diff --git a/cps/translations/de/LC_MESSAGES/messages.po b/cps/translations/de/LC_MESSAGES/messages.po
index 74c4da3b..45330ec2 100644
--- a/cps/translations/de/LC_MESSAGES/messages.po
+++ b/cps/translations/de/LC_MESSAGES/messages.po
@@ -5,31 +5,28 @@
 # FIRST AUTHOR OzzieIsaacs, 2016.
 msgid ""
 msgstr ""
-"Project-Id-Version: Calibre-Web\n"
+"Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2019-09-17 18:24+0200\n"
+"POT-Creation-Date: 2019-11-16 07:24+0100\n"
 "PO-Revision-Date: 2019-10-20 15:14+0200\n"
 "Last-Translator: Ozzie Isaacs\n"
 "Language: de\n"
 "Language-Team: \n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.7.0\n"
-"X-Generator: Poedit 2.2.4\n"
 
-#: cps/about.py:40 cps/about.py:65 cps/about.py:66 cps/uploader.py:228
+#: cps/about.py:41
 msgid "installed"
 msgstr "Installiert"
 
-#: cps/about.py:42 cps/about.py:65 cps/about.py:66 cps/uploader.py:213
-#: cps/uploader.py:214 cps/uploader.py:218 cps/uploader.py:222
-#: cps/uploader.py:226 cps/uploader.py:230
+#: cps/about.py:43
 msgid "not installed"
 msgstr "Nicht installiert"
 
-#: cps/about.py:80
+#: cps/about.py:81
 msgid "Statistics"
 msgstr "Statistiken"
 
@@ -41,7 +38,7 @@ msgstr "Server neu gestartet, Seite bitte neu laden"
 msgid "Performing shutdown of server, please close window"
 msgstr "Server wird heruntergefahren, Fenster bitte schließen"
 
-#: cps/admin.py:111 cps/updater.py:445
+#: cps/admin.py:111 cps/updater.py:446
 msgid "Unknown"
 msgstr "Unbekannt"
 
@@ -61,7 +58,7 @@ msgstr "Konfiguration von Calibre-Web wurde aktualisiert"
 msgid "Basic Configuration"
 msgstr "Basiskonfiguration"
 
-#: cps/admin.py:452 cps/web.py:1048
+#: cps/admin.py:452 cps/web.py:1054
 msgid "Please fill out all fields!"
 msgstr "Bitte alle Felder ausfüllen!"
 
@@ -70,7 +67,7 @@ msgstr "Bitte alle Felder ausfüllen!"
 msgid "Add new user"
 msgstr "Neuen Benutzer hinzufügen"
 
-#: cps/admin.py:463 cps/web.py:1251
+#: cps/admin.py:463 cps/web.py:1257
 msgid "E-mail is not from valid domain"
 msgstr "E-Mail bezieht sich nicht auf eine gültige Domain"
 
@@ -97,7 +94,7 @@ msgstr "Test-E-Mail wurde erfolgreich an %(kindlemail)s versendet"
 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:527 cps/web.py:1031
+#: cps/admin.py:527 cps/web.py:1037
 msgid "Please configure your kindle e-mail address first..."
 msgstr "Bitte zuerst die Kindle E-Mailadresse konfigurieren..."
 
@@ -114,7 +111,7 @@ msgstr "Benutzer '%(nick)s' gelöscht"
 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:600 cps/web.py:1277
+#: cps/admin.py:600 cps/web.py:1283
 msgid "Found an existing account for this e-mail address."
 msgstr "Es existiert bereits ein Benutzer für diese E-Mailadresse."
 
@@ -137,7 +134,7 @@ msgstr "Es ist ein unbekannter Fehler aufgetreten."
 msgid "Password for user %(user)s reset"
 msgstr "Passwort für Benutzer %(user)s wurde zurückgesetzt"
 
-#: cps/admin.py:634 cps/web.py:1073
+#: cps/admin.py:634 cps/web.py:1079
 msgid "An unknown error occurred. Please try again later."
 msgstr "Es ist ein unbekannter Fehler aufgetreten. Bitte später erneut versuchen."
 
@@ -177,22 +174,26 @@ msgstr "Update abgeschlossen, bitte okay drücken und Seite neu laden"
 msgid "Update failed:"
 msgstr "Update fehlgeschlagen:"
 
-#: cps/admin.py:687 cps/updater.py:271 cps/updater.py:456 cps/updater.py:458
+#: cps/admin.py:687 cps/updater.py:272 cps/updater.py:457 cps/updater.py:459
 msgid "HTTP Error"
 msgstr "HTTP Fehler"
 
-#: cps/admin.py:688 cps/updater.py:273 cps/updater.py:460
+#: cps/admin.py:688 cps/updater.py:274 cps/updater.py:461
 msgid "Connection error"
 msgstr "Verbindungsfehler"
 
-#: cps/admin.py:689 cps/updater.py:275 cps/updater.py:462
+#: cps/admin.py:689 cps/updater.py:276 cps/updater.py:463
 msgid "Timeout while establishing connection"
 msgstr "Timeout beim Verbindungsaufbau"
 
-#: cps/admin.py:690 cps/updater.py:277 cps/updater.py:464
+#: cps/admin.py:690 cps/updater.py:278 cps/updater.py:465
 msgid "General error"
 msgstr "Allgemeiner Fehler"
 
+#: cps/converter.py:31
+msgid "not configured"
+msgstr "Nicht konfiguriert"
+
 #: cps/editbooks.py:214 cps/editbooks.py:393
 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"
@@ -576,7 +577,7 @@ msgid "Show best rated books"
 msgstr "Zeige am besten bewertete Bücher"
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:67
-#: cps/web.py:969
+#: cps/web.py:975
 msgid "Read Books"
 msgstr "Gelesene Bücher"
 
@@ -585,7 +586,7 @@ msgid "Show read and unread"
 msgstr "Zeige gelesene/ungelesene Bücher"
 
 #: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:71
-#: cps/web.py:973
+#: cps/web.py:979
 msgid "Unread Books"
 msgstr "Ungelesene Bücher"
 
@@ -658,32 +659,32 @@ msgstr "Dateiformate"
 msgid "Show file formats selection"
 msgstr "Zeige Dateiformatauswahl"
 
-#: cps/updater.py:251 cps/updater.py:358 cps/updater.py:371
+#: cps/updater.py:252 cps/updater.py:359 cps/updater.py:372
 msgid "Unexpected data while reading update information"
 msgstr "Updateinformationen enthalten unbekannte Daten"
 
-#: cps/updater.py:258 cps/updater.py:364
+#: cps/updater.py:259 cps/updater.py:365
 msgid "No update available. You already have the latest version installed"
 msgstr "Kein Update verfügbar. Es ist bereits die aktuellste Version installiert"
 
-#: cps/updater.py:284
+#: cps/updater.py:285
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "Es sind Updates verfügbar. Klicke auf den Button unten, um auf die aktuellste Version zu aktualisieren."
 
-#: cps/updater.py:337
+#: cps/updater.py:338
 msgid "Could not fetch update information"
 msgstr "Updateinformationen konnten nicht geladen werden"
 
-#: cps/updater.py:351
+#: cps/updater.py:352
 msgid "No release information available"
 msgstr "Keine Releaseinformationen verfügbar"
 
-#: cps/updater.py:404 cps/updater.py:413
+#: cps/updater.py:405 cps/updater.py:414
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "Ein neues Update ist verfügbar. Klicke auf den Button unten, um auf Version: %(version)s zu aktualisieren"
 
-#: cps/updater.py:423
+#: cps/updater.py:424
 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."
 
@@ -707,7 +708,7 @@ msgstr "Bücher"
 msgid "Hot Books (most downloaded)"
 msgstr "Beliebte Bücher (am meisten Downloads)"
 
-#: cps/web.py:558 cps/web.py:1298 cps/web.py:1386
+#: cps/web.py:558 cps/web.py:1304 cps/web.py:1392
 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:"
 
@@ -774,112 +775,112 @@ msgstr "Kategorienliste"
 msgid "Tasks"
 msgstr "Aufgaben"
 
-#: cps/web.py:844
+#: cps/web.py:850
 msgid "Published after "
 msgstr "Herausgegeben nach dem "
 
-#: cps/web.py:851
+#: cps/web.py:857
 msgid "Published before "
 msgstr "Herausgegeben vor dem "
 
-#: cps/web.py:865
+#: cps/web.py:871
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Bewertung <= %(rating)s"
 
-#: cps/web.py:867
+#: cps/web.py:873
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Bewertung >= %(rating)s"
 
-#: cps/web.py:927 cps/web.py:937
+#: cps/web.py:933 cps/web.py:943
 msgid "search"
 msgstr "Suche"
 
-#: cps/web.py:1020
+#: cps/web.py:1026
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Bitte zuerst die SMTP-Einstellung konfigurieren ..."
 
-#: cps/web.py:1025
+#: cps/web.py:1031
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Buch erfolgreich zum Senden an %(kindlemail)s eingereiht"
 
-#: cps/web.py:1029
+#: cps/web.py:1035
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "Beim Senden des Buchs trat ein Fehler auf: %(res)s"
 
-#: cps/web.py:1049 cps/web.py:1074 cps/web.py:1078 cps/web.py:1083
-#: cps/web.py:1087
+#: cps/web.py:1055 cps/web.py:1080 cps/web.py:1084 cps/web.py:1089
+#: cps/web.py:1093
 msgid "register"
 msgstr "Registieren"
 
-#: cps/web.py:1076
+#: cps/web.py:1082
 msgid "Your e-mail is not allowed to register"
 msgstr "Diese E-Mail ist nicht für die Registrierung zugelassen"
 
-#: cps/web.py:1079
+#: cps/web.py:1085
 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:1082
+#: cps/web.py:1088
 msgid "This username or e-mail address is already in use."
 msgstr "Benutzername oder E-Mailadresse ist bereits in Verwendung."
 
-#: cps/web.py:1097
+#: cps/web.py:1103
 msgid "Cannot activate LDAP authentication"
 msgstr "LDAP-Authentifizierung kann nicht aktiviert werden"
 
-#: cps/web.py:1106 cps/web.py:1212
+#: cps/web.py:1112 cps/web.py:1218
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Du bist nun eingeloggt als '%(nickname)s'"
 
-#: cps/web.py:1110
+#: cps/web.py:1116
 msgid "Could not login. LDAP server down, please contact your administrator"
 msgstr "Login nicht erfolgreich, LDAP Server nicht erreichbar, bitte Administrator kontaktieren"
 
-#: cps/web.py:1114 cps/web.py:1122
+#: cps/web.py:1120 cps/web.py:1128
 msgid "Wrong Username or Password"
 msgstr "Falscher Benutzername oder Passwort"
 
-#: cps/web.py:1118
+#: cps/web.py:1124
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Eingeloggt als: '%(nickname)s'"
 
-#: cps/web.py:1126 cps/web.py:1148
+#: cps/web.py:1132 cps/web.py:1154
 msgid "login"
 msgstr "Login"
 
-#: cps/web.py:1160 cps/web.py:1191
+#: cps/web.py:1166 cps/web.py:1197
 msgid "Token not found"
 msgstr "Token wurde nicht gefunden"
 
-#: cps/web.py:1168 cps/web.py:1199
+#: cps/web.py:1174 cps/web.py:1205
 msgid "Token has expired"
 msgstr "Das Token ist abgelaufen"
 
-#: cps/web.py:1176
+#: cps/web.py:1182
 msgid "Success! Please return to your device"
 msgstr "Erfolg! Bitte zum Gerät zurückkehren"
 
-#: cps/web.py:1253 cps/web.py:1280 cps/web.py:1284
+#: cps/web.py:1259 cps/web.py:1286 cps/web.py:1290
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's Profil"
 
-#: cps/web.py:1282
+#: cps/web.py:1288
 msgid "Profile updated"
 msgstr "Profil aktualisiert"
 
-#: cps/web.py:1308 cps/web.py:1310 cps/web.py:1312 cps/web.py:1318
-#: cps/web.py:1322
+#: cps/web.py:1314 cps/web.py:1316 cps/web.py:1318 cps/web.py:1324
+#: cps/web.py:1328
 msgid "Read a Book"
 msgstr "Lese ein Buch"
 
-#: cps/web.py:1332
+#: cps/web.py:1338
 msgid "Error opening eBook. File does not exist or file is not accessible."
 msgstr "Fehler beim Öffnen des eBooks. Datei existiert nicht oder ist nicht zugänglich."
 
@@ -1057,7 +1058,7 @@ msgstr "OK"
 #: cps/templates/config_edit.html:321 cps/templates/config_view_edit.html:147
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:74
 #: cps/templates/layout.html:28 cps/templates/shelf.html:73
-#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:12
+#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:32
 #: cps/templates/user_edit.html:132
 msgid "Back"
 msgstr "Zurück"
@@ -2055,7 +2056,7 @@ msgstr "Lösche dieses Bücherregal"
 msgid "Edit Shelf"
 msgstr "Bücherregal editieren"
 
-#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:11
+#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:31
 msgid "Change order"
 msgstr "Reihenfolge ändern"
 
@@ -2179,9 +2180,6 @@ msgstr "Benutzer löschen"
 msgid "Recent Downloads"
 msgstr "Letzte Downloads"
 
-msgid "not configured"
-msgstr "Nicht konfiguriert"
-
 #~ msgid "Show sorted books"
 #~ msgstr "Zeige Bücher sortiert"
 
@@ -2310,3 +2308,4 @@ msgstr "Nicht konfiguriert"
 
 #~ msgid "Use"
 #~ msgstr "Benutzen"
+
diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po
index 597591cd..fe3653f2 100644
--- a/cps/translations/es/LC_MESSAGES/messages.po
+++ b/cps/translations/es/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: 2019-09-06 19:03+0200\n"
+"POT-Creation-Date: 2019-11-16 07:24+0100\n"
 "PO-Revision-Date: 2019-07-26 11:44+0100\n"
 "Last-Translator: minakmostoles <xxx@xxx.com>\n"
 "Language: es\n"
@@ -19,18 +19,16 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.7.0\n"
 
-#: cps/about.py:40 cps/about.py:65 cps/about.py:66 cps/uploader.py:228
+#: cps/about.py:41
 msgid "installed"
 msgstr ""
 
-#: cps/about.py:42 cps/about.py:65 cps/about.py:66 cps/uploader.py:213
-#: cps/uploader.py:214 cps/uploader.py:218 cps/uploader.py:222
-#: cps/uploader.py:226 cps/uploader.py:230
+#: cps/about.py:43
 msgid "not installed"
 msgstr "No instalado"
 
 # "Last-Translator: victorhck <victorhck@mailbox.org>\n"
-#: cps/about.py:80
+#: cps/about.py:81
 msgid "Statistics"
 msgstr "Estadísticas"
 
@@ -42,7 +40,7 @@ msgstr "Servidor reiniciado. Por favor, recargue la página"
 msgid "Performing shutdown of server, please close window"
 msgstr "Servidor en proceso de apagado. Por favor, cierre la ventana."
 
-#: cps/admin.py:111 cps/updater.py:445
+#: cps/admin.py:111 cps/updater.py:446
 msgid "Unknown"
 msgstr "Desconocido"
 
@@ -62,7 +60,7 @@ msgstr "Configuración de Calibre-Web actualizada"
 msgid "Basic Configuration"
 msgstr "Configuración básica"
 
-#: cps/admin.py:452 cps/web.py:1050
+#: cps/admin.py:452 cps/web.py:1054
 msgid "Please fill out all fields!"
 msgstr "¡Por favor completar todos los campos!"
 
@@ -71,7 +69,7 @@ msgstr "¡Por favor completar todos los campos!"
 msgid "Add new user"
 msgstr "Agregar un nuevo usuario"
 
-#: cps/admin.py:463 cps/web.py:1253
+#: cps/admin.py:463 cps/web.py:1257
 msgid "E-mail is not from valid domain"
 msgstr "El correo electrónico no tiene un nombre de dominio válido"
 
@@ -98,7 +96,7 @@ msgstr "Correo electrónico de prueba enviado con éxito a %(kindlemail)s"
 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:527 cps/web.py:1033
+#: cps/admin.py:527 cps/web.py:1037
 msgid "Please configure your kindle e-mail address first..."
 msgstr "Por favor configure primero la dirección de correo de su kindle..."
 
@@ -115,7 +113,7 @@ msgstr "Usuario '%(nick)s' borrado"
 msgid "No admin user remaining, can't delete user"
 msgstr "No queda ningún usuario administrador, no se puede eliminar usuario"
 
-#: cps/admin.py:600 cps/web.py:1279
+#: cps/admin.py:600 cps/web.py:1283
 msgid "Found an existing account for this e-mail address."
 msgstr "Encontrada una cuenta existente para esa dirección de correo electrónico."
 
@@ -138,7 +136,7 @@ msgstr "Ocurrió un error inesperado."
 msgid "Password for user %(user)s reset"
 msgstr "Contraseña para el usuario %(user)s reinicializada"
 
-#: cps/admin.py:634 cps/web.py:1075
+#: cps/admin.py:634 cps/web.py:1079
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ha ocurrido un error desconocido. Por favor vuelva a intentarlo más tarde."
 
@@ -178,22 +176,26 @@ msgstr "Actualización finalizada. Por favor, pulse OK y recargue la página"
 msgid "Update failed:"
 msgstr "Fallo al actualizar"
 
-#: cps/admin.py:687 cps/updater.py:271 cps/updater.py:456 cps/updater.py:458
+#: cps/admin.py:687 cps/updater.py:272 cps/updater.py:457 cps/updater.py:459
 msgid "HTTP Error"
 msgstr "Error HTTP"
 
-#: cps/admin.py:688 cps/updater.py:273 cps/updater.py:460
+#: cps/admin.py:688 cps/updater.py:274 cps/updater.py:461
 msgid "Connection error"
 msgstr "Error de conexión"
 
-#: cps/admin.py:689 cps/updater.py:275 cps/updater.py:462
+#: cps/admin.py:689 cps/updater.py:276 cps/updater.py:463
 msgid "Timeout while establishing connection"
 msgstr "Tiempo agotado mientras se trataba de establecer la conexión"
 
-#: cps/admin.py:690 cps/updater.py:277 cps/updater.py:464
+#: cps/admin.py:690 cps/updater.py:278 cps/updater.py:465
 msgid "General error"
 msgstr "Error general"
 
+#: cps/converter.py:31
+msgid "not configured"
+msgstr ""
+
 #: cps/editbooks.py:214 cps/editbooks.py:393
 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"
@@ -577,7 +579,7 @@ msgid "Show best rated books"
 msgstr "Mostrar libros mejor valorados"
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:67
-#: cps/web.py:971
+#: cps/web.py:975
 msgid "Read Books"
 msgstr "Libros leídos"
 
@@ -586,7 +588,7 @@ msgid "Show read and unread"
 msgstr "Mostrar leídos y no leídos"
 
 #: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:71
-#: cps/web.py:975
+#: cps/web.py:979
 msgid "Unread Books"
 msgstr "Libros no leídos"
 
@@ -659,228 +661,228 @@ msgstr "Formatos de archivo"
 msgid "Show file formats selection"
 msgstr "Mostrar selección de formatos de archivo"
 
-#: cps/updater.py:251 cps/updater.py:358 cps/updater.py:371
+#: cps/updater.py:252 cps/updater.py:359 cps/updater.py:372
 msgid "Unexpected data while reading update information"
 msgstr "Dato inesperado mientras se leía la información de actualización"
 
-#: cps/updater.py:258 cps/updater.py:364
+#: cps/updater.py:259 cps/updater.py:365
 msgid "No update available. You already have the latest version installed"
 msgstr "Actualización no disponible. Ya tienes la versión más reciente instalada"
 
-#: cps/updater.py:284
+#: cps/updater.py:285
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "Una nueva actualización está disponible. Haz clic en el botón inferior para actualizar a la versión más reciente."
 
-#: cps/updater.py:337
+#: cps/updater.py:338
 msgid "Could not fetch update information"
 msgstr "No se puede conseguir información sobre la actualización"
 
-#: cps/updater.py:351
+#: cps/updater.py:352
 msgid "No release information available"
 msgstr "No hay información del lanzamiento disponible"
 
-#: cps/updater.py:404 cps/updater.py:413
+#: cps/updater.py:405 cps/updater.py:414
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "Hay una nueva actualización disponible. Haz clic en el botón de abajo para actualizar a la versión: %(version)s"
 
-#: cps/updater.py:423
+#: cps/updater.py:424
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Haz clic en el botón de abajo para actualizar a la última versión estable."
 
-#: cps/web.py:460
+#: cps/web.py:458
 msgid "Recently Added Books"
 msgstr "Libros añadidos recientemente"
 
-#: cps/web.py:488
+#: cps/web.py:486
 msgid "Best rated books"
 msgstr "Libros mejor valorados"
 
-#: cps/templates/index.xml:38 cps/web.py:496
+#: cps/templates/index.xml:38 cps/web.py:494
 msgid "Random Books"
 msgstr "Libros al azar"
 
-#: cps/web.py:522
+#: cps/web.py:520
 msgid "Books"
 msgstr "Libros"
 
-#: cps/web.py:549
+#: cps/web.py:547
 msgid "Hot Books (most downloaded)"
 msgstr "Libros populares (los más descargados)"
 
-#: cps/web.py:560 cps/web.py:1300 cps/web.py:1388
+#: cps/web.py:558 cps/web.py:1304 cps/web.py:1392
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "Error al abrir eBook. El archivo no existe o no es accesible:"
 
-#: cps/web.py:573
+#: cps/web.py:571
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autor/es: %(name)s"
 
-#: cps/web.py:585
+#: cps/web.py:583
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Editor/es: "
 
-#: cps/web.py:596
+#: cps/web.py:594
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Series: %(serie)s"
 
-#: cps/web.py:607
+#: cps/web.py:605
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Calificación: %(rating)s estrellas"
 
-#: cps/web.py:618
+#: cps/web.py:616
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Formato del fichero: %(format)s"
 
-#: cps/web.py:630
+#: cps/web.py:628
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoría : %(name)s"
 
-#: cps/web.py:647
+#: cps/web.py:645
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Idioma: %(name)s"
 
-#: cps/web.py:679
+#: cps/web.py:677
 msgid "Publisher list"
 msgstr "Lista de editores"
 
-#: cps/templates/index.xml:82 cps/web.py:695
+#: cps/templates/index.xml:82 cps/web.py:693
 msgid "Series list"
 msgstr "Lista de series"
 
-#: cps/web.py:709
+#: cps/web.py:707
 msgid "Ratings list"
 msgstr "Lista de calificaciones"
 
-#: cps/web.py:722
+#: cps/web.py:720
 msgid "File formats list"
 msgstr "Lista de formatos"
 
-#: cps/web.py:750
+#: cps/web.py:748
 msgid "Available languages"
 msgstr "Idiomas disponibles"
 
-#: cps/templates/index.xml:75 cps/web.py:767
+#: cps/templates/index.xml:75 cps/web.py:765
 msgid "Category list"
 msgstr "Lista de categorías"
 
-#: cps/templates/layout.html:73 cps/web.py:781
+#: cps/templates/layout.html:73 cps/web.py:779
 msgid "Tasks"
 msgstr "Tareas"
 
-#: cps/web.py:846
+#: cps/web.py:850
 msgid "Published after "
 msgstr "Publicado después de"
 
-#: cps/web.py:853
+#: cps/web.py:857
 msgid "Published before "
 msgstr "Publicado antes de"
 
-#: cps/web.py:867
+#: cps/web.py:871
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Calificación <= %(rating)s"
 
-#: cps/web.py:869
+#: cps/web.py:873
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Calificación >= %(rating)s"
 
-#: cps/web.py:929 cps/web.py:939
+#: cps/web.py:933 cps/web.py:943
 msgid "search"
 msgstr "búsqueda"
 
-#: cps/web.py:1022
+#: cps/web.py:1026
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configura primero los parámetros del servidor SMTP..."
 
-#: cps/web.py:1027
+#: cps/web.py:1031
 #, 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:1031
+#: cps/web.py:1035
 #, python-format
 msgid "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:1051 cps/web.py:1076 cps/web.py:1080 cps/web.py:1085
-#: cps/web.py:1089
+#: cps/web.py:1055 cps/web.py:1080 cps/web.py:1084 cps/web.py:1089
+#: cps/web.py:1093
 msgid "register"
 msgstr "registrarse"
 
-#: cps/web.py:1078
+#: cps/web.py:1082
 msgid "Your e-mail is not allowed to register"
 msgstr "Su correo electrónico no está permitido para registrarse"
 
-#: cps/web.py:1081
+#: cps/web.py:1085
 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 electrónico."
 
-#: cps/web.py:1084
+#: cps/web.py:1088
 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:1099
+#: cps/web.py:1103
 msgid "Cannot activate LDAP authentication"
 msgstr "No se puede activar la autenticación LDAP"
 
-#: cps/web.py:1108 cps/web.py:1214
+#: cps/web.py:1112 cps/web.py:1218
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Sesión iniciada como : '%(nickname)s'"
 
-#: cps/web.py:1112
+#: cps/web.py:1116
 msgid "Could not login. LDAP server down, please contact your administrator"
 msgstr "No pude entrar a la cuenta. El servidor LDAP está inactivo, por favor contacte a su administrador"
 
-#: cps/web.py:1116 cps/web.py:1124
+#: cps/web.py:1120 cps/web.py:1128
 msgid "Wrong Username or Password"
 msgstr "Usuario o contraseña inválido"
 
-#: cps/web.py:1120
+#: cps/web.py:1124
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Ahora estás conectado como: '%(nickname)s'"
 
-#: cps/web.py:1128 cps/web.py:1150
+#: cps/web.py:1132 cps/web.py:1154
 msgid "login"
 msgstr "Iniciar sesión"
 
-#: cps/web.py:1162 cps/web.py:1193
+#: cps/web.py:1166 cps/web.py:1197
 msgid "Token not found"
 msgstr "Token no encontrado"
 
-#: cps/web.py:1170 cps/web.py:1201
+#: cps/web.py:1174 cps/web.py:1205
 msgid "Token has expired"
 msgstr "El token ha expirado"
 
-#: cps/web.py:1178
+#: cps/web.py:1182
 msgid "Success! Please return to your device"
 msgstr "¡Correcto! Por favor regrese a su dispositivo"
 
-#: cps/web.py:1255 cps/web.py:1282 cps/web.py:1286
+#: cps/web.py:1259 cps/web.py:1286 cps/web.py:1290
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Perfil de %(name)s"
 
-#: cps/web.py:1284
+#: cps/web.py:1288
 msgid "Profile updated"
 msgstr "Perfil actualizado"
 
-#: cps/web.py:1310 cps/web.py:1312 cps/web.py:1314 cps/web.py:1320
-#: cps/web.py:1324
+#: cps/web.py:1314 cps/web.py:1316 cps/web.py:1318 cps/web.py:1324
+#: cps/web.py:1328
 msgid "Read a Book"
 msgstr "Leer un libro"
 
-#: cps/web.py:1334
+#: cps/web.py:1338
 msgid "Error opening eBook. File does not exist or file is not accessible."
 msgstr "Error al abrir el eBook. El archivo no existe o el archivo no es accesible."
 
@@ -1058,7 +1060,7 @@ msgstr "Ok"
 #: cps/templates/config_edit.html:321 cps/templates/config_view_edit.html:147
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:74
 #: cps/templates/layout.html:28 cps/templates/shelf.html:73
-#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:12
+#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:32
 #: cps/templates/user_edit.html:132
 msgid "Back"
 msgstr "Regresar"
@@ -2056,7 +2058,7 @@ msgstr "Borrar este estante"
 msgid "Edit Shelf"
 msgstr "Editar estante"
 
-#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:11
+#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:31
 msgid "Change order"
 msgstr "Cambiar orden"
 
diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index 58c810dd..80b5a121 100644
--- a/cps/translations/fr/LC_MESSAGES/messages.po
+++ b/cps/translations/fr/LC_MESSAGES/messages.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-09-06 19:03+0200\n"
+"POT-Creation-Date: 2019-11-16 07:24+0100\n"
 "PO-Revision-Date: 2019-08-21 15:20+0100\n"
 "Last-Translator: Nicolas Roudninski <nicoroud@gmail.com>\n"
 "Language: fr\n"
@@ -31,17 +31,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.7.0\n"
 
-#: cps/about.py:40 cps/about.py:65 cps/about.py:66 cps/uploader.py:228
+#: cps/about.py:41
 msgid "installed"
 msgstr ""
 
-#: cps/about.py:42 cps/about.py:65 cps/about.py:66 cps/uploader.py:213
-#: cps/uploader.py:214 cps/uploader.py:218 cps/uploader.py:222
-#: cps/uploader.py:226 cps/uploader.py:230
+#: cps/about.py:43
 msgid "not installed"
 msgstr "non installé"
 
-#: cps/about.py:80
+#: cps/about.py:81
 msgid "Statistics"
 msgstr "Statistiques"
 
@@ -53,7 +51,7 @@ msgstr "Serveur redémarré, merci de rafraîchir la page"
 msgid "Performing shutdown of server, please close window"
 msgstr "Arrêt du serveur en cours, merci de fermer la fenêtre"
 
-#: cps/admin.py:111 cps/updater.py:445
+#: cps/admin.py:111 cps/updater.py:446
 msgid "Unknown"
 msgstr "Inconnu"
 
@@ -73,7 +71,7 @@ msgstr "Configuration de Calibre-Web mise à jour"
 msgid "Basic Configuration"
 msgstr "Configuration principale"
 
-#: cps/admin.py:452 cps/web.py:1050
+#: cps/admin.py:452 cps/web.py:1054
 msgid "Please fill out all fields!"
 msgstr "SVP, complétez tous les champs !"
 
@@ -82,7 +80,7 @@ msgstr "SVP, complétez tous les champs !"
 msgid "Add new user"
 msgstr "Ajouter un nouvel utilisateur"
 
-#: cps/admin.py:463 cps/web.py:1253
+#: cps/admin.py:463 cps/web.py:1257
 msgid "E-mail is not from valid domain"
 msgstr "Cette adresse de courriel n’appartient pas à un domaine valide"
 
@@ -109,7 +107,7 @@ msgstr "Courriel de test envoyé avec succès sur %(kindlemail)s"
 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:527 cps/web.py:1033
+#: cps/admin.py:527 cps/web.py:1037
 msgid "Please configure your kindle e-mail address first..."
 msgstr "Veuillez configurer votre adresse de courriel Kindle en premier lieu…"
 
@@ -126,7 +124,7 @@ msgstr "Utilisateur '%(nick)s' supprimé"
 msgid "No admin user remaining, can't delete user"
 msgstr "Aucun utilisateur admin restant, impossible de supprimer l’utilisateur"
 
-#: cps/admin.py:600 cps/web.py:1279
+#: cps/admin.py:600 cps/web.py:1283
 msgid "Found an existing account for this e-mail address."
 msgstr "Un compte existant a été trouvé pour cette adresse de courriel."
 
@@ -149,7 +147,7 @@ msgstr "Oups ! Une erreur inconnue a eu lieu."
 msgid "Password for user %(user)s reset"
 msgstr "Le mot de passe de l’utilisateur %(user)s a été réinitialisé"
 
-#: cps/admin.py:634 cps/web.py:1075
+#: cps/admin.py:634 cps/web.py:1079
 msgid "An unknown error occurred. Please try again later."
 msgstr "Une erreur inconnue est survenue. Veuillez réessayer plus tard."
 
@@ -189,22 +187,26 @@ msgstr "Mise à jour terminée, merci d’appuyer sur okay et de rafraîchir la
 msgid "Update failed:"
 msgstr "La mise à jour a échoué :"
 
-#: cps/admin.py:687 cps/updater.py:271 cps/updater.py:456 cps/updater.py:458
+#: cps/admin.py:687 cps/updater.py:272 cps/updater.py:457 cps/updater.py:459
 msgid "HTTP Error"
 msgstr "Erreur HTTP"
 
-#: cps/admin.py:688 cps/updater.py:273 cps/updater.py:460
+#: cps/admin.py:688 cps/updater.py:274 cps/updater.py:461
 msgid "Connection error"
 msgstr "Erreur de connexion"
 
-#: cps/admin.py:689 cps/updater.py:275 cps/updater.py:462
+#: cps/admin.py:689 cps/updater.py:276 cps/updater.py:463
 msgid "Timeout while establishing connection"
 msgstr "Délai d'attente dépassé lors de l'établissement de connexion"
 
-#: cps/admin.py:690 cps/updater.py:277 cps/updater.py:464
+#: cps/admin.py:690 cps/updater.py:278 cps/updater.py:465
 msgid "General error"
 msgstr "Erreur générale"
 
+#: cps/converter.py:31
+msgid "not configured"
+msgstr ""
+
 #: cps/editbooks.py:214 cps/editbooks.py:393
 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"
@@ -588,7 +590,7 @@ msgid "Show best rated books"
 msgstr "Montrer les livres les mieux notés"
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:67
-#: cps/web.py:971
+#: cps/web.py:975
 msgid "Read Books"
 msgstr "Livres lus"
 
@@ -597,7 +599,7 @@ msgid "Show read and unread"
 msgstr "Montrer lu et non-lu"
 
 #: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:71
-#: cps/web.py:975
+#: cps/web.py:979
 msgid "Unread Books"
 msgstr "Livres non-lus"
 
@@ -670,228 +672,228 @@ msgstr "Format de fichier"
 msgid "Show file formats selection"
 msgstr "Afficher la sélection des formats de fichiers"
 
-#: cps/updater.py:251 cps/updater.py:358 cps/updater.py:371
+#: cps/updater.py:252 cps/updater.py:359 cps/updater.py:372
 msgid "Unexpected data while reading update information"
 msgstr "Données inattendues lors de la lecture des informations de mise à jour"
 
-#: cps/updater.py:258 cps/updater.py:364
+#: cps/updater.py:259 cps/updater.py:365
 msgid "No update available. You already have the latest version installed"
 msgstr "Aucune mise à jour disponible. Vous avez déjà la dernière version installée"
 
-#: cps/updater.py:284
+#: cps/updater.py:285
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "Une nouvelle mise à jour est disponible. Cliquez sur le bouton ci-dessous pour charger la dernière version."
 
-#: cps/updater.py:337
+#: cps/updater.py:338
 msgid "Could not fetch update information"
 msgstr "Impossible d'extraire les informations de mise à jour"
 
-#: cps/updater.py:351
+#: cps/updater.py:352
 msgid "No release information available"
 msgstr "Aucune information concernant cette version n’est disponible"
 
-#: cps/updater.py:404 cps/updater.py:413
+#: cps/updater.py:405 cps/updater.py:414
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "Une nouvelle mise à jour est disponible. Cliquez sur le bouton ci-dessous pour charger la version %(version)s"
 
-#: cps/updater.py:423
+#: cps/updater.py:424
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Téléchargez la dernière version en cliquant sur le bouton ci-dessous."
 
-#: cps/web.py:460
+#: cps/web.py:458
 msgid "Recently Added Books"
 msgstr "Ajouts récents"
 
-#: cps/web.py:488
+#: cps/web.py:486
 msgid "Best rated books"
 msgstr "Livres les mieux notés"
 
-#: cps/templates/index.xml:38 cps/web.py:496
+#: cps/templates/index.xml:38 cps/web.py:494
 msgid "Random Books"
 msgstr "Livres au hasard"
 
-#: cps/web.py:522
+#: cps/web.py:520
 msgid "Books"
 msgstr "Livres"
 
-#: cps/web.py:549
+#: cps/web.py:547
 msgid "Hot Books (most downloaded)"
 msgstr "Livres populaires (les plus téléchargés)"
 
-#: cps/web.py:560 cps/web.py:1300 cps/web.py:1388
+#: cps/web.py:558 cps/web.py:1304 cps/web.py:1392
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "Erreur d'ouverture du livre numérique. Le fichier n'existe pas ou n'est pas accessible :"
 
-#: cps/web.py:573
+#: cps/web.py:571
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Auteur: %(name)s"
 
-#: cps/web.py:585
+#: cps/web.py:583
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Editeur : '%(name)s'"
 
-#: cps/web.py:596
+#: cps/web.py:594
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Séries : %(serie)s"
 
-#: cps/web.py:607
+#: cps/web.py:605
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Note: %(rating)s étoiles"
 
-#: cps/web.py:618
+#: cps/web.py:616
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Format de fichier: %(format)s"
 
-#: cps/web.py:630
+#: cps/web.py:628
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Catégorie : %(name)s"
 
-#: cps/web.py:647
+#: cps/web.py:645
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Langue : %(name)s"
 
-#: cps/web.py:679
+#: cps/web.py:677
 msgid "Publisher list"
 msgstr "Liste des éditeurs"
 
-#: cps/templates/index.xml:82 cps/web.py:695
+#: cps/templates/index.xml:82 cps/web.py:693
 msgid "Series list"
 msgstr "Liste des séries"
 
-#: cps/web.py:709
+#: cps/web.py:707
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:722
+#: cps/web.py:720
 msgid "File formats list"
 msgstr ""
 
-#: cps/web.py:750
+#: cps/web.py:748
 msgid "Available languages"
 msgstr "Langues disponibles"
 
-#: cps/templates/index.xml:75 cps/web.py:767
+#: cps/templates/index.xml:75 cps/web.py:765
 msgid "Category list"
 msgstr "Liste des catégories"
 
-#: cps/templates/layout.html:73 cps/web.py:781
+#: cps/templates/layout.html:73 cps/web.py:779
 msgid "Tasks"
 msgstr "Tâches"
 
-#: cps/web.py:846
+#: cps/web.py:850
 msgid "Published after "
 msgstr "Publié après le "
 
-#: cps/web.py:853
+#: cps/web.py:857
 msgid "Published before "
 msgstr "Publié avant le "
 
-#: cps/web.py:867
+#: cps/web.py:871
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Évaluation <= %(rating)s"
 
-#: cps/web.py:869
+#: cps/web.py:873
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Évaluation >= %(rating)s"
 
-#: cps/web.py:929 cps/web.py:939
+#: cps/web.py:933 cps/web.py:943
 msgid "search"
 msgstr "recherche"
 
-#: cps/web.py:1022
+#: cps/web.py:1026
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Veuillez configurer les paramètres SMTP au préalable…"
 
-#: cps/web.py:1027
+#: cps/web.py:1031
 #, 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 envois vers %(kindlemail)s"
 
-#: cps/web.py:1031
+#: cps/web.py:1035
 #, python-format
 msgid "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:1051 cps/web.py:1076 cps/web.py:1080 cps/web.py:1085
-#: cps/web.py:1089
+#: cps/web.py:1055 cps/web.py:1080 cps/web.py:1084 cps/web.py:1089
+#: cps/web.py:1093
 msgid "register"
 msgstr "s’enregistrer"
 
-#: cps/web.py:1078
+#: cps/web.py:1082
 msgid "Your e-mail is not allowed to register"
 msgstr "Votre adresse de courriel n’est pas autorisé pour une inscription"
 
-#: cps/web.py:1081
+#: cps/web.py:1085
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Le courriel de confirmation a été envoyé à votre adresse."
 
-#: cps/web.py:1084
+#: cps/web.py:1088
 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:1099
+#: cps/web.py:1103
 msgid "Cannot activate LDAP authentication"
 msgstr "Impossible d’activer l’authentification LDAP"
 
-#: cps/web.py:1108 cps/web.py:1214
+#: cps/web.py:1112 cps/web.py:1218
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "vous êtes maintenant connecté sous : '%(nickname)s'"
 
-#: cps/web.py:1112
+#: cps/web.py:1116
 msgid "Could not login. LDAP server down, please contact your administrator"
 msgstr "Impossible de se connecter. Serveur LDAP hors service, veuillez contacter votre administrateur"
 
-#: cps/web.py:1116 cps/web.py:1124
+#: cps/web.py:1120 cps/web.py:1128
 msgid "Wrong Username or Password"
 msgstr "Mauvais nom d'utilisateur ou mot de passe"
 
-#: cps/web.py:1120
+#: cps/web.py:1124
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Vous êtes maintenant connecté en tant que : ‘%(nickname)s’"
 
-#: cps/web.py:1128 cps/web.py:1150
+#: cps/web.py:1132 cps/web.py:1154
 msgid "login"
 msgstr "connexion"
 
-#: cps/web.py:1162 cps/web.py:1193
+#: cps/web.py:1166 cps/web.py:1197
 msgid "Token not found"
 msgstr "Jeton non trouvé"
 
-#: cps/web.py:1170 cps/web.py:1201
+#: cps/web.py:1174 cps/web.py:1205
 msgid "Token has expired"
 msgstr "Jeton expiré"
 
-#: cps/web.py:1178
+#: cps/web.py:1182
 msgid "Success! Please return to your device"
 msgstr "Réussite! Merci de vous tourner vers votre appareil"
 
-#: cps/web.py:1255 cps/web.py:1282 cps/web.py:1286
+#: cps/web.py:1259 cps/web.py:1286 cps/web.py:1290
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil de %(name)s"
 
-#: cps/web.py:1284
+#: cps/web.py:1288
 msgid "Profile updated"
 msgstr "Profil mis à jour"
 
-#: cps/web.py:1310 cps/web.py:1312 cps/web.py:1314 cps/web.py:1320
-#: cps/web.py:1324
+#: cps/web.py:1314 cps/web.py:1316 cps/web.py:1318 cps/web.py:1324
+#: cps/web.py:1328
 msgid "Read a Book"
 msgstr "Lire un livre"
 
-#: cps/web.py:1334
+#: cps/web.py:1338
 msgid "Error opening eBook. File does not exist or file is not accessible."
 msgstr "Erreur lors de l’ouverture d’un eBook. Le fichier n’existe pas ou le fichier n’est pas accessible."
 
@@ -1069,7 +1071,7 @@ msgstr "Oui"
 #: cps/templates/config_edit.html:321 cps/templates/config_view_edit.html:147
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:74
 #: cps/templates/layout.html:28 cps/templates/shelf.html:73
-#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:12
+#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:32
 #: cps/templates/user_edit.html:132
 msgid "Back"
 msgstr "Retour"
@@ -2067,7 +2069,7 @@ msgstr "Supprimer cette étagère"
 msgid "Edit Shelf"
 msgstr "Modifier l’étagère"
 
-#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:11
+#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:31
 msgid "Change order"
 msgstr "Modifier l’ordre"
 
diff --git a/cps/translations/hu/LC_MESSAGES/messages.po b/cps/translations/hu/LC_MESSAGES/messages.po
index b099def1..64256d32 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: 2019-09-06 19:03+0200\n"
+"POT-Creation-Date: 2019-11-16 07:24+0100\n"
 "PO-Revision-Date: 2019-04-06 23:36+0200\n"
 "Last-Translator: \n"
 "Language: hu\n"
@@ -18,17 +18,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.7.0\n"
 
-#: cps/about.py:40 cps/about.py:65 cps/about.py:66 cps/uploader.py:228
+#: cps/about.py:41
 msgid "installed"
 msgstr ""
 
-#: cps/about.py:42 cps/about.py:65 cps/about.py:66 cps/uploader.py:213
-#: cps/uploader.py:214 cps/uploader.py:218 cps/uploader.py:222
-#: cps/uploader.py:226 cps/uploader.py:230
+#: cps/about.py:43
 msgid "not installed"
 msgstr "nincs telepítve"
 
-#: cps/about.py:80
+#: cps/about.py:81
 msgid "Statistics"
 msgstr "Statisztika"
 
@@ -40,7 +38,7 @@ msgstr "A kiszolgáló újraindult, tölts be újra az oldalt!"
 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:111 cps/updater.py:445
+#: cps/admin.py:111 cps/updater.py:446
 msgid "Unknown"
 msgstr "Ismeretlen"
 
@@ -60,7 +58,7 @@ msgstr "A Calibre-Web konfigurációja frissítve."
 msgid "Basic Configuration"
 msgstr "Alapvető beállítások"
 
-#: cps/admin.py:452 cps/web.py:1050
+#: cps/admin.py:452 cps/web.py:1054
 msgid "Please fill out all fields!"
 msgstr "Az összes mezőt ki kell tölteni!"
 
@@ -69,7 +67,7 @@ msgstr "Az összes mezőt ki kell tölteni!"
 msgid "Add new user"
 msgstr "Új felhasználó hozzáadása"
 
-#: cps/admin.py:463 cps/web.py:1253
+#: cps/admin.py:463 cps/web.py:1257
 msgid "E-mail is not from valid domain"
 msgstr "Az e-mail tartománya nem érvényes."
 
@@ -96,7 +94,7 @@ msgstr "A teszt levél sikeresen elküldve ide: %(kindlemail)s"
 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:527 cps/web.py:1033
+#: cps/admin.py:527 cps/web.py:1037
 msgid "Please configure your kindle e-mail address first..."
 msgstr "Először be kell állítani a kindle e-mail címet..."
 
@@ -113,7 +111,7 @@ msgstr "A felhasználó törölve: %(nick)s"
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:600 cps/web.py:1279
+#: cps/admin.py:600 cps/web.py:1283
 msgid "Found an existing account for this e-mail address."
 msgstr "Már létezik felhasználó ehhez az e-mail címhez."
 
@@ -136,7 +134,7 @@ msgstr "Ismeretlen hiba történt."
 msgid "Password for user %(user)s reset"
 msgstr "A(z) %(user)s felhasználó jelszavának alaphelyzetbe állítása"
 
-#: cps/admin.py:634 cps/web.py:1075
+#: cps/admin.py:634 cps/web.py:1079
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ismeretlen hiba történt. Próbáld újra később!"
 
@@ -176,22 +174,26 @@ msgstr "A frissítés települt, kattints az OK-ra és újra tölt az oldal"
 msgid "Update failed:"
 msgstr "A frissítés nem sikerült:"
 
-#: cps/admin.py:687 cps/updater.py:271 cps/updater.py:456 cps/updater.py:458
+#: cps/admin.py:687 cps/updater.py:272 cps/updater.py:457 cps/updater.py:459
 msgid "HTTP Error"
 msgstr "HTTP hiba"
 
-#: cps/admin.py:688 cps/updater.py:273 cps/updater.py:460
+#: cps/admin.py:688 cps/updater.py:274 cps/updater.py:461
 msgid "Connection error"
 msgstr "Kapcsolódási hiba"
 
-#: cps/admin.py:689 cps/updater.py:275 cps/updater.py:462
+#: cps/admin.py:689 cps/updater.py:276 cps/updater.py:463
 msgid "Timeout while establishing connection"
 msgstr "Időtúllépés a kapcsolódás során"
 
-#: cps/admin.py:690 cps/updater.py:277 cps/updater.py:464
+#: cps/admin.py:690 cps/updater.py:278 cps/updater.py:465
 msgid "General error"
 msgstr "Általános hiba"
 
+#: cps/converter.py:31
+msgid "not configured"
+msgstr ""
+
 #: cps/editbooks.py:214 cps/editbooks.py:393
 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ő."
@@ -575,7 +577,7 @@ msgid "Show best rated books"
 msgstr "Legjobbra értékelt könyvek mutatása"
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:67
-#: cps/web.py:971
+#: cps/web.py:975
 msgid "Read Books"
 msgstr "Olvasott könyvek"
 
@@ -584,7 +586,7 @@ msgid "Show read and unread"
 msgstr "Mutassa az olvasva/olvasatlan állapotot"
 
 #: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:71
-#: cps/web.py:975
+#: cps/web.py:979
 msgid "Unread Books"
 msgstr "Olvasatlan könyvek"
 
@@ -657,228 +659,228 @@ msgstr ""
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/updater.py:251 cps/updater.py:358 cps/updater.py:371
+#: cps/updater.py:252 cps/updater.py:359 cps/updater.py:372
 msgid "Unexpected data while reading update information"
 msgstr "Ismeretlen adat a frissítési információk olvasásakor"
 
-#: cps/updater.py:258 cps/updater.py:364
+#: cps/updater.py:259 cps/updater.py:365
 msgid "No update available. You already have the latest version installed"
 msgstr "Nem érhető el újabb frissítés. Már a legújabb verzió van telepítve."
 
-#: cps/updater.py:284
+#: cps/updater.py:285
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "Egy új frissítés érhető el. Kattints a lenti gombra a legújabb verzió frissítésére"
 
-#: cps/updater.py:337
+#: cps/updater.py:338
 msgid "Could not fetch update information"
 msgstr "Nem lehetett begyűjteni a frissítési információkat"
 
-#: cps/updater.py:351
+#: cps/updater.py:352
 msgid "No release information available"
 msgstr "Nincs információ a kiadásról."
 
-#: cps/updater.py:404 cps/updater.py:413
+#: cps/updater.py:405 cps/updater.py:414
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "Új frissítés érhető el. Kattints az alábbi gombra a frissítéshez a következő verzióra: %(version)s"
 
-#: cps/updater.py:423
+#: cps/updater.py:424
 msgid "Click on the button below to update to the latest stable version."
 msgstr ""
 
-#: cps/web.py:460
+#: cps/web.py:458
 msgid "Recently Added Books"
 msgstr "Legutóbb hozzáadott könyvek"
 
-#: cps/web.py:488
+#: cps/web.py:486
 msgid "Best rated books"
 msgstr "Legjobbra értékelt könyvek"
 
-#: cps/templates/index.xml:38 cps/web.py:496
+#: cps/templates/index.xml:38 cps/web.py:494
 msgid "Random Books"
 msgstr "Könyvek találomra"
 
-#: cps/web.py:522
+#: cps/web.py:520
 msgid "Books"
 msgstr ""
 
-#: cps/web.py:549
+#: cps/web.py:547
 msgid "Hot Books (most downloaded)"
 msgstr "Kelendő könyvek (legtöbbet letöltöttek)"
 
-#: cps/web.py:560 cps/web.py:1300 cps/web.py:1388
+#: cps/web.py:558 cps/web.py:1304 cps/web.py:1392
 msgid "Error opening eBook. File does not exist or file 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:573
+#: cps/web.py:571
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:585
+#: cps/web.py:583
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Kiadó: %(name)s"
 
-#: cps/web.py:596
+#: cps/web.py:594
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Sorozat: %(serie)s"
 
-#: cps/web.py:607
+#: cps/web.py:605
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:618
+#: cps/web.py:616
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:630
+#: cps/web.py:628
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Címke: %(name)s"
 
-#: cps/web.py:647
+#: cps/web.py:645
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Nyelv: %(name)s"
 
-#: cps/web.py:679
+#: cps/web.py:677
 msgid "Publisher list"
 msgstr "Kiadók listája"
 
-#: cps/templates/index.xml:82 cps/web.py:695
+#: cps/templates/index.xml:82 cps/web.py:693
 msgid "Series list"
 msgstr "Sorozatok listája"
 
-#: cps/web.py:709
+#: cps/web.py:707
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:722
+#: cps/web.py:720
 msgid "File formats list"
 msgstr ""
 
-#: cps/web.py:750
+#: cps/web.py:748
 msgid "Available languages"
 msgstr "Elérhető nyelvek"
 
-#: cps/templates/index.xml:75 cps/web.py:767
+#: cps/templates/index.xml:75 cps/web.py:765
 msgid "Category list"
 msgstr "Címkék listája"
 
-#: cps/templates/layout.html:73 cps/web.py:781
+#: cps/templates/layout.html:73 cps/web.py:779
 msgid "Tasks"
 msgstr "Feladatok"
 
-#: cps/web.py:846
+#: cps/web.py:850
 msgid "Published after "
 msgstr "Kiadva ezután: "
 
-#: cps/web.py:853
+#: cps/web.py:857
 msgid "Published before "
 msgstr "Kiadva ezelőtt: "
 
-#: cps/web.py:867
+#: cps/web.py:871
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Értékelés <= %(rating)s"
 
-#: cps/web.py:869
+#: cps/web.py:873
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Értékelés <= %(rating)s"
 
-#: cps/web.py:929 cps/web.py:939
+#: cps/web.py:933 cps/web.py:943
 msgid "search"
 msgstr "keresés"
 
-#: cps/web.py:1022
+#: cps/web.py:1026
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Először be kell állítani az SMTP levelező beállításokat..."
 
-#: cps/web.py:1027
+#: cps/web.py:1031
 #, 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:1031
+#: cps/web.py:1035
 #, python-format
 msgid "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:1051 cps/web.py:1076 cps/web.py:1080 cps/web.py:1085
-#: cps/web.py:1089
+#: cps/web.py:1055 cps/web.py:1080 cps/web.py:1084 cps/web.py:1089
+#: cps/web.py:1093
 msgid "register"
 msgstr "regisztrálás"
 
-#: cps/web.py:1078
+#: cps/web.py:1082
 msgid "Your e-mail is not allowed to register"
 msgstr "Nem engedélyezett a megadott e-mail cím bejegyzése"
 
-#: cps/web.py:1081
+#: cps/web.py:1085
 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:1084
+#: cps/web.py:1088
 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:1099
+#: cps/web.py:1103
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1108 cps/web.py:1214
+#: cps/web.py:1112 cps/web.py:1218
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Be vagy jelentkezve mint: %(nickname)s"
 
-#: cps/web.py:1112
+#: cps/web.py:1116
 msgid "Could not login. LDAP server down, please contact your administrator"
 msgstr ""
 
-#: cps/web.py:1116 cps/web.py:1124
+#: cps/web.py:1120 cps/web.py:1128
 msgid "Wrong Username or Password"
 msgstr "Rossz felhasználó név vagy jelszó!"
 
-#: cps/web.py:1120
+#: cps/web.py:1124
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1128 cps/web.py:1150
+#: cps/web.py:1132 cps/web.py:1154
 msgid "login"
 msgstr "belépés"
 
-#: cps/web.py:1162 cps/web.py:1193
+#: cps/web.py:1166 cps/web.py:1197
 msgid "Token not found"
 msgstr "A token nem található."
 
-#: cps/web.py:1170 cps/web.py:1201
+#: cps/web.py:1174 cps/web.py:1205
 msgid "Token has expired"
 msgstr "A token érvényessége lejárt."
 
-#: cps/web.py:1178
+#: cps/web.py:1182
 msgid "Success! Please return to your device"
 msgstr "Sikerült! Újra használható az eszköz."
 
-#: cps/web.py:1255 cps/web.py:1282 cps/web.py:1286
+#: cps/web.py:1259 cps/web.py:1286 cps/web.py:1290
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s profilja"
 
-#: cps/web.py:1284
+#: cps/web.py:1288
 msgid "Profile updated"
 msgstr "A profil frissítve."
 
-#: cps/web.py:1310 cps/web.py:1312 cps/web.py:1314 cps/web.py:1320
-#: cps/web.py:1324
+#: cps/web.py:1314 cps/web.py:1316 cps/web.py:1318 cps/web.py:1324
+#: cps/web.py:1328
 msgid "Read a Book"
 msgstr "Egy olvasott könyv"
 
-#: cps/web.py:1334
+#: cps/web.py:1338
 msgid "Error opening eBook. File does not exist or file is not accessible."
 msgstr ""
 
@@ -1056,7 +1058,7 @@ msgstr "OK"
 #: cps/templates/config_edit.html:321 cps/templates/config_view_edit.html:147
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:74
 #: cps/templates/layout.html:28 cps/templates/shelf.html:73
-#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:12
+#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:32
 #: cps/templates/user_edit.html:132
 msgid "Back"
 msgstr "Vissza"
@@ -2054,7 +2056,7 @@ msgstr "Polc törlése"
 msgid "Edit Shelf"
 msgstr "Polc szerkesztése"
 
-#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:11
+#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:31
 msgid "Change order"
 msgstr "Sorrend változtatása"
 
diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po
index 881301d7..5d5c9219 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: 2019-09-06 19:03+0200\n"
+"POT-Creation-Date: 2019-11-16 07:24+0100\n"
 "PO-Revision-Date: 2017-04-04 15:09+0200\n"
 "Last-Translator: Marco Picone <marcovendere@gmail.com>\n"
 "Language: it\n"
@@ -17,17 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.7.0\n"
 
-#: cps/about.py:40 cps/about.py:65 cps/about.py:66 cps/uploader.py:228
+#: cps/about.py:41
 msgid "installed"
 msgstr ""
 
-#: cps/about.py:42 cps/about.py:65 cps/about.py:66 cps/uploader.py:213
-#: cps/uploader.py:214 cps/uploader.py:218 cps/uploader.py:222
-#: cps/uploader.py:226 cps/uploader.py:230
+#: cps/about.py:43
 msgid "not installed"
 msgstr "non installato"
 
-#: cps/about.py:80
+#: cps/about.py:81
 msgid "Statistics"
 msgstr "Statistica"
 
@@ -39,7 +37,7 @@ msgstr "Server riavviato, per favore ricarica la pagina"
 msgid "Performing shutdown of server, please close window"
 msgstr "Eseguo l'arresto del server, per favore chiudi la finestra."
 
-#: cps/admin.py:111 cps/updater.py:445
+#: cps/admin.py:111 cps/updater.py:446
 msgid "Unknown"
 msgstr "Sconosciuto"
 
@@ -59,7 +57,7 @@ msgstr "Aggiornamento della configurazione di Calibre-Web"
 msgid "Basic Configuration"
 msgstr "Configurazione di base"
 
-#: cps/admin.py:452 cps/web.py:1050
+#: cps/admin.py:452 cps/web.py:1054
 msgid "Please fill out all fields!"
 msgstr "Per favore compila tutti i campi!"
 
@@ -68,7 +66,7 @@ msgstr "Per favore compila tutti i campi!"
 msgid "Add new user"
 msgstr "Aggiungi un nuovo utente"
 
-#: cps/admin.py:463 cps/web.py:1253
+#: cps/admin.py:463 cps/web.py:1257
 msgid "E-mail is not from valid domain"
 msgstr "L'e-mail non proviene da un dominio valido"
 
@@ -95,7 +93,7 @@ msgstr "E-mail di test inviato con successo a %(kindlemail)s"
 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:527 cps/web.py:1033
+#: cps/admin.py:527 cps/web.py:1037
 msgid "Please configure your kindle e-mail address first..."
 msgstr "Per favore configura dapprima il tuo indirizzo e-mail di Kindle..."
 
@@ -112,7 +110,7 @@ msgstr "Utente '%(nick)s' eliminato"
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:600 cps/web.py:1279
+#: cps/admin.py:600 cps/web.py:1283
 msgid "Found an existing account for this e-mail address."
 msgstr "Ho trovato un account creato in precedenza con questo e-mail."
 
@@ -135,7 +133,7 @@ msgstr "Si è verificato un errore imprevisto."
 msgid "Password for user %(user)s reset"
 msgstr "La password dell'utente %(user)s è stata resettata"
 
-#: cps/admin.py:634 cps/web.py:1075
+#: cps/admin.py:634 cps/web.py:1079
 msgid "An unknown error occurred. Please try again later."
 msgstr "Si è verificato un errore sconosciuto: per favore riprova."
 
@@ -175,22 +173,26 @@ msgstr "Aggiornamento completato, prego premere ok e ricaricare la pagina"
 msgid "Update failed:"
 msgstr "Aggiornamento fallito:"
 
-#: cps/admin.py:687 cps/updater.py:271 cps/updater.py:456 cps/updater.py:458
+#: cps/admin.py:687 cps/updater.py:272 cps/updater.py:457 cps/updater.py:459
 msgid "HTTP Error"
 msgstr "HTTP Error"
 
-#: cps/admin.py:688 cps/updater.py:273 cps/updater.py:460
+#: cps/admin.py:688 cps/updater.py:274 cps/updater.py:461
 msgid "Connection error"
 msgstr "Errore di connessione"
 
-#: cps/admin.py:689 cps/updater.py:275 cps/updater.py:462
+#: cps/admin.py:689 cps/updater.py:276 cps/updater.py:463
 msgid "Timeout while establishing connection"
 msgstr "Tempo scaduto nello stabilire la connessione"
 
-#: cps/admin.py:690 cps/updater.py:277 cps/updater.py:464
+#: cps/admin.py:690 cps/updater.py:278 cps/updater.py:465
 msgid "General error"
 msgstr "Errore generale"
 
+#: cps/converter.py:31
+msgid "not configured"
+msgstr ""
+
 #: cps/editbooks.py:214 cps/editbooks.py:393
 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"
@@ -574,7 +576,7 @@ msgid "Show best rated books"
 msgstr "Mostra la sezione dei libri più votati"
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:67
-#: cps/web.py:971
+#: cps/web.py:975
 msgid "Read Books"
 msgstr "Libri da leggere"
 
@@ -583,7 +585,7 @@ msgid "Show read and unread"
 msgstr "Mostra letto e non letto"
 
 #: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:71
-#: cps/web.py:975
+#: cps/web.py:979
 msgid "Unread Books"
 msgstr "Libri non letti"
 
@@ -656,228 +658,228 @@ msgstr ""
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/updater.py:251 cps/updater.py:358 cps/updater.py:371
+#: cps/updater.py:252 cps/updater.py:359 cps/updater.py:372
 msgid "Unexpected data while reading update information"
 msgstr "Dati inattesi durante il processo di aggiornamento"
 
-#: cps/updater.py:258 cps/updater.py:364
+#: cps/updater.py:259 cps/updater.py:365
 msgid "No update available. You already have the latest version installed"
 msgstr "Nessun aggiornamento disponibile. Hai già installato l'ultima versione disponibile"
 
-#: cps/updater.py:284
+#: cps/updater.py:285
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "Nuovo aggiornamento disponibile. Clicca sul pulsante sottostante per aggiornare all'ultima versione."
 
-#: cps/updater.py:337
+#: cps/updater.py:338
 msgid "Could not fetch update information"
 msgstr "Impossibile recuperare informazioni di aggiornamento"
 
-#: cps/updater.py:351
+#: cps/updater.py:352
 msgid "No release information available"
 msgstr "Non sono disponibili informazioni sulla versione"
 
-#: cps/updater.py:404 cps/updater.py:413
+#: cps/updater.py:405 cps/updater.py:414
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "Nuovo aggiornamento disponibile. Clicca sul pulsante sottostante per aggiornare alla versione: %(version)s"
 
-#: cps/updater.py:423
+#: cps/updater.py:424
 msgid "Click on the button below to update to the latest stable version."
 msgstr ""
 
-#: cps/web.py:460
+#: cps/web.py:458
 msgid "Recently Added Books"
 msgstr "Libri aggiunti di recente"
 
-#: cps/web.py:488
+#: cps/web.py:486
 msgid "Best rated books"
 msgstr "I libri con le migliori valutazioni"
 
-#: cps/templates/index.xml:38 cps/web.py:496
+#: cps/templates/index.xml:38 cps/web.py:494
 msgid "Random Books"
 msgstr "Libri a caso"
 
-#: cps/web.py:522
+#: cps/web.py:520
 msgid "Books"
 msgstr ""
 
-#: cps/web.py:549
+#: cps/web.py:547
 msgid "Hot Books (most downloaded)"
 msgstr "I libri più richiesti"
 
-#: cps/web.py:560 cps/web.py:1300 cps/web.py:1388
+#: cps/web.py:558 cps/web.py:1304 cps/web.py:1392
 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/web.py:573
+#: cps/web.py:571
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:585
+#: cps/web.py:583
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Editore: %(name)s"
 
-#: cps/web.py:596
+#: cps/web.py:594
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie: %(serie)s"
 
-#: cps/web.py:607
+#: cps/web.py:605
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:618
+#: cps/web.py:616
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:630
+#: cps/web.py:628
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoria: %(name)s"
 
-#: cps/web.py:647
+#: cps/web.py:645
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Lingua: %(name)s"
 
-#: cps/web.py:679
+#: cps/web.py:677
 msgid "Publisher list"
 msgstr "Lista degli editori"
 
-#: cps/templates/index.xml:82 cps/web.py:695
+#: cps/templates/index.xml:82 cps/web.py:693
 msgid "Series list"
 msgstr "Lista delle serie"
 
-#: cps/web.py:709
+#: cps/web.py:707
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:722
+#: cps/web.py:720
 msgid "File formats list"
 msgstr ""
 
-#: cps/web.py:750
+#: cps/web.py:748
 msgid "Available languages"
 msgstr "Lingue disponibili"
 
-#: cps/templates/index.xml:75 cps/web.py:767
+#: cps/templates/index.xml:75 cps/web.py:765
 msgid "Category list"
 msgstr "Elenco categorie"
 
-#: cps/templates/layout.html:73 cps/web.py:781
+#: cps/templates/layout.html:73 cps/web.py:779
 msgid "Tasks"
 msgstr "Compito"
 
-#: cps/web.py:846
+#: cps/web.py:850
 msgid "Published after "
 msgstr "Pubblicato dopo "
 
-#: cps/web.py:853
+#: cps/web.py:857
 msgid "Published before "
 msgstr "Pubblicato prima "
 
-#: cps/web.py:867
+#: cps/web.py:871
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Valutazione <= %(rating)s"
 
-#: cps/web.py:869
+#: cps/web.py:873
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Valutazione >= %(rating)s"
 
-#: cps/web.py:929 cps/web.py:939
+#: cps/web.py:933 cps/web.py:943
 msgid "search"
 msgstr "ricerca"
 
-#: cps/web.py:1022
+#: cps/web.py:1026
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configurare dapprima le impostazioni del server SMTP..."
 
-#: cps/web.py:1027
+#: cps/web.py:1031
 #, 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:1031
+#: cps/web.py:1035
 #, python-format
 msgid "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:1051 cps/web.py:1076 cps/web.py:1080 cps/web.py:1085
-#: cps/web.py:1089
+#: cps/web.py:1055 cps/web.py:1080 cps/web.py:1084 cps/web.py:1089
+#: cps/web.py:1093
 msgid "register"
 msgstr "registra"
 
-#: cps/web.py:1078
+#: cps/web.py:1082
 msgid "Your e-mail is not allowed to register"
 msgstr "Il tuo e-mail non può essere utilizzato per la registrazione"
 
-#: cps/web.py:1081
+#: cps/web.py:1085
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Un e-mail di conferma è stato inviato al tuo indirizzo."
 
-#: cps/web.py:1084
+#: cps/web.py:1088
 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:1099
+#: cps/web.py:1103
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1108 cps/web.py:1214
+#: cps/web.py:1112 cps/web.py:1218
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "ora sei connesso come: '%(nickname)s'"
 
-#: cps/web.py:1112
+#: cps/web.py:1116
 msgid "Could not login. LDAP server down, please contact your administrator"
 msgstr ""
 
-#: cps/web.py:1116 cps/web.py:1124
+#: cps/web.py:1120 cps/web.py:1128
 msgid "Wrong Username or Password"
 msgstr "Nome utente o password errati"
 
-#: cps/web.py:1120
+#: cps/web.py:1124
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1128 cps/web.py:1150
+#: cps/web.py:1132 cps/web.py:1154
 msgid "login"
 msgstr "accedi"
 
-#: cps/web.py:1162 cps/web.py:1193
+#: cps/web.py:1166 cps/web.py:1197
 msgid "Token not found"
 msgstr "Token non trovato"
 
-#: cps/web.py:1170 cps/web.py:1201
+#: cps/web.py:1174 cps/web.py:1205
 msgid "Token has expired"
 msgstr "Il token è scaduto"
 
-#: cps/web.py:1178
+#: cps/web.py:1182
 msgid "Success! Please return to your device"
 msgstr "Successo! Torna al tuo dispositivo"
 
-#: cps/web.py:1255 cps/web.py:1282 cps/web.py:1286
+#: cps/web.py:1259 cps/web.py:1286 cps/web.py:1290
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profilo di %(name)s"
 
-#: cps/web.py:1284
+#: cps/web.py:1288
 msgid "Profile updated"
 msgstr "Profilo aggiornato"
 
-#: cps/web.py:1310 cps/web.py:1312 cps/web.py:1314 cps/web.py:1320
-#: cps/web.py:1324
+#: cps/web.py:1314 cps/web.py:1316 cps/web.py:1318 cps/web.py:1324
+#: cps/web.py:1328
 msgid "Read a Book"
 msgstr "Leggere un libro"
 
-#: cps/web.py:1334
+#: cps/web.py:1338
 msgid "Error opening eBook. File does not exist or file is not accessible."
 msgstr ""
 
@@ -1055,7 +1057,7 @@ msgstr "Ok"
 #: cps/templates/config_edit.html:321 cps/templates/config_view_edit.html:147
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:74
 #: cps/templates/layout.html:28 cps/templates/shelf.html:73
-#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:12
+#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:32
 #: cps/templates/user_edit.html:132
 msgid "Back"
 msgstr "Indietro"
@@ -2053,7 +2055,7 @@ msgstr "Cancellare questo scaffale"
 msgid "Edit Shelf"
 msgstr "Modifica scaffale"
 
-#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:11
+#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:31
 msgid "Change order"
 msgstr "Cambia ordine"
 
diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po
index d38517c3..b3e1a66b 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: 2019-09-06 19:03+0200\n"
+"POT-Creation-Date: 2019-11-16 07:24+0100\n"
 "PO-Revision-Date: 2018-02-07 02:20-0500\n"
 "Last-Translator: white <space_white@yahoo.com>\n"
 "Language: ja\n"
@@ -18,17 +18,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.7.0\n"
 
-#: cps/about.py:40 cps/about.py:65 cps/about.py:66 cps/uploader.py:228
+#: cps/about.py:41
 msgid "installed"
 msgstr ""
 
-#: cps/about.py:42 cps/about.py:65 cps/about.py:66 cps/uploader.py:213
-#: cps/uploader.py:214 cps/uploader.py:218 cps/uploader.py:222
-#: cps/uploader.py:226 cps/uploader.py:230
+#: cps/about.py:43
 msgid "not installed"
 msgstr "インストールされていません"
 
-#: cps/about.py:80
+#: cps/about.py:81
 msgid "Statistics"
 msgstr "統計"
 
@@ -40,7 +38,7 @@ msgstr "サーバを再起動しました。ページを再読み込みしてく
 msgid "Performing shutdown of server, please close window"
 msgstr "サーバをシャットダウンしています。ページを閉じてください"
 
-#: cps/admin.py:111 cps/updater.py:445
+#: cps/admin.py:111 cps/updater.py:446
 msgid "Unknown"
 msgstr "不明"
 
@@ -60,7 +58,7 @@ msgstr "Calibre-Web の設定を更新しました"
 msgid "Basic Configuration"
 msgstr "基本設定"
 
-#: cps/admin.py:452 cps/web.py:1050
+#: cps/admin.py:452 cps/web.py:1054
 msgid "Please fill out all fields!"
 msgstr "全ての項目を入力してください"
 
@@ -69,7 +67,7 @@ msgstr "全ての項目を入力してください"
 msgid "Add new user"
 msgstr "新規ユーザ追加"
 
-#: cps/admin.py:463 cps/web.py:1253
+#: cps/admin.py:463 cps/web.py:1257
 msgid "E-mail is not from valid domain"
 msgstr "このメールは有効なドメインからのものではありません"
 
@@ -96,7 +94,7 @@ msgstr "テストメールが %(kindlemail)s に送信されました"
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "テストメールを %(res)s に送信中にエラーが発生しました"
 
-#: cps/admin.py:527 cps/web.py:1033
+#: cps/admin.py:527 cps/web.py:1037
 msgid "Please configure your kindle e-mail address first..."
 msgstr "初めにKindleのメールアドレスを設定してください"
 
@@ -113,7 +111,7 @@ msgstr "ユーザ '%(nick)s' を削除しました"
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:600 cps/web.py:1279
+#: cps/admin.py:600 cps/web.py:1283
 msgid "Found an existing account for this e-mail address."
 msgstr "このメールアドレスで登録されたアカウントがあります"
 
@@ -136,7 +134,7 @@ msgstr "不明なエラーが発生しました。"
 msgid "Password for user %(user)s reset"
 msgstr "%(user)s 用のパスワードをリセット"
 
-#: cps/admin.py:634 cps/web.py:1075
+#: cps/admin.py:634 cps/web.py:1079
 msgid "An unknown error occurred. Please try again later."
 msgstr "不明なエラーが発生しました。あとで再試行してください。"
 
@@ -176,22 +174,26 @@ msgstr "アップデート完了、OKを押してページをリロードして
 msgid "Update failed:"
 msgstr "アップデート失敗:"
 
-#: cps/admin.py:687 cps/updater.py:271 cps/updater.py:456 cps/updater.py:458
+#: cps/admin.py:687 cps/updater.py:272 cps/updater.py:457 cps/updater.py:459
 msgid "HTTP Error"
 msgstr "HTTPエラー"
 
-#: cps/admin.py:688 cps/updater.py:273 cps/updater.py:460
+#: cps/admin.py:688 cps/updater.py:274 cps/updater.py:461
 msgid "Connection error"
 msgstr "接続エラー"
 
-#: cps/admin.py:689 cps/updater.py:275 cps/updater.py:462
+#: cps/admin.py:689 cps/updater.py:276 cps/updater.py:463
 msgid "Timeout while establishing connection"
 msgstr "接続を確立中にタイムアウトしました"
 
-#: cps/admin.py:690 cps/updater.py:277 cps/updater.py:464
+#: cps/admin.py:690 cps/updater.py:278 cps/updater.py:465
 msgid "General error"
 msgstr "エラー発生"
 
+#: cps/converter.py:31
+msgid "not configured"
+msgstr ""
+
 #: cps/editbooks.py:214 cps/editbooks.py:393
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "電子書籍を開けません。ファイルが存在しないかアクセスできません"
@@ -575,7 +577,7 @@ msgid "Show best rated books"
 msgstr "評価が高い本を表示"
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:67
-#: cps/web.py:971
+#: cps/web.py:975
 msgid "Read Books"
 msgstr "読んだ本"
 
@@ -584,7 +586,7 @@ msgid "Show read and unread"
 msgstr "既読の本と未読の本を表示"
 
 #: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:71
-#: cps/web.py:975
+#: cps/web.py:979
 msgid "Unread Books"
 msgstr "未読の本"
 
@@ -657,228 +659,228 @@ msgstr ""
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/updater.py:251 cps/updater.py:358 cps/updater.py:371
+#: cps/updater.py:252 cps/updater.py:359 cps/updater.py:372
 msgid "Unexpected data while reading update information"
 msgstr "アップデート情報を読み込み中に予期しないデータが見つかりました"
 
-#: cps/updater.py:258 cps/updater.py:364
+#: cps/updater.py:259 cps/updater.py:365
 msgid "No update available. You already have the latest version installed"
 msgstr "アップデートはありません。すでに最新バージョンがインストールされています"
 
-#: cps/updater.py:284
+#: cps/updater.py:285
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "アップデートが利用可能です。下のボタンをクリックして最新バージョンにアップデートしてください。"
 
-#: cps/updater.py:337
+#: cps/updater.py:338
 msgid "Could not fetch update information"
 msgstr "アップデート情報を取得できません"
 
-#: cps/updater.py:351
+#: cps/updater.py:352
 msgid "No release information available"
 msgstr "リリース情報がありません"
 
-#: cps/updater.py:404 cps/updater.py:413
+#: cps/updater.py:405 cps/updater.py:414
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "アップデートが利用可能です。下のボタンをクリックしてバージョン: %(version)s にアップデートしてください。"
 
-#: cps/updater.py:423
+#: cps/updater.py:424
 msgid "Click on the button below to update to the latest stable version."
 msgstr ""
 
-#: cps/web.py:460
+#: cps/web.py:458
 msgid "Recently Added Books"
 msgstr "最近追加された本"
 
-#: cps/web.py:488
+#: cps/web.py:486
 msgid "Best rated books"
 msgstr "高評価"
 
-#: cps/templates/index.xml:38 cps/web.py:496
+#: cps/templates/index.xml:38 cps/web.py:494
 msgid "Random Books"
 msgstr "ランダム"
 
-#: cps/web.py:522
+#: cps/web.py:520
 msgid "Books"
 msgstr ""
 
-#: cps/web.py:549
+#: cps/web.py:547
 msgid "Hot Books (most downloaded)"
 msgstr "話題(ダウンロード数順)"
 
-#: cps/web.py:560 cps/web.py:1300 cps/web.py:1388
+#: cps/web.py:558 cps/web.py:1304 cps/web.py:1392
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "電子書籍を開けません。ファイルが存在しないかアクセスできません:"
 
-#: cps/web.py:573
+#: cps/web.py:571
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:585
+#: cps/web.py:583
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "出版社: %(name)s"
 
-#: cps/web.py:596
+#: cps/web.py:594
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "シリーズ: %(serie)s"
 
-#: cps/web.py:607
+#: cps/web.py:605
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:618
+#: cps/web.py:616
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:630
+#: cps/web.py:628
 #, python-format
 msgid "Category: %(name)s"
 msgstr "カテゴリ: %(name)s"
 
-#: cps/web.py:647
+#: cps/web.py:645
 #, python-format
 msgid "Language: %(name)s"
 msgstr "言語: %(name)s"
 
-#: cps/web.py:679
+#: cps/web.py:677
 msgid "Publisher list"
 msgstr "出版社一覧"
 
-#: cps/templates/index.xml:82 cps/web.py:695
+#: cps/templates/index.xml:82 cps/web.py:693
 msgid "Series list"
 msgstr "シリーズ一覧"
 
-#: cps/web.py:709
+#: cps/web.py:707
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:722
+#: cps/web.py:720
 msgid "File formats list"
 msgstr ""
 
-#: cps/web.py:750
+#: cps/web.py:748
 msgid "Available languages"
 msgstr "言語"
 
-#: cps/templates/index.xml:75 cps/web.py:767
+#: cps/templates/index.xml:75 cps/web.py:765
 msgid "Category list"
 msgstr "カテゴリ一覧"
 
-#: cps/templates/layout.html:73 cps/web.py:781
+#: cps/templates/layout.html:73 cps/web.py:779
 msgid "Tasks"
 msgstr "タスク"
 
-#: cps/web.py:846
+#: cps/web.py:850
 msgid "Published after "
 msgstr "これ以降に出版 "
 
-#: cps/web.py:853
+#: cps/web.py:857
 msgid "Published before "
 msgstr "これ以前に出版 "
 
-#: cps/web.py:867
+#: cps/web.py:871
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "評価 <= %(rating)s"
 
-#: cps/web.py:869
+#: cps/web.py:873
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "評価 >= %(rating)s"
 
-#: cps/web.py:929 cps/web.py:939
+#: cps/web.py:933 cps/web.py:943
 msgid "search"
 msgstr "検索"
 
-#: cps/web.py:1022
+#: cps/web.py:1026
 msgid "Please configure the SMTP mail settings first..."
 msgstr "初めにSMTPメールの設定をしてください"
 
-#: cps/web.py:1027
+#: cps/web.py:1031
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "本の %(kindlemail)s への送信がキューに追加されました"
 
-#: cps/web.py:1031
+#: cps/web.py:1035
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "%(res)s を送信中にエラーが発生しました"
 
-#: cps/web.py:1051 cps/web.py:1076 cps/web.py:1080 cps/web.py:1085
-#: cps/web.py:1089
+#: cps/web.py:1055 cps/web.py:1080 cps/web.py:1084 cps/web.py:1089
+#: cps/web.py:1093
 msgid "register"
 msgstr "登録"
 
-#: cps/web.py:1078
+#: cps/web.py:1082
 msgid "Your e-mail is not allowed to register"
 msgstr "このメールアドレスは登録が許可されていません"
 
-#: cps/web.py:1081
+#: cps/web.py:1085
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "確認メールがこのメールアドレスに送信されました。"
 
-#: cps/web.py:1084
+#: cps/web.py:1088
 msgid "This username or e-mail address is already in use."
 msgstr "このユーザ名またはメールアドレスはすでに使われています。"
 
-#: cps/web.py:1099
+#: cps/web.py:1103
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1108 cps/web.py:1214
+#: cps/web.py:1112 cps/web.py:1218
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "%(nickname)s としてログイン中"
 
-#: cps/web.py:1112
+#: cps/web.py:1116
 msgid "Could not login. LDAP server down, please contact your administrator"
 msgstr ""
 
-#: cps/web.py:1116 cps/web.py:1124
+#: cps/web.py:1120 cps/web.py:1128
 msgid "Wrong Username or Password"
 msgstr "ユーザ名またはパスワードが違います"
 
-#: cps/web.py:1120
+#: cps/web.py:1124
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1128 cps/web.py:1150
+#: cps/web.py:1132 cps/web.py:1154
 msgid "login"
 msgstr "ログイン"
 
-#: cps/web.py:1162 cps/web.py:1193
+#: cps/web.py:1166 cps/web.py:1197
 msgid "Token not found"
 msgstr "トークンが見つかりません"
 
-#: cps/web.py:1170 cps/web.py:1201
+#: cps/web.py:1174 cps/web.py:1205
 msgid "Token has expired"
 msgstr "トークンが無効です"
 
-#: cps/web.py:1178
+#: cps/web.py:1182
 msgid "Success! Please return to your device"
 msgstr "成功です！端末に戻ってください"
 
-#: cps/web.py:1255 cps/web.py:1282 cps/web.py:1286
+#: cps/web.py:1259 cps/web.py:1286 cps/web.py:1290
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s のプロフィール"
 
-#: cps/web.py:1284
+#: cps/web.py:1288
 msgid "Profile updated"
 msgstr "プロフィールを更新しました"
 
-#: cps/web.py:1310 cps/web.py:1312 cps/web.py:1314 cps/web.py:1320
-#: cps/web.py:1324
+#: cps/web.py:1314 cps/web.py:1316 cps/web.py:1318 cps/web.py:1324
+#: cps/web.py:1328
 msgid "Read a Book"
 msgstr "本を読む"
 
-#: cps/web.py:1334
+#: cps/web.py:1338
 msgid "Error opening eBook. File does not exist or file is not accessible."
 msgstr ""
 
@@ -1056,7 +1058,7 @@ msgstr "はい"
 #: cps/templates/config_edit.html:321 cps/templates/config_view_edit.html:147
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:74
 #: cps/templates/layout.html:28 cps/templates/shelf.html:73
-#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:12
+#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:32
 #: cps/templates/user_edit.html:132
 msgid "Back"
 msgstr "戻る"
@@ -2054,7 +2056,7 @@ msgstr "この本棚を削除"
 msgid "Edit Shelf"
 msgstr "本棚を編集"
 
-#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:11
+#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:31
 msgid "Change order"
 msgstr "順番を変更"
 
diff --git a/cps/translations/km/LC_MESSAGES/messages.po b/cps/translations/km/LC_MESSAGES/messages.po
index 0a0f75b5..4f871e72 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: 2019-09-06 19:03+0200\n"
+"POT-Creation-Date: 2019-11-16 07:24+0100\n"
 "PO-Revision-Date: 2018-08-27 17:06+0700\n"
 "Last-Translator: \n"
 "Language: km_KH\n"
@@ -19,17 +19,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.7.0\n"
 
-#: cps/about.py:40 cps/about.py:65 cps/about.py:66 cps/uploader.py:228
+#: cps/about.py:41
 msgid "installed"
 msgstr ""
 
-#: cps/about.py:42 cps/about.py:65 cps/about.py:66 cps/uploader.py:213
-#: cps/uploader.py:214 cps/uploader.py:218 cps/uploader.py:222
-#: cps/uploader.py:226 cps/uploader.py:230
+#: cps/about.py:43
 msgid "not installed"
 msgstr "មិនបានតម្លើង"
 
-#: cps/about.py:80
+#: cps/about.py:81
 msgid "Statistics"
 msgstr "ស្ថិតិ"
 
@@ -41,7 +39,7 @@ msgstr "ម៉ាស៊ីន server បានដំណើរការម្ត
 msgid "Performing shutdown of server, please close window"
 msgstr "កំពុងបិទម៉ាស៊ីន server សូមបិទផ្ទាំងនេះ"
 
-#: cps/admin.py:111 cps/updater.py:445
+#: cps/admin.py:111 cps/updater.py:446
 msgid "Unknown"
 msgstr "មិនដឹង"
 
@@ -61,7 +59,7 @@ msgstr ""
 msgid "Basic Configuration"
 msgstr "ការកំណត់សាមញ្ញ"
 
-#: cps/admin.py:452 cps/web.py:1050
+#: cps/admin.py:452 cps/web.py:1054
 msgid "Please fill out all fields!"
 msgstr "សូមបំពេញចន្លោះទាំងអស់!"
 
@@ -70,7 +68,7 @@ msgstr "សូមបំពេញចន្លោះទាំងអស់!"
 msgid "Add new user"
 msgstr "បន្ថែមអ្នកប្រើប្រាស់ថ្មី"
 
-#: cps/admin.py:463 cps/web.py:1253
+#: cps/admin.py:463 cps/web.py:1257
 msgid "E-mail is not from valid domain"
 msgstr ""
 
@@ -97,7 +95,7 @@ msgstr ""
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:527 cps/web.py:1033
+#: cps/admin.py:527 cps/web.py:1037
 msgid "Please configure your kindle e-mail address first..."
 msgstr ""
 
@@ -114,7 +112,7 @@ msgstr "អ្នកប្រើប្រាស់ ‘%(nick)s’ ត្រូ
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:600 cps/web.py:1279
+#: cps/admin.py:600 cps/web.py:1283
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
@@ -137,7 +135,7 @@ msgstr "បញ្ហាដែលមិនដឹងបានកើតឡើង។
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:634 cps/web.py:1075
+#: cps/admin.py:634 cps/web.py:1079
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
@@ -177,22 +175,26 @@ msgstr "ការធ្វើបច្ចុប្បន្នភាពបាន
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:687 cps/updater.py:271 cps/updater.py:456 cps/updater.py:458
+#: cps/admin.py:687 cps/updater.py:272 cps/updater.py:457 cps/updater.py:459
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:688 cps/updater.py:273 cps/updater.py:460
+#: cps/admin.py:688 cps/updater.py:274 cps/updater.py:461
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:689 cps/updater.py:275 cps/updater.py:462
+#: cps/admin.py:689 cps/updater.py:276 cps/updater.py:463
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:690 cps/updater.py:277 cps/updater.py:464
+#: cps/admin.py:690 cps/updater.py:278 cps/updater.py:465
 msgid "General error"
 msgstr ""
 
+#: cps/converter.py:31
+msgid "not configured"
+msgstr ""
+
 #: cps/editbooks.py:214 cps/editbooks.py:393
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "មានបញ្ហាពេលបើកឯកសារ eBook ។ ពុំមានឯកសារ ឬឯកសារនេះមិនអាចបើកបាន"
@@ -576,7 +578,7 @@ msgid "Show best rated books"
 msgstr "បង្ហាញសៀវភៅដែលមានការវាយតម្លៃល្អជាងគេ"
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:67
-#: cps/web.py:971
+#: cps/web.py:975
 msgid "Read Books"
 msgstr "សៀវភៅដែលបានអានរួច"
 
@@ -585,7 +587,7 @@ msgid "Show read and unread"
 msgstr "បង្ហាញអានរួច និងមិនទាន់អាន"
 
 #: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:71
-#: cps/web.py:975
+#: cps/web.py:979
 msgid "Unread Books"
 msgstr "សៀវភៅដែលមិនទាន់បានអាន"
 
@@ -658,228 +660,228 @@ msgstr ""
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/updater.py:251 cps/updater.py:358 cps/updater.py:371
+#: cps/updater.py:252 cps/updater.py:359 cps/updater.py:372
 msgid "Unexpected data while reading update information"
 msgstr ""
 
-#: cps/updater.py:258 cps/updater.py:364
+#: cps/updater.py:259 cps/updater.py:365
 msgid "No update available. You already have the latest version installed"
 msgstr ""
 
-#: cps/updater.py:284
+#: cps/updater.py:285
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr ""
 
-#: cps/updater.py:337
+#: cps/updater.py:338
 msgid "Could not fetch update information"
 msgstr ""
 
-#: cps/updater.py:351
+#: cps/updater.py:352
 msgid "No release information available"
 msgstr ""
 
-#: cps/updater.py:404 cps/updater.py:413
+#: cps/updater.py:405 cps/updater.py:414
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr ""
 
-#: cps/updater.py:423
+#: cps/updater.py:424
 msgid "Click on the button below to update to the latest stable version."
 msgstr ""
 
-#: cps/web.py:460
+#: cps/web.py:458
 msgid "Recently Added Books"
 msgstr "សៀវភៅដែលទើបបានបន្ថែម"
 
-#: cps/web.py:488
+#: cps/web.py:486
 msgid "Best rated books"
 msgstr "សៀវភៅដែលត្រូវបានវាយតម្លៃល្អជាងគេ"
 
-#: cps/templates/index.xml:38 cps/web.py:496
+#: cps/templates/index.xml:38 cps/web.py:494
 msgid "Random Books"
 msgstr "សៀវភៅចៃដន្យ"
 
-#: cps/web.py:522
+#: cps/web.py:520
 msgid "Books"
 msgstr ""
 
-#: cps/web.py:549
+#: cps/web.py:547
 msgid "Hot Books (most downloaded)"
 msgstr "សៀវភៅដែលត្រូវបានទាញយកច្រើនជាងគេ"
 
-#: cps/web.py:560 cps/web.py:1300 cps/web.py:1388
+#: cps/web.py:558 cps/web.py:1304 cps/web.py:1392
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "មានបញ្ហាពេលបើកឯកសារ eBook ។ មិនមានឯកសារនេះ ឬមិនអាចបើកបាន៖"
 
-#: cps/web.py:573
+#: cps/web.py:571
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:585
+#: cps/web.py:583
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr ""
 
-#: cps/web.py:596
+#: cps/web.py:594
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "ស៊េរី៖ %(serie)s"
 
-#: cps/web.py:607
+#: cps/web.py:605
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:618
+#: cps/web.py:616
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:630
+#: cps/web.py:628
 #, python-format
 msgid "Category: %(name)s"
 msgstr "ប្រភេទ៖ %(name)s"
 
-#: cps/web.py:647
+#: cps/web.py:645
 #, python-format
 msgid "Language: %(name)s"
 msgstr "ភាសា៖ %(name)s"
 
-#: cps/web.py:679
+#: cps/web.py:677
 msgid "Publisher list"
 msgstr ""
 
-#: cps/templates/index.xml:82 cps/web.py:695
+#: cps/templates/index.xml:82 cps/web.py:693
 msgid "Series list"
 msgstr "បញ្ជីស៊េរី"
 
-#: cps/web.py:709
+#: cps/web.py:707
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:722
+#: cps/web.py:720
 msgid "File formats list"
 msgstr ""
 
-#: cps/web.py:750
+#: cps/web.py:748
 msgid "Available languages"
 msgstr "ភាសាដែលមាន"
 
-#: cps/templates/index.xml:75 cps/web.py:767
+#: cps/templates/index.xml:75 cps/web.py:765
 msgid "Category list"
 msgstr "បញ្ជីប្រភេទ"
 
-#: cps/templates/layout.html:73 cps/web.py:781
+#: cps/templates/layout.html:73 cps/web.py:779
 msgid "Tasks"
 msgstr "កិច្ចការនានា"
 
-#: cps/web.py:846
+#: cps/web.py:850
 msgid "Published after "
 msgstr "បានបោះពុម្ភក្រោយ  "
 
-#: cps/web.py:853
+#: cps/web.py:857
 msgid "Published before "
 msgstr "បានបោះពុម្ភមុន  "
 
-#: cps/web.py:867
+#: cps/web.py:871
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "ការវាយតម្លៃ <= %(rating)s"
 
-#: cps/web.py:869
+#: cps/web.py:873
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "ការវាយតម្លៃ >= %(rating)s"
 
-#: cps/web.py:929 cps/web.py:939
+#: cps/web.py:933 cps/web.py:943
 msgid "search"
 msgstr "ស្វែងរក"
 
-#: cps/web.py:1022
+#: cps/web.py:1026
 msgid "Please configure the SMTP mail settings first..."
 msgstr "សូមកំណត់អ៊ីមែល SMTP ជាមុនសិន"
 
-#: cps/web.py:1027
+#: cps/web.py:1031
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "សៀវភៅបានចូលជួរសម្រាប់ផ្ញើទៅ %(kindlemail)s ដោយជោគជ័យ"
 
-#: cps/web.py:1031
+#: cps/web.py:1035
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "មានបញ្ហានៅពេលផ្ញើសៀវភៅនេះ៖ %(res)s"
 
-#: cps/web.py:1051 cps/web.py:1076 cps/web.py:1080 cps/web.py:1085
-#: cps/web.py:1089
+#: cps/web.py:1055 cps/web.py:1080 cps/web.py:1084 cps/web.py:1089
+#: cps/web.py:1093
 msgid "register"
 msgstr "ចុះឈ្មោះ"
 
-#: cps/web.py:1078
+#: cps/web.py:1082
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1081
+#: cps/web.py:1085
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1084
+#: cps/web.py:1088
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:1099
+#: cps/web.py:1103
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1108 cps/web.py:1214
+#: cps/web.py:1112 cps/web.py:1218
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "ឥឡូវអ្នកបានចូលដោយមានឈ្មោះថា៖ ‘%(nickname)s’"
 
-#: cps/web.py:1112
+#: cps/web.py:1116
 msgid "Could not login. LDAP server down, please contact your administrator"
 msgstr ""
 
-#: cps/web.py:1116 cps/web.py:1124
+#: cps/web.py:1120 cps/web.py:1128
 msgid "Wrong Username or Password"
 msgstr "ខុសឈ្មោះអ្នកប្រើប្រាស់ ឬលេខសម្ងាត់"
 
-#: cps/web.py:1120
+#: cps/web.py:1124
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1128 cps/web.py:1150
+#: cps/web.py:1132 cps/web.py:1154
 msgid "login"
 msgstr "ចូលប្រើ"
 
-#: cps/web.py:1162 cps/web.py:1193
+#: cps/web.py:1166 cps/web.py:1197
 msgid "Token not found"
 msgstr "រកមិនឃើញវត្ថុតាង"
 
-#: cps/web.py:1170 cps/web.py:1201
+#: cps/web.py:1174 cps/web.py:1205
 msgid "Token has expired"
 msgstr "វត្ថុតាងហួសពេលកំណត់"
 
-#: cps/web.py:1178
+#: cps/web.py:1182
 msgid "Success! Please return to your device"
 msgstr "ជោគជ័យ! សូមវិលមកឧបករណ៍អ្នកវិញ"
 
-#: cps/web.py:1255 cps/web.py:1282 cps/web.py:1286
+#: cps/web.py:1259 cps/web.py:1286 cps/web.py:1290
 #, python-format
 msgid "%(name)s's profile"
 msgstr "ព័ត៌មានសង្ខេបរបស់ %(name)s"
 
-#: cps/web.py:1284
+#: cps/web.py:1288
 msgid "Profile updated"
 msgstr "ព័ត៌មានសង្ខេបបានកែប្រែ"
 
-#: cps/web.py:1310 cps/web.py:1312 cps/web.py:1314 cps/web.py:1320
-#: cps/web.py:1324
+#: cps/web.py:1314 cps/web.py:1316 cps/web.py:1318 cps/web.py:1324
+#: cps/web.py:1328
 msgid "Read a Book"
 msgstr "អានសៀវភៅ"
 
-#: cps/web.py:1334
+#: cps/web.py:1338
 msgid "Error opening eBook. File does not exist or file is not accessible."
 msgstr ""
 
@@ -1057,7 +1059,7 @@ msgstr "បាទ/ចាស"
 #: cps/templates/config_edit.html:321 cps/templates/config_view_edit.html:147
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:74
 #: cps/templates/layout.html:28 cps/templates/shelf.html:73
-#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:12
+#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:32
 #: cps/templates/user_edit.html:132
 msgid "Back"
 msgstr "មកក្រោយ"
@@ -2055,7 +2057,7 @@ msgstr "លុបធ្នើនេះ"
 msgid "Edit Shelf"
 msgstr ""
 
-#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:11
+#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:31
 msgid "Change order"
 msgstr "ប្តូរលំដាប់"
 
diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po
index f70d585f..1950a249 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: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-09-06 19:03+0200\n"
+"POT-Creation-Date: 2019-11-16 07:24+0100\n"
 "PO-Revision-Date: 2019-06-17 22:37+0200\n"
 "Last-Translator: Marcel Maas <marcel.maas@outlook.com>\n"
 "Language: nl\n"
@@ -19,17 +19,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.7.0\n"
 
-#: cps/about.py:40 cps/about.py:65 cps/about.py:66 cps/uploader.py:228
+#: cps/about.py:41
 msgid "installed"
 msgstr ""
 
-#: cps/about.py:42 cps/about.py:65 cps/about.py:66 cps/uploader.py:213
-#: cps/uploader.py:214 cps/uploader.py:218 cps/uploader.py:222
-#: cps/uploader.py:226 cps/uploader.py:230
+#: cps/about.py:43
 msgid "not installed"
 msgstr "niet geïnstalleerd"
 
-#: cps/about.py:80
+#: cps/about.py:81
 msgid "Statistics"
 msgstr "Statistieken"
 
@@ -41,7 +39,7 @@ msgstr "De server is herstart; vernieuw de pagina"
 msgid "Performing shutdown of server, please close window"
 msgstr "Bezig het stoppen van server; sluit het venster"
 
-#: cps/admin.py:111 cps/updater.py:445
+#: cps/admin.py:111 cps/updater.py:446
 msgid "Unknown"
 msgstr "Onbekend"
 
@@ -61,7 +59,7 @@ msgstr "Calibre-Web-configuratie bijgewerkt"
 msgid "Basic Configuration"
 msgstr "Basis configuratie"
 
-#: cps/admin.py:452 cps/web.py:1050
+#: cps/admin.py:452 cps/web.py:1054
 msgid "Please fill out all fields!"
 msgstr "Vul alle velden in!"
 
@@ -70,7 +68,7 @@ msgstr "Vul alle velden in!"
 msgid "Add new user"
 msgstr "Nieuwe gebruiker toevoegen"
 
-#: cps/admin.py:463 cps/web.py:1253
+#: cps/admin.py:463 cps/web.py:1257
 msgid "E-mail is not from valid domain"
 msgstr "Het e-mailadres bevat geen geldige domeinnaam"
 
@@ -97,7 +95,7 @@ msgstr "Test-e-mail verstuurd naar %(kindlemail)s"
 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:527 cps/web.py:1033
+#: cps/admin.py:527 cps/web.py:1037
 msgid "Please configure your kindle e-mail address first..."
 msgstr "Stel je kindle-e-mailadres in..."
 
@@ -114,7 +112,7 @@ msgstr "Gebruiker '%(nick)s' is verwijderd"
 msgid "No admin user remaining, can't delete user"
 msgstr "Kan laatste systeembeheerder niet verwijderen"
 
-#: cps/admin.py:600 cps/web.py:1279
+#: cps/admin.py:600 cps/web.py:1283
 msgid "Found an existing account for this e-mail address."
 msgstr "Bestaand account met dit e-mailadres aangetroffen."
 
@@ -137,7 +135,7 @@ msgstr "Er is een onbekende fout opgetreden."
 msgid "Password for user %(user)s reset"
 msgstr "Wachtwoord voor gebruiker %(user)s is hersteld"
 
-#: cps/admin.py:634 cps/web.py:1075
+#: cps/admin.py:634 cps/web.py:1079
 msgid "An unknown error occurred. Please try again later."
 msgstr "Onbekende fout opgetreden. Probeer het later nog eens."
 
@@ -177,22 +175,26 @@ msgstr "Update voltooid; klik op 'Oké' en vernieuw de pagina"
 msgid "Update failed:"
 msgstr "Update mislukt:"
 
-#: cps/admin.py:687 cps/updater.py:271 cps/updater.py:456 cps/updater.py:458
+#: cps/admin.py:687 cps/updater.py:272 cps/updater.py:457 cps/updater.py:459
 msgid "HTTP Error"
 msgstr "HTTP-fout"
 
-#: cps/admin.py:688 cps/updater.py:273 cps/updater.py:460
+#: cps/admin.py:688 cps/updater.py:274 cps/updater.py:461
 msgid "Connection error"
 msgstr "Verbindingsfout"
 
-#: cps/admin.py:689 cps/updater.py:275 cps/updater.py:462
+#: cps/admin.py:689 cps/updater.py:276 cps/updater.py:463
 msgid "Timeout while establishing connection"
 msgstr "Time-out tijdens maken van verbinding"
 
-#: cps/admin.py:690 cps/updater.py:277 cps/updater.py:464
+#: cps/admin.py:690 cps/updater.py:278 cps/updater.py:465
 msgid "General error"
 msgstr "Algemene fout"
 
+#: cps/converter.py:31
+msgid "not configured"
+msgstr ""
+
 #: cps/editbooks.py:214 cps/editbooks.py:393
 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"
@@ -576,7 +578,7 @@ msgid "Show best rated books"
 msgstr "Best beoordeelde boeken tonen"
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:67
-#: cps/web.py:971
+#: cps/web.py:975
 msgid "Read Books"
 msgstr "Gelezen boeken"
 
@@ -585,7 +587,7 @@ msgid "Show read and unread"
 msgstr "Gelezen/Ongelezen boeken tonen"
 
 #: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:71
-#: cps/web.py:975
+#: cps/web.py:979
 msgid "Unread Books"
 msgstr "Ongelezen boeken"
 
@@ -658,228 +660,228 @@ msgstr "Bestandsformaten"
 msgid "Show file formats selection"
 msgstr "Bestandsformaten tonen"
 
-#: cps/updater.py:251 cps/updater.py:358 cps/updater.py:371
+#: cps/updater.py:252 cps/updater.py:359 cps/updater.py:372
 msgid "Unexpected data while reading update information"
 msgstr "Onverwachte gegevens tijdens het uitlezen van de update-informatie"
 
-#: cps/updater.py:258 cps/updater.py:364
+#: cps/updater.py:259 cps/updater.py:365
 msgid "No update available. You already have the latest version installed"
 msgstr "Geen update beschikbaar. Je beschikt al over de nieuwste versie"
 
-#: cps/updater.py:284
+#: cps/updater.py:285
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "Er is een update beschikbaar. Klik op de knop hieronder om te updaten naar de nieuwste versie."
 
-#: cps/updater.py:337
+#: cps/updater.py:338
 msgid "Could not fetch update information"
 msgstr "De update-informatie kan niet worden opgehaald"
 
-#: cps/updater.py:351
+#: cps/updater.py:352
 msgid "No release information available"
 msgstr "Geen wijzigingslog beschikbaar"
 
-#: cps/updater.py:404 cps/updater.py:413
+#: cps/updater.py:405 cps/updater.py:414
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr "Er is een update beschikbaar. Klik op de knop hieronder om te updaten naar versie: %(version)s"
 
-#: cps/updater.py:423
+#: cps/updater.py:424
 msgid "Click on the button below to update to the latest stable version."
 msgstr "Druk op onderstaande knop om de laatste stabiele versie te installeren."
 
-#: cps/web.py:460
+#: cps/web.py:458
 msgid "Recently Added Books"
 msgstr "Recent toegevoegde boeken"
 
-#: cps/web.py:488
+#: cps/web.py:486
 msgid "Best rated books"
 msgstr "Best beoordeelde boeken"
 
-#: cps/templates/index.xml:38 cps/web.py:496
+#: cps/templates/index.xml:38 cps/web.py:494
 msgid "Random Books"
 msgstr "Willekeurige boeken"
 
-#: cps/web.py:522
+#: cps/web.py:520
 msgid "Books"
 msgstr "Boeken"
 
-#: cps/web.py:549
+#: cps/web.py:547
 msgid "Hot Books (most downloaded)"
 msgstr "Populaire boeken (meest gedownload)"
 
-#: cps/web.py:560 cps/web.py:1300 cps/web.py:1388
+#: cps/web.py:558 cps/web.py:1304 cps/web.py:1392
 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 niet toegankelijk:"
 
-#: cps/web.py:573
+#: cps/web.py:571
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Auteur: %(name)s"
 
-#: cps/web.py:585
+#: cps/web.py:583
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Uitgever: %(name)s"
 
-#: cps/web.py:596
+#: cps/web.py:594
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Reeks: %(serie)s"
 
-#: cps/web.py:607
+#: cps/web.py:605
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Beoordeling: %(rating)s sterren"
 
-#: cps/web.py:618
+#: cps/web.py:616
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Bestandsformaat: %(format)s"
 
-#: cps/web.py:630
+#: cps/web.py:628
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categorie: %(name)s"
 
-#: cps/web.py:647
+#: cps/web.py:645
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Taal: %(name)s"
 
-#: cps/web.py:679
+#: cps/web.py:677
 msgid "Publisher list"
 msgstr "Uitgeverslijst"
 
-#: cps/templates/index.xml:82 cps/web.py:695
+#: cps/templates/index.xml:82 cps/web.py:693
 msgid "Series list"
 msgstr "Boekenreeksen"
 
-#: cps/web.py:709
+#: cps/web.py:707
 msgid "Ratings list"
 msgstr "Beoordelingen"
 
-#: cps/web.py:722
+#: cps/web.py:720
 msgid "File formats list"
 msgstr "Alle bestandsformaten"
 
-#: cps/web.py:750
+#: cps/web.py:748
 msgid "Available languages"
 msgstr "Beschikbare talen"
 
-#: cps/templates/index.xml:75 cps/web.py:767
+#: cps/templates/index.xml:75 cps/web.py:765
 msgid "Category list"
 msgstr "Categorielijst"
 
-#: cps/templates/layout.html:73 cps/web.py:781
+#: cps/templates/layout.html:73 cps/web.py:779
 msgid "Tasks"
 msgstr "Taken"
 
-#: cps/web.py:846
+#: cps/web.py:850
 msgid "Published after "
 msgstr "Gepubliceerd na "
 
-#: cps/web.py:853
+#: cps/web.py:857
 msgid "Published before "
 msgstr "Gepubliceerd vóór "
 
-#: cps/web.py:867
+#: cps/web.py:871
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Beoordeling <= %(rating)s"
 
-#: cps/web.py:869
+#: cps/web.py:873
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Beoordeling >= %(rating)s"
 
-#: cps/web.py:929 cps/web.py:939
+#: cps/web.py:933 cps/web.py:943
 msgid "search"
 msgstr "zoeken"
 
-#: cps/web.py:1022
+#: cps/web.py:1026
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Stel eerst SMTP-mail in..."
 
-#: cps/web.py:1027
+#: cps/web.py:1031
 #, 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:1031
+#: cps/web.py:1035
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "Fout opgetreden bij het versturen van dit boek: %(res)s"
 
-#: cps/web.py:1051 cps/web.py:1076 cps/web.py:1080 cps/web.py:1085
-#: cps/web.py:1089
+#: cps/web.py:1055 cps/web.py:1080 cps/web.py:1084 cps/web.py:1089
+#: cps/web.py:1093
 msgid "register"
 msgstr "registreren"
 
-#: cps/web.py:1078
+#: cps/web.py:1082
 msgid "Your e-mail is not allowed to register"
 msgstr "Dit e-mailadres mag niet worden gebruikt voor registratie"
 
-#: cps/web.py:1081
+#: cps/web.py:1085
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Er is een bevestigingse-mail verstuurd naar je e-mailadres."
 
-#: cps/web.py:1084
+#: cps/web.py:1088
 msgid "This username or e-mail address is already in use."
 msgstr "Deze gebruikersnaam of e-mailadres is al in gebruik."
 
-#: cps/web.py:1099
+#: cps/web.py:1103
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1108 cps/web.py:1214
+#: cps/web.py:1112 cps/web.py:1218
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "je bent ingelogd als: '%(nickname)s'"
 
-#: cps/web.py:1112
+#: cps/web.py:1116
 msgid "Could not login. LDAP server down, please contact your administrator"
 msgstr "Kan niet inloggen, LDAP server niet bereikbaar, contacteer de beheerder"
 
-#: cps/web.py:1116 cps/web.py:1124
+#: cps/web.py:1120 cps/web.py:1128
 msgid "Wrong Username or Password"
 msgstr "Verkeerde gebruikersnaam of wachtwoord"
 
-#: cps/web.py:1120
+#: cps/web.py:1124
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Je bent ingelogd als: '%(nickname)s'"
 
-#: cps/web.py:1128 cps/web.py:1150
+#: cps/web.py:1132 cps/web.py:1154
 msgid "login"
 msgstr "inloggen"
 
-#: cps/web.py:1162 cps/web.py:1193
+#: cps/web.py:1166 cps/web.py:1197
 msgid "Token not found"
 msgstr "Toegangssleutel niet gevonden"
 
-#: cps/web.py:1170 cps/web.py:1201
+#: cps/web.py:1174 cps/web.py:1205
 msgid "Token has expired"
 msgstr "Toegangssleutel is verlopen"
 
-#: cps/web.py:1178
+#: cps/web.py:1182
 msgid "Success! Please return to your device"
 msgstr "Gelukt! Ga terug naar je apparaat"
 
-#: cps/web.py:1255 cps/web.py:1282 cps/web.py:1286
+#: cps/web.py:1259 cps/web.py:1286 cps/web.py:1290
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's profiel"
 
-#: cps/web.py:1284
+#: cps/web.py:1288
 msgid "Profile updated"
 msgstr "Profiel bijgewerkt"
 
-#: cps/web.py:1310 cps/web.py:1312 cps/web.py:1314 cps/web.py:1320
-#: cps/web.py:1324
+#: cps/web.py:1314 cps/web.py:1316 cps/web.py:1318 cps/web.py:1324
+#: cps/web.py:1328
 msgid "Read a Book"
 msgstr "Lees een boek"
 
-#: cps/web.py:1334
+#: cps/web.py:1338
 msgid "Error opening eBook. File does not exist or file is not accessible."
 msgstr ""
 
@@ -1057,7 +1059,7 @@ msgstr "Oké"
 #: cps/templates/config_edit.html:321 cps/templates/config_view_edit.html:147
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:74
 #: cps/templates/layout.html:28 cps/templates/shelf.html:73
-#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:12
+#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:32
 #: cps/templates/user_edit.html:132
 msgid "Back"
 msgstr "Annuleren"
@@ -2055,7 +2057,7 @@ msgstr "Deze boekenplank verwijderen"
 msgid "Edit Shelf"
 msgstr "Boekenplank bewerken"
 
-#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:11
+#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:31
 msgid "Change order"
 msgstr "Volgorde veranderen"
 
diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po
index b03eb306..5e68be36 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: 2019-09-06 19:03+0200\n"
+"POT-Creation-Date: 2019-11-16 07:24+0100\n"
 "PO-Revision-Date: 2019-08-18 22:06+0200\n"
 "Last-Translator: Radosław Kierznowski <radek.kierznowski@outlook.com>\n"
 "Language: pl\n"
@@ -19,17 +19,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.7.0\n"
 
-#: cps/about.py:40 cps/about.py:65 cps/about.py:66 cps/uploader.py:228
+#: cps/about.py:41
 msgid "installed"
 msgstr "zainstalowane"
 
-#: cps/about.py:42 cps/about.py:65 cps/about.py:66 cps/uploader.py:213
-#: cps/uploader.py:214 cps/uploader.py:218 cps/uploader.py:222
-#: cps/uploader.py:226 cps/uploader.py:230
+#: cps/about.py:43
 msgid "not installed"
 msgstr "nie zainstalowane"
 
-#: cps/about.py:80
+#: cps/about.py:81
 msgid "Statistics"
 msgstr "Statystyki"
 
@@ -42,7 +40,7 @@ msgid "Performing shutdown of server, please close window"
 msgstr "Wykonano wyłączenie serwera, proszę zamknąć okno"
 
 # ???
-#: cps/admin.py:111 cps/updater.py:445
+#: cps/admin.py:111 cps/updater.py:446
 msgid "Unknown"
 msgstr "Nieznany"
 
@@ -62,7 +60,7 @@ msgstr "Konfiguracja Calibre-Web została zaktualizowana"
 msgid "Basic Configuration"
 msgstr "Podstawowa konfiguracja"
 
-#: cps/admin.py:452 cps/web.py:1050
+#: cps/admin.py:452 cps/web.py:1054
 msgid "Please fill out all fields!"
 msgstr "Proszę wypełnić wszystkie pola!"
 
@@ -71,7 +69,7 @@ msgstr "Proszę wypełnić wszystkie pola!"
 msgid "Add new user"
 msgstr "Dodaj nowego użytkownika"
 
-#: cps/admin.py:463 cps/web.py:1253
+#: cps/admin.py:463 cps/web.py:1257
 msgid "E-mail is not from valid domain"
 msgstr "E-mail nie pochodzi z prawidłowej domeny"
 
@@ -98,7 +96,7 @@ msgstr "Test e-maila zakończony pomyślnie. Wysłano do %(kindlemail)s"
 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:527 cps/web.py:1033
+#: cps/admin.py:527 cps/web.py:1037
 msgid "Please configure your kindle e-mail address first..."
 msgstr "Najpierw skonfiguruj adres e-mail Kindla..."
 
@@ -115,7 +113,7 @@ msgstr "Użytkownik '%(nick)s' został usunięty"
 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:600 cps/web.py:1279
+#: cps/admin.py:600 cps/web.py:1283
 msgid "Found an existing account for this e-mail address."
 msgstr "Znaleziono istniejące konto dla tego adresu e-mail."
 
@@ -139,7 +137,7 @@ msgstr "Wystąpił nieznany błąd."
 msgid "Password for user %(user)s reset"
 msgstr "Zrestartowano hasło użytkownika %(user)s"
 
-#: cps/admin.py:634 cps/web.py:1075
+#: cps/admin.py:634 cps/web.py:1079
 msgid "An unknown error occurred. Please try again later."
 msgstr "Wystąpił nieznany błąd. Spróbuj ponownie później."
 
@@ -180,22 +178,26 @@ msgstr "Aktualizacja zakończona, proszę nacisnąć OK i odświeżyć stronę"
 msgid "Update failed:"
 msgstr "Aktualizacja nieudana:"
 
-#: cps/admin.py:687 cps/updater.py:271 cps/updater.py:456 cps/updater.py:458
+#: cps/admin.py:687 cps/updater.py:272 cps/updater.py:457 cps/updater.py:459
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:688 cps/updater.py:273 cps/updater.py:460
+#: cps/admin.py:688 cps/updater.py:274 cps/updater.py:461
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:689 cps/updater.py:275 cps/updater.py:462
+#: cps/admin.py:689 cps/updater.py:276 cps/updater.py:463
 msgid "Timeout while establishing connection"
 msgstr "Przekroczono limit czasu podczas nawiązywania połączenia"
 
-#: cps/admin.py:690 cps/updater.py:277 cps/updater.py:464
+#: cps/admin.py:690 cps/updater.py:278 cps/updater.py:465
 msgid "General error"
 msgstr ""
 
+#: cps/converter.py:31
+msgid "not configured"
+msgstr ""
+
 #: cps/editbooks.py:214 cps/editbooks.py:393
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Błąd podczas otwierania eBooka. Plik nie istnieje lub jest niedostępny"
@@ -583,7 +585,7 @@ msgid "Show best rated books"
 msgstr "Pokaż menu najlepiej ocenione książki"
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:67
-#: cps/web.py:971
+#: cps/web.py:975
 msgid "Read Books"
 msgstr "Przeczytane książki"
 
@@ -592,7 +594,7 @@ msgid "Show read and unread"
 msgstr "Pokaż menu przeczytane i nieprzeczytane"
 
 #: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:71
-#: cps/web.py:975
+#: cps/web.py:979
 msgid "Unread Books"
 msgstr "Nieprzeczytane książki"
 
@@ -665,228 +667,228 @@ msgstr "Format plików"
 msgid "Show file formats selection"
 msgstr "Pokaż menu formatu plików"
 
-#: cps/updater.py:251 cps/updater.py:358 cps/updater.py:371
+#: cps/updater.py:252 cps/updater.py:359 cps/updater.py:372
 msgid "Unexpected data while reading update information"
 msgstr ""
 
-#: cps/updater.py:258 cps/updater.py:364
+#: cps/updater.py:259 cps/updater.py:365
 msgid "No update available. You already have the latest version installed"
 msgstr ""
 
-#: cps/updater.py:284
+#: cps/updater.py:285
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr ""
 
-#: cps/updater.py:337
+#: cps/updater.py:338
 msgid "Could not fetch update information"
 msgstr ""
 
-#: cps/updater.py:351
+#: cps/updater.py:352
 msgid "No release information available"
 msgstr ""
 
-#: cps/updater.py:404 cps/updater.py:413
+#: cps/updater.py:405 cps/updater.py:414
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr ""
 
-#: cps/updater.py:423
+#: cps/updater.py:424
 msgid "Click on the button below to update to the latest stable version."
 msgstr ""
 
-#: cps/web.py:460
+#: cps/web.py:458
 msgid "Recently Added Books"
 msgstr "Ostatnio dodane książki"
 
-#: cps/web.py:488
+#: cps/web.py:486
 msgid "Best rated books"
 msgstr "Najlepiej oceniane książki"
 
-#: cps/templates/index.xml:38 cps/web.py:496
+#: cps/templates/index.xml:38 cps/web.py:494
 msgid "Random Books"
 msgstr "Losowe książki"
 
-#: cps/web.py:522
+#: cps/web.py:520
 msgid "Books"
 msgstr "Książki"
 
-#: cps/web.py:549
+#: cps/web.py:547
 msgid "Hot Books (most downloaded)"
 msgstr "Najpopularniejsze książki (najczęściej pobierane)"
 
-#: cps/web.py:560 cps/web.py:1300 cps/web.py:1388
+#: cps/web.py:558 cps/web.py:1304 cps/web.py:1392
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "Błąd otwierania e-booka. Plik nie istnieje lub plik nie jest dostępny:"
 
-#: cps/web.py:573
+#: cps/web.py:571
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autor: %(name)s"
 
-#: cps/web.py:585
+#: cps/web.py:583
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Wydawca: %(name)s"
 
-#: cps/web.py:596
+#: cps/web.py:594
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Seria: %(serie)s"
 
-#: cps/web.py:607
+#: cps/web.py:605
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr "Ocena: %(rating)s gwiazdek"
 
-#: cps/web.py:618
+#: cps/web.py:616
 #, python-format
 msgid "File format: %(format)s"
 msgstr "Format pliku: %(format)s"
 
-#: cps/web.py:630
+#: cps/web.py:628
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategoria: %(name)s"
 
-#: cps/web.py:647
+#: cps/web.py:645
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Język: %(name)s"
 
-#: cps/web.py:679
+#: cps/web.py:677
 msgid "Publisher list"
 msgstr "Lista wydawców"
 
-#: cps/templates/index.xml:82 cps/web.py:695
+#: cps/templates/index.xml:82 cps/web.py:693
 msgid "Series list"
 msgstr "Lista serii"
 
-#: cps/web.py:709
+#: cps/web.py:707
 msgid "Ratings list"
 msgstr "Lista z ocenami"
 
-#: cps/web.py:722
+#: cps/web.py:720
 msgid "File formats list"
 msgstr "Lista formatów"
 
-#: cps/web.py:750
+#: cps/web.py:748
 msgid "Available languages"
 msgstr "Dostępne języki"
 
-#: cps/templates/index.xml:75 cps/web.py:767
+#: cps/templates/index.xml:75 cps/web.py:765
 msgid "Category list"
 msgstr "Lista kategorii"
 
-#: cps/templates/layout.html:73 cps/web.py:781
+#: cps/templates/layout.html:73 cps/web.py:779
 msgid "Tasks"
 msgstr " Zadania"
 
-#: cps/web.py:846
+#: cps/web.py:850
 msgid "Published after "
 msgstr "Opublikowane po "
 
-#: cps/web.py:853
+#: cps/web.py:857
 msgid "Published before "
 msgstr "Opublikowane przed "
 
-#: cps/web.py:867
+#: cps/web.py:871
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Ocena <= %(rating)s"
 
-#: cps/web.py:869
+#: cps/web.py:873
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Ocena >= %(rating)s"
 
-#: cps/web.py:929 cps/web.py:939
+#: cps/web.py:933 cps/web.py:943
 msgid "search"
 msgstr "szukaj"
 
-#: cps/web.py:1022
+#: cps/web.py:1026
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Proszę najpierw skonfigurować ustawienia SMTP poczty e-mail..."
 
-#: cps/web.py:1027
+#: cps/web.py:1031
 #, 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:1031
+#: cps/web.py:1035
 #, python-format
 msgid "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:1051 cps/web.py:1076 cps/web.py:1080 cps/web.py:1085
-#: cps/web.py:1089
+#: cps/web.py:1055 cps/web.py:1080 cps/web.py:1084 cps/web.py:1089
+#: cps/web.py:1093
 msgid "register"
 msgstr "rejestracja"
 
-#: cps/web.py:1078
+#: cps/web.py:1082
 msgid "Your e-mail is not allowed to register"
 msgstr "Twój e-mail nie może się zarejestrować"
 
-#: cps/web.py:1081
+#: cps/web.py:1085
 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:1084
+#: cps/web.py:1088
 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:1099
+#: cps/web.py:1103
 msgid "Cannot activate LDAP authentication"
 msgstr "Nie można aktywować uwierzytelniania LDAP"
 
-#: cps/web.py:1108 cps/web.py:1214
+#: cps/web.py:1112 cps/web.py:1218
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Zalogowałeś się jako: '%(nickname)s'"
 
-#: cps/web.py:1112
+#: cps/web.py:1116
 msgid "Could not login. LDAP server down, please contact your administrator"
 msgstr "Brak możliwości zalogowania. Serwer LDAP jest niedostępny, skontaktuj się z administratorem"
 
-#: cps/web.py:1116 cps/web.py:1124
+#: cps/web.py:1120 cps/web.py:1128
 msgid "Wrong Username or Password"
 msgstr "Błędna nazwa użytkownika lub hasło"
 
-#: cps/web.py:1120
+#: cps/web.py:1124
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr "Jesteś teraz zalogowany jako: '%(nickname)s'"
 
-#: cps/web.py:1128 cps/web.py:1150
+#: cps/web.py:1132 cps/web.py:1154
 msgid "login"
 msgstr "logowanie"
 
-#: cps/web.py:1162 cps/web.py:1193
+#: cps/web.py:1166 cps/web.py:1197
 msgid "Token not found"
 msgstr "Nie znaleziono tokenu"
 
-#: cps/web.py:1170 cps/web.py:1201
+#: cps/web.py:1174 cps/web.py:1205
 msgid "Token has expired"
 msgstr "Token wygasł"
 
-#: cps/web.py:1178
+#: cps/web.py:1182
 msgid "Success! Please return to your device"
 msgstr "Powodzenie! Wróć do swojego urządzenia"
 
-#: cps/web.py:1255 cps/web.py:1282 cps/web.py:1286
+#: cps/web.py:1259 cps/web.py:1286 cps/web.py:1290
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil użytkownika %(name)s"
 
-#: cps/web.py:1284
+#: cps/web.py:1288
 msgid "Profile updated"
 msgstr "Zaktualizowano profil"
 
-#: cps/web.py:1310 cps/web.py:1312 cps/web.py:1314 cps/web.py:1320
-#: cps/web.py:1324
+#: cps/web.py:1314 cps/web.py:1316 cps/web.py:1318 cps/web.py:1324
+#: cps/web.py:1328
 msgid "Read a Book"
 msgstr "Czytaj książkę"
 
-#: cps/web.py:1334
+#: cps/web.py:1338
 msgid "Error opening eBook. File does not exist or file is not accessible."
 msgstr "Błąd podczas otwierania eBooka. Plik nie istnieje lub plik jest niedostępny."
 
@@ -1066,7 +1068,7 @@ msgstr "OK"
 #: cps/templates/config_edit.html:321 cps/templates/config_view_edit.html:147
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:74
 #: cps/templates/layout.html:28 cps/templates/shelf.html:73
-#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:12
+#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:32
 #: cps/templates/user_edit.html:132
 msgid "Back"
 msgstr "Wróć"
@@ -2075,7 +2077,7 @@ msgstr "Usuń tą półkę"
 msgid "Edit Shelf"
 msgstr "Edytuj półkę"
 
-#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:11
+#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:31
 msgid "Change order"
 msgstr "Zmień sortowanie"
 
diff --git a/cps/translations/ru/LC_MESSAGES/messages.po b/cps/translations/ru/LC_MESSAGES/messages.po
index e9d65d91..2b84a6a7 100644
--- a/cps/translations/ru/LC_MESSAGES/messages.po
+++ b/cps/translations/ru/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: 2019-09-06 19:03+0200\n"
+"POT-Creation-Date: 2019-11-16 07:24+0100\n"
 "PO-Revision-Date: 2018-12-14 16:26+0300\n"
 "Last-Translator: Pavel Korovin <p@tristero.se>\n"
 "Language: ru\n"
@@ -18,17 +18,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.7.0\n"
 
-#: cps/about.py:40 cps/about.py:65 cps/about.py:66 cps/uploader.py:228
+#: cps/about.py:41
 msgid "installed"
 msgstr ""
 
-#: cps/about.py:42 cps/about.py:65 cps/about.py:66 cps/uploader.py:213
-#: cps/uploader.py:214 cps/uploader.py:218 cps/uploader.py:222
-#: cps/uploader.py:226 cps/uploader.py:230
+#: cps/about.py:43
 msgid "not installed"
 msgstr "не установлено"
 
-#: cps/about.py:80
+#: cps/about.py:81
 msgid "Statistics"
 msgstr "Статистика"
 
@@ -40,7 +38,7 @@ msgstr "Сервер перезагружен, пожалуйста, перез
 msgid "Performing shutdown of server, please close window"
 msgstr "Производится остановка сервера, пожалуйста, закройте окно"
 
-#: cps/admin.py:111 cps/updater.py:445
+#: cps/admin.py:111 cps/updater.py:446
 msgid "Unknown"
 msgstr "Неизвестно"
 
@@ -60,7 +58,7 @@ msgstr "Конфигурация Calibre-Web обновлена"
 msgid "Basic Configuration"
 msgstr "Настройки сервера"
 
-#: cps/admin.py:452 cps/web.py:1050
+#: cps/admin.py:452 cps/web.py:1054
 msgid "Please fill out all fields!"
 msgstr "Пожалуйста, заполните все поля!"
 
@@ -69,7 +67,7 @@ msgstr "Пожалуйста, заполните все поля!"
 msgid "Add new user"
 msgstr "Добавить пользователя"
 
-#: cps/admin.py:463 cps/web.py:1253
+#: cps/admin.py:463 cps/web.py:1257
 msgid "E-mail is not from valid domain"
 msgstr "E-mail не из существующей доменной зоны"
 
@@ -96,7 +94,7 @@ msgstr "Тестовое письмо успешно отправлено на %
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Произошла ошибка при отправке тестового письма на: %(res)s"
 
-#: cps/admin.py:527 cps/web.py:1033
+#: cps/admin.py:527 cps/web.py:1037
 msgid "Please configure your kindle e-mail address first..."
 msgstr "Пожалуйста, сначала настройте e-mail на вашем kindle..."
 
@@ -113,7 +111,7 @@ msgstr "Пользователь '%(nick)s' удалён"
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:600 cps/web.py:1279
+#: cps/admin.py:600 cps/web.py:1283
 msgid "Found an existing account for this e-mail address."
 msgstr "Этот адрес электронной почты уже зарегистрирован."
 
@@ -136,7 +134,7 @@ msgstr "Произошла неизвестная ошибка."
 msgid "Password for user %(user)s reset"
 msgstr "Пароль для пользователя %(user)s сброшен"
 
-#: cps/admin.py:634 cps/web.py:1075
+#: cps/admin.py:634 cps/web.py:1079
 msgid "An unknown error occurred. Please try again later."
 msgstr "Неизвестная ошибка. Попробуйте позже."
 
@@ -176,22 +174,26 @@ msgstr "Обновления установлены, нажмите okay и пе
 msgid "Update failed:"
 msgstr "Ошибка обновления:"
 
-#: cps/admin.py:687 cps/updater.py:271 cps/updater.py:456 cps/updater.py:458
+#: cps/admin.py:687 cps/updater.py:272 cps/updater.py:457 cps/updater.py:459
 msgid "HTTP Error"
 msgstr "Ошибка HTTP"
 
-#: cps/admin.py:688 cps/updater.py:273 cps/updater.py:460
+#: cps/admin.py:688 cps/updater.py:274 cps/updater.py:461
 msgid "Connection error"
 msgstr "Ошибка соединения"
 
-#: cps/admin.py:689 cps/updater.py:275 cps/updater.py:462
+#: cps/admin.py:689 cps/updater.py:276 cps/updater.py:463
 msgid "Timeout while establishing connection"
 msgstr "Таймаут при установлении соединения"
 
-#: cps/admin.py:690 cps/updater.py:277 cps/updater.py:464
+#: cps/admin.py:690 cps/updater.py:278 cps/updater.py:465
 msgid "General error"
 msgstr "Общая ошибка"
 
+#: cps/converter.py:31
+msgid "not configured"
+msgstr ""
+
 #: cps/editbooks.py:214 cps/editbooks.py:393
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Ошибка при открытии eBook. Файл не существует или файл недоступен"
@@ -575,7 +577,7 @@ msgid "Show best rated books"
 msgstr "Показывать книги с наивысшим рейтингом"
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:67
-#: cps/web.py:971
+#: cps/web.py:975
 msgid "Read Books"
 msgstr "Прочитанные Книги"
 
@@ -584,7 +586,7 @@ msgid "Show read and unread"
 msgstr "Показывать прочитанные и непрочитанные"
 
 #: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:71
-#: cps/web.py:975
+#: cps/web.py:979
 msgid "Unread Books"
 msgstr "Непрочитанные Книги"
 
@@ -657,228 +659,228 @@ msgstr ""
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/updater.py:251 cps/updater.py:358 cps/updater.py:371
+#: cps/updater.py:252 cps/updater.py:359 cps/updater.py:372
 msgid "Unexpected data while reading update information"
 msgstr "Некорректные данные при чтении информации об обновлении"
 
-#: cps/updater.py:258 cps/updater.py:364
+#: cps/updater.py:259 cps/updater.py:365
 msgid "No update available. You already have the latest version installed"
 msgstr "Обновление недоступно. Вы используете самую последнюю версию"
 
-#: cps/updater.py:284
+#: cps/updater.py:285
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "Доступно обновление. Нажмите на кнопку, что бы обновиться до последней версии."
 
-#: cps/updater.py:337
+#: cps/updater.py:338
 msgid "Could not fetch update information"
 msgstr "Не удалось получить информацию об обновлении"
 
-#: cps/updater.py:351
+#: cps/updater.py:352
 msgid "No release information available"
 msgstr ""
 
-#: cps/updater.py:404 cps/updater.py:413
+#: cps/updater.py:405 cps/updater.py:414
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr ""
 
-#: cps/updater.py:423
+#: cps/updater.py:424
 msgid "Click on the button below to update to the latest stable version."
 msgstr ""
 
-#: cps/web.py:460
+#: cps/web.py:458
 msgid "Recently Added Books"
 msgstr "Недавно Добавленные Книги"
 
-#: cps/web.py:488
+#: cps/web.py:486
 msgid "Best rated books"
 msgstr "Книги с наивысшим рейтингом"
 
-#: cps/templates/index.xml:38 cps/web.py:496
+#: cps/templates/index.xml:38 cps/web.py:494
 msgid "Random Books"
 msgstr "Случайный выбор"
 
-#: cps/web.py:522
+#: cps/web.py:520
 msgid "Books"
 msgstr ""
 
-#: cps/web.py:549
+#: cps/web.py:547
 msgid "Hot Books (most downloaded)"
 msgstr "Популярные книги (часто загружаемые)"
 
-#: cps/web.py:560 cps/web.py:1300 cps/web.py:1388
+#: cps/web.py:558 cps/web.py:1304 cps/web.py:1392
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "Невозможно открыть книгу. Файл не существует или недоступен."
 
-#: cps/web.py:573
+#: cps/web.py:571
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:585
+#: cps/web.py:583
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Издатель: %(name)s"
 
-#: cps/web.py:596
+#: cps/web.py:594
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Серии: %(serie)s"
 
-#: cps/web.py:607
+#: cps/web.py:605
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:618
+#: cps/web.py:616
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:630
+#: cps/web.py:628
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Категория: %(name)s"
 
-#: cps/web.py:647
+#: cps/web.py:645
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Язык: %(name)s"
 
-#: cps/web.py:679
+#: cps/web.py:677
 msgid "Publisher list"
 msgstr "Список издателей"
 
-#: cps/templates/index.xml:82 cps/web.py:695
+#: cps/templates/index.xml:82 cps/web.py:693
 msgid "Series list"
 msgstr "Серии"
 
-#: cps/web.py:709
+#: cps/web.py:707
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:722
+#: cps/web.py:720
 msgid "File formats list"
 msgstr ""
 
-#: cps/web.py:750
+#: cps/web.py:748
 msgid "Available languages"
 msgstr "Доступные языки"
 
-#: cps/templates/index.xml:75 cps/web.py:767
+#: cps/templates/index.xml:75 cps/web.py:765
 msgid "Category list"
 msgstr "Категории"
 
-#: cps/templates/layout.html:73 cps/web.py:781
+#: cps/templates/layout.html:73 cps/web.py:779
 msgid "Tasks"
 msgstr "Задания"
 
-#: cps/web.py:846
+#: cps/web.py:850
 msgid "Published after "
 msgstr "Опубликовано до "
 
-#: cps/web.py:853
+#: cps/web.py:857
 msgid "Published before "
 msgstr "Опубликовано после "
 
-#: cps/web.py:867
+#: cps/web.py:871
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Рейтинг <= %(rating)s"
 
-#: cps/web.py:869
+#: cps/web.py:873
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Рейтинг >= %(rating)s"
 
-#: cps/web.py:929 cps/web.py:939
+#: cps/web.py:933 cps/web.py:943
 msgid "search"
 msgstr "поиск"
 
-#: cps/web.py:1022
+#: cps/web.py:1026
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Пожалуйста, сначала сконфигурируйте параметры SMTP"
 
-#: cps/web.py:1027
+#: cps/web.py:1031
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Книга успешно поставлена в очередь для отправки на %(kindlemail)s"
 
-#: cps/web.py:1031
+#: cps/web.py:1035
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "Ошибка при отправке книги: %(res)s"
 
-#: cps/web.py:1051 cps/web.py:1076 cps/web.py:1080 cps/web.py:1085
-#: cps/web.py:1089
+#: cps/web.py:1055 cps/web.py:1080 cps/web.py:1084 cps/web.py:1089
+#: cps/web.py:1093
 msgid "register"
 msgstr "регистрация"
 
-#: cps/web.py:1078
+#: cps/web.py:1082
 msgid "Your e-mail is not allowed to register"
 msgstr "Ваш e-mail не подходит для регистрации"
 
-#: cps/web.py:1081
+#: cps/web.py:1085
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Письмо с подтверждением отправлено вам на e-mail"
 
-#: cps/web.py:1084
+#: cps/web.py:1088
 msgid "This username or e-mail address is already in use."
 msgstr "Этот никнейм или e-mail уже используются"
 
-#: cps/web.py:1099
+#: cps/web.py:1103
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1108 cps/web.py:1214
+#: cps/web.py:1112 cps/web.py:1218
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Вы вошли как пользователь '%(nickname)s'"
 
-#: cps/web.py:1112
+#: cps/web.py:1116
 msgid "Could not login. LDAP server down, please contact your administrator"
 msgstr ""
 
-#: cps/web.py:1116 cps/web.py:1124
+#: cps/web.py:1120 cps/web.py:1128
 msgid "Wrong Username or Password"
 msgstr "Ошибка в имени пользователя или пароле"
 
-#: cps/web.py:1120
+#: cps/web.py:1124
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1128 cps/web.py:1150
+#: cps/web.py:1132 cps/web.py:1154
 msgid "login"
 msgstr "войти"
 
-#: cps/web.py:1162 cps/web.py:1193
+#: cps/web.py:1166 cps/web.py:1197
 msgid "Token not found"
 msgstr "Ключ не найден"
 
-#: cps/web.py:1170 cps/web.py:1201
+#: cps/web.py:1174 cps/web.py:1205
 msgid "Token has expired"
 msgstr "Ключ просрочен"
 
-#: cps/web.py:1178
+#: cps/web.py:1182
 msgid "Success! Please return to your device"
 msgstr "Успешно! Пожалуйста, проверьте свое устройство"
 
-#: cps/web.py:1255 cps/web.py:1282 cps/web.py:1286
+#: cps/web.py:1259 cps/web.py:1286 cps/web.py:1290
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Профиль %(name)s"
 
-#: cps/web.py:1284
+#: cps/web.py:1288
 msgid "Profile updated"
 msgstr "Профиль обновлён"
 
-#: cps/web.py:1310 cps/web.py:1312 cps/web.py:1314 cps/web.py:1320
-#: cps/web.py:1324
+#: cps/web.py:1314 cps/web.py:1316 cps/web.py:1318 cps/web.py:1324
+#: cps/web.py:1328
 msgid "Read a Book"
 msgstr "Читать Книгу"
 
-#: cps/web.py:1334
+#: cps/web.py:1338
 msgid "Error opening eBook. File does not exist or file is not accessible."
 msgstr ""
 
@@ -1056,7 +1058,7 @@ msgstr "Ok"
 #: cps/templates/config_edit.html:321 cps/templates/config_view_edit.html:147
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:74
 #: cps/templates/layout.html:28 cps/templates/shelf.html:73
-#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:12
+#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:32
 #: cps/templates/user_edit.html:132
 msgid "Back"
 msgstr "Назад"
@@ -2054,7 +2056,7 @@ msgstr "Удалить эту книжную полку"
 msgid "Edit Shelf"
 msgstr "Изменить Полку"
 
-#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:11
+#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:31
 msgid "Change order"
 msgstr "Изменить порядок"
 
diff --git a/cps/translations/sv/LC_MESSAGES/messages.mo b/cps/translations/sv/LC_MESSAGES/messages.mo
index 87446858..8fe2b886 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 7f266448..c3f5f79b 100644
--- a/cps/translations/sv/LC_MESSAGES/messages.po
+++ b/cps/translations/sv/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: 2019-09-06 19:03+0200\n"
-"PO-Revision-Date: 2018-11-23 02:57+0100\n"
+"POT-Creation-Date: 2019-11-16 07:24+0100\n"
+"PO-Revision-Date: 2019-11-14 18:50+0100\n"
 "Last-Translator: Jonatan Nyberg <jonatan.nyberg.karl@gmail.com>\n"
 "Language: sv\n"
 "Language-Team: \n"
@@ -18,17 +18,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.7.0\n"
 
-#: cps/about.py:40 cps/about.py:65 cps/about.py:66 cps/uploader.py:228
+#: cps/about.py:41
 msgid "installed"
-msgstr ""
+msgstr "installerad"
 
-#: cps/about.py:42 cps/about.py:65 cps/about.py:66 cps/uploader.py:213
-#: cps/uploader.py:214 cps/uploader.py:218 cps/uploader.py:222
-#: cps/uploader.py:226 cps/uploader.py:230
+#: cps/about.py:43
 msgid "not installed"
 msgstr "inte installerad"
 
-#: cps/about.py:80
+#: cps/about.py:81
 msgid "Statistics"
 msgstr "Statistik"
 
@@ -40,7 +38,7 @@ msgstr "Server startas om, vänligen uppdatera sidan"
 msgid "Performing shutdown of server, please close window"
 msgstr "Stänger servern, vänligen stäng fönstret"
 
-#: cps/admin.py:111 cps/updater.py:445
+#: cps/admin.py:111 cps/updater.py:446
 msgid "Unknown"
 msgstr "Okänd"
 
@@ -60,7 +58,7 @@ msgstr "Calibre-Web konfiguration uppdaterad"
 msgid "Basic Configuration"
 msgstr "Grundläggande konfiguration"
 
-#: cps/admin.py:452 cps/web.py:1050
+#: cps/admin.py:452 cps/web.py:1054
 msgid "Please fill out all fields!"
 msgstr "Fyll i alla fält!"
 
@@ -69,7 +67,7 @@ msgstr "Fyll i alla fält!"
 msgid "Add new user"
 msgstr "Lägg till ny användare"
 
-#: cps/admin.py:463 cps/web.py:1253
+#: cps/admin.py:463 cps/web.py:1257
 msgid "E-mail is not from valid domain"
 msgstr "E-posten är inte från giltig domän"
 
@@ -96,7 +94,7 @@ msgstr "Test-e-post skicka till %(kindlemail)s"
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Det gick inte att skicka Testmeddelandet: %(res)s"
 
-#: cps/admin.py:527 cps/web.py:1033
+#: cps/admin.py:527 cps/web.py:1037
 msgid "Please configure your kindle e-mail address first..."
 msgstr "Konfigurera din kindle-e-postadress först..."
 
@@ -111,9 +109,9 @@ msgstr "Användaren '%(nick)s' borttagen"
 
 #: cps/admin.py:561
 msgid "No admin user remaining, can't delete user"
-msgstr ""
+msgstr "Ingen adminstratörsanvändare kvar, kan inte ta bort användaren"
 
-#: cps/admin.py:600 cps/web.py:1279
+#: cps/admin.py:600 cps/web.py:1283
 msgid "Found an existing account for this e-mail address."
 msgstr "Hittade ett befintligt konto för den här e-postadressen."
 
@@ -136,13 +134,13 @@ msgstr "Ett okänt fel uppstod."
 msgid "Password for user %(user)s reset"
 msgstr "Lösenord för användaren %(user)s återställd"
 
-#: cps/admin.py:634 cps/web.py:1075
+#: cps/admin.py:634 cps/web.py:1079
 msgid "An unknown error occurred. Please try again later."
 msgstr "Ett okänt fel uppstod. Försök igen senare."
 
 #: cps/admin.py:645
 msgid "Logfile viewer"
-msgstr ""
+msgstr "Visaren för lggfiler"
 
 #: cps/admin.py:680
 msgid "Requesting update package"
@@ -176,22 +174,26 @@ msgstr "Uppdatering klar, tryck på okej och uppdatera sidan"
 msgid "Update failed:"
 msgstr "Uppdateringen misslyckades:"
 
-#: cps/admin.py:687 cps/updater.py:271 cps/updater.py:456 cps/updater.py:458
+#: cps/admin.py:687 cps/updater.py:272 cps/updater.py:457 cps/updater.py:459
 msgid "HTTP Error"
 msgstr "HTTP-fel"
 
-#: cps/admin.py:688 cps/updater.py:273 cps/updater.py:460
+#: cps/admin.py:688 cps/updater.py:274 cps/updater.py:461
 msgid "Connection error"
 msgstr "Anslutningsfel"
 
-#: cps/admin.py:689 cps/updater.py:275 cps/updater.py:462
+#: cps/admin.py:689 cps/updater.py:276 cps/updater.py:463
 msgid "Timeout while establishing connection"
 msgstr "Tiden ute när du etablerade anslutning"
 
-#: cps/admin.py:690 cps/updater.py:277 cps/updater.py:464
+#: cps/admin.py:690 cps/updater.py:278 cps/updater.py:465
 msgid "General error"
 msgstr "Allmänt fel"
 
+#: cps/converter.py:31
+msgid "not configured"
+msgstr ""
+
 #: cps/editbooks.py:214 cps/editbooks.py:393
 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"
@@ -226,7 +228,7 @@ msgstr "Filformatet %(ext)s lades till %(book)s"
 
 #: cps/editbooks.py:373
 msgid "Cover is not a supported imageformat (jpg/png/webp), can't save"
-msgstr ""
+msgstr "Omslaget är inte ett bildformat som stöds (jpg/png/webp), kan inte spara"
 
 #: cps/editbooks.py:406 cps/editbooks.py:415
 msgid "unknown"
@@ -234,7 +236,7 @@ msgstr "okänd"
 
 #: cps/editbooks.py:447
 msgid "Cover is not a jpg file, can't save"
-msgstr ""
+msgstr "Omslaget är inte en jpg-fil, kan inte spara"
 
 #: cps/editbooks.py:490
 #, python-format
@@ -262,7 +264,7 @@ msgstr "Det gick inte att ta bort filen %(file)s (behörighet nekad)."
 #: cps/editbooks.py:668
 #, python-format
 msgid "File %(file)s uploaded"
-msgstr ""
+msgstr "Filen %(file)s uppladdad"
 
 #: cps/editbooks.py:697
 msgid "Source or destination format for conversion missing"
@@ -280,7 +282,7 @@ msgstr "Det gick inte att konvertera den här boken: %(res)s"
 
 #: cps/gdrive.py:61
 msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
-msgstr ""
+msgstr "Installationen av Google Drive är inte klar, försök att inaktivera och aktivera Google Drive igen"
 
 #: cps/gdrive.py:103
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
@@ -331,12 +333,12 @@ msgstr "Registrera e-post för användare: %(name)s"
 #: cps/helper.py:162 cps/helper.py:164
 #, python-format
 msgid "Send %(format)s to Kindle"
-msgstr ""
+msgstr "Skicka %(format)s till Kindle"
 
 #: cps/helper.py:168
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
-msgstr ""
+msgstr "Konvertera %(orig)s till %(format)s och skicka till Kindle"
 
 #: cps/helper.py:208
 #, python-format
@@ -360,7 +362,7 @@ msgstr "Byt namn på författare från: \"%(src)s\" till \"%(dest)s\" misslyckad
 #: cps/helper.py:341
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr ""
+msgstr "Byt namn på fil i sökvägen '%(src)s' till '%(dest)s' misslyckades med fel:% (error) s"
 
 #: cps/helper.py:367 cps/helper.py:377 cps/helper.py:385
 #, python-format
@@ -411,46 +413,46 @@ msgstr "Okänd uppgift: "
 #: cps/oauth_bb.py:75
 #, python-format
 msgid "Register with %(provider)s"
-msgstr ""
+msgstr "Registrera dig med %(provider)s"
 
 #: cps/oauth_bb.py:155
 msgid "Failed to log in with GitHub."
-msgstr ""
+msgstr "Det gick inte att logga in med GitHub."
 
 #: cps/oauth_bb.py:160
 msgid "Failed to fetch user info from GitHub."
-msgstr ""
+msgstr "Det gick inte att hämta användarinformation från GitHub."
 
 #: cps/oauth_bb.py:171
 msgid "Failed to log in with Google."
-msgstr ""
+msgstr "Det gick inte att logga in med Google."
 
 #: cps/oauth_bb.py:176
 msgid "Failed to fetch user info from Google."
-msgstr ""
+msgstr "Det gick inte att hämta användarinformation från Google."
 
 #: cps/oauth_bb.py:274
 #, python-format
 msgid "Unlink to %(oauth)s success."
-msgstr ""
+msgstr "Koppla bort till %(oauth)s lyckades."
 
 #: cps/oauth_bb.py:278
 #, python-format
 msgid "Unlink to %(oauth)s failed."
-msgstr ""
+msgstr "Koppla bort till %(oauth)s misslyckades."
 
 #: cps/oauth_bb.py:281
 #, python-format
 msgid "Not linked to %(oauth)s."
-msgstr ""
+msgstr "Inte kopplat till %(oauth) s."
 
 #: cps/oauth_bb.py:309
 msgid "GitHub Oauth error, please retry later."
-msgstr ""
+msgstr "GitHub Oauth-fel, försök igen senare."
 
 #: cps/oauth_bb.py:328
 msgid "Google Oauth error, please retry later."
-msgstr ""
+msgstr "Google Oauth-fel, försök igen senare."
 
 #: cps/shelf.py:46 cps/shelf.py:98
 msgid "Invalid shelf specified"
@@ -459,7 +461,7 @@ msgstr "Ogiltig hylla specificerad"
 #: cps/shelf.py:53
 #, python-format
 msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
-msgstr ""
+msgstr "Tyvärr får du inte lägga till en bok på hyllan: %(shelfname)s"
 
 #: cps/shelf.py:61
 msgid "You are not allowed to edit public shelves"
@@ -575,7 +577,7 @@ msgid "Show best rated books"
 msgstr "Visa böcker med bästa betyg"
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:67
-#: cps/web.py:971
+#: cps/web.py:975
 msgid "Read Books"
 msgstr "Lästa böcker"
 
@@ -584,13 +586,13 @@ msgid "Show read and unread"
 msgstr "Visa lästa och olästa"
 
 #: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:71
-#: cps/web.py:975
+#: cps/web.py:979
 msgid "Unread Books"
 msgstr "Olästa böcker"
 
 #: cps/ub.py:73
 msgid "Show unread"
-msgstr ""
+msgstr "Visa olästa"
 
 #: cps/ub.py:74
 msgid "Discover"
@@ -643,244 +645,244 @@ msgstr "Visa språkval"
 
 #: cps/ub.py:94
 msgid "Ratings"
-msgstr ""
+msgstr "Betyg"
 
 #: cps/ub.py:96
 msgid "Show ratings selection"
-msgstr ""
+msgstr "Visa val av betyg"
 
 #: cps/ub.py:97
 msgid "File formats"
-msgstr ""
+msgstr "Filformat"
 
 #: cps/ub.py:99
 msgid "Show file formats selection"
-msgstr ""
+msgstr "Visa val av filformat"
 
-#: cps/updater.py:251 cps/updater.py:358 cps/updater.py:371
+#: cps/updater.py:252 cps/updater.py:359 cps/updater.py:372
 msgid "Unexpected data while reading update information"
 msgstr "Oväntade data vid läsning av uppdateringsinformation"
 
-#: cps/updater.py:258 cps/updater.py:364
+#: cps/updater.py:259 cps/updater.py:365
 msgid "No update available. You already have the latest version installed"
 msgstr "Ingen uppdatering tillgänglig. Du har redan den senaste versionen installerad"
 
-#: cps/updater.py:284
+#: cps/updater.py:285
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "En ny uppdatering är tillgänglig. Klicka på knappen nedan för att uppdatera till den senaste versionen."
 
-#: cps/updater.py:337
+#: cps/updater.py:338
 msgid "Could not fetch update information"
 msgstr "Kunde inte hämta uppdateringsinformation"
 
-#: cps/updater.py:351
+#: cps/updater.py:352
 msgid "No release information available"
-msgstr ""
+msgstr "Ingen versionsinformation tillgänglig"
 
-#: cps/updater.py:404 cps/updater.py:413
+#: cps/updater.py:405 cps/updater.py:414
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
-msgstr ""
+msgstr "En ny uppdatering är tillgänglig. Klicka på knappen nedan för att uppdatera till version: %(version)s"
 
-#: cps/updater.py:423
+#: cps/updater.py:424
 msgid "Click on the button below to update to the latest stable version."
-msgstr ""
+msgstr "Klicka på knappen nedan för att uppdatera till den senaste stabila versionen."
 
-#: cps/web.py:460
+#: cps/web.py:458
 msgid "Recently Added Books"
 msgstr "Nyligen tillagda böcker"
 
-#: cps/web.py:488
+#: cps/web.py:486
 msgid "Best rated books"
 msgstr "Bäst rankade böcker"
 
-#: cps/templates/index.xml:38 cps/web.py:496
+#: cps/templates/index.xml:38 cps/web.py:494
 msgid "Random Books"
 msgstr "Slumpmässiga böcker"
 
-#: cps/web.py:522
+#: cps/web.py:520
 msgid "Books"
-msgstr ""
+msgstr "Böcker"
 
-#: cps/web.py:549
+#: cps/web.py:547
 msgid "Hot Books (most downloaded)"
 msgstr "Heta böcker (mest hämtade)"
 
-#: cps/web.py:560 cps/web.py:1300 cps/web.py:1388
+#: cps/web.py:558 cps/web.py:1304 cps/web.py:1392
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "Fel vid öppnande av e-bok. Filen finns inte eller filen är inte tillgänglig:"
 
-#: cps/web.py:573
+#: cps/web.py:571
 #, python-format
 msgid "Author: %(name)s"
-msgstr ""
+msgstr "Författare: %(name)s"
 
-#: cps/web.py:585
+#: cps/web.py:583
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Förlag: %(name)s"
 
-#: cps/web.py:596
+#: cps/web.py:594
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serier: %(serie)s"
 
-#: cps/web.py:607
+#: cps/web.py:605
 #, python-format
 msgid "Rating: %(rating)s stars"
-msgstr ""
+msgstr "Betyg: %(rating)s stars"
 
-#: cps/web.py:618
+#: cps/web.py:616
 #, python-format
 msgid "File format: %(format)s"
-msgstr ""
+msgstr "Filformat: %(format)s"
 
-#: cps/web.py:630
+#: cps/web.py:628
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategori: %(name)s"
 
-#: cps/web.py:647
+#: cps/web.py:645
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Språk: %(name)s"
 
-#: cps/web.py:679
+#: cps/web.py:677
 msgid "Publisher list"
 msgstr "Lista över förlag"
 
-#: cps/templates/index.xml:82 cps/web.py:695
+#: cps/templates/index.xml:82 cps/web.py:693
 msgid "Series list"
 msgstr "Serielista"
 
-#: cps/web.py:709
+#: cps/web.py:707
 msgid "Ratings list"
-msgstr ""
+msgstr "Betygslista"
 
-#: cps/web.py:722
+#: cps/web.py:720
 msgid "File formats list"
-msgstr ""
+msgstr "Lista över filformat"
 
-#: cps/web.py:750
+#: cps/web.py:748
 msgid "Available languages"
 msgstr "Tillgängliga språk"
 
-#: cps/templates/index.xml:75 cps/web.py:767
+#: cps/templates/index.xml:75 cps/web.py:765
 msgid "Category list"
 msgstr "Kategorilista"
 
-#: cps/templates/layout.html:73 cps/web.py:781
+#: cps/templates/layout.html:73 cps/web.py:779
 msgid "Tasks"
 msgstr "Uppgifter"
 
-#: cps/web.py:846
+#: cps/web.py:850
 msgid "Published after "
 msgstr "Publicerad efter "
 
-#: cps/web.py:853
+#: cps/web.py:857
 msgid "Published before "
 msgstr "Publicerad före "
 
-#: cps/web.py:867
+#: cps/web.py:871
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Betyg <= %(rating)s"
 
-#: cps/web.py:869
+#: cps/web.py:873
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Betyg >= %(rating)s"
 
-#: cps/web.py:929 cps/web.py:939
+#: cps/web.py:933 cps/web.py:943
 msgid "search"
 msgstr "sök"
 
-#: cps/web.py:1022
+#: cps/web.py:1026
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Konfigurera SMTP-postinställningarna först..."
 
-#: cps/web.py:1027
+#: cps/web.py:1031
 #, 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:1031
+#: cps/web.py:1035
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "Det gick inte att skicka den här boken: %(res)s"
 
-#: cps/web.py:1051 cps/web.py:1076 cps/web.py:1080 cps/web.py:1085
-#: cps/web.py:1089
+#: cps/web.py:1055 cps/web.py:1080 cps/web.py:1084 cps/web.py:1089
+#: cps/web.py:1093
 msgid "register"
 msgstr "registrera"
 
-#: cps/web.py:1078
+#: cps/web.py:1082
 msgid "Your e-mail is not allowed to register"
 msgstr "Din e-post är inte tillåten att registrera"
 
-#: cps/web.py:1081
+#: cps/web.py:1085
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Bekräftelsemail skickades till ditt e-postkonto."
 
-#: cps/web.py:1084
+#: cps/web.py:1088
 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:1099
+#: cps/web.py:1103
 msgid "Cannot activate LDAP authentication"
-msgstr ""
+msgstr "Det går inte att aktivera LDAP-autentisering"
 
-#: cps/web.py:1108 cps/web.py:1214
+#: cps/web.py:1112 cps/web.py:1218
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "du är nu inloggad som: \"%(nickname)s\""
 
-#: cps/web.py:1112
+#: cps/web.py:1116
 msgid "Could not login. LDAP server down, please contact your administrator"
-msgstr ""
+msgstr "Det gick inte att logga in. LDAP-servern är nere, kontakta din administratör"
 
-#: cps/web.py:1116 cps/web.py:1124
+#: cps/web.py:1120 cps/web.py:1128
 msgid "Wrong Username or Password"
 msgstr "Fel användarnamn eller lösenord"
 
-#: cps/web.py:1120
+#: cps/web.py:1124
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
-msgstr ""
+msgstr "Du är nu inloggad som: \"%(nickname)s\""
 
-#: cps/web.py:1128 cps/web.py:1150
+#: cps/web.py:1132 cps/web.py:1154
 msgid "login"
 msgstr "logga in"
 
-#: cps/web.py:1162 cps/web.py:1193
+#: cps/web.py:1166 cps/web.py:1197
 msgid "Token not found"
 msgstr "Token hittades inte"
 
-#: cps/web.py:1170 cps/web.py:1201
+#: cps/web.py:1174 cps/web.py:1205
 msgid "Token has expired"
 msgstr "Token har löpt ut"
 
-#: cps/web.py:1178
+#: cps/web.py:1182
 msgid "Success! Please return to your device"
 msgstr "Lyckades! Vänligen återvänd till din enhet"
 
-#: cps/web.py:1255 cps/web.py:1282 cps/web.py:1286
+#: cps/web.py:1259 cps/web.py:1286 cps/web.py:1290
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)ss profil"
 
-#: cps/web.py:1284
+#: cps/web.py:1288
 msgid "Profile updated"
 msgstr "Profilen uppdaterad"
 
-#: cps/web.py:1310 cps/web.py:1312 cps/web.py:1314 cps/web.py:1320
-#: cps/web.py:1324
+#: cps/web.py:1314 cps/web.py:1316 cps/web.py:1318 cps/web.py:1324
+#: cps/web.py:1328
 msgid "Read a Book"
 msgstr "Läs en bok"
 
-#: cps/web.py:1334
+#: cps/web.py:1338
 msgid "Error opening eBook. File does not exist or file is not accessible."
-msgstr ""
+msgstr "Fel vid öppningen av e-boken. Filen finns inte eller filen är inte tillgänglig."
 
 #: cps/worker.py:328
 #, python-format
@@ -924,7 +926,7 @@ msgstr "Hämta"
 
 #: cps/templates/admin.html:15
 msgid "View Ebooks"
-msgstr ""
+msgstr "Visa e-böcker"
 
 #: cps/templates/admin.html:16 cps/templates/layout.html:65
 msgid "Upload"
@@ -1004,7 +1006,7 @@ msgstr "Administration"
 
 #: cps/templates/admin.html:109
 msgid "View Logfiles"
-msgstr ""
+msgstr "Visa loggfiler"
 
 #: cps/templates/admin.html:110
 msgid "Reconnect to Calibre DB"
@@ -1056,7 +1058,7 @@ msgstr "Ok"
 #: cps/templates/config_edit.html:321 cps/templates/config_view_edit.html:147
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:74
 #: cps/templates/layout.html:28 cps/templates/shelf.html:73
-#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:12
+#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:32
 #: cps/templates/user_edit.html:132
 msgid "Back"
 msgstr "Tillbaka"
@@ -1080,14 +1082,14 @@ msgstr "I biblioteket"
 #: cps/templates/author.html:34 cps/templates/list.html:14
 #: cps/templates/search.html:41
 msgid "All"
-msgstr ""
+msgstr "Alla"
 
 #: cps/templates/author.html:58 cps/templates/author.html:110
 #: cps/templates/discover.html:27 cps/templates/index.html:26
 #: cps/templates/index.html:89 cps/templates/search.html:67
 #: cps/templates/shelf.html:36
 msgid "reduce"
-msgstr ""
+msgstr "minska"
 
 #: cps/templates/author.html:94
 msgid "More by"
@@ -1272,7 +1274,7 @@ msgstr "Autentisera Google Drive"
 
 #: cps/templates/config_edit.html:41
 msgid "Please hit submit to continue with setup"
-msgstr ""
+msgstr "Klicka på skicka för att fortsätta med installationen"
 
 #: cps/templates/config_edit.html:44
 msgid "Please finish Google Drive setup after login"
@@ -1308,23 +1310,23 @@ msgstr "SSL Keyfile plats (lämna den tom för icke-SSL-servrar)"
 
 #: cps/templates/config_edit.html:99
 msgid "Update channel"
-msgstr ""
+msgstr "Uppdatera kanal"
 
 #: cps/templates/config_edit.html:101
 msgid "Stable"
-msgstr ""
+msgstr "Stabil"
 
 #: cps/templates/config_edit.html:102
 msgid "Stable (Automatic)"
-msgstr ""
+msgstr "Stabil (automatisk)"
 
 #: cps/templates/config_edit.html:103
 msgid "Nightly"
-msgstr ""
+msgstr "Ostabil"
 
 #: cps/templates/config_edit.html:104
 msgid "Nightly (Automatic)"
-msgstr ""
+msgstr "Ostabil (automatisk)"
 
 #: cps/templates/config_edit.html:115
 msgid "Logfile Configuration"
@@ -1340,11 +1342,11 @@ msgstr "Plats och namn på loggfilen (calibre-web.log för ingen post)"
 
 #: cps/templates/config_edit.html:136
 msgid "Enable Access Log"
-msgstr ""
+msgstr "Aktivera åtkomstlogg"
 
 #: cps/templates/config_edit.html:139
 msgid "Location and name of access logfile (access.log for no entry)"
-msgstr ""
+msgstr "Plats och namn på åtkomstloggfil (access.log för ingen post)"
 
 #: cps/templates/config_edit.html:150
 msgid "Feature Configuration"
@@ -1364,11 +1366,11 @@ msgstr "Aktivera offentlig registrering"
 
 #: cps/templates/config_edit.html:170
 msgid "Enable remote login (\"magic link\")"
-msgstr "Aktivera fjärrinloggning (\"magic link\")"
+msgstr "Aktivera fjärrinloggning (\"magisk länk\")"
 
 #: cps/templates/config_edit.html:175
 msgid "Use Goodreads"
-msgstr ""
+msgstr "Använd Goodreads"
 
 #: cps/templates/config_edit.html:176
 msgid "Obtain an API Key"
@@ -1384,82 +1386,82 @@ msgstr "Goodreads API-hemlighet"
 
 #: cps/templates/config_edit.html:191
 msgid "Login type"
-msgstr ""
+msgstr "Inloggningstyp"
 
 #: cps/templates/config_edit.html:193
 msgid "Use standard Authentication"
-msgstr ""
+msgstr "Använd standardautentisering"
 
 #: cps/templates/config_edit.html:195
 msgid "Use LDAP Authentication"
-msgstr ""
+msgstr "Använd LDAP-autentisering"
 
 #: cps/templates/config_edit.html:198
 msgid "Use OAuth"
-msgstr ""
+msgstr "Använd OAuth"
 
 #: cps/templates/config_edit.html:205
 msgid "LDAP Server Host Name or IP Address"
-msgstr ""
+msgstr "LDAP-serverns värdnamn eller IP-adress"
 
 #: cps/templates/config_edit.html:209
 msgid "LDAP Server Port"
-msgstr ""
+msgstr "LDAP-serverport"
 
 #: cps/templates/config_edit.html:213
 msgid "LDAP schema (ldap or ldaps)"
-msgstr ""
+msgstr "LDAP-schema (ldap eller ldaps)"
 
 #: cps/templates/config_edit.html:217
 msgid "LDAP Admin username"
-msgstr ""
+msgstr "LDAP-adminstratörsanvändarnamn"
 
 #: cps/templates/config_edit.html:221
 msgid "LDAP Admin password"
-msgstr ""
+msgstr "LDAP-adminstratörslösenord"
 
 #: cps/templates/config_edit.html:226
 msgid "LDAP Server use SSL"
-msgstr ""
+msgstr "LDAP-server använder SSL"
 
 #: cps/templates/config_edit.html:230
 msgid "LDAP Server use TLS"
-msgstr ""
+msgstr "LDAP-server använder TLS"
 
 #: cps/templates/config_edit.html:234
 msgid "LDAP Server Certificate"
-msgstr ""
+msgstr "LDAP-servercertifikat"
 
 #: cps/templates/config_edit.html:238
 msgid "LDAP SSL Certificate Path"
-msgstr ""
+msgstr "LDAP SSL-certifikatsökväg"
 
 #: cps/templates/config_edit.html:243
 msgid "LDAP Distinguished Name (DN)"
-msgstr ""
+msgstr "LDAP Distinguished Name (DN)"
 
 #: cps/templates/config_edit.html:247
 msgid "LDAP User object filter"
-msgstr ""
+msgstr "LDAP-användarobjektfilter"
 
 #: cps/templates/config_edit.html:252
 msgid "LDAP Server is OpenLDAP?"
-msgstr ""
+msgstr "LDAP-server är OpenLDAP?"
 
 #: cps/templates/config_edit.html:260
 #, python-format
 msgid "Obtain %(provider)s OAuth Credential"
-msgstr ""
+msgstr "Skaffa %(provider)s OAuth-certifikat"
 
 #: cps/templates/config_edit.html:263
 #, python-format
 msgid "%(provider)s OAuth Client Id"
-msgstr ""
+msgstr "%(provider)s OAuth-klient-id"
 
 #: cps/templates/config_edit.html:267
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
-msgstr ""
+msgstr "%(provider)s OAuth-klient-hemlighet"
 
 #: cps/templates/config_edit.html:282
 msgid "External binaries"
@@ -1508,7 +1510,7 @@ msgstr "Antal slumpmässiga böcker att visa"
 
 #: cps/templates/config_view_edit.html:31
 msgid "No. of authors to show before hiding (0=disable hiding)"
-msgstr ""
+msgstr "Antal författare att visa innan de döljs (0 = inaktivera dölja)"
 
 #: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:112
 msgid "Theme"
@@ -1528,7 +1530,7 @@ msgstr "Reguljärt uttryck för att ignorera kolumner"
 
 #: cps/templates/config_view_edit.html:46
 msgid "Link read/unread status to Calibre column"
-msgstr "Länka läst/oläst status till Calibre-kolumn"
+msgstr "Länka läst/oläst-status till Calibre-kolumn"
 
 #: cps/templates/config_view_edit.html:55
 msgid "Regular expression for title sorting"
@@ -1552,7 +1554,7 @@ msgstr "Tillåt Hämtningar"
 
 #: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:96
 msgid "Allow book viewer"
-msgstr ""
+msgstr "Tillåt bokvisare"
 
 #: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:100
 msgid "Allow Uploads"
@@ -1592,7 +1594,7 @@ msgstr "Läs i webbläsaren"
 
 #: cps/templates/detail.html:72
 msgid "Listen in browser"
-msgstr ""
+msgstr "Lyssna i webbläsaren"
 
 #: cps/templates/detail.html:117
 msgid "Book"
@@ -1608,11 +1610,11 @@ msgstr "språk"
 
 #: cps/templates/detail.html:200
 msgid "Mark As Unread"
-msgstr ""
+msgstr "Markera som oläst"
 
 #: cps/templates/detail.html:200
 msgid "Mark As Read"
-msgstr ""
+msgstr "Markera som läst"
 
 #: cps/templates/detail.html:201
 msgid "Read"
@@ -1697,7 +1699,7 @@ msgstr "Sök"
 
 #: cps/templates/http_error.html:37
 msgid "Create issue"
-msgstr ""
+msgstr "Skapa ärende"
 
 #: cps/templates/http_error.html:44
 msgid "Back to home"
@@ -1709,7 +1711,7 @@ msgstr "Upptäck (slumpmässiga böcker)"
 
 #: cps/templates/index.html:64
 msgid "Group by series"
-msgstr ""
+msgstr "Gruppera efter serie"
 
 #: cps/templates/index.xml:6
 msgid "Start"
@@ -1769,7 +1771,7 @@ msgstr "Användarens egna hyllor, endast synliga för den aktuella användaren s
 
 #: cps/templates/layout.html:28
 msgid "Home"
-msgstr ""
+msgstr "Hem"
 
 #: cps/templates/layout.html:34
 msgid "Toggle navigation"
@@ -1786,7 +1788,7 @@ msgstr "Inställningar"
 
 #: cps/templates/layout.html:78
 msgid "Account"
-msgstr ""
+msgstr "Konto"
 
 #: cps/templates/layout.html:80
 msgid "Logout"
@@ -1826,19 +1828,19 @@ msgstr "Bokdetaljer"
 
 #: cps/templates/layout.html:217
 msgid "Upload done, processing, please wait..."
-msgstr ""
+msgstr "Uppladdning klar, bearbetning, vänligen vänta ..."
 
 #: cps/templates/layout.html:220
 msgid "Error"
-msgstr ""
+msgstr "Fel"
 
 #: cps/templates/listenmp3.html:66
 msgid "Play / pause"
-msgstr ""
+msgstr "Spela / pausa"
 
 #: cps/templates/listenmp3.html:98
 msgid "volume"
-msgstr ""
+msgstr "volym"
 
 #: cps/templates/login.html:8 cps/templates/login.html:9
 #: cps/templates/register.html:7 cps/templates/user_edit.html:8
@@ -1856,15 +1858,15 @@ msgstr "Kom ihåg mig"
 
 #: cps/templates/login.html:22
 msgid "Log in with magic link"
-msgstr "Logga in med magic link"
+msgstr "Logga in med magisk länk"
 
 #: cps/templates/logviewer.html:5
 msgid "Show Calibre-Web log"
-msgstr ""
+msgstr "Visa Calibre-Web-logg"
 
 #: cps/templates/logviewer.html:8
 msgid "Show access log"
-msgstr ""
+msgstr "Visa åtkomstlogg"
 
 #: cps/templates/osd.xml:5
 msgid "Calibre-Web ebook catalog"
@@ -1960,19 +1962,19 @@ msgstr "Vertikal"
 
 #: cps/templates/readcbr.html:152
 msgid "Direction"
-msgstr ""
+msgstr "Riktning"
 
 #: cps/templates/readcbr.html:155
 msgid "Left to Right"
-msgstr ""
+msgstr "Vänster till höger"
 
 #: cps/templates/readcbr.html:156
 msgid "Right to Left"
-msgstr ""
+msgstr "Höger till vänster"
 
 #: cps/templates/readpdf.html:29
 msgid "PDF reader"
-msgstr ""
+msgstr "PDF-läsare"
 
 #: cps/templates/readtxt.html:6
 msgid "Basic txt Reader"
@@ -1996,7 +1998,7 @@ msgstr "Din e-postadress"
 
 #: cps/templates/remote_login.html:6
 msgid "Use your other device, login and visit "
-msgstr ""
+msgstr "Använd din andra enhet, logga in och besök "
 
 #: cps/templates/remote_login.html:9
 msgid "Once you do so, you will automatically get logged in on this device."
@@ -2004,7 +2006,7 @@ msgstr "När du gör det kommer du automatiskt att logga in på den här enheten
 
 #: cps/templates/remote_login.html:12
 msgid "The link will expire after 10 minutes."
-msgstr ""
+msgstr "Länken går ut efter 10 minuter."
 
 #: cps/templates/search.html:5
 msgid "No Results for:"
@@ -2054,7 +2056,7 @@ msgstr "Ta bort den här hyllan"
 msgid "Edit Shelf"
 msgstr "Redigera hyllan"
 
-#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:11
+#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:31
 msgid "Change order"
 msgstr "Ändra ordningen"
 
@@ -2096,7 +2098,7 @@ msgstr "Serier i detta bibliotek"
 
 #: cps/templates/stats.html:28
 msgid "Linked libraries"
-msgstr "Länkade bibliotek"
+msgstr "Kopplade bibliotek"
 
 #: cps/templates/stats.html:32
 msgid "Program library"
@@ -2160,15 +2162,15 @@ msgstr "Visa alla"
 
 #: cps/templates/user_edit.html:52
 msgid "OAuth Settings"
-msgstr ""
+msgstr "OAuth-inställningar"
 
 #: cps/templates/user_edit.html:54
 msgid "Link"
-msgstr ""
+msgstr "Koppla"
 
 #: cps/templates/user_edit.html:56
 msgid "Unlink"
-msgstr ""
+msgstr "Koppla bort"
 
 #: cps/templates/user_edit.html:124
 msgid "Delete this user"
diff --git a/cps/translations/uk/LC_MESSAGES/messages.po b/cps/translations/uk/LC_MESSAGES/messages.po
index 9080fcdb..a7013805 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: 2019-09-06 19:03+0200\n"
+"POT-Creation-Date: 2019-11-16 07:24+0100\n"
 "PO-Revision-Date: 2017-04-30 00:47+0300\n"
 "Last-Translator: ABIS Team <biblio.if.abis@gmail.com>\n"
 "Language: uk\n"
@@ -17,17 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.7.0\n"
 
-#: cps/about.py:40 cps/about.py:65 cps/about.py:66 cps/uploader.py:228
+#: cps/about.py:41
 msgid "installed"
 msgstr ""
 
-#: cps/about.py:42 cps/about.py:65 cps/about.py:66 cps/uploader.py:213
-#: cps/uploader.py:214 cps/uploader.py:218 cps/uploader.py:222
-#: cps/uploader.py:226 cps/uploader.py:230
+#: cps/about.py:43
 msgid "not installed"
 msgstr "не встановлено"
 
-#: cps/about.py:80
+#: cps/about.py:81
 msgid "Statistics"
 msgstr "Статистика"
 
@@ -39,7 +37,7 @@ msgstr "Сервер перезавантажено, будь-ласка, пер
 msgid "Performing shutdown of server, please close window"
 msgstr "Виконується зупинка серверу, будь-ласка, закрийте вікно"
 
-#: cps/admin.py:111 cps/updater.py:445
+#: cps/admin.py:111 cps/updater.py:446
 msgid "Unknown"
 msgstr "Невідомий"
 
@@ -59,7 +57,7 @@ msgstr ""
 msgid "Basic Configuration"
 msgstr "Настройки сервера"
 
-#: cps/admin.py:452 cps/web.py:1050
+#: cps/admin.py:452 cps/web.py:1054
 msgid "Please fill out all fields!"
 msgstr "Будь-ласка, заповніть всі поля!"
 
@@ -68,7 +66,7 @@ msgstr "Будь-ласка, заповніть всі поля!"
 msgid "Add new user"
 msgstr "Додати користувача"
 
-#: cps/admin.py:463 cps/web.py:1253
+#: cps/admin.py:463 cps/web.py:1257
 msgid "E-mail is not from valid domain"
 msgstr ""
 
@@ -95,7 +93,7 @@ msgstr ""
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:527 cps/web.py:1033
+#: cps/admin.py:527 cps/web.py:1037
 msgid "Please configure your kindle e-mail address first..."
 msgstr ""
 
@@ -112,7 +110,7 @@ msgstr "Користувача '%(nick)s' видалено"
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:600 cps/web.py:1279
+#: cps/admin.py:600 cps/web.py:1283
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
@@ -135,7 +133,7 @@ msgstr "Сталась невідома помилка"
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:634 cps/web.py:1075
+#: cps/admin.py:634 cps/web.py:1079
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
@@ -175,22 +173,26 @@ msgstr "Оновлення встановлені, натисніть ok і пе
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:687 cps/updater.py:271 cps/updater.py:456 cps/updater.py:458
+#: cps/admin.py:687 cps/updater.py:272 cps/updater.py:457 cps/updater.py:459
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:688 cps/updater.py:273 cps/updater.py:460
+#: cps/admin.py:688 cps/updater.py:274 cps/updater.py:461
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:689 cps/updater.py:275 cps/updater.py:462
+#: cps/admin.py:689 cps/updater.py:276 cps/updater.py:463
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:690 cps/updater.py:277 cps/updater.py:464
+#: cps/admin.py:690 cps/updater.py:278 cps/updater.py:465
 msgid "General error"
 msgstr ""
 
+#: cps/converter.py:31
+msgid "not configured"
+msgstr ""
+
 #: cps/editbooks.py:214 cps/editbooks.py:393
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Сталась помилка при відкриванні eBook. Файл не існує або відсутній доступ до нього"
@@ -574,7 +576,7 @@ msgid "Show best rated books"
 msgstr "Показувати книги з найвищим рейтингом"
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:67
-#: cps/web.py:971
+#: cps/web.py:975
 msgid "Read Books"
 msgstr "Прочитані книги"
 
@@ -583,7 +585,7 @@ msgid "Show read and unread"
 msgstr "Показувати прочитані та непрочитані книги"
 
 #: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:71
-#: cps/web.py:975
+#: cps/web.py:979
 msgid "Unread Books"
 msgstr "Непрочитані книги"
 
@@ -656,228 +658,228 @@ msgstr ""
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/updater.py:251 cps/updater.py:358 cps/updater.py:371
+#: cps/updater.py:252 cps/updater.py:359 cps/updater.py:372
 msgid "Unexpected data while reading update information"
 msgstr ""
 
-#: cps/updater.py:258 cps/updater.py:364
+#: cps/updater.py:259 cps/updater.py:365
 msgid "No update available. You already have the latest version installed"
 msgstr ""
 
-#: cps/updater.py:284
+#: cps/updater.py:285
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr ""
 
-#: cps/updater.py:337
+#: cps/updater.py:338
 msgid "Could not fetch update information"
 msgstr ""
 
-#: cps/updater.py:351
+#: cps/updater.py:352
 msgid "No release information available"
 msgstr ""
 
-#: cps/updater.py:404 cps/updater.py:413
+#: cps/updater.py:405 cps/updater.py:414
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr ""
 
-#: cps/updater.py:423
+#: cps/updater.py:424
 msgid "Click on the button below to update to the latest stable version."
 msgstr ""
 
-#: cps/web.py:460
+#: cps/web.py:458
 msgid "Recently Added Books"
 msgstr "Нещодавно додані книги"
 
-#: cps/web.py:488
+#: cps/web.py:486
 msgid "Best rated books"
 msgstr "Книги з найкращим рейтингом"
 
-#: cps/templates/index.xml:38 cps/web.py:496
+#: cps/templates/index.xml:38 cps/web.py:494
 msgid "Random Books"
 msgstr "Випадковий список книг"
 
-#: cps/web.py:522
+#: cps/web.py:520
 msgid "Books"
 msgstr ""
 
-#: cps/web.py:549
+#: cps/web.py:547
 msgid "Hot Books (most downloaded)"
 msgstr "Популярні книги (найбільш завантажувані)"
 
-#: cps/web.py:560 cps/web.py:1300 cps/web.py:1388
+#: cps/web.py:558 cps/web.py:1304 cps/web.py:1392
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "Неможливо відкрити книгу. Файл не існує або немає доступу."
 
-#: cps/web.py:573
+#: cps/web.py:571
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:585
+#: cps/web.py:583
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr ""
 
-#: cps/web.py:596
+#: cps/web.py:594
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Серії: %(serie)s"
 
-#: cps/web.py:607
+#: cps/web.py:605
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:618
+#: cps/web.py:616
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:630
+#: cps/web.py:628
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Категорія: %(name)s"
 
-#: cps/web.py:647
+#: cps/web.py:645
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Мова: %(name)s"
 
-#: cps/web.py:679
+#: cps/web.py:677
 msgid "Publisher list"
 msgstr ""
 
-#: cps/templates/index.xml:82 cps/web.py:695
+#: cps/templates/index.xml:82 cps/web.py:693
 msgid "Series list"
 msgstr "Список серій"
 
-#: cps/web.py:709
+#: cps/web.py:707
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:722
+#: cps/web.py:720
 msgid "File formats list"
 msgstr ""
 
-#: cps/web.py:750
+#: cps/web.py:748
 msgid "Available languages"
 msgstr "Доступні мови"
 
-#: cps/templates/index.xml:75 cps/web.py:767
+#: cps/templates/index.xml:75 cps/web.py:765
 msgid "Category list"
 msgstr "Список категорій"
 
-#: cps/templates/layout.html:73 cps/web.py:781
+#: cps/templates/layout.html:73 cps/web.py:779
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:846
+#: cps/web.py:850
 msgid "Published after "
 msgstr ""
 
-#: cps/web.py:853
+#: cps/web.py:857
 msgid "Published before "
 msgstr "Опубліковано до"
 
-#: cps/web.py:867
+#: cps/web.py:871
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr ""
 
-#: cps/web.py:869
+#: cps/web.py:873
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr ""
 
-#: cps/web.py:929 cps/web.py:939
+#: cps/web.py:933 cps/web.py:943
 msgid "search"
 msgstr "пошук"
 
-#: cps/web.py:1022
+#: cps/web.py:1026
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Будь-ласка, спочатку сконфігуруйте параметри SMTP"
 
-#: cps/web.py:1027
+#: cps/web.py:1031
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1031
+#: cps/web.py:1035
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "Помилка при відправці книги: %(res)s"
 
-#: cps/web.py:1051 cps/web.py:1076 cps/web.py:1080 cps/web.py:1085
-#: cps/web.py:1089
+#: cps/web.py:1055 cps/web.py:1080 cps/web.py:1084 cps/web.py:1089
+#: cps/web.py:1093
 msgid "register"
 msgstr "зареєструватись"
 
-#: cps/web.py:1078
+#: cps/web.py:1082
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1081
+#: cps/web.py:1085
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1084
+#: cps/web.py:1088
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:1099
+#: cps/web.py:1103
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1108 cps/web.py:1214
+#: cps/web.py:1112 cps/web.py:1218
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Ви увійшли як користувач: '%(nickname)s'"
 
-#: cps/web.py:1112
+#: cps/web.py:1116
 msgid "Could not login. LDAP server down, please contact your administrator"
 msgstr ""
 
-#: cps/web.py:1116 cps/web.py:1124
+#: cps/web.py:1120 cps/web.py:1128
 msgid "Wrong Username or Password"
 msgstr "Помилка в імені користувача або паролі"
 
-#: cps/web.py:1120
+#: cps/web.py:1124
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1128 cps/web.py:1150
+#: cps/web.py:1132 cps/web.py:1154
 msgid "login"
 msgstr "увійти"
 
-#: cps/web.py:1162 cps/web.py:1193
+#: cps/web.py:1166 cps/web.py:1197
 msgid "Token not found"
 msgstr "Токен не знайдено"
 
-#: cps/web.py:1170 cps/web.py:1201
+#: cps/web.py:1174 cps/web.py:1205
 msgid "Token has expired"
 msgstr "Час дії токено вичерпано"
 
-#: cps/web.py:1178
+#: cps/web.py:1182
 msgid "Success! Please return to your device"
 msgstr "Вдалося! Будь-ласка, поверніться до вашого пристрою"
 
-#: cps/web.py:1255 cps/web.py:1282 cps/web.py:1286
+#: cps/web.py:1259 cps/web.py:1286 cps/web.py:1290
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Профіль %(name)s"
 
-#: cps/web.py:1284
+#: cps/web.py:1288
 msgid "Profile updated"
 msgstr "Профіль оновлено"
 
-#: cps/web.py:1310 cps/web.py:1312 cps/web.py:1314 cps/web.py:1320
-#: cps/web.py:1324
+#: cps/web.py:1314 cps/web.py:1316 cps/web.py:1318 cps/web.py:1324
+#: cps/web.py:1328
 msgid "Read a Book"
 msgstr "Читати книгу"
 
-#: cps/web.py:1334
+#: cps/web.py:1338
 msgid "Error opening eBook. File does not exist or file is not accessible."
 msgstr ""
 
@@ -1055,7 +1057,7 @@ msgstr "Ok"
 #: cps/templates/config_edit.html:321 cps/templates/config_view_edit.html:147
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:74
 #: cps/templates/layout.html:28 cps/templates/shelf.html:73
-#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:12
+#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:32
 #: cps/templates/user_edit.html:132
 msgid "Back"
 msgstr "Назад"
@@ -2053,7 +2055,7 @@ msgstr "Видалити цю книжкову полицю"
 msgid "Edit Shelf"
 msgstr ""
 
-#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:11
+#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:31
 msgid "Change order"
 msgstr "Змінити порядок"
 
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index 9c88db52..2ae78031 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: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2019-09-06 19:03+0200\n"
+"POT-Creation-Date: 2019-11-16 07:24+0100\n"
 "PO-Revision-Date: 2017-01-06 17:00+0000\n"
 "Last-Translator: dalin <dalin.lin@gmail.com>\n"
 "Language: zh_Hans_CN\n"
@@ -18,17 +18,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.7.0\n"
 
-#: cps/about.py:40 cps/about.py:65 cps/about.py:66 cps/uploader.py:228
+#: cps/about.py:41
 msgid "installed"
 msgstr ""
 
-#: cps/about.py:42 cps/about.py:65 cps/about.py:66 cps/uploader.py:213
-#: cps/uploader.py:214 cps/uploader.py:218 cps/uploader.py:222
-#: cps/uploader.py:226 cps/uploader.py:230
+#: cps/about.py:43
 msgid "not installed"
 msgstr "未安装"
 
-#: cps/about.py:80
+#: cps/about.py:81
 msgid "Statistics"
 msgstr "统计"
 
@@ -40,7 +38,7 @@ msgstr "服务器已重启，请刷新页面"
 msgid "Performing shutdown of server, please close window"
 msgstr "正在关闭服务器，请关闭窗口"
 
-#: cps/admin.py:111 cps/updater.py:445
+#: cps/admin.py:111 cps/updater.py:446
 msgid "Unknown"
 msgstr "未知"
 
@@ -60,7 +58,7 @@ msgstr "Calibre-Web配置已更新"
 msgid "Basic Configuration"
 msgstr "基本配置"
 
-#: cps/admin.py:452 cps/web.py:1050
+#: cps/admin.py:452 cps/web.py:1054
 msgid "Please fill out all fields!"
 msgstr "请填写所有字段"
 
@@ -69,7 +67,7 @@ msgstr "请填写所有字段"
 msgid "Add new user"
 msgstr "添加新用户"
 
-#: cps/admin.py:463 cps/web.py:1253
+#: cps/admin.py:463 cps/web.py:1257
 msgid "E-mail is not from valid domain"
 msgstr "邮箱不在有效域中'"
 
@@ -96,7 +94,7 @@ msgstr "测试邮件已经被成功发到 %(kindlemail)s"
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "发送测试邮件出错了: %(res)s"
 
-#: cps/admin.py:527 cps/web.py:1033
+#: cps/admin.py:527 cps/web.py:1037
 msgid "Please configure your kindle e-mail address first..."
 msgstr "请先配置您的kindle邮箱..."
 
@@ -113,7 +111,7 @@ msgstr "用户 '%(nick)s' 已被删除"
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:600 cps/web.py:1279
+#: cps/admin.py:600 cps/web.py:1283
 msgid "Found an existing account for this e-mail address."
 msgstr "找到一个已有账号使用这个邮箱。"
 
@@ -136,7 +134,7 @@ msgstr "发生未知错误。"
 msgid "Password for user %(user)s reset"
 msgstr "用户 %(user)s 的密码已重置"
 
-#: cps/admin.py:634 cps/web.py:1075
+#: cps/admin.py:634 cps/web.py:1079
 msgid "An unknown error occurred. Please try again later."
 msgstr "发生一个未知错误，请稍后再试。"
 
@@ -176,22 +174,26 @@ msgstr "更新完成，请按确定并刷新页面"
 msgid "Update failed:"
 msgstr "更新失败："
 
-#: cps/admin.py:687 cps/updater.py:271 cps/updater.py:456 cps/updater.py:458
+#: cps/admin.py:687 cps/updater.py:272 cps/updater.py:457 cps/updater.py:459
 msgid "HTTP Error"
 msgstr "HTTP错误"
 
-#: cps/admin.py:688 cps/updater.py:273 cps/updater.py:460
+#: cps/admin.py:688 cps/updater.py:274 cps/updater.py:461
 msgid "Connection error"
 msgstr "连接错误"
 
-#: cps/admin.py:689 cps/updater.py:275 cps/updater.py:462
+#: cps/admin.py:689 cps/updater.py:276 cps/updater.py:463
 msgid "Timeout while establishing connection"
 msgstr "建立连接超时"
 
-#: cps/admin.py:690 cps/updater.py:277 cps/updater.py:464
+#: cps/admin.py:690 cps/updater.py:278 cps/updater.py:465
 msgid "General error"
 msgstr "一般错误"
 
+#: cps/converter.py:31
+msgid "not configured"
+msgstr ""
+
 #: cps/editbooks.py:214 cps/editbooks.py:393
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "打开电子书出错。文件不存在或不可访问"
@@ -575,7 +577,7 @@ msgid "Show best rated books"
 msgstr "显示最高评分书籍"
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:67
-#: cps/web.py:971
+#: cps/web.py:975
 msgid "Read Books"
 msgstr "已读书籍"
 
@@ -584,7 +586,7 @@ msgid "Show read and unread"
 msgstr "显示已读和未读"
 
 #: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:71
-#: cps/web.py:975
+#: cps/web.py:979
 msgid "Unread Books"
 msgstr "未读书籍"
 
@@ -657,228 +659,228 @@ msgstr ""
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/updater.py:251 cps/updater.py:358 cps/updater.py:371
+#: cps/updater.py:252 cps/updater.py:359 cps/updater.py:372
 msgid "Unexpected data while reading update information"
 msgstr "读取更新信息时出现异常数据"
 
-#: cps/updater.py:258 cps/updater.py:364
+#: cps/updater.py:259 cps/updater.py:365
 msgid "No update available. You already have the latest version installed"
 msgstr "没有可用更新。您已经安装了最新版本"
 
-#: cps/updater.py:284
+#: cps/updater.py:285
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr "有一个更新可用。点击正文按钮更新到最新版本。"
 
-#: cps/updater.py:337
+#: cps/updater.py:338
 msgid "Could not fetch update information"
 msgstr "无法获取更新信息"
 
-#: cps/updater.py:351
+#: cps/updater.py:352
 msgid "No release information available"
 msgstr ""
 
-#: cps/updater.py:404 cps/updater.py:413
+#: cps/updater.py:405 cps/updater.py:414
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr ""
 
-#: cps/updater.py:423
+#: cps/updater.py:424
 msgid "Click on the button below to update to the latest stable version."
 msgstr ""
 
-#: cps/web.py:460
+#: cps/web.py:458
 msgid "Recently Added Books"
 msgstr "最近添加的书籍"
 
-#: cps/web.py:488
+#: cps/web.py:486
 msgid "Best rated books"
 msgstr "最高评分书籍"
 
-#: cps/templates/index.xml:38 cps/web.py:496
+#: cps/templates/index.xml:38 cps/web.py:494
 msgid "Random Books"
 msgstr "随机书籍"
 
-#: cps/web.py:522
+#: cps/web.py:520
 msgid "Books"
 msgstr ""
 
-#: cps/web.py:549
+#: cps/web.py:547
 msgid "Hot Books (most downloaded)"
 msgstr "热门书籍(最多下载)"
 
-#: cps/web.py:560 cps/web.py:1300 cps/web.py:1388
+#: cps/web.py:558 cps/web.py:1304 cps/web.py:1392
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "无法打开电子书。 文件不存在或者文件不可访问:"
 
-#: cps/web.py:573
+#: cps/web.py:571
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:585
+#: cps/web.py:583
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "出版社： %(name)s"
 
-#: cps/web.py:596
+#: cps/web.py:594
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "丛书: %(serie)s"
 
-#: cps/web.py:607
+#: cps/web.py:605
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:618
+#: cps/web.py:616
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:630
+#: cps/web.py:628
 #, python-format
 msgid "Category: %(name)s"
 msgstr "分类: %(name)s"
 
-#: cps/web.py:647
+#: cps/web.py:645
 #, python-format
 msgid "Language: %(name)s"
 msgstr "语言: %(name)s"
 
-#: cps/web.py:679
+#: cps/web.py:677
 msgid "Publisher list"
 msgstr "出版社列表"
 
-#: cps/templates/index.xml:82 cps/web.py:695
+#: cps/templates/index.xml:82 cps/web.py:693
 msgid "Series list"
 msgstr "丛书列表"
 
-#: cps/web.py:709
+#: cps/web.py:707
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:722
+#: cps/web.py:720
 msgid "File formats list"
 msgstr ""
 
-#: cps/web.py:750
+#: cps/web.py:748
 msgid "Available languages"
 msgstr "可用语言"
 
-#: cps/templates/index.xml:75 cps/web.py:767
+#: cps/templates/index.xml:75 cps/web.py:765
 msgid "Category list"
 msgstr "分类列表"
 
-#: cps/templates/layout.html:73 cps/web.py:781
+#: cps/templates/layout.html:73 cps/web.py:779
 msgid "Tasks"
 msgstr "任务"
 
-#: cps/web.py:846
+#: cps/web.py:850
 msgid "Published after "
 msgstr "出版时晚于 "
 
-#: cps/web.py:853
+#: cps/web.py:857
 msgid "Published before "
 msgstr "出版时早于 "
 
-#: cps/web.py:867
+#: cps/web.py:871
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "评分 <= %(rating)s"
 
-#: cps/web.py:869
+#: cps/web.py:873
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "评分 >= %(rating)s"
 
-#: cps/web.py:929 cps/web.py:939
+#: cps/web.py:933 cps/web.py:943
 msgid "search"
 msgstr "搜索"
 
-#: cps/web.py:1022
+#: cps/web.py:1026
 msgid "Please configure the SMTP mail settings first..."
 msgstr "请先配置SMTP邮箱..."
 
-#: cps/web.py:1027
+#: cps/web.py:1031
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "书籍已经被成功加入 %(kindlemail)s 的发送队列"
 
-#: cps/web.py:1031
+#: cps/web.py:1035
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "发送这本书的时候出现错误: %(res)s"
 
-#: cps/web.py:1051 cps/web.py:1076 cps/web.py:1080 cps/web.py:1085
-#: cps/web.py:1089
+#: cps/web.py:1055 cps/web.py:1080 cps/web.py:1084 cps/web.py:1089
+#: cps/web.py:1093
 msgid "register"
 msgstr "注册"
 
-#: cps/web.py:1078
+#: cps/web.py:1082
 msgid "Your e-mail is not allowed to register"
 msgstr "您的邮箱不能用来注册"
 
-#: cps/web.py:1081
+#: cps/web.py:1085
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "确认邮件已经发送到您的邮箱。"
 
-#: cps/web.py:1084
+#: cps/web.py:1088
 msgid "This username or e-mail address is already in use."
 msgstr "这个用户名或者邮箱已经被使用。"
 
-#: cps/web.py:1099
+#: cps/web.py:1103
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1108 cps/web.py:1214
+#: cps/web.py:1112 cps/web.py:1218
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "您现在已以'%(nickname)s'身份登录"
 
-#: cps/web.py:1112
+#: cps/web.py:1116
 msgid "Could not login. LDAP server down, please contact your administrator"
 msgstr ""
 
-#: cps/web.py:1116 cps/web.py:1124
+#: cps/web.py:1120 cps/web.py:1128
 msgid "Wrong Username or Password"
 msgstr "用户名或密码错误"
 
-#: cps/web.py:1120
+#: cps/web.py:1124
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1128 cps/web.py:1150
+#: cps/web.py:1132 cps/web.py:1154
 msgid "login"
 msgstr "登录"
 
-#: cps/web.py:1162 cps/web.py:1193
+#: cps/web.py:1166 cps/web.py:1197
 msgid "Token not found"
 msgstr "找不到Token"
 
-#: cps/web.py:1170 cps/web.py:1201
+#: cps/web.py:1174 cps/web.py:1205
 msgid "Token has expired"
 msgstr "Token已过期"
 
-#: cps/web.py:1178
+#: cps/web.py:1182
 msgid "Success! Please return to your device"
 msgstr "成功！请返回您的设备"
 
-#: cps/web.py:1255 cps/web.py:1282 cps/web.py:1286
+#: cps/web.py:1259 cps/web.py:1286 cps/web.py:1290
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 的资料"
 
-#: cps/web.py:1284
+#: cps/web.py:1288
 msgid "Profile updated"
 msgstr "资料已更新"
 
-#: cps/web.py:1310 cps/web.py:1312 cps/web.py:1314 cps/web.py:1320
-#: cps/web.py:1324
+#: cps/web.py:1314 cps/web.py:1316 cps/web.py:1318 cps/web.py:1324
+#: cps/web.py:1328
 msgid "Read a Book"
 msgstr "阅读一本书"
 
-#: cps/web.py:1334
+#: cps/web.py:1338
 msgid "Error opening eBook. File does not exist or file is not accessible."
 msgstr ""
 
@@ -1056,7 +1058,7 @@ msgstr "确定"
 #: cps/templates/config_edit.html:321 cps/templates/config_view_edit.html:147
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:74
 #: cps/templates/layout.html:28 cps/templates/shelf.html:73
-#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:12
+#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:32
 #: cps/templates/user_edit.html:132
 msgid "Back"
 msgstr "后退"
@@ -2054,7 +2056,7 @@ msgstr "删除此书架"
 msgid "Edit Shelf"
 msgstr "编辑书架"
 
-#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:11
+#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:31
 msgid "Change order"
 msgstr "修改顺序"
 
diff --git a/messages.pot b/messages.pot
index 92c37e17..f1098cac 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-09-17 18:24+0200\n"
+"POT-Creation-Date: 2019-11-16 07:24+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,17 +17,15 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.7.0\n"
 
-#: cps/about.py:40 cps/about.py:65 cps/about.py:66 cps/uploader.py:228
+#: cps/about.py:41
 msgid "installed"
 msgstr ""
 
-#: cps/about.py:42 cps/about.py:65 cps/about.py:66 cps/uploader.py:213
-#: cps/uploader.py:214 cps/uploader.py:218 cps/uploader.py:222
-#: cps/uploader.py:226 cps/uploader.py:230
+#: cps/about.py:43
 msgid "not installed"
 msgstr ""
 
-#: cps/about.py:80
+#: cps/about.py:81
 msgid "Statistics"
 msgstr ""
 
@@ -39,7 +37,7 @@ msgstr ""
 msgid "Performing shutdown of server, please close window"
 msgstr ""
 
-#: cps/admin.py:111 cps/updater.py:445
+#: cps/admin.py:111 cps/updater.py:446
 msgid "Unknown"
 msgstr ""
 
@@ -59,7 +57,7 @@ msgstr ""
 msgid "Basic Configuration"
 msgstr ""
 
-#: cps/admin.py:452 cps/web.py:1048
+#: cps/admin.py:452 cps/web.py:1054
 msgid "Please fill out all fields!"
 msgstr ""
 
@@ -68,7 +66,7 @@ msgstr ""
 msgid "Add new user"
 msgstr ""
 
-#: cps/admin.py:463 cps/web.py:1251
+#: cps/admin.py:463 cps/web.py:1257
 msgid "E-mail is not from valid domain"
 msgstr ""
 
@@ -95,7 +93,7 @@ msgstr ""
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:527 cps/web.py:1031
+#: cps/admin.py:527 cps/web.py:1037
 msgid "Please configure your kindle e-mail address first..."
 msgstr ""
 
@@ -112,7 +110,7 @@ msgstr ""
 msgid "No admin user remaining, can't delete user"
 msgstr ""
 
-#: cps/admin.py:600 cps/web.py:1277
+#: cps/admin.py:600 cps/web.py:1283
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
@@ -135,7 +133,7 @@ msgstr ""
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:634 cps/web.py:1073
+#: cps/admin.py:634 cps/web.py:1079
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
@@ -175,22 +173,26 @@ msgstr ""
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:687 cps/updater.py:271 cps/updater.py:456 cps/updater.py:458
+#: cps/admin.py:687 cps/updater.py:272 cps/updater.py:457 cps/updater.py:459
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:688 cps/updater.py:273 cps/updater.py:460
+#: cps/admin.py:688 cps/updater.py:274 cps/updater.py:461
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:689 cps/updater.py:275 cps/updater.py:462
+#: cps/admin.py:689 cps/updater.py:276 cps/updater.py:463
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:690 cps/updater.py:277 cps/updater.py:464
+#: cps/admin.py:690 cps/updater.py:278 cps/updater.py:465
 msgid "General error"
 msgstr ""
 
+#: cps/converter.py:31
+msgid "not configured"
+msgstr ""
+
 #: cps/editbooks.py:214 cps/editbooks.py:393
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr ""
@@ -574,7 +576,7 @@ msgid "Show best rated books"
 msgstr ""
 
 #: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:67
-#: cps/web.py:969
+#: cps/web.py:975
 msgid "Read Books"
 msgstr ""
 
@@ -583,7 +585,7 @@ msgid "Show read and unread"
 msgstr ""
 
 #: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:71
-#: cps/web.py:973
+#: cps/web.py:979
 msgid "Unread Books"
 msgstr ""
 
@@ -656,32 +658,32 @@ msgstr ""
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/updater.py:251 cps/updater.py:358 cps/updater.py:371
+#: cps/updater.py:252 cps/updater.py:359 cps/updater.py:372
 msgid "Unexpected data while reading update information"
 msgstr ""
 
-#: cps/updater.py:258 cps/updater.py:364
+#: cps/updater.py:259 cps/updater.py:365
 msgid "No update available. You already have the latest version installed"
 msgstr ""
 
-#: cps/updater.py:284
+#: cps/updater.py:285
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr ""
 
-#: cps/updater.py:337
+#: cps/updater.py:338
 msgid "Could not fetch update information"
 msgstr ""
 
-#: cps/updater.py:351
+#: cps/updater.py:352
 msgid "No release information available"
 msgstr ""
 
-#: cps/updater.py:404 cps/updater.py:413
+#: cps/updater.py:405 cps/updater.py:414
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr ""
 
-#: cps/updater.py:423
+#: cps/updater.py:424
 msgid "Click on the button below to update to the latest stable version."
 msgstr ""
 
@@ -705,7 +707,7 @@ msgstr ""
 msgid "Hot Books (most downloaded)"
 msgstr ""
 
-#: cps/web.py:558 cps/web.py:1298 cps/web.py:1386
+#: cps/web.py:558 cps/web.py:1304 cps/web.py:1392
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr ""
 
@@ -772,112 +774,112 @@ msgstr ""
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:844
+#: cps/web.py:850
 msgid "Published after "
 msgstr ""
 
-#: cps/web.py:851
+#: cps/web.py:857
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:865
+#: cps/web.py:871
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr ""
 
-#: cps/web.py:867
+#: cps/web.py:873
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr ""
 
-#: cps/web.py:927 cps/web.py:937
+#: cps/web.py:933 cps/web.py:943
 msgid "search"
 msgstr ""
 
-#: cps/web.py:1020
+#: cps/web.py:1026
 msgid "Please configure the SMTP mail settings first..."
 msgstr ""
 
-#: cps/web.py:1025
+#: cps/web.py:1031
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1029
+#: cps/web.py:1035
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1049 cps/web.py:1074 cps/web.py:1078 cps/web.py:1083
-#: cps/web.py:1087
+#: cps/web.py:1055 cps/web.py:1080 cps/web.py:1084 cps/web.py:1089
+#: cps/web.py:1093
 msgid "register"
 msgstr ""
 
-#: cps/web.py:1076
+#: cps/web.py:1082
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1079
+#: cps/web.py:1085
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1082
+#: cps/web.py:1088
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:1097
+#: cps/web.py:1103
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1106 cps/web.py:1212
+#: cps/web.py:1112 cps/web.py:1218
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1110
+#: cps/web.py:1116
 msgid "Could not login. LDAP server down, please contact your administrator"
 msgstr ""
 
-#: cps/web.py:1114 cps/web.py:1122
+#: cps/web.py:1120 cps/web.py:1128
 msgid "Wrong Username or Password"
 msgstr ""
 
-#: cps/web.py:1118
+#: cps/web.py:1124
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1126 cps/web.py:1148
+#: cps/web.py:1132 cps/web.py:1154
 msgid "login"
 msgstr ""
 
-#: cps/web.py:1160 cps/web.py:1191
+#: cps/web.py:1166 cps/web.py:1197
 msgid "Token not found"
 msgstr ""
 
-#: cps/web.py:1168 cps/web.py:1199
+#: cps/web.py:1174 cps/web.py:1205
 msgid "Token has expired"
 msgstr ""
 
-#: cps/web.py:1176
+#: cps/web.py:1182
 msgid "Success! Please return to your device"
 msgstr ""
 
-#: cps/web.py:1253 cps/web.py:1280 cps/web.py:1284
+#: cps/web.py:1259 cps/web.py:1286 cps/web.py:1290
 #, python-format
 msgid "%(name)s's profile"
 msgstr ""
 
-#: cps/web.py:1282
+#: cps/web.py:1288
 msgid "Profile updated"
 msgstr ""
 
-#: cps/web.py:1308 cps/web.py:1310 cps/web.py:1312 cps/web.py:1318
-#: cps/web.py:1322
+#: cps/web.py:1314 cps/web.py:1316 cps/web.py:1318 cps/web.py:1324
+#: cps/web.py:1328
 msgid "Read a Book"
 msgstr ""
 
-#: cps/web.py:1332
+#: cps/web.py:1338
 msgid "Error opening eBook. File does not exist or file is not accessible."
 msgstr ""
 
@@ -1055,7 +1057,7 @@ msgstr ""
 #: cps/templates/config_edit.html:321 cps/templates/config_view_edit.html:147
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:74
 #: cps/templates/layout.html:28 cps/templates/shelf.html:73
-#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:12
+#: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:32
 #: cps/templates/user_edit.html:132
 msgid "Back"
 msgstr ""
@@ -2053,7 +2055,7 @@ msgstr ""
 msgid "Edit Shelf"
 msgstr ""
 
-#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:11
+#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:31
 msgid "Change order"
 msgstr ""