diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 35314511..bfb4688d 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -31,7 +31,7 @@ If applicable, add screenshots to help explain your problem.
  - OS: [e.g. Windows 10/Raspberry Pi OS]
  - Python version: [e.g. python2.7]
  - Calibre-Web version: [e.g. 0.6.8 or 087c4c59 (git rev-parse --short HEAD)]:
- - Docker container: [None/Technosoft2000/Linuxuser]:
+ - Docker container: [None/Technosoft2000/LinuxServer]:
  - Special Hardware: [e.g. Rasperry Pi Zero]
  - Browser: [e.g. Chrome 83.0.4103.97, Safari 13.3.7, Firefox 68.0.1 ESR]
 
diff --git a/README.md b/README.md
index 4ee209f8..3f0792bf 100644
--- a/README.md
+++ b/README.md
@@ -32,8 +32,8 @@ Calibre-Web is a web app providing a clean interface for browsing, reading and d
 
 ## Quick start
 
-1. Install dependencies by running `pip3 install --target vendor -r requirements.txt` (python3.x) or `pip install --target vendor -r requirements.txt` (python2.7).
-2. Execute the command: `python cps.py` (or `nohup python cps.py` - recommended if you want to exit the terminal window)
+1. Install dependencies by running `pip3 install --target vendor -r requirements.txt` (python3.x). Alternativly set up a python virtual environment.
+2. Execute the command: `python3 cps.py` (or `nohup python3 cps.py` - recommended if you want to exit the terminal window)
 3. Point your browser to `http://localhost:8083` or `http://localhost:8083/opds` for the OPDS catalog
 4. Set `Location of Calibre database` to the path of the folder where your Calibre library (metadata.db) lives, push "submit" button\
    Optionally a Google Drive can be used to host the calibre library [-> Using Google Drive integration](https://github.com/janeczku/calibre-web/wiki/Configuration#using-google-drive-integration)
@@ -48,7 +48,7 @@ Please note that running the above install command can fail on some versions of
 
 ## Requirements
 
-python 3.x+, (Python 2.7+)
+python 3.x+
 
 Optionally, to enable on-the-fly conversion from one ebook format to another when using the send-to-kindle feature, or during editing of ebooks metadata:
 
diff --git a/cps.py b/cps.py
index 50ab0076..737b0d97 100755
--- a/cps.py
+++ b/cps.py
@@ -31,7 +31,7 @@ else:
     sys.path.append(os.path.join(os.path.dirname(os.path.abspath(__file__)), 'vendor'))
 
 
-from cps import create_app, config
+from cps import create_app
 from cps import web_server
 from cps.opds import opds
 from cps.web import web
diff --git a/cps/__init__.py b/cps/__init__.py
index 1a7dc868..627cca0b 100644
--- a/cps/__init__.py
+++ b/cps/__init__.py
@@ -45,6 +45,7 @@ mimetypes.add_type('application/fb2+zip', '.fb2')
 mimetypes.add_type('application/x-mobipocket-ebook', '.mobi')
 mimetypes.add_type('application/x-mobipocket-ebook', '.prc')
 mimetypes.add_type('application/vnd.amazon.ebook', '.azw')
+mimetypes.add_type('application/x-mobi8-ebook', '.azw3')
 mimetypes.add_type('application/x-cbr', '.cbr')
 mimetypes.add_type('application/x-cbz', '.cbz')
 mimetypes.add_type('application/x-cbt', '.cbt')
@@ -98,6 +99,9 @@ def create_app():
     	cache_buster.init_cache_busting(app)
 
     log.info('Starting Calibre Web...')
+    if sys.version_info < (3, 0):
+        log.info('Python2 is EOL since end of 2019, this version of Calibre-Web supporting Python2 please consider upgrading to Python3')
+        print('Python2 is EOL since end of 2019, this version of Calibre-Web supporting Python2 please consider upgrading to Python3')
     Principal(app)
     lm.init_app(app)
     app.secret_key = os.getenv('SECRET_KEY', config_sql.get_flask_session_key(ub.session))
diff --git a/cps/admin.py b/cps/admin.py
index 328ee606..03b306a8 100644
--- a/cps/admin.py
+++ b/cps/admin.py
@@ -636,7 +636,7 @@ def pathchooser():
         "parentdir": parentdir,
         "type": browse_for,
         "oldfile": oldfile,
-        "absolute": abs,
+        "absolute": absolute,
     }
     return json.dumps(context)
 
diff --git a/cps/cli.py b/cps/cli.py
index 65a4185a..07b719d2 100644
--- a/cps/cli.py
+++ b/cps/cli.py
@@ -110,7 +110,10 @@ if ipadress:
         sys.exit(1)
 
 # handle and check user password argument
-user_password = args.s or None
+user_credentials = args.s or None
+if user_credentials and ":" not in user_credentials:
+    print("No valid username:password format")
+    sys.exit(3)
 
 # Handles enableing of filepicker
 filepicker = args.f or None
diff --git a/cps/constants.py b/cps/constants.py
index c1bcbe59..cecfc29c 100644
--- a/cps/constants.py
+++ b/cps/constants.py
@@ -21,6 +21,7 @@ import sys
 import os
 from collections import namedtuple
 
+# if installed via pip this variable is set to true
 HOME_CONFIG = False
 
 # Base dir is parent of current file, necessary if called from different folder
@@ -40,7 +41,7 @@ if HOME_CONFIG:
         os.makedirs(home_dir)
     CONFIG_DIR = os.environ.get('CALIBRE_DBPATH', home_dir)
 else:
-    CONFIG_DIR      = os.environ.get('CALIBRE_DBPATH', BASE_DIR)
+    CONFIG_DIR = os.environ.get('CALIBRE_DBPATH', BASE_DIR)
 
 
 ROLE_USER               = 0 << 0
@@ -130,7 +131,7 @@ def selected_roles(dictionary):
 BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, '
                                   'series_id, languages')
 
-STABLE_VERSION = {'version': '0.6.10 Beta'}
+STABLE_VERSION = {'version': '0.6.11 Beta'}
 
 NIGHTLY_VERSION = {}
 NIGHTLY_VERSION[0] = '$Format:%H$'
diff --git a/cps/db.py b/cps/db.py
index f30fb609..c08a3ea4 100644
--- a/cps/db.py
+++ b/cps/db.py
@@ -50,6 +50,8 @@ try:
 except ImportError:
     use_unidecode = False
 
+log = logger.create()
+
 cc_exceptions = ['datetime', 'comments', 'composite', 'series']
 cc_classes = {}
 
@@ -402,7 +404,10 @@ class AlchemyEncoder(json.JSONEncoder):
                                 el.append(ele.get())
                             else:
                                 el.append(json.dumps(ele, cls=AlchemyEncoder))
-                        data = ",".join(el)
+                        if field == 'authors':
+                            data = " & ".join(el)
+                        else:
+                            data = ",".join(el)
                         if data == '[]':
                             data = ""
                     else:
@@ -619,11 +624,14 @@ class CalibreDB():
             .join(*join, isouter=True) \
             .filter(db_filter) \
             .filter(self.common_filters(allow_show_archived))
-        pagination = Pagination(page, pagesize,
-                                len(query.all()))
-        entries = query.order_by(*order).offset(off).limit(pagesize).all()
-        for book in entries:
-            book = self.order_authors(book)
+        try:
+            pagination = Pagination(page, pagesize,
+                                    len(query.all()))
+            entries = query.order_by(*order).offset(off).limit(pagesize).all()
+        except Exception as e:
+            log.debug_or_exception(e)
+        #for book in entries:
+        #    book = self.order_authors(book)
         return entries, randm, pagination
 
     # Orders all Authors in the list according to authors sort
diff --git a/cps/editbooks.py b/cps/editbooks.py
index b20ec5c8..1b1e13a2 100644
--- a/cps/editbooks.py
+++ b/cps/editbooks.py
@@ -30,8 +30,8 @@ from uuid import uuid4
 from flask import Blueprint, request, flash, redirect, url_for, abort, Markup, Response
 from flask_babel import gettext as _
 from flask_login import current_user, login_required
-from sqlalchemy.exc import OperationalError
-
+from sqlalchemy.exc import OperationalError, IntegrityError
+from sqlite3 import OperationalError as sqliteOperationalError
 from . import constants, logger, isoLanguages, gdriveutils, uploader, helper
 from . import config, get_locale, ub, db
 from . import calibre_db
@@ -310,7 +310,6 @@ def delete_book(book_id, book_format, jsonResponse):
 
 
 def render_edit_book(book_id):
-    calibre_db.update_title_sort(config)
     cc = calibre_db.session.query(db.Custom_Columns).filter(db.Custom_Columns.datatype.notin_(db.cc_exceptions)).all()
     book = calibre_db.get_filtered_book(book_id, allow_show_archived=True)
     if not book:
@@ -570,7 +569,7 @@ def upload_single_file(request, book, book_id):
                     calibre_db.session.add(db_format)
                     calibre_db.session.commit()
                     calibre_db.update_title_sort(config)
-                except OperationalError as e:
+                except (OperationalError, IntegrityError) as e:
                     calibre_db.session.rollback()
                     log.error('Database error: %s', e)
                     flash(_(u"Database error: %(error)s.", error=e), category="error")
@@ -607,12 +606,19 @@ def upload_cover(request, book):
 @edit_required
 def edit_book(book_id):
     modif_date = False
+
+    # create the function for sorting...
+    try:
+        calibre_db.update_title_sort(config)
+    except sqliteOperationalError as e:
+        log.debug_or_exception(e)
+        calibre_db.session.rollback()
+
     # Show form
     if request.method != 'POST':
         return render_edit_book(book_id)
 
-    # create the function for sorting...
-    calibre_db.update_title_sort(config)
+
     book = calibre_db.get_filtered_book(book_id, allow_show_archived=True)
 
     # Book not found
@@ -925,7 +931,7 @@ def upload():
                     else:
                         resp = {"location": url_for('web.show_book', book_id=book_id)}
                         return Response(json.dumps(resp), mimetype='application/json')
-            except OperationalError as e:
+            except (OperationalError, IntegrityError) as e:
                 calibre_db.session.rollback()
                 log.error("Database error: %s", e)
                 flash(_(u"Database error: %(error)s.", error=e), category="error")
diff --git a/cps/gdriveutils.py b/cps/gdriveutils.py
index 6f78ab47..79587b79 100644
--- a/cps/gdriveutils.py
+++ b/cps/gdriveutils.py
@@ -394,7 +394,8 @@ def uploadFileToEbooksFolder(destFile, f):
             if len(existingFiles) > 0:
                 driveFile = existingFiles[0]
             else:
-                driveFile = drive.CreateFile({'title': x, 'parents': [{"kind": "drive#fileLink", 'id': parent['id']}],})
+                driveFile = drive.CreateFile({'title': x,
+                                              'parents': [{"kind": "drive#fileLink", 'id': parent['id']}], })
             driveFile.SetContentFile(f)
             driveFile.Upload()
         else:
diff --git a/cps/helper.py b/cps/helper.py
index 506afe71..77d292eb 100644
--- a/cps/helper.py
+++ b/cps/helper.py
@@ -32,7 +32,7 @@ from tempfile import gettempdir
 import requests
 from babel.dates import format_datetime
 from babel.units import format_unit
-from flask import send_from_directory, make_response, redirect, abort, url_for, send_file
+from flask import send_from_directory, make_response, redirect, abort, url_for, request
 from flask_babel import gettext as _
 from flask_login import current_user
 from sqlalchemy.sql.expression import true, false, and_, text
@@ -68,6 +68,7 @@ try:
 except (ImportError, RuntimeError) as e:
     log.debug('Cannot import Image, generating covers from non jpg files will not work: %s', e)
     use_IM = False
+    MissingDelegateError = BaseException
 
 
 # Convert existing book entry to new format
diff --git a/cps/iso_language_names.py b/cps/iso_language_names.py
index 52e50667..98368449 100644
--- a/cps/iso_language_names.py
+++ b/cps/iso_language_names.py
@@ -14,425 +14,845 @@ from __future__ import unicode_literals
 # map iso639 language codes to language names, translated
 
 LANGUAGE_NAMES = {
-    "pl": {
-        "aar": "afarski",
-        "abk": "abchaski",
-        "ace": "aczineski",
-        "ach": "aczoli",
-        "ada": "adangme",
-        "ady": "adygejski",
-        "afh": "afrihili",
-        "afr": "afrykanerski",
-        "ain": "ajnoski (Japonia)",
-        "aka": "akan",
-        "akk": "akadyjski",
-        "ale": "aleucki",
-        "alt": "ałtajski południowy",
-        "amh": "amharski",
-        "ang": "Staroangielski (ok. 450-1100)",
+    "cs": {
+        "aar": "afarština",
+        "abk": "abchazajština",
+        "ace": "atěžština",
+        "ach": "ačoli (luoština)",
+        "ada": "adangmeština",
+        "ady": "adyghe",
+        "afh": "afrihilijština",
+        "afr": "afrikánština",
+        "ain": "ainu (Japonsko)",
+        "aka": "akanština",
+        "akk": "akkadština",
+        "ale": "aleutština",
+        "alt": "altajština; jižní",
+        "amh": "Amharština",
+        "ang": "Angličtina; stará (asi 450-1100)",
         "anp": "angika",
-        "ara": "arabski",
-        "arc": "aramejski oficjalny (700-300 p.n.e.)",
-        "arg": "aragoński",
-        "arn": "araukański",
+        "ara": "arabština",
+        "arc": "aramejština; oficiální (700-300 př. n. l.)",
+        "arg": "aragonská španělština",
+        "arn": "mapudungun",
         "arp": "arapaho",
-        "arw": "arawak",
-        "asm": "asamski",
-        "ast": "asturyjski",
-        "ava": "awarski",
-        "ave": "awestyjski",
-        "awa": "awadhi",
-        "aym": "ajmara",
-        "aze": "azerski",
-        "bak": "baszkirski",
-        "bal": "baluczi",
-        "bam": "bambara",
-        "ban": "balijski",
+        "arw": "arawacké jazyky",
+        "asm": "ásámština",
+        "ast": "asturština",
+        "ava": "avarština",
+        "ave": "avestština",
+        "awa": "avadhština (avadhí)",
+        "aym": "aymarština",
+        "aze": "azerbajdžánština",
+        "bak": "Baskirština",
+        "bal": "balúčština",
+        "bam": "bambarština",
+        "ban": "balijština",
         "bas": "basa (Kamerun)",
-        "bej": "bedża",
-        "bel": "białoruski",
-        "bem": "bemba (Zambia)",
-        "ben": "bengalski",
-        "bho": "bhodźpuri",
-        "bik": "bikol",
-        "bin": "edo",
-        "bis": "bislama",
+        "bej": "bedža",
+        "bel": "běloruština",
+        "bem": "bemba (Zambie)",
+        "ben": "bengálština",
+        "bho": "bhódžpurština",
+        "bik": "bikolština",
+        "bin": "bini",
+        "bis": "bislamština",
         "bla": "siksika",
-        "bod": "tybetański",
-        "bos": "bośniacki",
-        "bra": "bradź",
-        "bre": "bretoński",
-        "bua": "buriacki",
-        "bug": "bugijski",
-        "bul": "bułgarski",
-        "byn": "blin",
-        "cad": "kaddo",
-        "car": "karaibski galibi",
-        "cat": "kataloński",
-        "ceb": "cebuański",
-        "ces": "czeski",
-        "cha": "czamorro",
-        "chb": "czibcza",
-        "che": "czeczeński",
-        "chg": "czagatajski",
-        "chk": "chuuk",
-        "chm": "maryjski (Rosja)",
-        "chn": "żargon chinoocki",
-        "cho": "czoktaw",
-        "chp": "chipewyan",
-        "chr": "czerokeski",
-        "chu": "starosłowiański",
-        "chv": "czuwaski",
-        "chy": "czejeński",
-        "cop": "koptyjski",
-        "cor": "kornijski",
-        "cos": "korsykański",
-        "cre": "kri",
-        "crh": "krymskotatarski",
-        "csb": "kaszubski",
-        "cym": "walijski",
-        "dak": "dakota",
-        "dan": "duński",
-        "dar": "dargwijski",
-        "del": "delaware",
-        "den": "slavey (atapaskański)",
-        "deu": "niemiecki",
+        "bod": "tibetština",
+        "bos": "bosenština",
+        "bra": "bradžština",
+        "bre": "bretonština",
+        "bua": "burjatština",
+        "bug": "bugiština",
+        "bul": "bulharština",
+        "byn": "bilin",
+        "cad": "caddo",
+        "car": "carib; Galibi",
+        "cat": "katalánština",
+        "ceb": "cebuánština",
+        "ces": "Čeština",
+        "cha": "čamoro",
+        "chb": "čibča",
+        "che": "čečenština",
+        "chg": "Chagatai",
+        "chk": "čukčtina",
+        "chm": "Mari (Russia)",
+        "chn": "činuk pidžin",
+        "cho": "choctawština",
+        "chp": "čipeva",
+        "chr": "čerokézština",
+        "chu": "Slavonic; Old",
+        "chv": "čuvaština",
+        "chy": "čejenština",
+        "cop": "koptština",
+        "cor": "kornština",
+        "cos": "korsičtina",
+        "cre": "krí",
+        "crh": "Turkish; Crimean",
+        "csb": "kašubština",
+        "cym": "velština",
+        "dak": "dakotština",
+        "dan": "dánština",
+        "dar": "dargwa",
+        "del": "delawarština",
+        "den": "atabaské jazyky",
+        "deu": "Němčina",
         "dgr": "dogrib",
-        "din": "dinka",
-        "div": "malediwski; divehi",
-        "doi": "dogri (makrojęzyk)",
-        "dsb": "dolnołużycki",
-        "dua": "duala",
-        "dum": "holenderski średniowieczny (ok. 1050-1350)",
-        "dyu": "diula",
-        "dzo": "dzongka",
+        "din": "dinkština",
+        "div": "Dhivehi",
+        "doi": "Dogri (macrolanguage)",
+        "dsb": "Sorbian; Lower",
+        "dua": "dualština",
+        "dum": "Dutch; Middle (ca. 1050-1350)",
+        "dyu": "djula",
+        "dzo": "Bhútánština",
         "efi": "efik",
-        "egy": "egipski (starożytny)",
+        "egy": "egyptština (starověká)",
         "eka": "ekajuk",
-        "ell": "grecki współczesny (1453-)",
-        "elx": "elamicki",
-        "eng": "Angielski",
-        "enm": "angielski średniowieczny (1100-1500)",
+        "ell": "řečtina; moderní (1453-)",
+        "elx": "elamština",
+        "eng": "Angličtina",
+        "enm": "Angličtina; středověká (1100-1500)",
         "epo": "esperanto",
-        "est": "estoński",
-        "eus": "baskijski",
-        "ewe": "ewe",
+        "est": "estonština",
+        "eus": "baskičtina",
+        "ewe": "eweština",
         "ewo": "ewondo",
-        "fan": "fang (Gwinea Równikowa)",
-        "fao": "farerski",
-        "fas": "perski",
-        "fat": "fanti",
-        "fij": "fidżyjski",
-        "fil": "pilipino",
-        "fin": "fiński",
-        "fon": "fon",
-        "fra": "francuski",
-        "frm": "francuski średniowieczny (ok. 1400-1600)",
-        "fro": "starofrancuski (842-ok. 1400)",
-        "frr": "północnofryzyjski",
-        "frs": "wschodniofryzyjski",
-        "fry": "zachodniofryzyjski",
-        "ful": "fulani",
-        "fur": "friulski",
+        "fan": "Fang (Equatorial Guinea)",
+        "fao": "faerština",
+        "fas": "perština",
+        "fat": "fantiština",
+        "fij": "Fidži",
+        "fil": "Filipino",
+        "fin": "finština",
+        "fon": "fonština",
+        "fra": "francouzština",
+        "frm": "French; Middle (ca. 1400-1600)",
+        "fro": "French; Old (842-ca. 1400)",
+        "frr": "Frisian; Northern",
+        "frs": "Frisian; Eastern",
+        "fry": "Frisian; Western",
+        "ful": "fulahština",
+        "fur": "furlanština",
         "gaa": "ga",
         "gay": "gayo",
-        "gba": "gbaya (Republika Środkowoafrykańska)",
-        "gez": "gyyz",
-        "gil": "gilbertański",
-        "gla": "szkocki gaelicki",
-        "gle": "irlandzki",
-        "glg": "galicyjski",
-        "glv": "manx",
-        "gmh": "średnio-wysoko-niemiecki (ok. 1050-1500)",
-        "goh": "staro-wysoko-niemiecki (ok. 750-1050)",
-        "gon": "gondi",
+        "gba": "Gbaya (Central African Republic)",
+        "gez": "etiopština",
+        "gil": "kiribatština",
+        "gla": "Gaelic; Scottish",
+        "gle": "irština",
+        "glg": "Galician",
+        "glv": "manština",
+        "gmh": "German; Middle High (ca. 1050-1500)",
+        "goh": "German; Old High (ca. 750-1050)",
+        "gon": "góndština",
         "gor": "gorontalo",
-        "got": "gocki",
+        "got": "gótština",
         "grb": "grebo",
-        "grc": "grecki starożytny (do 1453)",
-        "grn": "guarani",
-        "gsw": "niemiecki szwajcarski",
-        "guj": "gudźarati",
-        "gwi": "gwichʼin",
+        "grc": "řečtina; starověká (do 1453)",
+        "grn": "Guaranština",
+        "gsw": "German; Swiss",
+        "guj": "Gudžarátština",
+        "gwi": "Gwichʼin",
         "hai": "haida",
-        "hat": "kreolski haitański",
-        "hau": "hausa",
-        "haw": "hawajski",
-        "heb": "hebrajski",
+        "hat": "Creole; Haitian",
+        "hau": "Hausa",
+        "haw": "havajština",
+        "heb": "hebrejština",
         "her": "herero",
-        "hil": "hiligajnon",
-        "hin": "hindi",
-        "hit": "hetycki",
-        "hmn": "hmong",
+        "hil": "hiligayonština",
+        "hin": "hindština",
+        "hit": "chetitština",
+        "hmn": "hmongština",
         "hmo": "hiri motu",
-        "hrv": "chorwacki",
-        "hsb": "górnołużycki",
-        "hun": "węgierski",
+        "hrv": "chorvatština",
+        "hsb": "Sorbian; Upper",
+        "hun": "maďarština",
         "hup": "hupa",
-        "hye": "ormiański",
-        "iba": "ibanag",
-        "ibo": "ibo",
+        "hye": "arménština",
+        "iba": "iban",
+        "ibo": "igbo",
         "ido": "ido",
-        "iii": "syczuański",
-        "iku": "inuktitut",
-        "ile": "interlingue",
-        "ilo": "ilokano",
-        "ina": "interlingua (Międzynarodowe Stowarzyszenie Języka Pomocniczego)",
-        "ind": "indonezyjski",
-        "inh": "inguski",
-        "ipk": "inupiaq",
-        "isl": "islandzki",
-        "ita": "włoski",
-        "jav": "jawajski",
+        "iii": "Yi; Sichuan",
+        "iku": "Inuktitutština",
+        "ile": "Interlingue",
+        "ilo": "ilokánština",
+        "ina": "Interlingua (Mezinárodní pomocná jazyková asociace)",
+        "ind": "indonézština",
+        "inh": "inguština",
+        "ipk": "Inupiakština",
+        "isl": "islandština",
+        "ita": "italština",
+        "jav": "jávština",
         "jbo": "lojban",
-        "jpn": "japoński",
-        "jpr": "judeo-perski",
-        "jrb": "judeoarabski",
-        "kaa": "karakałpacki",
-        "kab": "kabylski",
-        "kac": "kaczin",
-        "kal": "kalaallisut",
-        "kam": "kamba (Kenia)",
-        "kan": "kannada",
-        "kas": "kaszmirski",
-        "kat": "gruziński",
+        "jpn": "japonština",
+        "jpr": "judeo-perština",
+        "jrb": "judeo-arabština",
+        "kaa": "karakalpačtina",
+        "kab": "kabulí",
+        "kac": "kačjinština",
+        "kal": "Kalaallisut",
+        "kam": "Kamba (Kenya)",
+        "kan": "Kannadština",
+        "kas": "kašmírština",
+        "kat": "Gruzínština",
         "kau": "kanuri",
         "kaw": "kawi",
-        "kaz": "kazaski",
-        "kbd": "kabardyjski",
-        "kha": "khasi",
-        "khm": "środkowokhmerski",
-        "kho": "chotański",
-        "kik": "kikiju",
-        "kin": "ruanda",
-        "kir": "kirgiski",
-        "kmb": "kimbundu",
-        "kok": "konkani (makrojęzyk)",
-        "kom": "komi",
-        "kon": "kongo",
-        "kor": "koreański",
-        "kos": "kosrae",
+        "kaz": "Kazachština",
+        "kbd": "kabardština",
+        "kha": "Khasi",
+        "khm": "Khmer; Central",
+        "kho": "chotánština",
+        "kik": "Kikuyu",
+        "kin": "Kinyarwandština",
+        "kir": "Kirgizština",
+        "kmb": "kimbundština",
+        "kok": "Konkani (macrolanguage)",
+        "kom": "komijština",
+        "kon": "Kongo",
+        "kor": "korejština",
+        "kos": "kosrajština",
         "kpe": "kpelle",
-        "krc": "karaczajsko-bałkarski",
-        "krl": "karelski",
+        "krc": "karachay-balkarština",
+        "krl": "karelština",
         "kru": "kurukh",
-        "kua": "kwanyama",
-        "kum": "kumycki",
-        "kur": "kurdyjski",
+        "kua": "Kuanyama",
+        "kum": "kumyčtina",
+        "kur": "kurdština",
         "kut": "kutenai",
         "lad": "ladino",
         "lah": "lahnda",
-        "lam": "lamba",
-        "lao": "laotański",
-        "lat": "łaciński",
-        "lav": "łotewski",
-        "lez": "lezgiński",
-        "lim": "limburgijski",
-        "lin": "lingala",
-        "lit": "litewski",
-        "lol": "mongo",
-        "loz": "lozi",
-        "ltz": "luksemburski",
-        "lua": "luba-lulua",
-        "lub": "luba-katanga",
-        "lug": "luganda",
-        "lui": "luiseno",
-        "lun": "lunda",
-        "luo": "luo (Kenia i Tanzania)",
-        "lus": "lushai",
-        "mad": "madurajski",
-        "mag": "magahi",
-        "mah": "marshalski",
-        "mai": "maithili",
-        "mak": "makasar",
-        "mal": "malajalam",
-        "man": "mandingo",
-        "mar": "marathi",
-        "mas": "masajski",
-        "mdf": "moksza",
-        "mdr": "mandar",
-        "men": "mende (Sierra Leone)",
-        "mga": "irlandzki średniowieczny (900-1200)",
-        "mic": "micmac",
+        "lam": "lambština",
+        "lao": "Laoština",
+        "lat": "latina",
+        "lav": "Latvian",
+        "lez": "lezgiština",
+        "lim": "Limburgan",
+        "lin": "Ngalština",
+        "lit": "litevština",
+        "lol": "mongština",
+        "loz": "lozština",
+        "ltz": "Luxembourgish",
+        "lua": "luba-luluaština",
+        "lub": "lubu-katanžština",
+        "lug": "Ganda",
+        "lui": "luiseňo",
+        "lun": "lundština",
+        "luo": "luoština (Keňa a Tanzanie)",
+        "lus": "lušáí",
+        "mad": "madurština",
+        "mag": "magahština",
+        "mah": "Marshallese",
+        "mai": "maithilština",
+        "mak": "makasarština",
+        "mal": "Malabarština",
+        "man": "mandingština",
+        "mar": "maráthština",
+        "mas": "masajština",
+        "mdf": "moksha",
+        "mdr": "mandarínština",
+        "men": "Mende (Sierra Leone)",
+        "mga": "irština; středověká (900-1200)",
+        "mic": "Mi'kmaq",
         "min": "minangkabau",
-        "mis": "języki niezakodowane",
-        "mkd": "macedoński",
-        "mlg": "malgaski",
-        "mlt": "maltański",
-        "mnc": "mandżurski",
-        "mni": "manipuri",
+        "mis": "Uncoded languages",
+        "mkd": "makedonština",
+        "mlg": "Malgaština",
+        "mlt": "maltézština",
+        "mnc": "manchu",
+        "mni": "manipurština",
         "moh": "mohawk",
-        "mon": "mongolski",
-        "mos": "mossi",
-        "mri": "maoryski",
-        "msa": "malajski (makrojęzyk)",
-        "mul": "wiele języków",
-        "mus": "krik",
-        "mwl": "mirandyjski",
-        "mwr": "marwari",
-        "mya": "birmański",
-        "myv": "erzja",
-        "nap": "neapolitański",
-        "nau": "nauruański",
-        "nav": "navaho",
-        "nbl": "ndebele południowy",
-        "nde": "ndebele północny",
-        "ndo": "ndonga",
+        "mon": "mongolština",
+        "mos": "mosi",
+        "mri": "maorština",
+        "msa": "Malay (macrolanguage)",
+        "mul": "násobné jazyky",
+        "mus": "krík",
+        "mwl": "mirandština",
+        "mwr": "márvárština",
+        "mya": "Barmština",
+        "myv": "erzya",
+        "nap": "neapolština",
+        "nau": "naurština",
+        "nav": "navažština",
+        "nbl": "Ndebele; South",
+        "nde": "Ndebele; North",
+        "ndo": "ndondština",
         "nds": "German; Low",
-        "nep": "nepalski",
-        "new": "newarski",
+        "nep": "nepálština",
+        "new": "Bhasa; Nepal",
         "nia": "nias",
         "niu": "niue",
-        "nld": "holenderski",
-        "nno": "norweski Nynorsk",
-        "nob": "norweski Bokmål",
-        "nog": "nogajski",
-        "non": "staronordyjski",
-        "nor": "norweski",
-        "nqo": "n’ko",
-        "nso": "sotho północny",
-        "nwc": "newarski klasyczny",
-        "nya": "njandża",
-        "nym": "nyamwezi",
-        "nyn": "nyankole",
-        "nyo": "nyoro",
-        "nzi": "nzema",
-        "oci": "okcytański (po 1500)",
-        "oji": "odżibwe",
+        "nld": "holandština",
+        "nno": "Norwegian Nynorsk",
+        "nob": "Norwegian Bokmål",
+        "nog": "nogai",
+        "non": "norština; stará",
+        "nor": "norština",
+        "nqo": "N'Ko",
+        "nso": "Sotho; Northern",
+        "nwc": "Newari; Old",
+        "nya": "Nyanja",
+        "nym": "ňamwežština",
+        "nyn": "nyankolština",
+        "nyo": "Nyoro",
+        "nzi": "nzima",
+        "oci": "Occitan (post 1500)",
+        "oji": "Ojibwa",
         "ori": "orija",
-        "orm": "oromo",
-        "osa": "osage",
-        "oss": "osetyjski",
-        "ota": "turecki otomański (1500-1928)",
-        "pag": "pangasino",
-        "pal": "pahlawi",
-        "pam": "pampango",
-        "pan": "pendżabski",
+        "orm": "Oromo (Afan)",
+        "osa": "osagština",
+        "oss": "Ossetian",
+        "ota": "turečtina; osmanská (1500-1928)",
+        "pag": "pangsinan",
+        "pal": "pahlaví",
+        "pam": "pampangau",
+        "pan": "Panjabi",
         "pap": "papiamento",
-        "pau": "palau",
-        "peo": "staroperski (ok. 600-400 p.n.e)",
-        "phn": "fenicki",
-        "pli": "pali",
-        "pol": "Polski",
-        "pon": "pohnpei",
-        "por": "portugalski",
-        "pro": "prowansalski średniowieczny (do 1500)",
-        "pus": "paszto",
-        "que": "keczua",
-        "raj": "radźasthani",
-        "rap": "rapanui",
-        "rar": "maoryski Wysp Cooka",
-        "roh": "retoromański",
-        "rom": "romski",
-        "ron": "rumuński",
-        "run": "rundi",
-        "rup": "arumuński",
-        "rus": "rosyjski",
-        "sad": "sandawe",
-        "sag": "sango",
-        "sah": "jakucki",
-        "sam": "samarytański aramejski",
-        "san": "sanskryt",
-        "sas": "sasak",
-        "sat": "santali",
-        "scn": "sycylijski",
-        "sco": "scots",
-        "sel": "selkupski",
-        "sga": "staroirlandzki (do 900)",
-        "shn": "szan",
+        "pau": "palauština",
+        "peo": "Persian; Old (ca. 600-400 B.C.)",
+        "phn": "Slovinština",
+        "pli": "páli",
+        "pol": "Polština",
+        "pon": "pohnpeiština",
+        "por": "portugalština",
+        "pro": "provensálština; stará (do 1500)",
+        "pus": "pašto",
+        "que": "kečuánština",
+        "raj": "rádžasthánština",
+        "rap": "rapanuiština",
+        "rar": "Maori; Cook Islands",
+        "roh": "Romansh",
+        "rom": "římština",
+        "ron": "rumunština",
+        "run": "Kirundi",
+        "rup": "Romanian; Macedo-",
+        "rus": "Ruština",
+        "sad": "sandawština",
+        "sag": "sangoština",
+        "sah": "jakutština",
+        "sam": "Aramaic; Samaritan",
+        "san": "sanskrt",
+        "sas": "sačtina",
+        "sat": "santálí",
+        "scn": "sicilština",
+        "sco": "skotština",
+        "sel": "selkupština",
+        "sga": "irština; stará (do 900)",
+        "shn": "šanština",
         "sid": "sidamo",
-        "sin": "syngaleski",
-        "slk": "słowacki",
-        "slv": "słoweński",
-        "sma": "południowolapoński",
-        "sme": "północnolapoński",
-        "smj": "lapoński lule",
-        "smn": "lapoński inari",
-        "smo": "samoański",
-        "sms": "lapoński skolt",
-        "sna": "shona",
-        "snd": "sindhi",
-        "snk": "soninke",
-        "sog": "sogdiański",
-        "som": "somalijski",
-        "sot": "sotho południowy",
-        "spa": "hiszpański",
-        "sqi": "albański",
-        "srd": "sardyński",
-        "srn": "sranan tongo",
-        "srp": "serbski",
-        "srr": "serer",
-        "ssw": "suazi",
+        "sin": "Sinhálština",
+        "slk": "Slovenština",
+        "slv": "slovinština",
+        "sma": "Sami; Southern",
+        "sme": "Sami; Northern",
+        "smj": "lule sami",
+        "smn": "Sami; Inari",
+        "smo": "Samoyština",
+        "sms": "Sami; Skolt",
+        "sna": "šonština",
+        "snd": "sindhština",
+        "snk": "sonikština",
+        "sog": "sogdijština",
+        "som": "somálština",
+        "sot": "sotština; jižní",
+        "spa": "španělština",
+        "sqi": "albánština",
+        "srd": "sardinština",
+        "srn": "Sranan Tongo",
+        "srp": "srbština",
+        "srr": "Serer",
+        "ssw": "Siswatština",
         "suk": "sukuma",
-        "sun": "sundajski",
+        "sun": "Sundanština",
         "sus": "susu",
-        "sux": "sumeryjski",
-        "swa": "suahili (makrojęzyk)",
-        "swe": "szwedzki",
-        "syc": "syryjski klasyczny",
-        "syr": "syryjski",
-        "tah": "tahitański",
-        "tam": "tamilski",
-        "tat": "tatarski",
-        "tel": "telugu",
+        "sux": "sumerština",
+        "swa": "svahilština (makrojazyk)",
+        "swe": "švédština",
+        "syc": "Syriac; Classical",
+        "syr": "syrština",
+        "tah": "tahitština",
+        "tam": "Tamilština",
+        "tat": "tatarština",
+        "tel": "Telugu",
         "tem": "temne",
         "ter": "tereno",
-        "tet": "tetum",
-        "tgk": "tadżycki",
-        "tgl": "tagalski",
-        "tha": "tajski",
-        "tig": "tigre",
-        "tir": "tigrinia",
-        "tiv": "tiw",
-        "tkl": "tokelau",
-        "tlh": "klingoński",
+        "tet": "tetumština",
+        "tgk": "Tádžičtina",
+        "tgl": "Tagalog",
+        "tha": "thajština",
+        "tig": "tigrejština",
+        "tir": "Tigrinijština",
+        "tiv": "tivština",
+        "tkl": "tokelauština",
+        "tlh": "Klingon",
         "tli": "tlingit",
-        "tmh": "tuareski",
-        "tog": "tongański (Nyasa)",
-        "ton": "tongański (Wyspy Tonga)",
+        "tmh": "Tamashek",
+        "tog": "tongština (nyasa)",
+        "ton": "Tonga",
         "tpi": "tok pisin",
-        "tsi": "tsimszian",
-        "tsn": "tswana",
-        "tso": "tsonga",
-        "tuk": "turkmeński",
-        "tum": "tumbuka",
-        "tur": "turecki",
-        "tvl": "tuvalu",
-        "twi": "twi",
-        "tyv": "tuwiński",
-        "udm": "udmurcki",
-        "uga": "ugarycki",
-        "uig": "ujgurski",
-        "ukr": "ukraiński",
+        "tsi": "tsimshijské jazyky",
+        "tsn": "Setswanština",
+        "tso": "Tsonga",
+        "tuk": "turkmenistánština",
+        "tum": "tumbukština",
+        "tur": "turečtina",
+        "tvl": "tuvalština",
+        "twi": "ťwiština",
+        "tyv": "tuvština",
+        "udm": "udmurtština",
+        "uga": "ugaritština",
+        "uig": "Uighurština",
+        "ukr": "ukrajinština",
         "umb": "umbundu",
-        "und": "nieokreślony",
-        "urd": "urdu",
-        "uzb": "uzbecki",
-        "vai": "wai",
-        "ven": "venda",
-        "vie": "wietnamski",
-        "vol": "wolapik",
-        "vot": "wotycki",
-        "wal": "walamo",
-        "war": "warajski (Filipiny)",
+        "und": "neurčitý",
+        "urd": "urdština",
+        "uzb": "uzbekistánština",
+        "vai": "vai",
+        "ven": "vendština",
+        "vie": "vietnamština",
+        "vol": "volapük",
+        "vot": "votiatština",
+        "wal": "Wolaytta",
+        "war": "Waray (Philippines)",
         "was": "washo",
-        "wln": "waloński",
-        "wol": "wolof",
-        "xal": "kałmucki",
-        "xho": "xhosa",
-        "yao": "yao",
-        "yap": "japski",
-        "yid": "jidysz",
-        "yor": "joruba",
-        "zap": "zapotecki",
-        "zbl": "bliss",
+        "wln": "valonština",
+        "wol": "volofština",
+        "xal": "Kalmyk",
+        "xho": "xhoština",
+        "yao": "jaoština",
+        "yap": "japština",
+        "yid": "Jidiš",
+        "yor": "jorubština",
+        "zap": "Zapotec",
+        "zbl": "Blissymbols",
         "zen": "zenaga",
-        "zha": "zhuang",
-        "zho": "chiński",
-        "zul": "zuluski",
-        "zun": "zuni",
-        "zxx": "brak kontekstu językowego",
-        "zza": "zazaki"
+        "zha": "Zhuang",
+        "zho": "čínština",
+        "zul": "Zulu",
+        "zun": "zunijština",
+        "zxx": "bez lingvistického obsahu",
+        "zza": "zaza"
+    },
+    "de": {
+        "aar": "Danakil-Sprache",
+        "abk": "Abchasisch",
+        "ace": "Aceh-Sprache",
+        "ach": "Acholi-Sprache",
+        "ada": "Adangme-Sprache",
+        "ady": "Adygisch",
+        "afh": "Afrihili",
+        "afr": "Afrikaans",
+        "ain": "Ainu-Sprache (Japan)",
+        "aka": "Akan-Sprache",
+        "akk": "Akkadisch",
+        "ale": "Aleutisch",
+        "alt": "Altaisch; Süd",
+        "amh": "Amharisch",
+        "ang": "Englisch; Alt (ca. 450-1100)",
+        "anp": "Anga-Sprache",
+        "ara": "Arabisch",
+        "arc": "Aramäisch",
+        "arg": "Aragonesisch",
+        "arn": "Mapudungun",
+        "arp": "Arapaho",
+        "arw": "Arawakisch",
+        "asm": "Assamesisch",
+        "ast": "Asturisch",
+        "ava": "Awarisch",
+        "ave": "Avestisch",
+        "awa": "Awadhi",
+        "aym": "Aymara",
+        "aze": "Aserbaidschanisch",
+        "bak": "Baschkirisch",
+        "bal": "Belutschisch",
+        "bam": "Bambara",
+        "ban": "Balinesisch",
+        "bas": "Basa (Kamerun)",
+        "bej": "Bedja (Bedauye)",
+        "bel": "Weißrussisch",
+        "bem": "Bemba (Sambia)",
+        "ben": "Bengalisch",
+        "bho": "Bhojpuri",
+        "bik": "Bikol",
+        "bin": "Bini",
+        "bis": "Bislama",
+        "bla": "Blackfoot",
+        "bod": "Tibetisch",
+        "bos": "Bosnisch",
+        "bra": "Braj-Bhakha",
+        "bre": "Bretonisch",
+        "bua": "Burjatisch",
+        "bug": "Buginesisch",
+        "bul": "Bulgarisch",
+        "byn": "Bilin",
+        "cad": "Caddo",
+        "car": "Karibisch; Galíbi",
+        "cat": "Katalanisch",
+        "ceb": "Cebuano",
+        "ces": "Tschechisch",
+        "cha": "Chamorro",
+        "chb": "Chibcha",
+        "che": "Tschetschenisch",
+        "chg": "Tschagataisch",
+        "chk": "Trukesisch",
+        "chm": "Mari (Russland)",
+        "chn": "Chinook",
+        "cho": "Choctaw",
+        "chp": "Chipewyan",
+        "chr": "Cherokee",
+        "chu": "Altkirchenslawisch",
+        "chv": "Tschuwaschisch",
+        "chy": "Cheyenne",
+        "cop": "Koptisch",
+        "cor": "Kornisch",
+        "cos": "Korsisch",
+        "cre": "Cree",
+        "crh": "Türkisch; Krimtatarisch",
+        "csb": "Kaschubisch",
+        "cym": "Walisisch",
+        "dak": "Dakota",
+        "dan": "Dänisch",
+        "dar": "Darginisch",
+        "del": "Delaware",
+        "den": "Slave (Athapaskisch)",
+        "deu": "Deutsch",
+        "dgr": "Dogrib",
+        "din": "Dinka",
+        "div": "Dhivehi",
+        "doi": "Dogri (Makrosprache)",
+        "dsb": "Sorbisch; Nieder",
+        "dua": "Duala",
+        "dum": "Niederländisch; Mittel (ca. 1050-1350)",
+        "dyu": "Dyula",
+        "dzo": "Dzongkha",
+        "efi": "Efik",
+        "egy": "Ägyptisch (Historisch)",
+        "eka": "Ekajuk",
+        "ell": "Neugriechisch (ab 1453)",
+        "elx": "Elamisch",
+        "eng": "Englisch",
+        "enm": "Mittelenglisch",
+        "epo": "Esperanto",
+        "est": "Estnisch",
+        "eus": "Baskisch",
+        "ewe": "Ewe-Sprache",
+        "ewo": "Ewondo",
+        "fan": "Fang (Äquatorial-Guinea)",
+        "fao": "Färöisch",
+        "fas": "Persisch",
+        "fat": "Fanti",
+        "fij": "Fidschianisch",
+        "fil": "Filipino",
+        "fin": "Finnisch",
+        "fon": "Fon",
+        "fra": "Französisch",
+        "frm": "Französisch; Mittel (ca. 1400 - 1600)",
+        "fro": "Französisch; Alt (842 - ca. 1400)",
+        "frr": "Friesisch; Nord",
+        "frs": "Friesisch; Ost",
+        "fry": "Friesisch; West",
+        "ful": "Ful",
+        "fur": "Friaulisch",
+        "gaa": "Ga",
+        "gay": "Gayo",
+        "gba": "Gbaya (Zentralafrikanische Republik)",
+        "gez": "Altäthiopisch",
+        "gil": "Gilbertesisch",
+        "gla": "Gälisch; Schottisch",
+        "gle": "Irisch",
+        "glg": "Galicisch",
+        "glv": "Manx",
+        "gmh": "Mittelhochdeutsch (ca. 1050-1500)",
+        "goh": "Althochdeutsch (ca. 750-1050)",
+        "gon": "Gondi",
+        "gor": "Gorontalesisch",
+        "got": "Gotisch",
+        "grb": "Grebo",
+        "grc": "Altgriechisch (bis 1453)",
+        "grn": "Guaraní",
+        "gsw": "Schweizerdeutsch",
+        "guj": "Gujarati",
+        "gwi": "Kutchin",
+        "hai": "Haida",
+        "hat": "Kreolisch; Haitisch",
+        "hau": "Haussa",
+        "haw": "Hawaiianisch",
+        "heb": "Hebräisch",
+        "her": "Herero",
+        "hil": "Hiligaynon",
+        "hin": "Hindi",
+        "hit": "Hethitisch",
+        "hmn": "Miao-Sprachen",
+        "hmo": "Hiri-Motu",
+        "hrv": "Kroatisch",
+        "hsb": "Obersorbisch",
+        "hun": "Ungarisch",
+        "hup": "Hupa",
+        "hye": "Armenisch",
+        "iba": "Iban",
+        "ibo": "Ibo",
+        "ido": "Ido",
+        "iii": "Yi; Sichuan",
+        "iku": "Inuktitut",
+        "ile": "Interlingue",
+        "ilo": "Ilokano",
+        "ina": "Interlingua (Internationale Hilfssprachen-Vereinigung)",
+        "ind": "Indonesisch",
+        "inh": "Inguschisch",
+        "ipk": "Inupiaq",
+        "isl": "Isländisch",
+        "ita": "Italienisch",
+        "jav": "Javanisch",
+        "jbo": "Lojban",
+        "jpn": "Japanisch",
+        "jpr": "Jüdisch-Persisch",
+        "jrb": "Jüdisch-Arabisch",
+        "kaa": "Karakalpakisch",
+        "kab": "Kabylisch",
+        "kac": "Kachinisch",
+        "kal": "Kalaallisut (Grönländisch)",
+        "kam": "Kamba (Kenia)",
+        "kan": "Kannada",
+        "kas": "Kaschmirisch",
+        "kat": "Georgisch",
+        "kau": "Kanuri",
+        "kaw": "Kawi; Altjavanisch",
+        "kaz": "Kasachisch",
+        "kbd": "Kabardisch",
+        "kha": "Khasi-Sprache",
+        "khm": "Khmer; Zentral",
+        "kho": "Sakisch",
+        "kik": "Kikuyu",
+        "kin": "Rwanda",
+        "kir": "Kirgisisch",
+        "kmb": "Mbundu; Kimbundu",
+        "kok": "Konkani (Makrosprache)",
+        "kom": "Komi",
+        "kon": "Kongo",
+        "kor": "Koreanisch",
+        "kos": "Kosraeanisch",
+        "kpe": "Kpelle",
+        "krc": "Karachay-Balkar",
+        "krl": "Karenisch",
+        "kru": "Kurukh",
+        "kua": "Kwanyama",
+        "kum": "Kumükisch",
+        "kur": "Kurdisch",
+        "kut": "Kutenai",
+        "lad": "Judenspanisch",
+        "lah": "Lahnda",
+        "lam": "Banjari; Lamba",
+        "lao": "Laotisch",
+        "lat": "Lateinisch",
+        "lav": "Lettisch",
+        "lez": "Lesgisch",
+        "lim": "Limburgisch",
+        "lin": "Lingala",
+        "lit": "Litauisch",
+        "lol": "Mongo",
+        "loz": "Rotse",
+        "ltz": "Luxemburgisch",
+        "lua": "Luba-Lulua",
+        "lub": "Luba-Katanga",
+        "lug": "Ganda",
+        "lui": "Luiseno",
+        "lun": "Lunda",
+        "luo": "Luo (Kenia und Tansania)",
+        "lus": "Lushai",
+        "mad": "Maduresisch",
+        "mag": "Khotta",
+        "mah": "Marshallesisch",
+        "mai": "Maithili",
+        "mak": "Makassarisch",
+        "mal": "Malayalam",
+        "man": "Mande; Mandigo; Malinke",
+        "mar": "Marathi",
+        "mas": "Massai",
+        "mdf": "Moksha",
+        "mdr": "Mandaresisch",
+        "men": "Mende (Sierra Leone)",
+        "mga": "Mittelirisch (900-1200)",
+        "mic": "Mikmak",
+        "min": "Minangkabau",
+        "mis": "Nichtklassifizierte Sprachen",
+        "mkd": "Makedonisch",
+        "mlg": "Madegassisch",
+        "mlt": "Maltesisch",
+        "mnc": "Manchu; Mandschurisch",
+        "mni": "Meithei-Sprache",
+        "moh": "Mohawk",
+        "mon": "Mongolisch",
+        "mos": "Mossi",
+        "mri": "Maori",
+        "msa": "Malaiisch (Makrosprache)",
+        "mul": "Mehrsprachig; Polyglott",
+        "mus": "Muskogee",
+        "mwl": "Mirandesisch",
+        "mwr": "Marwari",
+        "mya": "Burmesisch",
+        "myv": "Erzya",
+        "nap": "Neapolitanisch",
+        "nau": "Nauruanisch",
+        "nav": "Navajo",
+        "nbl": "Ndebele (Süd)",
+        "nde": "Ndebele (Nord)",
+        "ndo": "Ndonga",
+        "nds": "Plattdeutsch",
+        "nep": "Nepali",
+        "new": "Bhasa; Nepalesisch",
+        "nia": "Nias",
+        "niu": "Niue",
+        "nld": "Niederländisch",
+        "nno": "Nynorsk (Norwegen)",
+        "nob": "Norwegisch-Bokmål",
+        "nog": "Nogai",
+        "non": "Altnordisch",
+        "nor": "Norwegisch",
+        "nqo": "N'Ko",
+        "nso": "Sotho; Nord",
+        "nwc": "Newari; Alt",
+        "nya": "Nyanja",
+        "nym": "Nyamwezi",
+        "nyn": "Nyankole",
+        "nyo": "Nyoro",
+        "nzi": "Nzima",
+        "oci": "Okzitanisch (nach 1500)",
+        "oji": "Ojibwa",
+        "ori": "Orija",
+        "orm": "Oromo",
+        "osa": "Osage",
+        "oss": "Ossetisch",
+        "ota": "Ottomanisch (Osmanisch/Türkisch) (1500-1928)",
+        "pag": "Pangasinan",
+        "pal": "Mittelpersisch",
+        "pam": "Pampanggan",
+        "pan": "Panjabi",
+        "pap": "Papiamento",
+        "pau": "Palau",
+        "peo": "Persisch; Alt (ca. 600-400 v.Chr.)",
+        "phn": "Phönikisch",
+        "pli": "Pali",
+        "pol": "Polnisch",
+        "pon": "Ponapeanisch",
+        "por": "Portugiesisch",
+        "pro": "Altokzitanisch; Altprovenzalisch (bis 1500)",
+        "pus": "Paschtu; Afghanisch",
+        "que": "Ketschua",
+        "raj": "Rajasthani",
+        "rap": "Osterinsel-Sprache; Rapanui",
+        "rar": "Maori; Cook-Inseln",
+        "roh": "Bündnerromanisch",
+        "rom": "Romani; Zigeunersprache",
+        "ron": "Rumänisch",
+        "run": "Rundi",
+        "rup": "Rumänisch; Mezedonisch",
+        "rus": "Russisch",
+        "sad": "Sandawe",
+        "sag": "Sango",
+        "sah": "Jakutisch",
+        "sam": "Aramäisch; Samaritanisch",
+        "san": "Sanskrit",
+        "sas": "Sassak",
+        "sat": "Santali",
+        "scn": "Sizilianisch",
+        "sco": "Schottisch",
+        "sel": "Selkupisch",
+        "sga": "Altirisch (bis 900)",
+        "shn": "Schan",
+        "sid": "Sidamo",
+        "sin": "Singhalesisch",
+        "slk": "Slowakisch",
+        "slv": "Slowenisch",
+        "sma": "Sami; Süd",
+        "sme": "Nordsamisch",
+        "smj": "Samisch (Lule)",
+        "smn": "Samisch; Inari",
+        "smo": "Samoanisch",
+        "sms": "Samisch; Skolt",
+        "sna": "Schona",
+        "snd": "Sindhi",
+        "snk": "Soninke",
+        "sog": "Sogdisch",
+        "som": "Somali",
+        "sot": "Sotho (Süd)",
+        "spa": "Spanisch; Kastilianisch",
+        "sqi": "Albanisch",
+        "srd": "Sardisch",
+        "srn": "Sranan Tongo",
+        "srp": "Serbisch",
+        "srr": "Serer",
+        "ssw": "Swazi",
+        "suk": "Sukuma",
+        "sun": "Sundanesisch",
+        "sus": "Susu",
+        "sux": "Sumerisch",
+        "swa": "Swahili (Makrosprache)",
+        "swe": "Schwedisch",
+        "syc": "Syrisch; Klassisch",
+        "syr": "Syrisch",
+        "tah": "Tahitisch",
+        "tam": "Tamilisch",
+        "tat": "Tatarisch",
+        "tel": "Telugu",
+        "tem": "Temne",
+        "ter": "Tereno",
+        "tet": "Tetum",
+        "tgk": "Tadschikisch",
+        "tgl": "Tagalog",
+        "tha": "Thailändisch",
+        "tig": "Tigre",
+        "tir": "Tigrinja",
+        "tiv": "Tiv",
+        "tkl": "Tokelauanisch",
+        "tlh": "Klingonisch",
+        "tli": "Tlingit",
+        "tmh": "Tamaseq",
+        "tog": "Tonga (Nyasa)",
+        "ton": "Tonga (Tonga-Inseln)",
+        "tpi": "Neumelanesisch; Pidgin",
+        "tsi": "Tsimshian",
+        "tsn": "Tswana",
+        "tso": "Tsonga",
+        "tuk": "Turkmenisch",
+        "tum": "Tumbuka",
+        "tur": "Türkisch",
+        "tvl": "Elliceanisch",
+        "twi": "Twi",
+        "tyv": "Tuwinisch",
+        "udm": "Udmurt",
+        "uga": "Ugaritisch",
+        "uig": "Uigurisch",
+        "ukr": "Ukrainisch",
+        "umb": "Mbundu; Umbundu",
+        "und": "Unbestimmbar",
+        "urd": "Urdu",
+        "uzb": "Usbekisch",
+        "vai": "Vai",
+        "ven": "Venda",
+        "vie": "Vietnamesisch",
+        "vol": "Volapük",
+        "vot": "Wotisch",
+        "wal": "Wolaytta",
+        "war": "Waray (Philippinen)",
+        "was": "Washo",
+        "wln": "Wallonisch",
+        "wol": "Wolof",
+        "xal": "Kalmükisch",
+        "xho": "Xhosa",
+        "yao": "Yao",
+        "yap": "Yapesisch",
+        "yid": "Jiddisch",
+        "yor": "Joruba",
+        "zap": "Zapotekisch",
+        "zbl": "Bliss-Symbole",
+        "zen": "Zenaga",
+        "zha": "Zhuang",
+        "zho": "Chinesisch",
+        "zul": "Zulu",
+        "zun": "Zuni",
+        "zxx": "Kein sprachlicher Inhalt",
+        "zza": "Zaza"
     },
     "el": {
         "abk": "Αμπχαζιανά",
@@ -807,798 +1227,845 @@ LANGUAGE_NAMES = {
         "zul": "Zulu",
         "zun": "Zuni"
     },
-    "nl": {
-        "aar": "Afar; Hamitisch",
-        "abk": "Abchazisch",
-        "ace": "Achinees",
+    "es": {
+        "aar": "Afar",
+        "abk": "Abjasio",
+        "ace": "Achenés",
         "ach": "Acholi",
         "ada": "Adangme",
-        "ady": "Adyghe",
+        "ady": "Adigué",
         "afh": "Afrihili",
-        "afr": "Afrikaans",
-        "ain": "Ainu (Japan)",
-        "aka": "Akaans",
-        "akk": "Akkadiaans",
-        "ale": "Aleut",
-        "alt": "Altajs; zuidelijk",
-        "amh": "Amhaars; Amharisch",
-        "ang": "Engels; oud (ca. 450-1100)",
+        "afr": "Afrikáans",
+        "ain": "Ainu (Japón)",
+        "aka": "Acano",
+        "akk": "Acadio",
+        "ale": "Aleutiano",
+        "alt": "Altai meridional",
+        "amh": "Amhárico",
+        "ang": "Inglés antiguo (ca. 450-1100)",
         "anp": "Angika",
-        "ara": "Arabisch",
-        "arc": "Aramees; officieel (700-300 B.C.)",
-        "arg": "Aragonees",
+        "ara": "Árabe",
+        "arc": "Arameo oficial (700-300 A. C.)",
+        "arg": "Aragonés",
         "arn": "Mapudungun",
-        "arp": "Arapaho",
-        "arw": "Arawak",
-        "asm": "Assamees; Assami",
-        "ast": "Asturisch",
-        "ava": "Avaars; Awari",
-        "ave": "Avestisch",
+        "arp": "Arapajó",
+        "arw": "Arahuaco",
+        "asm": "Asamés",
+        "ast": "Asturiano",
+        "ava": "Ávaro",
+        "ave": "Avéstico",
         "awa": "Awadhi",
-        "aym": "Aymara",
-        "aze": "Azerbeidzjaans",
-        "bak": "Basjkiers; Basjkirisch",
-        "bal": "Balutsji; Baluchi",
+        "aym": "Aimara",
+        "aze": "Azerí",
+        "bak": "Bashkir",
+        "bal": "Baluchi",
         "bam": "Bambara",
-        "ban": "Balinees",
-        "bas": "Basa (Kameroen)",
-        "bej": "Beja",
-        "bel": "Wit-Russisch; Belarussisch",
+        "ban": "Balinés",
+        "bas": "Basa (Camerún)",
+        "bej": "Beya",
+        "bel": "Bielorruso",
         "bem": "Bemba (Zambia)",
-        "ben": "Bengaals",
-        "bho": "Bhojpuri",
-        "bik": "Bikol",
-        "bin": "Bini; Edo",
+        "ben": "Bengalí",
+        "bho": "Bopurí",
+        "bik": "Bicolano",
+        "bin": "Bini",
         "bis": "Bislama",
-        "bla": "Siksika",
-        "bod": "Tibetaans",
-        "bos": "Bosnisch",
+        "bla": "Siksiká",
+        "bod": "Tibetano",
+        "bos": "Bosnio",
         "bra": "Braj",
-        "bre": "Bretons; Bretoens",
-        "bua": "Boeriaats",
-        "bug": "Buginees",
-        "bul": "Bulgaars",
+        "bre": "Bretón",
+        "bua": "Buriato",
+        "bug": "Buginés",
+        "bul": "Búlgaro",
         "byn": "Bilin",
         "cad": "Caddo",
-        "car": "Caribische talen",
-        "cat": "Catalaans",
+        "car": "Caribe galibí",
+        "cat": "Catalán",
         "ceb": "Cebuano",
-        "ces": "Tsjechisch",
+        "ces": "Checo",
         "cha": "Chamorro",
-        "chb": "Tsjibtsja",
-        "che": "Tsjetsjeens",
+        "chb": "Muisca",
+        "che": "Checheno",
         "chg": "Chagatai",
-        "chk": "Chukees",
-        "chm": "Mari (Rusland)",
-        "chn": "Chinook-jargon",
+        "chk": "Chuukés",
+        "chm": "Mari (Rusia)",
+        "chn": "Jerga chinook",
         "cho": "Choctaw",
-        "chp": "Chipewyaans",
-        "chr": "Cherokee",
-        "chu": "Slavisch; oud (kerk)",
-        "chv": "Tsjoevasjisch",
+        "chp": "Chipewyan",
+        "chr": "Cheroqui",
+        "chu": "Eslavo antiguo",
+        "chv": "Chuvasio",
         "chy": "Cheyenne",
-        "cop": "Koptisch",
-        "cor": "Cornisch",
-        "cos": "Corsicaans",
+        "cop": "Copto",
+        "cor": "Córnico",
+        "cos": "Corso",
         "cre": "Cree",
-        "crh": "Turks; Crimean",
-        "csb": "Kasjoebiaans",
-        "cym": "Welsh",
+        "crh": "Tártaro de Crimea",
+        "csb": "Casubio",
+        "cym": "Galés",
         "dak": "Dakota",
-        "dan": "Deens",
+        "dan": "Danés",
         "dar": "Dargwa",
         "del": "Delaware",
-        "den": "Slavisch (Athapascaans)",
-        "deu": "Duits",
+        "den": "Slave (atabascano)",
+        "deu": "Alemán",
         "dgr": "Dogrib",
         "din": "Dinka",
-        "div": "Divehi",
-        "doi": "Dogri",
-        "dsb": "Sorbisch; lager",
+        "div": "Dhivehi",
+        "doi": "Dogri (macrolengua)",
+        "dsb": "Bajo sorabo",
         "dua": "Duala",
-        "dum": "Nederlands; middel (ca. 1050-1350)",
-        "dyu": "Dyula",
+        "dum": "Neerlandés medio (ca. 1050-1350)",
+        "dyu": "Diula",
         "dzo": "Dzongkha",
-        "efi": "Efikisch",
-        "egy": "Egyptisch (antiek)",
+        "efi": "Efik",
+        "egy": "Egipcio (antiguo)",
         "eka": "Ekajuk",
-        "ell": "Grieks; Modern (1453-)",
-        "elx": "Elamitisch",
-        "eng": "Engels",
-        "enm": "Engels; middel (1100-1500)",
+        "ell": "Griego moderno (1453-)",
+        "elx": "Elamita",
+        "eng": "Inglés",
+        "enm": "Inglés medio (1100-1500)",
         "epo": "Esperanto",
-        "est": "Estlands",
-        "eus": "Baskisch",
+        "est": "Estonio",
+        "eus": "Vasco",
         "ewe": "Ewe",
         "ewo": "Ewondo",
-        "fan": "Fang",
-        "fao": "Faeröers",
-        "fas": "Perzisch",
+        "fan": "Fang (Guinea Ecuatorial)",
+        "fao": "Feroés",
+        "fas": "Persa",
         "fat": "Fanti",
-        "fij": "Fijisch",
-        "fil": "Filipijns",
-        "fin": "Fins",
+        "fij": "Fiyiano",
+        "fil": "Filipino",
+        "fin": "Finés",
         "fon": "Fon",
-        "fra": "Frans",
-        "frm": "Frans; middel (ca. 1400-1600)",
-        "fro": "Frans; oud (842-ca. 1400)",
-        "frr": "Fries; noordelijk (Duitsland)",
-        "frs": "Fries; oostelijk (Duitsland)",
-        "fry": "Fries",
-        "ful": "Fulah",
-        "fur": "Friulisch",
+        "fra": "Francés",
+        "frm": "Francés medio (ca. 1400-1600)",
+        "fro": "Francés antiguo (842-ca. 1400)",
+        "frr": "Frisón septentrional",
+        "frs": "Frisón oriental",
+        "fry": "Frisón occidental",
+        "ful": "Fula",
+        "fur": "Friulano",
         "gaa": "Ga",
         "gay": "Gayo",
-        "gba": "Gbaya (Centraal Afrikaanse Republiek)",
+        "gba": "Gbaya (República Centroafricana)",
         "gez": "Ge'ez",
-        "gil": "Gilbertees",
-        "gla": "Keltisch; schots",
-        "gle": "Iers",
-        "glg": "Galiciaans",
-        "glv": "Manx",
-        "gmh": "Duits; middel hoog (ca. 1050-1500)",
-        "goh": "Duits; oud hoog (ca. 750-1050)",
+        "gil": "Gilbertés",
+        "gla": "Gaélico escocés",
+        "gle": "Irlandés",
+        "glg": "Gallego",
+        "glv": "Manés",
+        "gmh": "Alto alemán medio (ca. 1050-1500)",
+        "goh": "Alto alemán antiguo (ca. 750-1050)",
         "gon": "Gondi",
         "gor": "Gorontalo",
-        "got": "Gothisch",
+        "got": "Gótico",
         "grb": "Grebo",
-        "grc": "Grieks; antiek (tot 1453)",
-        "grn": "Guarani",
-        "gsw": "Duits; Zwitserland",
-        "guj": "Gujarati",
+        "grc": "Griego antiguo (hasta 1453)",
+        "grn": "Guaraní",
+        "gsw": "Alemán suizo",
+        "guj": "Guyaratí",
         "gwi": "Gwichʼin",
         "hai": "Haida",
-        "hat": "Creools; Haïtiaans",
+        "hat": "Criollo haitiano",
         "hau": "Hausa",
-        "haw": "Hawaiiaans",
-        "heb": "Hebreeuws",
+        "haw": "Hawaiano",
+        "heb": "Hebreo",
         "her": "Herero",
-        "hil": "Hiligainoons",
+        "hil": "Hiligainón",
         "hin": "Hindi",
-        "hit": "Hittitisch",
+        "hit": "Hitita",
         "hmn": "Hmong",
-        "hmo": "Hiri Motu",
-        "hrv": "Kroatisch",
-        "hsb": "Servisch; hoger",
-        "hun": "Hongaars",
+        "hmo": "Hiri motu",
+        "hrv": "Croata",
+        "hsb": "Alto sorabo",
+        "hun": "Húngaro",
         "hup": "Hupa",
-        "hye": "Armeens",
-        "iba": "Ibaans",
+        "hye": "Armenio",
+        "iba": "Iban",
         "ibo": "Igbo",
         "ido": "Ido",
-        "iii": "Yi; Sichuan - Nuosu",
+        "iii": "Yi de Sichuan",
         "iku": "Inuktitut",
-        "ile": "Interlingue",
-        "ilo": "Iloko",
-        "ina": "Interlingua (International Auxiliary Language Association)",
-        "ind": "Indonesisch",
-        "inh": "Ingoesjetisch",
-        "ipk": "Inupiak",
-        "isl": "IJslands",
-        "ita": "Italiaans",
-        "jav": "Javaans",
-        "jbo": "Lojbaans",
-        "jpn": "Japans",
-        "jpr": "Joods-Perzisch",
-        "jrb": "Joods-Arabisch",
-        "kaa": "Kara-Kalpak",
-        "kab": "Kabyle",
-        "kac": "Katsjin",
-        "kal": "Groenlands",
-        "kam": "Kamba (Kenya)",
-        "kan": "Kannada; Kanara; Kanarees",
-        "kas": "Kashmiri",
-        "kat": "Georgisch",
-        "kau": "Kanuri",
-        "kaw": "Kawi",
-        "kaz": "Kazachs",
-        "kbd": "Kabardisch; Tsjerkessisch",
-        "kha": "Khasi",
-        "khm": "Khmer, Cambodjaans",
-        "kho": "Khotanees",
-        "kik": "Kikuyu",
-        "kin": "Kinyarwanda",
-        "kir": "Kirgizisch",
-        "kmb": "Kimbundu",
-        "kok": "Konkani",
-        "kom": "Komi",
-        "kon": "Kikongo",
-        "kor": "Koreaans",
-        "kos": "Kosraeaans",
-        "kpe": "Kpelle",
-        "krc": "Karatsjay-Balkar",
-        "krl": "Karelisch",
-        "kru": "Kurukh",
-        "kua": "Kuanyama",
-        "kum": "Kumyk",
-        "kur": "Koerdisch",
-        "kut": "Kutenaïsch",
-        "lad": "Ladino",
-        "lah": "Lahnda",
-        "lam": "Lamba",
-        "lao": "Laotiaans",
-        "lat": "Latijn",
-        "lav": "Lets",
-        "lez": "Lezghiaans",
-        "lim": "Limburgs",
-        "lin": "Lingala",
-        "lit": "Litouws",
-        "lol": "Mongo",
-        "loz": "Lozi",
-        "ltz": "Luxemburgs",
-        "lua": "Luba-Lulua",
-        "lub": "Luba-Katanga",
-        "lug": "Luganda",
-        "lui": "Luiseno",
-        "lun": "Lunda",
-        "luo": "Luo (Kenia en Tanzania)",
-        "lus": "Lushai",
-        "mad": "Madurees",
-        "mag": "Magahisch",
-        "mah": "Marshallees",
-        "mai": "Maithili",
-        "mak": "Makasar",
-        "mal": "Malayalam",
-        "man": "Mandingo",
-        "mar": "Marathi",
-        "mas": "Masai",
-        "mdf": "Moksja",
-        "mdr": "Mandars",
-        "men": "Mende",
-        "mga": "Iers; middel (900-1200)",
-        "mic": "Mi'kmaq; Micmac",
-        "min": "Minangkabau",
-        "mis": "Niet-gecodeerde talen",
-        "mkd": "Macedonisch",
-        "mlg": "Malagassisch",
-        "mlt": "Maltees",
-        "mnc": "Manchu",
-        "mni": "Manipuri",
-        "moh": "Mohawk",
-        "mon": "Mongools",
-        "mos": "Mossisch",
-        "mri": "Maori",
-        "msa": "Maleis",
-        "mul": "Meerdere talen",
-        "mus": "Creek",
-        "mwl": "Mirandees",
-        "mwr": "Marwari",
-        "mya": "Burmees",
-        "myv": "Erzya",
-        "nap": "Napolitaans",
-        "nau": "Nauruaans",
-        "nav": "Navajo",
-        "nbl": "Ndebele; zuid",
-        "nde": "Ndebele; noord",
-        "ndo": "Ndonga",
-        "nds": "Duits; Laag",
-        "nep": "Nepalees",
-        "new": "Newari; Nepal",
-        "nia": "Nias",
-        "niu": "Niueaans",
-        "nld": "Nederlands",
-        "nno": "Noors; Nynorsk",
-        "nob": "Noors; Bokmål",
-        "nog": "Nogai",
-        "non": "Noors; oud",
-        "nor": "Noors",
-        "nqo": "N'Ko",
-        "nso": "Pedi; Sepedi; Noord-Sothotisch",
-        "nwc": "Newari; Klassiek Nepal",
-        "nya": "Nyanja",
-        "nym": "Nyamwezi",
-        "nyn": "Nyankools",
-        "nyo": "Nyoro",
-        "nzi": "Nzima",
-        "oci": "Occitaans (na 1500)",
-        "oji": "Ojibwa",
-        "ori": "Oriya",
-        "orm": "Oromo",
-        "osa": "Osaags",
-        "oss": "Ossetisch",
-        "ota": "Turks; ottomaans (1500-1928)",
-        "pag": "Pangasinaans",
-        "pal": "Pehlevi",
-        "pam": "Pampanga",
-        "pan": "Punjabi",
-        "pap": "Papiamento",
-        "pau": "Palauaans",
-        "peo": "Perzisch; oud (ca. 600-400 B.C.)",
-        "phn": "Foenisisch",
-        "pli": "Pali",
-        "pol": "Pools",
-        "pon": "Pohnpeiaans",
-        "por": "Portugees",
-        "pro": "Provençaals; oud (tot 1500)",
-        "pus": "Poesjto",
-        "que": "Quechua",
-        "raj": "Rajasthani",
-        "rap": "Rapanui",
-        "rar": "Rarotongan; Cookeilanden Maori",
-        "roh": "Reto-Romaans",
-        "rom": "Romani",
-        "ron": "Roemeens",
-        "run": "Rundi",
-        "rup": "Roemeens; Macedo-",
-        "rus": "Russisch",
-        "sad": "Sandawe",
-        "sag": "Sangho",
-        "sah": "Jakoets",
-        "sam": "Aramees; Samaritaans",
-        "san": "Sanskriet",
-        "sas": "Sasaaks",
-        "sat": "Santali",
-        "scn": "Siciliaans",
-        "sco": "Schots",
-        "sel": "Sulkoeps",
-        "sga": "Iers; oud (tot 900)",
-        "shn": "Sjaans",
-        "sid": "Sidamo",
-        "sin": "Sinhala",
-        "slk": "Slowaaks",
-        "slv": "Sloveens",
-        "sma": "Samisch; zuid, Laps; zuid",
-        "sme": "Samisch; noord, Laps; noord",
-        "smj": "Lule Sami",
-        "smn": "Sami; Inari, Laps; Inari",
-        "smo": "Samoaans",
-        "sms": "Sami; Skolt, Laps; Skolt",
-        "sna": "Shona",
-        "snd": "Sindhi",
-        "snk": "Soninke",
-        "sog": "Sogdiaans",
-        "som": "Somalisch",
-        "sot": "Sothaans; zuidelijk",
-        "spa": "Spaans",
-        "sqi": "Albanees",
-        "srd": "Sardinisch",
-        "srn": "Sranan Tongo",
-        "srp": "Servisch",
-        "srr": "Serer",
-        "ssw": "Swati",
-        "suk": "Sukuma",
-        "sun": "Soendanees; Sundanees",
-        "sus": "Susu",
-        "sux": "Sumerisch",
-        "swa": "Swahili",
-        "swe": "Zweeds",
-        "syc": "Syriac; Klassiek",
-        "syr": "Syrisch",
-        "tah": "Tahitisch",
-        "tam": "Tamil",
-        "tat": "Tataars",
-        "tel": "Telugu",
-        "tem": "Timne",
-        "ter": "Tereno",
-        "tet": "Tetum",
-        "tgk": "Tadzjieks",
-        "tgl": "Tagalog",
-        "tha": "Thai",
-        "tig": "Tigre",
-        "tir": "Tigrinya",
-        "tiv": "Tiv",
-        "tkl": "Tokelau",
-        "tlh": "Klingon; tlhIngan-Hol",
-        "tli": "Tlingit",
-        "tmh": "Tamasjek",
-        "tog": "Tonga (Nyasa)",
-        "ton": "Tonga (Tonga-eilanden)",
-        "tpi": "Tok Pisin",
-        "tsi": "Tsimsjiaans",
-        "tsn": "Tswana",
-        "tso": "Tsonga",
-        "tuk": "Turkmeens",
-        "tum": "Tumbuka",
-        "tur": "Turks",
-        "tvl": "Tuvalu",
-        "twi": "Twi",
-        "tyv": "Tuviniaans",
-        "udm": "Udmurts",
-        "uga": "Ugaritisch",
-        "uig": "Oeigoers; Oejgoers",
-        "ukr": "Oekraïens",
-        "umb": "Umbundu",
-        "und": "Onbepaald",
-        "urd": "Urdu",
-        "uzb": "Oezbeeks",
-        "vai": "Vai",
-        "ven": "Venda",
-        "vie": "Vietnamees",
-        "vol": "Volapük",
-        "vot": "Votisch",
-        "wal": "Walamo",
-        "war": "Waray (Filipijns)",
-        "was": "Wasjo",
-        "wln": "Waals",
-        "wol": "Wolof",
-        "xal": "Kalmyk",
-        "xho": "Xhosa",
-        "yao": "Yao",
-        "yap": "Yapees",
-        "yid": "Jiddisch",
-        "yor": "Yoruba",
-        "zap": "Zapotec",
-        "zbl": "Blissymbolen",
-        "zen": "Zenaga",
-        "zha": "Zhuang, Tsjoeang",
-        "zho": "Chinees",
-        "zul": "Zoeloe",
-        "zun": "Zuni",
-        "zxx": "Geen linguïstische inhoud",
-        "zza": "Zaza"
-    },
-    "tr": {
-        "abk": "Abhazca",
-        "ace": "Achinese",
-        "ach": "Acoli",
-        "ada": "Adangme",
-        "ady": "Adyghe",
-        "aar": "Afar",
-        "afh": "Afrihili",
-        "afr": "Afrikanca",
-        "ain": "Ainu (Japonca)",
-        "aka": "Akanca (Afrika dili)",
-        "akk": "Akatça",
-        "sqi": "Albanian",
-        "ale": "Alaskaca",
-        "amh": "Etiyopyaca",
-        "anp": "Angika",
-        "ara": "Arapça",
-        "arg": "Aragonca (İspanya)",
-        "arp": "Arapaho (Kuzey Amerika yerlileri)",
-        "arw": "Arawak (Surinam)",
-        "hye": "Ermenice",
-        "asm": "Assamese (Hindistan)",
-        "ast": "Asturyasca",
-        "ava": "Avarca",
-        "ave": "Avestan (Eski İran)",
-        "awa": "Awadhi (Hindistan)",
-        "aym": "Aymara (Güney Amerika)",
-        "aze": "Azerice",
-        "ban": "Balice (Bali adaları)",
-        "bal": "Belucice (İran)",
-        "bam": "Bambara (Mali)",
-        "bas": "Basa (Kamerun)",
-        "bak": "Başkırca",
-        "eus": "Baskça",
-        "bej": "Beja (Eritre; Sudan)",
-        "bel": "Beyaz Rusça",
-        "bem": "Bemba (Zambia)",
-        "ben": "Bengalce",
-        "bho": "Bhojpuri (Hindistan)",
-        "bik": "Bikol (Filipinler)",
-        "byn": "Bilin",
-        "bin": "Bini (Afrika)",
-        "bis": "Bislama (Vanuatu; Kuzey Pasifik)",
-        "zbl": "Blis Sembolleri",
-        "bos": "Boşnakça",
-        "bra": "Braj (Hindistan)",
-        "bre": "Bretonca",
-        "bug": "Buginese (Endonezya)",
-        "bul": "Bulgarca",
-        "bua": "Buriat (Moğolistan)",
-        "mya": "Burmaca",
-        "cad": "Caddo (Kuzey Amerika yerlileri)",
-        "cat": "Katalanca",
-        "ceb": "Cebuano (Filipinler)",
-        "chg": "Çağatayca",
-        "cha": "Chamorro (Guam adaları)",
-        "che": "Çeçence",
-        "chr": "Cherokee (Kuzey Amerika yerlileri)",
-        "chy": "Cheyenne (kuzey Amerika yerlileri)",
-        "chb": "Chibcha (Kolombiya)",
-        "zho": "Çince",
-        "chn": "Chinook lehçesi (Kuzey Batı Amerika kıyıları)",
-        "chp": "Chipewyan (Kuzey Amerika yerlileri)",
-        "cho": "Choctaw (Kuzey Amerika yerlileri)",
-        "chk": "Chuukese",
-        "chv": "Çuvaş (Türkçe)",
-        "cop": "Kıptice (Eski Mısır)",
-        "cor": "Cornish (Kelt)",
-        "cos": "Korsikaca",
-        "cre": "Cree (Kuzey Amerika yerlileri)",
-        "mus": "Creek",
-        "hrv": "Hırvatça",
-        "ces": "Çekçe",
-        "dak": "Dakota (Kuzey Amerika yerlileri)",
-        "dan": "Danimarkaca; Danca",
-        "dar": "Dargwa (Dağıstan)",
-        "del": "Delaware (Kuzey Amerika yerlileri)",
-        "div": "Dhivehi",
-        "din": "Dinka (Sudan)",
-        "doi": "Dogri (makro dili)",
-        "dgr": "Dogrib (Kanada)",
-        "dua": "Duala (Afrika)",
-        "nld": "Flâmanca (Hollanda dili)",
-        "dyu": "Dyula (Burkina Faso; Mali)",
-        "dzo": "Dzongkha (Butan)",
-        "efi": "Efik (Afrika)",
-        "egy": "Mısırca (Eski)",
-        "eka": "Ekajuk (Afrika)",
-        "elx": "Elamca",
-        "eng": "İngilizce",
-        "myv": "Erzya dili",
-        "epo": "Esperanto",
-        "est": "Estonca",
-        "ewe": "Ewe (Afrika)",
-        "ewo": "Ewondo (Afrika)",
-        "fan": "Fang (Ekvatoryal Guinea)",
-        "fat": "Fanti (Afrika)",
-        "fao": "Faroece",
-        "fij": "Fiji dili",
-        "fil": "Filipince",
-        "fin": "Fince",
-        "fon": "Fon (Benin)",
-        "fra": "Fransızca",
-        "fur": "Friulian (İtalya)",
-        "ful": "Fulah (Afrika)",
-        "gaa": "Ganaca",
-        "glg": "Galce",
-        "lug": "Ganda Dili",
-        "gay": "Gayo (Sumatra)",
-        "gba": "Gbaya (Orta Afrika Cumhuriyeti)",
-        "gez": "Geez (Etiyopya)",
-        "kat": "Gürcüce",
-        "deu": "Almanca",
-        "gil": "Kiribati dili",
-        "gon": "Gondi (Hindistan)",
-        "gor": "Gorontalo (Endonezya)",
-        "got": "Gotik",
-        "grb": "Grebo (Liberya)",
-        "grn": "Guarani (Paraguay)",
-        "guj": "Gucaratça",
-        "gwi": "Gwichʼin",
-        "hai": "Haida (Kuzey Amerika yerlileri)",
-        "hau": "Hausa Dili",
-        "haw": "Havai Dili",
-        "heb": "İbranice",
-        "her": "Herero Dili",
-        "hil": "Hiligaynon",
-        "hin": "Hintçe",
-        "hmo": "Hiri Motu",
-        "hit": "Hititçe",
-        "hmn": "Hmong",
-        "hun": "Macarca",
-        "hup": "Hupa",
-        "iba": "Iban",
-        "isl": "İzlandaca",
-        "ido": "Ido Dili",
-        "ibo": "Igbo Dili",
-        "ilo": "Iloko",
-        "ind": "Endonezyaca",
-        "inh": "İnguşca",
-        "ina": "Interlingua (Uluslararası Yardımcı Dil Kurumu)",
-        "ile": "Interlingue",
-        "iku": "Inuktitut",
-        "ipk": "Inupiak Dili",
-        "gle": "İrlandaca",
-        "ita": "İtalyanca",
-        "jpn": "Japonca",
-        "jav": "Cava Dili",
-        "jrb": "Yahudi-Arapçası",
-        "jpr": "Yahudi-Farsça",
-        "kbd": "Kabardian",
-        "kab": "Kabyle",
+        "ile": "Interlingüe",
+        "ilo": "Ilocano",
+        "ina": "Interlingua",
+        "ind": "Indonesio",
+        "inh": "Ingusetio",
+        "ipk": "Iñupiaq",
+        "isl": "Islandés",
+        "ita": "Italiano",
+        "jav": "Javanés",
+        "jbo": "Lojban",
+        "jpn": "Japonés",
+        "jpr": "Judeo-persa",
+        "jrb": "Judeo-árabe",
+        "kaa": "Karakalpako",
+        "kab": "Cabilio",
         "kac": "Kachin",
         "kal": "Kalaallisut",
-        "xal": "Kalmyk",
-        "kam": "Kamba (Kenya)",
-        "kan": "Kannada",
-        "kau": "Kanuri Dili",
-        "kaa": "Kara-Kalpak",
-        "krc": "Karachay-Balkar",
-        "krl": "Karelian",
-        "kas": "Keşmirce",
-        "csb": "Kashubian (Lehçe diyalekti)",
+        "kam": "Kamba (Kenia)",
+        "kan": "Canarés",
+        "kas": "Cachemir",
+        "kat": "Georgiano",
+        "kau": "Kanuri",
         "kaw": "Kawi",
-        "kaz": "Kazakça",
+        "kaz": "Kazajo",
+        "kbd": "Cabardiano",
         "kha": "Khasi",
-        "kho": "Khotanese",
-        "kik": "Kikuyu Dili",
-        "kmb": "Kimbundu",
+        "khm": "Jemer central",
+        "kho": "Khotanés",
+        "kik": "Kikuyu",
         "kin": "Kinyarwanda",
-        "kir": "Kırgızca",
-        "tlh": "Klingon",
-        "kom": "Komi Dili",
-        "kon": "Kongo Dili",
-        "kok": "Konkani (makro dil)",
-        "kor": "Korece",
-        "kos": "Kosraean",
+        "kir": "Kirguís",
+        "kmb": "Kimbundu",
+        "kok": "Konkaní (macrolengua)",
+        "kom": "Komi",
+        "kon": "Kikongo",
+        "kor": "Coreano",
+        "kos": "Kosraeano",
         "kpe": "Kpelle",
-        "kua": "Kuanyama Dili",
-        "kum": "Kumyk",
-        "kur": "Kürtçe",
+        "krc": "Karachayo-bálkaro",
+        "krl": "Carelio",
         "kru": "Kurukh",
+        "kua": "Kuanyama",
+        "kum": "Cumuco",
+        "kur": "Curdo",
         "kut": "Kutenai",
         "lad": "Ladino",
         "lah": "Lahnda",
         "lam": "Lamba",
-        "lao": "Laos Dili",
-        "lat": "Latince",
-        "lav": "Letonca",
-        "lez": "Lezghian",
-        "lim": "Liburg Dili",
-        "lin": "Lingala Dili",
-        "lit": "Litvanyaca",
-        "jbo": "Lojban dili",
-        "loz": "Lozi",
-        "lub": "Luba Katanga Dili",
-        "lua": "Luba-Lulua",
-        "lui": "Luiseno",
-        "smj": "Lule Sami",
-        "lun": "Lunda",
-        "luo": "Luo (Kenya ve Tanzanya)",
-        "lus": "Lushai",
-        "ltz": "Lüksemburg Dili",
-        "mkd": "Makedonca",
-        "mad": "Madurese",
-        "mag": "Magahi",
-        "mai": "Maithili dili",
-        "mak": "Makasar",
-        "mlg": "Madagaskar Dili",
-        "msa": "Malay (makro dili)",
-        "mal": "Malayalam",
-        "mlt": "Maltaca",
-        "mnc": "Manchu",
-        "mdr": "Mandar",
-        "man": "Mandingo",
-        "mni": "Manipuri dili",
-        "glv": "Manx (Galler)",
-        "mri": "Maori Dili",
-        "arn": "Mapudungun",
-        "mar": "Marathi",
-        "chm": "Mari (Rusya)",
-        "mah": "Marshall Dili",
-        "mwr": "Marwari",
-        "mas": "Masai",
-        "men": "Mende (Sierra Leone)",
-        "mic": "Mi'kmak",
-        "min": "Minangkabau",
-        "mwl": "Mirandese",
-        "moh": "Mohawk",
-        "mdf": "Moşka",
+        "lao": "Laosiano",
+        "lat": "Latín",
+        "lav": "Letón",
+        "lez": "Lezguino",
+        "lim": "Limburgan",
+        "lin": "Lingala",
+        "lit": "Lituano",
         "lol": "Mongo",
-        "mon": "Moğol Dili",
+        "loz": "Lozi",
+        "ltz": "Luxemburgués",
+        "lua": "Chiluba",
+        "lub": "Kiluba",
+        "lug": "Luganda",
+        "lui": "Luiseño",
+        "lun": "Lunda",
+        "luo": "Luo (Kenia y Tanzania)",
+        "lus": "Mizo",
+        "mad": "Madurés",
+        "mag": "Magahi",
+        "mah": "Marshalés",
+        "mai": "Maithili",
+        "mak": "Macasar",
+        "mal": "Malayalam",
+        "man": "Mandingo",
+        "mar": "Maratí",
+        "mas": "Masai",
+        "mdf": "Moksha",
+        "mdr": "Mandar",
+        "men": "Mende (Sierra Leona)",
+        "mga": "Irlandés medio (900-1200)",
+        "mic": "Mi'kmaq",
+        "min": "Minangkabau",
+        "mis": "Idiomas sin codificar",
+        "mkd": "Macedonio",
+        "mlg": "Malgache",
+        "mlt": "Maltés",
+        "mnc": "Manchú",
+        "mni": "Meitei",
+        "moh": "Mohawk",
+        "mon": "Mongol",
         "mos": "Mossi",
-        "mul": "Çoklu diller",
-        "nqo": "N'Ko",
-        "nau": "Nauru",
-        "nav": "Navajo Dili",
-        "ndo": "Ndonga Dili",
-        "nap": "Neapolitan",
+        "mri": "Maorí",
+        "msa": "Malayo (macrolengua)",
+        "mul": "Idiomas múltiples",
+        "mus": "Creek",
+        "mwl": "Mirandés",
+        "mwr": "Marwari",
+        "mya": "Birmano",
+        "myv": "Erzya",
+        "nap": "Napolitano",
+        "nau": "Nauruano",
+        "nav": "Navajo",
+        "nbl": "Ndebele meridional",
+        "nde": "Ndebele septentrional",
+        "ndo": "Ndonga",
+        "nds": "Bajo alemán",
+        "nep": "Nepalí",
+        "new": "Bhasa; Nepalés",
         "nia": "Nias",
-        "niu": "Niuean",
-        "zxx": "Hiçbir dil içeriği yok",
-        "nog": "Nogai",
-        "nor": "Norveçce",
-        "nob": "Norveççe Bokmal",
-        "nno": "Norveççe Nynorsk",
-        "nym": "Nyamwezi",
+        "niu": "Niuano",
+        "nld": "Neerlandés",
+        "nno": "Noruego nynorsk",
+        "nob": "Noruego bokmål",
+        "nog": "Nogayo",
+        "non": "Noruego antiguo",
+        "nor": "Noruego",
+        "nqo": "N'ko",
+        "nso": "Sepedi",
+        "nwc": "Newarí antiguo",
         "nya": "Nyanja",
+        "nym": "Nyamwezi",
         "nyn": "Nyankole",
         "nyo": "Nyoro",
-        "nzi": "Nzima",
-        "oci": "Oksitanca (1500 sonrası)",
-        "oji": "Ojibwa Dili",
-        "orm": "Oromo Dili",
+        "nzi": "Nzema",
+        "oci": "Occitano (posterior a 1500)",
+        "oji": "Ojibwa",
+        "ori": "Oriya",
+        "orm": "Oromo",
         "osa": "Osage",
-        "oss": "Osetya Dili",
-        "pal": "Pehlevi",
-        "pau": "Palauan",
-        "pli": "Pali Dili",
-        "pam": "Pampanga",
-        "pag": "Pangasinan",
-        "pan": "Pencabi Dili",
+        "oss": "Osetio",
+        "ota": "Turco otomano (1500-1928)",
+        "pag": "Pangasinense",
+        "pal": "Pahlavi",
+        "pam": "Pampango",
+        "pan": "Panyabí",
         "pap": "Papiamento",
-        "fas": "Farsça",
-        "phn": "Fenikçe",
-        "pon": "Pohnpeian",
-        "pol": "Polonyaca",
-        "por": "Portekizce",
-        "pus": "Pushto",
+        "pau": "Palauano",
+        "peo": "Persa antiguo (ca. 600-400 A. C.)",
+        "phn": "Fenicio",
+        "pli": "Pali",
+        "pol": "Polaco",
+        "pon": "Pohnpeiano",
+        "por": "Portugués",
+        "pro": "Provenzal antiguo (hasta 1500)",
+        "pus": "Pastún",
         "que": "Quechua",
-        "raj": "Rajasthani",
+        "raj": "Rajastaní",
         "rap": "Rapanui",
-        "ron": "Rumence",
-        "roh": "Romanca",
-        "rom": "Çingene Dili",
+        "rar": "Maorí; Islas Cook",
+        "roh": "Romanche",
+        "rom": "Romaní",
+        "ron": "Rumano",
         "run": "Kirundi",
-        "rus": "Rusça",
-        "smo": "Samoa Dili",
-        "sad": "Sandawe",
-        "sag": "Sangho",
-        "san": "Sanskritçe",
-        "sat": "Santali dili",
-        "srd": "Sardinya",
+        "rup": "Rumano; Macedo-",
+        "rus": "Ruso",
+        "sad": "Sandavés",
+        "sag": "Sango",
+        "sah": "Yakuto",
+        "sam": "Arameo samaritano",
+        "san": "Sánscrito",
         "sas": "Sasak",
-        "sco": "İskoç lehçesi",
+        "sat": "Santalí",
+        "scn": "Siciliano",
+        "sco": "Escocés (germánico)",
         "sel": "Selkup",
-        "srp": "Sırpça",
-        "srr": "Serer",
+        "sga": "Irlandés antiguo (hasta 900)",
         "shn": "Shan",
-        "sna": "Shona",
-        "scn": "Sicilyalı",
         "sid": "Sidamo",
-        "bla": "Siksika (Kuzey Amerika yerlileri)",
+        "sin": "Cingalés",
+        "slk": "Eslovaco",
+        "slv": "Esloveno",
+        "sma": "Sami meridional",
+        "sme": "Sami septentrional",
+        "smj": "Sami de Lule",
+        "smn": "Sami de Inari",
+        "smo": "Samoano",
+        "sms": "Sami de Skolt",
+        "sna": "Shona",
         "snd": "Sindhi",
-        "sin": "Sinhala Dili",
-        "den": "Slave (Athapascan; Kuzey Amerika yerlileri)",
-        "slk": "Slovakça",
-        "slv": "Slovence",
-        "sog": "Sogdian",
-        "som": "Somali Dili",
-        "snk": "Soninke",
-        "spa": "İspanyolca",
-        "srn": "Sranan Tongo",
+        "snk": "Soninké",
+        "sog": "Sogdiano",
+        "som": "Somalí",
+        "sot": "Sesotho",
+        "spa": "Español",
+        "sqi": "Albanés",
+        "srd": "Sardo",
+        "srn": "Sranan tongo",
+        "srp": "Serbio",
+        "srr": "Serer",
+        "ssw": "Swazi",
         "suk": "Sukuma",
-        "sux": "Sümerce",
-        "sun": "Sudan Dili",
+        "sun": "Sundanés",
         "sus": "Susu",
-        "swa": "Swahili (makro dil)",
-        "ssw": "Siswati",
-        "swe": "İsveçce",
-        "syr": "Süryanice",
-        "tgl": "Tagalog",
-        "tah": "Tahitice",
-        "tgk": "Tacikçe",
-        "tmh": "Tamashek",
-        "tam": "Tamilce",
-        "tat": "Tatarca",
-        "tel": "Telugu",
+        "sux": "Sumerio",
+        "swa": "Suajili (macrolengua)",
+        "swe": "Sueco",
+        "syc": "Siríaco clásico",
+        "syr": "Siríaco",
+        "tah": "Tahitiano",
+        "tam": "Tamil",
+        "tat": "Tártaro",
+        "tel": "Telugú",
+        "tem": "Temné",
         "ter": "Tereno",
-        "tet": "Tetum",
-        "tha": "Taylandça",
-        "bod": "Tibetçe",
-        "tig": "Tigre",
-        "tir": "Tigrinya Dili",
-        "tem": "Timne",
+        "tet": "Tetun",
+        "tgk": "Tayiko",
+        "tgl": "Tagalo",
+        "tha": "Tailandés",
+        "tig": "Tigré",
+        "tir": "Tigriña",
         "tiv": "Tiv",
+        "tkl": "Tokelauano",
+        "tlh": "Klingon",
         "tli": "Tlingit",
-        "tpi": "Tok Pisin",
-        "tkl": "Tokelau",
-        "tog": "Tonga (Nyasa)",
-        "ton": "Tonga",
+        "tmh": "Targuí",
+        "tog": "Tonga (Malaui)",
+        "ton": "Tonga (Islas Tonga)",
+        "tpi": "Tok pisin",
         "tsi": "Tsimshian",
+        "tsn": "Setsuana",
         "tso": "Tsonga",
-        "tsn": "Setswana",
+        "tuk": "Turcomano",
         "tum": "Tumbuka",
-        "tur": "Türkçe",
-        "tuk": "Türkmence",
-        "tvl": "Tuvalu",
-        "tyv": "Tuvinian",
+        "tur": "Turco",
+        "tvl": "Tuvaluano",
         "twi": "Twi",
+        "tyv": "Tuvano",
         "udm": "Udmurt",
-        "uga": "Ugarit Çivi Yazısı",
-        "uig": "Uygurca",
-        "ukr": "Ukraynaca",
+        "uga": "Ugarítico",
+        "uig": "Uiguro",
+        "ukr": "Ucraniano",
         "umb": "Umbundu",
-        "mis": "Şifresiz diller",
-        "und": "Belirlenemeyen",
-        "urd": "Urduca",
-        "uzb": "Özbekçe",
+        "und": "Indeterminado",
+        "urd": "Urdu",
+        "uzb": "Uzbeko",
         "vai": "Vai",
-        "ven": "Venda Dili",
-        "vie": "Vietnamca",
+        "ven": "Venda",
+        "vie": "Vietnamita",
         "vol": "Volapük",
-        "vot": "Votic",
-        "wln": "Valonca",
-        "war": "Waray (Filipinler)",
-        "was": "Vasho",
-        "cym": "Gal Dili",
+        "vot": "Vótico",
         "wal": "Wolaytta",
-        "wol": "Wolof",
+        "war": "Waray (Filipinas)",
+        "was": "Washo",
+        "wln": "Valón",
+        "wol": "Wólof",
+        "xal": "Calmuco",
         "xho": "Xhosa",
-        "sah": "Yakut",
         "yao": "Yao",
-        "yap": "Yapese",
-        "yid": "Yidiş",
+        "yap": "Yapés",
+        "yid": "Yidis",
         "yor": "Yoruba",
-        "zap": "Zapotec",
-        "zza": "Zaza",
+        "zap": "Zapoteco",
+        "zbl": "Símbolos de Bliss",
         "zen": "Zenaga",
-        "zha": "Zuang Dili",
-        "zul": "Zulu",
-        "zun": "Zuni"
+        "zha": "Chuang",
+        "zho": "Chino",
+        "zul": "Zulú",
+        "zun": "Zuñi",
+        "zxx": "Sin contenido lingüístico",
+        "zza": "Zaza"
+    },
+    "fi": {
+        "aar": "afar",
+        "abk": "abhaasi",
+        "ace": "aceh",
+        "ach": "atšoli",
+        "ada": "adangme",
+        "ady": "adyge",
+        "afh": "afrihili",
+        "afr": "afrikaans",
+        "ain": "Ainu (Japan)",
+        "aka": "Akan",
+        "akk": "akkadi",
+        "ale": "aleutti",
+        "alt": "Altai; Southern",
+        "amh": "amhara",
+        "ang": "English; Old (ca. 450-1100)",
+        "anp": "angika",
+        "ara": "arabia",
+        "arc": "Aramaic; Official (700-300 BCE)",
+        "arg": "aragonia",
+        "arn": "Mapudungun",
+        "arp": "arapaho",
+        "arw": "arawak",
+        "asm": "asami",
+        "ast": "asturia",
+        "ava": "avaari",
+        "ave": "avestan",
+        "awa": "awadhi",
+        "aym": "Aymara",
+        "aze": "azeri",
+        "bak": "baškiiri",
+        "bal": "belutši",
+        "bam": "Bambara",
+        "ban": "bali",
+        "bas": "Basa (Cameroon)",
+        "bej": "beja",
+        "bel": "valkovenäjä",
+        "bem": "Bemba (Zambia)",
+        "ben": "bengali",
+        "bho": "bhojpuri",
+        "bik": "bikol",
+        "bin": "bini",
+        "bis": "bislama",
+        "bla": "mustajalka (siksika)",
+        "bod": "tiibetti",
+        "bos": "bosnia",
+        "bra": "bradž",
+        "bre": "bretoni",
+        "bua": "burjaatti",
+        "bug": "bugi",
+        "bul": "bulgaria",
+        "byn": "Bilin",
+        "cad": "caddo",
+        "car": "Carib; Galibi",
+        "cat": "katalaani",
+        "ceb": "cebuano",
+        "ces": "tšekki",
+        "cha": "chamorro",
+        "chb": "chibcha",
+        "che": "tšetšeeni",
+        "chg": "Chagatai",
+        "chk": "chuuk",
+        "chm": "mari (Venäjä)",
+        "chn": "chinook-jargon",
+        "cho": "choctaw",
+        "chp": "chipewyan",
+        "chr": "cherokee",
+        "chu": "Slavonic; Old",
+        "chv": "tšuvassi",
+        "chy": "cheyenne",
+        "cop": "kopti",
+        "cor": "korni",
+        "cos": "korsika",
+        "cre": "cree",
+        "crh": "krimintataari",
+        "csb": "kašubi",
+        "cym": "kymri",
+        "dak": "dakota",
+        "dan": "tanska",
+        "dar": "dargva",
+        "del": "delaware",
+        "den": "athapaski-slavi",
+        "deu": "saksa",
+        "dgr": "dogrib",
+        "din": "Dinka",
+        "div": "Dhivehi",
+        "doi": "Dogri (macrolanguage)",
+        "dsb": "alasorbi",
+        "dua": "duala",
+        "dum": "Dutch; Middle (ca. 1050-1350)",
+        "dyu": "dyula",
+        "dzo": "dzongkha",
+        "efi": "efik",
+        "egy": "muinaisegypti",
+        "eka": "ekajuk",
+        "ell": "nykykreikka",
+        "elx": "elami",
+        "eng": "englanti",
+        "enm": "keskienglanti",
+        "epo": "esperanto",
+        "est": "viro",
+        "eus": "baski",
+        "ewe": "ewe",
+        "ewo": "ewondo",
+        "fan": "Fang (Equatorial Guinea)",
+        "fao": "fääri",
+        "fas": "persia",
+        "fat": "fanti",
+        "fij": "fidži",
+        "fil": "filipino",
+        "fin": "suomi",
+        "fon": "fon",
+        "fra": "ranska",
+        "frm": "French; Middle (ca. 1400-1600)",
+        "fro": "French; Old (842-ca. 1400)",
+        "frr": "Frisian; Northern",
+        "frs": "Frisian; Eastern",
+        "fry": "Frisian; Western",
+        "ful": "fulani",
+        "fur": "friuli",
+        "gaa": "gã",
+        "gay": "gayo",
+        "gba": "Gbaya (Central African Republic)",
+        "gez": "ge'ez",
+        "gil": "kiribati",
+        "gla": "Gaelic; Scottish",
+        "gle": "iiri",
+        "glg": "galicia",
+        "glv": "manksi",
+        "gmh": "German; Middle High (ca. 1050-1500)",
+        "goh": "German; Old High (ca. 750-1050)",
+        "gon": "gondi",
+        "gor": "gorontalo",
+        "got": "gootti",
+        "grb": "grebo",
+        "grc": "muinaiskreikka",
+        "grn": "guarani",
+        "gsw": "German; Swiss",
+        "guj": "gujarati",
+        "gwi": "Gwichʼin",
+        "hai": "haida",
+        "hat": "Creole; Haitian",
+        "hau": "hausa",
+        "haw": "havaiji",
+        "heb": "heprea",
+        "her": "herero",
+        "hil": "hiligaynon",
+        "hin": "hindi",
+        "hit": "heetti",
+        "hmn": "hmong",
+        "hmo": "hiri-motu",
+        "hrv": "kroatia",
+        "hsb": "Sorbian; Upper",
+        "hun": "unkari",
+        "hup": "hupa",
+        "hye": "armenia",
+        "iba": "Iban",
+        "ibo": "igbo",
+        "ido": "ido",
+        "iii": "Yi; Sichuan",
+        "iku": "inuktitut",
+        "ile": "interlingue",
+        "ilo": "iloko",
+        "ina": "interlingua",
+        "ind": "indonesia",
+        "inh": "inguuši",
+        "ipk": "iñupiaq",
+        "isl": "islanti",
+        "ita": "italia",
+        "jav": "jaava",
+        "jbo": "lojban",
+        "jpn": "japani",
+        "jpr": "juutalaispersia",
+        "jrb": "juutalaisarabia",
+        "kaa": "karakalpakki",
+        "kab": "kabyyli",
+        "kac": "kachin",
+        "kal": "grönlanti",
+        "kam": "Kamba (Kenya)",
+        "kan": "kannada",
+        "kas": "kashmiri",
+        "kat": "georgia",
+        "kau": "kanuri",
+        "kaw": "kavi",
+        "kaz": "kazakki",
+        "kbd": "kabardi",
+        "kha": "Khasi",
+        "khm": "Khmer; Central",
+        "kho": "khotani",
+        "kik": "kikuyu",
+        "kin": "ruanda",
+        "kir": "kirgiisi",
+        "kmb": "kimbundu",
+        "kok": "Konkani (macrolanguage)",
+        "kom": "komi",
+        "kon": "Kongo",
+        "kor": "korea",
+        "kos": "kosrae",
+        "kpe": "kpelle",
+        "krc": "karatšai-balkaari",
+        "krl": "karjala",
+        "kru": "kurukh",
+        "kua": "kuanjama",
+        "kum": "kumykki",
+        "kur": "kurdi",
+        "kut": "kutenai",
+        "lad": "ladino",
+        "lah": "lahnda",
+        "lam": "lamba",
+        "lao": "lao",
+        "lat": "latina",
+        "lav": "latvia",
+        "lez": "lezgi",
+        "lim": "Limburgan",
+        "lin": "lingala",
+        "lit": "liettua",
+        "lol": "mongo",
+        "loz": "lozi",
+        "ltz": "Luxemburg",
+        "lua": "luba (Lulua)",
+        "lub": "luba (Katanga)",
+        "lug": "Ganda",
+        "lui": "luiseño",
+        "lun": "lunda",
+        "luo": "luo",
+        "lus": "lushai",
+        "mad": "madura",
+        "mag": "magahi",
+        "mah": "Marshallese",
+        "mai": "maithili",
+        "mak": "Makasar",
+        "mal": "malayalam",
+        "man": "mandingo",
+        "mar": "marathi",
+        "mas": "masai",
+        "mdf": "mokša",
+        "mdr": "mandar",
+        "men": "Mende (Sierra Leone)",
+        "mga": "keski-iiri",
+        "mic": "Mi'kmaq",
+        "min": "minangkabau",
+        "mis": "Uncoded languages",
+        "mkd": "makedonia",
+        "mlg": "malagassi",
+        "mlt": "malta",
+        "mnc": "mantšu",
+        "mni": "manipuri",
+        "moh": "mohawk",
+        "mon": "Mongolian",
+        "mos": "mossi",
+        "mri": "maori",
+        "msa": "Malay (macrolanguage)",
+        "mul": "monia kieliä",
+        "mus": "muskogi",
+        "mwl": "mirandês",
+        "mwr": "marwari",
+        "mya": "burma",
+        "myv": "ersä",
+        "nap": "napoli",
+        "nau": "nauru",
+        "nav": "Navajo",
+        "nbl": "ndebele; eteländebele",
+        "nde": "ndebele; pohjoisndebele",
+        "ndo": "ndonga",
+        "nds": "German; Low",
+        "nep": "nepali",
+        "new": "Bhasa; Nepal",
+        "nia": "nias",
+        "niu": "niue",
+        "nld": "hollanti",
+        "nno": "norja (uusnorja)",
+        "nob": "Norwegian Bokmål",
+        "nog": "nogai",
+        "non": "muinaisnorja",
+        "nor": "norja",
+        "nqo": "N'Ko",
+        "nso": "Sotho; Northern",
+        "nwc": "Newari; Old",
+        "nya": "Nyanja",
+        "nym": "nyamwezi",
+        "nyn": "nyankole",
+        "nyo": "Nyoro",
+        "nzi": "nzima",
+        "oci": "Occitan (post 1500)",
+        "oji": "Ojibwa",
+        "ori": "oriya",
+        "orm": "oromo",
+        "osa": "osage",
+        "oss": "Ossetian",
+        "ota": "osmaninturkki",
+        "pag": "pangasinan",
+        "pal": "pahlavi",
+        "pam": "pampanga",
+        "pan": "Panjabi",
+        "pap": "papiamentu",
+        "pau": "palau",
+        "peo": "Persian; Old (ca. 600-400 B.C.)",
+        "phn": "foinikia",
+        "pli": "Pali",
+        "pol": "puola",
+        "pon": "pohnpei",
+        "por": "portugali",
+        "pro": "muinaisprovensaali",
+        "pus": "pašto",
+        "que": "Quechua",
+        "raj": "rajasthani",
+        "rap": "rapanui",
+        "rar": "Maori; Cook Islands",
+        "roh": "Romansh",
+        "rom": "romani",
+        "ron": "romania",
+        "run": "rundi",
+        "rup": "Romanian; Macedo-",
+        "rus": "venäjä",
+        "sad": "sandawe",
+        "sag": "Sango",
+        "sah": "jakuutti",
+        "sam": "Aramaic; Samaritan",
+        "san": "sanskrit",
+        "sas": "Sasak",
+        "sat": "santali",
+        "scn": "sisilia",
+        "sco": "skotti",
+        "sel": "selkuppi",
+        "sga": "muinaisiiri",
+        "shn": "shan",
+        "sid": "sidamo",
+        "sin": "Sinhala",
+        "slk": "slovakki",
+        "slv": "sloveeni",
+        "sma": "eteläsaame",
+        "sme": "pohjoissaame",
+        "smj": "luulajansaame",
+        "smn": "inarinsaame",
+        "smo": "samoa",
+        "sms": "koltansaami",
+        "sna": "shona",
+        "snd": "sindhi",
+        "snk": "soninke",
+        "sog": "sogdi",
+        "som": "somali",
+        "sot": "eteläsotho",
+        "spa": "espanja",
+        "sqi": "albania",
+        "srd": "sardi",
+        "srn": "Sranan Tongo",
+        "srp": "serbia",
+        "srr": "Serer",
+        "ssw": "swazi",
+        "suk": "sukuma",
+        "sun": "sunda",
+        "sus": "susu",
+        "sux": "sumeri",
+        "swa": "Swahili (macrolanguage)",
+        "swe": "ruotsi",
+        "syc": "Syriac; Classical",
+        "syr": "syyria",
+        "tah": "tahiti",
+        "tam": "tamili",
+        "tat": "tataari",
+        "tel": "Telugu",
+        "tem": "temne",
+        "ter": "tereno",
+        "tet": "tetum",
+        "tgk": "tadžikki",
+        "tgl": "tagalog",
+        "tha": "thai",
+        "tig": "tigre",
+        "tir": "tigrinya",
+        "tiv": "tiv",
+        "tkl": "tokelau",
+        "tlh": "Klingon",
+        "tli": "tlinglit",
+        "tmh": "Tamashek",
+        "tog": "Malawin tonga",
+        "ton": "Tongan tonga",
+        "tpi": "tok-pisin",
+        "tsi": "tsimshian",
+        "tsn": "tswana",
+        "tso": "tsonga",
+        "tuk": "turkmeeni",
+        "tum": "tumbuka",
+        "tur": "turkki",
+        "tvl": "tuvalu",
+        "twi": "twi",
+        "tyv": "tuva",
+        "udm": "udmurtti",
+        "uga": "ugarit",
+        "uig": "uiguuri",
+        "ukr": "ukraina",
+        "umb": "umbundu",
+        "und": "määrittämätön",
+        "urd": "urdu",
+        "uzb": "uzbekki",
+        "vai": "vai",
+        "ven": "venda",
+        "vie": "vietnam",
+        "vol": "volapük",
+        "vot": "vatja",
+        "wal": "Wolaytta",
+        "war": "Waray (Philippines)",
+        "was": "washo",
+        "wln": "valloni",
+        "wol": "wolof",
+        "xal": "Kalmyk",
+        "xho": "xhosa",
+        "yao": "mien",
+        "yap": "yap",
+        "yid": "jiddiš",
+        "yor": "yoruba",
+        "zap": "Zapotec",
+        "zbl": "Blissymbols",
+        "zen": "zenaga",
+        "zha": "Zhuang",
+        "zho": "kiina",
+        "zul": "zulu",
+        "zun": "zuni",
+        "zxx": "No linguistic content",
+        "zza": "Zaza"
     },
     "fr": {
         "aar": "afar",
@@ -2440,1266 +2907,6 @@ LANGUAGE_NAMES = {
         "zxx": "No linguistic content",
         "zza": "Zaza"
     },
-    "ru": {
-        "aar": "Афар",
-        "abk": "Абхазский",
-        "ace": "Ачехский",
-        "ach": "Ачоли",
-        "ada": "Адангме",
-        "ady": "Адыгейский",
-        "afh": "Африхили",
-        "afr": "Африкаанс",
-        "ain": "Ainu (Japan)",
-        "aka": "Акан",
-        "akk": "Аккадский",
-        "ale": "Алеутский",
-        "alt": "Altai; Southern",
-        "amh": "Амхарский (Амаринья)",
-        "ang": "English; Old (ca. 450-1100)",
-        "anp": "Анжика",
-        "ara": "Арабский",
-        "arc": "Арамейский; Официальный",
-        "arg": "Арагонский",
-        "arn": "Mapudungun",
-        "arp": "Арапахо",
-        "arw": "Аравакский",
-        "asm": "Ассамский",
-        "ast": "Астурийский",
-        "ava": "Аварский",
-        "ave": "Авестийский",
-        "awa": "Авадхи",
-        "aym": "Аймара",
-        "aze": "Азербайджанский",
-        "bak": "Башкирский",
-        "bal": "Baluchi",
-        "bam": "Бамбара",
-        "ban": "Балийский",
-        "bas": "Баса (Камерун)",
-        "bej": "Беджа",
-        "bel": "Белорусский",
-        "bem": "Бемба (Замбия)",
-        "ben": "Бенгальский",
-        "bho": "Бходжпури",
-        "bik": "Бикольский",
-        "bin": "Бини",
-        "bis": "Бислама",
-        "bla": "Сиксика",
-        "bod": "Тибетский",
-        "bos": "Боснийский",
-        "bra": "Браун",
-        "bre": "Бретонский",
-        "bua": "Бурятский",
-        "bug": "Бугийский",
-        "bul": "Болгарский",
-        "byn": "Bilin",
-        "cad": "Каддо",
-        "car": "Carib; Galibi",
-        "cat": "Каталанский",
-        "ceb": "Себуано",
-        "ces": "Чешский",
-        "cha": "Чаморро",
-        "chb": "Чибча",
-        "che": "Чеченский",
-        "chg": "Чагатайский",
-        "chk": "Трукский",
-        "chm": "Марийский (Россия)",
-        "chn": "Чинук жаргон",
-        "cho": "Чоктав",
-        "chp": "Чипевианский",
-        "chr": "Чероки",
-        "chu": "Slavonic; Old",
-        "chv": "Чувашский",
-        "chy": "Чейенн",
-        "cop": "Коптский",
-        "cor": "Корнский",
-        "cos": "Корсиканский",
-        "cre": "Кри",
-        "crh": "Turkish; Crimean",
-        "csb": "Кашубианский",
-        "cym": "Уэльский (Валлийский)",
-        "dak": "Дакота",
-        "dan": "Датский",
-        "dar": "Даргва",
-        "del": "Делаварский",
-        "den": "Атапачские языки",
-        "deu": "Немецкий",
-        "dgr": "Догриб",
-        "din": "Динка",
-        "div": "Dhivehi",
-        "doi": "Dogri (macrolanguage)",
-        "dsb": "Sorbian; Lower",
-        "dua": "Дуала",
-        "dum": "Dutch; Middle (ca. 1050-1350)",
-        "dyu": "Диула (Дьюла)",
-        "dzo": "Дзонг-кэ",
-        "efi": "Эфик",
-        "egy": "Древнеегипетский",
-        "eka": "Экаджук",
-        "ell": "Новогреческий (с 1453)",
-        "elx": "Эламский",
-        "eng": "Английский",
-        "enm": "Среднеанглийский (1100-1500)",
-        "epo": "Эсперанто",
-        "est": "Эстонский",
-        "eus": "Баскский",
-        "ewe": "Эве",
-        "ewo": "Эвондо",
-        "fan": "Fang (Equatorial Guinea)",
-        "fao": "Фарерский",
-        "fas": "Персидский",
-        "fat": "Фанти",
-        "fij": "Фиджийский",
-        "fil": "Filipino",
-        "fin": "Финский",
-        "fon": "Фон",
-        "fra": "Французский",
-        "frm": "French; Middle (ca. 1400-1600)",
-        "fro": "French; Old (842-ca. 1400)",
-        "frr": "Frisian; Northern",
-        "frs": "Frisian; Eastern",
-        "fry": "Frisian; Western",
-        "ful": "Фулах",
-        "fur": "Фриулианский",
-        "gaa": "Га",
-        "gay": "Гайо",
-        "gba": "Gbaya (Central African Republic)",
-        "gez": "Геэз",
-        "gil": "Гильбертский",
-        "gla": "Gaelic; Scottish",
-        "gle": "Ирландский",
-        "glg": "Galician",
-        "glv": "Мэнкский",
-        "gmh": "German; Middle High (ca. 1050-1500)",
-        "goh": "German; Old High (ca. 750-1050)",
-        "gon": "Гонди",
-        "gor": "Горонтало",
-        "got": "Готский",
-        "grb": "Гребо",
-        "grc": "Древнегреческий (по 1453)",
-        "grn": "Гуарани",
-        "gsw": "German; Swiss",
-        "guj": "Гуджарати",
-        "gwi": "Gwichʼin",
-        "hai": "Хайда",
-        "hat": "Creole; Haitian",
-        "hau": "Хауса",
-        "haw": "Гавайский",
-        "heb": "Иврит",
-        "her": "Гереро",
-        "hil": "Хилигайнон",
-        "hin": "Хинди",
-        "hit": "Хиттит",
-        "hmn": "Хмонг",
-        "hmo": "Хири Моту",
-        "hrv": "Хорватский",
-        "hsb": "Sorbian; Upper",
-        "hun": "Венгерский",
-        "hup": "Хупа",
-        "hye": "Армянский",
-        "iba": "Ибанский",
-        "ibo": "Игбо",
-        "ido": "Идо",
-        "iii": "Yi; Sichuan",
-        "iku": "Инуктитут",
-        "ile": "Интерлингве",
-        "ilo": "Илоко",
-        "ina": "Интерлингва (Ассоциация международного вспомогательного языка)",
-        "ind": "Индонезийский",
-        "inh": "Ингушский",
-        "ipk": "Инулиак",
-        "isl": "Исландский",
-        "ita": "Итальянский",
-        "jav": "Яванский",
-        "jbo": "Лоджбан",
-        "jpn": "Японский",
-        "jpr": "Еврейско-персидский",
-        "jrb": "Еврейско-арабский",
-        "kaa": "Каракалпакский",
-        "kab": "Кабильский",
-        "kac": "Качинский",
-        "kal": "Kalaallisut",
-        "kam": "Kamba (Kenya)",
-        "kan": "Каннада",
-        "kas": "Кашмири",
-        "kat": "Грузинский",
-        "kau": "Канури",
-        "kaw": "Кави",
-        "kaz": "Казахский",
-        "kbd": "Кабардинский",
-        "kha": "Кхаси",
-        "khm": "Khmer; Central",
-        "kho": "Хотанский",
-        "kik": "Кикуйю",
-        "kin": "Киньяруанда",
-        "kir": "Киргизский",
-        "kmb": "Кимбунду",
-        "kok": "Konkani (macrolanguage)",
-        "kom": "Коми",
-        "kon": "Конго",
-        "kor": "Корейский",
-        "kos": "Косраинский",
-        "kpe": "Кпелле",
-        "krc": "Карачаево-балкарский",
-        "krl": "Карельский",
-        "kru": "Курух",
-        "kua": "Киньяма",
-        "kum": "Кумыкский",
-        "kur": "Курдский",
-        "kut": "Кутенаи",
-        "lad": "Ладино",
-        "lah": "Лахнда",
-        "lam": "Ламба",
-        "lao": "Лаосский",
-        "lat": "Латинский",
-        "lav": "Латвийский",
-        "lez": "Лезгинский",
-        "lim": "Limburgan",
-        "lin": "Лингала",
-        "lit": "Литовский",
-        "lol": "Монго",
-        "loz": "Лози",
-        "ltz": "Luxembourgish",
-        "lua": "Луба-Лулуа",
-        "lub": "Луба-Катанга",
-        "lug": "Ганда",
-        "lui": "Луисеньо",
-        "lun": "Лунда",
-        "luo": "Луо (Кения и Танзания)",
-        "lus": "Лушай",
-        "mad": "Мадурский",
-        "mag": "Магахи",
-        "mah": "Marshallese",
-        "mai": "Майтхили",
-        "mak": "Макассарский",
-        "mal": "Малаялам",
-        "man": "Мандинго",
-        "mar": "Маратхи",
-        "mas": "Масаи",
-        "mdf": "Мокшанский",
-        "mdr": "Мандарский",
-        "men": "Mende (Sierra Leone)",
-        "mga": "Среднеирландский (900-1200)",
-        "mic": "Mi'kmaq",
-        "min": "Минангкабау",
-        "mis": "Uncoded languages",
-        "mkd": "Македонский",
-        "mlg": "Малагаси",
-        "mlt": "Мальтийский",
-        "mnc": "Манчу",
-        "mni": "Манипури",
-        "moh": "Мохаук",
-        "mon": "Монгольский",
-        "mos": "Моей",
-        "mri": "Маори",
-        "msa": "Malay (macrolanguage)",
-        "mul": "Разных семей языки",
-        "mus": "Крик",
-        "mwl": "Мирандские",
-        "mwr": "Марвари",
-        "mya": "Бирманский",
-        "myv": "Эрзянский",
-        "nap": "Неаполитанский",
-        "nau": "Науру",
-        "nav": "Navajo",
-        "nbl": "Ндебеле южный",
-        "nde": "Ндебеле северный",
-        "ndo": "Ндунга",
-        "nds": "German; Low",
-        "nep": "Непальский",
-        "new": "Bhasa; Nepal",
-        "nia": "Ниас",
-        "niu": "Ниуэ",
-        "nld": "Нидерландский",
-        "nno": "Норвежский Нюнорск",
-        "nob": "Norwegian Bokmål",
-        "nog": "Ногайский",
-        "non": "Старонорвежский",
-        "nor": "Норвежский",
-        "nqo": "Н'ко",
-        "nso": "Sotho; Northern",
-        "nwc": "Newari; Old",
-        "nya": "Nyanja",
-        "nym": "Ньямвези",
-        "nyn": "Ньянколе",
-        "nyo": "Ньоро",
-        "nzi": "Нзима",
-        "oci": "Occitan (post 1500)",
-        "oji": "Оджибва",
-        "ori": "Ория",
-        "orm": "Оромо",
-        "osa": "Оседжи",
-        "oss": "Ossetian",
-        "ota": "Турецкий; Отомангский (1500-1928)",
-        "pag": "Пангасинан",
-        "pal": "Пехлевийский",
-        "pam": "Пампанга",
-        "pan": "Panjabi",
-        "pap": "Папьяменто",
-        "pau": "Палау",
-        "peo": "Persian; Old (ca. 600-400 B.C.)",
-        "phn": "Финикийский",
-        "pli": "Пали",
-        "pol": "Польский",
-        "pon": "Фонпейский",
-        "por": "Португальский",
-        "pro": "Старопровансальский (по 1500)",
-        "pus": "Пушту",
-        "que": "Кечуа",
-        "raj": "Раджастхани",
-        "rap": "Рапаню",
-        "rar": "Maori; Cook Islands",
-        "roh": "Romansh",
-        "rom": "Цыганский",
-        "ron": "Румынский",
-        "run": "Рунди",
-        "rup": "Romanian; Macedo-",
-        "rus": "Русский",
-        "sad": "Сандаве",
-        "sag": "Санго",
-        "sah": "Якутский",
-        "sam": "Aramaic; Samaritan",
-        "san": "Санскрит",
-        "sas": "Сасакский",
-        "sat": "Сантали",
-        "scn": "Сицилийский",
-        "sco": "Шотландский",
-        "sel": "Селкапский",
-        "sga": "Староирландский (по 900)",
-        "shn": "Шанский",
-        "sid": "Сидама",
-        "sin": "Сингальский",
-        "slk": "Словацкий",
-        "slv": "Словенский",
-        "sma": "Sami; Southern",
-        "sme": "Sami; Northern",
-        "smj": "Люле-саамский",
-        "smn": "Sami; Inari",
-        "smo": "Самоанский",
-        "sms": "Sami; Skolt",
-        "sna": "Шона",
-        "snd": "Синдхи",
-        "snk": "Сонинк",
-        "sog": "Согдийский",
-        "som": "Сомали",
-        "sot": "Сото Южный",
-        "spa": "Испанский",
-        "sqi": "Албанский",
-        "srd": "Сардинский",
-        "srn": "Sranan Tongo",
-        "srp": "Сербский",
-        "srr": "Серер",
-        "ssw": "Свати",
-        "suk": "Сукума",
-        "sun": "Сунданский",
-        "sus": "Сусу",
-        "sux": "Шумерский",
-        "swa": "Swahili (macrolanguage)",
-        "swe": "Шведский",
-        "syc": "Syriac; Classical",
-        "syr": "Сирийский",
-        "tah": "Таитянский",
-        "tam": "Тамильский",
-        "tat": "Татарский",
-        "tel": "Телугу",
-        "tem": "Темне",
-        "ter": "Терено",
-        "tet": "Тетумский",
-        "tgk": "Таджикский",
-        "tgl": "Тагалог",
-        "tha": "Таи",
-        "tig": "Тигре",
-        "tir": "Тигринья",
-        "tiv": "Тив",
-        "tkl": "Токелау",
-        "tlh": "Klingon",
-        "tli": "Тлингит",
-        "tmh": "Тамашек",
-        "tog": "Тонга (Ньяса)",
-        "ton": "Тонга (острова Тонга)",
-        "tpi": "Ток Писин",
-        "tsi": "Цимшиан",
-        "tsn": "Тсвана",
-        "tso": "Тсонга",
-        "tuk": "Туркменский",
-        "tum": "Тумбука",
-        "tur": "Турецкий",
-        "tvl": "Тувалу",
-        "twi": "Тви",
-        "tyv": "Тувинский",
-        "udm": "Удмуртский",
-        "uga": "Угаритский",
-        "uig": "Уйгурский",
-        "ukr": "Украинский",
-        "umb": "Умбунду",
-        "und": "Неидентифицированный",
-        "urd": "Урду",
-        "uzb": "Узбекский",
-        "vai": "Ваи",
-        "ven": "Венда",
-        "vie": "Вьетнамский",
-        "vol": "Волапюк",
-        "vot": "Вотик",
-        "wal": "Wolaytta",
-        "war": "Waray (Philippines)",
-        "was": "Вашо",
-        "wln": "Валлун",
-        "wol": "Волоф",
-        "xal": "Kalmyk",
-        "xho": "Коса",
-        "yao": "Яо",
-        "yap": "Яапийский",
-        "yid": "Идиш",
-        "yor": "Йоруба",
-        "zap": "Сапотекский",
-        "zbl": "Blissymbols",
-        "zen": "Зенагский",
-        "zha": "Чжуанский",
-        "zho": "Китайский",
-        "zul": "Зулусский",
-        "zun": "Зуньи",
-        "zxx": "Нет языкового содержимого",
-        "zza": "Зазаки"
-    },
-    "zh_Hans_CN": {
-        "aar": "阿法尔语",
-        "abk": "阿布哈兹语",
-        "ace": "亚齐语",
-        "ach": "阿乔利语",
-        "ada": "阿当梅语",
-        "ady": "阿迪格语",
-        "afh": "阿弗里希利语",
-        "afr": "南非荷兰语",
-        "ain": "阿伊努语（日本）",
-        "aka": "阿坎语",
-        "akk": "阿卡德语",
-        "ale": "阿留申语",
-        "alt": "阿尔泰语（南）",
-        "amh": "阿姆哈拉语",
-        "ang": "英语（上古，约 450-1100）",
-        "anp": "安吉卡语",
-        "ara": "阿拉伯语",
-        "arc": "阿拉米语（官方，公元前 700-300）",
-        "arg": "阿拉贡语",
-        "arn": "阿劳坎语",
-        "arp": "阿拉帕霍语",
-        "arw": "阿拉瓦克语",
-        "asm": "阿萨姆语",
-        "ast": "阿斯图里亚斯语",
-        "ava": "阿瓦尔语",
-        "ave": "阿维斯陀语",
-        "awa": "阿瓦德语",
-        "aym": "艾马拉语",
-        "aze": "阿塞拜疆语",
-        "bak": "巴什基尔语",
-        "bal": "俾路支语",
-        "bam": "班巴拉语",
-        "ban": "巴厘语",
-        "bas": "巴萨语（喀麦隆）",
-        "bej": "贝扎语",
-        "bel": "白俄罗斯语",
-        "bem": "本巴语（赞比亚）",
-        "ben": "孟加拉语",
-        "bho": "博杰普尔语",
-        "bik": "比科尔语",
-        "bin": "比尼语",
-        "bis": "比斯拉马语",
-        "bla": "西克西卡语",
-        "bod": "藏语",
-        "bos": "波斯尼亚语",
-        "bra": "布拉吉语",
-        "bre": "布列塔尼语",
-        "bua": "布里亚特语",
-        "bug": "布吉语",
-        "bul": "保加利亚语",
-        "byn": "比林语",
-        "cad": "卡多语",
-        "car": "加勒比语",
-        "cat": "加泰罗尼亚语",
-        "ceb": "宿务语",
-        "ces": "捷克语",
-        "cha": "查莫罗语",
-        "chb": "奇布查语",
-        "che": "车臣语",
-        "chg": "察合台语",
-        "chk": "丘克语",
-        "chm": "马里语（俄罗斯）",
-        "chn": "奇努克混合语",
-        "cho": "乔克托语",
-        "chp": "奇佩维安语",
-        "chr": "切罗基语",
-        "chu": "斯拉夫语（古教会）",
-        "chv": "楚瓦什语",
-        "chy": "夏延语",
-        "cop": "科普特语",
-        "cor": "康沃尔语",
-        "cos": "科西嘉语",
-        "cre": "克里语",
-        "crh": "鞑靼语（克里米亚）",
-        "csb": "卡舒比语",
-        "cym": "威尔士语",
-        "dak": "达科他语",
-        "dan": "丹麦语",
-        "dar": "达尔格瓦语",
-        "del": "特拉华语",
-        "den": "史拉维语（阿沙巴斯甘）",
-        "deu": "德语",
-        "dgr": "多格里布语",
-        "din": "丁卡语",
-        "div": "迪维希语",
-        "doi": "多格拉语",
-        "dsb": "索布语（下）",
-        "dua": "杜亚拉语",
-        "dum": "荷兰语（中古，约 1050-1350）",
-        "dyu": "迪尤拉语",
-        "dzo": "宗喀语",
-        "efi": "埃菲克语",
-        "egy": "埃及语（古）",
-        "eka": "埃克丘克语",
-        "ell": "希腊语（现代，1453-）",
-        "elx": "埃兰语",
-        "eng": "英语",
-        "enm": "英语（中古，1100-1500）",
-        "epo": "世界语",
-        "est": "爱沙尼亚语",
-        "eus": "巴斯克语",
-        "ewe": "埃维语",
-        "ewo": "埃翁多语",
-        "fan": "芳语（赤道几内亚）",
-        "fao": "法罗语",
-        "fas": "波斯语",
-        "fat": "芳蒂语",
-        "fij": "斐济语",
-        "fil": "菲律宾语",
-        "fin": "芬兰语",
-        "fon": "丰语",
-        "fra": "法语",
-        "frm": "法语（中古，约 1400-1600）",
-        "fro": "法语（上古，842-约 1400）",
-        "frr": "弗里西语（北）",
-        "frs": "弗里西亚语（东）",
-        "fry": "弗里西亚语（西）",
-        "ful": "富拉语",
-        "fur": "弗留利语",
-        "gaa": "加语",
-        "gay": "卡约语",
-        "gba": "巴亚语（中非共和国）",
-        "gez": "吉兹语",
-        "gil": "吉尔伯特语",
-        "gla": "盖尔语（苏格兰）",
-        "gle": "爱尔兰语",
-        "glg": "加利西亚语",
-        "glv": "马恩岛语",
-        "gmh": "德语（中古高地，约 1050-1500）",
-        "goh": "德语（上古高地，约 750-1050）",
-        "gon": "贡德语",
-        "gor": "哥伦打洛语",
-        "got": "哥特语",
-        "grb": "格列博语",
-        "grc": "希腊语（古典，直到 1453）",
-        "grn": "瓜拉尼语",
-        "gsw": "德语（瑞士）",
-        "guj": "古吉拉特语",
-        "gwi": "库臣语",
-        "hai": "海达语",
-        "hat": "克里奥尔语（海地）",
-        "hau": "豪萨语",
-        "haw": "夏威夷语",
-        "heb": "希伯来语",
-        "her": "赫雷罗语",
-        "hil": "希利盖农语",
-        "hin": "印地语",
-        "hit": "赫梯语",
-        "hmn": "苗语",
-        "hmo": "希里莫图语",
-        "hrv": "克罗地亚语",
-        "hsb": "索布语（上）",
-        "hun": "匈牙利语",
-        "hup": "胡帕语",
-        "hye": "亚美尼亚语",
-        "iba": "伊班语",
-        "ibo": "伊博语",
-        "ido": "伊多语",
-        "iii": "彝语（四川）",
-        "iku": "伊努伊特语",
-        "ile": "国际语（西方）",
-        "ilo": "伊洛卡诺语",
-        "ina": "国际语",
-        "ind": "印尼语",
-        "inh": "印古什语",
-        "ipk": "依努庇克语",
-        "isl": "冰岛语",
-        "ita": "意大利语",
-        "jav": "爪哇语",
-        "jbo": "逻辑语",
-        "jpn": "日语",
-        "jpr": "犹太-波斯语",
-        "jrb": "犹太-阿拉伯语",
-        "kaa": "卡拉卡尔帕克语",
-        "kab": "卡布列语",
-        "kac": "景颇语",
-        "kal": "格陵兰语",
-        "kam": "坎巴语（肯尼亚）",
-        "kan": "卡纳达语",
-        "kas": "克什米尔语",
-        "kat": "格鲁吉亚语",
-        "kau": "卡努里语",
-        "kaw": "卡威语",
-        "kaz": "哈萨克语",
-        "kbd": "卡巴尔达语",
-        "kha": "卡西语",
-        "khm": "高棉语",
-        "kho": "和田语",
-        "kik": "基库尤语",
-        "kin": "基尼阿万达语",
-        "kir": "吉尔吉斯语",
-        "kmb": "金本杜语",
-        "kok": "孔卡尼语",
-        "kom": "科米语",
-        "kon": "刚果语",
-        "kor": "朝鲜语",
-        "kos": "科斯拉伊语",
-        "kpe": "克佩勒语",
-        "krc": "卡拉恰伊-巴尔卡尔语",
-        "krl": "卡累利阿语",
-        "kru": "库卢克语",
-        "kua": "宽亚玛语",
-        "kum": "库梅克语",
-        "kur": "库尔德语",
-        "kut": "库特内语",
-        "lad": "拉迪诺语",
-        "lah": "拉亨达语",
-        "lam": "兰巴语",
-        "lao": "老挝语",
-        "lat": "拉丁语",
-        "lav": "拉脱维亚语",
-        "lez": "列兹金语",
-        "lim": "林堡语",
-        "lin": "林加拉语",
-        "lit": "立陶宛语",
-        "lol": "芒戈语",
-        "loz": "洛齐语",
-        "ltz": "卢森堡语",
-        "lua": "卢巴-卢拉语",
-        "lub": "卢巴-加丹加语",
-        "lug": "干达语",
-        "lui": "卢伊塞诺语",
-        "lun": "隆达语",
-        "luo": "卢奥语（肯尼亚和坦桑尼亚）",
-        "lus": "卢萨语",
-        "mad": "马都拉语",
-        "mag": "摩揭陀语",
-        "mah": "马绍尔语",
-        "mai": "米德勒语",
-        "mak": "望加锡语",
-        "mal": "马拉雅拉姆语",
-        "man": "曼丁哥语",
-        "mar": "马拉地语",
-        "mas": "马萨伊语",
-        "mdf": "莫克沙语",
-        "mdr": "曼达语",
-        "men": "门德语（塞拉利昂）",
-        "mga": "爱尔兰语（中古，900-1200）",
-        "mic": "米克马克语",
-        "min": "米南卡保语",
-        "mis": "未被编码的语言",
-        "mkd": "马其顿语",
-        "mlg": "马达加斯加语",
-        "mlt": "马耳他语",
-        "mnc": "满语",
-        "mni": "曼尼普尔语",
-        "moh": "莫霍克语",
-        "mon": "蒙古语",
-        "mos": "莫西语",
-        "mri": "毛利语",
-        "msa": "马来语族",
-        "mul": "多种语言",
-        "mus": "克里克语",
-        "mwl": "米兰德斯语",
-        "mwr": "马尔瓦利语",
-        "mya": "缅甸语",
-        "myv": "厄尔兹亚语",
-        "nap": "拿坡里语",
-        "nau": "瑙鲁语",
-        "nav": "纳瓦霍语",
-        "nbl": "恩德贝勒语（南）",
-        "nde": "恩德贝勒语（北）",
-        "ndo": "恩敦加语",
-        "nds": "撒克逊语（低地）",
-        "nep": "尼泊尔语",
-        "new": "尼瓦尔语",
-        "nia": "尼亚斯语",
-        "niu": "纽埃语",
-        "nld": "荷兰语",
-        "nno": "新挪威语",
-        "nob": "挪威布克莫尔语",
-        "nog": "诺盖语",
-        "non": "诺尔斯语（古）",
-        "nor": "挪威语",
-        "nqo": "西非书面语言字母",
-        "nso": "索托语（北）",
-        "nwc": "尼瓦尔语（古典）",
-        "nya": "尼扬贾语",
-        "nym": "尼扬韦齐语",
-        "nyn": "尼扬科勒语",
-        "nyo": "尼奥罗语",
-        "nzi": "恩济马语",
-        "oci": "奥克西唐语（1500 后）",
-        "oji": "奥吉布瓦语",
-        "ori": "奥利亚语",
-        "orm": "奥罗莫语",
-        "osa": "奥萨格语",
-        "oss": "奥塞梯语",
-        "ota": "土耳其语（奥斯曼，1500-1928）",
-        "pag": "邦阿西楠语",
-        "pal": "钵罗钵语",
-        "pam": "邦板牙语",
-        "pan": "旁遮普语",
-        "pap": "帕皮亚门托语",
-        "pau": "帕劳语",
-        "peo": "波斯语（古，公元前约 600-400）",
-        "phn": "腓尼基语",
-        "pli": "巴利语",
-        "pol": "波兰语",
-        "pon": "波纳佩语",
-        "por": "葡萄牙语",
-        "pro": "普罗旺斯语（古，至 1500）",
-        "pus": "普什图语",
-        "que": "克丘亚语",
-        "raj": "拉贾斯坦语",
-        "rap": "拉帕努伊语",
-        "rar": "拉罗汤加语",
-        "roh": "罗曼什语",
-        "rom": "罗姆语",
-        "ron": "罗马尼亚语",
-        "run": "基隆迪语",
-        "rup": "阿罗马尼亚语",
-        "rus": "俄语",
-        "sad": "桑达韦语",
-        "sag": "桑戈语",
-        "sah": "雅库特语",
-        "sam": "阿拉米语（萨马利亚）",
-        "san": "梵语",
-        "sas": "萨萨克语",
-        "sat": "桑塔利语",
-        "scn": "西西里语",
-        "sco": "苏格兰语",
-        "sel": "塞尔库普语",
-        "sga": "爱尔兰语（古，至 900）",
-        "shn": "掸语",
-        "sid": "锡达莫语",
-        "sin": "僧加罗语",
-        "slk": "斯洛伐克语",
-        "slv": "斯洛文尼亚语",
-        "sma": "萨米语（南）",
-        "sme": "萨米语（北）",
-        "smj": "律勒欧-萨米语",
-        "smn": "伊纳里-萨米语",
-        "smo": "萨摩亚语",
-        "sms": "斯科特-萨米语",
-        "sna": "修纳语",
-        "snd": "信德语",
-        "snk": "索宁克语",
-        "sog": "粟特语",
-        "som": "索马里语",
-        "sot": "索托语（南）",
-        "spa": "西班牙语",
-        "sqi": "阿尔巴尼亚语",
-        "srd": "撒丁语",
-        "srn": "苏里南汤加语",
-        "srp": "塞尔维亚语",
-        "srr": "塞雷尔语",
-        "ssw": "斯瓦特语",
-        "suk": "苏库马语",
-        "sun": "巽他语",
-        "sus": "苏苏语",
-        "sux": "苏美尔语",
-        "swa": "斯瓦希里语族",
-        "swe": "瑞典语",
-        "syc": "叙利亚语（古典）",
-        "syr": "古叙利亚语",
-        "tah": "塔希提语",
-        "tam": "泰米尔语",
-        "tat": "塔塔尔语",
-        "tel": "泰卢固语",
-        "tem": "滕内语",
-        "ter": "特列纳语",
-        "tet": "特塔姆语",
-        "tgk": "塔吉克语",
-        "tgl": "塔加洛语",
-        "tha": "泰语",
-        "tig": "提格雷语",
-        "tir": "提格里尼亚语",
-        "tiv": "蒂夫语",
-        "tkl": "托克劳语",
-        "tlh": "克林贡语",
-        "tli": "特林吉特语",
-        "tmh": "塔马舍克语",
-        "tog": "汤加语 (尼亚萨)",
-        "ton": "汤加语（汤加岛）",
-        "tpi": "托克皮辛语",
-        "tsi": "钦西安语",
-        "tsn": "茨瓦纳语",
-        "tso": "聪加语",
-        "tuk": "土库曼语",
-        "tum": "奇图姆布卡语",
-        "tur": "土耳其语",
-        "tvl": "图瓦卢语",
-        "twi": "契维语",
-        "tyv": "图瓦语",
-        "udm": "乌德穆尔特语",
-        "uga": "乌加里特语",
-        "uig": "维吾尔语",
-        "ukr": "乌克兰语",
-        "umb": "翁本杜语",
-        "und": "未确定的语言",
-        "urd": "乌尔都语",
-        "uzb": "乌兹别克语",
-        "vai": "瓦伊语",
-        "ven": "文达语",
-        "vie": "越南语",
-        "vol": "沃拉普克语",
-        "vot": "沃提克语",
-        "wal": "瓦拉莫语",
-        "war": "瓦赖语（菲律宾）",
-        "was": "瓦肖语",
-        "wln": "瓦龙语",
-        "wol": "沃洛夫语",
-        "xal": "卡尔梅克语",
-        "xho": "科萨语",
-        "yao": "瑶语",
-        "yap": "雅浦语",
-        "yid": "依地语",
-        "yor": "约鲁巴语",
-        "zap": "萨波特克语",
-        "zbl": "布利斯符号",
-        "zen": "哲纳加语",
-        "zha": "壮语",
-        "zho": "中文",
-        "zul": "祖鲁语",
-        "zun": "祖尼语",
-        "zxx": "No linguistic content",
-        "zza": "扎扎其语"
-    },
-    "fi": {
-        "aar": "afar",
-        "abk": "abhaasi",
-        "ace": "aceh",
-        "ach": "atšoli",
-        "ada": "adangme",
-        "ady": "adyge",
-        "afh": "afrihili",
-        "afr": "afrikaans",
-        "ain": "Ainu (Japan)",
-        "aka": "Akan",
-        "akk": "akkadi",
-        "ale": "aleutti",
-        "alt": "Altai; Southern",
-        "amh": "amhara",
-        "ang": "English; Old (ca. 450-1100)",
-        "anp": "angika",
-        "ara": "arabia",
-        "arc": "Aramaic; Official (700-300 BCE)",
-        "arg": "aragonia",
-        "arn": "Mapudungun",
-        "arp": "arapaho",
-        "arw": "arawak",
-        "asm": "asami",
-        "ast": "asturia",
-        "ava": "avaari",
-        "ave": "avestan",
-        "awa": "awadhi",
-        "aym": "Aymara",
-        "aze": "azeri",
-        "bak": "baškiiri",
-        "bal": "belutši",
-        "bam": "Bambara",
-        "ban": "bali",
-        "bas": "Basa (Cameroon)",
-        "bej": "beja",
-        "bel": "valkovenäjä",
-        "bem": "Bemba (Zambia)",
-        "ben": "bengali",
-        "bho": "bhojpuri",
-        "bik": "bikol",
-        "bin": "bini",
-        "bis": "bislama",
-        "bla": "mustajalka (siksika)",
-        "bod": "tiibetti",
-        "bos": "bosnia",
-        "bra": "bradž",
-        "bre": "bretoni",
-        "bua": "burjaatti",
-        "bug": "bugi",
-        "bul": "bulgaria",
-        "byn": "Bilin",
-        "cad": "caddo",
-        "car": "Carib; Galibi",
-        "cat": "katalaani",
-        "ceb": "cebuano",
-        "ces": "tšekki",
-        "cha": "chamorro",
-        "chb": "chibcha",
-        "che": "tšetšeeni",
-        "chg": "Chagatai",
-        "chk": "chuuk",
-        "chm": "mari (Venäjä)",
-        "chn": "chinook-jargon",
-        "cho": "choctaw",
-        "chp": "chipewyan",
-        "chr": "cherokee",
-        "chu": "Slavonic; Old",
-        "chv": "tšuvassi",
-        "chy": "cheyenne",
-        "cop": "kopti",
-        "cor": "korni",
-        "cos": "korsika",
-        "cre": "cree",
-        "crh": "krimintataari",
-        "csb": "kašubi",
-        "cym": "kymri",
-        "dak": "dakota",
-        "dan": "tanska",
-        "dar": "dargva",
-        "del": "delaware",
-        "den": "athapaski-slavi",
-        "deu": "saksa",
-        "dgr": "dogrib",
-        "din": "Dinka",
-        "div": "Dhivehi",
-        "doi": "Dogri (macrolanguage)",
-        "dsb": "alasorbi",
-        "dua": "duala",
-        "dum": "Dutch; Middle (ca. 1050-1350)",
-        "dyu": "dyula",
-        "dzo": "dzongkha",
-        "efi": "efik",
-        "egy": "muinaisegypti",
-        "eka": "ekajuk",
-        "ell": "nykykreikka",
-        "elx": "elami",
-        "eng": "englanti",
-        "enm": "keskienglanti",
-        "epo": "esperanto",
-        "est": "viro",
-        "eus": "baski",
-        "ewe": "ewe",
-        "ewo": "ewondo",
-        "fan": "Fang (Equatorial Guinea)",
-        "fao": "fääri",
-        "fas": "persia",
-        "fat": "fanti",
-        "fij": "fidži",
-        "fil": "filipino",
-        "fin": "suomi",
-        "fon": "fon",
-        "fra": "ranska",
-        "frm": "French; Middle (ca. 1400-1600)",
-        "fro": "French; Old (842-ca. 1400)",
-        "frr": "Frisian; Northern",
-        "frs": "Frisian; Eastern",
-        "fry": "Frisian; Western",
-        "ful": "fulani",
-        "fur": "friuli",
-        "gaa": "gã",
-        "gay": "gayo",
-        "gba": "Gbaya (Central African Republic)",
-        "gez": "ge'ez",
-        "gil": "kiribati",
-        "gla": "Gaelic; Scottish",
-        "gle": "iiri",
-        "glg": "galicia",
-        "glv": "manksi",
-        "gmh": "German; Middle High (ca. 1050-1500)",
-        "goh": "German; Old High (ca. 750-1050)",
-        "gon": "gondi",
-        "gor": "gorontalo",
-        "got": "gootti",
-        "grb": "grebo",
-        "grc": "muinaiskreikka",
-        "grn": "guarani",
-        "gsw": "German; Swiss",
-        "guj": "gujarati",
-        "gwi": "Gwichʼin",
-        "hai": "haida",
-        "hat": "Creole; Haitian",
-        "hau": "hausa",
-        "haw": "havaiji",
-        "heb": "heprea",
-        "her": "herero",
-        "hil": "hiligaynon",
-        "hin": "hindi",
-        "hit": "heetti",
-        "hmn": "hmong",
-        "hmo": "hiri-motu",
-        "hrv": "kroatia",
-        "hsb": "Sorbian; Upper",
-        "hun": "unkari",
-        "hup": "hupa",
-        "hye": "armenia",
-        "iba": "Iban",
-        "ibo": "igbo",
-        "ido": "ido",
-        "iii": "Yi; Sichuan",
-        "iku": "inuktitut",
-        "ile": "interlingue",
-        "ilo": "iloko",
-        "ina": "interlingua",
-        "ind": "indonesia",
-        "inh": "inguuši",
-        "ipk": "iñupiaq",
-        "isl": "islanti",
-        "ita": "italia",
-        "jav": "jaava",
-        "jbo": "lojban",
-        "jpn": "japani",
-        "jpr": "juutalaispersia",
-        "jrb": "juutalaisarabia",
-        "kaa": "karakalpakki",
-        "kab": "kabyyli",
-        "kac": "kachin",
-        "kal": "grönlanti",
-        "kam": "Kamba (Kenya)",
-        "kan": "kannada",
-        "kas": "kashmiri",
-        "kat": "georgia",
-        "kau": "kanuri",
-        "kaw": "kavi",
-        "kaz": "kazakki",
-        "kbd": "kabardi",
-        "kha": "Khasi",
-        "khm": "Khmer; Central",
-        "kho": "khotani",
-        "kik": "kikuyu",
-        "kin": "ruanda",
-        "kir": "kirgiisi",
-        "kmb": "kimbundu",
-        "kok": "Konkani (macrolanguage)",
-        "kom": "komi",
-        "kon": "Kongo",
-        "kor": "korea",
-        "kos": "kosrae",
-        "kpe": "kpelle",
-        "krc": "karatšai-balkaari",
-        "krl": "karjala",
-        "kru": "kurukh",
-        "kua": "kuanjama",
-        "kum": "kumykki",
-        "kur": "kurdi",
-        "kut": "kutenai",
-        "lad": "ladino",
-        "lah": "lahnda",
-        "lam": "lamba",
-        "lao": "lao",
-        "lat": "latina",
-        "lav": "latvia",
-        "lez": "lezgi",
-        "lim": "Limburgan",
-        "lin": "lingala",
-        "lit": "liettua",
-        "lol": "mongo",
-        "loz": "lozi",
-        "ltz": "Luxemburg",
-        "lua": "luba (Lulua)",
-        "lub": "luba (Katanga)",
-        "lug": "Ganda",
-        "lui": "luiseño",
-        "lun": "lunda",
-        "luo": "luo",
-        "lus": "lushai",
-        "mad": "madura",
-        "mag": "magahi",
-        "mah": "Marshallese",
-        "mai": "maithili",
-        "mak": "Makasar",
-        "mal": "malayalam",
-        "man": "mandingo",
-        "mar": "marathi",
-        "mas": "masai",
-        "mdf": "mokša",
-        "mdr": "mandar",
-        "men": "Mende (Sierra Leone)",
-        "mga": "keski-iiri",
-        "mic": "Mi'kmaq",
-        "min": "minangkabau",
-        "mis": "Uncoded languages",
-        "mkd": "makedonia",
-        "mlg": "malagassi",
-        "mlt": "malta",
-        "mnc": "mantšu",
-        "mni": "manipuri",
-        "moh": "mohawk",
-        "mon": "Mongolian",
-        "mos": "mossi",
-        "mri": "maori",
-        "msa": "Malay (macrolanguage)",
-        "mul": "monia kieliä",
-        "mus": "muskogi",
-        "mwl": "mirandês",
-        "mwr": "marwari",
-        "mya": "burma",
-        "myv": "ersä",
-        "nap": "napoli",
-        "nau": "nauru",
-        "nav": "Navajo",
-        "nbl": "ndebele; eteländebele",
-        "nde": "ndebele; pohjoisndebele",
-        "ndo": "ndonga",
-        "nds": "German; Low",
-        "nep": "nepali",
-        "new": "Bhasa; Nepal",
-        "nia": "nias",
-        "niu": "niue",
-        "nld": "hollanti",
-        "nno": "norja (uusnorja)",
-        "nob": "Norwegian Bokmål",
-        "nog": "nogai",
-        "non": "muinaisnorja",
-        "nor": "norja",
-        "nqo": "N'Ko",
-        "nso": "Sotho; Northern",
-        "nwc": "Newari; Old",
-        "nya": "Nyanja",
-        "nym": "nyamwezi",
-        "nyn": "nyankole",
-        "nyo": "Nyoro",
-        "nzi": "nzima",
-        "oci": "Occitan (post 1500)",
-        "oji": "Ojibwa",
-        "ori": "oriya",
-        "orm": "oromo",
-        "osa": "osage",
-        "oss": "Ossetian",
-        "ota": "osmaninturkki",
-        "pag": "pangasinan",
-        "pal": "pahlavi",
-        "pam": "pampanga",
-        "pan": "Panjabi",
-        "pap": "papiamentu",
-        "pau": "palau",
-        "peo": "Persian; Old (ca. 600-400 B.C.)",
-        "phn": "foinikia",
-        "pli": "Pali",
-        "pol": "puola",
-        "pon": "pohnpei",
-        "por": "portugali",
-        "pro": "muinaisprovensaali",
-        "pus": "pašto",
-        "que": "Quechua",
-        "raj": "rajasthani",
-        "rap": "rapanui",
-        "rar": "Maori; Cook Islands",
-        "roh": "Romansh",
-        "rom": "romani",
-        "ron": "romania",
-        "run": "rundi",
-        "rup": "Romanian; Macedo-",
-        "rus": "venäjä",
-        "sad": "sandawe",
-        "sag": "Sango",
-        "sah": "jakuutti",
-        "sam": "Aramaic; Samaritan",
-        "san": "sanskrit",
-        "sas": "Sasak",
-        "sat": "santali",
-        "scn": "sisilia",
-        "sco": "skotti",
-        "sel": "selkuppi",
-        "sga": "muinaisiiri",
-        "shn": "shan",
-        "sid": "sidamo",
-        "sin": "Sinhala",
-        "slk": "slovakki",
-        "slv": "sloveeni",
-        "sma": "eteläsaame",
-        "sme": "pohjoissaame",
-        "smj": "luulajansaame",
-        "smn": "inarinsaame",
-        "smo": "samoa",
-        "sms": "koltansaami",
-        "sna": "shona",
-        "snd": "sindhi",
-        "snk": "soninke",
-        "sog": "sogdi",
-        "som": "somali",
-        "sot": "eteläsotho",
-        "spa": "espanja",
-        "sqi": "albania",
-        "srd": "sardi",
-        "srn": "Sranan Tongo",
-        "srp": "serbia",
-        "srr": "Serer",
-        "ssw": "swazi",
-        "suk": "sukuma",
-        "sun": "sunda",
-        "sus": "susu",
-        "sux": "sumeri",
-        "swa": "Swahili (macrolanguage)",
-        "swe": "ruotsi",
-        "syc": "Syriac; Classical",
-        "syr": "syyria",
-        "tah": "tahiti",
-        "tam": "tamili",
-        "tat": "tataari",
-        "tel": "Telugu",
-        "tem": "temne",
-        "ter": "tereno",
-        "tet": "tetum",
-        "tgk": "tadžikki",
-        "tgl": "tagalog",
-        "tha": "thai",
-        "tig": "tigre",
-        "tir": "tigrinya",
-        "tiv": "tiv",
-        "tkl": "tokelau",
-        "tlh": "Klingon",
-        "tli": "tlinglit",
-        "tmh": "Tamashek",
-        "tog": "Malawin tonga",
-        "ton": "Tongan tonga",
-        "tpi": "tok-pisin",
-        "tsi": "tsimshian",
-        "tsn": "tswana",
-        "tso": "tsonga",
-        "tuk": "turkmeeni",
-        "tum": "tumbuka",
-        "tur": "turkki",
-        "tvl": "tuvalu",
-        "twi": "twi",
-        "tyv": "tuva",
-        "udm": "udmurtti",
-        "uga": "ugarit",
-        "uig": "uiguuri",
-        "ukr": "ukraina",
-        "umb": "umbundu",
-        "und": "määrittämätön",
-        "urd": "urdu",
-        "uzb": "uzbekki",
-        "vai": "vai",
-        "ven": "venda",
-        "vie": "vietnam",
-        "vol": "volapük",
-        "vot": "vatja",
-        "wal": "Wolaytta",
-        "war": "Waray (Philippines)",
-        "was": "washo",
-        "wln": "valloni",
-        "wol": "wolof",
-        "xal": "Kalmyk",
-        "xho": "xhosa",
-        "yao": "mien",
-        "yap": "yap",
-        "yid": "jiddiš",
-        "yor": "yoruba",
-        "zap": "Zapotec",
-        "zbl": "Blissymbols",
-        "zen": "zenaga",
-        "zha": "Zhuang",
-        "zho": "kiina",
-        "zul": "zulu",
-        "zun": "zuni",
-        "zxx": "No linguistic content",
-        "zza": "Zaza"
-    },
     "it": {
         "aar": "Afar",
         "abk": "Abkhazian",
@@ -4120,846 +3327,6 @@ LANGUAGE_NAMES = {
         "zxx": "Nessun contenuto linguistico",
         "zza": "Zaza"
     },
-    "uk": {
-        "aar": "афар",
-        "abk": "абхазька",
-        "ace": "ачеська",
-        "ach": "ачолі",
-        "ada": "адангме",
-        "ady": "адигейська",
-        "afh": "афрингілі",
-        "afr": "африкаанс",
-        "ain": "айнська (Японія)",
-        "aka": "акан",
-        "akk": "аккадська",
-        "ale": "алеутська",
-        "alt": "алтайська (південна)",
-        "amh": "амхарська",
-        "ang": "давньоанглійська (бл. 450-1100)",
-        "anp": "ангіка",
-        "ara": "арабська",
-        "arc": "арамейська (офіційна; 700-300 до нашої ери)",
-        "arg": "арагонська",
-        "arn": "арауканська",
-        "arp": "арапахо",
-        "arw": "аравакська",
-        "asm": "ассамська",
-        "ast": "астурійська",
-        "ava": "аварська",
-        "ave": "авестанська",
-        "awa": "авадхі",
-        "aym": "аймарська",
-        "aze": "азербайджанська",
-        "bak": "башкирська",
-        "bal": "белуджійська",
-        "bam": "бамбара",
-        "ban": "балійська",
-        "bas": "баса (Камерун)",
-        "bej": "бежа",
-        "bel": "білоруська",
-        "bem": "бемба (Замбія)",
-        "ben": "бенгальська",
-        "bho": "бходжпурі",
-        "bik": "бікольська",
-        "bin": "біні",
-        "bis": "біслама",
-        "bla": "сісіка",
-        "bod": "тибетська",
-        "bos": "боснійська",
-        "bra": "брай",
-        "bre": "бретонська",
-        "bua": "бурятська",
-        "bug": "бугійська",
-        "bul": "болгарська",
-        "byn": "білін",
-        "cad": "каддо",
-        "car": "карибська (галібі)",
-        "cat": "каталонська",
-        "ceb": "себуано",
-        "ces": "чеська",
-        "cha": "чаморо",
-        "chb": "чибча",
-        "che": "чеченська",
-        "chg": "чагатайська",
-        "chk": "чуукська",
-        "chm": "марійська (Росія)",
-        "chn": "чинук; жаргон",
-        "cho": "чоктау",
-        "chp": "чипев’ян",
-        "chr": "черокі",
-        "chu": "давньослов’янська",
-        "chv": "чуваська",
-        "chy": "шаєнн",
-        "cop": "коптська",
-        "cor": "корнійська",
-        "cos": "корсиканська",
-        "cre": "крі",
-        "crh": "турецька (кримська)",
-        "csb": "кашубська",
-        "cym": "валійська",
-        "dak": "дакота",
-        "dan": "данська",
-        "dar": "даргва",
-        "del": "делаварська",
-        "den": "слейві (атабаська)",
-        "deu": "німецька",
-        "dgr": "догріб",
-        "din": "дінка",
-        "div": "мальдивська",
-        "doi": "догрі (макромова)",
-        "dsb": "нижньолужицька",
-        "dua": "дуала",
-        "dum": "середньовічна голландська (бл. 1050-1350)",
-        "dyu": "діула",
-        "dzo": "дзонг-ке",
-        "efi": "ефік",
-        "egy": "давньоєгипетська",
-        "eka": "екаджук",
-        "ell": "грецька (з 1453)",
-        "elx": "еламська",
-        "eng": "англійська",
-        "enm": "середньоанглійська (1100-1500)",
-        "epo": "есперанто",
-        "est": "естонська",
-        "eus": "баскська",
-        "ewe": "еве",
-        "ewo": "евондо",
-        "fan": "фанг (Екваторіальна Гвінея)",
-        "fao": "фарерська",
-        "fas": "перська",
-        "fat": "фанті",
-        "fij": "фіджійська",
-        "fil": "філіппінська",
-        "fin": "фінська",
-        "fon": "фон",
-        "fra": "французька",
-        "frm": "середньофранцузька (бл. 1400-1600)",
-        "fro": "давньофранцузька (842-бл. 1400)",
-        "frr": "фризька (північна)",
-        "frs": "фризька (східна)",
-        "fry": "фризька (західна)",
-        "ful": "фулах",
-        "fur": "фріульська",
-        "gaa": "га",
-        "gay": "гайо",
-        "gba": "гбая (Центральноафриканська Республіка)",
-        "gez": "гііз",
-        "gil": "гільбертська",
-        "gla": "гаельська (Шотландія)",
-        "gle": "ірландська",
-        "glg": "галісійська",
-        "glv": "манкс",
-        "gmh": "середньоверхньонімецька (бл. 1050-1500)",
-        "goh": "давньосередньонімецька (бл. 750-1050)",
-        "gon": "гонді",
-        "gor": "горонтало",
-        "got": "готська",
-        "grb": "гребо",
-        "grc": "давньогрецька (до 1453)",
-        "grn": "гуарані",
-        "gsw": "німецька (Швейцарія)",
-        "guj": "гуджараті",
-        "gwi": "гвічин",
-        "hai": "хайда",
-        "hat": "креольська (гаїтянська)",
-        "hau": "хауса",
-        "haw": "гавайська",
-        "heb": "іврит",
-        "her": "гереро",
-        "hil": "хілігайнон",
-        "hin": "хінді",
-        "hit": "хетська",
-        "hmn": "хмонг",
-        "hmo": "хірімоту",
-        "hrv": "хорватська",
-        "hsb": "верхньолужицька",
-        "hun": "угорська",
-        "hup": "хупа",
-        "hye": "вірменська",
-        "iba": "ібанська",
-        "ibo": "ігбо",
-        "ido": "ідо",
-        "iii": "ї (Сичуань)",
-        "iku": "інуктітут",
-        "ile": "окциденталь",
-        "ilo": "ілоко",
-        "ina": "інтерлінгва (Асоціація міжнародної допоміжної мови)",
-        "ind": "індонезійська",
-        "inh": "інгушська",
-        "ipk": "інупіак",
-        "isl": "ісландська",
-        "ita": "італійська",
-        "jav": "яванська",
-        "jbo": "ложбан",
-        "jpn": "японська",
-        "jpr": "єврейсько-перська",
-        "jrb": "єврейсько-арабська",
-        "kaa": "каракалпацька",
-        "kab": "кабильська",
-        "kac": "качин",
-        "kal": "калаалісут",
-        "kam": "камба (Кенія)",
-        "kan": "каннада",
-        "kas": "кашмірська",
-        "kat": "грузинська",
-        "kau": "канурі",
-        "kaw": "каві",
-        "kaz": "казахська",
-        "kbd": "кабардінська",
-        "kha": "кхасі",
-        "khm": "кхмерська (центральна)",
-        "kho": "хотаносакська",
-        "kik": "кікуйю",
-        "kin": "кіньяруанда",
-        "kir": "киргизька",
-        "kmb": "кімбунду",
-        "kok": "конкані (макромова)",
-        "kom": "комі",
-        "kon": "конго",
-        "kor": "корейська",
-        "kos": "косрейська",
-        "kpe": "кпелле",
-        "krc": "карачаєво-балкарська",
-        "krl": "карельська",
-        "kru": "курух",
-        "kua": "куаньяма",
-        "kum": "кумикська",
-        "kur": "курдська",
-        "kut": "кутенай",
-        "lad": "ладіно",
-        "lah": "лахнда",
-        "lam": "ламба",
-        "lao": "лаоська",
-        "lat": "латинська",
-        "lav": "латиська",
-        "lez": "лезгінська",
-        "lim": "лімбурганська",
-        "lin": "лінгала",
-        "lit": "литовська",
-        "lol": "монго",
-        "loz": "лозі",
-        "ltz": "люксембурзька",
-        "lua": "луба-лулуа",
-        "lub": "луба-катанга",
-        "lug": "ганда",
-        "lui": "луйсеньо",
-        "lun": "лунда",
-        "luo": "луо (Кенія і Танзанія)",
-        "lus": "лушай",
-        "mad": "мадурська",
-        "mag": "магахі",
-        "mah": "маршальська",
-        "mai": "майтхілі",
-        "mak": "макасарська",
-        "mal": "малаялам",
-        "man": "мандінго",
-        "mar": "мараті",
-        "mas": "масаї",
-        "mdf": "мокшанська",
-        "mdr": "мандарська",
-        "men": "менде (Сьєрра-Леоне)",
-        "mga": "середньоірландська (900-1200)",
-        "mic": "мікмак",
-        "min": "мінангкабау",
-        "mis": "мови без коду",
-        "mkd": "македонська",
-        "mlg": "малагасійська",
-        "mlt": "мальтійська",
-        "mnc": "манчжурська",
-        "mni": "маніпурська",
-        "moh": "мохаук",
-        "mon": "монгольська",
-        "mos": "мосі",
-        "mri": "маорійська",
-        "msa": "малайська (макромова)",
-        "mul": "мови; що належать до декількох родин",
-        "mus": "крікська",
-        "mwl": "мірандська",
-        "mwr": "марварі",
-        "mya": "бірманська",
-        "myv": "ерзянська",
-        "nap": "неаполітанська",
-        "nau": "науру",
-        "nav": "навахо",
-        "nbl": "південна ндебеле",
-        "nde": "північна ндебеле",
-        "ndo": "ндонга",
-        "nds": "нижньонімецька",
-        "nep": "непальська",
-        "new": "бхаса (Непал)",
-        "nia": "ніасійська",
-        "niu": "ніуе",
-        "nld": "голландська",
-        "nno": "норвезька нюноршк",
-        "nob": "норвезька букмол",
-        "nog": "ногайська",
-        "non": "давньонорвезька",
-        "nor": "норвезька",
-        "nqo": "н’ко",
-        "nso": "сото; північне",
-        "nwc": "неварі (давня)",
-        "nya": "ньянджа",
-        "nym": "ньямвезі",
-        "nyn": "ньянколе",
-        "nyo": "ньоро",
-        "nzi": "нзіма",
-        "oci": "оксітанська (після 1500)",
-        "oji": "оджибва",
-        "ori": "орія",
-        "orm": "оромо",
-        "osa": "оседжі",
-        "oss": "осетинська",
-        "ota": "оттоманська турецька (1500-1928)",
-        "pag": "пангасінан",
-        "pal": "пехлевійська",
-        "pam": "пампанга",
-        "pan": "пенджабі",
-        "pap": "папьяменто",
-        "pau": "палау",
-        "peo": "давньоперська (бл. 600-400 до н.е.)",
-        "phn": "фінікійська",
-        "pli": "палі",
-        "pol": "польська",
-        "pon": "понапе",
-        "por": "португальська",
-        "pro": "провансальська (давня; до 1500 року)",
-        "pus": "пуштунська",
-        "que": "кечуа",
-        "raj": "раджастхані",
-        "rap": "рапануї",
-        "rar": "маорійська (острови Кука)",
-        "roh": "ретророманська",
-        "rom": "ромська",
-        "ron": "румунська",
-        "run": "рунді",
-        "rup": "македоно-румунська",
-        "rus": "російська",
-        "sad": "сандаве",
-        "sag": "санго",
-        "sah": "якутська",
-        "sam": "арамейська (самаритянська)",
-        "san": "санскрит",
-        "sas": "сасакська",
-        "sat": "санталі",
-        "scn": "сицилійська",
-        "sco": "шотландська",
-        "sel": "селькупська",
-        "sga": "давньоірландська (до 900)",
-        "shn": "шан",
-        "sid": "сидама",
-        "sin": "сингалійська",
-        "slk": "словацька",
-        "slv": "словенська",
-        "sma": "саамська (південна)",
-        "sme": "саамська (північна)",
-        "smj": "лулесаамська",
-        "smn": "саамська (інарі)",
-        "smo": "самоанська",
-        "sms": "саамська (сколт)",
-        "sna": "шона",
-        "snd": "синдхі",
-        "snk": "сонікійська",
-        "sog": "согдійська",
-        "som": "сомалійська",
-        "sot": "сото; південна",
-        "spa": "іспанська",
-        "sqi": "албанська",
-        "srd": "сардинська",
-        "srn": "сранан-тонго",
-        "srp": "сербська",
-        "srr": "серер",
-        "ssw": "свазі",
-        "suk": "сукума",
-        "sun": "сунданська",
-        "sus": "сусу",
-        "sux": "шумерська",
-        "swa": "суахілі (макромова)",
-        "swe": "шведська",
-        "syc": "сирійська (класична)",
-        "syr": "сирійська",
-        "tah": "таїтянська",
-        "tam": "тамільська",
-        "tat": "татарська",
-        "tel": "телугу",
-        "tem": "тімне",
-        "ter": "терено",
-        "tet": "тетум",
-        "tgk": "таджицька",
-        "tgl": "тагалог",
-        "tha": "таїландська",
-        "tig": "тігре",
-        "tir": "тигринійська",
-        "tiv": "тиві",
-        "tkl": "токелау",
-        "tlh": "клінгонська",
-        "tli": "тлінгіт",
-        "tmh": "тамашек",
-        "tog": "тонга (ньяса)",
-        "ton": "тонга (острови Тонга)",
-        "tpi": "ток-пісін",
-        "tsi": "цимшіан",
-        "tsn": "тсвана",
-        "tso": "цонга",
-        "tuk": "туркменська",
-        "tum": "тумбука",
-        "tur": "турецька",
-        "tvl": "тувалу",
-        "twi": "тві",
-        "tyv": "тувінська",
-        "udm": "удмурдська",
-        "uga": "угаритська",
-        "uig": "уйгурська",
-        "ukr": "українська",
-        "umb": "умбунду",
-        "und": "невизначена",
-        "urd": "урду",
-        "uzb": "узбецька",
-        "vai": "вай",
-        "ven": "венда",
-        "vie": "в'єтнамська",
-        "vol": "волапюк",
-        "vot": "водська",
-        "wal": "волайтта",
-        "war": "варай (Філіппіни)",
-        "was": "вашо",
-        "wln": "валлонська",
-        "wol": "волоф",
-        "xal": "калмицька",
-        "xho": "хоза",
-        "yao": "яо",
-        "yap": "япська",
-        "yid": "ідиш",
-        "yor": "йоруба",
-        "zap": "сапотецька",
-        "zbl": "бліссимволіка",
-        "zen": "зеназька",
-        "zha": "чжуань",
-        "zho": "китайська",
-        "zul": "зулуська",
-        "zun": "зуні",
-        "zxx": "немає мовних даних",
-        "zza": "заза"
-    },
-    "de": {
-        "aar": "Danakil-Sprache",
-        "abk": "Abchasisch",
-        "ace": "Aceh-Sprache",
-        "ach": "Acholi-Sprache",
-        "ada": "Adangme-Sprache",
-        "ady": "Adygisch",
-        "afh": "Afrihili",
-        "afr": "Afrikaans",
-        "ain": "Ainu-Sprache (Japan)",
-        "aka": "Akan-Sprache",
-        "akk": "Akkadisch",
-        "ale": "Aleutisch",
-        "alt": "Altaisch; Süd",
-        "amh": "Amharisch",
-        "ang": "Englisch; Alt (ca. 450-1100)",
-        "anp": "Anga-Sprache",
-        "ara": "Arabisch",
-        "arc": "Aramäisch",
-        "arg": "Aragonesisch",
-        "arn": "Mapudungun",
-        "arp": "Arapaho",
-        "arw": "Arawakisch",
-        "asm": "Assamesisch",
-        "ast": "Asturisch",
-        "ava": "Awarisch",
-        "ave": "Avestisch",
-        "awa": "Awadhi",
-        "aym": "Aymara",
-        "aze": "Aserbaidschanisch",
-        "bak": "Baschkirisch",
-        "bal": "Belutschisch",
-        "bam": "Bambara",
-        "ban": "Balinesisch",
-        "bas": "Basa (Kamerun)",
-        "bej": "Bedja (Bedauye)",
-        "bel": "Weißrussisch",
-        "bem": "Bemba (Sambia)",
-        "ben": "Bengalisch",
-        "bho": "Bhojpuri",
-        "bik": "Bikol",
-        "bin": "Bini",
-        "bis": "Bislama",
-        "bla": "Blackfoot",
-        "bod": "Tibetisch",
-        "bos": "Bosnisch",
-        "bra": "Braj-Bhakha",
-        "bre": "Bretonisch",
-        "bua": "Burjatisch",
-        "bug": "Buginesisch",
-        "bul": "Bulgarisch",
-        "byn": "Bilin",
-        "cad": "Caddo",
-        "car": "Karibisch; Galíbi",
-        "cat": "Katalanisch",
-        "ceb": "Cebuano",
-        "ces": "Tschechisch",
-        "cha": "Chamorro",
-        "chb": "Chibcha",
-        "che": "Tschetschenisch",
-        "chg": "Tschagataisch",
-        "chk": "Trukesisch",
-        "chm": "Mari (Russland)",
-        "chn": "Chinook",
-        "cho": "Choctaw",
-        "chp": "Chipewyan",
-        "chr": "Cherokee",
-        "chu": "Altkirchenslawisch",
-        "chv": "Tschuwaschisch",
-        "chy": "Cheyenne",
-        "cop": "Koptisch",
-        "cor": "Kornisch",
-        "cos": "Korsisch",
-        "cre": "Cree",
-        "crh": "Türkisch; Krimtatarisch",
-        "csb": "Kaschubisch",
-        "cym": "Walisisch",
-        "dak": "Dakota",
-        "dan": "Dänisch",
-        "dar": "Darginisch",
-        "del": "Delaware",
-        "den": "Slave (Athapaskisch)",
-        "deu": "Deutsch",
-        "dgr": "Dogrib",
-        "din": "Dinka",
-        "div": "Dhivehi",
-        "doi": "Dogri (Makrosprache)",
-        "dsb": "Sorbisch; Nieder",
-        "dua": "Duala",
-        "dum": "Niederländisch; Mittel (ca. 1050-1350)",
-        "dyu": "Dyula",
-        "dzo": "Dzongkha",
-        "efi": "Efik",
-        "egy": "Ägyptisch (Historisch)",
-        "eka": "Ekajuk",
-        "ell": "Neugriechisch (ab 1453)",
-        "elx": "Elamisch",
-        "eng": "Englisch",
-        "enm": "Mittelenglisch",
-        "epo": "Esperanto",
-        "est": "Estnisch",
-        "eus": "Baskisch",
-        "ewe": "Ewe-Sprache",
-        "ewo": "Ewondo",
-        "fan": "Fang (Äquatorial-Guinea)",
-        "fao": "Färöisch",
-        "fas": "Persisch",
-        "fat": "Fanti",
-        "fij": "Fidschianisch",
-        "fil": "Filipino",
-        "fin": "Finnisch",
-        "fon": "Fon",
-        "fra": "Französisch",
-        "frm": "Französisch; Mittel (ca. 1400 - 1600)",
-        "fro": "Französisch; Alt (842 - ca. 1400)",
-        "frr": "Friesisch; Nord",
-        "frs": "Friesisch; Ost",
-        "fry": "Friesisch; West",
-        "ful": "Ful",
-        "fur": "Friaulisch",
-        "gaa": "Ga",
-        "gay": "Gayo",
-        "gba": "Gbaya (Zentralafrikanische Republik)",
-        "gez": "Altäthiopisch",
-        "gil": "Gilbertesisch",
-        "gla": "Gälisch; Schottisch",
-        "gle": "Irisch",
-        "glg": "Galicisch",
-        "glv": "Manx",
-        "gmh": "Mittelhochdeutsch (ca. 1050-1500)",
-        "goh": "Althochdeutsch (ca. 750-1050)",
-        "gon": "Gondi",
-        "gor": "Gorontalesisch",
-        "got": "Gotisch",
-        "grb": "Grebo",
-        "grc": "Altgriechisch (bis 1453)",
-        "grn": "Guaraní",
-        "gsw": "Schweizerdeutsch",
-        "guj": "Gujarati",
-        "gwi": "Kutchin",
-        "hai": "Haida",
-        "hat": "Kreolisch; Haitisch",
-        "hau": "Haussa",
-        "haw": "Hawaiianisch",
-        "heb": "Hebräisch",
-        "her": "Herero",
-        "hil": "Hiligaynon",
-        "hin": "Hindi",
-        "hit": "Hethitisch",
-        "hmn": "Miao-Sprachen",
-        "hmo": "Hiri-Motu",
-        "hrv": "Kroatisch",
-        "hsb": "Obersorbisch",
-        "hun": "Ungarisch",
-        "hup": "Hupa",
-        "hye": "Armenisch",
-        "iba": "Iban",
-        "ibo": "Ibo",
-        "ido": "Ido",
-        "iii": "Yi; Sichuan",
-        "iku": "Inuktitut",
-        "ile": "Interlingue",
-        "ilo": "Ilokano",
-        "ina": "Interlingua (Internationale Hilfssprachen-Vereinigung)",
-        "ind": "Indonesisch",
-        "inh": "Inguschisch",
-        "ipk": "Inupiaq",
-        "isl": "Isländisch",
-        "ita": "Italienisch",
-        "jav": "Javanisch",
-        "jbo": "Lojban",
-        "jpn": "Japanisch",
-        "jpr": "Jüdisch-Persisch",
-        "jrb": "Jüdisch-Arabisch",
-        "kaa": "Karakalpakisch",
-        "kab": "Kabylisch",
-        "kac": "Kachinisch",
-        "kal": "Kalaallisut (Grönländisch)",
-        "kam": "Kamba (Kenia)",
-        "kan": "Kannada",
-        "kas": "Kaschmirisch",
-        "kat": "Georgisch",
-        "kau": "Kanuri",
-        "kaw": "Kawi; Altjavanisch",
-        "kaz": "Kasachisch",
-        "kbd": "Kabardisch",
-        "kha": "Khasi-Sprache",
-        "khm": "Khmer; Zentral",
-        "kho": "Sakisch",
-        "kik": "Kikuyu",
-        "kin": "Rwanda",
-        "kir": "Kirgisisch",
-        "kmb": "Mbundu; Kimbundu",
-        "kok": "Konkani (Makrosprache)",
-        "kom": "Komi",
-        "kon": "Kongo",
-        "kor": "Koreanisch",
-        "kos": "Kosraeanisch",
-        "kpe": "Kpelle",
-        "krc": "Karachay-Balkar",
-        "krl": "Karenisch",
-        "kru": "Kurukh",
-        "kua": "Kwanyama",
-        "kum": "Kumükisch",
-        "kur": "Kurdisch",
-        "kut": "Kutenai",
-        "lad": "Judenspanisch",
-        "lah": "Lahnda",
-        "lam": "Banjari; Lamba",
-        "lao": "Laotisch",
-        "lat": "Lateinisch",
-        "lav": "Lettisch",
-        "lez": "Lesgisch",
-        "lim": "Limburgisch",
-        "lin": "Lingala",
-        "lit": "Litauisch",
-        "lol": "Mongo",
-        "loz": "Rotse",
-        "ltz": "Luxemburgisch",
-        "lua": "Luba-Lulua",
-        "lub": "Luba-Katanga",
-        "lug": "Ganda",
-        "lui": "Luiseno",
-        "lun": "Lunda",
-        "luo": "Luo (Kenia und Tansania)",
-        "lus": "Lushai",
-        "mad": "Maduresisch",
-        "mag": "Khotta",
-        "mah": "Marshallesisch",
-        "mai": "Maithili",
-        "mak": "Makassarisch",
-        "mal": "Malayalam",
-        "man": "Mande; Mandigo; Malinke",
-        "mar": "Marathi",
-        "mas": "Massai",
-        "mdf": "Moksha",
-        "mdr": "Mandaresisch",
-        "men": "Mende (Sierra Leone)",
-        "mga": "Mittelirisch (900-1200)",
-        "mic": "Mikmak",
-        "min": "Minangkabau",
-        "mis": "Nichtklassifizierte Sprachen",
-        "mkd": "Makedonisch",
-        "mlg": "Madegassisch",
-        "mlt": "Maltesisch",
-        "mnc": "Manchu; Mandschurisch",
-        "mni": "Meithei-Sprache",
-        "moh": "Mohawk",
-        "mon": "Mongolisch",
-        "mos": "Mossi",
-        "mri": "Maori",
-        "msa": "Malaiisch (Makrosprache)",
-        "mul": "Mehrsprachig; Polyglott",
-        "mus": "Muskogee",
-        "mwl": "Mirandesisch",
-        "mwr": "Marwari",
-        "mya": "Burmesisch",
-        "myv": "Erzya",
-        "nap": "Neapolitanisch",
-        "nau": "Nauruanisch",
-        "nav": "Navajo",
-        "nbl": "Ndebele (Süd)",
-        "nde": "Ndebele (Nord)",
-        "ndo": "Ndonga",
-        "nds": "Plattdeutsch",
-        "nep": "Nepali",
-        "new": "Bhasa; Nepalesisch",
-        "nia": "Nias",
-        "niu": "Niue",
-        "nld": "Niederländisch",
-        "nno": "Nynorsk (Norwegen)",
-        "nob": "Norwegisch-Bokmål",
-        "nog": "Nogai",
-        "non": "Altnordisch",
-        "nor": "Norwegisch",
-        "nqo": "N'Ko",
-        "nso": "Sotho; Nord",
-        "nwc": "Newari; Alt",
-        "nya": "Nyanja",
-        "nym": "Nyamwezi",
-        "nyn": "Nyankole",
-        "nyo": "Nyoro",
-        "nzi": "Nzima",
-        "oci": "Okzitanisch (nach 1500)",
-        "oji": "Ojibwa",
-        "ori": "Orija",
-        "orm": "Oromo",
-        "osa": "Osage",
-        "oss": "Ossetisch",
-        "ota": "Ottomanisch (Osmanisch/Türkisch) (1500-1928)",
-        "pag": "Pangasinan",
-        "pal": "Mittelpersisch",
-        "pam": "Pampanggan",
-        "pan": "Panjabi",
-        "pap": "Papiamento",
-        "pau": "Palau",
-        "peo": "Persisch; Alt (ca. 600-400 v.Chr.)",
-        "phn": "Phönikisch",
-        "pli": "Pali",
-        "pol": "Polnisch",
-        "pon": "Ponapeanisch",
-        "por": "Portugiesisch",
-        "pro": "Altokzitanisch; Altprovenzalisch (bis 1500)",
-        "pus": "Paschtu; Afghanisch",
-        "que": "Ketschua",
-        "raj": "Rajasthani",
-        "rap": "Osterinsel-Sprache; Rapanui",
-        "rar": "Maori; Cook-Inseln",
-        "roh": "Bündnerromanisch",
-        "rom": "Romani; Zigeunersprache",
-        "ron": "Rumänisch",
-        "run": "Rundi",
-        "rup": "Rumänisch; Mezedonisch",
-        "rus": "Russisch",
-        "sad": "Sandawe",
-        "sag": "Sango",
-        "sah": "Jakutisch",
-        "sam": "Aramäisch; Samaritanisch",
-        "san": "Sanskrit",
-        "sas": "Sassak",
-        "sat": "Santali",
-        "scn": "Sizilianisch",
-        "sco": "Schottisch",
-        "sel": "Selkupisch",
-        "sga": "Altirisch (bis 900)",
-        "shn": "Schan",
-        "sid": "Sidamo",
-        "sin": "Singhalesisch",
-        "slk": "Slowakisch",
-        "slv": "Slowenisch",
-        "sma": "Sami; Süd",
-        "sme": "Nordsamisch",
-        "smj": "Samisch (Lule)",
-        "smn": "Samisch; Inari",
-        "smo": "Samoanisch",
-        "sms": "Samisch; Skolt",
-        "sna": "Schona",
-        "snd": "Sindhi",
-        "snk": "Soninke",
-        "sog": "Sogdisch",
-        "som": "Somali",
-        "sot": "Sotho (Süd)",
-        "spa": "Spanisch; Kastilianisch",
-        "sqi": "Albanisch",
-        "srd": "Sardisch",
-        "srn": "Sranan Tongo",
-        "srp": "Serbisch",
-        "srr": "Serer",
-        "ssw": "Swazi",
-        "suk": "Sukuma",
-        "sun": "Sundanesisch",
-        "sus": "Susu",
-        "sux": "Sumerisch",
-        "swa": "Swahili (Makrosprache)",
-        "swe": "Schwedisch",
-        "syc": "Syrisch; Klassisch",
-        "syr": "Syrisch",
-        "tah": "Tahitisch",
-        "tam": "Tamilisch",
-        "tat": "Tatarisch",
-        "tel": "Telugu",
-        "tem": "Temne",
-        "ter": "Tereno",
-        "tet": "Tetum",
-        "tgk": "Tadschikisch",
-        "tgl": "Tagalog",
-        "tha": "Thailändisch",
-        "tig": "Tigre",
-        "tir": "Tigrinja",
-        "tiv": "Tiv",
-        "tkl": "Tokelauanisch",
-        "tlh": "Klingonisch",
-        "tli": "Tlingit",
-        "tmh": "Tamaseq",
-        "tog": "Tonga (Nyasa)",
-        "ton": "Tonga (Tonga-Inseln)",
-        "tpi": "Neumelanesisch; Pidgin",
-        "tsi": "Tsimshian",
-        "tsn": "Tswana",
-        "tso": "Tsonga",
-        "tuk": "Turkmenisch",
-        "tum": "Tumbuka",
-        "tur": "Türkisch",
-        "tvl": "Elliceanisch",
-        "twi": "Twi",
-        "tyv": "Tuwinisch",
-        "udm": "Udmurt",
-        "uga": "Ugaritisch",
-        "uig": "Uigurisch",
-        "ukr": "Ukrainisch",
-        "umb": "Mbundu; Umbundu",
-        "und": "Unbestimmbar",
-        "urd": "Urdu",
-        "uzb": "Usbekisch",
-        "vai": "Vai",
-        "ven": "Venda",
-        "vie": "Vietnamesisch",
-        "vol": "Volapük",
-        "vot": "Wotisch",
-        "wal": "Wolaytta",
-        "war": "Waray (Philippinen)",
-        "was": "Washo",
-        "wln": "Wallonisch",
-        "wol": "Wolof",
-        "xal": "Kalmükisch",
-        "xho": "Xhosa",
-        "yao": "Yao",
-        "yap": "Yapesisch",
-        "yid": "Jiddisch",
-        "yor": "Joruba",
-        "zap": "Zapotekisch",
-        "zbl": "Bliss-Symbole",
-        "zen": "Zenaga",
-        "zha": "Zhuang",
-        "zho": "Chinesisch",
-        "zul": "Zulu",
-        "zun": "Zuni",
-        "zxx": "Kein sprachlicher Inhalt",
-        "zza": "Zaza"
-    },
     "ja": {
         "aar": "アファル語",
         "abk": "アブハジア語",
@@ -5800,6 +4167,1266 @@ LANGUAGE_NAMES = {
         "zxx": "No linguistic content",
         "zza": "Zaza"
     },
+    "nl": {
+        "aar": "Afar; Hamitisch",
+        "abk": "Abchazisch",
+        "ace": "Achinees",
+        "ach": "Acholi",
+        "ada": "Adangme",
+        "ady": "Adyghe",
+        "afh": "Afrihili",
+        "afr": "Afrikaans",
+        "ain": "Ainu (Japan)",
+        "aka": "Akaans",
+        "akk": "Akkadiaans",
+        "ale": "Aleut",
+        "alt": "Altajs; zuidelijk",
+        "amh": "Amhaars; Amharisch",
+        "ang": "Engels; oud (ca. 450-1100)",
+        "anp": "Angika",
+        "ara": "Arabisch",
+        "arc": "Aramees; officieel (700-300 B.C.)",
+        "arg": "Aragonees",
+        "arn": "Mapudungun",
+        "arp": "Arapaho",
+        "arw": "Arawak",
+        "asm": "Assamees; Assami",
+        "ast": "Asturisch",
+        "ava": "Avaars; Awari",
+        "ave": "Avestisch",
+        "awa": "Awadhi",
+        "aym": "Aymara",
+        "aze": "Azerbeidzjaans",
+        "bak": "Basjkiers; Basjkirisch",
+        "bal": "Balutsji; Baluchi",
+        "bam": "Bambara",
+        "ban": "Balinees",
+        "bas": "Basa (Kameroen)",
+        "bej": "Beja",
+        "bel": "Wit-Russisch; Belarussisch",
+        "bem": "Bemba (Zambia)",
+        "ben": "Bengaals",
+        "bho": "Bhojpuri",
+        "bik": "Bikol",
+        "bin": "Bini; Edo",
+        "bis": "Bislama",
+        "bla": "Siksika",
+        "bod": "Tibetaans",
+        "bos": "Bosnisch",
+        "bra": "Braj",
+        "bre": "Bretons; Bretoens",
+        "bua": "Boeriaats",
+        "bug": "Buginees",
+        "bul": "Bulgaars",
+        "byn": "Bilin",
+        "cad": "Caddo",
+        "car": "Caribische talen",
+        "cat": "Catalaans",
+        "ceb": "Cebuano",
+        "ces": "Tsjechisch",
+        "cha": "Chamorro",
+        "chb": "Tsjibtsja",
+        "che": "Tsjetsjeens",
+        "chg": "Chagatai",
+        "chk": "Chukees",
+        "chm": "Mari (Rusland)",
+        "chn": "Chinook-jargon",
+        "cho": "Choctaw",
+        "chp": "Chipewyaans",
+        "chr": "Cherokee",
+        "chu": "Slavisch; oud (kerk)",
+        "chv": "Tsjoevasjisch",
+        "chy": "Cheyenne",
+        "cop": "Koptisch",
+        "cor": "Cornisch",
+        "cos": "Corsicaans",
+        "cre": "Cree",
+        "crh": "Turks; Crimean",
+        "csb": "Kasjoebiaans",
+        "cym": "Welsh",
+        "dak": "Dakota",
+        "dan": "Deens",
+        "dar": "Dargwa",
+        "del": "Delaware",
+        "den": "Slavisch (Athapascaans)",
+        "deu": "Duits",
+        "dgr": "Dogrib",
+        "din": "Dinka",
+        "div": "Divehi",
+        "doi": "Dogri",
+        "dsb": "Sorbisch; lager",
+        "dua": "Duala",
+        "dum": "Nederlands; middel (ca. 1050-1350)",
+        "dyu": "Dyula",
+        "dzo": "Dzongkha",
+        "efi": "Efikisch",
+        "egy": "Egyptisch (antiek)",
+        "eka": "Ekajuk",
+        "ell": "Grieks; Modern (1453-)",
+        "elx": "Elamitisch",
+        "eng": "Engels",
+        "enm": "Engels; middel (1100-1500)",
+        "epo": "Esperanto",
+        "est": "Estlands",
+        "eus": "Baskisch",
+        "ewe": "Ewe",
+        "ewo": "Ewondo",
+        "fan": "Fang",
+        "fao": "Faeröers",
+        "fas": "Perzisch",
+        "fat": "Fanti",
+        "fij": "Fijisch",
+        "fil": "Filipijns",
+        "fin": "Fins",
+        "fon": "Fon",
+        "fra": "Frans",
+        "frm": "Frans; middel (ca. 1400-1600)",
+        "fro": "Frans; oud (842-ca. 1400)",
+        "frr": "Fries; noordelijk (Duitsland)",
+        "frs": "Fries; oostelijk (Duitsland)",
+        "fry": "Fries",
+        "ful": "Fulah",
+        "fur": "Friulisch",
+        "gaa": "Ga",
+        "gay": "Gayo",
+        "gba": "Gbaya (Centraal Afrikaanse Republiek)",
+        "gez": "Ge'ez",
+        "gil": "Gilbertees",
+        "gla": "Keltisch; schots",
+        "gle": "Iers",
+        "glg": "Galiciaans",
+        "glv": "Manx",
+        "gmh": "Duits; middel hoog (ca. 1050-1500)",
+        "goh": "Duits; oud hoog (ca. 750-1050)",
+        "gon": "Gondi",
+        "gor": "Gorontalo",
+        "got": "Gothisch",
+        "grb": "Grebo",
+        "grc": "Grieks; antiek (tot 1453)",
+        "grn": "Guarani",
+        "gsw": "Duits; Zwitserland",
+        "guj": "Gujarati",
+        "gwi": "Gwichʼin",
+        "hai": "Haida",
+        "hat": "Creools; Haïtiaans",
+        "hau": "Hausa",
+        "haw": "Hawaiiaans",
+        "heb": "Hebreeuws",
+        "her": "Herero",
+        "hil": "Hiligainoons",
+        "hin": "Hindi",
+        "hit": "Hittitisch",
+        "hmn": "Hmong",
+        "hmo": "Hiri Motu",
+        "hrv": "Kroatisch",
+        "hsb": "Servisch; hoger",
+        "hun": "Hongaars",
+        "hup": "Hupa",
+        "hye": "Armeens",
+        "iba": "Ibaans",
+        "ibo": "Igbo",
+        "ido": "Ido",
+        "iii": "Yi; Sichuan - Nuosu",
+        "iku": "Inuktitut",
+        "ile": "Interlingue",
+        "ilo": "Iloko",
+        "ina": "Interlingua (International Auxiliary Language Association)",
+        "ind": "Indonesisch",
+        "inh": "Ingoesjetisch",
+        "ipk": "Inupiak",
+        "isl": "IJslands",
+        "ita": "Italiaans",
+        "jav": "Javaans",
+        "jbo": "Lojbaans",
+        "jpn": "Japans",
+        "jpr": "Joods-Perzisch",
+        "jrb": "Joods-Arabisch",
+        "kaa": "Kara-Kalpak",
+        "kab": "Kabyle",
+        "kac": "Katsjin",
+        "kal": "Groenlands",
+        "kam": "Kamba (Kenya)",
+        "kan": "Kannada; Kanara; Kanarees",
+        "kas": "Kashmiri",
+        "kat": "Georgisch",
+        "kau": "Kanuri",
+        "kaw": "Kawi",
+        "kaz": "Kazachs",
+        "kbd": "Kabardisch; Tsjerkessisch",
+        "kha": "Khasi",
+        "khm": "Khmer, Cambodjaans",
+        "kho": "Khotanees",
+        "kik": "Kikuyu",
+        "kin": "Kinyarwanda",
+        "kir": "Kirgizisch",
+        "kmb": "Kimbundu",
+        "kok": "Konkani",
+        "kom": "Komi",
+        "kon": "Kikongo",
+        "kor": "Koreaans",
+        "kos": "Kosraeaans",
+        "kpe": "Kpelle",
+        "krc": "Karatsjay-Balkar",
+        "krl": "Karelisch",
+        "kru": "Kurukh",
+        "kua": "Kuanyama",
+        "kum": "Kumyk",
+        "kur": "Koerdisch",
+        "kut": "Kutenaïsch",
+        "lad": "Ladino",
+        "lah": "Lahnda",
+        "lam": "Lamba",
+        "lao": "Laotiaans",
+        "lat": "Latijn",
+        "lav": "Lets",
+        "lez": "Lezghiaans",
+        "lim": "Limburgs",
+        "lin": "Lingala",
+        "lit": "Litouws",
+        "lol": "Mongo",
+        "loz": "Lozi",
+        "ltz": "Luxemburgs",
+        "lua": "Luba-Lulua",
+        "lub": "Luba-Katanga",
+        "lug": "Luganda",
+        "lui": "Luiseno",
+        "lun": "Lunda",
+        "luo": "Luo (Kenia en Tanzania)",
+        "lus": "Lushai",
+        "mad": "Madurees",
+        "mag": "Magahisch",
+        "mah": "Marshallees",
+        "mai": "Maithili",
+        "mak": "Makasar",
+        "mal": "Malayalam",
+        "man": "Mandingo",
+        "mar": "Marathi",
+        "mas": "Masai",
+        "mdf": "Moksja",
+        "mdr": "Mandars",
+        "men": "Mende",
+        "mga": "Iers; middel (900-1200)",
+        "mic": "Mi'kmaq; Micmac",
+        "min": "Minangkabau",
+        "mis": "Niet-gecodeerde talen",
+        "mkd": "Macedonisch",
+        "mlg": "Malagassisch",
+        "mlt": "Maltees",
+        "mnc": "Manchu",
+        "mni": "Manipuri",
+        "moh": "Mohawk",
+        "mon": "Mongools",
+        "mos": "Mossisch",
+        "mri": "Maori",
+        "msa": "Maleis",
+        "mul": "Meerdere talen",
+        "mus": "Creek",
+        "mwl": "Mirandees",
+        "mwr": "Marwari",
+        "mya": "Burmees",
+        "myv": "Erzya",
+        "nap": "Napolitaans",
+        "nau": "Nauruaans",
+        "nav": "Navajo",
+        "nbl": "Ndebele; zuid",
+        "nde": "Ndebele; noord",
+        "ndo": "Ndonga",
+        "nds": "Duits; Laag",
+        "nep": "Nepalees",
+        "new": "Newari; Nepal",
+        "nia": "Nias",
+        "niu": "Niueaans",
+        "nld": "Nederlands",
+        "nno": "Noors; Nynorsk",
+        "nob": "Noors; Bokmål",
+        "nog": "Nogai",
+        "non": "Noors; oud",
+        "nor": "Noors",
+        "nqo": "N'Ko",
+        "nso": "Pedi; Sepedi; Noord-Sothotisch",
+        "nwc": "Newari; Klassiek Nepal",
+        "nya": "Nyanja",
+        "nym": "Nyamwezi",
+        "nyn": "Nyankools",
+        "nyo": "Nyoro",
+        "nzi": "Nzima",
+        "oci": "Occitaans (na 1500)",
+        "oji": "Ojibwa",
+        "ori": "Oriya",
+        "orm": "Oromo",
+        "osa": "Osaags",
+        "oss": "Ossetisch",
+        "ota": "Turks; ottomaans (1500-1928)",
+        "pag": "Pangasinaans",
+        "pal": "Pehlevi",
+        "pam": "Pampanga",
+        "pan": "Punjabi",
+        "pap": "Papiamento",
+        "pau": "Palauaans",
+        "peo": "Perzisch; oud (ca. 600-400 B.C.)",
+        "phn": "Foenisisch",
+        "pli": "Pali",
+        "pol": "Pools",
+        "pon": "Pohnpeiaans",
+        "por": "Portugees",
+        "pro": "Provençaals; oud (tot 1500)",
+        "pus": "Poesjto",
+        "que": "Quechua",
+        "raj": "Rajasthani",
+        "rap": "Rapanui",
+        "rar": "Rarotongan; Cookeilanden Maori",
+        "roh": "Reto-Romaans",
+        "rom": "Romani",
+        "ron": "Roemeens",
+        "run": "Rundi",
+        "rup": "Roemeens; Macedo-",
+        "rus": "Russisch",
+        "sad": "Sandawe",
+        "sag": "Sangho",
+        "sah": "Jakoets",
+        "sam": "Aramees; Samaritaans",
+        "san": "Sanskriet",
+        "sas": "Sasaaks",
+        "sat": "Santali",
+        "scn": "Siciliaans",
+        "sco": "Schots",
+        "sel": "Sulkoeps",
+        "sga": "Iers; oud (tot 900)",
+        "shn": "Sjaans",
+        "sid": "Sidamo",
+        "sin": "Sinhala",
+        "slk": "Slowaaks",
+        "slv": "Sloveens",
+        "sma": "Samisch; zuid, Laps; zuid",
+        "sme": "Samisch; noord, Laps; noord",
+        "smj": "Lule Sami",
+        "smn": "Sami; Inari, Laps; Inari",
+        "smo": "Samoaans",
+        "sms": "Sami; Skolt, Laps; Skolt",
+        "sna": "Shona",
+        "snd": "Sindhi",
+        "snk": "Soninke",
+        "sog": "Sogdiaans",
+        "som": "Somalisch",
+        "sot": "Sothaans; zuidelijk",
+        "spa": "Spaans",
+        "sqi": "Albanees",
+        "srd": "Sardinisch",
+        "srn": "Sranan Tongo",
+        "srp": "Servisch",
+        "srr": "Serer",
+        "ssw": "Swati",
+        "suk": "Sukuma",
+        "sun": "Soendanees; Sundanees",
+        "sus": "Susu",
+        "sux": "Sumerisch",
+        "swa": "Swahili",
+        "swe": "Zweeds",
+        "syc": "Syriac; Klassiek",
+        "syr": "Syrisch",
+        "tah": "Tahitisch",
+        "tam": "Tamil",
+        "tat": "Tataars",
+        "tel": "Telugu",
+        "tem": "Timne",
+        "ter": "Tereno",
+        "tet": "Tetum",
+        "tgk": "Tadzjieks",
+        "tgl": "Tagalog",
+        "tha": "Thai",
+        "tig": "Tigre",
+        "tir": "Tigrinya",
+        "tiv": "Tiv",
+        "tkl": "Tokelau",
+        "tlh": "Klingon; tlhIngan-Hol",
+        "tli": "Tlingit",
+        "tmh": "Tamasjek",
+        "tog": "Tonga (Nyasa)",
+        "ton": "Tonga (Tonga-eilanden)",
+        "tpi": "Tok Pisin",
+        "tsi": "Tsimsjiaans",
+        "tsn": "Tswana",
+        "tso": "Tsonga",
+        "tuk": "Turkmeens",
+        "tum": "Tumbuka",
+        "tur": "Turks",
+        "tvl": "Tuvalu",
+        "twi": "Twi",
+        "tyv": "Tuviniaans",
+        "udm": "Udmurts",
+        "uga": "Ugaritisch",
+        "uig": "Oeigoers; Oejgoers",
+        "ukr": "Oekraïens",
+        "umb": "Umbundu",
+        "und": "Onbepaald",
+        "urd": "Urdu",
+        "uzb": "Oezbeeks",
+        "vai": "Vai",
+        "ven": "Venda",
+        "vie": "Vietnamees",
+        "vol": "Volapük",
+        "vot": "Votisch",
+        "wal": "Walamo",
+        "war": "Waray (Filipijns)",
+        "was": "Wasjo",
+        "wln": "Waals",
+        "wol": "Wolof",
+        "xal": "Kalmyk",
+        "xho": "Xhosa",
+        "yao": "Yao",
+        "yap": "Yapees",
+        "yid": "Jiddisch",
+        "yor": "Yoruba",
+        "zap": "Zapotec",
+        "zbl": "Blissymbolen",
+        "zen": "Zenaga",
+        "zha": "Zhuang, Tsjoeang",
+        "zho": "Chinees",
+        "zul": "Zoeloe",
+        "zun": "Zuni",
+        "zxx": "Geen linguïstische inhoud",
+        "zza": "Zaza"
+    },
+    "pl": {
+        "aar": "afarski",
+        "abk": "abchaski",
+        "ace": "aczineski",
+        "ach": "aczoli",
+        "ada": "adangme",
+        "ady": "adygejski",
+        "afh": "afrihili",
+        "afr": "afrykanerski",
+        "ain": "ajnoski (Japonia)",
+        "aka": "akan",
+        "akk": "akadyjski",
+        "ale": "aleucki",
+        "alt": "ałtajski południowy",
+        "amh": "amharski",
+        "ang": "Staroangielski (ok. 450-1100)",
+        "anp": "angika",
+        "ara": "arabski",
+        "arc": "aramejski oficjalny (700-300 p.n.e.)",
+        "arg": "aragoński",
+        "arn": "araukański",
+        "arp": "arapaho",
+        "arw": "arawak",
+        "asm": "asamski",
+        "ast": "asturyjski",
+        "ava": "awarski",
+        "ave": "awestyjski",
+        "awa": "awadhi",
+        "aym": "ajmara",
+        "aze": "azerski",
+        "bak": "baszkirski",
+        "bal": "baluczi",
+        "bam": "bambara",
+        "ban": "balijski",
+        "bas": "basa (Kamerun)",
+        "bej": "bedża",
+        "bel": "białoruski",
+        "bem": "bemba (Zambia)",
+        "ben": "bengalski",
+        "bho": "bhodźpuri",
+        "bik": "bikol",
+        "bin": "edo",
+        "bis": "bislama",
+        "bla": "siksika",
+        "bod": "tybetański",
+        "bos": "bośniacki",
+        "bra": "bradź",
+        "bre": "bretoński",
+        "bua": "buriacki",
+        "bug": "bugijski",
+        "bul": "bułgarski",
+        "byn": "blin",
+        "cad": "kaddo",
+        "car": "karaibski galibi",
+        "cat": "kataloński",
+        "ceb": "cebuański",
+        "ces": "czeski",
+        "cha": "czamorro",
+        "chb": "czibcza",
+        "che": "czeczeński",
+        "chg": "czagatajski",
+        "chk": "chuuk",
+        "chm": "maryjski (Rosja)",
+        "chn": "żargon chinoocki",
+        "cho": "czoktaw",
+        "chp": "chipewyan",
+        "chr": "czerokeski",
+        "chu": "starosłowiański",
+        "chv": "czuwaski",
+        "chy": "czejeński",
+        "cop": "koptyjski",
+        "cor": "kornijski",
+        "cos": "korsykański",
+        "cre": "kri",
+        "crh": "krymskotatarski",
+        "csb": "kaszubski",
+        "cym": "walijski",
+        "dak": "dakota",
+        "dan": "duński",
+        "dar": "dargwijski",
+        "del": "delaware",
+        "den": "slavey (atapaskański)",
+        "deu": "niemiecki",
+        "dgr": "dogrib",
+        "din": "dinka",
+        "div": "malediwski; divehi",
+        "doi": "dogri (makrojęzyk)",
+        "dsb": "dolnołużycki",
+        "dua": "duala",
+        "dum": "holenderski średniowieczny (ok. 1050-1350)",
+        "dyu": "diula",
+        "dzo": "dzongka",
+        "efi": "efik",
+        "egy": "egipski (starożytny)",
+        "eka": "ekajuk",
+        "ell": "grecki współczesny (1453-)",
+        "elx": "elamicki",
+        "eng": "Angielski",
+        "enm": "angielski średniowieczny (1100-1500)",
+        "epo": "esperanto",
+        "est": "estoński",
+        "eus": "baskijski",
+        "ewe": "ewe",
+        "ewo": "ewondo",
+        "fan": "fang (Gwinea Równikowa)",
+        "fao": "farerski",
+        "fas": "perski",
+        "fat": "fanti",
+        "fij": "fidżyjski",
+        "fil": "pilipino",
+        "fin": "fiński",
+        "fon": "fon",
+        "fra": "francuski",
+        "frm": "francuski średniowieczny (ok. 1400-1600)",
+        "fro": "starofrancuski (842-ok. 1400)",
+        "frr": "północnofryzyjski",
+        "frs": "wschodniofryzyjski",
+        "fry": "zachodniofryzyjski",
+        "ful": "fulani",
+        "fur": "friulski",
+        "gaa": "ga",
+        "gay": "gayo",
+        "gba": "gbaya (Republika Środkowoafrykańska)",
+        "gez": "gyyz",
+        "gil": "gilbertański",
+        "gla": "szkocki gaelicki",
+        "gle": "irlandzki",
+        "glg": "galicyjski",
+        "glv": "manx",
+        "gmh": "średnio-wysoko-niemiecki (ok. 1050-1500)",
+        "goh": "staro-wysoko-niemiecki (ok. 750-1050)",
+        "gon": "gondi",
+        "gor": "gorontalo",
+        "got": "gocki",
+        "grb": "grebo",
+        "grc": "grecki starożytny (do 1453)",
+        "grn": "guarani",
+        "gsw": "niemiecki szwajcarski",
+        "guj": "gudźarati",
+        "gwi": "gwichʼin",
+        "hai": "haida",
+        "hat": "kreolski haitański",
+        "hau": "hausa",
+        "haw": "hawajski",
+        "heb": "hebrajski",
+        "her": "herero",
+        "hil": "hiligajnon",
+        "hin": "hindi",
+        "hit": "hetycki",
+        "hmn": "hmong",
+        "hmo": "hiri motu",
+        "hrv": "chorwacki",
+        "hsb": "górnołużycki",
+        "hun": "węgierski",
+        "hup": "hupa",
+        "hye": "ormiański",
+        "iba": "ibanag",
+        "ibo": "ibo",
+        "ido": "ido",
+        "iii": "syczuański",
+        "iku": "inuktitut",
+        "ile": "interlingue",
+        "ilo": "ilokano",
+        "ina": "interlingua (Międzynarodowe Stowarzyszenie Języka Pomocniczego)",
+        "ind": "indonezyjski",
+        "inh": "inguski",
+        "ipk": "inupiaq",
+        "isl": "islandzki",
+        "ita": "włoski",
+        "jav": "jawajski",
+        "jbo": "lojban",
+        "jpn": "japoński",
+        "jpr": "judeo-perski",
+        "jrb": "judeoarabski",
+        "kaa": "karakałpacki",
+        "kab": "kabylski",
+        "kac": "kaczin",
+        "kal": "kalaallisut",
+        "kam": "kamba (Kenia)",
+        "kan": "kannada",
+        "kas": "kaszmirski",
+        "kat": "gruziński",
+        "kau": "kanuri",
+        "kaw": "kawi",
+        "kaz": "kazaski",
+        "kbd": "kabardyjski",
+        "kha": "khasi",
+        "khm": "środkowokhmerski",
+        "kho": "chotański",
+        "kik": "kikiju",
+        "kin": "ruanda",
+        "kir": "kirgiski",
+        "kmb": "kimbundu",
+        "kok": "konkani (makrojęzyk)",
+        "kom": "komi",
+        "kon": "kongo",
+        "kor": "koreański",
+        "kos": "kosrae",
+        "kpe": "kpelle",
+        "krc": "karaczajsko-bałkarski",
+        "krl": "karelski",
+        "kru": "kurukh",
+        "kua": "kwanyama",
+        "kum": "kumycki",
+        "kur": "kurdyjski",
+        "kut": "kutenai",
+        "lad": "ladino",
+        "lah": "lahnda",
+        "lam": "lamba",
+        "lao": "laotański",
+        "lat": "łaciński",
+        "lav": "łotewski",
+        "lez": "lezgiński",
+        "lim": "limburgijski",
+        "lin": "lingala",
+        "lit": "litewski",
+        "lol": "mongo",
+        "loz": "lozi",
+        "ltz": "luksemburski",
+        "lua": "luba-lulua",
+        "lub": "luba-katanga",
+        "lug": "luganda",
+        "lui": "luiseno",
+        "lun": "lunda",
+        "luo": "luo (Kenia i Tanzania)",
+        "lus": "lushai",
+        "mad": "madurajski",
+        "mag": "magahi",
+        "mah": "marshalski",
+        "mai": "maithili",
+        "mak": "makasar",
+        "mal": "malajalam",
+        "man": "mandingo",
+        "mar": "marathi",
+        "mas": "masajski",
+        "mdf": "moksza",
+        "mdr": "mandar",
+        "men": "mende (Sierra Leone)",
+        "mga": "irlandzki średniowieczny (900-1200)",
+        "mic": "micmac",
+        "min": "minangkabau",
+        "mis": "języki niezakodowane",
+        "mkd": "macedoński",
+        "mlg": "malgaski",
+        "mlt": "maltański",
+        "mnc": "mandżurski",
+        "mni": "manipuri",
+        "moh": "mohawk",
+        "mon": "mongolski",
+        "mos": "mossi",
+        "mri": "maoryski",
+        "msa": "malajski (makrojęzyk)",
+        "mul": "wiele języków",
+        "mus": "krik",
+        "mwl": "mirandyjski",
+        "mwr": "marwari",
+        "mya": "birmański",
+        "myv": "erzja",
+        "nap": "neapolitański",
+        "nau": "nauruański",
+        "nav": "navaho",
+        "nbl": "ndebele południowy",
+        "nde": "ndebele północny",
+        "ndo": "ndonga",
+        "nds": "German; Low",
+        "nep": "nepalski",
+        "new": "newarski",
+        "nia": "nias",
+        "niu": "niue",
+        "nld": "holenderski",
+        "nno": "norweski Nynorsk",
+        "nob": "norweski Bokmål",
+        "nog": "nogajski",
+        "non": "staronordyjski",
+        "nor": "norweski",
+        "nqo": "n’ko",
+        "nso": "sotho północny",
+        "nwc": "newarski klasyczny",
+        "nya": "njandża",
+        "nym": "nyamwezi",
+        "nyn": "nyankole",
+        "nyo": "nyoro",
+        "nzi": "nzema",
+        "oci": "okcytański (po 1500)",
+        "oji": "odżibwe",
+        "ori": "orija",
+        "orm": "oromo",
+        "osa": "osage",
+        "oss": "osetyjski",
+        "ota": "turecki otomański (1500-1928)",
+        "pag": "pangasino",
+        "pal": "pahlawi",
+        "pam": "pampango",
+        "pan": "pendżabski",
+        "pap": "papiamento",
+        "pau": "palau",
+        "peo": "staroperski (ok. 600-400 p.n.e)",
+        "phn": "fenicki",
+        "pli": "pali",
+        "pol": "Polski",
+        "pon": "pohnpei",
+        "por": "portugalski",
+        "pro": "prowansalski średniowieczny (do 1500)",
+        "pus": "paszto",
+        "que": "keczua",
+        "raj": "radźasthani",
+        "rap": "rapanui",
+        "rar": "maoryski Wysp Cooka",
+        "roh": "retoromański",
+        "rom": "romski",
+        "ron": "rumuński",
+        "run": "rundi",
+        "rup": "arumuński",
+        "rus": "rosyjski",
+        "sad": "sandawe",
+        "sag": "sango",
+        "sah": "jakucki",
+        "sam": "samarytański aramejski",
+        "san": "sanskryt",
+        "sas": "sasak",
+        "sat": "santali",
+        "scn": "sycylijski",
+        "sco": "scots",
+        "sel": "selkupski",
+        "sga": "staroirlandzki (do 900)",
+        "shn": "szan",
+        "sid": "sidamo",
+        "sin": "syngaleski",
+        "slk": "słowacki",
+        "slv": "słoweński",
+        "sma": "południowolapoński",
+        "sme": "północnolapoński",
+        "smj": "lapoński lule",
+        "smn": "lapoński inari",
+        "smo": "samoański",
+        "sms": "lapoński skolt",
+        "sna": "shona",
+        "snd": "sindhi",
+        "snk": "soninke",
+        "sog": "sogdiański",
+        "som": "somalijski",
+        "sot": "sotho południowy",
+        "spa": "hiszpański",
+        "sqi": "albański",
+        "srd": "sardyński",
+        "srn": "sranan tongo",
+        "srp": "serbski",
+        "srr": "serer",
+        "ssw": "suazi",
+        "suk": "sukuma",
+        "sun": "sundajski",
+        "sus": "susu",
+        "sux": "sumeryjski",
+        "swa": "suahili (makrojęzyk)",
+        "swe": "szwedzki",
+        "syc": "syryjski klasyczny",
+        "syr": "syryjski",
+        "tah": "tahitański",
+        "tam": "tamilski",
+        "tat": "tatarski",
+        "tel": "telugu",
+        "tem": "temne",
+        "ter": "tereno",
+        "tet": "tetum",
+        "tgk": "tadżycki",
+        "tgl": "tagalski",
+        "tha": "tajski",
+        "tig": "tigre",
+        "tir": "tigrinia",
+        "tiv": "tiw",
+        "tkl": "tokelau",
+        "tlh": "klingoński",
+        "tli": "tlingit",
+        "tmh": "tuareski",
+        "tog": "tongański (Nyasa)",
+        "ton": "tongański (Wyspy Tonga)",
+        "tpi": "tok pisin",
+        "tsi": "tsimszian",
+        "tsn": "tswana",
+        "tso": "tsonga",
+        "tuk": "turkmeński",
+        "tum": "tumbuka",
+        "tur": "turecki",
+        "tvl": "tuvalu",
+        "twi": "twi",
+        "tyv": "tuwiński",
+        "udm": "udmurcki",
+        "uga": "ugarycki",
+        "uig": "ujgurski",
+        "ukr": "ukraiński",
+        "umb": "umbundu",
+        "und": "nieokreślony",
+        "urd": "urdu",
+        "uzb": "uzbecki",
+        "vai": "wai",
+        "ven": "venda",
+        "vie": "wietnamski",
+        "vol": "wolapik",
+        "vot": "wotycki",
+        "wal": "walamo",
+        "war": "warajski (Filipiny)",
+        "was": "washo",
+        "wln": "waloński",
+        "wol": "wolof",
+        "xal": "kałmucki",
+        "xho": "xhosa",
+        "yao": "yao",
+        "yap": "japski",
+        "yid": "jidysz",
+        "yor": "joruba",
+        "zap": "zapotecki",
+        "zbl": "bliss",
+        "zen": "zenaga",
+        "zha": "zhuang",
+        "zho": "chiński",
+        "zul": "zuluski",
+        "zun": "zuni",
+        "zxx": "brak kontekstu językowego",
+        "zza": "zazaki"
+    },
+    "ru": {
+        "aar": "Афар",
+        "abk": "Абхазский",
+        "ace": "Ачехский",
+        "ach": "Ачоли",
+        "ada": "Адангме",
+        "ady": "Адыгейский",
+        "afh": "Африхили",
+        "afr": "Африкаанс",
+        "ain": "Ainu (Japan)",
+        "aka": "Акан",
+        "akk": "Аккадский",
+        "ale": "Алеутский",
+        "alt": "Altai; Southern",
+        "amh": "Амхарский (Амаринья)",
+        "ang": "English; Old (ca. 450-1100)",
+        "anp": "Анжика",
+        "ara": "Арабский",
+        "arc": "Арамейский; Официальный",
+        "arg": "Арагонский",
+        "arn": "Mapudungun",
+        "arp": "Арапахо",
+        "arw": "Аравакский",
+        "asm": "Ассамский",
+        "ast": "Астурийский",
+        "ava": "Аварский",
+        "ave": "Авестийский",
+        "awa": "Авадхи",
+        "aym": "Аймара",
+        "aze": "Азербайджанский",
+        "bak": "Башкирский",
+        "bal": "Baluchi",
+        "bam": "Бамбара",
+        "ban": "Балийский",
+        "bas": "Баса (Камерун)",
+        "bej": "Беджа",
+        "bel": "Белорусский",
+        "bem": "Бемба (Замбия)",
+        "ben": "Бенгальский",
+        "bho": "Бходжпури",
+        "bik": "Бикольский",
+        "bin": "Бини",
+        "bis": "Бислама",
+        "bla": "Сиксика",
+        "bod": "Тибетский",
+        "bos": "Боснийский",
+        "bra": "Браун",
+        "bre": "Бретонский",
+        "bua": "Бурятский",
+        "bug": "Бугийский",
+        "bul": "Болгарский",
+        "byn": "Bilin",
+        "cad": "Каддо",
+        "car": "Carib; Galibi",
+        "cat": "Каталанский",
+        "ceb": "Себуано",
+        "ces": "Чешский",
+        "cha": "Чаморро",
+        "chb": "Чибча",
+        "che": "Чеченский",
+        "chg": "Чагатайский",
+        "chk": "Трукский",
+        "chm": "Марийский (Россия)",
+        "chn": "Чинук жаргон",
+        "cho": "Чоктав",
+        "chp": "Чипевианский",
+        "chr": "Чероки",
+        "chu": "Slavonic; Old",
+        "chv": "Чувашский",
+        "chy": "Чейенн",
+        "cop": "Коптский",
+        "cor": "Корнский",
+        "cos": "Корсиканский",
+        "cre": "Кри",
+        "crh": "Turkish; Crimean",
+        "csb": "Кашубианский",
+        "cym": "Уэльский (Валлийский)",
+        "dak": "Дакота",
+        "dan": "Датский",
+        "dar": "Даргва",
+        "del": "Делаварский",
+        "den": "Атапачские языки",
+        "deu": "Немецкий",
+        "dgr": "Догриб",
+        "din": "Динка",
+        "div": "Dhivehi",
+        "doi": "Dogri (macrolanguage)",
+        "dsb": "Sorbian; Lower",
+        "dua": "Дуала",
+        "dum": "Dutch; Middle (ca. 1050-1350)",
+        "dyu": "Диула (Дьюла)",
+        "dzo": "Дзонг-кэ",
+        "efi": "Эфик",
+        "egy": "Древнеегипетский",
+        "eka": "Экаджук",
+        "ell": "Новогреческий (с 1453)",
+        "elx": "Эламский",
+        "eng": "Английский",
+        "enm": "Среднеанглийский (1100-1500)",
+        "epo": "Эсперанто",
+        "est": "Эстонский",
+        "eus": "Баскский",
+        "ewe": "Эве",
+        "ewo": "Эвондо",
+        "fan": "Fang (Equatorial Guinea)",
+        "fao": "Фарерский",
+        "fas": "Персидский",
+        "fat": "Фанти",
+        "fij": "Фиджийский",
+        "fil": "Filipino",
+        "fin": "Финский",
+        "fon": "Фон",
+        "fra": "Французский",
+        "frm": "French; Middle (ca. 1400-1600)",
+        "fro": "French; Old (842-ca. 1400)",
+        "frr": "Frisian; Northern",
+        "frs": "Frisian; Eastern",
+        "fry": "Frisian; Western",
+        "ful": "Фулах",
+        "fur": "Фриулианский",
+        "gaa": "Га",
+        "gay": "Гайо",
+        "gba": "Gbaya (Central African Republic)",
+        "gez": "Геэз",
+        "gil": "Гильбертский",
+        "gla": "Gaelic; Scottish",
+        "gle": "Ирландский",
+        "glg": "Galician",
+        "glv": "Мэнкский",
+        "gmh": "German; Middle High (ca. 1050-1500)",
+        "goh": "German; Old High (ca. 750-1050)",
+        "gon": "Гонди",
+        "gor": "Горонтало",
+        "got": "Готский",
+        "grb": "Гребо",
+        "grc": "Древнегреческий (по 1453)",
+        "grn": "Гуарани",
+        "gsw": "German; Swiss",
+        "guj": "Гуджарати",
+        "gwi": "Gwichʼin",
+        "hai": "Хайда",
+        "hat": "Creole; Haitian",
+        "hau": "Хауса",
+        "haw": "Гавайский",
+        "heb": "Иврит",
+        "her": "Гереро",
+        "hil": "Хилигайнон",
+        "hin": "Хинди",
+        "hit": "Хиттит",
+        "hmn": "Хмонг",
+        "hmo": "Хири Моту",
+        "hrv": "Хорватский",
+        "hsb": "Sorbian; Upper",
+        "hun": "Венгерский",
+        "hup": "Хупа",
+        "hye": "Армянский",
+        "iba": "Ибанский",
+        "ibo": "Игбо",
+        "ido": "Идо",
+        "iii": "Yi; Sichuan",
+        "iku": "Инуктитут",
+        "ile": "Интерлингве",
+        "ilo": "Илоко",
+        "ina": "Интерлингва (Ассоциация международного вспомогательного языка)",
+        "ind": "Индонезийский",
+        "inh": "Ингушский",
+        "ipk": "Инулиак",
+        "isl": "Исландский",
+        "ita": "Итальянский",
+        "jav": "Яванский",
+        "jbo": "Лоджбан",
+        "jpn": "Японский",
+        "jpr": "Еврейско-персидский",
+        "jrb": "Еврейско-арабский",
+        "kaa": "Каракалпакский",
+        "kab": "Кабильский",
+        "kac": "Качинский",
+        "kal": "Kalaallisut",
+        "kam": "Kamba (Kenya)",
+        "kan": "Каннада",
+        "kas": "Кашмири",
+        "kat": "Грузинский",
+        "kau": "Канури",
+        "kaw": "Кави",
+        "kaz": "Казахский",
+        "kbd": "Кабардинский",
+        "kha": "Кхаси",
+        "khm": "Khmer; Central",
+        "kho": "Хотанский",
+        "kik": "Кикуйю",
+        "kin": "Киньяруанда",
+        "kir": "Киргизский",
+        "kmb": "Кимбунду",
+        "kok": "Konkani (macrolanguage)",
+        "kom": "Коми",
+        "kon": "Конго",
+        "kor": "Корейский",
+        "kos": "Косраинский",
+        "kpe": "Кпелле",
+        "krc": "Карачаево-балкарский",
+        "krl": "Карельский",
+        "kru": "Курух",
+        "kua": "Киньяма",
+        "kum": "Кумыкский",
+        "kur": "Курдский",
+        "kut": "Кутенаи",
+        "lad": "Ладино",
+        "lah": "Лахнда",
+        "lam": "Ламба",
+        "lao": "Лаосский",
+        "lat": "Латинский",
+        "lav": "Латвийский",
+        "lez": "Лезгинский",
+        "lim": "Limburgan",
+        "lin": "Лингала",
+        "lit": "Литовский",
+        "lol": "Монго",
+        "loz": "Лози",
+        "ltz": "Luxembourgish",
+        "lua": "Луба-Лулуа",
+        "lub": "Луба-Катанга",
+        "lug": "Ганда",
+        "lui": "Луисеньо",
+        "lun": "Лунда",
+        "luo": "Луо (Кения и Танзания)",
+        "lus": "Лушай",
+        "mad": "Мадурский",
+        "mag": "Магахи",
+        "mah": "Marshallese",
+        "mai": "Майтхили",
+        "mak": "Макассарский",
+        "mal": "Малаялам",
+        "man": "Мандинго",
+        "mar": "Маратхи",
+        "mas": "Масаи",
+        "mdf": "Мокшанский",
+        "mdr": "Мандарский",
+        "men": "Mende (Sierra Leone)",
+        "mga": "Среднеирландский (900-1200)",
+        "mic": "Mi'kmaq",
+        "min": "Минангкабау",
+        "mis": "Uncoded languages",
+        "mkd": "Македонский",
+        "mlg": "Малагаси",
+        "mlt": "Мальтийский",
+        "mnc": "Манчу",
+        "mni": "Манипури",
+        "moh": "Мохаук",
+        "mon": "Монгольский",
+        "mos": "Моей",
+        "mri": "Маори",
+        "msa": "Malay (macrolanguage)",
+        "mul": "Разных семей языки",
+        "mus": "Крик",
+        "mwl": "Мирандские",
+        "mwr": "Марвари",
+        "mya": "Бирманский",
+        "myv": "Эрзянский",
+        "nap": "Неаполитанский",
+        "nau": "Науру",
+        "nav": "Navajo",
+        "nbl": "Ндебеле южный",
+        "nde": "Ндебеле северный",
+        "ndo": "Ндунга",
+        "nds": "German; Low",
+        "nep": "Непальский",
+        "new": "Bhasa; Nepal",
+        "nia": "Ниас",
+        "niu": "Ниуэ",
+        "nld": "Нидерландский",
+        "nno": "Норвежский Нюнорск",
+        "nob": "Norwegian Bokmål",
+        "nog": "Ногайский",
+        "non": "Старонорвежский",
+        "nor": "Норвежский",
+        "nqo": "Н'ко",
+        "nso": "Sotho; Northern",
+        "nwc": "Newari; Old",
+        "nya": "Nyanja",
+        "nym": "Ньямвези",
+        "nyn": "Ньянколе",
+        "nyo": "Ньоро",
+        "nzi": "Нзима",
+        "oci": "Occitan (post 1500)",
+        "oji": "Оджибва",
+        "ori": "Ория",
+        "orm": "Оромо",
+        "osa": "Оседжи",
+        "oss": "Ossetian",
+        "ota": "Турецкий; Отомангский (1500-1928)",
+        "pag": "Пангасинан",
+        "pal": "Пехлевийский",
+        "pam": "Пампанга",
+        "pan": "Panjabi",
+        "pap": "Папьяменто",
+        "pau": "Палау",
+        "peo": "Persian; Old (ca. 600-400 B.C.)",
+        "phn": "Финикийский",
+        "pli": "Пали",
+        "pol": "Польский",
+        "pon": "Фонпейский",
+        "por": "Португальский",
+        "pro": "Старопровансальский (по 1500)",
+        "pus": "Пушту",
+        "que": "Кечуа",
+        "raj": "Раджастхани",
+        "rap": "Рапаню",
+        "rar": "Maori; Cook Islands",
+        "roh": "Romansh",
+        "rom": "Цыганский",
+        "ron": "Румынский",
+        "run": "Рунди",
+        "rup": "Romanian; Macedo-",
+        "rus": "Русский",
+        "sad": "Сандаве",
+        "sag": "Санго",
+        "sah": "Якутский",
+        "sam": "Aramaic; Samaritan",
+        "san": "Санскрит",
+        "sas": "Сасакский",
+        "sat": "Сантали",
+        "scn": "Сицилийский",
+        "sco": "Шотландский",
+        "sel": "Селкапский",
+        "sga": "Староирландский (по 900)",
+        "shn": "Шанский",
+        "sid": "Сидама",
+        "sin": "Сингальский",
+        "slk": "Словацкий",
+        "slv": "Словенский",
+        "sma": "Sami; Southern",
+        "sme": "Sami; Northern",
+        "smj": "Люле-саамский",
+        "smn": "Sami; Inari",
+        "smo": "Самоанский",
+        "sms": "Sami; Skolt",
+        "sna": "Шона",
+        "snd": "Синдхи",
+        "snk": "Сонинк",
+        "sog": "Согдийский",
+        "som": "Сомали",
+        "sot": "Сото Южный",
+        "spa": "Испанский",
+        "sqi": "Албанский",
+        "srd": "Сардинский",
+        "srn": "Sranan Tongo",
+        "srp": "Сербский",
+        "srr": "Серер",
+        "ssw": "Свати",
+        "suk": "Сукума",
+        "sun": "Сунданский",
+        "sus": "Сусу",
+        "sux": "Шумерский",
+        "swa": "Swahili (macrolanguage)",
+        "swe": "Шведский",
+        "syc": "Syriac; Classical",
+        "syr": "Сирийский",
+        "tah": "Таитянский",
+        "tam": "Тамильский",
+        "tat": "Татарский",
+        "tel": "Телугу",
+        "tem": "Темне",
+        "ter": "Терено",
+        "tet": "Тетумский",
+        "tgk": "Таджикский",
+        "tgl": "Тагалог",
+        "tha": "Таи",
+        "tig": "Тигре",
+        "tir": "Тигринья",
+        "tiv": "Тив",
+        "tkl": "Токелау",
+        "tlh": "Klingon",
+        "tli": "Тлингит",
+        "tmh": "Тамашек",
+        "tog": "Тонга (Ньяса)",
+        "ton": "Тонга (острова Тонга)",
+        "tpi": "Ток Писин",
+        "tsi": "Цимшиан",
+        "tsn": "Тсвана",
+        "tso": "Тсонга",
+        "tuk": "Туркменский",
+        "tum": "Тумбука",
+        "tur": "Турецкий",
+        "tvl": "Тувалу",
+        "twi": "Тви",
+        "tyv": "Тувинский",
+        "udm": "Удмуртский",
+        "uga": "Угаритский",
+        "uig": "Уйгурский",
+        "ukr": "Украинский",
+        "umb": "Умбунду",
+        "und": "Неидентифицированный",
+        "urd": "Урду",
+        "uzb": "Узбекский",
+        "vai": "Ваи",
+        "ven": "Венда",
+        "vie": "Вьетнамский",
+        "vol": "Волапюк",
+        "vot": "Вотик",
+        "wal": "Wolaytta",
+        "war": "Waray (Philippines)",
+        "was": "Вашо",
+        "wln": "Валлун",
+        "wol": "Волоф",
+        "xal": "Kalmyk",
+        "xho": "Коса",
+        "yao": "Яо",
+        "yap": "Яапийский",
+        "yid": "Идиш",
+        "yor": "Йоруба",
+        "zap": "Сапотекский",
+        "zbl": "Blissymbols",
+        "zen": "Зенагский",
+        "zha": "Чжуанский",
+        "zho": "Китайский",
+        "zul": "Зулусский",
+        "zun": "Зуньи",
+        "zxx": "Нет языкового содержимого",
+        "zza": "Зазаки"
+    },
     "sv": {
         "aar": "Afar",
         "abk": "Abchaziska",
@@ -6220,845 +5847,1218 @@ LANGUAGE_NAMES = {
         "zxx": "No linguistic content",
         "zza": "Zaza"
     },
-    "cs": {
-        "aar": "afarština",
-        "abk": "abchazajština",
-        "ace": "atěžština",
-        "ach": "ačoli (luoština)",
-        "ada": "adangmeština",
-        "ady": "adyghe",
-        "afh": "afrihilijština",
-        "afr": "afrikánština",
-        "ain": "ainu (Japonsko)",
-        "aka": "akanština",
-        "akk": "akkadština",
-        "ale": "aleutština",
-        "alt": "altajština; jižní",
-        "amh": "Amharština",
-        "ang": "Angličtina; stará (asi 450-1100)",
-        "anp": "angika",
-        "ara": "arabština",
-        "arc": "aramejština; oficiální (700-300 př. n. l.)",
-        "arg": "aragonská španělština",
-        "arn": "mapudungun",
-        "arp": "arapaho",
-        "arw": "arawacké jazyky",
-        "asm": "ásámština",
-        "ast": "asturština",
-        "ava": "avarština",
-        "ave": "avestština",
-        "awa": "avadhština (avadhí)",
-        "aym": "aymarština",
-        "aze": "azerbajdžánština",
-        "bak": "Baskirština",
-        "bal": "balúčština",
-        "bam": "bambarština",
-        "ban": "balijština",
-        "bas": "basa (Kamerun)",
-        "bej": "bedža",
-        "bel": "běloruština",
-        "bem": "bemba (Zambie)",
-        "ben": "bengálština",
-        "bho": "bhódžpurština",
-        "bik": "bikolština",
-        "bin": "bini",
-        "bis": "bislamština",
-        "bla": "siksika",
-        "bod": "tibetština",
-        "bos": "bosenština",
-        "bra": "bradžština",
-        "bre": "bretonština",
-        "bua": "burjatština",
-        "bug": "bugiština",
-        "bul": "bulharština",
-        "byn": "bilin",
-        "cad": "caddo",
-        "car": "carib; Galibi",
-        "cat": "katalánština",
-        "ceb": "cebuánština",
-        "ces": "Čeština",
-        "cha": "čamoro",
-        "chb": "čibča",
-        "che": "čečenština",
-        "chg": "Chagatai",
-        "chk": "čukčtina",
-        "chm": "Mari (Russia)",
-        "chn": "činuk pidžin",
-        "cho": "choctawština",
-        "chp": "čipeva",
-        "chr": "čerokézština",
-        "chu": "Slavonic; Old",
-        "chv": "čuvaština",
-        "chy": "čejenština",
-        "cop": "koptština",
-        "cor": "kornština",
-        "cos": "korsičtina",
-        "cre": "krí",
-        "crh": "Turkish; Crimean",
-        "csb": "kašubština",
-        "cym": "velština",
-        "dak": "dakotština",
-        "dan": "dánština",
-        "dar": "dargwa",
-        "del": "delawarština",
-        "den": "atabaské jazyky",
-        "deu": "Němčina",
-        "dgr": "dogrib",
-        "din": "dinkština",
-        "div": "Dhivehi",
-        "doi": "Dogri (macrolanguage)",
-        "dsb": "Sorbian; Lower",
-        "dua": "dualština",
-        "dum": "Dutch; Middle (ca. 1050-1350)",
-        "dyu": "djula",
-        "dzo": "Bhútánština",
-        "efi": "efik",
-        "egy": "egyptština (starověká)",
-        "eka": "ekajuk",
-        "ell": "řečtina; moderní (1453-)",
-        "elx": "elamština",
-        "eng": "Angličtina",
-        "enm": "Angličtina; středověká (1100-1500)",
-        "epo": "esperanto",
-        "est": "estonština",
-        "eus": "baskičtina",
-        "ewe": "eweština",
-        "ewo": "ewondo",
-        "fan": "Fang (Equatorial Guinea)",
-        "fao": "faerština",
-        "fas": "perština",
-        "fat": "fantiština",
-        "fij": "Fidži",
-        "fil": "Filipino",
-        "fin": "finština",
-        "fon": "fonština",
-        "fra": "francouzština",
-        "frm": "French; Middle (ca. 1400-1600)",
-        "fro": "French; Old (842-ca. 1400)",
-        "frr": "Frisian; Northern",
-        "frs": "Frisian; Eastern",
-        "fry": "Frisian; Western",
-        "ful": "fulahština",
-        "fur": "furlanština",
-        "gaa": "ga",
-        "gay": "gayo",
-        "gba": "Gbaya (Central African Republic)",
-        "gez": "etiopština",
-        "gil": "kiribatština",
-        "gla": "Gaelic; Scottish",
-        "gle": "irština",
-        "glg": "Galician",
-        "glv": "manština",
-        "gmh": "German; Middle High (ca. 1050-1500)",
-        "goh": "German; Old High (ca. 750-1050)",
-        "gon": "góndština",
-        "gor": "gorontalo",
-        "got": "gótština",
-        "grb": "grebo",
-        "grc": "řečtina; starověká (do 1453)",
-        "grn": "Guaranština",
-        "gsw": "German; Swiss",
-        "guj": "Gudžarátština",
-        "gwi": "Gwichʼin",
-        "hai": "haida",
-        "hat": "Creole; Haitian",
-        "hau": "Hausa",
-        "haw": "havajština",
-        "heb": "hebrejština",
-        "her": "herero",
-        "hil": "hiligayonština",
-        "hin": "hindština",
-        "hit": "chetitština",
-        "hmn": "hmongština",
-        "hmo": "hiri motu",
-        "hrv": "chorvatština",
-        "hsb": "Sorbian; Upper",
-        "hun": "maďarština",
-        "hup": "hupa",
-        "hye": "arménština",
-        "iba": "iban",
-        "ibo": "igbo",
-        "ido": "ido",
-        "iii": "Yi; Sichuan",
-        "iku": "Inuktitutština",
-        "ile": "Interlingue",
-        "ilo": "ilokánština",
-        "ina": "Interlingua (Mezinárodní pomocná jazyková asociace)",
-        "ind": "indonézština",
-        "inh": "inguština",
-        "ipk": "Inupiakština",
-        "isl": "islandština",
-        "ita": "italština",
-        "jav": "jávština",
-        "jbo": "lojban",
-        "jpn": "japonština",
-        "jpr": "judeo-perština",
-        "jrb": "judeo-arabština",
-        "kaa": "karakalpačtina",
-        "kab": "kabulí",
-        "kac": "kačjinština",
-        "kal": "Kalaallisut",
-        "kam": "Kamba (Kenya)",
-        "kan": "Kannadština",
-        "kas": "kašmírština",
-        "kat": "Gruzínština",
-        "kau": "kanuri",
-        "kaw": "kawi",
-        "kaz": "Kazachština",
-        "kbd": "kabardština",
-        "kha": "Khasi",
-        "khm": "Khmer; Central",
-        "kho": "chotánština",
-        "kik": "Kikuyu",
-        "kin": "Kinyarwandština",
-        "kir": "Kirgizština",
-        "kmb": "kimbundština",
-        "kok": "Konkani (macrolanguage)",
-        "kom": "komijština",
-        "kon": "Kongo",
-        "kor": "korejština",
-        "kos": "kosrajština",
-        "kpe": "kpelle",
-        "krc": "karachay-balkarština",
-        "krl": "karelština",
-        "kru": "kurukh",
-        "kua": "Kuanyama",
-        "kum": "kumyčtina",
-        "kur": "kurdština",
-        "kut": "kutenai",
-        "lad": "ladino",
-        "lah": "lahnda",
-        "lam": "lambština",
-        "lao": "Laoština",
-        "lat": "latina",
-        "lav": "Latvian",
-        "lez": "lezgiština",
-        "lim": "Limburgan",
-        "lin": "Ngalština",
-        "lit": "litevština",
-        "lol": "mongština",
-        "loz": "lozština",
-        "ltz": "Luxembourgish",
-        "lua": "luba-luluaština",
-        "lub": "lubu-katanžština",
-        "lug": "Ganda",
-        "lui": "luiseňo",
-        "lun": "lundština",
-        "luo": "luoština (Keňa a Tanzanie)",
-        "lus": "lušáí",
-        "mad": "madurština",
-        "mag": "magahština",
-        "mah": "Marshallese",
-        "mai": "maithilština",
-        "mak": "makasarština",
-        "mal": "Malabarština",
-        "man": "mandingština",
-        "mar": "maráthština",
-        "mas": "masajština",
-        "mdf": "moksha",
-        "mdr": "mandarínština",
-        "men": "Mende (Sierra Leone)",
-        "mga": "irština; středověká (900-1200)",
-        "mic": "Mi'kmaq",
-        "min": "minangkabau",
-        "mis": "Uncoded languages",
-        "mkd": "makedonština",
-        "mlg": "Malgaština",
-        "mlt": "maltézština",
-        "mnc": "manchu",
-        "mni": "manipurština",
-        "moh": "mohawk",
-        "mon": "mongolština",
-        "mos": "mosi",
-        "mri": "maorština",
-        "msa": "Malay (macrolanguage)",
-        "mul": "násobné jazyky",
-        "mus": "krík",
-        "mwl": "mirandština",
-        "mwr": "márvárština",
-        "mya": "Barmština",
-        "myv": "erzya",
-        "nap": "neapolština",
-        "nau": "naurština",
-        "nav": "navažština",
-        "nbl": "Ndebele; South",
-        "nde": "Ndebele; North",
-        "ndo": "ndondština",
-        "nds": "German; Low",
-        "nep": "nepálština",
-        "new": "Bhasa; Nepal",
-        "nia": "nias",
-        "niu": "niue",
-        "nld": "holandština",
-        "nno": "Norwegian Nynorsk",
-        "nob": "Norwegian Bokmål",
-        "nog": "nogai",
-        "non": "norština; stará",
-        "nor": "norština",
-        "nqo": "N'Ko",
-        "nso": "Sotho; Northern",
-        "nwc": "Newari; Old",
-        "nya": "Nyanja",
-        "nym": "ňamwežština",
-        "nyn": "nyankolština",
-        "nyo": "Nyoro",
-        "nzi": "nzima",
-        "oci": "Occitan (post 1500)",
-        "oji": "Ojibwa",
-        "ori": "orija",
-        "orm": "Oromo (Afan)",
-        "osa": "osagština",
-        "oss": "Ossetian",
-        "ota": "turečtina; osmanská (1500-1928)",
-        "pag": "pangsinan",
-        "pal": "pahlaví",
-        "pam": "pampangau",
-        "pan": "Panjabi",
-        "pap": "papiamento",
-        "pau": "palauština",
-        "peo": "Persian; Old (ca. 600-400 B.C.)",
-        "phn": "Slovinština",
-        "pli": "páli",
-        "pol": "Polština",
-        "pon": "pohnpeiština",
-        "por": "portugalština",
-        "pro": "provensálština; stará (do 1500)",
-        "pus": "pašto",
-        "que": "kečuánština",
-        "raj": "rádžasthánština",
-        "rap": "rapanuiština",
-        "rar": "Maori; Cook Islands",
-        "roh": "Romansh",
-        "rom": "římština",
-        "ron": "rumunština",
-        "run": "Kirundi",
-        "rup": "Romanian; Macedo-",
-        "rus": "Ruština",
-        "sad": "sandawština",
-        "sag": "sangoština",
-        "sah": "jakutština",
-        "sam": "Aramaic; Samaritan",
-        "san": "sanskrt",
-        "sas": "sačtina",
-        "sat": "santálí",
-        "scn": "sicilština",
-        "sco": "skotština",
-        "sel": "selkupština",
-        "sga": "irština; stará (do 900)",
-        "shn": "šanština",
-        "sid": "sidamo",
-        "sin": "Sinhálština",
-        "slk": "Slovenština",
-        "slv": "slovinština",
-        "sma": "Sami; Southern",
-        "sme": "Sami; Northern",
-        "smj": "lule sami",
-        "smn": "Sami; Inari",
-        "smo": "Samoyština",
-        "sms": "Sami; Skolt",
-        "sna": "šonština",
-        "snd": "sindhština",
-        "snk": "sonikština",
-        "sog": "sogdijština",
-        "som": "somálština",
-        "sot": "sotština; jižní",
-        "spa": "španělština",
-        "sqi": "albánština",
-        "srd": "sardinština",
-        "srn": "Sranan Tongo",
-        "srp": "srbština",
-        "srr": "Serer",
-        "ssw": "Siswatština",
-        "suk": "sukuma",
-        "sun": "Sundanština",
-        "sus": "susu",
-        "sux": "sumerština",
-        "swa": "svahilština (makrojazyk)",
-        "swe": "švédština",
-        "syc": "Syriac; Classical",
-        "syr": "syrština",
-        "tah": "tahitština",
-        "tam": "Tamilština",
-        "tat": "tatarština",
-        "tel": "Telugu",
-        "tem": "temne",
-        "ter": "tereno",
-        "tet": "tetumština",
-        "tgk": "Tádžičtina",
-        "tgl": "Tagalog",
-        "tha": "thajština",
-        "tig": "tigrejština",
-        "tir": "Tigrinijština",
-        "tiv": "tivština",
-        "tkl": "tokelauština",
-        "tlh": "Klingon",
-        "tli": "tlingit",
-        "tmh": "Tamashek",
-        "tog": "tongština (nyasa)",
-        "ton": "Tonga",
-        "tpi": "tok pisin",
-        "tsi": "tsimshijské jazyky",
-        "tsn": "Setswanština",
-        "tso": "Tsonga",
-        "tuk": "turkmenistánština",
-        "tum": "tumbukština",
-        "tur": "turečtina",
-        "tvl": "tuvalština",
-        "twi": "ťwiština",
-        "tyv": "tuvština",
-        "udm": "udmurtština",
-        "uga": "ugaritština",
-        "uig": "Uighurština",
-        "ukr": "ukrajinština",
-        "umb": "umbundu",
-        "und": "neurčitý",
-        "urd": "urdština",
-        "uzb": "uzbekistánština",
-        "vai": "vai",
-        "ven": "vendština",
-        "vie": "vietnamština",
-        "vol": "volapük",
-        "vot": "votiatština",
-        "wal": "Wolaytta",
-        "war": "Waray (Philippines)",
-        "was": "washo",
-        "wln": "valonština",
-        "wol": "volofština",
-        "xal": "Kalmyk",
-        "xho": "xhoština",
-        "yao": "jaoština",
-        "yap": "japština",
-        "yid": "Jidiš",
-        "yor": "jorubština",
-        "zap": "Zapotec",
-        "zbl": "Blissymbols",
-        "zen": "zenaga",
-        "zha": "Zhuang",
-        "zho": "čínština",
-        "zul": "Zulu",
-        "zun": "zunijština",
-        "zxx": "bez lingvistického obsahu",
-        "zza": "zaza"
-    },
-    "es": {
-        "aar": "Afar",
-        "abk": "Abkhazian",
+    "tr": {
+        "abk": "Abhazca",
         "ace": "Achinese",
         "ach": "Acoli",
         "ada": "Adangme",
         "ady": "Adyghe",
+        "aar": "Afar",
         "afh": "Afrihili",
-        "afr": "Afrikaans",
-        "ain": "Ainu (Japan)",
-        "aka": "Akan",
-        "akk": "Akkadian",
-        "ale": "Aleut",
-        "alt": "Altai; Southern",
-        "amh": "Amharic",
-        "ang": "English; Old (ca. 450-1100)",
+        "afr": "Afrikanca",
+        "ain": "Ainu (Japonca)",
+        "aka": "Akanca (Afrika dili)",
+        "akk": "Akatça",
+        "sqi": "Albanian",
+        "ale": "Alaskaca",
+        "amh": "Etiyopyaca",
         "anp": "Angika",
-        "ara": "Arabic",
-        "arc": "Aramaic; Official (700-300 BCE)",
-        "arg": "Aragonese",
-        "arn": "Mapudungun",
-        "arp": "Arapaho",
-        "arw": "Arawak",
-        "asm": "Assamese",
-        "ast": "Asturian",
-        "ava": "Avaric",
-        "ave": "Avestan",
-        "awa": "Awadhi",
-        "aym": "Aymara",
-        "aze": "Azerbaijani",
-        "bak": "Bashkir",
-        "bal": "Baluchi",
-        "bam": "Bambara",
-        "ban": "Balinese",
-        "bas": "Basa (Cameroon)",
-        "bej": "Beja",
-        "bel": "Belarusian",
+        "ara": "Arapça",
+        "arg": "Aragonca (İspanya)",
+        "arp": "Arapaho (Kuzey Amerika yerlileri)",
+        "arw": "Arawak (Surinam)",
+        "hye": "Ermenice",
+        "asm": "Assamese (Hindistan)",
+        "ast": "Asturyasca",
+        "ava": "Avarca",
+        "ave": "Avestan (Eski İran)",
+        "awa": "Awadhi (Hindistan)",
+        "aym": "Aymara (Güney Amerika)",
+        "aze": "Azerice",
+        "ban": "Balice (Bali adaları)",
+        "bal": "Belucice (İran)",
+        "bam": "Bambara (Mali)",
+        "bas": "Basa (Kamerun)",
+        "bak": "Başkırca",
+        "eus": "Baskça",
+        "bej": "Beja (Eritre; Sudan)",
+        "bel": "Beyaz Rusça",
         "bem": "Bemba (Zambia)",
-        "ben": "Bengali",
-        "bho": "Bhojpuri",
-        "bik": "Bikol",
-        "bin": "Bini",
-        "bis": "Bislama",
-        "bla": "Siksika",
-        "bod": "Tibetan",
-        "bos": "Bosnian",
-        "bra": "Braj",
-        "bre": "Breton",
-        "bua": "Buriat",
-        "bug": "Buginese",
-        "bul": "Bulgarian",
+        "ben": "Bengalce",
+        "bho": "Bhojpuri (Hindistan)",
+        "bik": "Bikol (Filipinler)",
         "byn": "Bilin",
-        "cad": "Caddo",
-        "car": "Carib; Galibi",
-        "cat": "Catalan",
-        "ceb": "Cebuano",
-        "ces": "Czech",
-        "cha": "Chamorro",
-        "chb": "Chibcha",
-        "che": "Chechen",
-        "chg": "Chagatai",
+        "bin": "Bini (Afrika)",
+        "bis": "Bislama (Vanuatu; Kuzey Pasifik)",
+        "zbl": "Blis Sembolleri",
+        "bos": "Boşnakça",
+        "bra": "Braj (Hindistan)",
+        "bre": "Bretonca",
+        "bug": "Buginese (Endonezya)",
+        "bul": "Bulgarca",
+        "bua": "Buriat (Moğolistan)",
+        "mya": "Burmaca",
+        "cad": "Caddo (Kuzey Amerika yerlileri)",
+        "cat": "Katalanca",
+        "ceb": "Cebuano (Filipinler)",
+        "chg": "Çağatayca",
+        "cha": "Chamorro (Guam adaları)",
+        "che": "Çeçence",
+        "chr": "Cherokee (Kuzey Amerika yerlileri)",
+        "chy": "Cheyenne (kuzey Amerika yerlileri)",
+        "chb": "Chibcha (Kolombiya)",
+        "zho": "Çince",
+        "chn": "Chinook lehçesi (Kuzey Batı Amerika kıyıları)",
+        "chp": "Chipewyan (Kuzey Amerika yerlileri)",
+        "cho": "Choctaw (Kuzey Amerika yerlileri)",
         "chk": "Chuukese",
-        "chm": "Mari (Russia)",
-        "chn": "Chinook jargon",
-        "cho": "Choctaw",
-        "chp": "Chipewyan",
-        "chr": "Cherokee",
-        "chu": "Slavonic; Old",
-        "chv": "Chuvash",
-        "chy": "Cheyenne",
-        "cop": "Coptic",
-        "cor": "Cornish",
-        "cos": "Corsican",
-        "cre": "Cree",
-        "crh": "Turkish; Crimean",
-        "csb": "Kashubian",
-        "cym": "Welsh",
-        "dak": "Dakota",
-        "dan": "Danish",
-        "dar": "Dargwa",
-        "del": "Delaware",
-        "den": "Slave (Athapascan)",
-        "deu": "German",
-        "dgr": "Dogrib",
-        "din": "Dinka",
+        "chv": "Çuvaş (Türkçe)",
+        "cop": "Kıptice (Eski Mısır)",
+        "cor": "Cornish (Kelt)",
+        "cos": "Korsikaca",
+        "cre": "Cree (Kuzey Amerika yerlileri)",
+        "mus": "Creek",
+        "hrv": "Hırvatça",
+        "ces": "Çekçe",
+        "dak": "Dakota (Kuzey Amerika yerlileri)",
+        "dan": "Danimarkaca; Danca",
+        "dar": "Dargwa (Dağıstan)",
+        "del": "Delaware (Kuzey Amerika yerlileri)",
         "div": "Dhivehi",
-        "doi": "Dogri (macrolanguage)",
-        "dsb": "Sorbian; Lower",
-        "dua": "Duala",
-        "dum": "Dutch; Middle (ca. 1050-1350)",
-        "dyu": "Dyula",
-        "dzo": "Dzongkha",
-        "efi": "Efik",
-        "egy": "Egyptian (Ancient)",
-        "eka": "Ekajuk",
-        "ell": "Greek; Modern (1453-)",
-        "elx": "Elamite",
-        "eng": "English",
-        "enm": "English; Middle (1100-1500)",
+        "din": "Dinka (Sudan)",
+        "doi": "Dogri (makro dili)",
+        "dgr": "Dogrib (Kanada)",
+        "dua": "Duala (Afrika)",
+        "nld": "Flâmanca (Hollanda dili)",
+        "dyu": "Dyula (Burkina Faso; Mali)",
+        "dzo": "Dzongkha (Butan)",
+        "efi": "Efik (Afrika)",
+        "egy": "Mısırca (Eski)",
+        "eka": "Ekajuk (Afrika)",
+        "elx": "Elamca",
+        "eng": "İngilizce",
+        "myv": "Erzya dili",
         "epo": "Esperanto",
-        "est": "Estonian",
-        "eus": "Basque",
-        "ewe": "Ewe",
-        "ewo": "Ewondo",
-        "fan": "Fang (Equatorial Guinea)",
-        "fao": "Faroese",
-        "fas": "Persian",
-        "fat": "Fanti",
-        "fij": "Fijian",
-        "fil": "Filipino",
-        "fin": "Finnish",
-        "fon": "Fon",
-        "fra": "French",
-        "frm": "French; Middle (ca. 1400-1600)",
-        "fro": "French; Old (842-ca. 1400)",
-        "frr": "Frisian; Northern",
-        "frs": "Frisian; Eastern",
-        "fry": "Frisian; Western",
-        "ful": "Fulah",
-        "fur": "Friulian",
-        "gaa": "Ga",
-        "gay": "Gayo",
-        "gba": "Gbaya (Central African Republic)",
-        "gez": "Geez",
-        "gil": "Gilbertese",
-        "gla": "Gaelic; Scottish",
-        "gle": "Irish",
-        "glg": "Galician",
-        "glv": "Manx",
-        "gmh": "German; Middle High (ca. 1050-1500)",
-        "goh": "German; Old High (ca. 750-1050)",
-        "gon": "Gondi",
-        "gor": "Gorontalo",
-        "got": "Gothic",
-        "grb": "Grebo",
-        "grc": "Greek; Ancient (to 1453)",
-        "grn": "Guarani",
-        "gsw": "German; Swiss",
-        "guj": "Gujarati",
+        "est": "Estonca",
+        "ewe": "Ewe (Afrika)",
+        "ewo": "Ewondo (Afrika)",
+        "fan": "Fang (Ekvatoryal Guinea)",
+        "fat": "Fanti (Afrika)",
+        "fao": "Faroece",
+        "fij": "Fiji dili",
+        "fil": "Filipince",
+        "fin": "Fince",
+        "fon": "Fon (Benin)",
+        "fra": "Fransızca",
+        "fur": "Friulian (İtalya)",
+        "ful": "Fulah (Afrika)",
+        "gaa": "Ganaca",
+        "glg": "Galce",
+        "lug": "Ganda Dili",
+        "gay": "Gayo (Sumatra)",
+        "gba": "Gbaya (Orta Afrika Cumhuriyeti)",
+        "gez": "Geez (Etiyopya)",
+        "kat": "Gürcüce",
+        "deu": "Almanca",
+        "gil": "Kiribati dili",
+        "gon": "Gondi (Hindistan)",
+        "gor": "Gorontalo (Endonezya)",
+        "got": "Gotik",
+        "grb": "Grebo (Liberya)",
+        "grn": "Guarani (Paraguay)",
+        "guj": "Gucaratça",
         "gwi": "Gwichʼin",
-        "hai": "Haida",
-        "hat": "Creole; Haitian",
-        "hau": "Hausa",
-        "haw": "Hawaiian",
-        "heb": "Hebrew",
-        "her": "Herero",
+        "hai": "Haida (Kuzey Amerika yerlileri)",
+        "hau": "Hausa Dili",
+        "haw": "Havai Dili",
+        "heb": "İbranice",
+        "her": "Herero Dili",
         "hil": "Hiligaynon",
-        "hin": "Hindi",
-        "hit": "Hittite",
-        "hmn": "Hmong",
+        "hin": "Hintçe",
         "hmo": "Hiri Motu",
-        "hrv": "Croatian",
-        "hsb": "Sorbian; Upper",
-        "hun": "Hungarian",
+        "hit": "Hititçe",
+        "hmn": "Hmong",
+        "hun": "Macarca",
         "hup": "Hupa",
-        "hye": "Armenian",
         "iba": "Iban",
-        "ibo": "Igbo",
-        "ido": "Ido",
-        "iii": "Yi; Sichuan",
-        "iku": "Inuktitut",
-        "ile": "Interlingue",
+        "isl": "İzlandaca",
+        "ido": "Ido Dili",
+        "ibo": "Igbo Dili",
         "ilo": "Iloko",
-        "ina": "Interlingua (International Auxiliary Language Association)",
-        "ind": "Indonesian",
-        "inh": "Ingush",
-        "ipk": "Inupiaq",
-        "isl": "Icelandic",
-        "ita": "Italian",
-        "jav": "Javanese",
-        "jbo": "Lojban",
-        "jpn": "Japanese",
-        "jpr": "Judeo-Persian",
-        "jrb": "Judeo-Arabic",
-        "kaa": "Kara-Kalpak",
+        "ind": "Endonezyaca",
+        "inh": "İnguşca",
+        "ina": "Interlingua (Uluslararası Yardımcı Dil Kurumu)",
+        "ile": "Interlingue",
+        "iku": "Inuktitut",
+        "ipk": "Inupiak Dili",
+        "gle": "İrlandaca",
+        "ita": "İtalyanca",
+        "jpn": "Japonca",
+        "jav": "Cava Dili",
+        "jrb": "Yahudi-Arapçası",
+        "jpr": "Yahudi-Farsça",
+        "kbd": "Kabardian",
         "kab": "Kabyle",
         "kac": "Kachin",
         "kal": "Kalaallisut",
+        "xal": "Kalmyk",
         "kam": "Kamba (Kenya)",
         "kan": "Kannada",
-        "kas": "Kashmiri",
-        "kat": "Georgian",
-        "kau": "Kanuri",
-        "kaw": "Kawi",
-        "kaz": "Kazakh",
-        "kbd": "Kabardian",
-        "kha": "Khasi",
-        "khm": "Khmer; Central",
-        "kho": "Khotanese",
-        "kik": "Kikuyu",
-        "kin": "Kinyarwanda",
-        "kir": "Kirghiz",
-        "kmb": "Kimbundu",
-        "kok": "Konkani (macrolanguage)",
-        "kom": "Komi",
-        "kon": "Kongo",
-        "kor": "Korean",
-        "kos": "Kosraean",
-        "kpe": "Kpelle",
+        "kau": "Kanuri Dili",
+        "kaa": "Kara-Kalpak",
         "krc": "Karachay-Balkar",
         "krl": "Karelian",
-        "kru": "Kurukh",
-        "kua": "Kuanyama",
+        "kas": "Keşmirce",
+        "csb": "Kashubian (Lehçe diyalekti)",
+        "kaw": "Kawi",
+        "kaz": "Kazakça",
+        "kha": "Khasi",
+        "kho": "Khotanese",
+        "kik": "Kikuyu Dili",
+        "kmb": "Kimbundu",
+        "kin": "Kinyarwanda",
+        "kir": "Kırgızca",
+        "tlh": "Klingon",
+        "kom": "Komi Dili",
+        "kon": "Kongo Dili",
+        "kok": "Konkani (makro dil)",
+        "kor": "Korece",
+        "kos": "Kosraean",
+        "kpe": "Kpelle",
+        "kua": "Kuanyama Dili",
         "kum": "Kumyk",
-        "kur": "Kurdish",
+        "kur": "Kürtçe",
+        "kru": "Kurukh",
         "kut": "Kutenai",
         "lad": "Ladino",
         "lah": "Lahnda",
         "lam": "Lamba",
-        "lao": "Lao",
-        "lat": "Latin",
-        "lav": "Latvian",
+        "lao": "Laos Dili",
+        "lat": "Latince",
+        "lav": "Letonca",
         "lez": "Lezghian",
-        "lim": "Limburgan",
-        "lin": "Lingala",
-        "lit": "Lithuanian",
-        "lol": "Mongo",
+        "lim": "Liburg Dili",
+        "lin": "Lingala Dili",
+        "lit": "Litvanyaca",
+        "jbo": "Lojban dili",
         "loz": "Lozi",
-        "ltz": "Luxembourgish",
+        "lub": "Luba Katanga Dili",
         "lua": "Luba-Lulua",
-        "lub": "Luba-Katanga",
-        "lug": "Ganda",
         "lui": "Luiseno",
+        "smj": "Lule Sami",
         "lun": "Lunda",
-        "luo": "Luo (Kenya and Tanzania)",
+        "luo": "Luo (Kenya ve Tanzanya)",
         "lus": "Lushai",
+        "ltz": "Lüksemburg Dili",
+        "mkd": "Makedonca",
         "mad": "Madurese",
         "mag": "Magahi",
-        "mah": "Marshallese",
-        "mai": "Maithili",
+        "mai": "Maithili dili",
         "mak": "Makasar",
+        "mlg": "Madagaskar Dili",
+        "msa": "Malay (makro dili)",
         "mal": "Malayalam",
-        "man": "Mandingo",
-        "mar": "Marathi",
-        "mas": "Masai",
-        "mdf": "Moksha",
-        "mdr": "Mandar",
-        "men": "Mende (Sierra Leone)",
-        "mga": "Irish; Middle (900-1200)",
-        "mic": "Mi'kmaq",
-        "min": "Minangkabau",
-        "mis": "Uncoded languages",
-        "mkd": "Macedonian",
-        "mlg": "Malagasy",
-        "mlt": "Maltese",
+        "mlt": "Maltaca",
         "mnc": "Manchu",
-        "mni": "Manipuri",
-        "moh": "Mohawk",
-        "mon": "Mongolian",
-        "mos": "Mossi",
-        "mri": "Maori",
-        "msa": "Malay (macrolanguage)",
-        "mul": "Multiple languages",
-        "mus": "Creek",
-        "mwl": "Mirandese",
+        "mdr": "Mandar",
+        "man": "Mandingo",
+        "mni": "Manipuri dili",
+        "glv": "Manx (Galler)",
+        "mri": "Maori Dili",
+        "arn": "Mapudungun",
+        "mar": "Marathi",
+        "chm": "Mari (Rusya)",
+        "mah": "Marshall Dili",
         "mwr": "Marwari",
-        "mya": "Burmese",
-        "myv": "Erzya",
-        "nap": "Neapolitan",
+        "mas": "Masai",
+        "men": "Mende (Sierra Leone)",
+        "mic": "Mi'kmak",
+        "min": "Minangkabau",
+        "mwl": "Mirandese",
+        "moh": "Mohawk",
+        "mdf": "Moşka",
+        "lol": "Mongo",
+        "mon": "Moğol Dili",
+        "mos": "Mossi",
+        "mul": "Çoklu diller",
+        "nqo": "N'Ko",
         "nau": "Nauru",
-        "nav": "Navajo",
-        "nbl": "Ndebele; South",
-        "nde": "Ndebele; North",
-        "ndo": "Ndonga",
-        "nds": "German; Low",
-        "nep": "Nepali",
-        "new": "Bhasa; Nepal",
+        "nav": "Navajo Dili",
+        "ndo": "Ndonga Dili",
+        "nap": "Neapolitan",
         "nia": "Nias",
         "niu": "Niuean",
-        "nld": "Dutch",
-        "nno": "Norwegian Nynorsk",
-        "nob": "Norwegian Bokmål",
+        "zxx": "Hiçbir dil içeriği yok",
         "nog": "Nogai",
-        "non": "Norse; Old",
-        "nor": "Norwegian",
-        "nqo": "N'Ko",
-        "nso": "Sotho; Northern",
-        "nwc": "Newari; Old",
-        "nya": "Nyanja",
+        "nor": "Norveçce",
+        "nob": "Norveççe Bokmal",
+        "nno": "Norveççe Nynorsk",
         "nym": "Nyamwezi",
+        "nya": "Nyanja",
         "nyn": "Nyankole",
         "nyo": "Nyoro",
         "nzi": "Nzima",
-        "oci": "Occitan (post 1500)",
-        "oji": "Ojibwa",
-        "ori": "Oriya",
-        "orm": "Oromo",
+        "oci": "Oksitanca (1500 sonrası)",
+        "oji": "Ojibwa Dili",
+        "orm": "Oromo Dili",
         "osa": "Osage",
-        "oss": "Ossetian",
-        "ota": "Turkish; Ottoman (1500-1928)",
-        "pag": "Pangasinan",
-        "pal": "Pahlavi",
-        "pam": "Pampanga",
-        "pan": "Panjabi",
-        "pap": "Papiamento",
+        "oss": "Osetya Dili",
+        "pal": "Pehlevi",
         "pau": "Palauan",
-        "peo": "Persian; Old (ca. 600-400 B.C.)",
-        "phn": "Phoenician",
-        "pli": "Pali",
-        "pol": "Polish",
+        "pli": "Pali Dili",
+        "pam": "Pampanga",
+        "pag": "Pangasinan",
+        "pan": "Pencabi Dili",
+        "pap": "Papiamento",
+        "fas": "Farsça",
+        "phn": "Fenikçe",
         "pon": "Pohnpeian",
-        "por": "Portuguese",
-        "pro": "Provençal; Old (to 1500)",
-        "pus": "Pashto",
+        "pol": "Polonyaca",
+        "por": "Portekizce",
+        "pus": "Pushto",
         "que": "Quechua",
         "raj": "Rajasthani",
         "rap": "Rapanui",
-        "rar": "Maori; Cook Islands",
-        "roh": "Romansh",
-        "rom": "Romany",
-        "ron": "Romanian",
-        "run": "Rundi",
-        "rup": "Romanian; Macedo-",
-        "rus": "Russian",
+        "ron": "Rumence",
+        "roh": "Romanca",
+        "rom": "Çingene Dili",
+        "run": "Kirundi",
+        "rus": "Rusça",
+        "smo": "Samoa Dili",
         "sad": "Sandawe",
-        "sag": "Sango",
-        "sah": "Yakut",
-        "sam": "Aramaic; Samaritan",
-        "san": "Sanskrit",
+        "sag": "Sangho",
+        "san": "Sanskritçe",
+        "sat": "Santali dili",
+        "srd": "Sardinya",
         "sas": "Sasak",
-        "sat": "Santali",
-        "scn": "Sicilian",
-        "sco": "Scots",
+        "sco": "İskoç lehçesi",
         "sel": "Selkup",
-        "sga": "Irish; Old (to 900)",
-        "shn": "Shan",
-        "sid": "Sidamo",
-        "sin": "Sinhala",
-        "slk": "Slovak",
-        "slv": "Slovenian",
-        "sma": "Sami; Southern",
-        "sme": "Sami; Northern",
-        "smj": "Lule Sami",
-        "smn": "Sami; Inari",
-        "smo": "Samoan",
-        "sms": "Sami; Skolt",
-        "sna": "Shona",
-        "snd": "Sindhi",
-        "snk": "Soninke",
-        "sog": "Sogdian",
-        "som": "Somali",
-        "sot": "Sotho; Southern",
-        "spa": "Spanish",
-        "sqi": "Albanian",
-        "srd": "Sardinian",
-        "srn": "Sranan Tongo",
-        "srp": "Serbian",
+        "srp": "Sırpça",
         "srr": "Serer",
-        "ssw": "Swati",
+        "shn": "Shan",
+        "sna": "Shona",
+        "scn": "Sicilyalı",
+        "sid": "Sidamo",
+        "bla": "Siksika (Kuzey Amerika yerlileri)",
+        "snd": "Sindhi",
+        "sin": "Sinhala Dili",
+        "den": "Slave (Athapascan; Kuzey Amerika yerlileri)",
+        "slk": "Slovakça",
+        "slv": "Slovence",
+        "sog": "Sogdian",
+        "som": "Somali Dili",
+        "snk": "Soninke",
+        "spa": "İspanyolca",
+        "srn": "Sranan Tongo",
         "suk": "Sukuma",
-        "sun": "Sundanese",
+        "sux": "Sümerce",
+        "sun": "Sudan Dili",
         "sus": "Susu",
-        "sux": "Sumerian",
-        "swa": "Swahili (macrolanguage)",
-        "swe": "Swedish",
-        "syc": "Syriac; Classical",
-        "syr": "Syriac",
-        "tah": "Tahitian",
-        "tam": "Tamil",
-        "tat": "Tatar",
+        "swa": "Swahili (makro dil)",
+        "ssw": "Siswati",
+        "swe": "İsveçce",
+        "syr": "Süryanice",
+        "tgl": "Tagalog",
+        "tah": "Tahitice",
+        "tgk": "Tacikçe",
+        "tmh": "Tamashek",
+        "tam": "Tamilce",
+        "tat": "Tatarca",
         "tel": "Telugu",
-        "tem": "Timne",
         "ter": "Tereno",
         "tet": "Tetum",
-        "tgk": "Tajik",
-        "tgl": "Tagalog",
-        "tha": "Thai",
+        "tha": "Taylandça",
+        "bod": "Tibetçe",
         "tig": "Tigre",
-        "tir": "Tigrinya",
+        "tir": "Tigrinya Dili",
+        "tem": "Timne",
         "tiv": "Tiv",
-        "tkl": "Tokelau",
-        "tlh": "Klingon",
         "tli": "Tlingit",
-        "tmh": "Tamashek",
-        "tog": "Tonga (Nyasa)",
-        "ton": "Tonga (Tonga Islands)",
         "tpi": "Tok Pisin",
+        "tkl": "Tokelau",
+        "tog": "Tonga (Nyasa)",
+        "ton": "Tonga",
         "tsi": "Tsimshian",
-        "tsn": "Tswana",
         "tso": "Tsonga",
-        "tuk": "Turkmen",
+        "tsn": "Setswana",
         "tum": "Tumbuka",
-        "tur": "Turkish",
+        "tur": "Türkçe",
+        "tuk": "Türkmence",
         "tvl": "Tuvalu",
-        "twi": "Twi",
         "tyv": "Tuvinian",
+        "twi": "Twi",
         "udm": "Udmurt",
-        "uga": "Ugaritic",
-        "uig": "Uighur",
-        "ukr": "Ukrainian",
+        "uga": "Ugarit Çivi Yazısı",
+        "uig": "Uygurca",
+        "ukr": "Ukraynaca",
         "umb": "Umbundu",
-        "und": "Undetermined",
-        "urd": "Urdu",
-        "uzb": "Uzbek",
+        "mis": "Şifresiz diller",
+        "und": "Belirlenemeyen",
+        "urd": "Urduca",
+        "uzb": "Özbekçe",
         "vai": "Vai",
-        "ven": "Venda",
-        "vie": "Vietnamese",
+        "ven": "Venda Dili",
+        "vie": "Vietnamca",
         "vol": "Volapük",
         "vot": "Votic",
+        "wln": "Valonca",
+        "war": "Waray (Filipinler)",
+        "was": "Vasho",
+        "cym": "Gal Dili",
         "wal": "Wolaytta",
-        "war": "Waray (Philippines)",
-        "was": "Washo",
-        "wln": "Walloon",
         "wol": "Wolof",
-        "xal": "Kalmyk",
         "xho": "Xhosa",
+        "sah": "Yakut",
         "yao": "Yao",
         "yap": "Yapese",
-        "yid": "Yiddish",
+        "yid": "Yidiş",
         "yor": "Yoruba",
         "zap": "Zapotec",
-        "zbl": "Blissymbols",
+        "zza": "Zaza",
         "zen": "Zenaga",
-        "zha": "Zhuang",
-        "zho": "Chinese",
+        "zha": "Zuang Dili",
         "zul": "Zulu",
-        "zun": "Zuni",
+        "zun": "Zuni"
+    },
+    "uk": {
+        "aar": "афар",
+        "abk": "абхазька",
+        "ace": "ачеська",
+        "ach": "ачолі",
+        "ada": "адангме",
+        "ady": "адигейська",
+        "afh": "афрингілі",
+        "afr": "африкаанс",
+        "ain": "айнська (Японія)",
+        "aka": "акан",
+        "akk": "аккадська",
+        "ale": "алеутська",
+        "alt": "алтайська (південна)",
+        "amh": "амхарська",
+        "ang": "давньоанглійська (бл. 450-1100)",
+        "anp": "ангіка",
+        "ara": "арабська",
+        "arc": "арамейська (офіційна; 700-300 до нашої ери)",
+        "arg": "арагонська",
+        "arn": "арауканська",
+        "arp": "арапахо",
+        "arw": "аравакська",
+        "asm": "ассамська",
+        "ast": "астурійська",
+        "ava": "аварська",
+        "ave": "авестанська",
+        "awa": "авадхі",
+        "aym": "аймарська",
+        "aze": "азербайджанська",
+        "bak": "башкирська",
+        "bal": "белуджійська",
+        "bam": "бамбара",
+        "ban": "балійська",
+        "bas": "баса (Камерун)",
+        "bej": "бежа",
+        "bel": "білоруська",
+        "bem": "бемба (Замбія)",
+        "ben": "бенгальська",
+        "bho": "бходжпурі",
+        "bik": "бікольська",
+        "bin": "біні",
+        "bis": "біслама",
+        "bla": "сісіка",
+        "bod": "тибетська",
+        "bos": "боснійська",
+        "bra": "брай",
+        "bre": "бретонська",
+        "bua": "бурятська",
+        "bug": "бугійська",
+        "bul": "болгарська",
+        "byn": "білін",
+        "cad": "каддо",
+        "car": "карибська (галібі)",
+        "cat": "каталонська",
+        "ceb": "себуано",
+        "ces": "чеська",
+        "cha": "чаморо",
+        "chb": "чибча",
+        "che": "чеченська",
+        "chg": "чагатайська",
+        "chk": "чуукська",
+        "chm": "марійська (Росія)",
+        "chn": "чинук; жаргон",
+        "cho": "чоктау",
+        "chp": "чипев’ян",
+        "chr": "черокі",
+        "chu": "давньослов’янська",
+        "chv": "чуваська",
+        "chy": "шаєнн",
+        "cop": "коптська",
+        "cor": "корнійська",
+        "cos": "корсиканська",
+        "cre": "крі",
+        "crh": "турецька (кримська)",
+        "csb": "кашубська",
+        "cym": "валійська",
+        "dak": "дакота",
+        "dan": "данська",
+        "dar": "даргва",
+        "del": "делаварська",
+        "den": "слейві (атабаська)",
+        "deu": "німецька",
+        "dgr": "догріб",
+        "din": "дінка",
+        "div": "мальдивська",
+        "doi": "догрі (макромова)",
+        "dsb": "нижньолужицька",
+        "dua": "дуала",
+        "dum": "середньовічна голландська (бл. 1050-1350)",
+        "dyu": "діула",
+        "dzo": "дзонг-ке",
+        "efi": "ефік",
+        "egy": "давньоєгипетська",
+        "eka": "екаджук",
+        "ell": "грецька (з 1453)",
+        "elx": "еламська",
+        "eng": "англійська",
+        "enm": "середньоанглійська (1100-1500)",
+        "epo": "есперанто",
+        "est": "естонська",
+        "eus": "баскська",
+        "ewe": "еве",
+        "ewo": "евондо",
+        "fan": "фанг (Екваторіальна Гвінея)",
+        "fao": "фарерська",
+        "fas": "перська",
+        "fat": "фанті",
+        "fij": "фіджійська",
+        "fil": "філіппінська",
+        "fin": "фінська",
+        "fon": "фон",
+        "fra": "французька",
+        "frm": "середньофранцузька (бл. 1400-1600)",
+        "fro": "давньофранцузька (842-бл. 1400)",
+        "frr": "фризька (північна)",
+        "frs": "фризька (східна)",
+        "fry": "фризька (західна)",
+        "ful": "фулах",
+        "fur": "фріульська",
+        "gaa": "га",
+        "gay": "гайо",
+        "gba": "гбая (Центральноафриканська Республіка)",
+        "gez": "гііз",
+        "gil": "гільбертська",
+        "gla": "гаельська (Шотландія)",
+        "gle": "ірландська",
+        "glg": "галісійська",
+        "glv": "манкс",
+        "gmh": "середньоверхньонімецька (бл. 1050-1500)",
+        "goh": "давньосередньонімецька (бл. 750-1050)",
+        "gon": "гонді",
+        "gor": "горонтало",
+        "got": "готська",
+        "grb": "гребо",
+        "grc": "давньогрецька (до 1453)",
+        "grn": "гуарані",
+        "gsw": "німецька (Швейцарія)",
+        "guj": "гуджараті",
+        "gwi": "гвічин",
+        "hai": "хайда",
+        "hat": "креольська (гаїтянська)",
+        "hau": "хауса",
+        "haw": "гавайська",
+        "heb": "іврит",
+        "her": "гереро",
+        "hil": "хілігайнон",
+        "hin": "хінді",
+        "hit": "хетська",
+        "hmn": "хмонг",
+        "hmo": "хірімоту",
+        "hrv": "хорватська",
+        "hsb": "верхньолужицька",
+        "hun": "угорська",
+        "hup": "хупа",
+        "hye": "вірменська",
+        "iba": "ібанська",
+        "ibo": "ігбо",
+        "ido": "ідо",
+        "iii": "ї (Сичуань)",
+        "iku": "інуктітут",
+        "ile": "окциденталь",
+        "ilo": "ілоко",
+        "ina": "інтерлінгва (Асоціація міжнародної допоміжної мови)",
+        "ind": "індонезійська",
+        "inh": "інгушська",
+        "ipk": "інупіак",
+        "isl": "ісландська",
+        "ita": "італійська",
+        "jav": "яванська",
+        "jbo": "ложбан",
+        "jpn": "японська",
+        "jpr": "єврейсько-перська",
+        "jrb": "єврейсько-арабська",
+        "kaa": "каракалпацька",
+        "kab": "кабильська",
+        "kac": "качин",
+        "kal": "калаалісут",
+        "kam": "камба (Кенія)",
+        "kan": "каннада",
+        "kas": "кашмірська",
+        "kat": "грузинська",
+        "kau": "канурі",
+        "kaw": "каві",
+        "kaz": "казахська",
+        "kbd": "кабардінська",
+        "kha": "кхасі",
+        "khm": "кхмерська (центральна)",
+        "kho": "хотаносакська",
+        "kik": "кікуйю",
+        "kin": "кіньяруанда",
+        "kir": "киргизька",
+        "kmb": "кімбунду",
+        "kok": "конкані (макромова)",
+        "kom": "комі",
+        "kon": "конго",
+        "kor": "корейська",
+        "kos": "косрейська",
+        "kpe": "кпелле",
+        "krc": "карачаєво-балкарська",
+        "krl": "карельська",
+        "kru": "курух",
+        "kua": "куаньяма",
+        "kum": "кумикська",
+        "kur": "курдська",
+        "kut": "кутенай",
+        "lad": "ладіно",
+        "lah": "лахнда",
+        "lam": "ламба",
+        "lao": "лаоська",
+        "lat": "латинська",
+        "lav": "латиська",
+        "lez": "лезгінська",
+        "lim": "лімбурганська",
+        "lin": "лінгала",
+        "lit": "литовська",
+        "lol": "монго",
+        "loz": "лозі",
+        "ltz": "люксембурзька",
+        "lua": "луба-лулуа",
+        "lub": "луба-катанга",
+        "lug": "ганда",
+        "lui": "луйсеньо",
+        "lun": "лунда",
+        "luo": "луо (Кенія і Танзанія)",
+        "lus": "лушай",
+        "mad": "мадурська",
+        "mag": "магахі",
+        "mah": "маршальська",
+        "mai": "майтхілі",
+        "mak": "макасарська",
+        "mal": "малаялам",
+        "man": "мандінго",
+        "mar": "мараті",
+        "mas": "масаї",
+        "mdf": "мокшанська",
+        "mdr": "мандарська",
+        "men": "менде (Сьєрра-Леоне)",
+        "mga": "середньоірландська (900-1200)",
+        "mic": "мікмак",
+        "min": "мінангкабау",
+        "mis": "мови без коду",
+        "mkd": "македонська",
+        "mlg": "малагасійська",
+        "mlt": "мальтійська",
+        "mnc": "манчжурська",
+        "mni": "маніпурська",
+        "moh": "мохаук",
+        "mon": "монгольська",
+        "mos": "мосі",
+        "mri": "маорійська",
+        "msa": "малайська (макромова)",
+        "mul": "мови; що належать до декількох родин",
+        "mus": "крікська",
+        "mwl": "мірандська",
+        "mwr": "марварі",
+        "mya": "бірманська",
+        "myv": "ерзянська",
+        "nap": "неаполітанська",
+        "nau": "науру",
+        "nav": "навахо",
+        "nbl": "південна ндебеле",
+        "nde": "північна ндебеле",
+        "ndo": "ндонга",
+        "nds": "нижньонімецька",
+        "nep": "непальська",
+        "new": "бхаса (Непал)",
+        "nia": "ніасійська",
+        "niu": "ніуе",
+        "nld": "голландська",
+        "nno": "норвезька нюноршк",
+        "nob": "норвезька букмол",
+        "nog": "ногайська",
+        "non": "давньонорвезька",
+        "nor": "норвезька",
+        "nqo": "н’ко",
+        "nso": "сото; північне",
+        "nwc": "неварі (давня)",
+        "nya": "ньянджа",
+        "nym": "ньямвезі",
+        "nyn": "ньянколе",
+        "nyo": "ньоро",
+        "nzi": "нзіма",
+        "oci": "оксітанська (після 1500)",
+        "oji": "оджибва",
+        "ori": "орія",
+        "orm": "оромо",
+        "osa": "оседжі",
+        "oss": "осетинська",
+        "ota": "оттоманська турецька (1500-1928)",
+        "pag": "пангасінан",
+        "pal": "пехлевійська",
+        "pam": "пампанга",
+        "pan": "пенджабі",
+        "pap": "папьяменто",
+        "pau": "палау",
+        "peo": "давньоперська (бл. 600-400 до н.е.)",
+        "phn": "фінікійська",
+        "pli": "палі",
+        "pol": "польська",
+        "pon": "понапе",
+        "por": "португальська",
+        "pro": "провансальська (давня; до 1500 року)",
+        "pus": "пуштунська",
+        "que": "кечуа",
+        "raj": "раджастхані",
+        "rap": "рапануї",
+        "rar": "маорійська (острови Кука)",
+        "roh": "ретророманська",
+        "rom": "ромська",
+        "ron": "румунська",
+        "run": "рунді",
+        "rup": "македоно-румунська",
+        "rus": "російська",
+        "sad": "сандаве",
+        "sag": "санго",
+        "sah": "якутська",
+        "sam": "арамейська (самаритянська)",
+        "san": "санскрит",
+        "sas": "сасакська",
+        "sat": "санталі",
+        "scn": "сицилійська",
+        "sco": "шотландська",
+        "sel": "селькупська",
+        "sga": "давньоірландська (до 900)",
+        "shn": "шан",
+        "sid": "сидама",
+        "sin": "сингалійська",
+        "slk": "словацька",
+        "slv": "словенська",
+        "sma": "саамська (південна)",
+        "sme": "саамська (північна)",
+        "smj": "лулесаамська",
+        "smn": "саамська (інарі)",
+        "smo": "самоанська",
+        "sms": "саамська (сколт)",
+        "sna": "шона",
+        "snd": "синдхі",
+        "snk": "сонікійська",
+        "sog": "согдійська",
+        "som": "сомалійська",
+        "sot": "сото; південна",
+        "spa": "іспанська",
+        "sqi": "албанська",
+        "srd": "сардинська",
+        "srn": "сранан-тонго",
+        "srp": "сербська",
+        "srr": "серер",
+        "ssw": "свазі",
+        "suk": "сукума",
+        "sun": "сунданська",
+        "sus": "сусу",
+        "sux": "шумерська",
+        "swa": "суахілі (макромова)",
+        "swe": "шведська",
+        "syc": "сирійська (класична)",
+        "syr": "сирійська",
+        "tah": "таїтянська",
+        "tam": "тамільська",
+        "tat": "татарська",
+        "tel": "телугу",
+        "tem": "тімне",
+        "ter": "терено",
+        "tet": "тетум",
+        "tgk": "таджицька",
+        "tgl": "тагалог",
+        "tha": "таїландська",
+        "tig": "тігре",
+        "tir": "тигринійська",
+        "tiv": "тиві",
+        "tkl": "токелау",
+        "tlh": "клінгонська",
+        "tli": "тлінгіт",
+        "tmh": "тамашек",
+        "tog": "тонга (ньяса)",
+        "ton": "тонга (острови Тонга)",
+        "tpi": "ток-пісін",
+        "tsi": "цимшіан",
+        "tsn": "тсвана",
+        "tso": "цонга",
+        "tuk": "туркменська",
+        "tum": "тумбука",
+        "tur": "турецька",
+        "tvl": "тувалу",
+        "twi": "тві",
+        "tyv": "тувінська",
+        "udm": "удмурдська",
+        "uga": "угаритська",
+        "uig": "уйгурська",
+        "ukr": "українська",
+        "umb": "умбунду",
+        "und": "невизначена",
+        "urd": "урду",
+        "uzb": "узбецька",
+        "vai": "вай",
+        "ven": "венда",
+        "vie": "в'єтнамська",
+        "vol": "волапюк",
+        "vot": "водська",
+        "wal": "волайтта",
+        "war": "варай (Філіппіни)",
+        "was": "вашо",
+        "wln": "валлонська",
+        "wol": "волоф",
+        "xal": "калмицька",
+        "xho": "хоза",
+        "yao": "яо",
+        "yap": "япська",
+        "yid": "ідиш",
+        "yor": "йоруба",
+        "zap": "сапотецька",
+        "zbl": "бліссимволіка",
+        "zen": "зеназька",
+        "zha": "чжуань",
+        "zho": "китайська",
+        "zul": "зулуська",
+        "zun": "зуні",
+        "zxx": "немає мовних даних",
+        "zza": "заза"
+    },
+    "zh_Hans_CN": {
+        "aar": "阿法尔语",
+        "abk": "阿布哈兹语",
+        "ace": "亚齐语",
+        "ach": "阿乔利语",
+        "ada": "阿当梅语",
+        "ady": "阿迪格语",
+        "afh": "阿弗里希利语",
+        "afr": "南非荷兰语",
+        "ain": "阿伊努语（日本）",
+        "aka": "阿坎语",
+        "akk": "阿卡德语",
+        "ale": "阿留申语",
+        "alt": "阿尔泰语（南）",
+        "amh": "阿姆哈拉语",
+        "ang": "英语（上古，约 450-1100）",
+        "anp": "安吉卡语",
+        "ara": "阿拉伯语",
+        "arc": "阿拉米语（官方，公元前 700-300）",
+        "arg": "阿拉贡语",
+        "arn": "阿劳坎语",
+        "arp": "阿拉帕霍语",
+        "arw": "阿拉瓦克语",
+        "asm": "阿萨姆语",
+        "ast": "阿斯图里亚斯语",
+        "ava": "阿瓦尔语",
+        "ave": "阿维斯陀语",
+        "awa": "阿瓦德语",
+        "aym": "艾马拉语",
+        "aze": "阿塞拜疆语",
+        "bak": "巴什基尔语",
+        "bal": "俾路支语",
+        "bam": "班巴拉语",
+        "ban": "巴厘语",
+        "bas": "巴萨语（喀麦隆）",
+        "bej": "贝扎语",
+        "bel": "白俄罗斯语",
+        "bem": "本巴语（赞比亚）",
+        "ben": "孟加拉语",
+        "bho": "博杰普尔语",
+        "bik": "比科尔语",
+        "bin": "比尼语",
+        "bis": "比斯拉马语",
+        "bla": "西克西卡语",
+        "bod": "藏语",
+        "bos": "波斯尼亚语",
+        "bra": "布拉吉语",
+        "bre": "布列塔尼语",
+        "bua": "布里亚特语",
+        "bug": "布吉语",
+        "bul": "保加利亚语",
+        "byn": "比林语",
+        "cad": "卡多语",
+        "car": "加勒比语",
+        "cat": "加泰罗尼亚语",
+        "ceb": "宿务语",
+        "ces": "捷克语",
+        "cha": "查莫罗语",
+        "chb": "奇布查语",
+        "che": "车臣语",
+        "chg": "察合台语",
+        "chk": "丘克语",
+        "chm": "马里语（俄罗斯）",
+        "chn": "奇努克混合语",
+        "cho": "乔克托语",
+        "chp": "奇佩维安语",
+        "chr": "切罗基语",
+        "chu": "斯拉夫语（古教会）",
+        "chv": "楚瓦什语",
+        "chy": "夏延语",
+        "cop": "科普特语",
+        "cor": "康沃尔语",
+        "cos": "科西嘉语",
+        "cre": "克里语",
+        "crh": "鞑靼语（克里米亚）",
+        "csb": "卡舒比语",
+        "cym": "威尔士语",
+        "dak": "达科他语",
+        "dan": "丹麦语",
+        "dar": "达尔格瓦语",
+        "del": "特拉华语",
+        "den": "史拉维语（阿沙巴斯甘）",
+        "deu": "德语",
+        "dgr": "多格里布语",
+        "din": "丁卡语",
+        "div": "迪维希语",
+        "doi": "多格拉语",
+        "dsb": "索布语（下）",
+        "dua": "杜亚拉语",
+        "dum": "荷兰语（中古，约 1050-1350）",
+        "dyu": "迪尤拉语",
+        "dzo": "宗喀语",
+        "efi": "埃菲克语",
+        "egy": "埃及语（古）",
+        "eka": "埃克丘克语",
+        "ell": "希腊语（现代，1453-）",
+        "elx": "埃兰语",
+        "eng": "英语",
+        "enm": "英语（中古，1100-1500）",
+        "epo": "世界语",
+        "est": "爱沙尼亚语",
+        "eus": "巴斯克语",
+        "ewe": "埃维语",
+        "ewo": "埃翁多语",
+        "fan": "芳语（赤道几内亚）",
+        "fao": "法罗语",
+        "fas": "波斯语",
+        "fat": "芳蒂语",
+        "fij": "斐济语",
+        "fil": "菲律宾语",
+        "fin": "芬兰语",
+        "fon": "丰语",
+        "fra": "法语",
+        "frm": "法语（中古，约 1400-1600）",
+        "fro": "法语（上古，842-约 1400）",
+        "frr": "弗里西语（北）",
+        "frs": "弗里西亚语（东）",
+        "fry": "弗里西亚语（西）",
+        "ful": "富拉语",
+        "fur": "弗留利语",
+        "gaa": "加语",
+        "gay": "卡约语",
+        "gba": "巴亚语（中非共和国）",
+        "gez": "吉兹语",
+        "gil": "吉尔伯特语",
+        "gla": "盖尔语（苏格兰）",
+        "gle": "爱尔兰语",
+        "glg": "加利西亚语",
+        "glv": "马恩岛语",
+        "gmh": "德语（中古高地，约 1050-1500）",
+        "goh": "德语（上古高地，约 750-1050）",
+        "gon": "贡德语",
+        "gor": "哥伦打洛语",
+        "got": "哥特语",
+        "grb": "格列博语",
+        "grc": "希腊语（古典，直到 1453）",
+        "grn": "瓜拉尼语",
+        "gsw": "德语（瑞士）",
+        "guj": "古吉拉特语",
+        "gwi": "库臣语",
+        "hai": "海达语",
+        "hat": "克里奥尔语（海地）",
+        "hau": "豪萨语",
+        "haw": "夏威夷语",
+        "heb": "希伯来语",
+        "her": "赫雷罗语",
+        "hil": "希利盖农语",
+        "hin": "印地语",
+        "hit": "赫梯语",
+        "hmn": "苗语",
+        "hmo": "希里莫图语",
+        "hrv": "克罗地亚语",
+        "hsb": "索布语（上）",
+        "hun": "匈牙利语",
+        "hup": "胡帕语",
+        "hye": "亚美尼亚语",
+        "iba": "伊班语",
+        "ibo": "伊博语",
+        "ido": "伊多语",
+        "iii": "彝语（四川）",
+        "iku": "伊努伊特语",
+        "ile": "国际语（西方）",
+        "ilo": "伊洛卡诺语",
+        "ina": "国际语",
+        "ind": "印尼语",
+        "inh": "印古什语",
+        "ipk": "依努庇克语",
+        "isl": "冰岛语",
+        "ita": "意大利语",
+        "jav": "爪哇语",
+        "jbo": "逻辑语",
+        "jpn": "日语",
+        "jpr": "犹太-波斯语",
+        "jrb": "犹太-阿拉伯语",
+        "kaa": "卡拉卡尔帕克语",
+        "kab": "卡布列语",
+        "kac": "景颇语",
+        "kal": "格陵兰语",
+        "kam": "坎巴语（肯尼亚）",
+        "kan": "卡纳达语",
+        "kas": "克什米尔语",
+        "kat": "格鲁吉亚语",
+        "kau": "卡努里语",
+        "kaw": "卡威语",
+        "kaz": "哈萨克语",
+        "kbd": "卡巴尔达语",
+        "kha": "卡西语",
+        "khm": "高棉语",
+        "kho": "和田语",
+        "kik": "基库尤语",
+        "kin": "基尼阿万达语",
+        "kir": "吉尔吉斯语",
+        "kmb": "金本杜语",
+        "kok": "孔卡尼语",
+        "kom": "科米语",
+        "kon": "刚果语",
+        "kor": "朝鲜语",
+        "kos": "科斯拉伊语",
+        "kpe": "克佩勒语",
+        "krc": "卡拉恰伊-巴尔卡尔语",
+        "krl": "卡累利阿语",
+        "kru": "库卢克语",
+        "kua": "宽亚玛语",
+        "kum": "库梅克语",
+        "kur": "库尔德语",
+        "kut": "库特内语",
+        "lad": "拉迪诺语",
+        "lah": "拉亨达语",
+        "lam": "兰巴语",
+        "lao": "老挝语",
+        "lat": "拉丁语",
+        "lav": "拉脱维亚语",
+        "lez": "列兹金语",
+        "lim": "林堡语",
+        "lin": "林加拉语",
+        "lit": "立陶宛语",
+        "lol": "芒戈语",
+        "loz": "洛齐语",
+        "ltz": "卢森堡语",
+        "lua": "卢巴-卢拉语",
+        "lub": "卢巴-加丹加语",
+        "lug": "干达语",
+        "lui": "卢伊塞诺语",
+        "lun": "隆达语",
+        "luo": "卢奥语（肯尼亚和坦桑尼亚）",
+        "lus": "卢萨语",
+        "mad": "马都拉语",
+        "mag": "摩揭陀语",
+        "mah": "马绍尔语",
+        "mai": "米德勒语",
+        "mak": "望加锡语",
+        "mal": "马拉雅拉姆语",
+        "man": "曼丁哥语",
+        "mar": "马拉地语",
+        "mas": "马萨伊语",
+        "mdf": "莫克沙语",
+        "mdr": "曼达语",
+        "men": "门德语（塞拉利昂）",
+        "mga": "爱尔兰语（中古，900-1200）",
+        "mic": "米克马克语",
+        "min": "米南卡保语",
+        "mis": "未被编码的语言",
+        "mkd": "马其顿语",
+        "mlg": "马达加斯加语",
+        "mlt": "马耳他语",
+        "mnc": "满语",
+        "mni": "曼尼普尔语",
+        "moh": "莫霍克语",
+        "mon": "蒙古语",
+        "mos": "莫西语",
+        "mri": "毛利语",
+        "msa": "马来语族",
+        "mul": "多种语言",
+        "mus": "克里克语",
+        "mwl": "米兰德斯语",
+        "mwr": "马尔瓦利语",
+        "mya": "缅甸语",
+        "myv": "厄尔兹亚语",
+        "nap": "拿坡里语",
+        "nau": "瑙鲁语",
+        "nav": "纳瓦霍语",
+        "nbl": "恩德贝勒语（南）",
+        "nde": "恩德贝勒语（北）",
+        "ndo": "恩敦加语",
+        "nds": "撒克逊语（低地）",
+        "nep": "尼泊尔语",
+        "new": "尼瓦尔语",
+        "nia": "尼亚斯语",
+        "niu": "纽埃语",
+        "nld": "荷兰语",
+        "nno": "新挪威语",
+        "nob": "挪威布克莫尔语",
+        "nog": "诺盖语",
+        "non": "诺尔斯语（古）",
+        "nor": "挪威语",
+        "nqo": "西非书面语言字母",
+        "nso": "索托语（北）",
+        "nwc": "尼瓦尔语（古典）",
+        "nya": "尼扬贾语",
+        "nym": "尼扬韦齐语",
+        "nyn": "尼扬科勒语",
+        "nyo": "尼奥罗语",
+        "nzi": "恩济马语",
+        "oci": "奥克西唐语（1500 后）",
+        "oji": "奥吉布瓦语",
+        "ori": "奥利亚语",
+        "orm": "奥罗莫语",
+        "osa": "奥萨格语",
+        "oss": "奥塞梯语",
+        "ota": "土耳其语（奥斯曼，1500-1928）",
+        "pag": "邦阿西楠语",
+        "pal": "钵罗钵语",
+        "pam": "邦板牙语",
+        "pan": "旁遮普语",
+        "pap": "帕皮亚门托语",
+        "pau": "帕劳语",
+        "peo": "波斯语（古，公元前约 600-400）",
+        "phn": "腓尼基语",
+        "pli": "巴利语",
+        "pol": "波兰语",
+        "pon": "波纳佩语",
+        "por": "葡萄牙语",
+        "pro": "普罗旺斯语（古，至 1500）",
+        "pus": "普什图语",
+        "que": "克丘亚语",
+        "raj": "拉贾斯坦语",
+        "rap": "拉帕努伊语",
+        "rar": "拉罗汤加语",
+        "roh": "罗曼什语",
+        "rom": "罗姆语",
+        "ron": "罗马尼亚语",
+        "run": "基隆迪语",
+        "rup": "阿罗马尼亚语",
+        "rus": "俄语",
+        "sad": "桑达韦语",
+        "sag": "桑戈语",
+        "sah": "雅库特语",
+        "sam": "阿拉米语（萨马利亚）",
+        "san": "梵语",
+        "sas": "萨萨克语",
+        "sat": "桑塔利语",
+        "scn": "西西里语",
+        "sco": "苏格兰语",
+        "sel": "塞尔库普语",
+        "sga": "爱尔兰语（古，至 900）",
+        "shn": "掸语",
+        "sid": "锡达莫语",
+        "sin": "僧加罗语",
+        "slk": "斯洛伐克语",
+        "slv": "斯洛文尼亚语",
+        "sma": "萨米语（南）",
+        "sme": "萨米语（北）",
+        "smj": "律勒欧-萨米语",
+        "smn": "伊纳里-萨米语",
+        "smo": "萨摩亚语",
+        "sms": "斯科特-萨米语",
+        "sna": "修纳语",
+        "snd": "信德语",
+        "snk": "索宁克语",
+        "sog": "粟特语",
+        "som": "索马里语",
+        "sot": "索托语（南）",
+        "spa": "西班牙语",
+        "sqi": "阿尔巴尼亚语",
+        "srd": "撒丁语",
+        "srn": "苏里南汤加语",
+        "srp": "塞尔维亚语",
+        "srr": "塞雷尔语",
+        "ssw": "斯瓦特语",
+        "suk": "苏库马语",
+        "sun": "巽他语",
+        "sus": "苏苏语",
+        "sux": "苏美尔语",
+        "swa": "斯瓦希里语族",
+        "swe": "瑞典语",
+        "syc": "叙利亚语（古典）",
+        "syr": "古叙利亚语",
+        "tah": "塔希提语",
+        "tam": "泰米尔语",
+        "tat": "塔塔尔语",
+        "tel": "泰卢固语",
+        "tem": "滕内语",
+        "ter": "特列纳语",
+        "tet": "特塔姆语",
+        "tgk": "塔吉克语",
+        "tgl": "塔加洛语",
+        "tha": "泰语",
+        "tig": "提格雷语",
+        "tir": "提格里尼亚语",
+        "tiv": "蒂夫语",
+        "tkl": "托克劳语",
+        "tlh": "克林贡语",
+        "tli": "特林吉特语",
+        "tmh": "塔马舍克语",
+        "tog": "汤加语 (尼亚萨)",
+        "ton": "汤加语（汤加岛）",
+        "tpi": "托克皮辛语",
+        "tsi": "钦西安语",
+        "tsn": "茨瓦纳语",
+        "tso": "聪加语",
+        "tuk": "土库曼语",
+        "tum": "奇图姆布卡语",
+        "tur": "土耳其语",
+        "tvl": "图瓦卢语",
+        "twi": "契维语",
+        "tyv": "图瓦语",
+        "udm": "乌德穆尔特语",
+        "uga": "乌加里特语",
+        "uig": "维吾尔语",
+        "ukr": "乌克兰语",
+        "umb": "翁本杜语",
+        "und": "未确定的语言",
+        "urd": "乌尔都语",
+        "uzb": "乌兹别克语",
+        "vai": "瓦伊语",
+        "ven": "文达语",
+        "vie": "越南语",
+        "vol": "沃拉普克语",
+        "vot": "沃提克语",
+        "wal": "瓦拉莫语",
+        "war": "瓦赖语（菲律宾）",
+        "was": "瓦肖语",
+        "wln": "瓦龙语",
+        "wol": "沃洛夫语",
+        "xal": "卡尔梅克语",
+        "xho": "科萨语",
+        "yao": "瑶语",
+        "yap": "雅浦语",
+        "yid": "依地语",
+        "yor": "约鲁巴语",
+        "zap": "萨波特克语",
+        "zbl": "布利斯符号",
+        "zen": "哲纳加语",
+        "zha": "壮语",
+        "zho": "中文",
+        "zul": "祖鲁语",
+        "zun": "祖尼语",
         "zxx": "No linguistic content",
-        "zza": "Zaza"
+        "zza": "扎扎其语"
     },
     "en": {
         "aar": "Afar",
diff --git a/cps/kobo.py b/cps/kobo.py
index 06e89112..39032f3b 100644
--- a/cps/kobo.py
+++ b/cps/kobo.py
@@ -43,7 +43,6 @@ from flask_login import current_user
 from werkzeug.datastructures import Headers
 from sqlalchemy import func
 from sqlalchemy.sql.expression import and_, or_
-from sqlalchemy.exc import OperationalError
 from sqlalchemy.orm import load_only
 from sqlalchemy.exc import StatementError
 import requests
@@ -58,7 +57,7 @@ KOBO_FORMATS = {"KEPUB": ["KEPUB"], "EPUB": ["EPUB3", "EPUB"]}
 KOBO_STOREAPI_URL = "https://storeapi.kobo.com"
 KOBO_IMAGEHOST_URL = "https://kbimages1-a.akamaihd.net"
 
-SYNC_ITEM_LIMIT = 5
+SYNC_ITEM_LIMIT = 100
 
 kobo = Blueprint("kobo", __name__, url_prefix="/kobo/<auth_token>")
 kobo_auth.disable_failed_auth_redirect_for_blueprint(kobo)
diff --git a/cps/kobo_auth.py b/cps/kobo_auth.py
index ba35c78b..1ede03a4 100644
--- a/cps/kobo_auth.py
+++ b/cps/kobo_auth.py
@@ -66,7 +66,6 @@ from os import urandom
 from flask import g, Blueprint, url_for, abort, request
 from flask_login import login_user, login_required
 from flask_babel import gettext as _
-from sqlalchemy.exc import OperationalError
 
 from . import logger, ub, lm
 from .render_template import render_title_template
diff --git a/cps/logger.py b/cps/logger.py
index d2a41b71..b204de31 100644
--- a/cps/logger.py
+++ b/cps/logger.py
@@ -44,10 +44,22 @@ logging.addLevelName(logging.CRITICAL, "CRIT")
 class _Logger(logging.Logger):
 
     def debug_or_exception(self, message, *args, **kwargs):
-        if is_debug_enabled():
-            self.exception(message, stacklevel=2, *args, **kwargs)
+        if sys.version_info > (3, 7):
+            if is_debug_enabled():
+                self.exception(message, stacklevel=2, *args, **kwargs)
+            else:
+                self.error(message, stacklevel=2, *args, **kwargs)
+        elif sys.version_info > (3, 0):
+            if is_debug_enabled():
+                self.exception(message, stack_info=True, *args, **kwargs)
+            else:
+                self.error(message, *args, **kwargs)
         else:
-            self.error(message, stacklevel=2, *args, **kwargs)
+            if is_debug_enabled():
+                self.exception(message, *args, **kwargs)
+            else:
+                self.error(message, *args, **kwargs)
+
 
     def debug_no_auth(self, message, *args, **kwargs):
         if message.startswith("send: AUTH"):
diff --git a/cps/oauth_bb.py b/cps/oauth_bb.py
index b6474758..b17d38c7 100644
--- a/cps/oauth_bb.py
+++ b/cps/oauth_bb.py
@@ -32,7 +32,6 @@ from flask_dance.contrib.github import make_github_blueprint, github
 from flask_dance.contrib.google import make_google_blueprint, google
 from flask_login import login_user, current_user, login_required
 from sqlalchemy.orm.exc import NoResultFound
-from sqlalchemy.exc import OperationalError
 
 from . import constants, logger, config, app, ub
 
diff --git a/cps/opds.py b/cps/opds.py
index 1ae7010c..c66ee836 100644
--- a/cps/opds.py
+++ b/cps/opds.py
@@ -430,7 +430,12 @@ def check_auth(username, password):
             username = username.encode('utf-8')
     user = ub.session.query(ub.User).filter(func.lower(ub.User.nickname) ==
                                             username.decode('utf-8').lower()).first()
-    return bool(user and check_password_hash(str(user.password), password))
+    if bool(user and check_password_hash(str(user.password), password)):
+        return True
+    else:
+        ipAdress = request.headers.get('X-Forwarded-For', request.remote_addr)
+        log.warning('OPDS Login failed for user "%s" IP-address: %s', username.decode('utf-8'), ipAdress)
+        return False
 
 
 def authenticate():
diff --git a/cps/static/js/kthoom.js b/cps/static/js/kthoom.js
index 33a2ac0e..40db69ab 100644
--- a/cps/static/js/kthoom.js
+++ b/cps/static/js/kthoom.js
@@ -635,6 +635,14 @@ function init(filename) {
     // Focus the scrollable area so that keyboard scrolling work as expected
     $("#mainContent").focus();
 
+    $("#mainContent").swipe( {
+        swipeRight:function() {
+            showLeftPage();
+        },
+        swipeLeft:function() {
+            showRightPage();
+        },
+    });
     $("#mainImage").click(function(evt) {
         // Firefox does not support offsetX/Y so we have to manually calculate
         // where the user clicked in the image.
diff --git a/cps/static/js/main.js b/cps/static/js/main.js
index d891d30e..33881aaa 100644
--- a/cps/static/js/main.js
+++ b/cps/static/js/main.js
@@ -82,7 +82,6 @@ $(".container-fluid").bind('drop', function (e) {
         var files = e.originalEvent.dataTransfer.files;
         var test = $("#btn-upload")[0].accept;
         $(this).css('background', '');
-        // var final = [];
         const dt = new DataTransfer()
         jQuery.each(files, function (index, item) {
             if (test.indexOf(item.name.substr(item.name.lastIndexOf('.'))) !== -1) {
diff --git a/cps/static/js/reading/epub.js b/cps/static/js/reading/epub.js
index 8b7fb075..edafa82c 100644
--- a/cps/static/js/reading/epub.js
+++ b/cps/static/js/reading/epub.js
@@ -20,6 +20,34 @@ var reader;
         $("#bookmark, #show-Bookmarks").remove();
     }
 
+    // Enable swipe support
+    // I have no idea why swiperRight/swiperLeft from plugins is not working, events just don't get fired
+    var touchStart = 0;
+    var touchEnd = 0;
+
+    reader.rendition.on('touchstart', function(event) {
+        touchStart = event.changedTouches[0].screenX;
+    });
+    reader.rendition.on('touchend', function(event) {
+      touchEnd = event.changedTouches[0].screenX;
+        if (touchStart < touchEnd) {
+            if(reader.book.package.metadata.direction === "rtl") {
+    			reader.rendition.next();
+    		} else {
+    			reader.rendition.prev();
+    		}
+            // Swiped Right
+        }
+        if (touchStart > touchEnd) {
+            if(reader.book.package.metadata.direction === "rtl") {
+    			reader.rendition.prev();
+    		} else {
+                reader.rendition.next();
+    		}
+            // Swiped Left
+        }
+    });
+
     /**
      * @param {string} action - Add or remove bookmark
      * @param {string|int} location - Location or zero
@@ -43,3 +71,5 @@ var reader;
         });
     }
 })();
+
+
diff --git a/cps/templates/config_edit.html b/cps/templates/config_edit.html
index ba8d4f9e..716ed7ba 100644
--- a/cps/templates/config_edit.html
+++ b/cps/templates/config_edit.html
@@ -26,7 +26,7 @@
       </div>
       {% if not filepicker %}
        <div class="form-group">
-        <label id="filepicker-hint">{{_('To activate serverside filepicker start Calibre-Web with -f optionn')}}</label>
+        <label id="filepicker-hint">{{_('To activate serverside filepicker start Calibre-Web with -f option')}}</label>
       </div>
       {% endif %}
     {% if feature_support['gdrive']  %}
diff --git a/cps/templates/read.html b/cps/templates/read.html
index a4361fa0..b38f783c 100644
--- a/cps/templates/read.html
+++ b/cps/templates/read.html
@@ -78,7 +78,7 @@
           </div>
       </div>
       <div class="overlay"></div>
-
+      <script src="{{ url_for('static', filename='js/libs/jquery.min.js') }}"></script>
       <script src="{{ url_for('static', filename='js/libs/jszip.min.js') }}">
       </script> <script src="{{ url_for('static', filename='js/libs/epub.min.js') }}"></script>
       <script type="text/javascript">
@@ -91,10 +91,7 @@
               useBookmarks: "{{ g.user.is_authenticated | tojson }}"
           };
       </script>
-      <script src="{{ url_for('static', filename='js/libs/jquery.min.js') }}"></script>
-      <script src="{{ url_for('static', filename='js/libs/jszip.min.js') }}"></script>
       <script src="{{ url_for('static', filename='js/libs/screenfull.min.js') }}"></script>
-      <script src="{{ url_for('static', filename='js/libs/epub.min.js') }}"></script>
       <script src="{{ url_for('static', filename='js/libs/reader.min.js') }}"></script>
       <script src="{{ url_for('static', filename='js/reading/epub.js') }}"></script>
     </body>
diff --git a/cps/templates/readcbr.html b/cps/templates/readcbr.html
index 29508fbf..35943b34 100644
--- a/cps/templates/readcbr.html
+++ b/cps/templates/readcbr.html
@@ -13,14 +13,10 @@
   <link rel="stylesheet" href="{{ url_for('static', filename='css/kthoom.css') }}" type="text/css"/>
 
   <script src="{{ url_for('static', filename='js/libs/jquery.min.js') }}"></script>
+  <script src="{{ url_for('static', filename='js/libs/plugins.js') }}"></script>
   <script src="{{ url_for('static', filename='js/libs/screenfull.min.js') }}"></script>
-  <script src="{{ url_for('static', filename='js/io/bytestream.js') }}"></script>
-  <script src="{{ url_for('static', filename='js/io/bytebuffer.js') }}"></script>
-  <script src="{{ url_for('static', filename='js/io/bitstream.js') }}"></script>
-  <script src="{{ url_for('static', filename='js/archive/archive.js') }}"></script>
-  <script src="{{ url_for('static', filename='js/archive/rarvm.js') }}"></script>
-  <script src="{{ url_for('static', filename='js/archive/unrar5.js') }}"></script>
   <script src="{{ url_for('static', filename='js/kthoom.js') }}"></script>
+  <script src="{{ url_for('static', filename='js/archive/archive.js') }}"></script>
   <script>
     var updateArrows = function() {
       if ($('input[name="direction"]:checked').val() === "0") {
diff --git a/cps/templates/readtxt.html b/cps/templates/readtxt.html
index 46a16d8f..da862fb2 100644
--- a/cps/templates/readtxt.html
+++ b/cps/templates/readtxt.html
@@ -12,6 +12,7 @@
         <!-- EPUBJS Renderer -->
         <!--<script src="../build/epub.js"></script>-->
         <script src="{{ url_for('static', filename='js/libs/jquery.min.js') }}"></script>
+        <script src="{{ url_for('static', filename='js/libs/plugins.js') }}"></script>
 
         <style type="text/css">
 
@@ -97,6 +98,14 @@
           $( "#right" ).click(function() {
             nextPage();
           });
+          $("#readmain").swipe( {
+            swipeRight:function() {
+                prevPage();
+            },
+            swipeLeft:function() {
+                nextPage();
+            },
+          });
           //bind mouse
           $(window).bind('DOMMouseScroll mousewheel', function(event) {
             var delta = 0;
diff --git a/cps/templates/search_form.html b/cps/templates/search_form.html
index e61fe067..050028ac 100644
--- a/cps/templates/search_form.html
+++ b/cps/templates/search_form.html
@@ -98,7 +98,7 @@
     <div class="row">
         <div class="form-group col-sm-6">
         <div><label for="include_extension">{{_('Extensions')}}</label></div>
-        <select id="include_extension" class="selectpicker" name="include_extension" id="include_extension" data-live-search="true" data-style="btn-primary" multiple>
+        <select class="selectpicker" name="include_extension" id="include_extension" data-live-search="true" data-style="btn-primary" multiple>
         {% for extension in extensions %}
             <option value="{{extension.format}}">{{extension.format}}</option>
           {% endfor %}
@@ -106,7 +106,7 @@
         </div>
         <div class="form-group col-sm-6">
         <div><label for="exclude_extension">{{_('Exclude Extensions')}}</label></div>
-        <select id="exclude_extension" class="selectpicker" name="exclude_extension" id="exclude_extension" data-live-search="true" data-style="btn-danger" multiple>
+        <select class="selectpicker" name="exclude_extension" id="exclude_extension" data-live-search="true" data-style="btn-danger" multiple>
         {% for extension in extensions %}
             <option value="{{extension.format}}">{{extension.format}}</option>
           {% endfor %}
diff --git a/cps/translations/cs/LC_MESSAGES/messages.mo b/cps/translations/cs/LC_MESSAGES/messages.mo
index d41d4f77..cd030e69 100644
Binary files a/cps/translations/cs/LC_MESSAGES/messages.mo and b/cps/translations/cs/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/cs/LC_MESSAGES/messages.po b/cps/translations/cs/LC_MESSAGES/messages.po
index f8021bd3..7066cc5c 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-01-02 19:37+0100\n"
+"POT-Creation-Date: 2021-01-17 11:34+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:42
 msgid "installed"
@@ -29,310 +29,310 @@ msgstr "není nainstalováno"
 msgid "Statistics"
 msgstr "Statistika"
 
-#: cps/admin.py:144
+#: cps/admin.py:147
 msgid "Server restarted, please reload page"
 msgstr "Server restartován, znovu načtěte stránku"
 
-#: cps/admin.py:146
+#: cps/admin.py:149
 msgid "Performing shutdown of server, please close window"
 msgstr "Vypínám server, zavřete okno"
 
-#: cps/admin.py:154
+#: cps/admin.py:157
 msgid "Reconnect successful"
 msgstr "Úspěšně obnovené připojení"
 
-#: cps/admin.py:157
+#: cps/admin.py:160
 msgid "Unknown command"
 msgstr "Neznámý příkaz"
 
-#: cps/admin.py:167 cps/editbooks.py:636 cps/editbooks.py:648
-#: cps/editbooks.py:751 cps/editbooks.py:753 cps/editbooks.py:814
-#: cps/editbooks.py:830 cps/updater.py:510 cps/uploader.py:90
+#: cps/admin.py:170 cps/editbooks.py:642 cps/editbooks.py:654
+#: cps/editbooks.py:757 cps/editbooks.py:759 cps/editbooks.py:820
+#: cps/editbooks.py:836 cps/updater.py:510 cps/uploader.py:90
 #: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Neznámý"
 
-#: cps/admin.py:188
+#: cps/admin.py:191
 msgid "Admin page"
 msgstr "Stránka správce"
 
-#: cps/admin.py:210
+#: cps/admin.py:213
 msgid "UI Configuration"
 msgstr "Konfigurace uživatelského rozhraní"
 
-#: cps/admin.py:242 cps/admin.py:954
+#: cps/admin.py:245 cps/admin.py:923
 msgid "Calibre-Web configuration updated"
 msgstr "Konfigurace Calibre-Web aktualizována"
 
-#: cps/admin.py:253
+#: cps/admin.py:256
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Opravdu chcete odstranit Kobo token?"
 
-#: cps/admin.py:255
+#: cps/admin.py:258
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:257
+#: cps/admin.py:260
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:259 cps/templates/shelf.html:90
+#: cps/admin.py:262 cps/templates/shelf.html:90
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Jste si jisti, že chcete odstranit tuto polici?"
 
-#: cps/admin.py:545 cps/admin.py:551 cps/admin.py:561 cps/admin.py:571
+#: cps/admin.py:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534
 #: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Zakázat"
 
-#: cps/admin.py:547 cps/admin.py:553 cps/admin.py:563 cps/admin.py:573
+#: cps/admin.py:510 cps/admin.py:516 cps/admin.py:526 cps/admin.py:536
 #: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Povolit"
 
-#: cps/admin.py:713
+#: cps/admin.py:679
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json není nakonfigurováno pro webové aplikace"
 
-#: cps/admin.py:753
+#: cps/admin.py:721
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Umístění zápisového souboru není platné. Určete prosím platnou polohu"
 
-#: cps/admin.py:759
+#: cps/admin.py:727
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Umístění zápisového souboru pro přístup není platné. Určete prosím platnou polohu"
 
-#: cps/admin.py:788
+#: cps/admin.py:757
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Prosím zadejte LDAP poskytovatele, port, DN a Identifikátor objektu uživatele"
 
-#: cps/admin.py:803
+#: cps/admin.py:772
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "Filtr objektů skupiny LDAP musí mít jeden “%s” formátový identifikátor"
 
-#: cps/admin.py:806
+#: cps/admin.py:775
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Filtr objektů skupiny LDAP má nesrovnatelnou závorku"
 
-#: cps/admin.py:811
+#: cps/admin.py:780
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Filtr uživatelských objektů LDAP musí mít jeden “%s” formátový identifikátor"
 
-#: cps/admin.py:814
+#: cps/admin.py:783
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Filtr uživatelských objektů LDAP má nesrovnatelnou závorku"
 
-#: cps/admin.py:822
+#: cps/admin.py:791
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:825
+#: cps/admin.py:794
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:833
+#: cps/admin.py:802
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:859
+#: cps/admin.py:828
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "Umístění souboru klíčů není platné, zadejte prosím správnou cestu"
 
-#: cps/admin.py:865
+#: cps/admin.py:834
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Umístění certifikátu není platné, zadejte prosím správnou cestu"
 
-#: cps/admin.py:935 cps/admin.py:1039 cps/admin.py:1135 cps/admin.py:1184
-#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:258
-#: cps/shelf.py:307 cps/shelf.py:339 cps/shelf.py:371 cps/shelf.py:442
+#: cps/admin.py:904 cps/admin.py:1011 cps/admin.py:1100 cps/admin.py:1149
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:261
+#: cps/shelf.py:314 cps/shelf.py:348 cps/shelf.py:418
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:947
+#: cps/admin.py:916
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "Umístění databáze není platné, opravte prosím cestu"
 
-#: cps/admin.py:951
+#: cps/admin.py:920
 msgid "DB is not Writeable"
 msgstr "Databáze není zapisovatelná"
 
-#: cps/admin.py:984
+#: cps/admin.py:959
 msgid "Basic Configuration"
 msgstr "Základní konfigurace"
 
-#: cps/admin.py:999 cps/web.py:1287
+#: cps/admin.py:974 cps/web.py:1275
 msgid "Please fill out all fields!"
 msgstr "Vyplňte všechna pole!"
 
-#: cps/admin.py:1002 cps/admin.py:1014 cps/admin.py:1020 cps/admin.py:1153
+#: cps/admin.py:977 cps/admin.py:989 cps/admin.py:995 cps/admin.py:1118
 msgid "Add new user"
 msgstr "Přidat nového uživatele"
 
-#: cps/admin.py:1011 cps/web.py:1451
+#: cps/admin.py:986 cps/web.py:1439
 msgid "E-mail is not from valid domain"
 msgstr "E-mail není z platné domény"
 
-#: cps/admin.py:1018 cps/admin.py:1036
+#: cps/admin.py:993 cps/admin.py:1008
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Byl nalezen existující účet pro tuto e-mailovou adresu nebo přezdívku."
 
-#: cps/admin.py:1032
+#: cps/admin.py:1004
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Uživatel '%(user)s' vytvořen"
 
-#: cps/admin.py:1051
+#: cps/admin.py:1020
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Uživatel '%(nick)s' smazán"
 
-#: cps/admin.py:1054
+#: cps/admin.py:1023
 msgid "No admin user remaining, can't delete user"
 msgstr "Nezbývá žádný správce, nemůžete jej odstranit"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1028
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Nezbývá žádný správce, nelze odebrat roli správce"
 
-#: cps/admin.py:1096 cps/web.py:1493
+#: cps/admin.py:1064 cps/web.py:1481
 msgid "Found an existing account for this e-mail address."
 msgstr "Byl nalezen existující účet pro tuto e-mailovou adresu."
 
-#: cps/admin.py:1105 cps/admin.py:1119 cps/admin.py:1225 cps/web.py:1469
+#: cps/admin.py:1073 cps/admin.py:1087 cps/admin.py:1190 cps/web.py:1457
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Upravit uživatele %(nick)s"
 
-#: cps/admin.py:1111 cps/web.py:1462
+#: cps/admin.py:1079 cps/web.py:1450
 msgid "This username is already taken"
 msgstr "Zadané uživatelské jméno je již použito"
 
-#: cps/admin.py:1129
+#: cps/admin.py:1094
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Uživatel '%(nick)s' aktualizován"
 
-#: cps/admin.py:1132
+#: cps/admin.py:1097
 msgid "An unknown error occured."
 msgstr "Došlo k neznámé chybě."
 
-#: cps/admin.py:1162 cps/templates/admin.html:78
+#: cps/admin.py:1127 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "Změnit SMTP nastavení"
 
-#: cps/admin.py:1191
+#: cps/admin.py:1156
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Zkušební e-mail úspěšně odeslán na %(kindlemail)s"
 
-#: cps/admin.py:1194
+#: cps/admin.py:1159
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Při odesílání zkušebního e-mailu došlo k chybě: %(res)s"
 
-#: cps/admin.py:1196
+#: cps/admin.py:1161
 msgid "Please configure your e-mail address first..."
 msgstr "Prvně nastavte svou e-mailovou adresu..."
 
-#: cps/admin.py:1198
+#: cps/admin.py:1163
 msgid "E-mail server settings updated"
 msgstr "Nastavení e-mailového serveru aktualizováno"
 
-#: cps/admin.py:1209
+#: cps/admin.py:1174
 msgid "User not found"
 msgstr "Uživatel nenalezen"
 
-#: cps/admin.py:1236
+#: cps/admin.py:1201
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Heslo pro uživatele %(user)s resetováno"
 
-#: cps/admin.py:1239 cps/web.py:1311 cps/web.py:1375
+#: cps/admin.py:1204 cps/web.py:1299 cps/web.py:1363
 msgid "An unknown error occurred. Please try again later."
 msgstr "Neznámá chyba. Opakujte prosím později."
 
-#: cps/admin.py:1242 cps/web.py:1249
+#: cps/admin.py:1207 cps/web.py:1237
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Nejprve nakonfigurujte nastavení pošty SMTP..."
 
-#: cps/admin.py:1254
+#: cps/admin.py:1218
 msgid "Logfile viewer"
 msgstr "Prohlížeč log souborů"
 
-#: cps/admin.py:1315
+#: cps/admin.py:1280
 msgid "Requesting update package"
 msgstr "Požadování balíčku aktualizace"
 
-#: cps/admin.py:1316
+#: cps/admin.py:1281
 msgid "Downloading update package"
 msgstr "Stahování balíčku aktualizace"
 
-#: cps/admin.py:1317
+#: cps/admin.py:1282
 msgid "Unzipping update package"
 msgstr "Rozbalování balíčku aktualizace"
 
-#: cps/admin.py:1318
+#: cps/admin.py:1283
 msgid "Replacing files"
 msgstr "Nahrazování souborů"
 
-#: cps/admin.py:1319
+#: cps/admin.py:1284
 msgid "Database connections are closed"
 msgstr "Databázová připojení jsou uzavřena"
 
-#: cps/admin.py:1320
+#: cps/admin.py:1285
 msgid "Stopping server"
 msgstr "Zastavuji server"
 
-#: cps/admin.py:1321
+#: cps/admin.py:1286
 msgid "Update finished, please press okay and reload page"
 msgstr "Aktualizace dokončena, klepněte na tlačítko OK a znovu načtěte stránku"
 
-#: cps/admin.py:1322 cps/admin.py:1323 cps/admin.py:1324 cps/admin.py:1325
-#: cps/admin.py:1326
+#: cps/admin.py:1287 cps/admin.py:1288 cps/admin.py:1289 cps/admin.py:1290
+#: cps/admin.py:1291
 msgid "Update failed:"
 msgstr "Aktualizace selhala:"
 
-#: cps/admin.py:1322 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+#: cps/admin.py:1287 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTP chyba"
 
-#: cps/admin.py:1323 cps/updater.py:322 cps/updater.py:525
+#: cps/admin.py:1288 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Chyba připojení"
 
-#: cps/admin.py:1324 cps/updater.py:324 cps/updater.py:527
+#: cps/admin.py:1289 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Vypršel časový limit při navazování spojení"
 
-#: cps/admin.py:1325 cps/updater.py:326 cps/updater.py:529
+#: cps/admin.py:1290 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Všeobecná chyba"
 
-#: cps/admin.py:1326
+#: cps/admin.py:1291
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr "Aktualizační soubor nemohl být uložen do Temp Dir"
 
-#: cps/admin.py:1351
+#: cps/admin.py:1316
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Chyba: %(ldaperror)s"
 
-#: cps/admin.py:1355
+#: cps/admin.py:1320
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Chyba: Žádná reakce od uživatele LDAP serveru"
 
-#: cps/admin.py:1421
+#: cps/admin.py:1386
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Nepodařilo se vytvořit nejméně jednoho uživatele LDAP"
 
-#: cps/admin.py:1424
+#: cps/admin.py:1389
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Nejméně jeden uživatel LDAP nenalezen v databázi"
 
-#: cps/admin.py:1426
+#: cps/admin.py:1391
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -352,90 +352,90 @@ msgstr "Formát knihy úspěšně smazán"
 msgid "Book Successfully Deleted"
 msgstr "Kniha úspěšně smazána"
 
-#: cps/editbooks.py:317 cps/editbooks.py:620 cps/web.py:1521 cps/web.py:1554
-#: cps/web.py:1625
+#: cps/editbooks.py:316 cps/editbooks.py:626 cps/web.py:1509 cps/web.py:1542
+#: cps/web.py:1613
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Chyba otevírání eknihy. Soubor neexistuje nebo není přístupný"
 
-#: cps/editbooks.py:351
+#: cps/editbooks.py:350
 msgid "edit metadata"
 msgstr "upravit metadata"
 
-#: cps/editbooks.py:426
+#: cps/editbooks.py:425
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s není platným jazykem"
 
-#: cps/editbooks.py:537 cps/editbooks.py:796
+#: cps/editbooks.py:536 cps/editbooks.py:802
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Soubor s příponou '%(ext)s' nelze odeslat na tento server"
 
-#: cps/editbooks.py:541 cps/editbooks.py:800
+#: cps/editbooks.py:540 cps/editbooks.py:806
 msgid "File to be uploaded must have an extension"
 msgstr "Soubor, který má být odeslán musí mít příponu"
 
-#: cps/editbooks.py:553
+#: cps/editbooks.py:552
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Nepodařilo se vytvořit cestu %(path)s (oprávnění odepřeno)."
 
-#: cps/editbooks.py:558
+#: cps/editbooks.py:557
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Uložení souboru %(file)s se nezdařilo."
 
-#: cps/editbooks.py:576 cps/editbooks.py:931 cps/web.py:1498
+#: cps/editbooks.py:575 cps/editbooks.py:937 cps/web.py:1486
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Chyba databáze: %(error)s."
 
-#: cps/editbooks.py:580
+#: cps/editbooks.py:579
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Formát souboru %(ext)s přidán do %(book)s"
 
-#: cps/editbooks.py:700
+#: cps/editbooks.py:706
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:737
+#: cps/editbooks.py:743
 msgid "Metadata successfully updated"
 msgstr "Metadata úspěšně aktualizována"
 
-#: cps/editbooks.py:746
+#: cps/editbooks.py:752
 msgid "Error editing book, please check logfile for details"
 msgstr "Chyba při úpravách knihy, zkontrolujte prosím log pro podrobnosti"
 
-#: cps/editbooks.py:808
+#: cps/editbooks.py:814
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "Soubor %(filename)s nemohl být uložen do dočasného adresáře"
 
-#: cps/editbooks.py:818
+#: cps/editbooks.py:824
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Nahraná kniha pravděpodobně existuje v knihovně, zvažte prosím změnu před nahráním nové: "
 
-#: cps/editbooks.py:906
+#: cps/editbooks.py:912
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "Nepodařilo se přesunout soubor obalu %(file)s: %(error)s"
 
-#: cps/editbooks.py:917
+#: cps/editbooks.py:923
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Soubor %(file)s nahrán"
 
-#: cps/editbooks.py:943
+#: cps/editbooks.py:949
 msgid "Source or destination format for conversion missing"
 msgstr "Chybí zdrojový nebo cílový formát pro převod"
 
-#: cps/editbooks.py:951
+#: cps/editbooks.py:957
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Kniha byla úspěšně zařazena do fronty pro převod do %(book_format)s"
 
-#: cps/editbooks.py:955
+#: cps/editbooks.py:961
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Při převodu této knihy došlo k chybě: %(res)s"
@@ -596,85 +596,85 @@ msgstr "Dokončeno"
 msgid "Unknown Status"
 msgstr "Neznámý stav"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Pro získání platného api_endpoint pro zařízení Kobo, přístupte na calibre-web bez localhost"
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:157
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
 msgid "Kobo Setup"
 msgstr "Kobo nastavení"
 
-#: cps/oauth_bb.py:74
+#: cps/oauth_bb.py:73
 #, python-format
 msgid "Register with %(provider)s"
 msgstr "Registrovat s %(provider)s"
 
-#: cps/oauth_bb.py:158
+#: cps/oauth_bb.py:146
 msgid "Failed to log in with GitHub."
 msgstr "Přihlášení pomocí GitHub selhalo."
 
-#: cps/oauth_bb.py:163
+#: cps/oauth_bb.py:151
 msgid "Failed to fetch user info from GitHub."
 msgstr "Nepodařilo se načíst informace o uživateli z GitHub."
 
-#: cps/oauth_bb.py:174
+#: cps/oauth_bb.py:162
 msgid "Failed to log in with Google."
 msgstr "Přihlášení pomocí Google selhalo."
 
-#: cps/oauth_bb.py:179
+#: cps/oauth_bb.py:167
 msgid "Failed to fetch user info from Google."
 msgstr "Nepodařilo se načíst informace o uživateli z Google."
 
-#: cps/oauth_bb.py:229 cps/remotelogin.py:134 cps/web.py:1347
+#: cps/oauth_bb.py:213 cps/remotelogin.py:133 cps/web.py:1335
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "nyní jste přihlášen jako: '%(nickname)s'"
 
-#: cps/oauth_bb.py:239
+#: cps/oauth_bb.py:223
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr "Připojení k %(oauth)s úspěšné"
 
-#: cps/oauth_bb.py:245
+#: cps/oauth_bb.py:229
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr "Přihlášení selhalo, žádný uživatel s OAuth účtem"
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:271
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr "Odpojení od %(oauth)s úspěšné"
 
-#: cps/oauth_bb.py:291
+#: cps/oauth_bb.py:275
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr "Odpojení od %(oauth)s selhalo"
 
-#: cps/oauth_bb.py:294
+#: cps/oauth_bb.py:278
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:322
+#: cps/oauth_bb.py:306
 msgid "GitHub Oauth error, please retry later."
 msgstr "GitHub Oauth chyba, prosím opakujte později."
 
-#: cps/oauth_bb.py:341
+#: cps/oauth_bb.py:325
 msgid "Google Oauth error, please retry later."
 msgstr "Google Oauth chyba, prosím opakujte později."
 
-#: cps/remotelogin.py:66 cps/web.py:1394
+#: cps/remotelogin.py:65 cps/web.py:1382
 msgid "login"
 msgstr "přihlásit se"
 
-#: cps/remotelogin.py:78 cps/remotelogin.py:112
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
 msgid "Token not found"
 msgstr "Token nenalezen"
 
-#: cps/remotelogin.py:87 cps/remotelogin.py:120
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
 msgid "Token has expired"
 msgstr "Token vypršel"
 
-#: cps/remotelogin.py:96
+#: cps/remotelogin.py:95
 msgid "Success! Please return to your device"
 msgstr "Úspěch! Vraťte se prosím do zařízení"
 
@@ -702,7 +702,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:388
+#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:376
 msgid "Top Rated Books"
 msgstr "Nejlépe hodnocené knihy"
 
@@ -711,7 +711,7 @@ msgid "Show Top Rated Books"
 msgstr "Zobrazit nejlépe hodnocené knihy"
 
 #: cps/render_template.py:53 cps/templates/index.xml:46
-#: cps/templates/index.xml:50 cps/web.py:648
+#: cps/templates/index.xml:50 cps/web.py:636
 msgid "Read Books"
 msgstr "Přečtené knihy"
 
@@ -720,7 +720,7 @@ msgid "Show read and unread"
 msgstr "Zobrazit prečtené a nepřečtené"
 
 #: cps/render_template.py:57 cps/templates/index.xml:53
-#: cps/templates/index.xml:57 cps/web.py:651
+#: cps/templates/index.xml:57 cps/web.py:639
 msgid "Unread Books"
 msgstr "Nepřečtené knihy"
 
@@ -737,7 +737,7 @@ msgid "Show random books"
 msgstr "Zobrazit náhodné knihy"
 
 #: cps/render_template.py:63 cps/templates/book_table.html:50
-#: cps/templates/index.xml:75 cps/web.py:953
+#: cps/templates/index.xml:75 cps/web.py:941
 msgid "Categories"
 msgstr "Kategorie"
 
@@ -747,7 +747,7 @@ msgstr "Zobrazit výběr kategorie"
 
 #: cps/render_template.py:66 cps/templates/book_edit.html:84
 #: cps/templates/book_table.html:51 cps/templates/index.xml:82
-#: cps/templates/search_form.html:62 cps/web.py:857 cps/web.py:867
+#: cps/templates/search_form.html:62 cps/web.py:845 cps/web.py:855
 msgid "Series"
 msgstr "Série"
 
@@ -765,7 +765,7 @@ msgid "Show author selection"
 msgstr "Zobrazit výběr autora"
 
 #: cps/render_template.py:73 cps/templates/book_table.html:55
-#: cps/templates/index.xml:68 cps/web.py:836
+#: cps/templates/index.xml:68 cps/web.py:824
 msgid "Publishers"
 msgstr "Vydavatelé"
 
@@ -774,7 +774,7 @@ msgid "Show publisher selection"
 msgstr "Zobrazit výběr vydavatele"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:53
-#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:932
+#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:920
 msgid "Languages"
 msgstr "Jazyky"
 
@@ -798,7 +798,7 @@ msgstr "Formáty souborů"
 msgid "Show file formats selection"
 msgstr "Zobrazit výběr formátů"
 
-#: cps/render_template.py:87 cps/web.py:675
+#: cps/render_template.py:87 cps/web.py:663
 msgid "Archived Books"
 msgstr "Archivované knihy"
 
@@ -806,7 +806,7 @@ msgstr "Archivované knihy"
 msgid "Show archived books"
 msgstr "Zobrazit archivované knihy"
 
-#: cps/render_template.py:91 cps/web.py:746
+#: cps/render_template.py:91 cps/web.py:734
 msgid "Books List"
 msgstr ""
 
@@ -863,49 +863,49 @@ msgstr "Kniha byla odebrána z police: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr "Lituji, nejste oprávněni odebrat knihu z této police: %(sname)s"
 
-#: cps/shelf.py:238 cps/shelf.py:282
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr "Veřejná police s názvem '%(title)s' již existuje."
+#: cps/shelf.py:224 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "Vytvořit polici"
 
-#: cps/shelf.py:247 cps/shelf.py:292
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr "Osobní police s názvem ‘%(title)s’ již existuje."
+#: cps/shelf.py:231
+msgid "Edit a shelf"
+msgstr "Upravit polici"
 
-#: cps/shelf.py:254
+#: cps/shelf.py:249
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Police %(title)s vytvořena"
 
-#: cps/shelf.py:261 cps/shelf.py:310
-msgid "There was an error"
-msgstr "Došlo k chybě"
-
-#: cps/shelf.py:262 cps/shelf.py:264 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "Vytvořit polici"
-
-#: cps/shelf.py:304
+#: cps/shelf.py:252
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Police %(title)s změněna"
 
-#: cps/shelf.py:311 cps/shelf.py:313
-msgid "Edit a shelf"
-msgstr "Upravit polici"
+#: cps/shelf.py:265
+msgid "There was an error"
+msgstr "Došlo k chybě"
 
-#: cps/shelf.py:381
+#: cps/shelf.py:281
+#, 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:291
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr "Osobní police s názvem ‘%(title)s’ již existuje."
+
+#: cps/shelf.py:358
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Změnit  pořadí Police: '%(name)s'"
 
-#: cps/shelf.py:447
+#: cps/shelf.py:423
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Police: '%(name)s'"
 
-#: cps/shelf.py:451
+#: cps/shelf.py:427
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Chyba otevírání police. Police neexistuje nebo není přístupná"
 
@@ -938,222 +938,222 @@ msgstr "Nová aktualizace k dispozici. Klepnutím na tlačítko níže aktualizu
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Klepnutím na tlačítko níže aktualizujte na nejnovější stabilní verzi."
 
-#: cps/templates/index.html:5 cps/web.py:396
+#: cps/templates/index.html:5 cps/web.py:384
 msgid "Discover (Random Books)"
 msgstr "Objevte (Náhodné knihy)"
 
-#: cps/web.py:435
+#: cps/web.py:423
 msgid "Books"
 msgstr "Knihy"
 
-#: cps/web.py:460
+#: cps/web.py:448
 msgid "Hot Books (Most Downloaded)"
 msgstr "Žhavé knihy (Nejstahovanější)"
 
-#: cps/web.py:495
+#: cps/web.py:483
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:509
+#: cps/web.py:497
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Jejda! Vybraná kniha není k dispozici. Soubor neexistuje nebo není přístupný"
 
-#: cps/web.py:523
+#: cps/web.py:511
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autoři: %(name)s"
 
-#: cps/web.py:537
+#: cps/web.py:525
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Vydavatel: %(name)s"
 
-#: cps/web.py:550
+#: cps/web.py:538
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Série: %(serie)s"
 
-#: cps/web.py:563
+#: cps/web.py:551
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Hodnocení: %(rating)s stars"
 
-#: cps/web.py:576
+#: cps/web.py:564
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Soubor formátů: %(format)s"
 
-#: cps/web.py:590
+#: cps/web.py:578
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategorie: %(name)s"
 
-#: cps/web.py:609
+#: cps/web.py:597
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Jazyky: %(name)s"
 
-#: cps/web.py:639
+#: cps/web.py:627
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Vlastní sloupec %(column)d neexistuje v databázi"
 
-#: cps/templates/layout.html:56 cps/web.py:706 cps/web.py:1180
+#: cps/templates/layout.html:56 cps/web.py:694 cps/web.py:1168
 msgid "Advanced Search"
 msgstr "Rozšířené hledání"
 
 #: cps/templates/book_edit.html:214 cps/templates/feed.xml:33
 #: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:175 cps/web.py:718 cps/web.py:990
+#: cps/templates/search_form.html:175 cps/web.py:706 cps/web.py:978
 msgid "Search"
 msgstr "Hledat"
 
-#: cps/web.py:885
+#: cps/web.py:873
 msgid "Ratings list"
 msgstr "Seznam hodnocení"
 
-#: cps/web.py:904
+#: cps/web.py:892
 msgid "File formats list"
 msgstr "Seznam formátů"
 
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:967
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:955
 msgid "Tasks"
 msgstr "Úlohy"
 
-#: cps/web.py:1053
+#: cps/web.py:1041
 msgid "Published after "
 msgstr "Vydáno po "
 
-#: cps/web.py:1060
+#: cps/web.py:1048
 msgid "Published before "
 msgstr "Vydáno před "
 
-#: cps/web.py:1079
+#: cps/web.py:1067
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Hodnocení <= %(rating)s"
 
-#: cps/web.py:1081
+#: cps/web.py:1069
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Hodnocení >= %(rating)s"
 
-#: cps/web.py:1083
+#: cps/web.py:1071
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1254
+#: cps/web.py:1242
 #, 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:1258
+#: cps/web.py:1246
 #, 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:1260
+#: cps/web.py:1248
 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:1277
+#: cps/web.py:1265
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-mailový server není nakonfigurován, kontaktujte svého správce!"
 
-#: cps/web.py:1278 cps/web.py:1288 cps/web.py:1312 cps/web.py:1316
-#: cps/web.py:1321 cps/web.py:1325
+#: cps/web.py:1266 cps/web.py:1276 cps/web.py:1300 cps/web.py:1304
+#: cps/web.py:1309 cps/web.py:1313
 msgid "register"
 msgstr "registrovat"
 
-#: cps/web.py:1314
+#: cps/web.py:1302
 msgid "Your e-mail is not allowed to register"
 msgstr "Váš e-mail nemá povolení k registraci"
 
-#: cps/web.py:1317
+#: cps/web.py:1305
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Potvrzovací e-mail byl odeslán na váš účet."
 
-#: cps/web.py:1320
+#: cps/web.py:1308
 msgid "This username or e-mail address is already in use."
 msgstr "Toto uživatelské jméno nebo e-mailová adresa jsou již používány."
 
-#: cps/web.py:1337
+#: cps/web.py:1325
 msgid "Cannot activate LDAP authentication"
 msgstr "Nelze aktivovat ověření LDAP"
 
-#: cps/web.py:1354
+#: cps/web.py:1342
 #, 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:1360
+#: cps/web.py:1348
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Nelze se přihlásit: %(message)s"
 
-#: cps/web.py:1364 cps/web.py:1388
+#: cps/web.py:1352 cps/web.py:1376
 msgid "Wrong Username or Password"
 msgstr "Špatné uživatelské jméno nebo heslo"
 
-#: cps/web.py:1371
+#: cps/web.py:1359
 msgid "New Password was send to your email address"
 msgstr "Nové heslo bylo zasláno na vaši emailovou adresu"
 
-#: cps/web.py:1377
+#: cps/web.py:1365
 msgid "Please enter valid username to reset password"
 msgstr "Zadejte platné uživatelské jméno pro obnovení hesla"
 
-#: cps/web.py:1383
+#: cps/web.py:1371
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Nyní jste přihlášeni jako: '%(nickname)s'"
 
-#: cps/web.py:1453 cps/web.py:1506
+#: cps/web.py:1441 cps/web.py:1494
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s profil"
 
-#: cps/web.py:1489
+#: cps/web.py:1477
 msgid "Profile updated"
 msgstr "Profil aktualizován"
 
-#: cps/web.py:1533 cps/web.py:1536 cps/web.py:1539 cps/web.py:1546
-#: cps/web.py:1551
+#: cps/web.py:1521 cps/web.py:1524 cps/web.py:1527 cps/web.py:1534
+#: cps/web.py:1539
 msgid "Read a Book"
 msgstr "Číst knihu"
 
-#: cps/tasks/convert.py:108
+#: cps/tasks/convert.py:114
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Calibre převaděč %(tool)s nenalezen"
 
-#: cps/tasks/convert.py:132
+#: cps/tasks/convert.py:138
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:136
+#: cps/tasks/convert.py:142
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:146
+#: cps/tasks/convert.py:152
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Kepubify-převaděč selhal: %(error)s"
 
-#: cps/tasks/convert.py:170
+#: cps/tasks/convert.py:176
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr "Převedený soubor nebyl nalezen nebo více než jeden soubor ve složce %(folder)s"
 
-#: cps/tasks/convert.py:193
+#: cps/tasks/convert.py:199
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Převaděč eknih selhal: %(error)s"
 
-#: cps/tasks/convert.py:218
+#: cps/tasks/convert.py:224
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
diff --git a/cps/translations/de/LC_MESSAGES/messages.mo b/cps/translations/de/LC_MESSAGES/messages.mo
index 7591fd75..3c60122a 100644
Binary files a/cps/translations/de/LC_MESSAGES/messages.mo and b/cps/translations/de/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/de/LC_MESSAGES/messages.po b/cps/translations/de/LC_MESSAGES/messages.po
index 5206a3f9..314da8de 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-01-02 19:37+0100\n"
-"PO-Revision-Date: 2020-12-01 14:10+0100\n"
+"POT-Creation-Date: 2021-01-17 11:34+0100\n"
+"PO-Revision-Date: 2021-01-17 11:12+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.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:42
 msgid "installed"
@@ -30,312 +30,312 @@ msgstr "Nicht installiert"
 msgid "Statistics"
 msgstr "Statistiken"
 
-#: cps/admin.py:144
+#: cps/admin.py:147
 msgid "Server restarted, please reload page"
 msgstr "Server neu gestartet, Seite bitte neu laden"
 
-#: cps/admin.py:146
+#: cps/admin.py:149
 msgid "Performing shutdown of server, please close window"
 msgstr "Server wird heruntergefahren, Fenster bitte schließen"
 
-#: cps/admin.py:154
+#: cps/admin.py:157
 msgid "Reconnect successful"
 msgstr "Erfolgreich neu verbunden"
 
-#: cps/admin.py:157
+#: cps/admin.py:160
 msgid "Unknown command"
 msgstr "Unbekannter Befehl"
 
-#: cps/admin.py:167 cps/editbooks.py:636 cps/editbooks.py:648
-#: cps/editbooks.py:751 cps/editbooks.py:753 cps/editbooks.py:814
-#: cps/editbooks.py:830 cps/updater.py:510 cps/uploader.py:90
+#: cps/admin.py:170 cps/editbooks.py:642 cps/editbooks.py:654
+#: cps/editbooks.py:757 cps/editbooks.py:759 cps/editbooks.py:820
+#: cps/editbooks.py:836 cps/updater.py:510 cps/uploader.py:90
 #: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: cps/admin.py:188
+#: cps/admin.py:191
 msgid "Admin page"
 msgstr "Admin Seite"
 
-#: cps/admin.py:210
+#: cps/admin.py:213
 msgid "UI Configuration"
 msgstr "Benutzeroberflächenkonfiguration"
 
-#: cps/admin.py:242 cps/admin.py:954
+#: cps/admin.py:245 cps/admin.py:923
 msgid "Calibre-Web configuration updated"
 msgstr "Konfiguration von Calibre-Web wurde aktualisiert"
 
-#: cps/admin.py:253
+#: cps/admin.py:256
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Möchten Sie wirklich den Kobo Token löschen?"
 
-#: cps/admin.py:255
+#: cps/admin.py:258
 msgid "Do you really want to delete this domain?"
-msgstr ""
+msgstr "Möchten Sie wirklich diese Domain löschen?"
 
-#: cps/admin.py:257
+#: cps/admin.py:260
 msgid "Do you really want to delete this user?"
-msgstr ""
+msgstr "Möchten Sie wirklich diesen Benutzer löschen?"
 
-#: cps/admin.py:259 cps/templates/shelf.html:90
+#: cps/admin.py:262 cps/templates/shelf.html:90
 msgid "Are you sure you want to delete this shelf?"
-msgstr "Wirklich das Bücherregal löschen?"
+msgstr "Möchten Sie wirklich dieses Bücherregal löschen?"
 
-#: cps/admin.py:545 cps/admin.py:551 cps/admin.py:561 cps/admin.py:571
+#: cps/admin.py:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534
 #: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Verbieten"
 
-#: cps/admin.py:547 cps/admin.py:553 cps/admin.py:563 cps/admin.py:573
+#: cps/admin.py:510 cps/admin.py:516 cps/admin.py:526 cps/admin.py:536
 #: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Erlauben"
 
-#: cps/admin.py:713
+#: cps/admin.py:679
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json ist nicht für Web Anwendungen konfiguriert"
 
-#: cps/admin.py:753
+#: cps/admin.py:721
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Logdatei Pfad ist ungültig, bitte einen gültigen Pfad angeben"
 
-#: cps/admin.py:759
+#: cps/admin.py:727
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Zugriffs Logdatei Pfad ist ungültig, bitte einen gültigen Pfad angeben"
 
-#: cps/admin.py:788
+#: cps/admin.py:757
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Bitte einen LDAP Server, Port, DN und Benutzer Objekt angeben"
 
-#: cps/admin.py:803
+#: cps/admin.py:772
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP Gruppen Objekt Filter benötigt genau eine \"%s\" Format Kennung"
 
-#: cps/admin.py:806
+#: cps/admin.py:775
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP Gruppen Objekt Filter hat ungleiche Anzahl von Klammern"
 
-#: cps/admin.py:811
+#: cps/admin.py:780
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP Benutzer Objekt Filter benötigt genau eine \"%s\" Format Kennung"
 
-#: cps/admin.py:814
+#: cps/admin.py:783
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP Benutzer Objekt Filter hat ungleiche Anzahl von Klammern"
 
-#: cps/admin.py:822
+#: cps/admin.py:791
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
-msgstr ""
+msgstr "Der LDAP Member User Filter benötigt genau eine \"%s\" Formatierungsmarkierung"
 
-#: cps/admin.py:825
+#: cps/admin.py:794
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
-msgstr ""
+msgstr "LDAP Member User Filter hat eine ungleiche Anzahl von geöffneten und geschlossenen Klammern"
 
-#: cps/admin.py:833
+#: cps/admin.py:802
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
-msgstr ""
+msgstr "LDAP CA-Zertifikat, Zertifikat oder Key Datei ist kein gültiger Pfad"
 
-#: cps/admin.py:859
+#: cps/admin.py:828
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "Schlüsseldatei ist ungültig, bitte einen gültigen Pfad angeben"
 
-#: cps/admin.py:865
+#: cps/admin.py:834
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Zertifikatsdatei ist ungültig, bitte einen gültigen Pfad angeben"
 
-#: cps/admin.py:935 cps/admin.py:1039 cps/admin.py:1135 cps/admin.py:1184
-#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:258
-#: cps/shelf.py:307 cps/shelf.py:339 cps/shelf.py:371 cps/shelf.py:442
+#: cps/admin.py:904 cps/admin.py:1011 cps/admin.py:1100 cps/admin.py:1149
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:261
+#: cps/shelf.py:314 cps/shelf.py:348 cps/shelf.py:418
 msgid "Settings DB is not Writeable"
 msgstr "Einstellungsdatenbank ist nicht schreibbar"
 
-#: cps/admin.py:947
+#: cps/admin.py:916
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "DB Pfad ist nicht gültig, bitte einen gültigen Pfad angeben"
 
-#: cps/admin.py:951
+#: cps/admin.py:920
 msgid "DB is not Writeable"
 msgstr "Datenbank ist nicht schreibbar"
 
-#: cps/admin.py:984
+#: cps/admin.py:959
 msgid "Basic Configuration"
 msgstr "Basiskonfiguration"
 
-#: cps/admin.py:999 cps/web.py:1287
+#: cps/admin.py:974 cps/web.py:1275
 msgid "Please fill out all fields!"
 msgstr "Bitte alle Felder ausfüllen!"
 
-#: cps/admin.py:1002 cps/admin.py:1014 cps/admin.py:1020 cps/admin.py:1153
+#: cps/admin.py:977 cps/admin.py:989 cps/admin.py:995 cps/admin.py:1118
 msgid "Add new user"
 msgstr "Neuen Benutzer hinzufügen"
 
-#: cps/admin.py:1011 cps/web.py:1451
+#: cps/admin.py:986 cps/web.py:1439
 msgid "E-mail is not from valid domain"
 msgstr "E-Mail bezieht sich nicht auf eine gültige Domain"
 
-#: cps/admin.py:1018 cps/admin.py:1036
+#: cps/admin.py:993 cps/admin.py:1008
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Es existiert bereits ein Account für diese E-Mailadresse oder diesen Benutzernamen."
 
-#: cps/admin.py:1032
+#: cps/admin.py:1004
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Benutzer '%(user)s' angelegt"
 
-#: cps/admin.py:1051
+#: cps/admin.py:1020
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Benutzer '%(nick)s' gelöscht"
 
-#: cps/admin.py:1054
+#: cps/admin.py:1023
 msgid "No admin user remaining, can't delete user"
 msgstr "Benutzer kann nicht gelöscht werden, es wäre kein Admin Benutzer übrig"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1028
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Kein Admin Benutzer verblieben Admin Berechtigung kann nicht entfernt werden"
 
-#: cps/admin.py:1096 cps/web.py:1493
+#: cps/admin.py:1064 cps/web.py:1481
 msgid "Found an existing account for this e-mail address."
 msgstr "Es existiert bereits ein Benutzer für diese E-Mailadresse."
 
-#: cps/admin.py:1105 cps/admin.py:1119 cps/admin.py:1225 cps/web.py:1469
+#: cps/admin.py:1073 cps/admin.py:1087 cps/admin.py:1190 cps/web.py:1457
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Benutzer %(nick)s bearbeiten"
 
-#: cps/admin.py:1111 cps/web.py:1462
+#: cps/admin.py:1079 cps/web.py:1450
 msgid "This username is already taken"
 msgstr "Benutzername ist schon vorhanden"
 
-#: cps/admin.py:1129
+#: cps/admin.py:1094
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Benutzer '%(nick)s' aktualisiert"
 
-#: cps/admin.py:1132
+#: cps/admin.py:1097
 msgid "An unknown error occured."
 msgstr "Es ist ein unbekannter Fehler aufgetreten."
 
-#: cps/admin.py:1162 cps/templates/admin.html:78
+#: cps/admin.py:1127 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "SMTP-Einstellungen ändern"
 
-#: cps/admin.py:1191
+#: cps/admin.py:1156
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Test-E-Mail wurde erfolgreich an %(kindlemail)s versendet"
 
-#: cps/admin.py:1194
+#: cps/admin.py:1159
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Es trat ein Fehler beim Versenden der Test-E-Mail auf: %(res)s"
 
-#: cps/admin.py:1196
+#: cps/admin.py:1161
 msgid "Please configure your e-mail address first..."
 msgstr "Bitte zuerst E-Mail Adresse konfigurieren..."
 
-#: cps/admin.py:1198
+#: cps/admin.py:1163
 msgid "E-mail server settings updated"
 msgstr "Einstellungen des E-Mail-Servers aktualisiert"
 
-#: cps/admin.py:1209
+#: cps/admin.py:1174
 msgid "User not found"
 msgstr "Benutzer nicht gefunden"
 
-#: cps/admin.py:1236
+#: cps/admin.py:1201
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Passwort für Benutzer %(user)s wurde zurückgesetzt"
 
-#: cps/admin.py:1239 cps/web.py:1311 cps/web.py:1375
+#: cps/admin.py:1204 cps/web.py:1299 cps/web.py:1363
 msgid "An unknown error occurred. Please try again later."
 msgstr "Es ist ein unbekannter Fehler aufgetreten. Bitte später erneut versuchen."
 
-#: cps/admin.py:1242 cps/web.py:1249
+#: cps/admin.py:1207 cps/web.py:1237
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Bitte zuerst die SMTP-Einstellung konfigurieren ..."
 
-#: cps/admin.py:1254
+#: cps/admin.py:1218
 msgid "Logfile viewer"
 msgstr "Logdatei Anzeige"
 
-#: cps/admin.py:1315
+#: cps/admin.py:1280
 msgid "Requesting update package"
 msgstr "Frage Update an"
 
-#: cps/admin.py:1316
+#: cps/admin.py:1281
 msgid "Downloading update package"
 msgstr "Lade Update herunter"
 
-#: cps/admin.py:1317
+#: cps/admin.py:1282
 msgid "Unzipping update package"
 msgstr "Entpacke Update"
 
-#: cps/admin.py:1318
+#: cps/admin.py:1283
 msgid "Replacing files"
 msgstr "Ersetze Dateien"
 
-#: cps/admin.py:1319
+#: cps/admin.py:1284
 msgid "Database connections are closed"
 msgstr "Schließe Datenbankverbindungen"
 
-#: cps/admin.py:1320
+#: cps/admin.py:1285
 msgid "Stopping server"
 msgstr "Stoppe Server"
 
-#: cps/admin.py:1321
+#: cps/admin.py:1286
 msgid "Update finished, please press okay and reload page"
 msgstr "Update abgeschlossen, bitte okay drücken und Seite neu laden"
 
-#: cps/admin.py:1322 cps/admin.py:1323 cps/admin.py:1324 cps/admin.py:1325
-#: cps/admin.py:1326
+#: cps/admin.py:1287 cps/admin.py:1288 cps/admin.py:1289 cps/admin.py:1290
+#: cps/admin.py:1291
 msgid "Update failed:"
 msgstr "Update fehlgeschlagen:"
 
-#: cps/admin.py:1322 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+#: cps/admin.py:1287 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTP Fehler"
 
-#: cps/admin.py:1323 cps/updater.py:322 cps/updater.py:525
+#: cps/admin.py:1288 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Verbindungsfehler"
 
-#: cps/admin.py:1324 cps/updater.py:324 cps/updater.py:527
+#: cps/admin.py:1289 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Timeout beim Verbindungsaufbau"
 
-#: cps/admin.py:1325 cps/updater.py:326 cps/updater.py:529
+#: cps/admin.py:1290 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Allgemeiner Fehler"
 
-#: cps/admin.py:1326
+#: cps/admin.py:1291
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr "Updatedatei konnte nicht in Temporärem Ordner gespeichert werden"
 
-#: cps/admin.py:1351
+#: cps/admin.py:1316
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Fehler: %(ldaperror)s"
 
-#: cps/admin.py:1355
+#: cps/admin.py:1320
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Fehler: Keine Benutzerinformationen von LDAP Server empfangen"
 
-#: cps/admin.py:1421
+#: cps/admin.py:1386
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Mindestens ein LDAP Benutzer konnte nicht erzeugt werden"
 
-#: cps/admin.py:1424
+#: cps/admin.py:1389
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Mindestens ein LDAP Benutzer wurde nicht in der Datenbank gefudnen"
 
-#: cps/admin.py:1426
+#: cps/admin.py:1391
 msgid "{} User Successfully Imported"
-msgstr ""
+msgstr "{} Benutzer erfolgreich importiert"
 
 #: cps/converter.py:31
 msgid "not configured"
@@ -353,90 +353,90 @@ msgstr "Buch Format erfolgreich gelöscht"
 msgid "Book Successfully Deleted"
 msgstr "Buch erfolgreich gelöscht"
 
-#: cps/editbooks.py:317 cps/editbooks.py:620 cps/web.py:1521 cps/web.py:1554
-#: cps/web.py:1625
+#: cps/editbooks.py:316 cps/editbooks.py:626 cps/web.py:1509 cps/web.py:1542
+#: cps/web.py:1613
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Öffnen des Buchs fehlgeschlagen. Datei existiert nicht oder ist nicht zugänglich"
 
-#: cps/editbooks.py:351
+#: cps/editbooks.py:350
 msgid "edit metadata"
 msgstr "Metadaten editieren"
 
-#: cps/editbooks.py:426
+#: cps/editbooks.py:425
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s ist keine gültige Sprache"
 
-#: cps/editbooks.py:537 cps/editbooks.py:796
+#: cps/editbooks.py:536 cps/editbooks.py:802
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Dateiendung '%(ext)s' kann nicht auf diesen Server hochgeladen werden"
 
-#: cps/editbooks.py:541 cps/editbooks.py:800
+#: cps/editbooks.py:540 cps/editbooks.py:806
 msgid "File to be uploaded must have an extension"
 msgstr "Dateien müssen eine Erweiterung haben, um hochgeladen zu werden"
 
-#: cps/editbooks.py:553
+#: cps/editbooks.py:552
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Fehler beim Erzeugen des Pfads %(path)s (Zugriff verweigert)"
 
-#: cps/editbooks.py:558
+#: cps/editbooks.py:557
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Fehler beim Speichern der Datei %(file)s."
 
-#: cps/editbooks.py:576 cps/editbooks.py:931 cps/web.py:1498
+#: cps/editbooks.py:575 cps/editbooks.py:937 cps/web.py:1486
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Datenbankfehler: %(error)s."
 
-#: cps/editbooks.py:580
+#: cps/editbooks.py:579
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Dateiformat %(ext)s zu %(book)s hinzugefügt"
 
-#: cps/editbooks.py:700
+#: cps/editbooks.py:706
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "IDs unterscheiden nicht Groß-Kleinschreibung, alte ID wird überschrieben"
 
-#: cps/editbooks.py:737
+#: cps/editbooks.py:743
 msgid "Metadata successfully updated"
 msgstr "Metadaten wurden erfolgreich aktualisiert"
 
-#: cps/editbooks.py:746
+#: cps/editbooks.py:752
 msgid "Error editing book, please check logfile for details"
 msgstr "Fehler beim Editieren des Buchs, Details im Logfile"
 
-#: cps/editbooks.py:808
+#: cps/editbooks.py:814
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "Die Datei %(filename)s konnte nicht im temporären Ordner gespeichert werden"
 
-#: cps/editbooks.py:818
+#: cps/editbooks.py:824
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Das hochgeladene Buch existiert evtl. schon in der Bibliothek: "
 
-#: cps/editbooks.py:906
+#: cps/editbooks.py:912
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "Fehler beim Verschieben der Cover Datei %(file)s: %(error)s"
 
-#: cps/editbooks.py:917
+#: cps/editbooks.py:923
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Datei %(file)s hochgeladen"
 
-#: cps/editbooks.py:943
+#: cps/editbooks.py:949
 msgid "Source or destination format for conversion missing"
 msgstr "Quell- oder Zielformat für Konvertierung fehlt"
 
-#: cps/editbooks.py:951
+#: cps/editbooks.py:957
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Buch wurde erfolgreich für die Konvertierung nach %(book_format)s eingereiht"
 
-#: cps/editbooks.py:955
+#: cps/editbooks.py:961
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Es trat ein Fehler beim Konvertieren des Buches auf: %(res)s"
@@ -563,7 +563,7 @@ msgstr "Cover Datei ist keine gültige Bilddatei, kann nicht gespeichert werden"
 
 #: cps/helper.py:620
 msgid "Only jpg/jpeg/png/webp/bmp files are supported as coverfile"
-msgstr ""
+msgstr "Nur jpg/jpeg/png/webp/bmp Dateien werden als Coverdatei unterstützt"
 
 #: cps/helper.py:633
 msgid "Only jpg/jpeg files are supported as coverfile"
@@ -597,85 +597,85 @@ msgstr "Beendet"
 msgid "Unknown Status"
 msgstr "Unbekannter Status"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Bitte nicht von \"localhost\" auf Calibre-Web zugreifen, um einen gültigen  api_endpoint für Kobo Geräte zu erhalten"
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:157
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
 msgid "Kobo Setup"
 msgstr "Kobo Setup"
 
-#: cps/oauth_bb.py:74
+#: cps/oauth_bb.py:73
 #, python-format
 msgid "Register with %(provider)s"
 msgstr "Anmelden mit %(provider)s"
 
-#: cps/oauth_bb.py:158
+#: cps/oauth_bb.py:146
 msgid "Failed to log in with GitHub."
 msgstr "Login mit Github fehlgeschlagen."
 
-#: cps/oauth_bb.py:163
+#: cps/oauth_bb.py:151
 msgid "Failed to fetch user info from GitHub."
 msgstr "Laden der Benutzerinformationen von Github fehlgeschlagen."
 
-#: cps/oauth_bb.py:174
+#: cps/oauth_bb.py:162
 msgid "Failed to log in with Google."
 msgstr "Login mit Google fehlgeschlagen."
 
-#: cps/oauth_bb.py:179
+#: cps/oauth_bb.py:167
 msgid "Failed to fetch user info from Google."
 msgstr "Laden der Benutzerinformationen von Google fehlgeschlagen."
 
-#: cps/oauth_bb.py:229 cps/remotelogin.py:134 cps/web.py:1347
+#: cps/oauth_bb.py:213 cps/remotelogin.py:133 cps/web.py:1335
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Du bist nun eingeloggt als '%(nickname)s'"
 
-#: cps/oauth_bb.py:239
+#: cps/oauth_bb.py:223
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr "Verbindung mit %(oauth)s erfolgreich"
 
-#: cps/oauth_bb.py:245
+#: cps/oauth_bb.py:229
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr "Login fehlgeschlagen, es ist kein Benutzer mit diesem Account verbunden"
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:271
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr "Verbindung zu %(oauth)s erfolgreich getrennt"
 
-#: cps/oauth_bb.py:291
+#: cps/oauth_bb.py:275
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr "Verbindung mit %(oauth)s fehlgeschlagen"
 
-#: cps/oauth_bb.py:294
+#: cps/oauth_bb.py:278
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr "Nicht mit  %(oauth)s verbunden"
 
-#: cps/oauth_bb.py:322
+#: cps/oauth_bb.py:306
 msgid "GitHub Oauth error, please retry later."
 msgstr "GitHub Oauth Fehler, bitte später erneut versuchen."
 
-#: cps/oauth_bb.py:341
+#: cps/oauth_bb.py:325
 msgid "Google Oauth error, please retry later."
 msgstr "Google Oauth Fehler, bitte später erneut versuchen."
 
-#: cps/remotelogin.py:66 cps/web.py:1394
+#: cps/remotelogin.py:65 cps/web.py:1382
 msgid "login"
 msgstr "Login"
 
-#: cps/remotelogin.py:78 cps/remotelogin.py:112
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
 msgid "Token not found"
 msgstr "Token wurde nicht gefunden"
 
-#: cps/remotelogin.py:87 cps/remotelogin.py:120
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
 msgid "Token has expired"
 msgstr "Token ist abgelaufen"
 
-#: cps/remotelogin.py:96
+#: cps/remotelogin.py:95
 msgid "Success! Please return to your device"
 msgstr "Erfolg! Bitte zum Gerät zurückkehren"
 
@@ -703,7 +703,7 @@ msgstr "Heruntergeladene Bücher"
 msgid "Show Downloaded Books"
 msgstr "Zeige heruntergeladene Bücher"
 
-#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:388
+#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:376
 msgid "Top Rated Books"
 msgstr "Best bewertete Bücher"
 
@@ -712,7 +712,7 @@ msgid "Show Top Rated Books"
 msgstr "Bestbewertete Bücher anzeigen"
 
 #: cps/render_template.py:53 cps/templates/index.xml:46
-#: cps/templates/index.xml:50 cps/web.py:648
+#: cps/templates/index.xml:50 cps/web.py:636
 msgid "Read Books"
 msgstr "Gelesene Bücher"
 
@@ -721,7 +721,7 @@ msgid "Show read and unread"
 msgstr "Zeige gelesene/ungelesene Bücher"
 
 #: cps/render_template.py:57 cps/templates/index.xml:53
-#: cps/templates/index.xml:57 cps/web.py:651
+#: cps/templates/index.xml:57 cps/web.py:639
 msgid "Unread Books"
 msgstr "Ungelesene Bücher"
 
@@ -738,7 +738,7 @@ msgid "Show random books"
 msgstr "Zeige zufällige Bücher"
 
 #: cps/render_template.py:63 cps/templates/book_table.html:50
-#: cps/templates/index.xml:75 cps/web.py:953
+#: cps/templates/index.xml:75 cps/web.py:941
 msgid "Categories"
 msgstr "Kategorien"
 
@@ -748,7 +748,7 @@ msgstr "Zeige Kategorienauswahl"
 
 #: cps/render_template.py:66 cps/templates/book_edit.html:84
 #: cps/templates/book_table.html:51 cps/templates/index.xml:82
-#: cps/templates/search_form.html:62 cps/web.py:857 cps/web.py:867
+#: cps/templates/search_form.html:62 cps/web.py:845 cps/web.py:855
 msgid "Series"
 msgstr "Serien"
 
@@ -766,7 +766,7 @@ msgid "Show author selection"
 msgstr "Zeige Autorenauswahl"
 
 #: cps/render_template.py:73 cps/templates/book_table.html:55
-#: cps/templates/index.xml:68 cps/web.py:836
+#: cps/templates/index.xml:68 cps/web.py:824
 msgid "Publishers"
 msgstr "Verleger"
 
@@ -775,7 +775,7 @@ msgid "Show publisher selection"
 msgstr "Zeige Verlegerauswahl"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:53
-#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:932
+#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:920
 msgid "Languages"
 msgstr "Sprachen"
 
@@ -799,7 +799,7 @@ msgstr "Dateiformate"
 msgid "Show file formats selection"
 msgstr "Zeige Dateiformatauswahl"
 
-#: cps/render_template.py:87 cps/web.py:675
+#: cps/render_template.py:87 cps/web.py:663
 msgid "Archived Books"
 msgstr "Archivierte Bücher"
 
@@ -807,7 +807,7 @@ msgstr "Archivierte Bücher"
 msgid "Show archived books"
 msgstr "Zeige archivierte Bücher"
 
-#: cps/render_template.py:91 cps/web.py:746
+#: cps/render_template.py:91 cps/web.py:734
 msgid "Books List"
 msgstr "Bücherliste"
 
@@ -864,49 +864,49 @@ msgstr "Das Buch wurde aus dem Bücherregal: %(sname)s entfernt"
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr "Dir ist es nicht erlaubt, Bücher aus dem Bücherregal %(sname)s zu entfernen"
 
-#: cps/shelf.py:238 cps/shelf.py:282
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr "Es existiert bereit ein öffentliches Bücherregal mit dem Name '%(title)s'."
+#: cps/shelf.py:224 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "Bücherregal erzeugen"
 
-#: cps/shelf.py:247 cps/shelf.py:292
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr "Es existiert bereit ein privates Bücherregal mit dem Name '%(title)s'."
+#: cps/shelf.py:231
+msgid "Edit a shelf"
+msgstr "Bücherregal editieren"
 
-#: cps/shelf.py:254
+#: cps/shelf.py:249
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Bücherregal %(title)s erzeugt"
 
-#: cps/shelf.py:261 cps/shelf.py:310
-msgid "There was an error"
-msgstr "Es trat ein Fehler auf"
-
-#: cps/shelf.py:262 cps/shelf.py:264 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "Bücherregal erzeugen"
-
-#: cps/shelf.py:304
+#: cps/shelf.py:252
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Bücherregal %(title)s verändert"
 
-#: cps/shelf.py:311 cps/shelf.py:313
-msgid "Edit a shelf"
-msgstr "Bücherregal editieren"
+#: cps/shelf.py:265
+msgid "There was an error"
+msgstr "Es trat ein Fehler auf"
 
-#: cps/shelf.py:381
+#: cps/shelf.py:281
+#, 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:291
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr "Es existiert bereit ein privates Bücherregal mit dem Name '%(title)s'."
+
+#: cps/shelf.py:358
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Reihenfolge in Bücherregal '%(name)s' verändern"
 
-#: cps/shelf.py:447
+#: cps/shelf.py:423
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Bücherregal: '%(name)s'"
 
-#: cps/shelf.py:451
+#: cps/shelf.py:427
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Fehler beim Öffnen des Bücherregals. Bücherregal exisitert nicht oder ist nicht zugänglich"
 
@@ -939,225 +939,225 @@ msgstr "Ein neues Update ist verfügbar. Klicke auf den Button unten, um auf Ver
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Klicke auf den Button unten, um auf die letzte stabile Version zu aktualisieren."
 
-#: cps/templates/index.html:5 cps/web.py:396
+#: cps/templates/index.html:5 cps/web.py:384
 msgid "Discover (Random Books)"
 msgstr "Zufällige Bücher"
 
-#: cps/web.py:435
+#: cps/web.py:423
 msgid "Books"
 msgstr "Bücher"
 
-#: cps/web.py:460
+#: cps/web.py:448
 msgid "Hot Books (Most Downloaded)"
 msgstr "Beliebte Bücher (am meisten Downloads)"
 
-#: cps/web.py:495
+#: cps/web.py:483
 #, python-format
 msgid "Downloaded books by %(user)s"
-msgstr ""
+msgstr "Von %(user)s heruntergeladene Bücher"
 
-#: cps/web.py:509
+#: cps/web.py:497
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Öffnen des Buchs fehlgeschlagen. Datei existiert nicht oder ist nicht zugänglich"
 
-#: cps/web.py:523
+#: cps/web.py:511
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Author: %(name)s"
 
-#: cps/web.py:537
+#: cps/web.py:525
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Verleger: %(name)s"
 
-#: cps/web.py:550
+#: cps/web.py:538
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie: %(serie)s"
 
-#: cps/web.py:563
+#: cps/web.py:551
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Bewertung: %(rating)s Sterne"
 
-#: cps/web.py:576
+#: cps/web.py:564
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Dateiformat: %(format)s"
 
-#: cps/web.py:590
+#: cps/web.py:578
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategorie: %(name)s"
 
-#: cps/web.py:609
+#: cps/web.py:597
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Sprache: %(name)s"
 
-#: cps/web.py:639
+#: cps/web.py:627
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Benutzerdefinierte Spalte Nr. %(column)d ist nicht in Calibre Datenbank vorhanden"
 
-#: cps/templates/layout.html:56 cps/web.py:706 cps/web.py:1180
+#: cps/templates/layout.html:56 cps/web.py:694 cps/web.py:1168
 msgid "Advanced Search"
 msgstr "Erweiterte Suche"
 
 #: cps/templates/book_edit.html:214 cps/templates/feed.xml:33
 #: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:175 cps/web.py:718 cps/web.py:990
+#: cps/templates/search_form.html:175 cps/web.py:706 cps/web.py:978
 msgid "Search"
 msgstr "Suche"
 
-#: cps/web.py:885
+#: cps/web.py:873
 msgid "Ratings list"
 msgstr "Bewertungsliste"
 
-#: cps/web.py:904
+#: cps/web.py:892
 msgid "File formats list"
 msgstr "Liste der Dateiformate"
 
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:967
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:955
 msgid "Tasks"
 msgstr "Aufgaben"
 
-#: cps/web.py:1053
+#: cps/web.py:1041
 msgid "Published after "
 msgstr "Herausgegeben nach dem "
 
-#: cps/web.py:1060
+#: cps/web.py:1048
 msgid "Published before "
 msgstr "Herausgegeben vor dem "
 
-#: cps/web.py:1079
+#: cps/web.py:1067
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Bewertung <= %(rating)s"
 
-#: cps/web.py:1081
+#: cps/web.py:1069
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Bewertung >= %(rating)s"
 
-#: cps/web.py:1083
+#: cps/web.py:1071
 #, python-format
 msgid "Read Status = %(status)s"
-msgstr ""
+msgstr "Lesestatus = %(status)s"
 
-#: cps/web.py:1254
+#: cps/web.py:1242
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Buch erfolgreich zum Senden an %(kindlemail)s eingereiht"
 
-#: cps/web.py:1258
+#: cps/web.py:1246
 #, 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:1260
+#: cps/web.py:1248
 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:1277
+#: cps/web.py:1265
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Der E-Mail Server ist nicht konfigurierte, bitte den Administrator kontaktieren!"
 
-#: cps/web.py:1278 cps/web.py:1288 cps/web.py:1312 cps/web.py:1316
-#: cps/web.py:1321 cps/web.py:1325
+#: cps/web.py:1266 cps/web.py:1276 cps/web.py:1300 cps/web.py:1304
+#: cps/web.py:1309 cps/web.py:1313
 msgid "register"
 msgstr "Registieren"
 
-#: cps/web.py:1314
+#: cps/web.py:1302
 msgid "Your e-mail is not allowed to register"
 msgstr "Diese E-Mail ist nicht für die Registrierung zugelassen"
 
-#: cps/web.py:1317
+#: cps/web.py:1305
 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:1320
+#: cps/web.py:1308
 msgid "This username or e-mail address is already in use."
 msgstr "Benutzername oder E-Mailadresse ist bereits in Verwendung."
 
-#: cps/web.py:1337
+#: cps/web.py:1325
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP-Authentifizierung kann nicht aktiviert werden"
 
-#: cps/web.py:1354
+#: cps/web.py:1342
 #, 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:1360
+#: cps/web.py:1348
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Login nicht erfolgreich: %(message)s"
 
-#: cps/web.py:1364 cps/web.py:1388
+#: cps/web.py:1352 cps/web.py:1376
 msgid "Wrong Username or Password"
 msgstr "Falscher Benutzername oder Passwort"
 
-#: cps/web.py:1371
+#: cps/web.py:1359
 msgid "New Password was send to your email address"
 msgstr "Das neue Passwort wurde an die E-Mail Adresse verschickt"
 
-#: cps/web.py:1377
+#: cps/web.py:1365
 msgid "Please enter valid username to reset password"
 msgstr "Bitte einen gültigen Benutzernamen zum Zurücksetzen des Passworts angeben"
 
-#: cps/web.py:1383
+#: cps/web.py:1371
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Eingeloggt als: '%(nickname)s'"
 
-#: cps/web.py:1453 cps/web.py:1506
+#: cps/web.py:1441 cps/web.py:1494
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's Profil"
 
-#: cps/web.py:1489
+#: cps/web.py:1477
 msgid "Profile updated"
 msgstr "Profil aktualisiert"
 
-#: cps/web.py:1533 cps/web.py:1536 cps/web.py:1539 cps/web.py:1546
-#: cps/web.py:1551
+#: cps/web.py:1521 cps/web.py:1524 cps/web.py:1527 cps/web.py:1534
+#: cps/web.py:1539
 msgid "Read a Book"
 msgstr "Lese ein Buch"
 
-#: cps/tasks/convert.py:108
+#: cps/tasks/convert.py:114
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Calibre E-Book Konverter %(tool)s nicht gefunden"
 
-#: cps/tasks/convert.py:132
+#: cps/tasks/convert.py:138
 #, python-format
 msgid "%(format)s format not found on disk"
-msgstr ""
+msgstr "%(format)s Format nicht gefunden"
 
-#: cps/tasks/convert.py:136
+#: cps/tasks/convert.py:142
 msgid "Ebook converter failed with unknown error"
-msgstr ""
+msgstr "EBook Converter mit unbekanntem Fehler fehlgeschlagen"
 
-#: cps/tasks/convert.py:146
+#: cps/tasks/convert.py:152
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Kepubify Konverter Aufruf fehlgeschlagen: %(error)s"
 
-#: cps/tasks/convert.py:170
+#: cps/tasks/convert.py:176
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr "Konvertierte Datei nicht gefunden, oder mehr als eine Datei im Pfad %(folder)s"
 
-#: cps/tasks/convert.py:193
+#: cps/tasks/convert.py:199
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Fehler des EBook-Converters: %(error)s"
 
-#: cps/tasks/convert.py:218
+#: cps/tasks/convert.py:224
 #, python-format
 msgid "Calibre failed with error: %(error)s"
-msgstr ""
+msgstr "Calibre fehlgeschlagen mit Fehler: %(error)s"
 
 #: cps/templates/admin.html:9
 msgid "Users"
@@ -1392,32 +1392,32 @@ msgstr "In Bibliothek"
 #: cps/templates/author.html:26 cps/templates/index.html:68
 #: cps/templates/search.html:29 cps/templates/shelf.html:16
 msgid "Sort according to book date, newest first"
-msgstr ""
+msgstr "Sortiere nach Buchdatum, Neuestes zuerst"
 
 #: cps/templates/author.html:27 cps/templates/index.html:69
 #: cps/templates/search.html:30 cps/templates/shelf.html:17
 msgid "Sort according to book date, oldest first"
-msgstr ""
+msgstr "Sortiere nach Buchdatum, Aältestes zuerst"
 
 #: cps/templates/author.html:28 cps/templates/index.html:70
 #: cps/templates/search.html:31 cps/templates/shelf.html:18
 msgid "Sort title in alphabetical order"
-msgstr ""
+msgstr "Sortiere Titel in alphabetischer Reihenfolge"
 
 #: cps/templates/author.html:29 cps/templates/index.html:71
 #: cps/templates/search.html:32 cps/templates/shelf.html:19
 msgid "Sort title in reverse alphabetical order"
-msgstr ""
+msgstr "Sortiere Titel in umgekehrt alphabetischer Reihenfolge"
 
 #: cps/templates/author.html:30 cps/templates/index.html:74
 #: cps/templates/search.html:35 cps/templates/shelf.html:22
 msgid "Sort according to publishing date, newest first"
-msgstr ""
+msgstr "Sortiere nach Herausgabedatum, Neueste zuerst"
 
 #: cps/templates/author.html:31 cps/templates/index.html:75
 #: cps/templates/search.html:36 cps/templates/shelf.html:23
 msgid "Sort according to publishing date, oldest first"
-msgstr ""
+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
@@ -1673,11 +1673,11 @@ msgstr "Sicher?"
 
 #: cps/templates/book_table.html:74
 msgid "Books with Title will be merged from:"
-msgstr ""
+msgstr "Bücher werden zusammengeführt. Von Titel:"
 
 #: cps/templates/book_table.html:78
 msgid "Into Book with Title:"
-msgstr ""
+msgstr "In Buch mit Titel:"
 
 #: cps/templates/book_table.html:83
 msgid "Merge"
@@ -1693,7 +1693,7 @@ msgstr "Speicherort der Calibre-Datenbank"
 
 #: cps/templates/config_edit.html:29
 msgid "To activate serverside filepicker start Calibre-Web with -f optionn"
-msgstr ""
+msgstr "Calibre-Wb mit -f option starten um die serverseiten Dateiauswahl zu aktivieren"
 
 #: cps/templates/config_edit.html:35
 msgid "Use Google Drive?"
@@ -1878,15 +1878,15 @@ msgstr "SSL"
 
 #: cps/templates/config_edit.html:274
 msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)"
-msgstr ""
+msgstr "LDAP CA-Zertifikat Pfad (Nur für Client Zertifikat Authentifizierung benötigt)"
 
 #: cps/templates/config_edit.html:281
 msgid "LDAP Certificate Path (Only needed for Client Certificate Authentication)"
-msgstr ""
+msgstr "LDAP Zertifikat Pfad (Nur für Client Zertifikat Authentifizierung benötigt)"
 
 #: cps/templates/config_edit.html:288
 msgid "LDAP Keyfile Path (Only needed for Client Certificate Authentication)"
-msgstr ""
+msgstr "LDAP Keyfile Pfad (Nur für Client Zertifikat Authentifizierung benötigt)"
 
 #: cps/templates/config_edit.html:297
 msgid "LDAP Authentication"
@@ -1942,19 +1942,19 @@ msgstr "LDAP Gruppen Mitglieds Feld"
 
 #: cps/templates/config_edit.html:342
 msgid "LDAP Member User Filter Detection"
-msgstr ""
+msgstr "LDAP Member User Filter Erkennung"
 
 #: cps/templates/config_edit.html:344
 msgid "Autodetect"
-msgstr ""
+msgstr "Automatisch erkennen"
 
 #: cps/templates/config_edit.html:345
 msgid "Custom Filter"
-msgstr ""
+msgstr "Benutzerdefinierter Filter"
 
 #: cps/templates/config_edit.html:350
 msgid "LDAP Member User Filter"
-msgstr ""
+msgstr "LDAP Member User Filter"
 
 #: cps/templates/config_edit.html:361
 #, python-format
@@ -2213,20 +2213,20 @@ msgstr "Zurück zur Hauptseite"
 #: cps/templates/index.html:72 cps/templates/search.html:33
 #: cps/templates/shelf.html:20
 msgid "Sort authors in alphabetical order"
-msgstr ""
+msgstr "Sortiere Autoren in alphabetischer Reihenfolge"
 
 #: cps/templates/index.html:73 cps/templates/search.html:34
 #: cps/templates/shelf.html:21
 msgid "Sort authors in reverse alphabetical order"
-msgstr ""
+msgstr "Sortiere Autoren in umgekehrt alphabetischer Reihenfolge"
 
 #: cps/templates/index.html:77
 msgid "Sort ascending according to series index"
-msgstr ""
+msgstr "Sortiere Serienindex aufsteigend"
 
 #: cps/templates/index.html:78
 msgid "Sort descending according to series index"
-msgstr ""
+msgstr "Sortiere Serienindex absteigend"
 
 #: cps/templates/index.xml:6
 msgid "Start"
@@ -2439,27 +2439,27 @@ msgstr "Bücher müssen zuerst archiviert werden und dann mit dem Gerät synchro
 
 #: cps/templates/modal_dialogs.html:76
 msgid "Choose File Location"
-msgstr ""
+msgstr "Dateispeicherort auswählen"
 
 #: cps/templates/modal_dialogs.html:82
 msgid "type"
-msgstr ""
+msgstr "Typ"
 
 #: cps/templates/modal_dialogs.html:83
 msgid "name"
-msgstr ""
+msgstr "Name"
 
 #: cps/templates/modal_dialogs.html:84
 msgid "size"
-msgstr ""
+msgstr "Größe"
 
 #: cps/templates/modal_dialogs.html:90
 msgid "Parent Directory"
-msgstr ""
+msgstr "Übergeordnetes Verzeichnis"
 
 #: cps/templates/modal_dialogs.html:98
 msgid "Select"
-msgstr ""
+msgstr "Auswahl"
 
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web eBook Catalog"
@@ -2623,7 +2623,7 @@ msgstr "Herausgabedatum bis"
 
 #: cps/templates/search_form.html:35
 msgid "Read Status"
-msgstr ""
+msgstr "Lesestatus"
 
 #: cps/templates/search_form.html:52
 msgid "Exclude Tags"
@@ -2659,19 +2659,19 @@ msgstr "Lösche dieses Bücherregal"
 
 #: cps/templates/shelf.html:11
 msgid "Edit Shelf Properties"
-msgstr ""
+msgstr "Bücherregal Eigenschaften bearbeiten"
 
 #: cps/templates/shelf.html:13
 msgid "Arrange books manually"
-msgstr ""
+msgstr "Bücher manuell sortieren"
 
 #: cps/templates/shelf.html:14
 msgid "Disable Change order"
-msgstr ""
+msgstr "Manuelles Sortieren deaktivieren"
 
 #: cps/templates/shelf.html:14
 msgid "Enable Change order"
-msgstr ""
+msgstr "Manuelles Sortieren aktivieren"
 
 #: cps/templates/shelf.html:93
 msgid "Shelf will be deleted for all users"
@@ -2711,7 +2711,7 @@ msgstr "Serien in dieser Bibliothek"
 
 #: cps/templates/stats.html:29
 msgid "System Statistics"
-msgstr ""
+msgstr "System Statistiken"
 
 #: cps/templates/stats.html:33
 msgid "Program Library"
diff --git a/cps/translations/el/LC_MESSAGES/messages.mo b/cps/translations/el/LC_MESSAGES/messages.mo
index 4f0422a0..3f6d471d 100644
Binary files a/cps/translations/el/LC_MESSAGES/messages.mo and b/cps/translations/el/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/el/LC_MESSAGES/messages.po b/cps/translations/el/LC_MESSAGES/messages.po
index 72f23f15..655bbd41 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-01-02 19:37+0100\n"
+"POT-Creation-Date: 2021-01-17 11:34+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:42
 msgid "installed"
@@ -29,310 +29,310 @@ msgstr "δεν εγκαταστάθηκε"
 msgid "Statistics"
 msgstr "Στατιστικά"
 
-#: cps/admin.py:144
+#: cps/admin.py:147
 msgid "Server restarted, please reload page"
 msgstr "Ο διακομιστής επανεκκίνησε, παρακαλούμε φόρτωσε ξανά τη σελίδα"
 
-#: cps/admin.py:146
+#: cps/admin.py:149
 msgid "Performing shutdown of server, please close window"
 msgstr "Πραγματοποιείται κλείσιμο του διακομιστή, παρακαλούμε κλείσε το παράθυρο"
 
-#: cps/admin.py:154
+#: cps/admin.py:157
 msgid "Reconnect successful"
 msgstr "Επιτυχής επανασύνδεση"
 
-#: cps/admin.py:157
+#: cps/admin.py:160
 msgid "Unknown command"
 msgstr "Άγνωστη εντολή"
 
-#: cps/admin.py:167 cps/editbooks.py:636 cps/editbooks.py:648
-#: cps/editbooks.py:751 cps/editbooks.py:753 cps/editbooks.py:814
-#: cps/editbooks.py:830 cps/updater.py:510 cps/uploader.py:90
+#: cps/admin.py:170 cps/editbooks.py:642 cps/editbooks.py:654
+#: cps/editbooks.py:757 cps/editbooks.py:759 cps/editbooks.py:820
+#: cps/editbooks.py:836 cps/updater.py:510 cps/uploader.py:90
 #: cps/uploader.py:100
 msgid "Unknown"
 msgstr "ʼΑγνωστο"
 
-#: cps/admin.py:188
+#: cps/admin.py:191
 msgid "Admin page"
 msgstr "Σελίδα διαχειριστή"
 
-#: cps/admin.py:210
+#: cps/admin.py:213
 msgid "UI Configuration"
 msgstr "UI Διαμόρφωση"
 
-#: cps/admin.py:242 cps/admin.py:954
+#: cps/admin.py:245 cps/admin.py:923
 msgid "Calibre-Web configuration updated"
 msgstr "Ενημερώθηκε η διαμόρφωση Calibre-Web"
 
-#: cps/admin.py:253
+#: cps/admin.py:256
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Θέλεις πραγματικά να διαγράψεις τη Μονάδα Kobo;"
 
-#: cps/admin.py:255
+#: cps/admin.py:258
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:257
+#: cps/admin.py:260
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:259 cps/templates/shelf.html:90
+#: cps/admin.py:262 cps/templates/shelf.html:90
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Είσαι σίγουρος/η πως θέλεις να διαγράψεις αυτό το ράφι;"
 
-#: cps/admin.py:545 cps/admin.py:551 cps/admin.py:561 cps/admin.py:571
+#: cps/admin.py:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534
 #: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Απόρριψη"
 
-#: cps/admin.py:547 cps/admin.py:553 cps/admin.py:563 cps/admin.py:573
+#: cps/admin.py:510 cps/admin.py:516 cps/admin.py:526 cps/admin.py:536
 #: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Επιτρέπεται"
 
-#: cps/admin.py:713
+#: cps/admin.py:679
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json Δεν Έχει Διαμορφωθεί Για Διαδικτυακή Εφαρμογή"
 
-#: cps/admin.py:753
+#: cps/admin.py:721
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Το Φύλλο Καταγραφής Τοποθεσίας δεν είναι Έγκυρο, Παρακαλούμε Συμπλήρωσε Τη Σωστή Πορεία"
 
-#: cps/admin.py:759
+#: cps/admin.py:727
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Η Πρόσβαση Φύλλου Καταγραφης Τοποθεσίας δεν είναι έγκυρη, Παρακαλούμε Συμπλήρωσε Τη Σωστή Πορεία"
 
-#: cps/admin.py:788
+#: cps/admin.py:757
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Παρακαλούμε Συμπλήρωσε ένα Πάροχο LDAP, Θύρα, DN και Αντικείμενο Αναγνώρισης Χρήστη"
 
-#: cps/admin.py:803
+#: cps/admin.py:772
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "Το Αντικείμενο Φίλτρου Ομάδας LDAP Πρέπει να Έχει Μια \"%s\" Αναγνώριση Μορφής"
 
-#: cps/admin.py:806
+#: cps/admin.py:775
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Το Αντικείμενο Φίλτρου Ομάδας LDAP Έχει Παρενθέσεις Που Δεν Ταιριάζουν"
 
-#: cps/admin.py:811
+#: cps/admin.py:780
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Το Αντικείμενο Φίλτρου Χρήστη LDAP πρέπει να Έχει Μια \"%s\" Αναγνώριση Μορφής"
 
-#: cps/admin.py:814
+#: cps/admin.py:783
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Το Αντικείμενο Φίλτρου Χρήστη LDAP Έχει Παρενθέσεις Που Δεν Ταιριάζουν"
 
-#: cps/admin.py:822
+#: cps/admin.py:791
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:825
+#: cps/admin.py:794
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:833
+#: cps/admin.py:802
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:859
+#: cps/admin.py:828
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "Το Αρχειο Κλειδί Τοποθεσίας δεν είναι Έγκυρο, Παρακαλούμε Συμπληρώστε Τη Σωστή Πορεία"
 
-#: cps/admin.py:865
+#: cps/admin.py:834
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Η Τοποθεσία Certfile δεν είναι Έγκυρη, Παρακαλούμε Συμπληρώστε Τη Σωστή Πορεία"
 
-#: cps/admin.py:935 cps/admin.py:1039 cps/admin.py:1135 cps/admin.py:1184
-#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:258
-#: cps/shelf.py:307 cps/shelf.py:339 cps/shelf.py:371 cps/shelf.py:442
+#: cps/admin.py:904 cps/admin.py:1011 cps/admin.py:1100 cps/admin.py:1149
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:261
+#: cps/shelf.py:314 cps/shelf.py:348 cps/shelf.py:418
 msgid "Settings DB is not Writeable"
 msgstr "Οι ρυθμίσεις DB δεν μπορούν να Γραφτούν"
 
-#: cps/admin.py:947
+#: cps/admin.py:916
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "Η Τοποθεσία DB δεν είναι Έγκυρη, Παρακαλούμε Συμπληρώστε Τη Σωστή Πορεία"
 
-#: cps/admin.py:951
+#: cps/admin.py:920
 msgid "DB is not Writeable"
 msgstr "Η DB δεν μπορεί να Γραφτεί"
 
-#: cps/admin.py:984
+#: cps/admin.py:959
 msgid "Basic Configuration"
 msgstr "Βασική Διαμόρφωση"
 
-#: cps/admin.py:999 cps/web.py:1287
+#: cps/admin.py:974 cps/web.py:1275
 msgid "Please fill out all fields!"
 msgstr "Παρακαλούμε συμπλήρωσε όλα τα πεδία!"
 
-#: cps/admin.py:1002 cps/admin.py:1014 cps/admin.py:1020 cps/admin.py:1153
+#: cps/admin.py:977 cps/admin.py:989 cps/admin.py:995 cps/admin.py:1118
 msgid "Add new user"
 msgstr "Προσθήκη νέου χρήστη"
 
-#: cps/admin.py:1011 cps/web.py:1451
+#: cps/admin.py:986 cps/web.py:1439
 msgid "E-mail is not from valid domain"
 msgstr "Το E-mail δεν είναι από έγκυρο domain"
 
-#: cps/admin.py:1018 cps/admin.py:1036
+#: cps/admin.py:993 cps/admin.py:1008
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Βρέθηκε ένας ήδη υπάρχον λογαριασμός για αυτή τη διεύθυνση e-mail ή όνομα χρήστη."
 
-#: cps/admin.py:1032
+#: cps/admin.py:1004
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Χρήστης/ες '%(user)s' δημιουργήθηκαν"
 
-#: cps/admin.py:1051
+#: cps/admin.py:1020
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Χρήστης/ες '%(nick)s' διαγράφηκαν"
 
-#: cps/admin.py:1054
+#: cps/admin.py:1023
 msgid "No admin user remaining, can't delete user"
 msgstr "Δεν έχει απομείνει χρήστης διαχειριστής, δεν μπορεί να διαγραφεί ο χρήστης"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1028
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Δεν έχει απομείνει χρήστης διαχειριστής, δεν μπορεί να αφαιρεθεί ο ρόλος διαχειριστή"
 
-#: cps/admin.py:1096 cps/web.py:1493
+#: cps/admin.py:1064 cps/web.py:1481
 msgid "Found an existing account for this e-mail address."
 msgstr "Βρέθηκε ένας ήδη υπάρχον λογαριασμός για αυτή τη διεύθυνση e-mail."
 
-#: cps/admin.py:1105 cps/admin.py:1119 cps/admin.py:1225 cps/web.py:1469
+#: cps/admin.py:1073 cps/admin.py:1087 cps/admin.py:1190 cps/web.py:1457
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Επεξεργασία χρήστη %(nick)s"
 
-#: cps/admin.py:1111 cps/web.py:1462
+#: cps/admin.py:1079 cps/web.py:1450
 msgid "This username is already taken"
 msgstr "Αυτό το όνομα χρήστη έχει ήδη παρθεί"
 
-#: cps/admin.py:1129
+#: cps/admin.py:1094
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Χρήστης/ες '%(nick)s' ενημερώθηκαν"
 
-#: cps/admin.py:1132
+#: cps/admin.py:1097
 msgid "An unknown error occured."
 msgstr "Προέκυψε ένα άγνωστο σφάλμα."
 
-#: cps/admin.py:1162 cps/templates/admin.html:78
+#: cps/admin.py:1127 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "Επεξεργασία Ρυθμίσεων E-mail Διακομιστή"
 
-#: cps/admin.py:1191
+#: cps/admin.py:1156
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Το e-mail δοκιμής στάλθηκε επιτυχώς στο %(kindlemail)s"
 
-#: cps/admin.py:1194
+#: cps/admin.py:1159
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Παρουσιάστηκε σφάλμα κατά την αποστολή του δοκιμαστικού e-mail:% (res)s"
 
-#: cps/admin.py:1196
+#: cps/admin.py:1161
 msgid "Please configure your e-mail address first..."
 msgstr "Παρακαλούμε ρύθμισε πρώτα τη διεύθυνση e-mail σου..."
 
-#: cps/admin.py:1198
+#: cps/admin.py:1163
 msgid "E-mail server settings updated"
 msgstr "Ενημερώθηκαν οι ρυθμίσεις E-mail διακομιστή"
 
-#: cps/admin.py:1209
+#: cps/admin.py:1174
 msgid "User not found"
 msgstr "Δεν βρέθηκε χρήστης"
 
-#: cps/admin.py:1236
+#: cps/admin.py:1201
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Κωδικός για επαναφορά %(user) χρήστη/ών"
 
-#: cps/admin.py:1239 cps/web.py:1311 cps/web.py:1375
+#: cps/admin.py:1204 cps/web.py:1299 cps/web.py:1363
 msgid "An unknown error occurred. Please try again later."
 msgstr "Προέκυψε ένα άγνωστο σφάλμα. Παρακαλούμε δοκίμασε ξανά αργότερα."
 
-#: cps/admin.py:1242 cps/web.py:1249
+#: cps/admin.py:1207 cps/web.py:1237
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Παρακαλούμε διαμόρφωσε πρώτα τις ρυθμίσεις ταχυδρομείου SMTP..."
 
-#: cps/admin.py:1254
+#: cps/admin.py:1218
 msgid "Logfile viewer"
 msgstr "Προβολέας αρχείου φύλλου καταγραφής"
 
-#: cps/admin.py:1315
+#: cps/admin.py:1280
 msgid "Requesting update package"
 msgstr "Αίτημα πακέτου ενημέρωσης"
 
-#: cps/admin.py:1316
+#: cps/admin.py:1281
 msgid "Downloading update package"
 msgstr "Κατεβάζει πακέτο ενημέρωσης"
 
-#: cps/admin.py:1317
+#: cps/admin.py:1282
 msgid "Unzipping update package"
 msgstr "Ανοίγει πακέτο ενημέρωσης"
 
-#: cps/admin.py:1318
+#: cps/admin.py:1283
 msgid "Replacing files"
 msgstr "Αντικατάσταση αρχείων"
 
-#: cps/admin.py:1319
+#: cps/admin.py:1284
 msgid "Database connections are closed"
 msgstr "Οι συνδέσεις βάσης δεδομένων είναι κλειστές"
 
-#: cps/admin.py:1320
+#: cps/admin.py:1285
 msgid "Stopping server"
 msgstr "Σταματάει το διακομιστή"
 
-#: cps/admin.py:1321
+#: cps/admin.py:1286
 msgid "Update finished, please press okay and reload page"
 msgstr "Η ενημέρωση τελειώσε, παρακαλούμε πιέστε το εντάξει και φορτώστε ξανά τη σελίδα"
 
-#: cps/admin.py:1322 cps/admin.py:1323 cps/admin.py:1324 cps/admin.py:1325
-#: cps/admin.py:1326
+#: cps/admin.py:1287 cps/admin.py:1288 cps/admin.py:1289 cps/admin.py:1290
+#: cps/admin.py:1291
 msgid "Update failed:"
 msgstr "Η ενημέρωση απέτυχε:"
 
-#: cps/admin.py:1322 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+#: cps/admin.py:1287 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTP Σφάλμα"
 
-#: cps/admin.py:1323 cps/updater.py:322 cps/updater.py:525
+#: cps/admin.py:1288 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Σφάλμα σύνδεσης"
 
-#: cps/admin.py:1324 cps/updater.py:324 cps/updater.py:527
+#: cps/admin.py:1289 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Τελείωσε ο χρόνος κατά την προσπάθεια δημιουργίας σύνδεσης"
 
-#: cps/admin.py:1325 cps/updater.py:326 cps/updater.py:529
+#: cps/admin.py:1290 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Γενικό σφάλμα"
 
-#: cps/admin.py:1326
+#: cps/admin.py:1291
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr "Το Αρχείο Ενημέρωσης Δεν Μπόρεσε Να Αποθηκευτεί σε"
 
-#: cps/admin.py:1351
+#: cps/admin.py:1316
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Σφάλμα: %(ldaperror)s"
 
-#: cps/admin.py:1355
+#: cps/admin.py:1320
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Σφάλμα: Δεν επιστράφηκε χρήστης σε απάντηση του διακομιστή LDAP"
 
-#: cps/admin.py:1421
+#: cps/admin.py:1386
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Αποτυχία Δημιουργίας Τουλάχιστον Ενός Χρήστη LDAP"
 
-#: cps/admin.py:1424
+#: cps/admin.py:1389
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Τουλάχιστον Ένας Χρήστης LDAP Δεν Βρέθηκε Στη Βάση Δεδομένων"
 
-#: cps/admin.py:1426
+#: cps/admin.py:1391
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -352,90 +352,90 @@ msgstr "Η μορφή βιβλίου Διαγράφηκε Επιτυχώς"
 msgid "Book Successfully Deleted"
 msgstr "Το Βιβλίο Διαγράφηκε Επιτυχώς"
 
-#: cps/editbooks.py:317 cps/editbooks.py:620 cps/web.py:1521 cps/web.py:1554
-#: cps/web.py:1625
+#: cps/editbooks.py:316 cps/editbooks.py:626 cps/web.py:1509 cps/web.py:1542
+#: cps/web.py:1613
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Σφάλμα ανοίγματος eBook. Το αρχείο δεν υπάρχει ή το αρχείο δεν είναι προσβάσιμο"
 
-#: cps/editbooks.py:351
+#: cps/editbooks.py:350
 msgid "edit metadata"
 msgstr "επεξεργασία μεταδεδομένων"
 
-#: cps/editbooks.py:426
+#: cps/editbooks.py:425
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s δεν είναι μια έγκυρη γλώσσα"
 
-#: cps/editbooks.py:537 cps/editbooks.py:796
+#: cps/editbooks.py:536 cps/editbooks.py:802
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Η επέκταση αρχείου '%(ext)s' δεν επιτρέπεται να ανέβει σε αυτό το διακομιστή"
 
-#: cps/editbooks.py:541 cps/editbooks.py:800
+#: cps/editbooks.py:540 cps/editbooks.py:806
 msgid "File to be uploaded must have an extension"
 msgstr "Το αρχείο προς ανέβασμα πρέπει να έχει μια επέκταση"
 
-#: cps/editbooks.py:553
+#: cps/editbooks.py:552
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Αποτυχεία δημιουργίας πορείας %(path)s (Η άδεια απορρήφθηκε)."
 
-#: cps/editbooks.py:558
+#: cps/editbooks.py:557
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Αποτυχία αποθήκευσης αρχείου %(file)s."
 
-#: cps/editbooks.py:576 cps/editbooks.py:931 cps/web.py:1498
+#: cps/editbooks.py:575 cps/editbooks.py:937 cps/web.py:1486
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Σφάλμα βάσης δεδομένων: %(error)s."
 
-#: cps/editbooks.py:580
+#: cps/editbooks.py:579
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Μορφή αρχείου %(ext)s προστέθηκε σε %(book)s"
 
-#: cps/editbooks.py:700
+#: cps/editbooks.py:706
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "Τα αναγνωριστικά δεν έχουν Διάκριση Πεζών-Κεφαλαίων Γραμμάτων, Αντικατάσταση Παλιού Αναγνωριστικού"
 
-#: cps/editbooks.py:737
+#: cps/editbooks.py:743
 msgid "Metadata successfully updated"
 msgstr "Τα μεταδεδομένα ενημερώθηκαν επιτυχώς"
 
-#: cps/editbooks.py:746
+#: cps/editbooks.py:752
 msgid "Error editing book, please check logfile for details"
 msgstr "Σφάλμα επεξεργασίας βιβλίου, παρακαλούμε έλεγξε το φύλλο καταγραφής για λεπτομέρειες"
 
-#: cps/editbooks.py:808
+#: cps/editbooks.py:814
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "Το αρχείο %(filename)s δεν μπόρεσε να αποθηκευτεί σε temp dir"
 
-#: cps/editbooks.py:818
+#: cps/editbooks.py:824
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Το βιβλίο που ανέβηκε πιθανόν να υπάρχει στη βιβλιοθήκη, σκέψου να το αλλάξεις πριν ανεβάσεις νέο: "
 
-#: cps/editbooks.py:906
+#: cps/editbooks.py:912
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "Αποτυχία Μετακίνησης Αρχείου Φόντου %(file)s: %(error)s"
 
-#: cps/editbooks.py:917
+#: cps/editbooks.py:923
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Το αρχείο %(file)s ανέβηκε"
 
-#: cps/editbooks.py:943
+#: cps/editbooks.py:949
 msgid "Source or destination format for conversion missing"
 msgstr "Η δομή πηγής ή προορισμού για μετατροπή λείπει"
 
-#: cps/editbooks.py:951
+#: cps/editbooks.py:957
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Το βιβλίο είναι σε σειρά επιτυχώς για μετατροπή σε %(book_format)s"
 
-#: cps/editbooks.py:955
+#: cps/editbooks.py:961
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Υπήρξε ένα σφάλμα στη μετατροπή αυτού του βιβλίου: %(res)s"
@@ -596,85 +596,85 @@ msgstr "Τελείωσε"
 msgid "Unknown Status"
 msgstr "ʼΑγνωστη κατάσταση"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Παρακαλούμε λάβε πρόσβαση στο calibre-web από ένα μη τοπικό εξηπηρετητή για να λάβεις μια έγκυρη api_endpoint για συσκευή kobo"
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:157
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
 msgid "Kobo Setup"
 msgstr "Καθορισμός Kobo"
 
-#: cps/oauth_bb.py:74
+#: cps/oauth_bb.py:73
 #, python-format
 msgid "Register with %(provider)s"
 msgstr "Εγγραφή με %(provider)s"
 
-#: cps/oauth_bb.py:158
+#: cps/oauth_bb.py:146
 msgid "Failed to log in with GitHub."
 msgstr "Αποτυχία σύνδεσης με GitHub."
 
-#: cps/oauth_bb.py:163
+#: cps/oauth_bb.py:151
 msgid "Failed to fetch user info from GitHub."
 msgstr "Αποτυχία συγκέντρωσης πληροφοριών χρήστη από το GitHub."
 
-#: cps/oauth_bb.py:174
+#: cps/oauth_bb.py:162
 msgid "Failed to log in with Google."
 msgstr "Αποτυχία σύνδεσης με το Google."
 
-#: cps/oauth_bb.py:179
+#: cps/oauth_bb.py:167
 msgid "Failed to fetch user info from Google."
 msgstr "Αποτυχία συγκέντρωσης πληροφοριών χρήστη από το Google."
 
-#: cps/oauth_bb.py:229 cps/remotelogin.py:134 cps/web.py:1347
+#: cps/oauth_bb.py:213 cps/remotelogin.py:133 cps/web.py:1335
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "τώρα έχεις συνδεθεί ως: '%(nickname)s'"
 
-#: cps/oauth_bb.py:239
+#: cps/oauth_bb.py:223
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr "Η Σύνδεση στο %(oauth)s Πέτυχε"
 
-#: cps/oauth_bb.py:245
+#: cps/oauth_bb.py:229
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr "Η σύνδεση απέτυχε, Δεν Υπάρχει Συνδεδεμένος Χρήστης Με Λογαριασμό OAuth"
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:271
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr "Η αφαίρεση σύνδεσης με το %(oauth)s Πέτυχε"
 
-#: cps/oauth_bb.py:291
+#: cps/oauth_bb.py:275
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr "Η αφαίρεση σύνδεσης με το %(oauth)s Απέτυχε"
 
-#: cps/oauth_bb.py:294
+#: cps/oauth_bb.py:278
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr "Δεν Είναι Συνδεδεμένο με το %(oauth)s"
 
-#: cps/oauth_bb.py:322
+#: cps/oauth_bb.py:306
 msgid "GitHub Oauth error, please retry later."
 msgstr "GitHub Oauth σφάλμα, παρακαλούμε δοκίμασε ξανά αργότερα."
 
-#: cps/oauth_bb.py:341
+#: cps/oauth_bb.py:325
 msgid "Google Oauth error, please retry later."
 msgstr "Google Oauth σφάλμα, παρακαλούμε δοκίμασε ξανά αργότερα."
 
-#: cps/remotelogin.py:66 cps/web.py:1394
+#: cps/remotelogin.py:65 cps/web.py:1382
 msgid "login"
 msgstr "σύνδεση"
 
-#: cps/remotelogin.py:78 cps/remotelogin.py:112
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
 msgid "Token not found"
 msgstr "Η μάρκα δεν βρέθηκε"
 
-#: cps/remotelogin.py:87 cps/remotelogin.py:120
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
 msgid "Token has expired"
 msgstr "Η μάρκα έχει λήξει"
 
-#: cps/remotelogin.py:96
+#: cps/remotelogin.py:95
 msgid "Success! Please return to your device"
 msgstr "Επιτυχία! Παρακαλούμε επέστρεψε στη συσκευή σου"
 
@@ -702,7 +702,7 @@ msgstr "Κατεβασμένα Βιβλία"
 msgid "Show Downloaded Books"
 msgstr "Προβολή Κατεβασμένων Βιβλίων"
 
-#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:388
+#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:376
 msgid "Top Rated Books"
 msgstr "Βιβλία με Κορυφαία Αξιολόγηση"
 
@@ -711,7 +711,7 @@ msgid "Show Top Rated Books"
 msgstr "Προβολή Βιβλίων με Κορυφαία Αξιολόγηση"
 
 #: cps/render_template.py:53 cps/templates/index.xml:46
-#: cps/templates/index.xml:50 cps/web.py:648
+#: cps/templates/index.xml:50 cps/web.py:636
 msgid "Read Books"
 msgstr "Βιβλία που Διαβάστηκαν"
 
@@ -720,7 +720,7 @@ msgid "Show read and unread"
 msgstr "Προβολή διαβασμένων και αδιάβαστων"
 
 #: cps/render_template.py:57 cps/templates/index.xml:53
-#: cps/templates/index.xml:57 cps/web.py:651
+#: cps/templates/index.xml:57 cps/web.py:639
 msgid "Unread Books"
 msgstr "Βιβλία που δεν Διαβάστηκαν"
 
@@ -737,7 +737,7 @@ msgid "Show random books"
 msgstr "Προβολή τυχαίων βιβλίων"
 
 #: cps/render_template.py:63 cps/templates/book_table.html:50
-#: cps/templates/index.xml:75 cps/web.py:953
+#: cps/templates/index.xml:75 cps/web.py:941
 msgid "Categories"
 msgstr "Κατηγορίες"
 
@@ -747,7 +747,7 @@ msgstr "Προβολή επιλογών κατηγορίας"
 
 #: cps/render_template.py:66 cps/templates/book_edit.html:84
 #: cps/templates/book_table.html:51 cps/templates/index.xml:82
-#: cps/templates/search_form.html:62 cps/web.py:857 cps/web.py:867
+#: cps/templates/search_form.html:62 cps/web.py:845 cps/web.py:855
 msgid "Series"
 msgstr "Σειρές"
 
@@ -765,7 +765,7 @@ msgid "Show author selection"
 msgstr "Προβολή επιλογών συγγραφέα"
 
 #: cps/render_template.py:73 cps/templates/book_table.html:55
-#: cps/templates/index.xml:68 cps/web.py:836
+#: cps/templates/index.xml:68 cps/web.py:824
 msgid "Publishers"
 msgstr "Εκδότες"
 
@@ -774,7 +774,7 @@ msgid "Show publisher selection"
 msgstr "Προβολή επιλογών εκδότη"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:53
-#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:932
+#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:920
 msgid "Languages"
 msgstr "Γλώσσες"
 
@@ -798,7 +798,7 @@ msgstr "Μορφές αρχείου"
 msgid "Show file formats selection"
 msgstr "Προβολή επιλογών μορφής αρχείου"
 
-#: cps/render_template.py:87 cps/web.py:675
+#: cps/render_template.py:87 cps/web.py:663
 msgid "Archived Books"
 msgstr "Αρχειοθετημένα Βιβλία"
 
@@ -806,7 +806,7 @@ msgstr "Αρχειοθετημένα Βιβλία"
 msgid "Show archived books"
 msgstr "Προβολή αρχειοθετημένων βιβλίων"
 
-#: cps/render_template.py:91 cps/web.py:746
+#: cps/render_template.py:91 cps/web.py:734
 msgid "Books List"
 msgstr "Λίστα Βιβλίων"
 
@@ -863,49 +863,49 @@ msgstr "Το βιβλίο έχει αφαιρεθεί από το ράφι: %(sn
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr "Συγγνώμη αλλά δεν σου επιτρέπεται η αφαίρεση ενός βιβλίου από αυτό το ράφι: %(sname)s"
 
-#: cps/shelf.py:238 cps/shelf.py:282
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr "Ένα δημόσιο ράφι με το όνομα '%(title)s' υπάρχει ήδη."
+#: cps/shelf.py:224 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "Δημιούργησε ένα Ράφι"
 
-#: cps/shelf.py:247 cps/shelf.py:292
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr "Ένα ιδιωτικό ράφι με το όνομα '%(title)s' υπάρχει ήδη."
+#: cps/shelf.py:231
+msgid "Edit a shelf"
+msgstr "Επεξεργασία ενός ραφιού"
 
-#: cps/shelf.py:254
+#: cps/shelf.py:249
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Το ράφι %(title)s δημιουργήθηκε"
 
-#: cps/shelf.py:261 cps/shelf.py:310
-msgid "There was an error"
-msgstr "Υπήρξε ένα σφάλμα"
-
-#: cps/shelf.py:262 cps/shelf.py:264 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "Δημιούργησε ένα Ράφι"
-
-#: cps/shelf.py:304
+#: cps/shelf.py:252
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Το ράφι %(title)s άλλαξε"
 
-#: cps/shelf.py:311 cps/shelf.py:313
-msgid "Edit a shelf"
-msgstr "Επεξεργασία ενός ραφιού"
+#: cps/shelf.py:265
+msgid "There was an error"
+msgstr "Υπήρξε ένα σφάλμα"
 
-#: cps/shelf.py:381
+#: cps/shelf.py:281
+#, python-format
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr "Ένα δημόσιο ράφι με το όνομα '%(title)s' υπάρχει ήδη."
+
+#: cps/shelf.py:291
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr "Ένα ιδιωτικό ράφι με το όνομα '%(title)s' υπάρχει ήδη."
+
+#: cps/shelf.py:358
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Αλλαγή σειράς του Ραφιού: '%(name)s'"
 
-#: cps/shelf.py:447
+#: cps/shelf.py:423
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Ράφι: '%(name)s"
 
-#: cps/shelf.py:451
+#: cps/shelf.py:427
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Σφάλμα κατά το άνοιγμα του ραφιού. Το ράφι δεν υπάρχει ή δεν είναι προσβάσιμο"
 
@@ -938,222 +938,222 @@ msgstr "Μια νέα ενημέρωση είναι διαθέσιμη. Κάνε
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Κάνε κλικ στο κουμπί πιο κάτω για να ενημερώσεις με την τελευταία σταθερή έκδοση."
 
-#: cps/templates/index.html:5 cps/web.py:396
+#: cps/templates/index.html:5 cps/web.py:384
 msgid "Discover (Random Books)"
 msgstr "Ανακάλυψε (Τυχαία Βιβλία)"
 
-#: cps/web.py:435
+#: cps/web.py:423
 msgid "Books"
 msgstr "Βιβλία"
 
-#: cps/web.py:460
+#: cps/web.py:448
 msgid "Hot Books (Most Downloaded)"
 msgstr "Βιβλία στη Μόδα (Με τα περισσότερα κατεβάσματα)"
 
-#: cps/web.py:495
+#: cps/web.py:483
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Κατεβασμένα βιβλία από %(user)s"
 
-#: cps/web.py:509
+#: cps/web.py:497
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Oυπς! Ο επιλεγμένος τίτλος βιβλίου δεν είναι διαθέσιμος. Το αρχείο δεν υπάρχει ή δεν είναι προσβάσιμο"
 
-#: cps/web.py:523
+#: cps/web.py:511
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Συγγραφέας: %(name)s"
 
-#: cps/web.py:537
+#: cps/web.py:525
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Εκδότης: %(name)s"
 
-#: cps/web.py:550
+#: cps/web.py:538
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Σειρές: %(serie)s"
 
-#: cps/web.py:563
+#: cps/web.py:551
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Αξιολόγηση: %(rating)s stars"
 
-#: cps/web.py:576
+#: cps/web.py:564
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Μορφή αρχείου: %(format)s"
 
-#: cps/web.py:590
+#: cps/web.py:578
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Κατηγορία: %(name)s"
 
-#: cps/web.py:609
+#: cps/web.py:597
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Γλώσσα: %(name)s"
 
-#: cps/web.py:639
+#: cps/web.py:627
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Η ειδικά προσαρμοσμένη στήλη No.%(column)d δεν υπάρχει στο επίπεδο βάσης δεδομένων"
 
-#: cps/templates/layout.html:56 cps/web.py:706 cps/web.py:1180
+#: cps/templates/layout.html:56 cps/web.py:694 cps/web.py:1168
 msgid "Advanced Search"
 msgstr "Προχωρημένη Αναζήτηση"
 
 #: cps/templates/book_edit.html:214 cps/templates/feed.xml:33
 #: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:175 cps/web.py:718 cps/web.py:990
+#: cps/templates/search_form.html:175 cps/web.py:706 cps/web.py:978
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#: cps/web.py:885
+#: cps/web.py:873
 msgid "Ratings list"
 msgstr "Λίστα αξιολογήσεων"
 
-#: cps/web.py:904
+#: cps/web.py:892
 msgid "File formats list"
 msgstr "Λίστα μορφών αρχείου"
 
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:967
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:955
 msgid "Tasks"
 msgstr "Εργασίες"
 
-#: cps/web.py:1053
+#: cps/web.py:1041
 msgid "Published after "
 msgstr "Εκδόθηκε μετά"
 
-#: cps/web.py:1060
+#: cps/web.py:1048
 msgid "Published before "
 msgstr "Εκδόθηκε πριν"
 
-#: cps/web.py:1079
+#: cps/web.py:1067
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Αξιολόγηση <= %(rating)s"
 
-#: cps/web.py:1081
+#: cps/web.py:1069
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Αξιολόγηση >= %(rating)s"
 
-#: cps/web.py:1083
+#: cps/web.py:1071
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1254
+#: cps/web.py:1242
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Το βιβλίο έχει επιτυχώς μπει σε σειρά για αποστολή στο %(kindlemail)s"
 
-#: cps/web.py:1258
+#: cps/web.py:1246
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Oυπς! Υπήρξε ένα σφάλμα κατά την αποστολή αυτού του βιβλίου: %(res)s"
 
-#: cps/web.py:1260
+#: cps/web.py:1248
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Παρακαλούμε ενημέρωσε το προφίλ σου με μια έγκυρη Διεύθυνση E-mail Αποστολής στο Kindle."
 
-#: cps/web.py:1277
+#: cps/web.py:1265
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Ο διακομιστής E-Mail δεν έχει διαμορφωθεί, παρακαλούμε επικοινώνησε με το διαχειριστή σου!"
 
-#: cps/web.py:1278 cps/web.py:1288 cps/web.py:1312 cps/web.py:1316
-#: cps/web.py:1321 cps/web.py:1325
+#: cps/web.py:1266 cps/web.py:1276 cps/web.py:1300 cps/web.py:1304
+#: cps/web.py:1309 cps/web.py:1313
 msgid "register"
 msgstr "εγγραφή"
 
-#: cps/web.py:1314
+#: cps/web.py:1302
 msgid "Your e-mail is not allowed to register"
 msgstr "Η διεύθυνση e-mail σου δεν επιτρέπεται να εγγραφεί"
 
-#: cps/web.py:1317
+#: cps/web.py:1305
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Το e-mail επιβεβαίωσης έχει σταλεί στον e-mail λογαριασμό σου."
 
-#: cps/web.py:1320
+#: cps/web.py:1308
 msgid "This username or e-mail address is already in use."
 msgstr "Αυτό το όνομα χρήστη ή η διεύθυνση e-mail είναι ήδη σε χρήση."
 
-#: cps/web.py:1337
+#: cps/web.py:1325
 msgid "Cannot activate LDAP authentication"
 msgstr "Δεν μπόρεσε να ενεργοποιηθεί η επαλήθευση LDAP"
 
-#: cps/web.py:1354
+#: cps/web.py:1342
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Εναλλακτική Σύνδεση ως: '%(nickname)s', Ο Διακομιστής LDAP δεν είναι προσβάσιμος, ή ο χρήστης δεν είναι γνωστός"
 
-#: cps/web.py:1360
+#: cps/web.py:1348
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Δεν μπόρεσε να συνδεθεί: %(message)s"
 
-#: cps/web.py:1364 cps/web.py:1388
+#: cps/web.py:1352 cps/web.py:1376
 msgid "Wrong Username or Password"
 msgstr "Λανθασμένο Όνομα Χρήστη ή Κωδικός"
 
-#: cps/web.py:1371
+#: cps/web.py:1359
 msgid "New Password was send to your email address"
 msgstr "Ο Νέος Κωδικός έχει σταλεί στη διεύθυνση email σου"
 
-#: cps/web.py:1377
+#: cps/web.py:1365
 msgid "Please enter valid username to reset password"
 msgstr "Παρακαλούμε συμπλήρωσε ένα έγκυρο όνομα χρήστη για επαναφορά του κωδικού"
 
-#: cps/web.py:1383
+#: cps/web.py:1371
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Έχεις συνδεθεί ως: '%(nickname)s'"
 
-#: cps/web.py:1453 cps/web.py:1506
+#: cps/web.py:1441 cps/web.py:1494
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's προφίλ"
 
-#: cps/web.py:1489
+#: cps/web.py:1477
 msgid "Profile updated"
 msgstr "Το προφίλ ενημερώθηκε"
 
-#: cps/web.py:1533 cps/web.py:1536 cps/web.py:1539 cps/web.py:1546
-#: cps/web.py:1551
+#: cps/web.py:1521 cps/web.py:1524 cps/web.py:1527 cps/web.py:1534
+#: cps/web.py:1539
 msgid "Read a Book"
 msgstr "Διάβασε ένα Βιβλίο"
 
-#: cps/tasks/convert.py:108
+#: cps/tasks/convert.py:114
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Το εργαλείο μετατροπής Calibre ebook %(tool)s δεν βρέθηκε"
 
-#: cps/tasks/convert.py:132
+#: cps/tasks/convert.py:138
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr "%(format)s μορφή δεν βρέθηκε σε δίσκο"
 
-#: cps/tasks/convert.py:136
+#: cps/tasks/convert.py:142
 msgid "Ebook converter failed with unknown error"
 msgstr "Ο μετατροπέας Ebook απέτυχε με άγνωστο σφάλμα"
 
-#: cps/tasks/convert.py:146
+#: cps/tasks/convert.py:152
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Ο μετατροπέας Kepubify απέτυχε: %(error)s"
 
-#: cps/tasks/convert.py:170
+#: cps/tasks/convert.py:176
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr "Το τροποποιημένο αρχείο δεν βρέθηκε ή υπάρχουν περισσότερα από ένα αρχεία στο φάκελο %(folder)s"
 
-#: cps/tasks/convert.py:193
+#: cps/tasks/convert.py:199
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Ο μετατροπέας Ebook απέτυχε: %(error)s"
 
-#: cps/tasks/convert.py:218
+#: cps/tasks/convert.py:224
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Το Calibre απέτυχε με σφάλμα: %(error)s"
diff --git a/cps/translations/es/LC_MESSAGES/messages.mo b/cps/translations/es/LC_MESSAGES/messages.mo
index aeaf6361..bb50e1db 100644
Binary files a/cps/translations/es/LC_MESSAGES/messages.mo and b/cps/translations/es/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po
index f09008a4..b8a84c3b 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-01-02 19:37+0100\n"
+"POT-Creation-Date: 2021-01-17 11:34+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:42
 msgid "installed"
@@ -33,310 +33,310 @@ msgstr "no instalado"
 msgid "Statistics"
 msgstr "Estadísticas"
 
-#: cps/admin.py:144
+#: cps/admin.py:147
 msgid "Server restarted, please reload page"
 msgstr "Servidor reiniciado. Por favor, recargue la página"
 
-#: cps/admin.py:146
+#: cps/admin.py:149
 msgid "Performing shutdown of server, please close window"
 msgstr "El servidor se está apagando. Por favor, cierre la ventana"
 
-#: cps/admin.py:154
+#: cps/admin.py:157
 msgid "Reconnect successful"
 msgstr "Reconexión correcta"
 
-#: cps/admin.py:157
+#: cps/admin.py:160
 msgid "Unknown command"
 msgstr "Comando desconocido"
 
-#: cps/admin.py:167 cps/editbooks.py:636 cps/editbooks.py:648
-#: cps/editbooks.py:751 cps/editbooks.py:753 cps/editbooks.py:814
-#: cps/editbooks.py:830 cps/updater.py:510 cps/uploader.py:90
+#: cps/admin.py:170 cps/editbooks.py:642 cps/editbooks.py:654
+#: cps/editbooks.py:757 cps/editbooks.py:759 cps/editbooks.py:820
+#: cps/editbooks.py:836 cps/updater.py:510 cps/uploader.py:90
 #: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: cps/admin.py:188
+#: cps/admin.py:191
 msgid "Admin page"
 msgstr "Página de administración"
 
-#: cps/admin.py:210
+#: cps/admin.py:213
 msgid "UI Configuration"
 msgstr "Configuración de la interfaz de usuario"
 
-#: cps/admin.py:242 cps/admin.py:954
+#: cps/admin.py:245 cps/admin.py:923
 msgid "Calibre-Web configuration updated"
 msgstr "Configuración de Calibre-Web actualizada"
 
-#: cps/admin.py:253
+#: cps/admin.py:256
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "¿Realmente quieres borrar el Token de Kobo?"
 
-#: cps/admin.py:255
+#: cps/admin.py:258
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:257
+#: cps/admin.py:260
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:259 cps/templates/shelf.html:90
+#: cps/admin.py:262 cps/templates/shelf.html:90
 msgid "Are you sure you want to delete this shelf?"
 msgstr "¿Realmente quiere eliminar este estante?"
 
-#: cps/admin.py:545 cps/admin.py:551 cps/admin.py:561 cps/admin.py:571
+#: cps/admin.py:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534
 #: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Denegar"
 
-#: cps/admin.py:547 cps/admin.py:553 cps/admin.py:563 cps/admin.py:573
+#: cps/admin.py:510 cps/admin.py:516 cps/admin.py:526 cps/admin.py:536
 #: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Permitir"
 
-#: cps/admin.py:713
+#: cps/admin.py:679
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json no está configurado para la aplicación web"
 
-#: cps/admin.py:753
+#: cps/admin.py:721
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "La ruta del Logfile no es válida. Por favor, introduzca la ruta correcta"
 
-#: cps/admin.py:759
+#: cps/admin.py:727
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "La ruta del Access Logfile no es válida. Por favor, introduzca la ruta correcta"
 
-#: cps/admin.py:788
+#: cps/admin.py:757
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Por favor, introduzca un proveedor LDAP, puerto, DN y el User Object Identifier"
 
-#: cps/admin.py:803
+#: cps/admin.py:772
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP Group Object Filter necesita tener un identificador de formato \"%s\""
 
-#: cps/admin.py:806
+#: cps/admin.py:775
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "El LDAP Group Object Filter tiene un paréntesis diferente"
 
-#: cps/admin.py:811
+#: cps/admin.py:780
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP Group Object Filter necesita tener un identificador de formato \"%s\""
 
-#: cps/admin.py:814
+#: cps/admin.py:783
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "El LDAP Group Object Filter tiene un paréntesis diferente"
 
-#: cps/admin.py:822
+#: cps/admin.py:791
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:825
+#: cps/admin.py:794
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:833
+#: cps/admin.py:802
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:859
+#: cps/admin.py:828
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "La ruta del Keyfile no es válida, por favor, introduzca la ruta correcta"
 
-#: cps/admin.py:865
+#: cps/admin.py:834
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "La ruta de Certfile no es válida, por favor, introduzca la ruta correcta"
 
-#: cps/admin.py:935 cps/admin.py:1039 cps/admin.py:1135 cps/admin.py:1184
-#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:258
-#: cps/shelf.py:307 cps/shelf.py:339 cps/shelf.py:371 cps/shelf.py:442
+#: cps/admin.py:904 cps/admin.py:1011 cps/admin.py:1100 cps/admin.py:1149
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:261
+#: cps/shelf.py:314 cps/shelf.py:348 cps/shelf.py:418
 msgid "Settings DB is not Writeable"
 msgstr "La base de datos de configuración no es modificable"
 
-#: cps/admin.py:947
+#: cps/admin.py:916
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "La ruta de la base de datos no es válida. Por favor, introduzca la ruta correcta"
 
-#: cps/admin.py:951
+#: cps/admin.py:920
 msgid "DB is not Writeable"
 msgstr "La base de datos no es modificable"
 
-#: cps/admin.py:984
+#: cps/admin.py:959
 msgid "Basic Configuration"
 msgstr "Configuración básica"
 
-#: cps/admin.py:999 cps/web.py:1287
+#: cps/admin.py:974 cps/web.py:1275
 msgid "Please fill out all fields!"
 msgstr "¡Por favor, completa todos los campos!"
 
-#: cps/admin.py:1002 cps/admin.py:1014 cps/admin.py:1020 cps/admin.py:1153
+#: cps/admin.py:977 cps/admin.py:989 cps/admin.py:995 cps/admin.py:1118
 msgid "Add new user"
 msgstr "Añadir un nuevo usuario"
 
-#: cps/admin.py:1011 cps/web.py:1451
+#: cps/admin.py:986 cps/web.py:1439
 msgid "E-mail is not from valid domain"
 msgstr "El correo electrónico no tiene un dominio válido"
 
-#: cps/admin.py:1018 cps/admin.py:1036
+#: cps/admin.py:993 cps/admin.py:1008
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Encontrada una cuenta existente para este correo electrónico o nombre de usuario."
 
-#: cps/admin.py:1032
+#: cps/admin.py:1004
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Usuario '%(user)s' creado"
 
-#: cps/admin.py:1051
+#: cps/admin.py:1020
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Usuario '%(nick)s' borrado"
 
-#: cps/admin.py:1054
+#: cps/admin.py:1023
 msgid "No admin user remaining, can't delete user"
 msgstr "No queda ningún usuario administrador, no se puede eliminar al usuario"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1028
 msgid "No admin user remaining, can't remove admin role"
 msgstr "No queda ningún usuario administrador, no se puede eliminar al usuario"
 
-#: cps/admin.py:1096 cps/web.py:1493
+#: cps/admin.py:1064 cps/web.py:1481
 msgid "Found an existing account for this e-mail address."
 msgstr "Encontrada una cuenta existente para esa dirección de correo electrónico."
 
-#: cps/admin.py:1105 cps/admin.py:1119 cps/admin.py:1225 cps/web.py:1469
+#: cps/admin.py:1073 cps/admin.py:1087 cps/admin.py:1190 cps/web.py:1457
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Editar Usuario %(nick)s"
 
-#: cps/admin.py:1111 cps/web.py:1462
+#: cps/admin.py:1079 cps/web.py:1450
 msgid "This username is already taken"
 msgstr "Este nombre de usuario ya está en uso"
 
-#: cps/admin.py:1129
+#: cps/admin.py:1094
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Usuario '%(nick)s'  actualizado"
 
-#: cps/admin.py:1132
+#: cps/admin.py:1097
 msgid "An unknown error occured."
 msgstr "Ocurrió un error desconocido."
 
-#: cps/admin.py:1162 cps/templates/admin.html:78
+#: cps/admin.py:1127 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "Cambiar parámetros de correo"
 
-#: cps/admin.py:1191
+#: cps/admin.py:1156
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Correo electrónico de prueba enviado con éxito a %(kindlemail)s"
 
-#: cps/admin.py:1194
+#: cps/admin.py:1159
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Ocurrió un error enviando el correo electrónico de prueba: %(res)s"
 
-#: cps/admin.py:1196
+#: cps/admin.py:1161
 msgid "Please configure your e-mail address first..."
 msgstr "Por favor, configure su correo electrónico primero..."
 
-#: cps/admin.py:1198
+#: cps/admin.py:1163
 msgid "E-mail server settings updated"
 msgstr "Actualizados los ajustes del servidor de correo electrónico"
 
-#: cps/admin.py:1209
+#: cps/admin.py:1174
 msgid "User not found"
 msgstr "Usuario no encontrado"
 
-#: cps/admin.py:1236
+#: cps/admin.py:1201
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Contraseña para el usuario %(user)s reinicializada"
 
-#: cps/admin.py:1239 cps/web.py:1311 cps/web.py:1375
+#: cps/admin.py:1204 cps/web.py:1299 cps/web.py:1363
 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:1242 cps/web.py:1249
+#: cps/admin.py:1207 cps/web.py:1237
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configura primero los parámetros del servidor SMTP..."
 
-#: cps/admin.py:1254
+#: cps/admin.py:1218
 msgid "Logfile viewer"
 msgstr "Visor del fichero de log"
 
-#: cps/admin.py:1315
+#: cps/admin.py:1280
 msgid "Requesting update package"
 msgstr "Solicitando paquete de actualización"
 
-#: cps/admin.py:1316
+#: cps/admin.py:1281
 msgid "Downloading update package"
 msgstr "Descargando paquete de actualización"
 
-#: cps/admin.py:1317
+#: cps/admin.py:1282
 msgid "Unzipping update package"
 msgstr "Descomprimiendo paquete de actualización"
 
-#: cps/admin.py:1318
+#: cps/admin.py:1283
 msgid "Replacing files"
 msgstr "Remplazando archivos"
 
-#: cps/admin.py:1319
+#: cps/admin.py:1284
 msgid "Database connections are closed"
 msgstr "Los conexiones con la base datos están cerradas"
 
-#: cps/admin.py:1320
+#: cps/admin.py:1285
 msgid "Stopping server"
 msgstr "Parando el servidor"
 
-#: cps/admin.py:1321
+#: cps/admin.py:1286
 msgid "Update finished, please press okay and reload page"
 msgstr "Actualización finalizada. Por favor, pulse OK y recargue la página"
 
-#: cps/admin.py:1322 cps/admin.py:1323 cps/admin.py:1324 cps/admin.py:1325
-#: cps/admin.py:1326
+#: cps/admin.py:1287 cps/admin.py:1288 cps/admin.py:1289 cps/admin.py:1290
+#: cps/admin.py:1291
 msgid "Update failed:"
 msgstr "Falló la actualización:"
 
-#: cps/admin.py:1322 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+#: cps/admin.py:1287 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "Error HTTP"
 
-#: cps/admin.py:1323 cps/updater.py:322 cps/updater.py:525
+#: cps/admin.py:1288 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Error de conexión"
 
-#: cps/admin.py:1324 cps/updater.py:324 cps/updater.py:527
+#: cps/admin.py:1289 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Tiempo agotado mientras se trataba de establecer la conexión"
 
-#: cps/admin.py:1325 cps/updater.py:326 cps/updater.py:529
+#: cps/admin.py:1290 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Error general"
 
-#: cps/admin.py:1326
+#: cps/admin.py:1291
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr "La actualización del archivo no pudo guardarse en el directorio temporal (Temp Dir)"
 
-#: cps/admin.py:1351
+#: cps/admin.py:1316
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Error: %(ldaperror)s"
 
-#: cps/admin.py:1355
+#: cps/admin.py:1320
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Error: el servidor LDAP no ha devuelto ningún usuario"
 
-#: cps/admin.py:1421
+#: cps/admin.py:1386
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Error al crear al menos un usuario LDAP"
 
-#: cps/admin.py:1424
+#: cps/admin.py:1389
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Al menos, un usuario LDAP no se ha encontrado en la base de datos"
 
-#: cps/admin.py:1426
+#: cps/admin.py:1391
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -356,90 +356,90 @@ msgstr "Formato de libro borrado correctamente"
 msgid "Book Successfully Deleted"
 msgstr "Libro borrado correctamente"
 
-#: cps/editbooks.py:317 cps/editbooks.py:620 cps/web.py:1521 cps/web.py:1554
-#: cps/web.py:1625
+#: cps/editbooks.py:316 cps/editbooks.py:626 cps/web.py:1509 cps/web.py:1542
+#: cps/web.py:1613
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Error abriendo un eBook. El archivo no existe o no es accesible"
 
-#: cps/editbooks.py:351
+#: cps/editbooks.py:350
 msgid "edit metadata"
 msgstr "editar metadatos"
 
-#: cps/editbooks.py:426
+#: cps/editbooks.py:425
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s no es un idioma válido"
 
-#: cps/editbooks.py:537 cps/editbooks.py:796
+#: cps/editbooks.py:536 cps/editbooks.py:802
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "No se permite subir archivos con la extensión '%(ext)s' a este servidor"
 
-#: cps/editbooks.py:541 cps/editbooks.py:800
+#: cps/editbooks.py:540 cps/editbooks.py:806
 msgid "File to be uploaded must have an extension"
 msgstr "El archivo a subir debe tener una extensión"
 
-#: cps/editbooks.py:553
+#: cps/editbooks.py:552
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Fallo al crear la ruta %(path)s (permiso denegado)"
 
-#: cps/editbooks.py:558
+#: cps/editbooks.py:557
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Fallo al guardar el archivo %(file)s."
 
-#: cps/editbooks.py:576 cps/editbooks.py:931 cps/web.py:1498
+#: cps/editbooks.py:575 cps/editbooks.py:937 cps/web.py:1486
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Error en la base de datos: %(error)s."
 
-#: cps/editbooks.py:580
+#: cps/editbooks.py:579
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Archivo con formato %(ext)s añadido a %(book)s"
 
-#: cps/editbooks.py:700
+#: cps/editbooks.py:706
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:737
+#: cps/editbooks.py:743
 msgid "Metadata successfully updated"
 msgstr "Metadatos actualizados correctamente"
 
-#: cps/editbooks.py:746
+#: cps/editbooks.py:752
 msgid "Error editing book, please check logfile for details"
 msgstr "Error al editar el libro, por favor, compruebe el archivo de registro (logfile) para tener más detalles"
 
-#: cps/editbooks.py:808
+#: cps/editbooks.py:814
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "El archivo %(filename)s no pudo salvarse en el directorio temporal (Temp Dir)"
 
-#: cps/editbooks.py:818
+#: cps/editbooks.py:824
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "El libro cargado probablemente existe en la biblioteca, considera cambiarlo antes de subirlo de nuevo: "
 
-#: cps/editbooks.py:906
+#: cps/editbooks.py:912
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "Fallo al mover el archivo de cubierta %(file)s: %(error)s"
 
-#: cps/editbooks.py:917
+#: cps/editbooks.py:923
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "El fichero %(file)s a sido subido"
 
-#: cps/editbooks.py:943
+#: cps/editbooks.py:949
 msgid "Source or destination format for conversion missing"
 msgstr "Falta la fuente o el formato de destino para la conversión"
 
-#: cps/editbooks.py:951
+#: cps/editbooks.py:957
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Libro puesto a la cola para su conversión a %(book_format)s"
 
-#: cps/editbooks.py:955
+#: cps/editbooks.py:961
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Ocurrió un error al convertir este libro: %(res)s"
@@ -600,85 +600,85 @@ msgstr "Finalizado"
 msgid "Unknown Status"
 msgstr "Estado desconocido"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Por favor, accede a calibre-web desde una ubicación que no sea localhost para obtener una api_endpoint válida para tu dispositivo Kobo"
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:157
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
 msgid "Kobo Setup"
 msgstr "Configuración de Kobo"
 
-#: cps/oauth_bb.py:74
+#: cps/oauth_bb.py:73
 #, python-format
 msgid "Register with %(provider)s"
 msgstr "Registrado con %(provider)s"
 
-#: cps/oauth_bb.py:158
+#: cps/oauth_bb.py:146
 msgid "Failed to log in with GitHub."
 msgstr "Error al iniciar sesión con GitHub."
 
-#: cps/oauth_bb.py:163
+#: cps/oauth_bb.py:151
 msgid "Failed to fetch user info from GitHub."
 msgstr "Error al obtener la información del usuario de GitHub."
 
-#: cps/oauth_bb.py:174
+#: cps/oauth_bb.py:162
 msgid "Failed to log in with Google."
 msgstr "Error al iniciar sesión con Google."
 
-#: cps/oauth_bb.py:179
+#: cps/oauth_bb.py:167
 msgid "Failed to fetch user info from Google."
 msgstr "Error al obtener información del usuario de Google."
 
-#: cps/oauth_bb.py:229 cps/remotelogin.py:134 cps/web.py:1347
+#: cps/oauth_bb.py:213 cps/remotelogin.py:133 cps/web.py:1335
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "has iniciado sesión como : '%(nickname)s'"
 
-#: cps/oauth_bb.py:239
+#: cps/oauth_bb.py:223
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr "El enlace a %(oauth)s se ha realizado correctamente"
 
-#: cps/oauth_bb.py:245
+#: cps/oauth_bb.py:229
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr "Acceso erróneo, ningún usuario enlazado con la cuenta OAuth"
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:271
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr "%(oauth)s desenlazado con éxito"
 
-#: cps/oauth_bb.py:291
+#: cps/oauth_bb.py:275
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr "Error al desenlazar %(oauth)s"
 
-#: cps/oauth_bb.py:294
+#: cps/oauth_bb.py:278
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr "No vinculado con %(oauth)s"
 
-#: cps/oauth_bb.py:322
+#: cps/oauth_bb.py:306
 msgid "GitHub Oauth error, please retry later."
 msgstr "Error en GitHub Oauth, por favor, vuelva a intentarlo más tarde."
 
-#: cps/oauth_bb.py:341
+#: cps/oauth_bb.py:325
 msgid "Google Oauth error, please retry later."
 msgstr "Error en Google Oauth, por favor vuelva a intentarlo más tarde."
 
-#: cps/remotelogin.py:66 cps/web.py:1394
+#: cps/remotelogin.py:65 cps/web.py:1382
 msgid "login"
 msgstr "iniciar sesión"
 
-#: cps/remotelogin.py:78 cps/remotelogin.py:112
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
 msgid "Token not found"
 msgstr "Token no encontrado"
 
-#: cps/remotelogin.py:87 cps/remotelogin.py:120
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
 msgid "Token has expired"
 msgstr "El token ha expirado"
 
-#: cps/remotelogin.py:96
+#: cps/remotelogin.py:95
 msgid "Success! Please return to your device"
 msgstr "¡Correcto! Por favor regrese a su dispositivo"
 
@@ -706,7 +706,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:388
+#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:376
 msgid "Top Rated Books"
 msgstr "Libros mejor valorados"
 
@@ -715,7 +715,7 @@ msgid "Show Top Rated Books"
 msgstr "Mostrar libros mejor valorados"
 
 #: cps/render_template.py:53 cps/templates/index.xml:46
-#: cps/templates/index.xml:50 cps/web.py:648
+#: cps/templates/index.xml:50 cps/web.py:636
 msgid "Read Books"
 msgstr "Libros leídos"
 
@@ -724,7 +724,7 @@ msgid "Show read and unread"
 msgstr "Mostrar leídos y no leídos"
 
 #: cps/render_template.py:57 cps/templates/index.xml:53
-#: cps/templates/index.xml:57 cps/web.py:651
+#: cps/templates/index.xml:57 cps/web.py:639
 msgid "Unread Books"
 msgstr "Libros no leídos"
 
@@ -741,7 +741,7 @@ msgid "Show random books"
 msgstr "Mostrar libros al azar"
 
 #: cps/render_template.py:63 cps/templates/book_table.html:50
-#: cps/templates/index.xml:75 cps/web.py:953
+#: cps/templates/index.xml:75 cps/web.py:941
 msgid "Categories"
 msgstr "Categorías"
 
@@ -751,7 +751,7 @@ msgstr "Mostrar selección de categorías"
 
 #: cps/render_template.py:66 cps/templates/book_edit.html:84
 #: cps/templates/book_table.html:51 cps/templates/index.xml:82
-#: cps/templates/search_form.html:62 cps/web.py:857 cps/web.py:867
+#: cps/templates/search_form.html:62 cps/web.py:845 cps/web.py:855
 msgid "Series"
 msgstr "Series"
 
@@ -769,7 +769,7 @@ msgid "Show author selection"
 msgstr "Mostrar selección de autores"
 
 #: cps/render_template.py:73 cps/templates/book_table.html:55
-#: cps/templates/index.xml:68 cps/web.py:836
+#: cps/templates/index.xml:68 cps/web.py:824
 msgid "Publishers"
 msgstr "Editores"
 
@@ -778,7 +778,7 @@ msgid "Show publisher selection"
 msgstr "Mostrar selección de editores"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:53
-#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:932
+#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:920
 msgid "Languages"
 msgstr "Idiomas"
 
@@ -802,7 +802,7 @@ msgstr "Formatos de archivo"
 msgid "Show file formats selection"
 msgstr "Mostrar selección de formatos de archivo"
 
-#: cps/render_template.py:87 cps/web.py:675
+#: cps/render_template.py:87 cps/web.py:663
 msgid "Archived Books"
 msgstr "Libros archivados"
 
@@ -810,7 +810,7 @@ msgstr "Libros archivados"
 msgid "Show archived books"
 msgstr "Mostrar libros archivados"
 
-#: cps/render_template.py:91 cps/web.py:746
+#: cps/render_template.py:91 cps/web.py:734
 msgid "Books List"
 msgstr ""
 
@@ -867,49 +867,49 @@ msgstr "El libro fue eliminado del estante: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr "Lo siento, no tiene permiso para eliminar un libro del estante: %(sname)s"
 
-#: cps/shelf.py:238 cps/shelf.py:282
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr "Ya existe un estante público con el nombre '%(title)s'."
+#: cps/shelf.py:224 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "Crear un estante"
 
-#: cps/shelf.py:247 cps/shelf.py:292
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr "Ya existe un estante privado con el nombre '%(title)s'."
+#: cps/shelf.py:231
+msgid "Edit a shelf"
+msgstr "Editar un estante"
 
-#: cps/shelf.py:254
+#: cps/shelf.py:249
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Estante %(title)s creado"
 
-#: cps/shelf.py:261 cps/shelf.py:310
-msgid "There was an error"
-msgstr "Ha sucedido un error"
-
-#: cps/shelf.py:262 cps/shelf.py:264 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "Crear un estante"
-
-#: cps/shelf.py:304
+#: cps/shelf.py:252
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Estante %(title)s cambiado"
 
-#: cps/shelf.py:311 cps/shelf.py:313
-msgid "Edit a shelf"
-msgstr "Editar un estante"
+#: cps/shelf.py:265
+msgid "There was an error"
+msgstr "Ha sucedido un error"
 
-#: cps/shelf.py:381
+#: cps/shelf.py:281
+#, 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:291
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr "Ya existe un estante privado con el nombre '%(title)s'."
+
+#: cps/shelf.py:358
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Cambiar orden del estante: '%(name)s'"
 
-#: cps/shelf.py:447
+#: cps/shelf.py:423
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Estante: '%(name)s'"
 
-#: cps/shelf.py:451
+#: cps/shelf.py:427
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Error al abrir un estante. El estante no existe o no es accesible"
 
@@ -942,222 +942,222 @@ msgstr "Hay una nueva actualización disponible. Haz clic en el botón de abajo
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Haz clic en el botón de abajo para actualizar a la última versión estable."
 
-#: cps/templates/index.html:5 cps/web.py:396
+#: cps/templates/index.html:5 cps/web.py:384
 msgid "Discover (Random Books)"
 msgstr "Descubrir (Libros al azar)"
 
-#: cps/web.py:435
+#: cps/web.py:423
 msgid "Books"
 msgstr "Libros"
 
-#: cps/web.py:460
+#: cps/web.py:448
 msgid "Hot Books (Most Downloaded)"
 msgstr "Libros populares (los más descargados)"
 
-#: cps/web.py:495
+#: cps/web.py:483
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:509
+#: cps/web.py:497
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "oh, oh, el libro seleccionado no está disponible. El archivo no existe o no es accesible"
 
-#: cps/web.py:523
+#: cps/web.py:511
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autor/es: %(name)s"
 
-#: cps/web.py:537
+#: cps/web.py:525
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Editor/es: %(name)s"
 
-#: cps/web.py:550
+#: cps/web.py:538
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Series: %(serie)s"
 
-#: cps/web.py:563
+#: cps/web.py:551
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Calificación: %(rating)s estrellas"
 
-#: cps/web.py:576
+#: cps/web.py:564
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Formato del archivo: %(format)s"
 
-#: cps/web.py:590
+#: cps/web.py:578
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoría : %(name)s"
 
-#: cps/web.py:609
+#: cps/web.py:597
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Idioma: %(name)s"
 
-#: cps/web.py:639
+#: cps/web.py:627
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/templates/layout.html:56 cps/web.py:706 cps/web.py:1180
+#: cps/templates/layout.html:56 cps/web.py:694 cps/web.py:1168
 msgid "Advanced Search"
 msgstr "Búsqueda avanzada"
 
 #: cps/templates/book_edit.html:214 cps/templates/feed.xml:33
 #: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:175 cps/web.py:718 cps/web.py:990
+#: cps/templates/search_form.html:175 cps/web.py:706 cps/web.py:978
 msgid "Search"
 msgstr "Buscar"
 
-#: cps/web.py:885
+#: cps/web.py:873
 msgid "Ratings list"
 msgstr "Lista de calificaciones"
 
-#: cps/web.py:904
+#: cps/web.py:892
 msgid "File formats list"
 msgstr "Lista de formatos"
 
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:967
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:955
 msgid "Tasks"
 msgstr "Tareas"
 
-#: cps/web.py:1053
+#: cps/web.py:1041
 msgid "Published after "
 msgstr "Publicado después de "
 
-#: cps/web.py:1060
+#: cps/web.py:1048
 msgid "Published before "
 msgstr "Publicado antes de "
 
-#: cps/web.py:1079
+#: cps/web.py:1067
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Calificación <= %(rating)s"
 
-#: cps/web.py:1081
+#: cps/web.py:1069
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Calificación >= %(rating)s"
 
-#: cps/web.py:1083
+#: cps/web.py:1071
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1254
+#: cps/web.py:1242
 #, 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:1258
+#: cps/web.py:1246
 #, 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:1260
+#: cps/web.py:1248
 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:1277
+#: cps/web.py:1265
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "El servidor de E-Mail no está configurado, por favor, ¡avisa a tu administrador!"
 
-#: cps/web.py:1278 cps/web.py:1288 cps/web.py:1312 cps/web.py:1316
-#: cps/web.py:1321 cps/web.py:1325
+#: cps/web.py:1266 cps/web.py:1276 cps/web.py:1300 cps/web.py:1304
+#: cps/web.py:1309 cps/web.py:1313
 msgid "register"
 msgstr "registrarse"
 
-#: cps/web.py:1314
+#: cps/web.py:1302
 msgid "Your e-mail is not allowed to register"
 msgstr "Su correo electrónico no está permitido para registrarse"
 
-#: cps/web.py:1317
+#: cps/web.py:1305
 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:1320
+#: cps/web.py:1308
 msgid "This username or e-mail address is already in use."
 msgstr "Este nombre de usuario o correo electrónico ya están en uso."
 
-#: cps/web.py:1337
+#: cps/web.py:1325
 msgid "Cannot activate LDAP authentication"
 msgstr "No se puede activar la autenticación LDAP"
 
-#: cps/web.py:1354
+#: cps/web.py:1342
 #, 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:1360
+#: cps/web.py:1348
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "No se pudo entrar: %(message)s"
 
-#: cps/web.py:1364 cps/web.py:1388
+#: cps/web.py:1352 cps/web.py:1376
 msgid "Wrong Username or Password"
 msgstr "Usuario o contraseña inválido"
 
-#: cps/web.py:1371
+#: cps/web.py:1359
 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:1377
+#: cps/web.py:1365
 msgid "Please enter valid username to reset password"
 msgstr "Por favor, introduce un usuario válido para restablecer la contraseña"
 
-#: cps/web.py:1383
+#: cps/web.py:1371
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Ahora estás conectado como: '%(nickname)s'"
 
-#: cps/web.py:1453 cps/web.py:1506
+#: cps/web.py:1441 cps/web.py:1494
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Perfil de %(name)s"
 
-#: cps/web.py:1489
+#: cps/web.py:1477
 msgid "Profile updated"
 msgstr "Perfil actualizado"
 
-#: cps/web.py:1533 cps/web.py:1536 cps/web.py:1539 cps/web.py:1546
-#: cps/web.py:1551
+#: cps/web.py:1521 cps/web.py:1524 cps/web.py:1527 cps/web.py:1534
+#: cps/web.py:1539
 msgid "Read a Book"
 msgstr "Leer un libro"
 
-#: cps/tasks/convert.py:108
+#: cps/tasks/convert.py:114
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:132
+#: cps/tasks/convert.py:138
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:136
+#: cps/tasks/convert.py:142
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:146
+#: cps/tasks/convert.py:152
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:170
+#: cps/tasks/convert.py:176
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:193
+#: cps/tasks/convert.py:199
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Falló Ebook-converter: %(error)s"
 
-#: cps/tasks/convert.py:218
+#: cps/tasks/convert.py:224
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
diff --git a/cps/translations/fi/LC_MESSAGES/messages.mo b/cps/translations/fi/LC_MESSAGES/messages.mo
index 40a13cc4..a1755f5b 100644
Binary files a/cps/translations/fi/LC_MESSAGES/messages.mo and b/cps/translations/fi/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/fi/LC_MESSAGES/messages.po b/cps/translations/fi/LC_MESSAGES/messages.po
index 5de9c2a2..dce50ebe 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-01-02 19:37+0100\n"
+"POT-Creation-Date: 2021-01-17 11:34+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:42
 msgid "installed"
@@ -30,310 +30,310 @@ msgstr "ei asennettu"
 msgid "Statistics"
 msgstr "Tilastot"
 
-#: cps/admin.py:144
+#: cps/admin.py:147
 msgid "Server restarted, please reload page"
 msgstr "Palvelin uudelleenkäynnistetty, ole hyvä ja päivitä sivu"
 
-#: cps/admin.py:146
+#: cps/admin.py:149
 msgid "Performing shutdown of server, please close window"
 msgstr "Palvelinta sammutetaan, ole hyvä ja sulje sivu"
 
-#: cps/admin.py:154
+#: cps/admin.py:157
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:157
+#: cps/admin.py:160
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:167 cps/editbooks.py:636 cps/editbooks.py:648
-#: cps/editbooks.py:751 cps/editbooks.py:753 cps/editbooks.py:814
-#: cps/editbooks.py:830 cps/updater.py:510 cps/uploader.py:90
+#: cps/admin.py:170 cps/editbooks.py:642 cps/editbooks.py:654
+#: cps/editbooks.py:757 cps/editbooks.py:759 cps/editbooks.py:820
+#: cps/editbooks.py:836 cps/updater.py:510 cps/uploader.py:90
 #: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: cps/admin.py:188
+#: cps/admin.py:191
 msgid "Admin page"
 msgstr "Ylläpitosivu"
 
-#: cps/admin.py:210
+#: cps/admin.py:213
 msgid "UI Configuration"
 msgstr "Käyttöliittymän asetukset"
 
-#: cps/admin.py:242 cps/admin.py:954
+#: cps/admin.py:245 cps/admin.py:923
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web asetukset päivitetty"
 
-#: cps/admin.py:253
+#: cps/admin.py:256
 msgid "Do you really want to delete the Kobo Token?"
 msgstr ""
 
-#: cps/admin.py:255
+#: cps/admin.py:258
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:257
+#: cps/admin.py:260
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:259 cps/templates/shelf.html:90
+#: cps/admin.py:262 cps/templates/shelf.html:90
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Oletko varma, että haluat poistaa hyllyn?"
 
-#: cps/admin.py:545 cps/admin.py:551 cps/admin.py:561 cps/admin.py:571
+#: cps/admin.py:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534
 #: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:547 cps/admin.py:553 cps/admin.py:563 cps/admin.py:573
+#: cps/admin.py:510 cps/admin.py:516 cps/admin.py:526 cps/admin.py:536
 #: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:713
+#: cps/admin.py:679
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:753
+#: cps/admin.py:721
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:759
+#: cps/admin.py:727
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:788
+#: cps/admin.py:757
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:803
+#: cps/admin.py:772
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:806
+#: cps/admin.py:775
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:811
+#: cps/admin.py:780
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:814
+#: cps/admin.py:783
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:822
+#: cps/admin.py:791
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:825
+#: cps/admin.py:794
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:833
+#: cps/admin.py:802
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:859
+#: cps/admin.py:828
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:865
+#: cps/admin.py:834
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:935 cps/admin.py:1039 cps/admin.py:1135 cps/admin.py:1184
-#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:258
-#: cps/shelf.py:307 cps/shelf.py:339 cps/shelf.py:371 cps/shelf.py:442
+#: cps/admin.py:904 cps/admin.py:1011 cps/admin.py:1100 cps/admin.py:1149
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:261
+#: cps/shelf.py:314 cps/shelf.py:348 cps/shelf.py:418
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:947
+#: cps/admin.py:916
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:951
+#: cps/admin.py:920
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:984
+#: cps/admin.py:959
 msgid "Basic Configuration"
 msgstr "Perusasetukset"
 
-#: cps/admin.py:999 cps/web.py:1287
+#: cps/admin.py:974 cps/web.py:1275
 msgid "Please fill out all fields!"
 msgstr "Ole hyvä ja täytä kaikki kentät!"
 
-#: cps/admin.py:1002 cps/admin.py:1014 cps/admin.py:1020 cps/admin.py:1153
+#: cps/admin.py:977 cps/admin.py:989 cps/admin.py:995 cps/admin.py:1118
 msgid "Add new user"
 msgstr "Lisää uusi käyttäjä"
 
-#: cps/admin.py:1011 cps/web.py:1451
+#: cps/admin.py:986 cps/web.py:1439
 msgid "E-mail is not from valid domain"
 msgstr "Sähköpostiosoite ei ole toimivasta domainista"
 
-#: cps/admin.py:1018 cps/admin.py:1036
+#: cps/admin.py:993 cps/admin.py:1008
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Tälle sähköpostiosoitteelle tai tunnukselle löytyi jo tili."
 
-#: cps/admin.py:1032
+#: cps/admin.py:1004
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Käyttäjä '%(user)s' lisätty"
 
-#: cps/admin.py:1051
+#: cps/admin.py:1020
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Käyttäjä '%(nick)s' poistettu"
 
-#: cps/admin.py:1054
+#: cps/admin.py:1023
 msgid "No admin user remaining, can't delete user"
 msgstr "Pääkäyttäjiä ei jää jäljelle, käyttäjää ei voi poistaa"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1028
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:1096 cps/web.py:1493
+#: cps/admin.py:1064 cps/web.py:1481
 msgid "Found an existing account for this e-mail address."
 msgstr "Tälle sähköpostiosoitteelle läytyi jo käyttäjätunnus."
 
-#: cps/admin.py:1105 cps/admin.py:1119 cps/admin.py:1225 cps/web.py:1469
+#: cps/admin.py:1073 cps/admin.py:1087 cps/admin.py:1190 cps/web.py:1457
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Muokkaa käyttäjää %(nick)s"
 
-#: cps/admin.py:1111 cps/web.py:1462
+#: cps/admin.py:1079 cps/web.py:1450
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:1129
+#: cps/admin.py:1094
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Käyttäjä '%(nick)s' päivitetty"
 
-#: cps/admin.py:1132
+#: cps/admin.py:1097
 msgid "An unknown error occured."
 msgstr "Tapahtui tuntematon virhe."
 
-#: cps/admin.py:1162 cps/templates/admin.html:78
+#: cps/admin.py:1127 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "Muuta SMTP asetuksia"
 
-#: cps/admin.py:1191
+#: cps/admin.py:1156
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Testisähköposti lähetetty onnistuneesti osoitteeseen %(kindlemail)s"
 
-#: cps/admin.py:1194
+#: cps/admin.py:1159
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Testisähköpostin lähetyksessä tapahtui virhe: %(res)s"
 
-#: cps/admin.py:1196
+#: cps/admin.py:1161
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1198
+#: cps/admin.py:1163
 msgid "E-mail server settings updated"
 msgstr "Sähköpostipalvelimen tiedot päivitetty"
 
-#: cps/admin.py:1209
+#: cps/admin.py:1174
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:1236
+#: cps/admin.py:1201
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Käyttäjän %(user)s salasana palautettu"
 
-#: cps/admin.py:1239 cps/web.py:1311 cps/web.py:1375
+#: cps/admin.py:1204 cps/web.py:1299 cps/web.py:1363
 msgid "An unknown error occurred. Please try again later."
 msgstr "Tapahtui tuntematon virhe. Yritä myöhemmin uudelleen."
 
-#: cps/admin.py:1242 cps/web.py:1249
+#: cps/admin.py:1207 cps/web.py:1237
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Ole hyvä ja aseta SMTP postiasetukset ensin..."
 
-#: cps/admin.py:1254
+#: cps/admin.py:1218
 msgid "Logfile viewer"
 msgstr "Lokitiedoston katselin"
 
-#: cps/admin.py:1315
+#: cps/admin.py:1280
 msgid "Requesting update package"
 msgstr "Haetaan päivitystiedostoa"
 
-#: cps/admin.py:1316
+#: cps/admin.py:1281
 msgid "Downloading update package"
 msgstr "Ladataan päivitystiedostoa"
 
-#: cps/admin.py:1317
+#: cps/admin.py:1282
 msgid "Unzipping update package"
 msgstr "Puretaan päivitystiedostoa"
 
-#: cps/admin.py:1318
+#: cps/admin.py:1283
 msgid "Replacing files"
 msgstr "Korvataan tiedostoja"
 
-#: cps/admin.py:1319
+#: cps/admin.py:1284
 msgid "Database connections are closed"
 msgstr "Tietokantayhteydet on katkaistu"
 
-#: cps/admin.py:1320
+#: cps/admin.py:1285
 msgid "Stopping server"
 msgstr "Sammutetaan palvelin"
 
-#: cps/admin.py:1321
+#: cps/admin.py:1286
 msgid "Update finished, please press okay and reload page"
 msgstr "Päivitys valmistui, ole hyvä ja paina OK ja lataa sivu uudelleen"
 
-#: cps/admin.py:1322 cps/admin.py:1323 cps/admin.py:1324 cps/admin.py:1325
-#: cps/admin.py:1326
+#: cps/admin.py:1287 cps/admin.py:1288 cps/admin.py:1289 cps/admin.py:1290
+#: cps/admin.py:1291
 msgid "Update failed:"
 msgstr "Päivitys epäonnistui:"
 
-#: cps/admin.py:1322 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+#: cps/admin.py:1287 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTP virhe"
 
-#: cps/admin.py:1323 cps/updater.py:322 cps/updater.py:525
+#: cps/admin.py:1288 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Yhteysvirhe"
 
-#: cps/admin.py:1324 cps/updater.py:324 cps/updater.py:527
+#: cps/admin.py:1289 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Aikakatkaisu yhteyttä luotaessa"
 
-#: cps/admin.py:1325 cps/updater.py:326 cps/updater.py:529
+#: cps/admin.py:1290 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Yleinen virhe"
 
-#: cps/admin.py:1326
+#: cps/admin.py:1291
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
-#: cps/admin.py:1351
+#: cps/admin.py:1316
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1355
+#: cps/admin.py:1320
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1421
+#: cps/admin.py:1386
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1424
+#: cps/admin.py:1389
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1426
+#: cps/admin.py:1391
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -353,90 +353,90 @@ msgstr ""
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:317 cps/editbooks.py:620 cps/web.py:1521 cps/web.py:1554
-#: cps/web.py:1625
+#: cps/editbooks.py:316 cps/editbooks.py:626 cps/web.py:1509 cps/web.py:1542
+#: cps/web.py:1613
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Virhe e-kirjaa avatessa. Tiedostoa ei löydy tai se ei ole saatavilla"
 
-#: cps/editbooks.py:351
+#: cps/editbooks.py:350
 msgid "edit metadata"
 msgstr "muokkaa metadataa"
 
-#: cps/editbooks.py:426
+#: cps/editbooks.py:425
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s ei ole kelvollinen kieli"
 
-#: cps/editbooks.py:537 cps/editbooks.py:796
+#: cps/editbooks.py:536 cps/editbooks.py:802
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Tiedostopääte '%(ext)s' ei ole sallittujen palvelimelle ladattavien listalla"
 
-#: cps/editbooks.py:541 cps/editbooks.py:800
+#: cps/editbooks.py:540 cps/editbooks.py:806
 msgid "File to be uploaded must have an extension"
 msgstr "Ladattavalla tiedostolla on oltava tiedostopääte"
 
-#: cps/editbooks.py:553
+#: cps/editbooks.py:552
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Polun %(path)s luonti epäonnistui (Ei oikeutta)."
 
-#: cps/editbooks.py:558
+#: cps/editbooks.py:557
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Tiedoston %(file)s tallennus epäonnistui."
 
-#: cps/editbooks.py:576 cps/editbooks.py:931 cps/web.py:1498
+#: cps/editbooks.py:575 cps/editbooks.py:937 cps/web.py:1486
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:580
+#: cps/editbooks.py:579
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Tiedostoformaatti %(ext)s lisätty %(book)s"
 
-#: cps/editbooks.py:700
+#: cps/editbooks.py:706
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:737
+#: cps/editbooks.py:743
 msgid "Metadata successfully updated"
 msgstr "Metadata päivitetty onnistuneesti"
 
-#: cps/editbooks.py:746
+#: cps/editbooks.py:752
 msgid "Error editing book, please check logfile for details"
 msgstr "Kirjan editoinnissa tapahtui virhe, tarkista virheilmoitus lokista"
 
-#: cps/editbooks.py:808
+#: cps/editbooks.py:814
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:818
+#: cps/editbooks.py:824
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:906
+#: cps/editbooks.py:912
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:917
+#: cps/editbooks.py:923
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Tiedosto %(file)s tallennettu"
 
-#: cps/editbooks.py:943
+#: cps/editbooks.py:949
 msgid "Source or destination format for conversion missing"
 msgstr "Lähteen tai kohteen tiedostomuoto puuttuu"
 
-#: cps/editbooks.py:951
+#: cps/editbooks.py:957
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Kirja lisätty muutosjonoon muotoon %(book_format)s"
 
-#: cps/editbooks.py:955
+#: cps/editbooks.py:961
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Kirjan muunnoksessa tapahtui virhe: %(res)s"
@@ -597,85 +597,85 @@ msgstr "Valmistui"
 msgid "Unknown Status"
 msgstr "Tuntematon tila"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:157
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
 msgid "Kobo Setup"
 msgstr ""
 
-#: cps/oauth_bb.py:74
+#: cps/oauth_bb.py:73
 #, python-format
 msgid "Register with %(provider)s"
 msgstr "Rekisteröi tuottajalle %(provider)s"
 
-#: cps/oauth_bb.py:158
+#: cps/oauth_bb.py:146
 msgid "Failed to log in with GitHub."
 msgstr "GitHubiin kirjautuminen epäonnistui."
 
-#: cps/oauth_bb.py:163
+#: cps/oauth_bb.py:151
 msgid "Failed to fetch user info from GitHub."
 msgstr "Käyttäjätietojen haku GitHubista epäonnistui"
 
-#: cps/oauth_bb.py:174
+#: cps/oauth_bb.py:162
 msgid "Failed to log in with Google."
 msgstr "Googleen kirjautuminen epäonnistui."
 
-#: cps/oauth_bb.py:179
+#: cps/oauth_bb.py:167
 msgid "Failed to fetch user info from Google."
 msgstr "Käyttäjätietojen haku Googlesta epäonnistui."
 
-#: cps/oauth_bb.py:229 cps/remotelogin.py:134 cps/web.py:1347
+#: cps/oauth_bb.py:213 cps/remotelogin.py:133 cps/web.py:1335
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "olet nyt kirjautunut tunnuksella: \"%(nickname)s\""
 
-#: cps/oauth_bb.py:239
+#: cps/oauth_bb.py:223
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:245
+#: cps/oauth_bb.py:229
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr ""
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:271
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:291
+#: cps/oauth_bb.py:275
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr ""
 
-#: cps/oauth_bb.py:294
+#: cps/oauth_bb.py:278
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:322
+#: cps/oauth_bb.py:306
 msgid "GitHub Oauth error, please retry later."
 msgstr "GitHub Oauth virhe, yritä myöhemmin uudelleen."
 
-#: cps/oauth_bb.py:341
+#: cps/oauth_bb.py:325
 msgid "Google Oauth error, please retry later."
 msgstr "Google Oauth virhe, yritä myöhemmin uudelleen."
 
-#: cps/remotelogin.py:66 cps/web.py:1394
+#: cps/remotelogin.py:65 cps/web.py:1382
 msgid "login"
 msgstr "kirjaudu"
 
-#: cps/remotelogin.py:78 cps/remotelogin.py:112
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
 msgid "Token not found"
 msgstr "Valtuutusta ei löytynyt"
 
-#: cps/remotelogin.py:87 cps/remotelogin.py:120
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
 msgid "Token has expired"
 msgstr "Valtuutus vanhentunut"
 
-#: cps/remotelogin.py:96
+#: cps/remotelogin.py:95
 msgid "Success! Please return to your device"
 msgstr "Onnistui! Ole hyvä ja palaa laitteellesi"
 
@@ -703,7 +703,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:388
+#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:376
 msgid "Top Rated Books"
 msgstr "Parhaiten arvioidut kirjat"
 
@@ -712,7 +712,7 @@ msgid "Show Top Rated Books"
 msgstr "Näytä parhaiten arvioidut kirjat"
 
 #: cps/render_template.py:53 cps/templates/index.xml:46
-#: cps/templates/index.xml:50 cps/web.py:648
+#: cps/templates/index.xml:50 cps/web.py:636
 msgid "Read Books"
 msgstr "Luetut kirjat"
 
@@ -721,7 +721,7 @@ msgid "Show read and unread"
 msgstr "Näytä luetut ja lukemattomat"
 
 #: cps/render_template.py:57 cps/templates/index.xml:53
-#: cps/templates/index.xml:57 cps/web.py:651
+#: cps/templates/index.xml:57 cps/web.py:639
 msgid "Unread Books"
 msgstr "Lukemattomat kirjat"
 
@@ -738,7 +738,7 @@ msgid "Show random books"
 msgstr "Näytä satunnaisia kirjoja"
 
 #: cps/render_template.py:63 cps/templates/book_table.html:50
-#: cps/templates/index.xml:75 cps/web.py:953
+#: cps/templates/index.xml:75 cps/web.py:941
 msgid "Categories"
 msgstr "Kategoriat"
 
@@ -748,7 +748,7 @@ msgstr "Näytä kategoriavalinta"
 
 #: cps/render_template.py:66 cps/templates/book_edit.html:84
 #: cps/templates/book_table.html:51 cps/templates/index.xml:82
-#: cps/templates/search_form.html:62 cps/web.py:857 cps/web.py:867
+#: cps/templates/search_form.html:62 cps/web.py:845 cps/web.py:855
 msgid "Series"
 msgstr "Sarjat"
 
@@ -766,7 +766,7 @@ msgid "Show author selection"
 msgstr "Näytä kirjailijavalinta"
 
 #: cps/render_template.py:73 cps/templates/book_table.html:55
-#: cps/templates/index.xml:68 cps/web.py:836
+#: cps/templates/index.xml:68 cps/web.py:824
 msgid "Publishers"
 msgstr "Julkaisijat"
 
@@ -775,7 +775,7 @@ msgid "Show publisher selection"
 msgstr "Näytä julkaisijavalinta"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:53
-#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:932
+#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:920
 msgid "Languages"
 msgstr "Kielet"
 
@@ -799,7 +799,7 @@ msgstr "Tiedotomuodot"
 msgid "Show file formats selection"
 msgstr "Näytä tiedostomuotovalinta"
 
-#: cps/render_template.py:87 cps/web.py:675
+#: cps/render_template.py:87 cps/web.py:663
 msgid "Archived Books"
 msgstr ""
 
@@ -807,7 +807,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:91 cps/web.py:746
+#: cps/render_template.py:91 cps/web.py:734
 msgid "Books List"
 msgstr ""
 
@@ -864,49 +864,49 @@ msgstr "Kirja on poistettu hyllystä: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr "Valitettavsti sinulla ei ole oikeutta poistaa kirjaa hyllystä: %(sname)s"
 
-#: cps/shelf.py:238 cps/shelf.py:282
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr ""
+#: cps/shelf.py:224 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "luo hylly"
 
-#: cps/shelf.py:247 cps/shelf.py:292
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr ""
+#: cps/shelf.py:231
+msgid "Edit a shelf"
+msgstr "Muokkaa hyllyä"
 
-#: cps/shelf.py:254
+#: cps/shelf.py:249
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Hylly %(title)s luotu"
 
-#: cps/shelf.py:261 cps/shelf.py:310
-msgid "There was an error"
-msgstr "Tapahtui virhe"
-
-#: cps/shelf.py:262 cps/shelf.py:264 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "luo hylly"
-
-#: cps/shelf.py:304
+#: cps/shelf.py:252
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Hylly %(title)s muutettu"
 
-#: cps/shelf.py:311 cps/shelf.py:313
-msgid "Edit a shelf"
-msgstr "Muokkaa hyllyä"
+#: cps/shelf.py:265
+msgid "There was an error"
+msgstr "Tapahtui virhe"
 
-#: cps/shelf.py:381
+#: cps/shelf.py:281
+#, python-format
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:291
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:358
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Muuta hyllyn: '%(name)s' järjestystä"
 
-#: cps/shelf.py:447
+#: cps/shelf.py:423
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Hylly: '%(name)s'"
 
-#: cps/shelf.py:451
+#: cps/shelf.py:427
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Virhe hyllyn avauksessa. Hyllyä ei ole tai se ei ole saatavilla"
 
@@ -939,222 +939,222 @@ msgstr "Uusi päivitys saatavilla. Paina alla olevaa nappia päivittääksesi ve
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Paina alla olevaa nappia päivittääksesi uusimpaan vakaaseen versioon."
 
-#: cps/templates/index.html:5 cps/web.py:396
+#: cps/templates/index.html:5 cps/web.py:384
 msgid "Discover (Random Books)"
 msgstr "Löydä (satunnaiset kirjat)"
 
-#: cps/web.py:435
+#: cps/web.py:423
 msgid "Books"
 msgstr "Kirjat"
 
-#: cps/web.py:460
+#: cps/web.py:448
 msgid "Hot Books (Most Downloaded)"
 msgstr "Kuumat kirjat (ladatuimmat)"
 
-#: cps/web.py:495
+#: cps/web.py:483
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:509
+#: cps/web.py:497
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Virhe eKirjan avaamisessa. Tiedostoa ei ole tai se ei ole saatavilla:"
 
-#: cps/web.py:523
+#: cps/web.py:511
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Kirjailija: %(name)s"
 
-#: cps/web.py:537
+#: cps/web.py:525
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Julkaisija: %(name)s"
 
-#: cps/web.py:550
+#: cps/web.py:538
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Sarja: %(serie)s"
 
-#: cps/web.py:563
+#: cps/web.py:551
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Arvostelu: %(rating)s tähteä"
 
-#: cps/web.py:576
+#: cps/web.py:564
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Tiedostomuoto: %(format)s"
 
-#: cps/web.py:590
+#: cps/web.py:578
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategoria: %(name)s"
 
-#: cps/web.py:609
+#: cps/web.py:597
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Kieli: %(name)s"
 
-#: cps/web.py:639
+#: cps/web.py:627
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/templates/layout.html:56 cps/web.py:706 cps/web.py:1180
+#: cps/templates/layout.html:56 cps/web.py:694 cps/web.py:1168
 msgid "Advanced Search"
 msgstr "Edistynyt haku"
 
 #: cps/templates/book_edit.html:214 cps/templates/feed.xml:33
 #: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:175 cps/web.py:718 cps/web.py:990
+#: cps/templates/search_form.html:175 cps/web.py:706 cps/web.py:978
 msgid "Search"
 msgstr "Hae"
 
-#: cps/web.py:885
+#: cps/web.py:873
 msgid "Ratings list"
 msgstr "Arvostelulistaus"
 
-#: cps/web.py:904
+#: cps/web.py:892
 msgid "File formats list"
 msgstr "Tiedostomuotolistaus"
 
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:967
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:955
 msgid "Tasks"
 msgstr "Tehtävät"
 
-#: cps/web.py:1053
+#: cps/web.py:1041
 msgid "Published after "
 msgstr "Julkaistu alkaen "
 
-#: cps/web.py:1060
+#: cps/web.py:1048
 msgid "Published before "
 msgstr "Julkaisut ennen "
 
-#: cps/web.py:1079
+#: cps/web.py:1067
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Arvostelu <= %(rating)s"
 
-#: cps/web.py:1081
+#: cps/web.py:1069
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Arvostelu >= %(rating)s"
 
-#: cps/web.py:1083
+#: cps/web.py:1071
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1254
+#: cps/web.py:1242
 #, 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:1258
+#: cps/web.py:1246
 #, 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:1260
+#: cps/web.py:1248
 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:1277
+#: cps/web.py:1265
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/web.py:1278 cps/web.py:1288 cps/web.py:1312 cps/web.py:1316
-#: cps/web.py:1321 cps/web.py:1325
+#: cps/web.py:1266 cps/web.py:1276 cps/web.py:1300 cps/web.py:1304
+#: cps/web.py:1309 cps/web.py:1313
 msgid "register"
 msgstr "rekisteröidy"
 
-#: cps/web.py:1314
+#: cps/web.py:1302
 msgid "Your e-mail is not allowed to register"
 msgstr "Sähköpostiosoitteellasi ei ole sallittua rekisteröityä"
 
-#: cps/web.py:1317
+#: cps/web.py:1305
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Vahvistusviesti on lähetetty sähköpostiosoitteeseesi."
 
-#: cps/web.py:1320
+#: cps/web.py:1308
 msgid "This username or e-mail address is already in use."
 msgstr "Käyttäjätunnus tai sähköpostiosoite on jo käytössä."
 
-#: cps/web.py:1337
+#: cps/web.py:1325
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP autnetikoinnin aktivointi ei onnistu"
 
-#: cps/web.py:1354
+#: cps/web.py:1342
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1360
+#: cps/web.py:1348
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1364 cps/web.py:1388
+#: cps/web.py:1352 cps/web.py:1376
 msgid "Wrong Username or Password"
 msgstr "Väärä käyttäjätunnus tai salasana"
 
-#: cps/web.py:1371
+#: cps/web.py:1359
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1377
+#: cps/web.py:1365
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1383
+#: cps/web.py:1371
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "olet kirjautunut tunnuksella: '%(nickname)s'"
 
-#: cps/web.py:1453 cps/web.py:1506
+#: cps/web.py:1441 cps/web.py:1494
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)sn profiili"
 
-#: cps/web.py:1489
+#: cps/web.py:1477
 msgid "Profile updated"
 msgstr "Profiili päivitetty"
 
-#: cps/web.py:1533 cps/web.py:1536 cps/web.py:1539 cps/web.py:1546
-#: cps/web.py:1551
+#: cps/web.py:1521 cps/web.py:1524 cps/web.py:1527 cps/web.py:1534
+#: cps/web.py:1539
 msgid "Read a Book"
 msgstr "Lue kirja"
 
-#: cps/tasks/convert.py:108
+#: cps/tasks/convert.py:114
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:132
+#: cps/tasks/convert.py:138
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:136
+#: cps/tasks/convert.py:142
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:146
+#: cps/tasks/convert.py:152
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:170
+#: cps/tasks/convert.py:176
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:193
+#: cps/tasks/convert.py:199
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "E-kirjan muunnos epäonnistui: %(error)s"
 
-#: cps/tasks/convert.py:218
+#: cps/tasks/convert.py:224
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
diff --git a/cps/translations/fr/LC_MESSAGES/messages.mo b/cps/translations/fr/LC_MESSAGES/messages.mo
index 58a4159e..68cfb3d4 100644
Binary files a/cps/translations/fr/LC_MESSAGES/messages.mo and b/cps/translations/fr/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index cc900f7f..4cd4beb1 100644
--- a/cps/translations/fr/LC_MESSAGES/messages.po
+++ b/cps/translations/fr/LC_MESSAGES/messages.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-01-02 19:37+0100\n"
+"POT-Creation-Date: 2021-01-17 11:34+0100\n"
 "PO-Revision-Date: 2020-06-07 06:47+0200\n"
 "Last-Translator: Dekani <dekani1500@gmail.com>\n"
 "Language: fr\n"
@@ -30,7 +30,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:42
 msgid "installed"
@@ -44,310 +44,310 @@ msgstr "non installé"
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: cps/admin.py:144
+#: cps/admin.py:147
 msgid "Server restarted, please reload page"
 msgstr "Serveur redémarré, merci de rafraîchir la page"
 
-#: cps/admin.py:146
+#: cps/admin.py:149
 msgid "Performing shutdown of server, please close window"
 msgstr "Arrêt du serveur en cours, merci de fermer la fenêtre"
 
-#: cps/admin.py:154
+#: cps/admin.py:157
 msgid "Reconnect successful"
 msgstr "Reconnecté avec succès"
 
-#: cps/admin.py:157
+#: cps/admin.py:160
 msgid "Unknown command"
 msgstr "Commande inconnue"
 
-#: cps/admin.py:167 cps/editbooks.py:636 cps/editbooks.py:648
-#: cps/editbooks.py:751 cps/editbooks.py:753 cps/editbooks.py:814
-#: cps/editbooks.py:830 cps/updater.py:510 cps/uploader.py:90
+#: cps/admin.py:170 cps/editbooks.py:642 cps/editbooks.py:654
+#: cps/editbooks.py:757 cps/editbooks.py:759 cps/editbooks.py:820
+#: cps/editbooks.py:836 cps/updater.py:510 cps/uploader.py:90
 #: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: cps/admin.py:188
+#: cps/admin.py:191
 msgid "Admin page"
 msgstr "Page admin"
 
-#: cps/admin.py:210
+#: cps/admin.py:213
 msgid "UI Configuration"
 msgstr "Configuration de l’interface utilisateur"
 
-#: cps/admin.py:242 cps/admin.py:954
+#: cps/admin.py:245 cps/admin.py:923
 msgid "Calibre-Web configuration updated"
 msgstr "Configuration de Calibre-Web mise à jour"
 
-#: cps/admin.py:253
+#: cps/admin.py:256
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Voulez-vous vraiment supprimer le jeton Kobo?"
 
-#: cps/admin.py:255
+#: cps/admin.py:258
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:257
+#: cps/admin.py:260
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:259 cps/templates/shelf.html:90
+#: cps/admin.py:262 cps/templates/shelf.html:90
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Voulez-vous vraiment supprimer l’étagère?"
 
-#: cps/admin.py:545 cps/admin.py:551 cps/admin.py:561 cps/admin.py:571
+#: cps/admin.py:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534
 #: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Refuser"
 
-#: cps/admin.py:547 cps/admin.py:553 cps/admin.py:563 cps/admin.py:573
+#: cps/admin.py:510 cps/admin.py:516 cps/admin.py:526 cps/admin.py:536
 #: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Autoriser"
 
-#: cps/admin.py:713
+#: cps/admin.py:679
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json n'est pas configuré pour l'application Web"
 
-#: cps/admin.py:753
+#: cps/admin.py:721
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "L'emplacement du fichier logfile est incorrect, veuillez saisir un chemin valide"
 
-#: cps/admin.py:759
+#: cps/admin.py:727
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "L'emplacement du fichier Access Logfile est incorrect, veuillez saisir un chemin valide"
 
-#: cps/admin.py:788
+#: cps/admin.py:757
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Veuillez saisir un fournisseur LDAP, Port, DN et l'identifiant objet de l'utilisateur"
 
-#: cps/admin.py:803
+#: cps/admin.py:772
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "Le filtre objet du groupe LDAP a besoin d'un identifiant de format \"%s\""
 
-#: cps/admin.py:806
+#: cps/admin.py:775
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Le filtre objet du groupe LDAP a une parenthèse non gérée"
 
-#: cps/admin.py:811
+#: cps/admin.py:780
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Le filtre objet de l'utilisateur LDAP a besoin d'un identifiant de format \"%s\""
 
-#: cps/admin.py:814
+#: cps/admin.py:783
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Le filtre objet de l'utilisateur LDAP a une parenthèse non gérée"
 
-#: cps/admin.py:822
+#: cps/admin.py:791
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:825
+#: cps/admin.py:794
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:833
+#: cps/admin.py:802
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:859
+#: cps/admin.py:828
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "L'emplacement du fichier Keyfile est incorrect, veuillez saisir un chemin valide"
 
-#: cps/admin.py:865
+#: cps/admin.py:834
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "L'emplacement du fichier Certfile est incorrect, veuillez saisir un chemin valide"
 
-#: cps/admin.py:935 cps/admin.py:1039 cps/admin.py:1135 cps/admin.py:1184
-#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:258
-#: cps/shelf.py:307 cps/shelf.py:339 cps/shelf.py:371 cps/shelf.py:442
+#: cps/admin.py:904 cps/admin.py:1011 cps/admin.py:1100 cps/admin.py:1149
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:261
+#: cps/shelf.py:314 cps/shelf.py:348 cps/shelf.py:418
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:947
+#: cps/admin.py:916
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "L'emplacement DB est incorrect, veuillez saisir un chemin valide"
 
-#: cps/admin.py:951
+#: cps/admin.py:920
 msgid "DB is not Writeable"
 msgstr "La DB n'est pas accessible en écriture"
 
-#: cps/admin.py:984
+#: cps/admin.py:959
 msgid "Basic Configuration"
 msgstr "Configuration principale"
 
-#: cps/admin.py:999 cps/web.py:1287
+#: cps/admin.py:974 cps/web.py:1275
 msgid "Please fill out all fields!"
 msgstr "Veuillez compléter tous les champs !"
 
-#: cps/admin.py:1002 cps/admin.py:1014 cps/admin.py:1020 cps/admin.py:1153
+#: cps/admin.py:977 cps/admin.py:989 cps/admin.py:995 cps/admin.py:1118
 msgid "Add new user"
 msgstr "Ajouter un nouvel utilisateur"
 
-#: cps/admin.py:1011 cps/web.py:1451
+#: cps/admin.py:986 cps/web.py:1439
 msgid "E-mail is not from valid domain"
 msgstr "Cette adresse de courriel n’appartient pas à un domaine valide"
 
-#: cps/admin.py:1018 cps/admin.py:1036
+#: cps/admin.py:993 cps/admin.py:1008
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Un compte existant a été trouvé pour cette adresse de courriel ou pour ce surnom."
 
-#: cps/admin.py:1032
+#: cps/admin.py:1004
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Utilisateur '%(user)s' créé"
 
-#: cps/admin.py:1051
+#: cps/admin.py:1020
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Utilisateur '%(nick)s' supprimé"
 
-#: cps/admin.py:1054
+#: cps/admin.py:1023
 msgid "No admin user remaining, can't delete user"
 msgstr "Aucun utilisateur admin restant, impossible de supprimer l’utilisateur"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1028
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Aucun utilisateur admin restant, impossible de supprimer le rôle admin"
 
-#: cps/admin.py:1096 cps/web.py:1493
+#: cps/admin.py:1064 cps/web.py:1481
 msgid "Found an existing account for this e-mail address."
 msgstr "Un compte existant a été trouvé pour cette adresse de courriel."
 
-#: cps/admin.py:1105 cps/admin.py:1119 cps/admin.py:1225 cps/web.py:1469
+#: cps/admin.py:1073 cps/admin.py:1087 cps/admin.py:1190 cps/web.py:1457
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Éditer l'utilisateur %(nick)s"
 
-#: cps/admin.py:1111 cps/web.py:1462
+#: cps/admin.py:1079 cps/web.py:1450
 msgid "This username is already taken"
 msgstr "Cet utilisateur est déjà pris"
 
-#: cps/admin.py:1129
+#: cps/admin.py:1094
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Utilisateur '%(nick)s'  mis à jour"
 
-#: cps/admin.py:1132
+#: cps/admin.py:1097
 msgid "An unknown error occured."
 msgstr "Oups ! Une erreur inconnue a eu lieu."
 
-#: cps/admin.py:1162 cps/templates/admin.html:78
+#: cps/admin.py:1127 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "Modifier les paramètres du serveur de courriels"
 
-#: cps/admin.py:1191
+#: cps/admin.py:1156
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Courriel de test envoyé avec succès sur %(kindlemail)s"
 
-#: cps/admin.py:1194
+#: cps/admin.py:1159
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Il y a eu une erreur pendant l’envoi du courriel de test : %(res)s"
 
-#: cps/admin.py:1196
+#: cps/admin.py:1161
 msgid "Please configure your e-mail address first..."
 msgstr "Veuillez d'abord configurer votre adresse de courriel..."
 
-#: cps/admin.py:1198
+#: cps/admin.py:1163
 msgid "E-mail server settings updated"
 msgstr "Les paramètres du serveur de courriels ont été mis à jour"
 
-#: cps/admin.py:1209
+#: cps/admin.py:1174
 msgid "User not found"
 msgstr "L'utilisateur n'a pas été trouvé"
 
-#: cps/admin.py:1236
+#: cps/admin.py:1201
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Le mot de passe de l’utilisateur %(user)s a été réinitialisé"
 
-#: cps/admin.py:1239 cps/web.py:1311 cps/web.py:1375
+#: cps/admin.py:1204 cps/web.py:1299 cps/web.py:1363
 msgid "An unknown error occurred. Please try again later."
 msgstr "Une erreur inconnue est survenue. Veuillez réessayer plus tard."
 
-#: cps/admin.py:1242 cps/web.py:1249
+#: cps/admin.py:1207 cps/web.py:1237
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Veuillez configurer les paramètres SMTP au préalable..."
 
-#: cps/admin.py:1254
+#: cps/admin.py:1218
 msgid "Logfile viewer"
 msgstr "Visualiseur de fichier journal"
 
-#: cps/admin.py:1315
+#: cps/admin.py:1280
 msgid "Requesting update package"
 msgstr "Demande de mise à jour"
 
-#: cps/admin.py:1316
+#: cps/admin.py:1281
 msgid "Downloading update package"
 msgstr "Téléchargement de la mise à jour"
 
-#: cps/admin.py:1317
+#: cps/admin.py:1282
 msgid "Unzipping update package"
 msgstr "Décompression de la mise à jour"
 
-#: cps/admin.py:1318
+#: cps/admin.py:1283
 msgid "Replacing files"
 msgstr "Remplacement des fichiers"
 
-#: cps/admin.py:1319
+#: cps/admin.py:1284
 msgid "Database connections are closed"
 msgstr "Les connexions à la base de données ont été fermées"
 
-#: cps/admin.py:1320
+#: cps/admin.py:1285
 msgid "Stopping server"
 msgstr "Arrêt du serveur"
 
-#: cps/admin.py:1321
+#: cps/admin.py:1286
 msgid "Update finished, please press okay and reload page"
 msgstr "Mise à jour terminée, merci d’appuyer sur okay et de rafraîchir la page"
 
-#: cps/admin.py:1322 cps/admin.py:1323 cps/admin.py:1324 cps/admin.py:1325
-#: cps/admin.py:1326
+#: cps/admin.py:1287 cps/admin.py:1288 cps/admin.py:1289 cps/admin.py:1290
+#: cps/admin.py:1291
 msgid "Update failed:"
 msgstr "La mise à jour a échoué :"
 
-#: cps/admin.py:1322 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+#: cps/admin.py:1287 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "Erreur HTTP"
 
-#: cps/admin.py:1323 cps/updater.py:322 cps/updater.py:525
+#: cps/admin.py:1288 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Erreur de connexion"
 
-#: cps/admin.py:1324 cps/updater.py:324 cps/updater.py:527
+#: cps/admin.py:1289 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Délai d'attente dépassé lors de l'établissement de connexion"
 
-#: cps/admin.py:1325 cps/updater.py:326 cps/updater.py:529
+#: cps/admin.py:1290 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Erreur générale"
 
-#: cps/admin.py:1326
+#: cps/admin.py:1291
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr "Le fichier de mise à jour ne peut pas être sauvegardé dans le répertoire temporaire"
 
-#: cps/admin.py:1351
+#: cps/admin.py:1316
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Erreur : %(ldaperror)s"
 
-#: cps/admin.py:1355
+#: cps/admin.py:1320
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Erreur : Aucun utilisateur renvoyé dans la réponse LDAP du serveur"
 
-#: cps/admin.py:1421
+#: cps/admin.py:1386
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Impossible de créer au moins un utilisateur LDAP"
 
-#: cps/admin.py:1424
+#: cps/admin.py:1389
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Au moins un utilisateur LDAP n'a pas été trouvé dans la base de données"
 
-#: cps/admin.py:1426
+#: cps/admin.py:1391
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -367,90 +367,90 @@ 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:317 cps/editbooks.py:620 cps/web.py:1521 cps/web.py:1554
-#: cps/web.py:1625
+#: cps/editbooks.py:316 cps/editbooks.py:626 cps/web.py:1509 cps/web.py:1542
+#: cps/web.py:1613
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Erreur à l’ouverture du livre. Le fichier n’existe pas ou n’est pas accessible"
 
-#: cps/editbooks.py:351
+#: cps/editbooks.py:350
 msgid "edit metadata"
 msgstr "modifier les métadonnées"
 
-#: cps/editbooks.py:426
+#: cps/editbooks.py:425
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s n'est pas une langue valide"
 
-#: cps/editbooks.py:537 cps/editbooks.py:796
+#: cps/editbooks.py:536 cps/editbooks.py:802
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "L’extension de fichier '%(ext)s' n’est pas autorisée pour être déposée sur ce serveur"
 
-#: cps/editbooks.py:541 cps/editbooks.py:800
+#: cps/editbooks.py:540 cps/editbooks.py:806
 msgid "File to be uploaded must have an extension"
 msgstr "Pour être déposé le fichier doit avoir une extension"
 
-#: cps/editbooks.py:553
+#: cps/editbooks.py:552
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Impossible de créer le chemin %(path)s (Permission refusée)."
 
-#: cps/editbooks.py:558
+#: cps/editbooks.py:557
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Échec de la sauvegarde du fichier %(file)s."
 
-#: cps/editbooks.py:576 cps/editbooks.py:931 cps/web.py:1498
+#: cps/editbooks.py:575 cps/editbooks.py:937 cps/web.py:1486
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Erreur de la base de données: %(error)s."
 
-#: cps/editbooks.py:580
+#: cps/editbooks.py:579
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Le format de fichier %(ext)s a été ajouté à %(book)s"
 
-#: cps/editbooks.py:700
+#: cps/editbooks.py:706
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:737
+#: cps/editbooks.py:743
 msgid "Metadata successfully updated"
 msgstr "Les métadonnées ont bien été mises à jour"
 
-#: cps/editbooks.py:746
+#: cps/editbooks.py:752
 msgid "Error editing book, please check logfile for details"
 msgstr "Erreur d’édition du livre, veuillez consulter le journal (log) pour plus de détails"
 
-#: cps/editbooks.py:808
+#: cps/editbooks.py:814
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "Le fichier %(filename)s ne peut pas être sauvegardé dans le répertoire temporaire"
 
-#: cps/editbooks.py:818
+#: cps/editbooks.py:824
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Le fichier téléchargé existe probablement dans la librairie, veuillez le modifier avant de le télécharger de nouveau: "
 
-#: cps/editbooks.py:906
+#: cps/editbooks.py:912
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "Impossible de déplacer le fichier de couverture %(file)s: %(error)s"
 
-#: cps/editbooks.py:917
+#: cps/editbooks.py:923
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Le fichier %(file)s a été téléchargé"
 
-#: cps/editbooks.py:943
+#: cps/editbooks.py:949
 msgid "Source or destination format for conversion missing"
 msgstr "Le format de conversion de la source ou de la destination est manquant"
 
-#: cps/editbooks.py:951
+#: cps/editbooks.py:957
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Le livre a été mis avec succès en file de traitement pour conversion vers %(book_format)s"
 
-#: cps/editbooks.py:955
+#: cps/editbooks.py:961
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Une erreur est survenue au cours de la conversion du livre : %(res)s"
@@ -611,85 +611,85 @@ msgstr "Terminé"
 msgid "Unknown Status"
 msgstr "Statut inconnu"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Veuilllez ne pas accéder à calibre-web par localhost pour obtenir un api_endpoint valide pour un appareil kobo"
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:157
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
 msgid "Kobo Setup"
 msgstr "Configuration Kobo"
 
-#: cps/oauth_bb.py:74
+#: cps/oauth_bb.py:73
 #, python-format
 msgid "Register with %(provider)s"
 msgstr "Enregistrer avec %(provider)s"
 
-#: cps/oauth_bb.py:158
+#: cps/oauth_bb.py:146
 msgid "Failed to log in with GitHub."
 msgstr "Échec de la connexion avec GitHub."
 
-#: cps/oauth_bb.py:163
+#: cps/oauth_bb.py:151
 msgid "Failed to fetch user info from GitHub."
 msgstr "Impossible d’obtenir les informations d’utilisateur à partir de GitHub."
 
-#: cps/oauth_bb.py:174
+#: cps/oauth_bb.py:162
 msgid "Failed to log in with Google."
 msgstr "Échec de la connexion avec Google."
 
-#: cps/oauth_bb.py:179
+#: cps/oauth_bb.py:167
 msgid "Failed to fetch user info from Google."
 msgstr "Impossible d’obtenir les informations d’utilisateur avec Google."
 
-#: cps/oauth_bb.py:229 cps/remotelogin.py:134 cps/web.py:1347
+#: cps/oauth_bb.py:213 cps/remotelogin.py:133 cps/web.py:1335
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "vous êtes maintenant connecté comme : '%(nickname)s'"
 
-#: cps/oauth_bb.py:239
+#: cps/oauth_bb.py:223
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr "Lien vers %(oauth)s effectué avec succès"
 
-#: cps/oauth_bb.py:245
+#: cps/oauth_bb.py:229
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr "La connexion a échoué, aucun utilisateur lié au compte OAuth"
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:271
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr "Suppression de la liaison vers %(oauth)s effectuée avec succès"
 
-#: cps/oauth_bb.py:291
+#: cps/oauth_bb.py:275
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr "Suppression de la liaison vers %(oauth)s a échoué"
 
-#: cps/oauth_bb.py:294
+#: cps/oauth_bb.py:278
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:322
+#: cps/oauth_bb.py:306
 msgid "GitHub Oauth error, please retry later."
 msgstr "Erreur Oauth GitHub, veuillez réessayer plus tard."
 
-#: cps/oauth_bb.py:341
+#: cps/oauth_bb.py:325
 msgid "Google Oauth error, please retry later."
 msgstr "Erreur Oauth Google, veuillez réessayer plus tard."
 
-#: cps/remotelogin.py:66 cps/web.py:1394
+#: cps/remotelogin.py:65 cps/web.py:1382
 msgid "login"
 msgstr "connexion"
 
-#: cps/remotelogin.py:78 cps/remotelogin.py:112
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
 msgid "Token not found"
 msgstr "Jeton non trouvé"
 
-#: cps/remotelogin.py:87 cps/remotelogin.py:120
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
 msgid "Token has expired"
 msgstr "Jeton expiré"
 
-#: cps/remotelogin.py:96
+#: cps/remotelogin.py:95
 msgid "Success! Please return to your device"
 msgstr "Réussite! Merci de vous tourner vers votre appareil"
 
@@ -717,7 +717,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:388
+#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:376
 msgid "Top Rated Books"
 msgstr "Livres les mieux notés"
 
@@ -726,7 +726,7 @@ msgid "Show Top Rated Books"
 msgstr "Montrer les livres les mieux notés"
 
 #: cps/render_template.py:53 cps/templates/index.xml:46
-#: cps/templates/index.xml:50 cps/web.py:648
+#: cps/templates/index.xml:50 cps/web.py:636
 msgid "Read Books"
 msgstr "Livres lus"
 
@@ -735,7 +735,7 @@ msgid "Show read and unread"
 msgstr "Montrer lus et non-lus"
 
 #: cps/render_template.py:57 cps/templates/index.xml:53
-#: cps/templates/index.xml:57 cps/web.py:651
+#: cps/templates/index.xml:57 cps/web.py:639
 msgid "Unread Books"
 msgstr "Livres non-lus"
 
@@ -752,7 +752,7 @@ msgid "Show random books"
 msgstr "Montrer des livres au hasard"
 
 #: cps/render_template.py:63 cps/templates/book_table.html:50
-#: cps/templates/index.xml:75 cps/web.py:953
+#: cps/templates/index.xml:75 cps/web.py:941
 msgid "Categories"
 msgstr "Catégories"
 
@@ -762,7 +762,7 @@ msgstr "Montrer la sélection par catégories"
 
 #: cps/render_template.py:66 cps/templates/book_edit.html:84
 #: cps/templates/book_table.html:51 cps/templates/index.xml:82
-#: cps/templates/search_form.html:62 cps/web.py:857 cps/web.py:867
+#: cps/templates/search_form.html:62 cps/web.py:845 cps/web.py:855
 msgid "Series"
 msgstr "Séries"
 
@@ -780,7 +780,7 @@ msgid "Show author selection"
 msgstr "Montrer la sélection par auteur"
 
 #: cps/render_template.py:73 cps/templates/book_table.html:55
-#: cps/templates/index.xml:68 cps/web.py:836
+#: cps/templates/index.xml:68 cps/web.py:824
 msgid "Publishers"
 msgstr "Éditeurs"
 
@@ -789,7 +789,7 @@ msgid "Show publisher selection"
 msgstr "Montrer la sélection par éditeur"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:53
-#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:932
+#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:920
 msgid "Languages"
 msgstr "Langues"
 
@@ -813,7 +813,7 @@ msgstr "Formats de fichier"
 msgid "Show file formats selection"
 msgstr "Afficher la sélection des formats de fichiers"
 
-#: cps/render_template.py:87 cps/web.py:675
+#: cps/render_template.py:87 cps/web.py:663
 msgid "Archived Books"
 msgstr "Livres archivés"
 
@@ -821,7 +821,7 @@ msgstr "Livres archivés"
 msgid "Show archived books"
 msgstr "Afficher les livres archivés"
 
-#: cps/render_template.py:91 cps/web.py:746
+#: cps/render_template.py:91 cps/web.py:734
 msgid "Books List"
 msgstr ""
 
@@ -878,49 +878,49 @@ 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: %(sname)s"
 msgstr "Désolé, vous n’êtes pas autorisé à enlever un livre de cette étagère : %(sname)s"
 
-#: cps/shelf.py:238 cps/shelf.py:282
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr "Une étagère publique avec le nom '%(title)s' existe déjà."
+#: cps/shelf.py:224 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "Créer une étagère"
 
-#: cps/shelf.py:247 cps/shelf.py:292
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr "Une étagère privée avec le nom '%(title)s' existe déjà."
+#: cps/shelf.py:231
+msgid "Edit a shelf"
+msgstr "Modifier une étagère"
 
-#: cps/shelf.py:254
+#: cps/shelf.py:249
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Étagère %(title)s créée"
 
-#: cps/shelf.py:261 cps/shelf.py:310
-msgid "There was an error"
-msgstr "Il y a eu une erreur"
-
-#: cps/shelf.py:262 cps/shelf.py:264 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "Créer une étagère"
-
-#: cps/shelf.py:304
+#: cps/shelf.py:252
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "L’étagère %(title)s a été modifiée"
 
-#: cps/shelf.py:311 cps/shelf.py:313
-msgid "Edit a shelf"
-msgstr "Modifier une étagère"
+#: cps/shelf.py:265
+msgid "There was an error"
+msgstr "Il y a eu une erreur"
 
-#: cps/shelf.py:381
+#: cps/shelf.py:281
+#, 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:291
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr "Une étagère privée avec le nom '%(title)s' existe déjà."
+
+#: cps/shelf.py:358
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Modifier l’arrangement de l’étagère : ‘%(name)s’"
 
-#: cps/shelf.py:447
+#: cps/shelf.py:423
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Étagère : '%(name)s'"
 
-#: cps/shelf.py:451
+#: cps/shelf.py:427
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Erreur à l’ouverture de l’étagère. Elle n’existe plus ou n’est plus accessible"
 
@@ -953,222 +953,222 @@ msgstr "Une nouvelle mise à jour est disponible. Cliquez sur le bouton ci-desso
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Téléchargez la dernière version en cliquant sur le bouton ci-dessous."
 
-#: cps/templates/index.html:5 cps/web.py:396
+#: cps/templates/index.html:5 cps/web.py:384
 msgid "Discover (Random Books)"
 msgstr "Découvrir (Livres au hasard)"
 
-#: cps/web.py:435
+#: cps/web.py:423
 msgid "Books"
 msgstr "Livres"
 
-#: cps/web.py:460
+#: cps/web.py:448
 msgid "Hot Books (Most Downloaded)"
 msgstr "Livres populaires (les plus téléchargés)"
 
-#: cps/web.py:495
+#: cps/web.py:483
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:509
+#: cps/web.py:497
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Erreur d'ouverture du livre numérique. Le fichier n'existe pas ou n'est pas accessible"
 
-#: cps/web.py:523
+#: cps/web.py:511
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Auteur : %(name)s"
 
-#: cps/web.py:537
+#: cps/web.py:525
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Éditeur : '%(name)s'"
 
-#: cps/web.py:550
+#: cps/web.py:538
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Séries : %(serie)s"
 
-#: cps/web.py:563
+#: cps/web.py:551
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Évaluation : %(rating)s étoiles"
 
-#: cps/web.py:576
+#: cps/web.py:564
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Format de fichier : %(format)s"
 
-#: cps/web.py:590
+#: cps/web.py:578
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Catégorie : %(name)s"
 
-#: cps/web.py:609
+#: cps/web.py:597
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Langue : %(name)s"
 
-#: cps/web.py:639
+#: cps/web.py:627
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "La colonne personnalisée No.%(column)d n'existe pas dans la base de données calibre"
 
-#: cps/templates/layout.html:56 cps/web.py:706 cps/web.py:1180
+#: cps/templates/layout.html:56 cps/web.py:694 cps/web.py:1168
 msgid "Advanced Search"
 msgstr "Recherche avancée"
 
 #: cps/templates/book_edit.html:214 cps/templates/feed.xml:33
 #: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:175 cps/web.py:718 cps/web.py:990
+#: cps/templates/search_form.html:175 cps/web.py:706 cps/web.py:978
 msgid "Search"
 msgstr "Chercher"
 
-#: cps/web.py:885
+#: cps/web.py:873
 msgid "Ratings list"
 msgstr "Liste des évaluations"
 
-#: cps/web.py:904
+#: cps/web.py:892
 msgid "File formats list"
 msgstr "Liste de formats de fichiers"
 
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:967
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:955
 msgid "Tasks"
 msgstr "Tâches"
 
-#: cps/web.py:1053
+#: cps/web.py:1041
 msgid "Published after "
 msgstr "Publié après le "
 
-#: cps/web.py:1060
+#: cps/web.py:1048
 msgid "Published before "
 msgstr "Publié avant le "
 
-#: cps/web.py:1079
+#: cps/web.py:1067
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Évaluation <= %(rating)s"
 
-#: cps/web.py:1081
+#: cps/web.py:1069
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Évaluation >= %(rating)s"
 
-#: cps/web.py:1083
+#: cps/web.py:1071
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1254
+#: cps/web.py:1242
 #, 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:1258
+#: cps/web.py:1246
 #, 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:1260
+#: cps/web.py:1248
 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:1277
+#: cps/web.py:1265
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Le serveur de courriel n'est pas configuré, veuillez contacter votre administrateur!"
 
-#: cps/web.py:1278 cps/web.py:1288 cps/web.py:1312 cps/web.py:1316
-#: cps/web.py:1321 cps/web.py:1325
+#: cps/web.py:1266 cps/web.py:1276 cps/web.py:1300 cps/web.py:1304
+#: cps/web.py:1309 cps/web.py:1313
 msgid "register"
 msgstr "s’enregistrer"
 
-#: cps/web.py:1314
+#: cps/web.py:1302
 msgid "Your e-mail is not allowed to register"
 msgstr "Votre adresse de courriel n’est pas autorisé pour une inscription"
 
-#: cps/web.py:1317
+#: cps/web.py:1305
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Le courriel de confirmation a été envoyé à votre adresse."
 
-#: cps/web.py:1320
+#: cps/web.py:1308
 msgid "This username or e-mail address is already in use."
 msgstr "Ce nom d’utilisateur ou cette adresse de courriel sont déjà utilisés."
 
-#: cps/web.py:1337
+#: cps/web.py:1325
 msgid "Cannot activate LDAP authentication"
 msgstr "Impossible d’activer l’authentification LDAP"
 
-#: cps/web.py:1354
+#: cps/web.py:1342
 #, 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:1360
+#: cps/web.py:1348
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Impossible de se connecter: %(message)s"
 
-#: cps/web.py:1364 cps/web.py:1388
+#: cps/web.py:1352 cps/web.py:1376
 msgid "Wrong Username or Password"
 msgstr "Mauvais nom d'utilisateur ou mot de passe"
 
-#: cps/web.py:1371
+#: cps/web.py:1359
 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:1377
+#: cps/web.py:1365
 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:1383
+#: cps/web.py:1371
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Vous êtes maintenant connecté en tant que : ‘%(nickname)s’"
 
-#: cps/web.py:1453 cps/web.py:1506
+#: cps/web.py:1441 cps/web.py:1494
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil de %(name)s"
 
-#: cps/web.py:1489
+#: cps/web.py:1477
 msgid "Profile updated"
 msgstr "Profil mis à jour"
 
-#: cps/web.py:1533 cps/web.py:1536 cps/web.py:1539 cps/web.py:1546
-#: cps/web.py:1551
+#: cps/web.py:1521 cps/web.py:1524 cps/web.py:1527 cps/web.py:1534
+#: cps/web.py:1539
 msgid "Read a Book"
 msgstr "Lire un livre"
 
-#: cps/tasks/convert.py:108
+#: cps/tasks/convert.py:114
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "ebook-convert calibre %(tool)s non trouvé"
 
-#: cps/tasks/convert.py:132
+#: cps/tasks/convert.py:138
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:136
+#: cps/tasks/convert.py:142
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:146
+#: cps/tasks/convert.py:152
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "La commande Kepubify-converter a échouée : %(error)s"
 
-#: cps/tasks/convert.py:170
+#: cps/tasks/convert.py:176
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr "Fichier converti non trouvé ou plus d'un fichier dans le chemin %(folder)s"
 
-#: cps/tasks/convert.py:193
+#: cps/tasks/convert.py:199
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "La commande ebook-convert a échouée : %(error)s"
 
-#: cps/tasks/convert.py:218
+#: cps/tasks/convert.py:224
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
diff --git a/cps/translations/hu/LC_MESSAGES/messages.mo b/cps/translations/hu/LC_MESSAGES/messages.mo
index afabf31f..a8f54eaa 100644
Binary files a/cps/translations/hu/LC_MESSAGES/messages.mo and b/cps/translations/hu/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/hu/LC_MESSAGES/messages.po b/cps/translations/hu/LC_MESSAGES/messages.po
index 3871d0a4..ad369cee 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-01-02 19:37+0100\n"
+"POT-Creation-Date: 2021-01-17 11:34+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:42
 msgid "installed"
@@ -30,310 +30,310 @@ msgstr "nincs telepítve"
 msgid "Statistics"
 msgstr "Statisztika"
 
-#: cps/admin.py:144
+#: cps/admin.py:147
 msgid "Server restarted, please reload page"
 msgstr "A kiszolgáló újraindult, tölts be újra az oldalt!"
 
-#: cps/admin.py:146
+#: cps/admin.py:149
 msgid "Performing shutdown of server, please close window"
 msgstr "A kiszolgáló leállítása folyamatban, zárd be ezt az ablakot"
 
-#: cps/admin.py:154
+#: cps/admin.py:157
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:157
+#: cps/admin.py:160
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:167 cps/editbooks.py:636 cps/editbooks.py:648
-#: cps/editbooks.py:751 cps/editbooks.py:753 cps/editbooks.py:814
-#: cps/editbooks.py:830 cps/updater.py:510 cps/uploader.py:90
+#: cps/admin.py:170 cps/editbooks.py:642 cps/editbooks.py:654
+#: cps/editbooks.py:757 cps/editbooks.py:759 cps/editbooks.py:820
+#: cps/editbooks.py:836 cps/updater.py:510 cps/uploader.py:90
 #: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: cps/admin.py:188
+#: cps/admin.py:191
 msgid "Admin page"
 msgstr "Rendszergazda oldala"
 
-#: cps/admin.py:210
+#: cps/admin.py:213
 msgid "UI Configuration"
 msgstr "Felhasználói felület beállításai"
 
-#: cps/admin.py:242 cps/admin.py:954
+#: cps/admin.py:245 cps/admin.py:923
 msgid "Calibre-Web configuration updated"
 msgstr "A Calibre-Web konfigurációja frissítve."
 
-#: cps/admin.py:253
+#: cps/admin.py:256
 msgid "Do you really want to delete the Kobo Token?"
 msgstr ""
 
-#: cps/admin.py:255
+#: cps/admin.py:258
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:257
+#: cps/admin.py:260
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:259 cps/templates/shelf.html:90
+#: cps/admin.py:262 cps/templates/shelf.html:90
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Valóban törölni akarod a polcot?"
 
-#: cps/admin.py:545 cps/admin.py:551 cps/admin.py:561 cps/admin.py:571
+#: cps/admin.py:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534
 #: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:547 cps/admin.py:553 cps/admin.py:563 cps/admin.py:573
+#: cps/admin.py:510 cps/admin.py:516 cps/admin.py:526 cps/admin.py:536
 #: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:713
+#: cps/admin.py:679
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:753
+#: cps/admin.py:721
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:759
+#: cps/admin.py:727
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:788
+#: cps/admin.py:757
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:803
+#: cps/admin.py:772
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:806
+#: cps/admin.py:775
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:811
+#: cps/admin.py:780
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:814
+#: cps/admin.py:783
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:822
+#: cps/admin.py:791
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:825
+#: cps/admin.py:794
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:833
+#: cps/admin.py:802
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:859
+#: cps/admin.py:828
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:865
+#: cps/admin.py:834
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:935 cps/admin.py:1039 cps/admin.py:1135 cps/admin.py:1184
-#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:258
-#: cps/shelf.py:307 cps/shelf.py:339 cps/shelf.py:371 cps/shelf.py:442
+#: cps/admin.py:904 cps/admin.py:1011 cps/admin.py:1100 cps/admin.py:1149
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:261
+#: cps/shelf.py:314 cps/shelf.py:348 cps/shelf.py:418
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:947
+#: cps/admin.py:916
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:951
+#: cps/admin.py:920
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:984
+#: cps/admin.py:959
 msgid "Basic Configuration"
 msgstr "Alapvető beállítások"
 
-#: cps/admin.py:999 cps/web.py:1287
+#: cps/admin.py:974 cps/web.py:1275
 msgid "Please fill out all fields!"
 msgstr "Az összes mezőt ki kell tölteni!"
 
-#: cps/admin.py:1002 cps/admin.py:1014 cps/admin.py:1020 cps/admin.py:1153
+#: cps/admin.py:977 cps/admin.py:989 cps/admin.py:995 cps/admin.py:1118
 msgid "Add new user"
 msgstr "Új felhasználó hozzáadása"
 
-#: cps/admin.py:1011 cps/web.py:1451
+#: cps/admin.py:986 cps/web.py:1439
 msgid "E-mail is not from valid domain"
 msgstr "Az e-mail tartománya nem érvényes."
 
-#: cps/admin.py:1018 cps/admin.py:1036
+#: cps/admin.py:993 cps/admin.py:1008
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Már létezik felhasználó ehhez az e-mail címhez vagy felhasználói névhez."
 
-#: cps/admin.py:1032
+#: cps/admin.py:1004
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "A következő felhasználó létrehozva: %(user)s"
 
-#: cps/admin.py:1051
+#: cps/admin.py:1020
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "A felhasználó törölve: %(nick)s"
 
-#: cps/admin.py:1054
+#: cps/admin.py:1023
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:1060
+#: cps/admin.py:1028
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:1096 cps/web.py:1493
+#: cps/admin.py:1064 cps/web.py:1481
 msgid "Found an existing account for this e-mail address."
 msgstr "Már létezik felhasználó ehhez az e-mail címhez."
 
-#: cps/admin.py:1105 cps/admin.py:1119 cps/admin.py:1225 cps/web.py:1469
+#: cps/admin.py:1073 cps/admin.py:1087 cps/admin.py:1190 cps/web.py:1457
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr " A felhasználó szerkesztése: %(nick)s"
 
-#: cps/admin.py:1111 cps/web.py:1462
+#: cps/admin.py:1079 cps/web.py:1450
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:1129
+#: cps/admin.py:1094
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "A felhasználó frissítve: %(nick)s"
 
-#: cps/admin.py:1132
+#: cps/admin.py:1097
 msgid "An unknown error occured."
 msgstr "Ismeretlen hiba történt."
 
-#: cps/admin.py:1162 cps/templates/admin.html:78
+#: cps/admin.py:1127 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "SMTP beállítások változtatása"
 
-#: cps/admin.py:1191
+#: cps/admin.py:1156
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "A teszt levél sikeresen elküldve ide: %(kindlemail)s"
 
-#: cps/admin.py:1194
+#: cps/admin.py:1159
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Hiba történt a teszt levél küldése során: %(res)s"
 
-#: cps/admin.py:1196
+#: cps/admin.py:1161
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1198
+#: cps/admin.py:1163
 msgid "E-mail server settings updated"
 msgstr "Az e-mail kiszolgáló beállításai frissítve."
 
-#: cps/admin.py:1209
+#: cps/admin.py:1174
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:1236
+#: cps/admin.py:1201
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "A(z) %(user)s felhasználó jelszavának alaphelyzetbe állítása"
 
-#: cps/admin.py:1239 cps/web.py:1311 cps/web.py:1375
+#: cps/admin.py:1204 cps/web.py:1299 cps/web.py:1363
 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:1242 cps/web.py:1249
+#: cps/admin.py:1207 cps/web.py:1237
 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:1254
+#: cps/admin.py:1218
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1315
+#: cps/admin.py:1280
 msgid "Requesting update package"
 msgstr "Frissítési csomag kérése"
 
-#: cps/admin.py:1316
+#: cps/admin.py:1281
 msgid "Downloading update package"
 msgstr "Frissítési csomag letöltése"
 
-#: cps/admin.py:1317
+#: cps/admin.py:1282
 msgid "Unzipping update package"
 msgstr "Frissítési csomag kitömörítése"
 
-#: cps/admin.py:1318
+#: cps/admin.py:1283
 msgid "Replacing files"
 msgstr "Fájlok cserélése"
 
-#: cps/admin.py:1319
+#: cps/admin.py:1284
 msgid "Database connections are closed"
 msgstr "Adatbázis kapcsolatok lezárva"
 
-#: cps/admin.py:1320
+#: cps/admin.py:1285
 msgid "Stopping server"
 msgstr "Szerver leállítása"
 
-#: cps/admin.py:1321
+#: cps/admin.py:1286
 msgid "Update finished, please press okay and reload page"
 msgstr "A frissítés települt, kattints az OK-ra és újra tölt az oldal"
 
-#: cps/admin.py:1322 cps/admin.py:1323 cps/admin.py:1324 cps/admin.py:1325
-#: cps/admin.py:1326
+#: cps/admin.py:1287 cps/admin.py:1288 cps/admin.py:1289 cps/admin.py:1290
+#: cps/admin.py:1291
 msgid "Update failed:"
 msgstr "A frissítés nem sikerült:"
 
-#: cps/admin.py:1322 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+#: cps/admin.py:1287 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTP hiba"
 
-#: cps/admin.py:1323 cps/updater.py:322 cps/updater.py:525
+#: cps/admin.py:1288 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Kapcsolódási hiba"
 
-#: cps/admin.py:1324 cps/updater.py:324 cps/updater.py:527
+#: cps/admin.py:1289 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Időtúllépés a kapcsolódás során"
 
-#: cps/admin.py:1325 cps/updater.py:326 cps/updater.py:529
+#: cps/admin.py:1290 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Általános hiba"
 
-#: cps/admin.py:1326
+#: cps/admin.py:1291
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
-#: cps/admin.py:1351
+#: cps/admin.py:1316
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1355
+#: cps/admin.py:1320
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1421
+#: cps/admin.py:1386
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1424
+#: cps/admin.py:1389
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1426
+#: cps/admin.py:1391
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -353,90 +353,90 @@ msgstr ""
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:317 cps/editbooks.py:620 cps/web.py:1521 cps/web.py:1554
-#: cps/web.py:1625
+#: cps/editbooks.py:316 cps/editbooks.py:626 cps/web.py:1509 cps/web.py:1542
+#: cps/web.py:1613
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Hiba az ekönyv megnyitásakor. A fájl nem létezik vagy nem elérhető."
 
-#: cps/editbooks.py:351
+#: cps/editbooks.py:350
 msgid "edit metadata"
 msgstr "Metaadatok szerkesztése"
 
-#: cps/editbooks.py:426
+#: cps/editbooks.py:425
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "A(z) %(langname)s nem érvényes nyelv"
 
-#: cps/editbooks.py:537 cps/editbooks.py:796
+#: cps/editbooks.py:536 cps/editbooks.py:802
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "A(z) \"%(ext)s\" kiterjesztésű fájlok feltöltése nincs engedélyezve ezen a szerveren."
 
-#: cps/editbooks.py:541 cps/editbooks.py:800
+#: cps/editbooks.py:540 cps/editbooks.py:806
 msgid "File to be uploaded must have an extension"
 msgstr "A feltöltendő fájlnak kiterjesztéssel kell rendelkeznie!"
 
-#: cps/editbooks.py:553
+#: cps/editbooks.py:552
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Nem sikerült létrehozni az elérési utat (engedély megtagadva): %(path)s."
 
-#: cps/editbooks.py:558
+#: cps/editbooks.py:557
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Nem sikerült elmenteni a %(file)s fájlt."
 
-#: cps/editbooks.py:576 cps/editbooks.py:931 cps/web.py:1498
+#: cps/editbooks.py:575 cps/editbooks.py:937 cps/web.py:1486
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:580
+#: cps/editbooks.py:579
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "A(z) %(ext)s fájlformátum hozzáadva a könyvhez: %(book)s."
 
-#: cps/editbooks.py:700
+#: cps/editbooks.py:706
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:737
+#: cps/editbooks.py:743
 msgid "Metadata successfully updated"
 msgstr "A metaadatok sikeresen frissültek"
 
-#: cps/editbooks.py:746
+#: cps/editbooks.py:752
 msgid "Error editing book, please check logfile for details"
 msgstr "Hiba a könyv szerkesztése során, további részletek a naplófájlban."
 
-#: cps/editbooks.py:808
+#: cps/editbooks.py:814
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:818
+#: cps/editbooks.py:824
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:906
+#: cps/editbooks.py:912
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:917
+#: cps/editbooks.py:923
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:943
+#: cps/editbooks.py:949
 msgid "Source or destination format for conversion missing"
 msgstr "Az átalakításhoz hiányzik a forrás- vagy a célformátum!"
 
-#: cps/editbooks.py:951
+#: cps/editbooks.py:957
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "A könyv sikeresen átalakításra lett jelölve a következő formátumra: %(book_format)s"
 
-#: cps/editbooks.py:955
+#: cps/editbooks.py:961
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Hiba történt a könyv átalakításakor: %(res)s"
@@ -597,85 +597,85 @@ msgstr "Végrehajtva"
 msgid "Unknown Status"
 msgstr "Ismeretlen állapot"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:157
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
 msgid "Kobo Setup"
 msgstr ""
 
-#: cps/oauth_bb.py:74
+#: cps/oauth_bb.py:73
 #, python-format
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:158
+#: cps/oauth_bb.py:146
 msgid "Failed to log in with GitHub."
 msgstr ""
 
-#: cps/oauth_bb.py:163
+#: cps/oauth_bb.py:151
 msgid "Failed to fetch user info from GitHub."
 msgstr ""
 
-#: cps/oauth_bb.py:174
+#: cps/oauth_bb.py:162
 msgid "Failed to log in with Google."
 msgstr ""
 
-#: cps/oauth_bb.py:179
+#: cps/oauth_bb.py:167
 msgid "Failed to fetch user info from Google."
 msgstr ""
 
-#: cps/oauth_bb.py:229 cps/remotelogin.py:134 cps/web.py:1347
+#: cps/oauth_bb.py:213 cps/remotelogin.py:133 cps/web.py:1335
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Be vagy jelentkezve mint: %(nickname)s"
 
-#: cps/oauth_bb.py:239
+#: cps/oauth_bb.py:223
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:245
+#: cps/oauth_bb.py:229
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr ""
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:271
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:291
+#: cps/oauth_bb.py:275
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr ""
 
-#: cps/oauth_bb.py:294
+#: cps/oauth_bb.py:278
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:322
+#: cps/oauth_bb.py:306
 msgid "GitHub Oauth error, please retry later."
 msgstr ""
 
-#: cps/oauth_bb.py:341
+#: cps/oauth_bb.py:325
 msgid "Google Oauth error, please retry later."
 msgstr ""
 
-#: cps/remotelogin.py:66 cps/web.py:1394
+#: cps/remotelogin.py:65 cps/web.py:1382
 msgid "login"
 msgstr "belépés"
 
-#: cps/remotelogin.py:78 cps/remotelogin.py:112
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
 msgid "Token not found"
 msgstr "A token nem található."
 
-#: cps/remotelogin.py:87 cps/remotelogin.py:120
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
 msgid "Token has expired"
 msgstr "A token érvényessége lejárt."
 
-#: cps/remotelogin.py:96
+#: cps/remotelogin.py:95
 msgid "Success! Please return to your device"
 msgstr "Sikerült! Újra használható az eszköz."
 
@@ -703,7 +703,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:388
+#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:376
 msgid "Top Rated Books"
 msgstr "Legjobb könyvek"
 
@@ -712,7 +712,7 @@ msgid "Show Top Rated Books"
 msgstr "Legjobbra értékelt könyvek mutatása"
 
 #: cps/render_template.py:53 cps/templates/index.xml:46
-#: cps/templates/index.xml:50 cps/web.py:648
+#: cps/templates/index.xml:50 cps/web.py:636
 msgid "Read Books"
 msgstr "Olvasott könyvek"
 
@@ -721,7 +721,7 @@ msgid "Show read and unread"
 msgstr "Mutassa az olvasva/olvasatlan állapotot"
 
 #: cps/render_template.py:57 cps/templates/index.xml:53
-#: cps/templates/index.xml:57 cps/web.py:651
+#: cps/templates/index.xml:57 cps/web.py:639
 msgid "Unread Books"
 msgstr "Olvasatlan könyvek"
 
@@ -738,7 +738,7 @@ msgid "Show random books"
 msgstr "Könyvek találomra mutatása"
 
 #: cps/render_template.py:63 cps/templates/book_table.html:50
-#: cps/templates/index.xml:75 cps/web.py:953
+#: cps/templates/index.xml:75 cps/web.py:941
 msgid "Categories"
 msgstr "Címkék"
 
@@ -748,7 +748,7 @@ msgstr "Címke választó mutatása"
 
 #: cps/render_template.py:66 cps/templates/book_edit.html:84
 #: cps/templates/book_table.html:51 cps/templates/index.xml:82
-#: cps/templates/search_form.html:62 cps/web.py:857 cps/web.py:867
+#: cps/templates/search_form.html:62 cps/web.py:845 cps/web.py:855
 msgid "Series"
 msgstr "Sorozatok"
 
@@ -766,7 +766,7 @@ msgid "Show author selection"
 msgstr "Szerző választó mutatása"
 
 #: cps/render_template.py:73 cps/templates/book_table.html:55
-#: cps/templates/index.xml:68 cps/web.py:836
+#: cps/templates/index.xml:68 cps/web.py:824
 msgid "Publishers"
 msgstr "Kiadók"
 
@@ -775,7 +775,7 @@ msgid "Show publisher selection"
 msgstr "Kiadó választó mutatása"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:53
-#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:932
+#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:920
 msgid "Languages"
 msgstr "Nyelvek"
 
@@ -799,7 +799,7 @@ msgstr ""
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/render_template.py:87 cps/web.py:675
+#: cps/render_template.py:87 cps/web.py:663
 msgid "Archived Books"
 msgstr ""
 
@@ -807,7 +807,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:91 cps/web.py:746
+#: cps/render_template.py:91 cps/web.py:734
 msgid "Books List"
 msgstr ""
 
@@ -864,49 +864,49 @@ 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: %(sname)s"
 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:282
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr ""
+#: cps/shelf.py:224 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "Polc készítése"
 
-#: cps/shelf.py:247 cps/shelf.py:292
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr ""
+#: cps/shelf.py:231
+msgid "Edit a shelf"
+msgstr "Polc szerkesztése"
 
-#: cps/shelf.py:254
+#: cps/shelf.py:249
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "A következő polc létre lett hozva: %(title)s"
 
-#: cps/shelf.py:261 cps/shelf.py:310
-msgid "There was an error"
-msgstr "Hiba történt"
-
-#: cps/shelf.py:262 cps/shelf.py:264 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "Polc készítése"
-
-#: cps/shelf.py:304
+#: cps/shelf.py:252
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "A következő polc megváltoztatva: %(title)s"
 
-#: cps/shelf.py:311 cps/shelf.py:313
-msgid "Edit a shelf"
-msgstr "Polc szerkesztése"
+#: cps/shelf.py:265
+msgid "There was an error"
+msgstr "Hiba történt"
 
-#: cps/shelf.py:381
+#: cps/shelf.py:281
+#, python-format
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:291
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:358
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "A következő polc átrendezése: %(name)s"
 
-#: cps/shelf.py:447
+#: cps/shelf.py:423
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Polc: '%(name)s'"
 
-#: cps/shelf.py:451
+#: cps/shelf.py:427
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Hiba a polc megnyitásakor. A polc nem létezik vagy nem elérhető."
 
@@ -939,222 +939,222 @@ msgstr "Új frissítés érhető el. Kattints az alábbi gombra a frissítéshez
 msgid "Click on the button below to update to the latest stable version."
 msgstr ""
 
-#: cps/templates/index.html:5 cps/web.py:396
+#: cps/templates/index.html:5 cps/web.py:384
 msgid "Discover (Random Books)"
 msgstr "Felfedezés (könyvek találomra)"
 
-#: cps/web.py:435
+#: cps/web.py:423
 msgid "Books"
 msgstr ""
 
-#: cps/web.py:460
+#: cps/web.py:448
 msgid "Hot Books (Most Downloaded)"
 msgstr "Kelendő könyvek (legtöbbet letöltöttek)"
 
-#: cps/web.py:495
+#: cps/web.py:483
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:509
+#: cps/web.py:497
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Hiba történt az e-könyv megnyitásakor. A fájl nem létezik vagy nem érhető el:"
 
-#: cps/web.py:523
+#: cps/web.py:511
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:537
+#: cps/web.py:525
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Kiadó: %(name)s"
 
-#: cps/web.py:550
+#: cps/web.py:538
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Sorozat: %(serie)s"
 
-#: cps/web.py:563
+#: cps/web.py:551
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:576
+#: cps/web.py:564
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:590
+#: cps/web.py:578
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Címke: %(name)s"
 
-#: cps/web.py:609
+#: cps/web.py:597
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Nyelv: %(name)s"
 
-#: cps/web.py:639
+#: cps/web.py:627
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/templates/layout.html:56 cps/web.py:706 cps/web.py:1180
+#: cps/templates/layout.html:56 cps/web.py:694 cps/web.py:1168
 msgid "Advanced Search"
 msgstr "Részletes keresés"
 
 #: cps/templates/book_edit.html:214 cps/templates/feed.xml:33
 #: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:175 cps/web.py:718 cps/web.py:990
+#: cps/templates/search_form.html:175 cps/web.py:706 cps/web.py:978
 msgid "Search"
 msgstr "Keresés"
 
-#: cps/web.py:885
+#: cps/web.py:873
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:904
+#: cps/web.py:892
 msgid "File formats list"
 msgstr ""
 
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:967
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:955
 msgid "Tasks"
 msgstr "Feladatok"
 
-#: cps/web.py:1053
+#: cps/web.py:1041
 msgid "Published after "
 msgstr "Kiadva ezután: "
 
-#: cps/web.py:1060
+#: cps/web.py:1048
 msgid "Published before "
 msgstr "Kiadva ezelőtt: "
 
-#: cps/web.py:1079
+#: cps/web.py:1067
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Értékelés <= %(rating)s"
 
-#: cps/web.py:1081
+#: cps/web.py:1069
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Értékelés <= %(rating)s"
 
-#: cps/web.py:1083
+#: cps/web.py:1071
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1254
+#: cps/web.py:1242
 #, 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:1258
+#: cps/web.py:1246
 #, 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:1260
+#: cps/web.py:1248
 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:1277
+#: cps/web.py:1265
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/web.py:1278 cps/web.py:1288 cps/web.py:1312 cps/web.py:1316
-#: cps/web.py:1321 cps/web.py:1325
+#: cps/web.py:1266 cps/web.py:1276 cps/web.py:1300 cps/web.py:1304
+#: cps/web.py:1309 cps/web.py:1313
 msgid "register"
 msgstr "regisztrálás"
 
-#: cps/web.py:1314
+#: cps/web.py:1302
 msgid "Your e-mail is not allowed to register"
 msgstr "Nem engedélyezett a megadott e-mail cím bejegyzése"
 
-#: cps/web.py:1317
+#: cps/web.py:1305
 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:1320
+#: cps/web.py:1308
 msgid "This username or e-mail address is already in use."
 msgstr "Ez a felhasználónév vagy e-mail cím már használatban van."
 
-#: cps/web.py:1337
+#: cps/web.py:1325
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1354
+#: cps/web.py:1342
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1360
+#: cps/web.py:1348
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1364 cps/web.py:1388
+#: cps/web.py:1352 cps/web.py:1376
 msgid "Wrong Username or Password"
 msgstr "Rossz felhasználó név vagy jelszó!"
 
-#: cps/web.py:1371
+#: cps/web.py:1359
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1377
+#: cps/web.py:1365
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1383
+#: cps/web.py:1371
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1453 cps/web.py:1506
+#: cps/web.py:1441 cps/web.py:1494
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s profilja"
 
-#: cps/web.py:1489
+#: cps/web.py:1477
 msgid "Profile updated"
 msgstr "A profil frissítve."
 
-#: cps/web.py:1533 cps/web.py:1536 cps/web.py:1539 cps/web.py:1546
-#: cps/web.py:1551
+#: cps/web.py:1521 cps/web.py:1524 cps/web.py:1527 cps/web.py:1534
+#: cps/web.py:1539
 msgid "Read a Book"
 msgstr "Egy olvasott könyv"
 
-#: cps/tasks/convert.py:108
+#: cps/tasks/convert.py:114
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:132
+#: cps/tasks/convert.py:138
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:136
+#: cps/tasks/convert.py:142
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:146
+#: cps/tasks/convert.py:152
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:170
+#: cps/tasks/convert.py:176
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:193
+#: cps/tasks/convert.py:199
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Az e-könyv átalakítás nem sikerült: %(error)s"
 
-#: cps/tasks/convert.py:218
+#: cps/tasks/convert.py:224
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
diff --git a/cps/translations/it/LC_MESSAGES/messages.mo b/cps/translations/it/LC_MESSAGES/messages.mo
index 1c24dad1..6301799f 100644
Binary files a/cps/translations/it/LC_MESSAGES/messages.mo and b/cps/translations/it/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po
index df8427a3..80cb224a 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-01-02 19:37+0100\n"
+"POT-Creation-Date: 2021-01-17 11:34+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:42
 msgid "installed"
@@ -29,310 +29,310 @@ msgstr "non installato"
 msgid "Statistics"
 msgstr "Statistiche"
 
-#: cps/admin.py:144
+#: cps/admin.py:147
 msgid "Server restarted, please reload page"
 msgstr "Server riavviato, per favore ricarica la pagina"
 
-#: cps/admin.py:146
+#: cps/admin.py:149
 msgid "Performing shutdown of server, please close window"
 msgstr "Eseguo l'arresto del server, per favore chiudi la finestra"
 
-#: cps/admin.py:154
+#: cps/admin.py:157
 msgid "Reconnect successful"
 msgstr "Ricollegato con successo"
 
-#: cps/admin.py:157
+#: cps/admin.py:160
 msgid "Unknown command"
 msgstr "Comando sconosciuto"
 
-#: cps/admin.py:167 cps/editbooks.py:636 cps/editbooks.py:648
-#: cps/editbooks.py:751 cps/editbooks.py:753 cps/editbooks.py:814
-#: cps/editbooks.py:830 cps/updater.py:510 cps/uploader.py:90
+#: cps/admin.py:170 cps/editbooks.py:642 cps/editbooks.py:654
+#: cps/editbooks.py:757 cps/editbooks.py:759 cps/editbooks.py:820
+#: cps/editbooks.py:836 cps/updater.py:510 cps/uploader.py:90
 #: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: cps/admin.py:188
+#: cps/admin.py:191
 msgid "Admin page"
 msgstr "Pagina di amministrazione"
 
-#: cps/admin.py:210
+#: cps/admin.py:213
 msgid "UI Configuration"
 msgstr "Configurazione dell'interfaccia utente"
 
-#: cps/admin.py:242 cps/admin.py:954
+#: cps/admin.py:245 cps/admin.py:923
 msgid "Calibre-Web configuration updated"
 msgstr "La configurazione di Calibre-Web è stata aggiornata"
 
-#: cps/admin.py:253
+#: cps/admin.py:256
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Vuoi veramente eliminare il token di Kobo?"
 
-#: cps/admin.py:255
+#: cps/admin.py:258
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:257
+#: cps/admin.py:260
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:259 cps/templates/shelf.html:90
+#: cps/admin.py:262 cps/templates/shelf.html:90
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Vuoi davvero eliminare questo scaffale?"
 
-#: cps/admin.py:545 cps/admin.py:551 cps/admin.py:561 cps/admin.py:571
+#: cps/admin.py:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534
 #: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Nega"
 
-#: cps/admin.py:547 cps/admin.py:553 cps/admin.py:563 cps/admin.py:573
+#: cps/admin.py:510 cps/admin.py:516 cps/admin.py:526 cps/admin.py:536
 #: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Permetti"
 
-#: cps/admin.py:713
+#: cps/admin.py:679
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json non è configurato per Web Application"
 
-#: cps/admin.py:753
+#: cps/admin.py:721
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "La posizione del Logfile non è valida, per favore indica il percorso corretto"
 
-#: cps/admin.py:759
+#: cps/admin.py:727
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "La posizione dell'Access Logfile non è valida, per favore indica il percorso corretto"
 
-#: cps/admin.py:788
+#: cps/admin.py:757
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Per favore digita un Provider LDAP, porta, DN e User Object Identifier"
 
-#: cps/admin.py:803
+#: cps/admin.py:772
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP Group Object Filter deve avere un \"%s\" Format Identifier"
 
-#: cps/admin.py:806
+#: cps/admin.py:775
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP Group Object Filter contiene una parentesi senza la corrispettiva"
 
-#: cps/admin.py:811
+#: cps/admin.py:780
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP User Object Filter deve avere un \"%s\" Format Identifier"
 
-#: cps/admin.py:814
+#: cps/admin.py:783
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP User Object Filter contiene una parentesi senza la corrispettiva"
 
-#: cps/admin.py:822
+#: cps/admin.py:791
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP Member User Filter deve avere un \"%s\" Format Identifier"
 
-#: cps/admin.py:825
+#: cps/admin.py:794
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr "LDAP Member User Filter contiene una parentesi senza la corrispettiva"
 
-#: cps/admin.py:833
+#: cps/admin.py:802
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr "LDAP CACertificate, il certificato o la posizione della chiave non sono corretti, per favore indica il percorso corretto"
 
-#: cps/admin.py:859
+#: cps/admin.py:828
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "La posizione del Keyfile non è valida, per favore indica il percorso corretto"
 
-#: cps/admin.py:865
+#: cps/admin.py:834
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "La posizione del Certfile non è valida, per favore indica il percorso corretto"
 
-#: cps/admin.py:935 cps/admin.py:1039 cps/admin.py:1135 cps/admin.py:1184
-#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:258
-#: cps/shelf.py:307 cps/shelf.py:339 cps/shelf.py:371 cps/shelf.py:442
+#: cps/admin.py:904 cps/admin.py:1011 cps/admin.py:1100 cps/admin.py:1149
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:261
+#: cps/shelf.py:314 cps/shelf.py:348 cps/shelf.py:418
 msgid "Settings DB is not Writeable"
 msgstr "I parametri del DB non sono scrivibili"
 
-#: cps/admin.py:947
+#: cps/admin.py:916
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "La posizione del DB non è valida, per favore indica il percorso corretto"
 
-#: cps/admin.py:951
+#: cps/admin.py:920
 msgid "DB is not Writeable"
 msgstr "Il DB non è scrivibile"
 
-#: cps/admin.py:984
+#: cps/admin.py:959
 msgid "Basic Configuration"
 msgstr "Configurazione di base"
 
-#: cps/admin.py:999 cps/web.py:1287
+#: cps/admin.py:974 cps/web.py:1275
 msgid "Please fill out all fields!"
 msgstr "Per favore compila tutti i campi!"
 
-#: cps/admin.py:1002 cps/admin.py:1014 cps/admin.py:1020 cps/admin.py:1153
+#: cps/admin.py:977 cps/admin.py:989 cps/admin.py:995 cps/admin.py:1118
 msgid "Add new user"
 msgstr "Aggiungi un nuovo utente"
 
-#: cps/admin.py:1011 cps/web.py:1451
+#: cps/admin.py:986 cps/web.py:1439
 msgid "E-mail is not from valid domain"
 msgstr "L'e-mail non proviene da un dominio valido"
 
-#: cps/admin.py:1018 cps/admin.py:1036
+#: cps/admin.py:993 cps/admin.py:1008
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Trovato un account esistente con questo e-mail o nome di utente"
 
-#: cps/admin.py:1032
+#: cps/admin.py:1004
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "L'utente '%(user)s' è stato creato"
 
-#: cps/admin.py:1051
+#: cps/admin.py:1020
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "L'utente '%(nick)s' è stato eliminato"
 
-#: cps/admin.py:1054
+#: cps/admin.py:1023
 msgid "No admin user remaining, can't delete user"
 msgstr "Non rimarrebbe nessun utente amministratore, non posso eliminare l'utente"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1028
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Non rimarrebbe nessun utente amministratore, non posso rimuovere il ruolo di amministratore"
 
-#: cps/admin.py:1096 cps/web.py:1493
+#: cps/admin.py:1064 cps/web.py:1481
 msgid "Found an existing account for this e-mail address."
 msgstr "Ho trovato un account creato in precedenza con questa e-mail."
 
-#: cps/admin.py:1105 cps/admin.py:1119 cps/admin.py:1225 cps/web.py:1469
+#: cps/admin.py:1073 cps/admin.py:1087 cps/admin.py:1190 cps/web.py:1457
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Modifica l'utente %(nick)s"
 
-#: cps/admin.py:1111 cps/web.py:1462
+#: cps/admin.py:1079 cps/web.py:1450
 msgid "This username is already taken"
 msgstr "Questo nome di utente è già utilizzato"
 
-#: cps/admin.py:1129
+#: cps/admin.py:1094
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "L'utente '%(nick)s' è stato aggiornato"
 
-#: cps/admin.py:1132
+#: cps/admin.py:1097
 msgid "An unknown error occured."
 msgstr "Si è verificato un errore imprevisto."
 
-#: cps/admin.py:1162 cps/templates/admin.html:78
+#: cps/admin.py:1127 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "Modifica le impostazioni del server e-mail"
 
-#: cps/admin.py:1191
+#: cps/admin.py:1156
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "E-mail di test inviato con successo a %(kindlemail)s"
 
-#: cps/admin.py:1194
+#: cps/admin.py:1159
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Si è verificato un errore nell'invio dell'e-mail di test: %(res)s"
 
-#: cps/admin.py:1196
+#: cps/admin.py:1161
 msgid "Please configure your e-mail address first..."
 msgstr "Per favore prima configura il tuo indirizzo e-mail..."
 
-#: cps/admin.py:1198
+#: cps/admin.py:1163
 msgid "E-mail server settings updated"
 msgstr "Configurazione del server e-mail aggiornata"
 
-#: cps/admin.py:1209
+#: cps/admin.py:1174
 msgid "User not found"
 msgstr "Utente non trovato"
 
-#: cps/admin.py:1236
+#: cps/admin.py:1201
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "La password dell'utente %(user)s è stata resettata"
 
-#: cps/admin.py:1239 cps/web.py:1311 cps/web.py:1375
+#: cps/admin.py:1204 cps/web.py:1299 cps/web.py:1363
 msgid "An unknown error occurred. Please try again later."
 msgstr "Si è verificato un errore sconosciuto: per favore riprova."
 
-#: cps/admin.py:1242 cps/web.py:1249
+#: cps/admin.py:1207 cps/web.py:1237
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configura dapprima le impostazioni del server SMTP..."
 
-#: cps/admin.py:1254
+#: cps/admin.py:1218
 msgid "Logfile viewer"
 msgstr "Visualizzatore del Logfile"
 
-#: cps/admin.py:1315
+#: cps/admin.py:1280
 msgid "Requesting update package"
 msgstr "Richiedo il pacchetto di aggiornamento"
 
-#: cps/admin.py:1316
+#: cps/admin.py:1281
 msgid "Downloading update package"
 msgstr "Scarico il pacchetto di aggiornamento"
 
-#: cps/admin.py:1317
+#: cps/admin.py:1282
 msgid "Unzipping update package"
 msgstr "Decomprimo il pacchetto di aggiornamento"
 
-#: cps/admin.py:1318
+#: cps/admin.py:1283
 msgid "Replacing files"
 msgstr "Sostituisco i file"
 
-#: cps/admin.py:1319
+#: cps/admin.py:1284
 msgid "Database connections are closed"
 msgstr "Le connessioni al database sono chiuse"
 
-#: cps/admin.py:1320
+#: cps/admin.py:1285
 msgid "Stopping server"
 msgstr "Arresto il server"
 
-#: cps/admin.py:1321
+#: cps/admin.py:1286
 msgid "Update finished, please press okay and reload page"
 msgstr "Aggiornamento completato, per favore premi ok e ricarica la pagina"
 
-#: cps/admin.py:1322 cps/admin.py:1323 cps/admin.py:1324 cps/admin.py:1325
-#: cps/admin.py:1326
+#: cps/admin.py:1287 cps/admin.py:1288 cps/admin.py:1289 cps/admin.py:1290
+#: cps/admin.py:1291
 msgid "Update failed:"
 msgstr "Aggiornamento non riuscito:"
 
-#: cps/admin.py:1322 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+#: cps/admin.py:1287 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "Errore HTTP"
 
-#: cps/admin.py:1323 cps/updater.py:322 cps/updater.py:525
+#: cps/admin.py:1288 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Errore di connessione"
 
-#: cps/admin.py:1324 cps/updater.py:324 cps/updater.py:527
+#: cps/admin.py:1289 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Tempo scaduto nello stabilire la connessione"
 
-#: cps/admin.py:1325 cps/updater.py:326 cps/updater.py:529
+#: cps/admin.py:1290 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Errore generale"
 
-#: cps/admin.py:1326
+#: cps/admin.py:1291
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr "Il file di aggiornamento non può essere salvato nella cartella temporanea"
 
-#: cps/admin.py:1351
+#: cps/admin.py:1316
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Errore: %(ldaperror)s"
 
-#: cps/admin.py:1355
+#: cps/admin.py:1320
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Errore: nessun utente restituito in risposta dal server LDAP"
 
-#: cps/admin.py:1421
+#: cps/admin.py:1386
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Fallita la creazione di almeno un utente LDAP"
 
-#: cps/admin.py:1424
+#: cps/admin.py:1389
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Almeno un utente LDAP non è stato trovato nel database"
 
-#: cps/admin.py:1426
+#: cps/admin.py:1391
 msgid "{} User Successfully Imported"
 msgstr "{} utente importato con successo"
 
@@ -352,90 +352,90 @@ msgstr "Il formato del libro è stato eliminato con successo"
 msgid "Book Successfully Deleted"
 msgstr "Il libro é stato eliminato con successo"
 
-#: cps/editbooks.py:317 cps/editbooks.py:620 cps/web.py:1521 cps/web.py:1554
-#: cps/web.py:1625
+#: cps/editbooks.py:316 cps/editbooks.py:626 cps/web.py:1509 cps/web.py:1542
+#: cps/web.py:1613
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Errore durante l'apertura del libro. Il file non esiste o il file non è accessibile"
 
-#: cps/editbooks.py:351
+#: cps/editbooks.py:350
 msgid "edit metadata"
 msgstr "modifica i metadati"
 
-#: cps/editbooks.py:426
+#: cps/editbooks.py:425
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s non è una lingua valida"
 
-#: cps/editbooks.py:537 cps/editbooks.py:796
+#: cps/editbooks.py:536 cps/editbooks.py:802
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Non è consentito caricare file con l'estensione '%(ext)s' su questo server"
 
-#: cps/editbooks.py:541 cps/editbooks.py:800
+#: cps/editbooks.py:540 cps/editbooks.py:806
 msgid "File to be uploaded must have an extension"
 msgstr "Il file da caricare deve avere un'estensione"
 
-#: cps/editbooks.py:553
+#: cps/editbooks.py:552
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Impossibile creare la cartella %(path)s (autorizzazione negata)."
 
-#: cps/editbooks.py:558
+#: cps/editbooks.py:557
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Il salvataggio del file %(file)s non è riuscito."
 
-#: cps/editbooks.py:576 cps/editbooks.py:931 cps/web.py:1498
+#: cps/editbooks.py:575 cps/editbooks.py:937 cps/web.py:1486
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Errore nel database: %(error)s."
 
-#: cps/editbooks.py:580
+#: cps/editbooks.py:579
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Ho aggiunto il formato %(ext)s al libro %(book)s"
 
-#: cps/editbooks.py:700
+#: cps/editbooks.py:706
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "Gli identificatori non tengono conto delle lettere maiuscole o minuscole, sovrascrivo l'identificatore precedente"
 
-#: cps/editbooks.py:737
+#: cps/editbooks.py:743
 msgid "Metadata successfully updated"
 msgstr "I metadati sono stati aggiornati con successo"
 
-#: cps/editbooks.py:746
+#: cps/editbooks.py:752
 msgid "Error editing book, please check logfile for details"
 msgstr "Errore nella modifica del libro. Per favore verifica i dettagli nel file di registro (logfile)"
 
-#: cps/editbooks.py:808
+#: cps/editbooks.py:814
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "Il file %(filename)s non può essere salvato nella cartella temporanea"
 
-#: cps/editbooks.py:818
+#: cps/editbooks.py:824
 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:906
+#: cps/editbooks.py:912
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "Impossibile spostare il file della copertina %(file)s: %(error)s"
 
-#: cps/editbooks.py:917
+#: cps/editbooks.py:923
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Il file %(file)s è stato caricato"
 
-#: cps/editbooks.py:943
+#: cps/editbooks.py:949
 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:951
+#: cps/editbooks.py:957
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Libro accodato con successo per essere convertito in %(book_format)s"
 
-#: cps/editbooks.py:955
+#: cps/editbooks.py:961
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Si è verificato un errore durante la conversione del libro: %(res)s"
@@ -596,85 +596,85 @@ msgstr "Terminato"
 msgid "Unknown Status"
 msgstr "Stato sconosciuto"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:157
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
 msgid "Kobo Setup"
 msgstr "Configurazione di Kobo"
 
-#: cps/oauth_bb.py:74
+#: cps/oauth_bb.py:73
 #, python-format
 msgid "Register with %(provider)s"
 msgstr "Registra con %(provider)s"
 
-#: cps/oauth_bb.py:158
+#: cps/oauth_bb.py:146
 msgid "Failed to log in with GitHub."
 msgstr "Accesso con GitHub non è riuscito."
 
-#: cps/oauth_bb.py:163
+#: cps/oauth_bb.py:151
 msgid "Failed to fetch user info from GitHub."
 msgstr "Il recupero delle informazioni dell'utente da GitHub non è riuscito."
 
-#: cps/oauth_bb.py:174
+#: cps/oauth_bb.py:162
 msgid "Failed to log in with Google."
 msgstr "L'accesso con Google non è riuscito."
 
-#: cps/oauth_bb.py:179
+#: cps/oauth_bb.py:167
 msgid "Failed to fetch user info from Google."
 msgstr "Il recupero delle informazioni dell'utente da Google non è riuscito."
 
-#: cps/oauth_bb.py:229 cps/remotelogin.py:134 cps/web.py:1347
+#: cps/oauth_bb.py:213 cps/remotelogin.py:133 cps/web.py:1335
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "ora sei connesso come: '%(nickname)s'"
 
-#: cps/oauth_bb.py:239
+#: cps/oauth_bb.py:223
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr "Collegamento a %(oauth)s avvenuto con successo"
 
-#: cps/oauth_bb.py:245
+#: cps/oauth_bb.py:229
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr "Accesso non riuscito, non c'è un utente collegato all'account OAuth"
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:271
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr "Scollegamento da  %(oauth)s avvenuto con successo"
 
-#: cps/oauth_bb.py:291
+#: cps/oauth_bb.py:275
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr "Scollegamento da  %(oauth)s non riuscito"
 
-#: cps/oauth_bb.py:294
+#: cps/oauth_bb.py:278
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr "Non collegato a %(oauth)s"
 
-#: cps/oauth_bb.py:322
+#: cps/oauth_bb.py:306
 msgid "GitHub Oauth error, please retry later."
 msgstr "GitHub, errore Oauth: per favore riprova più tardi."
 
-#: cps/oauth_bb.py:341
+#: cps/oauth_bb.py:325
 msgid "Google Oauth error, please retry later."
 msgstr "Google, errore Oauth: per favore riprova più tardi."
 
-#: cps/remotelogin.py:66 cps/web.py:1394
+#: cps/remotelogin.py:65 cps/web.py:1382
 msgid "login"
 msgstr "accedi"
 
-#: cps/remotelogin.py:78 cps/remotelogin.py:112
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
 msgid "Token not found"
 msgstr "Token non trovato"
 
-#: cps/remotelogin.py:87 cps/remotelogin.py:120
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
 msgid "Token has expired"
 msgstr "Il token è scaduto"
 
-#: cps/remotelogin.py:96
+#: cps/remotelogin.py:95
 msgid "Success! Please return to your device"
 msgstr "Riuscito! Torna al tuo dispositivo"
 
@@ -702,7 +702,7 @@ msgstr "Libri scaricati"
 msgid "Show Downloaded Books"
 msgstr "Mostra l'opzione per la visualizzazione dei libri scaricati"
 
-#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:388
+#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:376
 msgid "Top Rated Books"
 msgstr "Libri meglio valutati"
 
@@ -711,7 +711,7 @@ msgid "Show Top Rated Books"
 msgstr "Mostra l'opzione per la selezione dei libri meglio valutati"
 
 #: cps/render_template.py:53 cps/templates/index.xml:46
-#: cps/templates/index.xml:50 cps/web.py:648
+#: cps/templates/index.xml:50 cps/web.py:636
 msgid "Read Books"
 msgstr "Libri da leggere"
 
@@ -720,7 +720,7 @@ msgid "Show read and unread"
 msgstr "Mostra l'opzione per la selezione letto e non letto"
 
 #: cps/render_template.py:57 cps/templates/index.xml:53
-#: cps/templates/index.xml:57 cps/web.py:651
+#: cps/templates/index.xml:57 cps/web.py:639
 msgid "Unread Books"
 msgstr "Libri non letti"
 
@@ -737,7 +737,7 @@ msgid "Show random books"
 msgstr "Mostra l'opzione per presentare libri aleatoriamente"
 
 #: cps/render_template.py:63 cps/templates/book_table.html:50
-#: cps/templates/index.xml:75 cps/web.py:953
+#: cps/templates/index.xml:75 cps/web.py:941
 msgid "Categories"
 msgstr "Categorie"
 
@@ -747,7 +747,7 @@ msgstr "Mostra l'opzione per la selezione delle categorie"
 
 #: cps/render_template.py:66 cps/templates/book_edit.html:84
 #: cps/templates/book_table.html:51 cps/templates/index.xml:82
-#: cps/templates/search_form.html:62 cps/web.py:857 cps/web.py:867
+#: cps/templates/search_form.html:62 cps/web.py:845 cps/web.py:855
 msgid "Series"
 msgstr "Serie"
 
@@ -765,7 +765,7 @@ msgid "Show author selection"
 msgstr "Mostra l'opzione per la selezione degli autori"
 
 #: cps/render_template.py:73 cps/templates/book_table.html:55
-#: cps/templates/index.xml:68 cps/web.py:836
+#: cps/templates/index.xml:68 cps/web.py:824
 msgid "Publishers"
 msgstr "Editori"
 
@@ -774,7 +774,7 @@ msgid "Show publisher selection"
 msgstr "Mostra l'opzione per la selezione degli editori"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:53
-#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:932
+#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:920
 msgid "Languages"
 msgstr "Lingue"
 
@@ -798,7 +798,7 @@ msgstr "Formati file"
 msgid "Show file formats selection"
 msgstr "Mostra la selezione del formato dei file"
 
-#: cps/render_template.py:87 cps/web.py:675
+#: cps/render_template.py:87 cps/web.py:663
 msgid "Archived Books"
 msgstr "Libri archiviati"
 
@@ -806,7 +806,7 @@ msgstr "Libri archiviati"
 msgid "Show archived books"
 msgstr "Mostra l'opzione per la selezione dei libri archiviati"
 
-#: cps/render_template.py:91 cps/web.py:746
+#: cps/render_template.py:91 cps/web.py:734
 msgid "Books List"
 msgstr "Elenco libri"
 
@@ -863,49 +863,49 @@ msgstr "Il libro è stato rimosso dallo scaffale: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr "Spiacente, ma non sei autorizzato a togliere libri dallo scaffale: %(sname)s"
 
-#: cps/shelf.py:238 cps/shelf.py:282
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr "Uno scaffale pubblico denominato '%(title)s' esiste già."
+#: cps/shelf.py:224 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "Crea uno scaffale"
 
-#: cps/shelf.py:247 cps/shelf.py:292
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr "Uno scaffale privato denominato '%(title)s' esiste già."
+#: cps/shelf.py:231
+msgid "Edit a shelf"
+msgstr "Modifica uno scaffale"
 
-#: cps/shelf.py:254
+#: cps/shelf.py:249
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Lo scaffale %(title)s è stato creato"
 
-#: cps/shelf.py:261 cps/shelf.py:310
-msgid "There was an error"
-msgstr "C'era un errore"
-
-#: cps/shelf.py:262 cps/shelf.py:264 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "Crea uno scaffale"
-
-#: cps/shelf.py:304
+#: cps/shelf.py:252
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Lo scaffale %(title)s è stato modificato"
 
-#: cps/shelf.py:311 cps/shelf.py:313
-msgid "Edit a shelf"
-msgstr "Modifica uno scaffale"
+#: cps/shelf.py:265
+msgid "There was an error"
+msgstr "C'era un errore"
 
-#: cps/shelf.py:381
+#: cps/shelf.py:281
+#, python-format
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr "Uno scaffale pubblico denominato '%(title)s' esiste già."
+
+#: cps/shelf.py:291
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr "Uno scaffale privato denominato '%(title)s' esiste già."
+
+#: cps/shelf.py:358
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Modifica l'ordine dello scaffale: '%(name)s'"
 
-#: cps/shelf.py:447
+#: cps/shelf.py:423
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Scaffale: '%(name)s'"
 
-#: cps/shelf.py:451
+#: cps/shelf.py:427
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Errore durante l'apertura dello scaffale. Lo scaffale non esiste o non è accessibile"
 
@@ -938,222 +938,222 @@ msgstr "Nuovo aggiornamento disponibile. Clicca sul pulsante sottostante per agg
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Clicca sul pulsante per aggiornare all'ultima versione stabile."
 
-#: cps/templates/index.html:5 cps/web.py:396
+#: cps/templates/index.html:5 cps/web.py:384
 msgid "Discover (Random Books)"
 msgstr "Scopri (libri casuali)"
 
-#: cps/web.py:435
+#: cps/web.py:423
 msgid "Books"
 msgstr "Libri"
 
-#: cps/web.py:460
+#: cps/web.py:448
 msgid "Hot Books (Most Downloaded)"
 msgstr "I libri più richiesti"
 
-#: cps/web.py:495
+#: cps/web.py:483
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "I libri scaricati da %(user)s"
 
-#: cps/web.py:509
+#: cps/web.py:497
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Errore durante l'apertura del libro selezionato. Il file non esiste o il file non è accessibile"
 
-#: cps/web.py:523
+#: cps/web.py:511
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autore: %(name)s"
 
-#: cps/web.py:537
+#: cps/web.py:525
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Editore: %(name)s"
 
-#: cps/web.py:550
+#: cps/web.py:538
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie: %(serie)s"
 
-#: cps/web.py:563
+#: cps/web.py:551
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Valutazione: %(rating)s stelle"
 
-#: cps/web.py:576
+#: cps/web.py:564
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Formato del file: %(format)s"
 
-#: cps/web.py:590
+#: cps/web.py:578
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoria: %(name)s"
 
-#: cps/web.py:609
+#: cps/web.py:597
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Lingua: %(name)s"
 
-#: cps/web.py:639
+#: cps/web.py:627
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "La colonna personale no.%(column)d non esiste nel database di Calibre"
 
-#: cps/templates/layout.html:56 cps/web.py:706 cps/web.py:1180
+#: cps/templates/layout.html:56 cps/web.py:694 cps/web.py:1168
 msgid "Advanced Search"
 msgstr "Ricerca avanzata"
 
 #: cps/templates/book_edit.html:214 cps/templates/feed.xml:33
 #: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:175 cps/web.py:718 cps/web.py:990
+#: cps/templates/search_form.html:175 cps/web.py:706 cps/web.py:978
 msgid "Search"
 msgstr "Cerca"
 
-#: cps/web.py:885
+#: cps/web.py:873
 msgid "Ratings list"
 msgstr "Elenco delle valutazioni"
 
-#: cps/web.py:904
+#: cps/web.py:892
 msgid "File formats list"
 msgstr "Elenco dei formati"
 
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:967
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:955
 msgid "Tasks"
 msgstr "Compito"
 
-#: cps/web.py:1053
+#: cps/web.py:1041
 msgid "Published after "
 msgstr "Pubblicato dopo il "
 
-#: cps/web.py:1060
+#: cps/web.py:1048
 msgid "Published before "
 msgstr "Pubblicato prima del "
 
-#: cps/web.py:1079
+#: cps/web.py:1067
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Valutazione <= %(rating)s"
 
-#: cps/web.py:1081
+#: cps/web.py:1069
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Valutazione >= %(rating)s"
 
-#: cps/web.py:1083
+#: cps/web.py:1071
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1254
+#: cps/web.py:1242
 #, 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:1258
+#: cps/web.py:1246
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Si è verificato un errore durante l'invio di questo libro: %(res)s"
 
-#: cps/web.py:1260
+#: cps/web.py:1248
 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:1277
+#: cps/web.py:1265
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Il server e-mail non è configurato, per favore contatta l'amministratore"
 
-#: cps/web.py:1278 cps/web.py:1288 cps/web.py:1312 cps/web.py:1316
-#: cps/web.py:1321 cps/web.py:1325
+#: cps/web.py:1266 cps/web.py:1276 cps/web.py:1300 cps/web.py:1304
+#: cps/web.py:1309 cps/web.py:1313
 msgid "register"
 msgstr "registra"
 
-#: cps/web.py:1314
+#: cps/web.py:1302
 msgid "Your e-mail is not allowed to register"
 msgstr "Il tuo e-mail non è autorizzato alla registrazione"
 
-#: cps/web.py:1317
+#: cps/web.py:1305
 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:1320
+#: cps/web.py:1308
 msgid "This username or e-mail address is already in use."
 msgstr "Questo nome di utente o questo e-mail sono già utilizzati."
 
-#: cps/web.py:1337
+#: cps/web.py:1325
 msgid "Cannot activate LDAP authentication"
 msgstr "Non posso attivare l'autenticazione LDAP"
 
-#: cps/web.py:1354
+#: cps/web.py:1342
 #, 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:1360
+#: cps/web.py:1348
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Non posso accedere: %(message)s"
 
-#: cps/web.py:1364 cps/web.py:1388
+#: cps/web.py:1352 cps/web.py:1376
 msgid "Wrong Username or Password"
 msgstr "Nome utente o password errati"
 
-#: cps/web.py:1371
+#: cps/web.py:1359
 msgid "New Password was send to your email address"
 msgstr "Una nuova password è stata inviata al tuo recapito e-mail"
 
-#: cps/web.py:1377
+#: cps/web.py:1365
 msgid "Please enter valid username to reset password"
 msgstr "Per favore digita un nome di utente valido per resettare la password"
 
-#: cps/web.py:1383
+#: cps/web.py:1371
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Ora sei connesso come '%(nickname)s'"
 
-#: cps/web.py:1453 cps/web.py:1506
+#: cps/web.py:1441 cps/web.py:1494
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profilo di %(name)s"
 
-#: cps/web.py:1489
+#: cps/web.py:1477
 msgid "Profile updated"
 msgstr "Profilo aggiornato"
 
-#: cps/web.py:1533 cps/web.py:1536 cps/web.py:1539 cps/web.py:1546
-#: cps/web.py:1551
+#: cps/web.py:1521 cps/web.py:1524 cps/web.py:1527 cps/web.py:1534
+#: cps/web.py:1539
 msgid "Read a Book"
 msgstr "Leggi un libro"
 
-#: cps/tasks/convert.py:108
+#: cps/tasks/convert.py:114
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Non ho trovato il convertitore %(tool)s di libri di Calibre"
 
-#: cps/tasks/convert.py:132
+#: cps/tasks/convert.py:138
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr "Non ho trovato il formato %(format)s nel disco"
 
-#: cps/tasks/convert.py:136
+#: cps/tasks/convert.py:142
 msgid "Ebook converter failed with unknown error"
 msgstr "La conversione del libro è terminata con un errore sconosciuto"
 
-#: cps/tasks/convert.py:146
+#: cps/tasks/convert.py:152
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Si è verificato un errore con il convertitore Kepubify: %(error)s"
 
-#: cps/tasks/convert.py:170
+#: cps/tasks/convert.py:176
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr "Non ho trovato il file convertito o ci sono più di un file nella cartella %(folder)s"
 
-#: cps/tasks/convert.py:193
+#: cps/tasks/convert.py:199
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Errore nel convertitore: %(error)s"
 
-#: cps/tasks/convert.py:218
+#: cps/tasks/convert.py:224
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Si è verificato un errore con Calibre: %(error)s"
diff --git a/cps/translations/ja/LC_MESSAGES/messages.mo b/cps/translations/ja/LC_MESSAGES/messages.mo
index 53dc3071..aa14daa9 100644
Binary files a/cps/translations/ja/LC_MESSAGES/messages.mo and b/cps/translations/ja/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po
index 3bae28a4..b9ff8b97 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-01-02 19:37+0100\n"
+"POT-Creation-Date: 2021-01-17 11:34+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:42
 msgid "installed"
@@ -30,310 +30,310 @@ msgstr "インストールされていません"
 msgid "Statistics"
 msgstr "統計"
 
-#: cps/admin.py:144
+#: cps/admin.py:147
 msgid "Server restarted, please reload page"
 msgstr "サーバを再起動しました。ページを再読み込みしてください"
 
-#: cps/admin.py:146
+#: cps/admin.py:149
 msgid "Performing shutdown of server, please close window"
 msgstr "サーバをシャットダウンしています。ページを閉じてください"
 
-#: cps/admin.py:154
+#: cps/admin.py:157
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:157
+#: cps/admin.py:160
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:167 cps/editbooks.py:636 cps/editbooks.py:648
-#: cps/editbooks.py:751 cps/editbooks.py:753 cps/editbooks.py:814
-#: cps/editbooks.py:830 cps/updater.py:510 cps/uploader.py:90
+#: cps/admin.py:170 cps/editbooks.py:642 cps/editbooks.py:654
+#: cps/editbooks.py:757 cps/editbooks.py:759 cps/editbooks.py:820
+#: cps/editbooks.py:836 cps/updater.py:510 cps/uploader.py:90
 #: cps/uploader.py:100
 msgid "Unknown"
 msgstr "不明"
 
-#: cps/admin.py:188
+#: cps/admin.py:191
 msgid "Admin page"
 msgstr "管理者ページ"
 
-#: cps/admin.py:210
+#: cps/admin.py:213
 msgid "UI Configuration"
 msgstr "UI設定"
 
-#: cps/admin.py:242 cps/admin.py:954
+#: cps/admin.py:245 cps/admin.py:923
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web の設定を更新しました"
 
-#: cps/admin.py:253
+#: cps/admin.py:256
 msgid "Do you really want to delete the Kobo Token?"
 msgstr ""
 
-#: cps/admin.py:255
+#: cps/admin.py:258
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:257
+#: cps/admin.py:260
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:259 cps/templates/shelf.html:90
+#: cps/admin.py:262 cps/templates/shelf.html:90
 msgid "Are you sure you want to delete this shelf?"
 msgstr ""
 
-#: cps/admin.py:545 cps/admin.py:551 cps/admin.py:561 cps/admin.py:571
+#: cps/admin.py:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534
 #: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:547 cps/admin.py:553 cps/admin.py:563 cps/admin.py:573
+#: cps/admin.py:510 cps/admin.py:516 cps/admin.py:526 cps/admin.py:536
 #: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:713
+#: cps/admin.py:679
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:753
+#: cps/admin.py:721
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:759
+#: cps/admin.py:727
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:788
+#: cps/admin.py:757
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:803
+#: cps/admin.py:772
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:806
+#: cps/admin.py:775
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:811
+#: cps/admin.py:780
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:814
+#: cps/admin.py:783
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:822
+#: cps/admin.py:791
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:825
+#: cps/admin.py:794
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:833
+#: cps/admin.py:802
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:859
+#: cps/admin.py:828
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:865
+#: cps/admin.py:834
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:935 cps/admin.py:1039 cps/admin.py:1135 cps/admin.py:1184
-#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:258
-#: cps/shelf.py:307 cps/shelf.py:339 cps/shelf.py:371 cps/shelf.py:442
+#: cps/admin.py:904 cps/admin.py:1011 cps/admin.py:1100 cps/admin.py:1149
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:261
+#: cps/shelf.py:314 cps/shelf.py:348 cps/shelf.py:418
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:947
+#: cps/admin.py:916
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:951
+#: cps/admin.py:920
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:984
+#: cps/admin.py:959
 msgid "Basic Configuration"
 msgstr "基本設定"
 
-#: cps/admin.py:999 cps/web.py:1287
+#: cps/admin.py:974 cps/web.py:1275
 msgid "Please fill out all fields!"
 msgstr "全ての項目を入力してください"
 
-#: cps/admin.py:1002 cps/admin.py:1014 cps/admin.py:1020 cps/admin.py:1153
+#: cps/admin.py:977 cps/admin.py:989 cps/admin.py:995 cps/admin.py:1118
 msgid "Add new user"
 msgstr "新規ユーザ追加"
 
-#: cps/admin.py:1011 cps/web.py:1451
+#: cps/admin.py:986 cps/web.py:1439
 msgid "E-mail is not from valid domain"
 msgstr "このメールは有効なドメインからのものではありません"
 
-#: cps/admin.py:1018 cps/admin.py:1036
+#: cps/admin.py:993 cps/admin.py:1008
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "このメールアドレスかニックネームで登録されたアカウントが見つかりました"
 
-#: cps/admin.py:1032
+#: cps/admin.py:1004
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "ユーザ '%(user)s' を作成しました"
 
-#: cps/admin.py:1051
+#: cps/admin.py:1020
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "ユーザ '%(nick)s' を削除しました"
 
-#: cps/admin.py:1054
+#: cps/admin.py:1023
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:1060
+#: cps/admin.py:1028
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:1096 cps/web.py:1493
+#: cps/admin.py:1064 cps/web.py:1481
 msgid "Found an existing account for this e-mail address."
 msgstr "このメールアドレスで登録されたアカウントがあります"
 
-#: cps/admin.py:1105 cps/admin.py:1119 cps/admin.py:1225 cps/web.py:1469
+#: cps/admin.py:1073 cps/admin.py:1087 cps/admin.py:1190 cps/web.py:1457
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "%(nick)s を編集"
 
-#: cps/admin.py:1111 cps/web.py:1462
+#: cps/admin.py:1079 cps/web.py:1450
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:1129
+#: cps/admin.py:1094
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "ユーザ '%(nick)s' を更新しました"
 
-#: cps/admin.py:1132
+#: cps/admin.py:1097
 msgid "An unknown error occured."
 msgstr "不明なエラーが発生しました。"
 
-#: cps/admin.py:1162 cps/templates/admin.html:78
+#: cps/admin.py:1127 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "SMTP設定を変更"
 
-#: cps/admin.py:1191
+#: cps/admin.py:1156
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "テストメールが %(kindlemail)s に送信されました"
 
-#: cps/admin.py:1194
+#: cps/admin.py:1159
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "テストメールを %(res)s に送信中にエラーが発生しました"
 
-#: cps/admin.py:1196
+#: cps/admin.py:1161
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1198
+#: cps/admin.py:1163
 msgid "E-mail server settings updated"
 msgstr "メールサーバの設定を更新しました"
 
-#: cps/admin.py:1209
+#: cps/admin.py:1174
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:1236
+#: cps/admin.py:1201
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "%(user)s 用のパスワードをリセット"
 
-#: cps/admin.py:1239 cps/web.py:1311 cps/web.py:1375
+#: cps/admin.py:1204 cps/web.py:1299 cps/web.py:1363
 msgid "An unknown error occurred. Please try again later."
 msgstr "不明なエラーが発生しました。あとで再試行してください。"
 
-#: cps/admin.py:1242 cps/web.py:1249
+#: cps/admin.py:1207 cps/web.py:1237
 msgid "Please configure the SMTP mail settings first..."
 msgstr "初めにSMTPメールの設定をしてください"
 
-#: cps/admin.py:1254
+#: cps/admin.py:1218
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1315
+#: cps/admin.py:1280
 msgid "Requesting update package"
 msgstr "更新データを要求中"
 
-#: cps/admin.py:1316
+#: cps/admin.py:1281
 msgid "Downloading update package"
 msgstr "更新データをダウンロード中"
 
-#: cps/admin.py:1317
+#: cps/admin.py:1282
 msgid "Unzipping update package"
 msgstr "更新データを展開中"
 
-#: cps/admin.py:1318
+#: cps/admin.py:1283
 msgid "Replacing files"
 msgstr "ファイルを置換中"
 
-#: cps/admin.py:1319
+#: cps/admin.py:1284
 msgid "Database connections are closed"
 msgstr "データベースの接続を切断完了"
 
-#: cps/admin.py:1320
+#: cps/admin.py:1285
 msgid "Stopping server"
 msgstr "サーバ停止中"
 
-#: cps/admin.py:1321
+#: cps/admin.py:1286
 msgid "Update finished, please press okay and reload page"
 msgstr "アップデート完了、OKを押してページをリロードしてください"
 
-#: cps/admin.py:1322 cps/admin.py:1323 cps/admin.py:1324 cps/admin.py:1325
-#: cps/admin.py:1326
+#: cps/admin.py:1287 cps/admin.py:1288 cps/admin.py:1289 cps/admin.py:1290
+#: cps/admin.py:1291
 msgid "Update failed:"
 msgstr "アップデート失敗:"
 
-#: cps/admin.py:1322 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+#: cps/admin.py:1287 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTPエラー"
 
-#: cps/admin.py:1323 cps/updater.py:322 cps/updater.py:525
+#: cps/admin.py:1288 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "接続エラー"
 
-#: cps/admin.py:1324 cps/updater.py:324 cps/updater.py:527
+#: cps/admin.py:1289 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "接続を確立中にタイムアウトしました"
 
-#: cps/admin.py:1325 cps/updater.py:326 cps/updater.py:529
+#: cps/admin.py:1290 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "エラー発生"
 
-#: cps/admin.py:1326
+#: cps/admin.py:1291
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
-#: cps/admin.py:1351
+#: cps/admin.py:1316
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1355
+#: cps/admin.py:1320
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1421
+#: cps/admin.py:1386
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1424
+#: cps/admin.py:1389
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1426
+#: cps/admin.py:1391
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -353,90 +353,90 @@ msgstr ""
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:317 cps/editbooks.py:620 cps/web.py:1521 cps/web.py:1554
-#: cps/web.py:1625
+#: cps/editbooks.py:316 cps/editbooks.py:626 cps/web.py:1509 cps/web.py:1542
+#: cps/web.py:1613
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "電子書籍を開けません。ファイルが存在しないかアクセスできません"
 
-#: cps/editbooks.py:351
+#: cps/editbooks.py:350
 msgid "edit metadata"
 msgstr "メタデータを編集"
 
-#: cps/editbooks.py:426
+#: cps/editbooks.py:425
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s は有効な言語ではありません"
 
-#: cps/editbooks.py:537 cps/editbooks.py:796
+#: cps/editbooks.py:536 cps/editbooks.py:802
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "ファイル拡張子 '%(ext)s' をこのサーバにアップロードすることは許可されていません"
 
-#: cps/editbooks.py:541 cps/editbooks.py:800
+#: cps/editbooks.py:540 cps/editbooks.py:806
 msgid "File to be uploaded must have an extension"
 msgstr "アップロードするファイルには拡張子が必要です"
 
-#: cps/editbooks.py:553
+#: cps/editbooks.py:552
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "%(path)s の作成に失敗しました (Permission denied)。"
 
-#: cps/editbooks.py:558
+#: cps/editbooks.py:557
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "%(file)s を保存できません。"
 
-#: cps/editbooks.py:576 cps/editbooks.py:931 cps/web.py:1498
+#: cps/editbooks.py:575 cps/editbooks.py:937 cps/web.py:1486
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:580
+#: cps/editbooks.py:579
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "ファイル形式 %(ext)s が %(book)s に追加されました"
 
-#: cps/editbooks.py:700
+#: cps/editbooks.py:706
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:737
+#: cps/editbooks.py:743
 msgid "Metadata successfully updated"
 msgstr "メタデータを更新しました"
 
-#: cps/editbooks.py:746
+#: cps/editbooks.py:752
 msgid "Error editing book, please check logfile for details"
 msgstr "本の編集でエラーが発生しました。詳細はログファイルを確認してください"
 
-#: cps/editbooks.py:808
+#: cps/editbooks.py:814
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:818
+#: cps/editbooks.py:824
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:906
+#: cps/editbooks.py:912
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:917
+#: cps/editbooks.py:923
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:943
+#: cps/editbooks.py:949
 msgid "Source or destination format for conversion missing"
 msgstr "変換元の形式または変換後の形式が指定されていません"
 
-#: cps/editbooks.py:951
+#: cps/editbooks.py:957
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "本の %(book_format)s への変換がキューに追加されました"
 
-#: cps/editbooks.py:955
+#: cps/editbooks.py:961
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "この本の変換中にエラーが発生しました: %(res)s"
@@ -597,85 +597,85 @@ msgstr "終了"
 msgid "Unknown Status"
 msgstr "不明"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:157
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
 msgid "Kobo Setup"
 msgstr ""
 
-#: cps/oauth_bb.py:74
+#: cps/oauth_bb.py:73
 #, python-format
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:158
+#: cps/oauth_bb.py:146
 msgid "Failed to log in with GitHub."
 msgstr ""
 
-#: cps/oauth_bb.py:163
+#: cps/oauth_bb.py:151
 msgid "Failed to fetch user info from GitHub."
 msgstr ""
 
-#: cps/oauth_bb.py:174
+#: cps/oauth_bb.py:162
 msgid "Failed to log in with Google."
 msgstr ""
 
-#: cps/oauth_bb.py:179
+#: cps/oauth_bb.py:167
 msgid "Failed to fetch user info from Google."
 msgstr ""
 
-#: cps/oauth_bb.py:229 cps/remotelogin.py:134 cps/web.py:1347
+#: cps/oauth_bb.py:213 cps/remotelogin.py:133 cps/web.py:1335
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "%(nickname)s としてログイン中"
 
-#: cps/oauth_bb.py:239
+#: cps/oauth_bb.py:223
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:245
+#: cps/oauth_bb.py:229
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr ""
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:271
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:291
+#: cps/oauth_bb.py:275
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr ""
 
-#: cps/oauth_bb.py:294
+#: cps/oauth_bb.py:278
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:322
+#: cps/oauth_bb.py:306
 msgid "GitHub Oauth error, please retry later."
 msgstr ""
 
-#: cps/oauth_bb.py:341
+#: cps/oauth_bb.py:325
 msgid "Google Oauth error, please retry later."
 msgstr ""
 
-#: cps/remotelogin.py:66 cps/web.py:1394
+#: cps/remotelogin.py:65 cps/web.py:1382
 msgid "login"
 msgstr "ログイン"
 
-#: cps/remotelogin.py:78 cps/remotelogin.py:112
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
 msgid "Token not found"
 msgstr "トークンが見つかりません"
 
-#: cps/remotelogin.py:87 cps/remotelogin.py:120
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
 msgid "Token has expired"
 msgstr "トークンが無効です"
 
-#: cps/remotelogin.py:96
+#: cps/remotelogin.py:95
 msgid "Success! Please return to your device"
 msgstr "成功です！端末に戻ってください"
 
@@ -703,7 +703,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:388
+#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:376
 msgid "Top Rated Books"
 msgstr ""
 
@@ -712,7 +712,7 @@ msgid "Show Top Rated Books"
 msgstr ""
 
 #: cps/render_template.py:53 cps/templates/index.xml:46
-#: cps/templates/index.xml:50 cps/web.py:648
+#: cps/templates/index.xml:50 cps/web.py:636
 msgid "Read Books"
 msgstr "読んだ本"
 
@@ -721,7 +721,7 @@ msgid "Show read and unread"
 msgstr "既読の本と未読の本を表示"
 
 #: cps/render_template.py:57 cps/templates/index.xml:53
-#: cps/templates/index.xml:57 cps/web.py:651
+#: cps/templates/index.xml:57 cps/web.py:639
 msgid "Unread Books"
 msgstr "未読の本"
 
@@ -738,7 +738,7 @@ msgid "Show random books"
 msgstr "ランダムで本を表示"
 
 #: cps/render_template.py:63 cps/templates/book_table.html:50
-#: cps/templates/index.xml:75 cps/web.py:953
+#: cps/templates/index.xml:75 cps/web.py:941
 msgid "Categories"
 msgstr "カテゴリ"
 
@@ -748,7 +748,7 @@ msgstr "カテゴリ選択を表示"
 
 #: cps/render_template.py:66 cps/templates/book_edit.html:84
 #: cps/templates/book_table.html:51 cps/templates/index.xml:82
-#: cps/templates/search_form.html:62 cps/web.py:857 cps/web.py:867
+#: cps/templates/search_form.html:62 cps/web.py:845 cps/web.py:855
 msgid "Series"
 msgstr "シリーズ"
 
@@ -766,7 +766,7 @@ msgid "Show author selection"
 msgstr "著者選択を表示"
 
 #: cps/render_template.py:73 cps/templates/book_table.html:55
-#: cps/templates/index.xml:68 cps/web.py:836
+#: cps/templates/index.xml:68 cps/web.py:824
 msgid "Publishers"
 msgstr "出版社"
 
@@ -775,7 +775,7 @@ msgid "Show publisher selection"
 msgstr "出版社選択を表示"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:53
-#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:932
+#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:920
 msgid "Languages"
 msgstr "言語"
 
@@ -799,7 +799,7 @@ msgstr ""
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/render_template.py:87 cps/web.py:675
+#: cps/render_template.py:87 cps/web.py:663
 msgid "Archived Books"
 msgstr ""
 
@@ -807,7 +807,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:91 cps/web.py:746
+#: cps/render_template.py:91 cps/web.py:734
 msgid "Books List"
 msgstr ""
 
@@ -864,49 +864,49 @@ msgstr "本が %(sname)s から削除されました"
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr "申し訳ありませんが、%(sname)s から本を削除することが許可されていません"
 
-#: cps/shelf.py:238 cps/shelf.py:282
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr ""
+#: cps/shelf.py:224 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "本棚を作成する"
 
-#: cps/shelf.py:247 cps/shelf.py:292
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr ""
+#: cps/shelf.py:231
+msgid "Edit a shelf"
+msgstr "本棚を編集する"
 
-#: cps/shelf.py:254
+#: cps/shelf.py:249
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "%(title)s を作成しました"
 
-#: cps/shelf.py:261 cps/shelf.py:310
-msgid "There was an error"
-msgstr "エラーが発生しました"
-
-#: cps/shelf.py:262 cps/shelf.py:264 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "本棚を作成する"
-
-#: cps/shelf.py:304
+#: cps/shelf.py:252
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "%(title)s を変更しました"
 
-#: cps/shelf.py:311 cps/shelf.py:313
-msgid "Edit a shelf"
-msgstr "本棚を編集する"
+#: cps/shelf.py:265
+msgid "There was an error"
+msgstr "エラーが発生しました"
 
-#: cps/shelf.py:381
+#: cps/shelf.py:281
+#, python-format
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:291
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:358
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "'%(name)s' 内の本の順番を変更する"
 
-#: cps/shelf.py:447
+#: cps/shelf.py:423
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "本棚: '%(name)s'"
 
-#: cps/shelf.py:451
+#: cps/shelf.py:427
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "本棚を開けません。この本棚は存在しないかアクセスできません"
 
@@ -939,222 +939,222 @@ msgstr "アップデートが利用可能です。下のボタンをクリック
 msgid "Click on the button below to update to the latest stable version."
 msgstr ""
 
-#: cps/templates/index.html:5 cps/web.py:396
+#: cps/templates/index.html:5 cps/web.py:384
 msgid "Discover (Random Books)"
 msgstr "本を見つける (ランダムで表示)"
 
-#: cps/web.py:435
+#: cps/web.py:423
 msgid "Books"
 msgstr ""
 
-#: cps/web.py:460
+#: cps/web.py:448
 msgid "Hot Books (Most Downloaded)"
 msgstr ""
 
-#: cps/web.py:495
+#: cps/web.py:483
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:509
+#: cps/web.py:497
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:523
+#: cps/web.py:511
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:537
+#: cps/web.py:525
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "出版社: %(name)s"
 
-#: cps/web.py:550
+#: cps/web.py:538
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "シリーズ: %(serie)s"
 
-#: cps/web.py:563
+#: cps/web.py:551
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:576
+#: cps/web.py:564
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:590
+#: cps/web.py:578
 #, python-format
 msgid "Category: %(name)s"
 msgstr "カテゴリ: %(name)s"
 
-#: cps/web.py:609
+#: cps/web.py:597
 #, python-format
 msgid "Language: %(name)s"
 msgstr "言語: %(name)s"
 
-#: cps/web.py:639
+#: cps/web.py:627
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/templates/layout.html:56 cps/web.py:706 cps/web.py:1180
+#: cps/templates/layout.html:56 cps/web.py:694 cps/web.py:1168
 msgid "Advanced Search"
 msgstr "詳細検索"
 
 #: cps/templates/book_edit.html:214 cps/templates/feed.xml:33
 #: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:175 cps/web.py:718 cps/web.py:990
+#: cps/templates/search_form.html:175 cps/web.py:706 cps/web.py:978
 msgid "Search"
 msgstr "検索"
 
-#: cps/web.py:885
+#: cps/web.py:873
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:904
+#: cps/web.py:892
 msgid "File formats list"
 msgstr ""
 
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:967
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:955
 msgid "Tasks"
 msgstr "タスク"
 
-#: cps/web.py:1053
+#: cps/web.py:1041
 msgid "Published after "
 msgstr "これ以降に出版 "
 
-#: cps/web.py:1060
+#: cps/web.py:1048
 msgid "Published before "
 msgstr "これ以前に出版 "
 
-#: cps/web.py:1079
+#: cps/web.py:1067
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "評価 <= %(rating)s"
 
-#: cps/web.py:1081
+#: cps/web.py:1069
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "評価 >= %(rating)s"
 
-#: cps/web.py:1083
+#: cps/web.py:1071
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1254
+#: cps/web.py:1242
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "本の %(kindlemail)s への送信がキューに追加されました"
 
-#: cps/web.py:1258
+#: cps/web.py:1246
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "%(res)s を送信中にエラーが発生しました"
 
-#: cps/web.py:1260
+#: cps/web.py:1248
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "初めにKindleのメールアドレスを設定してください"
 
-#: cps/web.py:1277
+#: cps/web.py:1265
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/web.py:1278 cps/web.py:1288 cps/web.py:1312 cps/web.py:1316
-#: cps/web.py:1321 cps/web.py:1325
+#: cps/web.py:1266 cps/web.py:1276 cps/web.py:1300 cps/web.py:1304
+#: cps/web.py:1309 cps/web.py:1313
 msgid "register"
 msgstr "登録"
 
-#: cps/web.py:1314
+#: cps/web.py:1302
 msgid "Your e-mail is not allowed to register"
 msgstr "このメールアドレスは登録が許可されていません"
 
-#: cps/web.py:1317
+#: cps/web.py:1305
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "確認メールがこのメールアドレスに送信されました。"
 
-#: cps/web.py:1320
+#: cps/web.py:1308
 msgid "This username or e-mail address is already in use."
 msgstr "このユーザ名またはメールアドレスはすでに使われています。"
 
-#: cps/web.py:1337
+#: cps/web.py:1325
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1354
+#: cps/web.py:1342
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1360
+#: cps/web.py:1348
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1364 cps/web.py:1388
+#: cps/web.py:1352 cps/web.py:1376
 msgid "Wrong Username or Password"
 msgstr "ユーザ名またはパスワードが違います"
 
-#: cps/web.py:1371
+#: cps/web.py:1359
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1377
+#: cps/web.py:1365
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1383
+#: cps/web.py:1371
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1453 cps/web.py:1506
+#: cps/web.py:1441 cps/web.py:1494
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s のプロフィール"
 
-#: cps/web.py:1489
+#: cps/web.py:1477
 msgid "Profile updated"
 msgstr "プロフィールを更新しました"
 
-#: cps/web.py:1533 cps/web.py:1536 cps/web.py:1539 cps/web.py:1546
-#: cps/web.py:1551
+#: cps/web.py:1521 cps/web.py:1524 cps/web.py:1527 cps/web.py:1534
+#: cps/web.py:1539
 msgid "Read a Book"
 msgstr "本を読む"
 
-#: cps/tasks/convert.py:108
+#: cps/tasks/convert.py:114
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:132
+#: cps/tasks/convert.py:138
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:136
+#: cps/tasks/convert.py:142
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:146
+#: cps/tasks/convert.py:152
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:170
+#: cps/tasks/convert.py:176
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:193
+#: cps/tasks/convert.py:199
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Ebook-converter が失敗しました: %(error)s"
 
-#: cps/tasks/convert.py:218
+#: cps/tasks/convert.py:224
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
diff --git a/cps/translations/km/LC_MESSAGES/messages.mo b/cps/translations/km/LC_MESSAGES/messages.mo
index da7f3c16..4cf29136 100644
Binary files a/cps/translations/km/LC_MESSAGES/messages.mo and b/cps/translations/km/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/km/LC_MESSAGES/messages.po b/cps/translations/km/LC_MESSAGES/messages.po
index 9c31f0f8..aa183f25 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-01-02 19:37+0100\n"
+"POT-Creation-Date: 2021-01-17 11:34+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:42
 msgid "installed"
@@ -31,310 +31,310 @@ msgstr "មិនបានតម្លើង"
 msgid "Statistics"
 msgstr "ស្ថិតិ"
 
-#: cps/admin.py:144
+#: cps/admin.py:147
 msgid "Server restarted, please reload page"
 msgstr "ម៉ាស៊ីន server បានដំណើរការម្តងទៀត សូមបើកទំព័រជាថ្មី"
 
-#: cps/admin.py:146
+#: cps/admin.py:149
 msgid "Performing shutdown of server, please close window"
 msgstr "កំពុងបិទម៉ាស៊ីន server សូមបិទផ្ទាំងនេះ"
 
-#: cps/admin.py:154
+#: cps/admin.py:157
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:157
+#: cps/admin.py:160
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:167 cps/editbooks.py:636 cps/editbooks.py:648
-#: cps/editbooks.py:751 cps/editbooks.py:753 cps/editbooks.py:814
-#: cps/editbooks.py:830 cps/updater.py:510 cps/uploader.py:90
+#: cps/admin.py:170 cps/editbooks.py:642 cps/editbooks.py:654
+#: cps/editbooks.py:757 cps/editbooks.py:759 cps/editbooks.py:820
+#: cps/editbooks.py:836 cps/updater.py:510 cps/uploader.py:90
 #: cps/uploader.py:100
 msgid "Unknown"
 msgstr "មិនដឹង"
 
-#: cps/admin.py:188
+#: cps/admin.py:191
 msgid "Admin page"
 msgstr "ទំព័ររដ្ឋបាល"
 
-#: cps/admin.py:210
+#: cps/admin.py:213
 msgid "UI Configuration"
 msgstr "ការកំណត់ផ្ទាំងប្រើប្រាស់"
 
-#: cps/admin.py:242 cps/admin.py:954
+#: cps/admin.py:245 cps/admin.py:923
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
-#: cps/admin.py:253
+#: cps/admin.py:256
 msgid "Do you really want to delete the Kobo Token?"
 msgstr ""
 
-#: cps/admin.py:255
+#: cps/admin.py:258
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:257
+#: cps/admin.py:260
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:259 cps/templates/shelf.html:90
+#: cps/admin.py:262 cps/templates/shelf.html:90
 msgid "Are you sure you want to delete this shelf?"
 msgstr "តើអ្នកពិតជាចង់លុបធ្នើនេះមែនទេ?"
 
-#: cps/admin.py:545 cps/admin.py:551 cps/admin.py:561 cps/admin.py:571
+#: cps/admin.py:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534
 #: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:547 cps/admin.py:553 cps/admin.py:563 cps/admin.py:573
+#: cps/admin.py:510 cps/admin.py:516 cps/admin.py:526 cps/admin.py:536
 #: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:713
+#: cps/admin.py:679
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:753
+#: cps/admin.py:721
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:759
+#: cps/admin.py:727
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:788
+#: cps/admin.py:757
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:803
+#: cps/admin.py:772
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:806
+#: cps/admin.py:775
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:811
+#: cps/admin.py:780
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:814
+#: cps/admin.py:783
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:822
+#: cps/admin.py:791
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:825
+#: cps/admin.py:794
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:833
+#: cps/admin.py:802
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:859
+#: cps/admin.py:828
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:865
+#: cps/admin.py:834
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:935 cps/admin.py:1039 cps/admin.py:1135 cps/admin.py:1184
-#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:258
-#: cps/shelf.py:307 cps/shelf.py:339 cps/shelf.py:371 cps/shelf.py:442
+#: cps/admin.py:904 cps/admin.py:1011 cps/admin.py:1100 cps/admin.py:1149
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:261
+#: cps/shelf.py:314 cps/shelf.py:348 cps/shelf.py:418
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:947
+#: cps/admin.py:916
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:951
+#: cps/admin.py:920
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:984
+#: cps/admin.py:959
 msgid "Basic Configuration"
 msgstr "ការកំណត់សាមញ្ញ"
 
-#: cps/admin.py:999 cps/web.py:1287
+#: cps/admin.py:974 cps/web.py:1275
 msgid "Please fill out all fields!"
 msgstr "សូមបំពេញចន្លោះទាំងអស់!"
 
-#: cps/admin.py:1002 cps/admin.py:1014 cps/admin.py:1020 cps/admin.py:1153
+#: cps/admin.py:977 cps/admin.py:989 cps/admin.py:995 cps/admin.py:1118
 msgid "Add new user"
 msgstr "បន្ថែមអ្នកប្រើប្រាស់ថ្មី"
 
-#: cps/admin.py:1011 cps/web.py:1451
+#: cps/admin.py:986 cps/web.py:1439
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/admin.py:1018 cps/admin.py:1036
+#: cps/admin.py:993 cps/admin.py:1008
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/admin.py:1032
+#: cps/admin.py:1004
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "បានបង្កើតអ្នកប្រើប្រាស់ ‘%(user)s’"
 
-#: cps/admin.py:1051
+#: cps/admin.py:1020
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "អ្នកប្រើប្រាស់ ‘%(nick)s’ ត្រូវបានលុប"
 
-#: cps/admin.py:1054
+#: cps/admin.py:1023
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:1060
+#: cps/admin.py:1028
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:1096 cps/web.py:1493
+#: cps/admin.py:1064 cps/web.py:1481
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/admin.py:1105 cps/admin.py:1119 cps/admin.py:1225 cps/web.py:1469
+#: cps/admin.py:1073 cps/admin.py:1087 cps/admin.py:1190 cps/web.py:1457
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "កែប្រែអ្នកប្រើប្រាស់ %(nick)s"
 
-#: cps/admin.py:1111 cps/web.py:1462
+#: cps/admin.py:1079 cps/web.py:1450
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:1129
+#: cps/admin.py:1094
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "អ្នកប្រើប្រាស់ ‘%(nick)s’ ត្រូវបានកែប្រែ"
 
-#: cps/admin.py:1132
+#: cps/admin.py:1097
 msgid "An unknown error occured."
 msgstr "បញ្ហាដែលមិនដឹងបានកើតឡើង។"
 
-#: cps/admin.py:1162 cps/templates/admin.html:78
+#: cps/admin.py:1127 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "ប្តូរការកំណត់ SMTP"
 
-#: cps/admin.py:1191
+#: cps/admin.py:1156
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/admin.py:1194
+#: cps/admin.py:1159
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:1196
+#: cps/admin.py:1161
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1198
+#: cps/admin.py:1163
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:1209
+#: cps/admin.py:1174
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:1236
+#: cps/admin.py:1201
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1239 cps/web.py:1311 cps/web.py:1375
+#: cps/admin.py:1204 cps/web.py:1299 cps/web.py:1363
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/admin.py:1242 cps/web.py:1249
+#: cps/admin.py:1207 cps/web.py:1237
 msgid "Please configure the SMTP mail settings first..."
 msgstr "សូមកំណត់អ៊ីមែល SMTP ជាមុនសិន"
 
-#: cps/admin.py:1254
+#: cps/admin.py:1218
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1315
+#: cps/admin.py:1280
 msgid "Requesting update package"
 msgstr "កំពុងស្នើសុំឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/admin.py:1316
+#: cps/admin.py:1281
 msgid "Downloading update package"
 msgstr "កំពុងទាញយកឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/admin.py:1317
+#: cps/admin.py:1282
 msgid "Unzipping update package"
 msgstr "កំពុងពន្លាឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/admin.py:1318
+#: cps/admin.py:1283
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:1319
+#: cps/admin.py:1284
 msgid "Database connections are closed"
 msgstr "ទំនាក់ទំនងទៅមូលដ្ឋានទិន្នន័យត្រូវបានផ្តាច់"
 
-#: cps/admin.py:1320
+#: cps/admin.py:1285
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:1321
+#: cps/admin.py:1286
 msgid "Update finished, please press okay and reload page"
 msgstr "ការធ្វើបច្ចុប្បន្នភាពបានបញ្ចប់ សូមចុច okay រួចបើកទំព័រជាថ្មី"
 
-#: cps/admin.py:1322 cps/admin.py:1323 cps/admin.py:1324 cps/admin.py:1325
-#: cps/admin.py:1326
+#: cps/admin.py:1287 cps/admin.py:1288 cps/admin.py:1289 cps/admin.py:1290
+#: cps/admin.py:1291
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:1322 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+#: cps/admin.py:1287 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:1323 cps/updater.py:322 cps/updater.py:525
+#: cps/admin.py:1288 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:1324 cps/updater.py:324 cps/updater.py:527
+#: cps/admin.py:1289 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:1325 cps/updater.py:326 cps/updater.py:529
+#: cps/admin.py:1290 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr ""
 
-#: cps/admin.py:1326
+#: cps/admin.py:1291
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
-#: cps/admin.py:1351
+#: cps/admin.py:1316
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1355
+#: cps/admin.py:1320
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1421
+#: cps/admin.py:1386
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1424
+#: cps/admin.py:1389
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1426
+#: cps/admin.py:1391
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -354,90 +354,90 @@ msgstr ""
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:317 cps/editbooks.py:620 cps/web.py:1521 cps/web.py:1554
-#: cps/web.py:1625
+#: cps/editbooks.py:316 cps/editbooks.py:626 cps/web.py:1509 cps/web.py:1542
+#: cps/web.py:1613
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "មានបញ្ហាពេលបើកឯកសារ eBook ។ ពុំមានឯកសារ ឬឯកសារនេះមិនអាចបើកបាន"
 
-#: cps/editbooks.py:351
+#: cps/editbooks.py:350
 msgid "edit metadata"
 msgstr "កែប្រែទិន្នន័យមេតា"
 
-#: cps/editbooks.py:426
+#: cps/editbooks.py:425
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr ""
 
-#: cps/editbooks.py:537 cps/editbooks.py:796
+#: cps/editbooks.py:536 cps/editbooks.py:802
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "ឯកសារប្រភេទ '%(ext)s' មិនត្រូវបានអនុញ្ញាតឲអាប់ឡូដទៅម៉ាស៊ីន server នេះទេ"
 
-#: cps/editbooks.py:541 cps/editbooks.py:800
+#: cps/editbooks.py:540 cps/editbooks.py:806
 msgid "File to be uploaded must have an extension"
 msgstr "ឯកសារដែលត្រូវអាប់ឡូដត្រូវមានកន្ទុយឯកសារ"
 
-#: cps/editbooks.py:553
+#: cps/editbooks.py:552
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "មិនអាចបង្កើតទីតាំង %(path)s (ពុំមានសិទ្ធិ)។"
 
-#: cps/editbooks.py:558
+#: cps/editbooks.py:557
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "មិនអាចរក្សាទុកឯកសារ %(file)s ។"
 
-#: cps/editbooks.py:576 cps/editbooks.py:931 cps/web.py:1498
+#: cps/editbooks.py:575 cps/editbooks.py:937 cps/web.py:1486
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:580
+#: cps/editbooks.py:579
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "ឯកសារទម្រង់ %(ext)s ត្រូវបានបន្ថែមទៅ %(book)s"
 
-#: cps/editbooks.py:700
+#: cps/editbooks.py:706
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:737
+#: cps/editbooks.py:743
 msgid "Metadata successfully updated"
 msgstr ""
 
-#: cps/editbooks.py:746
+#: cps/editbooks.py:752
 msgid "Error editing book, please check logfile for details"
 msgstr "មានបញ្ហាពេលកែប្រែសៀវភៅ សូមពិនិត្យមើល logfile សម្រាប់ព័ត៌មានបន្ថែម"
 
-#: cps/editbooks.py:808
+#: cps/editbooks.py:814
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:818
+#: cps/editbooks.py:824
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:906
+#: cps/editbooks.py:912
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:917
+#: cps/editbooks.py:923
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:943
+#: cps/editbooks.py:949
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/editbooks.py:951
+#: cps/editbooks.py:957
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/editbooks.py:955
+#: cps/editbooks.py:961
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
@@ -598,85 +598,85 @@ msgstr "បានបញ្ចប់"
 msgid "Unknown Status"
 msgstr ""
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:157
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
 msgid "Kobo Setup"
 msgstr ""
 
-#: cps/oauth_bb.py:74
+#: cps/oauth_bb.py:73
 #, python-format
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:158
+#: cps/oauth_bb.py:146
 msgid "Failed to log in with GitHub."
 msgstr ""
 
-#: cps/oauth_bb.py:163
+#: cps/oauth_bb.py:151
 msgid "Failed to fetch user info from GitHub."
 msgstr ""
 
-#: cps/oauth_bb.py:174
+#: cps/oauth_bb.py:162
 msgid "Failed to log in with Google."
 msgstr ""
 
-#: cps/oauth_bb.py:179
+#: cps/oauth_bb.py:167
 msgid "Failed to fetch user info from Google."
 msgstr ""
 
-#: cps/oauth_bb.py:229 cps/remotelogin.py:134 cps/web.py:1347
+#: cps/oauth_bb.py:213 cps/remotelogin.py:133 cps/web.py:1335
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "ឥឡូវអ្នកបានចូលដោយមានឈ្មោះថា៖ ‘%(nickname)s’"
 
-#: cps/oauth_bb.py:239
+#: cps/oauth_bb.py:223
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:245
+#: cps/oauth_bb.py:229
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr ""
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:271
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:291
+#: cps/oauth_bb.py:275
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr ""
 
-#: cps/oauth_bb.py:294
+#: cps/oauth_bb.py:278
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:322
+#: cps/oauth_bb.py:306
 msgid "GitHub Oauth error, please retry later."
 msgstr ""
 
-#: cps/oauth_bb.py:341
+#: cps/oauth_bb.py:325
 msgid "Google Oauth error, please retry later."
 msgstr ""
 
-#: cps/remotelogin.py:66 cps/web.py:1394
+#: cps/remotelogin.py:65 cps/web.py:1382
 msgid "login"
 msgstr "ចូលប្រើ"
 
-#: cps/remotelogin.py:78 cps/remotelogin.py:112
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
 msgid "Token not found"
 msgstr "រកមិនឃើញវត្ថុតាង"
 
-#: cps/remotelogin.py:87 cps/remotelogin.py:120
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
 msgid "Token has expired"
 msgstr "វត្ថុតាងហួសពេលកំណត់"
 
-#: cps/remotelogin.py:96
+#: cps/remotelogin.py:95
 msgid "Success! Please return to your device"
 msgstr "ជោគជ័យ! សូមវិលមកឧបករណ៍អ្នកវិញ"
 
@@ -704,7 +704,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:388
+#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:376
 msgid "Top Rated Books"
 msgstr "សៀវភៅដែលមានការវាយតម្លៃល្អជាងគេ"
 
@@ -713,7 +713,7 @@ msgid "Show Top Rated Books"
 msgstr "បង្ហាញសៀវភៅដែលមានការវាយតម្លៃល្អជាងគេ"
 
 #: cps/render_template.py:53 cps/templates/index.xml:46
-#: cps/templates/index.xml:50 cps/web.py:648
+#: cps/templates/index.xml:50 cps/web.py:636
 msgid "Read Books"
 msgstr "សៀវភៅដែលបានអានរួច"
 
@@ -722,7 +722,7 @@ msgid "Show read and unread"
 msgstr "បង្ហាញអានរួច និងមិនទាន់អាន"
 
 #: cps/render_template.py:57 cps/templates/index.xml:53
-#: cps/templates/index.xml:57 cps/web.py:651
+#: cps/templates/index.xml:57 cps/web.py:639
 msgid "Unread Books"
 msgstr "សៀវភៅដែលមិនទាន់បានអាន"
 
@@ -739,7 +739,7 @@ msgid "Show random books"
 msgstr "បង្ហាញសៀវភៅចៃដន្យ"
 
 #: cps/render_template.py:63 cps/templates/book_table.html:50
-#: cps/templates/index.xml:75 cps/web.py:953
+#: cps/templates/index.xml:75 cps/web.py:941
 msgid "Categories"
 msgstr "ប្រភេទនានា"
 
@@ -749,7 +749,7 @@ msgstr "បង្ហាញជម្រើសប្រភេទ"
 
 #: cps/render_template.py:66 cps/templates/book_edit.html:84
 #: cps/templates/book_table.html:51 cps/templates/index.xml:82
-#: cps/templates/search_form.html:62 cps/web.py:857 cps/web.py:867
+#: cps/templates/search_form.html:62 cps/web.py:845 cps/web.py:855
 msgid "Series"
 msgstr "ស៊េរី"
 
@@ -767,7 +767,7 @@ msgid "Show author selection"
 msgstr "បង្ហាញជម្រើសអ្នកនិពន្ធ"
 
 #: cps/render_template.py:73 cps/templates/book_table.html:55
-#: cps/templates/index.xml:68 cps/web.py:836
+#: cps/templates/index.xml:68 cps/web.py:824
 msgid "Publishers"
 msgstr ""
 
@@ -776,7 +776,7 @@ msgid "Show publisher selection"
 msgstr ""
 
 #: cps/render_template.py:76 cps/templates/book_table.html:53
-#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:932
+#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:920
 msgid "Languages"
 msgstr "ភាសានានា"
 
@@ -800,7 +800,7 @@ msgstr ""
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/render_template.py:87 cps/web.py:675
+#: cps/render_template.py:87 cps/web.py:663
 msgid "Archived Books"
 msgstr ""
 
@@ -808,7 +808,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:91 cps/web.py:746
+#: cps/render_template.py:91 cps/web.py:734
 msgid "Books List"
 msgstr ""
 
@@ -865,49 +865,49 @@ msgstr "សៀវភៅត្រូវបានដកចេញពីធ្នើ
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr "សូមអភ័យទោស អ្នកមិនមានសិទ្ធិដកសៀវភៅចេញពីធ្នើនេះទេ៖ %(sname)s"
 
-#: cps/shelf.py:238 cps/shelf.py:282
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr ""
+#: cps/shelf.py:224 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "បង្កើតធ្នើ"
 
-#: cps/shelf.py:247 cps/shelf.py:292
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr ""
+#: cps/shelf.py:231
+msgid "Edit a shelf"
+msgstr "កែប្រែធ្នើ"
 
-#: cps/shelf.py:254
+#: cps/shelf.py:249
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "ធ្នើឈ្មោះ %(title)s ត្រូវបានបង្កើត"
 
-#: cps/shelf.py:261 cps/shelf.py:310
-msgid "There was an error"
-msgstr "មានបញ្ហា"
-
-#: cps/shelf.py:262 cps/shelf.py:264 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "បង្កើតធ្នើ"
-
-#: cps/shelf.py:304
+#: cps/shelf.py:252
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "ធ្នើឈ្មោះ %(title)s ត្រូវបានប្តូរ"
 
-#: cps/shelf.py:311 cps/shelf.py:313
-msgid "Edit a shelf"
-msgstr "កែប្រែធ្នើ"
+#: cps/shelf.py:265
+msgid "There was an error"
+msgstr "មានបញ្ហា"
 
-#: cps/shelf.py:381
+#: cps/shelf.py:281
+#, python-format
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:291
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:358
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "ប្តូរលំដាប់ធ្នើ៖ ‘%(name)s’"
 
-#: cps/shelf.py:447
+#: cps/shelf.py:423
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "ធ្នើ៖ ‘%(name)s’"
 
-#: cps/shelf.py:451
+#: cps/shelf.py:427
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "មានបញ្ហាពេលបើកធ្នើ។ ពុំមានធ្នើ ឬមិនអាចបើកបាន"
 
@@ -940,222 +940,222 @@ msgstr ""
 msgid "Click on the button below to update to the latest stable version."
 msgstr ""
 
-#: cps/templates/index.html:5 cps/web.py:396
+#: cps/templates/index.html:5 cps/web.py:384
 msgid "Discover (Random Books)"
 msgstr "ស្រាវជ្រាវ (សៀវភៅចៃដន្យ)"
 
-#: cps/web.py:435
+#: cps/web.py:423
 msgid "Books"
 msgstr ""
 
-#: cps/web.py:460
+#: cps/web.py:448
 msgid "Hot Books (Most Downloaded)"
 msgstr "សៀវភៅដែលត្រូវបានទាញយកច្រើនជាងគេ"
 
-#: cps/web.py:495
+#: cps/web.py:483
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:509
+#: cps/web.py:497
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:523
+#: cps/web.py:511
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:537
+#: cps/web.py:525
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr ""
 
-#: cps/web.py:550
+#: cps/web.py:538
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "ស៊េរី៖ %(serie)s"
 
-#: cps/web.py:563
+#: cps/web.py:551
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:576
+#: cps/web.py:564
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:590
+#: cps/web.py:578
 #, python-format
 msgid "Category: %(name)s"
 msgstr "ប្រភេទ៖ %(name)s"
 
-#: cps/web.py:609
+#: cps/web.py:597
 #, python-format
 msgid "Language: %(name)s"
 msgstr "ភាសា៖ %(name)s"
 
-#: cps/web.py:639
+#: cps/web.py:627
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/templates/layout.html:56 cps/web.py:706 cps/web.py:1180
+#: cps/templates/layout.html:56 cps/web.py:694 cps/web.py:1168
 msgid "Advanced Search"
 msgstr "ស្វែងរកកម្រិតខ្ពស់"
 
 #: cps/templates/book_edit.html:214 cps/templates/feed.xml:33
 #: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:175 cps/web.py:718 cps/web.py:990
+#: cps/templates/search_form.html:175 cps/web.py:706 cps/web.py:978
 msgid "Search"
 msgstr "ស្វែងរក"
 
-#: cps/web.py:885
+#: cps/web.py:873
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:904
+#: cps/web.py:892
 msgid "File formats list"
 msgstr ""
 
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:967
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:955
 msgid "Tasks"
 msgstr "កិច្ចការនានា"
 
-#: cps/web.py:1053
+#: cps/web.py:1041
 msgid "Published after "
 msgstr "បានបោះពុម្ភក្រោយ  "
 
-#: cps/web.py:1060
+#: cps/web.py:1048
 msgid "Published before "
 msgstr "បានបោះពុម្ភមុន  "
 
-#: cps/web.py:1079
+#: cps/web.py:1067
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "ការវាយតម្លៃ <= %(rating)s"
 
-#: cps/web.py:1081
+#: cps/web.py:1069
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "ការវាយតម្លៃ >= %(rating)s"
 
-#: cps/web.py:1083
+#: cps/web.py:1071
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1254
+#: cps/web.py:1242
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "សៀវភៅបានចូលជួរសម្រាប់ផ្ញើទៅ %(kindlemail)s ដោយជោគជ័យ"
 
-#: cps/web.py:1258
+#: cps/web.py:1246
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "មានបញ្ហានៅពេលផ្ញើសៀវភៅនេះ៖ %(res)s"
 
-#: cps/web.py:1260
+#: cps/web.py:1248
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1277
+#: cps/web.py:1265
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/web.py:1278 cps/web.py:1288 cps/web.py:1312 cps/web.py:1316
-#: cps/web.py:1321 cps/web.py:1325
+#: cps/web.py:1266 cps/web.py:1276 cps/web.py:1300 cps/web.py:1304
+#: cps/web.py:1309 cps/web.py:1313
 msgid "register"
 msgstr "ចុះឈ្មោះ"
 
-#: cps/web.py:1314
+#: cps/web.py:1302
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1317
+#: cps/web.py:1305
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1320
+#: cps/web.py:1308
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:1337
+#: cps/web.py:1325
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1354
+#: cps/web.py:1342
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1360
+#: cps/web.py:1348
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1364 cps/web.py:1388
+#: cps/web.py:1352 cps/web.py:1376
 msgid "Wrong Username or Password"
 msgstr "ខុសឈ្មោះអ្នកប្រើប្រាស់ ឬលេខសម្ងាត់"
 
-#: cps/web.py:1371
+#: cps/web.py:1359
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1377
+#: cps/web.py:1365
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1383
+#: cps/web.py:1371
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1453 cps/web.py:1506
+#: cps/web.py:1441 cps/web.py:1494
 #, python-format
 msgid "%(name)s's profile"
 msgstr "ព័ត៌មានសង្ខេបរបស់ %(name)s"
 
-#: cps/web.py:1489
+#: cps/web.py:1477
 msgid "Profile updated"
 msgstr "ព័ត៌មានសង្ខេបបានកែប្រែ"
 
-#: cps/web.py:1533 cps/web.py:1536 cps/web.py:1539 cps/web.py:1546
-#: cps/web.py:1551
+#: cps/web.py:1521 cps/web.py:1524 cps/web.py:1527 cps/web.py:1534
+#: cps/web.py:1539
 msgid "Read a Book"
 msgstr "អានសៀវភៅ"
 
-#: cps/tasks/convert.py:108
+#: cps/tasks/convert.py:114
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:132
+#: cps/tasks/convert.py:138
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:136
+#: cps/tasks/convert.py:142
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:146
+#: cps/tasks/convert.py:152
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:170
+#: cps/tasks/convert.py:176
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:193
+#: cps/tasks/convert.py:199
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Ebook-converter បានបរាជ័យ៖ %(error)s"
 
-#: cps/tasks/convert.py:218
+#: cps/tasks/convert.py:224
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
diff --git a/cps/translations/nl/LC_MESSAGES/messages.mo b/cps/translations/nl/LC_MESSAGES/messages.mo
index 14525246..9e2f2e01 100644
Binary files a/cps/translations/nl/LC_MESSAGES/messages.mo and b/cps/translations/nl/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po
index a1aef60f..877ee4d3 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-01-02 19:37+0100\n"
+"POT-Creation-Date: 2021-01-17 11:34+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:42
 msgid "installed"
@@ -31,310 +31,310 @@ msgstr "niet geïnstalleerd"
 msgid "Statistics"
 msgstr "Statistieken"
 
-#: cps/admin.py:144
+#: cps/admin.py:147
 msgid "Server restarted, please reload page"
 msgstr "De server is herstart, vernieuw de pagina"
 
-#: cps/admin.py:146
+#: cps/admin.py:149
 msgid "Performing shutdown of server, please close window"
 msgstr "Bezig met afsluiten van de server, sluit het venster"
 
-#: cps/admin.py:154
+#: cps/admin.py:157
 msgid "Reconnect successful"
 msgstr "Opnieuw verbinden gelukt"
 
-#: cps/admin.py:157
+#: cps/admin.py:160
 msgid "Unknown command"
 msgstr "Onbekende opdracht"
 
-#: cps/admin.py:167 cps/editbooks.py:636 cps/editbooks.py:648
-#: cps/editbooks.py:751 cps/editbooks.py:753 cps/editbooks.py:814
-#: cps/editbooks.py:830 cps/updater.py:510 cps/uploader.py:90
+#: cps/admin.py:170 cps/editbooks.py:642 cps/editbooks.py:654
+#: cps/editbooks.py:757 cps/editbooks.py:759 cps/editbooks.py:820
+#: cps/editbooks.py:836 cps/updater.py:510 cps/uploader.py:90
 #: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: cps/admin.py:188
+#: cps/admin.py:191
 msgid "Admin page"
 msgstr "Systeembeheer"
 
-#: cps/admin.py:210
+#: cps/admin.py:213
 msgid "UI Configuration"
 msgstr "Uiterlijk aanpassen"
 
-#: cps/admin.py:242 cps/admin.py:954
+#: cps/admin.py:245 cps/admin.py:923
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web-configuratie bijgewerkt"
 
-#: cps/admin.py:253
+#: cps/admin.py:256
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Wil je werkelijk je Kobo Token verwijderen?"
 
-#: cps/admin.py:255
+#: cps/admin.py:258
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:257
+#: cps/admin.py:260
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:259 cps/templates/shelf.html:90
+#: cps/admin.py:262 cps/templates/shelf.html:90
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Weet je zeker dat je deze boekenplank wilt verwijderen?"
 
-#: cps/admin.py:545 cps/admin.py:551 cps/admin.py:561 cps/admin.py:571
+#: cps/admin.py:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534
 #: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Weigeren"
 
-#: cps/admin.py:547 cps/admin.py:553 cps/admin.py:563 cps/admin.py:573
+#: cps/admin.py:510 cps/admin.py:516 cps/admin.py:526 cps/admin.py:536
 #: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Toestaan"
 
-#: cps/admin.py:713
+#: cps/admin.py:679
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json is niet geconfigureerd voor webapplicatie"
 
-#: cps/admin.py:753
+#: cps/admin.py:721
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "De locatie van het logbestand is onjuist, voer een geldige locatie in"
 
-#: cps/admin.py:759
+#: cps/admin.py:727
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "De locatie vam het toegangslog is onjuist, voer een geldige locatie in"
 
-#: cps/admin.py:788
+#: cps/admin.py:757
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:803
+#: cps/admin.py:772
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:806
+#: cps/admin.py:775
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:811
+#: cps/admin.py:780
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:814
+#: cps/admin.py:783
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:822
+#: cps/admin.py:791
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:825
+#: cps/admin.py:794
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:833
+#: cps/admin.py:802
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:859
+#: cps/admin.py:828
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "SSL-sleutellocatie is niet geldig, voer een geldige locatie in"
 
-#: cps/admin.py:865
+#: cps/admin.py:834
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "SSL-certificaatlocatie is niet geldig, voer een geldige locatie in"
 
-#: cps/admin.py:935 cps/admin.py:1039 cps/admin.py:1135 cps/admin.py:1184
-#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:258
-#: cps/shelf.py:307 cps/shelf.py:339 cps/shelf.py:371 cps/shelf.py:442
+#: cps/admin.py:904 cps/admin.py:1011 cps/admin.py:1100 cps/admin.py:1149
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:261
+#: cps/shelf.py:314 cps/shelf.py:348 cps/shelf.py:418
 msgid "Settings DB is not Writeable"
 msgstr "Instellingen niet opgeslagen"
 
-#: cps/admin.py:947
+#: cps/admin.py:916
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "Database niet gevonden, voer de juiste locatie in"
 
-#: cps/admin.py:951
+#: cps/admin.py:920
 msgid "DB is not Writeable"
 msgstr "Kan niet schrijven naar database"
 
-#: cps/admin.py:984
+#: cps/admin.py:959
 msgid "Basic Configuration"
 msgstr "Basis configuratie"
 
-#: cps/admin.py:999 cps/web.py:1287
+#: cps/admin.py:974 cps/web.py:1275
 msgid "Please fill out all fields!"
 msgstr "Vul alle velden in!"
 
-#: cps/admin.py:1002 cps/admin.py:1014 cps/admin.py:1020 cps/admin.py:1153
+#: cps/admin.py:977 cps/admin.py:989 cps/admin.py:995 cps/admin.py:1118
 msgid "Add new user"
 msgstr "Gebruiker toevoegen"
 
-#: cps/admin.py:1011 cps/web.py:1451
+#: cps/admin.py:986 cps/web.py:1439
 msgid "E-mail is not from valid domain"
 msgstr "Het e-mailadres bevat geen geldige domeinnaam"
 
-#: cps/admin.py:1018 cps/admin.py:1036
+#: cps/admin.py:993 cps/admin.py:1008
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Bestaand account met dit e-mailadres of deze gebruikersnaam aangetroffen."
 
-#: cps/admin.py:1032
+#: cps/admin.py:1004
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Gebruiker '%(user)s' aangemaakt"
 
-#: cps/admin.py:1051
+#: cps/admin.py:1020
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Gebruiker '%(nick)s' verwijderd"
 
-#: cps/admin.py:1054
+#: cps/admin.py:1023
 msgid "No admin user remaining, can't delete user"
 msgstr "Kan laatste systeembeheerder niet verwijderen"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1028
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Kan systeembeheerder rol niet verwijderen van de laatste systeembeheerder"
 
-#: cps/admin.py:1096 cps/web.py:1493
+#: cps/admin.py:1064 cps/web.py:1481
 msgid "Found an existing account for this e-mail address."
 msgstr "Bestaand account met dit e-mailadres aangetroffen."
 
-#: cps/admin.py:1105 cps/admin.py:1119 cps/admin.py:1225 cps/web.py:1469
+#: cps/admin.py:1073 cps/admin.py:1087 cps/admin.py:1190 cps/web.py:1457
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Gebruiker '%(nick)s' bewerken"
 
-#: cps/admin.py:1111 cps/web.py:1462
+#: cps/admin.py:1079 cps/web.py:1450
 msgid "This username is already taken"
 msgstr "Deze gebruikersnaam is al in gebruik"
 
-#: cps/admin.py:1129
+#: cps/admin.py:1094
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Gebruiker '%(nick)s' bijgewerkt"
 
-#: cps/admin.py:1132
+#: cps/admin.py:1097
 msgid "An unknown error occured."
 msgstr "Er is een onbekende fout opgetreden."
 
-#: cps/admin.py:1162 cps/templates/admin.html:78
+#: cps/admin.py:1127 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "SMTP-instellingen bewerken"
 
-#: cps/admin.py:1191
+#: cps/admin.py:1156
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Test-e-mail verstuurd naar %(kindlemail)s"
 
-#: cps/admin.py:1194
+#: cps/admin.py:1159
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Fout opgetreden bij het versturen van de test-e-mail: %(res)s"
 
-#: cps/admin.py:1196
+#: cps/admin.py:1161
 msgid "Please configure your e-mail address first..."
 msgstr "Gelieve eerst je e-mail adres configureren..."
 
-#: cps/admin.py:1198
+#: cps/admin.py:1163
 msgid "E-mail server settings updated"
 msgstr "E-mailserver-instellingen bijgewerkt"
 
-#: cps/admin.py:1209
+#: cps/admin.py:1174
 msgid "User not found"
 msgstr "Gebruiker niet gevonden"
 
-#: cps/admin.py:1236
+#: cps/admin.py:1201
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Wachtwoord voor gebruiker %(user)s is hersteld"
 
-#: cps/admin.py:1239 cps/web.py:1311 cps/web.py:1375
+#: cps/admin.py:1204 cps/web.py:1299 cps/web.py:1363
 msgid "An unknown error occurred. Please try again later."
 msgstr "Onbekende fout opgetreden. Probeer het later nog eens."
 
-#: cps/admin.py:1242 cps/web.py:1249
+#: cps/admin.py:1207 cps/web.py:1237
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Stel eerst SMTP-mail in..."
 
-#: cps/admin.py:1254
+#: cps/admin.py:1218
 msgid "Logfile viewer"
 msgstr "Logbestand lezer"
 
-#: cps/admin.py:1315
+#: cps/admin.py:1280
 msgid "Requesting update package"
 msgstr "Update opvragen"
 
-#: cps/admin.py:1316
+#: cps/admin.py:1281
 msgid "Downloading update package"
 msgstr "Update downloaden"
 
-#: cps/admin.py:1317
+#: cps/admin.py:1282
 msgid "Unzipping update package"
 msgstr "Update uitpakken"
 
-#: cps/admin.py:1318
+#: cps/admin.py:1283
 msgid "Replacing files"
 msgstr "Update toepassen"
 
-#: cps/admin.py:1319
+#: cps/admin.py:1284
 msgid "Database connections are closed"
 msgstr "Databaseverbindingen zijn gesloten"
 
-#: cps/admin.py:1320
+#: cps/admin.py:1285
 msgid "Stopping server"
 msgstr "Bezig met stoppen van Calibre-Web"
 
-#: cps/admin.py:1321
+#: cps/admin.py:1286
 msgid "Update finished, please press okay and reload page"
 msgstr "Update voltooid, klik op 'Oké' en vernieuw de pagina"
 
-#: cps/admin.py:1322 cps/admin.py:1323 cps/admin.py:1324 cps/admin.py:1325
-#: cps/admin.py:1326
+#: cps/admin.py:1287 cps/admin.py:1288 cps/admin.py:1289 cps/admin.py:1290
+#: cps/admin.py:1291
 msgid "Update failed:"
 msgstr "Update mislukt:"
 
-#: cps/admin.py:1322 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+#: cps/admin.py:1287 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTP-fout"
 
-#: cps/admin.py:1323 cps/updater.py:322 cps/updater.py:525
+#: cps/admin.py:1288 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Verbindingsfout"
 
-#: cps/admin.py:1324 cps/updater.py:324 cps/updater.py:527
+#: cps/admin.py:1289 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Time-out tijdens maken van verbinding"
 
-#: cps/admin.py:1325 cps/updater.py:326 cps/updater.py:529
+#: cps/admin.py:1290 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Algemene fout"
 
-#: cps/admin.py:1326
+#: cps/admin.py:1291
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr "Geüpload bestand kon niet opgeslagen worden in de tijdelijke map"
 
-#: cps/admin.py:1351
+#: cps/admin.py:1316
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Fout: %(ldaperror)s"
 
-#: cps/admin.py:1355
+#: cps/admin.py:1320
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Fout: No user returned in response of LDAP server"
 
-#: cps/admin.py:1421
+#: cps/admin.py:1386
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1424
+#: cps/admin.py:1389
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1426
+#: cps/admin.py:1391
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -354,90 +354,90 @@ msgstr "Het boekformaat is verwijderd"
 msgid "Book Successfully Deleted"
 msgstr "Het boek is verwijderd"
 
-#: cps/editbooks.py:317 cps/editbooks.py:620 cps/web.py:1521 cps/web.py:1554
-#: cps/web.py:1625
+#: cps/editbooks.py:316 cps/editbooks.py:626 cps/web.py:1509 cps/web.py:1542
+#: cps/web.py:1613
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Kan e-boek niet openen: het bestand bestaat niet of is ontoegankelijk"
 
-#: cps/editbooks.py:351
+#: cps/editbooks.py:350
 msgid "edit metadata"
 msgstr "metagegevens bewerken"
 
-#: cps/editbooks.py:426
+#: cps/editbooks.py:425
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s is geen geldige taal"
 
-#: cps/editbooks.py:537 cps/editbooks.py:796
+#: cps/editbooks.py:536 cps/editbooks.py:802
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "De bestandsextensie '%(ext)s' is niet toegestaan op deze server"
 
-#: cps/editbooks.py:541 cps/editbooks.py:800
+#: cps/editbooks.py:540 cps/editbooks.py:806
 msgid "File to be uploaded must have an extension"
 msgstr "Het te uploaden bestand moet voorzien zijn van een extensie"
 
-#: cps/editbooks.py:553
+#: cps/editbooks.py:552
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Kan de locatie '%(path)s' niet aanmaken (niet gemachtigd)."
 
-#: cps/editbooks.py:558
+#: cps/editbooks.py:557
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Kan %(file)s niet opslaan."
 
-#: cps/editbooks.py:576 cps/editbooks.py:931 cps/web.py:1498
+#: cps/editbooks.py:575 cps/editbooks.py:937 cps/web.py:1486
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Database fout: %(error)s."
 
-#: cps/editbooks.py:580
+#: cps/editbooks.py:579
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Bestandsformaat %(ext)s toegevoegd aan %(book)s"
 
-#: cps/editbooks.py:700
+#: cps/editbooks.py:706
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "Identificatoren zijn niet hoofdlettergevoelig, overschrijf huidige identificatoren"
 
-#: cps/editbooks.py:737
+#: cps/editbooks.py:743
 msgid "Metadata successfully updated"
 msgstr "De metagegevens zijn bijgewerkt"
 
-#: cps/editbooks.py:746
+#: cps/editbooks.py:752
 msgid "Error editing book, please check logfile for details"
 msgstr "Kan het boek niet bewerken, controleer het logbestand"
 
-#: cps/editbooks.py:808
+#: cps/editbooks.py:814
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "Bestand %(filename)s kon niet opgeslagen worden in de tijdelijke map"
 
-#: cps/editbooks.py:818
+#: cps/editbooks.py:824
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Geüpload boek staat mogelijk al in de bibliotheek, controleer alvorens door te gaan: "
 
-#: cps/editbooks.py:906
+#: cps/editbooks.py:912
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "Omslag %(file)s niet verplaatst: %(error)s"
 
-#: cps/editbooks.py:917
+#: cps/editbooks.py:923
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Bestand %(file)s geüpload"
 
-#: cps/editbooks.py:943
+#: cps/editbooks.py:949
 msgid "Source or destination format for conversion missing"
 msgstr "Bron- of doelformaat ontbreekt voor conversie"
 
-#: cps/editbooks.py:951
+#: cps/editbooks.py:957
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Het boek is in de wachtrij geplaatst voor conversie naar %(book_format)s"
 
-#: cps/editbooks.py:955
+#: cps/editbooks.py:961
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Er is een fout opgetreden bij het converteren van dit boek: %(res)s"
@@ -598,85 +598,85 @@ msgstr "Voltooid"
 msgid "Unknown Status"
 msgstr "Onbekende status"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Je kunt Calibre-Web niet vanaf de lokale computer openen om een geldige api_endpoint te krijgen voor je kobo toestel"
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:157
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
 msgid "Kobo Setup"
 msgstr "Kobo Instellen"
 
-#: cps/oauth_bb.py:74
+#: cps/oauth_bb.py:73
 #, python-format
 msgid "Register with %(provider)s"
 msgstr "Aanmelden bij %(provider)s"
 
-#: cps/oauth_bb.py:158
+#: cps/oauth_bb.py:146
 msgid "Failed to log in with GitHub."
 msgstr "Inloggen bij GitHub mislukt."
 
-#: cps/oauth_bb.py:163
+#: cps/oauth_bb.py:151
 msgid "Failed to fetch user info from GitHub."
 msgstr "Opvragen gebruikersinfo bij GitHub mislukt."
 
-#: cps/oauth_bb.py:174
+#: cps/oauth_bb.py:162
 msgid "Failed to log in with Google."
 msgstr "Inloggen bij Google mislukt."
 
-#: cps/oauth_bb.py:179
+#: cps/oauth_bb.py:167
 msgid "Failed to fetch user info from Google."
 msgstr "Opvragen gebruikersinfo bij Google mislukt."
 
-#: cps/oauth_bb.py:229 cps/remotelogin.py:134 cps/web.py:1347
+#: cps/oauth_bb.py:213 cps/remotelogin.py:133 cps/web.py:1335
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "je bent ingelogd als: '%(nickname)s'"
 
-#: cps/oauth_bb.py:239
+#: cps/oauth_bb.py:223
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr "Koppeling gemaakt met %(oauth)s"
 
-#: cps/oauth_bb.py:245
+#: cps/oauth_bb.py:229
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr "Inloggen mislukt, geen gebruiker gekoppeld aan OAuth account"
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:271
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr "Koppeling met %(oauth)s verbroken"
 
-#: cps/oauth_bb.py:291
+#: cps/oauth_bb.py:275
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr "Ontkoppelen van %(oauth)s mislukt"
 
-#: cps/oauth_bb.py:294
+#: cps/oauth_bb.py:278
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:322
+#: cps/oauth_bb.py:306
 msgid "GitHub Oauth error, please retry later."
 msgstr "GitHub OAuth fout, probeer het later nog eens."
 
-#: cps/oauth_bb.py:341
+#: cps/oauth_bb.py:325
 msgid "Google Oauth error, please retry later."
 msgstr "Google OAuth fout, probeer het later nog eens."
 
-#: cps/remotelogin.py:66 cps/web.py:1394
+#: cps/remotelogin.py:65 cps/web.py:1382
 msgid "login"
 msgstr "inloggen"
 
-#: cps/remotelogin.py:78 cps/remotelogin.py:112
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
 msgid "Token not found"
 msgstr "Toegangssleutel niet gevonden"
 
-#: cps/remotelogin.py:87 cps/remotelogin.py:120
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
 msgid "Token has expired"
 msgstr "Toegangssleutel is verlopen"
 
-#: cps/remotelogin.py:96
+#: cps/remotelogin.py:95
 msgid "Success! Please return to your device"
 msgstr "Gelukt! Ga terug naar je apparaat"
 
@@ -704,7 +704,7 @@ msgstr "Gedownloade boeken"
 msgid "Show Downloaded Books"
 msgstr "Gedownloade boeken tonen"
 
-#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:388
+#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:376
 msgid "Top Rated Books"
 msgstr "Best beoordeelde boeken"
 
@@ -713,7 +713,7 @@ msgid "Show Top Rated Books"
 msgstr "Best beoordeelde boeken tonen"
 
 #: cps/render_template.py:53 cps/templates/index.xml:46
-#: cps/templates/index.xml:50 cps/web.py:648
+#: cps/templates/index.xml:50 cps/web.py:636
 msgid "Read Books"
 msgstr "Gelezen boeken"
 
@@ -722,7 +722,7 @@ msgid "Show read and unread"
 msgstr "Gelezen/Ongelezen boeken tonen"
 
 #: cps/render_template.py:57 cps/templates/index.xml:53
-#: cps/templates/index.xml:57 cps/web.py:651
+#: cps/templates/index.xml:57 cps/web.py:639
 msgid "Unread Books"
 msgstr "Ongelezen boeken"
 
@@ -739,7 +739,7 @@ msgid "Show random books"
 msgstr "Willekeurige boeken tonen"
 
 #: cps/render_template.py:63 cps/templates/book_table.html:50
-#: cps/templates/index.xml:75 cps/web.py:953
+#: cps/templates/index.xml:75 cps/web.py:941
 msgid "Categories"
 msgstr "Categorieën"
 
@@ -749,7 +749,7 @@ msgstr "Categoriekeuze tonen"
 
 #: cps/render_template.py:66 cps/templates/book_edit.html:84
 #: cps/templates/book_table.html:51 cps/templates/index.xml:82
-#: cps/templates/search_form.html:62 cps/web.py:857 cps/web.py:867
+#: cps/templates/search_form.html:62 cps/web.py:845 cps/web.py:855
 msgid "Series"
 msgstr "Boekenreeksen"
 
@@ -767,7 +767,7 @@ msgid "Show author selection"
 msgstr "Auteurkeuze tonen"
 
 #: cps/render_template.py:73 cps/templates/book_table.html:55
-#: cps/templates/index.xml:68 cps/web.py:836
+#: cps/templates/index.xml:68 cps/web.py:824
 msgid "Publishers"
 msgstr "Uitgevers"
 
@@ -776,7 +776,7 @@ msgid "Show publisher selection"
 msgstr "Uitgeverskeuze tonen"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:53
-#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:932
+#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:920
 msgid "Languages"
 msgstr "Talen"
 
@@ -800,7 +800,7 @@ msgstr "Bestandsformaten"
 msgid "Show file formats selection"
 msgstr "Bestandsformaten tonen"
 
-#: cps/render_template.py:87 cps/web.py:675
+#: cps/render_template.py:87 cps/web.py:663
 msgid "Archived Books"
 msgstr "Gearchiveerde boeken"
 
@@ -808,7 +808,7 @@ msgstr "Gearchiveerde boeken"
 msgid "Show archived books"
 msgstr "Gearchiveerde boeken tonen"
 
-#: cps/render_template.py:91 cps/web.py:746
+#: cps/render_template.py:91 cps/web.py:734
 msgid "Books List"
 msgstr "Boekenlijst"
 
@@ -865,49 +865,49 @@ msgstr "Het boek is verwijderd van boekenplank: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr "Je bent niet gemachtigd om boeken te verwijderen van boekenplank: %(sname)s"
 
-#: cps/shelf.py:238 cps/shelf.py:282
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr "Een openbare boekenplank met de naam '%(title)s' bestaat al."
+#: cps/shelf.py:224 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "Boekenplank maken"
 
-#: cps/shelf.py:247 cps/shelf.py:292
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr "Een persoonlijke boekenplank met de naam '%(title)s' bestaat al."
+#: cps/shelf.py:231
+msgid "Edit a shelf"
+msgstr "Pas een boekenplank aan"
 
-#: cps/shelf.py:254
+#: cps/shelf.py:249
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Boekenplank '%(title)s' aangemaakt"
 
-#: cps/shelf.py:261 cps/shelf.py:310
-msgid "There was an error"
-msgstr "Er is een fout opgetreden"
-
-#: cps/shelf.py:262 cps/shelf.py:264 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "Boekenplank maken"
-
-#: cps/shelf.py:304
+#: cps/shelf.py:252
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Boekenplank '%(title)s' is aangepast"
 
-#: cps/shelf.py:311 cps/shelf.py:313
-msgid "Edit a shelf"
-msgstr "Pas een boekenplank aan"
+#: cps/shelf.py:265
+msgid "There was an error"
+msgstr "Er is een fout opgetreden"
 
-#: cps/shelf.py:381
+#: cps/shelf.py:281
+#, 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:291
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr "Een persoonlijke boekenplank met de naam '%(title)s' bestaat al."
+
+#: cps/shelf.py:358
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Volgorde bewerken van boekenplank: '%(name)s'"
 
-#: cps/shelf.py:447
+#: cps/shelf.py:423
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Boekenplank: '%(name)s'"
 
-#: cps/shelf.py:451
+#: cps/shelf.py:427
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Kan boekenplank niet openen: de boekenplank bestaat niet of is ontoegankelijk"
 
@@ -940,222 +940,222 @@ msgstr "Er is een update beschikbaar. Klik op de knop hieronder om te updaten na
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Klik op onderstaande knop om de laatste stabiele versie te installeren."
 
-#: cps/templates/index.html:5 cps/web.py:396
+#: cps/templates/index.html:5 cps/web.py:384
 msgid "Discover (Random Books)"
 msgstr "Verkennen (willekeurige boeken)"
 
-#: cps/web.py:435
+#: cps/web.py:423
 msgid "Books"
 msgstr "Boeken"
 
-#: cps/web.py:460
+#: cps/web.py:448
 msgid "Hot Books (Most Downloaded)"
 msgstr "Populaire boeken (meest gedownload)"
 
-#: cps/web.py:495
+#: cps/web.py:483
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "Gedownloade boeken door %(user)s"
 
-#: cps/web.py:509
+#: cps/web.py:497
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Oeps! Geselecteerd boek is niet beschikbaar. Bestand bestaat niet of is niet toegankelijk"
 
-#: cps/web.py:523
+#: cps/web.py:511
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Auteur: %(name)s"
 
-#: cps/web.py:537
+#: cps/web.py:525
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Uitgever: %(name)s"
 
-#: cps/web.py:550
+#: cps/web.py:538
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Reeks: %(serie)s"
 
-#: cps/web.py:563
+#: cps/web.py:551
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Beoordeling: %(rating)s sterren"
 
-#: cps/web.py:576
+#: cps/web.py:564
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Bestandsformaat: %(format)s"
 
-#: cps/web.py:590
+#: cps/web.py:578
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categorie: %(name)s"
 
-#: cps/web.py:609
+#: cps/web.py:597
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Taal: %(name)s"
 
-#: cps/web.py:639
+#: cps/web.py:627
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/templates/layout.html:56 cps/web.py:706 cps/web.py:1180
+#: cps/templates/layout.html:56 cps/web.py:694 cps/web.py:1168
 msgid "Advanced Search"
 msgstr "Geavanceerd zoeken"
 
 #: cps/templates/book_edit.html:214 cps/templates/feed.xml:33
 #: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:175 cps/web.py:718 cps/web.py:990
+#: cps/templates/search_form.html:175 cps/web.py:706 cps/web.py:978
 msgid "Search"
 msgstr "Zoeken"
 
-#: cps/web.py:885
+#: cps/web.py:873
 msgid "Ratings list"
 msgstr "Beoordelingen"
 
-#: cps/web.py:904
+#: cps/web.py:892
 msgid "File formats list"
 msgstr "Alle bestandsformaten"
 
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:967
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:955
 msgid "Tasks"
 msgstr "Taken"
 
-#: cps/web.py:1053
+#: cps/web.py:1041
 msgid "Published after "
 msgstr "Gepubliceerd na "
 
-#: cps/web.py:1060
+#: cps/web.py:1048
 msgid "Published before "
 msgstr "Gepubliceerd vóór "
 
-#: cps/web.py:1079
+#: cps/web.py:1067
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Beoordeling <= %(rating)s"
 
-#: cps/web.py:1081
+#: cps/web.py:1069
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Beoordeling >= %(rating)s"
 
-#: cps/web.py:1083
+#: cps/web.py:1071
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1254
+#: cps/web.py:1242
 #, 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:1258
+#: cps/web.py:1246
 #, 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:1260
+#: cps/web.py:1248
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Stel je kindle-e-mailadres in..."
 
-#: cps/web.py:1277
+#: cps/web.py:1265
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-mailserver is niet geconfigureerd, neem contact op met de beheerder!"
 
-#: cps/web.py:1278 cps/web.py:1288 cps/web.py:1312 cps/web.py:1316
-#: cps/web.py:1321 cps/web.py:1325
+#: cps/web.py:1266 cps/web.py:1276 cps/web.py:1300 cps/web.py:1304
+#: cps/web.py:1309 cps/web.py:1313
 msgid "register"
 msgstr "registreren"
 
-#: cps/web.py:1314
+#: cps/web.py:1302
 msgid "Your e-mail is not allowed to register"
 msgstr "Dit e-mailadres mag niet worden gebruikt voor registratie"
 
-#: cps/web.py:1317
+#: cps/web.py:1305
 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:1320
+#: cps/web.py:1308
 msgid "This username or e-mail address is already in use."
 msgstr "Gebruikersnaam of e-mailadres is al in gebruik."
 
-#: cps/web.py:1337
+#: cps/web.py:1325
 msgid "Cannot activate LDAP authentication"
 msgstr "Kan de LDAP authenticatie niet activeren"
 
-#: cps/web.py:1354
+#: cps/web.py:1342
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1360
+#: cps/web.py:1348
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Inloggen mislukt: %(message)s"
 
-#: cps/web.py:1364 cps/web.py:1388
+#: cps/web.py:1352 cps/web.py:1376
 msgid "Wrong Username or Password"
 msgstr "Verkeerde gebruikersnaam of wachtwoord"
 
-#: cps/web.py:1371
+#: cps/web.py:1359
 msgid "New Password was send to your email address"
 msgstr "Een nieuw wachtwoord is verzonden naar je e-mailadres"
 
-#: cps/web.py:1377
+#: cps/web.py:1365
 msgid "Please enter valid username to reset password"
 msgstr "Geef een geldige gebruikersnaam op om je wachtwoord te herstellen"
 
-#: cps/web.py:1383
+#: cps/web.py:1371
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Je bent ingelogd als: '%(nickname)s'"
 
-#: cps/web.py:1453 cps/web.py:1506
+#: cps/web.py:1441 cps/web.py:1494
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's profiel"
 
-#: cps/web.py:1489
+#: cps/web.py:1477
 msgid "Profile updated"
 msgstr "Profiel bijgewerkt"
 
-#: cps/web.py:1533 cps/web.py:1536 cps/web.py:1539 cps/web.py:1546
-#: cps/web.py:1551
+#: cps/web.py:1521 cps/web.py:1524 cps/web.py:1527 cps/web.py:1534
+#: cps/web.py:1539
 msgid "Read a Book"
 msgstr "Lees een boek"
 
-#: cps/tasks/convert.py:108
+#: cps/tasks/convert.py:114
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:132
+#: cps/tasks/convert.py:138
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:136
+#: cps/tasks/convert.py:142
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:146
+#: cps/tasks/convert.py:152
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:170
+#: cps/tasks/convert.py:176
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:193
+#: cps/tasks/convert.py:199
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "E-boek-conversie mislukt: %(error)s"
 
-#: cps/tasks/convert.py:218
+#: cps/tasks/convert.py:224
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
diff --git a/cps/translations/pl/LC_MESSAGES/messages.mo b/cps/translations/pl/LC_MESSAGES/messages.mo
index 5abeff00..1f90fb07 100644
Binary files a/cps/translations/pl/LC_MESSAGES/messages.mo and b/cps/translations/pl/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po
index b7ac7801..0e3bc6d2 100644
--- a/cps/translations/pl/LC_MESSAGES/messages.po
+++ b/cps/translations/pl/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Calibre Web - polski (POT: 2019-08-06 18:35)\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-01-02 19:37+0100\n"
+"POT-Creation-Date: 2021-01-17 11:34+0100\n"
 "PO-Revision-Date: 2020-08-30 21:05+0200\n"
 "Last-Translator: Jerzy Piątek <jerzy.piatek@gmail.com>\n"
 "Language: pl\n"
@@ -17,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:42
 msgid "installed"
@@ -31,313 +31,313 @@ msgstr "nie zainstalowane"
 msgid "Statistics"
 msgstr "Statystyki"
 
-#: cps/admin.py:144
+#: cps/admin.py:147
 msgid "Server restarted, please reload page"
 msgstr "Serwer uruchomiony ponownie, proszę odświeżyć stronę"
 
-#: cps/admin.py:146
+#: cps/admin.py:149
 msgid "Performing shutdown of server, please close window"
 msgstr "Wykonano wyłączenie serwera, proszę zamknąć okno"
 
-#: cps/admin.py:154
+#: cps/admin.py:157
 msgid "Reconnect successful"
 msgstr "Ponowne połączenie zakończono sukcesem"
 
-#: cps/admin.py:157
+#: cps/admin.py:160
 msgid "Unknown command"
 msgstr "Nieznane polecenie"
 
 # ???
-#: cps/admin.py:167 cps/editbooks.py:636 cps/editbooks.py:648
-#: cps/editbooks.py:751 cps/editbooks.py:753 cps/editbooks.py:814
-#: cps/editbooks.py:830 cps/updater.py:510 cps/uploader.py:90
+#: cps/admin.py:170 cps/editbooks.py:642 cps/editbooks.py:654
+#: cps/editbooks.py:757 cps/editbooks.py:759 cps/editbooks.py:820
+#: cps/editbooks.py:836 cps/updater.py:510 cps/uploader.py:90
 #: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: cps/admin.py:188
+#: cps/admin.py:191
 msgid "Admin page"
 msgstr "Panel administratora"
 
-#: cps/admin.py:210
+#: cps/admin.py:213
 msgid "UI Configuration"
 msgstr "Konfiguracja Interfejsu"
 
-#: cps/admin.py:242 cps/admin.py:954
+#: cps/admin.py:245 cps/admin.py:923
 msgid "Calibre-Web configuration updated"
 msgstr "Konfiguracja Calibre-Web została zaktualizowana"
 
-#: cps/admin.py:253
+#: cps/admin.py:256
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Czy na pewno chcesz usunąć Token Kobo?"
 
-#: cps/admin.py:255
+#: cps/admin.py:258
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:257
+#: cps/admin.py:260
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:259 cps/templates/shelf.html:90
+#: cps/admin.py:262 cps/templates/shelf.html:90
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Czy na pewno chcesz usunąć półkę?"
 
-#: cps/admin.py:545 cps/admin.py:551 cps/admin.py:561 cps/admin.py:571
+#: cps/admin.py:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534
 #: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Zabroń"
 
-#: cps/admin.py:547 cps/admin.py:553 cps/admin.py:563 cps/admin.py:573
+#: cps/admin.py:510 cps/admin.py:516 cps/admin.py:526 cps/admin.py:536
 #: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Zezwalaj"
 
-#: cps/admin.py:713
+#: cps/admin.py:679
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json nie został skonfigurowany dla aplikacji webowej"
 
-#: cps/admin.py:753
+#: cps/admin.py:721
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Lokalizacja pliku dziennika jest nieprawidłowa, wprowadź poprawną ścieżkę"
 
-#: cps/admin.py:759
+#: cps/admin.py:727
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Lokalizacja pliku dziennika dostępu jest nieprawidłowa, wprowadź poprawną ścieżkę"
 
-#: cps/admin.py:788
+#: cps/admin.py:757
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Wprowadź dostawcę LDAP, port, nazwę wyróżniającą i identyfikator obiektu użytkownika"
 
-#: cps/admin.py:803
+#: cps/admin.py:772
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "Filtr obiektów grupy LDAP musi mieć jeden identyfikator formatu \"% s\""
 
-#: cps/admin.py:806
+#: cps/admin.py:775
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Filtr obiektów grupy LDAP ma niedopasowany nawias"
 
-#: cps/admin.py:811
+#: cps/admin.py:780
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Filtr obiektów użytkownika LDAP musi mieć jeden identyfikator formatu \"% s\""
 
-#: cps/admin.py:814
+#: cps/admin.py:783
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Filtr obiektów użytkownika LDAP ma niedopasowany nawias"
 
-#: cps/admin.py:822
+#: cps/admin.py:791
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:825
+#: cps/admin.py:794
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:833
+#: cps/admin.py:802
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:859
+#: cps/admin.py:828
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "Lokalizacja pliku klucza jest nieprawidłowa, wprowadź poprawną ścieżkę"
 
-#: cps/admin.py:865
+#: cps/admin.py:834
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Lokalizacja pliku certyfikatu jest nieprawidłowa, wprowadź poprawną ścieżkę"
 
-#: cps/admin.py:935 cps/admin.py:1039 cps/admin.py:1135 cps/admin.py:1184
-#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:258
-#: cps/shelf.py:307 cps/shelf.py:339 cps/shelf.py:371 cps/shelf.py:442
+#: cps/admin.py:904 cps/admin.py:1011 cps/admin.py:1100 cps/admin.py:1149
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:261
+#: cps/shelf.py:314 cps/shelf.py:348 cps/shelf.py:418
 msgid "Settings DB is not Writeable"
 msgstr "Baza danych ustawień nie jest zapisywalna"
 
-#: cps/admin.py:947
+#: cps/admin.py:916
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "Lokalizacja bazy danych jest nieprawidłowa, wprowadź poprawną ścieżkę"
 
-#: cps/admin.py:951
+#: cps/admin.py:920
 msgid "DB is not Writeable"
 msgstr "Baza danych nie jest zapisywalna"
 
-#: cps/admin.py:984
+#: cps/admin.py:959
 msgid "Basic Configuration"
 msgstr "Konfiguracja podstawowa"
 
-#: cps/admin.py:999 cps/web.py:1287
+#: cps/admin.py:974 cps/web.py:1275
 msgid "Please fill out all fields!"
 msgstr "Proszę wypełnić wszystkie pola!"
 
-#: cps/admin.py:1002 cps/admin.py:1014 cps/admin.py:1020 cps/admin.py:1153
+#: cps/admin.py:977 cps/admin.py:989 cps/admin.py:995 cps/admin.py:1118
 msgid "Add new user"
 msgstr "Dodaj nowego użytkownika"
 
-#: cps/admin.py:1011 cps/web.py:1451
+#: cps/admin.py:986 cps/web.py:1439
 msgid "E-mail is not from valid domain"
 msgstr "E-mail nie pochodzi z prawidłowej domeny"
 
-#: cps/admin.py:1018 cps/admin.py:1036
+#: cps/admin.py:993 cps/admin.py:1008
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Znaleziono istniejące konto dla tego adresu e-mail lub pseudonimu."
 
-#: cps/admin.py:1032
+#: cps/admin.py:1004
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Użytkownik '%(user)s' został utworzony"
 
-#: cps/admin.py:1051
+#: cps/admin.py:1020
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Użytkownik '%(nick)s' został usunięty"
 
-#: cps/admin.py:1054
+#: cps/admin.py:1023
 msgid "No admin user remaining, can't delete user"
 msgstr "Nie można usunąć użytkownika. Brak na serwerze innego konta z prawami administratora"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1028
 msgid "No admin user remaining, can't remove admin role"
 msgstr "Nie można odebrać praw administratora. Brak na serwerze innego konta z prawami administratora"
 
-#: cps/admin.py:1096 cps/web.py:1493
+#: cps/admin.py:1064 cps/web.py:1481
 msgid "Found an existing account for this e-mail address."
 msgstr "Znaleziono istniejące konto dla tego adresu e-mail."
 
-#: cps/admin.py:1105 cps/admin.py:1119 cps/admin.py:1225 cps/web.py:1469
+#: cps/admin.py:1073 cps/admin.py:1087 cps/admin.py:1190 cps/web.py:1457
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Edytuj użytkownika %(nick)s"
 
-#: cps/admin.py:1111 cps/web.py:1462
+#: cps/admin.py:1079 cps/web.py:1450
 msgid "This username is already taken"
 msgstr "Nazwa użytkownika jest już zajęta"
 
-#: cps/admin.py:1129
+#: cps/admin.py:1094
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Użytkownik '%(nick)s' został zaktualizowany"
 
-#: cps/admin.py:1132
+#: cps/admin.py:1097
 msgid "An unknown error occured."
 msgstr "Wystąpił nieznany błąd."
 
-#: cps/admin.py:1162 cps/templates/admin.html:78
+#: cps/admin.py:1127 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "Zmień ustawienia SMTP"
 
-#: cps/admin.py:1191
+#: cps/admin.py:1156
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Testowy e-mail pomyślnie przesłany do %(kindlemail)s"
 
-#: cps/admin.py:1194
+#: cps/admin.py:1159
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Wystąpił błąd podczas wysyłania e-maila testowego: %(res)s"
 
-#: cps/admin.py:1196
+#: cps/admin.py:1161
 msgid "Please configure your e-mail address first..."
 msgstr "Najpierw skonfiguruj swój adres e-mail..."
 
-#: cps/admin.py:1198
+#: cps/admin.py:1163
 msgid "E-mail server settings updated"
 msgstr "Zaktualizowano ustawienia serwera poczty e-mail"
 
-#: cps/admin.py:1209
+#: cps/admin.py:1174
 msgid "User not found"
 msgstr "Nie znaleziono użytkownika"
 
 # ???
-#: cps/admin.py:1236
+#: cps/admin.py:1201
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Zrestartowano hasło użytkownika %(user)s"
 
-#: cps/admin.py:1239 cps/web.py:1311 cps/web.py:1375
+#: cps/admin.py:1204 cps/web.py:1299 cps/web.py:1363
 msgid "An unknown error occurred. Please try again later."
 msgstr "Wystąpił nieznany błąd. Spróbuj ponownie później."
 
-#: cps/admin.py:1242 cps/web.py:1249
+#: cps/admin.py:1207 cps/web.py:1237
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Proszę najpierw skonfigurować ustawienia SMTP poczty e-mail..."
 
-#: cps/admin.py:1254
+#: cps/admin.py:1218
 msgid "Logfile viewer"
 msgstr "Przeglądanie dziennika"
 
-#: cps/admin.py:1315
+#: cps/admin.py:1280
 msgid "Requesting update package"
 msgstr "Żądanie o pakiet aktualizacji"
 
-#: cps/admin.py:1316
+#: cps/admin.py:1281
 msgid "Downloading update package"
 msgstr "Pobieranie pakietu aktualizacji"
 
-#: cps/admin.py:1317
+#: cps/admin.py:1282
 msgid "Unzipping update package"
 msgstr "Rozpakowywanie pakietu aktualizacji"
 
 # ???
-#: cps/admin.py:1318
+#: cps/admin.py:1283
 msgid "Replacing files"
 msgstr "Zastępowanie plików"
 
-#: cps/admin.py:1319
+#: cps/admin.py:1284
 msgid "Database connections are closed"
 msgstr "Połączenia z bazą danych zostały zakończone"
 
-#: cps/admin.py:1320
+#: cps/admin.py:1285
 msgid "Stopping server"
 msgstr "Zatrzymywanie serwera"
 
-#: cps/admin.py:1321
+#: cps/admin.py:1286
 msgid "Update finished, please press okay and reload page"
 msgstr "Aktualizacja zakończona, proszę nacisnąć OK i odświeżyć stronę"
 
-#: cps/admin.py:1322 cps/admin.py:1323 cps/admin.py:1324 cps/admin.py:1325
-#: cps/admin.py:1326
+#: cps/admin.py:1287 cps/admin.py:1288 cps/admin.py:1289 cps/admin.py:1290
+#: cps/admin.py:1291
 msgid "Update failed:"
 msgstr "Aktualizacja nieudana:"
 
-#: cps/admin.py:1322 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+#: cps/admin.py:1287 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "Błąd HTTP"
 
-#: cps/admin.py:1323 cps/updater.py:322 cps/updater.py:525
+#: cps/admin.py:1288 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Błąd połączenia"
 
-#: cps/admin.py:1324 cps/updater.py:324 cps/updater.py:527
+#: cps/admin.py:1289 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Przekroczono limit czasu podczas nawiązywania połączenia"
 
-#: cps/admin.py:1325 cps/updater.py:326 cps/updater.py:529
+#: cps/admin.py:1290 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Błąd ogólny"
 
-#: cps/admin.py:1326
+#: cps/admin.py:1291
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr "Plik aktualizacji nie mógł zostać zapisany w katalogu tymczasowym"
 
-#: cps/admin.py:1351
+#: cps/admin.py:1316
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Błąd: %(ldaperror)s"
 
-#: cps/admin.py:1355
+#: cps/admin.py:1320
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Błąd. LDAP nie zwrócił żadnego użytkownika"
 
-#: cps/admin.py:1421
+#: cps/admin.py:1386
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Błąd przy tworzeniu przynajmniej jednego użytkownika LDAP"
 
-#: cps/admin.py:1424
+#: cps/admin.py:1389
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "Przynajmniej jeden użytkownik LDAP nie został znaleziony w bazie danych"
 
-#: cps/admin.py:1426
+#: cps/admin.py:1391
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -357,90 +357,90 @@ msgstr "Plik książki w wybranym formacie został usunięty"
 msgid "Book Successfully Deleted"
 msgstr "Książka została usunięta"
 
-#: cps/editbooks.py:317 cps/editbooks.py:620 cps/web.py:1521 cps/web.py:1554
-#: cps/web.py:1625
+#: cps/editbooks.py:316 cps/editbooks.py:626 cps/web.py:1509 cps/web.py:1542
+#: cps/web.py:1613
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Błąd podczas otwierania e-booka. Plik nie istnieje lub jest niedostępny"
 
-#: cps/editbooks.py:351
+#: cps/editbooks.py:350
 msgid "edit metadata"
 msgstr "edytuj metadane"
 
-#: cps/editbooks.py:426
+#: cps/editbooks.py:425
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s nie jest prawidłowym językiem"
 
-#: cps/editbooks.py:537 cps/editbooks.py:796
+#: cps/editbooks.py:536 cps/editbooks.py:802
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Rozszerzenie pliku '%(ext)s' nie jest dozwolone do wysłania na ten serwer"
 
-#: cps/editbooks.py:541 cps/editbooks.py:800
+#: cps/editbooks.py:540 cps/editbooks.py:806
 msgid "File to be uploaded must have an extension"
 msgstr "Plik do wysłania musi mieć rozszerzenie"
 
-#: cps/editbooks.py:553
+#: cps/editbooks.py:552
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Nie udało się utworzyć łącza %(path)s (Odmowa dostępu)."
 
-#: cps/editbooks.py:558
+#: cps/editbooks.py:557
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Nie można zapisać pliku %(file)s."
 
-#: cps/editbooks.py:576 cps/editbooks.py:931 cps/web.py:1498
+#: cps/editbooks.py:575 cps/editbooks.py:937 cps/web.py:1486
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "Błąd bazy danych: %(error)s."
 
-#: cps/editbooks.py:580
+#: cps/editbooks.py:579
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Format pliku %(ext)s dodany do %(book)s"
 
-#: cps/editbooks.py:700
+#: cps/editbooks.py:706
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:737
+#: cps/editbooks.py:743
 msgid "Metadata successfully updated"
 msgstr "Metadane zostały pomyślnie zaktualizowane"
 
-#: cps/editbooks.py:746
+#: cps/editbooks.py:752
 msgid "Error editing book, please check logfile for details"
 msgstr "Błąd podczas edycji książki, sprawdź plik dziennika, aby uzyskać szczegółowe informacje"
 
-#: cps/editbooks.py:808
+#: cps/editbooks.py:814
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "Nie można zapisać pliku %(filename)s w katalogu tymczasowym"
 
-#: cps/editbooks.py:818
+#: cps/editbooks.py:824
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Wysłana książka prawdopodobnie istnieje w bibliotece, rozważ zmianę przed przesłaniem nowej: "
 
-#: cps/editbooks.py:906
+#: cps/editbooks.py:912
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "Nie udało się przenieść pliku okładki %(file)s:%(error)s"
 
-#: cps/editbooks.py:917
+#: cps/editbooks.py:923
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Wysłano plik %(file)s"
 
-#: cps/editbooks.py:943
+#: cps/editbooks.py:949
 msgid "Source or destination format for conversion missing"
 msgstr "Brak formatu źródłowego lub docelowego do konwersji"
 
-#: cps/editbooks.py:951
+#: cps/editbooks.py:957
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Książka została pomyślnie umieszczona w zadaniach do konwersji %(book_format)s"
 
-#: cps/editbooks.py:955
+#: cps/editbooks.py:961
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Podczas konwersji książki wystąpił błąd: %(res)s"
@@ -603,86 +603,86 @@ msgstr "Zakończone"
 msgid "Unknown Status"
 msgstr "Ststus nieznany"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Aby uzyskać prawidłowy api_endpoint dla urządzenia Kobo, należy skorzystać z dostępu do calibre-web spoza localhost"
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:157
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
 msgid "Kobo Setup"
 msgstr "Konfiguracja Kobo"
 
 # ???
-#: cps/oauth_bb.py:74
+#: cps/oauth_bb.py:73
 #, python-format
 msgid "Register with %(provider)s"
 msgstr "Zarejestruj się %(provider)s"
 
-#: cps/oauth_bb.py:158
+#: cps/oauth_bb.py:146
 msgid "Failed to log in with GitHub."
 msgstr "Nie udało się zalogować za pomocą GitHub."
 
-#: cps/oauth_bb.py:163
+#: cps/oauth_bb.py:151
 msgid "Failed to fetch user info from GitHub."
 msgstr "Nie udało się pobrać informacji o użytkowniku z GitHub."
 
-#: cps/oauth_bb.py:174
+#: cps/oauth_bb.py:162
 msgid "Failed to log in with Google."
 msgstr "Nie udało się zalogować do Google."
 
-#: cps/oauth_bb.py:179
+#: cps/oauth_bb.py:167
 msgid "Failed to fetch user info from Google."
 msgstr "Nie udało się pobrać informacji o użytkowniku z Google."
 
-#: cps/oauth_bb.py:229 cps/remotelogin.py:134 cps/web.py:1347
+#: cps/oauth_bb.py:213 cps/remotelogin.py:133 cps/web.py:1335
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "zalogowałeś się jako: '%(nickname)s'"
 
-#: cps/oauth_bb.py:239
+#: cps/oauth_bb.py:223
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr "Łączenie z %(oauth)s zakończono sukcesem"
 
-#: cps/oauth_bb.py:245
+#: cps/oauth_bb.py:229
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr "Błąd logowania, użytkownik niepołączony z kontem OAuth"
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:271
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr "Rozłączanie z %(oauth)s zakończono sukcesem"
 
-#: cps/oauth_bb.py:291
+#: cps/oauth_bb.py:275
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr "Rozłączanie z %(oauth)s zakończono porażką"
 
-#: cps/oauth_bb.py:294
+#: cps/oauth_bb.py:278
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:322
+#: cps/oauth_bb.py:306
 msgid "GitHub Oauth error, please retry later."
 msgstr "Błąd GitHub Oauth, proszę spróbować później."
 
-#: cps/oauth_bb.py:341
+#: cps/oauth_bb.py:325
 msgid "Google Oauth error, please retry later."
 msgstr "Błąd Google Oauth, proszę spróbować później."
 
-#: cps/remotelogin.py:66 cps/web.py:1394
+#: cps/remotelogin.py:65 cps/web.py:1382
 msgid "login"
 msgstr "logowanie"
 
-#: cps/remotelogin.py:78 cps/remotelogin.py:112
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
 msgid "Token not found"
 msgstr "Nie znaleziono tokenu"
 
-#: cps/remotelogin.py:87 cps/remotelogin.py:120
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
 msgid "Token has expired"
 msgstr "Token wygasł"
 
-#: cps/remotelogin.py:96
+#: cps/remotelogin.py:95
 msgid "Success! Please return to your device"
 msgstr "Powodzenie! Wróć do swojego urządzenia"
 
@@ -710,7 +710,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:388
+#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:376
 msgid "Top Rated Books"
 msgstr "Najwyżej ocenione"
 
@@ -719,7 +719,7 @@ msgid "Show Top Rated Books"
 msgstr "Pokaż menu najwyżej ocenionych książek"
 
 #: cps/render_template.py:53 cps/templates/index.xml:46
-#: cps/templates/index.xml:50 cps/web.py:648
+#: cps/templates/index.xml:50 cps/web.py:636
 msgid "Read Books"
 msgstr "Przeczytane"
 
@@ -728,7 +728,7 @@ msgid "Show read and unread"
 msgstr "Pokaż menu przeczytane i nieprzeczytane"
 
 #: cps/render_template.py:57 cps/templates/index.xml:53
-#: cps/templates/index.xml:57 cps/web.py:651
+#: cps/templates/index.xml:57 cps/web.py:639
 msgid "Unread Books"
 msgstr "Nieprzeczytane"
 
@@ -745,7 +745,7 @@ msgid "Show random books"
 msgstr "Pokaż menu losowych książek"
 
 #: cps/render_template.py:63 cps/templates/book_table.html:50
-#: cps/templates/index.xml:75 cps/web.py:953
+#: cps/templates/index.xml:75 cps/web.py:941
 msgid "Categories"
 msgstr "Kategorie"
 
@@ -755,7 +755,7 @@ msgstr "Pokaż menu wyboru kategorii"
 
 #: cps/render_template.py:66 cps/templates/book_edit.html:84
 #: cps/templates/book_table.html:51 cps/templates/index.xml:82
-#: cps/templates/search_form.html:62 cps/web.py:857 cps/web.py:867
+#: cps/templates/search_form.html:62 cps/web.py:845 cps/web.py:855
 msgid "Series"
 msgstr "Cykle"
 
@@ -773,7 +773,7 @@ msgid "Show author selection"
 msgstr "Pokaż menu wyboru autora"
 
 #: cps/render_template.py:73 cps/templates/book_table.html:55
-#: cps/templates/index.xml:68 cps/web.py:836
+#: cps/templates/index.xml:68 cps/web.py:824
 msgid "Publishers"
 msgstr "Wydawcy"
 
@@ -782,7 +782,7 @@ msgid "Show publisher selection"
 msgstr "Pokaż menu wyboru wydawcy"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:53
-#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:932
+#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:920
 msgid "Languages"
 msgstr "Języki"
 
@@ -806,7 +806,7 @@ msgstr "Formaty plików"
 msgid "Show file formats selection"
 msgstr "Pokaż menu formatu plików"
 
-#: cps/render_template.py:87 cps/web.py:675
+#: cps/render_template.py:87 cps/web.py:663
 msgid "Archived Books"
 msgstr "Zarchiwizowane książki"
 
@@ -814,7 +814,7 @@ msgstr "Zarchiwizowane książki"
 msgid "Show archived books"
 msgstr "Pokaż zarchiwizowane książki"
 
-#: cps/render_template.py:91 cps/web.py:746
+#: cps/render_template.py:91 cps/web.py:734
 msgid "Books List"
 msgstr ""
 
@@ -871,49 +871,49 @@ 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: %(sname)s"
 msgstr "Niestety nie możesz usunąć książki z tej półki %(sname)s"
 
-#: cps/shelf.py:238 cps/shelf.py:282
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr "Publiczna półka o nazwie '%(title)s' już istnieje."
+#: cps/shelf.py:224 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "Utwórz półkę"
 
-#: cps/shelf.py:247 cps/shelf.py:292
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr "Prywatna półka o nazwie '%(title)s' już istnieje."
+#: cps/shelf.py:231
+msgid "Edit a shelf"
+msgstr "Edytuj półkę"
 
-#: cps/shelf.py:254
+#: cps/shelf.py:249
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Półka %(title)s została utworzona"
 
-#: cps/shelf.py:261 cps/shelf.py:310
-msgid "There was an error"
-msgstr "Wystąpił błąd"
-
-#: cps/shelf.py:262 cps/shelf.py:264 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "Utwórz półkę"
-
-#: cps/shelf.py:304
+#: cps/shelf.py:252
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Półka %(title)s została zmieniona"
 
-#: cps/shelf.py:311 cps/shelf.py:313
-msgid "Edit a shelf"
-msgstr "Edytuj półkę"
+#: cps/shelf.py:265
+msgid "There was an error"
+msgstr "Wystąpił błąd"
 
-#: cps/shelf.py:381
+#: cps/shelf.py:281
+#, 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:291
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr "Prywatna półka o nazwie '%(title)s' już istnieje."
+
+#: cps/shelf.py:358
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Zmieniono kolejność półki: '%(name)s'"
 
-#: cps/shelf.py:447
+#: cps/shelf.py:423
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Półka: „%(name)s”"
 
-#: cps/shelf.py:451
+#: cps/shelf.py:427
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Błąd otwierania półki. Półka nie istnieje lub jest niedostępna"
 
@@ -946,222 +946,222 @@ msgstr "Dostępna jest nowa aktualizacja. Kliknij przycisk poniżej, aby zaktual
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Kliknij przycisk poniżej, aby zaktualizować do najnowszej stabilnej wersji."
 
-#: cps/templates/index.html:5 cps/web.py:396
+#: cps/templates/index.html:5 cps/web.py:384
 msgid "Discover (Random Books)"
 msgstr "Odkrywaj (losowe książki)"
 
-#: cps/web.py:435
+#: cps/web.py:423
 msgid "Books"
 msgstr "Książki"
 
-#: cps/web.py:460
+#: cps/web.py:448
 msgid "Hot Books (Most Downloaded)"
 msgstr "Najpopularniejsze książki (najczęściej pobierane)"
 
-#: cps/web.py:495
+#: cps/web.py:483
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:509
+#: cps/web.py:497
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Błąd otwierania e-booka. Plik nie istnieje lub jest niedostępny"
 
-#: cps/web.py:523
+#: cps/web.py:511
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autor: %(name)s"
 
-#: cps/web.py:537
+#: cps/web.py:525
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Wydawca: %(name)s"
 
-#: cps/web.py:550
+#: cps/web.py:538
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Cykl: %(serie)s"
 
-#: cps/web.py:563
+#: cps/web.py:551
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Ocena: %(rating)s gwiazdek"
 
-#: cps/web.py:576
+#: cps/web.py:564
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Format pliku: %(format)s"
 
-#: cps/web.py:590
+#: cps/web.py:578
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategoria: %(name)s"
 
-#: cps/web.py:609
+#: cps/web.py:597
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Język: %(name)s"
 
-#: cps/web.py:639
+#: cps/web.py:627
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "Niestandardowa kolumna No.%(column)d nie istnieje w bazie calibre"
 
-#: cps/templates/layout.html:56 cps/web.py:706 cps/web.py:1180
+#: cps/templates/layout.html:56 cps/web.py:694 cps/web.py:1168
 msgid "Advanced Search"
 msgstr "Wyszukiwanie"
 
 #: cps/templates/book_edit.html:214 cps/templates/feed.xml:33
 #: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:175 cps/web.py:718 cps/web.py:990
+#: cps/templates/search_form.html:175 cps/web.py:706 cps/web.py:978
 msgid "Search"
 msgstr "Szukaj"
 
-#: cps/web.py:885
+#: cps/web.py:873
 msgid "Ratings list"
 msgstr "Lista z ocenami"
 
-#: cps/web.py:904
+#: cps/web.py:892
 msgid "File formats list"
 msgstr "Lista formatów"
 
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:967
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:955
 msgid "Tasks"
 msgstr "Zadania"
 
-#: cps/web.py:1053
+#: cps/web.py:1041
 msgid "Published after "
 msgstr "Opublikowane po "
 
-#: cps/web.py:1060
+#: cps/web.py:1048
 msgid "Published before "
 msgstr "Opublikowane przed "
 
-#: cps/web.py:1079
+#: cps/web.py:1067
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Ocena <= %(rating)s"
 
-#: cps/web.py:1081
+#: cps/web.py:1069
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Ocena >= %(rating)s"
 
-#: cps/web.py:1083
+#: cps/web.py:1071
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1254
+#: cps/web.py:1242
 #, 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:1258
+#: cps/web.py:1246
 #, 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:1260
+#: cps/web.py:1248
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Najpierw skonfiguruj adres e-mail Kindle..."
 
-#: cps/web.py:1277
+#: cps/web.py:1265
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Serwer e-mail nie jest skonfigurowany, skontaktuj się z administratorem!"
 
-#: cps/web.py:1278 cps/web.py:1288 cps/web.py:1312 cps/web.py:1316
-#: cps/web.py:1321 cps/web.py:1325
+#: cps/web.py:1266 cps/web.py:1276 cps/web.py:1300 cps/web.py:1304
+#: cps/web.py:1309 cps/web.py:1313
 msgid "register"
 msgstr "rejestracja"
 
-#: cps/web.py:1314
+#: cps/web.py:1302
 msgid "Your e-mail is not allowed to register"
 msgstr "Twój e-mail nie może się zarejestrować"
 
-#: cps/web.py:1317
+#: cps/web.py:1305
 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:1320
+#: cps/web.py:1308
 msgid "This username or e-mail address is already in use."
 msgstr "Ta nazwa użytkownika lub adres e-mail jest już używany."
 
-#: cps/web.py:1337
+#: cps/web.py:1325
 msgid "Cannot activate LDAP authentication"
 msgstr "Nie można aktywować uwierzytelniania LDAP"
 
-#: cps/web.py:1354
+#: cps/web.py:1342
 #, 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:1360
+#: cps/web.py:1348
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Nie można zalogować: %(message)s"
 
-#: cps/web.py:1364 cps/web.py:1388
+#: cps/web.py:1352 cps/web.py:1376
 msgid "Wrong Username or Password"
 msgstr "Błędna nazwa użytkownika lub hasło"
 
-#: cps/web.py:1371
+#: cps/web.py:1359
 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:1377
+#: cps/web.py:1365
 msgid "Please enter valid username to reset password"
 msgstr "Wprowadź prawidłową nazwę użytkownika, aby zresetować hasło"
 
-#: cps/web.py:1383
+#: cps/web.py:1371
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Jesteś teraz zalogowany jako: '%(nickname)s'"
 
-#: cps/web.py:1453 cps/web.py:1506
+#: cps/web.py:1441 cps/web.py:1494
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil użytkownika %(name)s"
 
-#: cps/web.py:1489
+#: cps/web.py:1477
 msgid "Profile updated"
 msgstr "Zaktualizowano profil"
 
-#: cps/web.py:1533 cps/web.py:1536 cps/web.py:1539 cps/web.py:1546
-#: cps/web.py:1551
+#: cps/web.py:1521 cps/web.py:1524 cps/web.py:1527 cps/web.py:1534
+#: cps/web.py:1539
 msgid "Read a Book"
 msgstr "Czytaj książkę"
 
-#: cps/tasks/convert.py:108
+#: cps/tasks/convert.py:114
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Nie znaleziono narzędzia calibre %(tool)s do konwertowania"
 
-#: cps/tasks/convert.py:132
+#: cps/tasks/convert.py:138
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:136
+#: cps/tasks/convert.py:142
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:146
+#: cps/tasks/convert.py:152
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Kepubify-converter spowodowało błąd: %(error)s"
 
-#: cps/tasks/convert.py:170
+#: cps/tasks/convert.py:176
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr "Konwertowany plik nie został znaleziony, lub więcej niż jeden plik w folderze %(folder)s"
 
-#: cps/tasks/convert.py:193
+#: cps/tasks/convert.py:199
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Konwertowanie nie powiodło się: %(error)s"
 
-#: cps/tasks/convert.py:218
+#: cps/tasks/convert.py:224
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
diff --git a/cps/translations/ru/LC_MESSAGES/messages.mo b/cps/translations/ru/LC_MESSAGES/messages.mo
index 7367a756..913bc5d3 100644
Binary files a/cps/translations/ru/LC_MESSAGES/messages.mo and b/cps/translations/ru/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/ru/LC_MESSAGES/messages.po b/cps/translations/ru/LC_MESSAGES/messages.po
index 925f384e..948137c2 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-01-02 19:37+0100\n"
+"POT-Creation-Date: 2021-01-17 11:34+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:42
 msgid "installed"
@@ -31,310 +31,310 @@ msgstr "не установлено"
 msgid "Statistics"
 msgstr "Статистика"
 
-#: cps/admin.py:144
+#: cps/admin.py:147
 msgid "Server restarted, please reload page"
 msgstr "Сервер перезагружен, пожалуйста, обновите страницу"
 
-#: cps/admin.py:146
+#: cps/admin.py:149
 msgid "Performing shutdown of server, please close window"
 msgstr "Производится остановка сервера, пожалуйста, закройте окно"
 
-#: cps/admin.py:154
+#: cps/admin.py:157
 msgid "Reconnect successful"
 msgstr "Успешно переподключено"
 
-#: cps/admin.py:157
+#: cps/admin.py:160
 msgid "Unknown command"
 msgstr "Неизвестная команда"
 
-#: cps/admin.py:167 cps/editbooks.py:636 cps/editbooks.py:648
-#: cps/editbooks.py:751 cps/editbooks.py:753 cps/editbooks.py:814
-#: cps/editbooks.py:830 cps/updater.py:510 cps/uploader.py:90
+#: cps/admin.py:170 cps/editbooks.py:642 cps/editbooks.py:654
+#: cps/editbooks.py:757 cps/editbooks.py:759 cps/editbooks.py:820
+#: cps/editbooks.py:836 cps/updater.py:510 cps/uploader.py:90
 #: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Неизвестно"
 
-#: cps/admin.py:188
+#: cps/admin.py:191
 msgid "Admin page"
 msgstr "Администрирование"
 
-#: cps/admin.py:210
+#: cps/admin.py:213
 msgid "UI Configuration"
 msgstr "Настройка интерфейса"
 
-#: cps/admin.py:242 cps/admin.py:954
+#: cps/admin.py:245 cps/admin.py:923
 msgid "Calibre-Web configuration updated"
 msgstr "Конфигурация Calibre-Web обновлена"
 
-#: cps/admin.py:253
+#: cps/admin.py:256
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Вы действительно хотите удалить Kobo Token ?"
 
-#: cps/admin.py:255
+#: cps/admin.py:258
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:257
+#: cps/admin.py:260
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:259 cps/templates/shelf.html:90
+#: cps/admin.py:262 cps/templates/shelf.html:90
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Вы действительно хотите удалить эту книжную полку?"
 
-#: cps/admin.py:545 cps/admin.py:551 cps/admin.py:561 cps/admin.py:571
+#: cps/admin.py:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534
 #: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Запретить"
 
-#: cps/admin.py:547 cps/admin.py:553 cps/admin.py:563 cps/admin.py:573
+#: cps/admin.py:510 cps/admin.py:516 cps/admin.py:526 cps/admin.py:536
 #: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Разрешить"
 
-#: cps/admin.py:713
+#: cps/admin.py:679
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json не настроен для веб-приложения"
 
-#: cps/admin.py:753
+#: cps/admin.py:721
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Неправильное расположение файла журнала, пожалуйста, введите правильный путь."
 
-#: cps/admin.py:759
+#: cps/admin.py:727
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "Недопустимое расположение файла журнала доступа, пожалуйста, введите правильный путь"
 
-#: cps/admin.py:788
+#: cps/admin.py:757
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "Пожалуйста, введите провайдера LDAP, порт, DN и идентификатор объекта пользователя"
 
-#: cps/admin.py:803
+#: cps/admin.py:772
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "Фильтр объектов группы LDAP должен иметь один идентификатор формата \"%s\""
 
-#: cps/admin.py:806
+#: cps/admin.py:775
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "Фильтр объектов группы LDAP имеет незавершённые круглые скобки"
 
-#: cps/admin.py:811
+#: cps/admin.py:780
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "Фильтр объектов пользователя LDAP должен иметь один идентификатор формата \"%s\""
 
-#: cps/admin.py:814
+#: cps/admin.py:783
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "Фильтр объектов пользователя LDAP имеет незавершенную круглую скобку"
 
-#: cps/admin.py:822
+#: cps/admin.py:791
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:825
+#: cps/admin.py:794
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:833
+#: cps/admin.py:802
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:859
+#: cps/admin.py:828
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "Расположение ключевого файла неверно, пожалуйста, введите правильный путь"
 
-#: cps/admin.py:865
+#: cps/admin.py:834
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "Расположение Certfile не является действительным, пожалуйста, введите правильный путь"
 
-#: cps/admin.py:935 cps/admin.py:1039 cps/admin.py:1135 cps/admin.py:1184
-#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:258
-#: cps/shelf.py:307 cps/shelf.py:339 cps/shelf.py:371 cps/shelf.py:442
+#: cps/admin.py:904 cps/admin.py:1011 cps/admin.py:1100 cps/admin.py:1149
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:261
+#: cps/shelf.py:314 cps/shelf.py:348 cps/shelf.py:418
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:947
+#: cps/admin.py:916
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "Расположение Базы Данных неверно, пожалуйста, введите правильный путь."
 
-#: cps/admin.py:951
+#: cps/admin.py:920
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:984
+#: cps/admin.py:959
 msgid "Basic Configuration"
 msgstr "Настройки сервера"
 
-#: cps/admin.py:999 cps/web.py:1287
+#: cps/admin.py:974 cps/web.py:1275
 msgid "Please fill out all fields!"
 msgstr "Пожалуйста, заполните все поля!"
 
-#: cps/admin.py:1002 cps/admin.py:1014 cps/admin.py:1020 cps/admin.py:1153
+#: cps/admin.py:977 cps/admin.py:989 cps/admin.py:995 cps/admin.py:1118
 msgid "Add new user"
 msgstr "Добавить пользователя"
 
-#: cps/admin.py:1011 cps/web.py:1451
+#: cps/admin.py:986 cps/web.py:1439
 msgid "E-mail is not from valid domain"
 msgstr "E-mail не из существующей доменной зоны"
 
-#: cps/admin.py:1018 cps/admin.py:1036
+#: cps/admin.py:993 cps/admin.py:1008
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Для этого адреса электронной почты или логина уже есть учётная запись."
 
-#: cps/admin.py:1032
+#: cps/admin.py:1004
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Пользователь '%(user)s' добавлен"
 
-#: cps/admin.py:1051
+#: cps/admin.py:1020
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Пользователь '%(nick)s' удалён"
 
-#: cps/admin.py:1054
+#: cps/admin.py:1023
 msgid "No admin user remaining, can't delete user"
 msgstr "Это последний администратор, невозможно удалить пользователя"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1028
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:1096 cps/web.py:1493
+#: cps/admin.py:1064 cps/web.py:1481
 msgid "Found an existing account for this e-mail address."
 msgstr "Этот адрес электронной почты уже зарегистрирован."
 
-#: cps/admin.py:1105 cps/admin.py:1119 cps/admin.py:1225 cps/web.py:1469
+#: cps/admin.py:1073 cps/admin.py:1087 cps/admin.py:1190 cps/web.py:1457
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Изменить пользователя %(nick)s"
 
-#: cps/admin.py:1111 cps/web.py:1462
+#: cps/admin.py:1079 cps/web.py:1450
 msgid "This username is already taken"
 msgstr "Это имя пользователя уже занято"
 
-#: cps/admin.py:1129
+#: cps/admin.py:1094
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Пользователь '%(nick)s' обновлён"
 
-#: cps/admin.py:1132
+#: cps/admin.py:1097
 msgid "An unknown error occured."
 msgstr "Произошла неизвестная ошибка."
 
-#: cps/admin.py:1162 cps/templates/admin.html:78
+#: cps/admin.py:1127 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "Изменить настройки SMTP"
 
-#: cps/admin.py:1191
+#: cps/admin.py:1156
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Тестовое письмо успешно отправлено на %(kindlemail)s"
 
-#: cps/admin.py:1194
+#: cps/admin.py:1159
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Произошла ошибка при отправке тестового письма на: %(res)s"
 
-#: cps/admin.py:1196
+#: cps/admin.py:1161
 msgid "Please configure your e-mail address first..."
 msgstr "Пожалуйста, сначала настройте свой адрес электронной почты ..."
 
-#: cps/admin.py:1198
+#: cps/admin.py:1163
 msgid "E-mail server settings updated"
 msgstr "Настройки E-mail сервера обновлены"
 
-#: cps/admin.py:1209
+#: cps/admin.py:1174
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:1236
+#: cps/admin.py:1201
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Пароль для пользователя %(user)s сброшен"
 
-#: cps/admin.py:1239 cps/web.py:1311 cps/web.py:1375
+#: cps/admin.py:1204 cps/web.py:1299 cps/web.py:1363
 msgid "An unknown error occurred. Please try again later."
 msgstr "Неизвестная ошибка. Попробуйте позже."
 
-#: cps/admin.py:1242 cps/web.py:1249
+#: cps/admin.py:1207 cps/web.py:1237
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Пожалуйста, сперва настройте параметры SMTP....."
 
-#: cps/admin.py:1254
+#: cps/admin.py:1218
 msgid "Logfile viewer"
 msgstr "Просмотр лога"
 
-#: cps/admin.py:1315
+#: cps/admin.py:1280
 msgid "Requesting update package"
 msgstr "Проверка обновлений"
 
-#: cps/admin.py:1316
+#: cps/admin.py:1281
 msgid "Downloading update package"
 msgstr "Загрузка обновлений"
 
-#: cps/admin.py:1317
+#: cps/admin.py:1282
 msgid "Unzipping update package"
 msgstr "Распаковка обновлений"
 
-#: cps/admin.py:1318
+#: cps/admin.py:1283
 msgid "Replacing files"
 msgstr "Замена файлов"
 
-#: cps/admin.py:1319
+#: cps/admin.py:1284
 msgid "Database connections are closed"
 msgstr "Соединения с базой данных закрыты"
 
-#: cps/admin.py:1320
+#: cps/admin.py:1285
 msgid "Stopping server"
 msgstr "Остановка сервера"
 
-#: cps/admin.py:1321
+#: cps/admin.py:1286
 msgid "Update finished, please press okay and reload page"
 msgstr "Обновления установлены, нажмите ок и перезагрузите страницу"
 
-#: cps/admin.py:1322 cps/admin.py:1323 cps/admin.py:1324 cps/admin.py:1325
-#: cps/admin.py:1326
+#: cps/admin.py:1287 cps/admin.py:1288 cps/admin.py:1289 cps/admin.py:1290
+#: cps/admin.py:1291
 msgid "Update failed:"
 msgstr "Ошибка обновления:"
 
-#: cps/admin.py:1322 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+#: cps/admin.py:1287 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "Ошибка HTTP"
 
-#: cps/admin.py:1323 cps/updater.py:322 cps/updater.py:525
+#: cps/admin.py:1288 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Ошибка соединения"
 
-#: cps/admin.py:1324 cps/updater.py:324 cps/updater.py:527
+#: cps/admin.py:1289 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Тайм-аут при установлении соединения"
 
-#: cps/admin.py:1325 cps/updater.py:326 cps/updater.py:529
+#: cps/admin.py:1290 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Общая ошибка"
 
-#: cps/admin.py:1326
+#: cps/admin.py:1291
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr "Не удалось сохранить файл обновления во временной папке."
 
-#: cps/admin.py:1351
+#: cps/admin.py:1316
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "Ошибка: %(ldaperror)s"
 
-#: cps/admin.py:1355
+#: cps/admin.py:1320
 msgid "Error: No user returned in response of LDAP server"
 msgstr "Ошибка: ни одного пользователя не найдено в ответ на запрос сервер LDAP"
 
-#: cps/admin.py:1421
+#: cps/admin.py:1386
 msgid "Failed to Create at Least One LDAP User"
 msgstr "Не удалось создать хотя бы одного пользователя LDAP"
 
-#: cps/admin.py:1424
+#: cps/admin.py:1389
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "По крайней мере, один пользователь LDAP не найден в базе данных"
 
-#: cps/admin.py:1426
+#: cps/admin.py:1391
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -354,90 +354,90 @@ msgstr ""
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:317 cps/editbooks.py:620 cps/web.py:1521 cps/web.py:1554
-#: cps/web.py:1625
+#: cps/editbooks.py:316 cps/editbooks.py:626 cps/web.py:1509 cps/web.py:1542
+#: cps/web.py:1613
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Ошибка при открытии eBook. Файл не существует или файл недоступен"
 
-#: cps/editbooks.py:351
+#: cps/editbooks.py:350
 msgid "edit metadata"
 msgstr "изменить метаданные"
 
-#: cps/editbooks.py:426
+#: cps/editbooks.py:425
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s не допустимый язык"
 
-#: cps/editbooks.py:537 cps/editbooks.py:796
+#: cps/editbooks.py:536 cps/editbooks.py:802
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Запрещена загрузка файлов с расширением '%(ext)s'"
 
-#: cps/editbooks.py:541 cps/editbooks.py:800
+#: cps/editbooks.py:540 cps/editbooks.py:806
 msgid "File to be uploaded must have an extension"
 msgstr "Загружаемый файл должен иметь расширение"
 
-#: cps/editbooks.py:553
+#: cps/editbooks.py:552
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Ошибка при создании пути %(path)s (Доступ запрещён)."
 
-#: cps/editbooks.py:558
+#: cps/editbooks.py:557
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Не удалось сохранить файл %(file)s."
 
-#: cps/editbooks.py:576 cps/editbooks.py:931 cps/web.py:1498
+#: cps/editbooks.py:575 cps/editbooks.py:937 cps/web.py:1486
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:580
+#: cps/editbooks.py:579
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Формат файла %(ext)s добавлен в %(book)s"
 
-#: cps/editbooks.py:700
+#: cps/editbooks.py:706
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:737
+#: cps/editbooks.py:743
 msgid "Metadata successfully updated"
 msgstr "Метаданные обновлены"
 
-#: cps/editbooks.py:746
+#: cps/editbooks.py:752
 msgid "Error editing book, please check logfile for details"
 msgstr "Ошибка редактирования книги. Пожалуйста, проверьте лог-файл для дополнительной информации"
 
-#: cps/editbooks.py:808
+#: cps/editbooks.py:814
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "Файл %(filename)s не удалось сохранить во временную папку"
 
-#: cps/editbooks.py:818
+#: cps/editbooks.py:824
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Загруженная книга, вероятно, существует в библиотеке, перед тем как загрузить новую, рассмотрите возможность изменения: "
 
-#: cps/editbooks.py:906
+#: cps/editbooks.py:912
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:917
+#: cps/editbooks.py:923
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Файл %(file)s загружен"
 
-#: cps/editbooks.py:943
+#: cps/editbooks.py:949
 msgid "Source or destination format for conversion missing"
 msgstr "Исходный или целевой формат для конвертирования отсутствует"
 
-#: cps/editbooks.py:951
+#: cps/editbooks.py:957
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Книга успешно поставлена в очередь для конвертирования в %(book_format)s"
 
-#: cps/editbooks.py:955
+#: cps/editbooks.py:961
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Произошла ошибка при конвертирования этой книги: %(res)s"
@@ -598,85 +598,85 @@ msgstr "Завершено"
 msgid "Unknown Status"
 msgstr "Неизвестный статус"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Пожалуйста, подключитесь к Calibre-Web не с локального хоста, чтобы получить действительный api_endpoint для устройства Kobo"
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:157
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
 msgid "Kobo Setup"
 msgstr "Настройка Kobo"
 
-#: cps/oauth_bb.py:74
+#: cps/oauth_bb.py:73
 #, python-format
 msgid "Register with %(provider)s"
 msgstr "Зарегистрируйтесь с %(provider)s"
 
-#: cps/oauth_bb.py:158
+#: cps/oauth_bb.py:146
 msgid "Failed to log in with GitHub."
 msgstr "Не удалось войти в систему с помощью GitHub."
 
-#: cps/oauth_bb.py:163
+#: cps/oauth_bb.py:151
 msgid "Failed to fetch user info from GitHub."
 msgstr "Не удалось получить информацию о пользователе из GitHub."
 
-#: cps/oauth_bb.py:174
+#: cps/oauth_bb.py:162
 msgid "Failed to log in with Google."
 msgstr "Не удалось войти в систему с помощью Google."
 
-#: cps/oauth_bb.py:179
+#: cps/oauth_bb.py:167
 msgid "Failed to fetch user info from Google."
 msgstr "Не удалось получить информацию о пользователе из Google."
 
-#: cps/oauth_bb.py:229 cps/remotelogin.py:134 cps/web.py:1347
+#: cps/oauth_bb.py:213 cps/remotelogin.py:133 cps/web.py:1335
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "вы вошли как пользователь '%(nickname)s'"
 
-#: cps/oauth_bb.py:239
+#: cps/oauth_bb.py:223
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr "Связь с %(oauth)s Успешна"
 
-#: cps/oauth_bb.py:245
+#: cps/oauth_bb.py:229
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr "Не удалось войти, ни один пользователь не связан с учетной записью OAuth"
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:271
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr "Отмена связи с %(oauth)s успешно"
 
-#: cps/oauth_bb.py:291
+#: cps/oauth_bb.py:275
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr "Связь с %(oauth)s не удалось отмененить"
 
-#: cps/oauth_bb.py:294
+#: cps/oauth_bb.py:278
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:322
+#: cps/oauth_bb.py:306
 msgid "GitHub Oauth error, please retry later."
 msgstr "Ошибка GitHub Oauth, пожалуйста попробуйте позже."
 
-#: cps/oauth_bb.py:341
+#: cps/oauth_bb.py:325
 msgid "Google Oauth error, please retry later."
 msgstr "Ошибка Google Oauth, пожалуйста попробуйте позже."
 
-#: cps/remotelogin.py:66 cps/web.py:1394
+#: cps/remotelogin.py:65 cps/web.py:1382
 msgid "login"
 msgstr "войти"
 
-#: cps/remotelogin.py:78 cps/remotelogin.py:112
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
 msgid "Token not found"
 msgstr "Ключ не найден"
 
-#: cps/remotelogin.py:87 cps/remotelogin.py:120
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
 msgid "Token has expired"
 msgstr "Ключ просрочен"
 
-#: cps/remotelogin.py:96
+#: cps/remotelogin.py:95
 msgid "Success! Please return to your device"
 msgstr "Успешно! Пожалуйста, проверьте свое устройство"
 
@@ -704,7 +704,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:388
+#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:376
 msgid "Top Rated Books"
 msgstr "Книги с наилучшим рейтингом"
 
@@ -713,7 +713,7 @@ msgid "Show Top Rated Books"
 msgstr "Показывать книги с наивысшим рейтингом"
 
 #: cps/render_template.py:53 cps/templates/index.xml:46
-#: cps/templates/index.xml:50 cps/web.py:648
+#: cps/templates/index.xml:50 cps/web.py:636
 msgid "Read Books"
 msgstr "Прочитанные Книги"
 
@@ -722,7 +722,7 @@ msgid "Show read and unread"
 msgstr "Показывать прочитанные и непрочитанные"
 
 #: cps/render_template.py:57 cps/templates/index.xml:53
-#: cps/templates/index.xml:57 cps/web.py:651
+#: cps/templates/index.xml:57 cps/web.py:639
 msgid "Unread Books"
 msgstr "Непрочитанные Книги"
 
@@ -739,7 +739,7 @@ msgid "Show random books"
 msgstr "Показывать случайные книги"
 
 #: cps/render_template.py:63 cps/templates/book_table.html:50
-#: cps/templates/index.xml:75 cps/web.py:953
+#: cps/templates/index.xml:75 cps/web.py:941
 msgid "Categories"
 msgstr "Категории"
 
@@ -749,7 +749,7 @@ msgstr "Показывать выбор категории"
 
 #: cps/render_template.py:66 cps/templates/book_edit.html:84
 #: cps/templates/book_table.html:51 cps/templates/index.xml:82
-#: cps/templates/search_form.html:62 cps/web.py:857 cps/web.py:867
+#: cps/templates/search_form.html:62 cps/web.py:845 cps/web.py:855
 msgid "Series"
 msgstr "Серии"
 
@@ -767,7 +767,7 @@ msgid "Show author selection"
 msgstr "Показывать выбор автора"
 
 #: cps/render_template.py:73 cps/templates/book_table.html:55
-#: cps/templates/index.xml:68 cps/web.py:836
+#: cps/templates/index.xml:68 cps/web.py:824
 msgid "Publishers"
 msgstr "Издатели"
 
@@ -776,7 +776,7 @@ msgid "Show publisher selection"
 msgstr "Показать выбор издателя"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:53
-#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:932
+#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:920
 msgid "Languages"
 msgstr "Языки"
 
@@ -800,7 +800,7 @@ msgstr "Форматы файлов"
 msgid "Show file formats selection"
 msgstr "Показать выбор форматов файлов"
 
-#: cps/render_template.py:87 cps/web.py:675
+#: cps/render_template.py:87 cps/web.py:663
 msgid "Archived Books"
 msgstr ""
 
@@ -808,7 +808,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:91 cps/web.py:746
+#: cps/render_template.py:91 cps/web.py:734
 msgid "Books List"
 msgstr ""
 
@@ -865,49 +865,49 @@ msgstr "Книга удалена с полки: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr "Извините, вы не можете удалить книгу с полки: %(sname)s"
 
-#: cps/shelf.py:238 cps/shelf.py:282
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr "Публичная полка с названием '%(title)s' уже существует."
+#: cps/shelf.py:224 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "Создать полку"
 
-#: cps/shelf.py:247 cps/shelf.py:292
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr "Приватная полка с названием '%(title)s' уже существует."
+#: cps/shelf.py:231
+msgid "Edit a shelf"
+msgstr "Изменить полку"
 
-#: cps/shelf.py:254
+#: cps/shelf.py:249
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Создана полка %(title)s"
 
-#: cps/shelf.py:261 cps/shelf.py:310
-msgid "There was an error"
-msgstr "Произошла ошибка"
-
-#: cps/shelf.py:262 cps/shelf.py:264 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "Создать полку"
-
-#: cps/shelf.py:304
+#: cps/shelf.py:252
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Колка %(title)s изменена"
 
-#: cps/shelf.py:311 cps/shelf.py:313
-msgid "Edit a shelf"
-msgstr "Изменить полку"
+#: cps/shelf.py:265
+msgid "There was an error"
+msgstr "Произошла ошибка"
 
-#: cps/shelf.py:381
+#: cps/shelf.py:281
+#, python-format
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr "Публичная полка с названием '%(title)s' уже существует."
+
+#: cps/shelf.py:291
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr "Приватная полка с названием '%(title)s' уже существует."
+
+#: cps/shelf.py:358
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Изменить расположение полки '%(name)s'"
 
-#: cps/shelf.py:447
+#: cps/shelf.py:423
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Полка: '%(name)s'"
 
-#: cps/shelf.py:451
+#: cps/shelf.py:427
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Ошибка открытия Полки. Полка не существует или недоступна"
 
@@ -940,222 +940,222 @@ msgstr "Новое обновление доступно. Нажмите на к
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Нажмите на кнопку ниже для обновления до последней стабильной версии."
 
-#: cps/templates/index.html:5 cps/web.py:396
+#: cps/templates/index.html:5 cps/web.py:384
 msgid "Discover (Random Books)"
 msgstr "Обзор (Случайные Книги)"
 
-#: cps/web.py:435
+#: cps/web.py:423
 msgid "Books"
 msgstr "Книги"
 
-#: cps/web.py:460
+#: cps/web.py:448
 msgid "Hot Books (Most Downloaded)"
 msgstr "Популярные книги (часто загружаемые)"
 
-#: cps/web.py:495
+#: cps/web.py:483
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:509
+#: cps/web.py:497
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Невозможно открыть книгу. Файл не существует или недоступен"
 
-#: cps/web.py:523
+#: cps/web.py:511
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Автор: %(name)s"
 
-#: cps/web.py:537
+#: cps/web.py:525
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Издатель: %(name)s"
 
-#: cps/web.py:550
+#: cps/web.py:538
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Серии: %(serie)s"
 
-#: cps/web.py:563
+#: cps/web.py:551
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Оценка: %(rating)s звезды(а)"
 
-#: cps/web.py:576
+#: cps/web.py:564
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Формат файла: %(format)s"
 
-#: cps/web.py:590
+#: cps/web.py:578
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Категория: %(name)s"
 
-#: cps/web.py:609
+#: cps/web.py:597
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Язык: %(name)s"
 
-#: cps/web.py:639
+#: cps/web.py:627
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/templates/layout.html:56 cps/web.py:706 cps/web.py:1180
+#: cps/templates/layout.html:56 cps/web.py:694 cps/web.py:1168
 msgid "Advanced Search"
 msgstr "Расширенный поиск"
 
 #: cps/templates/book_edit.html:214 cps/templates/feed.xml:33
 #: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:175 cps/web.py:718 cps/web.py:990
+#: cps/templates/search_form.html:175 cps/web.py:706 cps/web.py:978
 msgid "Search"
 msgstr "Поиск"
 
-#: cps/web.py:885
+#: cps/web.py:873
 msgid "Ratings list"
 msgstr "Список рейтингов"
 
-#: cps/web.py:904
+#: cps/web.py:892
 msgid "File formats list"
 msgstr "Список форматов файлов"
 
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:967
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:955
 msgid "Tasks"
 msgstr "Задания"
 
-#: cps/web.py:1053
+#: cps/web.py:1041
 msgid "Published after "
 msgstr "Опубликовано после "
 
-#: cps/web.py:1060
+#: cps/web.py:1048
 msgid "Published before "
 msgstr "Опубликовано до "
 
-#: cps/web.py:1079
+#: cps/web.py:1067
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Рейтинг <= %(rating)s"
 
-#: cps/web.py:1081
+#: cps/web.py:1069
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Рейтинг >= %(rating)s"
 
-#: cps/web.py:1083
+#: cps/web.py:1071
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1254
+#: cps/web.py:1242
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Книга успешно поставлена в очередь для отправки на %(kindlemail)s"
 
-#: cps/web.py:1258
+#: cps/web.py:1246
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "При отправке этой книги произошла ошибка: %(res)s"
 
-#: cps/web.py:1260
+#: cps/web.py:1248
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "Пожалуйста, сначала настройте e-mail на вашем kindle..."
 
-#: cps/web.py:1277
+#: cps/web.py:1265
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "Сервер электронной почты не настроен, обратитесь к администратору !"
 
-#: cps/web.py:1278 cps/web.py:1288 cps/web.py:1312 cps/web.py:1316
-#: cps/web.py:1321 cps/web.py:1325
+#: cps/web.py:1266 cps/web.py:1276 cps/web.py:1300 cps/web.py:1304
+#: cps/web.py:1309 cps/web.py:1313
 msgid "register"
 msgstr "регистрация"
 
-#: cps/web.py:1314
+#: cps/web.py:1302
 msgid "Your e-mail is not allowed to register"
 msgstr "Ваш e-mail не подходит для регистрации"
 
-#: cps/web.py:1317
+#: cps/web.py:1305
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Письмо с подтверждением отправлено вам на e-mail."
 
-#: cps/web.py:1320
+#: cps/web.py:1308
 msgid "This username or e-mail address is already in use."
 msgstr "Этот никнейм или e-mail уже используются."
 
-#: cps/web.py:1337
+#: cps/web.py:1325
 msgid "Cannot activate LDAP authentication"
 msgstr "Не удается активировать LDAP аутентификацию"
 
-#: cps/web.py:1354
+#: cps/web.py:1342
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "Резервный вход в систему как: '%(nickname)s', LDAP-сервер недоступен или пользователь не известен"
 
-#: cps/web.py:1360
+#: cps/web.py:1348
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "Не удалось войти: %(message)s"
 
-#: cps/web.py:1364 cps/web.py:1388
+#: cps/web.py:1352 cps/web.py:1376
 msgid "Wrong Username or Password"
 msgstr "Ошибка в имени пользователя или пароле"
 
-#: cps/web.py:1371
+#: cps/web.py:1359
 msgid "New Password was send to your email address"
 msgstr "Новый пароль был отправлен на ваш адрес электронной почты"
 
-#: cps/web.py:1377
+#: cps/web.py:1365
 msgid "Please enter valid username to reset password"
 msgstr "Пожалуйста, введите действительное имя пользователя для сброса пароля"
 
-#: cps/web.py:1383
+#: cps/web.py:1371
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Вы вошли как: '%(nickname)s'"
 
-#: cps/web.py:1453 cps/web.py:1506
+#: cps/web.py:1441 cps/web.py:1494
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Профиль %(name)s's"
 
-#: cps/web.py:1489
+#: cps/web.py:1477
 msgid "Profile updated"
 msgstr "Профиль обновлён"
 
-#: cps/web.py:1533 cps/web.py:1536 cps/web.py:1539 cps/web.py:1546
-#: cps/web.py:1551
+#: cps/web.py:1521 cps/web.py:1524 cps/web.py:1527 cps/web.py:1534
+#: cps/web.py:1539
 msgid "Read a Book"
 msgstr "Читать Книгу"
 
-#: cps/tasks/convert.py:108
+#: cps/tasks/convert.py:114
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:132
+#: cps/tasks/convert.py:138
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:136
+#: cps/tasks/convert.py:142
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:146
+#: cps/tasks/convert.py:152
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:170
+#: cps/tasks/convert.py:176
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:193
+#: cps/tasks/convert.py:199
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Ошибка Ebook-конвертора: %(error)s"
 
-#: cps/tasks/convert.py:218
+#: cps/tasks/convert.py:224
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
diff --git a/cps/translations/sv/LC_MESSAGES/messages.mo b/cps/translations/sv/LC_MESSAGES/messages.mo
index 6cb8363f..0115bb12 100644
Binary files a/cps/translations/sv/LC_MESSAGES/messages.mo and b/cps/translations/sv/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/sv/LC_MESSAGES/messages.po b/cps/translations/sv/LC_MESSAGES/messages.po
index 3d290303..98808f94 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-01-02 19:37+0100\n"
+"POT-Creation-Date: 2021-01-17 11:34+0100\n"
 "PO-Revision-Date: 2020-03-14 09:30+0100\n"
 "Last-Translator: Jonatan Nyberg <jonatan.nyberg.karl@gmail.com>\n"
 "Language: sv\n"
@@ -16,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:42
 msgid "installed"
@@ -30,310 +30,310 @@ msgstr "inte installerad"
 msgid "Statistics"
 msgstr "Statistik"
 
-#: cps/admin.py:144
+#: cps/admin.py:147
 msgid "Server restarted, please reload page"
 msgstr "Server startas om, vänligen uppdatera sidan"
 
-#: cps/admin.py:146
+#: cps/admin.py:149
 msgid "Performing shutdown of server, please close window"
 msgstr "Stänger servern, vänligen stäng fönstret"
 
-#: cps/admin.py:154
+#: cps/admin.py:157
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:157
+#: cps/admin.py:160
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:167 cps/editbooks.py:636 cps/editbooks.py:648
-#: cps/editbooks.py:751 cps/editbooks.py:753 cps/editbooks.py:814
-#: cps/editbooks.py:830 cps/updater.py:510 cps/uploader.py:90
+#: cps/admin.py:170 cps/editbooks.py:642 cps/editbooks.py:654
+#: cps/editbooks.py:757 cps/editbooks.py:759 cps/editbooks.py:820
+#: cps/editbooks.py:836 cps/updater.py:510 cps/uploader.py:90
 #: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Okänd"
 
-#: cps/admin.py:188
+#: cps/admin.py:191
 msgid "Admin page"
 msgstr "Administrationssida"
 
-#: cps/admin.py:210
+#: cps/admin.py:213
 msgid "UI Configuration"
 msgstr "Användargränssnitt konfiguration"
 
-#: cps/admin.py:242 cps/admin.py:954
+#: cps/admin.py:245 cps/admin.py:923
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web konfiguration uppdaterad"
 
-#: cps/admin.py:253
+#: cps/admin.py:256
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "Vill du verkligen ta bort Kobo-token?"
 
-#: cps/admin.py:255
+#: cps/admin.py:258
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:257
+#: cps/admin.py:260
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:259 cps/templates/shelf.html:90
+#: cps/admin.py:262 cps/templates/shelf.html:90
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Är du säker på att du vill ta bort hyllan?"
 
-#: cps/admin.py:545 cps/admin.py:551 cps/admin.py:561 cps/admin.py:571
+#: cps/admin.py:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534
 #: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "Förneka"
 
-#: cps/admin.py:547 cps/admin.py:553 cps/admin.py:563 cps/admin.py:573
+#: cps/admin.py:510 cps/admin.py:516 cps/admin.py:526 cps/admin.py:536
 #: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "Tillåt"
 
-#: cps/admin.py:713
+#: cps/admin.py:679
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:753
+#: cps/admin.py:721
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:759
+#: cps/admin.py:727
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:788
+#: cps/admin.py:757
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:803
+#: cps/admin.py:772
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:806
+#: cps/admin.py:775
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:811
+#: cps/admin.py:780
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:814
+#: cps/admin.py:783
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:822
+#: cps/admin.py:791
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:825
+#: cps/admin.py:794
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:833
+#: cps/admin.py:802
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:859
+#: cps/admin.py:828
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:865
+#: cps/admin.py:834
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:935 cps/admin.py:1039 cps/admin.py:1135 cps/admin.py:1184
-#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:258
-#: cps/shelf.py:307 cps/shelf.py:339 cps/shelf.py:371 cps/shelf.py:442
+#: cps/admin.py:904 cps/admin.py:1011 cps/admin.py:1100 cps/admin.py:1149
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:261
+#: cps/shelf.py:314 cps/shelf.py:348 cps/shelf.py:418
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:947
+#: cps/admin.py:916
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:951
+#: cps/admin.py:920
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:984
+#: cps/admin.py:959
 msgid "Basic Configuration"
 msgstr "Grundläggande konfiguration"
 
-#: cps/admin.py:999 cps/web.py:1287
+#: cps/admin.py:974 cps/web.py:1275
 msgid "Please fill out all fields!"
 msgstr "Fyll i alla fält!"
 
-#: cps/admin.py:1002 cps/admin.py:1014 cps/admin.py:1020 cps/admin.py:1153
+#: cps/admin.py:977 cps/admin.py:989 cps/admin.py:995 cps/admin.py:1118
 msgid "Add new user"
 msgstr "Lägg till ny användare"
 
-#: cps/admin.py:1011 cps/web.py:1451
+#: cps/admin.py:986 cps/web.py:1439
 msgid "E-mail is not from valid domain"
 msgstr "E-posten är inte från giltig domän"
 
-#: cps/admin.py:1018 cps/admin.py:1036
+#: cps/admin.py:993 cps/admin.py:1008
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Hittade ett befintligt konto för den här e-postadressen eller smeknamnet."
 
-#: cps/admin.py:1032
+#: cps/admin.py:1004
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Användaren '%(user)s' skapad"
 
-#: cps/admin.py:1051
+#: cps/admin.py:1020
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Användaren '%(nick)s' borttagen"
 
-#: cps/admin.py:1054
+#: cps/admin.py:1023
 msgid "No admin user remaining, can't delete user"
 msgstr "Ingen adminstratörsanvändare kvar, kan inte ta bort användaren"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1028
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:1096 cps/web.py:1493
+#: cps/admin.py:1064 cps/web.py:1481
 msgid "Found an existing account for this e-mail address."
 msgstr "Hittade ett befintligt konto för den här e-postadressen."
 
-#: cps/admin.py:1105 cps/admin.py:1119 cps/admin.py:1225 cps/web.py:1469
+#: cps/admin.py:1073 cps/admin.py:1087 cps/admin.py:1190 cps/web.py:1457
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Redigera användaren %(nick)s"
 
-#: cps/admin.py:1111 cps/web.py:1462
+#: cps/admin.py:1079 cps/web.py:1450
 msgid "This username is already taken"
 msgstr "Detta användarnamn är redan taget"
 
-#: cps/admin.py:1129
+#: cps/admin.py:1094
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Användaren '%(nick)s' uppdaterad"
 
-#: cps/admin.py:1132
+#: cps/admin.py:1097
 msgid "An unknown error occured."
 msgstr "Ett okänt fel uppstod."
 
-#: cps/admin.py:1162 cps/templates/admin.html:78
+#: cps/admin.py:1127 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "Ändra SMTP-inställningar"
 
-#: cps/admin.py:1191
+#: cps/admin.py:1156
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Test-e-post skicka till %(kindlemail)s"
 
-#: cps/admin.py:1194
+#: cps/admin.py:1159
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Det gick inte att skicka Testmeddelandet: %(res)s"
 
-#: cps/admin.py:1196
+#: cps/admin.py:1161
 msgid "Please configure your e-mail address first..."
 msgstr "Vänligen konfigurera din e-postadress först..."
 
-#: cps/admin.py:1198
+#: cps/admin.py:1163
 msgid "E-mail server settings updated"
 msgstr "E-postserverinställningar uppdaterade"
 
-#: cps/admin.py:1209
+#: cps/admin.py:1174
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:1236
+#: cps/admin.py:1201
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Lösenord för användaren %(user)s återställd"
 
-#: cps/admin.py:1239 cps/web.py:1311 cps/web.py:1375
+#: cps/admin.py:1204 cps/web.py:1299 cps/web.py:1363
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ett okänt fel uppstod. Försök igen senare."
 
-#: cps/admin.py:1242 cps/web.py:1249
+#: cps/admin.py:1207 cps/web.py:1237
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Konfigurera SMTP-postinställningarna först..."
 
-#: cps/admin.py:1254
+#: cps/admin.py:1218
 msgid "Logfile viewer"
 msgstr "Visaren för loggfil"
 
-#: cps/admin.py:1315
+#: cps/admin.py:1280
 msgid "Requesting update package"
 msgstr "Begär uppdateringspaketet"
 
-#: cps/admin.py:1316
+#: cps/admin.py:1281
 msgid "Downloading update package"
 msgstr "Hämtar uppdateringspaketet"
 
-#: cps/admin.py:1317
+#: cps/admin.py:1282
 msgid "Unzipping update package"
 msgstr "Packar upp uppdateringspaketet"
 
-#: cps/admin.py:1318
+#: cps/admin.py:1283
 msgid "Replacing files"
 msgstr "Ersätta filer"
 
-#: cps/admin.py:1319
+#: cps/admin.py:1284
 msgid "Database connections are closed"
 msgstr "Databasanslutningarna är stängda"
 
-#: cps/admin.py:1320
+#: cps/admin.py:1285
 msgid "Stopping server"
 msgstr "Stoppar server"
 
-#: cps/admin.py:1321
+#: cps/admin.py:1286
 msgid "Update finished, please press okay and reload page"
 msgstr "Uppdatering klar, tryck på okej och uppdatera sidan"
 
-#: cps/admin.py:1322 cps/admin.py:1323 cps/admin.py:1324 cps/admin.py:1325
-#: cps/admin.py:1326
+#: cps/admin.py:1287 cps/admin.py:1288 cps/admin.py:1289 cps/admin.py:1290
+#: cps/admin.py:1291
 msgid "Update failed:"
 msgstr "Uppdateringen misslyckades:"
 
-#: cps/admin.py:1322 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+#: cps/admin.py:1287 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTP-fel"
 
-#: cps/admin.py:1323 cps/updater.py:322 cps/updater.py:525
+#: cps/admin.py:1288 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Anslutningsfel"
 
-#: cps/admin.py:1324 cps/updater.py:324 cps/updater.py:527
+#: cps/admin.py:1289 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Tiden ute när du etablerade anslutning"
 
-#: cps/admin.py:1325 cps/updater.py:326 cps/updater.py:529
+#: cps/admin.py:1290 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Allmänt fel"
 
-#: cps/admin.py:1326
+#: cps/admin.py:1291
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
-#: cps/admin.py:1351
+#: cps/admin.py:1316
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1355
+#: cps/admin.py:1320
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1421
+#: cps/admin.py:1386
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1424
+#: cps/admin.py:1389
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1426
+#: cps/admin.py:1391
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -353,90 +353,90 @@ msgstr ""
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:317 cps/editbooks.py:620 cps/web.py:1521 cps/web.py:1554
-#: cps/web.py:1625
+#: cps/editbooks.py:316 cps/editbooks.py:626 cps/web.py:1509 cps/web.py:1542
+#: cps/web.py:1613
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Det gick inte att öppna e-boken. Filen finns inte eller filen är inte tillgänglig"
 
-#: cps/editbooks.py:351
+#: cps/editbooks.py:350
 msgid "edit metadata"
 msgstr "redigera metadata"
 
-#: cps/editbooks.py:426
+#: cps/editbooks.py:425
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s är inte ett giltigt språk"
 
-#: cps/editbooks.py:537 cps/editbooks.py:796
+#: cps/editbooks.py:536 cps/editbooks.py:802
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Filändelsen '%(ext)s' får inte laddas upp till den här servern"
 
-#: cps/editbooks.py:541 cps/editbooks.py:800
+#: cps/editbooks.py:540 cps/editbooks.py:806
 msgid "File to be uploaded must have an extension"
 msgstr "Filen som ska laddas upp måste ha en ändelse"
 
-#: cps/editbooks.py:553
+#: cps/editbooks.py:552
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Det gick inte att skapa sökväg %(path)s (behörighet nekad)."
 
-#: cps/editbooks.py:558
+#: cps/editbooks.py:557
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Det gick inte att lagra filen %(file)s."
 
-#: cps/editbooks.py:576 cps/editbooks.py:931 cps/web.py:1498
+#: cps/editbooks.py:575 cps/editbooks.py:937 cps/web.py:1486
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:580
+#: cps/editbooks.py:579
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Filformatet %(ext)s lades till %(book)s"
 
-#: cps/editbooks.py:700
+#: cps/editbooks.py:706
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:737
+#: cps/editbooks.py:743
 msgid "Metadata successfully updated"
 msgstr "Metadata uppdaterades"
 
-#: cps/editbooks.py:746
+#: cps/editbooks.py:752
 msgid "Error editing book, please check logfile for details"
 msgstr "Det gick inte att redigera boken, kontrollera loggfilen för mer information"
 
-#: cps/editbooks.py:808
+#: cps/editbooks.py:814
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "Filen %(filename)s kunde inte sparas i temp dir"
 
-#: cps/editbooks.py:818
+#: cps/editbooks.py:824
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Uppladdad bok finns förmodligen i biblioteket, överväg att ändra innan du laddar upp nya: "
 
-#: cps/editbooks.py:906
+#: cps/editbooks.py:912
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:917
+#: cps/editbooks.py:923
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Filen %(file)s uppladdad"
 
-#: cps/editbooks.py:943
+#: cps/editbooks.py:949
 msgid "Source or destination format for conversion missing"
 msgstr "Källa eller målformat för konvertering saknas"
 
-#: cps/editbooks.py:951
+#: cps/editbooks.py:957
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Boken är i kö för konvertering till %(book_format)s"
 
-#: cps/editbooks.py:955
+#: cps/editbooks.py:961
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Det gick inte att konvertera den här boken: %(res)s"
@@ -597,85 +597,85 @@ msgstr "Klar"
 msgid "Unknown Status"
 msgstr "Okänd status"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "Vänligen få tillgång till calibre-web från icke localhost för att få giltig api_endpoint för Kobo-enhet"
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:157
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
 msgid "Kobo Setup"
 msgstr "Kobo-installation"
 
-#: cps/oauth_bb.py:74
+#: cps/oauth_bb.py:73
 #, python-format
 msgid "Register with %(provider)s"
 msgstr "Registrera dig med %(provider)s"
 
-#: cps/oauth_bb.py:158
+#: cps/oauth_bb.py:146
 msgid "Failed to log in with GitHub."
 msgstr "Det gick inte att logga in med GitHub."
 
-#: cps/oauth_bb.py:163
+#: cps/oauth_bb.py:151
 msgid "Failed to fetch user info from GitHub."
 msgstr "Det gick inte att hämta användarinformation från GitHub."
 
-#: cps/oauth_bb.py:174
+#: cps/oauth_bb.py:162
 msgid "Failed to log in with Google."
 msgstr "Det gick inte att logga in med Google."
 
-#: cps/oauth_bb.py:179
+#: cps/oauth_bb.py:167
 msgid "Failed to fetch user info from Google."
 msgstr "Det gick inte att hämta användarinformation från Google."
 
-#: cps/oauth_bb.py:229 cps/remotelogin.py:134 cps/web.py:1347
+#: cps/oauth_bb.py:213 cps/remotelogin.py:133 cps/web.py:1335
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "du är nu inloggad som: \"%(nickname)s\""
 
-#: cps/oauth_bb.py:239
+#: cps/oauth_bb.py:223
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:245
+#: cps/oauth_bb.py:229
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr ""
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:271
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:291
+#: cps/oauth_bb.py:275
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr ""
 
-#: cps/oauth_bb.py:294
+#: cps/oauth_bb.py:278
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:322
+#: cps/oauth_bb.py:306
 msgid "GitHub Oauth error, please retry later."
 msgstr "GitHub Oauth-fel, försök igen senare."
 
-#: cps/oauth_bb.py:341
+#: cps/oauth_bb.py:325
 msgid "Google Oauth error, please retry later."
 msgstr "Google Oauth-fel, försök igen senare."
 
-#: cps/remotelogin.py:66 cps/web.py:1394
+#: cps/remotelogin.py:65 cps/web.py:1382
 msgid "login"
 msgstr "logga in"
 
-#: cps/remotelogin.py:78 cps/remotelogin.py:112
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
 msgid "Token not found"
 msgstr "Token hittades inte"
 
-#: cps/remotelogin.py:87 cps/remotelogin.py:120
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
 msgid "Token has expired"
 msgstr "Token har löpt ut"
 
-#: cps/remotelogin.py:96
+#: cps/remotelogin.py:95
 msgid "Success! Please return to your device"
 msgstr "Lyckades! Vänligen återvänd till din enhet"
 
@@ -703,7 +703,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:388
+#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:376
 msgid "Top Rated Books"
 msgstr "Bäst rankade böcker"
 
@@ -712,7 +712,7 @@ msgid "Show Top Rated Books"
 msgstr "Visa böcker med bästa betyg"
 
 #: cps/render_template.py:53 cps/templates/index.xml:46
-#: cps/templates/index.xml:50 cps/web.py:648
+#: cps/templates/index.xml:50 cps/web.py:636
 msgid "Read Books"
 msgstr "Lästa böcker"
 
@@ -721,7 +721,7 @@ msgid "Show read and unread"
 msgstr "Visa lästa och olästa"
 
 #: cps/render_template.py:57 cps/templates/index.xml:53
-#: cps/templates/index.xml:57 cps/web.py:651
+#: cps/templates/index.xml:57 cps/web.py:639
 msgid "Unread Books"
 msgstr "Olästa böcker"
 
@@ -738,7 +738,7 @@ msgid "Show random books"
 msgstr "Visa slumpmässiga böcker"
 
 #: cps/render_template.py:63 cps/templates/book_table.html:50
-#: cps/templates/index.xml:75 cps/web.py:953
+#: cps/templates/index.xml:75 cps/web.py:941
 msgid "Categories"
 msgstr "Kategorier"
 
@@ -748,7 +748,7 @@ msgstr "Visa kategorival"
 
 #: cps/render_template.py:66 cps/templates/book_edit.html:84
 #: cps/templates/book_table.html:51 cps/templates/index.xml:82
-#: cps/templates/search_form.html:62 cps/web.py:857 cps/web.py:867
+#: cps/templates/search_form.html:62 cps/web.py:845 cps/web.py:855
 msgid "Series"
 msgstr "Serier"
 
@@ -766,7 +766,7 @@ msgid "Show author selection"
 msgstr "Visa författarval"
 
 #: cps/render_template.py:73 cps/templates/book_table.html:55
-#: cps/templates/index.xml:68 cps/web.py:836
+#: cps/templates/index.xml:68 cps/web.py:824
 msgid "Publishers"
 msgstr "Förlag"
 
@@ -775,7 +775,7 @@ msgid "Show publisher selection"
 msgstr "Visa urval av förlag"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:53
-#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:932
+#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:920
 msgid "Languages"
 msgstr "Språk"
 
@@ -799,7 +799,7 @@ msgstr "Filformat"
 msgid "Show file formats selection"
 msgstr "Visa val av filformat"
 
-#: cps/render_template.py:87 cps/web.py:675
+#: cps/render_template.py:87 cps/web.py:663
 msgid "Archived Books"
 msgstr ""
 
@@ -807,7 +807,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:91 cps/web.py:746
+#: cps/render_template.py:91 cps/web.py:734
 msgid "Books List"
 msgstr ""
 
@@ -864,49 +864,49 @@ msgstr "Boken har tagits bort från hyllan: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr "Tyvärr har du inte rätt att ta bort en bok från den här hyllan: %(sname)s"
 
-#: cps/shelf.py:238 cps/shelf.py:282
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr ""
+#: cps/shelf.py:224 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "skapa en hylla"
 
-#: cps/shelf.py:247 cps/shelf.py:292
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr ""
+#: cps/shelf.py:231
+msgid "Edit a shelf"
+msgstr "Redigera en hylla"
 
-#: cps/shelf.py:254
+#: cps/shelf.py:249
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Hyllan %(title)s skapad"
 
-#: cps/shelf.py:261 cps/shelf.py:310
-msgid "There was an error"
-msgstr "Det fanns ett fel"
-
-#: cps/shelf.py:262 cps/shelf.py:264 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "skapa en hylla"
-
-#: cps/shelf.py:304
+#: cps/shelf.py:252
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Hyllan %(title)s ändrad"
 
-#: cps/shelf.py:311 cps/shelf.py:313
-msgid "Edit a shelf"
-msgstr "Redigera en hylla"
+#: cps/shelf.py:265
+msgid "There was an error"
+msgstr "Det fanns ett fel"
 
-#: cps/shelf.py:381
+#: cps/shelf.py:281
+#, python-format
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:291
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:358
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Ändra ordning på hyllan: '%(name)s'"
 
-#: cps/shelf.py:447
+#: cps/shelf.py:423
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Hylla: '%(name)s'"
 
-#: cps/shelf.py:451
+#: cps/shelf.py:427
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Fel vid öppning av hyllan. Hylla finns inte eller är inte tillgänglig"
 
@@ -939,222 +939,222 @@ msgstr "En ny uppdatering är tillgänglig. Klicka på knappen nedan för att up
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Klicka på knappen nedan för att uppdatera till den senaste stabila versionen."
 
-#: cps/templates/index.html:5 cps/web.py:396
+#: cps/templates/index.html:5 cps/web.py:384
 msgid "Discover (Random Books)"
 msgstr "Upptäck (slumpmässiga böcker)"
 
-#: cps/web.py:435
+#: cps/web.py:423
 msgid "Books"
 msgstr "Böcker"
 
-#: cps/web.py:460
+#: cps/web.py:448
 msgid "Hot Books (Most Downloaded)"
 msgstr "Heta böcker (mest hämtade)"
 
-#: cps/web.py:495
+#: cps/web.py:483
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:509
+#: cps/web.py:497
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Hoppsan! Vald boktitel är inte tillgänglig. Filen finns inte eller är inte tillgänglig"
 
-#: cps/web.py:523
+#: cps/web.py:511
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Författare: %(name)s"
 
-#: cps/web.py:537
+#: cps/web.py:525
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Förlag: %(name)s"
 
-#: cps/web.py:550
+#: cps/web.py:538
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serier: %(serie)s"
 
-#: cps/web.py:563
+#: cps/web.py:551
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Betyg: %(rating)s stars"
 
-#: cps/web.py:576
+#: cps/web.py:564
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Filformat: %(format)s"
 
-#: cps/web.py:590
+#: cps/web.py:578
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategori: %(name)s"
 
-#: cps/web.py:609
+#: cps/web.py:597
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Språk: %(name)s"
 
-#: cps/web.py:639
+#: cps/web.py:627
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/templates/layout.html:56 cps/web.py:706 cps/web.py:1180
+#: cps/templates/layout.html:56 cps/web.py:694 cps/web.py:1168
 msgid "Advanced Search"
 msgstr "Avancerad sökning"
 
 #: cps/templates/book_edit.html:214 cps/templates/feed.xml:33
 #: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:175 cps/web.py:718 cps/web.py:990
+#: cps/templates/search_form.html:175 cps/web.py:706 cps/web.py:978
 msgid "Search"
 msgstr "Sök"
 
-#: cps/web.py:885
+#: cps/web.py:873
 msgid "Ratings list"
 msgstr "Betygslista"
 
-#: cps/web.py:904
+#: cps/web.py:892
 msgid "File formats list"
 msgstr "Lista över filformat"
 
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:967
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:955
 msgid "Tasks"
 msgstr "Uppgifter"
 
-#: cps/web.py:1053
+#: cps/web.py:1041
 msgid "Published after "
 msgstr "Publicerad efter "
 
-#: cps/web.py:1060
+#: cps/web.py:1048
 msgid "Published before "
 msgstr "Publicerad före "
 
-#: cps/web.py:1079
+#: cps/web.py:1067
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Betyg <= %(rating)s"
 
-#: cps/web.py:1081
+#: cps/web.py:1069
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Betyg >= %(rating)s"
 
-#: cps/web.py:1083
+#: cps/web.py:1071
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1254
+#: cps/web.py:1242
 #, 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:1258
+#: cps/web.py:1246
 #, 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:1260
+#: cps/web.py:1248
 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:1277
+#: cps/web.py:1265
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-postservern är inte konfigurerad, kontakta din administratör!"
 
-#: cps/web.py:1278 cps/web.py:1288 cps/web.py:1312 cps/web.py:1316
-#: cps/web.py:1321 cps/web.py:1325
+#: cps/web.py:1266 cps/web.py:1276 cps/web.py:1300 cps/web.py:1304
+#: cps/web.py:1309 cps/web.py:1313
 msgid "register"
 msgstr "registrera"
 
-#: cps/web.py:1314
+#: cps/web.py:1302
 msgid "Your e-mail is not allowed to register"
 msgstr "Din e-post är inte tillåten att registrera"
 
-#: cps/web.py:1317
+#: cps/web.py:1305
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Bekräftelsemail skickades till ditt e-postkonto."
 
-#: cps/web.py:1320
+#: cps/web.py:1308
 msgid "This username or e-mail address is already in use."
 msgstr "Det här användarnamnet eller e-postadressen är redan i bruk."
 
-#: cps/web.py:1337
+#: cps/web.py:1325
 msgid "Cannot activate LDAP authentication"
 msgstr "Det går inte att aktivera LDAP-autentisering"
 
-#: cps/web.py:1354
+#: cps/web.py:1342
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1360
+#: cps/web.py:1348
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1364 cps/web.py:1388
+#: cps/web.py:1352 cps/web.py:1376
 msgid "Wrong Username or Password"
 msgstr "Fel användarnamn eller lösenord"
 
-#: cps/web.py:1371
+#: cps/web.py:1359
 msgid "New Password was send to your email address"
 msgstr "Nytt lösenord skickades till din e-postadress"
 
-#: cps/web.py:1377
+#: cps/web.py:1365
 msgid "Please enter valid username to reset password"
 msgstr "Ange giltigt användarnamn för att återställa lösenordet"
 
-#: cps/web.py:1383
+#: cps/web.py:1371
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Du är nu inloggad som: \"%(nickname)s\""
 
-#: cps/web.py:1453 cps/web.py:1506
+#: cps/web.py:1441 cps/web.py:1494
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)ss profil"
 
-#: cps/web.py:1489
+#: cps/web.py:1477
 msgid "Profile updated"
 msgstr "Profilen uppdaterad"
 
-#: cps/web.py:1533 cps/web.py:1536 cps/web.py:1539 cps/web.py:1546
-#: cps/web.py:1551
+#: cps/web.py:1521 cps/web.py:1524 cps/web.py:1527 cps/web.py:1534
+#: cps/web.py:1539
 msgid "Read a Book"
 msgstr "Läs en bok"
 
-#: cps/tasks/convert.py:108
+#: cps/tasks/convert.py:114
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:132
+#: cps/tasks/convert.py:138
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:136
+#: cps/tasks/convert.py:142
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:146
+#: cps/tasks/convert.py:152
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:170
+#: cps/tasks/convert.py:176
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:193
+#: cps/tasks/convert.py:199
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "E-bokkonverteraren misslyckades: %(error)s"
 
-#: cps/tasks/convert.py:218
+#: cps/tasks/convert.py:224
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
diff --git a/cps/translations/tr/LC_MESSAGES/messages.mo b/cps/translations/tr/LC_MESSAGES/messages.mo
index a7692f32..03c04d13 100644
Binary files a/cps/translations/tr/LC_MESSAGES/messages.mo and b/cps/translations/tr/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/tr/LC_MESSAGES/messages.po b/cps/translations/tr/LC_MESSAGES/messages.po
index 017b2c90..98e661f5 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-01-02 19:37+0100\n"
+"POT-Creation-Date: 2021-01-17 11:34+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:42
 msgid "installed"
@@ -30,310 +30,310 @@ msgstr "yüklü değil"
 msgid "Statistics"
 msgstr "İstatistikler"
 
-#: cps/admin.py:144
+#: cps/admin.py:147
 msgid "Server restarted, please reload page"
 msgstr "Sunucu yeniden başlatıldı, lütfen sayfayı yeniden yükleyin"
 
-#: cps/admin.py:146
+#: cps/admin.py:149
 msgid "Performing shutdown of server, please close window"
 msgstr "Sunucu kapatıyor, lütfen pencereyi kapatın"
 
-#: cps/admin.py:154
+#: cps/admin.py:157
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:157
+#: cps/admin.py:160
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:167 cps/editbooks.py:636 cps/editbooks.py:648
-#: cps/editbooks.py:751 cps/editbooks.py:753 cps/editbooks.py:814
-#: cps/editbooks.py:830 cps/updater.py:510 cps/uploader.py:90
+#: cps/admin.py:170 cps/editbooks.py:642 cps/editbooks.py:654
+#: cps/editbooks.py:757 cps/editbooks.py:759 cps/editbooks.py:820
+#: cps/editbooks.py:836 cps/updater.py:510 cps/uploader.py:90
 #: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Bilinmeyen"
 
-#: cps/admin.py:188
+#: cps/admin.py:191
 msgid "Admin page"
 msgstr "Yönetim sayfası"
 
-#: cps/admin.py:210
+#: cps/admin.py:213
 msgid "UI Configuration"
 msgstr "Arayüz Ayarları"
 
-#: cps/admin.py:242 cps/admin.py:954
+#: cps/admin.py:245 cps/admin.py:923
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web yapılandırması güncellendi"
 
-#: cps/admin.py:253
+#: cps/admin.py:256
 msgid "Do you really want to delete the Kobo Token?"
 msgstr ""
 
-#: cps/admin.py:255
+#: cps/admin.py:258
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:257
+#: cps/admin.py:260
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:259 cps/templates/shelf.html:90
+#: cps/admin.py:262 cps/templates/shelf.html:90
 msgid "Are you sure you want to delete this shelf?"
 msgstr ""
 
-#: cps/admin.py:545 cps/admin.py:551 cps/admin.py:561 cps/admin.py:571
+#: cps/admin.py:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534
 #: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:547 cps/admin.py:553 cps/admin.py:563 cps/admin.py:573
+#: cps/admin.py:510 cps/admin.py:516 cps/admin.py:526 cps/admin.py:536
 #: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:713
+#: cps/admin.py:679
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:753
+#: cps/admin.py:721
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:759
+#: cps/admin.py:727
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:788
+#: cps/admin.py:757
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:803
+#: cps/admin.py:772
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:806
+#: cps/admin.py:775
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:811
+#: cps/admin.py:780
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:814
+#: cps/admin.py:783
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:822
+#: cps/admin.py:791
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:825
+#: cps/admin.py:794
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:833
+#: cps/admin.py:802
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:859
+#: cps/admin.py:828
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:865
+#: cps/admin.py:834
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:935 cps/admin.py:1039 cps/admin.py:1135 cps/admin.py:1184
-#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:258
-#: cps/shelf.py:307 cps/shelf.py:339 cps/shelf.py:371 cps/shelf.py:442
+#: cps/admin.py:904 cps/admin.py:1011 cps/admin.py:1100 cps/admin.py:1149
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:261
+#: cps/shelf.py:314 cps/shelf.py:348 cps/shelf.py:418
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:947
+#: cps/admin.py:916
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:951
+#: cps/admin.py:920
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:984
+#: cps/admin.py:959
 msgid "Basic Configuration"
 msgstr "Temel Ayarlar"
 
-#: cps/admin.py:999 cps/web.py:1287
+#: cps/admin.py:974 cps/web.py:1275
 msgid "Please fill out all fields!"
 msgstr "Lütfen tüm alanları doldurun!"
 
-#: cps/admin.py:1002 cps/admin.py:1014 cps/admin.py:1020 cps/admin.py:1153
+#: cps/admin.py:977 cps/admin.py:989 cps/admin.py:995 cps/admin.py:1118
 msgid "Add new user"
 msgstr "Yeni kullanıcı ekle"
 
-#: cps/admin.py:1011 cps/web.py:1451
+#: cps/admin.py:986 cps/web.py:1439
 msgid "E-mail is not from valid domain"
 msgstr "E-posta izin verilen bir servisten değil"
 
-#: cps/admin.py:1018 cps/admin.py:1036
+#: cps/admin.py:993 cps/admin.py:1008
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Bu e-posta adresi veya kullanıcı adı için zaten bir hesap var."
 
-#: cps/admin.py:1032
+#: cps/admin.py:1004
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "'%(user)s' kullanıcısı oluşturuldu"
 
-#: cps/admin.py:1051
+#: cps/admin.py:1020
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Kullanıcı '%(nick)s' silindi"
 
-#: cps/admin.py:1054
+#: cps/admin.py:1023
 msgid "No admin user remaining, can't delete user"
 msgstr "Başka yönetici kullanıcı olmadığından silinemedi"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1028
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:1096 cps/web.py:1493
+#: cps/admin.py:1064 cps/web.py:1481
 msgid "Found an existing account for this e-mail address."
 msgstr "Bu e-posta adresi için bir hesap mevcut."
 
-#: cps/admin.py:1105 cps/admin.py:1119 cps/admin.py:1225 cps/web.py:1469
+#: cps/admin.py:1073 cps/admin.py:1087 cps/admin.py:1190 cps/web.py:1457
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "%(nick)s kullanıcısını düzenle"
 
-#: cps/admin.py:1111 cps/web.py:1462
+#: cps/admin.py:1079 cps/web.py:1450
 msgid "This username is already taken"
 msgstr "Bu kullanıcı adı zaten alındı"
 
-#: cps/admin.py:1129
+#: cps/admin.py:1094
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "'%(nick)s' kullanıcısı güncellendi"
 
-#: cps/admin.py:1132
+#: cps/admin.py:1097
 msgid "An unknown error occured."
 msgstr "Bilinmeyen bir hata oluştu."
 
-#: cps/admin.py:1162 cps/templates/admin.html:78
+#: cps/admin.py:1127 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr ""
 
-#: cps/admin.py:1191
+#: cps/admin.py:1156
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Deneme e-postası başarıyla %(kindlemail)s adresine gönderildi"
 
-#: cps/admin.py:1194
+#: cps/admin.py:1159
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Deneme e-postası gönderilirken bir hata oluştu: %(res)s"
 
-#: cps/admin.py:1196
+#: cps/admin.py:1161
 msgid "Please configure your e-mail address first..."
 msgstr "Lütfen önce e-posta adresinizi ayarlayın..."
 
-#: cps/admin.py:1198
+#: cps/admin.py:1163
 msgid "E-mail server settings updated"
 msgstr "E-posta sunucusu ayarları güncellendi"
 
-#: cps/admin.py:1209
+#: cps/admin.py:1174
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:1236
+#: cps/admin.py:1201
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "%(user)s kullanıcısının şifresi sıfırlandı"
 
-#: cps/admin.py:1239 cps/web.py:1311 cps/web.py:1375
+#: cps/admin.py:1204 cps/web.py:1299 cps/web.py:1363
 msgid "An unknown error occurred. Please try again later."
 msgstr "Bilinmeyen bir hata oluştu. Lütfen daha sonra tekrar deneyiniz."
 
-#: cps/admin.py:1242 cps/web.py:1249
+#: cps/admin.py:1207 cps/web.py:1237
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Lütfen önce SMTP e-posta ayarlarını ayarlayın..."
 
-#: cps/admin.py:1254
+#: cps/admin.py:1218
 msgid "Logfile viewer"
 msgstr "Log dosyası görüntüleyici"
 
-#: cps/admin.py:1315
+#: cps/admin.py:1280
 msgid "Requesting update package"
 msgstr "Güncelleme paketi isteniyor"
 
-#: cps/admin.py:1316
+#: cps/admin.py:1281
 msgid "Downloading update package"
 msgstr "Güncelleme paketi indiriliyor"
 
-#: cps/admin.py:1317
+#: cps/admin.py:1282
 msgid "Unzipping update package"
 msgstr "Güncelleme paketi ayıklanıyor"
 
-#: cps/admin.py:1318
+#: cps/admin.py:1283
 msgid "Replacing files"
 msgstr "Dosyalar değiştiriliyor"
 
-#: cps/admin.py:1319
+#: cps/admin.py:1284
 msgid "Database connections are closed"
 msgstr "Veritabanı bağlantıları kapalı"
 
-#: cps/admin.py:1320
+#: cps/admin.py:1285
 msgid "Stopping server"
 msgstr "Sunucu durduruyor"
 
-#: cps/admin.py:1321
+#: cps/admin.py:1286
 msgid "Update finished, please press okay and reload page"
 msgstr "Güncelleme tamamlandı, sayfayı yenilemek için lütfen Tamam'a tıklayınız"
 
-#: cps/admin.py:1322 cps/admin.py:1323 cps/admin.py:1324 cps/admin.py:1325
-#: cps/admin.py:1326
+#: cps/admin.py:1287 cps/admin.py:1288 cps/admin.py:1289 cps/admin.py:1290
+#: cps/admin.py:1291
 msgid "Update failed:"
 msgstr "Güncelleme başarısız:"
 
-#: cps/admin.py:1322 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+#: cps/admin.py:1287 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTP Hatası"
 
-#: cps/admin.py:1323 cps/updater.py:322 cps/updater.py:525
+#: cps/admin.py:1288 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "Bağlantı hatası"
 
-#: cps/admin.py:1324 cps/updater.py:324 cps/updater.py:527
+#: cps/admin.py:1289 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "Bağlantı kurulmaya çalışırken zaman aşımına uğradı"
 
-#: cps/admin.py:1325 cps/updater.py:326 cps/updater.py:529
+#: cps/admin.py:1290 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "Genel hata"
 
-#: cps/admin.py:1326
+#: cps/admin.py:1291
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
-#: cps/admin.py:1351
+#: cps/admin.py:1316
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1355
+#: cps/admin.py:1320
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1421
+#: cps/admin.py:1386
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1424
+#: cps/admin.py:1389
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1426
+#: cps/admin.py:1391
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -353,90 +353,90 @@ msgstr ""
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:317 cps/editbooks.py:620 cps/web.py:1521 cps/web.py:1554
-#: cps/web.py:1625
+#: cps/editbooks.py:316 cps/editbooks.py:626 cps/web.py:1509 cps/web.py:1542
+#: cps/web.py:1613
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "eKitap açılırken hata oluştu. Dosya mevcut değil veya erişilemiyor"
 
-#: cps/editbooks.py:351
+#: cps/editbooks.py:350
 msgid "edit metadata"
 msgstr "metaveri düzenle"
 
-#: cps/editbooks.py:426
+#: cps/editbooks.py:425
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s geçerli bir dil değil"
 
-#: cps/editbooks.py:537 cps/editbooks.py:796
+#: cps/editbooks.py:536 cps/editbooks.py:802
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "'%(ext)s' uzantılı dosyaların bu sunucuya yüklenmesine izin verilmiyor"
 
-#: cps/editbooks.py:541 cps/editbooks.py:800
+#: cps/editbooks.py:540 cps/editbooks.py:806
 msgid "File to be uploaded must have an extension"
 msgstr "Yüklenecek dosyanın mutlaka bir uzantısı olması gerekli"
 
-#: cps/editbooks.py:553
+#: cps/editbooks.py:552
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "%(path)s dizini oluşturulamadı. (İzin reddedildi)"
 
-#: cps/editbooks.py:558
+#: cps/editbooks.py:557
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "%(file)s dosyası kaydedilemedi."
 
-#: cps/editbooks.py:576 cps/editbooks.py:931 cps/web.py:1498
+#: cps/editbooks.py:575 cps/editbooks.py:937 cps/web.py:1486
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:580
+#: cps/editbooks.py:579
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "%(book)s kitabına %(ext)s dosya biçimi eklendi"
 
-#: cps/editbooks.py:700
+#: cps/editbooks.py:706
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:737
+#: cps/editbooks.py:743
 msgid "Metadata successfully updated"
 msgstr "Metaveri başarıyla güncellendi"
 
-#: cps/editbooks.py:746
+#: cps/editbooks.py:752
 msgid "Error editing book, please check logfile for details"
 msgstr "eKitap düzenlenirken hata oluştu, detaylar için lütfen log dosyasını kontrol edin"
 
-#: cps/editbooks.py:808
+#: cps/editbooks.py:814
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "%(filename)s dosyası geçici dizine kaydedilemedi"
 
-#: cps/editbooks.py:818
+#: cps/editbooks.py:824
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "Yüklenen eKitap muhtemelen kitaplıkta zaten var. Yenisini yüklemeden değiştirmeyi düşünün: "
 
-#: cps/editbooks.py:906
+#: cps/editbooks.py:912
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:917
+#: cps/editbooks.py:923
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "%(file)s dosyası yüklendi"
 
-#: cps/editbooks.py:943
+#: cps/editbooks.py:949
 msgid "Source or destination format for conversion missing"
 msgstr "Dönüştürme için kaynak ya da hedef biçimi eksik"
 
-#: cps/editbooks.py:951
+#: cps/editbooks.py:957
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "eKitap %(book_format)s formatlarına dönüştürülmek üzere başarıyla sıraya alındı"
 
-#: cps/editbooks.py:955
+#: cps/editbooks.py:961
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Bu eKitabı dönüştürürken bir hata oluştu: %(res)s"
@@ -597,85 +597,85 @@ msgstr "Bitti"
 msgid "Unknown Status"
 msgstr "Bilinmeyen Durum"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:157
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
 msgid "Kobo Setup"
 msgstr ""
 
-#: cps/oauth_bb.py:74
+#: cps/oauth_bb.py:73
 #, python-format
 msgid "Register with %(provider)s"
 msgstr "%(provider)s ile Kaydol"
 
-#: cps/oauth_bb.py:158
+#: cps/oauth_bb.py:146
 msgid "Failed to log in with GitHub."
 msgstr "GitHub ile giriş yapılamadı."
 
-#: cps/oauth_bb.py:163
+#: cps/oauth_bb.py:151
 msgid "Failed to fetch user info from GitHub."
 msgstr "Github'dan kullanıcı bilgileri alınamadı."
 
-#: cps/oauth_bb.py:174
+#: cps/oauth_bb.py:162
 msgid "Failed to log in with Google."
 msgstr "Google ile giriş yapılamadı."
 
-#: cps/oauth_bb.py:179
+#: cps/oauth_bb.py:167
 msgid "Failed to fetch user info from Google."
 msgstr "Google'dan kullanıcı bilgileri alınamadı."
 
-#: cps/oauth_bb.py:229 cps/remotelogin.py:134 cps/web.py:1347
+#: cps/oauth_bb.py:213 cps/remotelogin.py:133 cps/web.py:1335
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "giriş yaptınız: '%(nickname)s'"
 
-#: cps/oauth_bb.py:239
+#: cps/oauth_bb.py:223
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:245
+#: cps/oauth_bb.py:229
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr ""
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:271
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:291
+#: cps/oauth_bb.py:275
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr ""
 
-#: cps/oauth_bb.py:294
+#: cps/oauth_bb.py:278
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:322
+#: cps/oauth_bb.py:306
 msgid "GitHub Oauth error, please retry later."
 msgstr "GitHub Oauth hatası, lütfen tekrar deneyin."
 
-#: cps/oauth_bb.py:341
+#: cps/oauth_bb.py:325
 msgid "Google Oauth error, please retry later."
 msgstr "Google Oauth hatası, lütfen tekrar deneyin."
 
-#: cps/remotelogin.py:66 cps/web.py:1394
+#: cps/remotelogin.py:65 cps/web.py:1382
 msgid "login"
 msgstr "giriş"
 
-#: cps/remotelogin.py:78 cps/remotelogin.py:112
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
 msgid "Token not found"
 msgstr "Token bulunamadı"
 
-#: cps/remotelogin.py:87 cps/remotelogin.py:120
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
 msgid "Token has expired"
 msgstr "Token süresi doldu"
 
-#: cps/remotelogin.py:96
+#: cps/remotelogin.py:95
 msgid "Success! Please return to your device"
 msgstr "Başarılı! Lütfen cihazınıza dönün"
 
@@ -703,7 +703,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:388
+#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:376
 msgid "Top Rated Books"
 msgstr ""
 
@@ -712,7 +712,7 @@ msgid "Show Top Rated Books"
 msgstr ""
 
 #: cps/render_template.py:53 cps/templates/index.xml:46
-#: cps/templates/index.xml:50 cps/web.py:648
+#: cps/templates/index.xml:50 cps/web.py:636
 msgid "Read Books"
 msgstr "Okunanlar"
 
@@ -721,7 +721,7 @@ msgid "Show read and unread"
 msgstr "Okunan ve okunmayanları göster"
 
 #: cps/render_template.py:57 cps/templates/index.xml:53
-#: cps/templates/index.xml:57 cps/web.py:651
+#: cps/templates/index.xml:57 cps/web.py:639
 msgid "Unread Books"
 msgstr "Okunmamışlar"
 
@@ -738,7 +738,7 @@ msgid "Show random books"
 msgstr "Rastgele eKitap göster"
 
 #: cps/render_template.py:63 cps/templates/book_table.html:50
-#: cps/templates/index.xml:75 cps/web.py:953
+#: cps/templates/index.xml:75 cps/web.py:941
 msgid "Categories"
 msgstr "Kategoriler"
 
@@ -748,7 +748,7 @@ msgstr "Kategori seçimini göster"
 
 #: cps/render_template.py:66 cps/templates/book_edit.html:84
 #: cps/templates/book_table.html:51 cps/templates/index.xml:82
-#: cps/templates/search_form.html:62 cps/web.py:857 cps/web.py:867
+#: cps/templates/search_form.html:62 cps/web.py:845 cps/web.py:855
 msgid "Series"
 msgstr "Seriler"
 
@@ -766,7 +766,7 @@ msgid "Show author selection"
 msgstr "Yazar seçimini göster"
 
 #: cps/render_template.py:73 cps/templates/book_table.html:55
-#: cps/templates/index.xml:68 cps/web.py:836
+#: cps/templates/index.xml:68 cps/web.py:824
 msgid "Publishers"
 msgstr "Yayıncılar"
 
@@ -775,7 +775,7 @@ msgid "Show publisher selection"
 msgstr "Yayıncı seçimini göster"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:53
-#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:932
+#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:920
 msgid "Languages"
 msgstr "Diller"
 
@@ -799,7 +799,7 @@ msgstr "Biçimler"
 msgid "Show file formats selection"
 msgstr "Dosya biçimi seçimini göster"
 
-#: cps/render_template.py:87 cps/web.py:675
+#: cps/render_template.py:87 cps/web.py:663
 msgid "Archived Books"
 msgstr ""
 
@@ -807,7 +807,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:91 cps/web.py:746
+#: cps/render_template.py:91 cps/web.py:734
 msgid "Books List"
 msgstr ""
 
@@ -864,49 +864,49 @@ msgstr "eKitap kitaplıktan silindi: %(sname)s"
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr "Maalesef bu kitaplıktan eKitap silmenize izin verilmiyor: %(sname)s"
 
-#: cps/shelf.py:238 cps/shelf.py:282
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr ""
+#: cps/shelf.py:224 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "Kitaplık oluştur"
 
-#: cps/shelf.py:247 cps/shelf.py:292
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr ""
+#: cps/shelf.py:231
+msgid "Edit a shelf"
+msgstr "Kitaplığı düzenle"
 
-#: cps/shelf.py:254
+#: cps/shelf.py:249
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "%(title)s kitaplığı oluşturuldu."
 
-#: cps/shelf.py:261 cps/shelf.py:310
-msgid "There was an error"
-msgstr "Bir hata oluştu"
-
-#: cps/shelf.py:262 cps/shelf.py:264 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "Kitaplık oluştur"
-
-#: cps/shelf.py:304
+#: cps/shelf.py:252
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "%(title)s kitaplığı değiştirildi"
 
-#: cps/shelf.py:311 cps/shelf.py:313
-msgid "Edit a shelf"
-msgstr "Kitaplığı düzenle"
+#: cps/shelf.py:265
+msgid "There was an error"
+msgstr "Bir hata oluştu"
 
-#: cps/shelf.py:381
+#: cps/shelf.py:281
+#, python-format
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:291
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:358
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Kitaplık sıralamasını değiştir: '%(name)s'"
 
-#: cps/shelf.py:447
+#: cps/shelf.py:423
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Kitaplık: '%(name)s'"
 
-#: cps/shelf.py:451
+#: cps/shelf.py:427
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Kitaplık açılırken hata oluştu. Kitaplık mevcut değil ya da erişilebilir değil"
 
@@ -939,222 +939,222 @@ msgstr "Yeni bir güncelleme mevcut. Son sürüme güncellemek için aşağıdak
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Son kararlı sürüme güncellemek için aşağıdaki düğmeye tıklayın."
 
-#: cps/templates/index.html:5 cps/web.py:396
+#: cps/templates/index.html:5 cps/web.py:384
 msgid "Discover (Random Books)"
 msgstr "Keşfet (Rastgele)"
 
-#: cps/web.py:435
+#: cps/web.py:423
 msgid "Books"
 msgstr "eKitaplar"
 
-#: cps/web.py:460
+#: cps/web.py:448
 msgid "Hot Books (Most Downloaded)"
 msgstr ""
 
-#: cps/web.py:495
+#: cps/web.py:483
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:509
+#: cps/web.py:497
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:523
+#: cps/web.py:511
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Yazar: %(name)s"
 
-#: cps/web.py:537
+#: cps/web.py:525
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Yayınevi: %(name)s"
 
-#: cps/web.py:550
+#: cps/web.py:538
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Seri: %(serie)s"
 
-#: cps/web.py:563
+#: cps/web.py:551
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Değerlendirme: %(rating)s yıldız"
 
-#: cps/web.py:576
+#: cps/web.py:564
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Biçim: %(format)s"
 
-#: cps/web.py:590
+#: cps/web.py:578
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategori: %(name)s"
 
-#: cps/web.py:609
+#: cps/web.py:597
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Dil: %(name)s"
 
-#: cps/web.py:639
+#: cps/web.py:627
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/templates/layout.html:56 cps/web.py:706 cps/web.py:1180
+#: cps/templates/layout.html:56 cps/web.py:694 cps/web.py:1168
 msgid "Advanced Search"
 msgstr "Gelişmiş Arama"
 
 #: cps/templates/book_edit.html:214 cps/templates/feed.xml:33
 #: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:175 cps/web.py:718 cps/web.py:990
+#: cps/templates/search_form.html:175 cps/web.py:706 cps/web.py:978
 msgid "Search"
 msgstr "Ara"
 
-#: cps/web.py:885
+#: cps/web.py:873
 msgid "Ratings list"
 msgstr "Değerlendirme listesi"
 
-#: cps/web.py:904
+#: cps/web.py:892
 msgid "File formats list"
 msgstr "Biçim listesi"
 
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:967
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:955
 msgid "Tasks"
 msgstr "Görevler"
 
-#: cps/web.py:1053
+#: cps/web.py:1041
 msgid "Published after "
 msgstr "Yayınlanma (sonra)"
 
-#: cps/web.py:1060
+#: cps/web.py:1048
 msgid "Published before "
 msgstr "Yayınlanma (önce)"
 
-#: cps/web.py:1079
+#: cps/web.py:1067
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Değerlendirme <= %(rating)s"
 
-#: cps/web.py:1081
+#: cps/web.py:1069
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Değerlendirme >= %(rating)s"
 
-#: cps/web.py:1083
+#: cps/web.py:1071
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1254
+#: cps/web.py:1242
 #, 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:1258
+#: cps/web.py:1246
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1260
+#: cps/web.py:1248
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1277
+#: cps/web.py:1265
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "E-Posta sunucusu ayarlanmadı, lütfen yöneticinizle iletişime geçin!"
 
-#: cps/web.py:1278 cps/web.py:1288 cps/web.py:1312 cps/web.py:1316
-#: cps/web.py:1321 cps/web.py:1325
+#: cps/web.py:1266 cps/web.py:1276 cps/web.py:1300 cps/web.py:1304
+#: cps/web.py:1309 cps/web.py:1313
 msgid "register"
 msgstr "kaydol"
 
-#: cps/web.py:1314
+#: cps/web.py:1302
 msgid "Your e-mail is not allowed to register"
 msgstr "E-posta adresinizle kaydolunmasına izin verilmiyor"
 
-#: cps/web.py:1317
+#: cps/web.py:1305
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Onay e-Postası hesabınıza gönderildi."
 
-#: cps/web.py:1320
+#: cps/web.py:1308
 msgid "This username or e-mail address is already in use."
 msgstr "Kullanıcı adı ya da e-Posta adresi zaten kullanımda."
 
-#: cps/web.py:1337
+#: cps/web.py:1325
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP Kimlik Doğrulaması etkinleştirilemiyor"
 
-#: cps/web.py:1354
+#: cps/web.py:1342
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1360
+#: cps/web.py:1348
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1364 cps/web.py:1388
+#: cps/web.py:1352 cps/web.py:1376
 msgid "Wrong Username or Password"
 msgstr "Yanlış Kullanıcı adı ya da Şifre"
 
-#: cps/web.py:1371
+#: cps/web.py:1359
 msgid "New Password was send to your email address"
 msgstr "Yeni şifre e-Posta adresinize gönderildi"
 
-#: cps/web.py:1377
+#: cps/web.py:1365
 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:1383
+#: cps/web.py:1371
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Giriş yaptınız: '%(nickname)s'"
 
-#: cps/web.py:1453 cps/web.py:1506
+#: cps/web.py:1441 cps/web.py:1494
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s Profili"
 
-#: cps/web.py:1489
+#: cps/web.py:1477
 msgid "Profile updated"
 msgstr "Profil güncellendi"
 
-#: cps/web.py:1533 cps/web.py:1536 cps/web.py:1539 cps/web.py:1546
-#: cps/web.py:1551
+#: cps/web.py:1521 cps/web.py:1524 cps/web.py:1527 cps/web.py:1534
+#: cps/web.py:1539
 msgid "Read a Book"
 msgstr "Kitap Oku"
 
-#: cps/tasks/convert.py:108
+#: cps/tasks/convert.py:114
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:132
+#: cps/tasks/convert.py:138
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:136
+#: cps/tasks/convert.py:142
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:146
+#: cps/tasks/convert.py:152
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:170
+#: cps/tasks/convert.py:176
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:193
+#: cps/tasks/convert.py:199
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "eKitap-Dönüştürücü hatası: %(error)s"
 
-#: cps/tasks/convert.py:218
+#: cps/tasks/convert.py:224
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
diff --git a/cps/translations/uk/LC_MESSAGES/messages.mo b/cps/translations/uk/LC_MESSAGES/messages.mo
index 1f904ced..d20b1adb 100644
Binary files a/cps/translations/uk/LC_MESSAGES/messages.mo and b/cps/translations/uk/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/uk/LC_MESSAGES/messages.po b/cps/translations/uk/LC_MESSAGES/messages.po
index 5c52a724..8b0a1718 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-01-02 19:37+0100\n"
+"POT-Creation-Date: 2021-01-17 11:34+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:42
 msgid "installed"
@@ -29,310 +29,310 @@ msgstr "не встановлено"
 msgid "Statistics"
 msgstr "Статистика"
 
-#: cps/admin.py:144
+#: cps/admin.py:147
 msgid "Server restarted, please reload page"
 msgstr "Сервер перезавантажено, будь-ласка, перезавантажте сторінку"
 
-#: cps/admin.py:146
+#: cps/admin.py:149
 msgid "Performing shutdown of server, please close window"
 msgstr "Виконується зупинка серверу, будь-ласка, закрийте вікно"
 
-#: cps/admin.py:154
+#: cps/admin.py:157
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:157
+#: cps/admin.py:160
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:167 cps/editbooks.py:636 cps/editbooks.py:648
-#: cps/editbooks.py:751 cps/editbooks.py:753 cps/editbooks.py:814
-#: cps/editbooks.py:830 cps/updater.py:510 cps/uploader.py:90
+#: cps/admin.py:170 cps/editbooks.py:642 cps/editbooks.py:654
+#: cps/editbooks.py:757 cps/editbooks.py:759 cps/editbooks.py:820
+#: cps/editbooks.py:836 cps/updater.py:510 cps/uploader.py:90
 #: cps/uploader.py:100
 msgid "Unknown"
 msgstr "Невідомий"
 
-#: cps/admin.py:188
+#: cps/admin.py:191
 msgid "Admin page"
 msgstr "Сторінка адміністратора"
 
-#: cps/admin.py:210
+#: cps/admin.py:213
 msgid "UI Configuration"
 msgstr "Конфігурація інтерфейсу"
 
-#: cps/admin.py:242 cps/admin.py:954
+#: cps/admin.py:245 cps/admin.py:923
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
-#: cps/admin.py:253
+#: cps/admin.py:256
 msgid "Do you really want to delete the Kobo Token?"
 msgstr ""
 
-#: cps/admin.py:255
+#: cps/admin.py:258
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:257
+#: cps/admin.py:260
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:259 cps/templates/shelf.html:90
+#: cps/admin.py:262 cps/templates/shelf.html:90
 msgid "Are you sure you want to delete this shelf?"
 msgstr "Ви справді хочете видалити книжкову полицю?"
 
-#: cps/admin.py:545 cps/admin.py:551 cps/admin.py:561 cps/admin.py:571
+#: cps/admin.py:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534
 #: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:547 cps/admin.py:553 cps/admin.py:563 cps/admin.py:573
+#: cps/admin.py:510 cps/admin.py:516 cps/admin.py:526 cps/admin.py:536
 #: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:713
+#: cps/admin.py:679
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:753
+#: cps/admin.py:721
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:759
+#: cps/admin.py:727
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:788
+#: cps/admin.py:757
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:803
+#: cps/admin.py:772
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:806
+#: cps/admin.py:775
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:811
+#: cps/admin.py:780
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:814
+#: cps/admin.py:783
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:822
+#: cps/admin.py:791
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:825
+#: cps/admin.py:794
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:833
+#: cps/admin.py:802
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:859
+#: cps/admin.py:828
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:865
+#: cps/admin.py:834
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:935 cps/admin.py:1039 cps/admin.py:1135 cps/admin.py:1184
-#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:258
-#: cps/shelf.py:307 cps/shelf.py:339 cps/shelf.py:371 cps/shelf.py:442
+#: cps/admin.py:904 cps/admin.py:1011 cps/admin.py:1100 cps/admin.py:1149
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:261
+#: cps/shelf.py:314 cps/shelf.py:348 cps/shelf.py:418
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:947
+#: cps/admin.py:916
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:951
+#: cps/admin.py:920
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:984
+#: cps/admin.py:959
 msgid "Basic Configuration"
 msgstr "Настройки сервера"
 
-#: cps/admin.py:999 cps/web.py:1287
+#: cps/admin.py:974 cps/web.py:1275
 msgid "Please fill out all fields!"
 msgstr "Будь-ласка, заповніть всі поля!"
 
-#: cps/admin.py:1002 cps/admin.py:1014 cps/admin.py:1020 cps/admin.py:1153
+#: cps/admin.py:977 cps/admin.py:989 cps/admin.py:995 cps/admin.py:1118
 msgid "Add new user"
 msgstr "Додати користувача"
 
-#: cps/admin.py:1011 cps/web.py:1451
+#: cps/admin.py:986 cps/web.py:1439
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/admin.py:1018 cps/admin.py:1036
+#: cps/admin.py:993 cps/admin.py:1008
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/admin.py:1032
+#: cps/admin.py:1004
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Користувач '%(user)s' додан"
 
-#: cps/admin.py:1051
+#: cps/admin.py:1020
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Користувача '%(nick)s' видалено"
 
-#: cps/admin.py:1054
+#: cps/admin.py:1023
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:1060
+#: cps/admin.py:1028
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:1096 cps/web.py:1493
+#: cps/admin.py:1064 cps/web.py:1481
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/admin.py:1105 cps/admin.py:1119 cps/admin.py:1225 cps/web.py:1469
+#: cps/admin.py:1073 cps/admin.py:1087 cps/admin.py:1190 cps/web.py:1457
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Змінити користувача %(nick)s"
 
-#: cps/admin.py:1111 cps/web.py:1462
+#: cps/admin.py:1079 cps/web.py:1450
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:1129
+#: cps/admin.py:1094
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Користувача '%(nick)s' оновлено"
 
-#: cps/admin.py:1132
+#: cps/admin.py:1097
 msgid "An unknown error occured."
 msgstr "Сталась невідома помилка"
 
-#: cps/admin.py:1162 cps/templates/admin.html:78
+#: cps/admin.py:1127 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "Змінити налаштування SMTP"
 
-#: cps/admin.py:1191
+#: cps/admin.py:1156
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/admin.py:1194
+#: cps/admin.py:1159
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:1196
+#: cps/admin.py:1161
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1198
+#: cps/admin.py:1163
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:1209
+#: cps/admin.py:1174
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:1236
+#: cps/admin.py:1201
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1239 cps/web.py:1311 cps/web.py:1375
+#: cps/admin.py:1204 cps/web.py:1299 cps/web.py:1363
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/admin.py:1242 cps/web.py:1249
+#: cps/admin.py:1207 cps/web.py:1237
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Будь-ласка, спочатку сконфігуруйте параметри SMTP"
 
-#: cps/admin.py:1254
+#: cps/admin.py:1218
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1315
+#: cps/admin.py:1280
 msgid "Requesting update package"
 msgstr "Перевірка оновлень"
 
-#: cps/admin.py:1316
+#: cps/admin.py:1281
 msgid "Downloading update package"
 msgstr "Завантаження оновлень"
 
-#: cps/admin.py:1317
+#: cps/admin.py:1282
 msgid "Unzipping update package"
 msgstr "Розпакування оновлення"
 
-#: cps/admin.py:1318
+#: cps/admin.py:1283
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:1319
+#: cps/admin.py:1284
 msgid "Database connections are closed"
 msgstr "З'єднання з базою даних закрите"
 
-#: cps/admin.py:1320
+#: cps/admin.py:1285
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:1321
+#: cps/admin.py:1286
 msgid "Update finished, please press okay and reload page"
 msgstr "Оновлення встановлені, натисніть ok і перезавантажте сторінку"
 
-#: cps/admin.py:1322 cps/admin.py:1323 cps/admin.py:1324 cps/admin.py:1325
-#: cps/admin.py:1326
+#: cps/admin.py:1287 cps/admin.py:1288 cps/admin.py:1289 cps/admin.py:1290
+#: cps/admin.py:1291
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:1322 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+#: cps/admin.py:1287 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:1323 cps/updater.py:322 cps/updater.py:525
+#: cps/admin.py:1288 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:1324 cps/updater.py:324 cps/updater.py:527
+#: cps/admin.py:1289 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:1325 cps/updater.py:326 cps/updater.py:529
+#: cps/admin.py:1290 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr ""
 
-#: cps/admin.py:1326
+#: cps/admin.py:1291
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
-#: cps/admin.py:1351
+#: cps/admin.py:1316
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1355
+#: cps/admin.py:1320
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1421
+#: cps/admin.py:1386
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1424
+#: cps/admin.py:1389
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1426
+#: cps/admin.py:1391
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -352,90 +352,90 @@ msgstr ""
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:317 cps/editbooks.py:620 cps/web.py:1521 cps/web.py:1554
-#: cps/web.py:1625
+#: cps/editbooks.py:316 cps/editbooks.py:626 cps/web.py:1509 cps/web.py:1542
+#: cps/web.py:1613
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Сталась помилка при відкриванні eBook. Файл не існує або відсутній доступ до нього"
 
-#: cps/editbooks.py:351
+#: cps/editbooks.py:350
 msgid "edit metadata"
 msgstr "змінити метадані"
 
-#: cps/editbooks.py:426
+#: cps/editbooks.py:425
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr ""
 
-#: cps/editbooks.py:537 cps/editbooks.py:796
+#: cps/editbooks.py:536 cps/editbooks.py:802
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr ""
 
-#: cps/editbooks.py:541 cps/editbooks.py:800
+#: cps/editbooks.py:540 cps/editbooks.py:806
 msgid "File to be uploaded must have an extension"
 msgstr "Завантажувальний файл повинен мати розширення"
 
-#: cps/editbooks.py:553
+#: cps/editbooks.py:552
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr ""
 
-#: cps/editbooks.py:558
+#: cps/editbooks.py:557
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr ""
 
-#: cps/editbooks.py:576 cps/editbooks.py:931 cps/web.py:1498
+#: cps/editbooks.py:575 cps/editbooks.py:937 cps/web.py:1486
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:580
+#: cps/editbooks.py:579
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr ""
 
-#: cps/editbooks.py:700
+#: cps/editbooks.py:706
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:737
+#: cps/editbooks.py:743
 msgid "Metadata successfully updated"
 msgstr ""
 
-#: cps/editbooks.py:746
+#: cps/editbooks.py:752
 msgid "Error editing book, please check logfile for details"
 msgstr "Сталась помилка при редагуванні книги. Будь-ласка, перевірте лог-файл для деталей"
 
-#: cps/editbooks.py:808
+#: cps/editbooks.py:814
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:818
+#: cps/editbooks.py:824
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:906
+#: cps/editbooks.py:912
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:917
+#: cps/editbooks.py:923
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:943
+#: cps/editbooks.py:949
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/editbooks.py:951
+#: cps/editbooks.py:957
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/editbooks.py:955
+#: cps/editbooks.py:961
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
@@ -596,85 +596,85 @@ msgstr ""
 msgid "Unknown Status"
 msgstr ""
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:157
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
 msgid "Kobo Setup"
 msgstr ""
 
-#: cps/oauth_bb.py:74
+#: cps/oauth_bb.py:73
 #, python-format
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:158
+#: cps/oauth_bb.py:146
 msgid "Failed to log in with GitHub."
 msgstr ""
 
-#: cps/oauth_bb.py:163
+#: cps/oauth_bb.py:151
 msgid "Failed to fetch user info from GitHub."
 msgstr ""
 
-#: cps/oauth_bb.py:174
+#: cps/oauth_bb.py:162
 msgid "Failed to log in with Google."
 msgstr ""
 
-#: cps/oauth_bb.py:179
+#: cps/oauth_bb.py:167
 msgid "Failed to fetch user info from Google."
 msgstr ""
 
-#: cps/oauth_bb.py:229 cps/remotelogin.py:134 cps/web.py:1347
+#: cps/oauth_bb.py:213 cps/remotelogin.py:133 cps/web.py:1335
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Ви увійшли як користувач: '%(nickname)s'"
 
-#: cps/oauth_bb.py:239
+#: cps/oauth_bb.py:223
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:245
+#: cps/oauth_bb.py:229
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr ""
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:271
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:291
+#: cps/oauth_bb.py:275
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr ""
 
-#: cps/oauth_bb.py:294
+#: cps/oauth_bb.py:278
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:322
+#: cps/oauth_bb.py:306
 msgid "GitHub Oauth error, please retry later."
 msgstr ""
 
-#: cps/oauth_bb.py:341
+#: cps/oauth_bb.py:325
 msgid "Google Oauth error, please retry later."
 msgstr ""
 
-#: cps/remotelogin.py:66 cps/web.py:1394
+#: cps/remotelogin.py:65 cps/web.py:1382
 msgid "login"
 msgstr "увійти"
 
-#: cps/remotelogin.py:78 cps/remotelogin.py:112
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
 msgid "Token not found"
 msgstr "Токен не знайдено"
 
-#: cps/remotelogin.py:87 cps/remotelogin.py:120
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
 msgid "Token has expired"
 msgstr "Час дії токено вичерпано"
 
-#: cps/remotelogin.py:96
+#: cps/remotelogin.py:95
 msgid "Success! Please return to your device"
 msgstr "Вдалося! Будь-ласка, поверніться до вашого пристрою"
 
@@ -702,7 +702,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:388
+#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:376
 msgid "Top Rated Books"
 msgstr "Книги з найкращим рейтингом"
 
@@ -711,7 +711,7 @@ msgid "Show Top Rated Books"
 msgstr "Показувати книги з найвищим рейтингом"
 
 #: cps/render_template.py:53 cps/templates/index.xml:46
-#: cps/templates/index.xml:50 cps/web.py:648
+#: cps/templates/index.xml:50 cps/web.py:636
 msgid "Read Books"
 msgstr "Прочитані книги"
 
@@ -720,7 +720,7 @@ msgid "Show read and unread"
 msgstr "Показувати прочитані та непрочитані книги"
 
 #: cps/render_template.py:57 cps/templates/index.xml:53
-#: cps/templates/index.xml:57 cps/web.py:651
+#: cps/templates/index.xml:57 cps/web.py:639
 msgid "Unread Books"
 msgstr "Непрочитані книги"
 
@@ -737,7 +737,7 @@ msgid "Show random books"
 msgstr "Показувати випадкові книги"
 
 #: cps/render_template.py:63 cps/templates/book_table.html:50
-#: cps/templates/index.xml:75 cps/web.py:953
+#: cps/templates/index.xml:75 cps/web.py:941
 msgid "Categories"
 msgstr "Категорії"
 
@@ -747,7 +747,7 @@ msgstr "Показувати вибір категорії"
 
 #: cps/render_template.py:66 cps/templates/book_edit.html:84
 #: cps/templates/book_table.html:51 cps/templates/index.xml:82
-#: cps/templates/search_form.html:62 cps/web.py:857 cps/web.py:867
+#: cps/templates/search_form.html:62 cps/web.py:845 cps/web.py:855
 msgid "Series"
 msgstr "Серії"
 
@@ -765,7 +765,7 @@ msgid "Show author selection"
 msgstr "Показувати вибір автора"
 
 #: cps/render_template.py:73 cps/templates/book_table.html:55
-#: cps/templates/index.xml:68 cps/web.py:836
+#: cps/templates/index.xml:68 cps/web.py:824
 msgid "Publishers"
 msgstr ""
 
@@ -774,7 +774,7 @@ msgid "Show publisher selection"
 msgstr ""
 
 #: cps/render_template.py:76 cps/templates/book_table.html:53
-#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:932
+#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:920
 msgid "Languages"
 msgstr "Мови"
 
@@ -798,7 +798,7 @@ msgstr ""
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/render_template.py:87 cps/web.py:675
+#: cps/render_template.py:87 cps/web.py:663
 msgid "Archived Books"
 msgstr ""
 
@@ -806,7 +806,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:91 cps/web.py:746
+#: cps/render_template.py:91 cps/web.py:734
 msgid "Books List"
 msgstr ""
 
@@ -863,49 +863,49 @@ msgstr "Книга видалена з книжкової полиці: %(sname)
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr "Вибачте, але у вас немає дозволу для видалення книги з цієї полиці"
 
-#: cps/shelf.py:238 cps/shelf.py:282
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr ""
+#: cps/shelf.py:224 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "створити книжкову полицю"
 
-#: cps/shelf.py:247 cps/shelf.py:292
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr ""
+#: cps/shelf.py:231
+msgid "Edit a shelf"
+msgstr "Змінити книжкову полицю"
 
-#: cps/shelf.py:254
+#: cps/shelf.py:249
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Створена книжкова полиця %(title)s"
 
-#: cps/shelf.py:261 cps/shelf.py:310
-msgid "There was an error"
-msgstr "Сталась помилка"
-
-#: cps/shelf.py:262 cps/shelf.py:264 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "створити книжкову полицю"
-
-#: cps/shelf.py:304
+#: cps/shelf.py:252
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Книжкова полиця %(title)s змінена"
 
-#: cps/shelf.py:311 cps/shelf.py:313
-msgid "Edit a shelf"
-msgstr "Змінити книжкову полицю"
+#: cps/shelf.py:265
+msgid "There was an error"
+msgstr "Сталась помилка"
 
-#: cps/shelf.py:381
+#: cps/shelf.py:281
+#, python-format
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:291
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:358
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Змінити розташування книжкової полиці '%(name)s'"
 
-#: cps/shelf.py:447
+#: cps/shelf.py:423
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Книжкова полиця: '%(name)s'"
 
-#: cps/shelf.py:451
+#: cps/shelf.py:427
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Помилка при відкриванні полиці. Полиця не існує або до неї відсутній доступ"
 
@@ -938,222 +938,222 @@ msgstr ""
 msgid "Click on the button below to update to the latest stable version."
 msgstr ""
 
-#: cps/templates/index.html:5 cps/web.py:396
+#: cps/templates/index.html:5 cps/web.py:384
 msgid "Discover (Random Books)"
 msgstr "Огляд (випадкові книги)"
 
-#: cps/web.py:435
+#: cps/web.py:423
 msgid "Books"
 msgstr ""
 
-#: cps/web.py:460
+#: cps/web.py:448
 msgid "Hot Books (Most Downloaded)"
 msgstr "Популярні книги (найбільш завантажувані)"
 
-#: cps/web.py:495
+#: cps/web.py:483
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:509
+#: cps/web.py:497
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "Неможливо відкрити книгу. Файл не існує або немає доступу."
 
-#: cps/web.py:523
+#: cps/web.py:511
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:537
+#: cps/web.py:525
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr ""
 
-#: cps/web.py:550
+#: cps/web.py:538
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Серії: %(serie)s"
 
-#: cps/web.py:563
+#: cps/web.py:551
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:576
+#: cps/web.py:564
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:590
+#: cps/web.py:578
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Категорія: %(name)s"
 
-#: cps/web.py:609
+#: cps/web.py:597
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Мова: %(name)s"
 
-#: cps/web.py:639
+#: cps/web.py:627
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/templates/layout.html:56 cps/web.py:706 cps/web.py:1180
+#: cps/templates/layout.html:56 cps/web.py:694 cps/web.py:1168
 msgid "Advanced Search"
 msgstr "Розширений пошук"
 
 #: cps/templates/book_edit.html:214 cps/templates/feed.xml:33
 #: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:175 cps/web.py:718 cps/web.py:990
+#: cps/templates/search_form.html:175 cps/web.py:706 cps/web.py:978
 msgid "Search"
 msgstr "Пошук"
 
-#: cps/web.py:885
+#: cps/web.py:873
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:904
+#: cps/web.py:892
 msgid "File formats list"
 msgstr ""
 
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:967
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:955
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1053
+#: cps/web.py:1041
 msgid "Published after "
 msgstr ""
 
-#: cps/web.py:1060
+#: cps/web.py:1048
 msgid "Published before "
 msgstr "Опубліковано до"
 
-#: cps/web.py:1079
+#: cps/web.py:1067
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1081
+#: cps/web.py:1069
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1083
+#: cps/web.py:1071
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1254
+#: cps/web.py:1242
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1258
+#: cps/web.py:1246
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "Помилка при відправці книги: %(res)s"
 
-#: cps/web.py:1260
+#: cps/web.py:1248
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1277
+#: cps/web.py:1265
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/web.py:1278 cps/web.py:1288 cps/web.py:1312 cps/web.py:1316
-#: cps/web.py:1321 cps/web.py:1325
+#: cps/web.py:1266 cps/web.py:1276 cps/web.py:1300 cps/web.py:1304
+#: cps/web.py:1309 cps/web.py:1313
 msgid "register"
 msgstr "зареєструватись"
 
-#: cps/web.py:1314
+#: cps/web.py:1302
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1317
+#: cps/web.py:1305
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1320
+#: cps/web.py:1308
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:1337
+#: cps/web.py:1325
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1354
+#: cps/web.py:1342
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1360
+#: cps/web.py:1348
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1364 cps/web.py:1388
+#: cps/web.py:1352 cps/web.py:1376
 msgid "Wrong Username or Password"
 msgstr "Помилка в імені користувача або паролі"
 
-#: cps/web.py:1371
+#: cps/web.py:1359
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1377
+#: cps/web.py:1365
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1383
+#: cps/web.py:1371
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1453 cps/web.py:1506
+#: cps/web.py:1441 cps/web.py:1494
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Профіль %(name)s"
 
-#: cps/web.py:1489
+#: cps/web.py:1477
 msgid "Profile updated"
 msgstr "Профіль оновлено"
 
-#: cps/web.py:1533 cps/web.py:1536 cps/web.py:1539 cps/web.py:1546
-#: cps/web.py:1551
+#: cps/web.py:1521 cps/web.py:1524 cps/web.py:1527 cps/web.py:1534
+#: cps/web.py:1539
 msgid "Read a Book"
 msgstr "Читати книгу"
 
-#: cps/tasks/convert.py:108
+#: cps/tasks/convert.py:114
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:132
+#: cps/tasks/convert.py:138
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:136
+#: cps/tasks/convert.py:142
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:146
+#: cps/tasks/convert.py:152
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:170
+#: cps/tasks/convert.py:176
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:193
+#: cps/tasks/convert.py:199
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:218
+#: cps/tasks/convert.py:224
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
index a3f7715c..2a784326 100644
Binary files a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo and b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index 1c47f86e..6e697745 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-01-02 19:37+0100\n"
+"POT-Creation-Date: 2021-01-17 11:34+0100\n"
 "PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: dalin <dalin.lin@gmail.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:42
 msgid "installed"
@@ -30,310 +30,310 @@ msgstr "未安装"
 msgid "Statistics"
 msgstr "统计"
 
-#: cps/admin.py:144
+#: cps/admin.py:147
 msgid "Server restarted, please reload page"
 msgstr "服务器已重启，请刷新页面"
 
-#: cps/admin.py:146
+#: cps/admin.py:149
 msgid "Performing shutdown of server, please close window"
 msgstr "正在关闭服务器，请关闭窗口"
 
-#: cps/admin.py:154
+#: cps/admin.py:157
 msgid "Reconnect successful"
 msgstr "重新连接成功"
 
-#: cps/admin.py:157
+#: cps/admin.py:160
 msgid "Unknown command"
 msgstr "未知命令"
 
-#: cps/admin.py:167 cps/editbooks.py:636 cps/editbooks.py:648
-#: cps/editbooks.py:751 cps/editbooks.py:753 cps/editbooks.py:814
-#: cps/editbooks.py:830 cps/updater.py:510 cps/uploader.py:90
+#: cps/admin.py:170 cps/editbooks.py:642 cps/editbooks.py:654
+#: cps/editbooks.py:757 cps/editbooks.py:759 cps/editbooks.py:820
+#: cps/editbooks.py:836 cps/updater.py:510 cps/uploader.py:90
 #: cps/uploader.py:100
 msgid "Unknown"
 msgstr "未知"
 
-#: cps/admin.py:188
+#: cps/admin.py:191
 msgid "Admin page"
 msgstr "管理页"
 
-#: cps/admin.py:210
+#: cps/admin.py:213
 msgid "UI Configuration"
 msgstr "界面配置"
 
-#: cps/admin.py:242 cps/admin.py:954
+#: cps/admin.py:245 cps/admin.py:923
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web配置已更新"
 
-#: cps/admin.py:253
+#: cps/admin.py:256
 msgid "Do you really want to delete the Kobo Token?"
 msgstr "您确定删除Kobo Token吗？"
 
-#: cps/admin.py:255
+#: cps/admin.py:258
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:257
+#: cps/admin.py:260
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:259 cps/templates/shelf.html:90
+#: cps/admin.py:262 cps/templates/shelf.html:90
 msgid "Are you sure you want to delete this shelf?"
 msgstr "您确定要删除此书架吗？"
 
-#: cps/admin.py:545 cps/admin.py:551 cps/admin.py:561 cps/admin.py:571
+#: cps/admin.py:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534
 #: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr "隐藏"
 
-#: cps/admin.py:547 cps/admin.py:553 cps/admin.py:563 cps/admin.py:573
+#: cps/admin.py:510 cps/admin.py:516 cps/admin.py:526 cps/admin.py:536
 #: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr "显示"
 
-#: cps/admin.py:713
+#: cps/admin.py:679
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr "client_secrets.json 未为 Web 应用程序配置"
 
-#: cps/admin.py:753
+#: cps/admin.py:721
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "日志文件路径无效，请输入正确的路径"
 
-#: cps/admin.py:759
+#: cps/admin.py:727
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr "访问日志路径无效，请输入正确的路径"
 
-#: cps/admin.py:788
+#: cps/admin.py:757
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr "请输入LDAP主机、端口、DN和用户对象标识符"
 
-#: cps/admin.py:803
+#: cps/admin.py:772
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP组对象过滤器需要一个具有“%s”格式标识符"
 
-#: cps/admin.py:806
+#: cps/admin.py:775
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP组对象过滤器的括号不匹配"
 
-#: cps/admin.py:811
+#: cps/admin.py:780
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr "LDAP用户对象过滤器需要一个具有“%s”格式标识符"
 
-#: cps/admin.py:814
+#: cps/admin.py:783
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr "LDAP用户对象过滤器的括号不匹配"
 
-#: cps/admin.py:822
+#: cps/admin.py:791
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:825
+#: cps/admin.py:794
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:833
+#: cps/admin.py:802
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:859
+#: cps/admin.py:828
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr "密钥文件路径无效，请输入正确的路径"
 
-#: cps/admin.py:865
+#: cps/admin.py:834
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr "证书文件路径无效，请输入正确的路径"
 
-#: cps/admin.py:935 cps/admin.py:1039 cps/admin.py:1135 cps/admin.py:1184
-#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:258
-#: cps/shelf.py:307 cps/shelf.py:339 cps/shelf.py:371 cps/shelf.py:442
+#: cps/admin.py:904 cps/admin.py:1011 cps/admin.py:1100 cps/admin.py:1149
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:261
+#: cps/shelf.py:314 cps/shelf.py:348 cps/shelf.py:418
 msgid "Settings DB is not Writeable"
 msgstr "设置数据库不可写入"
 
-#: cps/admin.py:947
+#: cps/admin.py:916
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr "数据库路径无效，请输入正确的路径"
 
-#: cps/admin.py:951
+#: cps/admin.py:920
 msgid "DB is not Writeable"
 msgstr "数据库不可写入"
 
-#: cps/admin.py:984
+#: cps/admin.py:959
 msgid "Basic Configuration"
 msgstr "基本配置"
 
-#: cps/admin.py:999 cps/web.py:1287
+#: cps/admin.py:974 cps/web.py:1275
 msgid "Please fill out all fields!"
 msgstr "请填写所有字段！"
 
-#: cps/admin.py:1002 cps/admin.py:1014 cps/admin.py:1020 cps/admin.py:1153
+#: cps/admin.py:977 cps/admin.py:989 cps/admin.py:995 cps/admin.py:1118
 msgid "Add new user"
 msgstr "添加新用户"
 
-#: cps/admin.py:1011 cps/web.py:1451
+#: cps/admin.py:986 cps/web.py:1439
 msgid "E-mail is not from valid domain"
 msgstr "邮箱不在有效域中"
 
-#: cps/admin.py:1018 cps/admin.py:1036
+#: cps/admin.py:993 cps/admin.py:1008
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "此邮箱或用户名的账号已经存在。"
 
-#: cps/admin.py:1032
+#: cps/admin.py:1004
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "用户“%(user)s”已创建"
 
-#: cps/admin.py:1051
+#: cps/admin.py:1020
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "用户“%(nick)s”已删除"
 
-#: cps/admin.py:1054
+#: cps/admin.py:1023
 msgid "No admin user remaining, can't delete user"
 msgstr "管理员账户不存在，无法删除用户"
 
-#: cps/admin.py:1060
+#: cps/admin.py:1028
 msgid "No admin user remaining, can't remove admin role"
 msgstr "理员账户不存在，无法删除管理员角色"
 
-#: cps/admin.py:1096 cps/web.py:1493
+#: cps/admin.py:1064 cps/web.py:1481
 msgid "Found an existing account for this e-mail address."
 msgstr "此邮箱的账号已经存在。"
 
-#: cps/admin.py:1105 cps/admin.py:1119 cps/admin.py:1225 cps/web.py:1469
+#: cps/admin.py:1073 cps/admin.py:1087 cps/admin.py:1190 cps/web.py:1457
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "编辑用户 %(nick)s"
 
-#: cps/admin.py:1111 cps/web.py:1462
+#: cps/admin.py:1079 cps/web.py:1450
 msgid "This username is already taken"
 msgstr "此用户名已被使用"
 
-#: cps/admin.py:1129
+#: cps/admin.py:1094
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "用户“%(nick)s”已更新"
 
-#: cps/admin.py:1132
+#: cps/admin.py:1097
 msgid "An unknown error occured."
 msgstr "发生未知错误。"
 
-#: cps/admin.py:1162 cps/templates/admin.html:78
+#: cps/admin.py:1127 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr "编辑邮件服务器设置"
 
-#: cps/admin.py:1191
+#: cps/admin.py:1156
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "测试邮件已经被成功发到 %(kindlemail)s"
 
-#: cps/admin.py:1194
+#: cps/admin.py:1159
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "发送测试邮件时出错：%(res)s"
 
-#: cps/admin.py:1196
+#: cps/admin.py:1161
 msgid "Please configure your e-mail address first..."
 msgstr "请先配置您的邮箱地址..."
 
-#: cps/admin.py:1198
+#: cps/admin.py:1163
 msgid "E-mail server settings updated"
 msgstr "邮件服务器设置已更新"
 
-#: cps/admin.py:1209
+#: cps/admin.py:1174
 msgid "User not found"
 msgstr "找不到用户"
 
-#: cps/admin.py:1236
+#: cps/admin.py:1201
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "用户 %(user)s 的密码已重置"
 
-#: cps/admin.py:1239 cps/web.py:1311 cps/web.py:1375
+#: cps/admin.py:1204 cps/web.py:1299 cps/web.py:1363
 msgid "An unknown error occurred. Please try again later."
 msgstr "发生一个未知错误，请稍后再试。"
 
-#: cps/admin.py:1242 cps/web.py:1249
+#: cps/admin.py:1207 cps/web.py:1237
 msgid "Please configure the SMTP mail settings first..."
 msgstr "请先配置SMTP邮箱设置..."
 
-#: cps/admin.py:1254
+#: cps/admin.py:1218
 msgid "Logfile viewer"
 msgstr "日志文件查看器"
 
-#: cps/admin.py:1315
+#: cps/admin.py:1280
 msgid "Requesting update package"
 msgstr "正在请求更新包"
 
-#: cps/admin.py:1316
+#: cps/admin.py:1281
 msgid "Downloading update package"
 msgstr "正在下载更新包"
 
-#: cps/admin.py:1317
+#: cps/admin.py:1282
 msgid "Unzipping update package"
 msgstr "正在解压更新包"
 
-#: cps/admin.py:1318
+#: cps/admin.py:1283
 msgid "Replacing files"
 msgstr "正在替换文件"
 
-#: cps/admin.py:1319
+#: cps/admin.py:1284
 msgid "Database connections are closed"
 msgstr "数据库连接已关闭"
 
-#: cps/admin.py:1320
+#: cps/admin.py:1285
 msgid "Stopping server"
 msgstr "正在停止服务器"
 
-#: cps/admin.py:1321
+#: cps/admin.py:1286
 msgid "Update finished, please press okay and reload page"
 msgstr "更新完成，请点击确定并刷新页面"
 
-#: cps/admin.py:1322 cps/admin.py:1323 cps/admin.py:1324 cps/admin.py:1325
-#: cps/admin.py:1326
+#: cps/admin.py:1287 cps/admin.py:1288 cps/admin.py:1289 cps/admin.py:1290
+#: cps/admin.py:1291
 msgid "Update failed:"
 msgstr "更新失败："
 
-#: cps/admin.py:1322 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+#: cps/admin.py:1287 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr "HTTP错误"
 
-#: cps/admin.py:1323 cps/updater.py:322 cps/updater.py:525
+#: cps/admin.py:1288 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr "连接错误"
 
-#: cps/admin.py:1324 cps/updater.py:324 cps/updater.py:527
+#: cps/admin.py:1289 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr "建立连接超时"
 
-#: cps/admin.py:1325 cps/updater.py:326 cps/updater.py:529
+#: cps/admin.py:1290 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr "一般错误"
 
-#: cps/admin.py:1326
+#: cps/admin.py:1291
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr "更新文件无法保存在临时目录中"
 
-#: cps/admin.py:1351
+#: cps/admin.py:1316
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr "错误：%(ldaperror)s"
 
-#: cps/admin.py:1355
+#: cps/admin.py:1320
 msgid "Error: No user returned in response of LDAP server"
 msgstr "错误：在LDAP服务器的响应中没有返回用户"
 
-#: cps/admin.py:1421
+#: cps/admin.py:1386
 msgid "Failed to Create at Least One LDAP User"
 msgstr "创建至少一个LDAP用户失败"
 
-#: cps/admin.py:1424
+#: cps/admin.py:1389
 msgid "At Least One LDAP User Not Found in Database"
 msgstr "数据库中没有找到至少一个LDAP用户"
 
-#: cps/admin.py:1426
+#: cps/admin.py:1391
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -353,90 +353,90 @@ msgstr "书籍格式已成功删除"
 msgid "Book Successfully Deleted"
 msgstr "书籍已成功删除"
 
-#: cps/editbooks.py:317 cps/editbooks.py:620 cps/web.py:1521 cps/web.py:1554
-#: cps/web.py:1625
+#: cps/editbooks.py:316 cps/editbooks.py:626 cps/web.py:1509 cps/web.py:1542
+#: cps/web.py:1613
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "打开电子书出错。文件不存在或不可访问"
 
-#: cps/editbooks.py:351
+#: cps/editbooks.py:350
 msgid "edit metadata"
 msgstr "编辑元数据"
 
-#: cps/editbooks.py:426
+#: cps/editbooks.py:425
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s 不是一种有效语言"
 
-#: cps/editbooks.py:537 cps/editbooks.py:796
+#: cps/editbooks.py:536 cps/editbooks.py:802
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "不能上传文件扩展名为“%(ext)s”的文件到此服务器"
 
-#: cps/editbooks.py:541 cps/editbooks.py:800
+#: cps/editbooks.py:540 cps/editbooks.py:806
 msgid "File to be uploaded must have an extension"
 msgstr "要上传的文件必须具有扩展名"
 
-#: cps/editbooks.py:553
+#: cps/editbooks.py:552
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "创建路径 %(path)s 失败(权限拒绝)。"
 
-#: cps/editbooks.py:558
+#: cps/editbooks.py:557
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "保存文件 %(file)s 失败。"
 
-#: cps/editbooks.py:576 cps/editbooks.py:931 cps/web.py:1498
+#: cps/editbooks.py:575 cps/editbooks.py:937 cps/web.py:1486
 #, python-format
 msgid "Database error: %(error)s."
 msgstr "数据库错误：%(error)s。"
 
-#: cps/editbooks.py:580
+#: cps/editbooks.py:579
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "已添加 %(ext)s 格式到 %(book)s"
 
-#: cps/editbooks.py:700
+#: cps/editbooks.py:706
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr "标识符不区分大小写，覆盖旧标识符"
 
-#: cps/editbooks.py:737
+#: cps/editbooks.py:743
 msgid "Metadata successfully updated"
 msgstr "已成功更新元数据"
 
-#: cps/editbooks.py:746
+#: cps/editbooks.py:752
 msgid "Error editing book, please check logfile for details"
 msgstr "编辑书籍出错，请检查日志文件以获取详细信息"
 
-#: cps/editbooks.py:808
+#: cps/editbooks.py:814
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr "文件 %(filename)s 无法保存到临时目录"
 
-#: cps/editbooks.py:818
+#: cps/editbooks.py:824
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr "上传的书籍可能已经存在，建议修改后重新上传： "
 
-#: cps/editbooks.py:906
+#: cps/editbooks.py:912
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr "移动封面文件失败 %(file)s：%(error)s"
 
-#: cps/editbooks.py:917
+#: cps/editbooks.py:923
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "文件 %(file)s 已上传"
 
-#: cps/editbooks.py:943
+#: cps/editbooks.py:949
 msgid "Source or destination format for conversion missing"
 msgstr "转换的源或目的格式缺失"
 
-#: cps/editbooks.py:951
+#: cps/editbooks.py:957
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "书籍已经被成功加入到 %(book_format)s 格式转换队列"
 
-#: cps/editbooks.py:955
+#: cps/editbooks.py:961
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "转换此书籍时出现错误： %(res)s"
@@ -597,85 +597,85 @@ msgstr "已完成"
 msgid "Unknown Status"
 msgstr "未知状态"
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr "请不要使用localhost访问Calibre-Web，以便Kobo设备能获取有效的api_endpoint"
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:157
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
 msgid "Kobo Setup"
 msgstr "Kobo 设置"
 
-#: cps/oauth_bb.py:74
+#: cps/oauth_bb.py:73
 #, python-format
 msgid "Register with %(provider)s"
 msgstr "使用 %(provider)s 注册"
 
-#: cps/oauth_bb.py:158
+#: cps/oauth_bb.py:146
 msgid "Failed to log in with GitHub."
 msgstr "使用Github登录失败。"
 
-#: cps/oauth_bb.py:163
+#: cps/oauth_bb.py:151
 msgid "Failed to fetch user info from GitHub."
 msgstr "从Github获取用户信息失败。"
 
-#: cps/oauth_bb.py:174
+#: cps/oauth_bb.py:162
 msgid "Failed to log in with Google."
 msgstr "使用Google登录失败。"
 
-#: cps/oauth_bb.py:179
+#: cps/oauth_bb.py:167
 msgid "Failed to fetch user info from Google."
 msgstr "从Google获取用户信息失败。"
 
-#: cps/oauth_bb.py:229 cps/remotelogin.py:134 cps/web.py:1347
+#: cps/oauth_bb.py:213 cps/remotelogin.py:133 cps/web.py:1335
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "您现在已以“%(nickname)s”身份登录"
 
-#: cps/oauth_bb.py:239
+#: cps/oauth_bb.py:223
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr "链接到%(oauth)s成功"
 
-#: cps/oauth_bb.py:245
+#: cps/oauth_bb.py:229
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr "登录失败，没有用户与OAuth帐户关联"
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:271
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr "取消链接到%(oauth)s成功"
 
-#: cps/oauth_bb.py:291
+#: cps/oauth_bb.py:275
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr "取消链接到%(oauth)s失败"
 
-#: cps/oauth_bb.py:294
+#: cps/oauth_bb.py:278
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr "为连接到%(oauth)s"
 
-#: cps/oauth_bb.py:322
+#: cps/oauth_bb.py:306
 msgid "GitHub Oauth error, please retry later."
 msgstr "GitHub Oauth 错误，请重试。"
 
-#: cps/oauth_bb.py:341
+#: cps/oauth_bb.py:325
 msgid "Google Oauth error, please retry later."
 msgstr "Google Oauth 错误，请重试。"
 
-#: cps/remotelogin.py:66 cps/web.py:1394
+#: cps/remotelogin.py:65 cps/web.py:1382
 msgid "login"
 msgstr "登录"
 
-#: cps/remotelogin.py:78 cps/remotelogin.py:112
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
 msgid "Token not found"
 msgstr "找不到Token"
 
-#: cps/remotelogin.py:87 cps/remotelogin.py:120
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
 msgid "Token has expired"
 msgstr "Token已过期"
 
-#: cps/remotelogin.py:96
+#: cps/remotelogin.py:95
 msgid "Success! Please return to your device"
 msgstr "成功！请返回您的设备"
 
@@ -703,7 +703,7 @@ msgstr "下载历史"
 msgid "Show Downloaded Books"
 msgstr "显示下载过的书籍"
 
-#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:388
+#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:376
 msgid "Top Rated Books"
 msgstr "最高评分书籍"
 
@@ -712,7 +712,7 @@ msgid "Show Top Rated Books"
 msgstr "显示最高评分书籍"
 
 #: cps/render_template.py:53 cps/templates/index.xml:46
-#: cps/templates/index.xml:50 cps/web.py:648
+#: cps/templates/index.xml:50 cps/web.py:636
 msgid "Read Books"
 msgstr "已读书籍"
 
@@ -721,7 +721,7 @@ msgid "Show read and unread"
 msgstr "显示阅读状态"
 
 #: cps/render_template.py:57 cps/templates/index.xml:53
-#: cps/templates/index.xml:57 cps/web.py:651
+#: cps/templates/index.xml:57 cps/web.py:639
 msgid "Unread Books"
 msgstr "未读书籍"
 
@@ -738,7 +738,7 @@ msgid "Show random books"
 msgstr "显示随机书籍"
 
 #: cps/render_template.py:63 cps/templates/book_table.html:50
-#: cps/templates/index.xml:75 cps/web.py:953
+#: cps/templates/index.xml:75 cps/web.py:941
 msgid "Categories"
 msgstr "分类"
 
@@ -748,7 +748,7 @@ msgstr "显示分类选择"
 
 #: cps/render_template.py:66 cps/templates/book_edit.html:84
 #: cps/templates/book_table.html:51 cps/templates/index.xml:82
-#: cps/templates/search_form.html:62 cps/web.py:857 cps/web.py:867
+#: cps/templates/search_form.html:62 cps/web.py:845 cps/web.py:855
 msgid "Series"
 msgstr "丛书"
 
@@ -766,7 +766,7 @@ msgid "Show author selection"
 msgstr "显示作者选择"
 
 #: cps/render_template.py:73 cps/templates/book_table.html:55
-#: cps/templates/index.xml:68 cps/web.py:836
+#: cps/templates/index.xml:68 cps/web.py:824
 msgid "Publishers"
 msgstr "出版社"
 
@@ -775,7 +775,7 @@ msgid "Show publisher selection"
 msgstr "显示出版社选择"
 
 #: cps/render_template.py:76 cps/templates/book_table.html:53
-#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:932
+#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:920
 msgid "Languages"
 msgstr "语言"
 
@@ -799,7 +799,7 @@ msgstr "文件格式"
 msgid "Show file formats selection"
 msgstr "显示文件格式选择"
 
-#: cps/render_template.py:87 cps/web.py:675
+#: cps/render_template.py:87 cps/web.py:663
 msgid "Archived Books"
 msgstr "归档书籍"
 
@@ -807,7 +807,7 @@ msgstr "归档书籍"
 msgid "Show archived books"
 msgstr "显示归档书籍"
 
-#: cps/render_template.py:91 cps/web.py:746
+#: cps/render_template.py:91 cps/web.py:734
 msgid "Books List"
 msgstr "书籍列表"
 
@@ -864,49 +864,49 @@ msgstr "此书已从书架 %(sname)s 中删除"
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr "对不起，您没有从书架 %(sname)s 中删除书籍的权限"
 
-#: cps/shelf.py:238 cps/shelf.py:282
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
-msgstr "公共书架：%(title)s已经存在已经存在。"
+#: cps/shelf.py:224 cps/templates/layout.html:140
+msgid "Create a Shelf"
+msgstr "创建书架"
 
-#: cps/shelf.py:247 cps/shelf.py:292
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
-msgstr "私有书架：%(title)s已经存在已经存在。"
+#: cps/shelf.py:231
+msgid "Edit a shelf"
+msgstr "编辑书架"
 
-#: cps/shelf.py:254
+#: cps/shelf.py:249
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "书架 %(title)s 已创建"
 
-#: cps/shelf.py:261 cps/shelf.py:310
-msgid "There was an error"
-msgstr "发生错误"
-
-#: cps/shelf.py:262 cps/shelf.py:264 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr "创建书架"
-
-#: cps/shelf.py:304
+#: cps/shelf.py:252
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "书架 %(title)s 已修改"
 
-#: cps/shelf.py:311 cps/shelf.py:313
-msgid "Edit a shelf"
-msgstr "编辑书架"
+#: cps/shelf.py:265
+msgid "There was an error"
+msgstr "发生错误"
 
-#: cps/shelf.py:381
+#: cps/shelf.py:281
+#, python-format
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr "公共书架：%(title)s已经存在已经存在。"
+
+#: cps/shelf.py:291
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr "私有书架：%(title)s已经存在已经存在。"
+
+#: cps/shelf.py:358
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "修改书架 %(name)s 顺序"
 
-#: cps/shelf.py:447
+#: cps/shelf.py:423
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "书架：%(name)s"
 
-#: cps/shelf.py:451
+#: cps/shelf.py:427
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "打开书架出错。书架不存在或不可访问"
 
@@ -939,222 +939,222 @@ msgstr "有新的更新。单击下面的按钮以更新到版本: %(version)s"
 msgid "Click on the button below to update to the latest stable version."
 msgstr "点击下面按钮更新到最新稳定版本。"
 
-#: cps/templates/index.html:5 cps/web.py:396
+#: cps/templates/index.html:5 cps/web.py:384
 msgid "Discover (Random Books)"
 msgstr "发现(随机书籍)"
 
-#: cps/web.py:435
+#: cps/web.py:423
 msgid "Books"
 msgstr "书籍"
 
-#: cps/web.py:460
+#: cps/web.py:448
 msgid "Hot Books (Most Downloaded)"
 msgstr "热门书籍（最多下载）"
 
-#: cps/web.py:495
+#: cps/web.py:483
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr "%(user)s 下载过的书籍"
 
-#: cps/web.py:509
+#: cps/web.py:497
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr "糟糕！选择书名无法打开。文件不存在或者文件不可访问"
 
-#: cps/web.py:523
+#: cps/web.py:511
 #, python-format
 msgid "Author: %(name)s"
 msgstr "作者：%(name)s"
 
-#: cps/web.py:537
+#: cps/web.py:525
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "出版社：%(name)s"
 
-#: cps/web.py:550
+#: cps/web.py:538
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "丛书：%(serie)s"
 
-#: cps/web.py:563
+#: cps/web.py:551
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "评分：%(rating)s 星"
 
-#: cps/web.py:576
+#: cps/web.py:564
 #, python-format
 msgid "File format: %(format)s"
 msgstr "文件格式：%(format)s"
 
-#: cps/web.py:590
+#: cps/web.py:578
 #, python-format
 msgid "Category: %(name)s"
 msgstr "分类：%(name)s"
 
-#: cps/web.py:609
+#: cps/web.py:597
 #, python-format
 msgid "Language: %(name)s"
 msgstr "语言：%(name)s"
 
-#: cps/web.py:639
+#: cps/web.py:627
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr "自定义列号：%(column)d在Calibre数据库中不存在"
 
-#: cps/templates/layout.html:56 cps/web.py:706 cps/web.py:1180
+#: cps/templates/layout.html:56 cps/web.py:694 cps/web.py:1168
 msgid "Advanced Search"
 msgstr "高级搜索"
 
 #: cps/templates/book_edit.html:214 cps/templates/feed.xml:33
 #: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:175 cps/web.py:718 cps/web.py:990
+#: cps/templates/search_form.html:175 cps/web.py:706 cps/web.py:978
 msgid "Search"
 msgstr "搜索"
 
-#: cps/web.py:885
+#: cps/web.py:873
 msgid "Ratings list"
 msgstr "评分列表"
 
-#: cps/web.py:904
+#: cps/web.py:892
 msgid "File formats list"
 msgstr "文件格式列表"
 
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:967
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:955
 msgid "Tasks"
 msgstr "任务列表"
 
-#: cps/web.py:1053
+#: cps/web.py:1041
 msgid "Published after "
 msgstr "出版时间晚于 "
 
-#: cps/web.py:1060
+#: cps/web.py:1048
 msgid "Published before "
 msgstr "出版时间早于 "
 
-#: cps/web.py:1079
+#: cps/web.py:1067
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "评分 <= %(rating)s"
 
-#: cps/web.py:1081
+#: cps/web.py:1069
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "评分 >= %(rating)s"
 
-#: cps/web.py:1083
+#: cps/web.py:1071
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1254
+#: cps/web.py:1242
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "书籍已经成功加入 %(kindlemail)s 的发送队列"
 
-#: cps/web.py:1258
+#: cps/web.py:1246
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr "糟糕！发送这本书籍的时候出现错误：%(res)s"
 
-#: cps/web.py:1260
+#: cps/web.py:1248
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr "请先配置您的kindle邮箱。"
 
-#: cps/web.py:1277
+#: cps/web.py:1265
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr "邮件服务未配置，请联系网站管理员！"
 
-#: cps/web.py:1278 cps/web.py:1288 cps/web.py:1312 cps/web.py:1316
-#: cps/web.py:1321 cps/web.py:1325
+#: cps/web.py:1266 cps/web.py:1276 cps/web.py:1300 cps/web.py:1304
+#: cps/web.py:1309 cps/web.py:1313
 msgid "register"
 msgstr "注册"
 
-#: cps/web.py:1314
+#: cps/web.py:1302
 msgid "Your e-mail is not allowed to register"
 msgstr "您的电子邮件不允许注册"
 
-#: cps/web.py:1317
+#: cps/web.py:1305
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "确认邮件已经发送到您的邮箱。"
 
-#: cps/web.py:1320
+#: cps/web.py:1308
 msgid "This username or e-mail address is already in use."
 msgstr "这个用户名或者邮箱已被使用。"
 
-#: cps/web.py:1337
+#: cps/web.py:1325
 msgid "Cannot activate LDAP authentication"
 msgstr "无法激活LDAP认证"
 
-#: cps/web.py:1354
+#: cps/web.py:1342
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr "后备登录“%(nickname)s”：无法访问LDAP服务器，或用户未知"
 
-#: cps/web.py:1360
+#: cps/web.py:1348
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr "无法登录：%(message)s"
 
-#: cps/web.py:1364 cps/web.py:1388
+#: cps/web.py:1352 cps/web.py:1376
 msgid "Wrong Username or Password"
 msgstr "用户名或密码错误"
 
-#: cps/web.py:1371
+#: cps/web.py:1359
 msgid "New Password was send to your email address"
 msgstr "新密码已发送到您的邮箱"
 
-#: cps/web.py:1377
+#: cps/web.py:1365
 msgid "Please enter valid username to reset password"
 msgstr "请输入有效的用户名进行密码重置"
 
-#: cps/web.py:1383
+#: cps/web.py:1371
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "您现在已以“%(nickname)s”登录"
 
-#: cps/web.py:1453 cps/web.py:1506
+#: cps/web.py:1441 cps/web.py:1494
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 的用户配置"
 
-#: cps/web.py:1489
+#: cps/web.py:1477
 msgid "Profile updated"
 msgstr "资料已更新"
 
-#: cps/web.py:1533 cps/web.py:1536 cps/web.py:1539 cps/web.py:1546
-#: cps/web.py:1551
+#: cps/web.py:1521 cps/web.py:1524 cps/web.py:1527 cps/web.py:1534
+#: cps/web.py:1539
 msgid "Read a Book"
 msgstr "阅读一本书"
 
-#: cps/tasks/convert.py:108
+#: cps/tasks/convert.py:114
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr "Calibre 电子书转换器%(tool)s没有发现"
 
-#: cps/tasks/convert.py:132
+#: cps/tasks/convert.py:138
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr "硬盘上找不到 %(format)s 格式"
 
-#: cps/tasks/convert.py:136
+#: cps/tasks/convert.py:142
 msgid "Ebook converter failed with unknown error"
 msgstr "发生未知错误，书籍转换失败"
 
-#: cps/tasks/convert.py:146
+#: cps/tasks/convert.py:152
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr "Kepubify 转换失败：%(error)s"
 
-#: cps/tasks/convert.py:170
+#: cps/tasks/convert.py:176
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr "找不到转换后的文件或文件夹%(folder)s中有多个文件"
 
-#: cps/tasks/convert.py:193
+#: cps/tasks/convert.py:199
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "电子书转换器失败： %(error)s"
 
-#: cps/tasks/convert.py:218
+#: cps/tasks/convert.py:224
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr "Calibre 运行失败，错误信息：%(error)s"
diff --git a/cps/ub.py b/cps/ub.py
index 03720387..1969ef53 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -43,10 +43,11 @@ from sqlalchemy import Column, ForeignKey
 from sqlalchemy import String, Integer, SmallInteger, Boolean, DateTime, Float, JSON
 from sqlalchemy.ext.declarative import declarative_base
 from sqlalchemy.orm.attributes import flag_modified
+from sqlalchemy.sql.expression import func
 from sqlalchemy.orm import backref, relationship, sessionmaker, Session, scoped_session
 from werkzeug.security import generate_password_hash
 
-from . import constants, logger
+from . import constants, logger, cli
 
 log = logger.create()
 
@@ -226,9 +227,6 @@ class Anonymous(AnonymousUserMixin, UserBase):
         self.denied_column_value = data.denied_column_value
         self.allowed_column_value = data.allowed_column_value
         self.view_settings = data.view_settings
-        # Initialize flask_session once
-        if 'view' not in flask_session:
-            flask_session['view']={}
 
 
     def role_admin(self):
@@ -247,14 +245,18 @@ class Anonymous(AnonymousUserMixin, UserBase):
         return False
 
     def get_view_property(self, page, prop):
-        if not flask_session['view'].get(page):
-            return None
-        return flask_session['view'][page].get(prop)
+        if 'view' in flask_session:
+            if not flask_session['view'].get(page):
+                return None
+            return flask_session['view'][page].get(prop)
+        return None
 
     def set_view_property(self, page, prop, value):
-        if not flask_session['view'].get(page):
-            flask_session['view'][page] = dict()
-        flask_session['view'][page][prop] = value
+        if 'view' in flask_session:
+            if not flask_session['view'].get(page):
+                flask_session['view'][page] = dict()
+            flask_session['view'][page][prop] = value
+        return None
 
 
 # Baseclass representing Shelfs in calibre-web in app.db
@@ -680,6 +682,21 @@ def init_db(app_db_path):
         create_admin_user(session)
         create_anonymous_user(session)
 
+    if cli.user_credentials:
+        username, password = cli.user_credentials.split(':')
+        user = session.query(User).filter(func.lower(User.nickname) == username.lower()).first()
+        if user:
+            user.password = generate_password_hash(password)
+            if session_commit() == "":
+                print("Password for user '{}' changed".format(username))
+                sys.exit(0)
+            else:
+                print("Failed changing password")
+                sys.exit(3)
+        else:
+            print("Username '{}' not valid, can't change password".format(username))
+            sys.exit(3)
+
 
 def dispose():
     global session
diff --git a/cps/web.py b/cps/web.py
index 82378de8..2a027eac 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -24,6 +24,7 @@ from __future__ import division, print_function, unicode_literals
 import os
 from datetime import datetime
 import json
+import re
 import mimetypes
 import chardet  # dependency of requests
 
@@ -47,7 +48,7 @@ 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 calibre_db, shelf
+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, \
@@ -184,7 +185,7 @@ def toggle_read(book_id):
                 calibre_db.session.commit()
         except (KeyError, AttributeError):
             log.error(u"Custom Column No.%d is not exisiting in calibre database", config.config_read_column)
-        except OperationalError as e:
+        except (OperationalError, InvalidRequestError) as e:
             calibre_db.session.rollback()
             log.error(u"Read status could not set: %e", e)
 
@@ -1198,7 +1199,7 @@ def serve_book(book_id, book_format, anyname):
     book = calibre_db.get_book(book_id)
     data = calibre_db.get_book_format(book_id, book_format.upper())
     if not data:
-        abort(404)
+        return "File not in Database"
     log.info('Serving book: %s', data.name)
     if config.config_use_google_drive:
         headers = Headers()
@@ -1207,11 +1208,14 @@ def serve_book(book_id, book_format, anyname):
         return do_gdrive_download(df, headers, (book_format.upper() == 'TXT'))
     else:
         if book_format.upper() == 'TXT':
-            rawdata = open(os.path.join(config.config_calibre_dir, book.path, data.name + "." + book_format),
-                           "rb").read()
-            result = chardet.detect(rawdata)
-            return make_response(
-                rawdata.decode(result['encoding']).encode('utf-8'))
+            try:
+                rawdata = open(os.path.join(config.config_calibre_dir, book.path, data.name + "." + book_format),
+                               "rb").read()
+                result = chardet.detect(rawdata)
+                return make_response(
+                    rawdata.decode(result['encoding']).encode('utf-8'))
+            except FileNotFoundError:
+                return "File Not Found"
         return send_from_directory(os.path.join(config.config_calibre_dir, book.path), data.name + "." + book_format)
 
 
@@ -1270,11 +1274,17 @@ def register():
         if config.config_register_email:
             nickname = to_save["email"]
         else:
-            nickname = to_save["nickname"]
-        if not nickname or not to_save["email"]:
+            nickname = to_save.get('nickname', None)
+        if not nickname or not to_save.get("email", None):
             flash(_(u"Please fill out all fields!"), category="error")
             return render_title_template('register.html', title=_(u"register"), page="register")
-
+        #if to_save["email"].count("@") != 1 or not \
+        # Regex according to https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input/email#validation
+        if not re.search(r"^[\w.!#$%&'*+\\/=?^_`{|}~-]+@[\w](?:[\w-]{0,61}[\w])?(?:\.[\w](?:[\w-]{0,61}[\w])?)*$",
+                     to_save["email"]):
+            flash(_(u"Invalid e-mail address format"), category="error")
+            log.warning('Registering failed for user "%s" e-mail address: %s', nickname, to_save["email"])
+            return render_title_template('register.html', title=_(u"register"), page="register")
 
         existing_user = ub.session.query(ub.User).filter(func.lower(ub.User.nickname) == nickname
                                                          .lower()).first()
@@ -1300,7 +1310,7 @@ def register():
                     return render_title_template('register.html', title=_(u"register"), page="register")
             else:
                 flash(_(u"Your e-mail is not allowed to register"), category="error")
-                log.warning('Registering failed for user "%s" e-mail address: %s', to_save['nickname'], to_save["email"])
+                log.warning('Registering failed for user "%s" e-mail address: %s', nickname, to_save["email"])
                 return render_title_template('register.html', title=_(u"register"), page="register")
             flash(_(u"Confirmation e-mail was send to your e-mail account."), category="success")
             return redirect(url_for('web.login'))
diff --git a/messages.pot b/messages.pot
index 88b8aace..3c00d3d2 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-01-02 19:37+0100\n"
+"POT-Creation-Date: 2021-01-17 11:34+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 2.8.0\n"
+"Generated-By: Babel 2.9.0\n"
 
 #: cps/about.py:42
 msgid "installed"
@@ -29,310 +29,310 @@ msgstr ""
 msgid "Statistics"
 msgstr ""
 
-#: cps/admin.py:144
+#: cps/admin.py:147
 msgid "Server restarted, please reload page"
 msgstr ""
 
-#: cps/admin.py:146
+#: cps/admin.py:149
 msgid "Performing shutdown of server, please close window"
 msgstr ""
 
-#: cps/admin.py:154
+#: cps/admin.py:157
 msgid "Reconnect successful"
 msgstr ""
 
-#: cps/admin.py:157
+#: cps/admin.py:160
 msgid "Unknown command"
 msgstr ""
 
-#: cps/admin.py:167 cps/editbooks.py:636 cps/editbooks.py:648
-#: cps/editbooks.py:751 cps/editbooks.py:753 cps/editbooks.py:814
-#: cps/editbooks.py:830 cps/updater.py:510 cps/uploader.py:90
+#: cps/admin.py:170 cps/editbooks.py:642 cps/editbooks.py:654
+#: cps/editbooks.py:757 cps/editbooks.py:759 cps/editbooks.py:820
+#: cps/editbooks.py:836 cps/updater.py:510 cps/uploader.py:90
 #: cps/uploader.py:100
 msgid "Unknown"
 msgstr ""
 
-#: cps/admin.py:188
+#: cps/admin.py:191
 msgid "Admin page"
 msgstr ""
 
-#: cps/admin.py:210
+#: cps/admin.py:213
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/admin.py:242 cps/admin.py:954
+#: cps/admin.py:245 cps/admin.py:923
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
-#: cps/admin.py:253
+#: cps/admin.py:256
 msgid "Do you really want to delete the Kobo Token?"
 msgstr ""
 
-#: cps/admin.py:255
+#: cps/admin.py:258
 msgid "Do you really want to delete this domain?"
 msgstr ""
 
-#: cps/admin.py:257
+#: cps/admin.py:260
 msgid "Do you really want to delete this user?"
 msgstr ""
 
-#: cps/admin.py:259 cps/templates/shelf.html:90
+#: cps/admin.py:262 cps/templates/shelf.html:90
 msgid "Are you sure you want to delete this shelf?"
 msgstr ""
 
-#: cps/admin.py:545 cps/admin.py:551 cps/admin.py:561 cps/admin.py:571
+#: cps/admin.py:508 cps/admin.py:514 cps/admin.py:524 cps/admin.py:534
 #: cps/templates/modal_dialogs.html:29
 msgid "Deny"
 msgstr ""
 
-#: cps/admin.py:547 cps/admin.py:553 cps/admin.py:563 cps/admin.py:573
+#: cps/admin.py:510 cps/admin.py:516 cps/admin.py:526 cps/admin.py:536
 #: cps/templates/modal_dialogs.html:28
 msgid "Allow"
 msgstr ""
 
-#: cps/admin.py:713
+#: cps/admin.py:679
 msgid "client_secrets.json Is Not Configured For Web Application"
 msgstr ""
 
-#: cps/admin.py:753
+#: cps/admin.py:721
 msgid "Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:759
+#: cps/admin.py:727
 msgid "Access Logfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:788
+#: cps/admin.py:757
 msgid "Please Enter a LDAP Provider, Port, DN and User Object Identifier"
 msgstr ""
 
-#: cps/admin.py:803
+#: cps/admin.py:772
 #, python-format
 msgid "LDAP Group Object Filter Needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:806
+#: cps/admin.py:775
 msgid "LDAP Group Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:811
+#: cps/admin.py:780
 #, python-format
 msgid "LDAP User Object Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:814
+#: cps/admin.py:783
 msgid "LDAP User Object Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:822
+#: cps/admin.py:791
 #, python-format
 msgid "LDAP Member User Filter needs to Have One \"%s\" Format Identifier"
 msgstr ""
 
-#: cps/admin.py:825
+#: cps/admin.py:794
 msgid "LDAP Member User Filter Has Unmatched Parenthesis"
 msgstr ""
 
-#: cps/admin.py:833
+#: cps/admin.py:802
 msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:859
+#: cps/admin.py:828
 msgid "Keyfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:865
+#: cps/admin.py:834
 msgid "Certfile Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:935 cps/admin.py:1039 cps/admin.py:1135 cps/admin.py:1184
-#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:258
-#: cps/shelf.py:307 cps/shelf.py:339 cps/shelf.py:371 cps/shelf.py:442
+#: cps/admin.py:904 cps/admin.py:1011 cps/admin.py:1100 cps/admin.py:1149
+#: cps/shelf.py:102 cps/shelf.py:159 cps/shelf.py:200 cps/shelf.py:261
+#: cps/shelf.py:314 cps/shelf.py:348 cps/shelf.py:418
 msgid "Settings DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:947
+#: cps/admin.py:916
 msgid "DB Location is not Valid, Please Enter Correct Path"
 msgstr ""
 
-#: cps/admin.py:951
+#: cps/admin.py:920
 msgid "DB is not Writeable"
 msgstr ""
 
-#: cps/admin.py:984
+#: cps/admin.py:959
 msgid "Basic Configuration"
 msgstr ""
 
-#: cps/admin.py:999 cps/web.py:1287
+#: cps/admin.py:974 cps/web.py:1275
 msgid "Please fill out all fields!"
 msgstr ""
 
-#: cps/admin.py:1002 cps/admin.py:1014 cps/admin.py:1020 cps/admin.py:1153
+#: cps/admin.py:977 cps/admin.py:989 cps/admin.py:995 cps/admin.py:1118
 msgid "Add new user"
 msgstr ""
 
-#: cps/admin.py:1011 cps/web.py:1451
+#: cps/admin.py:986 cps/web.py:1439
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/admin.py:1018 cps/admin.py:1036
+#: cps/admin.py:993 cps/admin.py:1008
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/admin.py:1032
+#: cps/admin.py:1004
 #, python-format
 msgid "User '%(user)s' created"
 msgstr ""
 
-#: cps/admin.py:1051
+#: cps/admin.py:1020
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr ""
 
-#: cps/admin.py:1054
+#: cps/admin.py:1023
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:1060
+#: cps/admin.py:1028
 msgid "No admin user remaining, can't remove admin role"
 msgstr ""
 
-#: cps/admin.py:1096 cps/web.py:1493
+#: cps/admin.py:1064 cps/web.py:1481
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/admin.py:1105 cps/admin.py:1119 cps/admin.py:1225 cps/web.py:1469
+#: cps/admin.py:1073 cps/admin.py:1087 cps/admin.py:1190 cps/web.py:1457
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr ""
 
-#: cps/admin.py:1111 cps/web.py:1462
+#: cps/admin.py:1079 cps/web.py:1450
 msgid "This username is already taken"
 msgstr ""
 
-#: cps/admin.py:1129
+#: cps/admin.py:1094
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr ""
 
-#: cps/admin.py:1132
+#: cps/admin.py:1097
 msgid "An unknown error occured."
 msgstr ""
 
-#: cps/admin.py:1162 cps/templates/admin.html:78
+#: cps/admin.py:1127 cps/templates/admin.html:78
 msgid "Edit E-mail Server Settings"
 msgstr ""
 
-#: cps/admin.py:1191
+#: cps/admin.py:1156
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/admin.py:1194
+#: cps/admin.py:1159
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:1196
+#: cps/admin.py:1161
 msgid "Please configure your e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:1198
+#: cps/admin.py:1163
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:1209
+#: cps/admin.py:1174
 msgid "User not found"
 msgstr ""
 
-#: cps/admin.py:1236
+#: cps/admin.py:1201
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1239 cps/web.py:1311 cps/web.py:1375
+#: cps/admin.py:1204 cps/web.py:1299 cps/web.py:1363
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/admin.py:1242 cps/web.py:1249
+#: cps/admin.py:1207 cps/web.py:1237
 msgid "Please configure the SMTP mail settings first..."
 msgstr ""
 
-#: cps/admin.py:1254
+#: cps/admin.py:1218
 msgid "Logfile viewer"
 msgstr ""
 
-#: cps/admin.py:1315
+#: cps/admin.py:1280
 msgid "Requesting update package"
 msgstr ""
 
-#: cps/admin.py:1316
+#: cps/admin.py:1281
 msgid "Downloading update package"
 msgstr ""
 
-#: cps/admin.py:1317
+#: cps/admin.py:1282
 msgid "Unzipping update package"
 msgstr ""
 
-#: cps/admin.py:1318
+#: cps/admin.py:1283
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:1319
+#: cps/admin.py:1284
 msgid "Database connections are closed"
 msgstr ""
 
-#: cps/admin.py:1320
+#: cps/admin.py:1285
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:1321
+#: cps/admin.py:1286
 msgid "Update finished, please press okay and reload page"
 msgstr ""
 
-#: cps/admin.py:1322 cps/admin.py:1323 cps/admin.py:1324 cps/admin.py:1325
-#: cps/admin.py:1326
+#: cps/admin.py:1287 cps/admin.py:1288 cps/admin.py:1289 cps/admin.py:1290
+#: cps/admin.py:1291
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:1322 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
+#: cps/admin.py:1287 cps/updater.py:320 cps/updater.py:521 cps/updater.py:523
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:1323 cps/updater.py:322 cps/updater.py:525
+#: cps/admin.py:1288 cps/updater.py:322 cps/updater.py:525
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:1324 cps/updater.py:324 cps/updater.py:527
+#: cps/admin.py:1289 cps/updater.py:324 cps/updater.py:527
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:1325 cps/updater.py:326 cps/updater.py:529
+#: cps/admin.py:1290 cps/updater.py:326 cps/updater.py:529
 msgid "General error"
 msgstr ""
 
-#: cps/admin.py:1326
+#: cps/admin.py:1291
 msgid "Update File Could Not be Saved in Temp Dir"
 msgstr ""
 
-#: cps/admin.py:1351
+#: cps/admin.py:1316
 #, python-format
 msgid "Error: %(ldaperror)s"
 msgstr ""
 
-#: cps/admin.py:1355
+#: cps/admin.py:1320
 msgid "Error: No user returned in response of LDAP server"
 msgstr ""
 
-#: cps/admin.py:1421
+#: cps/admin.py:1386
 msgid "Failed to Create at Least One LDAP User"
 msgstr ""
 
-#: cps/admin.py:1424
+#: cps/admin.py:1389
 msgid "At Least One LDAP User Not Found in Database"
 msgstr ""
 
-#: cps/admin.py:1426
+#: cps/admin.py:1391
 msgid "{} User Successfully Imported"
 msgstr ""
 
@@ -352,90 +352,90 @@ msgstr ""
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:317 cps/editbooks.py:620 cps/web.py:1521 cps/web.py:1554
-#: cps/web.py:1625
+#: cps/editbooks.py:316 cps/editbooks.py:626 cps/web.py:1509 cps/web.py:1542
+#: cps/web.py:1613
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr ""
 
-#: cps/editbooks.py:351
+#: cps/editbooks.py:350
 msgid "edit metadata"
 msgstr ""
 
-#: cps/editbooks.py:426
+#: cps/editbooks.py:425
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr ""
 
-#: cps/editbooks.py:537 cps/editbooks.py:796
+#: cps/editbooks.py:536 cps/editbooks.py:802
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr ""
 
-#: cps/editbooks.py:541 cps/editbooks.py:800
+#: cps/editbooks.py:540 cps/editbooks.py:806
 msgid "File to be uploaded must have an extension"
 msgstr ""
 
-#: cps/editbooks.py:553
+#: cps/editbooks.py:552
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr ""
 
-#: cps/editbooks.py:558
+#: cps/editbooks.py:557
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr ""
 
-#: cps/editbooks.py:576 cps/editbooks.py:931 cps/web.py:1498
+#: cps/editbooks.py:575 cps/editbooks.py:937 cps/web.py:1486
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
 
-#: cps/editbooks.py:580
+#: cps/editbooks.py:579
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr ""
 
-#: cps/editbooks.py:700
+#: cps/editbooks.py:706
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
 msgstr ""
 
-#: cps/editbooks.py:737
+#: cps/editbooks.py:743
 msgid "Metadata successfully updated"
 msgstr ""
 
-#: cps/editbooks.py:746
+#: cps/editbooks.py:752
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/editbooks.py:808
+#: cps/editbooks.py:814
 #, python-format
 msgid "File %(filename)s could not saved to temp dir"
 msgstr ""
 
-#: cps/editbooks.py:818
+#: cps/editbooks.py:824
 msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
-#: cps/editbooks.py:906
+#: cps/editbooks.py:912
 #, python-format
 msgid "Failed to Move Cover File %(file)s: %(error)s"
 msgstr ""
 
-#: cps/editbooks.py:917
+#: cps/editbooks.py:923
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:943
+#: cps/editbooks.py:949
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/editbooks.py:951
+#: cps/editbooks.py:957
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/editbooks.py:955
+#: cps/editbooks.py:961
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
@@ -596,85 +596,85 @@ msgstr ""
 msgid "Unknown Status"
 msgstr ""
 
-#: cps/kobo_auth.py:131
+#: cps/kobo_auth.py:130
 msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device"
 msgstr ""
 
-#: cps/kobo_auth.py:134 cps/kobo_auth.py:157
+#: cps/kobo_auth.py:133 cps/kobo_auth.py:153
 msgid "Kobo Setup"
 msgstr ""
 
-#: cps/oauth_bb.py:74
+#: cps/oauth_bb.py:73
 #, python-format
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:158
+#: cps/oauth_bb.py:146
 msgid "Failed to log in with GitHub."
 msgstr ""
 
-#: cps/oauth_bb.py:163
+#: cps/oauth_bb.py:151
 msgid "Failed to fetch user info from GitHub."
 msgstr ""
 
-#: cps/oauth_bb.py:174
+#: cps/oauth_bb.py:162
 msgid "Failed to log in with Google."
 msgstr ""
 
-#: cps/oauth_bb.py:179
+#: cps/oauth_bb.py:167
 msgid "Failed to fetch user info from Google."
 msgstr ""
 
-#: cps/oauth_bb.py:229 cps/remotelogin.py:134 cps/web.py:1347
+#: cps/oauth_bb.py:213 cps/remotelogin.py:133 cps/web.py:1335
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/oauth_bb.py:239
+#: cps/oauth_bb.py:223
 #, python-format
 msgid "Link to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:245
+#: cps/oauth_bb.py:229
 msgid "Login failed, No User Linked With OAuth Account"
 msgstr ""
 
-#: cps/oauth_bb.py:287
+#: cps/oauth_bb.py:271
 #, python-format
 msgid "Unlink to %(oauth)s Succeeded"
 msgstr ""
 
-#: cps/oauth_bb.py:291
+#: cps/oauth_bb.py:275
 #, python-format
 msgid "Unlink to %(oauth)s Failed"
 msgstr ""
 
-#: cps/oauth_bb.py:294
+#: cps/oauth_bb.py:278
 #, python-format
 msgid "Not Linked to %(oauth)s"
 msgstr ""
 
-#: cps/oauth_bb.py:322
+#: cps/oauth_bb.py:306
 msgid "GitHub Oauth error, please retry later."
 msgstr ""
 
-#: cps/oauth_bb.py:341
+#: cps/oauth_bb.py:325
 msgid "Google Oauth error, please retry later."
 msgstr ""
 
-#: cps/remotelogin.py:66 cps/web.py:1394
+#: cps/remotelogin.py:65 cps/web.py:1382
 msgid "login"
 msgstr ""
 
-#: cps/remotelogin.py:78 cps/remotelogin.py:112
+#: cps/remotelogin.py:77 cps/remotelogin.py:111
 msgid "Token not found"
 msgstr ""
 
-#: cps/remotelogin.py:87 cps/remotelogin.py:120
+#: cps/remotelogin.py:86 cps/remotelogin.py:119
 msgid "Token has expired"
 msgstr ""
 
-#: cps/remotelogin.py:96
+#: cps/remotelogin.py:95
 msgid "Success! Please return to your device"
 msgstr ""
 
@@ -702,7 +702,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:388
+#: cps/render_template.py:50 cps/templates/index.xml:24 cps/web.py:376
 msgid "Top Rated Books"
 msgstr ""
 
@@ -711,7 +711,7 @@ msgid "Show Top Rated Books"
 msgstr ""
 
 #: cps/render_template.py:53 cps/templates/index.xml:46
-#: cps/templates/index.xml:50 cps/web.py:648
+#: cps/templates/index.xml:50 cps/web.py:636
 msgid "Read Books"
 msgstr ""
 
@@ -720,7 +720,7 @@ msgid "Show read and unread"
 msgstr ""
 
 #: cps/render_template.py:57 cps/templates/index.xml:53
-#: cps/templates/index.xml:57 cps/web.py:651
+#: cps/templates/index.xml:57 cps/web.py:639
 msgid "Unread Books"
 msgstr ""
 
@@ -737,7 +737,7 @@ msgid "Show random books"
 msgstr ""
 
 #: cps/render_template.py:63 cps/templates/book_table.html:50
-#: cps/templates/index.xml:75 cps/web.py:953
+#: cps/templates/index.xml:75 cps/web.py:941
 msgid "Categories"
 msgstr ""
 
@@ -747,7 +747,7 @@ msgstr ""
 
 #: cps/render_template.py:66 cps/templates/book_edit.html:84
 #: cps/templates/book_table.html:51 cps/templates/index.xml:82
-#: cps/templates/search_form.html:62 cps/web.py:857 cps/web.py:867
+#: cps/templates/search_form.html:62 cps/web.py:845 cps/web.py:855
 msgid "Series"
 msgstr ""
 
@@ -765,7 +765,7 @@ msgid "Show author selection"
 msgstr ""
 
 #: cps/render_template.py:73 cps/templates/book_table.html:55
-#: cps/templates/index.xml:68 cps/web.py:836
+#: cps/templates/index.xml:68 cps/web.py:824
 msgid "Publishers"
 msgstr ""
 
@@ -774,7 +774,7 @@ msgid "Show publisher selection"
 msgstr ""
 
 #: cps/render_template.py:76 cps/templates/book_table.html:53
-#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:932
+#: cps/templates/index.xml:89 cps/templates/search_form.html:81 cps/web.py:920
 msgid "Languages"
 msgstr ""
 
@@ -798,7 +798,7 @@ msgstr ""
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/render_template.py:87 cps/web.py:675
+#: cps/render_template.py:87 cps/web.py:663
 msgid "Archived Books"
 msgstr ""
 
@@ -806,7 +806,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:91 cps/web.py:746
+#: cps/render_template.py:91 cps/web.py:734
 msgid "Books List"
 msgstr ""
 
@@ -863,49 +863,49 @@ msgstr ""
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr ""
 
-#: cps/shelf.py:238 cps/shelf.py:282
-#, python-format
-msgid "A public shelf with the name '%(title)s' already exists."
+#: cps/shelf.py:224 cps/templates/layout.html:140
+msgid "Create a Shelf"
 msgstr ""
 
-#: cps/shelf.py:247 cps/shelf.py:292
-#, python-format
-msgid "A private shelf with the name '%(title)s' already exists."
+#: cps/shelf.py:231
+msgid "Edit a shelf"
 msgstr ""
 
-#: cps/shelf.py:254
+#: cps/shelf.py:249
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr ""
 
-#: cps/shelf.py:261 cps/shelf.py:310
-msgid "There was an error"
-msgstr ""
-
-#: cps/shelf.py:262 cps/shelf.py:264 cps/templates/layout.html:140
-msgid "Create a Shelf"
-msgstr ""
-
-#: cps/shelf.py:304
+#: cps/shelf.py:252
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr ""
 
-#: cps/shelf.py:311 cps/shelf.py:313
-msgid "Edit a shelf"
+#: cps/shelf.py:265
+msgid "There was an error"
 msgstr ""
 
-#: cps/shelf.py:381
+#: cps/shelf.py:281
+#, python-format
+msgid "A public shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:291
+#, python-format
+msgid "A private shelf with the name '%(title)s' already exists."
+msgstr ""
+
+#: cps/shelf.py:358
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/shelf.py:447
+#: cps/shelf.py:423
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/shelf.py:451
+#: cps/shelf.py:427
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 
@@ -938,222 +938,222 @@ msgstr ""
 msgid "Click on the button below to update to the latest stable version."
 msgstr ""
 
-#: cps/templates/index.html:5 cps/web.py:396
+#: cps/templates/index.html:5 cps/web.py:384
 msgid "Discover (Random Books)"
 msgstr ""
 
-#: cps/web.py:435
+#: cps/web.py:423
 msgid "Books"
 msgstr ""
 
-#: cps/web.py:460
+#: cps/web.py:448
 msgid "Hot Books (Most Downloaded)"
 msgstr ""
 
-#: cps/web.py:495
+#: cps/web.py:483
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:509
+#: cps/web.py:497
 msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:523
+#: cps/web.py:511
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:537
+#: cps/web.py:525
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr ""
 
-#: cps/web.py:550
+#: cps/web.py:538
 #, python-format
 msgid "Series: %(serie)s"
 msgstr ""
 
-#: cps/web.py:563
+#: cps/web.py:551
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:576
+#: cps/web.py:564
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:590
+#: cps/web.py:578
 #, python-format
 msgid "Category: %(name)s"
 msgstr ""
 
-#: cps/web.py:609
+#: cps/web.py:597
 #, python-format
 msgid "Language: %(name)s"
 msgstr ""
 
-#: cps/web.py:639
+#: cps/web.py:627
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
 
-#: cps/templates/layout.html:56 cps/web.py:706 cps/web.py:1180
+#: cps/templates/layout.html:56 cps/web.py:694 cps/web.py:1168
 msgid "Advanced Search"
 msgstr ""
 
 #: cps/templates/book_edit.html:214 cps/templates/feed.xml:33
 #: cps/templates/layout.html:45 cps/templates/layout.html:48
-#: cps/templates/search_form.html:175 cps/web.py:718 cps/web.py:990
+#: cps/templates/search_form.html:175 cps/web.py:706 cps/web.py:978
 msgid "Search"
 msgstr ""
 
-#: cps/web.py:885
+#: cps/web.py:873
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:904
+#: cps/web.py:892
 msgid "File formats list"
 msgstr ""
 
-#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:967
+#: cps/templates/layout.html:74 cps/templates/tasks.html:7 cps/web.py:955
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1053
+#: cps/web.py:1041
 msgid "Published after "
 msgstr ""
 
-#: cps/web.py:1060
+#: cps/web.py:1048
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1079
+#: cps/web.py:1067
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1081
+#: cps/web.py:1069
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1083
+#: cps/web.py:1071
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1254
+#: cps/web.py:1242
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1258
+#: cps/web.py:1246
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1260
+#: cps/web.py:1248
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1277
+#: cps/web.py:1265
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/web.py:1278 cps/web.py:1288 cps/web.py:1312 cps/web.py:1316
-#: cps/web.py:1321 cps/web.py:1325
+#: cps/web.py:1266 cps/web.py:1276 cps/web.py:1300 cps/web.py:1304
+#: cps/web.py:1309 cps/web.py:1313
 msgid "register"
 msgstr ""
 
-#: cps/web.py:1314
+#: cps/web.py:1302
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1317
+#: cps/web.py:1305
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1320
+#: cps/web.py:1308
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:1337
+#: cps/web.py:1325
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1354
+#: cps/web.py:1342
 #, python-format
 msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
 msgstr ""
 
-#: cps/web.py:1360
+#: cps/web.py:1348
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1364 cps/web.py:1388
+#: cps/web.py:1352 cps/web.py:1376
 msgid "Wrong Username or Password"
 msgstr ""
 
-#: cps/web.py:1371
+#: cps/web.py:1359
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1377
+#: cps/web.py:1365
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1383
+#: cps/web.py:1371
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1453 cps/web.py:1506
+#: cps/web.py:1441 cps/web.py:1494
 #, python-format
 msgid "%(name)s's profile"
 msgstr ""
 
-#: cps/web.py:1489
+#: cps/web.py:1477
 msgid "Profile updated"
 msgstr ""
 
-#: cps/web.py:1533 cps/web.py:1536 cps/web.py:1539 cps/web.py:1546
-#: cps/web.py:1551
+#: cps/web.py:1521 cps/web.py:1524 cps/web.py:1527 cps/web.py:1534
+#: cps/web.py:1539
 msgid "Read a Book"
 msgstr ""
 
-#: cps/tasks/convert.py:108
+#: cps/tasks/convert.py:114
 #, python-format
 msgid "Calibre ebook-convert %(tool)s not found"
 msgstr ""
 
-#: cps/tasks/convert.py:132
+#: cps/tasks/convert.py:138
 #, python-format
 msgid "%(format)s format not found on disk"
 msgstr ""
 
-#: cps/tasks/convert.py:136
+#: cps/tasks/convert.py:142
 msgid "Ebook converter failed with unknown error"
 msgstr ""
 
-#: cps/tasks/convert.py:146
+#: cps/tasks/convert.py:152
 #, python-format
 msgid "Kepubify-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:170
+#: cps/tasks/convert.py:176
 #, python-format
 msgid "Converted file not found or more than one file in folder %(folder)s"
 msgstr ""
 
-#: cps/tasks/convert.py:193
+#: cps/tasks/convert.py:199
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr ""
 
-#: cps/tasks/convert.py:218
+#: cps/tasks/convert.py:224
 #, python-format
 msgid "Calibre failed with error: %(error)s"
 msgstr ""
diff --git a/optional-requirements.txt b/optional-requirements.txt
index 5087f4fa..3f0f1e00 100644
--- a/optional-requirements.txt
+++ b/optional-requirements.txt
@@ -1,5 +1,5 @@
 # GDrive Integration
-google-api-python-client==1.7.11,<1.8.0
+google-api-python-client>=1.7.11,<1.8.0
 gevent>=1.2.1,<20.6.0
 greenlet>=0.4.12,<0.4.17
 httplib2>=0.9.2,<0.18.0
@@ -9,7 +9,7 @@ pyasn1-modules>=0.0.8,<0.3.0
 pyasn1>=0.1.9,<0.5.0
 PyDrive2>=1.3.1,<1.8.0
 PyYAML>=3.12
-rsa==3.4.2,<4.1.0
+rsa>=3.4.2,<4.1.0
 six>=1.10.0,<1.15.0
 
 # goodreads
@@ -30,7 +30,7 @@ rarfile>=2.7
 
 # other
 natsort>=2.2.0,<7.1.0
-git+https://github.com/OzzieIsaacs/comicapi.git@7aa91ea95ea7a919df6c6cac817865434a31c228#egg=comicapi
+comicapi>= 2.1.3,<2.2.0
 
 #Kobo integration
 jsonschema>=3.2.0,<3.3.0
diff --git a/requirements.txt b/requirements.txt
index f154dd5b..94dc7f3a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ singledispatch>=3.4.0.0,<3.5.0.0
 backports_abc>=0.4
 Flask>=1.0.2,<1.2.0
 iso-639>=0.4.5,<0.5.0
-PyPDF2==1.26.0,<1.27.0
+PyPDF2>=1.26.0,<1.27.0
 pytz>=2016.10
 requests>=2.11.1,<2.25.0
 SQLAlchemy>=1.3.0,<1.4.0
diff --git a/setup.cfg b/setup.cfg
index b10c2828..88624195 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,6 +1,3 @@
-[bdist_wheel]
-universal = 1
-
 [metadata]
 name = calibreweb
 url = https://github.com/janeczku/calibre-web
@@ -20,8 +17,6 @@ license_file = LICENSE
 classifiers =
     Development Status :: 5 - Production/Stable
     License :: OSI Approved :: GNU Affero General Public License v3
-    Programming Language :: Python :: 2
-    Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.5
     Programming Language :: Python :: 3.6
@@ -31,57 +26,61 @@ keywords =
   calibre
   calibre-web
   library
-python_requires = >=2.6
+python_requires = >=3.0
 
 [options.entry_points]
 console_scripts =
   cps = calibreweb:main
 [options]
 include_package_data = True
-dependency_links = comicapi @ git+https://github.com/OzzieIsaacs/comicapi.git@5346716578b2843f54d522f44d01bc8d25001d24#egg=comicapi
 install_requires =
-  Babel >= 1.3
-  Flask-Babel >= 0.11.1
-  Flask-Login >= 0.3.2
-  Flask-Principal >= 0.3.2
-  singledispatch >= 3.4.0.0
-  backports_abc >= 0.4
-  Flask >= 0.11
-  iso-639 >= 0.4.5
-  PyPDF2 == 1.26.0
-  pytz >= 2016.10
-  requests >= 2.11.1
-  SQLAlchemy >= 1.1.0
-  tornado >= 4.1
-  unidecode >= 0.04.19
+    Babel>=1.3, <2.9
+    Flask-Babel>=0.11.1,<2.1.0
+    Flask-Login>=0.3.2,<0.5.1
+    Flask-Principal>=0.3.2,<0.5.1
+    singledispatch>=3.4.0.0,<3.5.0.0
+    backports_abc>=0.4
+    Flask>=1.0.2,<1.2.0
+    iso-639>=0.4.5,<0.5.0
+    PyPDF2>=1.26.0,<1.27.0
+    pytz>=2016.10
+    requests>=2.11.1,<2.25.0
+    SQLAlchemy>=1.3.0,<1.4.0
+    tornado>=4.1,<6.2
+    Wand>=0.4.4,<0.7.0
+    unidecode>=0.04.19,<1.2.0
 
 [options.extras_require]
 gdrive =
-  google-api-python-client == 1.6.1
-  google-api-python-client==1.6.1
-  gevent==1.2.1
-  greenlet==0.4.12
-  httplib2==0.9.2
-  oauth2client==4.0.0
-  uritemplate==3.0.0
-  pyasn1-modules==0.0.8
-  pyasn1==0.1.9
-  PyDrive==1.3.1
-  PyYAML==3.12
-  rsa==3.4.2
-  six==1.10.0
+    google-api-python-client>=1.7.11,<1.8.0
+    gevent>=1.2.1,<20.6.0
+    greenlet>=0.4.12,<0.4.17
+    httplib2>=0.9.2,<0.18.0
+    oauth2client>=4.0.0,<4.1.4
+    uritemplate>=3.0.0,<3.1.0
+    pyasn1-modules>=0.0.8,<0.3.0
+    pyasn1>=0.1.9,<0.5.0
+    PyDrive2>=1.3.1,<1.8.0
+    PyYAML>=3.12
+    rsa>=3.4.2,<4.1.0
+    six>=1.10.0,<1.15.0
 goodreads =
-  goodreads >= 0.3.2
-  python-Levenshtein>=0.12.0
+    goodreads>=0.3.2,<0.4.0
+    python-Levenshtein>=0.12.0,<0.13.0
+ldap =
+    python-ldap>=3.0.0,<3.3.0
+    Flask-SimpleLDAP>=1.4.0,<1.5.0
+oauth =
+    Flask-Dance>=1.4.0,<3.1.0
+    SQLAlchemy-Utils>=0.33.5,<0.37.0
 metadata =
-  lxml>=3.8.0
-  Pillow>=4.0.0
-  rarfile>=2.7
-  Wand >= 0.4.4
-comics=
-  natsort>=2.2.0
-  # find solution for this should belong to comics
-  # comicapi @ git+https://github.com/OzzieIsaacs/comicapi/archive/5346716578b2843f54d522f44d01bc8d25001d24.zip#egg=comicapi
+    lxml>=3.8.0,<4.6.0
+    rarfile>=2.7
+comics =
+    natsort>=2.2.0
+    comicapi>= 2.1.3,<2.2.0
+kobo =
+    jsonschema>=3.2.0,<3.3.0
 
 
 
diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html
index 027a3e46..e0c802ef 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-01-02 07:53:24</p>
+            <p class='text-justify attribute'><strong>Start Time: </strong>2021-01-23 19:48: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>Stop Time: </strong>2021-01-02 10:58:22</p>
+            <p class='text-justify attribute'><strong>Stop Time: </strong>2021-01-23 22:16:21</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 37 min</p>
+           <p class='text-justify attribute'><strong>Duration: </strong>2h 0 min</p>
         </div>
       </div>
       </div>
@@ -1190,11 +1190,11 @@
     
 
 
-    <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">
@@ -1339,33 +1339,11 @@
     
     
     
-        <tr id="ft12.16" class="none bg-danger">
+        <tr id='pt12.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_ft12.16')">FAIL</a>
-                </div>
-                <!--css div popup start-->
-                <div id="div_ft12.16" class="popup_window test_output" style="display:none;">
-                    <div class='close_button pull-right'>
-                        <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_ft12.16').style.display='none'"><span
-                                aria-hidden="true">&times;</span></button>
-                    </div>
-                    <div class="text-left pull-left">
-                        <pre class="text-left">Traceback (most recent call last):
-  File "/home/matthias/Entwicklung/calibre-web-test/test/test_edit_ebooks_gdrive.py", line 213, in test_edit_title
-    self.assertEqual('No Cover', title.get_attribute('value'))
-AssertionError: 'No Cover' != 'The camicdemo'
-- No Cover
-+ The camicdemo</pre>
-                    </div>
-                    <div class="clearfix"></div>
-                </div>
-                <!--css div popup end-->
-            </td>
+            <td colspan='6' align='center'>PASS</td>
         </tr>
     
     
@@ -1509,6 +1487,70 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
 
 
+    <tr id="su" class="failClass">
+        <td>TestFilePicker</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">0</td>
+        <td class="text-center">
+            <a onclick="showClassDetail('c15', 3)">Detail</a>
+        </td>
+    </tr>
+
+    
+    
+        <tr id='pt15.1' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestFilePicker - test_filepicker_all_file</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id="ft15.2" class="none bg-danger">
+            <td>
+                <div class='testcase'>TestFilePicker - test_filepicker_limited_file</div>
+            </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:none;">
+                    <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 "/home/ozzie/Development/calibre-web-test/test/test_filepicker.py", line 48, in test_filepicker_limited_file
+    self.assertEqual(CALIBRE_WEB_PATH, element.text)
+AssertionError: '/home/ozzie/Development/calibre-web' != ''
+- /home/ozzie/Development/calibre-web
++</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
+        </tr>
+    
+    
+    
+        <tr id='pt15.3' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestFilePicker - test_filepicker_new_file</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+
+
     <tr id="su" class="passClass">
         <td>TestSetupGdrive</td>
         <td class="text-center">1</td>
@@ -1517,13 +1559,13 @@ AssertionError: 'No Cover' != 'The camicdemo'
         <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'>TestSetupGdrive - test_config_gdrive</div>
             </td>
@@ -1541,13 +1583,13 @@ AssertionError: 'No Cover' != 'The camicdemo'
         <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'>TestGoodreads - test_author_page</div>
             </td>
@@ -1556,7 +1598,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt16.2' class='hiddenRow bg-success'>
+        <tr id='pt17.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_author_page_invalid</div>
             </td>
@@ -1565,7 +1607,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt16.3' class='hiddenRow bg-success'>
+        <tr id='pt17.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestGoodreads - test_goodreads_about</div>
             </td>
@@ -1583,13 +1625,13 @@ AssertionError: 'No Cover' != 'The camicdemo'
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c17', 9)">Detail</a>
+            <a onclick="showClassDetail('c18', 9)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt17.1' class='hiddenRow bg-success'>
+        <tr id='pt18.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_book_download</div>
             </td>
@@ -1598,7 +1640,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt17.2' class='hiddenRow bg-success'>
+        <tr id='pt18.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_kobo_about</div>
             </td>
@@ -1607,7 +1649,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt17.3' class='hiddenRow bg-success'>
+        <tr id='pt18.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_shelves_add_remove_books</div>
             </td>
@@ -1616,7 +1658,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt17.4' class='hiddenRow bg-success'>
+        <tr id='pt18.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_changed_book</div>
             </td>
@@ -1625,7 +1667,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt17.5' class='hiddenRow bg-success'>
+        <tr id='pt18.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_invalid</div>
             </td>
@@ -1634,7 +1676,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt17.6' class='hiddenRow bg-success'>
+        <tr id='pt18.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_reading_state</div>
             </td>
@@ -1643,7 +1685,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt17.7' class='hiddenRow bg-success'>
+        <tr id='pt18.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_shelf</div>
             </td>
@@ -1652,7 +1694,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt17.8' class='hiddenRow bg-success'>
+        <tr id='pt18.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_unchanged</div>
             </td>
@@ -1661,7 +1703,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt17.9' class='hiddenRow bg-success'>
+        <tr id='pt18.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestKoboSync - test_sync_upload</div>
             </td>
@@ -1679,13 +1721,13 @@ AssertionError: 'No Cover' != 'The camicdemo'
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c18', 13)">Detail</a>
+            <a onclick="showClassDetail('c19', 13)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt18.1' class='hiddenRow bg-success'>
+        <tr id='pt19.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL</div>
             </td>
@@ -1694,7 +1736,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt18.2' class='hiddenRow bg-success'>
+        <tr id='pt19.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_SSL_CERTIFICATE</div>
             </td>
@@ -1703,7 +1745,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt18.3' class='hiddenRow bg-success'>
+        <tr id='pt19.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_STARTTLS</div>
             </td>
@@ -1712,7 +1754,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt18.4' class='hiddenRow bg-success'>
+        <tr id='pt19.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_fallback_Login</div>
             </td>
@@ -1721,7 +1763,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt18.5' class='hiddenRow bg-success'>
+        <tr id='pt19.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import</div>
             </td>
@@ -1730,7 +1772,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt18.6' class='hiddenRow bg-success'>
+        <tr id='pt19.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_import_memberfield</div>
             </td>
@@ -1739,7 +1781,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt18.7' class='hiddenRow bg-success'>
+        <tr id='pt19.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_LDAP_login</div>
             </td>
@@ -1748,7 +1790,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt18.8' class='hiddenRow bg-success'>
+        <tr id='pt19.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_invalid_LDAP</div>
             </td>
@@ -1757,7 +1799,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt18.9' class='hiddenRow bg-success'>
+        <tr id='pt19.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_about</div>
             </td>
@@ -1766,7 +1808,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt18.10' class='hiddenRow bg-success'>
+        <tr id='pt19.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_authentication</div>
             </td>
@@ -1775,7 +1817,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt18.11' class='hiddenRow bg-success'>
+        <tr id='pt19.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_kobo_sync</div>
             </td>
@@ -1784,7 +1826,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt18.12' class='hiddenRow bg-success'>
+        <tr id='pt19.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_anonymous</div>
             </td>
@@ -1793,7 +1835,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt18.13' class='hiddenRow bg-success'>
+        <tr id='pt19.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLdapLogin - test_ldap_opds_download_book</div>
             </td>
@@ -1811,13 +1853,13 @@ AssertionError: 'No Cover' != 'The camicdemo'
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c19', 7)">Detail</a>
+            <a onclick="showClassDetail('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'>TestLogging - test_access_log_recover</div>
             </td>
@@ -1826,7 +1868,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt19.2' class='hiddenRow bg-success'>
+        <tr id='pt20.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_debug_log</div>
             </td>
@@ -1835,7 +1877,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt19.3' class='hiddenRow bg-success'>
+        <tr id='pt20.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_failed_login</div>
             </td>
@@ -1844,19 +1886,19 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id="st19.4" class="none bg-warning">
+        <tr id="st20.4" class="none bg-warning">
             <td>
                 <div class='testcase'>TestLogging - test_failed_register</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st19.4')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st20.4')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st19.4" class="popup_window test_output" style="display:none;">
+                <div id="div_st20.4" class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_st19.4').style.display='none'"><span
+                                onclick='document.getElementById('div_st20.4').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -1870,7 +1912,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt19.5' class='hiddenRow bg-success'>
+        <tr id='pt20.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_change</div>
             </td>
@@ -1879,7 +1921,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt19.6' class='hiddenRow bg-success'>
+        <tr id='pt20.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logfile_recover</div>
             </td>
@@ -1888,7 +1930,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt19.7' class='hiddenRow bg-success'>
+        <tr id='pt20.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogging - test_logviewer</div>
             </td>
@@ -1900,19 +1942,19 @@ AssertionError: 'No Cover' != 'The camicdemo'
 
     <tr id="su" class="passClass">
         <td>TestLogin</td>
-        <td class="text-center">13</td>
-        <td class="text-center">13</td>
+        <td class="text-center">14</td>
+        <td class="text-center">14</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c20', 13)">Detail</a>
+            <a onclick="showClassDetail('c21', 14)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt20.1' class='hiddenRow bg-success'>
+        <tr id='pt21.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_digest_login</div>
             </td>
@@ -1921,7 +1963,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt20.2' class='hiddenRow bg-success'>
+        <tr id='pt21.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_capital_letters_user_unicode_password</div>
             </td>
@@ -1930,7 +1972,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt20.3' class='hiddenRow bg-success'>
+        <tr id='pt21.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_delete_admin</div>
             </td>
@@ -1939,7 +1981,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt20.4' class='hiddenRow bg-success'>
+        <tr id='pt21.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_empty_password</div>
             </td>
@@ -1948,7 +1990,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt20.5' class='hiddenRow bg-success'>
+        <tr id='pt21.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_locale_select</div>
             </td>
@@ -1957,7 +1999,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt20.6' class='hiddenRow bg-success'>
+        <tr id='pt21.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_protected</div>
             </td>
@@ -1966,7 +2008,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt20.7' class='hiddenRow bg-success'>
+        <tr id='pt21.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_remember_me</div>
             </td>
@@ -1975,7 +2017,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt20.8' class='hiddenRow bg-success'>
+        <tr id='pt21.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_rename_user</div>
             </td>
@@ -1984,7 +2026,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt20.9' class='hiddenRow bg-success'>
+        <tr id='pt21.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_unicode_user_space_end_password</div>
             </td>
@@ -1993,7 +2035,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt20.10' class='hiddenRow bg-success'>
+        <tr id='pt21.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_login_user_with_space_password_end_space</div>
             </td>
@@ -2002,7 +2044,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt20.11' class='hiddenRow bg-success'>
+        <tr id='pt21.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_magic_remote_login</div>
             </td>
@@ -2011,7 +2053,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt20.12' class='hiddenRow bg-success'>
+        <tr id='pt21.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_next</div>
             </td>
@@ -2020,7 +2062,16 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt20.13' class='hiddenRow bg-success'>
+        <tr id='pt21.13' class='hiddenRow bg-success'>
+            <td>
+                <div class='testcase'>TestLogin - test_proxy_login</div>
+            </td>
+            <td colspan='6' align='center'>PASS</td>
+        </tr>
+    
+    
+    
+        <tr id='pt21.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestLogin - test_robots</div>
             </td>
@@ -2038,13 +2089,13 @@ AssertionError: 'No Cover' != 'The camicdemo'
         <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'>TestOAuthLogin - test_oauth_about</div>
             </td>
@@ -2053,7 +2104,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt21.2' class='hiddenRow bg-success'>
+        <tr id='pt22.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOAuthLogin - test_visible_oauth</div>
             </td>
@@ -2071,13 +2122,13 @@ AssertionError: 'No Cover' != 'The camicdemo'
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c22', 21)">Detail</a>
+            <a onclick="showClassDetail('c23', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt22.1' class='hiddenRow bg-success'>
+        <tr id='pt23.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds</div>
             </td>
@@ -2086,7 +2137,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt22.2' class='hiddenRow bg-success'>
+        <tr id='pt23.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_author</div>
             </td>
@@ -2095,7 +2146,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt22.3' class='hiddenRow bg-success'>
+        <tr id='pt23.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_calibre_companion</div>
             </td>
@@ -2104,7 +2155,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt22.4' class='hiddenRow bg-success'>
+        <tr id='pt23.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_cover</div>
             </td>
@@ -2113,7 +2164,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt22.5' class='hiddenRow bg-success'>
+        <tr id='pt23.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_download_book</div>
             </td>
@@ -2122,7 +2173,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt22.6' class='hiddenRow bg-success'>
+        <tr id='pt23.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_formats</div>
             </td>
@@ -2131,7 +2182,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt22.7' class='hiddenRow bg-success'>
+        <tr id='pt23.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_guest_user</div>
             </td>
@@ -2140,7 +2191,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt22.8' class='hiddenRow bg-success'>
+        <tr id='pt23.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_hot</div>
             </td>
@@ -2149,7 +2200,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt22.9' class='hiddenRow bg-success'>
+        <tr id='pt23.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_language</div>
             </td>
@@ -2158,7 +2209,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt22.10' class='hiddenRow bg-success'>
+        <tr id='pt23.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_non_admin</div>
             </td>
@@ -2167,7 +2218,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt22.11' class='hiddenRow bg-success'>
+        <tr id='pt23.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_publisher</div>
             </td>
@@ -2176,7 +2227,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt22.12' class='hiddenRow bg-success'>
+        <tr id='pt23.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_random</div>
             </td>
@@ -2185,7 +2236,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt22.13' class='hiddenRow bg-success'>
+        <tr id='pt23.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_ratings</div>
             </td>
@@ -2194,7 +2245,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt22.14' class='hiddenRow bg-success'>
+        <tr id='pt23.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_read_unread</div>
             </td>
@@ -2203,7 +2254,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt22.15' class='hiddenRow bg-success'>
+        <tr id='pt23.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_search</div>
             </td>
@@ -2212,7 +2263,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt22.16' class='hiddenRow bg-success'>
+        <tr id='pt23.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_series</div>
             </td>
@@ -2221,7 +2272,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt22.17' class='hiddenRow bg-success'>
+        <tr id='pt23.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_shelf_access</div>
             </td>
@@ -2230,7 +2281,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt22.18' class='hiddenRow bg-success'>
+        <tr id='pt23.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_tags</div>
             </td>
@@ -2239,7 +2290,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt22.19' class='hiddenRow bg-success'>
+        <tr id='pt23.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_top_rated</div>
             </td>
@@ -2248,7 +2299,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt22.20' class='hiddenRow bg-success'>
+        <tr id='pt23.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_opds_unicode_user</div>
             </td>
@@ -2257,7 +2308,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt22.21' class='hiddenRow bg-success'>
+        <tr id='pt23.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestOPDSFeed - test_recently_added</div>
             </td>
@@ -2267,21 +2318,21 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
 
 
-    <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">
-            <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'>TestReader - test_comic_reader</div>
             </td>
@@ -2290,7 +2341,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt23.2' class='hiddenRow bg-success'>
+        <tr id='pt24.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_epub_reader</div>
             </td>
@@ -2299,7 +2350,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt23.3' class='hiddenRow bg-success'>
+        <tr id='pt24.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_pdf_reader</div>
             </td>
@@ -2308,7 +2359,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt23.4' class='hiddenRow bg-success'>
+        <tr id='pt24.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestReader - test_sound_listener</div>
             </td>
@@ -2317,11 +2368,31 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt23.5' class='hiddenRow bg-success'>
+        <tr id="ft24.5" class="none bg-danger">
             <td>
                 <div class='testcase'>TestReader - test_txt_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_ft24.5')">FAIL</a>
+                </div>
+                <!--css div popup start-->
+                <div id="div_ft24.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_ft24.5').style.display='none'"><span
+                                aria-hidden="true">&times;</span></button>
+                    </div>
+                    <div class="text-left pull-left">
+                        <pre class="text-left">Traceback (most recent call last):
+  File "/home/ozzie/Development/calibre-web-test/test/test_reader.py", line 61, in test_txt_reader
+    self.assertTrue('hörte' in content.text, 'Encoding of textfile viewer is not respected properly')
+AssertionError: False is not true : Encoding of textfile viewer is not respected properly</pre>
+                    </div>
+                    <div class="clearfix"></div>
+                </div>
+                <!--css div popup end-->
+            </td>
         </tr>
     
     
@@ -2335,13 +2406,13 @@ AssertionError: 'No Cover' != 'The camicdemo'
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c24', 7)">Detail</a>
+            <a onclick="showClassDetail('c25', 7)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt24.1' class='hiddenRow bg-success'>
+        <tr id='pt25.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_forgot_password</div>
             </td>
@@ -2350,7 +2421,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt24.2' class='hiddenRow bg-success'>
+        <tr id='pt25.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_limit_domain</div>
             </td>
@@ -2359,7 +2430,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt24.3' class='hiddenRow bg-success'>
+        <tr id='pt25.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_register_no_server</div>
             </td>
@@ -2368,7 +2439,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt24.4' class='hiddenRow bg-success'>
+        <tr id='pt25.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_only_email</div>
             </td>
@@ -2377,7 +2448,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt24.5' class='hiddenRow bg-success'>
+        <tr id='pt25.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user</div>
             </td>
@@ -2386,7 +2457,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt24.6' class='hiddenRow bg-success'>
+        <tr id='pt25.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_registering_user_fail</div>
             </td>
@@ -2395,7 +2466,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt24.7' class='hiddenRow bg-success'>
+        <tr id='pt25.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestRegister - test_user_change_password</div>
             </td>
@@ -2413,13 +2484,13 @@ AssertionError: 'No Cover' != 'The camicdemo'
         <td class="text-center">0</td>
         <td class="text-center">1</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c25', 11)">Detail</a>
+            <a onclick="showClassDetail('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'>TestShelf - test_add_shelf_from_search</div>
             </td>
@@ -2428,7 +2499,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt25.2' class='hiddenRow bg-success'>
+        <tr id='pt26.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_arrange_shelf</div>
             </td>
@@ -2437,7 +2508,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt25.3' class='hiddenRow bg-success'>
+        <tr id='pt26.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_delete_book_of_shelf</div>
             </td>
@@ -2446,7 +2517,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt25.4' class='hiddenRow bg-success'>
+        <tr id='pt26.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_private_shelf</div>
             </td>
@@ -2455,7 +2526,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt25.5' class='hiddenRow bg-success'>
+        <tr id='pt26.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_private_shelf</div>
             </td>
@@ -2464,7 +2535,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt25.6' class='hiddenRow bg-success'>
+        <tr id='pt26.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_public_shelf</div>
             </td>
@@ -2473,7 +2544,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt25.7' class='hiddenRow bg-success'>
+        <tr id='pt26.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_rename_shelf</div>
             </td>
@@ -2482,7 +2553,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt25.8' class='hiddenRow bg-success'>
+        <tr id='pt26.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_action_non_shelf_edit_role</div>
             </td>
@@ -2491,7 +2562,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt25.9' class='hiddenRow bg-success'>
+        <tr id='pt26.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_anonymous</div>
             </td>
@@ -2500,19 +2571,19 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id="st25.10" class="none bg-warning">
+        <tr id="st26.10" class="none bg-warning">
             <td>
                 <div class='testcase'>TestShelf - test_shelf_database_change</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st25.10')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st26.10')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st25.10" class="popup_window test_output" style="display:none;">
+                <div id="div_st26.10" class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_st25.10').style.display='none'"><span
+                                onclick='document.getElementById('div_st26.10').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2526,7 +2597,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt25.11' class='hiddenRow bg-success'>
+        <tr id='pt26.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestShelf - test_shelf_long_name</div>
             </td>
@@ -2544,13 +2615,13 @@ AssertionError: 'No Cover' != 'The camicdemo'
         <td class="text-center">0</td>
         <td class="text-center">1</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'>TestUpdater - test_check_update_nightly_errors</div>
             </td>
@@ -2559,7 +2630,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt26.2' class='hiddenRow bg-success'>
+        <tr id='pt27.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_nightly_request_errors</div>
             </td>
@@ -2568,7 +2639,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt26.3' class='hiddenRow bg-success'>
+        <tr id='pt27.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_errors</div>
             </td>
@@ -2577,7 +2648,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt26.4' class='hiddenRow bg-success'>
+        <tr id='pt27.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_check_update_stable_versions</div>
             </td>
@@ -2586,7 +2657,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt26.5' class='hiddenRow bg-success'>
+        <tr id='pt27.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update</div>
             </td>
@@ -2595,7 +2666,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt26.6' class='hiddenRow bg-success'>
+        <tr id='pt27.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_stable_errors</div>
             </td>
@@ -2604,19 +2675,19 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id="st26.7" class="none bg-warning">
+        <tr id="st27.7" class="none bg-warning">
             <td>
                 <div class='testcase'>TestUpdater - test_perform_update_timeout</div>
             </td>
             <td colspan='6'>
                 <div class="text-center">
-                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st26.7')">SKIP</a>
+                    <a class="popup_link text-center" onfocus='blur()' onclick="showTestDetail('div_st27.7')">SKIP</a>
                 </div>
                 <!--css div popup start-->
-                <div id="div_st26.7" class="popup_window test_output" style="display:none;">
+                <div id="div_st27.7" class="popup_window test_output" style="display:none;">
                     <div class='close_button pull-right'>
                         <button type="button" class="close" aria-label="Close" onfocus='this.blur();'
-                                onclick='document.getElementById('div_st26.7').style.display='none'"><span
+                                onclick='document.getElementById('div_st27.7').style.display='none'"><span
                                 aria-hidden="true">&times;</span></button>
                     </div>
                     <div class="text-left pull-left">
@@ -2630,7 +2701,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt26.8' class='hiddenRow bg-success'>
+        <tr id='pt27.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUpdater - test_reconnect_database</div>
             </td>
@@ -2648,13 +2719,13 @@ AssertionError: 'No Cover' != 'The camicdemo'
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c27', 1)">Detail</a>
+            <a onclick="showClassDetail('c28', 1)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt27.1' class='hiddenRow bg-success'>
+        <tr id='pt28.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserLoad - test_user_change_vis</div>
             </td>
@@ -2672,13 +2743,13 @@ AssertionError: 'No Cover' != 'The camicdemo'
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c28', 21)">Detail</a>
+            <a onclick="showClassDetail('c29', 21)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt28.1' class='hiddenRow bg-success'>
+        <tr id='pt29.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_column_restriction</div>
             </td>
@@ -2687,7 +2758,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt28.2' class='hiddenRow bg-success'>
+        <tr id='pt29.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_allow_tag_restriction</div>
             </td>
@@ -2696,7 +2767,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt28.3' class='hiddenRow bg-success'>
+        <tr id='pt29.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_archived_format_template</div>
             </td>
@@ -2705,7 +2776,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt28.4' class='hiddenRow bg-success'>
+        <tr id='pt29.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_author_user_template</div>
             </td>
@@ -2714,7 +2785,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt28.5' class='hiddenRow bg-success'>
+        <tr id='pt29.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_best_user_template</div>
             </td>
@@ -2723,7 +2794,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt28.6' class='hiddenRow bg-success'>
+        <tr id='pt29.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_category_user_template</div>
             </td>
@@ -2732,7 +2803,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt28.7' class='hiddenRow bg-success'>
+        <tr id='pt29.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_column_restriction</div>
             </td>
@@ -2741,7 +2812,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt28.8' class='hiddenRow bg-success'>
+        <tr id='pt29.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_deny_tag_restriction</div>
             </td>
@@ -2750,7 +2821,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt28.9' class='hiddenRow bg-success'>
+        <tr id='pt29.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_detail_random_user_template</div>
             </td>
@@ -2759,7 +2830,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt28.10' class='hiddenRow bg-success'>
+        <tr id='pt29.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_download_user_template</div>
             </td>
@@ -2768,7 +2839,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt28.11' class='hiddenRow bg-success'>
+        <tr id='pt29.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_format_user_template</div>
             </td>
@@ -2777,7 +2848,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt28.12' class='hiddenRow bg-success'>
+        <tr id='pt29.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_hot_user_template</div>
             </td>
@@ -2786,7 +2857,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt28.13' class='hiddenRow bg-success'>
+        <tr id='pt29.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_language_user_template</div>
             </td>
@@ -2795,7 +2866,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt28.14' class='hiddenRow bg-success'>
+        <tr id='pt29.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_limit_book_languages</div>
             </td>
@@ -2804,7 +2875,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt28.15' class='hiddenRow bg-success'>
+        <tr id='pt29.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_list_user_template</div>
             </td>
@@ -2813,7 +2884,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt28.16' class='hiddenRow bg-success'>
+        <tr id='pt29.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_publisher_user_template</div>
             </td>
@@ -2822,7 +2893,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt28.17' class='hiddenRow bg-success'>
+        <tr id='pt29.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_random_user_template</div>
             </td>
@@ -2831,7 +2902,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt28.18' class='hiddenRow bg-success'>
+        <tr id='pt29.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_read_user_template</div>
             </td>
@@ -2840,7 +2911,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt28.19' class='hiddenRow bg-success'>
+        <tr id='pt29.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_recent_user_template</div>
             </td>
@@ -2849,7 +2920,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt28.20' class='hiddenRow bg-success'>
+        <tr id='pt29.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_series_user_template</div>
             </td>
@@ -2858,7 +2929,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt28.21' class='hiddenRow bg-success'>
+        <tr id='pt29.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestUserTemplate - test_ui_language_settings</div>
             </td>
@@ -2876,13 +2947,13 @@ AssertionError: 'No Cover' != 'The camicdemo'
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c29', 33)">Detail</a>
+            <a onclick="showClassDetail('c30', 33)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt29.1' class='hiddenRow bg-success'>
+        <tr id='pt30.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_about</div>
             </td>
@@ -2891,7 +2962,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt29.2' class='hiddenRow bg-success'>
+        <tr id='pt30.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_SMTP_Settings</div>
             </td>
@@ -2900,7 +2971,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt29.3' class='hiddenRow bg-success'>
+        <tr id='pt30.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_add_user</div>
             </td>
@@ -2909,7 +2980,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt29.4' class='hiddenRow bg-success'>
+        <tr id='pt30.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_password</div>
             </td>
@@ -2918,7 +2989,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt29.5' class='hiddenRow bg-success'>
+        <tr id='pt30.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_archived</div>
             </td>
@@ -2927,7 +2998,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt29.6' class='hiddenRow bg-success'>
+        <tr id='pt30.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_authors</div>
             </td>
@@ -2936,7 +3007,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt29.7' class='hiddenRow bg-success'>
+        <tr id='pt30.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_category</div>
             </td>
@@ -2945,7 +3016,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt29.8' class='hiddenRow bg-success'>
+        <tr id='pt30.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_file_formats</div>
             </td>
@@ -2954,7 +3025,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt29.9' class='hiddenRow bg-success'>
+        <tr id='pt30.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_hot</div>
             </td>
@@ -2963,7 +3034,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt29.10' class='hiddenRow bg-success'>
+        <tr id='pt30.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_language</div>
             </td>
@@ -2972,7 +3043,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt29.11' class='hiddenRow bg-success'>
+        <tr id='pt30.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_publisher</div>
             </td>
@@ -2981,7 +3052,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt29.12' class='hiddenRow bg-success'>
+        <tr id='pt30.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_random</div>
             </td>
@@ -2990,7 +3061,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt29.13' class='hiddenRow bg-success'>
+        <tr id='pt30.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rated</div>
             </td>
@@ -2999,7 +3070,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt29.14' class='hiddenRow bg-success'>
+        <tr id='pt30.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_rating</div>
             </td>
@@ -3008,7 +3079,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt29.15' class='hiddenRow bg-success'>
+        <tr id='pt30.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_read</div>
             </td>
@@ -3017,7 +3088,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt29.16' class='hiddenRow bg-success'>
+        <tr id='pt30.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_admin_change_visibility_series</div>
             </td>
@@ -3026,7 +3097,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt29.17' class='hiddenRow bg-success'>
+        <tr id='pt30.17' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_columns</div>
             </td>
@@ -3035,7 +3106,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt29.18' class='hiddenRow bg-success'>
+        <tr id='pt30.18' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_allow_tags</div>
             </td>
@@ -3044,7 +3115,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt29.19' class='hiddenRow bg-success'>
+        <tr id='pt30.19' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_archive_books</div>
             </td>
@@ -3053,7 +3124,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt29.20' class='hiddenRow bg-success'>
+        <tr id='pt30.20' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_authors_max_settings</div>
             </td>
@@ -3062,7 +3133,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt29.21' class='hiddenRow bg-success'>
+        <tr id='pt30.21' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_change_title</div>
             </td>
@@ -3071,7 +3142,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt29.22' class='hiddenRow bg-success'>
+        <tr id='pt30.22' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_checked_logged_in</div>
             </td>
@@ -3080,7 +3151,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt29.23' class='hiddenRow bg-success'>
+        <tr id='pt30.23' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_hide_custom_column</div>
             </td>
@@ -3089,7 +3160,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt29.24' class='hiddenRow bg-success'>
+        <tr id='pt30.24' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_link_column_to_read_status</div>
             </td>
@@ -3098,7 +3169,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt29.25' class='hiddenRow bg-success'>
+        <tr id='pt30.25' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_random_books_available</div>
             </td>
@@ -3107,7 +3178,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt29.26' class='hiddenRow bg-success'>
+        <tr id='pt30.26' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_columns</div>
             </td>
@@ -3116,7 +3187,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt29.27' class='hiddenRow bg-success'>
+        <tr id='pt30.27' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_restrict_tags</div>
             </td>
@@ -3125,7 +3196,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt29.28' class='hiddenRow bg-success'>
+        <tr id='pt30.28' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_save_views_recent</div>
             </td>
@@ -3134,7 +3205,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt29.29' class='hiddenRow bg-success'>
+        <tr id='pt30.29' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_functions</div>
             </td>
@@ -3143,7 +3214,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt29.30' class='hiddenRow bg-success'>
+        <tr id='pt30.30' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_order</div>
             </td>
@@ -3152,7 +3223,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt29.31' class='hiddenRow bg-success'>
+        <tr id='pt30.31' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_search_string</div>
             </td>
@@ -3161,7 +3232,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt29.32' class='hiddenRow bg-success'>
+        <tr id='pt30.32' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_email_available</div>
             </td>
@@ -3170,7 +3241,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt29.33' class='hiddenRow bg-success'>
+        <tr id='pt30.33' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreWebVisibilitys - test_user_visibility_sidebar</div>
             </td>
@@ -3188,13 +3259,13 @@ AssertionError: 'No Cover' != 'The camicdemo'
         <td class="text-center">0</td>
         <td class="text-center">0</td>
         <td class="text-center">
-            <a onclick="showClassDetail('c30', 16)">Detail</a>
+            <a onclick="showClassDetail('c31', 16)">Detail</a>
         </td>
     </tr>
 
     
     
-        <tr id='pt30.1' class='hiddenRow bg-success'>
+        <tr id='pt31.1' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort</div>
             </td>
@@ -3203,7 +3274,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt30.2' class='hiddenRow bg-success'>
+        <tr id='pt31.2' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_comma</div>
             </td>
@@ -3212,7 +3283,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt30.3' class='hiddenRow bg-success'>
+        <tr id='pt31.3' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_junior</div>
             </td>
@@ -3221,7 +3292,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt30.4' class='hiddenRow bg-success'>
+        <tr id='pt31.4' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_oneword</div>
             </td>
@@ -3230,7 +3301,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt30.5' class='hiddenRow bg-success'>
+        <tr id='pt31.5' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_author_sort_roman</div>
             </td>
@@ -3239,7 +3310,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt30.6' class='hiddenRow bg-success'>
+        <tr id='pt31.6' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_Limit_Length</div>
             </td>
@@ -3248,7 +3319,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt30.7' class='hiddenRow bg-success'>
+        <tr id='pt31.7' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_char_replacement</div>
             </td>
@@ -3257,7 +3328,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt30.8' class='hiddenRow bg-success'>
+        <tr id='pt31.8' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_chinese_Characters</div>
             </td>
@@ -3266,7 +3337,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt30.9' class='hiddenRow bg-success'>
+        <tr id='pt31.9' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_deg_eur_replacement</div>
             </td>
@@ -3275,7 +3346,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt30.10' class='hiddenRow bg-success'>
+        <tr id='pt31.10' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_doubleS</div>
             </td>
@@ -3284,7 +3355,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt30.11' class='hiddenRow bg-success'>
+        <tr id='pt31.11' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_finish_Dot</div>
             </td>
@@ -3293,7 +3364,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt30.12' class='hiddenRow bg-success'>
+        <tr id='pt31.12' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_high23</div>
             </td>
@@ -3302,7 +3373,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt30.13' class='hiddenRow bg-success'>
+        <tr id='pt31.13' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_check_umlauts</div>
             </td>
@@ -3311,7 +3382,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt30.14' class='hiddenRow bg-success'>
+        <tr id='pt31.14' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_random_password</div>
             </td>
@@ -3320,7 +3391,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt30.15' class='hiddenRow bg-success'>
+        <tr id='pt31.15' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_split_authors</div>
             </td>
@@ -3329,7 +3400,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
     
     
     
-        <tr id='pt30.16' class='hiddenRow bg-success'>
+        <tr id='pt31.16' class='hiddenRow bg-success'>
             <td>
                 <div class='testcase'>TestCalibreHelper - test_whitespaces</div>
             </td>
@@ -3340,9 +3411,9 @@ AssertionError: 'No Cover' != 'The camicdemo'
 
     <tr id='total_row' class="text-center bg-grey">
         <td>Total</td>
-        <td>294</td>
-        <td>286</td>
-        <td>1</td>
+        <td>298</td>
+        <td>289</td>
+        <td>2</td>
         <td>0</td>
         <td>7</td>
         <td>&nbsp;</td>
@@ -3372,7 +3443,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
           
             <tr>
               <th>Platform</th>
-              <td>Linux 5.8.0-33-generic #36~20.04.1-Ubuntu SMP Wed Dec 9 17:01:13 UTC 2020 x86_64 x86_64</td>
+              <td>Linux 5.8.0-40-generic #45~20.04.1-Ubuntu SMP Fri Jan 15 11:35:04 UTC 2021 x86_64 x86_64</td>
               <td>Basic</td>
             </tr>
           
@@ -3522,7 +3593,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
           
             <tr>
               <th>PyYAML</th>
-              <td>5.3.1</td>
+              <td>5.4.1</td>
               <td>TestEbookConvertCalibreGDrive</td>
             </tr>
           
@@ -3558,13 +3629,13 @@ AssertionError: 'No Cover' != 'The camicdemo'
           
             <tr>
               <th>PyYAML</th>
-              <td>5.3.1</td>
+              <td>5.4.1</td>
               <td>TestEbookConvertGDriveKepubify</td>
             </tr>
           
             <tr>
               <th>comicapi</th>
-              <td>2.1.2</td>
+              <td>2.1.3</td>
               <td>TestEditAdditionalBooks</td>
             </tr>
           
@@ -3618,7 +3689,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
           
             <tr>
               <th>PyYAML</th>
-              <td>5.3.1</td>
+              <td>5.4.1</td>
               <td>TestEditBooksOnGdrive</td>
             </tr>
           
@@ -3648,7 +3719,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
           
             <tr>
               <th>PyYAML</th>
-              <td>5.3.1</td>
+              <td>5.4.1</td>
               <td>TestSetupGdrive</td>
             </tr>
           
@@ -3702,7 +3773,7 @@ AssertionError: 'No Cover' != 'The camicdemo'
 </div>
 
 <script>
-    drawCircle(286, 1, 0, 7);
+    drawCircle(289, 2, 0, 7);
 </script>
 
 </div>