diff --git a/cps/cli.py b/cps/cli.py
index 26741c57..bb404bde 100644
--- a/cps/cli.py
+++ b/cps/cli.py
@@ -28,6 +28,7 @@ parser.add_argument('-p', metavar='path', help='path and name to settings db, e.
 parser.add_argument('-g', metavar='path', help='path and name to gdrive db, e.g. /opt/gd.db')
 parser.add_argument('-c', metavar='path', help='path and name to SSL certfile, e.g. /opt/test.cert, works only in combination with keyfile')
 parser.add_argument('-k', metavar='path', help='path and name to SSL keyfile, e.g. /opt/test.key, works only in combination with certfile')
+parser.add_argument('-v', action='store_true', help='shows version number and exits Calibre-web')
 args = parser.parse_args()
 
 generalPath = os.path.normpath(os.getenv("CALIBRE_DBPATH",
@@ -67,3 +68,7 @@ if (args.k and not args.c) or (not args.k and args.c):
 
 if args.k is "":
     keyfilepath = ""
+
+if args.v:
+    print("Calibre-web version: 0.6.4")
+    sys.exit(1)
diff --git a/cps/translations/de/LC_MESSAGES/messages.mo b/cps/translations/de/LC_MESSAGES/messages.mo
index 7fd45ede..abd73016 100644
Binary files a/cps/translations/de/LC_MESSAGES/messages.mo and b/cps/translations/de/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/de/LC_MESSAGES/messages.po b/cps/translations/de/LC_MESSAGES/messages.po
index f70744c1..b20a0766 100644
--- a/cps/translations/de/LC_MESSAGES/messages.po
+++ b/cps/translations/de/LC_MESSAGES/messages.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2019-03-24 08:25+0100\n"
-"PO-Revision-Date: 2019-03-10 08:30+0100\n"
+"POT-Creation-Date: 2019-05-31 11:20+0200\n"
+"PO-Revision-Date: 2019-05-31 11:19+0200\n"
 "Last-Translator: Ozzie Isaacs\n"
 "Language: de\n"
 "Language-Team: \n"
@@ -30,7 +30,7 @@ msgstr "Server neu gestartet,bitte Seite neu laden"
 msgid "Performing shutdown of server, please close window"
 msgstr "Server wird runtergefahren, bitte Fenster schließen"
 
-#: cps/admin.py:120 cps/updater.py:498
+#: cps/admin.py:120 cps/updater.py:445
 msgid "Unknown"
 msgstr "Unbekannt"
 
@@ -38,183 +38,184 @@ msgstr "Unbekannt"
 msgid "Admin page"
 msgstr "Admin Seite"
 
-#: cps/admin.py:206 cps/admin.py:484
+#: cps/admin.py:208 cps/admin.py:486
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web Konfiguration wurde aktualisiert"
 
-#: cps/admin.py:220 cps/templates/admin.html:100
+#: cps/admin.py:222 cps/templates/admin.html:102
 msgid "UI Configuration"
 msgstr "Konfiguration Benutzeroberfläche"
 
-#: cps/admin.py:293
+#: cps/admin.py:295
 msgid "Import of optional Google Drive requirements missing"
 msgstr "Optionale Abhängigkeiten für Google Drive fehlen"
 
-#: cps/admin.py:296
+#: cps/admin.py:298
 msgid "client_secrets.json is missing or not readable"
 msgstr "client_secrets.json nicht vorhanden, oder nicht lesbar"
 
-#: cps/admin.py:301 cps/admin.py:330
+#: cps/admin.py:303 cps/admin.py:332
 msgid "client_secrets.json is not configured for web application"
 msgstr "client_secrets.json nicht als Webapplication konfiguriert"
 
-#: cps/admin.py:333 cps/admin.py:359 cps/admin.py:371 cps/admin.py:396
-#: cps/admin.py:424 cps/admin.py:438 cps/admin.py:461 cps/admin.py:474
-#: cps/admin.py:492 cps/admin.py:499 cps/admin.py:514
-#: cps/templates/admin.html:99
+#: cps/admin.py:335 cps/admin.py:361 cps/admin.py:373 cps/admin.py:398
+#: cps/admin.py:426 cps/admin.py:440 cps/admin.py:463 cps/admin.py:476
+#: cps/admin.py:494 cps/admin.py:501 cps/admin.py:516
+#: cps/templates/admin.html:101
 msgid "Basic Configuration"
 msgstr "Basis Konfiguration"
 
-#: cps/admin.py:356
+#: cps/admin.py:358
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr "SSL-Keydatei Speicherort ist ungültig, bitte gültigen Pfad angeben"
 
-#: cps/admin.py:368
+#: cps/admin.py:370
 msgid "Certfile location is not valid, please enter correct path"
 msgstr "SSL-Certdatei Speicherort ist ungültig, bitte gültigen Pfad angeben"
 
-#: cps/admin.py:393
+#: cps/admin.py:395
 msgid "Please enter a LDAP provider and a DN"
 msgstr ""
 
-#: cps/admin.py:421
+#: cps/admin.py:423
 msgid "Please enter Github oauth credentials"
 msgstr ""
 
-#: cps/admin.py:435
+#: cps/admin.py:437
 msgid "Please enter Google oauth credentials"
 msgstr ""
 
-#: cps/admin.py:458
+#: cps/admin.py:460
 msgid "Logfile location is not valid, please enter correct path"
 msgstr "Speicherort Logdatei ist ungültig, bitte Pfad korrigieren"
 
-#: cps/admin.py:496
+#: cps/admin.py:498
 msgid "DB location is not valid, please enter correct path"
 msgstr "DB Speicherort ist ungültig, bitte Pfad korrigieren"
 
-#: cps/admin.py:556 cps/web.py:1055
+#: cps/admin.py:558 cps/web.py:1045
 msgid "Please fill out all fields!"
 msgstr "Bitte alle Felder ausfüllen!"
 
-#: cps/admin.py:558 cps/admin.py:564 cps/admin.py:580
-#: cps/templates/admin.html:33
+#: cps/admin.py:560 cps/admin.py:566 cps/admin.py:582
+#: cps/templates/admin.html:35
 msgid "Add new user"
 msgstr "Neuen Benutzer hinzufügen"
 
-#: cps/admin.py:562 cps/web.py:1261
+#: cps/admin.py:564 cps/web.py:1248
 msgid "E-mail is not from valid domain"
 msgstr "E-Mail ist nicht Teil einer gültigen Domain"
 
-#: cps/admin.py:570
+#: cps/admin.py:572
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Benutzer '%(user)s' angelegt"
 
-#: cps/admin.py:574
+#: cps/admin.py:576
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Es existiert bereits ein Account für diese E-Mailadresse oder Benutzernamen."
 
-#: cps/admin.py:605
+#: cps/admin.py:607
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Test E-Mail wurde erfolgreich an %(kindlemail)s versendet"
 
-#: cps/admin.py:608
+#: cps/admin.py:610
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Es trat ein Fehler beim Versenden der Test E-Mail auf: %(res)s"
 
-#: cps/admin.py:610 cps/web.py:1039
+#: cps/admin.py:612 cps/web.py:1029
 msgid "Please configure your kindle e-mail address first..."
 msgstr "Bitte zuerst die Kindle E-Mailadresse konfigurieren..."
 
-#: cps/admin.py:612
+#: cps/admin.py:614
 msgid "E-mail server settings updated"
 msgstr "E-Mail Server Einstellungen aktualisiert"
 
-#: cps/admin.py:613
+#: cps/admin.py:615
 msgid "Edit e-mail server settings"
 msgstr "E-Mail Server Einstellungen bearbeiten"
 
-#: cps/admin.py:638
+#: cps/admin.py:640
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Benutzer '%(nick)s' gelöscht"
 
-#: cps/admin.py:704
+#: cps/admin.py:711
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Benutzer '%(nick)s' aktualisiert"
 
-#: cps/admin.py:707
+#: cps/admin.py:714
 msgid "An unknown error occured."
 msgstr "Es ist ein unbekannter Fehler aufgetreten."
 
-#: cps/admin.py:710
+#: cps/admin.py:717
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Benutzer %(nick)s bearbeiten"
 
-#: cps/admin.py:726
+#: cps/admin.py:733
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Passwort für Benutzer %(user)s wurde zurückgesetzt"
 
-#: cps/admin.py:729 cps/web.py:1080
+#: cps/admin.py:736 cps/web.py:1070
 msgid "An unknown error occurred. Please try again later."
 msgstr "Es ist ein unbekannter Fehler aufgetreten. Bitte später erneut versuchen."
 
-#: cps/admin.py:748
+#: cps/admin.py:755
 msgid "Requesting update package"
 msgstr "Frage Update Paket an"
 
-#: cps/admin.py:749
+#: cps/admin.py:756
 msgid "Downloading update package"
 msgstr "Lade Update Paket herunter"
 
-#: cps/admin.py:750
+#: cps/admin.py:757
 msgid "Unzipping update package"
 msgstr "Entpacke Update Paket"
 
-#: cps/admin.py:751
+#: cps/admin.py:758
 msgid "Replacing files"
 msgstr "Ersetze Dateien"
 
-#: cps/admin.py:752
+#: cps/admin.py:759
 msgid "Database connections are closed"
 msgstr "Schließe Datenbankverbindungen"
 
-#: cps/admin.py:753
+#: cps/admin.py:760
 msgid "Stopping server"
 msgstr "Stoppe Server"
 
-#: cps/admin.py:754
+#: cps/admin.py:761
 msgid "Update finished, please press okay and reload page"
 msgstr "Update abgeschlossen, bitte okay drücken und Seite neu laden"
 
-#: cps/admin.py:755 cps/admin.py:756 cps/admin.py:757 cps/admin.py:758
+#: cps/admin.py:762 cps/admin.py:763 cps/admin.py:764 cps/admin.py:765
 msgid "Update failed:"
 msgstr "Update fehlgeschlagen:"
 
-#: cps/admin.py:755 cps/updater.py:275 cps/updater.py:509 cps/updater.py:511
+#: cps/admin.py:762 cps/updater.py:277 cps/updater.py:456 cps/updater.py:458
 msgid "HTTP Error"
 msgstr "HTTP Fehler"
 
-#: cps/admin.py:756 cps/updater.py:277 cps/updater.py:513
+#: cps/admin.py:763 cps/updater.py:279 cps/updater.py:460
 msgid "Connection error"
 msgstr "Verbindungsfehler"
 
-#: cps/admin.py:757 cps/updater.py:279 cps/updater.py:515
+#: cps/admin.py:764 cps/updater.py:281 cps/updater.py:462
 msgid "Timeout while establishing connection"
 msgstr "Timeout beim Verbindungsaufbau"
 
-#: cps/admin.py:758 cps/updater.py:281 cps/updater.py:517
+#: cps/admin.py:765 cps/updater.py:283 cps/updater.py:464
 msgid "General error"
 msgstr "Allgemeiner Fehler"
 
-#: cps/converter.py:31 cps/converter.py:48 cps/uploader.py:159
-#: cps/uploader.py:160 cps/uploader.py:164 cps/uploader.py:168
+#: cps/converter.py:31 cps/converter.py:48 cps/uploader.py:213
+#: cps/uploader.py:214 cps/uploader.py:218 cps/uploader.py:222
+#: cps/uploader.py:226
 msgid "not installed"
 msgstr "Nicht installiert"
 
@@ -226,7 +227,7 @@ msgstr "Ausführungsberechtigung nicht vorhanden"
 msgid "not configured"
 msgstr "Nicht konfiguriert"
 
-#: cps/editbooks.py:218 cps/editbooks.py:410
+#: cps/editbooks.py:218 cps/editbooks.py:432
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Buch öffnen fehlgeschlagen. Datei existiert nicht, oder ist nicht zugänglich"
 
@@ -234,16 +235,16 @@ msgstr "Buch öffnen fehlgeschlagen. Datei existiert nicht, oder ist nicht zugä
 msgid "edit metadata"
 msgstr "Metadaten editieren"
 
-#: cps/editbooks.py:325 cps/editbooks.py:572
+#: cps/editbooks.py:325 cps/editbooks.py:595
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Dateiendung '%(ext)s' kann nicht auf diesen Server hochgeladen werden"
 
-#: cps/editbooks.py:329 cps/editbooks.py:576
+#: cps/editbooks.py:329 cps/editbooks.py:599
 msgid "File to be uploaded must have an extension"
 msgstr "Dateien müssen eine Erweiterung haben, um hochgeladen zu werden"
 
-#: cps/editbooks.py:341 cps/editbooks.py:596
+#: cps/editbooks.py:341 cps/editbooks.py:619
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Fehler beim Erzeugen des Pfads %(path)s (Zugriff verweigert)"
@@ -258,66 +259,70 @@ msgstr "Fehler beim speichern der Datei %(file)s."
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Dateiformat %(ext)s zu %(book)s hinzugefügt"
 
-#: cps/editbooks.py:381
+#: cps/editbooks.py:382
 #, python-format
 msgid "Failed to create path for cover %(path)s (Permission denied)."
 msgstr "Fehler beim Erzeugen des Pfads für das Cover %(path)s (Zugriff verweigert)"
 
-#: cps/editbooks.py:389
-msgid "Cover-file is not a valid image file"
-msgstr "Cover-Datei ist keine gültige Bilddatei"
-
-#: cps/editbooks.py:392
+#: cps/editbooks.py:390
 #, python-format
 msgid "Failed to store cover-file %(cover)s."
 msgstr "Fehler beim Speichern des Covers %(cover)s."
 
-#: cps/editbooks.py:422 cps/editbooks.py:431
+#: cps/editbooks.py:393
+msgid "Cover-file is not a valid image file"
+msgstr "Cover-Datei ist keine gültige Bilddatei"
+
+#: cps/editbooks.py:399 cps/editbooks.py:413
+msgid "Cover is not a supported imageformat (jpg/png/webp), can't save"
+msgstr ""
+
+#: cps/editbooks.py:445 cps/editbooks.py:454
 msgid "unknown"
 msgstr "Unbekannt"
 
-#: cps/editbooks.py:463
+#: cps/editbooks.py:486
 msgid "Cover is not a jpg file, can't save"
 msgstr "Cover ist keine JPG Datei, konnte nicht gespeichert werden"
 
-#: cps/editbooks.py:511
+#: cps/editbooks.py:534
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s ist keine gültige Sprache"
 
-#: cps/editbooks.py:542
+#: cps/editbooks.py:565
 msgid "Metadata successfully updated"
 msgstr "Metadaten wurden erfolgreich aktualisiert"
 
-#: cps/editbooks.py:551
+#: cps/editbooks.py:574
 msgid "Error editing book, please check logfile for details"
 msgstr "Fehler beim Editieren des Buchs, Details im Logfile"
 
-#: cps/editbooks.py:601
+#: cps/editbooks.py:624
 #, python-format
 msgid "Failed to store file %(file)s (Permission denied)."
 msgstr "Fehler beim speichern der Datei %(file)s (Zugriff verweigert)"
 
-#: cps/editbooks.py:606
+#: cps/editbooks.py:629
 #, python-format
 msgid "Failed to delete file %(file)s (Permission denied)."
 msgstr "Fehler beim Löschen von Datei %(file)s (Zugriff verweigert)"
 
-#: cps/editbooks.py:689
+#: cps/editbooks.py:712
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:718
+#: cps/editbooks.py:741
 msgid "Source or destination format for conversion missing"
 msgstr "Quell- oder Zielformat für Konvertierung fehlt"
 
-#: cps/editbooks.py:728
+#: cps/editbooks.py:751
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Buch wurde erfolgreich für die Konvertierung in das %(book_format)s Format eingereiht"
 
-#: cps/editbooks.py:732
+#: cps/editbooks.py:755
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Es trat ein Fehlker beim Konvertieren des Buches auf: %(res)s"
@@ -330,133 +335,133 @@ msgstr "Google Drive setup is nicht komplett, bitte versuche Google Drive zu dea
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Callback Domain ist nicht verifiziert, bitte Domain in der Google Developer Console verifizieren"
 
-#: cps/helper.py:84
+#: cps/helper.py:97
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr "%(format)s Format nicht gefunden bei Buch ID %(book)d"
 
-#: cps/helper.py:96
+#: cps/helper.py:109
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr "%(format)s von Buch %(fn)s nicht auf Google Drive gefunden"
 
-#: cps/helper.py:103 cps/helper.py:211 cps/templates/detail.html:45
-#: cps/templates/detail.html:49
+#: cps/helper.py:116 cps/helper.py:223 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
 msgid "Send to Kindle"
 msgstr "An Kindle senden"
 
-#: cps/helper.py:104 cps/helper.py:122 cps/helper.py:213
+#: cps/helper.py:117 cps/helper.py:135 cps/helper.py:225
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Diese E-Mail wurde durch Calibre-Web versendet."
 
-#: cps/helper.py:115
+#: cps/helper.py:128
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr "%(format)s nicht gefunden: %(fn)s"
 
-#: cps/helper.py:120
+#: cps/helper.py:133
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web Test E-Mail"
 
-#: cps/helper.py:121
+#: cps/helper.py:134
 msgid "Test e-mail"
 msgstr "Test E-Mail"
 
-#: cps/helper.py:137
+#: cps/helper.py:150
 msgid "Get Started with Calibre-Web"
 msgstr "Loslegen mit Calibre-Web"
 
-#: cps/helper.py:138
+#: cps/helper.py:151
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr "Registrierungs E-Mail für Benutzer %(name)s"
 
-#: cps/helper.py:151 cps/helper.py:153 cps/helper.py:155 cps/helper.py:157
-#: cps/helper.py:163 cps/helper.py:165 cps/helper.py:167 cps/helper.py:169
+#: cps/helper.py:165 cps/helper.py:167 cps/helper.py:169 cps/helper.py:177
+#: cps/helper.py:179 cps/helper.py:181
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr "Sende %(format)s an Kindle"
 
-#: cps/helper.py:173 cps/helper.py:177
+#: cps/helper.py:185
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr "Konvertiere %(orig)s nach %(format)s und sende an Kindle"
 
-#: cps/helper.py:212
+#: cps/helper.py:224
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr "E-Mail: %(book)s"
 
-#: cps/helper.py:215
+#: cps/helper.py:227
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Die angeforderte Datei konnte nicht gelesen werden. Evtl. falsche Zugriffsrechte?"
 
-#: cps/helper.py:323
+#: cps/helper.py:335
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Umbenennen des Titelpfades '%(src)s' nach '%(dest)s' schlug fehl: %(error)s"
 
-#: cps/helper.py:333
+#: cps/helper.py:345
 #, python-format
 msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Umbenennen des Authorpfades '%(src)s' nach '%(dest)s' schlug fehl: %(error)s"
 
-#: cps/helper.py:347
+#: cps/helper.py:359
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr "Umbenennen der Datei im Pfad '%(src)s' nach '%(dest)s' ist fehlgeschlagen: %(error)s"
 
-#: cps/helper.py:373 cps/helper.py:383 cps/helper.py:391
+#: cps/helper.py:385 cps/helper.py:395 cps/helper.py:403
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr "Datei %(file)s wurde nicht auf Google Drive gefunden"
 
-#: cps/helper.py:412
+#: cps/helper.py:424
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr "Buchpfad %(path)s wurde nicht auf Google Drive gefunden"
 
-#: cps/helper.py:520
+#: cps/helper.py:584
 msgid "Error excecuting UnRar"
 msgstr "Fehler bei der Ausführung von UnRar"
 
-#: cps/helper.py:522
+#: cps/helper.py:586
 msgid "Unrar binary file not found"
 msgstr "UnRar Datei nicht gefunden"
 
-#: cps/helper.py:553
+#: cps/helper.py:614
 msgid "Waiting"
 msgstr "Wartend"
 
-#: cps/helper.py:555
+#: cps/helper.py:616
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
-#: cps/helper.py:557
+#: cps/helper.py:618
 msgid "Started"
 msgstr "Gestartet"
 
-#: cps/helper.py:559
+#: cps/helper.py:620
 msgid "Finished"
 msgstr "Beendet"
 
-#: cps/helper.py:561
+#: cps/helper.py:622
 msgid "Unknown Status"
 msgstr "Unbekannter Status"
 
-#: cps/helper.py:566
+#: cps/helper.py:627
 msgid "E-mail: "
 msgstr "E-Mail: "
 
-#: cps/helper.py:568 cps/helper.py:572
+#: cps/helper.py:629 cps/helper.py:633
 msgid "Convert: "
 msgstr "Konvertiere: "
 
-#: cps/helper.py:570
+#: cps/helper.py:631
 msgid "Upload: "
 msgstr "Upload: "
 
-#: cps/helper.py:574
+#: cps/helper.py:635
 msgid "Unknown Task: "
 msgstr "Unbekannte Aufgabe: "
 
@@ -496,31 +501,19 @@ msgstr ""
 msgid "Not linked to %(oauth)s."
 msgstr ""
 
-msgstr "Erfolg! Bitte zum Gerät zurückkehren"
+#: cps/oauth_bb.py:300
+msgid "GitHub Oauth error, please retry later."
+msgstr ""
 
-#: cps/web.py:2407
-msgid "Please configure the SMTP mail settings first..."
-msgstr "Bitte zuerst die SMTP Mail Einstellung konfigurieren ..."
+#: cps/oauth_bb.py:319
+msgid "Google Oauth error, please retry later."
+msgstr ""
 
-#: cps/web.py:2412
-#, python-format
-msgid "Book successfully queued for sending to %(kindlemail)s"
-msgstr "Buch erfolgreich zum Senden an %(kindlemail)s eingereiht"
-
-#: cps/web.py:2416
-#, 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:2418 cps/web.py:3223
-msgid "Please configure your kindle e-mail address first..."
-msgstr "Bitte zuerst die Kindle E-Mailadresse konfigurieren..."
-
-#: cps/web.py:2429 cps/web.py:2481
+#: cps/shelf.py:40 cps/shelf.py:92
 msgid "Invalid shelf specified"
 msgstr "Ungültiges Bücherregal angegeben"
 
-#: cps/web.py:2436
+#: cps/shelf.py:47
 #, python-format
 msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
 msgstr "Keine Erlaubnis ein Buch zum Bücherregale %(shelfname)s hinzuzufügen vorhanden"
@@ -619,325 +612,329 @@ msgstr "Fehler beim Öffnen. Bücherregel exisitert nicht oder ist nicht zugäng
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Reihenfolge in Bücherregal '%(name)s' verändern"
 
-#: cps/ub.py:107
+#: cps/ub.py:111
 msgid "Recently Added"
 msgstr "Kürzlich hinzugefügt"
 
-#: cps/ub.py:109
+#: cps/ub.py:113
 msgid "Show recent books"
 msgstr "Zeige kürzlich hinzugefügte Bücher"
 
-#: cps/templates/index.xml:17 cps/ub.py:110
+#: cps/templates/index.xml:17 cps/ub.py:114
 msgid "Hot Books"
 msgstr "Beliebte Bücher"
 
-#: cps/ub.py:111
+#: cps/ub.py:115
 msgid "Show hot books"
 msgstr "Zeige Auswahl Beliebte Bücher"
 
-#: cps/templates/index.xml:24 cps/ub.py:114
+#: cps/templates/index.xml:24 cps/ub.py:118
 msgid "Best rated Books"
 msgstr "Best bewertete Bücher"
 
-#: cps/ub.py:116
+#: cps/ub.py:120
 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:117
-#: cps/web.py:975
+#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:121
+#: cps/web.py:965
 msgid "Read Books"
 msgstr "Gelesene Bücher"
 
-#: cps/ub.py:119
+#: cps/ub.py:123
 msgid "Show read and unread"
 msgstr "Zeige Gelesen/Ungelesen Auswahl"
 
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:121
-#: cps/web.py:979
+#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:125
+#: cps/web.py:969
 msgid "Unread Books"
 msgstr "Ungelesene Bücher"
 
-#: cps/ub.py:123
+#: cps/ub.py:127
 msgid "Show unread"
 msgstr "Zeige Ungelesene"
 
-#: cps/ub.py:124
+#: cps/ub.py:128
 msgid "Discover"
 msgstr "Entdecke"
 
-#: cps/ub.py:126
+#: cps/ub.py:130
 msgid "Show random books"
 msgstr "Zeige Zufällige Bücher"
 
-#: cps/ub.py:127
+#: cps/ub.py:131
 msgid "Categories"
 msgstr "Kategorien"
 
-#: cps/ub.py:129
+#: cps/ub.py:133
 msgid "Show category selection"
 msgstr "Zeige Kategorienauswahl"
 
-#: cps/templates/book_edit.html:75 cps/templates/search_form.html:53
-#: cps/ub.py:130
+#: cps/templates/book_edit.html:71 cps/templates/search_form.html:53
+#: cps/ub.py:134
 msgid "Series"
 msgstr "Serien"
 
-#: cps/ub.py:132
+#: cps/ub.py:136
 msgid "Show series selection"
 msgstr "Zeige Serienauswahl"
 
-#: cps/templates/index.xml:61 cps/ub.py:133
+#: cps/templates/index.xml:61 cps/ub.py:137
 msgid "Authors"
 msgstr "Autoren"
 
-#: cps/ub.py:135
+#: cps/ub.py:139
 msgid "Show author selection"
 msgstr "Zeige Autorenauswahl"
 
-#: cps/templates/index.xml:68 cps/ub.py:137
+#: cps/templates/index.xml:68 cps/ub.py:141
 msgid "Publishers"
 msgstr "Verleger"
 
-#: cps/ub.py:139
+#: cps/ub.py:143
 msgid "Show publisher selection"
 msgstr "Zeige Verleger Auswahl"
 
-#: cps/templates/search_form.html:74 cps/ub.py:140
+#: cps/templates/search_form.html:74 cps/ub.py:144
 msgid "Languages"
 msgstr "Sprachen"
 
-#: cps/ub.py:143
+#: cps/ub.py:147
 msgid "Show language selection"
 msgstr "Zeige Sprachauswahl"
 
-#: cps/ub.py:144
+#: cps/ub.py:148
 msgid "Ratings"
 msgstr "Bewertungen"
 
-#: cps/ub.py:146
+#: cps/ub.py:150
 msgid "Show ratings selection"
 msgstr "Zeige Bewertungsauswahl"
 
-#: cps/ub.py:147
+#: cps/ub.py:151
 msgid "File formats"
 msgstr ""
 
-#: cps/ub.py:149
+#: cps/ub.py:153
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/updater.py:255 cps/updater.py:417 cps/updater.py:430
+#: cps/updater.py:257 cps/updater.py:364 cps/updater.py:377
 msgid "Unexpected data while reading update information"
 msgstr "Updateinformationen enthalten unbekannte Daten"
 
-#: cps/updater.py:262 cps/updater.py:423
+#: cps/updater.py:264 cps/updater.py:370
 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:288 cps/updater.py:347 cps/updater.py:475
+#: cps/updater.py:290 cps/updater.py:422
 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 aktuelle Version zu aktualisieren."
 
-#: cps/updater.py:341
+#: cps/updater.py:343
 msgid "Could not fetch update information"
 msgstr "Update Informationen konnten nicht geladen werden"
 
-#: cps/updater.py:410
+#: cps/updater.py:357
 msgid "No release information available"
 msgstr "Keine Release Informationen verfügbar"
 
-#: cps/updater.py:456 cps/updater.py:465
+#: cps/updater.py:403 cps/updater.py:412
 #, 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/web.py:464
+#: cps/web.py:457
 msgid "Recently Added Books"
 msgstr "Kürzlich hinzugefügte Bücher"
 
-#: cps/web.py:491
+#: cps/web.py:484
 msgid "Best rated books"
 msgstr "Best bewertete Bücher"
 
-#: cps/templates/index.xml:38 cps/web.py:499
+#: cps/templates/index.xml:38 cps/web.py:492
 msgid "Random Books"
 msgstr "Zufällige Bücher"
 
-#: cps/web.py:513
+#: cps/web.py:516
 msgid "Books"
 msgstr ""
 
-#: cps/web.py:540
+#: cps/web.py:543
 msgid "Hot Books (most downloaded)"
 msgstr "Beliebte Bücher (die meisten Downloads)"
 
-#: cps/web.py:568 cps/web.py:1306 cps/web.py:1409
+#: cps/web.py:553 cps/web.py:1294 cps/web.py:1383
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "Buch öffnen fehlgeschlagen. Datei existiert nicht, oder ist nicht zugänglich:"
 
-#: cps/web.py:599
-msgid "Publisher list"
-msgstr "Verlegerliste"
-
-#: cps/web.py:614
+#: cps/web.py:580
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr "Verleger: %(name)s"
 
-#: cps/templates/index.xml:82 cps/web.py:630
-msgid "Series list"
-msgstr "Liste Serien"
-
-#: cps/web.py:644
+#: cps/web.py:591
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie: %(serie)s"
 
-#: cps/web.py:658
-msgid "Ratings list"
-msgstr "Bewertungsliste"
-
-#: cps/web.py:672
+#: cps/web.py:602
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:685
-msgid "File formats list"
-msgstr ""
-
-#: cps/web.py:699
+#: cps/web.py:613
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:727
-msgid "Available languages"
-msgstr "Verfügbare Sprachen"
-
-#: cps/web.py:747
-#, python-format
-msgid "Language: %(name)s"
-msgstr "Sprache: %(name)s"
-
-#: cps/templates/index.xml:75 cps/web.py:761
-msgid "Category list"
-msgstr "Kategorieliste"
-
-#: cps/web.py:776
+#: cps/web.py:625
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategorie: %(name)s"
 
-#: cps/templates/layout.html:73 cps/web.py:787
+#: cps/web.py:659
+msgid "Publisher list"
+msgstr "Verlegerliste"
+
+#: cps/templates/index.xml:82 cps/web.py:675
+msgid "Series list"
+msgstr "Liste Serien"
+
+#: cps/web.py:689
+msgid "Ratings list"
+msgstr "Bewertungsliste"
+
+#: cps/web.py:702
+msgid "File formats list"
+msgstr ""
+
+#: cps/web.py:730
+msgid "Available languages"
+msgstr "Verfügbare Sprachen"
+
+#: cps/web.py:750
+#, python-format
+msgid "Language: %(name)s"
+msgstr "Sprache: %(name)s"
+
+#: cps/templates/index.xml:75 cps/web.py:764
+msgid "Category list"
+msgstr "Kategorieliste"
+
+#: cps/templates/layout.html:73 cps/web.py:777
 msgid "Tasks"
 msgstr "Aufgaben"
 
-#: cps/web.py:851
+#: cps/web.py:841
 msgid "Published after "
 msgstr "Herausgegeben nach dem "
 
-#: cps/web.py:858
+#: cps/web.py:848
 msgid "Published before "
 msgstr "Herausgegeben vor dem "
 
-#: cps/web.py:872
+#: cps/web.py:862
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Bewertung <= %(rating)s"
 
-#: cps/web.py:874
+#: cps/web.py:864
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Bewertung >= %(rating)s"
 
-#: cps/web.py:935 cps/web.py:944
+#: cps/web.py:924 cps/web.py:933
 msgid "search"
 msgstr "Suche"
 
-#: cps/web.py:1028
+#: cps/web.py:1018
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Bitte zuerst die SMTP Mail Einstellung konfigurieren ..."
 
-#: cps/web.py:1033
+#: cps/web.py:1023
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Buch erfolgreich zum Senden an %(kindlemail)s eingereiht"
 
-#: cps/web.py:1037
+#: cps/web.py:1027
 #, 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:1056 cps/web.py:1081 cps/web.py:1086 cps/web.py:1091
-#: cps/web.py:1095
+#: cps/web.py:1046 cps/web.py:1071 cps/web.py:1076 cps/web.py:1081
+#: cps/web.py:1085
 msgid "register"
 msgstr "Registieren"
 
-#: cps/web.py:1083
+#: cps/web.py:1073
 msgid "Your e-mail is not allowed to register"
 msgstr "Diese E-Mail ist nicht für die Registrierung zugelassen"
 
-#: cps/web.py:1087
+#: cps/web.py:1077
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Eine Bestätigungs E-Mail wurde an den E-Mail Account versendet."
 
-#: cps/web.py:1090
+#: cps/web.py:1080
 msgid "This username or e-mail address is already in use."
 msgstr "Benutzername oder E-Mailadresse ist bereits in Verwendung."
 
-#: cps/web.py:1113 cps/web.py:1125
+#: cps/web.py:1103 cps/web.py:1115
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1118 cps/web.py:1130
+#: cps/web.py:1108 cps/web.py:1120
 msgid "Wrong Username or Password"
 msgstr "Falscher Benutzername oder Passwort"
 
-#: cps/web.py:1121
+#: cps/web.py:1111
 msgid "Could not login. LDAP server down, please contact your administrator"
 msgstr ""
 
-#: cps/web.py:1136 cps/web.py:1158
+#: cps/web.py:1124 cps/web.py:1146
 msgid "login"
 msgstr "Login"
 
-#: cps/web.py:1170 cps/web.py:1201
+#: cps/web.py:1158 cps/web.py:1189
 msgid "Token not found"
 msgstr "Token wurde nicht gefunden"
 
-#: cps/web.py:1178 cps/web.py:1209
+#: cps/web.py:1166 cps/web.py:1197
 msgid "Token has expired"
 msgstr "Das Token ist abgelaufen"
 
-#: cps/web.py:1186
+#: cps/web.py:1174
 msgid "Success! Please return to your device"
 msgstr "Erfolg! Bitte zum Gerät zurückkehren"
 
-#: cps/web.py:1222
+#: cps/web.py:1210
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Du bist nun eingeloggt als '%(nickname)s'"
 
-#: cps/web.py:1263 cps/web.py:1290 cps/web.py:1294
+#: cps/web.py:1250 cps/web.py:1277 cps/web.py:1281
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's Profil"
 
-#: cps/web.py:1287
+#: cps/web.py:1274
 msgid "Found an existing account for this e-mail address."
 msgstr "Es existiert bereits ein Benutzer für diese E-Mailadresse."
 
-#: cps/web.py:1292
+#: cps/web.py:1279
 msgid "Profile updated"
 msgstr "Profil aktualisiert"
 
-#: cps/web.py:1316 cps/web.py:1318 cps/web.py:1320 cps/web.py:1324
-#: cps/web.py:1328 cps/web.py:1332 cps/web.py:1344
+#: cps/web.py:1304 cps/web.py:1306 cps/web.py:1308 cps/web.py:1314
+#: cps/web.py:1318
 msgid "Read a Book"
 msgstr "Lese ein Buch"
 
+#: cps/web.py:1328
+msgid "Error opening eBook. File does not exist or file is not accessible."
+msgstr ""
+
 #: cps/worker.py:308
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
@@ -972,148 +969,152 @@ msgstr "DLS"
 msgid "Admin"
 msgstr "Admin"
 
-#: cps/templates/admin.html:14 cps/templates/detail.html:22
-#: cps/templates/detail.html:31 cps/templates/shelf.html:6
+#: cps/templates/admin.html:14 cps/templates/detail.html:18
+#: cps/templates/detail.html:27 cps/templates/shelf.html:6
 #: cps/templates/shelfdown.html:62
 msgid "Download"
 msgstr "Download"
 
-#: cps/templates/admin.html:15 cps/templates/layout.html:65
+#: cps/templates/admin.html:15
+msgid "View Ebooks"
+msgstr ""
+
+#: cps/templates/admin.html:16 cps/templates/layout.html:65
 msgid "Upload"
 msgstr "Hochladen"
 
-#: cps/templates/admin.html:16
+#: cps/templates/admin.html:17
 msgid "Edit"
 msgstr "Editieren"
 
-#: cps/templates/admin.html:39
+#: cps/templates/admin.html:41
 msgid "SMTP e-mail server settings"
 msgstr "SMTP E-Mail Server Einstellungen"
 
-#: cps/templates/admin.html:42 cps/templates/email_edit.html:11
+#: cps/templates/admin.html:44 cps/templates/email_edit.html:11
 msgid "SMTP hostname"
 msgstr "SMTP Hostname"
 
-#: cps/templates/admin.html:43
+#: cps/templates/admin.html:45
 msgid "SMTP port"
 msgstr "SMTP Port"
 
-#: cps/templates/admin.html:44
+#: cps/templates/admin.html:46
 msgid "SSL"
 msgstr "SSL"
 
-#: cps/templates/admin.html:45 cps/templates/email_edit.html:27
+#: cps/templates/admin.html:47 cps/templates/email_edit.html:27
 msgid "SMTP login"
 msgstr "SMTP Login"
 
-#: cps/templates/admin.html:46
+#: cps/templates/admin.html:48
 msgid "From mail"
 msgstr "Absenderadresse"
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:58
 msgid "Change SMTP settings"
 msgstr "SMTP Einstellungen ändern"
 
-#: cps/templates/admin.html:62
+#: cps/templates/admin.html:64
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: cps/templates/admin.html:65
+#: cps/templates/admin.html:67
 msgid "Calibre DB dir"
 msgstr "Calibre DB Pfad"
 
-#: cps/templates/admin.html:69
+#: cps/templates/admin.html:71
 msgid "Log level"
 msgstr "Log Level"
 
-#: cps/templates/admin.html:73
+#: cps/templates/admin.html:75
 msgid "Port"
 msgstr "Port"
 
-#: cps/templates/admin.html:79 cps/templates/config_view_edit.html:23
+#: cps/templates/admin.html:81 cps/templates/config_view_edit.html:23
 msgid "Books per page"
 msgstr "Bücher pro Seite"
 
-#: cps/templates/admin.html:83
+#: cps/templates/admin.html:85
 msgid "Uploading"
 msgstr "Hochladen"
 
-#: cps/templates/admin.html:87
+#: cps/templates/admin.html:89
 msgid "Anonymous browsing"
 msgstr "Anonymes Browsen"
 
-#: cps/templates/admin.html:91
+#: cps/templates/admin.html:93
 msgid "Public registration"
 msgstr "Öffentliche Registrierung"
 
-#: cps/templates/admin.html:95 cps/templates/remote_login.html:4
+#: cps/templates/admin.html:97 cps/templates/remote_login.html:4
 msgid "Remote login"
 msgstr "Remote Login"
 
-#: cps/templates/admin.html:106
+#: cps/templates/admin.html:108
 msgid "Administration"
 msgstr "Administration"
 
-#: cps/templates/admin.html:107
+#: cps/templates/admin.html:109
 msgid "Reconnect to Calibre DB"
 msgstr "Calibre-DB neu verbinden"
 
-#: cps/templates/admin.html:108
+#: cps/templates/admin.html:110
 msgid "Restart Calibre-Web"
 msgstr "Calibre-Web Neustarten"
 
-#: cps/templates/admin.html:109
+#: cps/templates/admin.html:111
 msgid "Stop Calibre-Web"
 msgstr "Stoppe Calibre-Web"
 
-#: cps/templates/admin.html:115
+#: cps/templates/admin.html:117
 msgid "Update"
 msgstr "Update"
 
-#: cps/templates/admin.html:119
+#: cps/templates/admin.html:121
 msgid "Version"
 msgstr "Version"
 
-#: cps/templates/admin.html:120
+#: cps/templates/admin.html:122
 msgid "Details"
 msgstr "Details"
 
-#: cps/templates/admin.html:126
+#: cps/templates/admin.html:128
 msgid "Current version"
 msgstr "Aktuelle Version"
 
-#: cps/templates/admin.html:132
+#: cps/templates/admin.html:134
 msgid "Check for update"
 msgstr "Suche nach Update"
 
-#: cps/templates/admin.html:133
+#: cps/templates/admin.html:135
 msgid "Perform Update"
 msgstr "Update durchführen"
 
-#: cps/templates/admin.html:145
+#: cps/templates/admin.html:147
 msgid "Do you really want to restart Calibre-Web?"
 msgstr "Calibre-Web wirklich neustarten?"
 
-#: cps/templates/admin.html:150 cps/templates/admin.html:164
-#: cps/templates/admin.html:184 cps/templates/shelf.html:76
+#: cps/templates/admin.html:152 cps/templates/admin.html:166
+#: cps/templates/admin.html:186 cps/templates/shelf.html:72
 msgid "Ok"
 msgstr "Ok"
 
-#: cps/templates/admin.html:151 cps/templates/admin.html:165
-#: cps/templates/book_edit.html:178 cps/templates/book_edit.html:200
-#: cps/templates/config_edit.html:281 cps/templates/config_view_edit.html:141
+#: cps/templates/admin.html:153 cps/templates/admin.html:167
+#: cps/templates/book_edit.html:174 cps/templates/book_edit.html:196
+#: cps/templates/config_edit.html:281 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:77
+#: cps/templates/layout.html:28 cps/templates/shelf.html:73
 #: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:12
-#: cps/templates/user_edit.html:128
+#: cps/templates/user_edit.html:132
 msgid "Back"
 msgstr "Zurück"
 
-#: cps/templates/admin.html:163
+#: cps/templates/admin.html:165
 msgid "Do you really want to stop Calibre-Web?"
 msgstr "Calibre-Web wirklich stoppen?"
 
-#: cps/templates/admin.html:175
+#: cps/templates/admin.html:177
 msgid "Updating, please do not reload page"
 msgstr "Updatevorgang, bitte Seite nicht neu laden"
 
@@ -1125,176 +1126,176 @@ msgstr "via"
 msgid "In Library"
 msgstr "In Bibliothek"
 
-#: cps/templates/author.html:34 cps/templates/list.html:9
+#: cps/templates/author.html:34 cps/templates/list.html:14
 #: cps/templates/search.html:41
 msgid "All"
 msgstr "Alle"
 
-#: cps/templates/author.html:62 cps/templates/author.html:109
-#: cps/templates/discover.html:27 cps/templates/index.html:30
-#: cps/templates/index.html:97 cps/templates/search.html:67
-#: cps/templates/shelf.html:40
+#: cps/templates/author.html:58 cps/templates/author.html:105
+#: 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 "Reduzieren"
 
-#: cps/templates/author.html:93
+#: cps/templates/author.html:89
 msgid "More by"
 msgstr "Mehr von"
 
-#: cps/templates/book_edit.html:16
+#: cps/templates/book_edit.html:12
 msgid "Delete Book"
 msgstr "Buch löschen"
 
-#: cps/templates/book_edit.html:19
+#: cps/templates/book_edit.html:15
 msgid "Delete formats:"
 msgstr "Lösche Formate:"
 
-#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:199
+#: cps/templates/book_edit.html:18 cps/templates/book_edit.html:195
 #: cps/templates/email_edit.html:73
 msgid "Delete"
 msgstr "Löschen"
 
-#: cps/templates/book_edit.html:30
+#: cps/templates/book_edit.html:26
 msgid "Convert book format:"
 msgstr "Konvertiere Buch Format:"
 
-#: cps/templates/book_edit.html:34
+#: cps/templates/book_edit.html:30
 msgid "Convert from:"
 msgstr "Konvertiere von:"
 
-#: cps/templates/book_edit.html:36 cps/templates/book_edit.html:43
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
 msgstr "Wähle eine Option"
 
-#: cps/templates/book_edit.html:41
+#: cps/templates/book_edit.html:37
 msgid "Convert to:"
 msgstr "Konvertiere nach:"
 
-#: cps/templates/book_edit.html:50
+#: cps/templates/book_edit.html:46
 msgid "Convert book"
 msgstr "Konvertiere Buch"
 
-#: cps/templates/book_edit.html:59 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:55 cps/templates/search_form.html:6
 msgid "Book Title"
 msgstr "Buchtitel"
 
-#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:259
-#: cps/templates/book_edit.html:277 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:59 cps/templates/book_edit.html:255
+#: cps/templates/book_edit.html:273 cps/templates/search_form.html:10
 msgid "Author"
 msgstr "Autor"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:264
-#: cps/templates/book_edit.html:279 cps/templates/search_form.html:106
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:260
+#: cps/templates/book_edit.html:275 cps/templates/search_form.html:106
 msgid "Description"
 msgstr "Beschreibung"
 
-#: cps/templates/book_edit.html:71 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:67 cps/templates/search_form.html:33
 msgid "Tags"
 msgstr "Tags"
 
-#: cps/templates/book_edit.html:79
+#: cps/templates/book_edit.html:75
 msgid "Series id"
 msgstr "Serien ID"
 
-#: cps/templates/book_edit.html:83
+#: cps/templates/book_edit.html:79
 msgid "Rating"
 msgstr "Bewertung"
 
-#: cps/templates/book_edit.html:87
+#: cps/templates/book_edit.html:83
 msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
 msgstr "Cover URL (jpg, Cover wird heruntergeladen und in der Datenbank gespeichert, Feld erscheint anschließend wieder leer)"
 
-#: cps/templates/book_edit.html:91
+#: cps/templates/book_edit.html:87
 msgid "Upload Cover from local drive"
 msgstr "Cover von lokalem Laufwerk hinzufügen"
 
-#: cps/templates/book_edit.html:96 cps/templates/detail.html:172
+#: cps/templates/book_edit.html:92 cps/templates/detail.html:168
 msgid "Publishing date"
 msgstr "Herausgabedatum"
 
-#: cps/templates/book_edit.html:103 cps/templates/book_edit.html:261
-#: cps/templates/book_edit.html:278 cps/templates/detail.html:163
+#: cps/templates/book_edit.html:99 cps/templates/book_edit.html:257
+#: cps/templates/book_edit.html:274 cps/templates/detail.html:159
 #: cps/templates/search_form.html:14
 msgid "Publisher"
 msgstr "Herausgeber"
 
-#: cps/templates/book_edit.html:107 cps/templates/user_edit.html:31
+#: cps/templates/book_edit.html:103 cps/templates/user_edit.html:31
 msgid "Language"
 msgstr "Sprache"
 
-#: cps/templates/book_edit.html:117 cps/templates/search_form.html:117
+#: cps/templates/book_edit.html:113 cps/templates/search_form.html:117
 msgid "Yes"
 msgstr "Ja"
 
-#: cps/templates/book_edit.html:118 cps/templates/search_form.html:118
+#: cps/templates/book_edit.html:114 cps/templates/search_form.html:118
 msgid "No"
 msgstr "Nein"
 
-#: cps/templates/book_edit.html:164
+#: cps/templates/book_edit.html:160
 msgid "Upload format"
 msgstr "Format hochladen"
 
-#: cps/templates/book_edit.html:173
+#: cps/templates/book_edit.html:169
 msgid "view book after edit"
 msgstr "Buch nach Bearbeitung ansehen"
 
-#: cps/templates/book_edit.html:176 cps/templates/book_edit.html:212
+#: cps/templates/book_edit.html:172 cps/templates/book_edit.html:208
 msgid "Get metadata"
 msgstr "Metadaten laden"
 
-#: cps/templates/book_edit.html:177 cps/templates/config_edit.html:279
-#: cps/templates/config_view_edit.html:140 cps/templates/login.html:20
+#: cps/templates/book_edit.html:173 cps/templates/config_edit.html:279
+#: cps/templates/config_view_edit.html:146 cps/templates/login.html:20
 #: cps/templates/search_form.html:150 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:126
+#: cps/templates/user_edit.html:130
 msgid "Submit"
 msgstr "Abschicken"
 
-#: cps/templates/book_edit.html:191
+#: cps/templates/book_edit.html:187
 msgid "Are you really sure?"
 msgstr "Sicher?"
 
-#: cps/templates/book_edit.html:194
+#: cps/templates/book_edit.html:190
 msgid "Book will be deleted from Calibre database"
 msgstr "Das Buch wird aus der Calibre Datenbank"
 
-#: cps/templates/book_edit.html:195
+#: cps/templates/book_edit.html:191
 msgid "and from hard disk"
 msgstr "und von der Festplatte gelöscht"
 
-#: cps/templates/book_edit.html:215
+#: cps/templates/book_edit.html:211
 msgid "Keyword"
 msgstr "Suchbegriff"
 
-#: cps/templates/book_edit.html:216
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr " Suchbegriff "
 
-#: cps/templates/book_edit.html:218 cps/templates/layout.html:47
+#: cps/templates/book_edit.html:214 cps/templates/layout.html:47
 msgid "Go!"
 msgstr "Los!"
 
-#: cps/templates/book_edit.html:222
+#: cps/templates/book_edit.html:218
 msgid "Click the cover to load metadata to the form"
 msgstr "Klicke auf das Bild um die Metadaten zu übertragen"
 
-#: cps/templates/book_edit.html:234 cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:230 cps/templates/book_edit.html:270
 msgid "Loading..."
 msgstr "Lade..."
 
-#: cps/templates/book_edit.html:239 cps/templates/layout.html:187
+#: cps/templates/book_edit.html:235 cps/templates/layout.html:187
 #: cps/templates/layout.html:219
 msgid "Close"
 msgstr "Schließen"
 
-#: cps/templates/book_edit.html:266 cps/templates/book_edit.html:280
+#: cps/templates/book_edit.html:262 cps/templates/book_edit.html:276
 msgid "Source"
 msgstr "Quelle"
 
-#: cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:271
 msgid "Search error!"
 msgstr "Fehler bei Suche!"
 
-#: cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:272
 msgid "No Result(s) found! Please try aonther keyword."
 msgstr "Keine Ergebnisse gefunden! Bitte ein anderes Schlüsselwort benutzen."
 
@@ -1523,7 +1524,7 @@ msgstr "Anzahl Anzeige zufällige Bücher"
 msgid "No. of authors to show before hiding (0=disable hiding)"
 msgstr "Anzahl Autoren in Übersicht (0=deaktiviert)"
 
-#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:118
+#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:112
 msgid "Theme"
 msgstr "Theme"
 
@@ -1564,78 +1565,82 @@ msgid "Allow Downloads"
 msgstr "Downloads erlauben"
 
 #: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:96
+msgid "Allow book viewer"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:100
 msgid "Allow Uploads"
 msgstr "Uploads erlauben"
 
-#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:100
+#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:104
 msgid "Allow Edit"
 msgstr "Bearbeiten erlauben"
 
-#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:104
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:108
 msgid "Allow Delete books"
 msgstr "Bücher löschen erlauben"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:109
+#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:113
 msgid "Allow Changing Password"
 msgstr "Passwort ändern erlauben"
 
-#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:113
+#: cps/templates/config_view_edit.html:109 cps/templates/user_edit.html:117
 msgid "Allow Editing Public Shelfs"
 msgstr "Öffentliche Bücherregale editieren erlauben"
 
-#: cps/templates/config_view_edit.html:115
+#: cps/templates/config_view_edit.html:119
 msgid "Default visibilities for new users"
 msgstr "Default Sichtbarkeiten für neue Benutzer"
 
-#: cps/templates/config_view_edit.html:129 cps/templates/user_edit.html:75
+#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:75
 msgid "Show random books in detail view"
 msgstr "Zeige zufällige Bücher in der Detailansicht"
 
-#: cps/templates/config_view_edit.html:133 cps/templates/user_edit.html:88
+#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:88
 msgid "Show mature content"
 msgstr "Erwachsenencontent anzeigen"
 
-#: cps/templates/detail.html:63
+#: cps/templates/detail.html:59
 msgid "Read in browser"
 msgstr "Im Browser lesen"
 
-#: cps/templates/detail.html:77
+#: cps/templates/detail.html:73
 msgid "Listen in browser"
 msgstr "In Browser anhören"
 
-#: cps/templates/detail.html:124
+#: cps/templates/detail.html:120
 msgid "Book"
 msgstr "Buch"
 
-#: cps/templates/detail.html:124
+#: cps/templates/detail.html:120
 msgid "of"
 msgstr "von"
 
-#: cps/templates/detail.html:130
+#: cps/templates/detail.html:126
 msgid "language"
 msgstr "Sprache"
 
-#: cps/templates/detail.html:209
+#: cps/templates/detail.html:203
 msgid "Mark As Unread"
 msgstr "Als ungelesen markieren"
 
-#: cps/templates/detail.html:209
+#: cps/templates/detail.html:203
 msgid "Mark As Read"
 msgstr "Als gelesen markieren"
 
-#: cps/templates/detail.html:210
+#: cps/templates/detail.html:204
 msgid "Read"
 msgstr "Gelesen"
 
-#: cps/templates/detail.html:220 cps/templates/listenmp3.html:56
+#: cps/templates/detail.html:214 cps/templates/listenmp3.html:54
 msgid "Description:"
 msgstr "Beschreibung:"
 
-#: cps/templates/detail.html:233 cps/templates/search.html:14
+#: cps/templates/detail.html:227 cps/templates/search.html:14
 msgid "Add to shelf"
 msgstr "Zu Bücherregal hinzufügen"
 
-#: cps/templates/detail.html:295
+#: cps/templates/detail.html:289
 msgid "Edit metadata"
 msgstr "Metadaten bearbeiten"
 
@@ -1712,7 +1717,7 @@ msgstr "Zurück zur Hautseite"
 msgid "Discover (Random Books)"
 msgstr "Entdecke (Zufälliges Buch)"
 
-#: cps/templates/index.html:69
+#: cps/templates/index.html:65
 msgid "Group by series"
 msgstr ""
 
@@ -1785,7 +1790,7 @@ msgid "Advanced Search"
 msgstr "Erweiterte Suche"
 
 #: cps/templates/layout.html:76 cps/templates/read.html:71
-#: cps/templates/readcbr.html:89 cps/templates/readcbr.html:113
+#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
 msgid "Settings"
 msgstr "Einstellungen"
 
@@ -1863,105 +1868,105 @@ msgstr "Calibre-Web E-Book Katalog"
 msgid "Reflow text when sidebars are open."
 msgstr "Text umbrechen wenn Seitenleiste geöffnet ist."
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:88
 msgid "Keyboard Shortcuts"
 msgstr "Tastatur Kürzel"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:91
 msgid "Previous Page"
 msgstr "Vorherige Seite"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:92
 msgid "Next Page"
 msgstr "Nächste Seite"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:93
 msgid "Scale to Best"
 msgstr "Optimale Skalierung"
 
-#: cps/templates/readcbr.html:100
+#: cps/templates/readcbr.html:94
 msgid "Scale to Width"
 msgstr "Skaliere auf Breite"
 
-#: cps/templates/readcbr.html:101
+#: cps/templates/readcbr.html:95
 msgid "Scale to Height"
 msgstr "Skaliere auf Höhe"
 
-#: cps/templates/readcbr.html:102
+#: cps/templates/readcbr.html:96
 msgid "Scale to Native"
 msgstr "Skaliere 1:1"
 
-#: cps/templates/readcbr.html:103
+#: cps/templates/readcbr.html:97
 msgid "Rotate Right"
 msgstr "Rechts rotieren"
 
-#: cps/templates/readcbr.html:104
+#: cps/templates/readcbr.html:98
 msgid "Rotate Left"
 msgstr "Links rotieren"
 
-#: cps/templates/readcbr.html:105
+#: cps/templates/readcbr.html:99
 msgid "Flip Image"
 msgstr "Bild umdrehen"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:115
 msgid "Light"
 msgstr "Hell"
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:116
 msgid "Dark"
 msgstr "Dunkel"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:121
 msgid "Scale"
 msgstr "Skalierung"
 
-#: cps/templates/readcbr.html:130
+#: cps/templates/readcbr.html:124
 msgid "Best"
 msgstr "Beste"
 
-#: cps/templates/readcbr.html:131
+#: cps/templates/readcbr.html:125
 msgid "Width"
 msgstr "Breite"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:126
 msgid "Height"
 msgstr "Höhe"
 
-#: cps/templates/readcbr.html:133
+#: cps/templates/readcbr.html:127
 msgid "Native"
 msgstr "1:1"
 
-#: cps/templates/readcbr.html:138
+#: cps/templates/readcbr.html:132
 msgid "Rotate"
 msgstr "Rotieren"
 
-#: cps/templates/readcbr.html:149
+#: cps/templates/readcbr.html:143
 msgid "Flip"
 msgstr "Umdrehen"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:146
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: cps/templates/readcbr.html:153
+#: cps/templates/readcbr.html:147
 msgid "Vertical"
 msgstr "Vertikal"
 
-#: cps/templates/readcbr.html:158
+#: cps/templates/readcbr.html:152
 msgid "Direction"
 msgstr "Leserichtung"
 
-#: cps/templates/readcbr.html:161
+#: cps/templates/readcbr.html:155
 msgid "Left to Right"
 msgstr "Links nach rechts"
 
-#: cps/templates/readcbr.html:162
+#: cps/templates/readcbr.html:156
 msgid "Right to Left"
 msgstr "Rechts nach links"
 
 #: cps/templates/readpdf.html:29
-msgid "PDF.js viewer"
-msgstr "PDF.js Viewer"
+msgid "PDF reader"
+msgstr ""
 
 #: cps/templates/readtxt.html:6
 msgid "Basic txt Reader"
@@ -2047,11 +2052,11 @@ msgstr "Bücherregal editieren"
 msgid "Change order"
 msgstr "Reihenfolge ändern"
 
-#: cps/templates/shelf.html:71
+#: cps/templates/shelf.html:67
 msgid "Do you really want to delete the shelf?"
 msgstr "Wirklich das Bücherregal löschen?"
 
-#: cps/templates/shelf.html:74
+#: cps/templates/shelf.html:70
 msgid "Shelf will be lost for everybody and forever!"
 msgstr "Das Bücherregal wird für alle und für immer gelöscht!"
 
@@ -2159,20 +2164,17 @@ msgstr ""
 msgid "Unlink"
 msgstr ""
 
-#: cps/templates/user_edit.html:120
+#: cps/templates/user_edit.html:124
 msgid "Delete this user"
 msgstr "Benutzer löschen"
 
-#: cps/templates/user_edit.html:135
+#: cps/templates/user_edit.html:139
 msgid "Recent Downloads"
 msgstr "Letzte Downloads"
 
 #~ msgid "Show sorted books"
 #~ msgstr "Zeige Bücher sortiert"
 
-#~ msgid "Public registration is not enabled"
-#~ msgstr ""
-
 #~ msgid "Newest Books"
 #~ msgstr "Neueste Bücher"
 
@@ -2206,3 +2208,6 @@ msgstr "Letzte Downloads"
 #~ msgid "Descending"
 #~ msgstr "Absteigend"
 
+#~ msgid "PDF.js viewer"
+#~ msgstr "PDF.js Viewer"
+
diff --git a/cps/translations/es/LC_MESSAGES/messages.mo b/cps/translations/es/LC_MESSAGES/messages.mo
index 8f86300e..b9404c8b 100644
Binary files a/cps/translations/es/LC_MESSAGES/messages.mo and b/cps/translations/es/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po
index 53acd5db..206f5129 100644
--- a/cps/translations/es/LC_MESSAGES/messages.po
+++ b/cps/translations/es/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-05-30 09:06+0200\n"
+"POT-Creation-Date: 2019-05-31 11:20+0200\n"
 "PO-Revision-Date: 2018-10-05 11:27+0100\n"
 "Last-Translator: victorhck <victorhck@mailbox.org>\n"
 "Language: es\n"
@@ -18,740 +18,929 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.6.0\n"
 
-#: cps/book_formats.py:199 cps/book_formats.py:200 cps/book_formats.py:204
-#: cps/book_formats.py:208 cps/book_formats.py:212 cps/converter.py:29
-#: cps/converter.py:45
-msgid "not installed"
-msgstr "No instalado"
-
-#: cps/converter.py:40 cps/converter.py:56
-msgid "Excecution permissions missing"
-msgstr "Permisos de ejecución ausentes"
-
-#: cps/converter.py:66
-msgid "not configured"
-msgstr ""
-
-#: cps/helper.py:79
-#, python-format
-msgid "%(format)s format not found for book id: %(book)d"
-msgstr "%(format)s formato no encontrado para el id del libro: %(book)d"
-
-#: cps/helper.py:91
-#, python-format
-msgid "%(format)s not found on Google Drive: %(fn)s"
-msgstr "%(format)s no encontrado en Google Drive: %(fn)s"
-
-#: cps/helper.py:98 cps/helper.py:204 cps/templates/detail.html:45
-#: cps/templates/detail.html:49
-msgid "Send to Kindle"
-msgstr "Enviar a Kindle"
-
-#: cps/helper.py:99 cps/helper.py:117 cps/helper.py:206
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "Este correo electrónico ha sido enviado por Calibre-Web."
-
-#: cps/helper.py:110
-#, python-format
-msgid "%(format)s not found: %(fn)s"
-msgstr "%(format)s no encontrado: %(fn)s"
-
-#: cps/helper.py:115
-msgid "Calibre-Web test e-mail"
-msgstr "Calibre-Web comprobar correo electrónico"
-
-#: cps/helper.py:116
-msgid "Test e-mail"
-msgstr "Comprobar correo electrónico"
-
-#: cps/helper.py:132
-msgid "Get Started with Calibre-Web"
-msgstr "Primeros pasos con Calibre-Web"
-
-#: cps/helper.py:133
-#, python-format
-msgid "Registration e-mail for user: %(name)s"
-msgstr "Registrar un correo electrónico para el usuario: %(name)s"
-
-#: cps/helper.py:146 cps/helper.py:148 cps/helper.py:150 cps/helper.py:158
-#: cps/helper.py:160 cps/helper.py:162
-#, python-format
-msgid "Send %(format)s to Kindle"
-msgstr ""
-
-#: cps/helper.py:166
-#, python-format
-msgid "Convert %(orig)s to %(format)s and send to Kindle"
-msgstr ""
-
-#: cps/helper.py:205
-#, python-format
-msgid "E-mail: %(book)s"
-msgstr "Correo electrónico: %(book)s"
-
-#: cps/helper.py:208
-msgid "The requested file could not be read. Maybe wrong permissions?"
-msgstr "El fichero solicitado no puede ser leído. ¿Quizás existen problemas con los permisos?"
-
-#: cps/helper.py:316
-#, python-format
-msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "El renombrado del título de: '%(src)s' a '%(dest)s' falló con errores: %(error)s"
-
-#: cps/helper.py:326
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "El renombrado del autor de: '%(src)s' a '%(dest)s' falló con errores: %(error)s"
-
-#: cps/helper.py:340
-#, python-format
-msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr ""
-
-#: cps/helper.py:366 cps/helper.py:376 cps/helper.py:384
-#, python-format
-msgid "File %(file)s not found on Google Drive"
-msgstr "Fichero %(file)s no encontrado en Google Drive"
-
-#: cps/helper.py:405
-#, python-format
-msgid "Book path %(path)s not found on Google Drive"
-msgstr "La ruta %(path)s del libro no fue encontrada en Google Drive"
-
-#: cps/helper.py:556
-msgid "Error excecuting UnRar"
-msgstr "Error ejecutando UnRar"
-
-#: cps/helper.py:558
-msgid "Unrar binary file not found"
-msgstr "Fichero binario Unrar no encontrado"
-
-#: cps/helper.py:585
-msgid "Waiting"
-msgstr "Esperando"
-
-#: cps/helper.py:587
-msgid "Failed"
-msgstr "Fallido"
-
-#: cps/helper.py:589
-msgid "Started"
-msgstr "Comenzado"
-
-#: cps/helper.py:591
-msgid "Finished"
-msgstr "Finalizado"
-
-#: cps/helper.py:593
-msgid "Unknown Status"
-msgstr ""
-
-#: cps/helper.py:598
-msgid "E-mail: "
-msgstr ""
-
-#: cps/helper.py:600 cps/helper.py:604
-msgid "Convert: "
-msgstr ""
-
-#: cps/helper.py:602
-msgid "Upload: "
-msgstr ""
-
-#: cps/helper.py:606
-msgid "Unknown Task: "
-msgstr ""
-
-#: cps/updater.py:251 cps/updater.py:410 cps/updater.py:423
-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:416
-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:270 cps/updater.py:501 cps/updater.py:503 cps/web.py:1206
-msgid "HTTP Error"
-msgstr "Error HTTP"
-
-#: cps/updater.py:272 cps/updater.py:505 cps/web.py:1207
-msgid "Connection error"
-msgstr "Error de conexión"
-
-#: cps/updater.py:274 cps/updater.py:507 cps/web.py:1208
-msgid "Timeout while establishing connection"
-msgstr "Tiempo agotado mientras se trataba de establecer la conexión"
-
-#: cps/updater.py:276 cps/updater.py:509 cps/web.py:1209
-msgid "General error"
-msgstr "Error general"
-
-#: cps/updater.py:283 cps/updater.py:341 cps/updater.py:468
-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:335
-msgid "Could not fetch update information"
-msgstr "No se puede conseguir información sobre la actualización"
-
-#: cps/updater.py:403
-msgid "No release information available"
-msgstr ""
-
-#: cps/updater.py:449 cps/updater.py:458
-#, python-format
-msgid "A new update is available. Click on the button below to update to version: %(version)s"
-msgstr ""
-
-#: cps/updater.py:491 cps/web.py:2795
-msgid "Unknown"
-msgstr "Desconocido"
-
-#: cps/web.py:1199
-msgid "Requesting update package"
-msgstr "Solicitando paquete de actualización"
-
-#: cps/web.py:1200
-msgid "Downloading update package"
-msgstr "Descargando paquete de actualización"
-
-#: cps/web.py:1201
-msgid "Unzipping update package"
-msgstr "Descomprimiendo paquete de actualización"
-
-#: cps/web.py:1202
-msgid "Replacing files"
-msgstr ""
-
-#: cps/web.py:1203
-msgid "Database connections are closed"
-msgstr "Los conexiones de base datos están cerradas"
-
-#: cps/web.py:1204
-msgid "Stopping server"
-msgstr ""
-
-#: cps/web.py:1205
-msgid "Update finished, please press okay and reload page"
-msgstr "Actualización finalizada. Por favor, pulse OK y recargue la página"
-
-#: cps/web.py:1206 cps/web.py:1207 cps/web.py:1208 cps/web.py:1209
-msgid "Update failed:"
-msgstr ""
-
-#: cps/web.py:1235
-msgid "Recently Added Books"
-msgstr "Libros recientemente añadidos"
-
-#: cps/web.py:1245
-msgid "Newest Books"
-msgstr "Libros más nuevos"
-
-#: cps/web.py:1257
-msgid "Oldest Books"
-msgstr "Libros más antiguos"
-
-#: cps/web.py:1269
-msgid "Books (A-Z)"
-msgstr "Libros (A-Z)"
-
-#: cps/web.py:1280
-msgid "Books (Z-A)"
-msgstr "Libros (Z-A)"
-
-#: cps/web.py:1309
-msgid "Hot Books (most downloaded)"
-msgstr "Libros populares (los mas descargados)"
-
-#: cps/web.py:1322
-msgid "Best rated books"
-msgstr "Libros mejor valorados"
-
-#: cps/templates/index.xml:39 cps/web.py:1335
-msgid "Random Books"
-msgstr "Libros al azar"
-
-#: cps/web.py:1362 cps/web.py:1618 cps/web.py:2161
-msgid "Error opening eBook. File does not exist or file is not accessible:"
-msgstr "Error en la apertura del eBook. El archivo no existe o no es accesible:"
-
-#: cps/web.py:1391
-msgid "Publisher list"
-msgstr ""
-
-#: cps/web.py:1406
-#, python-format
-msgid "Publisher: %(name)s"
-msgstr ""
-
-#: cps/templates/index.xml:83 cps/web.py:1438
-msgid "Series list"
-msgstr "Lista de series"
-
-#: cps/web.py:1452
-#, python-format
-msgid "Series: %(serie)s"
-msgstr "Series : %(serie)s"
-
-#: cps/web.py:1478
-msgid "Available languages"
-msgstr "Idiomas disponibles"
-
-#: cps/web.py:1498
-#, python-format
-msgid "Language: %(name)s"
-msgstr "Idioma: %(name)s"
-
-#: cps/templates/index.xml:76 cps/web.py:1509
-msgid "Category list"
-msgstr "Lista de categorías"
-
-#: cps/web.py:1523
-#, python-format
-msgid "Category: %(name)s"
-msgstr "Categoría : %(name)s"
-
-#: cps/templates/layout.html:73 cps/web.py:1648
-msgid "Tasks"
-msgstr "Tareas"
-
-#: cps/web.py:1682
+#: cps/about.py:76
 msgid "Statistics"
 msgstr "Estadísticas"
 
-#: cps/web.py:1750
-msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
-msgstr ""
-
-#: cps/web.py:1795
-msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
-msgstr "El dominio de devolución de llamada no se ha verificado, siga los pasos para verificar el dominio en la consola de desarrollador de Google"
-
-#: cps/web.py:1871
+#: cps/admin.py:97
 msgid "Server restarted, please reload page"
 msgstr "Servidor reiniciado. Por favor, recargue la página"
 
-#: cps/web.py:1874
+#: cps/admin.py:100
 msgid "Performing shutdown of server, please close window"
 msgstr "Servidor en proceso de apagado. Por favor, cierre la ventana."
 
-#: cps/web.py:1953
-msgid "Published after "
-msgstr "Publicado antes de"
+#: cps/admin.py:120 cps/updater.py:445
+msgid "Unknown"
+msgstr "Desconocido"
 
-#: cps/web.py:1960
-msgid "Published before "
-msgstr "Publicado después de"
-
-#: cps/web.py:1974
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "Clasificación <= %(rating)s"
-
-#: cps/web.py:1976
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "Clasificación >= %(rating)s"
-
-#: cps/web.py:2036 cps/web.py:2045
-msgid "search"
-msgstr "búsqueda"
-
-#: cps/templates/index.xml:47 cps/templates/index.xml:51
-#: cps/templates/layout.html:148 cps/web.py:2116
-msgid "Read Books"
-msgstr "Libros leídos"
-
-#: cps/templates/index.xml:55 cps/templates/index.xml:59
-#: cps/templates/layout.html:150 cps/web.py:2119
-msgid "Unread Books"
-msgstr "Libros no leídos"
-
-#: cps/web.py:2171 cps/web.py:2173 cps/web.py:2175 cps/web.py:2187
-msgid "Read a Book"
-msgstr "Leer un libro"
-
-#: cps/web.py:2199
-msgid "Error opening eBook. Fileformat is not supported."
-msgstr ""
-
-#: cps/web.py:2249 cps/web.py:3170
-msgid "Please fill out all fields!"
-msgstr "¡Por favor completar todos los campos!"
-
-#: cps/web.py:2250 cps/web.py:2272 cps/web.py:2276 cps/web.py:2281
-#: cps/web.py:2283
-msgid "register"
-msgstr "registrarse"
-
-#: cps/web.py:2271 cps/web.py:3389
-msgid "An unknown error occurred. Please try again later."
-msgstr "Ha ocurrido un error desconocido. Por favor vuelva a intentarlo más tarde."
-
-#: cps/web.py:2274
-msgid "Your e-mail is not allowed to register"
-msgstr "Su correo electrónico no está permitido para registrarse"
-
-#: cps/web.py:2277
-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:2280
-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:2297 cps/web.py:2393
-#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
-msgstr "Sesión iniciada como : '%(nickname)s'"
-
-#: cps/web.py:2302
-msgid "Wrong Username or Password"
-msgstr "Usuario o contraseña inválido"
-
-#: cps/web.py:2308 cps/web.py:2329
-msgid "login"
-msgstr "Iniciar sesión"
-
-#: cps/web.py:2341 cps/web.py:2372
-msgid "Token not found"
-msgstr "Token no encontrado"
-
-#: cps/web.py:2349 cps/web.py:2380
-msgid "Token has expired"
-msgstr "El token ha expirado"
-
-#: cps/web.py:2357
-msgid "Success! Please return to your device"
-msgstr "¡Correcto! Por favor regrese a su dispositivo"
-
-#: cps/web.py:2407
-msgid "Please configure the SMTP mail settings first..."
-msgstr "Configurar primero los parámetros SMTP por favor..."
-
-#: cps/web.py:2412
-#, 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:2416
-#, 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:2418 cps/web.py:3223
-msgid "Please configure your kindle e-mail address first..."
-msgstr "Por favor configure primero la dirección de correo de su kindle..."
-
-#: cps/web.py:2429 cps/web.py:2481
-msgid "Invalid shelf specified"
-msgstr "Estante especificado inválido"
-
-#: cps/web.py:2436
-#, python-format
-msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
-msgstr ""
-
-#: cps/web.py:2444
-msgid "You are not allowed to edit public shelves"
-msgstr ""
-
-#: cps/web.py:2453
-#, python-format
-msgid "Book is already part of the shelf: %(shelfname)s"
-msgstr ""
-
-#: cps/web.py:2467
-#, python-format
-msgid "Book has been added to shelf: %(sname)s"
-msgstr "El libro fue agregado a el estante: %(sname)s"
-
-#: cps/web.py:2486
-#, python-format
-msgid "You are not allowed to add a book to the the shelf: %(name)s"
-msgstr "No tiene permiso para añadir un libro a el estante: %(name)s"
-
-#: cps/web.py:2491
-msgid "User is not allowed to edit public shelves"
-msgstr "El usuario no tiene permiso para editar estantes públicos"
-
-#: cps/web.py:2509
-#, python-format
-msgid "Books are already part of the shelf: %(name)s"
-msgstr "Los libros ya forman parte del estante: %(name)s"
-
-#: cps/web.py:2523
-#, python-format
-msgid "Books have been added to shelf: %(sname)s"
-msgstr "Los libros han sido añadidos al estante: %(sname)s"
-
-#: cps/web.py:2525
-#, python-format
-msgid "Could not add books to shelf: %(sname)s"
-msgstr "No se pudieron agregar libros al estante: %(sname)s"
-
-#: cps/web.py:2562
-#, python-format
-msgid "Book has been removed from shelf: %(sname)s"
-msgstr "El libro fue eliminado del estante: %(sname)s"
-
-#: cps/web.py:2568
-#, python-format
-msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
-msgstr "Lo siento, no tiene permiso para eliminar un libro del estante: %(sname)s"
-
-#: cps/web.py:2589 cps/web.py:2613
-#, python-format
-msgid "A shelf with the name '%(title)s' already exists."
-msgstr "Un estante con el nombre '%(title)s' ya existe."
-
-#: cps/web.py:2594
-#, python-format
-msgid "Shelf %(title)s created"
-msgstr "Estante %(title)s creado"
-
-#: cps/web.py:2596 cps/web.py:2624
-msgid "There was an error"
-msgstr "Ha sucedido un error"
-
-#: cps/web.py:2597 cps/web.py:2599
-msgid "create a shelf"
-msgstr "crear un estante"
-
-#: cps/web.py:2622
-#, python-format
-msgid "Shelf %(title)s changed"
-msgstr "Estante %(title)s cambiado"
-
-#: cps/web.py:2625 cps/web.py:2627
-msgid "Edit a shelf"
-msgstr "Editar un estante"
-
-#: cps/web.py:2648
-#, python-format
-msgid "successfully deleted shelf %(name)s"
-msgstr "Estante %(name)s fue borrado correctamente"
-
-#: cps/web.py:2675
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Estante: '%(name)s'"
-
-#: cps/web.py:2678
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "Error al abrir un estante. El estante no existe o no es accesible"
-
-#: cps/web.py:2709
-#, python-format
-msgid "Change order of Shelf: '%(name)s'"
-msgstr "Cambiar orden del estante: '%(name)s'"
-
-#: cps/web.py:2738 cps/web.py:3176
-msgid "E-mail is not from valid domain"
-msgstr "El correo electrónico no tiene un nombre de dominio válido"
-
-#: cps/web.py:2740 cps/web.py:2782 cps/web.py:2785
-#, python-format
-msgid "%(name)s's profile"
-msgstr "Perfil de %(name)s"
-
-#: cps/web.py:2780
-msgid "Found an existing account for this e-mail address."
-msgstr "Encontrada una cuenta existente para esa dirección de correo electrónico."
-
-#: cps/web.py:2783
-msgid "Profile updated"
-msgstr "Perfil actualizado"
-
-#: cps/web.py:2814
+#: cps/admin.py:139
 msgid "Admin page"
 msgstr "Página de administración"
 
-#: cps/web.py:2899 cps/web.py:3079
+#: cps/admin.py:208 cps/admin.py:486
 msgid "Calibre-Web configuration updated"
 msgstr "Configuración de Calibre-Web actualizada"
 
-#: cps/templates/admin.html:100 cps/web.py:2913
+#: cps/admin.py:222 cps/templates/admin.html:102
 msgid "UI Configuration"
 msgstr "Configuración de la interfaz del usuario"
 
-#: cps/web.py:2931
+#: cps/admin.py:295
 msgid "Import of optional Google Drive requirements missing"
 msgstr "Falta la importación de requisitos opcionales de Google Drive"
 
-#: cps/web.py:2934
+#: cps/admin.py:298
 msgid "client_secrets.json is missing or not readable"
 msgstr "client_secrets.json está desaparecido o no se puede leer"
 
-#: cps/web.py:2939 cps/web.py:2968
+#: cps/admin.py:303 cps/admin.py:332
 msgid "client_secrets.json is not configured for web application"
 msgstr "client_secrets.json no está configurado para la aplicación web"
 
-#: cps/templates/admin.html:99 cps/web.py:2971 cps/web.py:2997 cps/web.py:3009
-#: cps/web.py:3054 cps/web.py:3069 cps/web.py:3088 cps/web.py:3096
-#: cps/web.py:3112
+#: cps/admin.py:335 cps/admin.py:361 cps/admin.py:373 cps/admin.py:398
+#: cps/admin.py:426 cps/admin.py:440 cps/admin.py:463 cps/admin.py:476
+#: cps/admin.py:494 cps/admin.py:501 cps/admin.py:516
+#: cps/templates/admin.html:101
 msgid "Basic Configuration"
 msgstr "Configuración básica"
 
-#: cps/web.py:2994
+#: cps/admin.py:358
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr "La ubicación del fichero clave (Keyfile) no es válida, por favor introduzca la ruta correcta"
 
-#: cps/web.py:3006
+#: cps/admin.py:370
 msgid "Certfile location is not valid, please enter correct path"
 msgstr "La ubicación del fichero de certificado (Certfile) no es válida, por favor introduzca la ruta correcta"
 
-#: cps/web.py:3051
+#: cps/admin.py:395
+msgid "Please enter a LDAP provider and a DN"
+msgstr ""
+
+#: cps/admin.py:423
+msgid "Please enter Github oauth credentials"
+msgstr ""
+
+#: cps/admin.py:437
+msgid "Please enter Google oauth credentials"
+msgstr ""
+
+#: cps/admin.py:460
 msgid "Logfile location is not valid, please enter correct path"
 msgstr "La ubicación del fichero de registro (Logfile) no es válida, por favor introduzca la ruta correcta"
 
-#: cps/web.py:3092
+#: cps/admin.py:498
 msgid "DB location is not valid, please enter correct path"
 msgstr "Localización de la BD inválida, por favor introduzca la ruta correcta"
 
-#: cps/templates/admin.html:33 cps/web.py:3172 cps/web.py:3178 cps/web.py:3194
+#: cps/admin.py:558 cps/web.py:1045
+msgid "Please fill out all fields!"
+msgstr "¡Por favor completar todos los campos!"
+
+#: cps/admin.py:560 cps/admin.py:566 cps/admin.py:582
+#: cps/templates/admin.html:35
 msgid "Add new user"
 msgstr "Agregar un nuevo usuario"
 
-#: cps/web.py:3184
+#: cps/admin.py:564 cps/web.py:1248
+msgid "E-mail is not from valid domain"
+msgstr "El correo electrónico no tiene un nombre de dominio válido"
+
+#: cps/admin.py:572
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Usuario '%(user)s' creado"
 
-#: cps/web.py:3188
+#: cps/admin.py:576
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Encontrada una cuenta existente para este correo electrónico o nombre de usuario."
 
-#: cps/web.py:3218
+#: cps/admin.py:607
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Correo electrónico de prueba enviado con éxito a %(kindlemail)s"
 
-#: cps/web.py:3221
+#: cps/admin.py:610
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Ocurrió un error enviando el correo electrónico de prueba: %(res)s"
 
-#: cps/web.py:3225
+#: cps/admin.py:612 cps/web.py:1029
+msgid "Please configure your kindle e-mail address first..."
+msgstr "Por favor configure primero la dirección de correo de su kindle..."
+
+#: cps/admin.py:614
 msgid "E-mail server settings updated"
 msgstr "Actualizados los ajustes del servidor de correo electrónico"
 
-#: cps/web.py:3226
+#: cps/admin.py:615
 msgid "Edit e-mail server settings"
 msgstr "Editar los ajustes del servidor de correo electrónico"
 
-#: cps/web.py:3251
+#: cps/admin.py:640
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Usuario '%(nick)s' borrado"
 
-#: cps/web.py:3364
+#: cps/admin.py:711
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Usuario '%(nick)s'  actualizado"
 
-#: cps/web.py:3367
+#: cps/admin.py:714
 msgid "An unknown error occured."
 msgstr "Ocurrió un error inesperado."
 
-#: cps/web.py:3369
+#: cps/admin.py:717
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Editar Usuario %(nick)s"
 
-#: cps/web.py:3386
+#: cps/admin.py:733
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Contraseña para el usuario %(user)s reinicializada"
 
-#: cps/web.py:3400 cps/web.py:3592
+#: cps/admin.py:736 cps/web.py:1070
+msgid "An unknown error occurred. Please try again later."
+msgstr "Ha ocurrido un error desconocido. Por favor vuelva a intentarlo más tarde."
+
+#: cps/admin.py:755
+msgid "Requesting update package"
+msgstr "Solicitando paquete de actualización"
+
+#: cps/admin.py:756
+msgid "Downloading update package"
+msgstr "Descargando paquete de actualización"
+
+#: cps/admin.py:757
+msgid "Unzipping update package"
+msgstr "Descomprimiendo paquete de actualización"
+
+#: cps/admin.py:758
+msgid "Replacing files"
+msgstr ""
+
+#: cps/admin.py:759
+msgid "Database connections are closed"
+msgstr "Los conexiones de base datos están cerradas"
+
+#: cps/admin.py:760
+msgid "Stopping server"
+msgstr ""
+
+#: cps/admin.py:761
+msgid "Update finished, please press okay and reload page"
+msgstr "Actualización finalizada. Por favor, pulse OK y recargue la página"
+
+#: cps/admin.py:762 cps/admin.py:763 cps/admin.py:764 cps/admin.py:765
+msgid "Update failed:"
+msgstr ""
+
+#: cps/admin.py:762 cps/updater.py:277 cps/updater.py:456 cps/updater.py:458
+msgid "HTTP Error"
+msgstr "Error HTTP"
+
+#: cps/admin.py:763 cps/updater.py:279 cps/updater.py:460
+msgid "Connection error"
+msgstr "Error de conexión"
+
+#: cps/admin.py:764 cps/updater.py:281 cps/updater.py:462
+msgid "Timeout while establishing connection"
+msgstr "Tiempo agotado mientras se trataba de establecer la conexión"
+
+#: cps/admin.py:765 cps/updater.py:283 cps/updater.py:464
+msgid "General error"
+msgstr "Error general"
+
+#: cps/converter.py:31 cps/converter.py:48 cps/uploader.py:213
+#: cps/uploader.py:214 cps/uploader.py:218 cps/uploader.py:222
+#: cps/uploader.py:226
+msgid "not installed"
+msgstr "No instalado"
+
+#: cps/converter.py:43 cps/converter.py:60
+msgid "Excecution permissions missing"
+msgstr "Permisos de ejecución ausentes"
+
+#: cps/converter.py:70
+msgid "not configured"
+msgstr ""
+
+#: cps/editbooks.py:218 cps/editbooks.py:432
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Error abriendo un eBook. El archivo no existe o no es accesible"
 
-#: cps/web.py:3428
+#: cps/editbooks.py:246
 msgid "edit metadata"
 msgstr "editar metadatos"
 
-#: cps/web.py:3521 cps/web.py:3754
+#: cps/editbooks.py:325 cps/editbooks.py:595
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "No se permite subir archivos con la extensión '%(ext)s' a este servidor"
 
-#: cps/web.py:3525 cps/web.py:3757
+#: cps/editbooks.py:329 cps/editbooks.py:599
 msgid "File to be uploaded must have an extension"
 msgstr "El archivo a subir debe tener una extensión"
 
-#: cps/web.py:3537 cps/web.py:3776
+#: cps/editbooks.py:341 cps/editbooks.py:619
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Fallo al crear la ruta %(path)s (permiso denegado)"
 
-#: cps/web.py:3542
+#: cps/editbooks.py:346
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Falla al guardar el archivo %(file)s."
 
-#: cps/web.py:3559
+#: cps/editbooks.py:363
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Fichero con formato %(ext)s añadido a %(book)s"
 
-#: cps/web.py:3573 cps/web.py:3646
+#: cps/editbooks.py:382
+#, python-format
+msgid "Failed to create path for cover %(path)s (Permission denied)."
+msgstr ""
+
+#: cps/editbooks.py:390
+#, python-format
+msgid "Failed to store cover-file %(cover)s."
+msgstr ""
+
+#: cps/editbooks.py:393
+msgid "Cover-file is not a valid image file"
+msgstr ""
+
+#: cps/editbooks.py:399 cps/editbooks.py:413
 msgid "Cover is not a supported imageformat (jpg/png/webp), can't save"
 msgstr ""
 
-#: cps/web.py:3605 cps/web.py:3614
+#: cps/editbooks.py:445 cps/editbooks.py:454
 msgid "unknown"
 msgstr "desconocido"
 
-#: cps/web.py:3694
+#: cps/editbooks.py:486
+msgid "Cover is not a jpg file, can't save"
+msgstr ""
+
+#: cps/editbooks.py:534
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s no es un idioma válido"
 
-#: cps/web.py:3725
+#: cps/editbooks.py:565
 msgid "Metadata successfully updated"
 msgstr ""
 
-#: cps/web.py:3734
+#: cps/editbooks.py:574
 msgid "Error editing book, please check logfile for details"
 msgstr "Error al editar el libro, por favor compruebe el fichero de registro (logfile) para tener más detalles"
 
-#: cps/web.py:3780
+#: cps/editbooks.py:624
 #, python-format
 msgid "Failed to store file %(file)s (Permission denied)."
 msgstr "Fallo al guardar el archivo %(file)s (permiso denegado)"
 
-#: cps/web.py:3785
+#: cps/editbooks.py:629
 #, python-format
 msgid "Failed to delete file %(file)s (Permission denied)."
 msgstr "Fallo al borrar el archivo %(file)s (permiso denegado)"
 
-#: cps/web.py:3867
+#: cps/editbooks.py:712
 #, python-format
-msgid "File %(title)s"
+msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/web.py:3896
+#: cps/editbooks.py:741
 msgid "Source or destination format for conversion missing"
 msgstr "Falta la fuente o el formato de destino para la conversión"
 
-#: cps/web.py:3906
+#: cps/editbooks.py:751
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Libro puesto a la cola con éxito para convertirlo a %(book_format)s"
 
-#: cps/web.py:3910
+#: cps/editbooks.py:755
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Ocurrió un error al convertir este libro: %(res)s"
 
-#: cps/worker.py:305
+#: cps/gdrive.py:56
+msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
+msgstr ""
+
+#: cps/gdrive.py:101
+msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
+msgstr "El dominio de devolución de llamada no se ha verificado, siga los pasos para verificar el dominio en la consola de desarrollador de Google"
+
+#: cps/helper.py:97
+#, python-format
+msgid "%(format)s format not found for book id: %(book)d"
+msgstr "%(format)s formato no encontrado para el id del libro: %(book)d"
+
+#: cps/helper.py:109
+#, python-format
+msgid "%(format)s not found on Google Drive: %(fn)s"
+msgstr "%(format)s no encontrado en Google Drive: %(fn)s"
+
+#: cps/helper.py:116 cps/helper.py:223 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Enviar a Kindle"
+
+#: cps/helper.py:117 cps/helper.py:135 cps/helper.py:225
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "Este correo electrónico ha sido enviado por Calibre-Web."
+
+#: cps/helper.py:128
+#, python-format
+msgid "%(format)s not found: %(fn)s"
+msgstr "%(format)s no encontrado: %(fn)s"
+
+#: cps/helper.py:133
+msgid "Calibre-Web test e-mail"
+msgstr "Calibre-Web comprobar correo electrónico"
+
+#: cps/helper.py:134
+msgid "Test e-mail"
+msgstr "Comprobar correo electrónico"
+
+#: cps/helper.py:150
+msgid "Get Started with Calibre-Web"
+msgstr "Primeros pasos con Calibre-Web"
+
+#: cps/helper.py:151
+#, python-format
+msgid "Registration e-mail for user: %(name)s"
+msgstr "Registrar un correo electrónico para el usuario: %(name)s"
+
+#: cps/helper.py:165 cps/helper.py:167 cps/helper.py:169 cps/helper.py:177
+#: cps/helper.py:179 cps/helper.py:181
+#, python-format
+msgid "Send %(format)s to Kindle"
+msgstr ""
+
+#: cps/helper.py:185
+#, python-format
+msgid "Convert %(orig)s to %(format)s and send to Kindle"
+msgstr ""
+
+#: cps/helper.py:224
+#, python-format
+msgid "E-mail: %(book)s"
+msgstr "Correo electrónico: %(book)s"
+
+#: cps/helper.py:227
+msgid "The requested file could not be read. Maybe wrong permissions?"
+msgstr "El fichero solicitado no puede ser leído. ¿Quizás existen problemas con los permisos?"
+
+#: cps/helper.py:335
+#, python-format
+msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "El renombrado del título de: '%(src)s' a '%(dest)s' falló con errores: %(error)s"
+
+#: cps/helper.py:345
+#, python-format
+msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "El renombrado del autor de: '%(src)s' a '%(dest)s' falló con errores: %(error)s"
+
+#: cps/helper.py:359
+#, python-format
+msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr ""
+
+#: cps/helper.py:385 cps/helper.py:395 cps/helper.py:403
+#, python-format
+msgid "File %(file)s not found on Google Drive"
+msgstr "Fichero %(file)s no encontrado en Google Drive"
+
+#: cps/helper.py:424
+#, python-format
+msgid "Book path %(path)s not found on Google Drive"
+msgstr "La ruta %(path)s del libro no fue encontrada en Google Drive"
+
+#: cps/helper.py:584
+msgid "Error excecuting UnRar"
+msgstr "Error ejecutando UnRar"
+
+#: cps/helper.py:586
+msgid "Unrar binary file not found"
+msgstr "Fichero binario Unrar no encontrado"
+
+#: cps/helper.py:614
+msgid "Waiting"
+msgstr "Esperando"
+
+#: cps/helper.py:616
+msgid "Failed"
+msgstr "Fallido"
+
+#: cps/helper.py:618
+msgid "Started"
+msgstr "Comenzado"
+
+#: cps/helper.py:620
+msgid "Finished"
+msgstr "Finalizado"
+
+#: cps/helper.py:622
+msgid "Unknown Status"
+msgstr ""
+
+#: cps/helper.py:627
+msgid "E-mail: "
+msgstr ""
+
+#: cps/helper.py:629 cps/helper.py:633
+msgid "Convert: "
+msgstr ""
+
+#: cps/helper.py:631
+msgid "Upload: "
+msgstr ""
+
+#: cps/helper.py:635
+msgid "Unknown Task: "
+msgstr ""
+
+#: cps/oauth_bb.py:87
+#, python-format
+msgid "Register with %s, "
+msgstr ""
+
+#: cps/oauth_bb.py:145
+msgid "Failed to log in with GitHub."
+msgstr ""
+
+#: cps/oauth_bb.py:150
+msgid "Failed to fetch user info from GitHub."
+msgstr ""
+
+#: cps/oauth_bb.py:161
+msgid "Failed to log in with Google."
+msgstr ""
+
+#: cps/oauth_bb.py:166
+msgid "Failed to fetch user info from Google."
+msgstr ""
+
+#: cps/oauth_bb.py:265
+#, python-format
+msgid "Unlink to %(oauth)s success."
+msgstr ""
+
+#: cps/oauth_bb.py:269
+#, python-format
+msgid "Unlink to %(oauth)s failed."
+msgstr ""
+
+#: cps/oauth_bb.py:272
+#, python-format
+msgid "Not linked to %(oauth)s."
+msgstr ""
+
+#: cps/oauth_bb.py:300
+msgid "GitHub Oauth error, please retry later."
+msgstr ""
+
+#: cps/oauth_bb.py:319
+msgid "Google Oauth error, please retry later."
+msgstr ""
+
+#: cps/shelf.py:40 cps/shelf.py:92
+msgid "Invalid shelf specified"
+msgstr "Estante especificado inválido"
+
+#: cps/shelf.py:47
+#, python-format
+msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
+msgstr ""
+
+#: cps/shelf.py:55
+msgid "You are not allowed to edit public shelves"
+msgstr ""
+
+#: cps/shelf.py:64
+#, python-format
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr ""
+
+#: cps/shelf.py:78
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "El libro fue agregado a el estante: %(sname)s"
+
+#: cps/shelf.py:97
+#, python-format
+msgid "You are not allowed to add a book to the the shelf: %(name)s"
+msgstr "No tiene permiso para añadir un libro a el estante: %(name)s"
+
+#: cps/shelf.py:102
+msgid "User is not allowed to edit public shelves"
+msgstr "El usuario no tiene permiso para editar estantes públicos"
+
+#: cps/shelf.py:120
+#, python-format
+msgid "Books are already part of the shelf: %(name)s"
+msgstr "Los libros ya forman parte del estante: %(name)s"
+
+#: cps/shelf.py:134
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr "Los libros han sido añadidos al estante: %(sname)s"
+
+#: cps/shelf.py:136
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr "No se pudieron agregar libros al estante: %(sname)s"
+
+#: cps/shelf.py:173
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "El libro fue eliminado del estante: %(sname)s"
+
+#: cps/shelf.py:179
+#, python-format
+msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
+msgstr "Lo siento, no tiene permiso para eliminar un libro del estante: %(sname)s"
+
+#: cps/shelf.py:200 cps/shelf.py:224
+#, python-format
+msgid "A shelf with the name '%(title)s' already exists."
+msgstr "Un estante con el nombre '%(title)s' ya existe."
+
+#: cps/shelf.py:205
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "Estante %(title)s creado"
+
+#: cps/shelf.py:207 cps/shelf.py:235
+msgid "There was an error"
+msgstr "Ha sucedido un error"
+
+#: cps/shelf.py:208 cps/shelf.py:210
+msgid "create a shelf"
+msgstr "crear un estante"
+
+#: cps/shelf.py:233
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "Estante %(title)s cambiado"
+
+#: cps/shelf.py:236 cps/shelf.py:238
+msgid "Edit a shelf"
+msgstr "Editar un estante"
+
+#: cps/shelf.py:259
+#, python-format
+msgid "successfully deleted shelf %(name)s"
+msgstr "Estante %(name)s fue borrado correctamente"
+
+#: cps/shelf.py:289
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Estante: '%(name)s'"
+
+#: cps/shelf.py:292
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "Error al abrir un estante. El estante no existe o no es accesible"
+
+#: cps/shelf.py:324
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "Cambiar orden del estante: '%(name)s'"
+
+#: cps/ub.py:111
+msgid "Recently Added"
+msgstr "Añadido recientemente"
+
+#: cps/ub.py:113
+msgid "Show recent books"
+msgstr "Mostrar libros recientes"
+
+#: cps/templates/index.xml:17 cps/ub.py:114
+msgid "Hot Books"
+msgstr "Libros populares"
+
+#: cps/ub.py:115
+msgid "Show hot books"
+msgstr "Mostrar libros populares"
+
+#: cps/templates/index.xml:24 cps/ub.py:118
+msgid "Best rated Books"
+msgstr "Libros mejor valorados"
+
+#: cps/ub.py:120
+msgid "Show best rated books"
+msgstr "Mostrar libros mejor valorados"
+
+#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:121
+#: cps/web.py:965
+msgid "Read Books"
+msgstr "Libros leídos"
+
+#: cps/ub.py:123
+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:125
+#: cps/web.py:969
+msgid "Unread Books"
+msgstr "Libros no leídos"
+
+#: cps/ub.py:127
+msgid "Show unread"
+msgstr ""
+
+#: cps/ub.py:128
+msgid "Discover"
+msgstr "Descubrir"
+
+#: cps/ub.py:130
+msgid "Show random books"
+msgstr "Mostrar libros al azar"
+
+#: cps/ub.py:131
+msgid "Categories"
+msgstr "Categorías"
+
+#: cps/ub.py:133
+msgid "Show category selection"
+msgstr "Mostrar categorías elegidas"
+
+#: cps/templates/book_edit.html:71 cps/templates/search_form.html:53
+#: cps/ub.py:134
+msgid "Series"
+msgstr "Series"
+
+#: cps/ub.py:136
+msgid "Show series selection"
+msgstr "Mostrar series seleccionadas"
+
+#: cps/templates/index.xml:61 cps/ub.py:137
+msgid "Authors"
+msgstr "Autores"
+
+#: cps/ub.py:139
+msgid "Show author selection"
+msgstr "Mostrar selección de autores"
+
+#: cps/templates/index.xml:68 cps/ub.py:141
+msgid "Publishers"
+msgstr ""
+
+#: cps/ub.py:143
+msgid "Show publisher selection"
+msgstr ""
+
+#: cps/templates/search_form.html:74 cps/ub.py:144
+msgid "Languages"
+msgstr "Idioma"
+
+#: cps/ub.py:147
+msgid "Show language selection"
+msgstr "Mostrar idioma seleccionado"
+
+#: cps/ub.py:148
+msgid "Ratings"
+msgstr ""
+
+#: cps/ub.py:150
+msgid "Show ratings selection"
+msgstr ""
+
+#: cps/ub.py:151
+msgid "File formats"
+msgstr ""
+
+#: cps/ub.py:153
+msgid "Show file formats selection"
+msgstr ""
+
+#: cps/updater.py:257 cps/updater.py:364 cps/updater.py:377
+msgid "Unexpected data while reading update information"
+msgstr "Dato inesperado mientras se leía la información de actualización"
+
+#: cps/updater.py:264 cps/updater.py:370
+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:290 cps/updater.py:422
+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:343
+msgid "Could not fetch update information"
+msgstr "No se puede conseguir información sobre la actualización"
+
+#: cps/updater.py:357
+msgid "No release information available"
+msgstr ""
+
+#: cps/updater.py:403 cps/updater.py:412
+#, python-format
+msgid "A new update is available. Click on the button below to update to version: %(version)s"
+msgstr ""
+
+#: cps/web.py:457
+msgid "Recently Added Books"
+msgstr "Libros recientemente añadidos"
+
+#: cps/web.py:484
+msgid "Best rated books"
+msgstr "Libros mejor valorados"
+
+#: cps/templates/index.xml:38 cps/web.py:492
+msgid "Random Books"
+msgstr "Libros al azar"
+
+#: cps/web.py:516
+msgid "Books"
+msgstr ""
+
+#: cps/web.py:543
+msgid "Hot Books (most downloaded)"
+msgstr "Libros populares (los mas descargados)"
+
+#: cps/web.py:553 cps/web.py:1294 cps/web.py:1383
+msgid "Error opening eBook. File does not exist or file is not accessible:"
+msgstr "Error en la apertura del eBook. El archivo no existe o no es accesible:"
+
+#: cps/web.py:580
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr ""
+
+#: cps/web.py:591
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "Series : %(serie)s"
+
+#: cps/web.py:602
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr ""
+
+#: cps/web.py:613
+#, python-format
+msgid "File format: %(format)s"
+msgstr ""
+
+#: cps/web.py:625
+#, python-format
+msgid "Category: %(name)s"
+msgstr "Categoría : %(name)s"
+
+#: cps/web.py:659
+msgid "Publisher list"
+msgstr ""
+
+#: cps/templates/index.xml:82 cps/web.py:675
+msgid "Series list"
+msgstr "Lista de series"
+
+#: cps/web.py:689
+msgid "Ratings list"
+msgstr ""
+
+#: cps/web.py:702
+msgid "File formats list"
+msgstr ""
+
+#: cps/web.py:730
+msgid "Available languages"
+msgstr "Idiomas disponibles"
+
+#: cps/web.py:750
+#, python-format
+msgid "Language: %(name)s"
+msgstr "Idioma: %(name)s"
+
+#: cps/templates/index.xml:75 cps/web.py:764
+msgid "Category list"
+msgstr "Lista de categorías"
+
+#: cps/templates/layout.html:73 cps/web.py:777
+msgid "Tasks"
+msgstr "Tareas"
+
+#: cps/web.py:841
+msgid "Published after "
+msgstr "Publicado antes de"
+
+#: cps/web.py:848
+msgid "Published before "
+msgstr "Publicado después de"
+
+#: cps/web.py:862
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Clasificación <= %(rating)s"
+
+#: cps/web.py:864
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Clasificación >= %(rating)s"
+
+#: cps/web.py:924 cps/web.py:933
+msgid "search"
+msgstr "búsqueda"
+
+#: cps/web.py:1018
+msgid "Please configure the SMTP mail settings first..."
+msgstr "Configurar primero los parámetros SMTP por favor..."
+
+#: cps/web.py:1023
+#, 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:1027
+#, 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:1046 cps/web.py:1071 cps/web.py:1076 cps/web.py:1081
+#: cps/web.py:1085
+msgid "register"
+msgstr "registrarse"
+
+#: cps/web.py:1073
+msgid "Your e-mail is not allowed to register"
+msgstr "Su correo electrónico no está permitido para registrarse"
+
+#: cps/web.py:1077
+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:1080
+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:1103 cps/web.py:1115
+#, python-format
+msgid "You are now logged in as: '%(nickname)s'"
+msgstr ""
+
+#: cps/web.py:1108 cps/web.py:1120
+msgid "Wrong Username or Password"
+msgstr "Usuario o contraseña inválido"
+
+#: cps/web.py:1111
+msgid "Could not login. LDAP server down, please contact your administrator"
+msgstr ""
+
+#: cps/web.py:1124 cps/web.py:1146
+msgid "login"
+msgstr "Iniciar sesión"
+
+#: cps/web.py:1158 cps/web.py:1189
+msgid "Token not found"
+msgstr "Token no encontrado"
+
+#: cps/web.py:1166 cps/web.py:1197
+msgid "Token has expired"
+msgstr "El token ha expirado"
+
+#: cps/web.py:1174
+msgid "Success! Please return to your device"
+msgstr "¡Correcto! Por favor regrese a su dispositivo"
+
+#: cps/web.py:1210
+#, python-format
+msgid "you are now logged in as: '%(nickname)s'"
+msgstr "Sesión iniciada como : '%(nickname)s'"
+
+#: cps/web.py:1250 cps/web.py:1277 cps/web.py:1281
+#, python-format
+msgid "%(name)s's profile"
+msgstr "Perfil de %(name)s"
+
+#: cps/web.py:1274
+msgid "Found an existing account for this e-mail address."
+msgstr "Encontrada una cuenta existente para esa dirección de correo electrónico."
+
+#: cps/web.py:1279
+msgid "Profile updated"
+msgstr "Perfil actualizado"
+
+#: cps/web.py:1304 cps/web.py:1306 cps/web.py:1308 cps/web.py:1314
+#: cps/web.py:1318
+msgid "Read a Book"
+msgstr "Leer un libro"
+
+#: cps/web.py:1328
+msgid "Error opening eBook. File does not exist or file is not accessible."
+msgstr ""
+
+#: cps/worker.py:308
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Falló Ebook-converter: %(error)s"
 
-#: cps/worker.py:316
+#: cps/worker.py:319
 #, python-format
 msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "Kindlegen falló con error %(error)s. Mensaje: %(message)s"
@@ -780,147 +969,152 @@ msgstr "DLS"
 msgid "Admin"
 msgstr "Administración"
 
-#: cps/templates/admin.html:14 cps/templates/detail.html:22
-#: cps/templates/detail.html:31
+#: cps/templates/admin.html:14 cps/templates/detail.html:18
+#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/shelfdown.html:62
 msgid "Download"
 msgstr "Descargar"
 
-#: cps/templates/admin.html:15 cps/templates/layout.html:65
+#: cps/templates/admin.html:15
+msgid "View Ebooks"
+msgstr ""
+
+#: cps/templates/admin.html:16 cps/templates/layout.html:65
 msgid "Upload"
 msgstr "Subir archivo"
 
-#: cps/templates/admin.html:16
+#: cps/templates/admin.html:17
 msgid "Edit"
 msgstr "Editar"
 
-#: cps/templates/admin.html:39
+#: cps/templates/admin.html:41
 msgid "SMTP e-mail server settings"
 msgstr "Ajustes SMTP del servidor de correo electrónico"
 
-#: cps/templates/admin.html:42 cps/templates/email_edit.html:11
+#: cps/templates/admin.html:44 cps/templates/email_edit.html:11
 msgid "SMTP hostname"
 msgstr "Servidor SMTP"
 
-#: cps/templates/admin.html:43
+#: cps/templates/admin.html:45
 msgid "SMTP port"
 msgstr "Puerto SMTP"
 
-#: cps/templates/admin.html:44
+#: cps/templates/admin.html:46
 msgid "SSL"
 msgstr "SSL"
 
-#: cps/templates/admin.html:45 cps/templates/email_edit.html:27
+#: cps/templates/admin.html:47 cps/templates/email_edit.html:27
 msgid "SMTP login"
 msgstr "Login SMTP"
 
-#: cps/templates/admin.html:46
+#: cps/templates/admin.html:48
 msgid "From mail"
 msgstr "Desde el correo"
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:58
 msgid "Change SMTP settings"
 msgstr "Cambiar parámetros SMTP"
 
-#: cps/templates/admin.html:62
+#: cps/templates/admin.html:64
 msgid "Configuration"
 msgstr "Configuración"
 
-#: cps/templates/admin.html:65
+#: cps/templates/admin.html:67
 msgid "Calibre DB dir"
 msgstr "Dir DB Calibre"
 
-#: cps/templates/admin.html:69
+#: cps/templates/admin.html:71
 msgid "Log level"
 msgstr "Nivel de registro"
 
-#: cps/templates/admin.html:73
+#: cps/templates/admin.html:75
 msgid "Port"
 msgstr "Puerto"
 
-#: cps/templates/admin.html:79 cps/templates/config_view_edit.html:23
+#: cps/templates/admin.html:81 cps/templates/config_view_edit.html:23
 msgid "Books per page"
 msgstr "Libros por página"
 
-#: cps/templates/admin.html:83
+#: cps/templates/admin.html:85
 msgid "Uploading"
 msgstr "Subiendo"
 
-#: cps/templates/admin.html:87
+#: cps/templates/admin.html:89
 msgid "Anonymous browsing"
 msgstr "Navegación anónima"
 
-#: cps/templates/admin.html:91
+#: cps/templates/admin.html:93
 msgid "Public registration"
 msgstr "Registro público"
 
-#: cps/templates/admin.html:95 cps/templates/remote_login.html:4
+#: cps/templates/admin.html:97 cps/templates/remote_login.html:4
 msgid "Remote login"
 msgstr "Inicio de sesión remoto"
 
-#: cps/templates/admin.html:106
+#: cps/templates/admin.html:108
 msgid "Administration"
 msgstr "Administración"
 
-#: cps/templates/admin.html:107
+#: cps/templates/admin.html:109
 msgid "Reconnect to Calibre DB"
 msgstr "Reconectar a la BD Calibre"
 
-#: cps/templates/admin.html:108
+#: cps/templates/admin.html:110
 msgid "Restart Calibre-Web"
 msgstr "Reiniciar Calibre-Web"
 
-#: cps/templates/admin.html:109
+#: cps/templates/admin.html:111
 msgid "Stop Calibre-Web"
 msgstr "Detener Calibre-Web"
 
-#: cps/templates/admin.html:115
+#: cps/templates/admin.html:117
 msgid "Update"
 msgstr "Actualizar"
 
-#: cps/templates/admin.html:119
+#: cps/templates/admin.html:121
 msgid "Version"
 msgstr "Versión"
 
-#: cps/templates/admin.html:120
+#: cps/templates/admin.html:122
 msgid "Details"
 msgstr "Detalles"
 
-#: cps/templates/admin.html:126
+#: cps/templates/admin.html:128
 msgid "Current version"
 msgstr "Versión actual"
 
-#: cps/templates/admin.html:132
+#: cps/templates/admin.html:134
 msgid "Check for update"
 msgstr "Comprobar actualizaciones"
 
-#: cps/templates/admin.html:133
+#: cps/templates/admin.html:135
 msgid "Perform Update"
 msgstr "Realizar actualización"
 
-#: cps/templates/admin.html:145
+#: cps/templates/admin.html:147
 msgid "Do you really want to restart Calibre-Web?"
 msgstr "¿Realmente quiere reiniciar Calibre-Web?"
 
-#: cps/templates/admin.html:150 cps/templates/admin.html:164
-#: cps/templates/admin.html:184 cps/templates/shelf.html:73
+#: cps/templates/admin.html:152 cps/templates/admin.html:166
+#: cps/templates/admin.html:186 cps/templates/shelf.html:72
 msgid "Ok"
 msgstr "Ok"
 
-#: cps/templates/admin.html:151 cps/templates/admin.html:165
-#: cps/templates/book_edit.html:178 cps/templates/book_edit.html:200
-#: cps/templates/config_edit.html:226 cps/templates/config_view_edit.html:179
-#: cps/templates/email_edit.html:40 cps/templates/email_edit.html:75
-#: cps/templates/layout.html:28 cps/templates/shelf.html:74
+#: cps/templates/admin.html:153 cps/templates/admin.html:167
+#: cps/templates/book_edit.html:174 cps/templates/book_edit.html:196
+#: cps/templates/config_edit.html:281 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/user_edit.html:149
+#: cps/templates/user_edit.html:132
 msgid "Back"
 msgstr "Regresar"
 
-#: cps/templates/admin.html:163
+#: cps/templates/admin.html:165
 msgid "Do you really want to stop Calibre-Web?"
 msgstr "¿Realmente quiere detener Calibre-Web?"
 
-#: cps/templates/admin.html:175
+#: cps/templates/admin.html:177
 msgid "Updating, please do not reload page"
 msgstr "Actualizando. Por favor, no recargue la página"
 
@@ -932,176 +1126,176 @@ msgstr "via"
 msgid "In Library"
 msgstr "en Library"
 
-#: cps/templates/author.html:50 cps/templates/author.html:97
-#: cps/templates/discover.html:28 cps/templates/index.html:31
-#: cps/templates/index.html:86 cps/templates/search.html:55
-#: cps/templates/shelf.html:37
+#: cps/templates/author.html:34 cps/templates/list.html:14
+#: cps/templates/search.html:41
+msgid "All"
+msgstr ""
+
+#: cps/templates/author.html:58 cps/templates/author.html:105
+#: 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 ""
 
-#: cps/templates/author.html:81
+#: cps/templates/author.html:89
 msgid "More by"
 msgstr "Más por"
 
-#: cps/templates/book_edit.html:16
+#: cps/templates/book_edit.html:12
 msgid "Delete Book"
 msgstr "Borrar libro"
 
-#: cps/templates/book_edit.html:19
+#: cps/templates/book_edit.html:15
 msgid "Delete formats:"
 msgstr "Borrar formatos:"
 
-#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:199
-#: cps/templates/email_edit.html:73 cps/templates/email_edit.html:74
+#: cps/templates/book_edit.html:18 cps/templates/book_edit.html:195
+#: cps/templates/email_edit.html:73
 msgid "Delete"
 msgstr "Borrar"
 
-#: cps/templates/book_edit.html:30
+#: cps/templates/book_edit.html:26
 msgid "Convert book format:"
 msgstr "Convertir formato de libro:"
 
-#: cps/templates/book_edit.html:34
+#: cps/templates/book_edit.html:30
 msgid "Convert from:"
 msgstr "Convertir desde:"
 
-#: cps/templates/book_edit.html:36 cps/templates/book_edit.html:43
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
 msgstr "seleccionar una opción"
 
-#: cps/templates/book_edit.html:41
+#: cps/templates/book_edit.html:37
 msgid "Convert to:"
 msgstr "Convertir a:"
 
-#: cps/templates/book_edit.html:50
+#: cps/templates/book_edit.html:46
 msgid "Convert book"
 msgstr "Convertir libro"
 
-#: cps/templates/book_edit.html:59 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:55 cps/templates/search_form.html:6
 msgid "Book Title"
 msgstr "Título del libro"
 
-#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:259
-#: cps/templates/book_edit.html:277 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:59 cps/templates/book_edit.html:255
+#: cps/templates/book_edit.html:273 cps/templates/search_form.html:10
 msgid "Author"
 msgstr "Autor"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:264
-#: cps/templates/book_edit.html:279 cps/templates/search_form.html:106
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:260
+#: cps/templates/book_edit.html:275 cps/templates/search_form.html:106
 msgid "Description"
 msgstr "Descripción"
 
-#: cps/templates/book_edit.html:71 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:67 cps/templates/search_form.html:33
 msgid "Tags"
 msgstr "Etiquetas"
 
-#: cps/templates/book_edit.html:75 cps/templates/layout.html:159
-#: cps/templates/search_form.html:53
-msgid "Series"
-msgstr "Series"
-
-#: cps/templates/book_edit.html:79
+#: cps/templates/book_edit.html:75
 msgid "Series id"
 msgstr "Id de las series"
 
-#: cps/templates/book_edit.html:83
+#: cps/templates/book_edit.html:79
 msgid "Rating"
 msgstr "Clasificación"
 
-#: cps/templates/book_edit.html:87
+#: cps/templates/book_edit.html:83
 msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
 msgstr "URL de la portada (jpg, la portada es descargada y almacenada en la base de datos, el campo  está vacío de nuevo)"
 
-#: cps/templates/book_edit.html:91
+#: cps/templates/book_edit.html:87
 msgid "Upload Cover from local drive"
 msgstr "Subir portada desde un medio de almacenamiento local"
 
-#: cps/templates/book_edit.html:96 cps/templates/detail.html:148
+#: cps/templates/book_edit.html:92 cps/templates/detail.html:168
 msgid "Publishing date"
 msgstr "Fecha de publicación"
 
-#: cps/templates/book_edit.html:103 cps/templates/book_edit.html:261
-#: cps/templates/book_edit.html:278 cps/templates/detail.html:139
+#: cps/templates/book_edit.html:99 cps/templates/book_edit.html:257
+#: cps/templates/book_edit.html:274 cps/templates/detail.html:159
 #: cps/templates/search_form.html:14
 msgid "Publisher"
 msgstr "Editor"
 
-#: cps/templates/book_edit.html:107 cps/templates/user_edit.html:31
+#: cps/templates/book_edit.html:103 cps/templates/user_edit.html:31
 msgid "Language"
 msgstr "Idioma"
 
-#: cps/templates/book_edit.html:117 cps/templates/search_form.html:117
+#: cps/templates/book_edit.html:113 cps/templates/search_form.html:117
 msgid "Yes"
 msgstr "Sí"
 
-#: cps/templates/book_edit.html:118 cps/templates/search_form.html:118
+#: cps/templates/book_edit.html:114 cps/templates/search_form.html:118
 msgid "No"
 msgstr "No"
 
-#: cps/templates/book_edit.html:164
+#: cps/templates/book_edit.html:160
 msgid "Upload format"
 msgstr "Subir formato"
 
-#: cps/templates/book_edit.html:173
+#: cps/templates/book_edit.html:169
 msgid "view book after edit"
 msgstr "ver libro tras la edición"
 
-#: cps/templates/book_edit.html:176 cps/templates/book_edit.html:212
+#: cps/templates/book_edit.html:172 cps/templates/book_edit.html:208
 msgid "Get metadata"
 msgstr "Obtener metadatos"
 
-#: cps/templates/book_edit.html:177 cps/templates/config_edit.html:224
-#: cps/templates/config_view_edit.html:178 cps/templates/login.html:20
+#: cps/templates/book_edit.html:173 cps/templates/config_edit.html:279
+#: cps/templates/config_view_edit.html:146 cps/templates/login.html:20
 #: cps/templates/search_form.html:150 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:147
+#: cps/templates/user_edit.html:130
 msgid "Submit"
 msgstr "Enviar"
 
-#: cps/templates/book_edit.html:191
+#: cps/templates/book_edit.html:187
 msgid "Are you really sure?"
 msgstr "¿Estás realmente seguro?"
 
-#: cps/templates/book_edit.html:194
+#: cps/templates/book_edit.html:190
 msgid "Book will be deleted from Calibre database"
 msgstr "El libro será eliminado de la base de datos de Calibre"
 
-#: cps/templates/book_edit.html:195
+#: cps/templates/book_edit.html:191
 msgid "and from hard disk"
 msgstr "y del disco duro"
 
-#: cps/templates/book_edit.html:215
+#: cps/templates/book_edit.html:211
 msgid "Keyword"
 msgstr "Palabra clave"
 
-#: cps/templates/book_edit.html:216
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr "Buscar palabras clave"
 
-#: cps/templates/book_edit.html:218 cps/templates/layout.html:47
+#: cps/templates/book_edit.html:214 cps/templates/layout.html:47
 msgid "Go!"
 msgstr "¡Vamos!"
 
-#: cps/templates/book_edit.html:222
+#: cps/templates/book_edit.html:218
 msgid "Click the cover to load metadata to the form"
 msgstr "Haga clic en la portada para cargar los metadatos en el formulario"
 
-#: cps/templates/book_edit.html:234 cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:230 cps/templates/book_edit.html:270
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: cps/templates/book_edit.html:239 cps/templates/layout.html:226
-#: cps/templates/layout.html:258
+#: cps/templates/book_edit.html:235 cps/templates/layout.html:187
+#: cps/templates/layout.html:219
 msgid "Close"
 msgstr "Cerrar"
 
-#: cps/templates/book_edit.html:266 cps/templates/book_edit.html:280
+#: cps/templates/book_edit.html:262 cps/templates/book_edit.html:276
 msgid "Source"
 msgstr "Origen"
 
-#: cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:271
 msgid "Search error!"
 msgstr "¡Error en la búsqueda!"
 
-#: cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:272
 msgid "No Result(s) found! Please try aonther keyword."
 msgstr "¡No se encontraron resultados! Por favor intente otra palabra clave."
 
@@ -1229,35 +1423,87 @@ msgstr "Goodreads API Key"
 msgid "Goodreads API Secret"
 msgstr "Goodreads API Secret"
 
-#: cps/templates/config_edit.html:187
+#: cps/templates/config_edit.html:181
+msgid "Login type"
+msgstr ""
+
+#: cps/templates/config_edit.html:183
+msgid "Use standard Authentication"
+msgstr ""
+
+#: cps/templates/config_edit.html:185
+msgid "Use LDAP Authentication"
+msgstr ""
+
+#: cps/templates/config_edit.html:188
+msgid "Use GitHub OAuth"
+msgstr ""
+
+#: cps/templates/config_edit.html:189
+msgid "Use Google OAuth"
+msgstr ""
+
+#: cps/templates/config_edit.html:196
+msgid "LDAP Provider URL"
+msgstr ""
+
+#: cps/templates/config_edit.html:200
+msgid "LDAP Distinguished Name (DN)"
+msgstr ""
+
+#: cps/templates/config_edit.html:208
+msgid "Obtain GitHub OAuth Credential"
+msgstr ""
+
+#: cps/templates/config_edit.html:211
+msgid "GitHub OAuth Client Id"
+msgstr ""
+
+#: cps/templates/config_edit.html:215
+msgid "GitHub OAuth Client Secret"
+msgstr ""
+
+#: cps/templates/config_edit.html:221
+msgid "Obtain Google OAuth Credential"
+msgstr ""
+
+#: cps/templates/config_edit.html:224
+msgid "Google OAuth Client Id"
+msgstr ""
+
+#: cps/templates/config_edit.html:228
+msgid "Google OAuth Client Secret"
+msgstr ""
+
+#: cps/templates/config_edit.html:242
 msgid "External binaries"
 msgstr "Binarios externos"
 
-#: cps/templates/config_edit.html:195
+#: cps/templates/config_edit.html:250
 msgid "No converter"
 msgstr "No convertir"
 
-#: cps/templates/config_edit.html:197
+#: cps/templates/config_edit.html:252
 msgid "Use Kindlegen"
 msgstr "Utilizar Kindlegen"
 
-#: cps/templates/config_edit.html:199
+#: cps/templates/config_edit.html:254
 msgid "Use calibre's ebook converter"
 msgstr "Utilizar el convertidor de libros de Calibre"
 
-#: cps/templates/config_edit.html:203
+#: cps/templates/config_edit.html:258
 msgid "E-Book converter settings"
 msgstr "Ajustes del convertidos E-Book"
 
-#: cps/templates/config_edit.html:207
+#: cps/templates/config_edit.html:262
 msgid "Path to convertertool"
 msgstr "Ruta para convertertool"
 
-#: cps/templates/config_edit.html:213
+#: cps/templates/config_edit.html:268
 msgid "Location of Unrar binary"
 msgstr "Ubicación del binario de Unrar"
 
-#: cps/templates/config_edit.html:229 cps/templates/layout.html:84
+#: cps/templates/config_edit.html:284 cps/templates/layout.html:84
 #: cps/templates/login.html:4
 msgid "Login"
 msgstr "Inicio de sesión"
@@ -1266,8 +1512,7 @@ msgstr "Inicio de sesión"
 msgid "View Configuration"
 msgstr "Ver configuración"
 
-#: cps/templates/config_view_edit.html:19 cps/templates/layout.html:135
-#: cps/templates/layout.html:136 cps/templates/shelf_edit.html:7
+#: cps/templates/config_view_edit.html:19 cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr "Título"
 
@@ -1279,7 +1524,7 @@ msgstr "Número de libros aleatorios a mostrar"
 msgid "No. of authors to show before hiding (0=disable hiding)"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:118
+#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:112
 msgid "Theme"
 msgstr "Tema"
 
@@ -1311,127 +1556,91 @@ msgstr "Etiquetas para contenido para adultos"
 msgid "Default settings for new users"
 msgstr "Ajustes por defecto para nuevos usuarios"
 
-#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:104
+#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:83
 msgid "Admin user"
 msgstr "Usuario administrador"
 
-#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:113
+#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:92
 msgid "Allow Downloads"
 msgstr "Permitir descargas"
 
-#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:117
+#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:96
+msgid "Allow book viewer"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:100
 msgid "Allow Uploads"
 msgstr "Permitir subidas de archivos"
 
-#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:121
+#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:104
 msgid "Allow Edit"
 msgstr "Permitir editar"
 
-#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:125
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:108
 msgid "Allow Delete books"
 msgstr "Permitir eliminar libros"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:130
+#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:113
 msgid "Allow Changing Password"
 msgstr "Permitir cambiar la contraseña"
 
-#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:134
+#: cps/templates/config_view_edit.html:109 cps/templates/user_edit.html:117
 msgid "Allow Editing Public Shelfs"
 msgstr "Permitir editar estantes públicos"
 
-#: cps/templates/config_view_edit.html:115
+#: cps/templates/config_view_edit.html:119
 msgid "Default visibilities for new users"
 msgstr "Visibilidad predeterminada para nuevos usuarios"
 
-#: cps/templates/config_view_edit.html:123 cps/templates/user_edit.html:50
-msgid "Show random books"
-msgstr "Mostrar libros al azar"
-
-#: cps/templates/config_view_edit.html:127 cps/templates/user_edit.html:54
-msgid "Show recent books"
-msgstr "Mostrar libros recientes"
-
-#: cps/templates/config_view_edit.html:131 cps/templates/user_edit.html:58
-msgid "Show sorted books"
-msgstr "Mostrar libros ordenados"
-
-#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:62
-msgid "Show hot books"
-msgstr "Mostrar libros populares"
-
-#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:66
-msgid "Show best rated books"
-msgstr "Mostrar libros mejor valorados"
-
-#: cps/templates/config_view_edit.html:143 cps/templates/user_edit.html:70
-msgid "Show language selection"
-msgstr "Mostrar idioma seleccionado"
-
-#: cps/templates/config_view_edit.html:147 cps/templates/user_edit.html:74
-msgid "Show series selection"
-msgstr "Mostrar series seleccionadas"
-
-#: cps/templates/config_view_edit.html:151 cps/templates/user_edit.html:78
-msgid "Show category selection"
-msgstr "Mostrar categorías elegidas"
-
-#: cps/templates/config_view_edit.html:155 cps/templates/user_edit.html:82
-msgid "Show author selection"
-msgstr "Mostrar selección de autores"
-
-#: cps/templates/config_view_edit.html:159 cps/templates/user_edit.html:86
-msgid "Show publisher selection"
-msgstr ""
-
-#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:91
-msgid "Show read and unread"
-msgstr "Mostrar leídos y no leídos"
-
-#: cps/templates/config_view_edit.html:167 cps/templates/user_edit.html:96
+#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:75
 msgid "Show random books in detail view"
 msgstr "Mostrar libros aleatorios con vista detallada"
 
-#: cps/templates/config_view_edit.html:171 cps/templates/user_edit.html:109
+#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:88
 msgid "Show mature content"
 msgstr "Mostrar contenido para adulto"
 
-#: cps/templates/detail.html:63
+#: cps/templates/detail.html:59
 msgid "Read in browser"
 msgstr "Ver en el navegador"
 
-#: cps/templates/detail.html:100
+#: cps/templates/detail.html:73
+msgid "Listen in browser"
+msgstr ""
+
+#: cps/templates/detail.html:120
 msgid "Book"
 msgstr "Libro"
 
-#: cps/templates/detail.html:100
+#: cps/templates/detail.html:120
 msgid "of"
 msgstr "de"
 
-#: cps/templates/detail.html:106
+#: cps/templates/detail.html:126
 msgid "language"
 msgstr "idioma"
 
-#: cps/templates/detail.html:185
+#: cps/templates/detail.html:203
 msgid "Mark As Unread"
 msgstr ""
 
-#: cps/templates/detail.html:185
+#: cps/templates/detail.html:203
 msgid "Mark As Read"
 msgstr ""
 
-#: cps/templates/detail.html:186
+#: cps/templates/detail.html:204
 msgid "Read"
 msgstr "Leer"
 
-#: cps/templates/detail.html:196
+#: cps/templates/detail.html:214 cps/templates/listenmp3.html:54
 msgid "Description:"
 msgstr "Descripción:"
 
-#: cps/templates/detail.html:209 cps/templates/search.html:14
+#: cps/templates/detail.html:227 cps/templates/search.html:14
 msgid "Add to shelf"
 msgstr "Agregar al estante"
 
-#: cps/templates/detail.html:271
+#: cps/templates/detail.html:289
 msgid "Edit metadata"
 msgstr "Editar metadatos"
 
@@ -1491,12 +1700,12 @@ msgstr "Añadir"
 msgid "Do you really want to delete this domain rule?"
 msgstr "¿Realmente quiere eliminar esta regla de dominio?"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:210
+#: cps/templates/feed.xml:21 cps/templates/layout.html:171
 msgid "Next"
 msgstr "Siguiente"
 
-#: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:44 cps/templates/layout.html:45
+#: cps/templates/feed.xml:33 cps/templates/layout.html:44
+#: cps/templates/layout.html:45
 msgid "Search"
 msgstr "Buscar"
 
@@ -1508,75 +1717,63 @@ msgstr ""
 msgid "Discover (Random Books)"
 msgstr "Descubrir (Libros al azar)"
 
+#: cps/templates/index.html:65
+msgid "Group by series"
+msgstr ""
+
 #: cps/templates/index.xml:6
 msgid "Start"
 msgstr "Iniciar"
 
-#: cps/templates/index.xml:18 cps/templates/layout.html:141
-msgid "Hot Books"
-msgstr "Libros populares"
-
-#: cps/templates/index.xml:22
+#: cps/templates/index.xml:21
 msgid "Popular publications from this catalog based on Downloads."
 msgstr "Publicaciones mas populares para este catálogo basadas en las descargas."
 
-#: cps/templates/index.xml:25 cps/templates/layout.html:144
-msgid "Best rated Books"
-msgstr "Libros mejor valorados"
-
-#: cps/templates/index.xml:29
+#: cps/templates/index.xml:28
 msgid "Popular publications from this catalog based on Rating."
 msgstr "Publicaciones populares del catálogo basados en la clasificación."
 
-#: cps/templates/index.xml:32
+#: cps/templates/index.xml:31
 msgid "New Books"
 msgstr "Libros nuevos"
 
-#: cps/templates/index.xml:36
+#: cps/templates/index.xml:35
 msgid "The latest Books"
 msgstr "Libros recientes"
 
-#: cps/templates/index.xml:43
+#: cps/templates/index.xml:42
 msgid "Show Random Books"
 msgstr "Mostrar libros al azar"
 
-#: cps/templates/index.xml:62 cps/templates/layout.html:162
-msgid "Authors"
-msgstr "Autores"
-
-#: cps/templates/index.xml:66
+#: cps/templates/index.xml:65
 msgid "Books ordered by Author"
 msgstr "Libros ordenados por autor"
 
-#: cps/templates/index.xml:69 cps/templates/layout.html:165
-msgid "Publishers"
-msgstr ""
-
-#: cps/templates/index.xml:73
+#: cps/templates/index.xml:72
 msgid "Books ordered by publisher"
 msgstr ""
 
-#: cps/templates/index.xml:80
+#: cps/templates/index.xml:79
 msgid "Books ordered by category"
 msgstr "Libros ordenados por categorías"
 
-#: cps/templates/index.xml:87
+#: cps/templates/index.xml:86
 msgid "Books ordered by series"
 msgstr "Libros ordenados por series"
 
-#: cps/templates/index.xml:90 cps/templates/layout.html:171
+#: cps/templates/index.xml:89 cps/templates/layout.html:132
 msgid "Public Shelves"
 msgstr "Estantes públicos"
 
-#: cps/templates/index.xml:94
+#: cps/templates/index.xml:93
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr "Libros organizados en estantes públicos, visibles para todo el mundo"
 
-#: cps/templates/index.xml:98 cps/templates/layout.html:175
+#: cps/templates/index.xml:97 cps/templates/layout.html:136
 msgid "Your Shelves"
 msgstr "Sus estantes"
 
-#: cps/templates/index.xml:102
+#: cps/templates/index.xml:101
 msgid "User's own shelfs, only visible to the current user himself"
 msgstr "Los estantes propios del usuario, solo visibles para el propio usuario actual"
 
@@ -1593,7 +1790,7 @@ msgid "Advanced Search"
 msgstr "Búsqueda avanzada"
 
 #: cps/templates/layout.html:76 cps/templates/read.html:71
-#: cps/templates/readcbr.html:89 cps/templates/readcbr.html:113
+#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
 msgid "Settings"
 msgstr "Ajustes"
 
@@ -1609,7 +1806,7 @@ msgstr "Cerrar sesión"
 msgid "Register"
 msgstr "Registro"
 
-#: cps/templates/layout.html:111 cps/templates/layout.html:257
+#: cps/templates/layout.html:111 cps/templates/layout.html:218
 msgid "Uploading..."
 msgstr "Cargando..."
 
@@ -1621,68 +1818,27 @@ msgstr "por favor no recargue la página"
 msgid "Browse"
 msgstr "Navegar"
 
-#: cps/templates/layout.html:124
-msgid "Recently Added"
-msgstr "Añadido recientemente"
-
-#: cps/templates/layout.html:129
-msgid "Sorted Books"
-msgstr "Libros ordenados"
-
-#: cps/templates/layout.html:133 cps/templates/layout.html:134
-#: cps/templates/layout.html:135 cps/templates/layout.html:136
-msgid "Sort By"
-msgstr "Ordenar por"
-
-#: cps/templates/layout.html:133
-msgid "Newest"
-msgstr "Más nuevos"
-
-#: cps/templates/layout.html:134
-msgid "Oldest"
-msgstr "Más antiguos"
-
-#: cps/templates/layout.html:135
-msgid "Ascending"
-msgstr "Ascendente"
-
-#: cps/templates/layout.html:136
-msgid "Descending"
-msgstr "Descendente"
-
-#: cps/templates/layout.html:153
-msgid "Discover"
-msgstr "Descubrir"
-
-#: cps/templates/layout.html:156
-msgid "Categories"
-msgstr "Categorías"
-
-#: cps/templates/layout.html:168 cps/templates/search_form.html:74
-msgid "Languages"
-msgstr "Idioma"
-
-#: cps/templates/layout.html:180
+#: cps/templates/layout.html:141
 msgid "Create a Shelf"
 msgstr "Crear un estante"
 
-#: cps/templates/layout.html:181 cps/templates/stats.html:3
+#: cps/templates/layout.html:142 cps/templates/stats.html:3
 msgid "About"
 msgstr "Acerca de"
 
-#: cps/templates/layout.html:195
+#: cps/templates/layout.html:156
 msgid "Previous"
 msgstr "Previo"
 
-#: cps/templates/layout.html:222
+#: cps/templates/layout.html:183
 msgid "Book Details"
 msgstr "Detalles del libro"
 
-#: cps/templates/layout.html:256
+#: cps/templates/layout.html:217
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:259
+#: cps/templates/layout.html:220
 msgid "Error"
 msgstr ""
 
@@ -1712,105 +1868,105 @@ msgstr "Cátalogo de ebook de Calibre-Web"
 msgid "Reflow text when sidebars are open."
 msgstr "Redimensionar el texto cuando las barras laterales están abiertas."
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:88
 msgid "Keyboard Shortcuts"
 msgstr "Atajos de teclado"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:91
 msgid "Previous Page"
 msgstr "Página previa"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:92
 msgid "Next Page"
 msgstr "Página siguiente"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:93
 msgid "Scale to Best"
 msgstr "Escalar a mejor"
 
-#: cps/templates/readcbr.html:100
+#: cps/templates/readcbr.html:94
 msgid "Scale to Width"
 msgstr "Escalar a la ancho"
 
-#: cps/templates/readcbr.html:101
+#: cps/templates/readcbr.html:95
 msgid "Scale to Height"
 msgstr "Escalar a lo alto"
 
-#: cps/templates/readcbr.html:102
+#: cps/templates/readcbr.html:96
 msgid "Scale to Native"
 msgstr "Escalado nativo"
 
-#: cps/templates/readcbr.html:103
+#: cps/templates/readcbr.html:97
 msgid "Rotate Right"
 msgstr "Rotar hacia la derecha"
 
-#: cps/templates/readcbr.html:104
+#: cps/templates/readcbr.html:98
 msgid "Rotate Left"
 msgstr "Rotar hacia la izquierda"
 
-#: cps/templates/readcbr.html:105
+#: cps/templates/readcbr.html:99
 msgid "Flip Image"
 msgstr "Voltear imagen"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:115
 msgid "Light"
 msgstr "Claro"
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:116
 msgid "Dark"
 msgstr "Oscuro"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:121
 msgid "Scale"
 msgstr "Escalar"
 
-#: cps/templates/readcbr.html:130
+#: cps/templates/readcbr.html:124
 msgid "Best"
 msgstr "Mejor"
 
-#: cps/templates/readcbr.html:131
+#: cps/templates/readcbr.html:125
 msgid "Width"
 msgstr "Ancho"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:126
 msgid "Height"
 msgstr "Alto"
 
-#: cps/templates/readcbr.html:133
+#: cps/templates/readcbr.html:127
 msgid "Native"
 msgstr "Nativo"
 
-#: cps/templates/readcbr.html:138
+#: cps/templates/readcbr.html:132
 msgid "Rotate"
 msgstr "Rotar"
 
-#: cps/templates/readcbr.html:149
+#: cps/templates/readcbr.html:143
 msgid "Flip"
 msgstr "Voltear"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:146
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: cps/templates/readcbr.html:153
+#: cps/templates/readcbr.html:147
 msgid "Vertical"
 msgstr "Vertical"
 
-#: cps/templates/readcbr.html:158
+#: cps/templates/readcbr.html:152
 msgid "Direction"
 msgstr ""
 
-#: cps/templates/readcbr.html:161
+#: cps/templates/readcbr.html:155
 msgid "Left to Right"
 msgstr ""
 
-#: cps/templates/readcbr.html:162
+#: cps/templates/readcbr.html:156
 msgid "Right to Left"
 msgstr ""
 
 #: cps/templates/readpdf.html:29
-msgid "PDF.js viewer"
-msgstr "Visor PDF.js"
+msgid "PDF reader"
+msgstr ""
 
 #: cps/templates/readtxt.html:6
 msgid "Basic txt Reader"
@@ -1884,23 +2040,23 @@ msgstr "Clasificación mayor que"
 msgid "Rating less than"
 msgstr "Clasificación menor que"
 
-#: cps/templates/shelf.html:7
+#: cps/templates/shelf.html:10
 msgid "Delete this Shelf"
 msgstr "Borrar este estante"
 
-#: cps/templates/shelf.html:8
+#: cps/templates/shelf.html:11
 msgid "Edit Shelf"
 msgstr "Editar estante"
 
-#: cps/templates/shelf.html:9 cps/templates/shelf_order.html:11
+#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:11
 msgid "Change order"
 msgstr "Cambiar orden"
 
-#: cps/templates/shelf.html:68
+#: cps/templates/shelf.html:67
 msgid "Do you really want to delete the shelf?"
 msgstr "¿Realmente quiere eliminar este estante?"
 
-#: cps/templates/shelf.html:71
+#: cps/templates/shelf.html:70
 msgid "Shelf will be lost for everybody and forever!"
 msgstr "¡El estante se perderá para todo el mundo y para siempre!"
 
@@ -1988,19 +2144,31 @@ msgstr "Resetear contraseña de usuario"
 msgid "Kindle E-Mail"
 msgstr "Correo del Kindle"
 
-#: cps/templates/user_edit.html:39
+#: cps/templates/user_edit.html:40
 msgid "Show books with language"
 msgstr "Mostrar libros con idioma"
 
-#: cps/templates/user_edit.html:41
+#: cps/templates/user_edit.html:42
 msgid "Show all"
 msgstr "Mostrar todo"
 
-#: cps/templates/user_edit.html:141
+#: cps/templates/user_edit.html:52
+msgid "OAuth Settings"
+msgstr ""
+
+#: cps/templates/user_edit.html:54
+msgid "Link"
+msgstr ""
+
+#: cps/templates/user_edit.html:56
+msgid "Unlink"
+msgstr ""
+
+#: cps/templates/user_edit.html:124
 msgid "Delete this user"
 msgstr "Borrar este usuario"
 
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:139
 msgid "Recent Downloads"
 msgstr "Descargas recientes"
 
@@ -2109,3 +2277,45 @@ msgstr "Descargas recientes"
 #~ msgid "Using your another device, login and visit "
 #~ msgstr ""
 
+#~ msgid "Newest Books"
+#~ msgstr "Libros más nuevos"
+
+#~ msgid "Oldest Books"
+#~ msgstr "Libros más antiguos"
+
+#~ msgid "Books (A-Z)"
+#~ msgstr "Libros (A-Z)"
+
+#~ msgid "Books (Z-A)"
+#~ msgstr "Libros (Z-A)"
+
+#~ msgid "Error opening eBook. Fileformat is not supported."
+#~ msgstr ""
+
+#~ msgid "File %(title)s"
+#~ msgstr ""
+
+#~ msgid "Show sorted books"
+#~ msgstr "Mostrar libros ordenados"
+
+#~ msgid "Sorted Books"
+#~ msgstr "Libros ordenados"
+
+#~ msgid "Sort By"
+#~ msgstr "Ordenar por"
+
+#~ msgid "Newest"
+#~ msgstr "Más nuevos"
+
+#~ msgid "Oldest"
+#~ msgstr "Más antiguos"
+
+#~ msgid "Ascending"
+#~ msgstr "Ascendente"
+
+#~ msgid "Descending"
+#~ msgstr "Descendente"
+
+#~ msgid "PDF.js viewer"
+#~ msgstr "Visor PDF.js"
+
diff --git a/cps/translations/fr/LC_MESSAGES/messages.mo b/cps/translations/fr/LC_MESSAGES/messages.mo
index 73ca99d7..ad5a2025 100644
Binary files a/cps/translations/fr/LC_MESSAGES/messages.mo and b/cps/translations/fr/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index 685b0ff4..957dba43 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-05-30 09:06+0200\n"
+"POT-Creation-Date: 2019-05-31 11:20+0200\n"
 "PO-Revision-Date: 2019-02-03 14:57+0100\n"
 "Last-Translator: Nicolas Roudninski <nicoroud@gmail.com>\n"
 "Language: fr\n"
@@ -31,740 +31,929 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.6.0\n"
 
-#: cps/book_formats.py:199 cps/book_formats.py:200 cps/book_formats.py:204
-#: cps/book_formats.py:208 cps/book_formats.py:212 cps/converter.py:29
-#: cps/converter.py:45
-msgid "not installed"
-msgstr "non installé"
-
-#: cps/converter.py:40 cps/converter.py:56
-msgid "Excecution permissions missing"
-msgstr "Permission d’exécution manquante"
-
-#: cps/converter.py:66
-msgid "not configured"
-msgstr "non configuré"
-
-#: cps/helper.py:79
-#, python-format
-msgid "%(format)s format not found for book id: %(book)d"
-msgstr "le format %(format)s est introuvable pour le livre : %(book)d"
-
-#: cps/helper.py:91
-#, python-format
-msgid "%(format)s not found on Google Drive: %(fn)s"
-msgstr "le %(format)s est introuvable sur Google Drive : %(fn)s"
-
-#: cps/helper.py:98 cps/helper.py:204 cps/templates/detail.html:45
-#: cps/templates/detail.html:49
-msgid "Send to Kindle"
-msgstr "Envoyer vers Kindle"
-
-#: cps/helper.py:99 cps/helper.py:117 cps/helper.py:206
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "Ce courriel a été envoyé depuis Calibre-Web."
-
-#: cps/helper.py:110
-#, python-format
-msgid "%(format)s not found: %(fn)s"
-msgstr "%(format)s introuvable : %(fn)s"
-
-#: cps/helper.py:115
-msgid "Calibre-Web test e-mail"
-msgstr "Courriel de test de Calibre-Web"
-
-#: cps/helper.py:116
-msgid "Test e-mail"
-msgstr "Courriel de test"
-
-#: cps/helper.py:132
-msgid "Get Started with Calibre-Web"
-msgstr "Bien démarrer avec Calibre-Web"
-
-#: cps/helper.py:133
-#, python-format
-msgid "Registration e-mail for user: %(name)s"
-msgstr "Courriel d’inscription pour l’utilisateur : %(name)s"
-
-#: cps/helper.py:146 cps/helper.py:148 cps/helper.py:150 cps/helper.py:158
-#: cps/helper.py:160 cps/helper.py:162
-#, python-format
-msgid "Send %(format)s to Kindle"
-msgstr "Envoyer %(format)s vers le Kindle"
-
-#: cps/helper.py:166
-#, python-format
-msgid "Convert %(orig)s to %(format)s and send to Kindle"
-msgstr "Convertir de %(orig)s vers %(format)s et envoyer au Kindle"
-
-#: cps/helper.py:205
-#, python-format
-msgid "E-mail: %(book)s"
-msgstr "Courriel : %(book)s"
-
-#: cps/helper.py:208
-msgid "The requested file could not be read. Maybe wrong permissions?"
-msgstr "Le fichier demandé n’a pu être lu. Problème de permission d’accès ?"
-
-#: cps/helper.py:316
-#, python-format
-msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "Renommer le titre de : '%(src)s' à '%(dest)s' a échoué avec l’erreur : %(error)s"
-
-#: cps/helper.py:326
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "Renommer l’auteur de : '%(src)s' à '%(dest)s' a échoué avec l’erreur : %(error)s"
-
-#: cps/helper.py:340
-#, python-format
-msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "La modification du nom de fichier du chemin : '%(src)s' vers '%(dest)s' a échoué avec l’erreur : %(error)s"
-
-#: cps/helper.py:366 cps/helper.py:376 cps/helper.py:384
-#, python-format
-msgid "File %(file)s not found on Google Drive"
-msgstr ""
-
-#: cps/helper.py:405
-#, python-format
-msgid "Book path %(path)s not found on Google Drive"
-msgstr ""
-
-#: cps/helper.py:556
-msgid "Error excecuting UnRar"
-msgstr ""
-
-#: cps/helper.py:558
-msgid "Unrar binary file not found"
-msgstr ""
-
-#: cps/helper.py:585
-msgid "Waiting"
-msgstr ""
-
-#: cps/helper.py:587
-msgid "Failed"
-msgstr ""
-
-#: cps/helper.py:589
-msgid "Started"
-msgstr ""
-
-#: cps/helper.py:591
-msgid "Finished"
-msgstr "Terminé"
-
-#: cps/helper.py:593
-msgid "Unknown Status"
-msgstr "Statut inconnu"
-
-#: cps/helper.py:598
-msgid "E-mail: "
-msgstr "Courriel : "
-
-#: cps/helper.py:600 cps/helper.py:604
-msgid "Convert: "
-msgstr "Convertir vers : "
-
-#: cps/helper.py:602
-msgid "Upload: "
-msgstr "Déposer : "
-
-#: cps/helper.py:606
-msgid "Unknown Task: "
-msgstr "Tâche inconnue : "
-
-#: cps/updater.py:251 cps/updater.py:410 cps/updater.py:423
-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:416
-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:270 cps/updater.py:501 cps/updater.py:503 cps/web.py:1206
-msgid "HTTP Error"
-msgstr "Erreur HTTP"
-
-#: cps/updater.py:272 cps/updater.py:505 cps/web.py:1207
-msgid "Connection error"
-msgstr "Erreur de connexion"
-
-#: cps/updater.py:274 cps/updater.py:507 cps/web.py:1208
-msgid "Timeout while establishing connection"
-msgstr "Délai d'attente dépassé lors de l'établissement de connexion"
-
-#: cps/updater.py:276 cps/updater.py:509 cps/web.py:1209
-msgid "General error"
-msgstr "Erreur générale"
-
-#: cps/updater.py:283 cps/updater.py:341 cps/updater.py:468
-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:335
-msgid "Could not fetch update information"
-msgstr "Impossible d'extraire les informations de mise à jour"
-
-#: cps/updater.py:403
-msgid "No release information available"
-msgstr "Aucune information concernant cette version n’est disponible"
-
-#: cps/updater.py:449 cps/updater.py:458
-#, 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:491 cps/web.py:2795
-msgid "Unknown"
-msgstr "Inconnu"
-
-#: cps/web.py:1199
-msgid "Requesting update package"
-msgstr "Demander une mise à jour"
-
-#: cps/web.py:1200
-msgid "Downloading update package"
-msgstr "Téléchargement la mise à jour"
-
-#: cps/web.py:1201
-msgid "Unzipping update package"
-msgstr "Décompression de la mise à jour"
-
-#: cps/web.py:1202
-msgid "Replacing files"
-msgstr "Remplacement des fichiers"
-
-#: cps/web.py:1203
-msgid "Database connections are closed"
-msgstr "Connexion à la base de donnée fermée"
-
-#: cps/web.py:1204
-msgid "Stopping server"
-msgstr "Arrêt du serveur"
-
-#: cps/web.py:1205
-msgid "Update finished, please press okay and reload page"
-msgstr "Mise à jour terminée, merci d’appuyer sur okay et de rafraîchir la page"
-
-#: cps/web.py:1206 cps/web.py:1207 cps/web.py:1208 cps/web.py:1209
-msgid "Update failed:"
-msgstr "La mise à jour à échouée : "
-
-#: cps/web.py:1235
-msgid "Recently Added Books"
-msgstr "Ajouts récents"
-
-#: cps/web.py:1245
-msgid "Newest Books"
-msgstr "Livres récents"
-
-#: cps/web.py:1257
-msgid "Oldest Books"
-msgstr "Anciens livres"
-
-#: cps/web.py:1269
-msgid "Books (A-Z)"
-msgstr "Livres (A-Z)"
-
-#: cps/web.py:1280
-msgid "Books (Z-A)"
-msgstr "Livres (Z-A)"
-
-#: cps/web.py:1309
-msgid "Hot Books (most downloaded)"
-msgstr "Livres populaires (les plus téléchargés)"
-
-#: cps/web.py:1322
-msgid "Best rated books"
-msgstr "Livres les mieux notés"
-
-#: cps/templates/index.xml:39 cps/web.py:1335
-msgid "Random Books"
-msgstr "Livres au hasard"
-
-#: cps/web.py:1362 cps/web.py:1618 cps/web.py:2161
-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:1391
-msgid "Publisher list"
-msgstr "Liste des éditeurs"
-
-#: cps/web.py:1406
-#, python-format
-msgid "Publisher: %(name)s"
-msgstr "Editeur : '%(name)s'"
-
-#: cps/templates/index.xml:83 cps/web.py:1438
-msgid "Series list"
-msgstr "Liste des séries"
-
-#: cps/web.py:1452
-#, python-format
-msgid "Series: %(serie)s"
-msgstr "Séries : %(serie)s"
-
-#: cps/web.py:1478
-msgid "Available languages"
-msgstr "Langues disponibles"
-
-#: cps/web.py:1498
-#, python-format
-msgid "Language: %(name)s"
-msgstr "Langue : %(name)s"
-
-#: cps/templates/index.xml:76 cps/web.py:1509
-msgid "Category list"
-msgstr "Liste des catégories"
-
-#: cps/web.py:1523
-#, python-format
-msgid "Category: %(name)s"
-msgstr "Catégorie : %(name)s"
-
-#: cps/templates/layout.html:73 cps/web.py:1648
-msgid "Tasks"
-msgstr "Tâches"
-
-#: cps/web.py:1682
+#: cps/about.py:76
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: cps/web.py:1750
-msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
-msgstr ""
-
-#: cps/web.py:1795
-msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
-msgstr "Le domaine de retour d’appel (Callback domain) est non vérifié, Veuillez suivre les étapes nécessaires pour vérifier le domaine dans la console de développement de Google"
-
-#: cps/web.py:1871
+#: cps/admin.py:97
 msgid "Server restarted, please reload page"
 msgstr "Serveur redémarré, merci de rafraîchir la page"
 
-#: cps/web.py:1874
+#: cps/admin.py:100
 msgid "Performing shutdown of server, please close window"
 msgstr "Arrêt du serveur en cours, merci de fermer la fenêtre"
 
-#: cps/web.py:1953
-msgid "Published after "
-msgstr "Publié après le "
+#: cps/admin.py:120 cps/updater.py:445
+msgid "Unknown"
+msgstr "Inconnu"
 
-#: cps/web.py:1960
-msgid "Published before "
-msgstr "Publié avant le "
-
-#: cps/web.py:1974
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "Évaluation <= %(rating)s"
-
-#: cps/web.py:1976
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "Évaluation >= %(rating)s"
-
-#: cps/web.py:2036 cps/web.py:2045
-msgid "search"
-msgstr "recherche"
-
-#: cps/templates/index.xml:47 cps/templates/index.xml:51
-#: cps/templates/layout.html:148 cps/web.py:2116
-msgid "Read Books"
-msgstr "Livres lus"
-
-#: cps/templates/index.xml:55 cps/templates/index.xml:59
-#: cps/templates/layout.html:150 cps/web.py:2119
-msgid "Unread Books"
-msgstr "Livres non-lus"
-
-#: cps/web.py:2171 cps/web.py:2173 cps/web.py:2175 cps/web.py:2187
-msgid "Read a Book"
-msgstr "Lire un livre"
-
-#: cps/web.py:2199
-msgid "Error opening eBook. Fileformat is not supported."
-msgstr ""
-
-#: cps/web.py:2249 cps/web.py:3170
-msgid "Please fill out all fields!"
-msgstr "SVP, complétez tous les champs !"
-
-#: cps/web.py:2250 cps/web.py:2272 cps/web.py:2276 cps/web.py:2281
-#: cps/web.py:2283
-msgid "register"
-msgstr "s’enregistrer"
-
-#: cps/web.py:2271 cps/web.py:3389
-msgid "An unknown error occurred. Please try again later."
-msgstr "Une erreur inconnue est survenue. Veuillez réessayer plus tard."
-
-#: cps/web.py:2274
-msgid "Your e-mail is not allowed to register"
-msgstr "Votre adresse de courriel n’est pas autorisé pour une inscription"
-
-#: cps/web.py:2277
-msgid "Confirmation e-mail was send to your e-mail account."
-msgstr "Le courriel de confirmation a été envoyé à votre adresse."
-
-#: cps/web.py:2280
-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:2297 cps/web.py:2393
-#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
-msgstr "Vous êtes maintenant connecté sous : '%(nickname)s'"
-
-#: cps/web.py:2302
-msgid "Wrong Username or Password"
-msgstr "Mauvais nom d'utilisateur ou mot de passe"
-
-#: cps/web.py:2308 cps/web.py:2329
-msgid "login"
-msgstr "connexion"
-
-#: cps/web.py:2341 cps/web.py:2372
-msgid "Token not found"
-msgstr "Jeton non trouvé"
-
-#: cps/web.py:2349 cps/web.py:2380
-msgid "Token has expired"
-msgstr "Jeton expiré"
-
-#: cps/web.py:2357
-msgid "Success! Please return to your device"
-msgstr "Réussite! Merci de vous tourner vers votre appareil"
-
-#: cps/web.py:2407
-msgid "Please configure the SMTP mail settings first..."
-msgstr "Veuillez configurer les paramètres SMTP au préalable…"
-
-#: cps/web.py:2412
-#, 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:2416
-#, 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:2418 cps/web.py:3223
-msgid "Please configure your kindle e-mail address first..."
-msgstr "Veuillez configurer votre adresse de courriel Kindle en premier lieu…"
-
-#: cps/web.py:2429 cps/web.py:2481
-msgid "Invalid shelf specified"
-msgstr "L’étagère indiquée est invalide"
-
-#: cps/web.py:2436
-#, python-format
-msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
-msgstr "Désolé, vous n’êtes pas autorisé à ajouter un livre dans l’étagère %(shelfname)s"
-
-#: cps/web.py:2444
-msgid "You are not allowed to edit public shelves"
-msgstr "Désolé, vous n’êtes pas autorisé à éditer les étagères publiques"
-
-#: cps/web.py:2453
-#, python-format
-msgid "Book is already part of the shelf: %(shelfname)s"
-msgstr "Ce livre est déjà sur l’étagère : %(shelfname)s"
-
-#: cps/web.py:2467
-#, python-format
-msgid "Book has been added to shelf: %(sname)s"
-msgstr "Le livre a bien été ajouté à l'étagère : %(sname)s"
-
-#: cps/web.py:2486
-#, python-format
-msgid "You are not allowed to add a book to the the shelf: %(name)s"
-msgstr "Vous n’êtes pas autorisé à ajouter un livre dans l’étagère %(name)s"
-
-#: cps/web.py:2491
-msgid "User is not allowed to edit public shelves"
-msgstr "L’utilisateur n’est pas autorisé à éditer les étagères publiques"
-
-#: cps/web.py:2509
-#, python-format
-msgid "Books are already part of the shelf: %(name)s"
-msgstr "Ces livres sont déjà sur l’étagère : %(name)s"
-
-#: cps/web.py:2523
-#, python-format
-msgid "Books have been added to shelf: %(sname)s"
-msgstr "Les livres ont été ajoutés à l’étagère : %(sname)s"
-
-#: cps/web.py:2525
-#, python-format
-msgid "Could not add books to shelf: %(sname)s"
-msgstr "Impossible d’ajouter les livres à l’étagère : %(sname)s"
-
-#: cps/web.py:2562
-#, python-format
-msgid "Book has been removed from shelf: %(sname)s"
-msgstr "Le livre a été supprimé de l'étagère %(sname)s"
-
-#: cps/web.py:2568
-#, python-format
-msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
-msgstr "Désolé, vous n’êtes pas autorisé à enlever un livre de cette étagère : %(sname)s"
-
-#: cps/web.py:2589 cps/web.py:2613
-#, python-format
-msgid "A shelf with the name '%(title)s' already exists."
-msgstr "Une étagère de ce nom '%(title)s' existe déjà."
-
-#: cps/web.py:2594
-#, python-format
-msgid "Shelf %(title)s created"
-msgstr "Étagère %(title)s créée"
-
-#: cps/web.py:2596 cps/web.py:2624
-msgid "There was an error"
-msgstr "Il y a eu une erreur"
-
-#: cps/web.py:2597 cps/web.py:2599
-msgid "create a shelf"
-msgstr "Créer une étagère"
-
-#: cps/web.py:2622
-#, python-format
-msgid "Shelf %(title)s changed"
-msgstr "L’étagère %(title)s a été modifiée"
-
-#: cps/web.py:2625 cps/web.py:2627
-msgid "Edit a shelf"
-msgstr "Modifier une étagère"
-
-#: cps/web.py:2648
-#, python-format
-msgid "successfully deleted shelf %(name)s"
-msgstr "l’étagère %(name)s a été supprimé avec succès"
-
-#: cps/web.py:2675
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Étagère : '%(name)s'"
-
-#: cps/web.py:2678
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "Erreur à l’ouverture de l’étagère. Elle n’existe plus ou n’est plus accessible."
-
-#: cps/web.py:2709
-#, python-format
-msgid "Change order of Shelf: '%(name)s'"
-msgstr "Modifier l’arrangement de l’étagère : ‘%(name)s’"
-
-#: cps/web.py:2738 cps/web.py:3176
-msgid "E-mail is not from valid domain"
-msgstr "Cette adresse de courriel n’appartient pas à un domaine valide"
-
-#: cps/web.py:2740 cps/web.py:2782 cps/web.py:2785
-#, python-format
-msgid "%(name)s's profile"
-msgstr "Profil de %(name)s"
-
-#: cps/web.py:2780
-msgid "Found an existing account for this e-mail address."
-msgstr "Un compte existant a été trouvé pour cette adresse de courriel"
-
-#: cps/web.py:2783
-msgid "Profile updated"
-msgstr "Profil mis à jour"
-
-#: cps/web.py:2814
+#: cps/admin.py:139
 msgid "Admin page"
 msgstr "Page administrateur"
 
-#: cps/web.py:2899 cps/web.py:3079
+#: cps/admin.py:208 cps/admin.py:486
 msgid "Calibre-Web configuration updated"
 msgstr "Configuration de Calibre-Web mise à jour"
 
-#: cps/templates/admin.html:100 cps/web.py:2913
+#: cps/admin.py:222 cps/templates/admin.html:102
 msgid "UI Configuration"
 msgstr "Configuration de l’interface utilisateur"
 
-#: cps/web.py:2931
+#: cps/admin.py:295
 msgid "Import of optional Google Drive requirements missing"
 msgstr "L’import des pré-requis optionnels pour Google Drive est manquant"
 
-#: cps/web.py:2934
+#: cps/admin.py:298
 msgid "client_secrets.json is missing or not readable"
 msgstr "client_secrets.json est manquant ou ne peut être lu"
 
-#: cps/web.py:2939 cps/web.py:2968
+#: cps/admin.py:303 cps/admin.py:332
 msgid "client_secrets.json is not configured for web application"
 msgstr "client_secrets.json n’est pas configuré pour une application web"
 
-#: cps/templates/admin.html:99 cps/web.py:2971 cps/web.py:2997 cps/web.py:3009
-#: cps/web.py:3054 cps/web.py:3069 cps/web.py:3088 cps/web.py:3096
-#: cps/web.py:3112
+#: cps/admin.py:335 cps/admin.py:361 cps/admin.py:373 cps/admin.py:398
+#: cps/admin.py:426 cps/admin.py:440 cps/admin.py:463 cps/admin.py:476
+#: cps/admin.py:494 cps/admin.py:501 cps/admin.py:516
+#: cps/templates/admin.html:101
 msgid "Basic Configuration"
 msgstr "Configuration principale"
 
-#: cps/web.py:2994
+#: cps/admin.py:358
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr "L’emplacement du fichier de la clé de chiffrement (keyfile) n’est pas valide, veuillez saisir un chemin d’accès correct"
 
-#: cps/web.py:3006
+#: cps/admin.py:370
 msgid "Certfile location is not valid, please enter correct path"
 msgstr "L’emplacement du fichier de certificat (cert) n’est pas valide, veuillez saisir un chemin d’accès correct"
 
-#: cps/web.py:3051
+#: cps/admin.py:395
+msgid "Please enter a LDAP provider and a DN"
+msgstr ""
+
+#: cps/admin.py:423
+msgid "Please enter Github oauth credentials"
+msgstr ""
+
+#: cps/admin.py:437
+msgid "Please enter Google oauth credentials"
+msgstr ""
+
+#: cps/admin.py:460
 msgid "Logfile location is not valid, please enter correct path"
 msgstr "L’emplacement du fichier de Log n’est pas valide, veuillez saisir un chemin d’accès correct"
 
-#: cps/web.py:3092
+#: cps/admin.py:498
 msgid "DB location is not valid, please enter correct path"
 msgstr "L’emplacement du fichier de base de donnée (DB) n’est pas valide, veuillez saisir un chemin d’accès correct"
 
-#: cps/templates/admin.html:33 cps/web.py:3172 cps/web.py:3178 cps/web.py:3194
+#: cps/admin.py:558 cps/web.py:1045
+msgid "Please fill out all fields!"
+msgstr "SVP, complétez tous les champs !"
+
+#: cps/admin.py:560 cps/admin.py:566 cps/admin.py:582
+#: cps/templates/admin.html:35
 msgid "Add new user"
 msgstr "Ajouter un nouvel utilisateur"
 
-#: cps/web.py:3184
+#: cps/admin.py:564 cps/web.py:1248
+msgid "E-mail is not from valid domain"
+msgstr "Cette adresse de courriel n’appartient pas à un domaine valide"
+
+#: cps/admin.py:572
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Utilisateur '%(user)s' créé"
 
-#: cps/web.py:3188
+#: cps/admin.py:576
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Un compte existant a été trouvé pour cette adresse de courriel ou pour ce surnom."
 
-#: cps/web.py:3218
+#: cps/admin.py:607
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Courriel de test envoyé avec succès sur %(kindlemail)s"
 
-#: cps/web.py:3221
+#: cps/admin.py:610
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Il y a eu une erreur pendant l’envoi du courriel de test : %(res)s"
 
-#: cps/web.py:3225
+#: cps/admin.py:612 cps/web.py:1029
+msgid "Please configure your kindle e-mail address first..."
+msgstr "Veuillez configurer votre adresse de courriel Kindle en premier lieu…"
+
+#: cps/admin.py:614
 msgid "E-mail server settings updated"
 msgstr "Les paramètres du serveur de courriels ont été mis à jour"
 
-#: cps/web.py:3226
+#: cps/admin.py:615
 msgid "Edit e-mail server settings"
 msgstr "Modifier les paramètres du serveur de courriels"
 
-#: cps/web.py:3251
+#: cps/admin.py:640
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Utilisateur '%(nick)s' supprimé"
 
-#: cps/web.py:3364
+#: cps/admin.py:711
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Utilisateur '%(nick)s'  mis à jour"
 
-#: cps/web.py:3367
+#: cps/admin.py:714
 msgid "An unknown error occured."
 msgstr "Oups ! Une erreur inconnue a eu lieu."
 
-#: cps/web.py:3369
+#: cps/admin.py:717
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Éditer l'utilisateur %(nick)s"
 
-#: cps/web.py:3386
+#: cps/admin.py:733
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Le mot de passe de l’utilisateur %(user)s a été réinitialisé"
 
-#: cps/web.py:3400 cps/web.py:3592
+#: cps/admin.py:736 cps/web.py:1070
+msgid "An unknown error occurred. Please try again later."
+msgstr "Une erreur inconnue est survenue. Veuillez réessayer plus tard."
+
+#: cps/admin.py:755
+msgid "Requesting update package"
+msgstr "Demander une mise à jour"
+
+#: cps/admin.py:756
+msgid "Downloading update package"
+msgstr "Téléchargement la mise à jour"
+
+#: cps/admin.py:757
+msgid "Unzipping update package"
+msgstr "Décompression de la mise à jour"
+
+#: cps/admin.py:758
+msgid "Replacing files"
+msgstr "Remplacement des fichiers"
+
+#: cps/admin.py:759
+msgid "Database connections are closed"
+msgstr "Connexion à la base de donnée fermée"
+
+#: cps/admin.py:760
+msgid "Stopping server"
+msgstr "Arrêt du serveur"
+
+#: cps/admin.py:761
+msgid "Update finished, please press okay and reload page"
+msgstr "Mise à jour terminée, merci d’appuyer sur okay et de rafraîchir la page"
+
+#: cps/admin.py:762 cps/admin.py:763 cps/admin.py:764 cps/admin.py:765
+msgid "Update failed:"
+msgstr "La mise à jour à échouée : "
+
+#: cps/admin.py:762 cps/updater.py:277 cps/updater.py:456 cps/updater.py:458
+msgid "HTTP Error"
+msgstr "Erreur HTTP"
+
+#: cps/admin.py:763 cps/updater.py:279 cps/updater.py:460
+msgid "Connection error"
+msgstr "Erreur de connexion"
+
+#: cps/admin.py:764 cps/updater.py:281 cps/updater.py:462
+msgid "Timeout while establishing connection"
+msgstr "Délai d'attente dépassé lors de l'établissement de connexion"
+
+#: cps/admin.py:765 cps/updater.py:283 cps/updater.py:464
+msgid "General error"
+msgstr "Erreur générale"
+
+#: cps/converter.py:31 cps/converter.py:48 cps/uploader.py:213
+#: cps/uploader.py:214 cps/uploader.py:218 cps/uploader.py:222
+#: cps/uploader.py:226
+msgid "not installed"
+msgstr "non installé"
+
+#: cps/converter.py:43 cps/converter.py:60
+msgid "Excecution permissions missing"
+msgstr "Permission d’exécution manquante"
+
+#: cps/converter.py:70
+msgid "not configured"
+msgstr "non configuré"
+
+#: cps/editbooks.py:218 cps/editbooks.py:432
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Erreur à l’ouverture du livre. Le fichier n’existe pas ou n’est pas accessible"
 
-#: cps/web.py:3428
+#: cps/editbooks.py:246
 msgid "edit metadata"
 msgstr "modifier les métadonnées"
 
-#: cps/web.py:3521 cps/web.py:3754
+#: cps/editbooks.py:325 cps/editbooks.py:595
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "L’extension de fichier '%(ext)s' n’est pas autorisée pour être déposée sur ce serveur"
 
-#: cps/web.py:3525 cps/web.py:3757
+#: cps/editbooks.py:329 cps/editbooks.py:599
 msgid "File to be uploaded must have an extension"
 msgstr "Pour être déposé le fichier doit avoir une extension"
 
-#: cps/web.py:3537 cps/web.py:3776
+#: cps/editbooks.py:341 cps/editbooks.py:619
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Impossible de créer le chemin %(path)s (permission refusée)"
 
-#: cps/web.py:3542
+#: cps/editbooks.py:346
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Echec de la sauvegarde du fichier %(file)s."
 
-#: cps/web.py:3559
+#: cps/editbooks.py:363
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Le format de fichier %(ext)s a été ajouté à %(book)s"
 
-#: cps/web.py:3573 cps/web.py:3646
+#: cps/editbooks.py:382
+#, python-format
+msgid "Failed to create path for cover %(path)s (Permission denied)."
+msgstr ""
+
+#: cps/editbooks.py:390
+#, python-format
+msgid "Failed to store cover-file %(cover)s."
+msgstr ""
+
+#: cps/editbooks.py:393
+msgid "Cover-file is not a valid image file"
+msgstr ""
+
+#: cps/editbooks.py:399 cps/editbooks.py:413
 msgid "Cover is not a supported imageformat (jpg/png/webp), can't save"
 msgstr ""
 
-#: cps/web.py:3605 cps/web.py:3614
+#: cps/editbooks.py:445 cps/editbooks.py:454
 msgid "unknown"
 msgstr "inconnu"
 
-#: cps/web.py:3694
+#: cps/editbooks.py:486
+msgid "Cover is not a jpg file, can't save"
+msgstr ""
+
+#: cps/editbooks.py:534
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s n'est pas une langue valide"
 
-#: cps/web.py:3725
+#: cps/editbooks.py:565
 msgid "Metadata successfully updated"
 msgstr "Les métadonnées ont bien été mise à jour"
 
-#: cps/web.py:3734
+#: cps/editbooks.py:574
 msgid "Error editing book, please check logfile for details"
 msgstr "Erreur d’édition du livre, veuillez consulter le journal (log) pour plus de détails"
 
-#: cps/web.py:3780
+#: cps/editbooks.py:624
 #, python-format
 msgid "Failed to store file %(file)s (Permission denied)."
 msgstr "Impossible d'enregistrer le fichier %(file)s (permission refusée)"
 
-#: cps/web.py:3785
+#: cps/editbooks.py:629
 #, python-format
 msgid "Failed to delete file %(file)s (Permission denied)."
 msgstr "Impossible de supprimer le fichier %(file)s (permission refusée)"
 
-#: cps/web.py:3867
+#: cps/editbooks.py:712
 #, python-format
-msgid "File %(title)s"
+msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/web.py:3896
+#: cps/editbooks.py:741
 msgid "Source or destination format for conversion missing"
 msgstr "Le format de conversion de la source ou de la destination est manquant"
 
-#: cps/web.py:3906
+#: cps/editbooks.py:751
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Le livre a été mis avec succès en file de traitement pour conversion vers %(book_format)s"
 
-#: cps/web.py:3910
+#: cps/editbooks.py:755
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Une erreur est survenue au cours de la conversion du livre : %(res)s"
 
-#: cps/worker.py:305
+#: cps/gdrive.py:56
+msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
+msgstr ""
+
+#: cps/gdrive.py:101
+msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
+msgstr "Le domaine de retour d’appel (Callback domain) est non vérifié, Veuillez suivre les étapes nécessaires pour vérifier le domaine dans la console de développement de Google"
+
+#: cps/helper.py:97
+#, python-format
+msgid "%(format)s format not found for book id: %(book)d"
+msgstr "le format %(format)s est introuvable pour le livre : %(book)d"
+
+#: cps/helper.py:109
+#, python-format
+msgid "%(format)s not found on Google Drive: %(fn)s"
+msgstr "le %(format)s est introuvable sur Google Drive : %(fn)s"
+
+#: cps/helper.py:116 cps/helper.py:223 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Envoyer vers Kindle"
+
+#: cps/helper.py:117 cps/helper.py:135 cps/helper.py:225
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "Ce courriel a été envoyé depuis Calibre-Web."
+
+#: cps/helper.py:128
+#, python-format
+msgid "%(format)s not found: %(fn)s"
+msgstr "%(format)s introuvable : %(fn)s"
+
+#: cps/helper.py:133
+msgid "Calibre-Web test e-mail"
+msgstr "Courriel de test de Calibre-Web"
+
+#: cps/helper.py:134
+msgid "Test e-mail"
+msgstr "Courriel de test"
+
+#: cps/helper.py:150
+msgid "Get Started with Calibre-Web"
+msgstr "Bien démarrer avec Calibre-Web"
+
+#: cps/helper.py:151
+#, python-format
+msgid "Registration e-mail for user: %(name)s"
+msgstr "Courriel d’inscription pour l’utilisateur : %(name)s"
+
+#: cps/helper.py:165 cps/helper.py:167 cps/helper.py:169 cps/helper.py:177
+#: cps/helper.py:179 cps/helper.py:181
+#, python-format
+msgid "Send %(format)s to Kindle"
+msgstr "Envoyer %(format)s vers le Kindle"
+
+#: cps/helper.py:185
+#, python-format
+msgid "Convert %(orig)s to %(format)s and send to Kindle"
+msgstr "Convertir de %(orig)s vers %(format)s et envoyer au Kindle"
+
+#: cps/helper.py:224
+#, python-format
+msgid "E-mail: %(book)s"
+msgstr "Courriel : %(book)s"
+
+#: cps/helper.py:227
+msgid "The requested file could not be read. Maybe wrong permissions?"
+msgstr "Le fichier demandé n’a pu être lu. Problème de permission d’accès ?"
+
+#: cps/helper.py:335
+#, python-format
+msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "Renommer le titre de : '%(src)s' à '%(dest)s' a échoué avec l’erreur : %(error)s"
+
+#: cps/helper.py:345
+#, python-format
+msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "Renommer l’auteur de : '%(src)s' à '%(dest)s' a échoué avec l’erreur : %(error)s"
+
+#: cps/helper.py:359
+#, python-format
+msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "La modification du nom de fichier du chemin : '%(src)s' vers '%(dest)s' a échoué avec l’erreur : %(error)s"
+
+#: cps/helper.py:385 cps/helper.py:395 cps/helper.py:403
+#, python-format
+msgid "File %(file)s not found on Google Drive"
+msgstr ""
+
+#: cps/helper.py:424
+#, python-format
+msgid "Book path %(path)s not found on Google Drive"
+msgstr ""
+
+#: cps/helper.py:584
+msgid "Error excecuting UnRar"
+msgstr ""
+
+#: cps/helper.py:586
+msgid "Unrar binary file not found"
+msgstr ""
+
+#: cps/helper.py:614
+msgid "Waiting"
+msgstr ""
+
+#: cps/helper.py:616
+msgid "Failed"
+msgstr ""
+
+#: cps/helper.py:618
+msgid "Started"
+msgstr ""
+
+#: cps/helper.py:620
+msgid "Finished"
+msgstr "Terminé"
+
+#: cps/helper.py:622
+msgid "Unknown Status"
+msgstr "Statut inconnu"
+
+#: cps/helper.py:627
+msgid "E-mail: "
+msgstr "Courriel : "
+
+#: cps/helper.py:629 cps/helper.py:633
+msgid "Convert: "
+msgstr "Convertir vers : "
+
+#: cps/helper.py:631
+msgid "Upload: "
+msgstr "Déposer : "
+
+#: cps/helper.py:635
+msgid "Unknown Task: "
+msgstr "Tâche inconnue : "
+
+#: cps/oauth_bb.py:87
+#, python-format
+msgid "Register with %s, "
+msgstr ""
+
+#: cps/oauth_bb.py:145
+msgid "Failed to log in with GitHub."
+msgstr ""
+
+#: cps/oauth_bb.py:150
+msgid "Failed to fetch user info from GitHub."
+msgstr ""
+
+#: cps/oauth_bb.py:161
+msgid "Failed to log in with Google."
+msgstr ""
+
+#: cps/oauth_bb.py:166
+msgid "Failed to fetch user info from Google."
+msgstr ""
+
+#: cps/oauth_bb.py:265
+#, python-format
+msgid "Unlink to %(oauth)s success."
+msgstr ""
+
+#: cps/oauth_bb.py:269
+#, python-format
+msgid "Unlink to %(oauth)s failed."
+msgstr ""
+
+#: cps/oauth_bb.py:272
+#, python-format
+msgid "Not linked to %(oauth)s."
+msgstr ""
+
+#: cps/oauth_bb.py:300
+msgid "GitHub Oauth error, please retry later."
+msgstr ""
+
+#: cps/oauth_bb.py:319
+msgid "Google Oauth error, please retry later."
+msgstr ""
+
+#: cps/shelf.py:40 cps/shelf.py:92
+msgid "Invalid shelf specified"
+msgstr "L’étagère indiquée est invalide"
+
+#: cps/shelf.py:47
+#, python-format
+msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
+msgstr "Désolé, vous n’êtes pas autorisé à ajouter un livre dans l’étagère %(shelfname)s"
+
+#: cps/shelf.py:55
+msgid "You are not allowed to edit public shelves"
+msgstr "Désolé, vous n’êtes pas autorisé à éditer les étagères publiques"
+
+#: cps/shelf.py:64
+#, python-format
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr "Ce livre est déjà sur l’étagère : %(shelfname)s"
+
+#: cps/shelf.py:78
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "Le livre a bien été ajouté à l'étagère : %(sname)s"
+
+#: cps/shelf.py:97
+#, python-format
+msgid "You are not allowed to add a book to the the shelf: %(name)s"
+msgstr "Vous n’êtes pas autorisé à ajouter un livre dans l’étagère %(name)s"
+
+#: cps/shelf.py:102
+msgid "User is not allowed to edit public shelves"
+msgstr "L’utilisateur n’est pas autorisé à éditer les étagères publiques"
+
+#: cps/shelf.py:120
+#, python-format
+msgid "Books are already part of the shelf: %(name)s"
+msgstr "Ces livres sont déjà sur l’étagère : %(name)s"
+
+#: cps/shelf.py:134
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr "Les livres ont été ajoutés à l’étagère : %(sname)s"
+
+#: cps/shelf.py:136
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr "Impossible d’ajouter les livres à l’étagère : %(sname)s"
+
+#: cps/shelf.py:173
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "Le livre a été supprimé de l'étagère %(sname)s"
+
+#: cps/shelf.py:179
+#, python-format
+msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
+msgstr "Désolé, vous n’êtes pas autorisé à enlever un livre de cette étagère : %(sname)s"
+
+#: cps/shelf.py:200 cps/shelf.py:224
+#, python-format
+msgid "A shelf with the name '%(title)s' already exists."
+msgstr "Une étagère de ce nom '%(title)s' existe déjà."
+
+#: cps/shelf.py:205
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "Étagère %(title)s créée"
+
+#: cps/shelf.py:207 cps/shelf.py:235
+msgid "There was an error"
+msgstr "Il y a eu une erreur"
+
+#: cps/shelf.py:208 cps/shelf.py:210
+msgid "create a shelf"
+msgstr "Créer une étagère"
+
+#: cps/shelf.py:233
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "L’étagère %(title)s a été modifiée"
+
+#: cps/shelf.py:236 cps/shelf.py:238
+msgid "Edit a shelf"
+msgstr "Modifier une étagère"
+
+#: cps/shelf.py:259
+#, python-format
+msgid "successfully deleted shelf %(name)s"
+msgstr "l’étagère %(name)s a été supprimé avec succès"
+
+#: cps/shelf.py:289
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Étagère : '%(name)s'"
+
+#: cps/shelf.py:292
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "Erreur à l’ouverture de l’étagère. Elle n’existe plus ou n’est plus accessible."
+
+#: cps/shelf.py:324
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "Modifier l’arrangement de l’étagère : ‘%(name)s’"
+
+#: cps/ub.py:111
+msgid "Recently Added"
+msgstr "Ajouts récents"
+
+#: cps/ub.py:113
+msgid "Show recent books"
+msgstr "Afficher les livres récents"
+
+#: cps/templates/index.xml:17 cps/ub.py:114
+msgid "Hot Books"
+msgstr "Livres populaires"
+
+#: cps/ub.py:115
+msgid "Show hot books"
+msgstr "Montrer les livres populaires"
+
+#: cps/templates/index.xml:24 cps/ub.py:118
+msgid "Best rated Books"
+msgstr "Livres les mieux notés"
+
+#: cps/ub.py:120
+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:121
+#: cps/web.py:965
+msgid "Read Books"
+msgstr "Livres lus"
+
+#: cps/ub.py:123
+msgid "Show read and unread"
+msgstr "Montrer lu et non-lu"
+
+#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:125
+#: cps/web.py:969
+msgid "Unread Books"
+msgstr "Livres non-lus"
+
+#: cps/ub.py:127
+msgid "Show unread"
+msgstr ""
+
+#: cps/ub.py:128
+msgid "Discover"
+msgstr "Découvrir"
+
+#: cps/ub.py:130
+msgid "Show random books"
+msgstr "Montrer des livres au hasard"
+
+#: cps/ub.py:131
+msgid "Categories"
+msgstr "Catégories"
+
+#: cps/ub.py:133
+msgid "Show category selection"
+msgstr "Montrer la sélection par catégories"
+
+#: cps/templates/book_edit.html:71 cps/templates/search_form.html:53
+#: cps/ub.py:134
+msgid "Series"
+msgstr "Séries"
+
+#: cps/ub.py:136
+msgid "Show series selection"
+msgstr "Montrer la sélection par séries"
+
+#: cps/templates/index.xml:61 cps/ub.py:137
+msgid "Authors"
+msgstr "Auteurs"
+
+#: cps/ub.py:139
+msgid "Show author selection"
+msgstr "Montrer la sélection par auteur"
+
+#: cps/templates/index.xml:68 cps/ub.py:141
+msgid "Publishers"
+msgstr "Editeurs"
+
+#: cps/ub.py:143
+msgid "Show publisher selection"
+msgstr "Montrer la sélection par éditeur"
+
+#: cps/templates/search_form.html:74 cps/ub.py:144
+msgid "Languages"
+msgstr "Langues"
+
+#: cps/ub.py:147
+msgid "Show language selection"
+msgstr "Montrer la sélection par langue"
+
+#: cps/ub.py:148
+msgid "Ratings"
+msgstr ""
+
+#: cps/ub.py:150
+msgid "Show ratings selection"
+msgstr ""
+
+#: cps/ub.py:151
+msgid "File formats"
+msgstr ""
+
+#: cps/ub.py:153
+msgid "Show file formats selection"
+msgstr ""
+
+#: cps/updater.py:257 cps/updater.py:364 cps/updater.py:377
+msgid "Unexpected data while reading update information"
+msgstr "Données inattendues lors de la lecture des informations de mise à jour"
+
+#: cps/updater.py:264 cps/updater.py:370
+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:290 cps/updater.py:422
+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:343
+msgid "Could not fetch update information"
+msgstr "Impossible d'extraire les informations de mise à jour"
+
+#: cps/updater.py:357
+msgid "No release information available"
+msgstr "Aucune information concernant cette version n’est disponible"
+
+#: cps/updater.py:403 cps/updater.py:412
+#, 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/web.py:457
+msgid "Recently Added Books"
+msgstr "Ajouts récents"
+
+#: cps/web.py:484
+msgid "Best rated books"
+msgstr "Livres les mieux notés"
+
+#: cps/templates/index.xml:38 cps/web.py:492
+msgid "Random Books"
+msgstr "Livres au hasard"
+
+#: cps/web.py:516
+msgid "Books"
+msgstr ""
+
+#: cps/web.py:543
+msgid "Hot Books (most downloaded)"
+msgstr "Livres populaires (les plus téléchargés)"
+
+#: cps/web.py:553 cps/web.py:1294 cps/web.py:1383
+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:580
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr "Editeur : '%(name)s'"
+
+#: cps/web.py:591
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "Séries : %(serie)s"
+
+#: cps/web.py:602
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr ""
+
+#: cps/web.py:613
+#, python-format
+msgid "File format: %(format)s"
+msgstr ""
+
+#: cps/web.py:625
+#, python-format
+msgid "Category: %(name)s"
+msgstr "Catégorie : %(name)s"
+
+#: cps/web.py:659
+msgid "Publisher list"
+msgstr "Liste des éditeurs"
+
+#: cps/templates/index.xml:82 cps/web.py:675
+msgid "Series list"
+msgstr "Liste des séries"
+
+#: cps/web.py:689
+msgid "Ratings list"
+msgstr ""
+
+#: cps/web.py:702
+msgid "File formats list"
+msgstr ""
+
+#: cps/web.py:730
+msgid "Available languages"
+msgstr "Langues disponibles"
+
+#: cps/web.py:750
+#, python-format
+msgid "Language: %(name)s"
+msgstr "Langue : %(name)s"
+
+#: cps/templates/index.xml:75 cps/web.py:764
+msgid "Category list"
+msgstr "Liste des catégories"
+
+#: cps/templates/layout.html:73 cps/web.py:777
+msgid "Tasks"
+msgstr "Tâches"
+
+#: cps/web.py:841
+msgid "Published after "
+msgstr "Publié après le "
+
+#: cps/web.py:848
+msgid "Published before "
+msgstr "Publié avant le "
+
+#: cps/web.py:862
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Évaluation <= %(rating)s"
+
+#: cps/web.py:864
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Évaluation >= %(rating)s"
+
+#: cps/web.py:924 cps/web.py:933
+msgid "search"
+msgstr "recherche"
+
+#: cps/web.py:1018
+msgid "Please configure the SMTP mail settings first..."
+msgstr "Veuillez configurer les paramètres SMTP au préalable…"
+
+#: cps/web.py:1023
+#, 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:1027
+#, 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:1046 cps/web.py:1071 cps/web.py:1076 cps/web.py:1081
+#: cps/web.py:1085
+msgid "register"
+msgstr "s’enregistrer"
+
+#: cps/web.py:1073
+msgid "Your e-mail is not allowed to register"
+msgstr "Votre adresse de courriel n’est pas autorisé pour une inscription"
+
+#: cps/web.py:1077
+msgid "Confirmation e-mail was send to your e-mail account."
+msgstr "Le courriel de confirmation a été envoyé à votre adresse."
+
+#: cps/web.py:1080
+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:1103 cps/web.py:1115
+#, python-format
+msgid "You are now logged in as: '%(nickname)s'"
+msgstr ""
+
+#: cps/web.py:1108 cps/web.py:1120
+msgid "Wrong Username or Password"
+msgstr "Mauvais nom d'utilisateur ou mot de passe"
+
+#: cps/web.py:1111
+msgid "Could not login. LDAP server down, please contact your administrator"
+msgstr ""
+
+#: cps/web.py:1124 cps/web.py:1146
+msgid "login"
+msgstr "connexion"
+
+#: cps/web.py:1158 cps/web.py:1189
+msgid "Token not found"
+msgstr "Jeton non trouvé"
+
+#: cps/web.py:1166 cps/web.py:1197
+msgid "Token has expired"
+msgstr "Jeton expiré"
+
+#: cps/web.py:1174
+msgid "Success! Please return to your device"
+msgstr "Réussite! Merci de vous tourner vers votre appareil"
+
+#: cps/web.py:1210
+#, python-format
+msgid "you are now logged in as: '%(nickname)s'"
+msgstr "Vous êtes maintenant connecté sous : '%(nickname)s'"
+
+#: cps/web.py:1250 cps/web.py:1277 cps/web.py:1281
+#, python-format
+msgid "%(name)s's profile"
+msgstr "Profil de %(name)s"
+
+#: cps/web.py:1274
+msgid "Found an existing account for this e-mail address."
+msgstr "Un compte existant a été trouvé pour cette adresse de courriel"
+
+#: cps/web.py:1279
+msgid "Profile updated"
+msgstr "Profil mis à jour"
+
+#: cps/web.py:1304 cps/web.py:1306 cps/web.py:1308 cps/web.py:1314
+#: cps/web.py:1318
+msgid "Read a Book"
+msgstr "Lire un livre"
+
+#: cps/web.py:1328
+msgid "Error opening eBook. File does not exist or file is not accessible."
+msgstr ""
+
+#: cps/worker.py:308
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "La commande ebook-convert a échouée : %(error)s"
 
-#: cps/worker.py:316
+#: cps/worker.py:319
 #, python-format
 msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "La commande Kindlegen a échouée avec le code d’erreur : %(error)s et le message : %(message)s"
@@ -793,147 +982,152 @@ msgstr "DLS"
 msgid "Admin"
 msgstr "Administration"
 
-#: cps/templates/admin.html:14 cps/templates/detail.html:22
-#: cps/templates/detail.html:31
+#: cps/templates/admin.html:14 cps/templates/detail.html:18
+#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/shelfdown.html:62
 msgid "Download"
 msgstr "Télécharger"
 
-#: cps/templates/admin.html:15 cps/templates/layout.html:65
+#: cps/templates/admin.html:15
+msgid "View Ebooks"
+msgstr ""
+
+#: cps/templates/admin.html:16 cps/templates/layout.html:65
 msgid "Upload"
 msgstr "Déposer"
 
-#: cps/templates/admin.html:16
+#: cps/templates/admin.html:17
 msgid "Edit"
 msgstr "Éditer"
 
-#: cps/templates/admin.html:39
+#: cps/templates/admin.html:41
 msgid "SMTP e-mail server settings"
 msgstr "Paramètres du serveur SMTP"
 
-#: cps/templates/admin.html:42 cps/templates/email_edit.html:11
+#: cps/templates/admin.html:44 cps/templates/email_edit.html:11
 msgid "SMTP hostname"
 msgstr "Adresse du serveur SMTP"
 
-#: cps/templates/admin.html:43
+#: cps/templates/admin.html:45
 msgid "SMTP port"
 msgstr "Port du serveur SMTP"
 
-#: cps/templates/admin.html:44
+#: cps/templates/admin.html:46
 msgid "SSL"
 msgstr "SSL"
 
-#: cps/templates/admin.html:45 cps/templates/email_edit.html:27
+#: cps/templates/admin.html:47 cps/templates/email_edit.html:27
 msgid "SMTP login"
 msgstr "Compte utilisateur SMTP"
 
-#: cps/templates/admin.html:46
+#: cps/templates/admin.html:48
 msgid "From mail"
 msgstr "Expéditeur des courriels"
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:58
 msgid "Change SMTP settings"
 msgstr "Modifier les paramètres SMTP"
 
-#: cps/templates/admin.html:62
+#: cps/templates/admin.html:64
 msgid "Configuration"
 msgstr "Configuration"
 
-#: cps/templates/admin.html:65
+#: cps/templates/admin.html:67
 msgid "Calibre DB dir"
 msgstr "Répertoire de la base de donnée Calibre"
 
-#: cps/templates/admin.html:69
+#: cps/templates/admin.html:71
 msgid "Log level"
 msgstr "Niveau de journalisation"
 
-#: cps/templates/admin.html:73
+#: cps/templates/admin.html:75
 msgid "Port"
 msgstr "Port"
 
-#: cps/templates/admin.html:79 cps/templates/config_view_edit.html:23
+#: cps/templates/admin.html:81 cps/templates/config_view_edit.html:23
 msgid "Books per page"
 msgstr "Livres par page"
 
-#: cps/templates/admin.html:83
+#: cps/templates/admin.html:85
 msgid "Uploading"
 msgstr "Dépôt de fichier"
 
-#: cps/templates/admin.html:87
+#: cps/templates/admin.html:89
 msgid "Anonymous browsing"
 msgstr "Navigation anonyme"
 
-#: cps/templates/admin.html:91
+#: cps/templates/admin.html:93
 msgid "Public registration"
 msgstr "Inscription public"
 
-#: cps/templates/admin.html:95 cps/templates/remote_login.html:4
+#: cps/templates/admin.html:97 cps/templates/remote_login.html:4
 msgid "Remote login"
 msgstr "Connexion (\"magic link\")"
 
-#: cps/templates/admin.html:106
+#: cps/templates/admin.html:108
 msgid "Administration"
 msgstr "Administration"
 
-#: cps/templates/admin.html:107
+#: cps/templates/admin.html:109
 msgid "Reconnect to Calibre DB"
 msgstr "Se reconnecter à Calibre-Web"
 
-#: cps/templates/admin.html:108
+#: cps/templates/admin.html:110
 msgid "Restart Calibre-Web"
 msgstr "Redémarrer Calibre-Web"
 
-#: cps/templates/admin.html:109
+#: cps/templates/admin.html:111
 msgid "Stop Calibre-Web"
 msgstr "Arrêter Calibre-Web"
 
-#: cps/templates/admin.html:115
+#: cps/templates/admin.html:117
 msgid "Update"
 msgstr "Mise à jour de Calibre-Web"
 
-#: cps/templates/admin.html:119
+#: cps/templates/admin.html:121
 msgid "Version"
 msgstr "Version"
 
-#: cps/templates/admin.html:120
+#: cps/templates/admin.html:122
 msgid "Details"
 msgstr "Détails"
 
-#: cps/templates/admin.html:126
+#: cps/templates/admin.html:128
 msgid "Current version"
 msgstr "Version actuellement installée"
 
-#: cps/templates/admin.html:132
+#: cps/templates/admin.html:134
 msgid "Check for update"
 msgstr "Rechercher les mise à jour"
 
-#: cps/templates/admin.html:133
+#: cps/templates/admin.html:135
 msgid "Perform Update"
 msgstr "Effectuer la mise à jour"
 
-#: cps/templates/admin.html:145
+#: cps/templates/admin.html:147
 msgid "Do you really want to restart Calibre-Web?"
 msgstr "Voulez-vous vraiment redémarrer Calibre-Web?"
 
-#: cps/templates/admin.html:150 cps/templates/admin.html:164
-#: cps/templates/admin.html:184 cps/templates/shelf.html:73
+#: cps/templates/admin.html:152 cps/templates/admin.html:166
+#: cps/templates/admin.html:186 cps/templates/shelf.html:72
 msgid "Ok"
 msgstr "D’accord"
 
-#: cps/templates/admin.html:151 cps/templates/admin.html:165
-#: cps/templates/book_edit.html:178 cps/templates/book_edit.html:200
-#: cps/templates/config_edit.html:226 cps/templates/config_view_edit.html:179
-#: cps/templates/email_edit.html:40 cps/templates/email_edit.html:75
-#: cps/templates/layout.html:28 cps/templates/shelf.html:74
+#: cps/templates/admin.html:153 cps/templates/admin.html:167
+#: cps/templates/book_edit.html:174 cps/templates/book_edit.html:196
+#: cps/templates/config_edit.html:281 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/user_edit.html:149
+#: cps/templates/user_edit.html:132
 msgid "Back"
 msgstr "Retour"
 
-#: cps/templates/admin.html:163
+#: cps/templates/admin.html:165
 msgid "Do you really want to stop Calibre-Web?"
 msgstr "Voulez-Vous vraiment arrêter Calibre-Web?"
 
-#: cps/templates/admin.html:175
+#: cps/templates/admin.html:177
 msgid "Updating, please do not reload page"
 msgstr "Mise à jour en cours, ne pas rafraîchir la page"
 
@@ -945,176 +1139,176 @@ msgstr "via"
 msgid "In Library"
 msgstr "Dans la librairie"
 
-#: cps/templates/author.html:50 cps/templates/author.html:97
-#: cps/templates/discover.html:28 cps/templates/index.html:31
-#: cps/templates/index.html:86 cps/templates/search.html:55
-#: cps/templates/shelf.html:37
+#: cps/templates/author.html:34 cps/templates/list.html:14
+#: cps/templates/search.html:41
+msgid "All"
+msgstr ""
+
+#: cps/templates/author.html:58 cps/templates/author.html:105
+#: 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 ""
 
-#: cps/templates/author.html:81
+#: cps/templates/author.html:89
 msgid "More by"
 msgstr "Plus de"
 
-#: cps/templates/book_edit.html:16
+#: cps/templates/book_edit.html:12
 msgid "Delete Book"
 msgstr "Effacer le livre"
 
-#: cps/templates/book_edit.html:19
+#: cps/templates/book_edit.html:15
 msgid "Delete formats:"
 msgstr "Supprimer les formats :"
 
-#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:199
-#: cps/templates/email_edit.html:73 cps/templates/email_edit.html:74
+#: cps/templates/book_edit.html:18 cps/templates/book_edit.html:195
+#: cps/templates/email_edit.html:73
 msgid "Delete"
 msgstr "Supprimer"
 
-#: cps/templates/book_edit.html:30
+#: cps/templates/book_edit.html:26
 msgid "Convert book format:"
 msgstr "Convertir le format du livre :"
 
-#: cps/templates/book_edit.html:34
+#: cps/templates/book_edit.html:30
 msgid "Convert from:"
 msgstr "Convertir depuis :"
 
-#: cps/templates/book_edit.html:36 cps/templates/book_edit.html:43
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
 msgstr "Choisissez un format"
 
-#: cps/templates/book_edit.html:41
+#: cps/templates/book_edit.html:37
 msgid "Convert to:"
 msgstr "Convertir vers :"
 
-#: cps/templates/book_edit.html:50
+#: cps/templates/book_edit.html:46
 msgid "Convert book"
 msgstr "Convertir le livre"
 
-#: cps/templates/book_edit.html:59 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:55 cps/templates/search_form.html:6
 msgid "Book Title"
 msgstr "Titre du livre"
 
-#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:259
-#: cps/templates/book_edit.html:277 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:59 cps/templates/book_edit.html:255
+#: cps/templates/book_edit.html:273 cps/templates/search_form.html:10
 msgid "Author"
 msgstr "Auteur"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:264
-#: cps/templates/book_edit.html:279 cps/templates/search_form.html:106
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:260
+#: cps/templates/book_edit.html:275 cps/templates/search_form.html:106
 msgid "Description"
 msgstr "Description"
 
-#: cps/templates/book_edit.html:71 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:67 cps/templates/search_form.html:33
 msgid "Tags"
 msgstr "Étiquette"
 
-#: cps/templates/book_edit.html:75 cps/templates/layout.html:159
-#: cps/templates/search_form.html:53
-msgid "Series"
-msgstr "Séries"
-
-#: cps/templates/book_edit.html:79
+#: cps/templates/book_edit.html:75
 msgid "Series id"
 msgstr "Numéro dans la série"
 
-#: cps/templates/book_edit.html:83
+#: cps/templates/book_edit.html:79
 msgid "Rating"
 msgstr "Évaluation"
 
-#: cps/templates/book_edit.html:87
+#: cps/templates/book_edit.html:83
 msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
 msgstr "URL de la couverture (jpg, la couverture est déposée sur le serveur et sauvegardée en base, ce champ est ensuite remis à vide)"
 
-#: cps/templates/book_edit.html:91
+#: cps/templates/book_edit.html:87
 msgid "Upload Cover from local drive"
 msgstr "Déposer la couverture depuis un fichier en local…"
 
-#: cps/templates/book_edit.html:96 cps/templates/detail.html:148
+#: cps/templates/book_edit.html:92 cps/templates/detail.html:168
 msgid "Publishing date"
 msgstr "Date de publication "
 
-#: cps/templates/book_edit.html:103 cps/templates/book_edit.html:261
-#: cps/templates/book_edit.html:278 cps/templates/detail.html:139
+#: cps/templates/book_edit.html:99 cps/templates/book_edit.html:257
+#: cps/templates/book_edit.html:274 cps/templates/detail.html:159
 #: cps/templates/search_form.html:14
 msgid "Publisher"
 msgstr "Editeur "
 
-#: cps/templates/book_edit.html:107 cps/templates/user_edit.html:31
+#: cps/templates/book_edit.html:103 cps/templates/user_edit.html:31
 msgid "Language"
 msgstr "Langue"
 
-#: cps/templates/book_edit.html:117 cps/templates/search_form.html:117
+#: cps/templates/book_edit.html:113 cps/templates/search_form.html:117
 msgid "Yes"
 msgstr "Oui"
 
-#: cps/templates/book_edit.html:118 cps/templates/search_form.html:118
+#: cps/templates/book_edit.html:114 cps/templates/search_form.html:118
 msgid "No"
 msgstr "Non"
 
-#: cps/templates/book_edit.html:164
+#: cps/templates/book_edit.html:160
 msgid "Upload format"
 msgstr "Format du fichier déposé"
 
-#: cps/templates/book_edit.html:173
+#: cps/templates/book_edit.html:169
 msgid "view book after edit"
 msgstr "voir le livre après l'édition"
 
-#: cps/templates/book_edit.html:176 cps/templates/book_edit.html:212
+#: cps/templates/book_edit.html:172 cps/templates/book_edit.html:208
 msgid "Get metadata"
 msgstr "Obtenir les métadonnées"
 
-#: cps/templates/book_edit.html:177 cps/templates/config_edit.html:224
-#: cps/templates/config_view_edit.html:178 cps/templates/login.html:20
+#: cps/templates/book_edit.html:173 cps/templates/config_edit.html:279
+#: cps/templates/config_view_edit.html:146 cps/templates/login.html:20
 #: cps/templates/search_form.html:150 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:147
+#: cps/templates/user_edit.html:130
 msgid "Submit"
 msgstr "Soumettre"
 
-#: cps/templates/book_edit.html:191
+#: cps/templates/book_edit.html:187
 msgid "Are you really sure?"
 msgstr "Etes-vous vraiment sur?"
 
-#: cps/templates/book_edit.html:194
+#: cps/templates/book_edit.html:190
 msgid "Book will be deleted from Calibre database"
 msgstr "Le livre va être supprimé de la base de données de Calibre"
 
-#: cps/templates/book_edit.html:195
+#: cps/templates/book_edit.html:191
 msgid "and from hard disk"
 msgstr "et du disque dur"
 
-#: cps/templates/book_edit.html:215
+#: cps/templates/book_edit.html:211
 msgid "Keyword"
 msgstr "Mot-clé"
 
-#: cps/templates/book_edit.html:216
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr " Rechercher le mot-clé "
 
-#: cps/templates/book_edit.html:218 cps/templates/layout.html:47
+#: cps/templates/book_edit.html:214 cps/templates/layout.html:47
 msgid "Go!"
 msgstr "Allez !"
 
-#: cps/templates/book_edit.html:222
+#: cps/templates/book_edit.html:218
 msgid "Click the cover to load metadata to the form"
 msgstr "Cliquer sur la couverture pour importer les métadonnées dans le formulaire"
 
-#: cps/templates/book_edit.html:234 cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:230 cps/templates/book_edit.html:270
 msgid "Loading..."
 msgstr "Chargement…"
 
-#: cps/templates/book_edit.html:239 cps/templates/layout.html:226
-#: cps/templates/layout.html:258
+#: cps/templates/book_edit.html:235 cps/templates/layout.html:187
+#: cps/templates/layout.html:219
 msgid "Close"
 msgstr "Fermer"
 
-#: cps/templates/book_edit.html:266 cps/templates/book_edit.html:280
+#: cps/templates/book_edit.html:262 cps/templates/book_edit.html:276
 msgid "Source"
 msgstr "Source"
 
-#: cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:271
 msgid "Search error!"
 msgstr "Rechercher les erreur!"
 
-#: cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:272
 msgid "No Result(s) found! Please try aonther keyword."
 msgstr "Aucun résultat. Veuillez essayer avec un nouveau mot clé."
 
@@ -1242,35 +1436,87 @@ msgstr "Clé de l’API Goodreads"
 msgid "Goodreads API Secret"
 msgstr "Secret de l’API Goodreads"
 
-#: cps/templates/config_edit.html:187
+#: cps/templates/config_edit.html:181
+msgid "Login type"
+msgstr ""
+
+#: cps/templates/config_edit.html:183
+msgid "Use standard Authentication"
+msgstr ""
+
+#: cps/templates/config_edit.html:185
+msgid "Use LDAP Authentication"
+msgstr ""
+
+#: cps/templates/config_edit.html:188
+msgid "Use GitHub OAuth"
+msgstr ""
+
+#: cps/templates/config_edit.html:189
+msgid "Use Google OAuth"
+msgstr ""
+
+#: cps/templates/config_edit.html:196
+msgid "LDAP Provider URL"
+msgstr ""
+
+#: cps/templates/config_edit.html:200
+msgid "LDAP Distinguished Name (DN)"
+msgstr ""
+
+#: cps/templates/config_edit.html:208
+msgid "Obtain GitHub OAuth Credential"
+msgstr ""
+
+#: cps/templates/config_edit.html:211
+msgid "GitHub OAuth Client Id"
+msgstr ""
+
+#: cps/templates/config_edit.html:215
+msgid "GitHub OAuth Client Secret"
+msgstr ""
+
+#: cps/templates/config_edit.html:221
+msgid "Obtain Google OAuth Credential"
+msgstr ""
+
+#: cps/templates/config_edit.html:224
+msgid "Google OAuth Client Id"
+msgstr ""
+
+#: cps/templates/config_edit.html:228
+msgid "Google OAuth Client Secret"
+msgstr ""
+
+#: cps/templates/config_edit.html:242
 msgid "External binaries"
 msgstr "Configuration des outils de conversion externes"
 
-#: cps/templates/config_edit.html:195
+#: cps/templates/config_edit.html:250
 msgid "No converter"
 msgstr "Pas de convertisseur"
 
-#: cps/templates/config_edit.html:197
+#: cps/templates/config_edit.html:252
 msgid "Use Kindlegen"
 msgstr "Utiliser Kindlegen"
 
-#: cps/templates/config_edit.html:199
+#: cps/templates/config_edit.html:254
 msgid "Use calibre's ebook converter"
 msgstr "Utiliser Calibre ebook-convert"
 
-#: cps/templates/config_edit.html:203
+#: cps/templates/config_edit.html:258
 msgid "E-Book converter settings"
 msgstr "Paramètres de la commande de conversion de livres"
 
-#: cps/templates/config_edit.html:207
+#: cps/templates/config_edit.html:262
 msgid "Path to convertertool"
 msgstr "Chemin d’accès à la commande de conversion"
 
-#: cps/templates/config_edit.html:213
+#: cps/templates/config_edit.html:268
 msgid "Location of Unrar binary"
 msgstr "Chemin d’accès à la commande UnRar"
 
-#: cps/templates/config_edit.html:229 cps/templates/layout.html:84
+#: cps/templates/config_edit.html:284 cps/templates/layout.html:84
 #: cps/templates/login.html:4
 msgid "Login"
 msgstr "Connexion"
@@ -1279,8 +1525,7 @@ msgstr "Connexion"
 msgid "View Configuration"
 msgstr "Configuration du mode d’affichage"
 
-#: cps/templates/config_view_edit.html:19 cps/templates/layout.html:135
-#: cps/templates/layout.html:136 cps/templates/shelf_edit.html:7
+#: cps/templates/config_view_edit.html:19 cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr "Titre"
 
@@ -1292,7 +1537,7 @@ msgstr "Nombre de livres choisis au hasard à afficher"
 msgid "No. of authors to show before hiding (0=disable hiding)"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:118
+#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:112
 msgid "Theme"
 msgstr "Thème"
 
@@ -1324,127 +1569,91 @@ msgstr "Mots clés pour contenue pour adulte"
 msgid "Default settings for new users"
 msgstr "Réglages par défaut pour les nouveaux utilisateurs"
 
-#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:104
+#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:83
 msgid "Admin user"
 msgstr "Utilisateur admin"
 
-#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:113
+#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:92
 msgid "Allow Downloads"
 msgstr "Permettre les téléchargements"
 
-#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:117
+#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:96
+msgid "Allow book viewer"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:100
 msgid "Allow Uploads"
 msgstr "Permettre le dépôt de fichiers"
 
-#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:121
+#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:104
 msgid "Allow Edit"
 msgstr "Permettre l'édition"
 
-#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:125
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:108
 msgid "Allow Delete books"
 msgstr "Autoriser la suppression des livres"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:130
+#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:113
 msgid "Allow Changing Password"
 msgstr "Permettre le changement de mot de passe"
 
-#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:134
+#: cps/templates/config_view_edit.html:109 cps/templates/user_edit.html:117
 msgid "Allow Editing Public Shelfs"
 msgstr "Autoriser la modification d’étagères publiques"
 
-#: cps/templates/config_view_edit.html:115
+#: cps/templates/config_view_edit.html:119
 msgid "Default visibilities for new users"
 msgstr "Mode de visualisation par défaut pour les nouveaux utilisateurs"
 
-#: cps/templates/config_view_edit.html:123 cps/templates/user_edit.html:50
-msgid "Show random books"
-msgstr "Montrer des livres au hasard"
-
-#: cps/templates/config_view_edit.html:127 cps/templates/user_edit.html:54
-msgid "Show recent books"
-msgstr "Afficher les livres récents"
-
-#: cps/templates/config_view_edit.html:131 cps/templates/user_edit.html:58
-msgid "Show sorted books"
-msgstr "Afficher les livres triés"
-
-#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:62
-msgid "Show hot books"
-msgstr "Montrer les livres populaires"
-
-#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:66
-msgid "Show best rated books"
-msgstr "Montrer les livres les mieux notés"
-
-#: cps/templates/config_view_edit.html:143 cps/templates/user_edit.html:70
-msgid "Show language selection"
-msgstr "Montrer la sélection par langue"
-
-#: cps/templates/config_view_edit.html:147 cps/templates/user_edit.html:74
-msgid "Show series selection"
-msgstr "Montrer la sélection par séries"
-
-#: cps/templates/config_view_edit.html:151 cps/templates/user_edit.html:78
-msgid "Show category selection"
-msgstr "Montrer la sélection par catégories"
-
-#: cps/templates/config_view_edit.html:155 cps/templates/user_edit.html:82
-msgid "Show author selection"
-msgstr "Montrer la sélection par auteur"
-
-#: cps/templates/config_view_edit.html:159 cps/templates/user_edit.html:86
-msgid "Show publisher selection"
-msgstr "Montrer la sélection par éditeur"
-
-#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:91
-msgid "Show read and unread"
-msgstr "Montrer lu et non-lu"
-
-#: cps/templates/config_view_edit.html:167 cps/templates/user_edit.html:96
+#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:75
 msgid "Show random books in detail view"
 msgstr "Montrer aléatoirement des livres dans la vue détaillée"
 
-#: cps/templates/config_view_edit.html:171 cps/templates/user_edit.html:109
+#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:88
 msgid "Show mature content"
 msgstr "Montrer le contenu pour adulte"
 
-#: cps/templates/detail.html:63
+#: cps/templates/detail.html:59
 msgid "Read in browser"
 msgstr "Lire dans le navigateur"
 
-#: cps/templates/detail.html:100
+#: cps/templates/detail.html:73
+msgid "Listen in browser"
+msgstr ""
+
+#: cps/templates/detail.html:120
 msgid "Book"
 msgstr "Livre"
 
-#: cps/templates/detail.html:100
+#: cps/templates/detail.html:120
 msgid "of"
 msgstr "de"
 
-#: cps/templates/detail.html:106
+#: cps/templates/detail.html:126
 msgid "language"
 msgstr "langue"
 
-#: cps/templates/detail.html:185
+#: cps/templates/detail.html:203
 msgid "Mark As Unread"
 msgstr ""
 
-#: cps/templates/detail.html:185
+#: cps/templates/detail.html:203
 msgid "Mark As Read"
 msgstr ""
 
-#: cps/templates/detail.html:186
+#: cps/templates/detail.html:204
 msgid "Read"
 msgstr "Lu"
 
-#: cps/templates/detail.html:196
+#: cps/templates/detail.html:214 cps/templates/listenmp3.html:54
 msgid "Description:"
 msgstr "Description :"
 
-#: cps/templates/detail.html:209 cps/templates/search.html:14
+#: cps/templates/detail.html:227 cps/templates/search.html:14
 msgid "Add to shelf"
 msgstr "Ajouter à l'étagère"
 
-#: cps/templates/detail.html:271
+#: cps/templates/detail.html:289
 msgid "Edit metadata"
 msgstr "Éditer les métadonnées"
 
@@ -1504,12 +1713,12 @@ msgstr "Ajouter"
 msgid "Do you really want to delete this domain rule?"
 msgstr "Souhaitez-vous vraiment supprimer cette règle de domaine ?"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:210
+#: cps/templates/feed.xml:21 cps/templates/layout.html:171
 msgid "Next"
 msgstr "Suivant"
 
-#: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:44 cps/templates/layout.html:45
+#: cps/templates/feed.xml:33 cps/templates/layout.html:44
+#: cps/templates/layout.html:45
 msgid "Search"
 msgstr "Chercher"
 
@@ -1521,75 +1730,63 @@ msgstr "Retour à l’accueil"
 msgid "Discover (Random Books)"
 msgstr "Découverte (livres au hasard)"
 
+#: cps/templates/index.html:65
+msgid "Group by series"
+msgstr ""
+
 #: cps/templates/index.xml:6
 msgid "Start"
 msgstr "Démarrer"
 
-#: cps/templates/index.xml:18 cps/templates/layout.html:141
-msgid "Hot Books"
-msgstr "Livres populaires"
-
-#: cps/templates/index.xml:22
+#: cps/templates/index.xml:21
 msgid "Popular publications from this catalog based on Downloads."
 msgstr "Publications populaires depuis le catalogue basées sur les téléchargements."
 
-#: cps/templates/index.xml:25 cps/templates/layout.html:144
-msgid "Best rated Books"
-msgstr "Livres les mieux notés"
-
-#: cps/templates/index.xml:29
+#: cps/templates/index.xml:28
 msgid "Popular publications from this catalog based on Rating."
 msgstr "Publications populaires de ce catalogue sur la base de notes."
 
-#: cps/templates/index.xml:32
+#: cps/templates/index.xml:31
 msgid "New Books"
 msgstr "Nouveaux livres"
 
-#: cps/templates/index.xml:36
+#: cps/templates/index.xml:35
 msgid "The latest Books"
 msgstr "Les derniers livres"
 
-#: cps/templates/index.xml:43
+#: cps/templates/index.xml:42
 msgid "Show Random Books"
 msgstr "Montrer des livres au hasard"
 
-#: cps/templates/index.xml:62 cps/templates/layout.html:162
-msgid "Authors"
-msgstr "Auteurs"
-
-#: cps/templates/index.xml:66
+#: cps/templates/index.xml:65
 msgid "Books ordered by Author"
 msgstr "Livres classés par auteur"
 
-#: cps/templates/index.xml:69 cps/templates/layout.html:165
-msgid "Publishers"
-msgstr "Editeurs"
-
-#: cps/templates/index.xml:73
+#: cps/templates/index.xml:72
 msgid "Books ordered by publisher"
 msgstr "Livres classés par éditeur"
 
-#: cps/templates/index.xml:80
+#: cps/templates/index.xml:79
 msgid "Books ordered by category"
 msgstr "Livres classés par catégorie"
 
-#: cps/templates/index.xml:87
+#: cps/templates/index.xml:86
 msgid "Books ordered by series"
 msgstr "Livres classés par série"
 
-#: cps/templates/index.xml:90 cps/templates/layout.html:171
+#: cps/templates/index.xml:89 cps/templates/layout.html:132
 msgid "Public Shelves"
 msgstr "Étagères publiques"
 
-#: cps/templates/index.xml:94
+#: cps/templates/index.xml:93
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr "Livres disponibles dans les étagères publiques, visibles par tous"
 
-#: cps/templates/index.xml:98 cps/templates/layout.html:175
+#: cps/templates/index.xml:97 cps/templates/layout.html:136
 msgid "Your Shelves"
 msgstr "Vos étagères"
 
-#: cps/templates/index.xml:102
+#: cps/templates/index.xml:101
 msgid "User's own shelfs, only visible to the current user himself"
 msgstr "Etagères personnelles, seulement visible de l’utilisateur propréitaire"
 
@@ -1606,7 +1803,7 @@ msgid "Advanced Search"
 msgstr "Recherche avancée"
 
 #: cps/templates/layout.html:76 cps/templates/read.html:71
-#: cps/templates/readcbr.html:89 cps/templates/readcbr.html:113
+#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
 msgid "Settings"
 msgstr "Paramètres"
 
@@ -1622,7 +1819,7 @@ msgstr "Déconnexion"
 msgid "Register"
 msgstr "S'enregistrer"
 
-#: cps/templates/layout.html:111 cps/templates/layout.html:257
+#: cps/templates/layout.html:111 cps/templates/layout.html:218
 msgid "Uploading..."
 msgstr "Dépôt en cours…"
 
@@ -1634,68 +1831,27 @@ msgstr "Veuillez ne PAS rafraîchir la page"
 msgid "Browse"
 msgstr "Explorer"
 
-#: cps/templates/layout.html:124
-msgid "Recently Added"
-msgstr "Ajouts récents"
-
-#: cps/templates/layout.html:129
-msgid "Sorted Books"
-msgstr "Classer les livres"
-
-#: cps/templates/layout.html:133 cps/templates/layout.html:134
-#: cps/templates/layout.html:135 cps/templates/layout.html:136
-msgid "Sort By"
-msgstr "Classer par"
-
-#: cps/templates/layout.html:133
-msgid "Newest"
-msgstr "Récents"
-
-#: cps/templates/layout.html:134
-msgid "Oldest"
-msgstr "Anciens"
-
-#: cps/templates/layout.html:135
-msgid "Ascending"
-msgstr "Ascendant"
-
-#: cps/templates/layout.html:136
-msgid "Descending"
-msgstr "Descendant"
-
-#: cps/templates/layout.html:153
-msgid "Discover"
-msgstr "Découvrir"
-
-#: cps/templates/layout.html:156
-msgid "Categories"
-msgstr "Catégories"
-
-#: cps/templates/layout.html:168 cps/templates/search_form.html:74
-msgid "Languages"
-msgstr "Langues"
-
-#: cps/templates/layout.html:180
+#: cps/templates/layout.html:141
 msgid "Create a Shelf"
 msgstr "Créer une étagère"
 
-#: cps/templates/layout.html:181 cps/templates/stats.html:3
+#: cps/templates/layout.html:142 cps/templates/stats.html:3
 msgid "About"
 msgstr "À propos"
 
-#: cps/templates/layout.html:195
+#: cps/templates/layout.html:156
 msgid "Previous"
 msgstr "Précédent"
 
-#: cps/templates/layout.html:222
+#: cps/templates/layout.html:183
 msgid "Book Details"
 msgstr "Détails du livre"
 
-#: cps/templates/layout.html:256
+#: cps/templates/layout.html:217
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:259
+#: cps/templates/layout.html:220
 msgid "Error"
 msgstr ""
 
@@ -1725,105 +1881,105 @@ msgstr "Catalogue de livres électroniques Calibre-Web"
 msgid "Reflow text when sidebars are open."
 msgstr "Mettre à jour la mise en page du texte quand les bandeaux latéraux sont ouverts"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:88
 msgid "Keyboard Shortcuts"
 msgstr "Raccourcis clavier"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:91
 msgid "Previous Page"
 msgstr "Page précédente"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:92
 msgid "Next Page"
 msgstr "Page suivante"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:93
 msgid "Scale to Best"
 msgstr "Mise à l’échelle optimale"
 
-#: cps/templates/readcbr.html:100
+#: cps/templates/readcbr.html:94
 msgid "Scale to Width"
 msgstr "Mise à l’échelle sur la largeur"
 
-#: cps/templates/readcbr.html:101
+#: cps/templates/readcbr.html:95
 msgid "Scale to Height"
 msgstr "Mise à l’échelle sur la hauteur"
 
-#: cps/templates/readcbr.html:102
+#: cps/templates/readcbr.html:96
 msgid "Scale to Native"
 msgstr "Mise à l’échelle d’origine"
 
-#: cps/templates/readcbr.html:103
+#: cps/templates/readcbr.html:97
 msgid "Rotate Right"
 msgstr "Rotation droite"
 
-#: cps/templates/readcbr.html:104
+#: cps/templates/readcbr.html:98
 msgid "Rotate Left"
 msgstr "Rotation gauche"
 
-#: cps/templates/readcbr.html:105
+#: cps/templates/readcbr.html:99
 msgid "Flip Image"
 msgstr "Inverser l’image"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:115
 msgid "Light"
 msgstr "Clair"
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:116
 msgid "Dark"
 msgstr "Sombre"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:121
 msgid "Scale"
 msgstr "Echelle"
 
-#: cps/templates/readcbr.html:130
+#: cps/templates/readcbr.html:124
 msgid "Best"
 msgstr "Optimal"
 
-#: cps/templates/readcbr.html:131
+#: cps/templates/readcbr.html:125
 msgid "Width"
 msgstr "Largeur"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:126
 msgid "Height"
 msgstr "Hauteur"
 
-#: cps/templates/readcbr.html:133
+#: cps/templates/readcbr.html:127
 msgid "Native"
 msgstr "Origine"
 
-#: cps/templates/readcbr.html:138
+#: cps/templates/readcbr.html:132
 msgid "Rotate"
 msgstr "Rotation"
 
-#: cps/templates/readcbr.html:149
+#: cps/templates/readcbr.html:143
 msgid "Flip"
 msgstr "Inverser"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:146
 msgid "Horizontal"
 msgstr "Horizontal"
 
-#: cps/templates/readcbr.html:153
+#: cps/templates/readcbr.html:147
 msgid "Vertical"
 msgstr "Vertical"
 
-#: cps/templates/readcbr.html:158
+#: cps/templates/readcbr.html:152
 msgid "Direction"
 msgstr ""
 
-#: cps/templates/readcbr.html:161
+#: cps/templates/readcbr.html:155
 msgid "Left to Right"
 msgstr ""
 
-#: cps/templates/readcbr.html:162
+#: cps/templates/readcbr.html:156
 msgid "Right to Left"
 msgstr ""
 
 #: cps/templates/readpdf.html:29
-msgid "PDF.js viewer"
-msgstr "Visionneuse PDF.js"
+msgid "PDF reader"
+msgstr ""
 
 #: cps/templates/readtxt.html:6
 msgid "Basic txt Reader"
@@ -1897,23 +2053,23 @@ msgstr "Évaluation supérieure à"
 msgid "Rating less than"
 msgstr "Évaluation inférieure à"
 
-#: cps/templates/shelf.html:7
+#: cps/templates/shelf.html:10
 msgid "Delete this Shelf"
 msgstr "Supprimer cette étagère"
 
-#: cps/templates/shelf.html:8
+#: cps/templates/shelf.html:11
 msgid "Edit Shelf"
 msgstr "Modifier l’étagère"
 
-#: cps/templates/shelf.html:9 cps/templates/shelf_order.html:11
+#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:11
 msgid "Change order"
 msgstr "Modifier l’ordre"
 
-#: cps/templates/shelf.html:68
+#: cps/templates/shelf.html:67
 msgid "Do you really want to delete the shelf?"
 msgstr "Voulez-vous vraiment supprimer l’étagère?"
 
-#: cps/templates/shelf.html:71
+#: cps/templates/shelf.html:70
 msgid "Shelf will be lost for everybody and forever!"
 msgstr "L’étagère sera supprimée pour tout le monde et de façon définitive !"
 
@@ -2001,19 +2157,31 @@ msgstr "Réinitialiser le mot de passe de l’utilisateur"
 msgid "Kindle E-Mail"
 msgstr "Adresse de courriel Kindle"
 
-#: cps/templates/user_edit.html:39
+#: cps/templates/user_edit.html:40
 msgid "Show books with language"
 msgstr "Montrer les livres dans la langue"
 
-#: cps/templates/user_edit.html:41
+#: cps/templates/user_edit.html:42
 msgid "Show all"
 msgstr "Montrer tout"
 
-#: cps/templates/user_edit.html:141
+#: cps/templates/user_edit.html:52
+msgid "OAuth Settings"
+msgstr ""
+
+#: cps/templates/user_edit.html:54
+msgid "Link"
+msgstr ""
+
+#: cps/templates/user_edit.html:56
+msgid "Unlink"
+msgstr ""
+
+#: cps/templates/user_edit.html:124
 msgid "Delete this user"
 msgstr "Supprimer cet utilisateur"
 
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:139
 msgid "Recent Downloads"
 msgstr "Téléchargements récents"
 
@@ -2077,3 +2245,45 @@ msgstr "Téléchargements récents"
 #~ msgid "Using your another device, login and visit "
 #~ msgstr ""
 
+#~ msgid "Newest Books"
+#~ msgstr "Livres récents"
+
+#~ msgid "Oldest Books"
+#~ msgstr "Anciens livres"
+
+#~ msgid "Books (A-Z)"
+#~ msgstr "Livres (A-Z)"
+
+#~ msgid "Books (Z-A)"
+#~ msgstr "Livres (Z-A)"
+
+#~ msgid "Error opening eBook. Fileformat is not supported."
+#~ msgstr ""
+
+#~ msgid "File %(title)s"
+#~ msgstr ""
+
+#~ msgid "Show sorted books"
+#~ msgstr "Afficher les livres triés"
+
+#~ msgid "Sorted Books"
+#~ msgstr "Classer les livres"
+
+#~ msgid "Sort By"
+#~ msgstr "Classer par"
+
+#~ msgid "Newest"
+#~ msgstr "Récents"
+
+#~ msgid "Oldest"
+#~ msgstr "Anciens"
+
+#~ msgid "Ascending"
+#~ msgstr "Ascendant"
+
+#~ msgid "Descending"
+#~ msgstr "Descendant"
+
+#~ msgid "PDF.js viewer"
+#~ msgstr "Visionneuse PDF.js"
+
diff --git a/cps/translations/hu/LC_MESSAGES/messages.mo b/cps/translations/hu/LC_MESSAGES/messages.mo
index cadd7679..849f222c 100644
Binary files a/cps/translations/hu/LC_MESSAGES/messages.mo and b/cps/translations/hu/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/hu/LC_MESSAGES/messages.po b/cps/translations/hu/LC_MESSAGES/messages.po
index 503590f5..d24efcc7 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-05-30 09:06+0200\n"
+"POT-Creation-Date: 2019-05-31 11:20+0200\n"
 "PO-Revision-Date: 2019-04-06 23:36+0200\n"
 "Last-Translator: \n"
 "Language: hu\n"
@@ -18,740 +18,929 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.6.0\n"
 
-#: cps/book_formats.py:199 cps/book_formats.py:200 cps/book_formats.py:204
-#: cps/book_formats.py:208 cps/book_formats.py:212 cps/converter.py:29
-#: cps/converter.py:45
-msgid "not installed"
-msgstr "nincs telepítve"
-
-#: cps/converter.py:40 cps/converter.py:56
-msgid "Excecution permissions missing"
-msgstr "Nincs jogosultság a futtatáshoz"
-
-#: cps/converter.py:66
-msgid "not configured"
-msgstr "nincs konfigurálva"
-
-#: cps/helper.py:79
-#, python-format
-msgid "%(format)s format not found for book id: %(book)d"
-msgstr "A(z) %(format)s formátum nem található a következő könyvhöz: %(book)d"
-
-#: cps/helper.py:91
-#, python-format
-msgid "%(format)s not found on Google Drive: %(fn)s"
-msgstr "%(format)s nem található a Google Drive-on: %(fn)s"
-
-#: cps/helper.py:98 cps/helper.py:204 cps/templates/detail.html:45
-#: cps/templates/detail.html:49
-msgid "Send to Kindle"
-msgstr "Küldés Kindle-re"
-
-#: cps/helper.py:99 cps/helper.py:117 cps/helper.py:206
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "Ez az e-mail a Calibre-Web-en keresztül lett küldve."
-
-#: cps/helper.py:110
-#, python-format
-msgid "%(format)s not found: %(fn)s"
-msgstr "%(format)s nem található: %(fn)s"
-
-#: cps/helper.py:115
-msgid "Calibre-Web test e-mail"
-msgstr "Calibre-Web teszt e-mail"
-
-#: cps/helper.py:116
-msgid "Test e-mail"
-msgstr "Teszt e-mail"
-
-#: cps/helper.py:132
-msgid "Get Started with Calibre-Web"
-msgstr "Kezdő lépések a Calibre-Web-bel"
-
-#: cps/helper.py:133
-#, python-format
-msgid "Registration e-mail for user: %(name)s"
-msgstr "Regisztrációs e-mail a következő felhasználóhoz: %(name)s"
-
-#: cps/helper.py:146 cps/helper.py:148 cps/helper.py:150 cps/helper.py:158
-#: cps/helper.py:160 cps/helper.py:162
-#, python-format
-msgid "Send %(format)s to Kindle"
-msgstr "%(format)s küldése Kindle-re"
-
-#: cps/helper.py:166
-#, python-format
-msgid "Convert %(orig)s to %(format)s and send to Kindle"
-msgstr "%(orig)s konvertálása %(format)s-ra és küldés Kindle-re"
-
-#: cps/helper.py:205
-#, python-format
-msgid "E-mail: %(book)s"
-msgstr "E-mail: %(book)s"
-
-#: cps/helper.py:208
-msgid "The requested file could not be read. Maybe wrong permissions?"
-msgstr "A kért fájl nem olvasható. Esetleg jogosultsági probléma lenne?"
-
-#: cps/helper.py:316
-#, python-format
-msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "A cím átnevezése \"%(src)s\"-ról \"%(dest)s\"-ra nem sikerült a következő hiba miatt: %(error)s"
-
-#: cps/helper.py:326
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "A szerző átnevezése \"%(src)s\"-ról \"%(dest)s\"-ra nem sikerült a következő hiba miatt: %(error)s"
-
-#: cps/helper.py:340
-#, python-format
-msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "\"%(src)s\" fájl átnevezése \"%(dest)s\"-re nem sikerült a következő hiba miatt: %(error)s"
-
-#: cps/helper.py:366 cps/helper.py:376 cps/helper.py:384
-#, python-format
-msgid "File %(file)s not found on Google Drive"
-msgstr "A \"%(file)s\" fájl nem található a Google Drive-on"
-
-#: cps/helper.py:405
-#, python-format
-msgid "Book path %(path)s not found on Google Drive"
-msgstr "A könyv elérési útja (\"%(path)s\") nem található a Google Drive-on"
-
-#: cps/helper.py:556
-msgid "Error excecuting UnRar"
-msgstr "Hiba az UnRar futtatásakor"
-
-#: cps/helper.py:558
-msgid "Unrar binary file not found"
-msgstr "Az Unrar futtatható állománya nem található"
-
-#: cps/helper.py:585
-msgid "Waiting"
-msgstr "Várakozás"
-
-#: cps/helper.py:587
-msgid "Failed"
-msgstr "Nem sikerült"
-
-#: cps/helper.py:589
-msgid "Started"
-msgstr "Elindítva"
-
-#: cps/helper.py:591
-msgid "Finished"
-msgstr "Végrehajtva"
-
-#: cps/helper.py:593
-msgid "Unknown Status"
-msgstr "Ismeretlen állapot"
-
-#: cps/helper.py:598
-msgid "E-mail: "
-msgstr "E-mail cím: "
-
-#: cps/helper.py:600 cps/helper.py:604
-msgid "Convert: "
-msgstr "Konvertálás:"
-
-#: cps/helper.py:602
-msgid "Upload: "
-msgstr "Feltöltés:"
-
-#: cps/helper.py:606
-msgid "Unknown Task: "
-msgstr "Ismeretlen feladat:"
-
-#: cps/updater.py:251 cps/updater.py:410 cps/updater.py:423
-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:416
-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:270 cps/updater.py:501 cps/updater.py:503 cps/web.py:1206
-msgid "HTTP Error"
-msgstr "HTTP hiba"
-
-#: cps/updater.py:272 cps/updater.py:505 cps/web.py:1207
-msgid "Connection error"
-msgstr "Kapcsolódási hiba"
-
-#: cps/updater.py:274 cps/updater.py:507 cps/web.py:1208
-msgid "Timeout while establishing connection"
-msgstr "Időtúllépés a kapcsolódás során"
-
-#: cps/updater.py:276 cps/updater.py:509 cps/web.py:1209
-msgid "General error"
-msgstr "Általános hiba"
-
-#: cps/updater.py:283 cps/updater.py:341 cps/updater.py:468
-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:335
-msgid "Could not fetch update information"
-msgstr "Nem lehetett begyűjteni a frissítési információkat"
-
-#: cps/updater.py:403
-msgid "No release information available"
-msgstr "Nincs információ a kiadásról."
-
-#: cps/updater.py:449 cps/updater.py:458
-#, 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:491 cps/web.py:2795
-msgid "Unknown"
-msgstr "Ismeretlen"
-
-#: cps/web.py:1199
-msgid "Requesting update package"
-msgstr "Frissítési csomag kérése"
-
-#: cps/web.py:1200
-msgid "Downloading update package"
-msgstr "Frissítési csomag letöltése"
-
-#: cps/web.py:1201
-msgid "Unzipping update package"
-msgstr "Frissítési csomag kitömörítése"
-
-#: cps/web.py:1202
-msgid "Replacing files"
-msgstr "Fájlok cserélése"
-
-#: cps/web.py:1203
-msgid "Database connections are closed"
-msgstr "Adatbázis kapcsolatok lezárva"
-
-#: cps/web.py:1204
-msgid "Stopping server"
-msgstr "Szerver leállítása"
-
-#: cps/web.py:1205
-msgid "Update finished, please press okay and reload page"
-msgstr "A frissítés települt, kattints az OK-ra és újra tölt az oldal"
-
-#: cps/web.py:1206 cps/web.py:1207 cps/web.py:1208 cps/web.py:1209
-msgid "Update failed:"
-msgstr "A frissítés nem sikerült:"
-
-#: cps/web.py:1235
-msgid "Recently Added Books"
-msgstr "Legutóbb hozzáadott könyvek"
-
-#: cps/web.py:1245
-msgid "Newest Books"
-msgstr "Legújabb könyvek"
-
-#: cps/web.py:1257
-msgid "Oldest Books"
-msgstr "Legrégebbi könyvek"
-
-#: cps/web.py:1269
-msgid "Books (A-Z)"
-msgstr "Könyvek (A-Zs)"
-
-#: cps/web.py:1280
-msgid "Books (Z-A)"
-msgstr "Könyvek (Zs-A)"
-
-#: cps/web.py:1309
-msgid "Hot Books (most downloaded)"
-msgstr "Kelendő könyvek (legtöbbet letöltöttek)"
-
-#: cps/web.py:1322
-msgid "Best rated books"
-msgstr "Legjobbra értékelt könyvek"
-
-#: cps/templates/index.xml:39 cps/web.py:1335
-msgid "Random Books"
-msgstr "Könyvek találomra"
-
-#: cps/web.py:1362 cps/web.py:1618 cps/web.py:2161
-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:1391
-msgid "Publisher list"
-msgstr "Kiadók listája"
-
-#: cps/web.py:1406
-#, python-format
-msgid "Publisher: %(name)s"
-msgstr "Kiadó: %(name)s"
-
-#: cps/templates/index.xml:83 cps/web.py:1438
-msgid "Series list"
-msgstr "Sorozatok listája"
-
-#: cps/web.py:1452
-#, python-format
-msgid "Series: %(serie)s"
-msgstr "Sorozat: %(serie)s"
-
-#: cps/web.py:1478
-msgid "Available languages"
-msgstr "Elérhető nyelvek"
-
-#: cps/web.py:1498
-#, python-format
-msgid "Language: %(name)s"
-msgstr "Nyelv: %(name)s"
-
-#: cps/templates/index.xml:76 cps/web.py:1509
-msgid "Category list"
-msgstr "Címkék listája"
-
-#: cps/web.py:1523
-#, python-format
-msgid "Category: %(name)s"
-msgstr "Címke: %(name)s"
-
-#: cps/templates/layout.html:73 cps/web.py:1648
-msgid "Tasks"
-msgstr "Feladatok"
-
-#: cps/web.py:1682
+#: cps/about.py:76
 msgid "Statistics"
 msgstr "Statisztika"
 
-#: cps/web.py:1750
-msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
-msgstr "A Google Drive beállítása nem fejeződött be, próbáld kikapcsolni és újra aktíválni a Google Drive-ot."
-
-#: cps/web.py:1795
-msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
-msgstr "A visszahívási tartomány nem ellenőrzött, kövesd az alábbi lépéseket a tartomány ellenőrzéséhez a Google Developer Console-ban:"
-
-#: cps/web.py:1871
+#: cps/admin.py:97
 msgid "Server restarted, please reload page"
 msgstr "A kiszolgáló újraindult, tölts be újra az oldalt!"
 
-#: cps/web.py:1874
+#: cps/admin.py:100
 msgid "Performing shutdown of server, please close window"
 msgstr "A kiszolgáló leállítása folyamatban, zárd be ezt az ablakot"
 
-#: cps/web.py:1953
-msgid "Published after "
-msgstr "Kiadva ezután: "
+#: cps/admin.py:120 cps/updater.py:445
+msgid "Unknown"
+msgstr "Ismeretlen"
 
-#: cps/web.py:1960
-msgid "Published before "
-msgstr "Kiadva ezelőtt: "
-
-#: cps/web.py:1974
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "Értékelés <= %(rating)s"
-
-#: cps/web.py:1976
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "Értékelés <= %(rating)s"
-
-#: cps/web.py:2036 cps/web.py:2045
-msgid "search"
-msgstr "keresés"
-
-#: cps/templates/index.xml:47 cps/templates/index.xml:51
-#: cps/templates/layout.html:148 cps/web.py:2116
-msgid "Read Books"
-msgstr "Olvasott könyvek"
-
-#: cps/templates/index.xml:55 cps/templates/index.xml:59
-#: cps/templates/layout.html:150 cps/web.py:2119
-msgid "Unread Books"
-msgstr "Olvasatlan könyvek"
-
-#: cps/web.py:2171 cps/web.py:2173 cps/web.py:2175 cps/web.py:2187
-msgid "Read a Book"
-msgstr "Egy olvasott könyv"
-
-#: cps/web.py:2199
-msgid "Error opening eBook. Fileformat is not supported."
-msgstr ""
-
-#: cps/web.py:2249 cps/web.py:3170
-msgid "Please fill out all fields!"
-msgstr "Az összes mezőt ki kell tölteni!"
-
-#: cps/web.py:2250 cps/web.py:2272 cps/web.py:2276 cps/web.py:2281
-#: cps/web.py:2283
-msgid "register"
-msgstr "regisztrálás"
-
-#: cps/web.py:2271 cps/web.py:3389
-msgid "An unknown error occurred. Please try again later."
-msgstr "Ismeretlen hiba történt. Próbáld újra később!"
-
-#: cps/web.py:2274
-msgid "Your e-mail is not allowed to register"
-msgstr "Nem engedélyezett a megadott e-mail cím bejegyzése"
-
-#: cps/web.py:2277
-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:2280
-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:2297 cps/web.py:2393
-#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
-msgstr "Be vagy jelentkezve mint: %(nickname)s"
-
-#: cps/web.py:2302
-msgid "Wrong Username or Password"
-msgstr "Rossz felhasználó név vagy jelszó!"
-
-#: cps/web.py:2308 cps/web.py:2329
-msgid "login"
-msgstr "belépés"
-
-#: cps/web.py:2341 cps/web.py:2372
-msgid "Token not found"
-msgstr "A token nem található."
-
-#: cps/web.py:2349 cps/web.py:2380
-msgid "Token has expired"
-msgstr "A token érvényessége lejárt."
-
-#: cps/web.py:2357
-msgid "Success! Please return to your device"
-msgstr "Sikerült! Újra használható az eszköz."
-
-#: cps/web.py:2407
-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:2412
-#, 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:2416
-#, 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:2418 cps/web.py:3223
-msgid "Please configure your kindle e-mail address first..."
-msgstr "Először be kell állítani a kindle e-mail címet..."
-
-#: cps/web.py:2429 cps/web.py:2481
-msgid "Invalid shelf specified"
-msgstr "A megadott polc érvénytelen!"
-
-#: cps/web.py:2436
-#, python-format
-msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
-msgstr "Elnézést, nem vagy jogosult hozzáadni a könyvet a következő polcra: %(shelfname)s"
-
-#: cps/web.py:2444
-msgid "You are not allowed to edit public shelves"
-msgstr "Nem vagy jogosult szerkeszteni nyilvános polcokat"
-
-#: cps/web.py:2453
-#, python-format
-msgid "Book is already part of the shelf: %(shelfname)s"
-msgstr "A könyv már a következő polcon van: %(shelfname)s"
-
-#: cps/web.py:2467
-#, python-format
-msgid "Book has been added to shelf: %(sname)s"
-msgstr "A könyv hozzá lett adva a következő polchoz: %(sname)s"
-
-#: cps/web.py:2486
-#, python-format
-msgid "You are not allowed to add a book to the the shelf: %(name)s"
-msgstr "Nincs jogosultságod könyvet tenni a következő polcra: %(name)s."
-
-#: cps/web.py:2491
-msgid "User is not allowed to edit public shelves"
-msgstr "A felhasználó nem szerkeszthet nyilvános polcokat"
-
-#: cps/web.py:2509
-#, python-format
-msgid "Books are already part of the shelf: %(name)s"
-msgstr "A könyvek már a következő polcon vannak: %(name)s"
-
-#: cps/web.py:2523
-#, python-format
-msgid "Books have been added to shelf: %(sname)s"
-msgstr "A könyvek hozzá lettek adva a következő polchoz: %(sname)s"
-
-#: cps/web.py:2525
-#, python-format
-msgid "Could not add books to shelf: %(sname)s"
-msgstr "Nem sikerült hozzáadni a könyveket a polchoz: %(sname)s"
-
-#: cps/web.py:2562
-#, python-format
-msgid "Book has been removed from shelf: %(sname)s"
-msgstr "A könyv el lett távolítva a polcról: %(sname)s"
-
-#: cps/web.py:2568
-#, python-format
-msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
-msgstr "Sajnálom, nincs jogosultságot eltávolítani könyvet erről a polcról: %(sname)s"
-
-#: cps/web.py:2589 cps/web.py:2613
-#, python-format
-msgid "A shelf with the name '%(title)s' already exists."
-msgstr "Már létezik \"%(title)s\" nevű polc!"
-
-#: cps/web.py:2594
-#, python-format
-msgid "Shelf %(title)s created"
-msgstr "A következő polc létre lett hozva: %(title)s"
-
-#: cps/web.py:2596 cps/web.py:2624
-msgid "There was an error"
-msgstr "Hiba történt"
-
-#: cps/web.py:2597 cps/web.py:2599
-msgid "create a shelf"
-msgstr "Polc készítése"
-
-#: cps/web.py:2622
-#, python-format
-msgid "Shelf %(title)s changed"
-msgstr "A következő polc megváltoztatva: %(title)s"
-
-#: cps/web.py:2625 cps/web.py:2627
-msgid "Edit a shelf"
-msgstr "Polc szerkesztése"
-
-#: cps/web.py:2648
-#, python-format
-msgid "successfully deleted shelf %(name)s"
-msgstr "A következő polc sikeresen törölve: %(name)s"
-
-#: cps/web.py:2675
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Polc: '%(name)s'"
-
-#: cps/web.py:2678
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "Hiba a polc megnyitásakor. A polc nem létezik vagy nem elérhető."
-
-#: cps/web.py:2709
-#, python-format
-msgid "Change order of Shelf: '%(name)s'"
-msgstr "A következő polc átrendezése: %(name)s"
-
-#: cps/web.py:2738 cps/web.py:3176
-msgid "E-mail is not from valid domain"
-msgstr "Az e-mail tartománya nem érvényes."
-
-#: cps/web.py:2740 cps/web.py:2782 cps/web.py:2785
-#, python-format
-msgid "%(name)s's profile"
-msgstr "%(name)s profilja"
-
-#: cps/web.py:2780
-msgid "Found an existing account for this e-mail address."
-msgstr "Már létezik felhasználó ehhez az e-mail címhez."
-
-#: cps/web.py:2783
-msgid "Profile updated"
-msgstr "A profil frissítve."
-
-#: cps/web.py:2814
+#: cps/admin.py:139
 msgid "Admin page"
 msgstr "Rendszergazda oldala"
 
-#: cps/web.py:2899 cps/web.py:3079
+#: cps/admin.py:208 cps/admin.py:486
 msgid "Calibre-Web configuration updated"
 msgstr "A Calibre-Web konfigurációja frissítve."
 
-#: cps/templates/admin.html:100 cps/web.py:2913
+#: cps/admin.py:222 cps/templates/admin.html:102
 msgid "UI Configuration"
 msgstr "Felhasználói felület beállításai"
 
-#: cps/web.py:2931
+#: cps/admin.py:295
 msgid "Import of optional Google Drive requirements missing"
 msgstr "Hiányzanak a Google Drive használatához szükséges komponensek"
 
-#: cps/web.py:2934
+#: cps/admin.py:298
 msgid "client_secrets.json is missing or not readable"
 msgstr "A client_secrets.json hiányzik vagy nem olvasható."
 
-#: cps/web.py:2939 cps/web.py:2968
+#: cps/admin.py:303 cps/admin.py:332
 msgid "client_secrets.json is not configured for web application"
 msgstr "A client_secrets.json nincs beállítva a web alkalmazáshoz."
 
-#: cps/templates/admin.html:99 cps/web.py:2971 cps/web.py:2997 cps/web.py:3009
-#: cps/web.py:3054 cps/web.py:3069 cps/web.py:3088 cps/web.py:3096
-#: cps/web.py:3112
+#: cps/admin.py:335 cps/admin.py:361 cps/admin.py:373 cps/admin.py:398
+#: cps/admin.py:426 cps/admin.py:440 cps/admin.py:463 cps/admin.py:476
+#: cps/admin.py:494 cps/admin.py:501 cps/admin.py:516
+#: cps/templates/admin.html:101
 msgid "Basic Configuration"
 msgstr "Alapvető beállítások"
 
-#: cps/web.py:2994
+#: cps/admin.py:358
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr "A kulcsfájl helye nem érvényes, adj meg érvényes elérési utat"
 
-#: cps/web.py:3006
+#: cps/admin.py:370
 msgid "Certfile location is not valid, please enter correct path"
 msgstr "A tanusítványfájl helye nem érvényes, adj meg érvényes elérési utat"
 
-#: cps/web.py:3051
+#: cps/admin.py:395
+msgid "Please enter a LDAP provider and a DN"
+msgstr ""
+
+#: cps/admin.py:423
+msgid "Please enter Github oauth credentials"
+msgstr ""
+
+#: cps/admin.py:437
+msgid "Please enter Google oauth credentials"
+msgstr ""
+
+#: cps/admin.py:460
 msgid "Logfile location is not valid, please enter correct path"
 msgstr "A naplófájl helye nem érvényes, adj meg érvényes elérési utat"
 
-#: cps/web.py:3092
+#: cps/admin.py:498
 msgid "DB location is not valid, please enter correct path"
 msgstr "Az adatbázis helye nem érvényes, adj meg érvényes elérési utat"
 
-#: cps/templates/admin.html:33 cps/web.py:3172 cps/web.py:3178 cps/web.py:3194
+#: cps/admin.py:558 cps/web.py:1045
+msgid "Please fill out all fields!"
+msgstr "Az összes mezőt ki kell tölteni!"
+
+#: cps/admin.py:560 cps/admin.py:566 cps/admin.py:582
+#: cps/templates/admin.html:35
 msgid "Add new user"
 msgstr "Új felhasználó hozzáadása"
 
-#: cps/web.py:3184
+#: cps/admin.py:564 cps/web.py:1248
+msgid "E-mail is not from valid domain"
+msgstr "Az e-mail tartománya nem érvényes."
+
+#: cps/admin.py:572
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "A következő felhasználó létrehozva: %(user)s"
 
-#: cps/web.py:3188
+#: cps/admin.py:576
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Már létezik felhasználó ehhez az e-mail címhez vagy felhasználói névhez."
 
-#: cps/web.py:3218
+#: cps/admin.py:607
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "A teszt levél sikeresen elküldve ide: %(kindlemail)s"
 
-#: cps/web.py:3221
+#: cps/admin.py:610
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Hiba történt a teszt levél küldése során: %(res)s"
 
-#: cps/web.py:3225
+#: cps/admin.py:612 cps/web.py:1029
+msgid "Please configure your kindle e-mail address first..."
+msgstr "Először be kell állítani a kindle e-mail címet..."
+
+#: cps/admin.py:614
 msgid "E-mail server settings updated"
 msgstr "Az e-mail kiszolgáló beállításai frissítve."
 
-#: cps/web.py:3226
+#: cps/admin.py:615
 msgid "Edit e-mail server settings"
 msgstr "Az e-mail kiszolgáló beállításainak módosítása"
 
-#: cps/web.py:3251
+#: cps/admin.py:640
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "A felhasználó törölve: %(nick)s"
 
-#: cps/web.py:3364
+#: cps/admin.py:711
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "A felhasználó frissítve: %(nick)s"
 
-#: cps/web.py:3367
+#: cps/admin.py:714
 msgid "An unknown error occured."
 msgstr "Ismeretlen hiba történt."
 
-#: cps/web.py:3369
+#: cps/admin.py:717
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr " A felhasználó szerkesztése: %(nick)s"
 
-#: cps/web.py:3386
+#: cps/admin.py:733
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "A(z) %(user)s felhasználó jelszavának alaphelyzetbe állítása"
 
-#: cps/web.py:3400 cps/web.py:3592
+#: cps/admin.py:736 cps/web.py:1070
+msgid "An unknown error occurred. Please try again later."
+msgstr "Ismeretlen hiba történt. Próbáld újra később!"
+
+#: cps/admin.py:755
+msgid "Requesting update package"
+msgstr "Frissítési csomag kérése"
+
+#: cps/admin.py:756
+msgid "Downloading update package"
+msgstr "Frissítési csomag letöltése"
+
+#: cps/admin.py:757
+msgid "Unzipping update package"
+msgstr "Frissítési csomag kitömörítése"
+
+#: cps/admin.py:758
+msgid "Replacing files"
+msgstr "Fájlok cserélése"
+
+#: cps/admin.py:759
+msgid "Database connections are closed"
+msgstr "Adatbázis kapcsolatok lezárva"
+
+#: cps/admin.py:760
+msgid "Stopping server"
+msgstr "Szerver leállítása"
+
+#: cps/admin.py:761
+msgid "Update finished, please press okay and reload page"
+msgstr "A frissítés települt, kattints az OK-ra és újra tölt az oldal"
+
+#: cps/admin.py:762 cps/admin.py:763 cps/admin.py:764 cps/admin.py:765
+msgid "Update failed:"
+msgstr "A frissítés nem sikerült:"
+
+#: cps/admin.py:762 cps/updater.py:277 cps/updater.py:456 cps/updater.py:458
+msgid "HTTP Error"
+msgstr "HTTP hiba"
+
+#: cps/admin.py:763 cps/updater.py:279 cps/updater.py:460
+msgid "Connection error"
+msgstr "Kapcsolódási hiba"
+
+#: cps/admin.py:764 cps/updater.py:281 cps/updater.py:462
+msgid "Timeout while establishing connection"
+msgstr "Időtúllépés a kapcsolódás során"
+
+#: cps/admin.py:765 cps/updater.py:283 cps/updater.py:464
+msgid "General error"
+msgstr "Általános hiba"
+
+#: cps/converter.py:31 cps/converter.py:48 cps/uploader.py:213
+#: cps/uploader.py:214 cps/uploader.py:218 cps/uploader.py:222
+#: cps/uploader.py:226
+msgid "not installed"
+msgstr "nincs telepítve"
+
+#: cps/converter.py:43 cps/converter.py:60
+msgid "Excecution permissions missing"
+msgstr "Nincs jogosultság a futtatáshoz"
+
+#: cps/converter.py:70
+msgid "not configured"
+msgstr "nincs konfigurálva"
+
+#: cps/editbooks.py:218 cps/editbooks.py:432
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Hiba az ekönyv megnyitásakor. A fájl nem létezik vagy nem elérhető."
 
-#: cps/web.py:3428
+#: cps/editbooks.py:246
 msgid "edit metadata"
 msgstr "Metaadatok szerkesztése"
 
-#: cps/web.py:3521 cps/web.py:3754
+#: cps/editbooks.py:325 cps/editbooks.py:595
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "A(z) \"%(ext)s\" kiterjesztésű fájlok feltöltése nincs engedélyezve ezen a szerveren."
 
-#: cps/web.py:3525 cps/web.py:3757
+#: cps/editbooks.py:329 cps/editbooks.py:599
 msgid "File to be uploaded must have an extension"
 msgstr "A feltöltendő fájlnak kiterjesztéssel kell rendelkeznie!"
 
-#: cps/web.py:3537 cps/web.py:3776
+#: cps/editbooks.py:341 cps/editbooks.py:619
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Nem sikerült létrehozni az elérési utat (engedély megtagadva): %(path)s."
 
-#: cps/web.py:3542
+#: cps/editbooks.py:346
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Nem sikerült elmenteni a %(file)s fájlt."
 
-#: cps/web.py:3559
+#: cps/editbooks.py:363
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "A(z) %(ext)s fájlformátum hozzáadva a könyvhez: %(book)s."
 
-#: cps/web.py:3573 cps/web.py:3646
+#: cps/editbooks.py:382
+#, python-format
+msgid "Failed to create path for cover %(path)s (Permission denied)."
+msgstr ""
+
+#: cps/editbooks.py:390
+#, python-format
+msgid "Failed to store cover-file %(cover)s."
+msgstr ""
+
+#: cps/editbooks.py:393
+msgid "Cover-file is not a valid image file"
+msgstr ""
+
+#: cps/editbooks.py:399 cps/editbooks.py:413
 msgid "Cover is not a supported imageformat (jpg/png/webp), can't save"
 msgstr ""
 
-#: cps/web.py:3605 cps/web.py:3614
+#: cps/editbooks.py:445 cps/editbooks.py:454
 msgid "unknown"
 msgstr "ismeretlen"
 
-#: cps/web.py:3694
+#: cps/editbooks.py:486
+msgid "Cover is not a jpg file, can't save"
+msgstr ""
+
+#: cps/editbooks.py:534
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "A(z) %(langname)s nem érvényes nyelv"
 
-#: cps/web.py:3725
+#: cps/editbooks.py:565
 msgid "Metadata successfully updated"
 msgstr "A metaadatok sikeresen frissültek"
 
-#: cps/web.py:3734
+#: cps/editbooks.py:574
 msgid "Error editing book, please check logfile for details"
 msgstr "Hiba a könyv szerkesztése során, további részletek a naplófájlban."
 
-#: cps/web.py:3780
+#: cps/editbooks.py:624
 #, python-format
 msgid "Failed to store file %(file)s (Permission denied)."
 msgstr "Nem sikerült elmenteni a %(file)s fájlt."
 
-#: cps/web.py:3785
+#: cps/editbooks.py:629
 #, python-format
 msgid "Failed to delete file %(file)s (Permission denied)."
 msgstr "Nem sikerült törölni a %(file)s fájlt."
 
-#: cps/web.py:3867
+#: cps/editbooks.py:712
 #, python-format
-msgid "File %(title)s"
-msgstr "Fájl: %(title)s"
+msgid "File %(file)s uploaded"
+msgstr ""
 
-#: cps/web.py:3896
+#: cps/editbooks.py:741
 msgid "Source or destination format for conversion missing"
 msgstr "Az átalakításhoz hiányzik a forrás- vagy a célformátum!"
 
-#: cps/web.py:3906
+#: cps/editbooks.py:751
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "A könyv sikeresen átalakításra lett jelölve a következő formátumra: %(book_format)s"
 
-#: cps/web.py:3910
+#: cps/editbooks.py:755
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Hiba történt a könyv átalakításakor: %(res)s"
 
-#: cps/worker.py:305
+#: cps/gdrive.py:56
+msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
+msgstr "A Google Drive beállítása nem fejeződött be, próbáld kikapcsolni és újra aktíválni a Google Drive-ot."
+
+#: cps/gdrive.py:101
+msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
+msgstr "A visszahívási tartomány nem ellenőrzött, kövesd az alábbi lépéseket a tartomány ellenőrzéséhez a Google Developer Console-ban:"
+
+#: cps/helper.py:97
+#, python-format
+msgid "%(format)s format not found for book id: %(book)d"
+msgstr "A(z) %(format)s formátum nem található a következő könyvhöz: %(book)d"
+
+#: cps/helper.py:109
+#, python-format
+msgid "%(format)s not found on Google Drive: %(fn)s"
+msgstr "%(format)s nem található a Google Drive-on: %(fn)s"
+
+#: cps/helper.py:116 cps/helper.py:223 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Küldés Kindle-re"
+
+#: cps/helper.py:117 cps/helper.py:135 cps/helper.py:225
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "Ez az e-mail a Calibre-Web-en keresztül lett küldve."
+
+#: cps/helper.py:128
+#, python-format
+msgid "%(format)s not found: %(fn)s"
+msgstr "%(format)s nem található: %(fn)s"
+
+#: cps/helper.py:133
+msgid "Calibre-Web test e-mail"
+msgstr "Calibre-Web teszt e-mail"
+
+#: cps/helper.py:134
+msgid "Test e-mail"
+msgstr "Teszt e-mail"
+
+#: cps/helper.py:150
+msgid "Get Started with Calibre-Web"
+msgstr "Kezdő lépések a Calibre-Web-bel"
+
+#: cps/helper.py:151
+#, python-format
+msgid "Registration e-mail for user: %(name)s"
+msgstr "Regisztrációs e-mail a következő felhasználóhoz: %(name)s"
+
+#: cps/helper.py:165 cps/helper.py:167 cps/helper.py:169 cps/helper.py:177
+#: cps/helper.py:179 cps/helper.py:181
+#, python-format
+msgid "Send %(format)s to Kindle"
+msgstr "%(format)s küldése Kindle-re"
+
+#: cps/helper.py:185
+#, python-format
+msgid "Convert %(orig)s to %(format)s and send to Kindle"
+msgstr "%(orig)s konvertálása %(format)s-ra és küldés Kindle-re"
+
+#: cps/helper.py:224
+#, python-format
+msgid "E-mail: %(book)s"
+msgstr "E-mail: %(book)s"
+
+#: cps/helper.py:227
+msgid "The requested file could not be read. Maybe wrong permissions?"
+msgstr "A kért fájl nem olvasható. Esetleg jogosultsági probléma lenne?"
+
+#: cps/helper.py:335
+#, python-format
+msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "A cím átnevezése \"%(src)s\"-ról \"%(dest)s\"-ra nem sikerült a következő hiba miatt: %(error)s"
+
+#: cps/helper.py:345
+#, python-format
+msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "A szerző átnevezése \"%(src)s\"-ról \"%(dest)s\"-ra nem sikerült a következő hiba miatt: %(error)s"
+
+#: cps/helper.py:359
+#, python-format
+msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "\"%(src)s\" fájl átnevezése \"%(dest)s\"-re nem sikerült a következő hiba miatt: %(error)s"
+
+#: cps/helper.py:385 cps/helper.py:395 cps/helper.py:403
+#, python-format
+msgid "File %(file)s not found on Google Drive"
+msgstr "A \"%(file)s\" fájl nem található a Google Drive-on"
+
+#: cps/helper.py:424
+#, python-format
+msgid "Book path %(path)s not found on Google Drive"
+msgstr "A könyv elérési útja (\"%(path)s\") nem található a Google Drive-on"
+
+#: cps/helper.py:584
+msgid "Error excecuting UnRar"
+msgstr "Hiba az UnRar futtatásakor"
+
+#: cps/helper.py:586
+msgid "Unrar binary file not found"
+msgstr "Az Unrar futtatható állománya nem található"
+
+#: cps/helper.py:614
+msgid "Waiting"
+msgstr "Várakozás"
+
+#: cps/helper.py:616
+msgid "Failed"
+msgstr "Nem sikerült"
+
+#: cps/helper.py:618
+msgid "Started"
+msgstr "Elindítva"
+
+#: cps/helper.py:620
+msgid "Finished"
+msgstr "Végrehajtva"
+
+#: cps/helper.py:622
+msgid "Unknown Status"
+msgstr "Ismeretlen állapot"
+
+#: cps/helper.py:627
+msgid "E-mail: "
+msgstr "E-mail cím: "
+
+#: cps/helper.py:629 cps/helper.py:633
+msgid "Convert: "
+msgstr "Konvertálás:"
+
+#: cps/helper.py:631
+msgid "Upload: "
+msgstr "Feltöltés:"
+
+#: cps/helper.py:635
+msgid "Unknown Task: "
+msgstr "Ismeretlen feladat:"
+
+#: cps/oauth_bb.py:87
+#, python-format
+msgid "Register with %s, "
+msgstr ""
+
+#: cps/oauth_bb.py:145
+msgid "Failed to log in with GitHub."
+msgstr ""
+
+#: cps/oauth_bb.py:150
+msgid "Failed to fetch user info from GitHub."
+msgstr ""
+
+#: cps/oauth_bb.py:161
+msgid "Failed to log in with Google."
+msgstr ""
+
+#: cps/oauth_bb.py:166
+msgid "Failed to fetch user info from Google."
+msgstr ""
+
+#: cps/oauth_bb.py:265
+#, python-format
+msgid "Unlink to %(oauth)s success."
+msgstr ""
+
+#: cps/oauth_bb.py:269
+#, python-format
+msgid "Unlink to %(oauth)s failed."
+msgstr ""
+
+#: cps/oauth_bb.py:272
+#, python-format
+msgid "Not linked to %(oauth)s."
+msgstr ""
+
+#: cps/oauth_bb.py:300
+msgid "GitHub Oauth error, please retry later."
+msgstr ""
+
+#: cps/oauth_bb.py:319
+msgid "Google Oauth error, please retry later."
+msgstr ""
+
+#: cps/shelf.py:40 cps/shelf.py:92
+msgid "Invalid shelf specified"
+msgstr "A megadott polc érvénytelen!"
+
+#: cps/shelf.py:47
+#, python-format
+msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
+msgstr "Elnézést, nem vagy jogosult hozzáadni a könyvet a következő polcra: %(shelfname)s"
+
+#: cps/shelf.py:55
+msgid "You are not allowed to edit public shelves"
+msgstr "Nem vagy jogosult szerkeszteni nyilvános polcokat"
+
+#: cps/shelf.py:64
+#, python-format
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr "A könyv már a következő polcon van: %(shelfname)s"
+
+#: cps/shelf.py:78
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "A könyv hozzá lett adva a következő polchoz: %(sname)s"
+
+#: cps/shelf.py:97
+#, python-format
+msgid "You are not allowed to add a book to the the shelf: %(name)s"
+msgstr "Nincs jogosultságod könyvet tenni a következő polcra: %(name)s."
+
+#: cps/shelf.py:102
+msgid "User is not allowed to edit public shelves"
+msgstr "A felhasználó nem szerkeszthet nyilvános polcokat"
+
+#: cps/shelf.py:120
+#, python-format
+msgid "Books are already part of the shelf: %(name)s"
+msgstr "A könyvek már a következő polcon vannak: %(name)s"
+
+#: cps/shelf.py:134
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr "A könyvek hozzá lettek adva a következő polchoz: %(sname)s"
+
+#: cps/shelf.py:136
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr "Nem sikerült hozzáadni a könyveket a polchoz: %(sname)s"
+
+#: cps/shelf.py:173
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "A könyv el lett távolítva a polcról: %(sname)s"
+
+#: cps/shelf.py:179
+#, python-format
+msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
+msgstr "Sajnálom, nincs jogosultságot eltávolítani könyvet erről a polcról: %(sname)s"
+
+#: cps/shelf.py:200 cps/shelf.py:224
+#, python-format
+msgid "A shelf with the name '%(title)s' already exists."
+msgstr "Már létezik \"%(title)s\" nevű polc!"
+
+#: cps/shelf.py:205
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "A következő polc létre lett hozva: %(title)s"
+
+#: cps/shelf.py:207 cps/shelf.py:235
+msgid "There was an error"
+msgstr "Hiba történt"
+
+#: cps/shelf.py:208 cps/shelf.py:210
+msgid "create a shelf"
+msgstr "Polc készítése"
+
+#: cps/shelf.py:233
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "A következő polc megváltoztatva: %(title)s"
+
+#: cps/shelf.py:236 cps/shelf.py:238
+msgid "Edit a shelf"
+msgstr "Polc szerkesztése"
+
+#: cps/shelf.py:259
+#, python-format
+msgid "successfully deleted shelf %(name)s"
+msgstr "A következő polc sikeresen törölve: %(name)s"
+
+#: cps/shelf.py:289
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Polc: '%(name)s'"
+
+#: cps/shelf.py:292
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "Hiba a polc megnyitásakor. A polc nem létezik vagy nem elérhető."
+
+#: cps/shelf.py:324
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "A következő polc átrendezése: %(name)s"
+
+#: cps/ub.py:111
+msgid "Recently Added"
+msgstr "Legutóbb hozzáadott"
+
+#: cps/ub.py:113
+msgid "Show recent books"
+msgstr "Legutóbbi könyvek mutatása"
+
+#: cps/templates/index.xml:17 cps/ub.py:114
+msgid "Hot Books"
+msgstr "Kelendő könyvek"
+
+#: cps/ub.py:115
+msgid "Show hot books"
+msgstr "Kelendő könyvek mutatása"
+
+#: cps/templates/index.xml:24 cps/ub.py:118
+msgid "Best rated Books"
+msgstr "Legjobb könyvek"
+
+#: cps/ub.py:120
+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:121
+#: cps/web.py:965
+msgid "Read Books"
+msgstr "Olvasott könyvek"
+
+#: cps/ub.py:123
+msgid "Show read and unread"
+msgstr "Mutassa az olvasva/olvasatlan állapotot"
+
+#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:125
+#: cps/web.py:969
+msgid "Unread Books"
+msgstr "Olvasatlan könyvek"
+
+#: cps/ub.py:127
+msgid "Show unread"
+msgstr ""
+
+#: cps/ub.py:128
+msgid "Discover"
+msgstr "Felfedezés"
+
+#: cps/ub.py:130
+msgid "Show random books"
+msgstr "Könyvek találomra mutatása"
+
+#: cps/ub.py:131
+msgid "Categories"
+msgstr "Címkék"
+
+#: cps/ub.py:133
+msgid "Show category selection"
+msgstr "Címke választó mutatása"
+
+#: cps/templates/book_edit.html:71 cps/templates/search_form.html:53
+#: cps/ub.py:134
+msgid "Series"
+msgstr "Sorozatok"
+
+#: cps/ub.py:136
+msgid "Show series selection"
+msgstr "Sorozat választó mutatása"
+
+#: cps/templates/index.xml:61 cps/ub.py:137
+msgid "Authors"
+msgstr "Szerzők"
+
+#: cps/ub.py:139
+msgid "Show author selection"
+msgstr "Szerző választó mutatása"
+
+#: cps/templates/index.xml:68 cps/ub.py:141
+msgid "Publishers"
+msgstr "Kiadók"
+
+#: cps/ub.py:143
+msgid "Show publisher selection"
+msgstr "Kiadó választó mutatása"
+
+#: cps/templates/search_form.html:74 cps/ub.py:144
+msgid "Languages"
+msgstr "Nyelvek"
+
+#: cps/ub.py:147
+msgid "Show language selection"
+msgstr "Nyelv választó mutatása"
+
+#: cps/ub.py:148
+msgid "Ratings"
+msgstr ""
+
+#: cps/ub.py:150
+msgid "Show ratings selection"
+msgstr ""
+
+#: cps/ub.py:151
+msgid "File formats"
+msgstr ""
+
+#: cps/ub.py:153
+msgid "Show file formats selection"
+msgstr ""
+
+#: cps/updater.py:257 cps/updater.py:364 cps/updater.py:377
+msgid "Unexpected data while reading update information"
+msgstr "Ismeretlen adat a frissítési információk olvasásakor"
+
+#: cps/updater.py:264 cps/updater.py:370
+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:290 cps/updater.py:422
+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:343
+msgid "Could not fetch update information"
+msgstr "Nem lehetett begyűjteni a frissítési információkat"
+
+#: cps/updater.py:357
+msgid "No release information available"
+msgstr "Nincs információ a kiadásról."
+
+#: cps/updater.py:403 cps/updater.py:412
+#, 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/web.py:457
+msgid "Recently Added Books"
+msgstr "Legutóbb hozzáadott könyvek"
+
+#: cps/web.py:484
+msgid "Best rated books"
+msgstr "Legjobbra értékelt könyvek"
+
+#: cps/templates/index.xml:38 cps/web.py:492
+msgid "Random Books"
+msgstr "Könyvek találomra"
+
+#: cps/web.py:516
+msgid "Books"
+msgstr ""
+
+#: cps/web.py:543
+msgid "Hot Books (most downloaded)"
+msgstr "Kelendő könyvek (legtöbbet letöltöttek)"
+
+#: cps/web.py:553 cps/web.py:1294 cps/web.py:1383
+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:580
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr "Kiadó: %(name)s"
+
+#: cps/web.py:591
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "Sorozat: %(serie)s"
+
+#: cps/web.py:602
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr ""
+
+#: cps/web.py:613
+#, python-format
+msgid "File format: %(format)s"
+msgstr ""
+
+#: cps/web.py:625
+#, python-format
+msgid "Category: %(name)s"
+msgstr "Címke: %(name)s"
+
+#: cps/web.py:659
+msgid "Publisher list"
+msgstr "Kiadók listája"
+
+#: cps/templates/index.xml:82 cps/web.py:675
+msgid "Series list"
+msgstr "Sorozatok listája"
+
+#: cps/web.py:689
+msgid "Ratings list"
+msgstr ""
+
+#: cps/web.py:702
+msgid "File formats list"
+msgstr ""
+
+#: cps/web.py:730
+msgid "Available languages"
+msgstr "Elérhető nyelvek"
+
+#: cps/web.py:750
+#, python-format
+msgid "Language: %(name)s"
+msgstr "Nyelv: %(name)s"
+
+#: cps/templates/index.xml:75 cps/web.py:764
+msgid "Category list"
+msgstr "Címkék listája"
+
+#: cps/templates/layout.html:73 cps/web.py:777
+msgid "Tasks"
+msgstr "Feladatok"
+
+#: cps/web.py:841
+msgid "Published after "
+msgstr "Kiadva ezután: "
+
+#: cps/web.py:848
+msgid "Published before "
+msgstr "Kiadva ezelőtt: "
+
+#: cps/web.py:862
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Értékelés <= %(rating)s"
+
+#: cps/web.py:864
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Értékelés <= %(rating)s"
+
+#: cps/web.py:924 cps/web.py:933
+msgid "search"
+msgstr "keresés"
+
+#: cps/web.py:1018
+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:1023
+#, 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:1027
+#, 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:1046 cps/web.py:1071 cps/web.py:1076 cps/web.py:1081
+#: cps/web.py:1085
+msgid "register"
+msgstr "regisztrálás"
+
+#: cps/web.py:1073
+msgid "Your e-mail is not allowed to register"
+msgstr "Nem engedélyezett a megadott e-mail cím bejegyzése"
+
+#: cps/web.py:1077
+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:1080
+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:1103 cps/web.py:1115
+#, python-format
+msgid "You are now logged in as: '%(nickname)s'"
+msgstr ""
+
+#: cps/web.py:1108 cps/web.py:1120
+msgid "Wrong Username or Password"
+msgstr "Rossz felhasználó név vagy jelszó!"
+
+#: cps/web.py:1111
+msgid "Could not login. LDAP server down, please contact your administrator"
+msgstr ""
+
+#: cps/web.py:1124 cps/web.py:1146
+msgid "login"
+msgstr "belépés"
+
+#: cps/web.py:1158 cps/web.py:1189
+msgid "Token not found"
+msgstr "A token nem található."
+
+#: cps/web.py:1166 cps/web.py:1197
+msgid "Token has expired"
+msgstr "A token érvényessége lejárt."
+
+#: cps/web.py:1174
+msgid "Success! Please return to your device"
+msgstr "Sikerült! Újra használható az eszköz."
+
+#: cps/web.py:1210
+#, python-format
+msgid "you are now logged in as: '%(nickname)s'"
+msgstr "Be vagy jelentkezve mint: %(nickname)s"
+
+#: cps/web.py:1250 cps/web.py:1277 cps/web.py:1281
+#, python-format
+msgid "%(name)s's profile"
+msgstr "%(name)s profilja"
+
+#: cps/web.py:1274
+msgid "Found an existing account for this e-mail address."
+msgstr "Már létezik felhasználó ehhez az e-mail címhez."
+
+#: cps/web.py:1279
+msgid "Profile updated"
+msgstr "A profil frissítve."
+
+#: cps/web.py:1304 cps/web.py:1306 cps/web.py:1308 cps/web.py:1314
+#: cps/web.py:1318
+msgid "Read a Book"
+msgstr "Egy olvasott könyv"
+
+#: cps/web.py:1328
+msgid "Error opening eBook. File does not exist or file is not accessible."
+msgstr ""
+
+#: cps/worker.py:308
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Az e-könyv átalakítás nem sikerült: %(error)s"
 
-#: cps/worker.py:316
+#: cps/worker.py:319
 #, python-format
 msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "A Kindlegen futtatása nem sikerült a(z) %(error)s hiba miatt. Üzenet: %(message)s"
@@ -780,147 +969,152 @@ msgstr "Letöltések"
 msgid "Admin"
 msgstr "Rendszergazda"
 
-#: cps/templates/admin.html:14 cps/templates/detail.html:22
-#: cps/templates/detail.html:31
+#: cps/templates/admin.html:14 cps/templates/detail.html:18
+#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/shelfdown.html:62
 msgid "Download"
 msgstr "Letöltés"
 
-#: cps/templates/admin.html:15 cps/templates/layout.html:65
+#: cps/templates/admin.html:15
+msgid "View Ebooks"
+msgstr ""
+
+#: cps/templates/admin.html:16 cps/templates/layout.html:65
 msgid "Upload"
 msgstr "Feltöltés"
 
-#: cps/templates/admin.html:16
+#: cps/templates/admin.html:17
 msgid "Edit"
 msgstr "Szerkesztés"
 
-#: cps/templates/admin.html:39
+#: cps/templates/admin.html:41
 msgid "SMTP e-mail server settings"
 msgstr "SMTP e-mail kiszolgáló beállítások"
 
-#: cps/templates/admin.html:42 cps/templates/email_edit.html:11
+#: cps/templates/admin.html:44 cps/templates/email_edit.html:11
 msgid "SMTP hostname"
 msgstr "SMTP szervernév"
 
-#: cps/templates/admin.html:43
+#: cps/templates/admin.html:45
 msgid "SMTP port"
 msgstr "SMTP port"
 
-#: cps/templates/admin.html:44
+#: cps/templates/admin.html:46
 msgid "SSL"
 msgstr "SSL"
 
-#: cps/templates/admin.html:45 cps/templates/email_edit.html:27
+#: cps/templates/admin.html:47 cps/templates/email_edit.html:27
 msgid "SMTP login"
 msgstr "SMTP felhasználó"
 
-#: cps/templates/admin.html:46
+#: cps/templates/admin.html:48
 msgid "From mail"
 msgstr "Küldő e-mail cím"
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:58
 msgid "Change SMTP settings"
 msgstr "SMTP beállítások változtatása"
 
-#: cps/templates/admin.html:62
+#: cps/templates/admin.html:64
 msgid "Configuration"
 msgstr "Konfiguráció"
 
-#: cps/templates/admin.html:65
+#: cps/templates/admin.html:67
 msgid "Calibre DB dir"
 msgstr "Calibre adatbázis mappája:"
 
-#: cps/templates/admin.html:69
+#: cps/templates/admin.html:71
 msgid "Log level"
 msgstr "Naplózás szintje:"
 
-#: cps/templates/admin.html:73
+#: cps/templates/admin.html:75
 msgid "Port"
 msgstr "Port:"
 
-#: cps/templates/admin.html:79 cps/templates/config_view_edit.html:23
+#: cps/templates/admin.html:81 cps/templates/config_view_edit.html:23
 msgid "Books per page"
 msgstr "Könyvek oldalanként:"
 
-#: cps/templates/admin.html:83
+#: cps/templates/admin.html:85
 msgid "Uploading"
 msgstr "Feltöltés:"
 
-#: cps/templates/admin.html:87
+#: cps/templates/admin.html:89
 msgid "Anonymous browsing"
 msgstr "Böngészés bejelentkezés nélkül:"
 
-#: cps/templates/admin.html:91
+#: cps/templates/admin.html:93
 msgid "Public registration"
 msgstr "Nyílvános regisztráció:"
 
-#: cps/templates/admin.html:95 cps/templates/remote_login.html:4
+#: cps/templates/admin.html:97 cps/templates/remote_login.html:4
 msgid "Remote login"
 msgstr "Távoli belépés:"
 
-#: cps/templates/admin.html:106
+#: cps/templates/admin.html:108
 msgid "Administration"
 msgstr "Adminisztráció"
 
-#: cps/templates/admin.html:107
+#: cps/templates/admin.html:109
 msgid "Reconnect to Calibre DB"
 msgstr "Újracsatlakozás a Calibre adatbázishoz"
 
-#: cps/templates/admin.html:108
+#: cps/templates/admin.html:110
 msgid "Restart Calibre-Web"
 msgstr "A Calibre adatbázis újraindítása"
 
-#: cps/templates/admin.html:109
+#: cps/templates/admin.html:111
 msgid "Stop Calibre-Web"
 msgstr "A Calibre adatbázis leállítása"
 
-#: cps/templates/admin.html:115
+#: cps/templates/admin.html:117
 msgid "Update"
 msgstr "Frissítés"
 
-#: cps/templates/admin.html:119
+#: cps/templates/admin.html:121
 msgid "Version"
 msgstr "Verzió"
 
-#: cps/templates/admin.html:120
+#: cps/templates/admin.html:122
 msgid "Details"
 msgstr "Részletek"
 
-#: cps/templates/admin.html:126
+#: cps/templates/admin.html:128
 msgid "Current version"
 msgstr "Jelenlegi verzió"
 
-#: cps/templates/admin.html:132
+#: cps/templates/admin.html:134
 msgid "Check for update"
 msgstr "Frissítés keresése"
 
-#: cps/templates/admin.html:133
+#: cps/templates/admin.html:135
 msgid "Perform Update"
 msgstr "Frissítés elkezdése"
 
-#: cps/templates/admin.html:145
+#: cps/templates/admin.html:147
 msgid "Do you really want to restart Calibre-Web?"
 msgstr "Valóban újra akarod indítani a Calibre-Web-et?"
 
-#: cps/templates/admin.html:150 cps/templates/admin.html:164
-#: cps/templates/admin.html:184 cps/templates/shelf.html:73
+#: cps/templates/admin.html:152 cps/templates/admin.html:166
+#: cps/templates/admin.html:186 cps/templates/shelf.html:72
 msgid "Ok"
 msgstr "OK"
 
-#: cps/templates/admin.html:151 cps/templates/admin.html:165
-#: cps/templates/book_edit.html:178 cps/templates/book_edit.html:200
-#: cps/templates/config_edit.html:226 cps/templates/config_view_edit.html:179
-#: cps/templates/email_edit.html:40 cps/templates/email_edit.html:75
-#: cps/templates/layout.html:28 cps/templates/shelf.html:74
+#: cps/templates/admin.html:153 cps/templates/admin.html:167
+#: cps/templates/book_edit.html:174 cps/templates/book_edit.html:196
+#: cps/templates/config_edit.html:281 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/user_edit.html:149
+#: cps/templates/user_edit.html:132
 msgid "Back"
 msgstr "Vissza"
 
-#: cps/templates/admin.html:163
+#: cps/templates/admin.html:165
 msgid "Do you really want to stop Calibre-Web?"
 msgstr "Valóban le akarod állítani a Calibre-Web-et?"
 
-#: cps/templates/admin.html:175
+#: cps/templates/admin.html:177
 msgid "Updating, please do not reload page"
 msgstr "Frissítés folyamatban, ne töltsd újra az oldalt"
 
@@ -932,176 +1126,176 @@ msgstr "keresztül"
 msgid "In Library"
 msgstr "Könyvtárban"
 
-#: cps/templates/author.html:50 cps/templates/author.html:97
-#: cps/templates/discover.html:28 cps/templates/index.html:31
-#: cps/templates/index.html:86 cps/templates/search.html:55
-#: cps/templates/shelf.html:37
+#: cps/templates/author.html:34 cps/templates/list.html:14
+#: cps/templates/search.html:41
+msgid "All"
+msgstr ""
+
+#: cps/templates/author.html:58 cps/templates/author.html:105
+#: 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 "csökkentsd"
 
-#: cps/templates/author.html:81
+#: cps/templates/author.html:89
 msgid "More by"
 msgstr "Több eszerint:"
 
-#: cps/templates/book_edit.html:16
+#: cps/templates/book_edit.html:12
 msgid "Delete Book"
 msgstr "Könyv törlése"
 
-#: cps/templates/book_edit.html:19
+#: cps/templates/book_edit.html:15
 msgid "Delete formats:"
 msgstr "Formátumok törlése:"
 
-#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:199
-#: cps/templates/email_edit.html:73 cps/templates/email_edit.html:74
+#: cps/templates/book_edit.html:18 cps/templates/book_edit.html:195
+#: cps/templates/email_edit.html:73
 msgid "Delete"
 msgstr "Törlés"
 
-#: cps/templates/book_edit.html:30
+#: cps/templates/book_edit.html:26
 msgid "Convert book format:"
 msgstr "Könyvformátum átalakítása:"
 
-#: cps/templates/book_edit.html:34
+#: cps/templates/book_edit.html:30
 msgid "Convert from:"
 msgstr "Konvertálás erről:"
 
-#: cps/templates/book_edit.html:36 cps/templates/book_edit.html:43
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
 msgstr "Válassz egy lehetőséget"
 
-#: cps/templates/book_edit.html:41
+#: cps/templates/book_edit.html:37
 msgid "Convert to:"
 msgstr "Konvertálás erre:"
 
-#: cps/templates/book_edit.html:50
+#: cps/templates/book_edit.html:46
 msgid "Convert book"
 msgstr "Könyv konvertálása"
 
-#: cps/templates/book_edit.html:59 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:55 cps/templates/search_form.html:6
 msgid "Book Title"
 msgstr "Könyv címe"
 
-#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:259
-#: cps/templates/book_edit.html:277 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:59 cps/templates/book_edit.html:255
+#: cps/templates/book_edit.html:273 cps/templates/search_form.html:10
 msgid "Author"
 msgstr "Szerző"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:264
-#: cps/templates/book_edit.html:279 cps/templates/search_form.html:106
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:260
+#: cps/templates/book_edit.html:275 cps/templates/search_form.html:106
 msgid "Description"
 msgstr "Leírás"
 
-#: cps/templates/book_edit.html:71 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:67 cps/templates/search_form.html:33
 msgid "Tags"
 msgstr "Címkék"
 
-#: cps/templates/book_edit.html:75 cps/templates/layout.html:159
-#: cps/templates/search_form.html:53
-msgid "Series"
-msgstr "Sorozatok"
-
-#: cps/templates/book_edit.html:79
+#: cps/templates/book_edit.html:75
 msgid "Series id"
 msgstr "Sorozat azonosítója"
 
-#: cps/templates/book_edit.html:83
+#: cps/templates/book_edit.html:79
 msgid "Rating"
 msgstr "Értékelés"
 
-#: cps/templates/book_edit.html:87
+#: cps/templates/book_edit.html:83
 msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
 msgstr "Borító URL (jpg, borító letöltve és elmentve az adatbázisban, a mező újra üres lesz utána)"
 
-#: cps/templates/book_edit.html:91
+#: cps/templates/book_edit.html:87
 msgid "Upload Cover from local drive"
 msgstr "Borító feltöltése helyi meghajtóról"
 
-#: cps/templates/book_edit.html:96 cps/templates/detail.html:148
+#: cps/templates/book_edit.html:92 cps/templates/detail.html:168
 msgid "Publishing date"
 msgstr "Kiadás éve"
 
-#: cps/templates/book_edit.html:103 cps/templates/book_edit.html:261
-#: cps/templates/book_edit.html:278 cps/templates/detail.html:139
+#: cps/templates/book_edit.html:99 cps/templates/book_edit.html:257
+#: cps/templates/book_edit.html:274 cps/templates/detail.html:159
 #: cps/templates/search_form.html:14
 msgid "Publisher"
 msgstr "Kiadó"
 
-#: cps/templates/book_edit.html:107 cps/templates/user_edit.html:31
+#: cps/templates/book_edit.html:103 cps/templates/user_edit.html:31
 msgid "Language"
 msgstr "Nyelv"
 
-#: cps/templates/book_edit.html:117 cps/templates/search_form.html:117
+#: cps/templates/book_edit.html:113 cps/templates/search_form.html:117
 msgid "Yes"
 msgstr "Igen"
 
-#: cps/templates/book_edit.html:118 cps/templates/search_form.html:118
+#: cps/templates/book_edit.html:114 cps/templates/search_form.html:118
 msgid "No"
 msgstr "Nem"
 
-#: cps/templates/book_edit.html:164
+#: cps/templates/book_edit.html:160
 msgid "Upload format"
 msgstr "Feltöltés formátuma"
 
-#: cps/templates/book_edit.html:173
+#: cps/templates/book_edit.html:169
 msgid "view book after edit"
 msgstr "Könyv megnézése szerkesztés után"
 
-#: cps/templates/book_edit.html:176 cps/templates/book_edit.html:212
+#: cps/templates/book_edit.html:172 cps/templates/book_edit.html:208
 msgid "Get metadata"
 msgstr "Metaadatok beszerzése"
 
-#: cps/templates/book_edit.html:177 cps/templates/config_edit.html:224
-#: cps/templates/config_view_edit.html:178 cps/templates/login.html:20
+#: cps/templates/book_edit.html:173 cps/templates/config_edit.html:279
+#: cps/templates/config_view_edit.html:146 cps/templates/login.html:20
 #: cps/templates/search_form.html:150 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:147
+#: cps/templates/user_edit.html:130
 msgid "Submit"
 msgstr "Küldés"
 
-#: cps/templates/book_edit.html:191
+#: cps/templates/book_edit.html:187
 msgid "Are you really sure?"
 msgstr "Biztosan?"
 
-#: cps/templates/book_edit.html:194
+#: cps/templates/book_edit.html:190
 msgid "Book will be deleted from Calibre database"
 msgstr "A könyv törölve lesz a Calibre adatbázisból"
 
-#: cps/templates/book_edit.html:195
+#: cps/templates/book_edit.html:191
 msgid "and from hard disk"
 msgstr " és a merevlemezről"
 
-#: cps/templates/book_edit.html:215
+#: cps/templates/book_edit.html:211
 msgid "Keyword"
 msgstr "Kulcsszó"
 
-#: cps/templates/book_edit.html:216
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr " Keresési kulcsszó "
 
-#: cps/templates/book_edit.html:218 cps/templates/layout.html:47
+#: cps/templates/book_edit.html:214 cps/templates/layout.html:47
 msgid "Go!"
 msgstr "Rajta!"
 
-#: cps/templates/book_edit.html:222
+#: cps/templates/book_edit.html:218
 msgid "Click the cover to load metadata to the form"
 msgstr "Kattints a borítóra a metadatok betöltésére"
 
-#: cps/templates/book_edit.html:234 cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:230 cps/templates/book_edit.html:270
 msgid "Loading..."
 msgstr "Betöltés..."
 
-#: cps/templates/book_edit.html:239 cps/templates/layout.html:226
-#: cps/templates/layout.html:258
+#: cps/templates/book_edit.html:235 cps/templates/layout.html:187
+#: cps/templates/layout.html:219
 msgid "Close"
 msgstr "Bezárás"
 
-#: cps/templates/book_edit.html:266 cps/templates/book_edit.html:280
+#: cps/templates/book_edit.html:262 cps/templates/book_edit.html:276
 msgid "Source"
 msgstr "Forrás"
 
-#: cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:271
 msgid "Search error!"
 msgstr "Keresési hiba!"
 
-#: cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:272
 msgid "No Result(s) found! Please try aonther keyword."
 msgstr "Nincs találat! Próbálj másik kulcsszót."
 
@@ -1229,35 +1423,87 @@ msgstr "Goodreads API-kulcs"
 msgid "Goodreads API Secret"
 msgstr "Goodreads API titkos kód"
 
-#: cps/templates/config_edit.html:187
+#: cps/templates/config_edit.html:181
+msgid "Login type"
+msgstr ""
+
+#: cps/templates/config_edit.html:183
+msgid "Use standard Authentication"
+msgstr ""
+
+#: cps/templates/config_edit.html:185
+msgid "Use LDAP Authentication"
+msgstr ""
+
+#: cps/templates/config_edit.html:188
+msgid "Use GitHub OAuth"
+msgstr ""
+
+#: cps/templates/config_edit.html:189
+msgid "Use Google OAuth"
+msgstr ""
+
+#: cps/templates/config_edit.html:196
+msgid "LDAP Provider URL"
+msgstr ""
+
+#: cps/templates/config_edit.html:200
+msgid "LDAP Distinguished Name (DN)"
+msgstr ""
+
+#: cps/templates/config_edit.html:208
+msgid "Obtain GitHub OAuth Credential"
+msgstr ""
+
+#: cps/templates/config_edit.html:211
+msgid "GitHub OAuth Client Id"
+msgstr ""
+
+#: cps/templates/config_edit.html:215
+msgid "GitHub OAuth Client Secret"
+msgstr ""
+
+#: cps/templates/config_edit.html:221
+msgid "Obtain Google OAuth Credential"
+msgstr ""
+
+#: cps/templates/config_edit.html:224
+msgid "Google OAuth Client Id"
+msgstr ""
+
+#: cps/templates/config_edit.html:228
+msgid "Google OAuth Client Secret"
+msgstr ""
+
+#: cps/templates/config_edit.html:242
 msgid "External binaries"
 msgstr "Külső futtatható fájlok"
 
-#: cps/templates/config_edit.html:195
+#: cps/templates/config_edit.html:250
 msgid "No converter"
 msgstr "Átalakítás nélkül"
 
-#: cps/templates/config_edit.html:197
+#: cps/templates/config_edit.html:252
 msgid "Use Kindlegen"
 msgstr "Kindlegen használata"
 
-#: cps/templates/config_edit.html:199
+#: cps/templates/config_edit.html:254
 msgid "Use calibre's ebook converter"
 msgstr "Calibre e-könyv átalakító használata"
 
-#: cps/templates/config_edit.html:203
+#: cps/templates/config_edit.html:258
 msgid "E-Book converter settings"
 msgstr "E-könyv átalakító beállításai"
 
-#: cps/templates/config_edit.html:207
+#: cps/templates/config_edit.html:262
 msgid "Path to convertertool"
 msgstr "Elérési út az átalakító-eszközhöz"
 
-#: cps/templates/config_edit.html:213
+#: cps/templates/config_edit.html:268
 msgid "Location of Unrar binary"
 msgstr "Az Unrar futtatási állományának helye"
 
-#: cps/templates/config_edit.html:229 cps/templates/layout.html:84
+#: cps/templates/config_edit.html:284 cps/templates/layout.html:84
 #: cps/templates/login.html:4
 msgid "Login"
 msgstr "Belépés"
@@ -1266,8 +1512,7 @@ msgstr "Belépés"
 msgid "View Configuration"
 msgstr "Általános beállítások"
 
-#: cps/templates/config_view_edit.html:19 cps/templates/layout.html:135
-#: cps/templates/layout.html:136 cps/templates/shelf_edit.html:7
+#: cps/templates/config_view_edit.html:19 cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr "Név"
 
@@ -1279,7 +1524,7 @@ msgstr "Találomra mutatott könyvek száma"
 msgid "No. of authors to show before hiding (0=disable hiding)"
 msgstr "Mutatott szerzők száma (0=elrejtés kikapcsolása)"
 
-#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:118
+#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:112
 msgid "Theme"
 msgstr "Téma"
 
@@ -1311,127 +1556,91 @@ msgstr "Felnőtt tartalom címkéi"
 msgid "Default settings for new users"
 msgstr "Új felhasználók alapértelmezett beállításai"
 
-#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:104
+#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:83
 msgid "Admin user"
 msgstr "Rendszergazda felhasználó"
 
-#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:113
+#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:92
 msgid "Allow Downloads"
 msgstr "Letöltés engedélyezése"
 
-#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:117
+#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:96
+msgid "Allow book viewer"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:100
 msgid "Allow Uploads"
 msgstr "Feltöltés engedélyezése"
 
-#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:121
+#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:104
 msgid "Allow Edit"
 msgstr "Szerkesztés engedélyezése"
 
-#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:125
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:108
 msgid "Allow Delete books"
 msgstr "Könyv törlés engedélyezése"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:130
+#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:113
 msgid "Allow Changing Password"
 msgstr "Jelszó változtatásának engedélyezése"
 
-#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:134
+#: cps/templates/config_view_edit.html:109 cps/templates/user_edit.html:117
 msgid "Allow Editing Public Shelfs"
 msgstr "Nyilvános polcok szerkesztésének engedélyezése"
 
-#: cps/templates/config_view_edit.html:115
+#: cps/templates/config_view_edit.html:119
 msgid "Default visibilities for new users"
 msgstr "Új felhasználók alapértelmezett látható elemei"
 
-#: cps/templates/config_view_edit.html:123 cps/templates/user_edit.html:50
-msgid "Show random books"
-msgstr "Könyvek találomra mutatása"
-
-#: cps/templates/config_view_edit.html:127 cps/templates/user_edit.html:54
-msgid "Show recent books"
-msgstr "Legutóbbi könyvek mutatása"
-
-#: cps/templates/config_view_edit.html:131 cps/templates/user_edit.html:58
-msgid "Show sorted books"
-msgstr "Rendezett könyvek mutatása"
-
-#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:62
-msgid "Show hot books"
-msgstr "Kelendő könyvek mutatása"
-
-#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:66
-msgid "Show best rated books"
-msgstr "Legjobbra értékelt könyvek mutatása"
-
-#: cps/templates/config_view_edit.html:143 cps/templates/user_edit.html:70
-msgid "Show language selection"
-msgstr "Nyelv választó mutatása"
-
-#: cps/templates/config_view_edit.html:147 cps/templates/user_edit.html:74
-msgid "Show series selection"
-msgstr "Sorozat választó mutatása"
-
-#: cps/templates/config_view_edit.html:151 cps/templates/user_edit.html:78
-msgid "Show category selection"
-msgstr "Címke választó mutatása"
-
-#: cps/templates/config_view_edit.html:155 cps/templates/user_edit.html:82
-msgid "Show author selection"
-msgstr "Szerző választó mutatása"
-
-#: cps/templates/config_view_edit.html:159 cps/templates/user_edit.html:86
-msgid "Show publisher selection"
-msgstr "Kiadó választó mutatása"
-
-#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:91
-msgid "Show read and unread"
-msgstr "Mutassa az olvasva/olvasatlan állapotot"
-
-#: cps/templates/config_view_edit.html:167 cps/templates/user_edit.html:96
+#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:75
 msgid "Show random books in detail view"
 msgstr "Mutasson könyveket találomra a részletes nézetben"
 
-#: cps/templates/config_view_edit.html:171 cps/templates/user_edit.html:109
+#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:88
 msgid "Show mature content"
 msgstr "Mutassa a felnőtt tartalmat"
 
-#: cps/templates/detail.html:63
+#: cps/templates/detail.html:59
 msgid "Read in browser"
 msgstr "Olvasás böngészőben"
 
-#: cps/templates/detail.html:100
+#: cps/templates/detail.html:73
+msgid "Listen in browser"
+msgstr ""
+
+#: cps/templates/detail.html:120
 msgid "Book"
 msgstr " "
 
-#: cps/templates/detail.html:100
+#: cps/templates/detail.html:120
 msgid "of"
 msgstr "kötete a sorozatnak:"
 
-#: cps/templates/detail.html:106
+#: cps/templates/detail.html:126
 msgid "language"
 msgstr "nyelv"
 
-#: cps/templates/detail.html:185
+#: cps/templates/detail.html:203
 msgid "Mark As Unread"
 msgstr "Legyen olvasatlan"
 
-#: cps/templates/detail.html:185
+#: cps/templates/detail.html:203
 msgid "Mark As Read"
 msgstr "Legyen olvasott"
 
-#: cps/templates/detail.html:186
+#: cps/templates/detail.html:204
 msgid "Read"
 msgstr "Olvasva"
 
-#: cps/templates/detail.html:196
+#: cps/templates/detail.html:214 cps/templates/listenmp3.html:54
 msgid "Description:"
 msgstr "Ismertető:"
 
-#: cps/templates/detail.html:209 cps/templates/search.html:14
+#: cps/templates/detail.html:227 cps/templates/search.html:14
 msgid "Add to shelf"
 msgstr "Hozzáadás polchoz"
 
-#: cps/templates/detail.html:271
+#: cps/templates/detail.html:289
 msgid "Edit metadata"
 msgstr "Metaadatok szerkesztése"
 
@@ -1491,12 +1700,12 @@ msgstr "Hozzáadás"
 msgid "Do you really want to delete this domain rule?"
 msgstr "Valóban törölni akarod ezt a tartomány-szabályt?"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:210
+#: cps/templates/feed.xml:21 cps/templates/layout.html:171
 msgid "Next"
 msgstr "Következő"
 
-#: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:44 cps/templates/layout.html:45
+#: cps/templates/feed.xml:33 cps/templates/layout.html:44
+#: cps/templates/layout.html:45
 msgid "Search"
 msgstr "Keresés"
 
@@ -1508,75 +1717,63 @@ msgstr "Vissza a kezdőlapra"
 msgid "Discover (Random Books)"
 msgstr "Felfedezés (könyvek találomra)"
 
+#: cps/templates/index.html:65
+msgid "Group by series"
+msgstr ""
+
 #: cps/templates/index.xml:6
 msgid "Start"
 msgstr "Kezdés"
 
-#: cps/templates/index.xml:18 cps/templates/layout.html:141
-msgid "Hot Books"
-msgstr "Kelendő könyvek"
-
-#: cps/templates/index.xml:22
+#: cps/templates/index.xml:21
 msgid "Popular publications from this catalog based on Downloads."
 msgstr "Ebből a katalógusból származó népszerű kiadványok letöltések alapján."
 
-#: cps/templates/index.xml:25 cps/templates/layout.html:144
-msgid "Best rated Books"
-msgstr "Legjobb könyvek"
-
-#: cps/templates/index.xml:29
+#: cps/templates/index.xml:28
 msgid "Popular publications from this catalog based on Rating."
 msgstr "Ebből a katalógusból származó népszerű kiadványok értékelések alapján."
 
-#: cps/templates/index.xml:32
+#: cps/templates/index.xml:31
 msgid "New Books"
 msgstr "Új könyvek"
 
-#: cps/templates/index.xml:36
+#: cps/templates/index.xml:35
 msgid "The latest Books"
 msgstr "A legfrissebb könyvek"
 
-#: cps/templates/index.xml:43
+#: cps/templates/index.xml:42
 msgid "Show Random Books"
 msgstr "Mutass könyveket találomra"
 
-#: cps/templates/index.xml:62 cps/templates/layout.html:162
-msgid "Authors"
-msgstr "Szerzők"
-
-#: cps/templates/index.xml:66
+#: cps/templates/index.xml:65
 msgid "Books ordered by Author"
 msgstr "Könyvek szerző szerint rendezve"
 
-#: cps/templates/index.xml:69 cps/templates/layout.html:165
-msgid "Publishers"
-msgstr "Kiadók"
-
-#: cps/templates/index.xml:73
+#: cps/templates/index.xml:72
 msgid "Books ordered by publisher"
 msgstr "Könyvek kiadók szerint rendezve"
 
-#: cps/templates/index.xml:80
+#: cps/templates/index.xml:79
 msgid "Books ordered by category"
 msgstr "Könyvek címke szerint rendezve"
 
-#: cps/templates/index.xml:87
+#: cps/templates/index.xml:86
 msgid "Books ordered by series"
 msgstr "Könyvek sorozat szerint rendezve"
 
-#: cps/templates/index.xml:90 cps/templates/layout.html:171
+#: cps/templates/index.xml:89 cps/templates/layout.html:132
 msgid "Public Shelves"
 msgstr "Nyilvános polcok"
 
-#: cps/templates/index.xml:94
+#: cps/templates/index.xml:93
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr "Könyvek nyilvános polcokra rakva, mindenkinek látható"
 
-#: cps/templates/index.xml:98 cps/templates/layout.html:175
+#: cps/templates/index.xml:97 cps/templates/layout.html:136
 msgid "Your Shelves"
 msgstr "Saját polcok"
 
-#: cps/templates/index.xml:102
+#: cps/templates/index.xml:101
 msgid "User's own shelfs, only visible to the current user himself"
 msgstr "A felhasználó saját polcai, csak a jelenlegi felhasználónak láthatóak"
 
@@ -1593,7 +1790,7 @@ msgid "Advanced Search"
 msgstr "Részletes keresés"
 
 #: cps/templates/layout.html:76 cps/templates/read.html:71
-#: cps/templates/readcbr.html:89 cps/templates/readcbr.html:113
+#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
 msgid "Settings"
 msgstr "Beállítások"
 
@@ -1609,7 +1806,7 @@ msgstr "Kilépés"
 msgid "Register"
 msgstr "Regisztrálás"
 
-#: cps/templates/layout.html:111 cps/templates/layout.html:257
+#: cps/templates/layout.html:111 cps/templates/layout.html:218
 msgid "Uploading..."
 msgstr "Feltöltés..."
 
@@ -1621,68 +1818,27 @@ msgstr "Ne frissítsd az oldalt!"
 msgid "Browse"
 msgstr "Böngészés"
 
-#: cps/templates/layout.html:124
-msgid "Recently Added"
-msgstr "Legutóbb hozzáadott"
-
-#: cps/templates/layout.html:129
-msgid "Sorted Books"
-msgstr "Rendezett könyvek"
-
-#: cps/templates/layout.html:133 cps/templates/layout.html:134
-#: cps/templates/layout.html:135 cps/templates/layout.html:136
-msgid "Sort By"
-msgstr "Sorbarendezés eszerint:"
-
-#: cps/templates/layout.html:133
-msgid "Newest"
-msgstr "Legújabbak"
-
-#: cps/templates/layout.html:134
-msgid "Oldest"
-msgstr "Legrégebbiek"
-
-#: cps/templates/layout.html:135
-msgid "Ascending"
-msgstr "Növekvő"
-
-#: cps/templates/layout.html:136
-msgid "Descending"
-msgstr "Csökkenő"
-
-#: cps/templates/layout.html:153
-msgid "Discover"
-msgstr "Felfedezés"
-
-#: cps/templates/layout.html:156
-msgid "Categories"
-msgstr "Címkék"
-
-#: cps/templates/layout.html:168 cps/templates/search_form.html:74
-msgid "Languages"
-msgstr "Nyelvek"
-
-#: cps/templates/layout.html:180
+#: cps/templates/layout.html:141
 msgid "Create a Shelf"
 msgstr "Polc készítése"
 
-#: cps/templates/layout.html:181 cps/templates/stats.html:3
+#: cps/templates/layout.html:142 cps/templates/stats.html:3
 msgid "About"
 msgstr "Névjegy"
 
-#: cps/templates/layout.html:195
+#: cps/templates/layout.html:156
 msgid "Previous"
 msgstr "Előző"
 
-#: cps/templates/layout.html:222
+#: cps/templates/layout.html:183
 msgid "Book Details"
 msgstr "Könyv részletei"
 
-#: cps/templates/layout.html:256
+#: cps/templates/layout.html:217
 msgid "Upload done, processing, please wait..."
 msgstr "Feltöltés kész, feldolgozás alatt, kérlek várj..."
 
-#: cps/templates/layout.html:259
+#: cps/templates/layout.html:220
 msgid "Error"
 msgstr "Hiba"
 
@@ -1712,105 +1868,105 @@ msgstr "Calibre-Web e-könyv katalógus"
 msgid "Reflow text when sidebars are open."
 msgstr "Szöveg újratördelése amikor az oldalsávok nyitva vannak"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:88
 msgid "Keyboard Shortcuts"
 msgstr "Gyorsbillentyűk"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:91
 msgid "Previous Page"
 msgstr "Előző oldal"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:92
 msgid "Next Page"
 msgstr "Következő oldal"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:93
 msgid "Scale to Best"
 msgstr "Méretezés a legjobbra"
 
-#: cps/templates/readcbr.html:100
+#: cps/templates/readcbr.html:94
 msgid "Scale to Width"
 msgstr "Méretezés a szélességre"
 
-#: cps/templates/readcbr.html:101
+#: cps/templates/readcbr.html:95
 msgid "Scale to Height"
 msgstr "Méretezés a magasságra"
 
-#: cps/templates/readcbr.html:102
+#: cps/templates/readcbr.html:96
 msgid "Scale to Native"
 msgstr "Méretezés a natívra"
 
-#: cps/templates/readcbr.html:103
+#: cps/templates/readcbr.html:97
 msgid "Rotate Right"
 msgstr "Forgatás balra"
 
-#: cps/templates/readcbr.html:104
+#: cps/templates/readcbr.html:98
 msgid "Rotate Left"
 msgstr "Forgatás jobbra"
 
-#: cps/templates/readcbr.html:105
+#: cps/templates/readcbr.html:99
 msgid "Flip Image"
 msgstr "Kép tükrözése"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:115
 msgid "Light"
 msgstr "Világos"
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:116
 msgid "Dark"
 msgstr "Sötét"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:121
 msgid "Scale"
 msgstr "Méretezés"
 
-#: cps/templates/readcbr.html:130
+#: cps/templates/readcbr.html:124
 msgid "Best"
 msgstr "Legjobb"
 
-#: cps/templates/readcbr.html:131
+#: cps/templates/readcbr.html:125
 msgid "Width"
 msgstr "Szélesség"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:126
 msgid "Height"
 msgstr "Magasság"
 
-#: cps/templates/readcbr.html:133
+#: cps/templates/readcbr.html:127
 msgid "Native"
 msgstr "Natív"
 
-#: cps/templates/readcbr.html:138
+#: cps/templates/readcbr.html:132
 msgid "Rotate"
 msgstr "Forgatás"
 
-#: cps/templates/readcbr.html:149
+#: cps/templates/readcbr.html:143
 msgid "Flip"
 msgstr "Tökrözés"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:146
 msgid "Horizontal"
 msgstr "Vízszintes"
 
-#: cps/templates/readcbr.html:153
+#: cps/templates/readcbr.html:147
 msgid "Vertical"
 msgstr "Függőleges"
 
-#: cps/templates/readcbr.html:158
+#: cps/templates/readcbr.html:152
 msgid "Direction"
 msgstr ""
 
-#: cps/templates/readcbr.html:161
+#: cps/templates/readcbr.html:155
 msgid "Left to Right"
 msgstr ""
 
-#: cps/templates/readcbr.html:162
+#: cps/templates/readcbr.html:156
 msgid "Right to Left"
 msgstr ""
 
 #: cps/templates/readpdf.html:29
-msgid "PDF.js viewer"
-msgstr "PDF.js olvasó"
+msgid "PDF reader"
+msgstr ""
 
 #: cps/templates/readtxt.html:6
 msgid "Basic txt Reader"
@@ -1884,23 +2040,23 @@ msgstr "Értékelés nagyob mint"
 msgid "Rating less than"
 msgstr "Értékelés kisebb mint"
 
-#: cps/templates/shelf.html:7
+#: cps/templates/shelf.html:10
 msgid "Delete this Shelf"
 msgstr "Polc törlése"
 
-#: cps/templates/shelf.html:8
+#: cps/templates/shelf.html:11
 msgid "Edit Shelf"
 msgstr "Polc szerkesztése"
 
-#: cps/templates/shelf.html:9 cps/templates/shelf_order.html:11
+#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:11
 msgid "Change order"
 msgstr "Sorrend változtatása"
 
-#: cps/templates/shelf.html:68
+#: cps/templates/shelf.html:67
 msgid "Do you really want to delete the shelf?"
 msgstr "Valóban törölni akarod a polcot?"
 
-#: cps/templates/shelf.html:71
+#: cps/templates/shelf.html:70
 msgid "Shelf will be lost for everybody and forever!"
 msgstr "A polc el fog tűnni mindenki számára és örökké!"
 
@@ -1988,19 +2144,31 @@ msgstr "Felhasználó jelszavának alaphelyzetbe állítása"
 msgid "Kindle E-Mail"
 msgstr "Kindle e-mail"
 
-#: cps/templates/user_edit.html:39
+#: cps/templates/user_edit.html:40
 msgid "Show books with language"
 msgstr "Mutasd a könyveket a következő nyelvvel"
 
-#: cps/templates/user_edit.html:41
+#: cps/templates/user_edit.html:42
 msgid "Show all"
 msgstr "Mindent mutass"
 
-#: cps/templates/user_edit.html:141
+#: cps/templates/user_edit.html:52
+msgid "OAuth Settings"
+msgstr ""
+
+#: cps/templates/user_edit.html:54
+msgid "Link"
+msgstr ""
+
+#: cps/templates/user_edit.html:56
+msgid "Unlink"
+msgstr ""
+
+#: cps/templates/user_edit.html:124
 msgid "Delete this user"
 msgstr "A felhasználó törlése"
 
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:139
 msgid "Recent Downloads"
 msgstr "Utolsó letöltések"
 
@@ -3087,3 +3255,45 @@ msgstr "Utolsó letöltések"
 #~ msgid "Using your another device, login and visit "
 #~ msgstr ""
 
+#~ msgid "Newest Books"
+#~ msgstr "Legújabb könyvek"
+
+#~ msgid "Oldest Books"
+#~ msgstr "Legrégebbi könyvek"
+
+#~ msgid "Books (A-Z)"
+#~ msgstr "Könyvek (A-Zs)"
+
+#~ msgid "Books (Z-A)"
+#~ msgstr "Könyvek (Zs-A)"
+
+#~ msgid "Error opening eBook. Fileformat is not supported."
+#~ msgstr ""
+
+#~ msgid "File %(title)s"
+#~ msgstr "Fájl: %(title)s"
+
+#~ msgid "Show sorted books"
+#~ msgstr "Rendezett könyvek mutatása"
+
+#~ msgid "Sorted Books"
+#~ msgstr "Rendezett könyvek"
+
+#~ msgid "Sort By"
+#~ msgstr "Sorbarendezés eszerint:"
+
+#~ msgid "Newest"
+#~ msgstr "Legújabbak"
+
+#~ msgid "Oldest"
+#~ msgstr "Legrégebbiek"
+
+#~ msgid "Ascending"
+#~ msgstr "Növekvő"
+
+#~ msgid "Descending"
+#~ msgstr "Csökkenő"
+
+#~ msgid "PDF.js viewer"
+#~ msgstr "PDF.js olvasó"
+
diff --git a/cps/translations/it/LC_MESSAGES/messages.mo b/cps/translations/it/LC_MESSAGES/messages.mo
index fa695ecf..8778b0da 100644
Binary files a/cps/translations/it/LC_MESSAGES/messages.mo and b/cps/translations/it/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po
index 8d1e8c27..ddf8e92b 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-05-30 09:06+0200\n"
+"POT-Creation-Date: 2019-05-31 11:20+0200\n"
 "PO-Revision-Date: 2017-04-04 15:09+0200\n"
 "Last-Translator: Marco Picone <marcovendere@gmail.com>\n"
 "Language: it\n"
@@ -17,740 +17,929 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.6.0\n"
 
-#: cps/book_formats.py:199 cps/book_formats.py:200 cps/book_formats.py:204
-#: cps/book_formats.py:208 cps/book_formats.py:212 cps/converter.py:29
-#: cps/converter.py:45
-msgid "not installed"
-msgstr "non installato"
-
-#: cps/converter.py:40 cps/converter.py:56
-msgid "Excecution permissions missing"
-msgstr "Mancano le autorizzazioni di esecuzione"
-
-#: cps/converter.py:66
-msgid "not configured"
-msgstr "non configurato"
-
-#: cps/helper.py:79
-#, python-format
-msgid "%(format)s format not found for book id: %(book)d"
-msgstr "%(format)s formato non trovato per il libro: %(book)d"
-
-#: cps/helper.py:91
-#, python-format
-msgid "%(format)s not found on Google Drive: %(fn)s"
-msgstr "%(format)s non trovato su Google Drive: %(fn)s"
-
-#: cps/helper.py:98 cps/helper.py:204 cps/templates/detail.html:45
-#: cps/templates/detail.html:49
-msgid "Send to Kindle"
-msgstr "Invia a Kindle"
-
-#: cps/helper.py:99 cps/helper.py:117 cps/helper.py:206
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "Questo e-mail è stato spedito tramite Calibre-Web."
-
-#: cps/helper.py:110
-#, python-format
-msgid "%(format)s not found: %(fn)s"
-msgstr "%(format)s non trovato: %(fn)s"
-
-#: cps/helper.py:115
-msgid "Calibre-Web test e-mail"
-msgstr "E-mail di test da Calibre-Web"
-
-#: cps/helper.py:116
-msgid "Test e-mail"
-msgstr "E-mail di test"
-
-#: cps/helper.py:132
-msgid "Get Started with Calibre-Web"
-msgstr "Inizia con Calibre-Web"
-
-#: cps/helper.py:133
-#, python-format
-msgid "Registration e-mail for user: %(name)s"
-msgstr "E-mail di registrazione per l'utente: %(name)s"
-
-#: cps/helper.py:146 cps/helper.py:148 cps/helper.py:150 cps/helper.py:158
-#: cps/helper.py:160 cps/helper.py:162
-#, python-format
-msgid "Send %(format)s to Kindle"
-msgstr "Invia %(format)s a Kindle"
-
-#: cps/helper.py:166
-#, python-format
-msgid "Convert %(orig)s to %(format)s and send to Kindle"
-msgstr "Converti %(orig)s in %(format)s e spedisci a Kindle"
-
-#: cps/helper.py:205
-#, python-format
-msgid "E-mail: %(book)s"
-msgstr "E-mail: %(book)s"
-
-#: cps/helper.py:208
-msgid "The requested file could not be read. Maybe wrong permissions?"
-msgstr "Il file richiesto non può essere letto. I permessi sono corretti?"
-
-#: cps/helper.py:316
-#, python-format
-msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "La modifica del titolo da: '%(src)s' a '%(dest)s' è terminata con l'errore: %(error)s"
-
-#: cps/helper.py:326
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "La modifica dell'autore da: '%(src)s' a '%(dest)s' è terminata con l'errore: %(error)s"
-
-#: cps/helper.py:340
-#, python-format
-msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "La modifica del file nella cartella da '%(src)s' a '%(dest)s' è terminata con l'errore: %(error)s"
-
-#: cps/helper.py:366 cps/helper.py:376 cps/helper.py:384
-#, python-format
-msgid "File %(file)s not found on Google Drive"
-msgstr "File %(file)s non trovato su Google Drive"
-
-#: cps/helper.py:405
-#, python-format
-msgid "Book path %(path)s not found on Google Drive"
-msgstr "Non ho trovato la cartella %(path)s su Google Drive"
-
-#: cps/helper.py:556
-msgid "Error excecuting UnRar"
-msgstr "Errore nell'esecuzione di UnRar"
-
-#: cps/helper.py:558
-msgid "Unrar binary file not found"
-msgstr "Non ho trovato il file binario di UnRar"
-
-#: cps/helper.py:585
-msgid "Waiting"
-msgstr "Attendere"
-
-#: cps/helper.py:587
-msgid "Failed"
-msgstr "Fallito"
-
-#: cps/helper.py:589
-msgid "Started"
-msgstr "Avviato"
-
-#: cps/helper.py:591
-msgid "Finished"
-msgstr "Terminato"
-
-#: cps/helper.py:593
-msgid "Unknown Status"
-msgstr "Stato sconosciuto"
-
-#: cps/helper.py:598
-msgid "E-mail: "
-msgstr "E-mail: "
-
-#: cps/helper.py:600 cps/helper.py:604
-msgid "Convert: "
-msgstr "Conversione: "
-
-#: cps/helper.py:602
-msgid "Upload: "
-msgstr "Upload: "
-
-#: cps/helper.py:606
-msgid "Unknown Task: "
-msgstr "Processo sconosciuto: "
-
-#: cps/updater.py:251 cps/updater.py:410 cps/updater.py:423
-msgid "Unexpected data while reading update information"
-msgstr "Dati inattesi durante il processo di aggiornamento"
-
-#: cps/updater.py:258 cps/updater.py:416
-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:270 cps/updater.py:501 cps/updater.py:503 cps/web.py:1206
-msgid "HTTP Error"
-msgstr "HTTP Error"
-
-#: cps/updater.py:272 cps/updater.py:505 cps/web.py:1207
-msgid "Connection error"
-msgstr "Errore di connessione"
-
-#: cps/updater.py:274 cps/updater.py:507 cps/web.py:1208
-msgid "Timeout while establishing connection"
-msgstr "Tempo scaduto nello stabilire la connessione"
-
-#: cps/updater.py:276 cps/updater.py:509 cps/web.py:1209
-msgid "General error"
-msgstr "Errore generale"
-
-#: cps/updater.py:283 cps/updater.py:341 cps/updater.py:468
-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:335
-msgid "Could not fetch update information"
-msgstr "Impossibile recuperare informazioni di aggiornamento"
-
-#: cps/updater.py:403
-msgid "No release information available"
-msgstr "Non sono disponibili informazioni sulla versione"
-
-#: cps/updater.py:449 cps/updater.py:458
-#, 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:491 cps/web.py:2795
-msgid "Unknown"
-msgstr "Sconosciuto"
-
-#: cps/web.py:1199
-msgid "Requesting update package"
-msgstr "Richiesta del pacchetto di aggiornamento"
-
-#: cps/web.py:1200
-msgid "Downloading update package"
-msgstr "Scarico il pacchetto di aggiornamento"
-
-#: cps/web.py:1201
-msgid "Unzipping update package"
-msgstr "Decomprimo il pacchetto di aggiornamento"
-
-#: cps/web.py:1202
-msgid "Replacing files"
-msgstr "Sostituzione files"
-
-#: cps/web.py:1203
-msgid "Database connections are closed"
-msgstr "Le connessioni al database sono chiuse"
-
-#: cps/web.py:1204
-msgid "Stopping server"
-msgstr "Arresta il server"
-
-#: cps/web.py:1205
-msgid "Update finished, please press okay and reload page"
-msgstr "Aggiornamento completato, prego premere ok e ricaricare la pagina"
-
-#: cps/web.py:1206 cps/web.py:1207 cps/web.py:1208 cps/web.py:1209
-msgid "Update failed:"
-msgstr "Aggiornamento fallito:"
-
-#: cps/web.py:1235
-msgid "Recently Added Books"
-msgstr "Libri aggiunti di recente"
-
-#: cps/web.py:1245
-msgid "Newest Books"
-msgstr "I libri più nuovi"
-
-#: cps/web.py:1257
-msgid "Oldest Books"
-msgstr "I libri più vecchi"
-
-#: cps/web.py:1269
-msgid "Books (A-Z)"
-msgstr "Libri (A-Z)"
-
-#: cps/web.py:1280
-msgid "Books (Z-A)"
-msgstr "Libri (Z-A)"
-
-#: cps/web.py:1309
-msgid "Hot Books (most downloaded)"
-msgstr "I libri più richiesti"
-
-#: cps/web.py:1322
-msgid "Best rated books"
-msgstr "I libri con le migliori valutazioni"
-
-#: cps/templates/index.xml:39 cps/web.py:1335
-msgid "Random Books"
-msgstr "Libri a caso"
-
-#: cps/web.py:1362 cps/web.py:1618 cps/web.py:2161
-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:1391
-msgid "Publisher list"
-msgstr "Lista degli editori"
-
-#: cps/web.py:1406
-#, python-format
-msgid "Publisher: %(name)s"
-msgstr "Editore: %(name)s"
-
-#: cps/templates/index.xml:83 cps/web.py:1438
-msgid "Series list"
-msgstr "Lista delle serie"
-
-#: cps/web.py:1452
-#, python-format
-msgid "Series: %(serie)s"
-msgstr "Serie: %(serie)s"
-
-#: cps/web.py:1478
-msgid "Available languages"
-msgstr "Lingue disponibili"
-
-#: cps/web.py:1498
-#, python-format
-msgid "Language: %(name)s"
-msgstr "Lingua: %(name)s"
-
-#: cps/templates/index.xml:76 cps/web.py:1509
-msgid "Category list"
-msgstr "Elenco categorie"
-
-#: cps/web.py:1523
-#, python-format
-msgid "Category: %(name)s"
-msgstr "Categoria: %(name)s"
-
-#: cps/templates/layout.html:73 cps/web.py:1648
-msgid "Tasks"
-msgstr "Compito"
-
-#: cps/web.py:1682
+#: cps/about.py:76
 msgid "Statistics"
 msgstr "Statistica"
 
-#: cps/web.py:1750
-msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
-msgstr "La configurazione di Google Drive non è stata completata correttamente. Prova a disattivare e riattivare nuovamente Google Drive"
-
-#: cps/web.py:1795
-msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
-msgstr "Callback domain non è stato verificato. Per favore intraprendi il necessario per verificare il dominio nella developer console di Google"
-
-#: cps/web.py:1871
+#: cps/admin.py:97
 msgid "Server restarted, please reload page"
 msgstr "Server riavviato, per favore ricarica la pagina"
 
-#: cps/web.py:1874
+#: cps/admin.py:100
 msgid "Performing shutdown of server, please close window"
 msgstr "Eseguo l'arresto del server, per favore chiudi la finestra."
 
-#: cps/web.py:1953
-msgid "Published after "
-msgstr "Pubblicato dopo "
+#: cps/admin.py:120 cps/updater.py:445
+msgid "Unknown"
+msgstr "Sconosciuto"
 
-#: cps/web.py:1960
-msgid "Published before "
-msgstr "Pubblicato prima "
-
-#: cps/web.py:1974
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "Valutazione <= %(rating)s"
-
-#: cps/web.py:1976
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "Valutazione >= %(rating)s"
-
-#: cps/web.py:2036 cps/web.py:2045
-msgid "search"
-msgstr "ricerca"
-
-#: cps/templates/index.xml:47 cps/templates/index.xml:51
-#: cps/templates/layout.html:148 cps/web.py:2116
-msgid "Read Books"
-msgstr "Libri da leggere"
-
-#: cps/templates/index.xml:55 cps/templates/index.xml:59
-#: cps/templates/layout.html:150 cps/web.py:2119
-msgid "Unread Books"
-msgstr "Libri non letti"
-
-#: cps/web.py:2171 cps/web.py:2173 cps/web.py:2175 cps/web.py:2187
-msgid "Read a Book"
-msgstr "Leggere un libro"
-
-#: cps/web.py:2199
-msgid "Error opening eBook. Fileformat is not supported."
-msgstr ""
-
-#: cps/web.py:2249 cps/web.py:3170
-msgid "Please fill out all fields!"
-msgstr "Per favore compila tutti i campi!"
-
-#: cps/web.py:2250 cps/web.py:2272 cps/web.py:2276 cps/web.py:2281
-#: cps/web.py:2283
-msgid "register"
-msgstr "registra"
-
-#: cps/web.py:2271 cps/web.py:3389
-msgid "An unknown error occurred. Please try again later."
-msgstr "Si è verificato un errore sconosciuto: per favore riprova."
-
-#: cps/web.py:2274
-msgid "Your e-mail is not allowed to register"
-msgstr "Il tuo e-mail non può essere utilizzato per la registrazione"
-
-#: cps/web.py:2277
-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:2280
-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:2297 cps/web.py:2393
-#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
-msgstr "ora sei connesso come: '%(nickname)s'"
-
-#: cps/web.py:2302
-msgid "Wrong Username or Password"
-msgstr "Nome utente o password errati"
-
-#: cps/web.py:2308 cps/web.py:2329
-msgid "login"
-msgstr "accedi"
-
-#: cps/web.py:2341 cps/web.py:2372
-msgid "Token not found"
-msgstr "Token non trovato"
-
-#: cps/web.py:2349 cps/web.py:2380
-msgid "Token has expired"
-msgstr "Il token è scaduto"
-
-#: cps/web.py:2357
-msgid "Success! Please return to your device"
-msgstr "Successo! Torna al tuo dispositivo"
-
-#: cps/web.py:2407
-msgid "Please configure the SMTP mail settings first..."
-msgstr "Configurare dapprima le impostazioni del server SMTP..."
-
-#: cps/web.py:2412
-#, 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:2416
-#, 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:2418 cps/web.py:3223
-msgid "Please configure your kindle e-mail address first..."
-msgstr "Per favore configura dapprima il tuo indirizzo e-mail di Kindle..."
-
-#: cps/web.py:2429 cps/web.py:2481
-msgid "Invalid shelf specified"
-msgstr "Lo scaffale specificato non è valevole"
-
-#: cps/web.py:2436
-#, python-format
-msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
-msgstr "Mi spiace, ma non sei autorizzato ad aggiungere libri allo scaffale: %(shelfname)s"
-
-#: cps/web.py:2444
-msgid "You are not allowed to edit public shelves"
-msgstr "Non sei autorizzato a modificare gli scaffali pubblici"
-
-#: cps/web.py:2453
-#, python-format
-msgid "Book is already part of the shelf: %(shelfname)s"
-msgstr "Il libro è gia presente nello scaffale: %(shelfname)s"
-
-#: cps/web.py:2467
-#, python-format
-msgid "Book has been added to shelf: %(sname)s"
-msgstr "Il libro è stato aggiunto allo scaffale: %(sname)s"
-
-#: cps/web.py:2486
-#, python-format
-msgid "You are not allowed to add a book to the the shelf: %(name)s"
-msgstr "Non sei autorizzato ad aggiungere libri allo scaffale: %(name)s"
-
-#: cps/web.py:2491
-msgid "User is not allowed to edit public shelves"
-msgstr "L'utente non è autorizzato a modificare gli scaffali pubblici"
-
-#: cps/web.py:2509
-#, python-format
-msgid "Books are already part of the shelf: %(name)s"
-msgstr "I libri sono già presenti nello scaffale: %(name)s"
-
-#: cps/web.py:2523
-#, python-format
-msgid "Books have been added to shelf: %(sname)s"
-msgstr "I libri sono stati aggiunti allo scaffale: %(sname)s"
-
-#: cps/web.py:2525
-#, python-format
-msgid "Could not add books to shelf: %(sname)s"
-msgstr "Non posso aggiungere libri allo scaffale: %(sname)s"
-
-#: cps/web.py:2562
-#, python-format
-msgid "Book has been removed from shelf: %(sname)s"
-msgstr "Il libro è stato rimosso dallo scaffale: %(sname)s"
-
-#: cps/web.py:2568
-#, python-format
-msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
-msgstr "Spiacente, ma non sei autorizzato a togliere libri dallo scaffale: %(sname)s"
-
-#: cps/web.py:2589 cps/web.py:2613
-#, python-format
-msgid "A shelf with the name '%(title)s' already exists."
-msgstr "Uno scaffale con il nome '%(title)s' esiste già."
-
-#: cps/web.py:2594
-#, python-format
-msgid "Shelf %(title)s created"
-msgstr "Lo scaffale %(title)s è stato creato"
-
-#: cps/web.py:2596 cps/web.py:2624
-msgid "There was an error"
-msgstr "C'era un errore"
-
-#: cps/web.py:2597 cps/web.py:2599
-msgid "create a shelf"
-msgstr "crea uno scaffale"
-
-#: cps/web.py:2622
-#, python-format
-msgid "Shelf %(title)s changed"
-msgstr "Lo scaffale %(title)s è stato modificato"
-
-#: cps/web.py:2625 cps/web.py:2627
-msgid "Edit a shelf"
-msgstr "Modifica uno scaffale"
-
-#: cps/web.py:2648
-#, python-format
-msgid "successfully deleted shelf %(name)s"
-msgstr "lo scaffale %(name)s è stato eliminato con successo"
-
-#: cps/web.py:2675
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Scaffale: '%(name)s'"
-
-#: cps/web.py:2678
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "Errore durante l'apertura dello scaffale. Lo scaffale non esiste o non è accessibile"
-
-#: cps/web.py:2709
-#, python-format
-msgid "Change order of Shelf: '%(name)s'"
-msgstr "Modificare l'ordine dello scaffale: '%(name)s'"
-
-#: cps/web.py:2738 cps/web.py:3176
-msgid "E-mail is not from valid domain"
-msgstr "L'e-mail non proviene da un dominio valido"
-
-#: cps/web.py:2740 cps/web.py:2782 cps/web.py:2785
-#, python-format
-msgid "%(name)s's profile"
-msgstr "Profilo di %(name)s"
-
-#: cps/web.py:2780
-msgid "Found an existing account for this e-mail address."
-msgstr "Ho trovato un account creato in precedenza con questo e-mail."
-
-#: cps/web.py:2783
-msgid "Profile updated"
-msgstr "Profilo aggiornato"
-
-#: cps/web.py:2814
+#: cps/admin.py:139
 msgid "Admin page"
 msgstr "Pagina di amministrazione"
 
-#: cps/web.py:2899 cps/web.py:3079
+#: cps/admin.py:208 cps/admin.py:486
 msgid "Calibre-Web configuration updated"
 msgstr "Aggiornamento della configurazione di Calibre-Web"
 
-#: cps/templates/admin.html:100 cps/web.py:2913
+#: cps/admin.py:222 cps/templates/admin.html:102
 msgid "UI Configuration"
 msgstr "Configurazione dell'interfaccia utente"
 
-#: cps/web.py:2931
+#: cps/admin.py:295
 msgid "Import of optional Google Drive requirements missing"
 msgstr "Importa parametri mancanti per Google Drive"
 
-#: cps/web.py:2934
+#: cps/admin.py:298
 msgid "client_secrets.json is missing or not readable"
 msgstr "client_secrets.json manca o è inaccessibile"
 
-#: cps/web.py:2939 cps/web.py:2968
+#: cps/admin.py:303 cps/admin.py:332
 msgid "client_secrets.json is not configured for web application"
 msgstr "client_secrets.json non è configurato per questa applicazione web"
 
-#: cps/templates/admin.html:99 cps/web.py:2971 cps/web.py:2997 cps/web.py:3009
-#: cps/web.py:3054 cps/web.py:3069 cps/web.py:3088 cps/web.py:3096
-#: cps/web.py:3112
+#: cps/admin.py:335 cps/admin.py:361 cps/admin.py:373 cps/admin.py:398
+#: cps/admin.py:426 cps/admin.py:440 cps/admin.py:463 cps/admin.py:476
+#: cps/admin.py:494 cps/admin.py:501 cps/admin.py:516
+#: cps/templates/admin.html:101
 msgid "Basic Configuration"
 msgstr "Configurazione di base"
 
-#: cps/web.py:2994
+#: cps/admin.py:358
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr "La posizione del Keyfile non è corretta: per favore indica il percorso corretto"
 
-#: cps/web.py:3006
+#: cps/admin.py:370
 msgid "Certfile location is not valid, please enter correct path"
 msgstr "La posizione del Cerfile non è corretta: per favore indica il percorso corretto"
 
-#: cps/web.py:3051
+#: cps/admin.py:395
+msgid "Please enter a LDAP provider and a DN"
+msgstr ""
+
+#: cps/admin.py:423
+msgid "Please enter Github oauth credentials"
+msgstr ""
+
+#: cps/admin.py:437
+msgid "Please enter Google oauth credentials"
+msgstr ""
+
+#: cps/admin.py:460
 msgid "Logfile location is not valid, please enter correct path"
 msgstr "La posizione del Logfile non è corretta: per favore indica il percorso corretto"
 
-#: cps/web.py:3092
+#: cps/admin.py:498
 msgid "DB location is not valid, please enter correct path"
 msgstr "La posizione DB non è corretta: per favore indica il percorso corretto"
 
-#: cps/templates/admin.html:33 cps/web.py:3172 cps/web.py:3178 cps/web.py:3194
+#: cps/admin.py:558 cps/web.py:1045
+msgid "Please fill out all fields!"
+msgstr "Per favore compila tutti i campi!"
+
+#: cps/admin.py:560 cps/admin.py:566 cps/admin.py:582
+#: cps/templates/admin.html:35
 msgid "Add new user"
 msgstr "Aggiungi un nuovo utente"
 
-#: cps/web.py:3184
+#: cps/admin.py:564 cps/web.py:1248
+msgid "E-mail is not from valid domain"
+msgstr "L'e-mail non proviene da un dominio valido"
+
+#: cps/admin.py:572
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Utente '%(user)s' creato"
 
-#: cps/web.py:3188
+#: cps/admin.py:576
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Trovato un account esistente con questo e-mail o nome di utente"
 
-#: cps/web.py:3218
+#: cps/admin.py:607
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "E-mail di test inviato con successo a %(kindlemail)s"
 
-#: cps/web.py:3221
+#: cps/admin.py:610
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Si è verificato un errore nell'invio dell'e-mail di test: %(res)s"
 
-#: cps/web.py:3225
+#: cps/admin.py:612 cps/web.py:1029
+msgid "Please configure your kindle e-mail address first..."
+msgstr "Per favore configura dapprima il tuo indirizzo e-mail di Kindle..."
+
+#: cps/admin.py:614
 msgid "E-mail server settings updated"
 msgstr "Configurazione del server e-mail aggiornata"
 
-#: cps/web.py:3226
+#: cps/admin.py:615
 msgid "Edit e-mail server settings"
 msgstr "Modifica la configurazione del server e-mail"
 
-#: cps/web.py:3251
+#: cps/admin.py:640
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Utente '%(nick)s' eliminato"
 
-#: cps/web.py:3364
+#: cps/admin.py:711
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Utente '%(nick)s' aggiornato"
 
-#: cps/web.py:3367
+#: cps/admin.py:714
 msgid "An unknown error occured."
 msgstr "Si è verificato un errore imprevisto."
 
-#: cps/web.py:3369
+#: cps/admin.py:717
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Modifica utente %(nick)s"
 
-#: cps/web.py:3386
+#: cps/admin.py:733
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "La password dell'utente %(user)s è stata resettata"
 
-#: cps/web.py:3400 cps/web.py:3592
+#: cps/admin.py:736 cps/web.py:1070
+msgid "An unknown error occurred. Please try again later."
+msgstr "Si è verificato un errore sconosciuto: per favore riprova."
+
+#: cps/admin.py:755
+msgid "Requesting update package"
+msgstr "Richiesta del pacchetto di aggiornamento"
+
+#: cps/admin.py:756
+msgid "Downloading update package"
+msgstr "Scarico il pacchetto di aggiornamento"
+
+#: cps/admin.py:757
+msgid "Unzipping update package"
+msgstr "Decomprimo il pacchetto di aggiornamento"
+
+#: cps/admin.py:758
+msgid "Replacing files"
+msgstr "Sostituzione files"
+
+#: cps/admin.py:759
+msgid "Database connections are closed"
+msgstr "Le connessioni al database sono chiuse"
+
+#: cps/admin.py:760
+msgid "Stopping server"
+msgstr "Arresta il server"
+
+#: cps/admin.py:761
+msgid "Update finished, please press okay and reload page"
+msgstr "Aggiornamento completato, prego premere ok e ricaricare la pagina"
+
+#: cps/admin.py:762 cps/admin.py:763 cps/admin.py:764 cps/admin.py:765
+msgid "Update failed:"
+msgstr "Aggiornamento fallito:"
+
+#: cps/admin.py:762 cps/updater.py:277 cps/updater.py:456 cps/updater.py:458
+msgid "HTTP Error"
+msgstr "HTTP Error"
+
+#: cps/admin.py:763 cps/updater.py:279 cps/updater.py:460
+msgid "Connection error"
+msgstr "Errore di connessione"
+
+#: cps/admin.py:764 cps/updater.py:281 cps/updater.py:462
+msgid "Timeout while establishing connection"
+msgstr "Tempo scaduto nello stabilire la connessione"
+
+#: cps/admin.py:765 cps/updater.py:283 cps/updater.py:464
+msgid "General error"
+msgstr "Errore generale"
+
+#: cps/converter.py:31 cps/converter.py:48 cps/uploader.py:213
+#: cps/uploader.py:214 cps/uploader.py:218 cps/uploader.py:222
+#: cps/uploader.py:226
+msgid "not installed"
+msgstr "non installato"
+
+#: cps/converter.py:43 cps/converter.py:60
+msgid "Excecution permissions missing"
+msgstr "Mancano le autorizzazioni di esecuzione"
+
+#: cps/converter.py:70
+msgid "not configured"
+msgstr "non configurato"
+
+#: cps/editbooks.py:218 cps/editbooks.py:432
 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:3428
+#: cps/editbooks.py:246
 msgid "edit metadata"
 msgstr "modifica i metadati"
 
-#: cps/web.py:3521 cps/web.py:3754
+#: cps/editbooks.py:325 cps/editbooks.py:595
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Non è consentito caricare file con l'estensione '%(ext)s' su questo server"
 
-#: cps/web.py:3525 cps/web.py:3757
+#: cps/editbooks.py:329 cps/editbooks.py:599
 msgid "File to be uploaded must have an extension"
 msgstr "Il file da caricare deve avere un'estensione"
 
-#: cps/web.py:3537 cps/web.py:3776
+#: cps/editbooks.py:341 cps/editbooks.py:619
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Impossibile creare il percorso %(path)s (autorizzazione negata)."
 
-#: cps/web.py:3542
+#: cps/editbooks.py:346
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Il salvataggio del file %(file)s è fallito."
 
-#: cps/web.py:3559
+#: cps/editbooks.py:363
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Ho aggiunto l'estensione %(ext)s al libro %(book)s"
 
-#: cps/web.py:3573 cps/web.py:3646
+#: cps/editbooks.py:382
+#, python-format
+msgid "Failed to create path for cover %(path)s (Permission denied)."
+msgstr ""
+
+#: cps/editbooks.py:390
+#, python-format
+msgid "Failed to store cover-file %(cover)s."
+msgstr ""
+
+#: cps/editbooks.py:393
+msgid "Cover-file is not a valid image file"
+msgstr ""
+
+#: cps/editbooks.py:399 cps/editbooks.py:413
 msgid "Cover is not a supported imageformat (jpg/png/webp), can't save"
 msgstr ""
 
-#: cps/web.py:3605 cps/web.py:3614
+#: cps/editbooks.py:445 cps/editbooks.py:454
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: cps/web.py:3694
+#: cps/editbooks.py:486
+msgid "Cover is not a jpg file, can't save"
+msgstr ""
+
+#: cps/editbooks.py:534
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s non è una lingua valida"
 
-#: cps/web.py:3725
+#: cps/editbooks.py:565
 msgid "Metadata successfully updated"
 msgstr "I metadati sono stati aggiornati con successo"
 
-#: cps/web.py:3734
+#: cps/editbooks.py:574
 msgid "Error editing book, please check logfile for details"
 msgstr "Errore nella modifica del libro. Per favore verifica i dettagli nel file di registro (logfile)"
 
-#: cps/web.py:3780
+#: cps/editbooks.py:624
 #, python-format
 msgid "Failed to store file %(file)s (Permission denied)."
 msgstr "Impossibile salvare il file %(file)s (autorizzazione negata)"
 
-#: cps/web.py:3785
+#: cps/editbooks.py:629
 #, python-format
 msgid "Failed to delete file %(file)s (Permission denied)."
 msgstr "Impossibile eliminare il file %(file)s (autorizzazione negata)"
 
-#: cps/web.py:3867
+#: cps/editbooks.py:712
 #, python-format
-msgid "File %(title)s"
-msgstr "File %(title)s"
+msgid "File %(file)s uploaded"
+msgstr ""
 
-#: cps/web.py:3896
+#: cps/editbooks.py:741
 msgid "Source or destination format for conversion missing"
 msgstr "Il formato sorgente o quello di destinazione per la conversione mancano"
 
-#: cps/web.py:3906
+#: cps/editbooks.py:751
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Libro accodato con successo per essere convertito in %(book_format)s"
 
-#: cps/web.py:3910
+#: cps/editbooks.py:755
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Si è verificato un errore durante la conversione del libro: %(res)s"
 
-#: cps/worker.py:305
+#: cps/gdrive.py:56
+msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
+msgstr "La configurazione di Google Drive non è stata completata correttamente. Prova a disattivare e riattivare nuovamente Google Drive"
+
+#: cps/gdrive.py:101
+msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
+msgstr "Callback domain non è stato verificato. Per favore intraprendi il necessario per verificare il dominio nella developer console di Google"
+
+#: cps/helper.py:97
+#, python-format
+msgid "%(format)s format not found for book id: %(book)d"
+msgstr "%(format)s formato non trovato per il libro: %(book)d"
+
+#: cps/helper.py:109
+#, python-format
+msgid "%(format)s not found on Google Drive: %(fn)s"
+msgstr "%(format)s non trovato su Google Drive: %(fn)s"
+
+#: cps/helper.py:116 cps/helper.py:223 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Invia a Kindle"
+
+#: cps/helper.py:117 cps/helper.py:135 cps/helper.py:225
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "Questo e-mail è stato spedito tramite Calibre-Web."
+
+#: cps/helper.py:128
+#, python-format
+msgid "%(format)s not found: %(fn)s"
+msgstr "%(format)s non trovato: %(fn)s"
+
+#: cps/helper.py:133
+msgid "Calibre-Web test e-mail"
+msgstr "E-mail di test da Calibre-Web"
+
+#: cps/helper.py:134
+msgid "Test e-mail"
+msgstr "E-mail di test"
+
+#: cps/helper.py:150
+msgid "Get Started with Calibre-Web"
+msgstr "Inizia con Calibre-Web"
+
+#: cps/helper.py:151
+#, python-format
+msgid "Registration e-mail for user: %(name)s"
+msgstr "E-mail di registrazione per l'utente: %(name)s"
+
+#: cps/helper.py:165 cps/helper.py:167 cps/helper.py:169 cps/helper.py:177
+#: cps/helper.py:179 cps/helper.py:181
+#, python-format
+msgid "Send %(format)s to Kindle"
+msgstr "Invia %(format)s a Kindle"
+
+#: cps/helper.py:185
+#, python-format
+msgid "Convert %(orig)s to %(format)s and send to Kindle"
+msgstr "Converti %(orig)s in %(format)s e spedisci a Kindle"
+
+#: cps/helper.py:224
+#, python-format
+msgid "E-mail: %(book)s"
+msgstr "E-mail: %(book)s"
+
+#: cps/helper.py:227
+msgid "The requested file could not be read. Maybe wrong permissions?"
+msgstr "Il file richiesto non può essere letto. I permessi sono corretti?"
+
+#: cps/helper.py:335
+#, python-format
+msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "La modifica del titolo da: '%(src)s' a '%(dest)s' è terminata con l'errore: %(error)s"
+
+#: cps/helper.py:345
+#, python-format
+msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "La modifica dell'autore da: '%(src)s' a '%(dest)s' è terminata con l'errore: %(error)s"
+
+#: cps/helper.py:359
+#, python-format
+msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "La modifica del file nella cartella da '%(src)s' a '%(dest)s' è terminata con l'errore: %(error)s"
+
+#: cps/helper.py:385 cps/helper.py:395 cps/helper.py:403
+#, python-format
+msgid "File %(file)s not found on Google Drive"
+msgstr "File %(file)s non trovato su Google Drive"
+
+#: cps/helper.py:424
+#, python-format
+msgid "Book path %(path)s not found on Google Drive"
+msgstr "Non ho trovato la cartella %(path)s su Google Drive"
+
+#: cps/helper.py:584
+msgid "Error excecuting UnRar"
+msgstr "Errore nell'esecuzione di UnRar"
+
+#: cps/helper.py:586
+msgid "Unrar binary file not found"
+msgstr "Non ho trovato il file binario di UnRar"
+
+#: cps/helper.py:614
+msgid "Waiting"
+msgstr "Attendere"
+
+#: cps/helper.py:616
+msgid "Failed"
+msgstr "Fallito"
+
+#: cps/helper.py:618
+msgid "Started"
+msgstr "Avviato"
+
+#: cps/helper.py:620
+msgid "Finished"
+msgstr "Terminato"
+
+#: cps/helper.py:622
+msgid "Unknown Status"
+msgstr "Stato sconosciuto"
+
+#: cps/helper.py:627
+msgid "E-mail: "
+msgstr "E-mail: "
+
+#: cps/helper.py:629 cps/helper.py:633
+msgid "Convert: "
+msgstr "Conversione: "
+
+#: cps/helper.py:631
+msgid "Upload: "
+msgstr "Upload: "
+
+#: cps/helper.py:635
+msgid "Unknown Task: "
+msgstr "Processo sconosciuto: "
+
+#: cps/oauth_bb.py:87
+#, python-format
+msgid "Register with %s, "
+msgstr ""
+
+#: cps/oauth_bb.py:145
+msgid "Failed to log in with GitHub."
+msgstr ""
+
+#: cps/oauth_bb.py:150
+msgid "Failed to fetch user info from GitHub."
+msgstr ""
+
+#: cps/oauth_bb.py:161
+msgid "Failed to log in with Google."
+msgstr ""
+
+#: cps/oauth_bb.py:166
+msgid "Failed to fetch user info from Google."
+msgstr ""
+
+#: cps/oauth_bb.py:265
+#, python-format
+msgid "Unlink to %(oauth)s success."
+msgstr ""
+
+#: cps/oauth_bb.py:269
+#, python-format
+msgid "Unlink to %(oauth)s failed."
+msgstr ""
+
+#: cps/oauth_bb.py:272
+#, python-format
+msgid "Not linked to %(oauth)s."
+msgstr ""
+
+#: cps/oauth_bb.py:300
+msgid "GitHub Oauth error, please retry later."
+msgstr ""
+
+#: cps/oauth_bb.py:319
+msgid "Google Oauth error, please retry later."
+msgstr ""
+
+#: cps/shelf.py:40 cps/shelf.py:92
+msgid "Invalid shelf specified"
+msgstr "Lo scaffale specificato non è valevole"
+
+#: cps/shelf.py:47
+#, python-format
+msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
+msgstr "Mi spiace, ma non sei autorizzato ad aggiungere libri allo scaffale: %(shelfname)s"
+
+#: cps/shelf.py:55
+msgid "You are not allowed to edit public shelves"
+msgstr "Non sei autorizzato a modificare gli scaffali pubblici"
+
+#: cps/shelf.py:64
+#, python-format
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr "Il libro è gia presente nello scaffale: %(shelfname)s"
+
+#: cps/shelf.py:78
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "Il libro è stato aggiunto allo scaffale: %(sname)s"
+
+#: cps/shelf.py:97
+#, python-format
+msgid "You are not allowed to add a book to the the shelf: %(name)s"
+msgstr "Non sei autorizzato ad aggiungere libri allo scaffale: %(name)s"
+
+#: cps/shelf.py:102
+msgid "User is not allowed to edit public shelves"
+msgstr "L'utente non è autorizzato a modificare gli scaffali pubblici"
+
+#: cps/shelf.py:120
+#, python-format
+msgid "Books are already part of the shelf: %(name)s"
+msgstr "I libri sono già presenti nello scaffale: %(name)s"
+
+#: cps/shelf.py:134
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr "I libri sono stati aggiunti allo scaffale: %(sname)s"
+
+#: cps/shelf.py:136
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr "Non posso aggiungere libri allo scaffale: %(sname)s"
+
+#: cps/shelf.py:173
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "Il libro è stato rimosso dallo scaffale: %(sname)s"
+
+#: cps/shelf.py:179
+#, python-format
+msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
+msgstr "Spiacente, ma non sei autorizzato a togliere libri dallo scaffale: %(sname)s"
+
+#: cps/shelf.py:200 cps/shelf.py:224
+#, python-format
+msgid "A shelf with the name '%(title)s' already exists."
+msgstr "Uno scaffale con il nome '%(title)s' esiste già."
+
+#: cps/shelf.py:205
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "Lo scaffale %(title)s è stato creato"
+
+#: cps/shelf.py:207 cps/shelf.py:235
+msgid "There was an error"
+msgstr "C'era un errore"
+
+#: cps/shelf.py:208 cps/shelf.py:210
+msgid "create a shelf"
+msgstr "crea uno scaffale"
+
+#: cps/shelf.py:233
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "Lo scaffale %(title)s è stato modificato"
+
+#: cps/shelf.py:236 cps/shelf.py:238
+msgid "Edit a shelf"
+msgstr "Modifica uno scaffale"
+
+#: cps/shelf.py:259
+#, python-format
+msgid "successfully deleted shelf %(name)s"
+msgstr "lo scaffale %(name)s è stato eliminato con successo"
+
+#: cps/shelf.py:289
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Scaffale: '%(name)s'"
+
+#: cps/shelf.py:292
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "Errore durante l'apertura dello scaffale. Lo scaffale non esiste o non è accessibile"
+
+#: cps/shelf.py:324
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "Modificare l'ordine dello scaffale: '%(name)s'"
+
+#: cps/ub.py:111
+msgid "Recently Added"
+msgstr "Aggiunto recentemente"
+
+#: cps/ub.py:113
+msgid "Show recent books"
+msgstr "Mostra i libri recenti"
+
+#: cps/templates/index.xml:17 cps/ub.py:114
+msgid "Hot Books"
+msgstr "Hot Ebook"
+
+#: cps/ub.py:115
+msgid "Show hot books"
+msgstr "Mostra libri popolari"
+
+#: cps/templates/index.xml:24 cps/ub.py:118
+msgid "Best rated Books"
+msgstr "Libri più votati"
+
+#: cps/ub.py:120
+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:121
+#: cps/web.py:965
+msgid "Read Books"
+msgstr "Libri da leggere"
+
+#: cps/ub.py:123
+msgid "Show read and unread"
+msgstr "Mostra letto e non letto"
+
+#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:125
+#: cps/web.py:969
+msgid "Unread Books"
+msgstr "Libri non letti"
+
+#: cps/ub.py:127
+msgid "Show unread"
+msgstr ""
+
+#: cps/ub.py:128
+msgid "Discover"
+msgstr "Per scoprire"
+
+#: cps/ub.py:130
+msgid "Show random books"
+msgstr "Mostra libro a caso"
+
+#: cps/ub.py:131
+msgid "Categories"
+msgstr "Categoria"
+
+#: cps/ub.py:133
+msgid "Show category selection"
+msgstr "Mostra la selezione delle categorie"
+
+#: cps/templates/book_edit.html:71 cps/templates/search_form.html:53
+#: cps/ub.py:134
+msgid "Series"
+msgstr "Serie"
+
+#: cps/ub.py:136
+msgid "Show series selection"
+msgstr "Mostra la selezione delle serie"
+
+#: cps/templates/index.xml:61 cps/ub.py:137
+msgid "Authors"
+msgstr "Autori"
+
+#: cps/ub.py:139
+msgid "Show author selection"
+msgstr "Mostra la selezione dell'autore"
+
+#: cps/templates/index.xml:68 cps/ub.py:141
+msgid "Publishers"
+msgstr "Editori"
+
+#: cps/ub.py:143
+msgid "Show publisher selection"
+msgstr "Mostra la selezione dell'editore"
+
+#: cps/templates/search_form.html:74 cps/ub.py:144
+msgid "Languages"
+msgstr "Lingua"
+
+#: cps/ub.py:147
+msgid "Show language selection"
+msgstr "Mostra la selezione della lingua"
+
+#: cps/ub.py:148
+msgid "Ratings"
+msgstr ""
+
+#: cps/ub.py:150
+msgid "Show ratings selection"
+msgstr ""
+
+#: cps/ub.py:151
+msgid "File formats"
+msgstr ""
+
+#: cps/ub.py:153
+msgid "Show file formats selection"
+msgstr ""
+
+#: cps/updater.py:257 cps/updater.py:364 cps/updater.py:377
+msgid "Unexpected data while reading update information"
+msgstr "Dati inattesi durante il processo di aggiornamento"
+
+#: cps/updater.py:264 cps/updater.py:370
+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:290 cps/updater.py:422
+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:343
+msgid "Could not fetch update information"
+msgstr "Impossibile recuperare informazioni di aggiornamento"
+
+#: cps/updater.py:357
+msgid "No release information available"
+msgstr "Non sono disponibili informazioni sulla versione"
+
+#: cps/updater.py:403 cps/updater.py:412
+#, 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/web.py:457
+msgid "Recently Added Books"
+msgstr "Libri aggiunti di recente"
+
+#: cps/web.py:484
+msgid "Best rated books"
+msgstr "I libri con le migliori valutazioni"
+
+#: cps/templates/index.xml:38 cps/web.py:492
+msgid "Random Books"
+msgstr "Libri a caso"
+
+#: cps/web.py:516
+msgid "Books"
+msgstr ""
+
+#: cps/web.py:543
+msgid "Hot Books (most downloaded)"
+msgstr "I libri più richiesti"
+
+#: cps/web.py:553 cps/web.py:1294 cps/web.py:1383
+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:580
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr "Editore: %(name)s"
+
+#: cps/web.py:591
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "Serie: %(serie)s"
+
+#: cps/web.py:602
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr ""
+
+#: cps/web.py:613
+#, python-format
+msgid "File format: %(format)s"
+msgstr ""
+
+#: cps/web.py:625
+#, python-format
+msgid "Category: %(name)s"
+msgstr "Categoria: %(name)s"
+
+#: cps/web.py:659
+msgid "Publisher list"
+msgstr "Lista degli editori"
+
+#: cps/templates/index.xml:82 cps/web.py:675
+msgid "Series list"
+msgstr "Lista delle serie"
+
+#: cps/web.py:689
+msgid "Ratings list"
+msgstr ""
+
+#: cps/web.py:702
+msgid "File formats list"
+msgstr ""
+
+#: cps/web.py:730
+msgid "Available languages"
+msgstr "Lingue disponibili"
+
+#: cps/web.py:750
+#, python-format
+msgid "Language: %(name)s"
+msgstr "Lingua: %(name)s"
+
+#: cps/templates/index.xml:75 cps/web.py:764
+msgid "Category list"
+msgstr "Elenco categorie"
+
+#: cps/templates/layout.html:73 cps/web.py:777
+msgid "Tasks"
+msgstr "Compito"
+
+#: cps/web.py:841
+msgid "Published after "
+msgstr "Pubblicato dopo "
+
+#: cps/web.py:848
+msgid "Published before "
+msgstr "Pubblicato prima "
+
+#: cps/web.py:862
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Valutazione <= %(rating)s"
+
+#: cps/web.py:864
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Valutazione >= %(rating)s"
+
+#: cps/web.py:924 cps/web.py:933
+msgid "search"
+msgstr "ricerca"
+
+#: cps/web.py:1018
+msgid "Please configure the SMTP mail settings first..."
+msgstr "Configurare dapprima le impostazioni del server SMTP..."
+
+#: cps/web.py:1023
+#, 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:1027
+#, 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:1046 cps/web.py:1071 cps/web.py:1076 cps/web.py:1081
+#: cps/web.py:1085
+msgid "register"
+msgstr "registra"
+
+#: cps/web.py:1073
+msgid "Your e-mail is not allowed to register"
+msgstr "Il tuo e-mail non può essere utilizzato per la registrazione"
+
+#: cps/web.py:1077
+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:1080
+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:1103 cps/web.py:1115
+#, python-format
+msgid "You are now logged in as: '%(nickname)s'"
+msgstr ""
+
+#: cps/web.py:1108 cps/web.py:1120
+msgid "Wrong Username or Password"
+msgstr "Nome utente o password errati"
+
+#: cps/web.py:1111
+msgid "Could not login. LDAP server down, please contact your administrator"
+msgstr ""
+
+#: cps/web.py:1124 cps/web.py:1146
+msgid "login"
+msgstr "accedi"
+
+#: cps/web.py:1158 cps/web.py:1189
+msgid "Token not found"
+msgstr "Token non trovato"
+
+#: cps/web.py:1166 cps/web.py:1197
+msgid "Token has expired"
+msgstr "Il token è scaduto"
+
+#: cps/web.py:1174
+msgid "Success! Please return to your device"
+msgstr "Successo! Torna al tuo dispositivo"
+
+#: cps/web.py:1210
+#, python-format
+msgid "you are now logged in as: '%(nickname)s'"
+msgstr "ora sei connesso come: '%(nickname)s'"
+
+#: cps/web.py:1250 cps/web.py:1277 cps/web.py:1281
+#, python-format
+msgid "%(name)s's profile"
+msgstr "Profilo di %(name)s"
+
+#: cps/web.py:1274
+msgid "Found an existing account for this e-mail address."
+msgstr "Ho trovato un account creato in precedenza con questo e-mail."
+
+#: cps/web.py:1279
+msgid "Profile updated"
+msgstr "Profilo aggiornato"
+
+#: cps/web.py:1304 cps/web.py:1306 cps/web.py:1308 cps/web.py:1314
+#: cps/web.py:1318
+msgid "Read a Book"
+msgstr "Leggere un libro"
+
+#: cps/web.py:1328
+msgid "Error opening eBook. File does not exist or file is not accessible."
+msgstr ""
+
+#: cps/worker.py:308
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Errore nel convertitore: %(error)s"
 
-#: cps/worker.py:316
+#: cps/worker.py:319
 #, python-format
 msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "Kindlegen ha restituito l'errore %(error)s. Messaggio: %(message)s"
@@ -779,147 +968,152 @@ msgstr "DLS"
 msgid "Admin"
 msgstr "Admin"
 
-#: cps/templates/admin.html:14 cps/templates/detail.html:22
-#: cps/templates/detail.html:31
+#: cps/templates/admin.html:14 cps/templates/detail.html:18
+#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/shelfdown.html:62
 msgid "Download"
 msgstr "Download"
 
-#: cps/templates/admin.html:15 cps/templates/layout.html:65
+#: cps/templates/admin.html:15
+msgid "View Ebooks"
+msgstr ""
+
+#: cps/templates/admin.html:16 cps/templates/layout.html:65
 msgid "Upload"
 msgstr "Upload"
 
-#: cps/templates/admin.html:16
+#: cps/templates/admin.html:17
 msgid "Edit"
 msgstr "Modifica"
 
-#: cps/templates/admin.html:39
+#: cps/templates/admin.html:41
 msgid "SMTP e-mail server settings"
 msgstr "Configurazione server SMTP"
 
-#: cps/templates/admin.html:42 cps/templates/email_edit.html:11
+#: cps/templates/admin.html:44 cps/templates/email_edit.html:11
 msgid "SMTP hostname"
 msgstr "indirizzo server SMTP"
 
-#: cps/templates/admin.html:43
+#: cps/templates/admin.html:45
 msgid "SMTP port"
 msgstr "porta SMTP"
 
-#: cps/templates/admin.html:44
+#: cps/templates/admin.html:46
 msgid "SSL"
 msgstr "SSL"
 
-#: cps/templates/admin.html:45 cps/templates/email_edit.html:27
+#: cps/templates/admin.html:47 cps/templates/email_edit.html:27
 msgid "SMTP login"
 msgstr "login SMTP"
 
-#: cps/templates/admin.html:46
+#: cps/templates/admin.html:48
 msgid "From mail"
 msgstr "E-mail da"
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:58
 msgid "Change SMTP settings"
 msgstr "Modificare le impostazioni SMTP"
 
-#: cps/templates/admin.html:62
+#: cps/templates/admin.html:64
 msgid "Configuration"
 msgstr "Configurazione"
 
-#: cps/templates/admin.html:65
+#: cps/templates/admin.html:67
 msgid "Calibre DB dir"
 msgstr "Cartella DB Calibre"
 
-#: cps/templates/admin.html:69
+#: cps/templates/admin.html:71
 msgid "Log level"
 msgstr "Livello di log"
 
-#: cps/templates/admin.html:73
+#: cps/templates/admin.html:75
 msgid "Port"
 msgstr "Porta"
 
-#: cps/templates/admin.html:79 cps/templates/config_view_edit.html:23
+#: cps/templates/admin.html:81 cps/templates/config_view_edit.html:23
 msgid "Books per page"
 msgstr "Libri per pagina"
 
-#: cps/templates/admin.html:83
+#: cps/templates/admin.html:85
 msgid "Uploading"
 msgstr "Uploading"
 
-#: cps/templates/admin.html:87
+#: cps/templates/admin.html:89
 msgid "Anonymous browsing"
 msgstr "Navigazione anonima"
 
-#: cps/templates/admin.html:91
+#: cps/templates/admin.html:93
 msgid "Public registration"
 msgstr "Registrazione pubblica"
 
-#: cps/templates/admin.html:95 cps/templates/remote_login.html:4
+#: cps/templates/admin.html:97 cps/templates/remote_login.html:4
 msgid "Remote login"
 msgstr "Login remoto"
 
-#: cps/templates/admin.html:106
+#: cps/templates/admin.html:108
 msgid "Administration"
 msgstr "Amministrazione"
 
-#: cps/templates/admin.html:107
+#: cps/templates/admin.html:109
 msgid "Reconnect to Calibre DB"
 msgstr "Ricollegare al DB Calibre"
 
-#: cps/templates/admin.html:108
+#: cps/templates/admin.html:110
 msgid "Restart Calibre-Web"
 msgstr "Riavvia Calibre-Web"
 
-#: cps/templates/admin.html:109
+#: cps/templates/admin.html:111
 msgid "Stop Calibre-Web"
 msgstr "Arresta Calibre-Web"
 
-#: cps/templates/admin.html:115
+#: cps/templates/admin.html:117
 msgid "Update"
 msgstr "Aggiornamento"
 
-#: cps/templates/admin.html:119
+#: cps/templates/admin.html:121
 msgid "Version"
 msgstr "Versione"
 
-#: cps/templates/admin.html:120
+#: cps/templates/admin.html:122
 msgid "Details"
 msgstr "Dettagli"
 
-#: cps/templates/admin.html:126
+#: cps/templates/admin.html:128
 msgid "Current version"
 msgstr "Versione attuale"
 
-#: cps/templates/admin.html:132
+#: cps/templates/admin.html:134
 msgid "Check for update"
 msgstr "Ricerca aggiornamenti"
 
-#: cps/templates/admin.html:133
+#: cps/templates/admin.html:135
 msgid "Perform Update"
 msgstr "Esegui aggiornamento"
 
-#: cps/templates/admin.html:145
+#: cps/templates/admin.html:147
 msgid "Do you really want to restart Calibre-Web?"
 msgstr "Vuoi veramente riavviare Calibre-Web?"
 
-#: cps/templates/admin.html:150 cps/templates/admin.html:164
-#: cps/templates/admin.html:184 cps/templates/shelf.html:73
+#: cps/templates/admin.html:152 cps/templates/admin.html:166
+#: cps/templates/admin.html:186 cps/templates/shelf.html:72
 msgid "Ok"
 msgstr "Ok"
 
-#: cps/templates/admin.html:151 cps/templates/admin.html:165
-#: cps/templates/book_edit.html:178 cps/templates/book_edit.html:200
-#: cps/templates/config_edit.html:226 cps/templates/config_view_edit.html:179
-#: cps/templates/email_edit.html:40 cps/templates/email_edit.html:75
-#: cps/templates/layout.html:28 cps/templates/shelf.html:74
+#: cps/templates/admin.html:153 cps/templates/admin.html:167
+#: cps/templates/book_edit.html:174 cps/templates/book_edit.html:196
+#: cps/templates/config_edit.html:281 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/user_edit.html:149
+#: cps/templates/user_edit.html:132
 msgid "Back"
 msgstr "Indietro"
 
-#: cps/templates/admin.html:163
+#: cps/templates/admin.html:165
 msgid "Do you really want to stop Calibre-Web?"
 msgstr "Vuoi veramente arrestare Calibre-Web?"
 
-#: cps/templates/admin.html:175
+#: cps/templates/admin.html:177
 msgid "Updating, please do not reload page"
 msgstr "Aggiornamento, non ricaricare la pagina."
 
@@ -931,176 +1125,176 @@ msgstr "via"
 msgid "In Library"
 msgstr "Nella libreria"
 
-#: cps/templates/author.html:50 cps/templates/author.html:97
-#: cps/templates/discover.html:28 cps/templates/index.html:31
-#: cps/templates/index.html:86 cps/templates/search.html:55
-#: cps/templates/shelf.html:37
+#: cps/templates/author.html:34 cps/templates/list.html:14
+#: cps/templates/search.html:41
+msgid "All"
+msgstr ""
+
+#: cps/templates/author.html:58 cps/templates/author.html:105
+#: 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 "riduci"
 
-#: cps/templates/author.html:81
+#: cps/templates/author.html:89
 msgid "More by"
 msgstr "Altro da"
 
-#: cps/templates/book_edit.html:16
+#: cps/templates/book_edit.html:12
 msgid "Delete Book"
 msgstr "Elimina libro"
 
-#: cps/templates/book_edit.html:19
+#: cps/templates/book_edit.html:15
 msgid "Delete formats:"
 msgstr "Elimina i formati:"
 
-#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:199
-#: cps/templates/email_edit.html:73 cps/templates/email_edit.html:74
+#: cps/templates/book_edit.html:18 cps/templates/book_edit.html:195
+#: cps/templates/email_edit.html:73
 msgid "Delete"
 msgstr "Elimina"
 
-#: cps/templates/book_edit.html:30
+#: cps/templates/book_edit.html:26
 msgid "Convert book format:"
 msgstr "Converti il libro nel formato:"
 
-#: cps/templates/book_edit.html:34
+#: cps/templates/book_edit.html:30
 msgid "Convert from:"
 msgstr "Converti da:"
 
-#: cps/templates/book_edit.html:36 cps/templates/book_edit.html:43
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
 msgstr "seleziona un'opzione"
 
-#: cps/templates/book_edit.html:41
+#: cps/templates/book_edit.html:37
 msgid "Convert to:"
 msgstr "Converti in:"
 
-#: cps/templates/book_edit.html:50
+#: cps/templates/book_edit.html:46
 msgid "Convert book"
 msgstr "Converti libro"
 
-#: cps/templates/book_edit.html:59 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:55 cps/templates/search_form.html:6
 msgid "Book Title"
 msgstr "Titolo del libro"
 
-#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:259
-#: cps/templates/book_edit.html:277 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:59 cps/templates/book_edit.html:255
+#: cps/templates/book_edit.html:273 cps/templates/search_form.html:10
 msgid "Author"
 msgstr "Autore"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:264
-#: cps/templates/book_edit.html:279 cps/templates/search_form.html:106
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:260
+#: cps/templates/book_edit.html:275 cps/templates/search_form.html:106
 msgid "Description"
 msgstr "Descrizione"
 
-#: cps/templates/book_edit.html:71 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:67 cps/templates/search_form.html:33
 msgid "Tags"
 msgstr "Tags"
 
-#: cps/templates/book_edit.html:75 cps/templates/layout.html:159
-#: cps/templates/search_form.html:53
-msgid "Series"
-msgstr "Serie"
-
-#: cps/templates/book_edit.html:79
+#: cps/templates/book_edit.html:75
 msgid "Series id"
 msgstr "Serie id"
 
-#: cps/templates/book_edit.html:83
+#: cps/templates/book_edit.html:79
 msgid "Rating"
 msgstr "Valutazione"
 
-#: cps/templates/book_edit.html:87
+#: cps/templates/book_edit.html:83
 msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
 msgstr "URL della copertina (jpg, la copertina viene caricata e salvata nel database, dopodiché il campo viene nuovamente svuotato)"
 
-#: cps/templates/book_edit.html:91
+#: cps/templates/book_edit.html:87
 msgid "Upload Cover from local drive"
 msgstr "Carica la copertina dal disco locale"
 
-#: cps/templates/book_edit.html:96 cps/templates/detail.html:148
+#: cps/templates/book_edit.html:92 cps/templates/detail.html:168
 msgid "Publishing date"
 msgstr "Data di pubblicazione"
 
-#: cps/templates/book_edit.html:103 cps/templates/book_edit.html:261
-#: cps/templates/book_edit.html:278 cps/templates/detail.html:139
+#: cps/templates/book_edit.html:99 cps/templates/book_edit.html:257
+#: cps/templates/book_edit.html:274 cps/templates/detail.html:159
 #: cps/templates/search_form.html:14
 msgid "Publisher"
 msgstr "Editore"
 
-#: cps/templates/book_edit.html:107 cps/templates/user_edit.html:31
+#: cps/templates/book_edit.html:103 cps/templates/user_edit.html:31
 msgid "Language"
 msgstr "Lingua"
 
-#: cps/templates/book_edit.html:117 cps/templates/search_form.html:117
+#: cps/templates/book_edit.html:113 cps/templates/search_form.html:117
 msgid "Yes"
 msgstr "Si"
 
-#: cps/templates/book_edit.html:118 cps/templates/search_form.html:118
+#: cps/templates/book_edit.html:114 cps/templates/search_form.html:118
 msgid "No"
 msgstr "No"
 
-#: cps/templates/book_edit.html:164
+#: cps/templates/book_edit.html:160
 msgid "Upload format"
 msgstr "Carica formato"
 
-#: cps/templates/book_edit.html:173
+#: cps/templates/book_edit.html:169
 msgid "view book after edit"
 msgstr "visualizzare il libro dopo la modifica"
 
-#: cps/templates/book_edit.html:176 cps/templates/book_edit.html:212
+#: cps/templates/book_edit.html:172 cps/templates/book_edit.html:208
 msgid "Get metadata"
 msgstr "Ottieni metadati"
 
-#: cps/templates/book_edit.html:177 cps/templates/config_edit.html:224
-#: cps/templates/config_view_edit.html:178 cps/templates/login.html:20
+#: cps/templates/book_edit.html:173 cps/templates/config_edit.html:279
+#: cps/templates/config_view_edit.html:146 cps/templates/login.html:20
 #: cps/templates/search_form.html:150 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:147
+#: cps/templates/user_edit.html:130
 msgid "Submit"
 msgstr "Invia"
 
-#: cps/templates/book_edit.html:191
+#: cps/templates/book_edit.html:187
 msgid "Are you really sure?"
 msgstr "Sei davvero sicuro?"
 
-#: cps/templates/book_edit.html:194
+#: cps/templates/book_edit.html:190
 msgid "Book will be deleted from Calibre database"
 msgstr "Il libro verrà cancellato dal database di Calibre"
 
-#: cps/templates/book_edit.html:195
+#: cps/templates/book_edit.html:191
 msgid "and from hard disk"
 msgstr "e dal disco rigido"
 
-#: cps/templates/book_edit.html:215
+#: cps/templates/book_edit.html:211
 msgid "Keyword"
 msgstr "Parola chiave"
 
-#: cps/templates/book_edit.html:216
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr "Cerca parola chiave"
 
-#: cps/templates/book_edit.html:218 cps/templates/layout.html:47
+#: cps/templates/book_edit.html:214 cps/templates/layout.html:47
 msgid "Go!"
 msgstr "Vai!"
 
-#: cps/templates/book_edit.html:222
+#: cps/templates/book_edit.html:218
 msgid "Click the cover to load metadata to the form"
 msgstr "Fai clic sulla copertina per caricare i metadati presenti nel modulo"
 
-#: cps/templates/book_edit.html:234 cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:230 cps/templates/book_edit.html:270
 msgid "Loading..."
 msgstr "Caricamento in corso..."
 
-#: cps/templates/book_edit.html:239 cps/templates/layout.html:226
-#: cps/templates/layout.html:258
+#: cps/templates/book_edit.html:235 cps/templates/layout.html:187
+#: cps/templates/layout.html:219
 msgid "Close"
 msgstr "Chiudi"
 
-#: cps/templates/book_edit.html:266 cps/templates/book_edit.html:280
+#: cps/templates/book_edit.html:262 cps/templates/book_edit.html:276
 msgid "Source"
 msgstr "Fonte"
 
-#: cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:271
 msgid "Search error!"
 msgstr "Errore di ricerca!"
 
-#: cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:272
 msgid "No Result(s) found! Please try aonther keyword."
 msgstr "Nessun risultato! Prova con un altro criterio di ricerca."
 
@@ -1228,35 +1422,87 @@ msgstr "API di Goodreads"
 msgid "Goodreads API Secret"
 msgstr "Goodreads API Secret"
 
-#: cps/templates/config_edit.html:187
+#: cps/templates/config_edit.html:181
+msgid "Login type"
+msgstr ""
+
+#: cps/templates/config_edit.html:183
+msgid "Use standard Authentication"
+msgstr ""
+
+#: cps/templates/config_edit.html:185
+msgid "Use LDAP Authentication"
+msgstr ""
+
+#: cps/templates/config_edit.html:188
+msgid "Use GitHub OAuth"
+msgstr ""
+
+#: cps/templates/config_edit.html:189
+msgid "Use Google OAuth"
+msgstr ""
+
+#: cps/templates/config_edit.html:196
+msgid "LDAP Provider URL"
+msgstr ""
+
+#: cps/templates/config_edit.html:200
+msgid "LDAP Distinguished Name (DN)"
+msgstr ""
+
+#: cps/templates/config_edit.html:208
+msgid "Obtain GitHub OAuth Credential"
+msgstr ""
+
+#: cps/templates/config_edit.html:211
+msgid "GitHub OAuth Client Id"
+msgstr ""
+
+#: cps/templates/config_edit.html:215
+msgid "GitHub OAuth Client Secret"
+msgstr ""
+
+#: cps/templates/config_edit.html:221
+msgid "Obtain Google OAuth Credential"
+msgstr ""
+
+#: cps/templates/config_edit.html:224
+msgid "Google OAuth Client Id"
+msgstr ""
+
+#: cps/templates/config_edit.html:228
+msgid "Google OAuth Client Secret"
+msgstr ""
+
+#: cps/templates/config_edit.html:242
 msgid "External binaries"
 msgstr "Files binari esterni"
 
-#: cps/templates/config_edit.html:195
+#: cps/templates/config_edit.html:250
 msgid "No converter"
 msgstr "Nessun convertitore"
 
-#: cps/templates/config_edit.html:197
+#: cps/templates/config_edit.html:252
 msgid "Use Kindlegen"
 msgstr "Utilizza Kindlegen"
 
-#: cps/templates/config_edit.html:199
+#: cps/templates/config_edit.html:254
 msgid "Use calibre's ebook converter"
 msgstr "Utilizza il convertitore di Calibre"
 
-#: cps/templates/config_edit.html:203
+#: cps/templates/config_edit.html:258
 msgid "E-Book converter settings"
 msgstr "Configurazione del convertitore di e-book"
 
-#: cps/templates/config_edit.html:207
+#: cps/templates/config_edit.html:262
 msgid "Path to convertertool"
 msgstr "Percorso del convertitore"
 
-#: cps/templates/config_edit.html:213
+#: cps/templates/config_edit.html:268
 msgid "Location of Unrar binary"
 msgstr "Percorso di UnRar"
 
-#: cps/templates/config_edit.html:229 cps/templates/layout.html:84
+#: cps/templates/config_edit.html:284 cps/templates/layout.html:84
 #: cps/templates/login.html:4
 msgid "Login"
 msgstr "Accesso"
@@ -1265,8 +1511,7 @@ msgstr "Accesso"
 msgid "View Configuration"
 msgstr "Visualizza configurazione"
 
-#: cps/templates/config_view_edit.html:19 cps/templates/layout.html:135
-#: cps/templates/layout.html:136 cps/templates/shelf_edit.html:7
+#: cps/templates/config_view_edit.html:19 cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr "Titolo"
 
@@ -1278,7 +1523,7 @@ msgstr "Numero di libri casuali da mostrare"
 msgid "No. of authors to show before hiding (0=disable hiding)"
 msgstr "Numero di autori da mostrare prima di nascondere (0=disabilita mascheramento)"
 
-#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:118
+#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:112
 msgid "Theme"
 msgstr "Tema"
 
@@ -1310,127 +1555,91 @@ msgstr "Tags per libri per adulti"
 msgid "Default settings for new users"
 msgstr "Impostazioni predefinite per i nuovi utenti"
 
-#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:104
+#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:83
 msgid "Admin user"
 msgstr "Utente amministratore"
 
-#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:113
+#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:92
 msgid "Allow Downloads"
 msgstr "Consenti download"
 
-#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:117
+#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:96
+msgid "Allow book viewer"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:100
 msgid "Allow Uploads"
 msgstr "Consenti caricamenti"
 
-#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:121
+#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:104
 msgid "Allow Edit"
 msgstr "Consenti modifica"
 
-#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:125
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:108
 msgid "Allow Delete books"
 msgstr "Consenti l'eliminazione di libri"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:130
+#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:113
 msgid "Allow Changing Password"
 msgstr "Consenti la modifica della password"
 
-#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:134
+#: cps/templates/config_view_edit.html:109 cps/templates/user_edit.html:117
 msgid "Allow Editing Public Shelfs"
 msgstr "Consenti la modifica degli scaffali pubblici"
 
-#: cps/templates/config_view_edit.html:115
+#: cps/templates/config_view_edit.html:119
 msgid "Default visibilities for new users"
 msgstr "Visibilità di base per i nuovi utenti"
 
-#: cps/templates/config_view_edit.html:123 cps/templates/user_edit.html:50
-msgid "Show random books"
-msgstr "Mostra libro a caso"
-
-#: cps/templates/config_view_edit.html:127 cps/templates/user_edit.html:54
-msgid "Show recent books"
-msgstr "Mostra i libri recenti"
-
-#: cps/templates/config_view_edit.html:131 cps/templates/user_edit.html:58
-msgid "Show sorted books"
-msgstr "Mostra i libri ordinati"
-
-#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:62
-msgid "Show hot books"
-msgstr "Mostra libri popolari"
-
-#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:66
-msgid "Show best rated books"
-msgstr "Mostra la sezione dei libri più votati"
-
-#: cps/templates/config_view_edit.html:143 cps/templates/user_edit.html:70
-msgid "Show language selection"
-msgstr "Mostra la selezione della lingua"
-
-#: cps/templates/config_view_edit.html:147 cps/templates/user_edit.html:74
-msgid "Show series selection"
-msgstr "Mostra la selezione delle serie"
-
-#: cps/templates/config_view_edit.html:151 cps/templates/user_edit.html:78
-msgid "Show category selection"
-msgstr "Mostra la selezione delle categorie"
-
-#: cps/templates/config_view_edit.html:155 cps/templates/user_edit.html:82
-msgid "Show author selection"
-msgstr "Mostra la selezione dell'autore"
-
-#: cps/templates/config_view_edit.html:159 cps/templates/user_edit.html:86
-msgid "Show publisher selection"
-msgstr "Mostra la selezione dell'editore"
-
-#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:91
-msgid "Show read and unread"
-msgstr "Mostra letto e non letto"
-
-#: cps/templates/config_view_edit.html:167 cps/templates/user_edit.html:96
+#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:75
 msgid "Show random books in detail view"
 msgstr "Mostra libri a caso nella vista dettagliata"
 
-#: cps/templates/config_view_edit.html:171 cps/templates/user_edit.html:109
+#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:88
 msgid "Show mature content"
 msgstr "Mostra sezione adulti"
 
-#: cps/templates/detail.html:63
+#: cps/templates/detail.html:59
 msgid "Read in browser"
 msgstr "Leggere nel browser"
 
-#: cps/templates/detail.html:100
+#: cps/templates/detail.html:73
+msgid "Listen in browser"
+msgstr ""
+
+#: cps/templates/detail.html:120
 msgid "Book"
 msgstr "Libro"
 
-#: cps/templates/detail.html:100
+#: cps/templates/detail.html:120
 msgid "of"
 msgstr "di"
 
-#: cps/templates/detail.html:106
+#: cps/templates/detail.html:126
 msgid "language"
 msgstr "lingua"
 
-#: cps/templates/detail.html:185
+#: cps/templates/detail.html:203
 msgid "Mark As Unread"
 msgstr "Marca come non letto"
 
-#: cps/templates/detail.html:185
+#: cps/templates/detail.html:203
 msgid "Mark As Read"
 msgstr "Marca come letto"
 
-#: cps/templates/detail.html:186
+#: cps/templates/detail.html:204
 msgid "Read"
 msgstr "Leggere"
 
-#: cps/templates/detail.html:196
+#: cps/templates/detail.html:214 cps/templates/listenmp3.html:54
 msgid "Description:"
 msgstr "Descrizione:"
 
-#: cps/templates/detail.html:209 cps/templates/search.html:14
+#: cps/templates/detail.html:227 cps/templates/search.html:14
 msgid "Add to shelf"
 msgstr "Aggiungi allo scaffale"
 
-#: cps/templates/detail.html:271
+#: cps/templates/detail.html:289
 msgid "Edit metadata"
 msgstr "Modifica metadati"
 
@@ -1490,12 +1699,12 @@ msgstr "Aggiungi"
 msgid "Do you really want to delete this domain rule?"
 msgstr "Vuoi veramente eliminare questa regola di dominio?"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:210
+#: cps/templates/feed.xml:21 cps/templates/layout.html:171
 msgid "Next"
 msgstr "Prossimo"
 
-#: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:44 cps/templates/layout.html:45
+#: cps/templates/feed.xml:33 cps/templates/layout.html:44
+#: cps/templates/layout.html:45
 msgid "Search"
 msgstr "Cerca"
 
@@ -1507,75 +1716,63 @@ msgstr "Ritorno alla pagina principale"
 msgid "Discover (Random Books)"
 msgstr "Scoprire (libri casuali)"
 
+#: cps/templates/index.html:65
+msgid "Group by series"
+msgstr ""
+
 #: cps/templates/index.xml:6
 msgid "Start"
 msgstr "Inizio"
 
-#: cps/templates/index.xml:18 cps/templates/layout.html:141
-msgid "Hot Books"
-msgstr "Hot Ebook"
-
-#: cps/templates/index.xml:22
+#: cps/templates/index.xml:21
 msgid "Popular publications from this catalog based on Downloads."
 msgstr "Pubblicazioni popolari di questo catalogo in base ai download."
 
-#: cps/templates/index.xml:25 cps/templates/layout.html:144
-msgid "Best rated Books"
-msgstr "Libri più votati"
-
-#: cps/templates/index.xml:29
+#: cps/templates/index.xml:28
 msgid "Popular publications from this catalog based on Rating."
 msgstr "Pubblicazioni popolari di questo catalogo basate sui voti."
 
-#: cps/templates/index.xml:32
+#: cps/templates/index.xml:31
 msgid "New Books"
 msgstr "Nuovi libri"
 
-#: cps/templates/index.xml:36
+#: cps/templates/index.xml:35
 msgid "The latest Books"
 msgstr "Gli ultimi Libri"
 
-#: cps/templates/index.xml:43
+#: cps/templates/index.xml:42
 msgid "Show Random Books"
 msgstr "Mostra libri casuali"
 
-#: cps/templates/index.xml:62 cps/templates/layout.html:162
-msgid "Authors"
-msgstr "Autori"
-
-#: cps/templates/index.xml:66
+#: cps/templates/index.xml:65
 msgid "Books ordered by Author"
 msgstr "Libri ordinati per autore"
 
-#: cps/templates/index.xml:69 cps/templates/layout.html:165
-msgid "Publishers"
-msgstr "Editori"
-
-#: cps/templates/index.xml:73
+#: cps/templates/index.xml:72
 msgid "Books ordered by publisher"
 msgstr "Libri ordinati per editori"
 
-#: cps/templates/index.xml:80
+#: cps/templates/index.xml:79
 msgid "Books ordered by category"
 msgstr "Libri ordinati per categoria"
 
-#: cps/templates/index.xml:87
+#: cps/templates/index.xml:86
 msgid "Books ordered by series"
 msgstr "Libri ordinati per serie"
 
-#: cps/templates/index.xml:90 cps/templates/layout.html:171
+#: cps/templates/index.xml:89 cps/templates/layout.html:132
 msgid "Public Shelves"
 msgstr "Scaffali pubblici"
 
-#: cps/templates/index.xml:94
+#: cps/templates/index.xml:93
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr "Libri organizzati in scaffali pubblici, visibili a tutti"
 
-#: cps/templates/index.xml:98 cps/templates/layout.html:175
+#: cps/templates/index.xml:97 cps/templates/layout.html:136
 msgid "Your Shelves"
 msgstr "I tuoi scaffali"
 
-#: cps/templates/index.xml:102
+#: cps/templates/index.xml:101
 msgid "User's own shelfs, only visible to the current user himself"
 msgstr "Scaffali dell'utente, visibili unicamente all'utente stesso"
 
@@ -1592,7 +1789,7 @@ msgid "Advanced Search"
 msgstr "Ricerca avanzata"
 
 #: cps/templates/layout.html:76 cps/templates/read.html:71
-#: cps/templates/readcbr.html:89 cps/templates/readcbr.html:113
+#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
 msgid "Settings"
 msgstr "Configurazione"
 
@@ -1608,7 +1805,7 @@ msgstr "Logout"
 msgid "Register"
 msgstr "Registrare"
 
-#: cps/templates/layout.html:111 cps/templates/layout.html:257
+#: cps/templates/layout.html:111 cps/templates/layout.html:218
 msgid "Uploading..."
 msgstr "Caricare"
 
@@ -1620,68 +1817,27 @@ msgstr "per favore non aggiornare la pagina"
 msgid "Browse"
 msgstr "Navigare"
 
-#: cps/templates/layout.html:124
-msgid "Recently Added"
-msgstr "Aggiunto recentemente"
-
-#: cps/templates/layout.html:129
-msgid "Sorted Books"
-msgstr "Libri ordinati"
-
-#: cps/templates/layout.html:133 cps/templates/layout.html:134
-#: cps/templates/layout.html:135 cps/templates/layout.html:136
-msgid "Sort By"
-msgstr "Ordina per"
-
-#: cps/templates/layout.html:133
-msgid "Newest"
-msgstr "i più nuovi"
-
-#: cps/templates/layout.html:134
-msgid "Oldest"
-msgstr "i più vecchi"
-
-#: cps/templates/layout.html:135
-msgid "Ascending"
-msgstr "Ascendente"
-
-#: cps/templates/layout.html:136
-msgid "Descending"
-msgstr "Discendente"
-
-#: cps/templates/layout.html:153
-msgid "Discover"
-msgstr "Per scoprire"
-
-#: cps/templates/layout.html:156
-msgid "Categories"
-msgstr "Categoria"
-
-#: cps/templates/layout.html:168 cps/templates/search_form.html:74
-msgid "Languages"
-msgstr "Lingua"
-
-#: cps/templates/layout.html:180
+#: cps/templates/layout.html:141
 msgid "Create a Shelf"
 msgstr "Crea uno scaffale"
 
-#: cps/templates/layout.html:181 cps/templates/stats.html:3
+#: cps/templates/layout.html:142 cps/templates/stats.html:3
 msgid "About"
 msgstr "Informazioni su"
 
-#: cps/templates/layout.html:195
+#: cps/templates/layout.html:156
 msgid "Previous"
 msgstr "Precedente"
 
-#: cps/templates/layout.html:222
+#: cps/templates/layout.html:183
 msgid "Book Details"
 msgstr "Dettagli ebook"
 
-#: cps/templates/layout.html:256
+#: cps/templates/layout.html:217
 msgid "Upload done, processing, please wait..."
 msgstr "Caricamento riuscito, sto elaborando, per favore aspetta..."
 
-#: cps/templates/layout.html:259
+#: cps/templates/layout.html:220
 msgid "Error"
 msgstr "Errore"
 
@@ -1711,105 +1867,105 @@ msgstr "Catalogo Calibre-Web"
 msgid "Reflow text when sidebars are open."
 msgstr "Adatta il testo quando le barre laterali sono aperte."
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:88
 msgid "Keyboard Shortcuts"
 msgstr "Scorciatoie della tastiera"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:91
 msgid "Previous Page"
 msgstr "Pagina precedente"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:92
 msgid "Next Page"
 msgstr "Pagina successiva"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:93
 msgid "Scale to Best"
 msgstr "Adatta al migliore"
 
-#: cps/templates/readcbr.html:100
+#: cps/templates/readcbr.html:94
 msgid "Scale to Width"
 msgstr "Adatta alla larghezza"
 
-#: cps/templates/readcbr.html:101
+#: cps/templates/readcbr.html:95
 msgid "Scale to Height"
 msgstr "Adatta all'altezza"
 
-#: cps/templates/readcbr.html:102
+#: cps/templates/readcbr.html:96
 msgid "Scale to Native"
 msgstr "Dimensione originale"
 
-#: cps/templates/readcbr.html:103
+#: cps/templates/readcbr.html:97
 msgid "Rotate Right"
 msgstr "Ruota a destra"
 
-#: cps/templates/readcbr.html:104
+#: cps/templates/readcbr.html:98
 msgid "Rotate Left"
 msgstr "Ruota a sinistra"
 
-#: cps/templates/readcbr.html:105
+#: cps/templates/readcbr.html:99
 msgid "Flip Image"
 msgstr "Capovolgi immagine"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:115
 msgid "Light"
 msgstr "Chiaro"
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:116
 msgid "Dark"
 msgstr "Scuro"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:121
 msgid "Scale"
 msgstr "Adatta"
 
-#: cps/templates/readcbr.html:130
+#: cps/templates/readcbr.html:124
 msgid "Best"
 msgstr "Migliore"
 
-#: cps/templates/readcbr.html:131
+#: cps/templates/readcbr.html:125
 msgid "Width"
 msgstr "Larghezza"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:126
 msgid "Height"
 msgstr "Alteszza"
 
-#: cps/templates/readcbr.html:133
+#: cps/templates/readcbr.html:127
 msgid "Native"
 msgstr "Originale"
 
-#: cps/templates/readcbr.html:138
+#: cps/templates/readcbr.html:132
 msgid "Rotate"
 msgstr "Ruota"
 
-#: cps/templates/readcbr.html:149
+#: cps/templates/readcbr.html:143
 msgid "Flip"
 msgstr "Capovolgi"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:146
 msgid "Horizontal"
 msgstr "Orizzontale"
 
-#: cps/templates/readcbr.html:153
+#: cps/templates/readcbr.html:147
 msgid "Vertical"
 msgstr "Verticale"
 
-#: cps/templates/readcbr.html:158
+#: cps/templates/readcbr.html:152
 msgid "Direction"
 msgstr ""
 
-#: cps/templates/readcbr.html:161
+#: cps/templates/readcbr.html:155
 msgid "Left to Right"
 msgstr ""
 
-#: cps/templates/readcbr.html:162
+#: cps/templates/readcbr.html:156
 msgid "Right to Left"
 msgstr ""
 
 #: cps/templates/readpdf.html:29
-msgid "PDF.js viewer"
-msgstr "Visore PDF.js"
+msgid "PDF reader"
+msgstr ""
 
 #: cps/templates/readtxt.html:6
 msgid "Basic txt Reader"
@@ -1883,23 +2039,23 @@ msgstr "Valutazione superiore a"
 msgid "Rating less than"
 msgstr "Valutazione inferiore a"
 
-#: cps/templates/shelf.html:7
+#: cps/templates/shelf.html:10
 msgid "Delete this Shelf"
 msgstr "Cancellare questo scaffale"
 
-#: cps/templates/shelf.html:8
+#: cps/templates/shelf.html:11
 msgid "Edit Shelf"
 msgstr "Modifica scaffale"
 
-#: cps/templates/shelf.html:9 cps/templates/shelf_order.html:11
+#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:11
 msgid "Change order"
 msgstr "Cambia ordine"
 
-#: cps/templates/shelf.html:68
+#: cps/templates/shelf.html:67
 msgid "Do you really want to delete the shelf?"
 msgstr "Vuoi davvero eliminare lo scaffale?"
 
-#: cps/templates/shelf.html:71
+#: cps/templates/shelf.html:70
 msgid "Shelf will be lost for everybody and forever!"
 msgstr "Lo scaffale sarà perso per tutti e per sempre!"
 
@@ -1987,19 +2143,31 @@ msgstr "Resetta la password dell'utente"
 msgid "Kindle E-Mail"
 msgstr "E-mail di Kindle"
 
-#: cps/templates/user_edit.html:39
+#: cps/templates/user_edit.html:40
 msgid "Show books with language"
 msgstr "Mostra libri per lingua"
 
-#: cps/templates/user_edit.html:41
+#: cps/templates/user_edit.html:42
 msgid "Show all"
 msgstr "Mostra tutto"
 
-#: cps/templates/user_edit.html:141
+#: cps/templates/user_edit.html:52
+msgid "OAuth Settings"
+msgstr ""
+
+#: cps/templates/user_edit.html:54
+msgid "Link"
+msgstr ""
+
+#: cps/templates/user_edit.html:56
+msgid "Unlink"
+msgstr ""
+
+#: cps/templates/user_edit.html:124
 msgid "Delete this user"
 msgstr "Elimina questo utente"
 
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:139
 msgid "Recent Downloads"
 msgstr "Download Recenti"
 
@@ -3281,3 +3449,45 @@ msgstr "Download Recenti"
 #~ msgid "Using your another device, login and visit "
 #~ msgstr ""
 
+#~ msgid "Newest Books"
+#~ msgstr "I libri più nuovi"
+
+#~ msgid "Oldest Books"
+#~ msgstr "I libri più vecchi"
+
+#~ msgid "Books (A-Z)"
+#~ msgstr "Libri (A-Z)"
+
+#~ msgid "Books (Z-A)"
+#~ msgstr "Libri (Z-A)"
+
+#~ msgid "Error opening eBook. Fileformat is not supported."
+#~ msgstr ""
+
+#~ msgid "File %(title)s"
+#~ msgstr "File %(title)s"
+
+#~ msgid "Show sorted books"
+#~ msgstr "Mostra i libri ordinati"
+
+#~ msgid "Sorted Books"
+#~ msgstr "Libri ordinati"
+
+#~ msgid "Sort By"
+#~ msgstr "Ordina per"
+
+#~ msgid "Newest"
+#~ msgstr "i più nuovi"
+
+#~ msgid "Oldest"
+#~ msgstr "i più vecchi"
+
+#~ msgid "Ascending"
+#~ msgstr "Ascendente"
+
+#~ msgid "Descending"
+#~ msgstr "Discendente"
+
+#~ msgid "PDF.js viewer"
+#~ msgstr "Visore PDF.js"
+
diff --git a/cps/translations/ja/LC_MESSAGES/messages.mo b/cps/translations/ja/LC_MESSAGES/messages.mo
index b74e0e61..345d4d04 100644
Binary files a/cps/translations/ja/LC_MESSAGES/messages.mo and b/cps/translations/ja/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po
index e70f7d43..301580ac 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-05-30 09:06+0200\n"
+"POT-Creation-Date: 2019-05-31 11:20+0200\n"
 "PO-Revision-Date: 2018-02-07 02:20-0500\n"
 "Last-Translator: white <space_white@yahoo.com>\n"
 "Language: ja\n"
@@ -18,740 +18,929 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.6.0\n"
 
-#: cps/book_formats.py:199 cps/book_formats.py:200 cps/book_formats.py:204
-#: cps/book_formats.py:208 cps/book_formats.py:212 cps/converter.py:29
-#: cps/converter.py:45
-msgid "not installed"
-msgstr "インストールされていません"
-
-#: cps/converter.py:40 cps/converter.py:56
-msgid "Excecution permissions missing"
-msgstr "実行許可がありません"
-
-#: cps/converter.py:66
-msgid "not configured"
-msgstr "未設定です"
-
-#: cps/helper.py:79
-#, python-format
-msgid "%(format)s format not found for book id: %(book)d"
-msgstr "ID: %(book)d の本に %(format)s フォーマットはありません"
-
-#: cps/helper.py:91
-#, python-format
-msgid "%(format)s not found on Google Drive: %(fn)s"
-msgstr "Googleドライブ: %(fn)s に %(format)s はありません"
-
-#: cps/helper.py:98 cps/helper.py:204 cps/templates/detail.html:45
-#: cps/templates/detail.html:49
-msgid "Send to Kindle"
-msgstr "Kindleに送信"
-
-#: cps/helper.py:99 cps/helper.py:117 cps/helper.py:206
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "このメールはCalibre-Web経由で送信されました。"
-
-#: cps/helper.py:110
-#, python-format
-msgid "%(format)s not found: %(fn)s"
-msgstr "%(format)s がありません: %(fn)s"
-
-#: cps/helper.py:115
-msgid "Calibre-Web test e-mail"
-msgstr "Calibre-Web テストメール"
-
-#: cps/helper.py:116
-msgid "Test e-mail"
-msgstr "テストメール"
-
-#: cps/helper.py:132
-msgid "Get Started with Calibre-Web"
-msgstr "Calibre-Webを始める"
-
-#: cps/helper.py:133
-#, python-format
-msgid "Registration e-mail for user: %(name)s"
-msgstr "ユーザ: %(name)s 用の登録メール"
-
-#: cps/helper.py:146 cps/helper.py:148 cps/helper.py:150 cps/helper.py:158
-#: cps/helper.py:160 cps/helper.py:162
-#, python-format
-msgid "Send %(format)s to Kindle"
-msgstr "Kindleに %(format)s を送信"
-
-#: cps/helper.py:166
-#, python-format
-msgid "Convert %(orig)s to %(format)s and send to Kindle"
-msgstr "%(orig)s を %(format)s に変換してからKindleに送信"
-
-#: cps/helper.py:205
-#, python-format
-msgid "E-mail: %(book)s"
-msgstr "メール: %(book)s"
-
-#: cps/helper.py:208
-msgid "The requested file could not be read. Maybe wrong permissions?"
-msgstr "要求されたファイルを読み込めませんでした。権限設定が正しいか確認してください。"
-
-#: cps/helper.py:316
-#, python-format
-msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "エラー: %(error)s により、タイトルを %(src)s から %(dest)s に変更できませんでした。"
-
-#: cps/helper.py:326
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "エラー: %(error)s により、著者名を %(src)s から %(dest)s に変更できませんでした。"
-
-#: cps/helper.py:340
-#, python-format
-msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "エラー: %(error)s により、ファイルパスを %(src)s から %(dest)s に変更できませんでした。"
-
-#: cps/helper.py:366 cps/helper.py:376 cps/helper.py:384
-#, python-format
-msgid "File %(file)s not found on Google Drive"
-msgstr "ファイル %(file)s はGoogleドライブ上にありません"
-
-#: cps/helper.py:405
-#, python-format
-msgid "Book path %(path)s not found on Google Drive"
-msgstr "本のパス %(path)s はGoogleドライブ上にありません"
-
-#: cps/helper.py:556
-msgid "Error excecuting UnRar"
-msgstr "rarファイルを展開中にエラーが発生しました"
-
-#: cps/helper.py:558
-msgid "Unrar binary file not found"
-msgstr "Unrarバイナリが見つかりません"
-
-#: cps/helper.py:585
-msgid "Waiting"
-msgstr "待機中"
-
-#: cps/helper.py:587
-msgid "Failed"
-msgstr "失敗"
-
-#: cps/helper.py:589
-msgid "Started"
-msgstr "開始"
-
-#: cps/helper.py:591
-msgid "Finished"
-msgstr "終了"
-
-#: cps/helper.py:593
-msgid "Unknown Status"
-msgstr "不明"
-
-#: cps/helper.py:598
-msgid "E-mail: "
-msgstr "メール: "
-
-#: cps/helper.py:600 cps/helper.py:604
-msgid "Convert: "
-msgstr "変換: "
-
-#: cps/helper.py:602
-msgid "Upload: "
-msgstr "アップロード: "
-
-#: cps/helper.py:606
-msgid "Unknown Task: "
-msgstr "不明なタスク: "
-
-#: cps/updater.py:251 cps/updater.py:410 cps/updater.py:423
-msgid "Unexpected data while reading update information"
-msgstr "アップデート情報を読み込み中に予期しないデータが見つかりました"
-
-#: cps/updater.py:258 cps/updater.py:416
-msgid "No update available. You already have the latest version installed"
-msgstr "アップデートはありません。すでに最新バージョンがインストールされています"
-
-#: cps/updater.py:270 cps/updater.py:501 cps/updater.py:503 cps/web.py:1206
-msgid "HTTP Error"
-msgstr "HTTPエラー"
-
-#: cps/updater.py:272 cps/updater.py:505 cps/web.py:1207
-msgid "Connection error"
-msgstr "接続エラー"
-
-#: cps/updater.py:274 cps/updater.py:507 cps/web.py:1208
-msgid "Timeout while establishing connection"
-msgstr "接続を確立中にタイムアウトしました"
-
-#: cps/updater.py:276 cps/updater.py:509 cps/web.py:1209
-msgid "General error"
-msgstr "エラー発生"
-
-#: cps/updater.py:283 cps/updater.py:341 cps/updater.py:468
-msgid "A new update is available. Click on the button below to update to the latest version."
-msgstr "アップデートが利用可能です。下のボタンをクリックして最新バージョンにアップデートしてください。"
-
-#: cps/updater.py:335
-msgid "Could not fetch update information"
-msgstr "アップデート情報を取得できません"
-
-#: cps/updater.py:403
-msgid "No release information available"
-msgstr "リリース情報がありません"
-
-#: cps/updater.py:449 cps/updater.py:458
-#, 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:491 cps/web.py:2795
-msgid "Unknown"
-msgstr "不明"
-
-#: cps/web.py:1199
-msgid "Requesting update package"
-msgstr "更新データを要求中"
-
-#: cps/web.py:1200
-msgid "Downloading update package"
-msgstr "更新データをダウンロード中"
-
-#: cps/web.py:1201
-msgid "Unzipping update package"
-msgstr "更新データを展開中"
-
-#: cps/web.py:1202
-msgid "Replacing files"
-msgstr "ファイルを置換中"
-
-#: cps/web.py:1203
-msgid "Database connections are closed"
-msgstr "データベースの接続を切断完了"
-
-#: cps/web.py:1204
-msgid "Stopping server"
-msgstr "サーバ停止中"
-
-#: cps/web.py:1205
-msgid "Update finished, please press okay and reload page"
-msgstr "アップデート完了、OKを押してページをリロードしてください"
-
-#: cps/web.py:1206 cps/web.py:1207 cps/web.py:1208 cps/web.py:1209
-msgid "Update failed:"
-msgstr "アップデート失敗:"
-
-#: cps/web.py:1235
-msgid "Recently Added Books"
-msgstr "最近追加された本"
-
-#: cps/web.py:1245
-msgid "Newest Books"
-msgstr "新着順"
-
-#: cps/web.py:1257
-msgid "Oldest Books"
-msgstr "投稿順"
-
-#: cps/web.py:1269
-msgid "Books (A-Z)"
-msgstr "昇順"
-
-#: cps/web.py:1280
-msgid "Books (Z-A)"
-msgstr "降順"
-
-#: cps/web.py:1309
-msgid "Hot Books (most downloaded)"
-msgstr "話題(ダウンロード数順)"
-
-#: cps/web.py:1322
-msgid "Best rated books"
-msgstr "高評価"
-
-#: cps/templates/index.xml:39 cps/web.py:1335
-msgid "Random Books"
-msgstr "ランダム"
-
-#: cps/web.py:1362 cps/web.py:1618 cps/web.py:2161
-msgid "Error opening eBook. File does not exist or file is not accessible:"
-msgstr "電子書籍を開けません。ファイルが存在しないかアクセスできません:"
-
-#: cps/web.py:1391
-msgid "Publisher list"
-msgstr "出版社一覧"
-
-#: cps/web.py:1406
-#, python-format
-msgid "Publisher: %(name)s"
-msgstr "出版社: %(name)s"
-
-#: cps/templates/index.xml:83 cps/web.py:1438
-msgid "Series list"
-msgstr "シリーズ一覧"
-
-#: cps/web.py:1452
-#, python-format
-msgid "Series: %(serie)s"
-msgstr "シリーズ: %(serie)s"
-
-#: cps/web.py:1478
-msgid "Available languages"
-msgstr "言語"
-
-#: cps/web.py:1498
-#, python-format
-msgid "Language: %(name)s"
-msgstr "言語: %(name)s"
-
-#: cps/templates/index.xml:76 cps/web.py:1509
-msgid "Category list"
-msgstr "カテゴリ一覧"
-
-#: cps/web.py:1523
-#, python-format
-msgid "Category: %(name)s"
-msgstr "カテゴリ: %(name)s"
-
-#: cps/templates/layout.html:73 cps/web.py:1648
-msgid "Tasks"
-msgstr "タスク"
-
-#: cps/web.py:1682
+#: cps/about.py:76
 msgid "Statistics"
 msgstr "統計"
 
-#: cps/web.py:1750
-msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
-msgstr "Googleドライブの設定が完了していません。Googleドライブを無効化してから再度有効にしてみてください"
-
-#: cps/web.py:1795
-msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
-msgstr "コールバックドメインが認証されていません。Google Developer Consoleでドメインを認証してください"
-
-#: cps/web.py:1871
+#: cps/admin.py:97
 msgid "Server restarted, please reload page"
 msgstr "サーバを再起動しました。ページを再読み込みしてください"
 
-#: cps/web.py:1874
+#: cps/admin.py:100
 msgid "Performing shutdown of server, please close window"
 msgstr "サーバをシャットダウンしています。ページを閉じてください"
 
-#: cps/web.py:1953
-msgid "Published after "
-msgstr "これ以降に出版 "
+#: cps/admin.py:120 cps/updater.py:445
+msgid "Unknown"
+msgstr "不明"
 
-#: cps/web.py:1960
-msgid "Published before "
-msgstr "これ以前に出版 "
-
-#: cps/web.py:1974
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "評価 <= %(rating)s"
-
-#: cps/web.py:1976
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "評価 >= %(rating)s"
-
-#: cps/web.py:2036 cps/web.py:2045
-msgid "search"
-msgstr "検索"
-
-#: cps/templates/index.xml:47 cps/templates/index.xml:51
-#: cps/templates/layout.html:148 cps/web.py:2116
-msgid "Read Books"
-msgstr "読んだ本"
-
-#: cps/templates/index.xml:55 cps/templates/index.xml:59
-#: cps/templates/layout.html:150 cps/web.py:2119
-msgid "Unread Books"
-msgstr "未読の本"
-
-#: cps/web.py:2171 cps/web.py:2173 cps/web.py:2175 cps/web.py:2187
-msgid "Read a Book"
-msgstr "本を読む"
-
-#: cps/web.py:2199
-msgid "Error opening eBook. Fileformat is not supported."
-msgstr ""
-
-#: cps/web.py:2249 cps/web.py:3170
-msgid "Please fill out all fields!"
-msgstr "全ての項目を入力してください"
-
-#: cps/web.py:2250 cps/web.py:2272 cps/web.py:2276 cps/web.py:2281
-#: cps/web.py:2283
-msgid "register"
-msgstr "登録"
-
-#: cps/web.py:2271 cps/web.py:3389
-msgid "An unknown error occurred. Please try again later."
-msgstr "不明なエラーが発生しました。あとで再試行してください。"
-
-#: cps/web.py:2274
-msgid "Your e-mail is not allowed to register"
-msgstr "このメールアドレスは登録が許可されていません"
-
-#: cps/web.py:2277
-msgid "Confirmation e-mail was send to your e-mail account."
-msgstr "確認メールがこのメールアドレスに送信されました。"
-
-#: cps/web.py:2280
-msgid "This username or e-mail address is already in use."
-msgstr "このユーザ名またはメールアドレスはすでに使われています。"
-
-#: cps/web.py:2297 cps/web.py:2393
-#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
-msgstr "%(nickname)s としてログイン中"
-
-#: cps/web.py:2302
-msgid "Wrong Username or Password"
-msgstr "ユーザ名またはパスワードが違います"
-
-#: cps/web.py:2308 cps/web.py:2329
-msgid "login"
-msgstr "ログイン"
-
-#: cps/web.py:2341 cps/web.py:2372
-msgid "Token not found"
-msgstr "トークンが見つかりません"
-
-#: cps/web.py:2349 cps/web.py:2380
-msgid "Token has expired"
-msgstr "トークンが無効です"
-
-#: cps/web.py:2357
-msgid "Success! Please return to your device"
-msgstr "成功です！端末に戻ってください"
-
-#: cps/web.py:2407
-msgid "Please configure the SMTP mail settings first..."
-msgstr "初めにSMTPメールの設定をしてください"
-
-#: cps/web.py:2412
-#, python-format
-msgid "Book successfully queued for sending to %(kindlemail)s"
-msgstr "本の %(kindlemail)s への送信がキューに追加されました"
-
-#: cps/web.py:2416
-#, python-format
-msgid "There was an error sending this book: %(res)s"
-msgstr "%(res)s を送信中にエラーが発生しました"
-
-#: cps/web.py:2418 cps/web.py:3223
-msgid "Please configure your kindle e-mail address first..."
-msgstr "初めにKindleのメールアドレスを設定してください"
-
-#: cps/web.py:2429 cps/web.py:2481
-msgid "Invalid shelf specified"
-msgstr "指定された本棚は無効です"
-
-#: cps/web.py:2436
-#, python-format
-msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
-msgstr "申し訳ありませんが、あなたは %(shelfname)s に本を追加することが許可されていません"
-
-#: cps/web.py:2444
-msgid "You are not allowed to edit public shelves"
-msgstr "みんなの本棚を編集することが許可されていません"
-
-#: cps/web.py:2453
-#, python-format
-msgid "Book is already part of the shelf: %(shelfname)s"
-msgstr "この本は %(shelfname)s にすでに追加されています"
-
-#: cps/web.py:2467
-#, python-format
-msgid "Book has been added to shelf: %(sname)s"
-msgstr "本を %(sname)s に追加しました"
-
-#: cps/web.py:2486
-#, python-format
-msgid "You are not allowed to add a book to the the shelf: %(name)s"
-msgstr "%(name)s に本を追加することが許可されていません"
-
-#: cps/web.py:2491
-msgid "User is not allowed to edit public shelves"
-msgstr "みんなの本棚を編集することが許可されていません"
-
-#: cps/web.py:2509
-#, python-format
-msgid "Books are already part of the shelf: %(name)s"
-msgstr "これらの本は %(name)s にすでに追加されています"
-
-#: cps/web.py:2523
-#, python-format
-msgid "Books have been added to shelf: %(sname)s"
-msgstr "本が %(sname)s に追加されました"
-
-#: cps/web.py:2525
-#, python-format
-msgid "Could not add books to shelf: %(sname)s"
-msgstr "%(sname)s に本を追加できません"
-
-#: cps/web.py:2562
-#, python-format
-msgid "Book has been removed from shelf: %(sname)s"
-msgstr "本が %(sname)s から削除されました"
-
-#: cps/web.py:2568
-#, python-format
-msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
-msgstr "申し訳ありませんが、%(sname)s から本を削除することが許可されていません"
-
-#: cps/web.py:2589 cps/web.py:2613
-#, python-format
-msgid "A shelf with the name '%(title)s' already exists."
-msgstr "'%(title)s'は既に存在します"
-
-#: cps/web.py:2594
-#, python-format
-msgid "Shelf %(title)s created"
-msgstr "%(title)s を作成しました"
-
-#: cps/web.py:2596 cps/web.py:2624
-msgid "There was an error"
-msgstr "エラーが発生しました"
-
-#: cps/web.py:2597 cps/web.py:2599
-msgid "create a shelf"
-msgstr "本棚を作成する"
-
-#: cps/web.py:2622
-#, python-format
-msgid "Shelf %(title)s changed"
-msgstr "%(title)s を変更しました"
-
-#: cps/web.py:2625 cps/web.py:2627
-msgid "Edit a shelf"
-msgstr "本棚を編集する"
-
-#: cps/web.py:2648
-#, python-format
-msgid "successfully deleted shelf %(name)s"
-msgstr "%(name)s を削除しました"
-
-#: cps/web.py:2675
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "本棚: '%(name)s'"
-
-#: cps/web.py:2678
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "本棚を開けません。この本棚は存在しないかアクセスできません"
-
-#: cps/web.py:2709
-#, python-format
-msgid "Change order of Shelf: '%(name)s'"
-msgstr "'%(name)s' 内の本の順番を変更する"
-
-#: cps/web.py:2738 cps/web.py:3176
-msgid "E-mail is not from valid domain"
-msgstr "このメールは有効なドメインからのものではありません"
-
-#: cps/web.py:2740 cps/web.py:2782 cps/web.py:2785
-#, python-format
-msgid "%(name)s's profile"
-msgstr "%(name)s のプロフィール"
-
-#: cps/web.py:2780
-msgid "Found an existing account for this e-mail address."
-msgstr "このメールアドレスで登録されたアカウントがあります"
-
-#: cps/web.py:2783
-msgid "Profile updated"
-msgstr "プロフィールを更新しました"
-
-#: cps/web.py:2814
+#: cps/admin.py:139
 msgid "Admin page"
 msgstr "管理者ページ"
 
-#: cps/web.py:2899 cps/web.py:3079
+#: cps/admin.py:208 cps/admin.py:486
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web の設定を更新しました"
 
-#: cps/templates/admin.html:100 cps/web.py:2913
+#: cps/admin.py:222 cps/templates/admin.html:102
 msgid "UI Configuration"
 msgstr "UI設定"
 
-#: cps/web.py:2931
+#: cps/admin.py:295
 msgid "Import of optional Google Drive requirements missing"
 msgstr "Googleドライブ用のOptional Requirementsがインストールされていません"
 
-#: cps/web.py:2934
+#: cps/admin.py:298
 msgid "client_secrets.json is missing or not readable"
 msgstr "client_secrets.json が存在しないか読み込めません"
 
-#: cps/web.py:2939 cps/web.py:2968
+#: cps/admin.py:303 cps/admin.py:332
 msgid "client_secrets.json is not configured for web application"
 msgstr "client_secrets.json がWebアプリ用に設定されていません"
 
-#: cps/templates/admin.html:99 cps/web.py:2971 cps/web.py:2997 cps/web.py:3009
-#: cps/web.py:3054 cps/web.py:3069 cps/web.py:3088 cps/web.py:3096
-#: cps/web.py:3112
+#: cps/admin.py:335 cps/admin.py:361 cps/admin.py:373 cps/admin.py:398
+#: cps/admin.py:426 cps/admin.py:440 cps/admin.py:463 cps/admin.py:476
+#: cps/admin.py:494 cps/admin.py:501 cps/admin.py:516
+#: cps/templates/admin.html:101
 msgid "Basic Configuration"
 msgstr "基本設定"
 
-#: cps/web.py:2994
+#: cps/admin.py:358
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr "キーファイルが無効です。正しいパスを入力してください"
 
-#: cps/web.py:3006
+#: cps/admin.py:370
 msgid "Certfile location is not valid, please enter correct path"
 msgstr "証明書が無効です。正しいパスを入力してください"
 
-#: cps/web.py:3051
+#: cps/admin.py:395
+msgid "Please enter a LDAP provider and a DN"
+msgstr ""
+
+#: cps/admin.py:423
+msgid "Please enter Github oauth credentials"
+msgstr ""
+
+#: cps/admin.py:437
+msgid "Please enter Google oauth credentials"
+msgstr ""
+
+#: cps/admin.py:460
 msgid "Logfile location is not valid, please enter correct path"
 msgstr "ログファイルが無効です。正しいパスを入力してください"
 
-#: cps/web.py:3092
+#: cps/admin.py:498
 msgid "DB location is not valid, please enter correct path"
 msgstr "データベースが無効です。正しいパスを入力してください"
 
-#: cps/templates/admin.html:33 cps/web.py:3172 cps/web.py:3178 cps/web.py:3194
+#: cps/admin.py:558 cps/web.py:1045
+msgid "Please fill out all fields!"
+msgstr "全ての項目を入力してください"
+
+#: cps/admin.py:560 cps/admin.py:566 cps/admin.py:582
+#: cps/templates/admin.html:35
 msgid "Add new user"
 msgstr "新規ユーザ追加"
 
-#: cps/web.py:3184
+#: cps/admin.py:564 cps/web.py:1248
+msgid "E-mail is not from valid domain"
+msgstr "このメールは有効なドメインからのものではありません"
+
+#: cps/admin.py:572
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "ユーザ '%(user)s' を作成しました"
 
-#: cps/web.py:3188
+#: cps/admin.py:576
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "このメールアドレスかニックネームで登録されたアカウントが見つかりました"
 
-#: cps/web.py:3218
+#: cps/admin.py:607
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "テストメールが %(kindlemail)s に送信されました"
 
-#: cps/web.py:3221
+#: cps/admin.py:610
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "テストメールを %(res)s に送信中にエラーが発生しました"
 
-#: cps/web.py:3225
+#: cps/admin.py:612 cps/web.py:1029
+msgid "Please configure your kindle e-mail address first..."
+msgstr "初めにKindleのメールアドレスを設定してください"
+
+#: cps/admin.py:614
 msgid "E-mail server settings updated"
 msgstr "メールサーバの設定を更新しました"
 
-#: cps/web.py:3226
+#: cps/admin.py:615
 msgid "Edit e-mail server settings"
 msgstr "メールサーバの設定を編集"
 
-#: cps/web.py:3251
+#: cps/admin.py:640
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "ユーザ '%(nick)s' を削除しました"
 
-#: cps/web.py:3364
+#: cps/admin.py:711
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "ユーザ '%(nick)s' を更新しました"
 
-#: cps/web.py:3367
+#: cps/admin.py:714
 msgid "An unknown error occured."
 msgstr "不明なエラーが発生しました。"
 
-#: cps/web.py:3369
+#: cps/admin.py:717
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "%(nick)s を編集"
 
-#: cps/web.py:3386
+#: cps/admin.py:733
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "%(user)s 用のパスワードをリセット"
 
-#: cps/web.py:3400 cps/web.py:3592
+#: cps/admin.py:736 cps/web.py:1070
+msgid "An unknown error occurred. Please try again later."
+msgstr "不明なエラーが発生しました。あとで再試行してください。"
+
+#: cps/admin.py:755
+msgid "Requesting update package"
+msgstr "更新データを要求中"
+
+#: cps/admin.py:756
+msgid "Downloading update package"
+msgstr "更新データをダウンロード中"
+
+#: cps/admin.py:757
+msgid "Unzipping update package"
+msgstr "更新データを展開中"
+
+#: cps/admin.py:758
+msgid "Replacing files"
+msgstr "ファイルを置換中"
+
+#: cps/admin.py:759
+msgid "Database connections are closed"
+msgstr "データベースの接続を切断完了"
+
+#: cps/admin.py:760
+msgid "Stopping server"
+msgstr "サーバ停止中"
+
+#: cps/admin.py:761
+msgid "Update finished, please press okay and reload page"
+msgstr "アップデート完了、OKを押してページをリロードしてください"
+
+#: cps/admin.py:762 cps/admin.py:763 cps/admin.py:764 cps/admin.py:765
+msgid "Update failed:"
+msgstr "アップデート失敗:"
+
+#: cps/admin.py:762 cps/updater.py:277 cps/updater.py:456 cps/updater.py:458
+msgid "HTTP Error"
+msgstr "HTTPエラー"
+
+#: cps/admin.py:763 cps/updater.py:279 cps/updater.py:460
+msgid "Connection error"
+msgstr "接続エラー"
+
+#: cps/admin.py:764 cps/updater.py:281 cps/updater.py:462
+msgid "Timeout while establishing connection"
+msgstr "接続を確立中にタイムアウトしました"
+
+#: cps/admin.py:765 cps/updater.py:283 cps/updater.py:464
+msgid "General error"
+msgstr "エラー発生"
+
+#: cps/converter.py:31 cps/converter.py:48 cps/uploader.py:213
+#: cps/uploader.py:214 cps/uploader.py:218 cps/uploader.py:222
+#: cps/uploader.py:226
+msgid "not installed"
+msgstr "インストールされていません"
+
+#: cps/converter.py:43 cps/converter.py:60
+msgid "Excecution permissions missing"
+msgstr "実行許可がありません"
+
+#: cps/converter.py:70
+msgid "not configured"
+msgstr "未設定です"
+
+#: cps/editbooks.py:218 cps/editbooks.py:432
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "電子書籍を開けません。ファイルが存在しないかアクセスできません"
 
-#: cps/web.py:3428
+#: cps/editbooks.py:246
 msgid "edit metadata"
 msgstr "メタデータを編集"
 
-#: cps/web.py:3521 cps/web.py:3754
+#: cps/editbooks.py:325 cps/editbooks.py:595
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "ファイル拡張子 '%(ext)s' をこのサーバにアップロードすることは許可されていません"
 
-#: cps/web.py:3525 cps/web.py:3757
+#: cps/editbooks.py:329 cps/editbooks.py:599
 msgid "File to be uploaded must have an extension"
 msgstr "アップロードするファイルには拡張子が必要です"
 
-#: cps/web.py:3537 cps/web.py:3776
+#: cps/editbooks.py:341 cps/editbooks.py:619
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "%(path)s の作成に失敗しました (Permission denied)。"
 
-#: cps/web.py:3542
+#: cps/editbooks.py:346
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "%(file)s を保存できません。"
 
-#: cps/web.py:3559
+#: cps/editbooks.py:363
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "ファイル形式 %(ext)s が %(book)s に追加されました"
 
-#: cps/web.py:3573 cps/web.py:3646
+#: cps/editbooks.py:382
+#, python-format
+msgid "Failed to create path for cover %(path)s (Permission denied)."
+msgstr ""
+
+#: cps/editbooks.py:390
+#, python-format
+msgid "Failed to store cover-file %(cover)s."
+msgstr ""
+
+#: cps/editbooks.py:393
+msgid "Cover-file is not a valid image file"
+msgstr ""
+
+#: cps/editbooks.py:399 cps/editbooks.py:413
 msgid "Cover is not a supported imageformat (jpg/png/webp), can't save"
 msgstr ""
 
-#: cps/web.py:3605 cps/web.py:3614
+#: cps/editbooks.py:445 cps/editbooks.py:454
 msgid "unknown"
 msgstr "不明"
 
-#: cps/web.py:3694
+#: cps/editbooks.py:486
+msgid "Cover is not a jpg file, can't save"
+msgstr ""
+
+#: cps/editbooks.py:534
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s は有効な言語ではありません"
 
-#: cps/web.py:3725
+#: cps/editbooks.py:565
 msgid "Metadata successfully updated"
 msgstr "メタデータを更新しました"
 
-#: cps/web.py:3734
+#: cps/editbooks.py:574
 msgid "Error editing book, please check logfile for details"
 msgstr "本の編集でエラーが発生しました。詳細はログファイルを確認してください"
 
-#: cps/web.py:3780
+#: cps/editbooks.py:624
 #, python-format
 msgid "Failed to store file %(file)s (Permission denied)."
 msgstr "ファイル %(file)s の保存に失敗しました (Permission denied)。"
 
-#: cps/web.py:3785
+#: cps/editbooks.py:629
 #, python-format
 msgid "Failed to delete file %(file)s (Permission denied)."
 msgstr "ファイル %(file)s の削除に失敗しました (Permission denied)。"
 
-#: cps/web.py:3867
+#: cps/editbooks.py:712
 #, python-format
-msgid "File %(title)s"
-msgstr "ファイル %(title)s"
+msgid "File %(file)s uploaded"
+msgstr ""
 
-#: cps/web.py:3896
+#: cps/editbooks.py:741
 msgid "Source or destination format for conversion missing"
 msgstr "変換元の形式または変換後の形式が指定されていません"
 
-#: cps/web.py:3906
+#: cps/editbooks.py:751
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "本の %(book_format)s への変換がキューに追加されました"
 
-#: cps/web.py:3910
+#: cps/editbooks.py:755
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "この本の変換中にエラーが発生しました: %(res)s"
 
-#: cps/worker.py:305
+#: cps/gdrive.py:56
+msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
+msgstr "Googleドライブの設定が完了していません。Googleドライブを無効化してから再度有効にしてみてください"
+
+#: cps/gdrive.py:101
+msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
+msgstr "コールバックドメインが認証されていません。Google Developer Consoleでドメインを認証してください"
+
+#: cps/helper.py:97
+#, python-format
+msgid "%(format)s format not found for book id: %(book)d"
+msgstr "ID: %(book)d の本に %(format)s フォーマットはありません"
+
+#: cps/helper.py:109
+#, python-format
+msgid "%(format)s not found on Google Drive: %(fn)s"
+msgstr "Googleドライブ: %(fn)s に %(format)s はありません"
+
+#: cps/helper.py:116 cps/helper.py:223 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Kindleに送信"
+
+#: cps/helper.py:117 cps/helper.py:135 cps/helper.py:225
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "このメールはCalibre-Web経由で送信されました。"
+
+#: cps/helper.py:128
+#, python-format
+msgid "%(format)s not found: %(fn)s"
+msgstr "%(format)s がありません: %(fn)s"
+
+#: cps/helper.py:133
+msgid "Calibre-Web test e-mail"
+msgstr "Calibre-Web テストメール"
+
+#: cps/helper.py:134
+msgid "Test e-mail"
+msgstr "テストメール"
+
+#: cps/helper.py:150
+msgid "Get Started with Calibre-Web"
+msgstr "Calibre-Webを始める"
+
+#: cps/helper.py:151
+#, python-format
+msgid "Registration e-mail for user: %(name)s"
+msgstr "ユーザ: %(name)s 用の登録メール"
+
+#: cps/helper.py:165 cps/helper.py:167 cps/helper.py:169 cps/helper.py:177
+#: cps/helper.py:179 cps/helper.py:181
+#, python-format
+msgid "Send %(format)s to Kindle"
+msgstr "Kindleに %(format)s を送信"
+
+#: cps/helper.py:185
+#, python-format
+msgid "Convert %(orig)s to %(format)s and send to Kindle"
+msgstr "%(orig)s を %(format)s に変換してからKindleに送信"
+
+#: cps/helper.py:224
+#, python-format
+msgid "E-mail: %(book)s"
+msgstr "メール: %(book)s"
+
+#: cps/helper.py:227
+msgid "The requested file could not be read. Maybe wrong permissions?"
+msgstr "要求されたファイルを読み込めませんでした。権限設定が正しいか確認してください。"
+
+#: cps/helper.py:335
+#, python-format
+msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "エラー: %(error)s により、タイトルを %(src)s から %(dest)s に変更できませんでした。"
+
+#: cps/helper.py:345
+#, python-format
+msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "エラー: %(error)s により、著者名を %(src)s から %(dest)s に変更できませんでした。"
+
+#: cps/helper.py:359
+#, python-format
+msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "エラー: %(error)s により、ファイルパスを %(src)s から %(dest)s に変更できませんでした。"
+
+#: cps/helper.py:385 cps/helper.py:395 cps/helper.py:403
+#, python-format
+msgid "File %(file)s not found on Google Drive"
+msgstr "ファイル %(file)s はGoogleドライブ上にありません"
+
+#: cps/helper.py:424
+#, python-format
+msgid "Book path %(path)s not found on Google Drive"
+msgstr "本のパス %(path)s はGoogleドライブ上にありません"
+
+#: cps/helper.py:584
+msgid "Error excecuting UnRar"
+msgstr "rarファイルを展開中にエラーが発生しました"
+
+#: cps/helper.py:586
+msgid "Unrar binary file not found"
+msgstr "Unrarバイナリが見つかりません"
+
+#: cps/helper.py:614
+msgid "Waiting"
+msgstr "待機中"
+
+#: cps/helper.py:616
+msgid "Failed"
+msgstr "失敗"
+
+#: cps/helper.py:618
+msgid "Started"
+msgstr "開始"
+
+#: cps/helper.py:620
+msgid "Finished"
+msgstr "終了"
+
+#: cps/helper.py:622
+msgid "Unknown Status"
+msgstr "不明"
+
+#: cps/helper.py:627
+msgid "E-mail: "
+msgstr "メール: "
+
+#: cps/helper.py:629 cps/helper.py:633
+msgid "Convert: "
+msgstr "変換: "
+
+#: cps/helper.py:631
+msgid "Upload: "
+msgstr "アップロード: "
+
+#: cps/helper.py:635
+msgid "Unknown Task: "
+msgstr "不明なタスク: "
+
+#: cps/oauth_bb.py:87
+#, python-format
+msgid "Register with %s, "
+msgstr ""
+
+#: cps/oauth_bb.py:145
+msgid "Failed to log in with GitHub."
+msgstr ""
+
+#: cps/oauth_bb.py:150
+msgid "Failed to fetch user info from GitHub."
+msgstr ""
+
+#: cps/oauth_bb.py:161
+msgid "Failed to log in with Google."
+msgstr ""
+
+#: cps/oauth_bb.py:166
+msgid "Failed to fetch user info from Google."
+msgstr ""
+
+#: cps/oauth_bb.py:265
+#, python-format
+msgid "Unlink to %(oauth)s success."
+msgstr ""
+
+#: cps/oauth_bb.py:269
+#, python-format
+msgid "Unlink to %(oauth)s failed."
+msgstr ""
+
+#: cps/oauth_bb.py:272
+#, python-format
+msgid "Not linked to %(oauth)s."
+msgstr ""
+
+#: cps/oauth_bb.py:300
+msgid "GitHub Oauth error, please retry later."
+msgstr ""
+
+#: cps/oauth_bb.py:319
+msgid "Google Oauth error, please retry later."
+msgstr ""
+
+#: cps/shelf.py:40 cps/shelf.py:92
+msgid "Invalid shelf specified"
+msgstr "指定された本棚は無効です"
+
+#: cps/shelf.py:47
+#, python-format
+msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
+msgstr "申し訳ありませんが、あなたは %(shelfname)s に本を追加することが許可されていません"
+
+#: cps/shelf.py:55
+msgid "You are not allowed to edit public shelves"
+msgstr "みんなの本棚を編集することが許可されていません"
+
+#: cps/shelf.py:64
+#, python-format
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr "この本は %(shelfname)s にすでに追加されています"
+
+#: cps/shelf.py:78
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "本を %(sname)s に追加しました"
+
+#: cps/shelf.py:97
+#, python-format
+msgid "You are not allowed to add a book to the the shelf: %(name)s"
+msgstr "%(name)s に本を追加することが許可されていません"
+
+#: cps/shelf.py:102
+msgid "User is not allowed to edit public shelves"
+msgstr "みんなの本棚を編集することが許可されていません"
+
+#: cps/shelf.py:120
+#, python-format
+msgid "Books are already part of the shelf: %(name)s"
+msgstr "これらの本は %(name)s にすでに追加されています"
+
+#: cps/shelf.py:134
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr "本が %(sname)s に追加されました"
+
+#: cps/shelf.py:136
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr "%(sname)s に本を追加できません"
+
+#: cps/shelf.py:173
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "本が %(sname)s から削除されました"
+
+#: cps/shelf.py:179
+#, python-format
+msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
+msgstr "申し訳ありませんが、%(sname)s から本を削除することが許可されていません"
+
+#: cps/shelf.py:200 cps/shelf.py:224
+#, python-format
+msgid "A shelf with the name '%(title)s' already exists."
+msgstr "'%(title)s'は既に存在します"
+
+#: cps/shelf.py:205
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "%(title)s を作成しました"
+
+#: cps/shelf.py:207 cps/shelf.py:235
+msgid "There was an error"
+msgstr "エラーが発生しました"
+
+#: cps/shelf.py:208 cps/shelf.py:210
+msgid "create a shelf"
+msgstr "本棚を作成する"
+
+#: cps/shelf.py:233
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "%(title)s を変更しました"
+
+#: cps/shelf.py:236 cps/shelf.py:238
+msgid "Edit a shelf"
+msgstr "本棚を編集する"
+
+#: cps/shelf.py:259
+#, python-format
+msgid "successfully deleted shelf %(name)s"
+msgstr "%(name)s を削除しました"
+
+#: cps/shelf.py:289
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "本棚: '%(name)s'"
+
+#: cps/shelf.py:292
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "本棚を開けません。この本棚は存在しないかアクセスできません"
+
+#: cps/shelf.py:324
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "'%(name)s' 内の本の順番を変更する"
+
+#: cps/ub.py:111
+msgid "Recently Added"
+msgstr "最近追加した本"
+
+#: cps/ub.py:113
+msgid "Show recent books"
+msgstr "最近追加された本を表示"
+
+#: cps/templates/index.xml:17 cps/ub.py:114
+msgid "Hot Books"
+msgstr "人気の本"
+
+#: cps/ub.py:115
+msgid "Show hot books"
+msgstr "人気な本を表示"
+
+#: cps/templates/index.xml:24 cps/ub.py:118
+msgid "Best rated Books"
+msgstr "高評価の本"
+
+#: cps/ub.py:120
+msgid "Show best rated books"
+msgstr "評価が高い本を表示"
+
+#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:121
+#: cps/web.py:965
+msgid "Read Books"
+msgstr "読んだ本"
+
+#: cps/ub.py:123
+msgid "Show read and unread"
+msgstr "既読の本と未読の本を表示"
+
+#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:125
+#: cps/web.py:969
+msgid "Unread Books"
+msgstr "未読の本"
+
+#: cps/ub.py:127
+msgid "Show unread"
+msgstr ""
+
+#: cps/ub.py:128
+msgid "Discover"
+msgstr "見つける"
+
+#: cps/ub.py:130
+msgid "Show random books"
+msgstr "ランダムで本を表示"
+
+#: cps/ub.py:131
+msgid "Categories"
+msgstr "カテゴリ"
+
+#: cps/ub.py:133
+msgid "Show category selection"
+msgstr "カテゴリ選択を表示"
+
+#: cps/templates/book_edit.html:71 cps/templates/search_form.html:53
+#: cps/ub.py:134
+msgid "Series"
+msgstr "シリーズ"
+
+#: cps/ub.py:136
+msgid "Show series selection"
+msgstr "シリーズ選択を表示"
+
+#: cps/templates/index.xml:61 cps/ub.py:137
+msgid "Authors"
+msgstr "著者"
+
+#: cps/ub.py:139
+msgid "Show author selection"
+msgstr "著者選択を表示"
+
+#: cps/templates/index.xml:68 cps/ub.py:141
+msgid "Publishers"
+msgstr "出版社"
+
+#: cps/ub.py:143
+msgid "Show publisher selection"
+msgstr "出版社選択を表示"
+
+#: cps/templates/search_form.html:74 cps/ub.py:144
+msgid "Languages"
+msgstr "言語"
+
+#: cps/ub.py:147
+msgid "Show language selection"
+msgstr "言語選択を表示"
+
+#: cps/ub.py:148
+msgid "Ratings"
+msgstr ""
+
+#: cps/ub.py:150
+msgid "Show ratings selection"
+msgstr ""
+
+#: cps/ub.py:151
+msgid "File formats"
+msgstr ""
+
+#: cps/ub.py:153
+msgid "Show file formats selection"
+msgstr ""
+
+#: cps/updater.py:257 cps/updater.py:364 cps/updater.py:377
+msgid "Unexpected data while reading update information"
+msgstr "アップデート情報を読み込み中に予期しないデータが見つかりました"
+
+#: cps/updater.py:264 cps/updater.py:370
+msgid "No update available. You already have the latest version installed"
+msgstr "アップデートはありません。すでに最新バージョンがインストールされています"
+
+#: cps/updater.py:290 cps/updater.py:422
+msgid "A new update is available. Click on the button below to update to the latest version."
+msgstr "アップデートが利用可能です。下のボタンをクリックして最新バージョンにアップデートしてください。"
+
+#: cps/updater.py:343
+msgid "Could not fetch update information"
+msgstr "アップデート情報を取得できません"
+
+#: cps/updater.py:357
+msgid "No release information available"
+msgstr "リリース情報がありません"
+
+#: cps/updater.py:403 cps/updater.py:412
+#, python-format
+msgid "A new update is available. Click on the button below to update to version: %(version)s"
+msgstr "アップデートが利用可能です。下のボタンをクリックしてバージョン: %(version)s にアップデートしてください。"
+
+#: cps/web.py:457
+msgid "Recently Added Books"
+msgstr "最近追加された本"
+
+#: cps/web.py:484
+msgid "Best rated books"
+msgstr "高評価"
+
+#: cps/templates/index.xml:38 cps/web.py:492
+msgid "Random Books"
+msgstr "ランダム"
+
+#: cps/web.py:516
+msgid "Books"
+msgstr ""
+
+#: cps/web.py:543
+msgid "Hot Books (most downloaded)"
+msgstr "話題(ダウンロード数順)"
+
+#: cps/web.py:553 cps/web.py:1294 cps/web.py:1383
+msgid "Error opening eBook. File does not exist or file is not accessible:"
+msgstr "電子書籍を開けません。ファイルが存在しないかアクセスできません:"
+
+#: cps/web.py:580
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr "出版社: %(name)s"
+
+#: cps/web.py:591
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "シリーズ: %(serie)s"
+
+#: cps/web.py:602
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr ""
+
+#: cps/web.py:613
+#, python-format
+msgid "File format: %(format)s"
+msgstr ""
+
+#: cps/web.py:625
+#, python-format
+msgid "Category: %(name)s"
+msgstr "カテゴリ: %(name)s"
+
+#: cps/web.py:659
+msgid "Publisher list"
+msgstr "出版社一覧"
+
+#: cps/templates/index.xml:82 cps/web.py:675
+msgid "Series list"
+msgstr "シリーズ一覧"
+
+#: cps/web.py:689
+msgid "Ratings list"
+msgstr ""
+
+#: cps/web.py:702
+msgid "File formats list"
+msgstr ""
+
+#: cps/web.py:730
+msgid "Available languages"
+msgstr "言語"
+
+#: cps/web.py:750
+#, python-format
+msgid "Language: %(name)s"
+msgstr "言語: %(name)s"
+
+#: cps/templates/index.xml:75 cps/web.py:764
+msgid "Category list"
+msgstr "カテゴリ一覧"
+
+#: cps/templates/layout.html:73 cps/web.py:777
+msgid "Tasks"
+msgstr "タスク"
+
+#: cps/web.py:841
+msgid "Published after "
+msgstr "これ以降に出版 "
+
+#: cps/web.py:848
+msgid "Published before "
+msgstr "これ以前に出版 "
+
+#: cps/web.py:862
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "評価 <= %(rating)s"
+
+#: cps/web.py:864
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "評価 >= %(rating)s"
+
+#: cps/web.py:924 cps/web.py:933
+msgid "search"
+msgstr "検索"
+
+#: cps/web.py:1018
+msgid "Please configure the SMTP mail settings first..."
+msgstr "初めにSMTPメールの設定をしてください"
+
+#: cps/web.py:1023
+#, python-format
+msgid "Book successfully queued for sending to %(kindlemail)s"
+msgstr "本の %(kindlemail)s への送信がキューに追加されました"
+
+#: cps/web.py:1027
+#, python-format
+msgid "There was an error sending this book: %(res)s"
+msgstr "%(res)s を送信中にエラーが発生しました"
+
+#: cps/web.py:1046 cps/web.py:1071 cps/web.py:1076 cps/web.py:1081
+#: cps/web.py:1085
+msgid "register"
+msgstr "登録"
+
+#: cps/web.py:1073
+msgid "Your e-mail is not allowed to register"
+msgstr "このメールアドレスは登録が許可されていません"
+
+#: cps/web.py:1077
+msgid "Confirmation e-mail was send to your e-mail account."
+msgstr "確認メールがこのメールアドレスに送信されました。"
+
+#: cps/web.py:1080
+msgid "This username or e-mail address is already in use."
+msgstr "このユーザ名またはメールアドレスはすでに使われています。"
+
+#: cps/web.py:1103 cps/web.py:1115
+#, python-format
+msgid "You are now logged in as: '%(nickname)s'"
+msgstr ""
+
+#: cps/web.py:1108 cps/web.py:1120
+msgid "Wrong Username or Password"
+msgstr "ユーザ名またはパスワードが違います"
+
+#: cps/web.py:1111
+msgid "Could not login. LDAP server down, please contact your administrator"
+msgstr ""
+
+#: cps/web.py:1124 cps/web.py:1146
+msgid "login"
+msgstr "ログイン"
+
+#: cps/web.py:1158 cps/web.py:1189
+msgid "Token not found"
+msgstr "トークンが見つかりません"
+
+#: cps/web.py:1166 cps/web.py:1197
+msgid "Token has expired"
+msgstr "トークンが無効です"
+
+#: cps/web.py:1174
+msgid "Success! Please return to your device"
+msgstr "成功です！端末に戻ってください"
+
+#: cps/web.py:1210
+#, python-format
+msgid "you are now logged in as: '%(nickname)s'"
+msgstr "%(nickname)s としてログイン中"
+
+#: cps/web.py:1250 cps/web.py:1277 cps/web.py:1281
+#, python-format
+msgid "%(name)s's profile"
+msgstr "%(name)s のプロフィール"
+
+#: cps/web.py:1274
+msgid "Found an existing account for this e-mail address."
+msgstr "このメールアドレスで登録されたアカウントがあります"
+
+#: cps/web.py:1279
+msgid "Profile updated"
+msgstr "プロフィールを更新しました"
+
+#: cps/web.py:1304 cps/web.py:1306 cps/web.py:1308 cps/web.py:1314
+#: cps/web.py:1318
+msgid "Read a Book"
+msgstr "本を読む"
+
+#: cps/web.py:1328
+msgid "Error opening eBook. File does not exist or file is not accessible."
+msgstr ""
+
+#: cps/worker.py:308
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Ebook-converter が失敗しました: %(error)s"
 
-#: cps/worker.py:316
+#: cps/worker.py:319
 #, python-format
 msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "Kindlegen が失敗しました。エラー: %(error)s, メッセージ: %(message)s"
@@ -780,147 +969,152 @@ msgstr "DLS"
 msgid "Admin"
 msgstr "管理者"
 
-#: cps/templates/admin.html:14 cps/templates/detail.html:22
-#: cps/templates/detail.html:31
+#: cps/templates/admin.html:14 cps/templates/detail.html:18
+#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/shelfdown.html:62
 msgid "Download"
 msgstr "ダウンロード"
 
-#: cps/templates/admin.html:15 cps/templates/layout.html:65
+#: cps/templates/admin.html:15
+msgid "View Ebooks"
+msgstr ""
+
+#: cps/templates/admin.html:16 cps/templates/layout.html:65
 msgid "Upload"
 msgstr "アップロード"
 
-#: cps/templates/admin.html:16
+#: cps/templates/admin.html:17
 msgid "Edit"
 msgstr "編集"
 
-#: cps/templates/admin.html:39
+#: cps/templates/admin.html:41
 msgid "SMTP e-mail server settings"
 msgstr "SMTPメールサーバ設定"
 
-#: cps/templates/admin.html:42 cps/templates/email_edit.html:11
+#: cps/templates/admin.html:44 cps/templates/email_edit.html:11
 msgid "SMTP hostname"
 msgstr "SMTPホスト名"
 
-#: cps/templates/admin.html:43
+#: cps/templates/admin.html:45
 msgid "SMTP port"
 msgstr "SMTPポート"
 
-#: cps/templates/admin.html:44
+#: cps/templates/admin.html:46
 msgid "SSL"
 msgstr "SSL"
 
-#: cps/templates/admin.html:45 cps/templates/email_edit.html:27
+#: cps/templates/admin.html:47 cps/templates/email_edit.html:27
 msgid "SMTP login"
 msgstr "SMTPログイン"
 
-#: cps/templates/admin.html:46
+#: cps/templates/admin.html:48
 msgid "From mail"
 msgstr "メールから"
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:58
 msgid "Change SMTP settings"
 msgstr "SMTP設定を変更"
 
-#: cps/templates/admin.html:62
+#: cps/templates/admin.html:64
 msgid "Configuration"
 msgstr "設定"
 
-#: cps/templates/admin.html:65
+#: cps/templates/admin.html:67
 msgid "Calibre DB dir"
 msgstr "Calibreデータベースのあるフォルダ"
 
-#: cps/templates/admin.html:69
+#: cps/templates/admin.html:71
 msgid "Log level"
 msgstr "ログレベル"
 
-#: cps/templates/admin.html:73
+#: cps/templates/admin.html:75
 msgid "Port"
 msgstr "ポート番号"
 
-#: cps/templates/admin.html:79 cps/templates/config_view_edit.html:23
+#: cps/templates/admin.html:81 cps/templates/config_view_edit.html:23
 msgid "Books per page"
 msgstr "1ページに表示する本の冊数"
 
-#: cps/templates/admin.html:83
+#: cps/templates/admin.html:85
 msgid "Uploading"
 msgstr "アップロード機能"
 
-#: cps/templates/admin.html:87
+#: cps/templates/admin.html:89
 msgid "Anonymous browsing"
 msgstr "匿名で閲覧"
 
-#: cps/templates/admin.html:91
+#: cps/templates/admin.html:93
 msgid "Public registration"
 msgstr "誰でも新規登録可能"
 
-#: cps/templates/admin.html:95 cps/templates/remote_login.html:4
+#: cps/templates/admin.html:97 cps/templates/remote_login.html:4
 msgid "Remote login"
 msgstr "リモートログイン"
 
-#: cps/templates/admin.html:106
+#: cps/templates/admin.html:108
 msgid "Administration"
 msgstr "管理"
 
-#: cps/templates/admin.html:107
+#: cps/templates/admin.html:109
 msgid "Reconnect to Calibre DB"
 msgstr "Calibreデータベースに再接続"
 
-#: cps/templates/admin.html:108
+#: cps/templates/admin.html:110
 msgid "Restart Calibre-Web"
 msgstr "Calibre-Webを再起動"
 
-#: cps/templates/admin.html:109
+#: cps/templates/admin.html:111
 msgid "Stop Calibre-Web"
 msgstr "Calibre-Webを停止"
 
-#: cps/templates/admin.html:115
+#: cps/templates/admin.html:117
 msgid "Update"
 msgstr "アップデート"
 
-#: cps/templates/admin.html:119
+#: cps/templates/admin.html:121
 msgid "Version"
 msgstr "バージョン"
 
-#: cps/templates/admin.html:120
+#: cps/templates/admin.html:122
 msgid "Details"
 msgstr "詳細"
 
-#: cps/templates/admin.html:126
+#: cps/templates/admin.html:128
 msgid "Current version"
 msgstr "現在のバージョン"
 
-#: cps/templates/admin.html:132
+#: cps/templates/admin.html:134
 msgid "Check for update"
 msgstr "更新を確認"
 
-#: cps/templates/admin.html:133
+#: cps/templates/admin.html:135
 msgid "Perform Update"
 msgstr "更新を実行"
 
-#: cps/templates/admin.html:145
+#: cps/templates/admin.html:147
 msgid "Do you really want to restart Calibre-Web?"
 msgstr "Calibre-Webを再起動します。よろしいですか？"
 
-#: cps/templates/admin.html:150 cps/templates/admin.html:164
-#: cps/templates/admin.html:184 cps/templates/shelf.html:73
+#: cps/templates/admin.html:152 cps/templates/admin.html:166
+#: cps/templates/admin.html:186 cps/templates/shelf.html:72
 msgid "Ok"
 msgstr "はい"
 
-#: cps/templates/admin.html:151 cps/templates/admin.html:165
-#: cps/templates/book_edit.html:178 cps/templates/book_edit.html:200
-#: cps/templates/config_edit.html:226 cps/templates/config_view_edit.html:179
-#: cps/templates/email_edit.html:40 cps/templates/email_edit.html:75
-#: cps/templates/layout.html:28 cps/templates/shelf.html:74
+#: cps/templates/admin.html:153 cps/templates/admin.html:167
+#: cps/templates/book_edit.html:174 cps/templates/book_edit.html:196
+#: cps/templates/config_edit.html:281 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/user_edit.html:149
+#: cps/templates/user_edit.html:132
 msgid "Back"
 msgstr "戻る"
 
-#: cps/templates/admin.html:163
+#: cps/templates/admin.html:165
 msgid "Do you really want to stop Calibre-Web?"
 msgstr "Calibre-Webを停止します。よろしいですか?"
 
-#: cps/templates/admin.html:175
+#: cps/templates/admin.html:177
 msgid "Updating, please do not reload page"
 msgstr "更新中です。ページ再読み込みしないでください"
 
@@ -932,176 +1126,176 @@ msgstr "経由"
 msgid "In Library"
 msgstr "ライブラリ内"
 
-#: cps/templates/author.html:50 cps/templates/author.html:97
-#: cps/templates/discover.html:28 cps/templates/index.html:31
-#: cps/templates/index.html:86 cps/templates/search.html:55
-#: cps/templates/shelf.html:37
+#: cps/templates/author.html:34 cps/templates/list.html:14
+#: cps/templates/search.html:41
+msgid "All"
+msgstr ""
+
+#: cps/templates/author.html:58 cps/templates/author.html:105
+#: 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 "減らす"
 
-#: cps/templates/author.html:81
+#: cps/templates/author.html:89
 msgid "More by"
 msgstr ""
 
-#: cps/templates/book_edit.html:16
+#: cps/templates/book_edit.html:12
 msgid "Delete Book"
 msgstr "本を削除"
 
-#: cps/templates/book_edit.html:19
+#: cps/templates/book_edit.html:15
 msgid "Delete formats:"
 msgstr "削除する形式:"
 
-#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:199
-#: cps/templates/email_edit.html:73 cps/templates/email_edit.html:74
+#: cps/templates/book_edit.html:18 cps/templates/book_edit.html:195
+#: cps/templates/email_edit.html:73
 msgid "Delete"
 msgstr "削除"
 
-#: cps/templates/book_edit.html:30
+#: cps/templates/book_edit.html:26
 msgid "Convert book format:"
 msgstr "変換する形式:"
 
-#: cps/templates/book_edit.html:34
+#: cps/templates/book_edit.html:30
 msgid "Convert from:"
 msgstr "変換元:"
 
-#: cps/templates/book_edit.html:36 cps/templates/book_edit.html:43
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
 msgstr "選択肢を選ぶ"
 
-#: cps/templates/book_edit.html:41
+#: cps/templates/book_edit.html:37
 msgid "Convert to:"
 msgstr "変換先:"
 
-#: cps/templates/book_edit.html:50
+#: cps/templates/book_edit.html:46
 msgid "Convert book"
 msgstr "本を変換"
 
-#: cps/templates/book_edit.html:59 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:55 cps/templates/search_form.html:6
 msgid "Book Title"
 msgstr "本のタイトル"
 
-#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:259
-#: cps/templates/book_edit.html:277 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:59 cps/templates/book_edit.html:255
+#: cps/templates/book_edit.html:273 cps/templates/search_form.html:10
 msgid "Author"
 msgstr "著者"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:264
-#: cps/templates/book_edit.html:279 cps/templates/search_form.html:106
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:260
+#: cps/templates/book_edit.html:275 cps/templates/search_form.html:106
 msgid "Description"
 msgstr "詳細"
 
-#: cps/templates/book_edit.html:71 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:67 cps/templates/search_form.html:33
 msgid "Tags"
 msgstr "タグ"
 
-#: cps/templates/book_edit.html:75 cps/templates/layout.html:159
-#: cps/templates/search_form.html:53
-msgid "Series"
-msgstr "シリーズ"
-
-#: cps/templates/book_edit.html:79
+#: cps/templates/book_edit.html:75
 msgid "Series id"
 msgstr "シリーズID"
 
-#: cps/templates/book_edit.html:83
+#: cps/templates/book_edit.html:79
 msgid "Rating"
 msgstr "評価"
 
-#: cps/templates/book_edit.html:87
+#: cps/templates/book_edit.html:83
 msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
 msgstr "カバー画像のURL (カバー画像はjpg形式でダウンロードしてデータベースに保存され、ここは再度空欄になります)"
 
-#: cps/templates/book_edit.html:91
+#: cps/templates/book_edit.html:87
 msgid "Upload Cover from local drive"
 msgstr "カバー画像をローカルからアップロード"
 
-#: cps/templates/book_edit.html:96 cps/templates/detail.html:148
+#: cps/templates/book_edit.html:92 cps/templates/detail.html:168
 msgid "Publishing date"
 msgstr "発行日"
 
-#: cps/templates/book_edit.html:103 cps/templates/book_edit.html:261
-#: cps/templates/book_edit.html:278 cps/templates/detail.html:139
+#: cps/templates/book_edit.html:99 cps/templates/book_edit.html:257
+#: cps/templates/book_edit.html:274 cps/templates/detail.html:159
 #: cps/templates/search_form.html:14
 msgid "Publisher"
 msgstr "出版社"
 
-#: cps/templates/book_edit.html:107 cps/templates/user_edit.html:31
+#: cps/templates/book_edit.html:103 cps/templates/user_edit.html:31
 msgid "Language"
 msgstr "言語"
 
-#: cps/templates/book_edit.html:117 cps/templates/search_form.html:117
+#: cps/templates/book_edit.html:113 cps/templates/search_form.html:117
 msgid "Yes"
 msgstr "はい"
 
-#: cps/templates/book_edit.html:118 cps/templates/search_form.html:118
+#: cps/templates/book_edit.html:114 cps/templates/search_form.html:118
 msgid "No"
 msgstr "いいえ"
 
-#: cps/templates/book_edit.html:164
+#: cps/templates/book_edit.html:160
 msgid "Upload format"
 msgstr "アップロードする形式"
 
-#: cps/templates/book_edit.html:173
+#: cps/templates/book_edit.html:169
 msgid "view book after edit"
 msgstr "編集後に本を表示"
 
-#: cps/templates/book_edit.html:176 cps/templates/book_edit.html:212
+#: cps/templates/book_edit.html:172 cps/templates/book_edit.html:208
 msgid "Get metadata"
 msgstr "メタデータを取得"
 
-#: cps/templates/book_edit.html:177 cps/templates/config_edit.html:224
-#: cps/templates/config_view_edit.html:178 cps/templates/login.html:20
+#: cps/templates/book_edit.html:173 cps/templates/config_edit.html:279
+#: cps/templates/config_view_edit.html:146 cps/templates/login.html:20
 #: cps/templates/search_form.html:150 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:147
+#: cps/templates/user_edit.html:130
 msgid "Submit"
 msgstr "決定"
 
-#: cps/templates/book_edit.html:191
+#: cps/templates/book_edit.html:187
 msgid "Are you really sure?"
 msgstr "よろしいですか?"
 
-#: cps/templates/book_edit.html:194
+#: cps/templates/book_edit.html:190
 msgid "Book will be deleted from Calibre database"
 msgstr "この本はCalibreデータベースから削除されます"
 
-#: cps/templates/book_edit.html:195
+#: cps/templates/book_edit.html:191
 msgid "and from hard disk"
 msgstr ""
 
-#: cps/templates/book_edit.html:215
+#: cps/templates/book_edit.html:211
 msgid "Keyword"
 msgstr "キーワード"
 
-#: cps/templates/book_edit.html:216
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr "キーワードを検索"
 
-#: cps/templates/book_edit.html:218 cps/templates/layout.html:47
+#: cps/templates/book_edit.html:214 cps/templates/layout.html:47
 msgid "Go!"
 msgstr "決定"
 
-#: cps/templates/book_edit.html:222
+#: cps/templates/book_edit.html:218
 msgid "Click the cover to load metadata to the form"
 msgstr "カバー画像をクリックしてメタデータをフォームに読み込んでください"
 
-#: cps/templates/book_edit.html:234 cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:230 cps/templates/book_edit.html:270
 msgid "Loading..."
 msgstr "読み込み中..."
 
-#: cps/templates/book_edit.html:239 cps/templates/layout.html:226
-#: cps/templates/layout.html:258
+#: cps/templates/book_edit.html:235 cps/templates/layout.html:187
+#: cps/templates/layout.html:219
 msgid "Close"
 msgstr "閉じる"
 
-#: cps/templates/book_edit.html:266 cps/templates/book_edit.html:280
+#: cps/templates/book_edit.html:262 cps/templates/book_edit.html:276
 msgid "Source"
 msgstr "ソース"
 
-#: cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:271
 msgid "Search error!"
 msgstr "検索エラー"
 
-#: cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:272
 msgid "No Result(s) found! Please try aonther keyword."
 msgstr "検索結果が見つかりません。別のキーワードで検索してみてください。"
 
@@ -1229,35 +1423,87 @@ msgstr "GoodreadsのAPIキー"
 msgid "Goodreads API Secret"
 msgstr "GoodreadsのAPIシークレット"
 
-#: cps/templates/config_edit.html:187
+#: cps/templates/config_edit.html:181
+msgid "Login type"
+msgstr ""
+
+#: cps/templates/config_edit.html:183
+msgid "Use standard Authentication"
+msgstr ""
+
+#: cps/templates/config_edit.html:185
+msgid "Use LDAP Authentication"
+msgstr ""
+
+#: cps/templates/config_edit.html:188
+msgid "Use GitHub OAuth"
+msgstr ""
+
+#: cps/templates/config_edit.html:189
+msgid "Use Google OAuth"
+msgstr ""
+
+#: cps/templates/config_edit.html:196
+msgid "LDAP Provider URL"
+msgstr ""
+
+#: cps/templates/config_edit.html:200
+msgid "LDAP Distinguished Name (DN)"
+msgstr ""
+
+#: cps/templates/config_edit.html:208
+msgid "Obtain GitHub OAuth Credential"
+msgstr ""
+
+#: cps/templates/config_edit.html:211
+msgid "GitHub OAuth Client Id"
+msgstr ""
+
+#: cps/templates/config_edit.html:215
+msgid "GitHub OAuth Client Secret"
+msgstr ""
+
+#: cps/templates/config_edit.html:221
+msgid "Obtain Google OAuth Credential"
+msgstr ""
+
+#: cps/templates/config_edit.html:224
+msgid "Google OAuth Client Id"
+msgstr ""
+
+#: cps/templates/config_edit.html:228
+msgid "Google OAuth Client Secret"
+msgstr ""
+
+#: cps/templates/config_edit.html:242
 msgid "External binaries"
 msgstr "外部バイナリ"
 
-#: cps/templates/config_edit.html:195
+#: cps/templates/config_edit.html:250
 msgid "No converter"
 msgstr "変換ソフトなし"
 
-#: cps/templates/config_edit.html:197
+#: cps/templates/config_edit.html:252
 msgid "Use Kindlegen"
 msgstr "Kindlegenを使う"
 
-#: cps/templates/config_edit.html:199
+#: cps/templates/config_edit.html:254
 msgid "Use calibre's ebook converter"
 msgstr "calibreのebook converterを使う"
 
-#: cps/templates/config_edit.html:203
+#: cps/templates/config_edit.html:258
 msgid "E-Book converter settings"
 msgstr "E-Book converterの設定"
 
-#: cps/templates/config_edit.html:207
+#: cps/templates/config_edit.html:262
 msgid "Path to convertertool"
 msgstr "convertertoolのパス"
 
-#: cps/templates/config_edit.html:213
+#: cps/templates/config_edit.html:268
 msgid "Location of Unrar binary"
 msgstr "Unrarバイナリのパス"
 
-#: cps/templates/config_edit.html:229 cps/templates/layout.html:84
+#: cps/templates/config_edit.html:284 cps/templates/layout.html:84
 #: cps/templates/login.html:4
 msgid "Login"
 msgstr "ログイン"
@@ -1266,8 +1512,7 @@ msgstr "ログイン"
 msgid "View Configuration"
 msgstr "表示設定"
 
-#: cps/templates/config_view_edit.html:19 cps/templates/layout.html:135
-#: cps/templates/layout.html:136 cps/templates/shelf_edit.html:7
+#: cps/templates/config_view_edit.html:19 cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr "タイトル"
 
@@ -1279,7 +1524,7 @@ msgstr "ランダムで表示する本の冊数"
 msgid "No. of authors to show before hiding (0=disable hiding)"
 msgstr "非表示にする前に表示する著者の人数 (0の場合は常に表示)"
 
-#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:118
+#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:112
 msgid "Theme"
 msgstr "テーマ"
 
@@ -1311,127 +1556,91 @@ msgstr "成人向けのタグ"
 msgid "Default settings for new users"
 msgstr "新規ユーザのデフォルト設定"
 
-#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:104
+#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:83
 msgid "Admin user"
 msgstr "管理者ユーザ"
 
-#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:113
+#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:92
 msgid "Allow Downloads"
 msgstr "ダウンロードを許可"
 
-#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:117
+#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:96
+msgid "Allow book viewer"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:100
 msgid "Allow Uploads"
 msgstr "アップロードを許可"
 
-#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:121
+#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:104
 msgid "Allow Edit"
 msgstr "編集を許可"
 
-#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:125
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:108
 msgid "Allow Delete books"
 msgstr "本の削除を許可"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:130
+#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:113
 msgid "Allow Changing Password"
 msgstr "パスワード変更を許可"
 
-#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:134
+#: cps/templates/config_view_edit.html:109 cps/templates/user_edit.html:117
 msgid "Allow Editing Public Shelfs"
 msgstr "みんなの本棚の編集を許可"
 
-#: cps/templates/config_view_edit.html:115
+#: cps/templates/config_view_edit.html:119
 msgid "Default visibilities for new users"
 msgstr "新規ユーザのデフォルト表示設定"
 
-#: cps/templates/config_view_edit.html:123 cps/templates/user_edit.html:50
-msgid "Show random books"
-msgstr "ランダムで本を表示"
-
-#: cps/templates/config_view_edit.html:127 cps/templates/user_edit.html:54
-msgid "Show recent books"
-msgstr "最近追加された本を表示"
-
-#: cps/templates/config_view_edit.html:131 cps/templates/user_edit.html:58
-msgid "Show sorted books"
-msgstr "ソートされた本を表示"
-
-#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:62
-msgid "Show hot books"
-msgstr "人気な本を表示"
-
-#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:66
-msgid "Show best rated books"
-msgstr "評価が高い本を表示"
-
-#: cps/templates/config_view_edit.html:143 cps/templates/user_edit.html:70
-msgid "Show language selection"
-msgstr "言語選択を表示"
-
-#: cps/templates/config_view_edit.html:147 cps/templates/user_edit.html:74
-msgid "Show series selection"
-msgstr "シリーズ選択を表示"
-
-#: cps/templates/config_view_edit.html:151 cps/templates/user_edit.html:78
-msgid "Show category selection"
-msgstr "カテゴリ選択を表示"
-
-#: cps/templates/config_view_edit.html:155 cps/templates/user_edit.html:82
-msgid "Show author selection"
-msgstr "著者選択を表示"
-
-#: cps/templates/config_view_edit.html:159 cps/templates/user_edit.html:86
-msgid "Show publisher selection"
-msgstr "出版社選択を表示"
-
-#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:91
-msgid "Show read and unread"
-msgstr "既読の本と未読の本を表示"
-
-#: cps/templates/config_view_edit.html:167 cps/templates/user_edit.html:96
+#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:75
 msgid "Show random books in detail view"
 msgstr "詳細画面でランダムで本を表示"
 
-#: cps/templates/config_view_edit.html:171 cps/templates/user_edit.html:109
+#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:88
 msgid "Show mature content"
 msgstr "成人向けコンテンツを表示"
 
-#: cps/templates/detail.html:63
+#: cps/templates/detail.html:59
 msgid "Read in browser"
 msgstr "ブラウザで読む"
 
-#: cps/templates/detail.html:100
+#: cps/templates/detail.html:73
+msgid "Listen in browser"
+msgstr ""
+
+#: cps/templates/detail.html:120
 msgid "Book"
 msgstr "本"
 
-#: cps/templates/detail.html:100
+#: cps/templates/detail.html:120
 msgid "of"
 msgstr "の"
 
-#: cps/templates/detail.html:106
+#: cps/templates/detail.html:126
 msgid "language"
 msgstr "言語"
 
-#: cps/templates/detail.html:185
+#: cps/templates/detail.html:203
 msgid "Mark As Unread"
 msgstr "未読に設定"
 
-#: cps/templates/detail.html:185
+#: cps/templates/detail.html:203
 msgid "Mark As Read"
 msgstr "既読に設定"
 
-#: cps/templates/detail.html:186
+#: cps/templates/detail.html:204
 msgid "Read"
 msgstr "読んだ"
 
-#: cps/templates/detail.html:196
+#: cps/templates/detail.html:214 cps/templates/listenmp3.html:54
 msgid "Description:"
 msgstr "詳細:"
 
-#: cps/templates/detail.html:209 cps/templates/search.html:14
+#: cps/templates/detail.html:227 cps/templates/search.html:14
 msgid "Add to shelf"
 msgstr "本棚に追加"
 
-#: cps/templates/detail.html:271
+#: cps/templates/detail.html:289
 msgid "Edit metadata"
 msgstr "メタデータを編集"
 
@@ -1491,12 +1700,12 @@ msgstr "追加"
 msgid "Do you really want to delete this domain rule?"
 msgstr "このドメインルールを削除してもよろしいですか？"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:210
+#: cps/templates/feed.xml:21 cps/templates/layout.html:171
 msgid "Next"
 msgstr "次"
 
-#: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:44 cps/templates/layout.html:45
+#: cps/templates/feed.xml:33 cps/templates/layout.html:44
+#: cps/templates/layout.html:45
 msgid "Search"
 msgstr "検索"
 
@@ -1508,75 +1717,63 @@ msgstr "ホームに戻る"
 msgid "Discover (Random Books)"
 msgstr "本を見つける (ランダムで表示)"
 
+#: cps/templates/index.html:65
+msgid "Group by series"
+msgstr ""
+
 #: cps/templates/index.xml:6
 msgid "Start"
 msgstr "開始"
 
-#: cps/templates/index.xml:18 cps/templates/layout.html:141
-msgid "Hot Books"
-msgstr "人気の本"
-
-#: cps/templates/index.xml:22
+#: cps/templates/index.xml:21
 msgid "Popular publications from this catalog based on Downloads."
 msgstr "ダウンロード数に基づいた、この出版社が出している有名な本"
 
-#: cps/templates/index.xml:25 cps/templates/layout.html:144
-msgid "Best rated Books"
-msgstr "高評価の本"
-
-#: cps/templates/index.xml:29
+#: cps/templates/index.xml:28
 msgid "Popular publications from this catalog based on Rating."
 msgstr "評価に基づいた、この出版社が出している有名な本"
 
-#: cps/templates/index.xml:32
+#: cps/templates/index.xml:31
 msgid "New Books"
 msgstr "新着本"
 
-#: cps/templates/index.xml:36
+#: cps/templates/index.xml:35
 msgid "The latest Books"
 msgstr "最新の本"
 
-#: cps/templates/index.xml:43
+#: cps/templates/index.xml:42
 msgid "Show Random Books"
 msgstr "ランダムで本を表示"
 
-#: cps/templates/index.xml:62 cps/templates/layout.html:162
-msgid "Authors"
-msgstr "著者"
-
-#: cps/templates/index.xml:66
+#: cps/templates/index.xml:65
 msgid "Books ordered by Author"
 msgstr "著者名順"
 
-#: cps/templates/index.xml:69 cps/templates/layout.html:165
-msgid "Publishers"
-msgstr "出版社"
-
-#: cps/templates/index.xml:73
+#: cps/templates/index.xml:72
 msgid "Books ordered by publisher"
 msgstr "出版社順"
 
-#: cps/templates/index.xml:80
+#: cps/templates/index.xml:79
 msgid "Books ordered by category"
 msgstr "カテゴリ順"
 
-#: cps/templates/index.xml:87
+#: cps/templates/index.xml:86
 msgid "Books ordered by series"
 msgstr "シリーズ順"
 
-#: cps/templates/index.xml:90 cps/templates/layout.html:171
+#: cps/templates/index.xml:89 cps/templates/layout.html:132
 msgid "Public Shelves"
 msgstr "みんなの本棚"
 
-#: cps/templates/index.xml:94
+#: cps/templates/index.xml:93
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr "みんなの本棚に入れた本棚は、他の人からも見えます"
 
-#: cps/templates/index.xml:98 cps/templates/layout.html:175
+#: cps/templates/index.xml:97 cps/templates/layout.html:136
 msgid "Your Shelves"
 msgstr "あなたの本棚"
 
-#: cps/templates/index.xml:102
+#: cps/templates/index.xml:101
 msgid "User's own shelfs, only visible to the current user himself"
 msgstr "ユーザ自身の本棚は、自分にのみ見えます"
 
@@ -1593,7 +1790,7 @@ msgid "Advanced Search"
 msgstr "詳細検索"
 
 #: cps/templates/layout.html:76 cps/templates/read.html:71
-#: cps/templates/readcbr.html:89 cps/templates/readcbr.html:113
+#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
 msgid "Settings"
 msgstr "設定"
 
@@ -1609,7 +1806,7 @@ msgstr "ログアウト"
 msgid "Register"
 msgstr "登録"
 
-#: cps/templates/layout.html:111 cps/templates/layout.html:257
+#: cps/templates/layout.html:111 cps/templates/layout.html:218
 msgid "Uploading..."
 msgstr "アップロード中..."
 
@@ -1621,68 +1818,27 @@ msgstr "ページを更新しないでください"
 msgid "Browse"
 msgstr "閲覧"
 
-#: cps/templates/layout.html:124
-msgid "Recently Added"
-msgstr "最近追加した本"
-
-#: cps/templates/layout.html:129
-msgid "Sorted Books"
-msgstr "本をソート"
-
-#: cps/templates/layout.html:133 cps/templates/layout.html:134
-#: cps/templates/layout.html:135 cps/templates/layout.html:136
-msgid "Sort By"
-msgstr "ソート"
-
-#: cps/templates/layout.html:133
-msgid "Newest"
-msgstr "新着順"
-
-#: cps/templates/layout.html:134
-msgid "Oldest"
-msgstr "投稿順"
-
-#: cps/templates/layout.html:135
-msgid "Ascending"
-msgstr "昇順"
-
-#: cps/templates/layout.html:136
-msgid "Descending"
-msgstr "降順"
-
-#: cps/templates/layout.html:153
-msgid "Discover"
-msgstr "見つける"
-
-#: cps/templates/layout.html:156
-msgid "Categories"
-msgstr "カテゴリ"
-
-#: cps/templates/layout.html:168 cps/templates/search_form.html:74
-msgid "Languages"
-msgstr "言語"
-
-#: cps/templates/layout.html:180
+#: cps/templates/layout.html:141
 msgid "Create a Shelf"
 msgstr "本棚を作成"
 
-#: cps/templates/layout.html:181 cps/templates/stats.html:3
+#: cps/templates/layout.html:142 cps/templates/stats.html:3
 msgid "About"
 msgstr "このサイトについて"
 
-#: cps/templates/layout.html:195
+#: cps/templates/layout.html:156
 msgid "Previous"
 msgstr "前"
 
-#: cps/templates/layout.html:222
+#: cps/templates/layout.html:183
 msgid "Book Details"
 msgstr "本の詳細"
 
-#: cps/templates/layout.html:256
+#: cps/templates/layout.html:217
 msgid "Upload done, processing, please wait..."
 msgstr "アップロード完了。現在処理中ですのでお待ち下さい..."
 
-#: cps/templates/layout.html:259
+#: cps/templates/layout.html:220
 msgid "Error"
 msgstr "エラー"
 
@@ -1712,105 +1868,105 @@ msgstr "Calibre-Web 電子書籍カタログ"
 msgid "Reflow text when sidebars are open."
 msgstr ""
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:88
 msgid "Keyboard Shortcuts"
 msgstr "キーボードショートカット"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:91
 msgid "Previous Page"
 msgstr "前のページ"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:92
 msgid "Next Page"
 msgstr "次のページ"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:93
 msgid "Scale to Best"
 msgstr "最適なサイズにする"
 
-#: cps/templates/readcbr.html:100
+#: cps/templates/readcbr.html:94
 msgid "Scale to Width"
 msgstr "横に合わせる"
 
-#: cps/templates/readcbr.html:101
+#: cps/templates/readcbr.html:95
 msgid "Scale to Height"
 msgstr "縦に合わせる"
 
-#: cps/templates/readcbr.html:102
+#: cps/templates/readcbr.html:96
 msgid "Scale to Native"
 msgstr "オリジナルのサイズにする"
 
-#: cps/templates/readcbr.html:103
+#: cps/templates/readcbr.html:97
 msgid "Rotate Right"
 msgstr "右に回転する"
 
-#: cps/templates/readcbr.html:104
+#: cps/templates/readcbr.html:98
 msgid "Rotate Left"
 msgstr "左に回転する"
 
-#: cps/templates/readcbr.html:105
+#: cps/templates/readcbr.html:99
 msgid "Flip Image"
 msgstr "画像を反転する"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:115
 msgid "Light"
 msgstr "ライト"
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:116
 msgid "Dark"
 msgstr "ダーク"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:121
 msgid "Scale"
 msgstr "サイズ"
 
-#: cps/templates/readcbr.html:130
+#: cps/templates/readcbr.html:124
 msgid "Best"
 msgstr "最適"
 
-#: cps/templates/readcbr.html:131
+#: cps/templates/readcbr.html:125
 msgid "Width"
 msgstr "横に合わせる"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:126
 msgid "Height"
 msgstr "縦に合わせる"
 
-#: cps/templates/readcbr.html:133
+#: cps/templates/readcbr.html:127
 msgid "Native"
 msgstr "オリジナル"
 
-#: cps/templates/readcbr.html:138
+#: cps/templates/readcbr.html:132
 msgid "Rotate"
 msgstr "回転"
 
-#: cps/templates/readcbr.html:149
+#: cps/templates/readcbr.html:143
 msgid "Flip"
 msgstr "反転"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:146
 msgid "Horizontal"
 msgstr "水平方向"
 
-#: cps/templates/readcbr.html:153
+#: cps/templates/readcbr.html:147
 msgid "Vertical"
 msgstr "垂直方向"
 
-#: cps/templates/readcbr.html:158
+#: cps/templates/readcbr.html:152
 msgid "Direction"
 msgstr "読む方向"
 
-#: cps/templates/readcbr.html:161
+#: cps/templates/readcbr.html:155
 msgid "Left to Right"
 msgstr "左から右"
 
-#: cps/templates/readcbr.html:162
+#: cps/templates/readcbr.html:156
 msgid "Right to Left"
 msgstr "右から左"
 
 #: cps/templates/readpdf.html:29
-msgid "PDF.js viewer"
-msgstr "PDF.js ビューア"
+msgid "PDF reader"
+msgstr ""
 
 #: cps/templates/readtxt.html:6
 msgid "Basic txt Reader"
@@ -1884,23 +2040,23 @@ msgstr "これ以上の評価:"
 msgid "Rating less than"
 msgstr "これ未満の評価:"
 
-#: cps/templates/shelf.html:7
+#: cps/templates/shelf.html:10
 msgid "Delete this Shelf"
 msgstr "この本棚を削除"
 
-#: cps/templates/shelf.html:8
+#: cps/templates/shelf.html:11
 msgid "Edit Shelf"
 msgstr "本棚を編集"
 
-#: cps/templates/shelf.html:9 cps/templates/shelf_order.html:11
+#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:11
 msgid "Change order"
 msgstr "順番を変更"
 
-#: cps/templates/shelf.html:68
+#: cps/templates/shelf.html:67
 msgid "Do you really want to delete the shelf?"
 msgstr "この本棚を削除してもよろしいですか?"
 
-#: cps/templates/shelf.html:71
+#: cps/templates/shelf.html:70
 msgid "Shelf will be lost for everybody and forever!"
 msgstr "この本棚は誰にも見えなくなり、完全に消滅します"
 
@@ -1988,19 +2144,31 @@ msgstr "ユーザパスワードをリセット"
 msgid "Kindle E-Mail"
 msgstr "Kindleのメールアドレス"
 
-#: cps/templates/user_edit.html:39
+#: cps/templates/user_edit.html:40
 msgid "Show books with language"
 msgstr "この言語で本を表示"
 
-#: cps/templates/user_edit.html:41
+#: cps/templates/user_edit.html:42
 msgid "Show all"
 msgstr "全て表示"
 
-#: cps/templates/user_edit.html:141
+#: cps/templates/user_edit.html:52
+msgid "OAuth Settings"
+msgstr ""
+
+#: cps/templates/user_edit.html:54
+msgid "Link"
+msgstr ""
+
+#: cps/templates/user_edit.html:56
+msgid "Unlink"
+msgstr ""
+
+#: cps/templates/user_edit.html:124
 msgid "Delete this user"
 msgstr "このユーザを削除"
 
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:139
 msgid "Recent Downloads"
 msgstr "最近のダウンロード"
 
@@ -2028,3 +2196,45 @@ msgstr "最近のダウンロード"
 #~ msgid "Using your another device, login and visit "
 #~ msgstr ""
 
+#~ msgid "Newest Books"
+#~ msgstr "新着順"
+
+#~ msgid "Oldest Books"
+#~ msgstr "投稿順"
+
+#~ msgid "Books (A-Z)"
+#~ msgstr "昇順"
+
+#~ msgid "Books (Z-A)"
+#~ msgstr "降順"
+
+#~ msgid "Error opening eBook. Fileformat is not supported."
+#~ msgstr ""
+
+#~ msgid "File %(title)s"
+#~ msgstr "ファイル %(title)s"
+
+#~ msgid "Show sorted books"
+#~ msgstr "ソートされた本を表示"
+
+#~ msgid "Sorted Books"
+#~ msgstr "本をソート"
+
+#~ msgid "Sort By"
+#~ msgstr "ソート"
+
+#~ msgid "Newest"
+#~ msgstr "新着順"
+
+#~ msgid "Oldest"
+#~ msgstr "投稿順"
+
+#~ msgid "Ascending"
+#~ msgstr "昇順"
+
+#~ msgid "Descending"
+#~ msgstr "降順"
+
+#~ msgid "PDF.js viewer"
+#~ msgstr "PDF.js ビューア"
+
diff --git a/cps/translations/km/LC_MESSAGES/messages.mo b/cps/translations/km/LC_MESSAGES/messages.mo
index 4a8d6590..9e077ba0 100644
Binary files a/cps/translations/km/LC_MESSAGES/messages.mo and b/cps/translations/km/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/km/LC_MESSAGES/messages.po b/cps/translations/km/LC_MESSAGES/messages.po
index 20892ce5..97607b03 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-05-30 09:06+0200\n"
+"POT-Creation-Date: 2019-05-31 11:20+0200\n"
 "PO-Revision-Date: 2018-08-27 17:06+0700\n"
 "Last-Translator: \n"
 "Language: km_KH\n"
@@ -19,740 +19,929 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.6.0\n"
 
-#: cps/book_formats.py:199 cps/book_formats.py:200 cps/book_formats.py:204
-#: cps/book_formats.py:208 cps/book_formats.py:212 cps/converter.py:29
-#: cps/converter.py:45
-msgid "not installed"
-msgstr "មិនបានតម្លើង"
-
-#: cps/converter.py:40 cps/converter.py:56
-msgid "Excecution permissions missing"
-msgstr "ខ្វះសិទ្ធិប្រតិបត្តិការ"
-
-#: cps/converter.py:66
-msgid "not configured"
-msgstr ""
-
-#: cps/helper.py:79
-#, python-format
-msgid "%(format)s format not found for book id: %(book)d"
-msgstr ""
-
-#: cps/helper.py:91
-#, python-format
-msgid "%(format)s not found on Google Drive: %(fn)s"
-msgstr ""
-
-#: cps/helper.py:98 cps/helper.py:204 cps/templates/detail.html:45
-#: cps/templates/detail.html:49
-msgid "Send to Kindle"
-msgstr "ផ្ញើទៅ Kindle"
-
-#: cps/helper.py:99 cps/helper.py:117 cps/helper.py:206
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr ""
-
-#: cps/helper.py:110
-#, python-format
-msgid "%(format)s not found: %(fn)s"
-msgstr ""
-
-#: cps/helper.py:115
-msgid "Calibre-Web test e-mail"
-msgstr ""
-
-#: cps/helper.py:116
-msgid "Test e-mail"
-msgstr ""
-
-#: cps/helper.py:132
-msgid "Get Started with Calibre-Web"
-msgstr ""
-
-#: cps/helper.py:133
-#, python-format
-msgid "Registration e-mail for user: %(name)s"
-msgstr ""
-
-#: cps/helper.py:146 cps/helper.py:148 cps/helper.py:150 cps/helper.py:158
-#: cps/helper.py:160 cps/helper.py:162
-#, python-format
-msgid "Send %(format)s to Kindle"
-msgstr ""
-
-#: cps/helper.py:166
-#, python-format
-msgid "Convert %(orig)s to %(format)s and send to Kindle"
-msgstr ""
-
-#: cps/helper.py:205
-#, python-format
-msgid "E-mail: %(book)s"
-msgstr "អ៊ីមែល៖ %(book)s"
-
-#: cps/helper.py:208
-msgid "The requested file could not be read. Maybe wrong permissions?"
-msgstr "ឯកសារដែលបានស្នើសុំមិនអាចបើកបានទេ។ អាចនឹងខុសសិទ្ធិប្រើប្រាស់ទេដឹង?"
-
-#: cps/helper.py:316
-#, python-format
-msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "ប្តូរចំណងជើងពី “%(src)s” ទៅជា “%(dest)s” បរាជ័យដោយបញ្ហា: %(error)s"
-
-#: cps/helper.py:326
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "ប្តូរអ្នកនិពន្ធពី “%(src)s” ទៅជា “%(dest)s” បរាជ័យដោយបញ្ហា: %(error)s"
-
-#: cps/helper.py:340
-#, python-format
-msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr ""
-
-#: cps/helper.py:366 cps/helper.py:376 cps/helper.py:384
-#, python-format
-msgid "File %(file)s not found on Google Drive"
-msgstr "ឯកសារ %(file)s រកមិនឃើញក្នុង Google Drive"
-
-#: cps/helper.py:405
-#, python-format
-msgid "Book path %(path)s not found on Google Drive"
-msgstr "ទីតាំងសៀវភៅ %(path)s រកមិនឃើញក្នុង Google Drive"
-
-#: cps/helper.py:556
-msgid "Error excecuting UnRar"
-msgstr ""
-
-#: cps/helper.py:558
-msgid "Unrar binary file not found"
-msgstr ""
-
-#: cps/helper.py:585
-msgid "Waiting"
-msgstr "កំពុងរង់ចាំ"
-
-#: cps/helper.py:587
-msgid "Failed"
-msgstr "បានបរាជ័យ"
-
-#: cps/helper.py:589
-msgid "Started"
-msgstr "បានចាប់ផ្តើម"
-
-#: cps/helper.py:591
-msgid "Finished"
-msgstr "បានបញ្ចប់"
-
-#: cps/helper.py:593
-msgid "Unknown Status"
-msgstr ""
-
-#: cps/helper.py:598
-msgid "E-mail: "
-msgstr ""
-
-#: cps/helper.py:600 cps/helper.py:604
-msgid "Convert: "
-msgstr ""
-
-#: cps/helper.py:602
-msgid "Upload: "
-msgstr ""
-
-#: cps/helper.py:606
-msgid "Unknown Task: "
-msgstr ""
-
-#: cps/updater.py:251 cps/updater.py:410 cps/updater.py:423
-msgid "Unexpected data while reading update information"
-msgstr ""
-
-#: cps/updater.py:258 cps/updater.py:416
-msgid "No update available. You already have the latest version installed"
-msgstr ""
-
-#: cps/updater.py:270 cps/updater.py:501 cps/updater.py:503 cps/web.py:1206
-msgid "HTTP Error"
-msgstr ""
-
-#: cps/updater.py:272 cps/updater.py:505 cps/web.py:1207
-msgid "Connection error"
-msgstr ""
-
-#: cps/updater.py:274 cps/updater.py:507 cps/web.py:1208
-msgid "Timeout while establishing connection"
-msgstr ""
-
-#: cps/updater.py:276 cps/updater.py:509 cps/web.py:1209
-msgid "General error"
-msgstr ""
-
-#: cps/updater.py:283 cps/updater.py:341 cps/updater.py:468
-msgid "A new update is available. Click on the button below to update to the latest version."
-msgstr ""
-
-#: cps/updater.py:335
-msgid "Could not fetch update information"
-msgstr ""
-
-#: cps/updater.py:403
-msgid "No release information available"
-msgstr ""
-
-#: cps/updater.py:449 cps/updater.py:458
-#, python-format
-msgid "A new update is available. Click on the button below to update to version: %(version)s"
-msgstr ""
-
-#: cps/updater.py:491 cps/web.py:2795
-msgid "Unknown"
-msgstr "មិនដឹង"
-
-#: cps/web.py:1199
-msgid "Requesting update package"
-msgstr "កំពុងស្នើសុំឯកសារបច្ចុប្បន្នភាព"
-
-#: cps/web.py:1200
-msgid "Downloading update package"
-msgstr "កំពុងទាញយកឯកសារបច្ចុប្បន្នភាព"
-
-#: cps/web.py:1201
-msgid "Unzipping update package"
-msgstr "កំពុងពន្លាឯកសារបច្ចុប្បន្នភាព"
-
-#: cps/web.py:1202
-msgid "Replacing files"
-msgstr ""
-
-#: cps/web.py:1203
-msgid "Database connections are closed"
-msgstr "ទំនាក់ទំនងទៅមូលដ្ឋានទិន្នន័យត្រូវបានផ្តាច់"
-
-#: cps/web.py:1204
-msgid "Stopping server"
-msgstr ""
-
-#: cps/web.py:1205
-msgid "Update finished, please press okay and reload page"
-msgstr "ការធ្វើបច្ចុប្បន្នភាពបានបញ្ចប់ សូមចុច okay រួចបើកទំព័រជាថ្មី"
-
-#: cps/web.py:1206 cps/web.py:1207 cps/web.py:1208 cps/web.py:1209
-msgid "Update failed:"
-msgstr ""
-
-#: cps/web.py:1235
-msgid "Recently Added Books"
-msgstr "សៀវភៅដែលទើបបានបន្ថែម"
-
-#: cps/web.py:1245
-msgid "Newest Books"
-msgstr "សៀវភៅថ្មីៗជាងគេ"
-
-#: cps/web.py:1257
-msgid "Oldest Books"
-msgstr "សៀវភៅចាស់ជាងគេ"
-
-#: cps/web.py:1269
-msgid "Books (A-Z)"
-msgstr "សៀវភៅពី A ទៅ Z"
-
-#: cps/web.py:1280
-msgid "Books (Z-A)"
-msgstr "សៀវភៅពី Z ទៅ A"
-
-#: cps/web.py:1309
-msgid "Hot Books (most downloaded)"
-msgstr "សៀវភៅដែលត្រូវបានទាញយកច្រើនជាងគេ"
-
-#: cps/web.py:1322
-msgid "Best rated books"
-msgstr "សៀវភៅដែលត្រូវបានវាយតម្លៃល្អជាងគេ"
-
-#: cps/templates/index.xml:39 cps/web.py:1335
-msgid "Random Books"
-msgstr "សៀវភៅចៃដន្យ"
-
-#: cps/web.py:1362 cps/web.py:1618 cps/web.py:2161
-msgid "Error opening eBook. File does not exist or file is not accessible:"
-msgstr "មានបញ្ហាពេលបើកឯកសារ eBook ។ មិនមានឯកសារនេះ ឬមិនអាចបើកបាន៖"
-
-#: cps/web.py:1391
-msgid "Publisher list"
-msgstr ""
-
-#: cps/web.py:1406
-#, python-format
-msgid "Publisher: %(name)s"
-msgstr ""
-
-#: cps/templates/index.xml:83 cps/web.py:1438
-msgid "Series list"
-msgstr "បញ្ជីស៊េរី"
-
-#: cps/web.py:1452
-#, python-format
-msgid "Series: %(serie)s"
-msgstr "ស៊េរី៖ %(serie)s"
-
-#: cps/web.py:1478
-msgid "Available languages"
-msgstr "ភាសាដែលមាន"
-
-#: cps/web.py:1498
-#, python-format
-msgid "Language: %(name)s"
-msgstr "ភាសា៖ %(name)s"
-
-#: cps/templates/index.xml:76 cps/web.py:1509
-msgid "Category list"
-msgstr "បញ្ជីប្រភេទ"
-
-#: cps/web.py:1523
-#, python-format
-msgid "Category: %(name)s"
-msgstr "ប្រភេទ៖ %(name)s"
-
-#: cps/templates/layout.html:73 cps/web.py:1648
-msgid "Tasks"
-msgstr "កិច្ចការនានា"
-
-#: cps/web.py:1682
+#: cps/about.py:76
 msgid "Statistics"
 msgstr "ស្ថិតិ"
 
-#: cps/web.py:1750
-msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
-msgstr ""
-
-#: cps/web.py:1795
-msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
-msgstr "Callback domain មិនទាន់បានផ្ទៀងផ្ទាត់ឲប្រើទេ សូមធ្វើតាមជំហានដើម្បីផ្ទៀងផ្ទាត់ domain នៅក្នុង Google Developer Console"
-
-#: cps/web.py:1871
+#: cps/admin.py:97
 msgid "Server restarted, please reload page"
 msgstr "ម៉ាស៊ីន server បានដំណើរការម្តងទៀត សូមបើកទំព័រជាថ្មី"
 
-#: cps/web.py:1874
+#: cps/admin.py:100
 msgid "Performing shutdown of server, please close window"
 msgstr "កំពុងបិទម៉ាស៊ីន server សូមបិទផ្ទាំងនេះ"
 
-#: cps/web.py:1953
-msgid "Published after "
-msgstr "បានបោះពុម្ភក្រោយ  "
+#: cps/admin.py:120 cps/updater.py:445
+msgid "Unknown"
+msgstr "មិនដឹង"
 
-#: cps/web.py:1960
-msgid "Published before "
-msgstr "បានបោះពុម្ភមុន  "
-
-#: cps/web.py:1974
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "ការវាយតម្លៃ <= %(rating)s"
-
-#: cps/web.py:1976
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "ការវាយតម្លៃ >= %(rating)s"
-
-#: cps/web.py:2036 cps/web.py:2045
-msgid "search"
-msgstr "ស្វែងរក"
-
-#: cps/templates/index.xml:47 cps/templates/index.xml:51
-#: cps/templates/layout.html:148 cps/web.py:2116
-msgid "Read Books"
-msgstr "សៀវភៅដែលបានអានរួច"
-
-#: cps/templates/index.xml:55 cps/templates/index.xml:59
-#: cps/templates/layout.html:150 cps/web.py:2119
-msgid "Unread Books"
-msgstr "សៀវភៅដែលមិនទាន់បានអាន"
-
-#: cps/web.py:2171 cps/web.py:2173 cps/web.py:2175 cps/web.py:2187
-msgid "Read a Book"
-msgstr "អានសៀវភៅ"
-
-#: cps/web.py:2199
-msgid "Error opening eBook. Fileformat is not supported."
-msgstr ""
-
-#: cps/web.py:2249 cps/web.py:3170
-msgid "Please fill out all fields!"
-msgstr "សូមបំពេញចន្លោះទាំងអស់!"
-
-#: cps/web.py:2250 cps/web.py:2272 cps/web.py:2276 cps/web.py:2281
-#: cps/web.py:2283
-msgid "register"
-msgstr "ចុះឈ្មោះ"
-
-#: cps/web.py:2271 cps/web.py:3389
-msgid "An unknown error occurred. Please try again later."
-msgstr ""
-
-#: cps/web.py:2274
-msgid "Your e-mail is not allowed to register"
-msgstr ""
-
-#: cps/web.py:2277
-msgid "Confirmation e-mail was send to your e-mail account."
-msgstr ""
-
-#: cps/web.py:2280
-msgid "This username or e-mail address is already in use."
-msgstr ""
-
-#: cps/web.py:2297 cps/web.py:2393
-#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
-msgstr "ឥឡូវអ្នកបានចូលដោយមានឈ្មោះថា៖ ‘%(nickname)s’"
-
-#: cps/web.py:2302
-msgid "Wrong Username or Password"
-msgstr "ខុសឈ្មោះអ្នកប្រើប្រាស់ ឬលេខសម្ងាត់"
-
-#: cps/web.py:2308 cps/web.py:2329
-msgid "login"
-msgstr "ចូលប្រើ"
-
-#: cps/web.py:2341 cps/web.py:2372
-msgid "Token not found"
-msgstr "រកមិនឃើញវត្ថុតាង"
-
-#: cps/web.py:2349 cps/web.py:2380
-msgid "Token has expired"
-msgstr "វត្ថុតាងហួសពេលកំណត់"
-
-#: cps/web.py:2357
-msgid "Success! Please return to your device"
-msgstr "ជោគជ័យ! សូមវិលមកឧបករណ៍អ្នកវិញ"
-
-#: cps/web.py:2407
-msgid "Please configure the SMTP mail settings first..."
-msgstr "សូមកំណត់អ៊ីមែល SMTP ជាមុនសិន"
-
-#: cps/web.py:2412
-#, python-format
-msgid "Book successfully queued for sending to %(kindlemail)s"
-msgstr "សៀវភៅបានចូលជួរសម្រាប់ផ្ញើទៅ %(kindlemail)s ដោយជោគជ័យ"
-
-#: cps/web.py:2416
-#, python-format
-msgid "There was an error sending this book: %(res)s"
-msgstr "មានបញ្ហានៅពេលផ្ញើសៀវភៅនេះ៖ %(res)s"
-
-#: cps/web.py:2418 cps/web.py:3223
-msgid "Please configure your kindle e-mail address first..."
-msgstr ""
-
-#: cps/web.py:2429 cps/web.py:2481
-msgid "Invalid shelf specified"
-msgstr ""
-
-#: cps/web.py:2436
-#, python-format
-msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
-msgstr ""
-
-#: cps/web.py:2444
-msgid "You are not allowed to edit public shelves"
-msgstr ""
-
-#: cps/web.py:2453
-#, python-format
-msgid "Book is already part of the shelf: %(shelfname)s"
-msgstr ""
-
-#: cps/web.py:2467
-#, python-format
-msgid "Book has been added to shelf: %(sname)s"
-msgstr "សៀវភៅត្រូវបានបន្ថែមទៅធ្នើ៖ %(sname)s"
-
-#: cps/web.py:2486
-#, python-format
-msgid "You are not allowed to add a book to the the shelf: %(name)s"
-msgstr ""
-
-#: cps/web.py:2491
-msgid "User is not allowed to edit public shelves"
-msgstr ""
-
-#: cps/web.py:2509
-#, python-format
-msgid "Books are already part of the shelf: %(name)s"
-msgstr ""
-
-#: cps/web.py:2523
-#, python-format
-msgid "Books have been added to shelf: %(sname)s"
-msgstr ""
-
-#: cps/web.py:2525
-#, python-format
-msgid "Could not add books to shelf: %(sname)s"
-msgstr ""
-
-#: cps/web.py:2562
-#, python-format
-msgid "Book has been removed from shelf: %(sname)s"
-msgstr "សៀវភៅត្រូវបានដកចេញពីធ្នើ៖ %(sname)s"
-
-#: cps/web.py:2568
-#, python-format
-msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
-msgstr "សូមអភ័យទោស អ្នកមិនមានសិទ្ធិដកសៀវភៅចេញពីធ្នើនេះទេ៖ %(sname)s"
-
-#: cps/web.py:2589 cps/web.py:2613
-#, python-format
-msgid "A shelf with the name '%(title)s' already exists."
-msgstr "មានធ្នើដែលមានឈ្មោះ ‘%(title)s’ រួចហើយ។"
-
-#: cps/web.py:2594
-#, python-format
-msgid "Shelf %(title)s created"
-msgstr "ធ្នើឈ្មោះ %(title)s ត្រូវបានបង្កើត"
-
-#: cps/web.py:2596 cps/web.py:2624
-msgid "There was an error"
-msgstr "មានបញ្ហា"
-
-#: cps/web.py:2597 cps/web.py:2599
-msgid "create a shelf"
-msgstr "បង្កើតធ្នើ"
-
-#: cps/web.py:2622
-#, python-format
-msgid "Shelf %(title)s changed"
-msgstr "ធ្នើឈ្មោះ %(title)s ត្រូវបានប្តូរ"
-
-#: cps/web.py:2625 cps/web.py:2627
-msgid "Edit a shelf"
-msgstr "កែប្រែធ្នើ"
-
-#: cps/web.py:2648
-#, python-format
-msgid "successfully deleted shelf %(name)s"
-msgstr "បានបង្កើតធ្នើឈ្មោះ %(name)s ដោយជោគជ័យ"
-
-#: cps/web.py:2675
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "ធ្នើ៖ ‘%(name)s’"
-
-#: cps/web.py:2678
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "មានបញ្ហាពេលបើកធ្នើ។ ពុំមានធ្នើ ឬមិនអាចបើកបាន"
-
-#: cps/web.py:2709
-#, python-format
-msgid "Change order of Shelf: '%(name)s'"
-msgstr "ប្តូរលំដាប់ធ្នើ៖ ‘%(name)s’"
-
-#: cps/web.py:2738 cps/web.py:3176
-msgid "E-mail is not from valid domain"
-msgstr ""
-
-#: cps/web.py:2740 cps/web.py:2782 cps/web.py:2785
-#, python-format
-msgid "%(name)s's profile"
-msgstr "ព័ត៌មានសង្ខេបរបស់ %(name)s"
-
-#: cps/web.py:2780
-msgid "Found an existing account for this e-mail address."
-msgstr ""
-
-#: cps/web.py:2783
-msgid "Profile updated"
-msgstr "ព័ត៌មានសង្ខេបបានកែប្រែ"
-
-#: cps/web.py:2814
+#: cps/admin.py:139
 msgid "Admin page"
 msgstr "ទំព័ររដ្ឋបាល"
 
-#: cps/web.py:2899 cps/web.py:3079
+#: cps/admin.py:208 cps/admin.py:486
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
-#: cps/templates/admin.html:100 cps/web.py:2913
+#: cps/admin.py:222 cps/templates/admin.html:102
 msgid "UI Configuration"
 msgstr "ការកំណត់ផ្ទាំងប្រើប្រាស់"
 
-#: cps/web.py:2931
+#: cps/admin.py:295
 msgid "Import of optional Google Drive requirements missing"
 msgstr "ខ្វះការនាំចូលតម្រូវការបន្ថែមរបស់ Google Drive"
 
-#: cps/web.py:2934
+#: cps/admin.py:298
 msgid "client_secrets.json is missing or not readable"
 msgstr "មិនមានឯកសារ client_secrets.json ឬមិនអាចបើកបាន"
 
-#: cps/web.py:2939 cps/web.py:2968
+#: cps/admin.py:303 cps/admin.py:332
 msgid "client_secrets.json is not configured for web application"
 msgstr "ឯកសារ client_secrets.json មិនទាន់បានកំណត់សម្រាប់កម្មវិធីវែប"
 
-#: cps/templates/admin.html:99 cps/web.py:2971 cps/web.py:2997 cps/web.py:3009
-#: cps/web.py:3054 cps/web.py:3069 cps/web.py:3088 cps/web.py:3096
-#: cps/web.py:3112
+#: cps/admin.py:335 cps/admin.py:361 cps/admin.py:373 cps/admin.py:398
+#: cps/admin.py:426 cps/admin.py:440 cps/admin.py:463 cps/admin.py:476
+#: cps/admin.py:494 cps/admin.py:501 cps/admin.py:516
+#: cps/templates/admin.html:101
 msgid "Basic Configuration"
 msgstr "ការកំណត់សាមញ្ញ"
 
-#: cps/web.py:2994
+#: cps/admin.py:358
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr "ទីតាំងរបស់ keyfile មិនត្រឹមត្រូវ សូមបញ្ចូលទីតាំងត្រឹមត្រូវ"
 
-#: cps/web.py:3006
+#: cps/admin.py:370
 msgid "Certfile location is not valid, please enter correct path"
 msgstr "ទីតាំងរបស់ certfile មិនត្រឹមត្រូវ សូមបញ្ចូលទីតាំងត្រឹមត្រូវ"
 
-#: cps/web.py:3051
+#: cps/admin.py:395
+msgid "Please enter a LDAP provider and a DN"
+msgstr ""
+
+#: cps/admin.py:423
+msgid "Please enter Github oauth credentials"
+msgstr ""
+
+#: cps/admin.py:437
+msgid "Please enter Google oauth credentials"
+msgstr ""
+
+#: cps/admin.py:460
 msgid "Logfile location is not valid, please enter correct path"
 msgstr "ទីតាំងរបស់ logfile មិនត្រឹមត្រូវ សូមបញ្ចូលទីតាំងត្រឹមត្រូវ"
 
-#: cps/web.py:3092
+#: cps/admin.py:498
 msgid "DB location is not valid, please enter correct path"
 msgstr "ទីតាំងរបស់ database មិនត្រឹមត្រូវ សូមបញ្ចូលទីតាំងត្រឹមត្រូវ"
 
-#: cps/templates/admin.html:33 cps/web.py:3172 cps/web.py:3178 cps/web.py:3194
+#: cps/admin.py:558 cps/web.py:1045
+msgid "Please fill out all fields!"
+msgstr "សូមបំពេញចន្លោះទាំងអស់!"
+
+#: cps/admin.py:560 cps/admin.py:566 cps/admin.py:582
+#: cps/templates/admin.html:35
 msgid "Add new user"
 msgstr "បន្ថែមអ្នកប្រើប្រាស់ថ្មី"
 
-#: cps/web.py:3184
+#: cps/admin.py:564 cps/web.py:1248
+msgid "E-mail is not from valid domain"
+msgstr ""
+
+#: cps/admin.py:572
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "បានបង្កើតអ្នកប្រើប្រាស់ ‘%(user)s’"
 
-#: cps/web.py:3188
+#: cps/admin.py:576
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/web.py:3218
+#: cps/admin.py:607
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:3221
+#: cps/admin.py:610
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/web.py:3225
+#: cps/admin.py:612 cps/web.py:1029
+msgid "Please configure your kindle e-mail address first..."
+msgstr ""
+
+#: cps/admin.py:614
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/web.py:3226
+#: cps/admin.py:615
 msgid "Edit e-mail server settings"
 msgstr ""
 
-#: cps/web.py:3251
+#: cps/admin.py:640
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "អ្នកប្រើប្រាស់ ‘%(nick)s’ ត្រូវបានលុប"
 
-#: cps/web.py:3364
+#: cps/admin.py:711
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "អ្នកប្រើប្រាស់ ‘%(nick)s’ ត្រូវបានកែប្រែ"
 
-#: cps/web.py:3367
+#: cps/admin.py:714
 msgid "An unknown error occured."
 msgstr "បញ្ហាដែលមិនដឹងបានកើតឡើង។"
 
-#: cps/web.py:3369
+#: cps/admin.py:717
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "កែប្រែអ្នកប្រើប្រាស់ %(nick)s"
 
-#: cps/web.py:3386
+#: cps/admin.py:733
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/web.py:3400 cps/web.py:3592
+#: cps/admin.py:736 cps/web.py:1070
+msgid "An unknown error occurred. Please try again later."
+msgstr ""
+
+#: cps/admin.py:755
+msgid "Requesting update package"
+msgstr "កំពុងស្នើសុំឯកសារបច្ចុប្បន្នភាព"
+
+#: cps/admin.py:756
+msgid "Downloading update package"
+msgstr "កំពុងទាញយកឯកសារបច្ចុប្បន្នភាព"
+
+#: cps/admin.py:757
+msgid "Unzipping update package"
+msgstr "កំពុងពន្លាឯកសារបច្ចុប្បន្នភាព"
+
+#: cps/admin.py:758
+msgid "Replacing files"
+msgstr ""
+
+#: cps/admin.py:759
+msgid "Database connections are closed"
+msgstr "ទំនាក់ទំនងទៅមូលដ្ឋានទិន្នន័យត្រូវបានផ្តាច់"
+
+#: cps/admin.py:760
+msgid "Stopping server"
+msgstr ""
+
+#: cps/admin.py:761
+msgid "Update finished, please press okay and reload page"
+msgstr "ការធ្វើបច្ចុប្បន្នភាពបានបញ្ចប់ សូមចុច okay រួចបើកទំព័រជាថ្មី"
+
+#: cps/admin.py:762 cps/admin.py:763 cps/admin.py:764 cps/admin.py:765
+msgid "Update failed:"
+msgstr ""
+
+#: cps/admin.py:762 cps/updater.py:277 cps/updater.py:456 cps/updater.py:458
+msgid "HTTP Error"
+msgstr ""
+
+#: cps/admin.py:763 cps/updater.py:279 cps/updater.py:460
+msgid "Connection error"
+msgstr ""
+
+#: cps/admin.py:764 cps/updater.py:281 cps/updater.py:462
+msgid "Timeout while establishing connection"
+msgstr ""
+
+#: cps/admin.py:765 cps/updater.py:283 cps/updater.py:464
+msgid "General error"
+msgstr ""
+
+#: cps/converter.py:31 cps/converter.py:48 cps/uploader.py:213
+#: cps/uploader.py:214 cps/uploader.py:218 cps/uploader.py:222
+#: cps/uploader.py:226
+msgid "not installed"
+msgstr "មិនបានតម្លើង"
+
+#: cps/converter.py:43 cps/converter.py:60
+msgid "Excecution permissions missing"
+msgstr "ខ្វះសិទ្ធិប្រតិបត្តិការ"
+
+#: cps/converter.py:70
+msgid "not configured"
+msgstr ""
+
+#: cps/editbooks.py:218 cps/editbooks.py:432
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "មានបញ្ហាពេលបើកឯកសារ eBook ។ ពុំមានឯកសារ ឬឯកសារនេះមិនអាចបើកបាន"
 
-#: cps/web.py:3428
+#: cps/editbooks.py:246
 msgid "edit metadata"
 msgstr "កែប្រែទិន្នន័យមេតា"
 
-#: cps/web.py:3521 cps/web.py:3754
+#: cps/editbooks.py:325 cps/editbooks.py:595
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "ឯកសារប្រភេទ '%(ext)s' មិនត្រូវបានអនុញ្ញាតឲអាប់ឡូដទៅម៉ាស៊ីន server នេះទេ"
 
-#: cps/web.py:3525 cps/web.py:3757
+#: cps/editbooks.py:329 cps/editbooks.py:599
 msgid "File to be uploaded must have an extension"
 msgstr "ឯកសារដែលត្រូវអាប់ឡូដត្រូវមានកន្ទុយឯកសារ"
 
-#: cps/web.py:3537 cps/web.py:3776
+#: cps/editbooks.py:341 cps/editbooks.py:619
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "មិនអាចបង្កើតទីតាំង %(path)s (ពុំមានសិទ្ធិ)។"
 
-#: cps/web.py:3542
+#: cps/editbooks.py:346
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "មិនអាចរក្សាទុកឯកសារ %(file)s ។"
 
-#: cps/web.py:3559
+#: cps/editbooks.py:363
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "ឯកសារទម្រង់ %(ext)s ត្រូវបានបន្ថែមទៅ %(book)s"
 
-#: cps/web.py:3573 cps/web.py:3646
+#: cps/editbooks.py:382
+#, python-format
+msgid "Failed to create path for cover %(path)s (Permission denied)."
+msgstr ""
+
+#: cps/editbooks.py:390
+#, python-format
+msgid "Failed to store cover-file %(cover)s."
+msgstr ""
+
+#: cps/editbooks.py:393
+msgid "Cover-file is not a valid image file"
+msgstr ""
+
+#: cps/editbooks.py:399 cps/editbooks.py:413
 msgid "Cover is not a supported imageformat (jpg/png/webp), can't save"
 msgstr ""
 
-#: cps/web.py:3605 cps/web.py:3614
+#: cps/editbooks.py:445 cps/editbooks.py:454
 msgid "unknown"
 msgstr "មិនដឹង"
 
-#: cps/web.py:3694
+#: cps/editbooks.py:486
+msgid "Cover is not a jpg file, can't save"
+msgstr ""
+
+#: cps/editbooks.py:534
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr ""
 
-#: cps/web.py:3725
+#: cps/editbooks.py:565
 msgid "Metadata successfully updated"
 msgstr ""
 
-#: cps/web.py:3734
+#: cps/editbooks.py:574
 msgid "Error editing book, please check logfile for details"
 msgstr "មានបញ្ហាពេលកែប្រែសៀវភៅ សូមពិនិត្យមើល logfile សម្រាប់ព័ត៌មានបន្ថែម"
 
-#: cps/web.py:3780
+#: cps/editbooks.py:624
 #, python-format
 msgid "Failed to store file %(file)s (Permission denied)."
 msgstr "មិនអាចរក្សាទុកឯកសារ %(file)s (មិនមានសិទ្ធិ)។"
 
-#: cps/web.py:3785
+#: cps/editbooks.py:629
 #, python-format
 msgid "Failed to delete file %(file)s (Permission denied)."
 msgstr "មិនអាចលុបឯកសារ %(file)s (មិនមានសិទ្ធិ)។"
 
-#: cps/web.py:3867
+#: cps/editbooks.py:712
 #, python-format
-msgid "File %(title)s"
+msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/web.py:3896
+#: cps/editbooks.py:741
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/web.py:3906
+#: cps/editbooks.py:751
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/web.py:3910
+#: cps/editbooks.py:755
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
 
-#: cps/worker.py:305
+#: cps/gdrive.py:56
+msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
+msgstr ""
+
+#: cps/gdrive.py:101
+msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
+msgstr "Callback domain មិនទាន់បានផ្ទៀងផ្ទាត់ឲប្រើទេ សូមធ្វើតាមជំហានដើម្បីផ្ទៀងផ្ទាត់ domain នៅក្នុង Google Developer Console"
+
+#: cps/helper.py:97
+#, python-format
+msgid "%(format)s format not found for book id: %(book)d"
+msgstr ""
+
+#: cps/helper.py:109
+#, python-format
+msgid "%(format)s not found on Google Drive: %(fn)s"
+msgstr ""
+
+#: cps/helper.py:116 cps/helper.py:223 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "ផ្ញើទៅ Kindle"
+
+#: cps/helper.py:117 cps/helper.py:135 cps/helper.py:225
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr ""
+
+#: cps/helper.py:128
+#, python-format
+msgid "%(format)s not found: %(fn)s"
+msgstr ""
+
+#: cps/helper.py:133
+msgid "Calibre-Web test e-mail"
+msgstr ""
+
+#: cps/helper.py:134
+msgid "Test e-mail"
+msgstr ""
+
+#: cps/helper.py:150
+msgid "Get Started with Calibre-Web"
+msgstr ""
+
+#: cps/helper.py:151
+#, python-format
+msgid "Registration e-mail for user: %(name)s"
+msgstr ""
+
+#: cps/helper.py:165 cps/helper.py:167 cps/helper.py:169 cps/helper.py:177
+#: cps/helper.py:179 cps/helper.py:181
+#, python-format
+msgid "Send %(format)s to Kindle"
+msgstr ""
+
+#: cps/helper.py:185
+#, python-format
+msgid "Convert %(orig)s to %(format)s and send to Kindle"
+msgstr ""
+
+#: cps/helper.py:224
+#, python-format
+msgid "E-mail: %(book)s"
+msgstr "អ៊ីមែល៖ %(book)s"
+
+#: cps/helper.py:227
+msgid "The requested file could not be read. Maybe wrong permissions?"
+msgstr "ឯកសារដែលបានស្នើសុំមិនអាចបើកបានទេ។ អាចនឹងខុសសិទ្ធិប្រើប្រាស់ទេដឹង?"
+
+#: cps/helper.py:335
+#, python-format
+msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "ប្តូរចំណងជើងពី “%(src)s” ទៅជា “%(dest)s” បរាជ័យដោយបញ្ហា: %(error)s"
+
+#: cps/helper.py:345
+#, python-format
+msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "ប្តូរអ្នកនិពន្ធពី “%(src)s” ទៅជា “%(dest)s” បរាជ័យដោយបញ្ហា: %(error)s"
+
+#: cps/helper.py:359
+#, python-format
+msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr ""
+
+#: cps/helper.py:385 cps/helper.py:395 cps/helper.py:403
+#, python-format
+msgid "File %(file)s not found on Google Drive"
+msgstr "ឯកសារ %(file)s រកមិនឃើញក្នុង Google Drive"
+
+#: cps/helper.py:424
+#, python-format
+msgid "Book path %(path)s not found on Google Drive"
+msgstr "ទីតាំងសៀវភៅ %(path)s រកមិនឃើញក្នុង Google Drive"
+
+#: cps/helper.py:584
+msgid "Error excecuting UnRar"
+msgstr ""
+
+#: cps/helper.py:586
+msgid "Unrar binary file not found"
+msgstr ""
+
+#: cps/helper.py:614
+msgid "Waiting"
+msgstr "កំពុងរង់ចាំ"
+
+#: cps/helper.py:616
+msgid "Failed"
+msgstr "បានបរាជ័យ"
+
+#: cps/helper.py:618
+msgid "Started"
+msgstr "បានចាប់ផ្តើម"
+
+#: cps/helper.py:620
+msgid "Finished"
+msgstr "បានបញ្ចប់"
+
+#: cps/helper.py:622
+msgid "Unknown Status"
+msgstr ""
+
+#: cps/helper.py:627
+msgid "E-mail: "
+msgstr ""
+
+#: cps/helper.py:629 cps/helper.py:633
+msgid "Convert: "
+msgstr ""
+
+#: cps/helper.py:631
+msgid "Upload: "
+msgstr ""
+
+#: cps/helper.py:635
+msgid "Unknown Task: "
+msgstr ""
+
+#: cps/oauth_bb.py:87
+#, python-format
+msgid "Register with %s, "
+msgstr ""
+
+#: cps/oauth_bb.py:145
+msgid "Failed to log in with GitHub."
+msgstr ""
+
+#: cps/oauth_bb.py:150
+msgid "Failed to fetch user info from GitHub."
+msgstr ""
+
+#: cps/oauth_bb.py:161
+msgid "Failed to log in with Google."
+msgstr ""
+
+#: cps/oauth_bb.py:166
+msgid "Failed to fetch user info from Google."
+msgstr ""
+
+#: cps/oauth_bb.py:265
+#, python-format
+msgid "Unlink to %(oauth)s success."
+msgstr ""
+
+#: cps/oauth_bb.py:269
+#, python-format
+msgid "Unlink to %(oauth)s failed."
+msgstr ""
+
+#: cps/oauth_bb.py:272
+#, python-format
+msgid "Not linked to %(oauth)s."
+msgstr ""
+
+#: cps/oauth_bb.py:300
+msgid "GitHub Oauth error, please retry later."
+msgstr ""
+
+#: cps/oauth_bb.py:319
+msgid "Google Oauth error, please retry later."
+msgstr ""
+
+#: cps/shelf.py:40 cps/shelf.py:92
+msgid "Invalid shelf specified"
+msgstr ""
+
+#: cps/shelf.py:47
+#, python-format
+msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
+msgstr ""
+
+#: cps/shelf.py:55
+msgid "You are not allowed to edit public shelves"
+msgstr ""
+
+#: cps/shelf.py:64
+#, python-format
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr ""
+
+#: cps/shelf.py:78
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "សៀវភៅត្រូវបានបន្ថែមទៅធ្នើ៖ %(sname)s"
+
+#: cps/shelf.py:97
+#, python-format
+msgid "You are not allowed to add a book to the the shelf: %(name)s"
+msgstr ""
+
+#: cps/shelf.py:102
+msgid "User is not allowed to edit public shelves"
+msgstr ""
+
+#: cps/shelf.py:120
+#, python-format
+msgid "Books are already part of the shelf: %(name)s"
+msgstr ""
+
+#: cps/shelf.py:134
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr ""
+
+#: cps/shelf.py:136
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr ""
+
+#: cps/shelf.py:173
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "សៀវភៅត្រូវបានដកចេញពីធ្នើ៖ %(sname)s"
+
+#: cps/shelf.py:179
+#, python-format
+msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
+msgstr "សូមអភ័យទោស អ្នកមិនមានសិទ្ធិដកសៀវភៅចេញពីធ្នើនេះទេ៖ %(sname)s"
+
+#: cps/shelf.py:200 cps/shelf.py:224
+#, python-format
+msgid "A shelf with the name '%(title)s' already exists."
+msgstr "មានធ្នើដែលមានឈ្មោះ ‘%(title)s’ រួចហើយ។"
+
+#: cps/shelf.py:205
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "ធ្នើឈ្មោះ %(title)s ត្រូវបានបង្កើត"
+
+#: cps/shelf.py:207 cps/shelf.py:235
+msgid "There was an error"
+msgstr "មានបញ្ហា"
+
+#: cps/shelf.py:208 cps/shelf.py:210
+msgid "create a shelf"
+msgstr "បង្កើតធ្នើ"
+
+#: cps/shelf.py:233
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "ធ្នើឈ្មោះ %(title)s ត្រូវបានប្តូរ"
+
+#: cps/shelf.py:236 cps/shelf.py:238
+msgid "Edit a shelf"
+msgstr "កែប្រែធ្នើ"
+
+#: cps/shelf.py:259
+#, python-format
+msgid "successfully deleted shelf %(name)s"
+msgstr "បានបង្កើតធ្នើឈ្មោះ %(name)s ដោយជោគជ័យ"
+
+#: cps/shelf.py:289
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "ធ្នើ៖ ‘%(name)s’"
+
+#: cps/shelf.py:292
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "មានបញ្ហាពេលបើកធ្នើ។ ពុំមានធ្នើ ឬមិនអាចបើកបាន"
+
+#: cps/shelf.py:324
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "ប្តូរលំដាប់ធ្នើ៖ ‘%(name)s’"
+
+#: cps/ub.py:111
+msgid "Recently Added"
+msgstr "ទើបបន្ថែមថ្មីៗ"
+
+#: cps/ub.py:113
+msgid "Show recent books"
+msgstr "បង្ហាញសៀវភៅមកថ្មី"
+
+#: cps/templates/index.xml:17 cps/ub.py:114
+msgid "Hot Books"
+msgstr "សៀវភៅដែលមានប្រជាប្រិយភាព"
+
+#: cps/ub.py:115
+msgid "Show hot books"
+msgstr "បង្ហាញសៀវភៅដែលមានប្រជាប្រិយភាព"
+
+#: cps/templates/index.xml:24 cps/ub.py:118
+msgid "Best rated Books"
+msgstr "សៀវភៅដែលមានការវាយតម្លៃល្អជាងគេ"
+
+#: cps/ub.py:120
+msgid "Show best rated books"
+msgstr "បង្ហាញសៀវភៅដែលមានការវាយតម្លៃល្អជាងគេ"
+
+#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:121
+#: cps/web.py:965
+msgid "Read Books"
+msgstr "សៀវភៅដែលបានអានរួច"
+
+#: cps/ub.py:123
+msgid "Show read and unread"
+msgstr "បង្ហាញអានរួច និងមិនទាន់អាន"
+
+#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:125
+#: cps/web.py:969
+msgid "Unread Books"
+msgstr "សៀវភៅដែលមិនទាន់បានអាន"
+
+#: cps/ub.py:127
+msgid "Show unread"
+msgstr ""
+
+#: cps/ub.py:128
+msgid "Discover"
+msgstr "ស្រាវជ្រាវ"
+
+#: cps/ub.py:130
+msgid "Show random books"
+msgstr "បង្ហាញសៀវភៅចៃដន្យ"
+
+#: cps/ub.py:131
+msgid "Categories"
+msgstr "ប្រភេទនានា"
+
+#: cps/ub.py:133
+msgid "Show category selection"
+msgstr "បង្ហាញជម្រើសប្រភេទ"
+
+#: cps/templates/book_edit.html:71 cps/templates/search_form.html:53
+#: cps/ub.py:134
+msgid "Series"
+msgstr "ស៊េរី"
+
+#: cps/ub.py:136
+msgid "Show series selection"
+msgstr "បង្ហាញជម្រើសស៊េរី"
+
+#: cps/templates/index.xml:61 cps/ub.py:137
+msgid "Authors"
+msgstr "អ្នកនិពន្ធ"
+
+#: cps/ub.py:139
+msgid "Show author selection"
+msgstr "បង្ហាញជម្រើសអ្នកនិពន្ធ"
+
+#: cps/templates/index.xml:68 cps/ub.py:141
+msgid "Publishers"
+msgstr ""
+
+#: cps/ub.py:143
+msgid "Show publisher selection"
+msgstr ""
+
+#: cps/templates/search_form.html:74 cps/ub.py:144
+msgid "Languages"
+msgstr "ភាសានានា"
+
+#: cps/ub.py:147
+msgid "Show language selection"
+msgstr "បង្ហាញផ្នែកភាសា"
+
+#: cps/ub.py:148
+msgid "Ratings"
+msgstr ""
+
+#: cps/ub.py:150
+msgid "Show ratings selection"
+msgstr ""
+
+#: cps/ub.py:151
+msgid "File formats"
+msgstr ""
+
+#: cps/ub.py:153
+msgid "Show file formats selection"
+msgstr ""
+
+#: cps/updater.py:257 cps/updater.py:364 cps/updater.py:377
+msgid "Unexpected data while reading update information"
+msgstr ""
+
+#: cps/updater.py:264 cps/updater.py:370
+msgid "No update available. You already have the latest version installed"
+msgstr ""
+
+#: cps/updater.py:290 cps/updater.py:422
+msgid "A new update is available. Click on the button below to update to the latest version."
+msgstr ""
+
+#: cps/updater.py:343
+msgid "Could not fetch update information"
+msgstr ""
+
+#: cps/updater.py:357
+msgid "No release information available"
+msgstr ""
+
+#: cps/updater.py:403 cps/updater.py:412
+#, python-format
+msgid "A new update is available. Click on the button below to update to version: %(version)s"
+msgstr ""
+
+#: cps/web.py:457
+msgid "Recently Added Books"
+msgstr "សៀវភៅដែលទើបបានបន្ថែម"
+
+#: cps/web.py:484
+msgid "Best rated books"
+msgstr "សៀវភៅដែលត្រូវបានវាយតម្លៃល្អជាងគេ"
+
+#: cps/templates/index.xml:38 cps/web.py:492
+msgid "Random Books"
+msgstr "សៀវភៅចៃដន្យ"
+
+#: cps/web.py:516
+msgid "Books"
+msgstr ""
+
+#: cps/web.py:543
+msgid "Hot Books (most downloaded)"
+msgstr "សៀវភៅដែលត្រូវបានទាញយកច្រើនជាងគេ"
+
+#: cps/web.py:553 cps/web.py:1294 cps/web.py:1383
+msgid "Error opening eBook. File does not exist or file is not accessible:"
+msgstr "មានបញ្ហាពេលបើកឯកសារ eBook ។ មិនមានឯកសារនេះ ឬមិនអាចបើកបាន៖"
+
+#: cps/web.py:580
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr ""
+
+#: cps/web.py:591
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "ស៊េរី៖ %(serie)s"
+
+#: cps/web.py:602
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr ""
+
+#: cps/web.py:613
+#, python-format
+msgid "File format: %(format)s"
+msgstr ""
+
+#: cps/web.py:625
+#, python-format
+msgid "Category: %(name)s"
+msgstr "ប្រភេទ៖ %(name)s"
+
+#: cps/web.py:659
+msgid "Publisher list"
+msgstr ""
+
+#: cps/templates/index.xml:82 cps/web.py:675
+msgid "Series list"
+msgstr "បញ្ជីស៊េរី"
+
+#: cps/web.py:689
+msgid "Ratings list"
+msgstr ""
+
+#: cps/web.py:702
+msgid "File formats list"
+msgstr ""
+
+#: cps/web.py:730
+msgid "Available languages"
+msgstr "ភាសាដែលមាន"
+
+#: cps/web.py:750
+#, python-format
+msgid "Language: %(name)s"
+msgstr "ភាសា៖ %(name)s"
+
+#: cps/templates/index.xml:75 cps/web.py:764
+msgid "Category list"
+msgstr "បញ្ជីប្រភេទ"
+
+#: cps/templates/layout.html:73 cps/web.py:777
+msgid "Tasks"
+msgstr "កិច្ចការនានា"
+
+#: cps/web.py:841
+msgid "Published after "
+msgstr "បានបោះពុម្ភក្រោយ  "
+
+#: cps/web.py:848
+msgid "Published before "
+msgstr "បានបោះពុម្ភមុន  "
+
+#: cps/web.py:862
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "ការវាយតម្លៃ <= %(rating)s"
+
+#: cps/web.py:864
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "ការវាយតម្លៃ >= %(rating)s"
+
+#: cps/web.py:924 cps/web.py:933
+msgid "search"
+msgstr "ស្វែងរក"
+
+#: cps/web.py:1018
+msgid "Please configure the SMTP mail settings first..."
+msgstr "សូមកំណត់អ៊ីមែល SMTP ជាមុនសិន"
+
+#: cps/web.py:1023
+#, python-format
+msgid "Book successfully queued for sending to %(kindlemail)s"
+msgstr "សៀវភៅបានចូលជួរសម្រាប់ផ្ញើទៅ %(kindlemail)s ដោយជោគជ័យ"
+
+#: cps/web.py:1027
+#, python-format
+msgid "There was an error sending this book: %(res)s"
+msgstr "មានបញ្ហានៅពេលផ្ញើសៀវភៅនេះ៖ %(res)s"
+
+#: cps/web.py:1046 cps/web.py:1071 cps/web.py:1076 cps/web.py:1081
+#: cps/web.py:1085
+msgid "register"
+msgstr "ចុះឈ្មោះ"
+
+#: cps/web.py:1073
+msgid "Your e-mail is not allowed to register"
+msgstr ""
+
+#: cps/web.py:1077
+msgid "Confirmation e-mail was send to your e-mail account."
+msgstr ""
+
+#: cps/web.py:1080
+msgid "This username or e-mail address is already in use."
+msgstr ""
+
+#: cps/web.py:1103 cps/web.py:1115
+#, python-format
+msgid "You are now logged in as: '%(nickname)s'"
+msgstr ""
+
+#: cps/web.py:1108 cps/web.py:1120
+msgid "Wrong Username or Password"
+msgstr "ខុសឈ្មោះអ្នកប្រើប្រាស់ ឬលេខសម្ងាត់"
+
+#: cps/web.py:1111
+msgid "Could not login. LDAP server down, please contact your administrator"
+msgstr ""
+
+#: cps/web.py:1124 cps/web.py:1146
+msgid "login"
+msgstr "ចូលប្រើ"
+
+#: cps/web.py:1158 cps/web.py:1189
+msgid "Token not found"
+msgstr "រកមិនឃើញវត្ថុតាង"
+
+#: cps/web.py:1166 cps/web.py:1197
+msgid "Token has expired"
+msgstr "វត្ថុតាងហួសពេលកំណត់"
+
+#: cps/web.py:1174
+msgid "Success! Please return to your device"
+msgstr "ជោគជ័យ! សូមវិលមកឧបករណ៍អ្នកវិញ"
+
+#: cps/web.py:1210
+#, python-format
+msgid "you are now logged in as: '%(nickname)s'"
+msgstr "ឥឡូវអ្នកបានចូលដោយមានឈ្មោះថា៖ ‘%(nickname)s’"
+
+#: cps/web.py:1250 cps/web.py:1277 cps/web.py:1281
+#, python-format
+msgid "%(name)s's profile"
+msgstr "ព័ត៌មានសង្ខេបរបស់ %(name)s"
+
+#: cps/web.py:1274
+msgid "Found an existing account for this e-mail address."
+msgstr ""
+
+#: cps/web.py:1279
+msgid "Profile updated"
+msgstr "ព័ត៌មានសង្ខេបបានកែប្រែ"
+
+#: cps/web.py:1304 cps/web.py:1306 cps/web.py:1308 cps/web.py:1314
+#: cps/web.py:1318
+msgid "Read a Book"
+msgstr "អានសៀវភៅ"
+
+#: cps/web.py:1328
+msgid "Error opening eBook. File does not exist or file is not accessible."
+msgstr ""
+
+#: cps/worker.py:308
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Ebook-converter បានបរាជ័យ៖ %(error)s"
 
-#: cps/worker.py:316
+#: cps/worker.py:319
 #, python-format
 msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "Kindlegen បានបរាជ័យដោយមានកំហុស %(error)s. សារ៖ %(message)s"
@@ -781,147 +970,152 @@ msgstr "ឯកសារ DLS"
 msgid "Admin"
 msgstr "រដ្ឋបាល"
 
-#: cps/templates/admin.html:14 cps/templates/detail.html:22
-#: cps/templates/detail.html:31
+#: cps/templates/admin.html:14 cps/templates/detail.html:18
+#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/shelfdown.html:62
 msgid "Download"
 msgstr "ទាញយក"
 
-#: cps/templates/admin.html:15 cps/templates/layout.html:65
+#: cps/templates/admin.html:15
+msgid "View Ebooks"
+msgstr ""
+
+#: cps/templates/admin.html:16 cps/templates/layout.html:65
 msgid "Upload"
 msgstr "អាប់ឡូដ"
 
-#: cps/templates/admin.html:16
+#: cps/templates/admin.html:17
 msgid "Edit"
 msgstr "កែប្រែ"
 
-#: cps/templates/admin.html:39
+#: cps/templates/admin.html:41
 msgid "SMTP e-mail server settings"
 msgstr ""
 
-#: cps/templates/admin.html:42 cps/templates/email_edit.html:11
+#: cps/templates/admin.html:44 cps/templates/email_edit.html:11
 msgid "SMTP hostname"
 msgstr "ឈ្មោះម៉ាស៊ីន SMTP"
 
-#: cps/templates/admin.html:43
+#: cps/templates/admin.html:45
 msgid "SMTP port"
 msgstr "លេខ port SMTP"
 
-#: cps/templates/admin.html:44
+#: cps/templates/admin.html:46
 msgid "SSL"
 msgstr "SSL"
 
-#: cps/templates/admin.html:45 cps/templates/email_edit.html:27
+#: cps/templates/admin.html:47 cps/templates/email_edit.html:27
 msgid "SMTP login"
 msgstr "អ្នកចូលប្រើ SMTP"
 
-#: cps/templates/admin.html:46
+#: cps/templates/admin.html:48
 msgid "From mail"
 msgstr "ពីអ៊ីមែល"
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:58
 msgid "Change SMTP settings"
 msgstr "ប្តូរការកំណត់ SMTP"
 
-#: cps/templates/admin.html:62
+#: cps/templates/admin.html:64
 msgid "Configuration"
 msgstr "ការកំណត់"
 
-#: cps/templates/admin.html:65
+#: cps/templates/admin.html:67
 msgid "Calibre DB dir"
 msgstr "ទីតាំង database Calibre"
 
-#: cps/templates/admin.html:69
+#: cps/templates/admin.html:71
 msgid "Log level"
 msgstr ""
 
-#: cps/templates/admin.html:73
+#: cps/templates/admin.html:75
 msgid "Port"
 msgstr "លេខ port"
 
-#: cps/templates/admin.html:79 cps/templates/config_view_edit.html:23
+#: cps/templates/admin.html:81 cps/templates/config_view_edit.html:23
 msgid "Books per page"
 msgstr "ចំនួនសៀវភៅក្នុងមួយទំព័រ"
 
-#: cps/templates/admin.html:83
+#: cps/templates/admin.html:85
 msgid "Uploading"
 msgstr "កំពុងអាប់ឡូដ"
 
-#: cps/templates/admin.html:87
+#: cps/templates/admin.html:89
 msgid "Anonymous browsing"
 msgstr ""
 
-#: cps/templates/admin.html:91
+#: cps/templates/admin.html:93
 msgid "Public registration"
 msgstr "ការចុះឈ្មាះសាធារណៈ"
 
-#: cps/templates/admin.html:95 cps/templates/remote_login.html:4
+#: cps/templates/admin.html:97 cps/templates/remote_login.html:4
 msgid "Remote login"
 msgstr "ការចូលប្រើប្រាស់ពីចម្ងាយ"
 
-#: cps/templates/admin.html:106
+#: cps/templates/admin.html:108
 msgid "Administration"
 msgstr "កិច្ចការរដ្ឋបាល"
 
-#: cps/templates/admin.html:107
+#: cps/templates/admin.html:109
 msgid "Reconnect to Calibre DB"
 msgstr "ភ្ជាប់ទៅ database Calibre ម្តងទៀត"
 
-#: cps/templates/admin.html:108
+#: cps/templates/admin.html:110
 msgid "Restart Calibre-Web"
 msgstr ""
 
-#: cps/templates/admin.html:109
+#: cps/templates/admin.html:111
 msgid "Stop Calibre-Web"
 msgstr ""
 
-#: cps/templates/admin.html:115
+#: cps/templates/admin.html:117
 msgid "Update"
 msgstr ""
 
-#: cps/templates/admin.html:119
+#: cps/templates/admin.html:121
 msgid "Version"
 msgstr ""
 
-#: cps/templates/admin.html:120
+#: cps/templates/admin.html:122
 msgid "Details"
 msgstr ""
 
-#: cps/templates/admin.html:126
+#: cps/templates/admin.html:128
 msgid "Current version"
 msgstr ""
 
-#: cps/templates/admin.html:132
+#: cps/templates/admin.html:134
 msgid "Check for update"
 msgstr "រកមើលបច្ចុប្បន្នភាព"
 
-#: cps/templates/admin.html:133
+#: cps/templates/admin.html:135
 msgid "Perform Update"
 msgstr "ធ្វើបច្ចុប្បន្នភាព"
 
-#: cps/templates/admin.html:145
+#: cps/templates/admin.html:147
 msgid "Do you really want to restart Calibre-Web?"
 msgstr ""
 
-#: cps/templates/admin.html:150 cps/templates/admin.html:164
-#: cps/templates/admin.html:184 cps/templates/shelf.html:73
+#: cps/templates/admin.html:152 cps/templates/admin.html:166
+#: cps/templates/admin.html:186 cps/templates/shelf.html:72
 msgid "Ok"
 msgstr "បាទ/ចាស"
 
-#: cps/templates/admin.html:151 cps/templates/admin.html:165
-#: cps/templates/book_edit.html:178 cps/templates/book_edit.html:200
-#: cps/templates/config_edit.html:226 cps/templates/config_view_edit.html:179
-#: cps/templates/email_edit.html:40 cps/templates/email_edit.html:75
-#: cps/templates/layout.html:28 cps/templates/shelf.html:74
+#: cps/templates/admin.html:153 cps/templates/admin.html:167
+#: cps/templates/book_edit.html:174 cps/templates/book_edit.html:196
+#: cps/templates/config_edit.html:281 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/user_edit.html:149
+#: cps/templates/user_edit.html:132
 msgid "Back"
 msgstr "មកក្រោយ"
 
-#: cps/templates/admin.html:163
+#: cps/templates/admin.html:165
 msgid "Do you really want to stop Calibre-Web?"
 msgstr ""
 
-#: cps/templates/admin.html:175
+#: cps/templates/admin.html:177
 msgid "Updating, please do not reload page"
 msgstr "កំពុងធ្វើបច្ចុប្បន្នភាព សូមកុំបើកទំព័រជាថ្មី"
 
@@ -933,176 +1127,176 @@ msgstr "តាមរយៈ"
 msgid "In Library"
 msgstr "នៅក្នុងបណ្ណាល័យ"
 
-#: cps/templates/author.html:50 cps/templates/author.html:97
-#: cps/templates/discover.html:28 cps/templates/index.html:31
-#: cps/templates/index.html:86 cps/templates/search.html:55
-#: cps/templates/shelf.html:37
+#: cps/templates/author.html:34 cps/templates/list.html:14
+#: cps/templates/search.html:41
+msgid "All"
+msgstr ""
+
+#: cps/templates/author.html:58 cps/templates/author.html:105
+#: 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 ""
 
-#: cps/templates/author.html:81
+#: cps/templates/author.html:89
 msgid "More by"
 msgstr "បន្ថែមទៀតដោយ"
 
-#: cps/templates/book_edit.html:16
+#: cps/templates/book_edit.html:12
 msgid "Delete Book"
 msgstr "លុបសៀវភៅ"
 
-#: cps/templates/book_edit.html:19
+#: cps/templates/book_edit.html:15
 msgid "Delete formats:"
 msgstr "លុបឯកសារទម្រង់៖"
 
-#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:199
-#: cps/templates/email_edit.html:73 cps/templates/email_edit.html:74
+#: cps/templates/book_edit.html:18 cps/templates/book_edit.html:195
+#: cps/templates/email_edit.html:73
 msgid "Delete"
 msgstr "លុប"
 
-#: cps/templates/book_edit.html:30
+#: cps/templates/book_edit.html:26
 msgid "Convert book format:"
 msgstr ""
 
-#: cps/templates/book_edit.html:34
+#: cps/templates/book_edit.html:30
 msgid "Convert from:"
 msgstr ""
 
-#: cps/templates/book_edit.html:36 cps/templates/book_edit.html:43
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
 msgstr ""
 
-#: cps/templates/book_edit.html:41
+#: cps/templates/book_edit.html:37
 msgid "Convert to:"
 msgstr ""
 
-#: cps/templates/book_edit.html:50
+#: cps/templates/book_edit.html:46
 msgid "Convert book"
 msgstr ""
 
-#: cps/templates/book_edit.html:59 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:55 cps/templates/search_form.html:6
 msgid "Book Title"
 msgstr "ចំណងជើងសៀវភៅ"
 
-#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:259
-#: cps/templates/book_edit.html:277 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:59 cps/templates/book_edit.html:255
+#: cps/templates/book_edit.html:273 cps/templates/search_form.html:10
 msgid "Author"
 msgstr "អ្នកនិពន្ធ"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:264
-#: cps/templates/book_edit.html:279 cps/templates/search_form.html:106
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:260
+#: cps/templates/book_edit.html:275 cps/templates/search_form.html:106
 msgid "Description"
 msgstr "ពិពណ៌នា"
 
-#: cps/templates/book_edit.html:71 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:67 cps/templates/search_form.html:33
 msgid "Tags"
 msgstr "Tag"
 
-#: cps/templates/book_edit.html:75 cps/templates/layout.html:159
-#: cps/templates/search_form.html:53
-msgid "Series"
-msgstr "ស៊េរី"
-
-#: cps/templates/book_edit.html:79
+#: cps/templates/book_edit.html:75
 msgid "Series id"
 msgstr "លេខសម្គាល់ស៊េរី"
 
-#: cps/templates/book_edit.html:83
+#: cps/templates/book_edit.html:79
 msgid "Rating"
 msgstr "ការវាយតម្លៃ"
 
-#: cps/templates/book_edit.html:87
+#: cps/templates/book_edit.html:83
 msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
 msgstr "URL របស់ក្របមុខ (ឯកសារ JPG ក្របមុខត្រូវបានទាញយក និងរក្សាទុកក្នុង database ក្រោយមកចន្លោះនេះទទេម្តងទៀត)"
 
-#: cps/templates/book_edit.html:91
+#: cps/templates/book_edit.html:87
 msgid "Upload Cover from local drive"
 msgstr ""
 
-#: cps/templates/book_edit.html:96 cps/templates/detail.html:148
+#: cps/templates/book_edit.html:92 cps/templates/detail.html:168
 msgid "Publishing date"
 msgstr "ថ្ងៃបោះពុម្ភ"
 
-#: cps/templates/book_edit.html:103 cps/templates/book_edit.html:261
-#: cps/templates/book_edit.html:278 cps/templates/detail.html:139
+#: cps/templates/book_edit.html:99 cps/templates/book_edit.html:257
+#: cps/templates/book_edit.html:274 cps/templates/detail.html:159
 #: cps/templates/search_form.html:14
 msgid "Publisher"
 msgstr "អ្នកបោះពុម្ភ"
 
-#: cps/templates/book_edit.html:107 cps/templates/user_edit.html:31
+#: cps/templates/book_edit.html:103 cps/templates/user_edit.html:31
 msgid "Language"
 msgstr "ភាសា"
 
-#: cps/templates/book_edit.html:117 cps/templates/search_form.html:117
+#: cps/templates/book_edit.html:113 cps/templates/search_form.html:117
 msgid "Yes"
 msgstr "បាទ/ចាស"
 
-#: cps/templates/book_edit.html:118 cps/templates/search_form.html:118
+#: cps/templates/book_edit.html:114 cps/templates/search_form.html:118
 msgid "No"
 msgstr "ទេ"
 
-#: cps/templates/book_edit.html:164
+#: cps/templates/book_edit.html:160
 msgid "Upload format"
 msgstr "ទម្រង់អាប់ឡូដ"
 
-#: cps/templates/book_edit.html:173
+#: cps/templates/book_edit.html:169
 msgid "view book after edit"
 msgstr "មើលសៀវភៅក្រោយពីកែប្រែ"
 
-#: cps/templates/book_edit.html:176 cps/templates/book_edit.html:212
+#: cps/templates/book_edit.html:172 cps/templates/book_edit.html:208
 msgid "Get metadata"
 msgstr "មើលទិន្នន័យមេតា"
 
-#: cps/templates/book_edit.html:177 cps/templates/config_edit.html:224
-#: cps/templates/config_view_edit.html:178 cps/templates/login.html:20
+#: cps/templates/book_edit.html:173 cps/templates/config_edit.html:279
+#: cps/templates/config_view_edit.html:146 cps/templates/login.html:20
 #: cps/templates/search_form.html:150 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:147
+#: cps/templates/user_edit.html:130
 msgid "Submit"
 msgstr "បញ្ចូល"
 
-#: cps/templates/book_edit.html:191
+#: cps/templates/book_edit.html:187
 msgid "Are you really sure?"
 msgstr ""
 
-#: cps/templates/book_edit.html:194
+#: cps/templates/book_edit.html:190
 msgid "Book will be deleted from Calibre database"
 msgstr "សៀវភៅនឹងត្រូវលុបចេញពី database របស់ Calibre"
 
-#: cps/templates/book_edit.html:195
+#: cps/templates/book_edit.html:191
 msgid "and from hard disk"
 msgstr "និងពីថាសរឹង"
 
-#: cps/templates/book_edit.html:215
+#: cps/templates/book_edit.html:211
 msgid "Keyword"
 msgstr "ពាក្យគន្លឹះ"
 
-#: cps/templates/book_edit.html:216
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr "ស្វែងរកពាក្យគន្លឹះ"
 
-#: cps/templates/book_edit.html:218 cps/templates/layout.html:47
+#: cps/templates/book_edit.html:214 cps/templates/layout.html:47
 msgid "Go!"
 msgstr "ទៅ!"
 
-#: cps/templates/book_edit.html:222
+#: cps/templates/book_edit.html:218
 msgid "Click the cover to load metadata to the form"
 msgstr "ចុចលើគម្របដើម្បីបញ្ចូលទិន្នន័យមេតាទៅក្នុង form"
 
-#: cps/templates/book_edit.html:234 cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:230 cps/templates/book_edit.html:270
 msgid "Loading..."
 msgstr "កំពុងដំណើរការ..."
 
-#: cps/templates/book_edit.html:239 cps/templates/layout.html:226
-#: cps/templates/layout.html:258
+#: cps/templates/book_edit.html:235 cps/templates/layout.html:187
+#: cps/templates/layout.html:219
 msgid "Close"
 msgstr "បិទ"
 
-#: cps/templates/book_edit.html:266 cps/templates/book_edit.html:280
+#: cps/templates/book_edit.html:262 cps/templates/book_edit.html:276
 msgid "Source"
 msgstr "ប្រភព"
 
-#: cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:271
 msgid "Search error!"
 msgstr "ការស្វែងរកមានកំហុស!"
 
-#: cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:272
 msgid "No Result(s) found! Please try aonther keyword."
 msgstr ""
 
@@ -1230,35 +1424,87 @@ msgstr "Goodreads API key"
 msgid "Goodreads API Secret"
 msgstr "Goodreads API secret"
 
-#: cps/templates/config_edit.html:187
+#: cps/templates/config_edit.html:181
+msgid "Login type"
+msgstr ""
+
+#: cps/templates/config_edit.html:183
+msgid "Use standard Authentication"
+msgstr ""
+
+#: cps/templates/config_edit.html:185
+msgid "Use LDAP Authentication"
+msgstr ""
+
+#: cps/templates/config_edit.html:188
+msgid "Use GitHub OAuth"
+msgstr ""
+
+#: cps/templates/config_edit.html:189
+msgid "Use Google OAuth"
+msgstr ""
+
+#: cps/templates/config_edit.html:196
+msgid "LDAP Provider URL"
+msgstr ""
+
+#: cps/templates/config_edit.html:200
+msgid "LDAP Distinguished Name (DN)"
+msgstr ""
+
+#: cps/templates/config_edit.html:208
+msgid "Obtain GitHub OAuth Credential"
+msgstr ""
+
+#: cps/templates/config_edit.html:211
+msgid "GitHub OAuth Client Id"
+msgstr ""
+
+#: cps/templates/config_edit.html:215
+msgid "GitHub OAuth Client Secret"
+msgstr ""
+
+#: cps/templates/config_edit.html:221
+msgid "Obtain Google OAuth Credential"
+msgstr ""
+
+#: cps/templates/config_edit.html:224
+msgid "Google OAuth Client Id"
+msgstr ""
+
+#: cps/templates/config_edit.html:228
+msgid "Google OAuth Client Secret"
+msgstr ""
+
+#: cps/templates/config_edit.html:242
 msgid "External binaries"
 msgstr ""
 
-#: cps/templates/config_edit.html:195
+#: cps/templates/config_edit.html:250
 msgid "No converter"
 msgstr "គ្មានកម្មវិធីបម្លែង"
 
-#: cps/templates/config_edit.html:197
+#: cps/templates/config_edit.html:252
 msgid "Use Kindlegen"
 msgstr "ប្រើ Kindlegen"
 
-#: cps/templates/config_edit.html:199
+#: cps/templates/config_edit.html:254
 msgid "Use calibre's ebook converter"
 msgstr "ប្រើកម្មវិធីបម្លែង eBook របស់ Calibre"
 
-#: cps/templates/config_edit.html:203
+#: cps/templates/config_edit.html:258
 msgid "E-Book converter settings"
 msgstr "ការកំណត់របស់កម្មវិធីបម្លែង eBook"
 
-#: cps/templates/config_edit.html:207
+#: cps/templates/config_edit.html:262
 msgid "Path to convertertool"
 msgstr "ទីតាំងរបស់កម្មវិធីបម្លែង"
 
-#: cps/templates/config_edit.html:213
+#: cps/templates/config_edit.html:268
 msgid "Location of Unrar binary"
 msgstr ""
 
-#: cps/templates/config_edit.html:229 cps/templates/layout.html:84
+#: cps/templates/config_edit.html:284 cps/templates/layout.html:84
 #: cps/templates/login.html:4
 msgid "Login"
 msgstr "ចូលប្រើប្រាស់"
@@ -1267,8 +1513,7 @@ msgstr "ចូលប្រើប្រាស់"
 msgid "View Configuration"
 msgstr "មើលការកំណត់"
 
-#: cps/templates/config_view_edit.html:19 cps/templates/layout.html:135
-#: cps/templates/layout.html:136 cps/templates/shelf_edit.html:7
+#: cps/templates/config_view_edit.html:19 cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr "ចំណងជើង"
 
@@ -1280,7 +1525,7 @@ msgstr "ចំនួនសៀវភៅចៃដន្យដើម្បីបង
 msgid "No. of authors to show before hiding (0=disable hiding)"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:118
+#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:112
 msgid "Theme"
 msgstr "ការតុបតែង"
 
@@ -1312,127 +1557,91 @@ msgstr "Tag សម្រាប់មាតិកាសម្រាប់មន
 msgid "Default settings for new users"
 msgstr "ការកំណត់មកស្រាប់សម្រាប់អ្នកប្រើប្រាស់ថ្មី"
 
-#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:104
+#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:83
 msgid "Admin user"
 msgstr "អ្នកប្រើប្រាស់រដ្ឋបាល"
 
-#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:113
+#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:92
 msgid "Allow Downloads"
 msgstr "អនុញ្ញាតឲទាញយក"
 
-#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:117
+#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:96
+msgid "Allow book viewer"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:100
 msgid "Allow Uploads"
 msgstr "អនុញ្ញាតឲអាប់ឡូត"
 
-#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:121
+#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:104
 msgid "Allow Edit"
 msgstr "អនុញ្ញាតឲកែប្រែ"
 
-#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:125
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:108
 msgid "Allow Delete books"
 msgstr "អនុញ្ញាតឲលុបសៀវភៅ"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:130
+#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:113
 msgid "Allow Changing Password"
 msgstr "អនុញ្ញាតឲប្តូរលេខសម្ងាត់"
 
-#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:134
+#: cps/templates/config_view_edit.html:109 cps/templates/user_edit.html:117
 msgid "Allow Editing Public Shelfs"
 msgstr "អនុញ្ញាតឲកែប្រែធ្នើសាធារណៈ"
 
-#: cps/templates/config_view_edit.html:115
+#: cps/templates/config_view_edit.html:119
 msgid "Default visibilities for new users"
 msgstr "ភាពមើលឃើញដែលមកស្រាប់សម្រាប់អ្នកប្រើប្រាស់ថ្មី"
 
-#: cps/templates/config_view_edit.html:123 cps/templates/user_edit.html:50
-msgid "Show random books"
-msgstr "បង្ហាញសៀវភៅចៃដន្យ"
-
-#: cps/templates/config_view_edit.html:127 cps/templates/user_edit.html:54
-msgid "Show recent books"
-msgstr "បង្ហាញសៀវភៅមកថ្មី"
-
-#: cps/templates/config_view_edit.html:131 cps/templates/user_edit.html:58
-msgid "Show sorted books"
-msgstr "បង្ហាញសៀវភៅដែលរៀបតាមលំដាប់"
-
-#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:62
-msgid "Show hot books"
-msgstr "បង្ហាញសៀវភៅដែលមានប្រជាប្រិយភាព"
-
-#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:66
-msgid "Show best rated books"
-msgstr "បង្ហាញសៀវភៅដែលមានការវាយតម្លៃល្អជាងគេ"
-
-#: cps/templates/config_view_edit.html:143 cps/templates/user_edit.html:70
-msgid "Show language selection"
-msgstr "បង្ហាញផ្នែកភាសា"
-
-#: cps/templates/config_view_edit.html:147 cps/templates/user_edit.html:74
-msgid "Show series selection"
-msgstr "បង្ហាញជម្រើសស៊េរី"
-
-#: cps/templates/config_view_edit.html:151 cps/templates/user_edit.html:78
-msgid "Show category selection"
-msgstr "បង្ហាញជម្រើសប្រភេទ"
-
-#: cps/templates/config_view_edit.html:155 cps/templates/user_edit.html:82
-msgid "Show author selection"
-msgstr "បង្ហាញជម្រើសអ្នកនិពន្ធ"
-
-#: cps/templates/config_view_edit.html:159 cps/templates/user_edit.html:86
-msgid "Show publisher selection"
-msgstr ""
-
-#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:91
-msgid "Show read and unread"
-msgstr "បង្ហាញអានរួច និងមិនទាន់អាន"
-
-#: cps/templates/config_view_edit.html:167 cps/templates/user_edit.html:96
+#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:75
 msgid "Show random books in detail view"
 msgstr "បង្ហាញសៀវភៅចៃដន្យក្នុងការបង្ហាញជាពិស្តារ"
 
-#: cps/templates/config_view_edit.html:171 cps/templates/user_edit.html:109
+#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:88
 msgid "Show mature content"
 msgstr "បង្ហាញមាតិកាសម្រាប់មនុស្សពេញវ័យ"
 
-#: cps/templates/detail.html:63
+#: cps/templates/detail.html:59
 msgid "Read in browser"
 msgstr "អានក្នុងកម្មវិធី browser"
 
-#: cps/templates/detail.html:100
+#: cps/templates/detail.html:73
+msgid "Listen in browser"
+msgstr ""
+
+#: cps/templates/detail.html:120
 msgid "Book"
 msgstr "សៀវភៅ"
 
-#: cps/templates/detail.html:100
+#: cps/templates/detail.html:120
 msgid "of"
 msgstr "នៃ"
 
-#: cps/templates/detail.html:106
+#: cps/templates/detail.html:126
 msgid "language"
 msgstr "ភាសា"
 
-#: cps/templates/detail.html:185
+#: cps/templates/detail.html:203
 msgid "Mark As Unread"
 msgstr ""
 
-#: cps/templates/detail.html:185
+#: cps/templates/detail.html:203
 msgid "Mark As Read"
 msgstr ""
 
-#: cps/templates/detail.html:186
+#: cps/templates/detail.html:204
 msgid "Read"
 msgstr "អាន"
 
-#: cps/templates/detail.html:196
+#: cps/templates/detail.html:214 cps/templates/listenmp3.html:54
 msgid "Description:"
 msgstr "ពិពណ៌នា"
 
-#: cps/templates/detail.html:209 cps/templates/search.html:14
+#: cps/templates/detail.html:227 cps/templates/search.html:14
 msgid "Add to shelf"
 msgstr "បន្ថែមទៅធ្នើ"
 
-#: cps/templates/detail.html:271
+#: cps/templates/detail.html:289
 msgid "Edit metadata"
 msgstr "កែប្រែទិន្នន័យមេតា"
 
@@ -1492,12 +1701,12 @@ msgstr ""
 msgid "Do you really want to delete this domain rule?"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:210
+#: cps/templates/feed.xml:21 cps/templates/layout.html:171
 msgid "Next"
 msgstr "បន្ទាប់"
 
-#: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:44 cps/templates/layout.html:45
+#: cps/templates/feed.xml:33 cps/templates/layout.html:44
+#: cps/templates/layout.html:45
 msgid "Search"
 msgstr "ស្វែងរក"
 
@@ -1509,75 +1718,63 @@ msgstr ""
 msgid "Discover (Random Books)"
 msgstr "ស្រាវជ្រាវ (សៀវភៅចៃដន្យ)"
 
+#: cps/templates/index.html:65
+msgid "Group by series"
+msgstr ""
+
 #: cps/templates/index.xml:6
 msgid "Start"
 msgstr "ចាប់ផ្តើម"
 
-#: cps/templates/index.xml:18 cps/templates/layout.html:141
-msgid "Hot Books"
-msgstr "សៀវភៅដែលមានប្រជាប្រិយភាព"
-
-#: cps/templates/index.xml:22
+#: cps/templates/index.xml:21
 msgid "Popular publications from this catalog based on Downloads."
 msgstr "ការបោះពុម្ភផ្សាយដែលមានប្រជាប្រិយភាពពីកាតាឡុកនេះផ្អែកលើការទាញយក"
 
-#: cps/templates/index.xml:25 cps/templates/layout.html:144
-msgid "Best rated Books"
-msgstr "សៀវភៅដែលមានការវាយតម្លៃល្អជាងគេ"
-
-#: cps/templates/index.xml:29
+#: cps/templates/index.xml:28
 msgid "Popular publications from this catalog based on Rating."
 msgstr "ការបោះពុម្ភផ្សាយដែលមានប្រជាប្រិយភាពពីកាតាឡុកនេះផ្អែកលើការវាយតម្លៃ"
 
-#: cps/templates/index.xml:32
+#: cps/templates/index.xml:31
 msgid "New Books"
 msgstr "សៀវភៅថ្មីៗ"
 
-#: cps/templates/index.xml:36
+#: cps/templates/index.xml:35
 msgid "The latest Books"
 msgstr "សៀវភៅចុងក្រោយគេ"
 
-#: cps/templates/index.xml:43
+#: cps/templates/index.xml:42
 msgid "Show Random Books"
 msgstr "បង្ហាញសៀវភៅចៃដន្យ"
 
-#: cps/templates/index.xml:62 cps/templates/layout.html:162
-msgid "Authors"
-msgstr "អ្នកនិពន្ធ"
-
-#: cps/templates/index.xml:66
+#: cps/templates/index.xml:65
 msgid "Books ordered by Author"
 msgstr "សៀវភៅរៀបតាមលំដាប់អ្នកនិពន្ធ"
 
-#: cps/templates/index.xml:69 cps/templates/layout.html:165
-msgid "Publishers"
-msgstr ""
-
-#: cps/templates/index.xml:73
+#: cps/templates/index.xml:72
 msgid "Books ordered by publisher"
 msgstr ""
 
-#: cps/templates/index.xml:80
+#: cps/templates/index.xml:79
 msgid "Books ordered by category"
 msgstr "សៀវភៅរៀបតាមលំដាប់ប្រភេទ"
 
-#: cps/templates/index.xml:87
+#: cps/templates/index.xml:86
 msgid "Books ordered by series"
 msgstr "សៀវភៅរៀបតាមលំដាប់ស៊េរី"
 
-#: cps/templates/index.xml:90 cps/templates/layout.html:171
+#: cps/templates/index.xml:89 cps/templates/layout.html:132
 msgid "Public Shelves"
 msgstr "ធ្នើសាធារណៈ"
 
-#: cps/templates/index.xml:94
+#: cps/templates/index.xml:93
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr "សៀវភៅដែលរៀបចំនៅក្នុងធ្នើសាធារណៈ អាចមើលឃើញដោយគ្រប់គ្នា"
 
-#: cps/templates/index.xml:98 cps/templates/layout.html:175
+#: cps/templates/index.xml:97 cps/templates/layout.html:136
 msgid "Your Shelves"
 msgstr "ធ្នើរបស់អ្នក"
 
-#: cps/templates/index.xml:102
+#: cps/templates/index.xml:101
 msgid "User's own shelfs, only visible to the current user himself"
 msgstr "ធ្នើផ្ទាល់ខ្លួនរបស់អ្នកប្រើប្រាស់ អាចមើលឃើញដោយអ្នកប្រើប្រាស់នេះប៉ុណ្ណោះ"
 
@@ -1594,7 +1791,7 @@ msgid "Advanced Search"
 msgstr "ស្វែងរកកម្រិតខ្ពស់"
 
 #: cps/templates/layout.html:76 cps/templates/read.html:71
-#: cps/templates/readcbr.html:89 cps/templates/readcbr.html:113
+#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
 msgid "Settings"
 msgstr "ការកំណត់"
 
@@ -1610,7 +1807,7 @@ msgstr "ចេញពីការប្រើប្រាស់"
 msgid "Register"
 msgstr "ចុះឈ្មោះ"
 
-#: cps/templates/layout.html:111 cps/templates/layout.html:257
+#: cps/templates/layout.html:111 cps/templates/layout.html:218
 msgid "Uploading..."
 msgstr "កំពុងអាប់ឡូត..."
 
@@ -1622,68 +1819,27 @@ msgstr "សូមកុំបើកទំព័រជាថ្មី"
 msgid "Browse"
 msgstr "រុករក"
 
-#: cps/templates/layout.html:124
-msgid "Recently Added"
-msgstr "ទើបបន្ថែមថ្មីៗ"
-
-#: cps/templates/layout.html:129
-msgid "Sorted Books"
-msgstr "សៀវភៅរៀបតាមលំដាប់"
-
-#: cps/templates/layout.html:133 cps/templates/layout.html:134
-#: cps/templates/layout.html:135 cps/templates/layout.html:136
-msgid "Sort By"
-msgstr "រៀបតាម"
-
-#: cps/templates/layout.html:133
-msgid "Newest"
-msgstr "ថ្មីជាងគេ"
-
-#: cps/templates/layout.html:134
-msgid "Oldest"
-msgstr "ចាស់ជាងគេ"
-
-#: cps/templates/layout.html:135
-msgid "Ascending"
-msgstr "ពីតូចទៅធំ"
-
-#: cps/templates/layout.html:136
-msgid "Descending"
-msgstr "ពីធំទៅតូច"
-
-#: cps/templates/layout.html:153
-msgid "Discover"
-msgstr "ស្រាវជ្រាវ"
-
-#: cps/templates/layout.html:156
-msgid "Categories"
-msgstr "ប្រភេទនានា"
-
-#: cps/templates/layout.html:168 cps/templates/search_form.html:74
-msgid "Languages"
-msgstr "ភាសានានា"
-
-#: cps/templates/layout.html:180
+#: cps/templates/layout.html:141
 msgid "Create a Shelf"
 msgstr "បង្កើតធ្នើ"
 
-#: cps/templates/layout.html:181 cps/templates/stats.html:3
+#: cps/templates/layout.html:142 cps/templates/stats.html:3
 msgid "About"
 msgstr "អំពី"
 
-#: cps/templates/layout.html:195
+#: cps/templates/layout.html:156
 msgid "Previous"
 msgstr "មុន"
 
-#: cps/templates/layout.html:222
+#: cps/templates/layout.html:183
 msgid "Book Details"
 msgstr "ព័ត៌មានលម្អិតរបស់សៀវភៅ"
 
-#: cps/templates/layout.html:256
+#: cps/templates/layout.html:217
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:259
+#: cps/templates/layout.html:220
 msgid "Error"
 msgstr ""
 
@@ -1713,105 +1869,105 @@ msgstr ""
 msgid "Reflow text when sidebars are open."
 msgstr "សេរេអត្ថបទនៅពេលបើកផ្ទាំងចំហៀង។"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:88
 msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:91
 msgid "Previous Page"
 msgstr ""
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:92
 msgid "Next Page"
 msgstr ""
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:93
 msgid "Scale to Best"
 msgstr ""
 
-#: cps/templates/readcbr.html:100
+#: cps/templates/readcbr.html:94
 msgid "Scale to Width"
 msgstr ""
 
-#: cps/templates/readcbr.html:101
+#: cps/templates/readcbr.html:95
 msgid "Scale to Height"
 msgstr ""
 
-#: cps/templates/readcbr.html:102
+#: cps/templates/readcbr.html:96
 msgid "Scale to Native"
 msgstr ""
 
-#: cps/templates/readcbr.html:103
+#: cps/templates/readcbr.html:97
 msgid "Rotate Right"
 msgstr ""
 
-#: cps/templates/readcbr.html:104
+#: cps/templates/readcbr.html:98
 msgid "Rotate Left"
 msgstr ""
 
-#: cps/templates/readcbr.html:105
+#: cps/templates/readcbr.html:99
 msgid "Flip Image"
 msgstr ""
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:115
 msgid "Light"
 msgstr ""
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:116
 msgid "Dark"
 msgstr ""
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:121
 msgid "Scale"
 msgstr ""
 
-#: cps/templates/readcbr.html:130
+#: cps/templates/readcbr.html:124
 msgid "Best"
 msgstr ""
 
-#: cps/templates/readcbr.html:131
+#: cps/templates/readcbr.html:125
 msgid "Width"
 msgstr ""
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:126
 msgid "Height"
 msgstr ""
 
-#: cps/templates/readcbr.html:133
+#: cps/templates/readcbr.html:127
 msgid "Native"
 msgstr ""
 
-#: cps/templates/readcbr.html:138
+#: cps/templates/readcbr.html:132
 msgid "Rotate"
 msgstr ""
 
-#: cps/templates/readcbr.html:149
+#: cps/templates/readcbr.html:143
 msgid "Flip"
 msgstr ""
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:146
 msgid "Horizontal"
 msgstr ""
 
-#: cps/templates/readcbr.html:153
+#: cps/templates/readcbr.html:147
 msgid "Vertical"
 msgstr ""
 
-#: cps/templates/readcbr.html:158
+#: cps/templates/readcbr.html:152
 msgid "Direction"
 msgstr ""
 
-#: cps/templates/readcbr.html:161
+#: cps/templates/readcbr.html:155
 msgid "Left to Right"
 msgstr ""
 
-#: cps/templates/readcbr.html:162
+#: cps/templates/readcbr.html:156
 msgid "Right to Left"
 msgstr ""
 
 #: cps/templates/readpdf.html:29
-msgid "PDF.js viewer"
-msgstr "កម្មវិធីមើល PDF.js"
+msgid "PDF reader"
+msgstr ""
 
 #: cps/templates/readtxt.html:6
 msgid "Basic txt Reader"
@@ -1885,23 +2041,23 @@ msgstr "ការវាយតម្លៃលើសពី"
 msgid "Rating less than"
 msgstr "ការវាយតម្លៃតិចជាង"
 
-#: cps/templates/shelf.html:7
+#: cps/templates/shelf.html:10
 msgid "Delete this Shelf"
 msgstr "លុបធ្នើនេះ"
 
-#: cps/templates/shelf.html:8
+#: cps/templates/shelf.html:11
 msgid "Edit Shelf"
 msgstr ""
 
-#: cps/templates/shelf.html:9 cps/templates/shelf_order.html:11
+#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:11
 msgid "Change order"
 msgstr "ប្តូរលំដាប់"
 
-#: cps/templates/shelf.html:68
+#: cps/templates/shelf.html:67
 msgid "Do you really want to delete the shelf?"
 msgstr "តើអ្នកពិតជាចង់លុបធ្នើនេះមែនទេ?"
 
-#: cps/templates/shelf.html:71
+#: cps/templates/shelf.html:70
 msgid "Shelf will be lost for everybody and forever!"
 msgstr "ធ្នើនេះនឹងបាត់បង់ជាអចិន្ត្រៃយ៍សម្រាប់គ្រប់គ្នា!"
 
@@ -1989,19 +2145,31 @@ msgstr ""
 msgid "Kindle E-Mail"
 msgstr "អ៊ីមែល Kindle"
 
-#: cps/templates/user_edit.html:39
+#: cps/templates/user_edit.html:40
 msgid "Show books with language"
 msgstr "បង្ហាញសៀវភៅដែលមានភាសា"
 
-#: cps/templates/user_edit.html:41
+#: cps/templates/user_edit.html:42
 msgid "Show all"
 msgstr "បង្ហាញទាំងអស់"
 
-#: cps/templates/user_edit.html:141
+#: cps/templates/user_edit.html:52
+msgid "OAuth Settings"
+msgstr ""
+
+#: cps/templates/user_edit.html:54
+msgid "Link"
+msgstr ""
+
+#: cps/templates/user_edit.html:56
+msgid "Unlink"
+msgstr ""
+
+#: cps/templates/user_edit.html:124
 msgid "Delete this user"
 msgstr "លុបអ្នកប្រើប្រាស់នេះ"
 
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:139
 msgid "Recent Downloads"
 msgstr "ការទាញយកថ្មីៗ"
 
@@ -2110,3 +2278,45 @@ msgstr "ការទាញយកថ្មីៗ"
 #~ msgid "Using your another device, login and visit "
 #~ msgstr ""
 
+#~ msgid "Newest Books"
+#~ msgstr "សៀវភៅថ្មីៗជាងគេ"
+
+#~ msgid "Oldest Books"
+#~ msgstr "សៀវភៅចាស់ជាងគេ"
+
+#~ msgid "Books (A-Z)"
+#~ msgstr "សៀវភៅពី A ទៅ Z"
+
+#~ msgid "Books (Z-A)"
+#~ msgstr "សៀវភៅពី Z ទៅ A"
+
+#~ msgid "Error opening eBook. Fileformat is not supported."
+#~ msgstr ""
+
+#~ msgid "File %(title)s"
+#~ msgstr ""
+
+#~ msgid "Show sorted books"
+#~ msgstr "បង្ហាញសៀវភៅដែលរៀបតាមលំដាប់"
+
+#~ msgid "Sorted Books"
+#~ msgstr "សៀវភៅរៀបតាមលំដាប់"
+
+#~ msgid "Sort By"
+#~ msgstr "រៀបតាម"
+
+#~ msgid "Newest"
+#~ msgstr "ថ្មីជាងគេ"
+
+#~ msgid "Oldest"
+#~ msgstr "ចាស់ជាងគេ"
+
+#~ msgid "Ascending"
+#~ msgstr "ពីតូចទៅធំ"
+
+#~ msgid "Descending"
+#~ msgstr "ពីធំទៅតូច"
+
+#~ msgid "PDF.js viewer"
+#~ msgstr "កម្មវិធីមើល PDF.js"
+
diff --git a/cps/translations/nl/LC_MESSAGES/messages.mo b/cps/translations/nl/LC_MESSAGES/messages.mo
index e727869c..5b4f0125 100644
Binary files a/cps/translations/nl/LC_MESSAGES/messages.mo and b/cps/translations/nl/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po
index 4862c608..c9d71938 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 dutch translation by Ed Driesen (GPL V3)\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-05-30 09:06+0200\n"
+"POT-Creation-Date: 2019-05-31 11:20+0200\n"
 "PO-Revision-Date: 2018-12-09 15:07+0100\n"
 "Last-Translator: \n"
 "Language: nl\n"
@@ -19,740 +19,929 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.6.0\n"
 
-#: cps/book_formats.py:199 cps/book_formats.py:200 cps/book_formats.py:204
-#: cps/book_formats.py:208 cps/book_formats.py:212 cps/converter.py:29
-#: cps/converter.py:45
-msgid "not installed"
-msgstr "niet geïnstalleerd"
-
-#: cps/converter.py:40 cps/converter.py:56
-msgid "Excecution permissions missing"
-msgstr "Rechten om uit te voeren ontbreken"
-
-#: cps/converter.py:66
-msgid "not configured"
-msgstr "Niet geconfigureerd"
-
-#: cps/helper.py:79
-#, python-format
-msgid "%(format)s format not found for book id: %(book)d"
-msgstr "%(format)s formaat niet gevonden voor boek met id: %(book)d"
-
-#: cps/helper.py:91
-#, python-format
-msgid "%(format)s not found on Google Drive: %(fn)s"
-msgstr "%(format)s niet gevonden op Google Drive: %(fn)s"
-
-#: cps/helper.py:98 cps/helper.py:204 cps/templates/detail.html:45
-#: cps/templates/detail.html:49
-msgid "Send to Kindle"
-msgstr "Stuur naar Kindle"
-
-#: cps/helper.py:99 cps/helper.py:117 cps/helper.py:206
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "Deze email werd verzonden via Calibre-Web."
-
-#: cps/helper.py:110
-#, python-format
-msgid "%(format)s not found: %(fn)s"
-msgstr "%(format)s niet gevonden %(fn)s"
-
-#: cps/helper.py:115
-msgid "Calibre-Web test e-mail"
-msgstr "Calibre-Web test email"
-
-#: cps/helper.py:116
-msgid "Test e-mail"
-msgstr "Test email"
-
-#: cps/helper.py:132
-msgid "Get Started with Calibre-Web"
-msgstr "Aan de slag met Calibre-Web"
-
-#: cps/helper.py:133
-#, python-format
-msgid "Registration e-mail for user: %(name)s"
-msgstr "Registratie email voor gebruiker: %(name)s"
-
-#: cps/helper.py:146 cps/helper.py:148 cps/helper.py:150 cps/helper.py:158
-#: cps/helper.py:160 cps/helper.py:162
-#, python-format
-msgid "Send %(format)s to Kindle"
-msgstr ""
-
-#: cps/helper.py:166
-#, python-format
-msgid "Convert %(orig)s to %(format)s and send to Kindle"
-msgstr ""
-
-#: cps/helper.py:205
-#, python-format
-msgid "E-mail: %(book)s"
-msgstr "Email: %(book)s"
-
-#: cps/helper.py:208
-msgid "The requested file could not be read. Maybe wrong permissions?"
-msgstr "Het gevraagde bestand kon niet worden gelezen. Misschien niet de juiste permissies?"
-
-#: cps/helper.py:316
-#, python-format
-msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "Hernoemen van titel: '%(src)s' naar '%(dest)s' faade met fout: %(error)s"
-
-#: cps/helper.py:326
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "Hernoemen van de auteur: '%(src)s' naar '%(dest)s' faalde met fout: %(error)s"
-
-#: cps/helper.py:340
-#, python-format
-msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr ""
-
-#: cps/helper.py:366 cps/helper.py:376 cps/helper.py:384
-#, python-format
-msgid "File %(file)s not found on Google Drive"
-msgstr "Bestand %(file)s niet gevonden op Google Drive"
-
-#: cps/helper.py:405
-#, python-format
-msgid "Book path %(path)s not found on Google Drive"
-msgstr "Boek pad %(path)s niet gevonden op Google Drive"
-
-#: cps/helper.py:556
-msgid "Error excecuting UnRar"
-msgstr "Fout bij het uitvoeren van UnRar"
-
-#: cps/helper.py:558
-msgid "Unrar binary file not found"
-msgstr "Unrar uitvoeringsbestand niet gevonden"
-
-#: cps/helper.py:585
-msgid "Waiting"
-msgstr "Wachten"
-
-#: cps/helper.py:587
-msgid "Failed"
-msgstr "Mislukt"
-
-#: cps/helper.py:589
-msgid "Started"
-msgstr "Gestart"
-
-#: cps/helper.py:591
-msgid "Finished"
-msgstr "Voltooid"
-
-#: cps/helper.py:593
-msgid "Unknown Status"
-msgstr "Onbekende status"
-
-#: cps/helper.py:598
-msgid "E-mail: "
-msgstr "Email:"
-
-#: cps/helper.py:600 cps/helper.py:604
-msgid "Convert: "
-msgstr "Converteer:"
-
-#: cps/helper.py:602
-msgid "Upload: "
-msgstr "Upload:"
-
-#: cps/helper.py:606
-msgid "Unknown Task: "
-msgstr "Onbekende taak:"
-
-#: cps/updater.py:251 cps/updater.py:410 cps/updater.py:423
-msgid "Unexpected data while reading update information"
-msgstr "Onverwachte data tijdens het lezen van de update informatie"
-
-#: cps/updater.py:258 cps/updater.py:416
-msgid "No update available. You already have the latest version installed"
-msgstr "Geen update beschikbaar. Je hebt reeds de laatste versie geïnstalleerd"
-
-#: cps/updater.py:270 cps/updater.py:501 cps/updater.py:503 cps/web.py:1206
-msgid "HTTP Error"
-msgstr "HTTP fout"
-
-#: cps/updater.py:272 cps/updater.py:505 cps/web.py:1207
-msgid "Connection error"
-msgstr "Verbindingsfout"
-
-#: cps/updater.py:274 cps/updater.py:507 cps/web.py:1208
-msgid "Timeout while establishing connection"
-msgstr "Time-out bij het maken van de verbinding"
-
-#: cps/updater.py:276 cps/updater.py:509 cps/web.py:1209
-msgid "General error"
-msgstr "Algemene fout"
-
-#: cps/updater.py:283 cps/updater.py:341 cps/updater.py:468
-msgid "A new update is available. Click on the button below to update to the latest version."
-msgstr "Een nieuwe update is beschikbaar. Click op de knop hier onder op te updaten naar de laatste versie."
-
-#: cps/updater.py:335
-msgid "Could not fetch update information"
-msgstr "De update informatie kon niet gelezen worden"
-
-#: cps/updater.py:403
-msgid "No release information available"
-msgstr ""
-
-#: cps/updater.py:449 cps/updater.py:458
-#, python-format
-msgid "A new update is available. Click on the button below to update to version: %(version)s"
-msgstr ""
-
-#: cps/updater.py:491 cps/web.py:2795
-msgid "Unknown"
-msgstr "Onbekend"
-
-#: cps/web.py:1199
-msgid "Requesting update package"
-msgstr "Update pakket wordt aangevraagd"
-
-#: cps/web.py:1200
-msgid "Downloading update package"
-msgstr "Update pakket wordt gedownload"
-
-#: cps/web.py:1201
-msgid "Unzipping update package"
-msgstr "Update pakket wordt uitgepakt"
-
-#: cps/web.py:1202
-msgid "Replacing files"
-msgstr "Bestanden aan het vervangen"
-
-#: cps/web.py:1203
-msgid "Database connections are closed"
-msgstr "Database verbindingen zijn gesloten"
-
-#: cps/web.py:1204
-msgid "Stopping server"
-msgstr "Server aan het stoppen"
-
-#: cps/web.py:1205
-msgid "Update finished, please press okay and reload page"
-msgstr "Update voltooid, klik op ok en herlaad de pagina"
-
-#: cps/web.py:1206 cps/web.py:1207 cps/web.py:1208 cps/web.py:1209
-msgid "Update failed:"
-msgstr "Update gefaald:"
-
-#: cps/web.py:1235
-msgid "Recently Added Books"
-msgstr "Recent toegevoegde boeken"
-
-#: cps/web.py:1245
-msgid "Newest Books"
-msgstr "Nieuwste boeken"
-
-#: cps/web.py:1257
-msgid "Oldest Books"
-msgstr "Oudste boeken"
-
-#: cps/web.py:1269
-msgid "Books (A-Z)"
-msgstr "Boeken (A-Z)"
-
-#: cps/web.py:1280
-msgid "Books (Z-A)"
-msgstr "Boeken (A-Z)"
-
-#: cps/web.py:1309
-msgid "Hot Books (most downloaded)"
-msgstr "Populaire boeken (meeste downloads)"
-
-#: cps/web.py:1322
-msgid "Best rated books"
-msgstr "Best beoordeelde boeken"
-
-#: cps/templates/index.xml:39 cps/web.py:1335
-msgid "Random Books"
-msgstr "Willekeurige boeken"
-
-#: cps/web.py:1362 cps/web.py:1618 cps/web.py:2161
-msgid "Error opening eBook. File does not exist or file is not accessible:"
-msgstr "Fout bij openen van het boek. Bestand bestaat niet of is niet toegankelijk:"
-
-#: cps/web.py:1391
-msgid "Publisher list"
-msgstr "Uitgeverslijst"
-
-#: cps/web.py:1406
-#, python-format
-msgid "Publisher: %(name)s"
-msgstr "Uitgever: %(name)s"
-
-#: cps/templates/index.xml:83 cps/web.py:1438
-msgid "Series list"
-msgstr "Serie lijst"
-
-#: cps/web.py:1452
-#, python-format
-msgid "Series: %(serie)s"
-msgstr "Serie: %(serie)s"
-
-#: cps/web.py:1478
-msgid "Available languages"
-msgstr "Beschikbare talen"
-
-#: cps/web.py:1498
-#, python-format
-msgid "Language: %(name)s"
-msgstr "Taal: %(name)s"
-
-#: cps/templates/index.xml:76 cps/web.py:1509
-msgid "Category list"
-msgstr "Categorie lijst"
-
-#: cps/web.py:1523
-#, python-format
-msgid "Category: %(name)s"
-msgstr "Categorie: %(name)s"
-
-#: cps/templates/layout.html:73 cps/web.py:1648
-msgid "Tasks"
-msgstr "Taken"
-
-#: cps/web.py:1682
+#: cps/about.py:76
 msgid "Statistics"
 msgstr "Statistieken"
 
-#: cps/web.py:1750
-msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
-msgstr ""
-
-#: cps/web.py:1795
-msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
-msgstr "Het callback domein is niet geverifieerd, volg de stappen in de google ontwikkelaars console om het domein te verifiëren"
-
-#: cps/web.py:1871
+#: cps/admin.py:97
 msgid "Server restarted, please reload page"
 msgstr "Server herstart, gelieve de pagina herladen"
 
-#: cps/web.py:1874
+#: cps/admin.py:100
 msgid "Performing shutdown of server, please close window"
 msgstr "Bezig met het stoppen van de server, gelieve venster te sluiten"
 
-#: cps/web.py:1953
-msgid "Published after "
-msgstr "Gepubliceerd na "
+#: cps/admin.py:120 cps/updater.py:445
+msgid "Unknown"
+msgstr "Onbekend"
 
-#: cps/web.py:1960
-msgid "Published before "
-msgstr "Gepubliceerd voor "
-
-#: cps/web.py:1974
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "Waardering <= %(rating)s"
-
-#: cps/web.py:1976
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "Waardering >= %(rating)s"
-
-#: cps/web.py:2036 cps/web.py:2045
-msgid "search"
-msgstr "zoek"
-
-#: cps/templates/index.xml:47 cps/templates/index.xml:51
-#: cps/templates/layout.html:148 cps/web.py:2116
-msgid "Read Books"
-msgstr "Gelezen Boeken"
-
-#: cps/templates/index.xml:55 cps/templates/index.xml:59
-#: cps/templates/layout.html:150 cps/web.py:2119
-msgid "Unread Books"
-msgstr "Ongelezen Boeken"
-
-#: cps/web.py:2171 cps/web.py:2173 cps/web.py:2175 cps/web.py:2187
-msgid "Read a Book"
-msgstr "Lees een boek"
-
-#: cps/web.py:2199
-msgid "Error opening eBook. Fileformat is not supported."
-msgstr ""
-
-#: cps/web.py:2249 cps/web.py:3170
-msgid "Please fill out all fields!"
-msgstr "Gelieve alle velden in te vullen!"
-
-#: cps/web.py:2250 cps/web.py:2272 cps/web.py:2276 cps/web.py:2281
-#: cps/web.py:2283
-msgid "register"
-msgstr "registreer"
-
-#: cps/web.py:2271 cps/web.py:3389
-msgid "An unknown error occurred. Please try again later."
-msgstr "Er was een onbekende fout. Gelieve later nog eens te proberen."
-
-#: cps/web.py:2274
-msgid "Your e-mail is not allowed to register"
-msgstr "Het is niet toegestaan om te registreren met jou email"
-
-#: cps/web.py:2277
-msgid "Confirmation e-mail was send to your e-mail account."
-msgstr "Bevestigings email werd verzonden naar jou email account."
-
-#: cps/web.py:2280
-msgid "This username or e-mail address is already in use."
-msgstr "Deze gebruikersnaam of email adres is reeds in gebruik."
-
-#: cps/web.py:2297 cps/web.py:2393
-#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
-msgstr "je bent nu ingelogd als: '%(nickname)s'"
-
-#: cps/web.py:2302
-msgid "Wrong Username or Password"
-msgstr "Verkeerde gebruikersnaam of Wachtwoord"
-
-#: cps/web.py:2308 cps/web.py:2329
-msgid "login"
-msgstr "login"
-
-#: cps/web.py:2341 cps/web.py:2372
-msgid "Token not found"
-msgstr "Token niet gevonden"
-
-#: cps/web.py:2349 cps/web.py:2380
-msgid "Token has expired"
-msgstr "Token is verlopen"
-
-#: cps/web.py:2357
-msgid "Success! Please return to your device"
-msgstr "Gelukt! Ga terug naar je apparaat"
-
-#: cps/web.py:2407
-msgid "Please configure the SMTP mail settings first..."
-msgstr "Gelieve de SMTP mail instellingen eerst te configureren..."
-
-#: cps/web.py:2412
-#, python-format
-msgid "Book successfully queued for sending to %(kindlemail)s"
-msgstr "Boek met succes in de wachtrij geplaatst om te verzenden naar %(kindlemail)s"
-
-#: cps/web.py:2416
-#, python-format
-msgid "There was an error sending this book: %(res)s"
-msgstr "Er trad een fout op bij het versturen van dit boek: %(res)s"
-
-#: cps/web.py:2418 cps/web.py:3223
-msgid "Please configure your kindle e-mail address first..."
-msgstr "Gelieve eerst je kindle mailadres te configureren..."
-
-#: cps/web.py:2429 cps/web.py:2481
-msgid "Invalid shelf specified"
-msgstr "Ongeldige boekenplank gespecificeerd"
-
-#: cps/web.py:2436
-#, python-format
-msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
-msgstr "Sorry, jij mag geen boeken toe voegen aan boekenplank: %(shelfname)s"
-
-#: cps/web.py:2444
-msgid "You are not allowed to edit public shelves"
-msgstr "Jij mag geen publieke boekenplanken bewerken"
-
-#: cps/web.py:2453
-#, python-format
-msgid "Book is already part of the shelf: %(shelfname)s"
-msgstr "Dit boek maakt al deel uit van boekenplank: %(shelfname)s"
-
-#: cps/web.py:2467
-#, python-format
-msgid "Book has been added to shelf: %(sname)s"
-msgstr "Boek werd toegevoegd aan boekenplank: %(sname)s"
-
-#: cps/web.py:2486
-#, python-format
-msgid "You are not allowed to add a book to the the shelf: %(name)s"
-msgstr "Jij mag geen boeken plaatsen op boekenplank: %(name)s"
-
-#: cps/web.py:2491
-msgid "User is not allowed to edit public shelves"
-msgstr "Gebruiker is niet toegestaan om publieke boekenplanken te bewerken"
-
-#: cps/web.py:2509
-#, python-format
-msgid "Books are already part of the shelf: %(name)s"
-msgstr "Deze boeken maken reeds deel uit van boekenplank: %(name)s"
-
-#: cps/web.py:2523
-#, python-format
-msgid "Books have been added to shelf: %(sname)s"
-msgstr "De boeken werden toegevoegd aan boekenplank: %(sname)s"
-
-#: cps/web.py:2525
-#, python-format
-msgid "Could not add books to shelf: %(sname)s"
-msgstr "Kon geen boeken toevoegen aan boekenplank: %(sname)s"
-
-#: cps/web.py:2562
-#, python-format
-msgid "Book has been removed from shelf: %(sname)s"
-msgstr "Boek werd verwijderd van boekenplank: %(sname)s"
-
-#: cps/web.py:2568
-#, python-format
-msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
-msgstr "Sorry, jij mag geen boeken verwijderen van deze boekenplank: %(sname)s"
-
-#: cps/web.py:2589 cps/web.py:2613
-#, python-format
-msgid "A shelf with the name '%(title)s' already exists."
-msgstr "Een boekenplank met de naam '%(title)s' bestaat reeds."
-
-#: cps/web.py:2594
-#, python-format
-msgid "Shelf %(title)s created"
-msgstr "Boekenplank %(title)s aangemaakt"
-
-#: cps/web.py:2596 cps/web.py:2624
-msgid "There was an error"
-msgstr "Er deed zich een fout voor"
-
-#: cps/web.py:2597 cps/web.py:2599
-msgid "create a shelf"
-msgstr "maak een boekenplank"
-
-#: cps/web.py:2622
-#, python-format
-msgid "Shelf %(title)s changed"
-msgstr "Boekenplank %(title)s gewijzigd"
-
-#: cps/web.py:2625 cps/web.py:2627
-msgid "Edit a shelf"
-msgstr "Bewerk een boekenplank"
-
-#: cps/web.py:2648
-#, python-format
-msgid "successfully deleted shelf %(name)s"
-msgstr "boekenplank %(name)s succesvol gewist"
-
-#: cps/web.py:2675
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Boekenplank: '%(name)s'"
-
-#: cps/web.py:2678
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "Fout bij openen boekenplank. Boekenplank bestaat niet of is niet toegankelijk"
-
-#: cps/web.py:2709
-#, python-format
-msgid "Change order of Shelf: '%(name)s'"
-msgstr "Verander volgorde van Boekenplank: '%(name)s'"
-
-#: cps/web.py:2738 cps/web.py:3176
-msgid "E-mail is not from valid domain"
-msgstr "Email is niet van een geldig domein"
-
-#: cps/web.py:2740 cps/web.py:2782 cps/web.py:2785
-#, python-format
-msgid "%(name)s's profile"
-msgstr "%(name)s's profiel"
-
-#: cps/web.py:2780
-msgid "Found an existing account for this e-mail address."
-msgstr "Een bestaand account met dit email adres werd gevonden."
-
-#: cps/web.py:2783
-msgid "Profile updated"
-msgstr "Profiel aangepast"
-
-#: cps/web.py:2814
+#: cps/admin.py:139
 msgid "Admin page"
 msgstr "Administratie pagina"
 
-#: cps/web.py:2899 cps/web.py:3079
+#: cps/admin.py:208 cps/admin.py:486
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web configuratie aangepast"
 
-#: cps/templates/admin.html:100 cps/web.py:2913
+#: cps/admin.py:222 cps/templates/admin.html:102
 msgid "UI Configuration"
 msgstr "Gebruikersinterface configuratie"
 
-#: cps/web.py:2931
+#: cps/admin.py:295
 msgid "Import of optional Google Drive requirements missing"
 msgstr "De import van optionele Google Drive vereisten ontbreken"
 
-#: cps/web.py:2934
+#: cps/admin.py:298
 msgid "client_secrets.json is missing or not readable"
 msgstr "client_secrets.json ontbreekt of is niet leesbaar"
 
-#: cps/web.py:2939 cps/web.py:2968
+#: cps/admin.py:303 cps/admin.py:332
 msgid "client_secrets.json is not configured for web application"
 msgstr "client_secrets.json is niet geconfigureerd voor web applicaties"
 
-#: cps/templates/admin.html:99 cps/web.py:2971 cps/web.py:2997 cps/web.py:3009
-#: cps/web.py:3054 cps/web.py:3069 cps/web.py:3088 cps/web.py:3096
-#: cps/web.py:3112
+#: cps/admin.py:335 cps/admin.py:361 cps/admin.py:373 cps/admin.py:398
+#: cps/admin.py:426 cps/admin.py:440 cps/admin.py:463 cps/admin.py:476
+#: cps/admin.py:494 cps/admin.py:501 cps/admin.py:516
+#: cps/templates/admin.html:101
 msgid "Basic Configuration"
 msgstr "Basis configuratie"
 
-#: cps/web.py:2994
+#: cps/admin.py:358
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr "Sleutelbestand (\"keyfile\") locatie ongeldig, gelieve het correcte pad in te geven"
 
-#: cps/web.py:3006
+#: cps/admin.py:370
 msgid "Certfile location is not valid, please enter correct path"
 msgstr "Certificatiebestand (\"certfile\") locatie ongeldig, gelieve het correcte pad in te geven"
 
-#: cps/web.py:3051
+#: cps/admin.py:395
+msgid "Please enter a LDAP provider and a DN"
+msgstr ""
+
+#: cps/admin.py:423
+msgid "Please enter Github oauth credentials"
+msgstr ""
+
+#: cps/admin.py:437
+msgid "Please enter Google oauth credentials"
+msgstr ""
+
+#: cps/admin.py:460
 msgid "Logfile location is not valid, please enter correct path"
 msgstr "Log bestand (\"logfile\") locatie ongeldig, gelieve het correcte pad in te geven"
 
-#: cps/web.py:3092
+#: cps/admin.py:498
 msgid "DB location is not valid, please enter correct path"
 msgstr "DB locatie is niet geldig, gelieve het correcte pad in te geven"
 
-#: cps/templates/admin.html:33 cps/web.py:3172 cps/web.py:3178 cps/web.py:3194
+#: cps/admin.py:558 cps/web.py:1045
+msgid "Please fill out all fields!"
+msgstr "Gelieve alle velden in te vullen!"
+
+#: cps/admin.py:560 cps/admin.py:566 cps/admin.py:582
+#: cps/templates/admin.html:35
 msgid "Add new user"
 msgstr "Voeg nieuwe gebruiker toe"
 
-#: cps/web.py:3184
+#: cps/admin.py:564 cps/web.py:1248
+msgid "E-mail is not from valid domain"
+msgstr "Email is niet van een geldig domein"
+
+#: cps/admin.py:572
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Gebruiker '%(user)s' aangemaakt"
 
-#: cps/web.py:3188
+#: cps/admin.py:576
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Een bestaande account gevonden met dit email adres of gebruikersnaam."
 
-#: cps/web.py:3218
+#: cps/admin.py:607
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Test email met succes verzonden naar %(kindlemail)s"
 
-#: cps/web.py:3221
+#: cps/admin.py:610
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Er was een fout bij het verzenden van test email: %(res)s"
 
-#: cps/web.py:3225
+#: cps/admin.py:612 cps/web.py:1029
+msgid "Please configure your kindle e-mail address first..."
+msgstr "Gelieve eerst je kindle mailadres te configureren..."
+
+#: cps/admin.py:614
 msgid "E-mail server settings updated"
 msgstr "Email server instellingen aangepast"
 
-#: cps/web.py:3226
+#: cps/admin.py:615
 msgid "Edit e-mail server settings"
 msgstr "Bewerk email server instellingen"
 
-#: cps/web.py:3251
+#: cps/admin.py:640
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Gebruiker '%(nick)s' verwijderd"
 
-#: cps/web.py:3364
+#: cps/admin.py:711
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Gebruiker '%(nick)s' aangepast"
 
-#: cps/web.py:3367
+#: cps/admin.py:714
 msgid "An unknown error occured."
 msgstr "Een onbekende fout deed zich voor."
 
-#: cps/web.py:3369
+#: cps/admin.py:717
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Bewerk gebruiker '%(nick)s"
 
-#: cps/web.py:3386
+#: cps/admin.py:733
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Wachtwoord voor gebruiker %(user)s gereset"
 
-#: cps/web.py:3400 cps/web.py:3592
+#: cps/admin.py:736 cps/web.py:1070
+msgid "An unknown error occurred. Please try again later."
+msgstr "Er was een onbekende fout. Gelieve later nog eens te proberen."
+
+#: cps/admin.py:755
+msgid "Requesting update package"
+msgstr "Update pakket wordt aangevraagd"
+
+#: cps/admin.py:756
+msgid "Downloading update package"
+msgstr "Update pakket wordt gedownload"
+
+#: cps/admin.py:757
+msgid "Unzipping update package"
+msgstr "Update pakket wordt uitgepakt"
+
+#: cps/admin.py:758
+msgid "Replacing files"
+msgstr "Bestanden aan het vervangen"
+
+#: cps/admin.py:759
+msgid "Database connections are closed"
+msgstr "Database verbindingen zijn gesloten"
+
+#: cps/admin.py:760
+msgid "Stopping server"
+msgstr "Server aan het stoppen"
+
+#: cps/admin.py:761
+msgid "Update finished, please press okay and reload page"
+msgstr "Update voltooid, klik op ok en herlaad de pagina"
+
+#: cps/admin.py:762 cps/admin.py:763 cps/admin.py:764 cps/admin.py:765
+msgid "Update failed:"
+msgstr "Update gefaald:"
+
+#: cps/admin.py:762 cps/updater.py:277 cps/updater.py:456 cps/updater.py:458
+msgid "HTTP Error"
+msgstr "HTTP fout"
+
+#: cps/admin.py:763 cps/updater.py:279 cps/updater.py:460
+msgid "Connection error"
+msgstr "Verbindingsfout"
+
+#: cps/admin.py:764 cps/updater.py:281 cps/updater.py:462
+msgid "Timeout while establishing connection"
+msgstr "Time-out bij het maken van de verbinding"
+
+#: cps/admin.py:765 cps/updater.py:283 cps/updater.py:464
+msgid "General error"
+msgstr "Algemene fout"
+
+#: cps/converter.py:31 cps/converter.py:48 cps/uploader.py:213
+#: cps/uploader.py:214 cps/uploader.py:218 cps/uploader.py:222
+#: cps/uploader.py:226
+msgid "not installed"
+msgstr "niet geïnstalleerd"
+
+#: cps/converter.py:43 cps/converter.py:60
+msgid "Excecution permissions missing"
+msgstr "Rechten om uit te voeren ontbreken"
+
+#: cps/converter.py:70
+msgid "not configured"
+msgstr "Niet geconfigureerd"
+
+#: cps/editbooks.py:218 cps/editbooks.py:432
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Fout bij openen eBook. Het bestand bestaat niet of is niet toegankelijk"
 
-#: cps/web.py:3428
+#: cps/editbooks.py:246
 msgid "edit metadata"
 msgstr "bewerk metadata"
 
-#: cps/web.py:3521 cps/web.py:3754
+#: cps/editbooks.py:325 cps/editbooks.py:595
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Het uploaden van bestandsextensie '%(ext)s' is niet toegestaan op deze server"
 
-#: cps/web.py:3525 cps/web.py:3757
+#: cps/editbooks.py:329 cps/editbooks.py:599
 msgid "File to be uploaded must have an extension"
 msgstr "Up te loaden bestanden dienen een extensie te hebben"
 
-#: cps/web.py:3537 cps/web.py:3776
+#: cps/editbooks.py:341 cps/editbooks.py:619
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Het pad %(path)s aanmaken mislukt (Geen toestemming)."
 
-#: cps/web.py:3542
+#: cps/editbooks.py:346
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Bestand opslaan niet gelukt voor %(file)s."
 
-#: cps/web.py:3559
+#: cps/editbooks.py:363
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Bestandsformaat %(ext)s toegevoegd aan %(book)s"
 
-#: cps/web.py:3573 cps/web.py:3646
+#: cps/editbooks.py:382
+#, python-format
+msgid "Failed to create path for cover %(path)s (Permission denied)."
+msgstr ""
+
+#: cps/editbooks.py:390
+#, python-format
+msgid "Failed to store cover-file %(cover)s."
+msgstr ""
+
+#: cps/editbooks.py:393
+msgid "Cover-file is not a valid image file"
+msgstr ""
+
+#: cps/editbooks.py:399 cps/editbooks.py:413
 msgid "Cover is not a supported imageformat (jpg/png/webp), can't save"
 msgstr ""
 
-#: cps/web.py:3605 cps/web.py:3614
+#: cps/editbooks.py:445 cps/editbooks.py:454
 msgid "unknown"
 msgstr "onbekend"
 
-#: cps/web.py:3694
+#: cps/editbooks.py:486
+msgid "Cover is not a jpg file, can't save"
+msgstr ""
+
+#: cps/editbooks.py:534
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s is geen geldige taal"
 
-#: cps/web.py:3725
+#: cps/editbooks.py:565
 msgid "Metadata successfully updated"
 msgstr "Metadata succesvol geüpdatet"
 
-#: cps/web.py:3734
+#: cps/editbooks.py:574
 msgid "Error editing book, please check logfile for details"
 msgstr "Fout bij het bewerken van het boek, gelieve logfile controleren"
 
-#: cps/web.py:3780
+#: cps/editbooks.py:624
 #, python-format
 msgid "Failed to store file %(file)s (Permission denied)."
 msgstr "Bestand %(file)s opslaan mislukt (Geen toestemming)."
 
-#: cps/web.py:3785
+#: cps/editbooks.py:629
 #, python-format
 msgid "Failed to delete file %(file)s (Permission denied)."
 msgstr "Bestand %(file)s wissen mislukt (Geen toestemming)."
 
-#: cps/web.py:3867
+#: cps/editbooks.py:712
 #, python-format
-msgid "File %(title)s"
+msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/web.py:3896
+#: cps/editbooks.py:741
 msgid "Source or destination format for conversion missing"
 msgstr "Bron of doel formaat voor conversie ontbreekt"
 
-#: cps/web.py:3906
+#: cps/editbooks.py:751
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Boek succesvol in de wachtrij geplaatst voor conversie naar %(book_format)s"
 
-#: cps/web.py:3910
+#: cps/editbooks.py:755
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Er trad een fout op bij het converteren van dit boek: %(res)s"
 
-#: cps/worker.py:305
+#: cps/gdrive.py:56
+msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
+msgstr ""
+
+#: cps/gdrive.py:101
+msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
+msgstr "Het callback domein is niet geverifieerd, volg de stappen in de google ontwikkelaars console om het domein te verifiëren"
+
+#: cps/helper.py:97
+#, python-format
+msgid "%(format)s format not found for book id: %(book)d"
+msgstr "%(format)s formaat niet gevonden voor boek met id: %(book)d"
+
+#: cps/helper.py:109
+#, python-format
+msgid "%(format)s not found on Google Drive: %(fn)s"
+msgstr "%(format)s niet gevonden op Google Drive: %(fn)s"
+
+#: cps/helper.py:116 cps/helper.py:223 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Stuur naar Kindle"
+
+#: cps/helper.py:117 cps/helper.py:135 cps/helper.py:225
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "Deze email werd verzonden via Calibre-Web."
+
+#: cps/helper.py:128
+#, python-format
+msgid "%(format)s not found: %(fn)s"
+msgstr "%(format)s niet gevonden %(fn)s"
+
+#: cps/helper.py:133
+msgid "Calibre-Web test e-mail"
+msgstr "Calibre-Web test email"
+
+#: cps/helper.py:134
+msgid "Test e-mail"
+msgstr "Test email"
+
+#: cps/helper.py:150
+msgid "Get Started with Calibre-Web"
+msgstr "Aan de slag met Calibre-Web"
+
+#: cps/helper.py:151
+#, python-format
+msgid "Registration e-mail for user: %(name)s"
+msgstr "Registratie email voor gebruiker: %(name)s"
+
+#: cps/helper.py:165 cps/helper.py:167 cps/helper.py:169 cps/helper.py:177
+#: cps/helper.py:179 cps/helper.py:181
+#, python-format
+msgid "Send %(format)s to Kindle"
+msgstr ""
+
+#: cps/helper.py:185
+#, python-format
+msgid "Convert %(orig)s to %(format)s and send to Kindle"
+msgstr ""
+
+#: cps/helper.py:224
+#, python-format
+msgid "E-mail: %(book)s"
+msgstr "Email: %(book)s"
+
+#: cps/helper.py:227
+msgid "The requested file could not be read. Maybe wrong permissions?"
+msgstr "Het gevraagde bestand kon niet worden gelezen. Misschien niet de juiste permissies?"
+
+#: cps/helper.py:335
+#, python-format
+msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "Hernoemen van titel: '%(src)s' naar '%(dest)s' faade met fout: %(error)s"
+
+#: cps/helper.py:345
+#, python-format
+msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "Hernoemen van de auteur: '%(src)s' naar '%(dest)s' faalde met fout: %(error)s"
+
+#: cps/helper.py:359
+#, python-format
+msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr ""
+
+#: cps/helper.py:385 cps/helper.py:395 cps/helper.py:403
+#, python-format
+msgid "File %(file)s not found on Google Drive"
+msgstr "Bestand %(file)s niet gevonden op Google Drive"
+
+#: cps/helper.py:424
+#, python-format
+msgid "Book path %(path)s not found on Google Drive"
+msgstr "Boek pad %(path)s niet gevonden op Google Drive"
+
+#: cps/helper.py:584
+msgid "Error excecuting UnRar"
+msgstr "Fout bij het uitvoeren van UnRar"
+
+#: cps/helper.py:586
+msgid "Unrar binary file not found"
+msgstr "Unrar uitvoeringsbestand niet gevonden"
+
+#: cps/helper.py:614
+msgid "Waiting"
+msgstr "Wachten"
+
+#: cps/helper.py:616
+msgid "Failed"
+msgstr "Mislukt"
+
+#: cps/helper.py:618
+msgid "Started"
+msgstr "Gestart"
+
+#: cps/helper.py:620
+msgid "Finished"
+msgstr "Voltooid"
+
+#: cps/helper.py:622
+msgid "Unknown Status"
+msgstr "Onbekende status"
+
+#: cps/helper.py:627
+msgid "E-mail: "
+msgstr "Email:"
+
+#: cps/helper.py:629 cps/helper.py:633
+msgid "Convert: "
+msgstr "Converteer:"
+
+#: cps/helper.py:631
+msgid "Upload: "
+msgstr "Upload:"
+
+#: cps/helper.py:635
+msgid "Unknown Task: "
+msgstr "Onbekende taak:"
+
+#: cps/oauth_bb.py:87
+#, python-format
+msgid "Register with %s, "
+msgstr ""
+
+#: cps/oauth_bb.py:145
+msgid "Failed to log in with GitHub."
+msgstr ""
+
+#: cps/oauth_bb.py:150
+msgid "Failed to fetch user info from GitHub."
+msgstr ""
+
+#: cps/oauth_bb.py:161
+msgid "Failed to log in with Google."
+msgstr ""
+
+#: cps/oauth_bb.py:166
+msgid "Failed to fetch user info from Google."
+msgstr ""
+
+#: cps/oauth_bb.py:265
+#, python-format
+msgid "Unlink to %(oauth)s success."
+msgstr ""
+
+#: cps/oauth_bb.py:269
+#, python-format
+msgid "Unlink to %(oauth)s failed."
+msgstr ""
+
+#: cps/oauth_bb.py:272
+#, python-format
+msgid "Not linked to %(oauth)s."
+msgstr ""
+
+#: cps/oauth_bb.py:300
+msgid "GitHub Oauth error, please retry later."
+msgstr ""
+
+#: cps/oauth_bb.py:319
+msgid "Google Oauth error, please retry later."
+msgstr ""
+
+#: cps/shelf.py:40 cps/shelf.py:92
+msgid "Invalid shelf specified"
+msgstr "Ongeldige boekenplank gespecificeerd"
+
+#: cps/shelf.py:47
+#, python-format
+msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
+msgstr "Sorry, jij mag geen boeken toe voegen aan boekenplank: %(shelfname)s"
+
+#: cps/shelf.py:55
+msgid "You are not allowed to edit public shelves"
+msgstr "Jij mag geen publieke boekenplanken bewerken"
+
+#: cps/shelf.py:64
+#, python-format
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr "Dit boek maakt al deel uit van boekenplank: %(shelfname)s"
+
+#: cps/shelf.py:78
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "Boek werd toegevoegd aan boekenplank: %(sname)s"
+
+#: cps/shelf.py:97
+#, python-format
+msgid "You are not allowed to add a book to the the shelf: %(name)s"
+msgstr "Jij mag geen boeken plaatsen op boekenplank: %(name)s"
+
+#: cps/shelf.py:102
+msgid "User is not allowed to edit public shelves"
+msgstr "Gebruiker is niet toegestaan om publieke boekenplanken te bewerken"
+
+#: cps/shelf.py:120
+#, python-format
+msgid "Books are already part of the shelf: %(name)s"
+msgstr "Deze boeken maken reeds deel uit van boekenplank: %(name)s"
+
+#: cps/shelf.py:134
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr "De boeken werden toegevoegd aan boekenplank: %(sname)s"
+
+#: cps/shelf.py:136
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr "Kon geen boeken toevoegen aan boekenplank: %(sname)s"
+
+#: cps/shelf.py:173
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "Boek werd verwijderd van boekenplank: %(sname)s"
+
+#: cps/shelf.py:179
+#, python-format
+msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
+msgstr "Sorry, jij mag geen boeken verwijderen van deze boekenplank: %(sname)s"
+
+#: cps/shelf.py:200 cps/shelf.py:224
+#, python-format
+msgid "A shelf with the name '%(title)s' already exists."
+msgstr "Een boekenplank met de naam '%(title)s' bestaat reeds."
+
+#: cps/shelf.py:205
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "Boekenplank %(title)s aangemaakt"
+
+#: cps/shelf.py:207 cps/shelf.py:235
+msgid "There was an error"
+msgstr "Er deed zich een fout voor"
+
+#: cps/shelf.py:208 cps/shelf.py:210
+msgid "create a shelf"
+msgstr "maak een boekenplank"
+
+#: cps/shelf.py:233
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "Boekenplank %(title)s gewijzigd"
+
+#: cps/shelf.py:236 cps/shelf.py:238
+msgid "Edit a shelf"
+msgstr "Bewerk een boekenplank"
+
+#: cps/shelf.py:259
+#, python-format
+msgid "successfully deleted shelf %(name)s"
+msgstr "boekenplank %(name)s succesvol gewist"
+
+#: cps/shelf.py:289
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Boekenplank: '%(name)s'"
+
+#: cps/shelf.py:292
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "Fout bij openen boekenplank. Boekenplank bestaat niet of is niet toegankelijk"
+
+#: cps/shelf.py:324
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "Verander volgorde van Boekenplank: '%(name)s'"
+
+#: cps/ub.py:111
+msgid "Recently Added"
+msgstr "Recent Toegevoegd"
+
+#: cps/ub.py:113
+msgid "Show recent books"
+msgstr "Toon recente boeken"
+
+#: cps/templates/index.xml:17 cps/ub.py:114
+msgid "Hot Books"
+msgstr "Populaire Boeken"
+
+#: cps/ub.py:115
+msgid "Show hot books"
+msgstr "Toon populaire boeken"
+
+#: cps/templates/index.xml:24 cps/ub.py:118
+msgid "Best rated Books"
+msgstr "Best beoordeeld"
+
+#: cps/ub.py:120
+msgid "Show best rated books"
+msgstr "Toon best beoordeelde boeken"
+
+#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:121
+#: cps/web.py:965
+msgid "Read Books"
+msgstr "Gelezen Boeken"
+
+#: cps/ub.py:123
+msgid "Show read and unread"
+msgstr "Toon gelezen en ongelezen"
+
+#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:125
+#: cps/web.py:969
+msgid "Unread Books"
+msgstr "Ongelezen Boeken"
+
+#: cps/ub.py:127
+msgid "Show unread"
+msgstr ""
+
+#: cps/ub.py:128
+msgid "Discover"
+msgstr "Ontdek"
+
+#: cps/ub.py:130
+msgid "Show random books"
+msgstr "Toon willekeurige boeken"
+
+#: cps/ub.py:131
+msgid "Categories"
+msgstr "Categorieën"
+
+#: cps/ub.py:133
+msgid "Show category selection"
+msgstr "Toon categorie selectie"
+
+#: cps/templates/book_edit.html:71 cps/templates/search_form.html:53
+#: cps/ub.py:134
+msgid "Series"
+msgstr "Series"
+
+#: cps/ub.py:136
+msgid "Show series selection"
+msgstr "Toon serie selectie"
+
+#: cps/templates/index.xml:61 cps/ub.py:137
+msgid "Authors"
+msgstr "Auteurs"
+
+#: cps/ub.py:139
+msgid "Show author selection"
+msgstr "Toon auteur selectie"
+
+#: cps/templates/index.xml:68 cps/ub.py:141
+msgid "Publishers"
+msgstr "Uitgevers"
+
+#: cps/ub.py:143
+msgid "Show publisher selection"
+msgstr "Toon uitgevers selectie"
+
+#: cps/templates/search_form.html:74 cps/ub.py:144
+msgid "Languages"
+msgstr "Talen"
+
+#: cps/ub.py:147
+msgid "Show language selection"
+msgstr "Toon taal selectie"
+
+#: cps/ub.py:148
+msgid "Ratings"
+msgstr ""
+
+#: cps/ub.py:150
+msgid "Show ratings selection"
+msgstr ""
+
+#: cps/ub.py:151
+msgid "File formats"
+msgstr ""
+
+#: cps/ub.py:153
+msgid "Show file formats selection"
+msgstr ""
+
+#: cps/updater.py:257 cps/updater.py:364 cps/updater.py:377
+msgid "Unexpected data while reading update information"
+msgstr "Onverwachte data tijdens het lezen van de update informatie"
+
+#: cps/updater.py:264 cps/updater.py:370
+msgid "No update available. You already have the latest version installed"
+msgstr "Geen update beschikbaar. Je hebt reeds de laatste versie geïnstalleerd"
+
+#: cps/updater.py:290 cps/updater.py:422
+msgid "A new update is available. Click on the button below to update to the latest version."
+msgstr "Een nieuwe update is beschikbaar. Click op de knop hier onder op te updaten naar de laatste versie."
+
+#: cps/updater.py:343
+msgid "Could not fetch update information"
+msgstr "De update informatie kon niet gelezen worden"
+
+#: cps/updater.py:357
+msgid "No release information available"
+msgstr ""
+
+#: cps/updater.py:403 cps/updater.py:412
+#, python-format
+msgid "A new update is available. Click on the button below to update to version: %(version)s"
+msgstr ""
+
+#: cps/web.py:457
+msgid "Recently Added Books"
+msgstr "Recent toegevoegde boeken"
+
+#: cps/web.py:484
+msgid "Best rated books"
+msgstr "Best beoordeelde boeken"
+
+#: cps/templates/index.xml:38 cps/web.py:492
+msgid "Random Books"
+msgstr "Willekeurige boeken"
+
+#: cps/web.py:516
+msgid "Books"
+msgstr ""
+
+#: cps/web.py:543
+msgid "Hot Books (most downloaded)"
+msgstr "Populaire boeken (meeste downloads)"
+
+#: cps/web.py:553 cps/web.py:1294 cps/web.py:1383
+msgid "Error opening eBook. File does not exist or file is not accessible:"
+msgstr "Fout bij openen van het boek. Bestand bestaat niet of is niet toegankelijk:"
+
+#: cps/web.py:580
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr "Uitgever: %(name)s"
+
+#: cps/web.py:591
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "Serie: %(serie)s"
+
+#: cps/web.py:602
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr ""
+
+#: cps/web.py:613
+#, python-format
+msgid "File format: %(format)s"
+msgstr ""
+
+#: cps/web.py:625
+#, python-format
+msgid "Category: %(name)s"
+msgstr "Categorie: %(name)s"
+
+#: cps/web.py:659
+msgid "Publisher list"
+msgstr "Uitgeverslijst"
+
+#: cps/templates/index.xml:82 cps/web.py:675
+msgid "Series list"
+msgstr "Serie lijst"
+
+#: cps/web.py:689
+msgid "Ratings list"
+msgstr ""
+
+#: cps/web.py:702
+msgid "File formats list"
+msgstr ""
+
+#: cps/web.py:730
+msgid "Available languages"
+msgstr "Beschikbare talen"
+
+#: cps/web.py:750
+#, python-format
+msgid "Language: %(name)s"
+msgstr "Taal: %(name)s"
+
+#: cps/templates/index.xml:75 cps/web.py:764
+msgid "Category list"
+msgstr "Categorie lijst"
+
+#: cps/templates/layout.html:73 cps/web.py:777
+msgid "Tasks"
+msgstr "Taken"
+
+#: cps/web.py:841
+msgid "Published after "
+msgstr "Gepubliceerd na "
+
+#: cps/web.py:848
+msgid "Published before "
+msgstr "Gepubliceerd voor "
+
+#: cps/web.py:862
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Waardering <= %(rating)s"
+
+#: cps/web.py:864
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Waardering >= %(rating)s"
+
+#: cps/web.py:924 cps/web.py:933
+msgid "search"
+msgstr "zoek"
+
+#: cps/web.py:1018
+msgid "Please configure the SMTP mail settings first..."
+msgstr "Gelieve de SMTP mail instellingen eerst te configureren..."
+
+#: cps/web.py:1023
+#, python-format
+msgid "Book successfully queued for sending to %(kindlemail)s"
+msgstr "Boek met succes in de wachtrij geplaatst om te verzenden naar %(kindlemail)s"
+
+#: cps/web.py:1027
+#, python-format
+msgid "There was an error sending this book: %(res)s"
+msgstr "Er trad een fout op bij het versturen van dit boek: %(res)s"
+
+#: cps/web.py:1046 cps/web.py:1071 cps/web.py:1076 cps/web.py:1081
+#: cps/web.py:1085
+msgid "register"
+msgstr "registreer"
+
+#: cps/web.py:1073
+msgid "Your e-mail is not allowed to register"
+msgstr "Het is niet toegestaan om te registreren met jou email"
+
+#: cps/web.py:1077
+msgid "Confirmation e-mail was send to your e-mail account."
+msgstr "Bevestigings email werd verzonden naar jou email account."
+
+#: cps/web.py:1080
+msgid "This username or e-mail address is already in use."
+msgstr "Deze gebruikersnaam of email adres is reeds in gebruik."
+
+#: cps/web.py:1103 cps/web.py:1115
+#, python-format
+msgid "You are now logged in as: '%(nickname)s'"
+msgstr ""
+
+#: cps/web.py:1108 cps/web.py:1120
+msgid "Wrong Username or Password"
+msgstr "Verkeerde gebruikersnaam of Wachtwoord"
+
+#: cps/web.py:1111
+msgid "Could not login. LDAP server down, please contact your administrator"
+msgstr ""
+
+#: cps/web.py:1124 cps/web.py:1146
+msgid "login"
+msgstr "login"
+
+#: cps/web.py:1158 cps/web.py:1189
+msgid "Token not found"
+msgstr "Token niet gevonden"
+
+#: cps/web.py:1166 cps/web.py:1197
+msgid "Token has expired"
+msgstr "Token is verlopen"
+
+#: cps/web.py:1174
+msgid "Success! Please return to your device"
+msgstr "Gelukt! Ga terug naar je apparaat"
+
+#: cps/web.py:1210
+#, python-format
+msgid "you are now logged in as: '%(nickname)s'"
+msgstr "je bent nu ingelogd als: '%(nickname)s'"
+
+#: cps/web.py:1250 cps/web.py:1277 cps/web.py:1281
+#, python-format
+msgid "%(name)s's profile"
+msgstr "%(name)s's profiel"
+
+#: cps/web.py:1274
+msgid "Found an existing account for this e-mail address."
+msgstr "Een bestaand account met dit email adres werd gevonden."
+
+#: cps/web.py:1279
+msgid "Profile updated"
+msgstr "Profiel aangepast"
+
+#: cps/web.py:1304 cps/web.py:1306 cps/web.py:1308 cps/web.py:1314
+#: cps/web.py:1318
+msgid "Read a Book"
+msgstr "Lees een boek"
+
+#: cps/web.py:1328
+msgid "Error opening eBook. File does not exist or file is not accessible."
+msgstr ""
+
+#: cps/worker.py:308
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Ebook conversie mislukt: %(error)s"
 
-#: cps/worker.py:316
+#: cps/worker.py:319
 #, python-format
 msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "Kindlegen gefaald met Error %(error)s. Bericht: %(message)s"
@@ -781,147 +970,152 @@ msgstr "DLS"
 msgid "Admin"
 msgstr "Administratie"
 
-#: cps/templates/admin.html:14 cps/templates/detail.html:22
-#: cps/templates/detail.html:31
+#: cps/templates/admin.html:14 cps/templates/detail.html:18
+#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/shelfdown.html:62
 msgid "Download"
 msgstr "Download"
 
-#: cps/templates/admin.html:15 cps/templates/layout.html:65
+#: cps/templates/admin.html:15
+msgid "View Ebooks"
+msgstr ""
+
+#: cps/templates/admin.html:16 cps/templates/layout.html:65
 msgid "Upload"
 msgstr "Upload"
 
-#: cps/templates/admin.html:16
+#: cps/templates/admin.html:17
 msgid "Edit"
 msgstr "Bewerk"
 
-#: cps/templates/admin.html:39
+#: cps/templates/admin.html:41
 msgid "SMTP e-mail server settings"
 msgstr "SMTP email server instellingen"
 
-#: cps/templates/admin.html:42 cps/templates/email_edit.html:11
+#: cps/templates/admin.html:44 cps/templates/email_edit.html:11
 msgid "SMTP hostname"
 msgstr "SMTP hostnaam"
 
-#: cps/templates/admin.html:43
+#: cps/templates/admin.html:45
 msgid "SMTP port"
 msgstr "SMTP poort"
 
-#: cps/templates/admin.html:44
+#: cps/templates/admin.html:46
 msgid "SSL"
 msgstr "SSL"
 
-#: cps/templates/admin.html:45 cps/templates/email_edit.html:27
+#: cps/templates/admin.html:47 cps/templates/email_edit.html:27
 msgid "SMTP login"
 msgstr "SMTP login"
 
-#: cps/templates/admin.html:46
+#: cps/templates/admin.html:48
 msgid "From mail"
 msgstr "Van mail"
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:58
 msgid "Change SMTP settings"
 msgstr "Bewerk SMTP instellingen"
 
-#: cps/templates/admin.html:62
+#: cps/templates/admin.html:64
 msgid "Configuration"
 msgstr "Configuratie"
 
-#: cps/templates/admin.html:65
+#: cps/templates/admin.html:67
 msgid "Calibre DB dir"
 msgstr "Calibre DB map"
 
-#: cps/templates/admin.html:69
+#: cps/templates/admin.html:71
 msgid "Log level"
 msgstr "Log niveau"
 
-#: cps/templates/admin.html:73
+#: cps/templates/admin.html:75
 msgid "Port"
 msgstr "Poort"
 
-#: cps/templates/admin.html:79 cps/templates/config_view_edit.html:23
+#: cps/templates/admin.html:81 cps/templates/config_view_edit.html:23
 msgid "Books per page"
 msgstr "Boeken per pagina"
 
-#: cps/templates/admin.html:83
+#: cps/templates/admin.html:85
 msgid "Uploading"
 msgstr "Aan het uploaden"
 
-#: cps/templates/admin.html:87
+#: cps/templates/admin.html:89
 msgid "Anonymous browsing"
 msgstr "Anoniem verkennen"
 
-#: cps/templates/admin.html:91
+#: cps/templates/admin.html:93
 msgid "Public registration"
 msgstr "Publieke registratie"
 
-#: cps/templates/admin.html:95 cps/templates/remote_login.html:4
+#: cps/templates/admin.html:97 cps/templates/remote_login.html:4
 msgid "Remote login"
 msgstr "Login op afstand"
 
-#: cps/templates/admin.html:106
+#: cps/templates/admin.html:108
 msgid "Administration"
 msgstr "Administratie"
 
-#: cps/templates/admin.html:107
+#: cps/templates/admin.html:109
 msgid "Reconnect to Calibre DB"
 msgstr "Herverbinden met calibre DB"
 
-#: cps/templates/admin.html:108
+#: cps/templates/admin.html:110
 msgid "Restart Calibre-Web"
 msgstr "Herstart Calibre-Web"
 
-#: cps/templates/admin.html:109
+#: cps/templates/admin.html:111
 msgid "Stop Calibre-Web"
 msgstr "Stop Calibre-Web"
 
-#: cps/templates/admin.html:115
+#: cps/templates/admin.html:117
 msgid "Update"
 msgstr "Update"
 
-#: cps/templates/admin.html:119
+#: cps/templates/admin.html:121
 msgid "Version"
 msgstr "Versie"
 
-#: cps/templates/admin.html:120
+#: cps/templates/admin.html:122
 msgid "Details"
 msgstr "Details"
 
-#: cps/templates/admin.html:126
+#: cps/templates/admin.html:128
 msgid "Current version"
 msgstr "Huidige versie"
 
-#: cps/templates/admin.html:132
+#: cps/templates/admin.html:134
 msgid "Check for update"
 msgstr "Controleer voor update"
 
-#: cps/templates/admin.html:133
+#: cps/templates/admin.html:135
 msgid "Perform Update"
 msgstr "Voer update uit"
 
-#: cps/templates/admin.html:145
+#: cps/templates/admin.html:147
 msgid "Do you really want to restart Calibre-Web?"
 msgstr "Wil je Calibre-Web echt herstarten?"
 
-#: cps/templates/admin.html:150 cps/templates/admin.html:164
-#: cps/templates/admin.html:184 cps/templates/shelf.html:73
+#: cps/templates/admin.html:152 cps/templates/admin.html:166
+#: cps/templates/admin.html:186 cps/templates/shelf.html:72
 msgid "Ok"
 msgstr "Ok"
 
-#: cps/templates/admin.html:151 cps/templates/admin.html:165
-#: cps/templates/book_edit.html:178 cps/templates/book_edit.html:200
-#: cps/templates/config_edit.html:226 cps/templates/config_view_edit.html:179
-#: cps/templates/email_edit.html:40 cps/templates/email_edit.html:75
-#: cps/templates/layout.html:28 cps/templates/shelf.html:74
+#: cps/templates/admin.html:153 cps/templates/admin.html:167
+#: cps/templates/book_edit.html:174 cps/templates/book_edit.html:196
+#: cps/templates/config_edit.html:281 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/user_edit.html:149
+#: cps/templates/user_edit.html:132
 msgid "Back"
 msgstr "Terug"
 
-#: cps/templates/admin.html:163
+#: cps/templates/admin.html:165
 msgid "Do you really want to stop Calibre-Web?"
 msgstr "Wil je Calibre-Web echt stoppen?"
 
-#: cps/templates/admin.html:175
+#: cps/templates/admin.html:177
 msgid "Updating, please do not reload page"
 msgstr "Aan het updaten, gelieve de pagina niet te herladen"
 
@@ -933,176 +1127,176 @@ msgstr "via"
 msgid "In Library"
 msgstr "In Bibliotheek"
 
-#: cps/templates/author.html:50 cps/templates/author.html:97
-#: cps/templates/discover.html:28 cps/templates/index.html:31
-#: cps/templates/index.html:86 cps/templates/search.html:55
-#: cps/templates/shelf.html:37
+#: cps/templates/author.html:34 cps/templates/list.html:14
+#: cps/templates/search.html:41
+msgid "All"
+msgstr ""
+
+#: cps/templates/author.html:58 cps/templates/author.html:105
+#: 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 ""
 
-#: cps/templates/author.html:81
+#: cps/templates/author.html:89
 msgid "More by"
 msgstr "Meer van"
 
-#: cps/templates/book_edit.html:16
+#: cps/templates/book_edit.html:12
 msgid "Delete Book"
 msgstr "Wis boek"
 
-#: cps/templates/book_edit.html:19
+#: cps/templates/book_edit.html:15
 msgid "Delete formats:"
 msgstr "Wis formaten:"
 
-#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:199
-#: cps/templates/email_edit.html:73 cps/templates/email_edit.html:74
+#: cps/templates/book_edit.html:18 cps/templates/book_edit.html:195
+#: cps/templates/email_edit.html:73
 msgid "Delete"
 msgstr "Wis"
 
-#: cps/templates/book_edit.html:30
+#: cps/templates/book_edit.html:26
 msgid "Convert book format:"
 msgstr "Converteer boek formaat:"
 
-#: cps/templates/book_edit.html:34
+#: cps/templates/book_edit.html:30
 msgid "Convert from:"
 msgstr "Converteer van:"
 
-#: cps/templates/book_edit.html:36 cps/templates/book_edit.html:43
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
 msgstr "selecteer een optie"
 
-#: cps/templates/book_edit.html:41
+#: cps/templates/book_edit.html:37
 msgid "Convert to:"
 msgstr "Converteer naar:"
 
-#: cps/templates/book_edit.html:50
+#: cps/templates/book_edit.html:46
 msgid "Convert book"
 msgstr "Converteer boek"
 
-#: cps/templates/book_edit.html:59 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:55 cps/templates/search_form.html:6
 msgid "Book Title"
 msgstr "Boek titel"
 
-#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:259
-#: cps/templates/book_edit.html:277 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:59 cps/templates/book_edit.html:255
+#: cps/templates/book_edit.html:273 cps/templates/search_form.html:10
 msgid "Author"
 msgstr "Auteur"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:264
-#: cps/templates/book_edit.html:279 cps/templates/search_form.html:106
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:260
+#: cps/templates/book_edit.html:275 cps/templates/search_form.html:106
 msgid "Description"
 msgstr "Omschrijving"
 
-#: cps/templates/book_edit.html:71 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:67 cps/templates/search_form.html:33
 msgid "Tags"
 msgstr "Tags"
 
-#: cps/templates/book_edit.html:75 cps/templates/layout.html:159
-#: cps/templates/search_form.html:53
-msgid "Series"
-msgstr "Series"
-
-#: cps/templates/book_edit.html:79
+#: cps/templates/book_edit.html:75
 msgid "Series id"
 msgstr "Series id"
 
-#: cps/templates/book_edit.html:83
+#: cps/templates/book_edit.html:79
 msgid "Rating"
 msgstr "Beoordeling"
 
-#: cps/templates/book_edit.html:87
+#: cps/templates/book_edit.html:83
 msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
 msgstr "Boekomslag URL (jpg, omslag wordt gedownload en opgeslagen in database, invulveld is nadien terug leeg)"
 
-#: cps/templates/book_edit.html:91
+#: cps/templates/book_edit.html:87
 msgid "Upload Cover from local drive"
 msgstr "Upload cover van lokale schijf"
 
-#: cps/templates/book_edit.html:96 cps/templates/detail.html:148
+#: cps/templates/book_edit.html:92 cps/templates/detail.html:168
 msgid "Publishing date"
 msgstr "Publicatie datum"
 
-#: cps/templates/book_edit.html:103 cps/templates/book_edit.html:261
-#: cps/templates/book_edit.html:278 cps/templates/detail.html:139
+#: cps/templates/book_edit.html:99 cps/templates/book_edit.html:257
+#: cps/templates/book_edit.html:274 cps/templates/detail.html:159
 #: cps/templates/search_form.html:14
 msgid "Publisher"
 msgstr "Uitgever"
 
-#: cps/templates/book_edit.html:107 cps/templates/user_edit.html:31
+#: cps/templates/book_edit.html:103 cps/templates/user_edit.html:31
 msgid "Language"
 msgstr "Taal"
 
-#: cps/templates/book_edit.html:117 cps/templates/search_form.html:117
+#: cps/templates/book_edit.html:113 cps/templates/search_form.html:117
 msgid "Yes"
 msgstr "Ja"
 
-#: cps/templates/book_edit.html:118 cps/templates/search_form.html:118
+#: cps/templates/book_edit.html:114 cps/templates/search_form.html:118
 msgid "No"
 msgstr "Nee"
 
-#: cps/templates/book_edit.html:164
+#: cps/templates/book_edit.html:160
 msgid "Upload format"
 msgstr "Upload type"
 
-#: cps/templates/book_edit.html:173
+#: cps/templates/book_edit.html:169
 msgid "view book after edit"
 msgstr "bekijk boek na bewerking"
 
-#: cps/templates/book_edit.html:176 cps/templates/book_edit.html:212
+#: cps/templates/book_edit.html:172 cps/templates/book_edit.html:208
 msgid "Get metadata"
 msgstr "Verkrijg metadata"
 
-#: cps/templates/book_edit.html:177 cps/templates/config_edit.html:224
-#: cps/templates/config_view_edit.html:178 cps/templates/login.html:20
+#: cps/templates/book_edit.html:173 cps/templates/config_edit.html:279
+#: cps/templates/config_view_edit.html:146 cps/templates/login.html:20
 #: cps/templates/search_form.html:150 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:147
+#: cps/templates/user_edit.html:130
 msgid "Submit"
 msgstr "Opslaan"
 
-#: cps/templates/book_edit.html:191
+#: cps/templates/book_edit.html:187
 msgid "Are you really sure?"
 msgstr "Ben je zeker?"
 
-#: cps/templates/book_edit.html:194
+#: cps/templates/book_edit.html:190
 msgid "Book will be deleted from Calibre database"
 msgstr "Boek wordt nu gewist uit de Calibre database"
 
-#: cps/templates/book_edit.html:195
+#: cps/templates/book_edit.html:191
 msgid "and from hard disk"
 msgstr "en van de harde schijf"
 
-#: cps/templates/book_edit.html:215
+#: cps/templates/book_edit.html:211
 msgid "Keyword"
 msgstr "Zoekwoord"
 
-#: cps/templates/book_edit.html:216
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr " Zoek sleutelwoord "
 
-#: cps/templates/book_edit.html:218 cps/templates/layout.html:47
+#: cps/templates/book_edit.html:214 cps/templates/layout.html:47
 msgid "Go!"
 msgstr "Start!"
 
-#: cps/templates/book_edit.html:222
+#: cps/templates/book_edit.html:218
 msgid "Click the cover to load metadata to the form"
 msgstr "Klik op de omslag om de metatadata in het formulier te laden"
 
-#: cps/templates/book_edit.html:234 cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:230 cps/templates/book_edit.html:270
 msgid "Loading..."
 msgstr "Aan het laden..."
 
-#: cps/templates/book_edit.html:239 cps/templates/layout.html:226
-#: cps/templates/layout.html:258
+#: cps/templates/book_edit.html:235 cps/templates/layout.html:187
+#: cps/templates/layout.html:219
 msgid "Close"
 msgstr "Sluit"
 
-#: cps/templates/book_edit.html:266 cps/templates/book_edit.html:280
+#: cps/templates/book_edit.html:262 cps/templates/book_edit.html:276
 msgid "Source"
 msgstr "Bron"
 
-#: cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:271
 msgid "Search error!"
 msgstr "Zoek fout!"
 
-#: cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:272
 msgid "No Result(s) found! Please try aonther keyword."
 msgstr "Geen resultaten gevonden! Gebruik alsjeblieft een ander sleutelwoord."
 
@@ -1230,35 +1424,87 @@ msgstr "Goodreads API sleutel"
 msgid "Goodreads API Secret"
 msgstr "Goodreads API geheim"
 
-#: cps/templates/config_edit.html:187
+#: cps/templates/config_edit.html:181
+msgid "Login type"
+msgstr ""
+
+#: cps/templates/config_edit.html:183
+msgid "Use standard Authentication"
+msgstr ""
+
+#: cps/templates/config_edit.html:185
+msgid "Use LDAP Authentication"
+msgstr ""
+
+#: cps/templates/config_edit.html:188
+msgid "Use GitHub OAuth"
+msgstr ""
+
+#: cps/templates/config_edit.html:189
+msgid "Use Google OAuth"
+msgstr ""
+
+#: cps/templates/config_edit.html:196
+msgid "LDAP Provider URL"
+msgstr ""
+
+#: cps/templates/config_edit.html:200
+msgid "LDAP Distinguished Name (DN)"
+msgstr ""
+
+#: cps/templates/config_edit.html:208
+msgid "Obtain GitHub OAuth Credential"
+msgstr ""
+
+#: cps/templates/config_edit.html:211
+msgid "GitHub OAuth Client Id"
+msgstr ""
+
+#: cps/templates/config_edit.html:215
+msgid "GitHub OAuth Client Secret"
+msgstr ""
+
+#: cps/templates/config_edit.html:221
+msgid "Obtain Google OAuth Credential"
+msgstr ""
+
+#: cps/templates/config_edit.html:224
+msgid "Google OAuth Client Id"
+msgstr ""
+
+#: cps/templates/config_edit.html:228
+msgid "Google OAuth Client Secret"
+msgstr ""
+
+#: cps/templates/config_edit.html:242
 msgid "External binaries"
 msgstr "Externe bibliotheken"
 
-#: cps/templates/config_edit.html:195
+#: cps/templates/config_edit.html:250
 msgid "No converter"
 msgstr "Geen conversie programma"
 
-#: cps/templates/config_edit.html:197
+#: cps/templates/config_edit.html:252
 msgid "Use Kindlegen"
 msgstr "Gebruik Kindlegen"
 
-#: cps/templates/config_edit.html:199
+#: cps/templates/config_edit.html:254
 msgid "Use calibre's ebook converter"
 msgstr "Gebruik calibre's ebook converter"
 
-#: cps/templates/config_edit.html:203
+#: cps/templates/config_edit.html:258
 msgid "E-Book converter settings"
 msgstr "E-book conversie instellingen"
 
-#: cps/templates/config_edit.html:207
+#: cps/templates/config_edit.html:262
 msgid "Path to convertertool"
 msgstr "Pad naar conversietool"
 
-#: cps/templates/config_edit.html:213
+#: cps/templates/config_edit.html:268
 msgid "Location of Unrar binary"
 msgstr "Locatie van Unrar programma"
 
-#: cps/templates/config_edit.html:229 cps/templates/layout.html:84
+#: cps/templates/config_edit.html:284 cps/templates/layout.html:84
 #: cps/templates/login.html:4
 msgid "Login"
 msgstr "Login"
@@ -1267,8 +1513,7 @@ msgstr "Login"
 msgid "View Configuration"
 msgstr "Bekijk Configuratie"
 
-#: cps/templates/config_view_edit.html:19 cps/templates/layout.html:135
-#: cps/templates/layout.html:136 cps/templates/shelf_edit.html:7
+#: cps/templates/config_view_edit.html:19 cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr "Titel"
 
@@ -1280,7 +1525,7 @@ msgstr "Aantal boeken te tonen"
 msgid "No. of authors to show before hiding (0=disable hiding)"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:118
+#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:112
 msgid "Theme"
 msgstr "Thema"
 
@@ -1312,127 +1557,91 @@ msgstr "Tags voor Volwassen Inhoud"
 msgid "Default settings for new users"
 msgstr "Standaard instellingen voor nieuwe gebruikers"
 
-#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:104
+#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:83
 msgid "Admin user"
 msgstr "Administratie gebruiker"
 
-#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:113
+#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:92
 msgid "Allow Downloads"
 msgstr "Downloads toestaan"
 
-#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:117
+#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:96
+msgid "Allow book viewer"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:100
 msgid "Allow Uploads"
 msgstr "Uploads toestaan"
 
-#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:121
+#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:104
 msgid "Allow Edit"
 msgstr "Bewerken toestaan"
 
-#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:125
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:108
 msgid "Allow Delete books"
 msgstr "Het wissen van boeken toestaan"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:130
+#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:113
 msgid "Allow Changing Password"
 msgstr "Wachtwoord wijzigen toestaan"
 
-#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:134
+#: cps/templates/config_view_edit.html:109 cps/templates/user_edit.html:117
 msgid "Allow Editing Public Shelfs"
 msgstr "Publieke boekenplanken bewerken toestaan"
 
-#: cps/templates/config_view_edit.html:115
+#: cps/templates/config_view_edit.html:119
 msgid "Default visibilities for new users"
 msgstr "Standaard zichtbaar voor nieuwe gebruikers"
 
-#: cps/templates/config_view_edit.html:123 cps/templates/user_edit.html:50
-msgid "Show random books"
-msgstr "Toon willekeurige boeken"
-
-#: cps/templates/config_view_edit.html:127 cps/templates/user_edit.html:54
-msgid "Show recent books"
-msgstr "Toon recente boeken"
-
-#: cps/templates/config_view_edit.html:131 cps/templates/user_edit.html:58
-msgid "Show sorted books"
-msgstr "Toon gesorteerde boeken"
-
-#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:62
-msgid "Show hot books"
-msgstr "Toon populaire boeken"
-
-#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:66
-msgid "Show best rated books"
-msgstr "Toon best beoordeelde boeken"
-
-#: cps/templates/config_view_edit.html:143 cps/templates/user_edit.html:70
-msgid "Show language selection"
-msgstr "Toon taal selectie"
-
-#: cps/templates/config_view_edit.html:147 cps/templates/user_edit.html:74
-msgid "Show series selection"
-msgstr "Toon serie selectie"
-
-#: cps/templates/config_view_edit.html:151 cps/templates/user_edit.html:78
-msgid "Show category selection"
-msgstr "Toon categorie selectie"
-
-#: cps/templates/config_view_edit.html:155 cps/templates/user_edit.html:82
-msgid "Show author selection"
-msgstr "Toon auteur selectie"
-
-#: cps/templates/config_view_edit.html:159 cps/templates/user_edit.html:86
-msgid "Show publisher selection"
-msgstr "Toon uitgevers selectie"
-
-#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:91
-msgid "Show read and unread"
-msgstr "Toon gelezen en ongelezen"
-
-#: cps/templates/config_view_edit.html:167 cps/templates/user_edit.html:96
+#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:75
 msgid "Show random books in detail view"
 msgstr "Toon willekeurige boeken in gedetailleerd zicht"
 
-#: cps/templates/config_view_edit.html:171 cps/templates/user_edit.html:109
+#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:88
 msgid "Show mature content"
 msgstr "Toon Volwassen Inhoud"
 
-#: cps/templates/detail.html:63
+#: cps/templates/detail.html:59
 msgid "Read in browser"
 msgstr "Lees in browser"
 
-#: cps/templates/detail.html:100
+#: cps/templates/detail.html:73
+msgid "Listen in browser"
+msgstr ""
+
+#: cps/templates/detail.html:120
 msgid "Book"
 msgstr "Boek"
 
-#: cps/templates/detail.html:100
+#: cps/templates/detail.html:120
 msgid "of"
 msgstr "van"
 
-#: cps/templates/detail.html:106
+#: cps/templates/detail.html:126
 msgid "language"
 msgstr "taal"
 
-#: cps/templates/detail.html:185
+#: cps/templates/detail.html:203
 msgid "Mark As Unread"
 msgstr ""
 
-#: cps/templates/detail.html:185
+#: cps/templates/detail.html:203
 msgid "Mark As Read"
 msgstr ""
 
-#: cps/templates/detail.html:186
+#: cps/templates/detail.html:204
 msgid "Read"
 msgstr "Lees"
 
-#: cps/templates/detail.html:196
+#: cps/templates/detail.html:214 cps/templates/listenmp3.html:54
 msgid "Description:"
 msgstr "Omschrijving:"
 
-#: cps/templates/detail.html:209 cps/templates/search.html:14
+#: cps/templates/detail.html:227 cps/templates/search.html:14
 msgid "Add to shelf"
 msgstr "Voeg toe aan boekenplank"
 
-#: cps/templates/detail.html:271
+#: cps/templates/detail.html:289
 msgid "Edit metadata"
 msgstr "Bewerk metadata"
 
@@ -1492,12 +1701,12 @@ msgstr "Voeg toe"
 msgid "Do you really want to delete this domain rule?"
 msgstr "Wil je werkelijk deze domein regel verwijderen?"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:210
+#: cps/templates/feed.xml:21 cps/templates/layout.html:171
 msgid "Next"
 msgstr "Volgende"
 
-#: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:44 cps/templates/layout.html:45
+#: cps/templates/feed.xml:33 cps/templates/layout.html:44
+#: cps/templates/layout.html:45
 msgid "Search"
 msgstr "Zoek"
 
@@ -1509,75 +1718,63 @@ msgstr ""
 msgid "Discover (Random Books)"
 msgstr "Ontdek (Willekeurige Boeken)"
 
+#: cps/templates/index.html:65
+msgid "Group by series"
+msgstr ""
+
 #: cps/templates/index.xml:6
 msgid "Start"
 msgstr "Start"
 
-#: cps/templates/index.xml:18 cps/templates/layout.html:141
-msgid "Hot Books"
-msgstr "Populaire Boeken"
-
-#: cps/templates/index.xml:22
+#: cps/templates/index.xml:21
 msgid "Popular publications from this catalog based on Downloads."
 msgstr "Populaire publicaties van deze cataloog gebaseerd op Downloads."
 
-#: cps/templates/index.xml:25 cps/templates/layout.html:144
-msgid "Best rated Books"
-msgstr "Best beoordeeld"
-
-#: cps/templates/index.xml:29
+#: cps/templates/index.xml:28
 msgid "Popular publications from this catalog based on Rating."
 msgstr "Populaire publicaties van deze cataloog gebaseerd op Beoordeling."
 
-#: cps/templates/index.xml:32
+#: cps/templates/index.xml:31
 msgid "New Books"
 msgstr "Nieuwe Boeken"
 
-#: cps/templates/index.xml:36
+#: cps/templates/index.xml:35
 msgid "The latest Books"
 msgstr "Recentste boeken"
 
-#: cps/templates/index.xml:43
+#: cps/templates/index.xml:42
 msgid "Show Random Books"
 msgstr "Toon Willekeurige Boeken"
 
-#: cps/templates/index.xml:62 cps/templates/layout.html:162
-msgid "Authors"
-msgstr "Auteurs"
-
-#: cps/templates/index.xml:66
+#: cps/templates/index.xml:65
 msgid "Books ordered by Author"
 msgstr "Boeken gesorteerd op Auteur"
 
-#: cps/templates/index.xml:69 cps/templates/layout.html:165
-msgid "Publishers"
-msgstr "Uitgevers"
-
-#: cps/templates/index.xml:73
+#: cps/templates/index.xml:72
 msgid "Books ordered by publisher"
 msgstr "Boeken gesorteerd op uitgever"
 
-#: cps/templates/index.xml:80
+#: cps/templates/index.xml:79
 msgid "Books ordered by category"
 msgstr "Boeken gesorteerd op Categorie"
 
-#: cps/templates/index.xml:87
+#: cps/templates/index.xml:86
 msgid "Books ordered by series"
 msgstr "Boeken gesorteerd op Serie"
 
-#: cps/templates/index.xml:90 cps/templates/layout.html:171
+#: cps/templates/index.xml:89 cps/templates/layout.html:132
 msgid "Public Shelves"
 msgstr "Publieke Boekenplanken"
 
-#: cps/templates/index.xml:94
+#: cps/templates/index.xml:93
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr "Boeken georganiseerd in publieke boekenplanken, zichtbaar voor iedereen"
 
-#: cps/templates/index.xml:98 cps/templates/layout.html:175
+#: cps/templates/index.xml:97 cps/templates/layout.html:136
 msgid "Your Shelves"
 msgstr "Jou Boekenplanken"
 
-#: cps/templates/index.xml:102
+#: cps/templates/index.xml:101
 msgid "User's own shelfs, only visible to the current user himself"
 msgstr "Eigen boekenplanken, enkel zichtbaar voor de huidige gebruiker zelf"
 
@@ -1594,7 +1791,7 @@ msgid "Advanced Search"
 msgstr "Geavanceerd zoeken"
 
 #: cps/templates/layout.html:76 cps/templates/read.html:71
-#: cps/templates/readcbr.html:89 cps/templates/readcbr.html:113
+#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
 msgid "Settings"
 msgstr "Instellingen"
 
@@ -1610,7 +1807,7 @@ msgstr "Log uit"
 msgid "Register"
 msgstr "Registreer"
 
-#: cps/templates/layout.html:111 cps/templates/layout.html:257
+#: cps/templates/layout.html:111 cps/templates/layout.html:218
 msgid "Uploading..."
 msgstr "Aan het uploaden..."
 
@@ -1622,68 +1819,27 @@ msgstr "gelieve de pagina niet te herladen"
 msgid "Browse"
 msgstr "Verkennen"
 
-#: cps/templates/layout.html:124
-msgid "Recently Added"
-msgstr "Recent Toegevoegd"
-
-#: cps/templates/layout.html:129
-msgid "Sorted Books"
-msgstr "Gesorteerde Boeken"
-
-#: cps/templates/layout.html:133 cps/templates/layout.html:134
-#: cps/templates/layout.html:135 cps/templates/layout.html:136
-msgid "Sort By"
-msgstr "Sorteren op"
-
-#: cps/templates/layout.html:133
-msgid "Newest"
-msgstr "Nieuwste"
-
-#: cps/templates/layout.html:134
-msgid "Oldest"
-msgstr "Oudste"
-
-#: cps/templates/layout.html:135
-msgid "Ascending"
-msgstr "Oplopend"
-
-#: cps/templates/layout.html:136
-msgid "Descending"
-msgstr "Aflopend"
-
-#: cps/templates/layout.html:153
-msgid "Discover"
-msgstr "Ontdek"
-
-#: cps/templates/layout.html:156
-msgid "Categories"
-msgstr "Categorieën"
-
-#: cps/templates/layout.html:168 cps/templates/search_form.html:74
-msgid "Languages"
-msgstr "Talen"
-
-#: cps/templates/layout.html:180
+#: cps/templates/layout.html:141
 msgid "Create a Shelf"
 msgstr "Maak een boekenplank"
 
-#: cps/templates/layout.html:181 cps/templates/stats.html:3
+#: cps/templates/layout.html:142 cps/templates/stats.html:3
 msgid "About"
 msgstr "Over"
 
-#: cps/templates/layout.html:195
+#: cps/templates/layout.html:156
 msgid "Previous"
 msgstr "Vorige"
 
-#: cps/templates/layout.html:222
+#: cps/templates/layout.html:183
 msgid "Book Details"
 msgstr "Boek Details"
 
-#: cps/templates/layout.html:256
+#: cps/templates/layout.html:217
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:259
+#: cps/templates/layout.html:220
 msgid "Error"
 msgstr ""
 
@@ -1713,105 +1869,105 @@ msgstr "Calibre-Web ebook cataloog"
 msgid "Reflow text when sidebars are open."
 msgstr "Herschuif tekst waneer het zijpaneel open staat."
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:88
 msgid "Keyboard Shortcuts"
 msgstr "Sneltoetsen"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:91
 msgid "Previous Page"
 msgstr "Vorige Pagina"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:92
 msgid "Next Page"
 msgstr "Volgende Pagina"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:93
 msgid "Scale to Best"
 msgstr "Optimaal schalen"
 
-#: cps/templates/readcbr.html:100
+#: cps/templates/readcbr.html:94
 msgid "Scale to Width"
 msgstr "Schalen naar breedte"
 
-#: cps/templates/readcbr.html:101
+#: cps/templates/readcbr.html:95
 msgid "Scale to Height"
 msgstr "Schalen naar hoogte"
 
-#: cps/templates/readcbr.html:102
+#: cps/templates/readcbr.html:96
 msgid "Scale to Native"
 msgstr "Schalen op ware grootte"
 
-#: cps/templates/readcbr.html:103
+#: cps/templates/readcbr.html:97
 msgid "Rotate Right"
 msgstr "Draai rechtsom"
 
-#: cps/templates/readcbr.html:104
+#: cps/templates/readcbr.html:98
 msgid "Rotate Left"
 msgstr "Draai linksom"
 
-#: cps/templates/readcbr.html:105
+#: cps/templates/readcbr.html:99
 msgid "Flip Image"
 msgstr "Keer beeld om"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:115
 msgid "Light"
 msgstr "Licht"
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:116
 msgid "Dark"
 msgstr "Donker"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:121
 msgid "Scale"
 msgstr "Schaal"
 
-#: cps/templates/readcbr.html:130
+#: cps/templates/readcbr.html:124
 msgid "Best"
 msgstr "Beste"
 
-#: cps/templates/readcbr.html:131
+#: cps/templates/readcbr.html:125
 msgid "Width"
 msgstr "Breedte"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:126
 msgid "Height"
 msgstr "Hoogte"
 
-#: cps/templates/readcbr.html:133
+#: cps/templates/readcbr.html:127
 msgid "Native"
 msgstr "Ware grootte"
 
-#: cps/templates/readcbr.html:138
+#: cps/templates/readcbr.html:132
 msgid "Rotate"
 msgstr "Draai"
 
-#: cps/templates/readcbr.html:149
+#: cps/templates/readcbr.html:143
 msgid "Flip"
 msgstr "Keer"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:146
 msgid "Horizontal"
 msgstr "Horizontaal"
 
-#: cps/templates/readcbr.html:153
+#: cps/templates/readcbr.html:147
 msgid "Vertical"
 msgstr "Verticaal"
 
-#: cps/templates/readcbr.html:158
+#: cps/templates/readcbr.html:152
 msgid "Direction"
 msgstr ""
 
-#: cps/templates/readcbr.html:161
+#: cps/templates/readcbr.html:155
 msgid "Left to Right"
 msgstr ""
 
-#: cps/templates/readcbr.html:162
+#: cps/templates/readcbr.html:156
 msgid "Right to Left"
 msgstr ""
 
 #: cps/templates/readpdf.html:29
-msgid "PDF.js viewer"
-msgstr "PDF.js viewer"
+msgid "PDF reader"
+msgstr ""
 
 #: cps/templates/readtxt.html:6
 msgid "Basic txt Reader"
@@ -1885,23 +2041,23 @@ msgstr "Waardering meer dan"
 msgid "Rating less than"
 msgstr "Waardering minder dan"
 
-#: cps/templates/shelf.html:7
+#: cps/templates/shelf.html:10
 msgid "Delete this Shelf"
 msgstr "Wis deze boekenplank"
 
-#: cps/templates/shelf.html:8
+#: cps/templates/shelf.html:11
 msgid "Edit Shelf"
 msgstr "Bewerk Boekenplank"
 
-#: cps/templates/shelf.html:9 cps/templates/shelf_order.html:11
+#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:11
 msgid "Change order"
 msgstr "Verander volgorde"
 
-#: cps/templates/shelf.html:68
+#: cps/templates/shelf.html:67
 msgid "Do you really want to delete the shelf?"
 msgstr "Wil je echt deze boekenplank verwijderen?"
 
-#: cps/templates/shelf.html:71
+#: cps/templates/shelf.html:70
 msgid "Shelf will be lost for everybody and forever!"
 msgstr "Boekenplank zal verdwijnen voor iedereen en altijd!"
 
@@ -1989,19 +2145,31 @@ msgstr "Reset gebruikers wachtwoord"
 msgid "Kindle E-Mail"
 msgstr "Kindle email"
 
-#: cps/templates/user_edit.html:39
+#: cps/templates/user_edit.html:40
 msgid "Show books with language"
 msgstr "Toon boeken met taal"
 
-#: cps/templates/user_edit.html:41
+#: cps/templates/user_edit.html:42
 msgid "Show all"
 msgstr "Toon alles"
 
-#: cps/templates/user_edit.html:141
+#: cps/templates/user_edit.html:52
+msgid "OAuth Settings"
+msgstr ""
+
+#: cps/templates/user_edit.html:54
+msgid "Link"
+msgstr ""
+
+#: cps/templates/user_edit.html:56
+msgid "Unlink"
+msgstr ""
+
+#: cps/templates/user_edit.html:124
 msgid "Delete this user"
 msgstr "Wis deze gebruiker"
 
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:139
 msgid "Recent Downloads"
 msgstr "Recente Downloads"
 
@@ -3283,3 +3451,45 @@ msgstr "Recente Downloads"
 #~ msgid "Using your another device, login and visit "
 #~ msgstr ""
 
+#~ msgid "Newest Books"
+#~ msgstr "Nieuwste boeken"
+
+#~ msgid "Oldest Books"
+#~ msgstr "Oudste boeken"
+
+#~ msgid "Books (A-Z)"
+#~ msgstr "Boeken (A-Z)"
+
+#~ msgid "Books (Z-A)"
+#~ msgstr "Boeken (A-Z)"
+
+#~ msgid "Error opening eBook. Fileformat is not supported."
+#~ msgstr ""
+
+#~ msgid "File %(title)s"
+#~ msgstr ""
+
+#~ msgid "Show sorted books"
+#~ msgstr "Toon gesorteerde boeken"
+
+#~ msgid "Sorted Books"
+#~ msgstr "Gesorteerde Boeken"
+
+#~ msgid "Sort By"
+#~ msgstr "Sorteren op"
+
+#~ msgid "Newest"
+#~ msgstr "Nieuwste"
+
+#~ msgid "Oldest"
+#~ msgstr "Oudste"
+
+#~ msgid "Ascending"
+#~ msgstr "Oplopend"
+
+#~ msgid "Descending"
+#~ msgstr "Aflopend"
+
+#~ msgid "PDF.js viewer"
+#~ msgstr "PDF.js viewer"
+
diff --git a/cps/translations/pl/LC_MESSAGES/messages.mo b/cps/translations/pl/LC_MESSAGES/messages.mo
index 24e87db5..3e193cb2 100644
Binary files a/cps/translations/pl/LC_MESSAGES/messages.mo and b/cps/translations/pl/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po
index 4b6a85b7..035bf38b 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: 2017-04-11 22:51)\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-05-30 09:06+0200\n"
+"POT-Creation-Date: 2019-05-31 11:20+0200\n"
 "PO-Revision-Date: 2017-04-11 22:51+0200\n"
 "Last-Translator: Radosław Kierznowski <radek.kierznowski@outlook.com>\n"
 "Language: pl\n"
@@ -19,740 +19,929 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.6.0\n"
 
-#: cps/book_formats.py:199 cps/book_formats.py:200 cps/book_formats.py:204
-#: cps/book_formats.py:208 cps/book_formats.py:212 cps/converter.py:29
-#: cps/converter.py:45
-msgid "not installed"
-msgstr "nie zainstalowane"
-
-#: cps/converter.py:40 cps/converter.py:56
-msgid "Excecution permissions missing"
-msgstr ""
-
-#: cps/converter.py:66
-msgid "not configured"
-msgstr ""
-
-#: cps/helper.py:79
-#, python-format
-msgid "%(format)s format not found for book id: %(book)d"
-msgstr ""
-
-#: cps/helper.py:91
-#, python-format
-msgid "%(format)s not found on Google Drive: %(fn)s"
-msgstr ""
-
-#: cps/helper.py:98 cps/helper.py:204 cps/templates/detail.html:45
-#: cps/templates/detail.html:49
-msgid "Send to Kindle"
-msgstr "Wyślij do Kindle"
-
-#: cps/helper.py:99 cps/helper.py:117 cps/helper.py:206
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr ""
-
-#: cps/helper.py:110
-#, python-format
-msgid "%(format)s not found: %(fn)s"
-msgstr ""
-
-#: cps/helper.py:115
-msgid "Calibre-Web test e-mail"
-msgstr ""
-
-#: cps/helper.py:116
-msgid "Test e-mail"
-msgstr ""
-
-#: cps/helper.py:132
-msgid "Get Started with Calibre-Web"
-msgstr ""
-
-#: cps/helper.py:133
-#, python-format
-msgid "Registration e-mail for user: %(name)s"
-msgstr ""
-
-#: cps/helper.py:146 cps/helper.py:148 cps/helper.py:150 cps/helper.py:158
-#: cps/helper.py:160 cps/helper.py:162
-#, python-format
-msgid "Send %(format)s to Kindle"
-msgstr ""
-
-#: cps/helper.py:166
-#, python-format
-msgid "Convert %(orig)s to %(format)s and send to Kindle"
-msgstr ""
-
-#: cps/helper.py:205
-#, python-format
-msgid "E-mail: %(book)s"
-msgstr ""
-
-#: cps/helper.py:208
-msgid "The requested file could not be read. Maybe wrong permissions?"
-msgstr ""
-
-#: cps/helper.py:316
-#, python-format
-msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr ""
-
-#: cps/helper.py:326
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr ""
-
-#: cps/helper.py:340
-#, python-format
-msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr ""
-
-#: cps/helper.py:366 cps/helper.py:376 cps/helper.py:384
-#, python-format
-msgid "File %(file)s not found on Google Drive"
-msgstr ""
-
-#: cps/helper.py:405
-#, python-format
-msgid "Book path %(path)s not found on Google Drive"
-msgstr ""
-
-#: cps/helper.py:556
-msgid "Error excecuting UnRar"
-msgstr ""
-
-#: cps/helper.py:558
-msgid "Unrar binary file not found"
-msgstr ""
-
-#: cps/helper.py:585
-msgid "Waiting"
-msgstr ""
-
-#: cps/helper.py:587
-msgid "Failed"
-msgstr ""
-
-#: cps/helper.py:589
-msgid "Started"
-msgstr ""
-
-#: cps/helper.py:591
-msgid "Finished"
-msgstr ""
-
-#: cps/helper.py:593
-msgid "Unknown Status"
-msgstr ""
-
-#: cps/helper.py:598
-msgid "E-mail: "
-msgstr ""
-
-#: cps/helper.py:600 cps/helper.py:604
-msgid "Convert: "
-msgstr ""
-
-#: cps/helper.py:602
-msgid "Upload: "
-msgstr ""
-
-#: cps/helper.py:606
-msgid "Unknown Task: "
-msgstr ""
-
-#: cps/updater.py:251 cps/updater.py:410 cps/updater.py:423
-msgid "Unexpected data while reading update information"
-msgstr ""
-
-#: cps/updater.py:258 cps/updater.py:416
-msgid "No update available. You already have the latest version installed"
-msgstr ""
-
-#: cps/updater.py:270 cps/updater.py:501 cps/updater.py:503 cps/web.py:1206
-msgid "HTTP Error"
-msgstr ""
-
-#: cps/updater.py:272 cps/updater.py:505 cps/web.py:1207
-msgid "Connection error"
-msgstr ""
-
-#: cps/updater.py:274 cps/updater.py:507 cps/web.py:1208
-msgid "Timeout while establishing connection"
-msgstr ""
-
-#: cps/updater.py:276 cps/updater.py:509 cps/web.py:1209
-msgid "General error"
-msgstr ""
-
-#: cps/updater.py:283 cps/updater.py:341 cps/updater.py:468
-msgid "A new update is available. Click on the button below to update to the latest version."
-msgstr ""
-
-#: cps/updater.py:335
-msgid "Could not fetch update information"
-msgstr ""
-
-#: cps/updater.py:403
-msgid "No release information available"
-msgstr ""
-
-#: cps/updater.py:449 cps/updater.py:458
-#, python-format
-msgid "A new update is available. Click on the button below to update to version: %(version)s"
-msgstr ""
-
-#: cps/updater.py:491 cps/web.py:2795
-msgid "Unknown"
-msgstr ""
-
-#: cps/web.py:1199
-msgid "Requesting update package"
-msgstr "Żądanie o pakiet aktualizacji"
-
-#: cps/web.py:1200
-msgid "Downloading update package"
-msgstr "Pobieranie pakietu aktualizacji"
-
-#: cps/web.py:1201
-msgid "Unzipping update package"
-msgstr "Rozpakowywanie pakietu aktualizacji"
-
-#: cps/web.py:1202
-msgid "Replacing files"
-msgstr ""
-
-#: cps/web.py:1203
-msgid "Database connections are closed"
-msgstr "Połączenia z bazą danych zostały zakończone"
-
-#: cps/web.py:1204
-msgid "Stopping server"
-msgstr ""
-
-#: cps/web.py:1205
-msgid "Update finished, please press okay and reload page"
-msgstr "Aktualizacja zakończona, proszę nacisnąć OK i odświeżyć stronę"
-
-#: cps/web.py:1206 cps/web.py:1207 cps/web.py:1208 cps/web.py:1209
-msgid "Update failed:"
-msgstr ""
-
-#: cps/web.py:1235
-msgid "Recently Added Books"
-msgstr ""
-
-#: cps/web.py:1245
-msgid "Newest Books"
-msgstr ""
-
-#: cps/web.py:1257
-msgid "Oldest Books"
-msgstr ""
-
-#: cps/web.py:1269
-msgid "Books (A-Z)"
-msgstr ""
-
-#: cps/web.py:1280
-msgid "Books (Z-A)"
-msgstr ""
-
-#: cps/web.py:1309
-msgid "Hot Books (most downloaded)"
-msgstr "Najpopularniejsze książki (najczęściej pobierane)"
-
-#: cps/web.py:1322
-msgid "Best rated books"
-msgstr "Najlepiej oceniane książki"
-
-#: cps/templates/index.xml:39 cps/web.py:1335
-msgid "Random Books"
-msgstr "Losowe książki"
-
-#: cps/web.py:1362 cps/web.py:1618 cps/web.py:2161
-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:1391
-msgid "Publisher list"
-msgstr ""
-
-#: cps/web.py:1406
-#, python-format
-msgid "Publisher: %(name)s"
-msgstr ""
-
-#: cps/templates/index.xml:83 cps/web.py:1438
-msgid "Series list"
-msgstr "Lista serii"
-
-#: cps/web.py:1452
-#, python-format
-msgid "Series: %(serie)s"
-msgstr "Seria: %(serie)s"
-
-#: cps/web.py:1478
-msgid "Available languages"
-msgstr "Dostępne języki"
-
-#: cps/web.py:1498
-#, python-format
-msgid "Language: %(name)s"
-msgstr "Język: %(name)s"
-
-#: cps/templates/index.xml:76 cps/web.py:1509
-msgid "Category list"
-msgstr "Lista kategorii"
-
-#: cps/web.py:1523
-#, python-format
-msgid "Category: %(name)s"
-msgstr "Kategoria: %(name)s"
-
-#: cps/templates/layout.html:73 cps/web.py:1648
-msgid "Tasks"
-msgstr ""
-
-#: cps/web.py:1682
+#: cps/about.py:76
 msgid "Statistics"
 msgstr "Statystyki"
 
-#: cps/web.py:1750
-msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
-msgstr ""
-
-#: cps/web.py:1795
-msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
-msgstr ""
-
-#: cps/web.py:1871
+#: cps/admin.py:97
 msgid "Server restarted, please reload page"
 msgstr "Serwer uruchomiony ponownie, proszę odświeżyć stronę"
 
-#: cps/web.py:1874
+#: cps/admin.py:100
 msgid "Performing shutdown of server, please close window"
 msgstr "Wykonano wyłączenie serwera, proszę zamknąć okno"
 
-#: cps/web.py:1953
-msgid "Published after "
+#: cps/admin.py:120 cps/updater.py:445
+msgid "Unknown"
 msgstr ""
 
-#: cps/web.py:1960
-msgid "Published before "
-msgstr ""
-
-#: cps/web.py:1974
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr ""
-
-#: cps/web.py:1976
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr ""
-
-#: cps/web.py:2036 cps/web.py:2045
-msgid "search"
-msgstr "szukaj"
-
-#: cps/templates/index.xml:47 cps/templates/index.xml:51
-#: cps/templates/layout.html:148 cps/web.py:2116
-msgid "Read Books"
-msgstr "Przeczytane książki"
-
-#: cps/templates/index.xml:55 cps/templates/index.xml:59
-#: cps/templates/layout.html:150 cps/web.py:2119
-msgid "Unread Books"
-msgstr "Nieprzeczytane książki"
-
-#: cps/web.py:2171 cps/web.py:2173 cps/web.py:2175 cps/web.py:2187
-msgid "Read a Book"
-msgstr "Czytaj książkę"
-
-#: cps/web.py:2199
-msgid "Error opening eBook. Fileformat is not supported."
-msgstr ""
-
-#: cps/web.py:2249 cps/web.py:3170
-msgid "Please fill out all fields!"
-msgstr "Proszę wypełnić wszystkie pola!"
-
-#: cps/web.py:2250 cps/web.py:2272 cps/web.py:2276 cps/web.py:2281
-#: cps/web.py:2283
-msgid "register"
-msgstr "rejestracja"
-
-#: cps/web.py:2271 cps/web.py:3389
-msgid "An unknown error occurred. Please try again later."
-msgstr ""
-
-#: cps/web.py:2274
-msgid "Your e-mail is not allowed to register"
-msgstr ""
-
-#: cps/web.py:2277
-msgid "Confirmation e-mail was send to your e-mail account."
-msgstr ""
-
-#: cps/web.py:2280
-msgid "This username or e-mail address is already in use."
-msgstr ""
-
-#: cps/web.py:2297 cps/web.py:2393
-#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
-msgstr "Zalogowałeś się jako: '%(nickname)s'"
-
-#: cps/web.py:2302
-msgid "Wrong Username or Password"
-msgstr "Błędna nazwa użytkownika lub hasło"
-
-#: cps/web.py:2308 cps/web.py:2329
-msgid "login"
-msgstr "logowanie"
-
-#: cps/web.py:2341 cps/web.py:2372
-msgid "Token not found"
-msgstr ""
-
-#: cps/web.py:2349 cps/web.py:2380
-msgid "Token has expired"
-msgstr ""
-
-#: cps/web.py:2357
-msgid "Success! Please return to your device"
-msgstr ""
-
-#: cps/web.py:2407
-msgid "Please configure the SMTP mail settings first..."
-msgstr "Proszę najpierw skonfigurować ustawienia SMTP poczty e-mail..."
-
-#: cps/web.py:2412
-#, python-format
-msgid "Book successfully queued for sending to %(kindlemail)s"
-msgstr ""
-
-#: cps/web.py:2416
-#, 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:2418 cps/web.py:3223
-msgid "Please configure your kindle e-mail address first..."
-msgstr ""
-
-#: cps/web.py:2429 cps/web.py:2481
-msgid "Invalid shelf specified"
-msgstr ""
-
-#: cps/web.py:2436
-#, python-format
-msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
-msgstr ""
-
-#: cps/web.py:2444
-msgid "You are not allowed to edit public shelves"
-msgstr ""
-
-#: cps/web.py:2453
-#, python-format
-msgid "Book is already part of the shelf: %(shelfname)s"
-msgstr ""
-
-#: cps/web.py:2467
-#, python-format
-msgid "Book has been added to shelf: %(sname)s"
-msgstr "Książka została dodana do półki: %(sname)s"
-
-#: cps/web.py:2486
-#, python-format
-msgid "You are not allowed to add a book to the the shelf: %(name)s"
-msgstr ""
-
-#: cps/web.py:2491
-msgid "User is not allowed to edit public shelves"
-msgstr ""
-
-#: cps/web.py:2509
-#, python-format
-msgid "Books are already part of the shelf: %(name)s"
-msgstr ""
-
-#: cps/web.py:2523
-#, python-format
-msgid "Books have been added to shelf: %(sname)s"
-msgstr ""
-
-#: cps/web.py:2525
-#, python-format
-msgid "Could not add books to shelf: %(sname)s"
-msgstr ""
-
-#: cps/web.py:2562
-#, python-format
-msgid "Book has been removed from shelf: %(sname)s"
-msgstr "Książka została usunięta z półki: %(sname)s"
-
-#: cps/web.py:2568
-#, python-format
-msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
-msgstr ""
-
-#: cps/web.py:2589 cps/web.py:2613
-#, python-format
-msgid "A shelf with the name '%(title)s' already exists."
-msgstr "Półka o nazwie '%(title)s' już istnieje."
-
-#: cps/web.py:2594
-#, python-format
-msgid "Shelf %(title)s created"
-msgstr "Półka %(title)s została utworzona"
-
-#: cps/web.py:2596 cps/web.py:2624
-msgid "There was an error"
-msgstr "Wystąpił błąd"
-
-#: cps/web.py:2597 cps/web.py:2599
-msgid "create a shelf"
-msgstr "utwórz półkę"
-
-#: cps/web.py:2622
-#, python-format
-msgid "Shelf %(title)s changed"
-msgstr "Półka %(title)s została zmieniona"
-
-#: cps/web.py:2625 cps/web.py:2627
-msgid "Edit a shelf"
-msgstr "Edytuj półkę"
-
-#: cps/web.py:2648
-#, python-format
-msgid "successfully deleted shelf %(name)s"
-msgstr "pomyślnie usunięto półkę %(name)s"
-
-#: cps/web.py:2675
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Półka: '%(name)s'"
-
-#: cps/web.py:2678
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr ""
-
-#: cps/web.py:2709
-#, python-format
-msgid "Change order of Shelf: '%(name)s'"
-msgstr "Zmieniono kolejność półki: '%(name)s'"
-
-#: cps/web.py:2738 cps/web.py:3176
-msgid "E-mail is not from valid domain"
-msgstr ""
-
-#: cps/web.py:2740 cps/web.py:2782 cps/web.py:2785
-#, python-format
-msgid "%(name)s's profile"
-msgstr "Profil użytkownika %(name)s"
-
-#: cps/web.py:2780
-msgid "Found an existing account for this e-mail address."
-msgstr ""
-
-#: cps/web.py:2783
-msgid "Profile updated"
-msgstr "Zaktualizowano profil"
-
-#: cps/web.py:2814
+#: cps/admin.py:139
 msgid "Admin page"
 msgstr "Portal administracyjny"
 
-#: cps/web.py:2899 cps/web.py:3079
+#: cps/admin.py:208 cps/admin.py:486
 msgid "Calibre-Web configuration updated"
 msgstr "Konfiguracja Calibre-Web została zaktualizowana"
 
-#: cps/templates/admin.html:100 cps/web.py:2913
+#: cps/admin.py:222 cps/templates/admin.html:102
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/web.py:2931
+#: cps/admin.py:295
 msgid "Import of optional Google Drive requirements missing"
 msgstr ""
 
-#: cps/web.py:2934
+#: cps/admin.py:298
 msgid "client_secrets.json is missing or not readable"
 msgstr ""
 
-#: cps/web.py:2939 cps/web.py:2968
+#: cps/admin.py:303 cps/admin.py:332
 msgid "client_secrets.json is not configured for web application"
 msgstr ""
 
-#: cps/templates/admin.html:99 cps/web.py:2971 cps/web.py:2997 cps/web.py:3009
-#: cps/web.py:3054 cps/web.py:3069 cps/web.py:3088 cps/web.py:3096
-#: cps/web.py:3112
+#: cps/admin.py:335 cps/admin.py:361 cps/admin.py:373 cps/admin.py:398
+#: cps/admin.py:426 cps/admin.py:440 cps/admin.py:463 cps/admin.py:476
+#: cps/admin.py:494 cps/admin.py:501 cps/admin.py:516
+#: cps/templates/admin.html:101
 msgid "Basic Configuration"
 msgstr "Podstawowa konfiguracja"
 
-#: cps/web.py:2994
+#: cps/admin.py:358
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:3006
+#: cps/admin.py:370
 msgid "Certfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:3051
+#: cps/admin.py:395
+msgid "Please enter a LDAP provider and a DN"
+msgstr ""
+
+#: cps/admin.py:423
+msgid "Please enter Github oauth credentials"
+msgstr ""
+
+#: cps/admin.py:437
+msgid "Please enter Google oauth credentials"
+msgstr ""
+
+#: cps/admin.py:460
 msgid "Logfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:3092
+#: cps/admin.py:498
 msgid "DB location is not valid, please enter correct path"
 msgstr "Lokalizacja bazy danych jest nieprawidłowa, wpisz poprawną ścieżkę"
 
-#: cps/templates/admin.html:33 cps/web.py:3172 cps/web.py:3178 cps/web.py:3194
+#: cps/admin.py:558 cps/web.py:1045
+msgid "Please fill out all fields!"
+msgstr "Proszę wypełnić wszystkie pola!"
+
+#: cps/admin.py:560 cps/admin.py:566 cps/admin.py:582
+#: cps/templates/admin.html:35
 msgid "Add new user"
 msgstr "Dodaj nowego użytkownika"
 
-#: cps/web.py:3184
+#: cps/admin.py:564 cps/web.py:1248
+msgid "E-mail is not from valid domain"
+msgstr ""
+
+#: cps/admin.py:572
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Użytkownik '%(user)s' został utworzony"
 
-#: cps/web.py:3188
+#: cps/admin.py:576
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/web.py:3218
+#: cps/admin.py:607
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:3221
+#: cps/admin.py:610
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/web.py:3225
+#: cps/admin.py:612 cps/web.py:1029
+msgid "Please configure your kindle e-mail address first..."
+msgstr ""
+
+#: cps/admin.py:614
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/web.py:3226
+#: cps/admin.py:615
 msgid "Edit e-mail server settings"
 msgstr ""
 
-#: cps/web.py:3251
+#: cps/admin.py:640
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Użytkownik '%(nick)s' został usunięty"
 
-#: cps/web.py:3364
+#: cps/admin.py:711
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Użytkownik '%(nick)s' został zaktualizowany"
 
-#: cps/web.py:3367
+#: cps/admin.py:714
 msgid "An unknown error occured."
 msgstr "Wystąpił nieznany błąd."
 
-#: cps/web.py:3369
+#: cps/admin.py:717
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Edytuj użytkownika %(nick)s"
 
-#: cps/web.py:3386
+#: cps/admin.py:733
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/web.py:3400 cps/web.py:3592
+#: cps/admin.py:736 cps/web.py:1070
+msgid "An unknown error occurred. Please try again later."
+msgstr ""
+
+#: cps/admin.py:755
+msgid "Requesting update package"
+msgstr "Żądanie o pakiet aktualizacji"
+
+#: cps/admin.py:756
+msgid "Downloading update package"
+msgstr "Pobieranie pakietu aktualizacji"
+
+#: cps/admin.py:757
+msgid "Unzipping update package"
+msgstr "Rozpakowywanie pakietu aktualizacji"
+
+#: cps/admin.py:758
+msgid "Replacing files"
+msgstr ""
+
+#: cps/admin.py:759
+msgid "Database connections are closed"
+msgstr "Połączenia z bazą danych zostały zakończone"
+
+#: cps/admin.py:760
+msgid "Stopping server"
+msgstr ""
+
+#: cps/admin.py:761
+msgid "Update finished, please press okay and reload page"
+msgstr "Aktualizacja zakończona, proszę nacisnąć OK i odświeżyć stronę"
+
+#: cps/admin.py:762 cps/admin.py:763 cps/admin.py:764 cps/admin.py:765
+msgid "Update failed:"
+msgstr ""
+
+#: cps/admin.py:762 cps/updater.py:277 cps/updater.py:456 cps/updater.py:458
+msgid "HTTP Error"
+msgstr ""
+
+#: cps/admin.py:763 cps/updater.py:279 cps/updater.py:460
+msgid "Connection error"
+msgstr ""
+
+#: cps/admin.py:764 cps/updater.py:281 cps/updater.py:462
+msgid "Timeout while establishing connection"
+msgstr ""
+
+#: cps/admin.py:765 cps/updater.py:283 cps/updater.py:464
+msgid "General error"
+msgstr ""
+
+#: cps/converter.py:31 cps/converter.py:48 cps/uploader.py:213
+#: cps/uploader.py:214 cps/uploader.py:218 cps/uploader.py:222
+#: cps/uploader.py:226
+msgid "not installed"
+msgstr "nie zainstalowane"
+
+#: cps/converter.py:43 cps/converter.py:60
+msgid "Excecution permissions missing"
+msgstr ""
+
+#: cps/converter.py:70
+msgid "not configured"
+msgstr ""
+
+#: cps/editbooks.py:218 cps/editbooks.py:432
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr ""
 
-#: cps/web.py:3428
+#: cps/editbooks.py:246
 msgid "edit metadata"
 msgstr "edytuj metadane"
 
-#: cps/web.py:3521 cps/web.py:3754
+#: cps/editbooks.py:325 cps/editbooks.py:595
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Rozszerzenie pliku '%(ext)s' nie jest dozwolone do przesłania na ten serwer"
 
-#: cps/web.py:3525 cps/web.py:3757
+#: cps/editbooks.py:329 cps/editbooks.py:599
 msgid "File to be uploaded must have an extension"
 msgstr "Plik do przesłania musi mieć rozszerzenie"
 
-#: cps/web.py:3537 cps/web.py:3776
+#: cps/editbooks.py:341 cps/editbooks.py:619
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Nie udało się utworzyć łącza %(path)s (Odmowa dostępu)."
 
-#: cps/web.py:3542
+#: cps/editbooks.py:346
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr ""
 
-#: cps/web.py:3559
+#: cps/editbooks.py:363
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr ""
 
-#: cps/web.py:3573 cps/web.py:3646
+#: cps/editbooks.py:382
+#, python-format
+msgid "Failed to create path for cover %(path)s (Permission denied)."
+msgstr ""
+
+#: cps/editbooks.py:390
+#, python-format
+msgid "Failed to store cover-file %(cover)s."
+msgstr ""
+
+#: cps/editbooks.py:393
+msgid "Cover-file is not a valid image file"
+msgstr ""
+
+#: cps/editbooks.py:399 cps/editbooks.py:413
 msgid "Cover is not a supported imageformat (jpg/png/webp), can't save"
 msgstr ""
 
-#: cps/web.py:3605 cps/web.py:3614
+#: cps/editbooks.py:445 cps/editbooks.py:454
 msgid "unknown"
 msgstr ""
 
-#: cps/web.py:3694
+#: cps/editbooks.py:486
+msgid "Cover is not a jpg file, can't save"
+msgstr ""
+
+#: cps/editbooks.py:534
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr ""
 
-#: cps/web.py:3725
+#: cps/editbooks.py:565
 msgid "Metadata successfully updated"
 msgstr ""
 
-#: cps/web.py:3734
+#: cps/editbooks.py:574
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/web.py:3780
+#: cps/editbooks.py:624
 #, python-format
 msgid "Failed to store file %(file)s (Permission denied)."
 msgstr "Nie można przechowywać pliku %(file)s (Odmowa dostępu)."
 
-#: cps/web.py:3785
+#: cps/editbooks.py:629
 #, python-format
 msgid "Failed to delete file %(file)s (Permission denied)."
 msgstr "Nie udało się usunąć pliku %(file)s (Odmowa dostępu)."
 
-#: cps/web.py:3867
+#: cps/editbooks.py:712
 #, python-format
-msgid "File %(title)s"
+msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/web.py:3896
+#: cps/editbooks.py:741
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/web.py:3906
+#: cps/editbooks.py:751
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/web.py:3910
+#: cps/editbooks.py:755
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
 
-#: cps/worker.py:305
+#: cps/gdrive.py:56
+msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
+msgstr ""
+
+#: cps/gdrive.py:101
+msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
+msgstr ""
+
+#: cps/helper.py:97
+#, python-format
+msgid "%(format)s format not found for book id: %(book)d"
+msgstr ""
+
+#: cps/helper.py:109
+#, python-format
+msgid "%(format)s not found on Google Drive: %(fn)s"
+msgstr ""
+
+#: cps/helper.py:116 cps/helper.py:223 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Wyślij do Kindle"
+
+#: cps/helper.py:117 cps/helper.py:135 cps/helper.py:225
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr ""
+
+#: cps/helper.py:128
+#, python-format
+msgid "%(format)s not found: %(fn)s"
+msgstr ""
+
+#: cps/helper.py:133
+msgid "Calibre-Web test e-mail"
+msgstr ""
+
+#: cps/helper.py:134
+msgid "Test e-mail"
+msgstr ""
+
+#: cps/helper.py:150
+msgid "Get Started with Calibre-Web"
+msgstr ""
+
+#: cps/helper.py:151
+#, python-format
+msgid "Registration e-mail for user: %(name)s"
+msgstr ""
+
+#: cps/helper.py:165 cps/helper.py:167 cps/helper.py:169 cps/helper.py:177
+#: cps/helper.py:179 cps/helper.py:181
+#, python-format
+msgid "Send %(format)s to Kindle"
+msgstr ""
+
+#: cps/helper.py:185
+#, python-format
+msgid "Convert %(orig)s to %(format)s and send to Kindle"
+msgstr ""
+
+#: cps/helper.py:224
+#, python-format
+msgid "E-mail: %(book)s"
+msgstr ""
+
+#: cps/helper.py:227
+msgid "The requested file could not be read. Maybe wrong permissions?"
+msgstr ""
+
+#: cps/helper.py:335
+#, python-format
+msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr ""
+
+#: cps/helper.py:345
+#, python-format
+msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr ""
+
+#: cps/helper.py:359
+#, python-format
+msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr ""
+
+#: cps/helper.py:385 cps/helper.py:395 cps/helper.py:403
+#, python-format
+msgid "File %(file)s not found on Google Drive"
+msgstr ""
+
+#: cps/helper.py:424
+#, python-format
+msgid "Book path %(path)s not found on Google Drive"
+msgstr ""
+
+#: cps/helper.py:584
+msgid "Error excecuting UnRar"
+msgstr ""
+
+#: cps/helper.py:586
+msgid "Unrar binary file not found"
+msgstr ""
+
+#: cps/helper.py:614
+msgid "Waiting"
+msgstr ""
+
+#: cps/helper.py:616
+msgid "Failed"
+msgstr ""
+
+#: cps/helper.py:618
+msgid "Started"
+msgstr ""
+
+#: cps/helper.py:620
+msgid "Finished"
+msgstr ""
+
+#: cps/helper.py:622
+msgid "Unknown Status"
+msgstr ""
+
+#: cps/helper.py:627
+msgid "E-mail: "
+msgstr ""
+
+#: cps/helper.py:629 cps/helper.py:633
+msgid "Convert: "
+msgstr ""
+
+#: cps/helper.py:631
+msgid "Upload: "
+msgstr ""
+
+#: cps/helper.py:635
+msgid "Unknown Task: "
+msgstr ""
+
+#: cps/oauth_bb.py:87
+#, python-format
+msgid "Register with %s, "
+msgstr ""
+
+#: cps/oauth_bb.py:145
+msgid "Failed to log in with GitHub."
+msgstr ""
+
+#: cps/oauth_bb.py:150
+msgid "Failed to fetch user info from GitHub."
+msgstr ""
+
+#: cps/oauth_bb.py:161
+msgid "Failed to log in with Google."
+msgstr ""
+
+#: cps/oauth_bb.py:166
+msgid "Failed to fetch user info from Google."
+msgstr ""
+
+#: cps/oauth_bb.py:265
+#, python-format
+msgid "Unlink to %(oauth)s success."
+msgstr ""
+
+#: cps/oauth_bb.py:269
+#, python-format
+msgid "Unlink to %(oauth)s failed."
+msgstr ""
+
+#: cps/oauth_bb.py:272
+#, python-format
+msgid "Not linked to %(oauth)s."
+msgstr ""
+
+#: cps/oauth_bb.py:300
+msgid "GitHub Oauth error, please retry later."
+msgstr ""
+
+#: cps/oauth_bb.py:319
+msgid "Google Oauth error, please retry later."
+msgstr ""
+
+#: cps/shelf.py:40 cps/shelf.py:92
+msgid "Invalid shelf specified"
+msgstr ""
+
+#: cps/shelf.py:47
+#, python-format
+msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
+msgstr ""
+
+#: cps/shelf.py:55
+msgid "You are not allowed to edit public shelves"
+msgstr ""
+
+#: cps/shelf.py:64
+#, python-format
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr ""
+
+#: cps/shelf.py:78
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "Książka została dodana do półki: %(sname)s"
+
+#: cps/shelf.py:97
+#, python-format
+msgid "You are not allowed to add a book to the the shelf: %(name)s"
+msgstr ""
+
+#: cps/shelf.py:102
+msgid "User is not allowed to edit public shelves"
+msgstr ""
+
+#: cps/shelf.py:120
+#, python-format
+msgid "Books are already part of the shelf: %(name)s"
+msgstr ""
+
+#: cps/shelf.py:134
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr ""
+
+#: cps/shelf.py:136
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr ""
+
+#: cps/shelf.py:173
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "Książka została usunięta z półki: %(sname)s"
+
+#: cps/shelf.py:179
+#, python-format
+msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
+msgstr ""
+
+#: cps/shelf.py:200 cps/shelf.py:224
+#, python-format
+msgid "A shelf with the name '%(title)s' already exists."
+msgstr "Półka o nazwie '%(title)s' już istnieje."
+
+#: cps/shelf.py:205
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "Półka %(title)s została utworzona"
+
+#: cps/shelf.py:207 cps/shelf.py:235
+msgid "There was an error"
+msgstr "Wystąpił błąd"
+
+#: cps/shelf.py:208 cps/shelf.py:210
+msgid "create a shelf"
+msgstr "utwórz półkę"
+
+#: cps/shelf.py:233
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "Półka %(title)s została zmieniona"
+
+#: cps/shelf.py:236 cps/shelf.py:238
+msgid "Edit a shelf"
+msgstr "Edytuj półkę"
+
+#: cps/shelf.py:259
+#, python-format
+msgid "successfully deleted shelf %(name)s"
+msgstr "pomyślnie usunięto półkę %(name)s"
+
+#: cps/shelf.py:289
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Półka: '%(name)s'"
+
+#: cps/shelf.py:292
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr ""
+
+#: cps/shelf.py:324
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "Zmieniono kolejność półki: '%(name)s'"
+
+#: cps/ub.py:111
+msgid "Recently Added"
+msgstr ""
+
+#: cps/ub.py:113
+msgid "Show recent books"
+msgstr ""
+
+#: cps/templates/index.xml:17 cps/ub.py:114
+msgid "Hot Books"
+msgstr "Najpopularniejsze książki"
+
+#: cps/ub.py:115
+msgid "Show hot books"
+msgstr "Pokaż najpopularniejsze książki"
+
+#: cps/templates/index.xml:24 cps/ub.py:118
+msgid "Best rated Books"
+msgstr "Najlepiej ocenione książki"
+
+#: cps/ub.py:120
+msgid "Show best rated books"
+msgstr "Pokaż najlepiej ocenione książki"
+
+#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:121
+#: cps/web.py:965
+msgid "Read Books"
+msgstr "Przeczytane książki"
+
+#: cps/ub.py:123
+msgid "Show read and unread"
+msgstr "Pokaż przeczytane i nieprzeczytane"
+
+#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:125
+#: cps/web.py:969
+msgid "Unread Books"
+msgstr "Nieprzeczytane książki"
+
+#: cps/ub.py:127
+msgid "Show unread"
+msgstr ""
+
+#: cps/ub.py:128
+msgid "Discover"
+msgstr "Odkrywaj"
+
+#: cps/ub.py:130
+msgid "Show random books"
+msgstr "Pokaż losowe książki"
+
+#: cps/ub.py:131
+msgid "Categories"
+msgstr "Kategorie"
+
+#: cps/ub.py:133
+msgid "Show category selection"
+msgstr "Pokaż wybór kategorii"
+
+#: cps/templates/book_edit.html:71 cps/templates/search_form.html:53
+#: cps/ub.py:134
+msgid "Series"
+msgstr "Seria"
+
+#: cps/ub.py:136
+msgid "Show series selection"
+msgstr "Pokaż wybór serii"
+
+#: cps/templates/index.xml:61 cps/ub.py:137
+msgid "Authors"
+msgstr "Autorzy"
+
+#: cps/ub.py:139
+msgid "Show author selection"
+msgstr "Pokaż wybór autora"
+
+#: cps/templates/index.xml:68 cps/ub.py:141
+msgid "Publishers"
+msgstr ""
+
+#: cps/ub.py:143
+msgid "Show publisher selection"
+msgstr ""
+
+#: cps/templates/search_form.html:74 cps/ub.py:144
+msgid "Languages"
+msgstr "Języki"
+
+#: cps/ub.py:147
+msgid "Show language selection"
+msgstr "Pokaż wybór języka"
+
+#: cps/ub.py:148
+msgid "Ratings"
+msgstr ""
+
+#: cps/ub.py:150
+msgid "Show ratings selection"
+msgstr ""
+
+#: cps/ub.py:151
+msgid "File formats"
+msgstr ""
+
+#: cps/ub.py:153
+msgid "Show file formats selection"
+msgstr ""
+
+#: cps/updater.py:257 cps/updater.py:364 cps/updater.py:377
+msgid "Unexpected data while reading update information"
+msgstr ""
+
+#: cps/updater.py:264 cps/updater.py:370
+msgid "No update available. You already have the latest version installed"
+msgstr ""
+
+#: cps/updater.py:290 cps/updater.py:422
+msgid "A new update is available. Click on the button below to update to the latest version."
+msgstr ""
+
+#: cps/updater.py:343
+msgid "Could not fetch update information"
+msgstr ""
+
+#: cps/updater.py:357
+msgid "No release information available"
+msgstr ""
+
+#: cps/updater.py:403 cps/updater.py:412
+#, python-format
+msgid "A new update is available. Click on the button below to update to version: %(version)s"
+msgstr ""
+
+#: cps/web.py:457
+msgid "Recently Added Books"
+msgstr ""
+
+#: cps/web.py:484
+msgid "Best rated books"
+msgstr "Najlepiej oceniane książki"
+
+#: cps/templates/index.xml:38 cps/web.py:492
+msgid "Random Books"
+msgstr "Losowe książki"
+
+#: cps/web.py:516
+msgid "Books"
+msgstr ""
+
+#: cps/web.py:543
+msgid "Hot Books (most downloaded)"
+msgstr "Najpopularniejsze książki (najczęściej pobierane)"
+
+#: cps/web.py:553 cps/web.py:1294 cps/web.py:1383
+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:580
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr ""
+
+#: cps/web.py:591
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "Seria: %(serie)s"
+
+#: cps/web.py:602
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr ""
+
+#: cps/web.py:613
+#, python-format
+msgid "File format: %(format)s"
+msgstr ""
+
+#: cps/web.py:625
+#, python-format
+msgid "Category: %(name)s"
+msgstr "Kategoria: %(name)s"
+
+#: cps/web.py:659
+msgid "Publisher list"
+msgstr ""
+
+#: cps/templates/index.xml:82 cps/web.py:675
+msgid "Series list"
+msgstr "Lista serii"
+
+#: cps/web.py:689
+msgid "Ratings list"
+msgstr ""
+
+#: cps/web.py:702
+msgid "File formats list"
+msgstr ""
+
+#: cps/web.py:730
+msgid "Available languages"
+msgstr "Dostępne języki"
+
+#: cps/web.py:750
+#, python-format
+msgid "Language: %(name)s"
+msgstr "Język: %(name)s"
+
+#: cps/templates/index.xml:75 cps/web.py:764
+msgid "Category list"
+msgstr "Lista kategorii"
+
+#: cps/templates/layout.html:73 cps/web.py:777
+msgid "Tasks"
+msgstr ""
+
+#: cps/web.py:841
+msgid "Published after "
+msgstr ""
+
+#: cps/web.py:848
+msgid "Published before "
+msgstr ""
+
+#: cps/web.py:862
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr ""
+
+#: cps/web.py:864
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr ""
+
+#: cps/web.py:924 cps/web.py:933
+msgid "search"
+msgstr "szukaj"
+
+#: cps/web.py:1018
+msgid "Please configure the SMTP mail settings first..."
+msgstr "Proszę najpierw skonfigurować ustawienia SMTP poczty e-mail..."
+
+#: cps/web.py:1023
+#, python-format
+msgid "Book successfully queued for sending to %(kindlemail)s"
+msgstr ""
+
+#: cps/web.py:1027
+#, 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:1046 cps/web.py:1071 cps/web.py:1076 cps/web.py:1081
+#: cps/web.py:1085
+msgid "register"
+msgstr "rejestracja"
+
+#: cps/web.py:1073
+msgid "Your e-mail is not allowed to register"
+msgstr ""
+
+#: cps/web.py:1077
+msgid "Confirmation e-mail was send to your e-mail account."
+msgstr ""
+
+#: cps/web.py:1080
+msgid "This username or e-mail address is already in use."
+msgstr ""
+
+#: cps/web.py:1103 cps/web.py:1115
+#, python-format
+msgid "You are now logged in as: '%(nickname)s'"
+msgstr ""
+
+#: cps/web.py:1108 cps/web.py:1120
+msgid "Wrong Username or Password"
+msgstr "Błędna nazwa użytkownika lub hasło"
+
+#: cps/web.py:1111
+msgid "Could not login. LDAP server down, please contact your administrator"
+msgstr ""
+
+#: cps/web.py:1124 cps/web.py:1146
+msgid "login"
+msgstr "logowanie"
+
+#: cps/web.py:1158 cps/web.py:1189
+msgid "Token not found"
+msgstr ""
+
+#: cps/web.py:1166 cps/web.py:1197
+msgid "Token has expired"
+msgstr ""
+
+#: cps/web.py:1174
+msgid "Success! Please return to your device"
+msgstr ""
+
+#: cps/web.py:1210
+#, python-format
+msgid "you are now logged in as: '%(nickname)s'"
+msgstr "Zalogowałeś się jako: '%(nickname)s'"
+
+#: cps/web.py:1250 cps/web.py:1277 cps/web.py:1281
+#, python-format
+msgid "%(name)s's profile"
+msgstr "Profil użytkownika %(name)s"
+
+#: cps/web.py:1274
+msgid "Found an existing account for this e-mail address."
+msgstr ""
+
+#: cps/web.py:1279
+msgid "Profile updated"
+msgstr "Zaktualizowano profil"
+
+#: cps/web.py:1304 cps/web.py:1306 cps/web.py:1308 cps/web.py:1314
+#: cps/web.py:1318
+msgid "Read a Book"
+msgstr "Czytaj książkę"
+
+#: cps/web.py:1328
+msgid "Error opening eBook. File does not exist or file is not accessible."
+msgstr ""
+
+#: cps/worker.py:308
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr ""
 
-#: cps/worker.py:316
+#: cps/worker.py:319
 #, python-format
 msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr ""
@@ -781,147 +970,152 @@ msgstr "DLS"
 msgid "Admin"
 msgstr "Portal administracyjny"
 
-#: cps/templates/admin.html:14 cps/templates/detail.html:22
-#: cps/templates/detail.html:31
+#: cps/templates/admin.html:14 cps/templates/detail.html:18
+#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/shelfdown.html:62
 msgid "Download"
 msgstr "Pobierz"
 
-#: cps/templates/admin.html:15 cps/templates/layout.html:65
+#: cps/templates/admin.html:15
+msgid "View Ebooks"
+msgstr ""
+
+#: cps/templates/admin.html:16 cps/templates/layout.html:65
 msgid "Upload"
 msgstr "Wyślij"
 
-#: cps/templates/admin.html:16
+#: cps/templates/admin.html:17
 msgid "Edit"
 msgstr "Edytuj"
 
-#: cps/templates/admin.html:39
+#: cps/templates/admin.html:41
 msgid "SMTP e-mail server settings"
 msgstr ""
 
-#: cps/templates/admin.html:42 cps/templates/email_edit.html:11
+#: cps/templates/admin.html:44 cps/templates/email_edit.html:11
 msgid "SMTP hostname"
 msgstr "Adres serwera SMTP"
 
-#: cps/templates/admin.html:43
+#: cps/templates/admin.html:45
 msgid "SMTP port"
 msgstr "Port serwera SMTP"
 
-#: cps/templates/admin.html:44
+#: cps/templates/admin.html:46
 msgid "SSL"
 msgstr "SSL"
 
-#: cps/templates/admin.html:45 cps/templates/email_edit.html:27
+#: cps/templates/admin.html:47 cps/templates/email_edit.html:27
 msgid "SMTP login"
 msgstr "Nazwa użytkownika SMTP"
 
-#: cps/templates/admin.html:46
+#: cps/templates/admin.html:48
 msgid "From mail"
 msgstr "Wyślij z adresu e-mail"
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:58
 msgid "Change SMTP settings"
 msgstr "Zmień ustawienia SMTP"
 
-#: cps/templates/admin.html:62
+#: cps/templates/admin.html:64
 msgid "Configuration"
 msgstr "Konfiguracja"
 
-#: cps/templates/admin.html:65
+#: cps/templates/admin.html:67
 msgid "Calibre DB dir"
 msgstr "Folder bazy danych Calibre"
 
-#: cps/templates/admin.html:69
+#: cps/templates/admin.html:71
 msgid "Log level"
 msgstr ""
 
-#: cps/templates/admin.html:73
+#: cps/templates/admin.html:75
 msgid "Port"
 msgstr "Port"
 
-#: cps/templates/admin.html:79 cps/templates/config_view_edit.html:23
+#: cps/templates/admin.html:81 cps/templates/config_view_edit.html:23
 msgid "Books per page"
 msgstr "Ilość książek na stronie"
 
-#: cps/templates/admin.html:83
+#: cps/templates/admin.html:85
 msgid "Uploading"
 msgstr "Wysyłanie"
 
-#: cps/templates/admin.html:87
+#: cps/templates/admin.html:89
 msgid "Anonymous browsing"
 msgstr ""
 
-#: cps/templates/admin.html:91
+#: cps/templates/admin.html:93
 msgid "Public registration"
 msgstr "Publiczna rejestracja"
 
-#: cps/templates/admin.html:95 cps/templates/remote_login.html:4
+#: cps/templates/admin.html:97 cps/templates/remote_login.html:4
 msgid "Remote login"
 msgstr ""
 
-#: cps/templates/admin.html:106
+#: cps/templates/admin.html:108
 msgid "Administration"
 msgstr "Zarządzanie"
 
-#: cps/templates/admin.html:107
+#: cps/templates/admin.html:109
 msgid "Reconnect to Calibre DB"
 msgstr "Połącz ponownie z bazą danych Calibre"
 
-#: cps/templates/admin.html:108
+#: cps/templates/admin.html:110
 msgid "Restart Calibre-Web"
 msgstr "Uruchom ponownie Calibre Web"
 
-#: cps/templates/admin.html:109
+#: cps/templates/admin.html:111
 msgid "Stop Calibre-Web"
 msgstr "Zatrzymaj Calibre Web"
 
-#: cps/templates/admin.html:115
+#: cps/templates/admin.html:117
 msgid "Update"
 msgstr ""
 
-#: cps/templates/admin.html:119
+#: cps/templates/admin.html:121
 msgid "Version"
 msgstr ""
 
-#: cps/templates/admin.html:120
+#: cps/templates/admin.html:122
 msgid "Details"
 msgstr ""
 
-#: cps/templates/admin.html:126
+#: cps/templates/admin.html:128
 msgid "Current version"
 msgstr ""
 
-#: cps/templates/admin.html:132
+#: cps/templates/admin.html:134
 msgid "Check for update"
 msgstr "Sprawdź aktualizacje"
 
-#: cps/templates/admin.html:133
+#: cps/templates/admin.html:135
 msgid "Perform Update"
 msgstr "Wykonaj aktualizację"
 
-#: cps/templates/admin.html:145
+#: cps/templates/admin.html:147
 msgid "Do you really want to restart Calibre-Web?"
 msgstr "Na pewno chcesz uruchomić ponownie Calibre Web?"
 
-#: cps/templates/admin.html:150 cps/templates/admin.html:164
-#: cps/templates/admin.html:184 cps/templates/shelf.html:73
+#: cps/templates/admin.html:152 cps/templates/admin.html:166
+#: cps/templates/admin.html:186 cps/templates/shelf.html:72
 msgid "Ok"
 msgstr "OK"
 
-#: cps/templates/admin.html:151 cps/templates/admin.html:165
-#: cps/templates/book_edit.html:178 cps/templates/book_edit.html:200
-#: cps/templates/config_edit.html:226 cps/templates/config_view_edit.html:179
-#: cps/templates/email_edit.html:40 cps/templates/email_edit.html:75
-#: cps/templates/layout.html:28 cps/templates/shelf.html:74
+#: cps/templates/admin.html:153 cps/templates/admin.html:167
+#: cps/templates/book_edit.html:174 cps/templates/book_edit.html:196
+#: cps/templates/config_edit.html:281 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/user_edit.html:149
+#: cps/templates/user_edit.html:132
 msgid "Back"
 msgstr "Wróć"
 
-#: cps/templates/admin.html:163
+#: cps/templates/admin.html:165
 msgid "Do you really want to stop Calibre-Web?"
 msgstr "Na pewno chcesz zatrzymać Calibre Web?"
 
-#: cps/templates/admin.html:175
+#: cps/templates/admin.html:177
 msgid "Updating, please do not reload page"
 msgstr "Aktualizowanie, proszę nie odświeżać strony"
 
@@ -933,176 +1127,176 @@ msgstr ""
 msgid "In Library"
 msgstr ""
 
-#: cps/templates/author.html:50 cps/templates/author.html:97
-#: cps/templates/discover.html:28 cps/templates/index.html:31
-#: cps/templates/index.html:86 cps/templates/search.html:55
-#: cps/templates/shelf.html:37
+#: cps/templates/author.html:34 cps/templates/list.html:14
+#: cps/templates/search.html:41
+msgid "All"
+msgstr ""
+
+#: cps/templates/author.html:58 cps/templates/author.html:105
+#: 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 ""
 
-#: cps/templates/author.html:81
+#: cps/templates/author.html:89
 msgid "More by"
 msgstr ""
 
-#: cps/templates/book_edit.html:16
+#: cps/templates/book_edit.html:12
 msgid "Delete Book"
 msgstr ""
 
-#: cps/templates/book_edit.html:19
+#: cps/templates/book_edit.html:15
 msgid "Delete formats:"
 msgstr ""
 
-#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:199
-#: cps/templates/email_edit.html:73 cps/templates/email_edit.html:74
+#: cps/templates/book_edit.html:18 cps/templates/book_edit.html:195
+#: cps/templates/email_edit.html:73
 msgid "Delete"
 msgstr ""
 
-#: cps/templates/book_edit.html:30
+#: cps/templates/book_edit.html:26
 msgid "Convert book format:"
 msgstr ""
 
-#: cps/templates/book_edit.html:34
+#: cps/templates/book_edit.html:30
 msgid "Convert from:"
 msgstr ""
 
-#: cps/templates/book_edit.html:36 cps/templates/book_edit.html:43
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
 msgstr ""
 
-#: cps/templates/book_edit.html:41
+#: cps/templates/book_edit.html:37
 msgid "Convert to:"
 msgstr ""
 
-#: cps/templates/book_edit.html:50
+#: cps/templates/book_edit.html:46
 msgid "Convert book"
 msgstr ""
 
-#: cps/templates/book_edit.html:59 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:55 cps/templates/search_form.html:6
 msgid "Book Title"
 msgstr "Tytuł książki"
 
-#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:259
-#: cps/templates/book_edit.html:277 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:59 cps/templates/book_edit.html:255
+#: cps/templates/book_edit.html:273 cps/templates/search_form.html:10
 msgid "Author"
 msgstr "Autor"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:264
-#: cps/templates/book_edit.html:279 cps/templates/search_form.html:106
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:260
+#: cps/templates/book_edit.html:275 cps/templates/search_form.html:106
 msgid "Description"
 msgstr "Opis"
 
-#: cps/templates/book_edit.html:71 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:67 cps/templates/search_form.html:33
 msgid "Tags"
 msgstr "Tagi"
 
-#: cps/templates/book_edit.html:75 cps/templates/layout.html:159
-#: cps/templates/search_form.html:53
-msgid "Series"
-msgstr "Seria"
-
-#: cps/templates/book_edit.html:79
+#: cps/templates/book_edit.html:75
 msgid "Series id"
 msgstr "ID serii"
 
-#: cps/templates/book_edit.html:83
+#: cps/templates/book_edit.html:79
 msgid "Rating"
 msgstr "Ocena"
 
-#: cps/templates/book_edit.html:87
+#: cps/templates/book_edit.html:83
 msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
 msgstr ""
 
-#: cps/templates/book_edit.html:91
+#: cps/templates/book_edit.html:87
 msgid "Upload Cover from local drive"
 msgstr ""
 
-#: cps/templates/book_edit.html:96 cps/templates/detail.html:148
+#: cps/templates/book_edit.html:92 cps/templates/detail.html:168
 msgid "Publishing date"
 msgstr "Data publikacji"
 
-#: cps/templates/book_edit.html:103 cps/templates/book_edit.html:261
-#: cps/templates/book_edit.html:278 cps/templates/detail.html:139
+#: cps/templates/book_edit.html:99 cps/templates/book_edit.html:257
+#: cps/templates/book_edit.html:274 cps/templates/detail.html:159
 #: cps/templates/search_form.html:14
 msgid "Publisher"
 msgstr "Wydawca"
 
-#: cps/templates/book_edit.html:107 cps/templates/user_edit.html:31
+#: cps/templates/book_edit.html:103 cps/templates/user_edit.html:31
 msgid "Language"
 msgstr "Język"
 
-#: cps/templates/book_edit.html:117 cps/templates/search_form.html:117
+#: cps/templates/book_edit.html:113 cps/templates/search_form.html:117
 msgid "Yes"
 msgstr "Tak"
 
-#: cps/templates/book_edit.html:118 cps/templates/search_form.html:118
+#: cps/templates/book_edit.html:114 cps/templates/search_form.html:118
 msgid "No"
 msgstr "Nie"
 
-#: cps/templates/book_edit.html:164
+#: cps/templates/book_edit.html:160
 msgid "Upload format"
 msgstr ""
 
-#: cps/templates/book_edit.html:173
+#: cps/templates/book_edit.html:169
 msgid "view book after edit"
 msgstr "wyświetl książkę po edycji"
 
-#: cps/templates/book_edit.html:176 cps/templates/book_edit.html:212
+#: cps/templates/book_edit.html:172 cps/templates/book_edit.html:208
 msgid "Get metadata"
 msgstr "Uzyskaj metadane"
 
-#: cps/templates/book_edit.html:177 cps/templates/config_edit.html:224
-#: cps/templates/config_view_edit.html:178 cps/templates/login.html:20
+#: cps/templates/book_edit.html:173 cps/templates/config_edit.html:279
+#: cps/templates/config_view_edit.html:146 cps/templates/login.html:20
 #: cps/templates/search_form.html:150 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:147
+#: cps/templates/user_edit.html:130
 msgid "Submit"
 msgstr "Wyślij"
 
-#: cps/templates/book_edit.html:191
+#: cps/templates/book_edit.html:187
 msgid "Are you really sure?"
 msgstr ""
 
-#: cps/templates/book_edit.html:194
+#: cps/templates/book_edit.html:190
 msgid "Book will be deleted from Calibre database"
 msgstr ""
 
-#: cps/templates/book_edit.html:195
+#: cps/templates/book_edit.html:191
 msgid "and from hard disk"
 msgstr ""
 
-#: cps/templates/book_edit.html:215
+#: cps/templates/book_edit.html:211
 msgid "Keyword"
 msgstr "Słowo kluczowe"
 
-#: cps/templates/book_edit.html:216
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr " Szukaj słowa kluczowego "
 
-#: cps/templates/book_edit.html:218 cps/templates/layout.html:47
+#: cps/templates/book_edit.html:214 cps/templates/layout.html:47
 msgid "Go!"
 msgstr "Idź!"
 
-#: cps/templates/book_edit.html:222
+#: cps/templates/book_edit.html:218
 msgid "Click the cover to load metadata to the form"
 msgstr "Kliknij okładkę, aby załadować metadane do formularza"
 
-#: cps/templates/book_edit.html:234 cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:230 cps/templates/book_edit.html:270
 msgid "Loading..."
 msgstr "Ładowanie..."
 
-#: cps/templates/book_edit.html:239 cps/templates/layout.html:226
-#: cps/templates/layout.html:258
+#: cps/templates/book_edit.html:235 cps/templates/layout.html:187
+#: cps/templates/layout.html:219
 msgid "Close"
 msgstr "Zamknij"
 
-#: cps/templates/book_edit.html:266 cps/templates/book_edit.html:280
+#: cps/templates/book_edit.html:262 cps/templates/book_edit.html:276
 msgid "Source"
 msgstr "Źródło"
 
-#: cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:271
 msgid "Search error!"
 msgstr "Błąd wyszukiwania!"
 
-#: cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:272
 msgid "No Result(s) found! Please try aonther keyword."
 msgstr ""
 
@@ -1231,35 +1425,87 @@ msgstr ""
 msgid "Goodreads API Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:187
+#: cps/templates/config_edit.html:181
+msgid "Login type"
+msgstr ""
+
+#: cps/templates/config_edit.html:183
+msgid "Use standard Authentication"
+msgstr ""
+
+#: cps/templates/config_edit.html:185
+msgid "Use LDAP Authentication"
+msgstr ""
+
+#: cps/templates/config_edit.html:188
+msgid "Use GitHub OAuth"
+msgstr ""
+
+#: cps/templates/config_edit.html:189
+msgid "Use Google OAuth"
+msgstr ""
+
+#: cps/templates/config_edit.html:196
+msgid "LDAP Provider URL"
+msgstr ""
+
+#: cps/templates/config_edit.html:200
+msgid "LDAP Distinguished Name (DN)"
+msgstr ""
+
+#: cps/templates/config_edit.html:208
+msgid "Obtain GitHub OAuth Credential"
+msgstr ""
+
+#: cps/templates/config_edit.html:211
+msgid "GitHub OAuth Client Id"
+msgstr ""
+
+#: cps/templates/config_edit.html:215
+msgid "GitHub OAuth Client Secret"
+msgstr ""
+
+#: cps/templates/config_edit.html:221
+msgid "Obtain Google OAuth Credential"
+msgstr ""
+
+#: cps/templates/config_edit.html:224
+msgid "Google OAuth Client Id"
+msgstr ""
+
+#: cps/templates/config_edit.html:228
+msgid "Google OAuth Client Secret"
+msgstr ""
+
+#: cps/templates/config_edit.html:242
 msgid "External binaries"
 msgstr ""
 
-#: cps/templates/config_edit.html:195
+#: cps/templates/config_edit.html:250
 msgid "No converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:197
+#: cps/templates/config_edit.html:252
 msgid "Use Kindlegen"
 msgstr ""
 
-#: cps/templates/config_edit.html:199
+#: cps/templates/config_edit.html:254
 msgid "Use calibre's ebook converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:203
+#: cps/templates/config_edit.html:258
 msgid "E-Book converter settings"
 msgstr ""
 
-#: cps/templates/config_edit.html:207
+#: cps/templates/config_edit.html:262
 msgid "Path to convertertool"
 msgstr ""
 
-#: cps/templates/config_edit.html:213
+#: cps/templates/config_edit.html:268
 msgid "Location of Unrar binary"
 msgstr ""
 
-#: cps/templates/config_edit.html:229 cps/templates/layout.html:84
+#: cps/templates/config_edit.html:284 cps/templates/layout.html:84
 #: cps/templates/login.html:4
 msgid "Login"
 msgstr "Zaloguj się"
@@ -1268,8 +1514,7 @@ msgstr "Zaloguj się"
 msgid "View Configuration"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:19 cps/templates/layout.html:135
-#: cps/templates/layout.html:136 cps/templates/shelf_edit.html:7
+#: cps/templates/config_view_edit.html:19 cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr "Tytuł"
 
@@ -1281,7 +1526,7 @@ msgstr "Liczba losowych książek do pokazania"
 msgid "No. of authors to show before hiding (0=disable hiding)"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:118
+#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:112
 msgid "Theme"
 msgstr ""
 
@@ -1313,127 +1558,91 @@ msgstr ""
 msgid "Default settings for new users"
 msgstr "Domyślne ustawienia dla nowych użytkowników"
 
-#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:104
+#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:83
 msgid "Admin user"
 msgstr "Użytkownik z uprawnieniami administratora"
 
-#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:113
+#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:92
 msgid "Allow Downloads"
 msgstr "Zezwalaj na pobieranie"
 
-#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:117
+#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:96
+msgid "Allow book viewer"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:100
 msgid "Allow Uploads"
 msgstr "Zezwalaj na wysyłanie"
 
-#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:121
+#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:104
 msgid "Allow Edit"
 msgstr "Zezwalaj na edycję"
 
-#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:125
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:108
 msgid "Allow Delete books"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:130
+#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:113
 msgid "Allow Changing Password"
 msgstr "Zezwalaj na zmianę hasła"
 
-#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:134
+#: cps/templates/config_view_edit.html:109 cps/templates/user_edit.html:117
 msgid "Allow Editing Public Shelfs"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:115
+#: cps/templates/config_view_edit.html:119
 msgid "Default visibilities for new users"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:123 cps/templates/user_edit.html:50
-msgid "Show random books"
-msgstr "Pokaż losowe książki"
-
-#: cps/templates/config_view_edit.html:127 cps/templates/user_edit.html:54
-msgid "Show recent books"
-msgstr ""
-
-#: cps/templates/config_view_edit.html:131 cps/templates/user_edit.html:58
-msgid "Show sorted books"
-msgstr ""
-
-#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:62
-msgid "Show hot books"
-msgstr "Pokaż najpopularniejsze książki"
-
-#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:66
-msgid "Show best rated books"
-msgstr "Pokaż najlepiej ocenione książki"
-
-#: cps/templates/config_view_edit.html:143 cps/templates/user_edit.html:70
-msgid "Show language selection"
-msgstr "Pokaż wybór języka"
-
-#: cps/templates/config_view_edit.html:147 cps/templates/user_edit.html:74
-msgid "Show series selection"
-msgstr "Pokaż wybór serii"
-
-#: cps/templates/config_view_edit.html:151 cps/templates/user_edit.html:78
-msgid "Show category selection"
-msgstr "Pokaż wybór kategorii"
-
-#: cps/templates/config_view_edit.html:155 cps/templates/user_edit.html:82
-msgid "Show author selection"
-msgstr "Pokaż wybór autora"
-
-#: cps/templates/config_view_edit.html:159 cps/templates/user_edit.html:86
-msgid "Show publisher selection"
-msgstr ""
-
-#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:91
-msgid "Show read and unread"
-msgstr "Pokaż przeczytane i nieprzeczytane"
-
-#: cps/templates/config_view_edit.html:167 cps/templates/user_edit.html:96
+#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:75
 msgid "Show random books in detail view"
 msgstr "Pokaz losowe książki w widoku szczegółowym"
 
-#: cps/templates/config_view_edit.html:171 cps/templates/user_edit.html:109
+#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:88
 msgid "Show mature content"
 msgstr ""
 
-#: cps/templates/detail.html:63
+#: cps/templates/detail.html:59
 msgid "Read in browser"
 msgstr "Czytaj w przeglądarce"
 
-#: cps/templates/detail.html:100
+#: cps/templates/detail.html:73
+msgid "Listen in browser"
+msgstr ""
+
+#: cps/templates/detail.html:120
 msgid "Book"
 msgstr "Książka"
 
-#: cps/templates/detail.html:100
+#: cps/templates/detail.html:120
 msgid "of"
 msgstr "z"
 
-#: cps/templates/detail.html:106
+#: cps/templates/detail.html:126
 msgid "language"
 msgstr "język"
 
-#: cps/templates/detail.html:185
+#: cps/templates/detail.html:203
 msgid "Mark As Unread"
 msgstr ""
 
-#: cps/templates/detail.html:185
+#: cps/templates/detail.html:203
 msgid "Mark As Read"
 msgstr ""
 
-#: cps/templates/detail.html:186
+#: cps/templates/detail.html:204
 msgid "Read"
 msgstr "Czytaj"
 
-#: cps/templates/detail.html:196
+#: cps/templates/detail.html:214 cps/templates/listenmp3.html:54
 msgid "Description:"
 msgstr "Opis:"
 
-#: cps/templates/detail.html:209 cps/templates/search.html:14
+#: cps/templates/detail.html:227 cps/templates/search.html:14
 msgid "Add to shelf"
 msgstr "Dodaj do półki"
 
-#: cps/templates/detail.html:271
+#: cps/templates/detail.html:289
 msgid "Edit metadata"
 msgstr "Edytuj metadane"
 
@@ -1493,12 +1702,12 @@ msgstr ""
 msgid "Do you really want to delete this domain rule?"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:210
+#: cps/templates/feed.xml:21 cps/templates/layout.html:171
 msgid "Next"
 msgstr "Następne"
 
-#: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:44 cps/templates/layout.html:45
+#: cps/templates/feed.xml:33 cps/templates/layout.html:44
+#: cps/templates/layout.html:45
 msgid "Search"
 msgstr "Szukaj"
 
@@ -1510,75 +1719,63 @@ msgstr ""
 msgid "Discover (Random Books)"
 msgstr "Odkrywaj (losowe książki)"
 
+#: cps/templates/index.html:65
+msgid "Group by series"
+msgstr ""
+
 #: cps/templates/index.xml:6
 msgid "Start"
 msgstr "Rozpocznij"
 
-#: cps/templates/index.xml:18 cps/templates/layout.html:141
-msgid "Hot Books"
-msgstr "Najpopularniejsze książki"
-
-#: cps/templates/index.xml:22
+#: cps/templates/index.xml:21
 msgid "Popular publications from this catalog based on Downloads."
 msgstr "Popularne publikacje z tego katalogu bazujące na pobranych."
 
-#: cps/templates/index.xml:25 cps/templates/layout.html:144
-msgid "Best rated Books"
-msgstr "Najlepiej ocenione książki"
-
-#: cps/templates/index.xml:29
+#: cps/templates/index.xml:28
 msgid "Popular publications from this catalog based on Rating."
 msgstr "Popularne publikacje z tego katalogu bazujące na ocenach."
 
-#: cps/templates/index.xml:32
+#: cps/templates/index.xml:31
 msgid "New Books"
 msgstr "Nowe książki"
 
-#: cps/templates/index.xml:36
+#: cps/templates/index.xml:35
 msgid "The latest Books"
 msgstr "Ostatnie książki"
 
-#: cps/templates/index.xml:43
+#: cps/templates/index.xml:42
 msgid "Show Random Books"
 msgstr "Pokazuj losowe książki"
 
-#: cps/templates/index.xml:62 cps/templates/layout.html:162
-msgid "Authors"
-msgstr "Autorzy"
-
-#: cps/templates/index.xml:66
+#: cps/templates/index.xml:65
 msgid "Books ordered by Author"
 msgstr "Książki sortowane według autorów"
 
-#: cps/templates/index.xml:69 cps/templates/layout.html:165
-msgid "Publishers"
-msgstr ""
-
-#: cps/templates/index.xml:73
+#: cps/templates/index.xml:72
 msgid "Books ordered by publisher"
 msgstr ""
 
-#: cps/templates/index.xml:80
+#: cps/templates/index.xml:79
 msgid "Books ordered by category"
 msgstr "Książki sortowane według kategorii"
 
-#: cps/templates/index.xml:87
+#: cps/templates/index.xml:86
 msgid "Books ordered by series"
 msgstr "Książki sortowane według serii"
 
-#: cps/templates/index.xml:90 cps/templates/layout.html:171
+#: cps/templates/index.xml:89 cps/templates/layout.html:132
 msgid "Public Shelves"
 msgstr "Publiczne półki"
 
-#: cps/templates/index.xml:94
+#: cps/templates/index.xml:93
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr ""
 
-#: cps/templates/index.xml:98 cps/templates/layout.html:175
+#: cps/templates/index.xml:97 cps/templates/layout.html:136
 msgid "Your Shelves"
 msgstr "Twoje półki"
 
-#: cps/templates/index.xml:102
+#: cps/templates/index.xml:101
 msgid "User's own shelfs, only visible to the current user himself"
 msgstr ""
 
@@ -1595,7 +1792,7 @@ msgid "Advanced Search"
 msgstr "Zaawansowane wyszukiwanie"
 
 #: cps/templates/layout.html:76 cps/templates/read.html:71
-#: cps/templates/readcbr.html:89 cps/templates/readcbr.html:113
+#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
 msgid "Settings"
 msgstr ""
 
@@ -1611,7 +1808,7 @@ msgstr "Wyloguj się"
 msgid "Register"
 msgstr "Zarejestruj się"
 
-#: cps/templates/layout.html:111 cps/templates/layout.html:257
+#: cps/templates/layout.html:111 cps/templates/layout.html:218
 msgid "Uploading..."
 msgstr ""
 
@@ -1623,68 +1820,27 @@ msgstr ""
 msgid "Browse"
 msgstr "Przeglądaj"
 
-#: cps/templates/layout.html:124
-msgid "Recently Added"
-msgstr ""
-
-#: cps/templates/layout.html:129
-msgid "Sorted Books"
-msgstr ""
-
-#: cps/templates/layout.html:133 cps/templates/layout.html:134
-#: cps/templates/layout.html:135 cps/templates/layout.html:136
-msgid "Sort By"
-msgstr ""
-
-#: cps/templates/layout.html:133
-msgid "Newest"
-msgstr ""
-
-#: cps/templates/layout.html:134
-msgid "Oldest"
-msgstr ""
-
-#: cps/templates/layout.html:135
-msgid "Ascending"
-msgstr ""
-
-#: cps/templates/layout.html:136
-msgid "Descending"
-msgstr ""
-
-#: cps/templates/layout.html:153
-msgid "Discover"
-msgstr "Odkrywaj"
-
-#: cps/templates/layout.html:156
-msgid "Categories"
-msgstr "Kategorie"
-
-#: cps/templates/layout.html:168 cps/templates/search_form.html:74
-msgid "Languages"
-msgstr "Języki"
-
-#: cps/templates/layout.html:180
+#: cps/templates/layout.html:141
 msgid "Create a Shelf"
 msgstr "Utwórz półkę"
 
-#: cps/templates/layout.html:181 cps/templates/stats.html:3
+#: cps/templates/layout.html:142 cps/templates/stats.html:3
 msgid "About"
 msgstr "O programie"
 
-#: cps/templates/layout.html:195
+#: cps/templates/layout.html:156
 msgid "Previous"
 msgstr ""
 
-#: cps/templates/layout.html:222
+#: cps/templates/layout.html:183
 msgid "Book Details"
 msgstr ""
 
-#: cps/templates/layout.html:256
+#: cps/templates/layout.html:217
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:259
+#: cps/templates/layout.html:220
 msgid "Error"
 msgstr ""
 
@@ -1715,105 +1871,105 @@ msgstr ""
 msgid "Reflow text when sidebars are open."
 msgstr "Tekst pływający, gdy paski boczne są otwarte."
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:88
 msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:91
 msgid "Previous Page"
 msgstr ""
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:92
 msgid "Next Page"
 msgstr ""
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:93
 msgid "Scale to Best"
 msgstr ""
 
-#: cps/templates/readcbr.html:100
+#: cps/templates/readcbr.html:94
 msgid "Scale to Width"
 msgstr ""
 
-#: cps/templates/readcbr.html:101
+#: cps/templates/readcbr.html:95
 msgid "Scale to Height"
 msgstr ""
 
-#: cps/templates/readcbr.html:102
+#: cps/templates/readcbr.html:96
 msgid "Scale to Native"
 msgstr ""
 
-#: cps/templates/readcbr.html:103
+#: cps/templates/readcbr.html:97
 msgid "Rotate Right"
 msgstr ""
 
-#: cps/templates/readcbr.html:104
+#: cps/templates/readcbr.html:98
 msgid "Rotate Left"
 msgstr ""
 
-#: cps/templates/readcbr.html:105
+#: cps/templates/readcbr.html:99
 msgid "Flip Image"
 msgstr ""
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:115
 msgid "Light"
 msgstr ""
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:116
 msgid "Dark"
 msgstr ""
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:121
 msgid "Scale"
 msgstr ""
 
-#: cps/templates/readcbr.html:130
+#: cps/templates/readcbr.html:124
 msgid "Best"
 msgstr ""
 
-#: cps/templates/readcbr.html:131
+#: cps/templates/readcbr.html:125
 msgid "Width"
 msgstr ""
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:126
 msgid "Height"
 msgstr ""
 
-#: cps/templates/readcbr.html:133
+#: cps/templates/readcbr.html:127
 msgid "Native"
 msgstr ""
 
-#: cps/templates/readcbr.html:138
+#: cps/templates/readcbr.html:132
 msgid "Rotate"
 msgstr ""
 
-#: cps/templates/readcbr.html:149
+#: cps/templates/readcbr.html:143
 msgid "Flip"
 msgstr ""
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:146
 msgid "Horizontal"
 msgstr ""
 
-#: cps/templates/readcbr.html:153
+#: cps/templates/readcbr.html:147
 msgid "Vertical"
 msgstr ""
 
-#: cps/templates/readcbr.html:158
+#: cps/templates/readcbr.html:152
 msgid "Direction"
 msgstr ""
 
-#: cps/templates/readcbr.html:161
+#: cps/templates/readcbr.html:155
 msgid "Left to Right"
 msgstr ""
 
-#: cps/templates/readcbr.html:162
+#: cps/templates/readcbr.html:156
 msgid "Right to Left"
 msgstr ""
 
 #: cps/templates/readpdf.html:29
-msgid "PDF.js viewer"
-msgstr "PDF.js viewer"
+msgid "PDF reader"
+msgstr ""
 
 #: cps/templates/readtxt.html:6
 msgid "Basic txt Reader"
@@ -1887,23 +2043,23 @@ msgstr ""
 msgid "Rating less than"
 msgstr ""
 
-#: cps/templates/shelf.html:7
+#: cps/templates/shelf.html:10
 msgid "Delete this Shelf"
 msgstr "Usuń tą półkę"
 
-#: cps/templates/shelf.html:8
+#: cps/templates/shelf.html:11
 msgid "Edit Shelf"
 msgstr ""
 
-#: cps/templates/shelf.html:9 cps/templates/shelf_order.html:11
+#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:11
 msgid "Change order"
 msgstr "Zmień sortowanie"
 
-#: cps/templates/shelf.html:68
+#: cps/templates/shelf.html:67
 msgid "Do you really want to delete the shelf?"
 msgstr ""
 
-#: cps/templates/shelf.html:71
+#: cps/templates/shelf.html:70
 msgid "Shelf will be lost for everybody and forever!"
 msgstr ""
 
@@ -1991,19 +2147,31 @@ msgstr ""
 msgid "Kindle E-Mail"
 msgstr "Adres e-mail Kindle"
 
-#: cps/templates/user_edit.html:39
+#: cps/templates/user_edit.html:40
 msgid "Show books with language"
 msgstr "Pokaż książki w języku"
 
-#: cps/templates/user_edit.html:41
+#: cps/templates/user_edit.html:42
 msgid "Show all"
 msgstr "Pokaż wszystko"
 
-#: cps/templates/user_edit.html:141
+#: cps/templates/user_edit.html:52
+msgid "OAuth Settings"
+msgstr ""
+
+#: cps/templates/user_edit.html:54
+msgid "Link"
+msgstr ""
+
+#: cps/templates/user_edit.html:56
+msgid "Unlink"
+msgstr ""
+
+#: cps/templates/user_edit.html:124
 msgid "Delete this user"
 msgstr "Usuń tego użytkownika"
 
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:139
 msgid "Recent Downloads"
 msgstr "Ostatnio pobierane"
 
@@ -3285,3 +3453,45 @@ msgstr "Ostatnio pobierane"
 #~ msgid "Using your another device, login and visit "
 #~ msgstr ""
 
+#~ msgid "Newest Books"
+#~ msgstr ""
+
+#~ msgid "Oldest Books"
+#~ msgstr ""
+
+#~ msgid "Books (A-Z)"
+#~ msgstr ""
+
+#~ msgid "Books (Z-A)"
+#~ msgstr ""
+
+#~ msgid "Error opening eBook. Fileformat is not supported."
+#~ msgstr ""
+
+#~ msgid "File %(title)s"
+#~ msgstr ""
+
+#~ msgid "Show sorted books"
+#~ msgstr ""
+
+#~ msgid "Sorted Books"
+#~ msgstr ""
+
+#~ msgid "Sort By"
+#~ msgstr ""
+
+#~ msgid "Newest"
+#~ msgstr ""
+
+#~ msgid "Oldest"
+#~ msgstr ""
+
+#~ msgid "Ascending"
+#~ msgstr ""
+
+#~ msgid "Descending"
+#~ msgstr ""
+
+#~ msgid "PDF.js viewer"
+#~ msgstr "PDF.js viewer"
+
diff --git a/cps/translations/ru/LC_MESSAGES/messages.mo b/cps/translations/ru/LC_MESSAGES/messages.mo
index 0940adfb..0ee14ae4 100644
Binary files a/cps/translations/ru/LC_MESSAGES/messages.mo and b/cps/translations/ru/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/ru/LC_MESSAGES/messages.po b/cps/translations/ru/LC_MESSAGES/messages.po
index ea9e8cf2..aa8b8691 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-05-30 09:06+0200\n"
+"POT-Creation-Date: 2019-05-31 11:20+0200\n"
 "PO-Revision-Date: 2018-12-14 16:26+0300\n"
 "Last-Translator: Pavel Korovin <p@tristero.se>\n"
 "Language: ru\n"
@@ -18,740 +18,929 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.6.0\n"
 
-#: cps/book_formats.py:199 cps/book_formats.py:200 cps/book_formats.py:204
-#: cps/book_formats.py:208 cps/book_formats.py:212 cps/converter.py:29
-#: cps/converter.py:45
-msgid "not installed"
-msgstr "не установлено"
-
-#: cps/converter.py:40 cps/converter.py:56
-msgid "Excecution permissions missing"
-msgstr "Отсутствуют разрешения на выполнение"
-
-#: cps/converter.py:66
-msgid "not configured"
-msgstr "не настроен"
-
-#: cps/helper.py:79
-#, python-format
-msgid "%(format)s format not found for book id: %(book)d"
-msgstr "%(format)s форма не найден для книги с id: %(book)d"
-
-#: cps/helper.py:91
-#, python-format
-msgid "%(format)s not found on Google Drive: %(fn)s"
-msgstr "%(format)s не найден на Google Drive: %(fn)s"
-
-#: cps/helper.py:98 cps/helper.py:204 cps/templates/detail.html:45
-#: cps/templates/detail.html:49
-msgid "Send to Kindle"
-msgstr "Отправить на Kindle"
-
-#: cps/helper.py:99 cps/helper.py:117 cps/helper.py:206
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "Это электронное письмо было отправлено через Caliber-Web."
-
-#: cps/helper.py:110
-#, python-format
-msgid "%(format)s not found: %(fn)s"
-msgstr "%(format)s не найден: %(fn)s"
-
-#: cps/helper.py:115
-msgid "Calibre-Web test e-mail"
-msgstr "Тестовый e-mail для Calibre-Web"
-
-#: cps/helper.py:116
-msgid "Test e-mail"
-msgstr "Тестовый e-mail"
-
-#: cps/helper.py:132
-msgid "Get Started with Calibre-Web"
-msgstr "Начать работать с Calibre-Web"
-
-#: cps/helper.py:133
-#, python-format
-msgid "Registration e-mail for user: %(name)s"
-msgstr "Регистрационный e-mail для пользователя: %(name)s"
-
-#: cps/helper.py:146 cps/helper.py:148 cps/helper.py:150 cps/helper.py:158
-#: cps/helper.py:160 cps/helper.py:162
-#, python-format
-msgid "Send %(format)s to Kindle"
-msgstr ""
-
-#: cps/helper.py:166
-#, python-format
-msgid "Convert %(orig)s to %(format)s and send to Kindle"
-msgstr ""
-
-#: cps/helper.py:205
-#, python-format
-msgid "E-mail: %(book)s"
-msgstr "Эл. почта: %(book)s"
-
-#: cps/helper.py:208
-msgid "The requested file could not be read. Maybe wrong permissions?"
-msgstr "Запрашиваемый файл не может быть прочитан. Возможно не верные разрешения?"
-
-#: cps/helper.py:316
-#, python-format
-msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "Переименовывание заголовка с: '%(src)s' на '%(dest)s' не удалось из-за ошибки: %(error)s"
-
-#: cps/helper.py:326
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "Переименовывание автора с: '%(src)s' на '%(dest)s' не удалось из-за ошибки: %(error)s"
-
-#: cps/helper.py:340
-#, python-format
-msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr ""
-
-#: cps/helper.py:366 cps/helper.py:376 cps/helper.py:384
-#, python-format
-msgid "File %(file)s not found on Google Drive"
-msgstr "Файл %(file)s не найден на Google Drive"
-
-#: cps/helper.py:405
-#, python-format
-msgid "Book path %(path)s not found on Google Drive"
-msgstr "Путь книги %(path)s не найден на Google Drive"
-
-#: cps/helper.py:556
-msgid "Error excecuting UnRar"
-msgstr "Ошибка извлечения UnRar"
-
-#: cps/helper.py:558
-msgid "Unrar binary file not found"
-msgstr "Unrar двочиный файл не найден"
-
-#: cps/helper.py:585
-msgid "Waiting"
-msgstr "Ожидание"
-
-#: cps/helper.py:587
-msgid "Failed"
-msgstr "Неудачно"
-
-#: cps/helper.py:589
-msgid "Started"
-msgstr "Начало"
-
-#: cps/helper.py:591
-msgid "Finished"
-msgstr "Закончено"
-
-#: cps/helper.py:593
-msgid "Unknown Status"
-msgstr "Неизвестный статус"
-
-#: cps/helper.py:598
-msgid "E-mail: "
-msgstr "E-mail: "
-
-#: cps/helper.py:600 cps/helper.py:604
-msgid "Convert: "
-msgstr "Конвертировать:"
-
-#: cps/helper.py:602
-msgid "Upload: "
-msgstr "Загрузить:"
-
-#: cps/helper.py:606
-msgid "Unknown Task: "
-msgstr "Неизвестная задача:"
-
-#: cps/updater.py:251 cps/updater.py:410 cps/updater.py:423
-msgid "Unexpected data while reading update information"
-msgstr "Некорректные данные при чтении информации об обновлении"
-
-#: cps/updater.py:258 cps/updater.py:416
-msgid "No update available. You already have the latest version installed"
-msgstr "Обновление недоступно. Вы используете самую последнюю версию"
-
-#: cps/updater.py:270 cps/updater.py:501 cps/updater.py:503 cps/web.py:1206
-msgid "HTTP Error"
-msgstr "Ошибка HTTP"
-
-#: cps/updater.py:272 cps/updater.py:505 cps/web.py:1207
-msgid "Connection error"
-msgstr "Ошибка соединения"
-
-#: cps/updater.py:274 cps/updater.py:507 cps/web.py:1208
-msgid "Timeout while establishing connection"
-msgstr "Таймаут при установлении соединения"
-
-#: cps/updater.py:276 cps/updater.py:509 cps/web.py:1209
-msgid "General error"
-msgstr "Общая ошибка"
-
-#: cps/updater.py:283 cps/updater.py:341 cps/updater.py:468
-msgid "A new update is available. Click on the button below to update to the latest version."
-msgstr "Доступно обновление. Нажмите на кнопку, что бы обновиться до последней версии."
-
-#: cps/updater.py:335
-msgid "Could not fetch update information"
-msgstr "Не удалось получить информацию об обновлении"
-
-#: cps/updater.py:403
-msgid "No release information available"
-msgstr ""
-
-#: cps/updater.py:449 cps/updater.py:458
-#, python-format
-msgid "A new update is available. Click on the button below to update to version: %(version)s"
-msgstr ""
-
-#: cps/updater.py:491 cps/web.py:2795
-msgid "Unknown"
-msgstr "Неизвестно"
-
-#: cps/web.py:1199
-msgid "Requesting update package"
-msgstr "Проверка обновлений"
-
-#: cps/web.py:1200
-msgid "Downloading update package"
-msgstr "Загрузка обновлений"
-
-#: cps/web.py:1201
-msgid "Unzipping update package"
-msgstr "Распаковка обновлений"
-
-#: cps/web.py:1202
-msgid "Replacing files"
-msgstr "Замена файлов"
-
-#: cps/web.py:1203
-msgid "Database connections are closed"
-msgstr "Соеднинения с базой данных закрыты"
-
-#: cps/web.py:1204
-msgid "Stopping server"
-msgstr "Остановка сервера"
-
-#: cps/web.py:1205
-msgid "Update finished, please press okay and reload page"
-msgstr "Обновления установлены, нажмите okay и перезагрузите страницу"
-
-#: cps/web.py:1206 cps/web.py:1207 cps/web.py:1208 cps/web.py:1209
-msgid "Update failed:"
-msgstr "Ошибка обновления:"
-
-#: cps/web.py:1235
-msgid "Recently Added Books"
-msgstr "Недавно Добавленные Книги"
-
-#: cps/web.py:1245
-msgid "Newest Books"
-msgstr "Новые Книги"
-
-#: cps/web.py:1257
-msgid "Oldest Books"
-msgstr "Старые Книги"
-
-#: cps/web.py:1269
-msgid "Books (A-Z)"
-msgstr "Книги (А-Я)"
-
-#: cps/web.py:1280
-msgid "Books (Z-A)"
-msgstr "Книги (Я-А)"
-
-#: cps/web.py:1309
-msgid "Hot Books (most downloaded)"
-msgstr "Популярные книги (часто загружаемые)"
-
-#: cps/web.py:1322
-msgid "Best rated books"
-msgstr "Книги с наивысшим рейтингом"
-
-#: cps/templates/index.xml:39 cps/web.py:1335
-msgid "Random Books"
-msgstr "Случайный выбор"
-
-#: cps/web.py:1362 cps/web.py:1618 cps/web.py:2161
-msgid "Error opening eBook. File does not exist or file is not accessible:"
-msgstr "Невозможно открыть книгу. Файл не существует или недоступен."
-
-#: cps/web.py:1391
-msgid "Publisher list"
-msgstr "Список издателей"
-
-#: cps/web.py:1406
-#, python-format
-msgid "Publisher: %(name)s"
-msgstr "Издатель: %(name)s"
-
-#: cps/templates/index.xml:83 cps/web.py:1438
-msgid "Series list"
-msgstr "Серии"
-
-#: cps/web.py:1452
-#, python-format
-msgid "Series: %(serie)s"
-msgstr "Серии: %(serie)s"
-
-#: cps/web.py:1478
-msgid "Available languages"
-msgstr "Доступные языки"
-
-#: cps/web.py:1498
-#, python-format
-msgid "Language: %(name)s"
-msgstr "Язык: %(name)s"
-
-#: cps/templates/index.xml:76 cps/web.py:1509
-msgid "Category list"
-msgstr "Категории"
-
-#: cps/web.py:1523
-#, python-format
-msgid "Category: %(name)s"
-msgstr "Категория: %(name)s"
-
-#: cps/templates/layout.html:73 cps/web.py:1648
-msgid "Tasks"
-msgstr "Задания"
-
-#: cps/web.py:1682
+#: cps/about.py:76
 msgid "Statistics"
 msgstr "Статистика"
 
-#: cps/web.py:1750
-msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
-msgstr ""
-
-#: cps/web.py:1795
-msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
-msgstr "Не удалось проверить домен обратного вызова, пожалуйста, выполните шаги для проверки домена в консоли разработчика Google."
-
-#: cps/web.py:1871
+#: cps/admin.py:97
 msgid "Server restarted, please reload page"
 msgstr "Сервер перезагружен, пожалуйста, перезагрузите страницу"
 
-#: cps/web.py:1874
+#: cps/admin.py:100
 msgid "Performing shutdown of server, please close window"
 msgstr "Производится остановка сервера, пожалуйста, закройте окно"
 
-#: cps/web.py:1953
-msgid "Published after "
-msgstr "Опубликовано до "
+#: cps/admin.py:120 cps/updater.py:445
+msgid "Unknown"
+msgstr "Неизвестно"
 
-#: cps/web.py:1960
-msgid "Published before "
-msgstr "Опубликовано после "
-
-#: cps/web.py:1974
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "Рейтинг <= %(rating)s"
-
-#: cps/web.py:1976
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "Рейтинг >= %(rating)s"
-
-#: cps/web.py:2036 cps/web.py:2045
-msgid "search"
-msgstr "поиск"
-
-#: cps/templates/index.xml:47 cps/templates/index.xml:51
-#: cps/templates/layout.html:148 cps/web.py:2116
-msgid "Read Books"
-msgstr "Прочитанные Книги"
-
-#: cps/templates/index.xml:55 cps/templates/index.xml:59
-#: cps/templates/layout.html:150 cps/web.py:2119
-msgid "Unread Books"
-msgstr "Непрочитанные Книги"
-
-#: cps/web.py:2171 cps/web.py:2173 cps/web.py:2175 cps/web.py:2187
-msgid "Read a Book"
-msgstr "Читать Книгу"
-
-#: cps/web.py:2199
-msgid "Error opening eBook. Fileformat is not supported."
-msgstr ""
-
-#: cps/web.py:2249 cps/web.py:3170
-msgid "Please fill out all fields!"
-msgstr "Пожалуйста, заполните все поля!"
-
-#: cps/web.py:2250 cps/web.py:2272 cps/web.py:2276 cps/web.py:2281
-#: cps/web.py:2283
-msgid "register"
-msgstr "регистрация"
-
-#: cps/web.py:2271 cps/web.py:3389
-msgid "An unknown error occurred. Please try again later."
-msgstr "Неизвестная ошибка. Попробуйте позже."
-
-#: cps/web.py:2274
-msgid "Your e-mail is not allowed to register"
-msgstr "Ваш e-mail не подходит для регистрации"
-
-#: cps/web.py:2277
-msgid "Confirmation e-mail was send to your e-mail account."
-msgstr "Письмо с подтверждением отправлено вам на e-mail"
-
-#: cps/web.py:2280
-msgid "This username or e-mail address is already in use."
-msgstr "Этот никнейм или e-mail уже используются"
-
-#: cps/web.py:2297 cps/web.py:2393
-#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
-msgstr "Вы вошли как пользователь '%(nickname)s'"
-
-#: cps/web.py:2302
-msgid "Wrong Username or Password"
-msgstr "Ошибка в имени пользователя или пароле"
-
-#: cps/web.py:2308 cps/web.py:2329
-msgid "login"
-msgstr "войти"
-
-#: cps/web.py:2341 cps/web.py:2372
-msgid "Token not found"
-msgstr "Ключ не найден"
-
-#: cps/web.py:2349 cps/web.py:2380
-msgid "Token has expired"
-msgstr "Ключ просрочен"
-
-#: cps/web.py:2357
-msgid "Success! Please return to your device"
-msgstr "Успешно! Пожалуйста, проверьте свое устройство"
-
-#: cps/web.py:2407
-msgid "Please configure the SMTP mail settings first..."
-msgstr "Пожалуйста, сначала сконфигурируйте параметры SMTP"
-
-#: cps/web.py:2412
-#, python-format
-msgid "Book successfully queued for sending to %(kindlemail)s"
-msgstr "Книга успешно поставлена в очередь для отправки на %(kindlemail)s"
-
-#: cps/web.py:2416
-#, python-format
-msgid "There was an error sending this book: %(res)s"
-msgstr "Ошибка при отправке книги: %(res)s"
-
-#: cps/web.py:2418 cps/web.py:3223
-msgid "Please configure your kindle e-mail address first..."
-msgstr "Пожалуйста, сначала настройте e-mail на вашем kindle..."
-
-#: cps/web.py:2429 cps/web.py:2481
-msgid "Invalid shelf specified"
-msgstr "Указана неверная полка"
-
-#: cps/web.py:2436
-#, python-format
-msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
-msgstr "Извините, но вам не разрешено добавлять книгу на полку: %(shelfname)s"
-
-#: cps/web.py:2444
-msgid "You are not allowed to edit public shelves"
-msgstr "Вы не можете редактировать общедоступные полки"
-
-#: cps/web.py:2453
-#, python-format
-msgid "Book is already part of the shelf: %(shelfname)s"
-msgstr "Книги уже размещены на полке: %(shelfname)s"
-
-#: cps/web.py:2467
-#, python-format
-msgid "Book has been added to shelf: %(sname)s"
-msgstr "Книга добавлена на книжную полку: %(sname)s"
-
-#: cps/web.py:2486
-#, python-format
-msgid "You are not allowed to add a book to the the shelf: %(name)s"
-msgstr "Вам не разрешено добавлять книгу на полку: %(name)s"
-
-#: cps/web.py:2491
-msgid "User is not allowed to edit public shelves"
-msgstr "Пользователь не может редактировать общедоступные полки"
-
-#: cps/web.py:2509
-#, python-format
-msgid "Books are already part of the shelf: %(name)s"
-msgstr "Книги уже размещены на полке: %(name)s"
-
-#: cps/web.py:2523
-#, python-format
-msgid "Books have been added to shelf: %(sname)s"
-msgstr "Книги добавлены в полку: %(sname)s"
-
-#: cps/web.py:2525
-#, python-format
-msgid "Could not add books to shelf: %(sname)s"
-msgstr "Не удалось добавить книги на полку: %(sname)s"
-
-#: cps/web.py:2562
-#, python-format
-msgid "Book has been removed from shelf: %(sname)s"
-msgstr "Книга удалена с полки: %(sname)s"
-
-#: cps/web.py:2568
-#, python-format
-msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
-msgstr "Извините, вы не можете удалить книгу с полки: %(sname)s"
-
-#: cps/web.py:2589 cps/web.py:2613
-#, python-format
-msgid "A shelf with the name '%(title)s' already exists."
-msgstr "Полка с названием '%(title)s' уже существует."
-
-#: cps/web.py:2594
-#, python-format
-msgid "Shelf %(title)s created"
-msgstr "Создана полка %(title)s"
-
-#: cps/web.py:2596 cps/web.py:2624
-msgid "There was an error"
-msgstr "Произошла ошибка"
-
-#: cps/web.py:2597 cps/web.py:2599
-msgid "create a shelf"
-msgstr "создать полку"
-
-#: cps/web.py:2622
-#, python-format
-msgid "Shelf %(title)s changed"
-msgstr "Колка %(title)s изменена"
-
-#: cps/web.py:2625 cps/web.py:2627
-msgid "Edit a shelf"
-msgstr "Изменить полку"
-
-#: cps/web.py:2648
-#, python-format
-msgid "successfully deleted shelf %(name)s"
-msgstr "удачно удалена полка %(name)s"
-
-#: cps/web.py:2675
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Полка: '%(name)s'"
-
-#: cps/web.py:2678
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "Ошибка открытия Полки. Полка не существует или недоступна"
-
-#: cps/web.py:2709
-#, python-format
-msgid "Change order of Shelf: '%(name)s'"
-msgstr "Изменить расположение полки '%(name)s'"
-
-#: cps/web.py:2738 cps/web.py:3176
-msgid "E-mail is not from valid domain"
-msgstr "E-mail не из существующей доменной зоны"
-
-#: cps/web.py:2740 cps/web.py:2782 cps/web.py:2785
-#, python-format
-msgid "%(name)s's profile"
-msgstr "Профиль %(name)s"
-
-#: cps/web.py:2780
-msgid "Found an existing account for this e-mail address."
-msgstr "Этот адрес электронной почты уже зарегистрирован."
-
-#: cps/web.py:2783
-msgid "Profile updated"
-msgstr "Профиль обновлён"
-
-#: cps/web.py:2814
+#: cps/admin.py:139
 msgid "Admin page"
 msgstr "Администрирование"
 
-#: cps/web.py:2899 cps/web.py:3079
+#: cps/admin.py:208 cps/admin.py:486
 msgid "Calibre-Web configuration updated"
 msgstr "Конфигурация Calibre-Web обновлена"
 
-#: cps/templates/admin.html:100 cps/web.py:2913
+#: cps/admin.py:222 cps/templates/admin.html:102
 msgid "UI Configuration"
 msgstr "Настройка интерфейса"
 
-#: cps/web.py:2931
+#: cps/admin.py:295
 msgid "Import of optional Google Drive requirements missing"
 msgstr "Импорт дополнительных требований к Google Диску отсутствует"
 
-#: cps/web.py:2934
+#: cps/admin.py:298
 msgid "client_secrets.json is missing or not readable"
 msgstr "client_secrets.json отсутствует или его невозможно прочесть"
 
-#: cps/web.py:2939 cps/web.py:2968
+#: cps/admin.py:303 cps/admin.py:332
 msgid "client_secrets.json is not configured for web application"
 msgstr "client_secrets.json не настроен для веб-приложения"
 
-#: cps/templates/admin.html:99 cps/web.py:2971 cps/web.py:2997 cps/web.py:3009
-#: cps/web.py:3054 cps/web.py:3069 cps/web.py:3088 cps/web.py:3096
-#: cps/web.py:3112
+#: cps/admin.py:335 cps/admin.py:361 cps/admin.py:373 cps/admin.py:398
+#: cps/admin.py:426 cps/admin.py:440 cps/admin.py:463 cps/admin.py:476
+#: cps/admin.py:494 cps/admin.py:501 cps/admin.py:516
+#: cps/templates/admin.html:101
 msgid "Basic Configuration"
 msgstr "Настройки сервера"
 
-#: cps/web.py:2994
+#: cps/admin.py:358
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr "Неверное расположение файла-ключа, введите правильный путь"
 
-#: cps/web.py:3006
+#: cps/admin.py:370
 msgid "Certfile location is not valid, please enter correct path"
 msgstr "Неверное расположение сертификата, введите правильный путь"
 
-#: cps/web.py:3051
+#: cps/admin.py:395
+msgid "Please enter a LDAP provider and a DN"
+msgstr ""
+
+#: cps/admin.py:423
+msgid "Please enter Github oauth credentials"
+msgstr ""
+
+#: cps/admin.py:437
+msgid "Please enter Google oauth credentials"
+msgstr ""
+
+#: cps/admin.py:460
 msgid "Logfile location is not valid, please enter correct path"
 msgstr "Неверное расположение лог-файла, введите правильный путь"
 
-#: cps/web.py:3092
+#: cps/admin.py:498
 msgid "DB location is not valid, please enter correct path"
 msgstr "Неверное расположение базы данных, введите правильный путь"
 
-#: cps/templates/admin.html:33 cps/web.py:3172 cps/web.py:3178 cps/web.py:3194
+#: cps/admin.py:558 cps/web.py:1045
+msgid "Please fill out all fields!"
+msgstr "Пожалуйста, заполните все поля!"
+
+#: cps/admin.py:560 cps/admin.py:566 cps/admin.py:582
+#: cps/templates/admin.html:35
 msgid "Add new user"
 msgstr "Добавить пользователя"
 
-#: cps/web.py:3184
+#: cps/admin.py:564 cps/web.py:1248
+msgid "E-mail is not from valid domain"
+msgstr "E-mail не из существующей доменной зоны"
+
+#: cps/admin.py:572
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Пользователь '%(user)s' добавлен"
 
-#: cps/web.py:3188
+#: cps/admin.py:576
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Для этого адреса электронной почты или логина уже есть аккаунт."
 
-#: cps/web.py:3218
+#: cps/admin.py:607
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Тестовое письмо успешно отправлено на %(kindlemail)s"
 
-#: cps/web.py:3221
+#: cps/admin.py:610
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Произошла ошибка при отправке тестового письма на: %(res)s"
 
-#: cps/web.py:3225
+#: cps/admin.py:612 cps/web.py:1029
+msgid "Please configure your kindle e-mail address first..."
+msgstr "Пожалуйста, сначала настройте e-mail на вашем kindle..."
+
+#: cps/admin.py:614
 msgid "E-mail server settings updated"
 msgstr "Настройки E-mail сервера обновлены"
 
-#: cps/web.py:3226
+#: cps/admin.py:615
 msgid "Edit e-mail server settings"
 msgstr "Изменить настройки e-mail сервера"
 
-#: cps/web.py:3251
+#: cps/admin.py:640
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Пользователь '%(nick)s' удалён"
 
-#: cps/web.py:3364
+#: cps/admin.py:711
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Пользователь '%(nick)s' обновлён"
 
-#: cps/web.py:3367
+#: cps/admin.py:714
 msgid "An unknown error occured."
 msgstr "Произошла неизвестная ошибка."
 
-#: cps/web.py:3369
+#: cps/admin.py:717
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Изменить пользователя %(nick)s"
 
-#: cps/web.py:3386
+#: cps/admin.py:733
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Пароль для пользователя %(user)s сброшен"
 
-#: cps/web.py:3400 cps/web.py:3592
+#: cps/admin.py:736 cps/web.py:1070
+msgid "An unknown error occurred. Please try again later."
+msgstr "Неизвестная ошибка. Попробуйте позже."
+
+#: cps/admin.py:755
+msgid "Requesting update package"
+msgstr "Проверка обновлений"
+
+#: cps/admin.py:756
+msgid "Downloading update package"
+msgstr "Загрузка обновлений"
+
+#: cps/admin.py:757
+msgid "Unzipping update package"
+msgstr "Распаковка обновлений"
+
+#: cps/admin.py:758
+msgid "Replacing files"
+msgstr "Замена файлов"
+
+#: cps/admin.py:759
+msgid "Database connections are closed"
+msgstr "Соеднинения с базой данных закрыты"
+
+#: cps/admin.py:760
+msgid "Stopping server"
+msgstr "Остановка сервера"
+
+#: cps/admin.py:761
+msgid "Update finished, please press okay and reload page"
+msgstr "Обновления установлены, нажмите okay и перезагрузите страницу"
+
+#: cps/admin.py:762 cps/admin.py:763 cps/admin.py:764 cps/admin.py:765
+msgid "Update failed:"
+msgstr "Ошибка обновления:"
+
+#: cps/admin.py:762 cps/updater.py:277 cps/updater.py:456 cps/updater.py:458
+msgid "HTTP Error"
+msgstr "Ошибка HTTP"
+
+#: cps/admin.py:763 cps/updater.py:279 cps/updater.py:460
+msgid "Connection error"
+msgstr "Ошибка соединения"
+
+#: cps/admin.py:764 cps/updater.py:281 cps/updater.py:462
+msgid "Timeout while establishing connection"
+msgstr "Таймаут при установлении соединения"
+
+#: cps/admin.py:765 cps/updater.py:283 cps/updater.py:464
+msgid "General error"
+msgstr "Общая ошибка"
+
+#: cps/converter.py:31 cps/converter.py:48 cps/uploader.py:213
+#: cps/uploader.py:214 cps/uploader.py:218 cps/uploader.py:222
+#: cps/uploader.py:226
+msgid "not installed"
+msgstr "не установлено"
+
+#: cps/converter.py:43 cps/converter.py:60
+msgid "Excecution permissions missing"
+msgstr "Отсутствуют разрешения на выполнение"
+
+#: cps/converter.py:70
+msgid "not configured"
+msgstr "не настроен"
+
+#: cps/editbooks.py:218 cps/editbooks.py:432
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Ошибка при открытии eBook. Файл не существует или файл недоступен"
 
-#: cps/web.py:3428
+#: cps/editbooks.py:246
 msgid "edit metadata"
 msgstr "изменить метаданные"
 
-#: cps/web.py:3521 cps/web.py:3754
+#: cps/editbooks.py:325 cps/editbooks.py:595
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Запрещена загрузка файлов с расширением '%(ext)s'"
 
-#: cps/web.py:3525 cps/web.py:3757
+#: cps/editbooks.py:329 cps/editbooks.py:599
 msgid "File to be uploaded must have an extension"
 msgstr "Загружаемый файл должен иметь расширение"
 
-#: cps/web.py:3537 cps/web.py:3776
+#: cps/editbooks.py:341 cps/editbooks.py:619
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Ошибка при создании пути %(path)s (Доступ запрещён)."
 
-#: cps/web.py:3542
+#: cps/editbooks.py:346
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Не удалось сохранить файл %(file)s."
 
-#: cps/web.py:3559
+#: cps/editbooks.py:363
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Формат файла %(ext)s добавлен в %(book)s"
 
-#: cps/web.py:3573 cps/web.py:3646
+#: cps/editbooks.py:382
+#, python-format
+msgid "Failed to create path for cover %(path)s (Permission denied)."
+msgstr ""
+
+#: cps/editbooks.py:390
+#, python-format
+msgid "Failed to store cover-file %(cover)s."
+msgstr ""
+
+#: cps/editbooks.py:393
+msgid "Cover-file is not a valid image file"
+msgstr ""
+
+#: cps/editbooks.py:399 cps/editbooks.py:413
 msgid "Cover is not a supported imageformat (jpg/png/webp), can't save"
 msgstr ""
 
-#: cps/web.py:3605 cps/web.py:3614
+#: cps/editbooks.py:445 cps/editbooks.py:454
 msgid "unknown"
 msgstr "неизвестно"
 
-#: cps/web.py:3694
+#: cps/editbooks.py:486
+msgid "Cover is not a jpg file, can't save"
+msgstr ""
+
+#: cps/editbooks.py:534
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s не допустимый язык"
 
-#: cps/web.py:3725
+#: cps/editbooks.py:565
 msgid "Metadata successfully updated"
 msgstr "Метаданные обновлены"
 
-#: cps/web.py:3734
+#: cps/editbooks.py:574
 msgid "Error editing book, please check logfile for details"
 msgstr "Ошибка редактирования книги. Пожалуйста, проверьте лог-файл для дополнительной информации"
 
-#: cps/web.py:3780
+#: cps/editbooks.py:624
 #, python-format
 msgid "Failed to store file %(file)s (Permission denied)."
 msgstr "Ошибка записи файла %(file)s (Доступ запрещён)."
 
-#: cps/web.py:3785
+#: cps/editbooks.py:629
 #, python-format
 msgid "Failed to delete file %(file)s (Permission denied)."
 msgstr "Ошибка удаления файла %(file)s (Доступ запрещён)."
 
-#: cps/web.py:3867
+#: cps/editbooks.py:712
 #, python-format
-msgid "File %(title)s"
+msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/web.py:3896
+#: cps/editbooks.py:741
 msgid "Source or destination format for conversion missing"
 msgstr "Исходный или целевой формат для конвертирования отсутствует"
 
-#: cps/web.py:3906
+#: cps/editbooks.py:751
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Книга успешно поставлена в очередь для конвертирования в %(book_format)s"
 
-#: cps/web.py:3910
+#: cps/editbooks.py:755
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Произошла ошибка при конвертирования этой книги: %(res)s"
 
-#: cps/worker.py:305
+#: cps/gdrive.py:56
+msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
+msgstr ""
+
+#: cps/gdrive.py:101
+msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
+msgstr "Не удалось проверить домен обратного вызова, пожалуйста, выполните шаги для проверки домена в консоли разработчика Google."
+
+#: cps/helper.py:97
+#, python-format
+msgid "%(format)s format not found for book id: %(book)d"
+msgstr "%(format)s форма не найден для книги с id: %(book)d"
+
+#: cps/helper.py:109
+#, python-format
+msgid "%(format)s not found on Google Drive: %(fn)s"
+msgstr "%(format)s не найден на Google Drive: %(fn)s"
+
+#: cps/helper.py:116 cps/helper.py:223 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Отправить на Kindle"
+
+#: cps/helper.py:117 cps/helper.py:135 cps/helper.py:225
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "Это электронное письмо было отправлено через Caliber-Web."
+
+#: cps/helper.py:128
+#, python-format
+msgid "%(format)s not found: %(fn)s"
+msgstr "%(format)s не найден: %(fn)s"
+
+#: cps/helper.py:133
+msgid "Calibre-Web test e-mail"
+msgstr "Тестовый e-mail для Calibre-Web"
+
+#: cps/helper.py:134
+msgid "Test e-mail"
+msgstr "Тестовый e-mail"
+
+#: cps/helper.py:150
+msgid "Get Started with Calibre-Web"
+msgstr "Начать работать с Calibre-Web"
+
+#: cps/helper.py:151
+#, python-format
+msgid "Registration e-mail for user: %(name)s"
+msgstr "Регистрационный e-mail для пользователя: %(name)s"
+
+#: cps/helper.py:165 cps/helper.py:167 cps/helper.py:169 cps/helper.py:177
+#: cps/helper.py:179 cps/helper.py:181
+#, python-format
+msgid "Send %(format)s to Kindle"
+msgstr ""
+
+#: cps/helper.py:185
+#, python-format
+msgid "Convert %(orig)s to %(format)s and send to Kindle"
+msgstr ""
+
+#: cps/helper.py:224
+#, python-format
+msgid "E-mail: %(book)s"
+msgstr "Эл. почта: %(book)s"
+
+#: cps/helper.py:227
+msgid "The requested file could not be read. Maybe wrong permissions?"
+msgstr "Запрашиваемый файл не может быть прочитан. Возможно не верные разрешения?"
+
+#: cps/helper.py:335
+#, python-format
+msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "Переименовывание заголовка с: '%(src)s' на '%(dest)s' не удалось из-за ошибки: %(error)s"
+
+#: cps/helper.py:345
+#, python-format
+msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "Переименовывание автора с: '%(src)s' на '%(dest)s' не удалось из-за ошибки: %(error)s"
+
+#: cps/helper.py:359
+#, python-format
+msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr ""
+
+#: cps/helper.py:385 cps/helper.py:395 cps/helper.py:403
+#, python-format
+msgid "File %(file)s not found on Google Drive"
+msgstr "Файл %(file)s не найден на Google Drive"
+
+#: cps/helper.py:424
+#, python-format
+msgid "Book path %(path)s not found on Google Drive"
+msgstr "Путь книги %(path)s не найден на Google Drive"
+
+#: cps/helper.py:584
+msgid "Error excecuting UnRar"
+msgstr "Ошибка извлечения UnRar"
+
+#: cps/helper.py:586
+msgid "Unrar binary file not found"
+msgstr "Unrar двочиный файл не найден"
+
+#: cps/helper.py:614
+msgid "Waiting"
+msgstr "Ожидание"
+
+#: cps/helper.py:616
+msgid "Failed"
+msgstr "Неудачно"
+
+#: cps/helper.py:618
+msgid "Started"
+msgstr "Начало"
+
+#: cps/helper.py:620
+msgid "Finished"
+msgstr "Закончено"
+
+#: cps/helper.py:622
+msgid "Unknown Status"
+msgstr "Неизвестный статус"
+
+#: cps/helper.py:627
+msgid "E-mail: "
+msgstr "E-mail: "
+
+#: cps/helper.py:629 cps/helper.py:633
+msgid "Convert: "
+msgstr "Конвертировать:"
+
+#: cps/helper.py:631
+msgid "Upload: "
+msgstr "Загрузить:"
+
+#: cps/helper.py:635
+msgid "Unknown Task: "
+msgstr "Неизвестная задача:"
+
+#: cps/oauth_bb.py:87
+#, python-format
+msgid "Register with %s, "
+msgstr ""
+
+#: cps/oauth_bb.py:145
+msgid "Failed to log in with GitHub."
+msgstr ""
+
+#: cps/oauth_bb.py:150
+msgid "Failed to fetch user info from GitHub."
+msgstr ""
+
+#: cps/oauth_bb.py:161
+msgid "Failed to log in with Google."
+msgstr ""
+
+#: cps/oauth_bb.py:166
+msgid "Failed to fetch user info from Google."
+msgstr ""
+
+#: cps/oauth_bb.py:265
+#, python-format
+msgid "Unlink to %(oauth)s success."
+msgstr ""
+
+#: cps/oauth_bb.py:269
+#, python-format
+msgid "Unlink to %(oauth)s failed."
+msgstr ""
+
+#: cps/oauth_bb.py:272
+#, python-format
+msgid "Not linked to %(oauth)s."
+msgstr ""
+
+#: cps/oauth_bb.py:300
+msgid "GitHub Oauth error, please retry later."
+msgstr ""
+
+#: cps/oauth_bb.py:319
+msgid "Google Oauth error, please retry later."
+msgstr ""
+
+#: cps/shelf.py:40 cps/shelf.py:92
+msgid "Invalid shelf specified"
+msgstr "Указана неверная полка"
+
+#: cps/shelf.py:47
+#, python-format
+msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
+msgstr "Извините, но вам не разрешено добавлять книгу на полку: %(shelfname)s"
+
+#: cps/shelf.py:55
+msgid "You are not allowed to edit public shelves"
+msgstr "Вы не можете редактировать общедоступные полки"
+
+#: cps/shelf.py:64
+#, python-format
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr "Книги уже размещены на полке: %(shelfname)s"
+
+#: cps/shelf.py:78
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "Книга добавлена на книжную полку: %(sname)s"
+
+#: cps/shelf.py:97
+#, python-format
+msgid "You are not allowed to add a book to the the shelf: %(name)s"
+msgstr "Вам не разрешено добавлять книгу на полку: %(name)s"
+
+#: cps/shelf.py:102
+msgid "User is not allowed to edit public shelves"
+msgstr "Пользователь не может редактировать общедоступные полки"
+
+#: cps/shelf.py:120
+#, python-format
+msgid "Books are already part of the shelf: %(name)s"
+msgstr "Книги уже размещены на полке: %(name)s"
+
+#: cps/shelf.py:134
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr "Книги добавлены в полку: %(sname)s"
+
+#: cps/shelf.py:136
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr "Не удалось добавить книги на полку: %(sname)s"
+
+#: cps/shelf.py:173
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "Книга удалена с полки: %(sname)s"
+
+#: cps/shelf.py:179
+#, python-format
+msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
+msgstr "Извините, вы не можете удалить книгу с полки: %(sname)s"
+
+#: cps/shelf.py:200 cps/shelf.py:224
+#, python-format
+msgid "A shelf with the name '%(title)s' already exists."
+msgstr "Полка с названием '%(title)s' уже существует."
+
+#: cps/shelf.py:205
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "Создана полка %(title)s"
+
+#: cps/shelf.py:207 cps/shelf.py:235
+msgid "There was an error"
+msgstr "Произошла ошибка"
+
+#: cps/shelf.py:208 cps/shelf.py:210
+msgid "create a shelf"
+msgstr "создать полку"
+
+#: cps/shelf.py:233
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "Колка %(title)s изменена"
+
+#: cps/shelf.py:236 cps/shelf.py:238
+msgid "Edit a shelf"
+msgstr "Изменить полку"
+
+#: cps/shelf.py:259
+#, python-format
+msgid "successfully deleted shelf %(name)s"
+msgstr "удачно удалена полка %(name)s"
+
+#: cps/shelf.py:289
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Полка: '%(name)s'"
+
+#: cps/shelf.py:292
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "Ошибка открытия Полки. Полка не существует или недоступна"
+
+#: cps/shelf.py:324
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "Изменить расположение полки '%(name)s'"
+
+#: cps/ub.py:111
+msgid "Recently Added"
+msgstr "Недавно Добавленные"
+
+#: cps/ub.py:113
+msgid "Show recent books"
+msgstr "Показывать недавние книги"
+
+#: cps/templates/index.xml:17 cps/ub.py:114
+msgid "Hot Books"
+msgstr "Популярные Книги"
+
+#: cps/ub.py:115
+msgid "Show hot books"
+msgstr "Показывать популярные книги"
+
+#: cps/templates/index.xml:24 cps/ub.py:118
+msgid "Best rated Books"
+msgstr "Книги с наилучшим рейтингом"
+
+#: cps/ub.py:120
+msgid "Show best rated books"
+msgstr "Показывать книги с наивысшим рейтингом"
+
+#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:121
+#: cps/web.py:965
+msgid "Read Books"
+msgstr "Прочитанные Книги"
+
+#: cps/ub.py:123
+msgid "Show read and unread"
+msgstr "Показывать прочитанные и непрочитанные"
+
+#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:125
+#: cps/web.py:969
+msgid "Unread Books"
+msgstr "Непрочитанные Книги"
+
+#: cps/ub.py:127
+msgid "Show unread"
+msgstr ""
+
+#: cps/ub.py:128
+msgid "Discover"
+msgstr "Обзор"
+
+#: cps/ub.py:130
+msgid "Show random books"
+msgstr "Показывать случайные книги"
+
+#: cps/ub.py:131
+msgid "Categories"
+msgstr "Категории"
+
+#: cps/ub.py:133
+msgid "Show category selection"
+msgstr "Показывать выбор категории"
+
+#: cps/templates/book_edit.html:71 cps/templates/search_form.html:53
+#: cps/ub.py:134
+msgid "Series"
+msgstr "Серии"
+
+#: cps/ub.py:136
+msgid "Show series selection"
+msgstr "Показывать выбор серии"
+
+#: cps/templates/index.xml:61 cps/ub.py:137
+msgid "Authors"
+msgstr "Авторы"
+
+#: cps/ub.py:139
+msgid "Show author selection"
+msgstr "Показывать выбор автора"
+
+#: cps/templates/index.xml:68 cps/ub.py:141
+msgid "Publishers"
+msgstr "Издатели"
+
+#: cps/ub.py:143
+msgid "Show publisher selection"
+msgstr "Показать выбор издателя"
+
+#: cps/templates/search_form.html:74 cps/ub.py:144
+msgid "Languages"
+msgstr "Языки"
+
+#: cps/ub.py:147
+msgid "Show language selection"
+msgstr "Показывать выбор языка"
+
+#: cps/ub.py:148
+msgid "Ratings"
+msgstr ""
+
+#: cps/ub.py:150
+msgid "Show ratings selection"
+msgstr ""
+
+#: cps/ub.py:151
+msgid "File formats"
+msgstr ""
+
+#: cps/ub.py:153
+msgid "Show file formats selection"
+msgstr ""
+
+#: cps/updater.py:257 cps/updater.py:364 cps/updater.py:377
+msgid "Unexpected data while reading update information"
+msgstr "Некорректные данные при чтении информации об обновлении"
+
+#: cps/updater.py:264 cps/updater.py:370
+msgid "No update available. You already have the latest version installed"
+msgstr "Обновление недоступно. Вы используете самую последнюю версию"
+
+#: cps/updater.py:290 cps/updater.py:422
+msgid "A new update is available. Click on the button below to update to the latest version."
+msgstr "Доступно обновление. Нажмите на кнопку, что бы обновиться до последней версии."
+
+#: cps/updater.py:343
+msgid "Could not fetch update information"
+msgstr "Не удалось получить информацию об обновлении"
+
+#: cps/updater.py:357
+msgid "No release information available"
+msgstr ""
+
+#: cps/updater.py:403 cps/updater.py:412
+#, python-format
+msgid "A new update is available. Click on the button below to update to version: %(version)s"
+msgstr ""
+
+#: cps/web.py:457
+msgid "Recently Added Books"
+msgstr "Недавно Добавленные Книги"
+
+#: cps/web.py:484
+msgid "Best rated books"
+msgstr "Книги с наивысшим рейтингом"
+
+#: cps/templates/index.xml:38 cps/web.py:492
+msgid "Random Books"
+msgstr "Случайный выбор"
+
+#: cps/web.py:516
+msgid "Books"
+msgstr ""
+
+#: cps/web.py:543
+msgid "Hot Books (most downloaded)"
+msgstr "Популярные книги (часто загружаемые)"
+
+#: cps/web.py:553 cps/web.py:1294 cps/web.py:1383
+msgid "Error opening eBook. File does not exist or file is not accessible:"
+msgstr "Невозможно открыть книгу. Файл не существует или недоступен."
+
+#: cps/web.py:580
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr "Издатель: %(name)s"
+
+#: cps/web.py:591
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "Серии: %(serie)s"
+
+#: cps/web.py:602
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr ""
+
+#: cps/web.py:613
+#, python-format
+msgid "File format: %(format)s"
+msgstr ""
+
+#: cps/web.py:625
+#, python-format
+msgid "Category: %(name)s"
+msgstr "Категория: %(name)s"
+
+#: cps/web.py:659
+msgid "Publisher list"
+msgstr "Список издателей"
+
+#: cps/templates/index.xml:82 cps/web.py:675
+msgid "Series list"
+msgstr "Серии"
+
+#: cps/web.py:689
+msgid "Ratings list"
+msgstr ""
+
+#: cps/web.py:702
+msgid "File formats list"
+msgstr ""
+
+#: cps/web.py:730
+msgid "Available languages"
+msgstr "Доступные языки"
+
+#: cps/web.py:750
+#, python-format
+msgid "Language: %(name)s"
+msgstr "Язык: %(name)s"
+
+#: cps/templates/index.xml:75 cps/web.py:764
+msgid "Category list"
+msgstr "Категории"
+
+#: cps/templates/layout.html:73 cps/web.py:777
+msgid "Tasks"
+msgstr "Задания"
+
+#: cps/web.py:841
+msgid "Published after "
+msgstr "Опубликовано до "
+
+#: cps/web.py:848
+msgid "Published before "
+msgstr "Опубликовано после "
+
+#: cps/web.py:862
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Рейтинг <= %(rating)s"
+
+#: cps/web.py:864
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Рейтинг >= %(rating)s"
+
+#: cps/web.py:924 cps/web.py:933
+msgid "search"
+msgstr "поиск"
+
+#: cps/web.py:1018
+msgid "Please configure the SMTP mail settings first..."
+msgstr "Пожалуйста, сначала сконфигурируйте параметры SMTP"
+
+#: cps/web.py:1023
+#, python-format
+msgid "Book successfully queued for sending to %(kindlemail)s"
+msgstr "Книга успешно поставлена в очередь для отправки на %(kindlemail)s"
+
+#: cps/web.py:1027
+#, python-format
+msgid "There was an error sending this book: %(res)s"
+msgstr "Ошибка при отправке книги: %(res)s"
+
+#: cps/web.py:1046 cps/web.py:1071 cps/web.py:1076 cps/web.py:1081
+#: cps/web.py:1085
+msgid "register"
+msgstr "регистрация"
+
+#: cps/web.py:1073
+msgid "Your e-mail is not allowed to register"
+msgstr "Ваш e-mail не подходит для регистрации"
+
+#: cps/web.py:1077
+msgid "Confirmation e-mail was send to your e-mail account."
+msgstr "Письмо с подтверждением отправлено вам на e-mail"
+
+#: cps/web.py:1080
+msgid "This username or e-mail address is already in use."
+msgstr "Этот никнейм или e-mail уже используются"
+
+#: cps/web.py:1103 cps/web.py:1115
+#, python-format
+msgid "You are now logged in as: '%(nickname)s'"
+msgstr ""
+
+#: cps/web.py:1108 cps/web.py:1120
+msgid "Wrong Username or Password"
+msgstr "Ошибка в имени пользователя или пароле"
+
+#: cps/web.py:1111
+msgid "Could not login. LDAP server down, please contact your administrator"
+msgstr ""
+
+#: cps/web.py:1124 cps/web.py:1146
+msgid "login"
+msgstr "войти"
+
+#: cps/web.py:1158 cps/web.py:1189
+msgid "Token not found"
+msgstr "Ключ не найден"
+
+#: cps/web.py:1166 cps/web.py:1197
+msgid "Token has expired"
+msgstr "Ключ просрочен"
+
+#: cps/web.py:1174
+msgid "Success! Please return to your device"
+msgstr "Успешно! Пожалуйста, проверьте свое устройство"
+
+#: cps/web.py:1210
+#, python-format
+msgid "you are now logged in as: '%(nickname)s'"
+msgstr "Вы вошли как пользователь '%(nickname)s'"
+
+#: cps/web.py:1250 cps/web.py:1277 cps/web.py:1281
+#, python-format
+msgid "%(name)s's profile"
+msgstr "Профиль %(name)s"
+
+#: cps/web.py:1274
+msgid "Found an existing account for this e-mail address."
+msgstr "Этот адрес электронной почты уже зарегистрирован."
+
+#: cps/web.py:1279
+msgid "Profile updated"
+msgstr "Профиль обновлён"
+
+#: cps/web.py:1304 cps/web.py:1306 cps/web.py:1308 cps/web.py:1314
+#: cps/web.py:1318
+msgid "Read a Book"
+msgstr "Читать Книгу"
+
+#: cps/web.py:1328
+msgid "Error opening eBook. File does not exist or file is not accessible."
+msgstr ""
+
+#: cps/worker.py:308
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "Ошибка Ebook-конвертора: %(error)s"
 
-#: cps/worker.py:316
+#: cps/worker.py:319
 #, python-format
 msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "Kindlegen - неудачно, с Ошибкой %(error)s. Сообщение: %(message)s"
@@ -780,147 +969,152 @@ msgstr "DLS"
 msgid "Admin"
 msgstr "Управление"
 
-#: cps/templates/admin.html:14 cps/templates/detail.html:22
-#: cps/templates/detail.html:31
+#: cps/templates/admin.html:14 cps/templates/detail.html:18
+#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/shelfdown.html:62
 msgid "Download"
 msgstr "Скачать"
 
-#: cps/templates/admin.html:15 cps/templates/layout.html:65
+#: cps/templates/admin.html:15
+msgid "View Ebooks"
+msgstr ""
+
+#: cps/templates/admin.html:16 cps/templates/layout.html:65
 msgid "Upload"
 msgstr "Загрузить"
 
-#: cps/templates/admin.html:16
+#: cps/templates/admin.html:17
 msgid "Edit"
 msgstr "Редактировать"
 
-#: cps/templates/admin.html:39
+#: cps/templates/admin.html:41
 msgid "SMTP e-mail server settings"
 msgstr "Настройки SMTP-сервера"
 
-#: cps/templates/admin.html:42 cps/templates/email_edit.html:11
+#: cps/templates/admin.html:44 cps/templates/email_edit.html:11
 msgid "SMTP hostname"
 msgstr "SMTP-сервер"
 
-#: cps/templates/admin.html:43
+#: cps/templates/admin.html:45
 msgid "SMTP port"
 msgstr "SMTP-порт"
 
-#: cps/templates/admin.html:44
+#: cps/templates/admin.html:46
 msgid "SSL"
 msgstr "SSL"
 
-#: cps/templates/admin.html:45 cps/templates/email_edit.html:27
+#: cps/templates/admin.html:47 cps/templates/email_edit.html:27
 msgid "SMTP login"
 msgstr "SMTP-логин"
 
-#: cps/templates/admin.html:46
+#: cps/templates/admin.html:48
 msgid "From mail"
 msgstr "Отправитель"
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:58
 msgid "Change SMTP settings"
 msgstr "Изменить настройки SMTP"
 
-#: cps/templates/admin.html:62
+#: cps/templates/admin.html:64
 msgid "Configuration"
 msgstr "Настройки сервера"
 
-#: cps/templates/admin.html:65
+#: cps/templates/admin.html:67
 msgid "Calibre DB dir"
 msgstr "Папка Calibre DB"
 
-#: cps/templates/admin.html:69
+#: cps/templates/admin.html:71
 msgid "Log level"
 msgstr "Уровень лога"
 
-#: cps/templates/admin.html:73
+#: cps/templates/admin.html:75
 msgid "Port"
 msgstr "Порт"
 
-#: cps/templates/admin.html:79 cps/templates/config_view_edit.html:23
+#: cps/templates/admin.html:81 cps/templates/config_view_edit.html:23
 msgid "Books per page"
 msgstr "Количество книг на странице"
 
-#: cps/templates/admin.html:83
+#: cps/templates/admin.html:85
 msgid "Uploading"
 msgstr "Загрузка на сервер"
 
-#: cps/templates/admin.html:87
+#: cps/templates/admin.html:89
 msgid "Anonymous browsing"
 msgstr "Анонимный просмотр"
 
-#: cps/templates/admin.html:91
+#: cps/templates/admin.html:93
 msgid "Public registration"
 msgstr "Публичная регистрация"
 
-#: cps/templates/admin.html:95 cps/templates/remote_login.html:4
+#: cps/templates/admin.html:97 cps/templates/remote_login.html:4
 msgid "Remote login"
 msgstr "Удалённый логин"
 
-#: cps/templates/admin.html:106
+#: cps/templates/admin.html:108
 msgid "Administration"
 msgstr "Управление"
 
-#: cps/templates/admin.html:107
+#: cps/templates/admin.html:109
 msgid "Reconnect to Calibre DB"
 msgstr "Переподключиться к БД Calibre"
 
-#: cps/templates/admin.html:108
+#: cps/templates/admin.html:110
 msgid "Restart Calibre-Web"
 msgstr "Перезагрузить Calibre-Web"
 
-#: cps/templates/admin.html:109
+#: cps/templates/admin.html:111
 msgid "Stop Calibre-Web"
 msgstr "Остановить Calibre-Web"
 
-#: cps/templates/admin.html:115
+#: cps/templates/admin.html:117
 msgid "Update"
 msgstr "Обновление"
 
-#: cps/templates/admin.html:119
+#: cps/templates/admin.html:121
 msgid "Version"
 msgstr "Версия"
 
-#: cps/templates/admin.html:120
+#: cps/templates/admin.html:122
 msgid "Details"
 msgstr "Подробности"
 
-#: cps/templates/admin.html:126
+#: cps/templates/admin.html:128
 msgid "Current version"
 msgstr "Текущая версия"
 
-#: cps/templates/admin.html:132
+#: cps/templates/admin.html:134
 msgid "Check for update"
 msgstr "Проверка обновлений"
 
-#: cps/templates/admin.html:133
+#: cps/templates/admin.html:135
 msgid "Perform Update"
 msgstr "Установить обновления"
 
-#: cps/templates/admin.html:145
+#: cps/templates/admin.html:147
 msgid "Do you really want to restart Calibre-Web?"
 msgstr "Вы действительно хотите перезагрузить Calibre-Web?"
 
-#: cps/templates/admin.html:150 cps/templates/admin.html:164
-#: cps/templates/admin.html:184 cps/templates/shelf.html:73
+#: cps/templates/admin.html:152 cps/templates/admin.html:166
+#: cps/templates/admin.html:186 cps/templates/shelf.html:72
 msgid "Ok"
 msgstr "Ok"
 
-#: cps/templates/admin.html:151 cps/templates/admin.html:165
-#: cps/templates/book_edit.html:178 cps/templates/book_edit.html:200
-#: cps/templates/config_edit.html:226 cps/templates/config_view_edit.html:179
-#: cps/templates/email_edit.html:40 cps/templates/email_edit.html:75
-#: cps/templates/layout.html:28 cps/templates/shelf.html:74
+#: cps/templates/admin.html:153 cps/templates/admin.html:167
+#: cps/templates/book_edit.html:174 cps/templates/book_edit.html:196
+#: cps/templates/config_edit.html:281 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/user_edit.html:149
+#: cps/templates/user_edit.html:132
 msgid "Back"
 msgstr "Назад"
 
-#: cps/templates/admin.html:163
+#: cps/templates/admin.html:165
 msgid "Do you really want to stop Calibre-Web?"
 msgstr "Вы действительно хотите остановить Calibre-Web?"
 
-#: cps/templates/admin.html:175
+#: cps/templates/admin.html:177
 msgid "Updating, please do not reload page"
 msgstr "Установка обновлений, пожалуйста, не обновляйте страницу."
 
@@ -932,176 +1126,176 @@ msgstr "с помощью"
 msgid "In Library"
 msgstr "В библиотеке"
 
-#: cps/templates/author.html:50 cps/templates/author.html:97
-#: cps/templates/discover.html:28 cps/templates/index.html:31
-#: cps/templates/index.html:86 cps/templates/search.html:55
-#: cps/templates/shelf.html:37
+#: cps/templates/author.html:34 cps/templates/list.html:14
+#: cps/templates/search.html:41
+msgid "All"
+msgstr ""
+
+#: cps/templates/author.html:58 cps/templates/author.html:105
+#: 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 ""
 
-#: cps/templates/author.html:81
+#: cps/templates/author.html:89
 msgid "More by"
 msgstr "Ещё от"
 
-#: cps/templates/book_edit.html:16
+#: cps/templates/book_edit.html:12
 msgid "Delete Book"
 msgstr "Удалить книгу"
 
-#: cps/templates/book_edit.html:19
+#: cps/templates/book_edit.html:15
 msgid "Delete formats:"
 msgstr "Удалить форматы:"
 
-#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:199
-#: cps/templates/email_edit.html:73 cps/templates/email_edit.html:74
+#: cps/templates/book_edit.html:18 cps/templates/book_edit.html:195
+#: cps/templates/email_edit.html:73
 msgid "Delete"
 msgstr "Удалить"
 
-#: cps/templates/book_edit.html:30
+#: cps/templates/book_edit.html:26
 msgid "Convert book format:"
 msgstr "Конвертировать формат книги:"
 
-#: cps/templates/book_edit.html:34
+#: cps/templates/book_edit.html:30
 msgid "Convert from:"
 msgstr "Конвертировать из:"
 
-#: cps/templates/book_edit.html:36 cps/templates/book_edit.html:43
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
 msgstr "выбрать вариант"
 
-#: cps/templates/book_edit.html:41
+#: cps/templates/book_edit.html:37
 msgid "Convert to:"
 msgstr "Конвертировать в:"
 
-#: cps/templates/book_edit.html:50
+#: cps/templates/book_edit.html:46
 msgid "Convert book"
 msgstr "Конвертировать книгу"
 
-#: cps/templates/book_edit.html:59 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:55 cps/templates/search_form.html:6
 msgid "Book Title"
 msgstr "Название"
 
-#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:259
-#: cps/templates/book_edit.html:277 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:59 cps/templates/book_edit.html:255
+#: cps/templates/book_edit.html:273 cps/templates/search_form.html:10
 msgid "Author"
 msgstr "Автор"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:264
-#: cps/templates/book_edit.html:279 cps/templates/search_form.html:106
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:260
+#: cps/templates/book_edit.html:275 cps/templates/search_form.html:106
 msgid "Description"
 msgstr "Описание"
 
-#: cps/templates/book_edit.html:71 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:67 cps/templates/search_form.html:33
 msgid "Tags"
 msgstr "Теги"
 
-#: cps/templates/book_edit.html:75 cps/templates/layout.html:159
-#: cps/templates/search_form.html:53
-msgid "Series"
-msgstr "Серии"
-
-#: cps/templates/book_edit.html:79
+#: cps/templates/book_edit.html:75
 msgid "Series id"
 msgstr "Серия"
 
-#: cps/templates/book_edit.html:83
+#: cps/templates/book_edit.html:79
 msgid "Rating"
 msgstr "Рейтинг"
 
-#: cps/templates/book_edit.html:87
+#: cps/templates/book_edit.html:83
 msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
 msgstr "URL обложки(jpg, обложка загружается и сохраняется в базе данных, после этого поле снова пустое)"
 
-#: cps/templates/book_edit.html:91
+#: cps/templates/book_edit.html:87
 msgid "Upload Cover from local drive"
 msgstr "Загрузить обложку с диска"
 
-#: cps/templates/book_edit.html:96 cps/templates/detail.html:148
+#: cps/templates/book_edit.html:92 cps/templates/detail.html:168
 msgid "Publishing date"
 msgstr "Опубликовано"
 
-#: cps/templates/book_edit.html:103 cps/templates/book_edit.html:261
-#: cps/templates/book_edit.html:278 cps/templates/detail.html:139
+#: cps/templates/book_edit.html:99 cps/templates/book_edit.html:257
+#: cps/templates/book_edit.html:274 cps/templates/detail.html:159
 #: cps/templates/search_form.html:14
 msgid "Publisher"
 msgstr "Издатель"
 
-#: cps/templates/book_edit.html:107 cps/templates/user_edit.html:31
+#: cps/templates/book_edit.html:103 cps/templates/user_edit.html:31
 msgid "Language"
 msgstr "Язык"
 
-#: cps/templates/book_edit.html:117 cps/templates/search_form.html:117
+#: cps/templates/book_edit.html:113 cps/templates/search_form.html:117
 msgid "Yes"
 msgstr "Да"
 
-#: cps/templates/book_edit.html:118 cps/templates/search_form.html:118
+#: cps/templates/book_edit.html:114 cps/templates/search_form.html:118
 msgid "No"
 msgstr "Нет"
 
-#: cps/templates/book_edit.html:164
+#: cps/templates/book_edit.html:160
 msgid "Upload format"
 msgstr "Загружаемый формат"
 
-#: cps/templates/book_edit.html:173
+#: cps/templates/book_edit.html:169
 msgid "view book after edit"
 msgstr "смотреть книгу после редактирования"
 
-#: cps/templates/book_edit.html:176 cps/templates/book_edit.html:212
+#: cps/templates/book_edit.html:172 cps/templates/book_edit.html:208
 msgid "Get metadata"
 msgstr "Получить метаданные"
 
-#: cps/templates/book_edit.html:177 cps/templates/config_edit.html:224
-#: cps/templates/config_view_edit.html:178 cps/templates/login.html:20
+#: cps/templates/book_edit.html:173 cps/templates/config_edit.html:279
+#: cps/templates/config_view_edit.html:146 cps/templates/login.html:20
 #: cps/templates/search_form.html:150 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:147
+#: cps/templates/user_edit.html:130
 msgid "Submit"
 msgstr "Отправить"
 
-#: cps/templates/book_edit.html:191
+#: cps/templates/book_edit.html:187
 msgid "Are you really sure?"
 msgstr "Вы действительно уверены?"
 
-#: cps/templates/book_edit.html:194
+#: cps/templates/book_edit.html:190
 msgid "Book will be deleted from Calibre database"
 msgstr "Книга будет удалена из БД Calibre"
 
-#: cps/templates/book_edit.html:195
+#: cps/templates/book_edit.html:191
 msgid "and from hard disk"
 msgstr "и с диска"
 
-#: cps/templates/book_edit.html:215
+#: cps/templates/book_edit.html:211
 msgid "Keyword"
 msgstr "Ключевое слово"
 
-#: cps/templates/book_edit.html:216
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr " Поиск по ключевому слову "
 
-#: cps/templates/book_edit.html:218 cps/templates/layout.html:47
+#: cps/templates/book_edit.html:214 cps/templates/layout.html:47
 msgid "Go!"
 msgstr "Старт!"
 
-#: cps/templates/book_edit.html:222
+#: cps/templates/book_edit.html:218
 msgid "Click the cover to load metadata to the form"
 msgstr "Нажмите на обложку, чтобы получить метаданные"
 
-#: cps/templates/book_edit.html:234 cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:230 cps/templates/book_edit.html:270
 msgid "Loading..."
 msgstr "Загрузка..."
 
-#: cps/templates/book_edit.html:239 cps/templates/layout.html:226
-#: cps/templates/layout.html:258
+#: cps/templates/book_edit.html:235 cps/templates/layout.html:187
+#: cps/templates/layout.html:219
 msgid "Close"
 msgstr "Закрыть"
 
-#: cps/templates/book_edit.html:266 cps/templates/book_edit.html:280
+#: cps/templates/book_edit.html:262 cps/templates/book_edit.html:276
 msgid "Source"
 msgstr "Источник"
 
-#: cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:271
 msgid "Search error!"
 msgstr "Ошибка поиска!"
 
-#: cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:272
 msgid "No Result(s) found! Please try aonther keyword."
 msgstr "Результат(ы) не найдены! Попробуйте другое ключевое слово."
 
@@ -1229,35 +1423,87 @@ msgstr "Ключ API Goodreads"
 msgid "Goodreads API Secret"
 msgstr "Goodreads API Секрет"
 
-#: cps/templates/config_edit.html:187
+#: cps/templates/config_edit.html:181
+msgid "Login type"
+msgstr ""
+
+#: cps/templates/config_edit.html:183
+msgid "Use standard Authentication"
+msgstr ""
+
+#: cps/templates/config_edit.html:185
+msgid "Use LDAP Authentication"
+msgstr ""
+
+#: cps/templates/config_edit.html:188
+msgid "Use GitHub OAuth"
+msgstr ""
+
+#: cps/templates/config_edit.html:189
+msgid "Use Google OAuth"
+msgstr ""
+
+#: cps/templates/config_edit.html:196
+msgid "LDAP Provider URL"
+msgstr ""
+
+#: cps/templates/config_edit.html:200
+msgid "LDAP Distinguished Name (DN)"
+msgstr ""
+
+#: cps/templates/config_edit.html:208
+msgid "Obtain GitHub OAuth Credential"
+msgstr ""
+
+#: cps/templates/config_edit.html:211
+msgid "GitHub OAuth Client Id"
+msgstr ""
+
+#: cps/templates/config_edit.html:215
+msgid "GitHub OAuth Client Secret"
+msgstr ""
+
+#: cps/templates/config_edit.html:221
+msgid "Obtain Google OAuth Credential"
+msgstr ""
+
+#: cps/templates/config_edit.html:224
+msgid "Google OAuth Client Id"
+msgstr ""
+
+#: cps/templates/config_edit.html:228
+msgid "Google OAuth Client Secret"
+msgstr ""
+
+#: cps/templates/config_edit.html:242
 msgid "External binaries"
 msgstr "Внешние двоичные файлы"
 
-#: cps/templates/config_edit.html:195
+#: cps/templates/config_edit.html:250
 msgid "No converter"
 msgstr "Нет конвертера"
 
-#: cps/templates/config_edit.html:197
+#: cps/templates/config_edit.html:252
 msgid "Use Kindlegen"
 msgstr "Использовать Kindlegen"
 
-#: cps/templates/config_edit.html:199
+#: cps/templates/config_edit.html:254
 msgid "Use calibre's ebook converter"
 msgstr "Использовать конвертер calibre's ebook"
 
-#: cps/templates/config_edit.html:203
+#: cps/templates/config_edit.html:258
 msgid "E-Book converter settings"
 msgstr "Настройки конвертера E-Book"
 
-#: cps/templates/config_edit.html:207
+#: cps/templates/config_edit.html:262
 msgid "Path to convertertool"
 msgstr "Путь к конвертеру"
 
-#: cps/templates/config_edit.html:213
+#: cps/templates/config_edit.html:268
 msgid "Location of Unrar binary"
 msgstr "Расположение двоичного файла Unrar"
 
-#: cps/templates/config_edit.html:229 cps/templates/layout.html:84
+#: cps/templates/config_edit.html:284 cps/templates/layout.html:84
 #: cps/templates/login.html:4
 msgid "Login"
 msgstr "Логин"
@@ -1266,8 +1512,7 @@ msgstr "Логин"
 msgid "View Configuration"
 msgstr "Просмотреть Конфигурацию"
 
-#: cps/templates/config_view_edit.html:19 cps/templates/layout.html:135
-#: cps/templates/layout.html:136 cps/templates/shelf_edit.html:7
+#: cps/templates/config_view_edit.html:19 cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr "Заголовок"
 
@@ -1279,7 +1524,7 @@ msgstr "Количество отображаемых случайных кни
 msgid "No. of authors to show before hiding (0=disable hiding)"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:118
+#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:112
 msgid "Theme"
 msgstr "Тема"
 
@@ -1311,127 +1556,91 @@ msgstr "Теги для Зрелого Контента"
 msgid "Default settings for new users"
 msgstr "Настройки по умолчанию для новых пользователей"
 
-#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:104
+#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:83
 msgid "Admin user"
 msgstr "Управление сервером"
 
-#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:113
+#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:92
 msgid "Allow Downloads"
 msgstr "Разрешить скачивание с сервера"
 
-#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:117
+#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:96
+msgid "Allow book viewer"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:100
 msgid "Allow Uploads"
 msgstr "Разрешить загрузку на сервер"
 
-#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:121
+#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:104
 msgid "Allow Edit"
 msgstr "Разрешить редактирование книг"
 
-#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:125
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:108
 msgid "Allow Delete books"
 msgstr "Разрешить удаление книг"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:130
+#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:113
 msgid "Allow Changing Password"
 msgstr "Разрешить смену пароля"
 
-#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:134
+#: cps/templates/config_view_edit.html:109 cps/templates/user_edit.html:117
 msgid "Allow Editing Public Shelfs"
 msgstr "Разрешить редактирование публичных книжных полок"
 
-#: cps/templates/config_view_edit.html:115
+#: cps/templates/config_view_edit.html:119
 msgid "Default visibilities for new users"
 msgstr "Видимость для новых пользователей(по умолчанию)"
 
-#: cps/templates/config_view_edit.html:123 cps/templates/user_edit.html:50
-msgid "Show random books"
-msgstr "Показывать случайные книги"
-
-#: cps/templates/config_view_edit.html:127 cps/templates/user_edit.html:54
-msgid "Show recent books"
-msgstr "Показывать недавние книги"
-
-#: cps/templates/config_view_edit.html:131 cps/templates/user_edit.html:58
-msgid "Show sorted books"
-msgstr "Показывать отсортированные книги"
-
-#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:62
-msgid "Show hot books"
-msgstr "Показывать популярные книги"
-
-#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:66
-msgid "Show best rated books"
-msgstr "Показывать книги с наивысшим рейтингом"
-
-#: cps/templates/config_view_edit.html:143 cps/templates/user_edit.html:70
-msgid "Show language selection"
-msgstr "Показывать выбор языка"
-
-#: cps/templates/config_view_edit.html:147 cps/templates/user_edit.html:74
-msgid "Show series selection"
-msgstr "Показывать выбор серии"
-
-#: cps/templates/config_view_edit.html:151 cps/templates/user_edit.html:78
-msgid "Show category selection"
-msgstr "Показывать выбор категории"
-
-#: cps/templates/config_view_edit.html:155 cps/templates/user_edit.html:82
-msgid "Show author selection"
-msgstr "Показывать выбор автора"
-
-#: cps/templates/config_view_edit.html:159 cps/templates/user_edit.html:86
-msgid "Show publisher selection"
-msgstr "Показать выбор издателя"
-
-#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:91
-msgid "Show read and unread"
-msgstr "Показывать прочитанные и непрочитанные"
-
-#: cps/templates/config_view_edit.html:167 cps/templates/user_edit.html:96
+#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:75
 msgid "Show random books in detail view"
 msgstr "Показывать случайные книги при просмотре деталей"
 
-#: cps/templates/config_view_edit.html:171 cps/templates/user_edit.html:109
+#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:88
 msgid "Show mature content"
 msgstr "Показывать взрослый контент"
 
-#: cps/templates/detail.html:63
+#: cps/templates/detail.html:59
 msgid "Read in browser"
 msgstr "Открыть в браузере"
 
-#: cps/templates/detail.html:100
+#: cps/templates/detail.html:73
+msgid "Listen in browser"
+msgstr ""
+
+#: cps/templates/detail.html:120
 msgid "Book"
 msgstr "Книга"
 
-#: cps/templates/detail.html:100
+#: cps/templates/detail.html:120
 msgid "of"
 msgstr "из"
 
-#: cps/templates/detail.html:106
+#: cps/templates/detail.html:126
 msgid "language"
 msgstr "Язык"
 
-#: cps/templates/detail.html:185
+#: cps/templates/detail.html:203
 msgid "Mark As Unread"
 msgstr ""
 
-#: cps/templates/detail.html:185
+#: cps/templates/detail.html:203
 msgid "Mark As Read"
 msgstr ""
 
-#: cps/templates/detail.html:186
+#: cps/templates/detail.html:204
 msgid "Read"
 msgstr "Прочитано"
 
-#: cps/templates/detail.html:196
+#: cps/templates/detail.html:214 cps/templates/listenmp3.html:54
 msgid "Description:"
 msgstr "Описание:"
 
-#: cps/templates/detail.html:209 cps/templates/search.html:14
+#: cps/templates/detail.html:227 cps/templates/search.html:14
 msgid "Add to shelf"
 msgstr "Добавить на книжную полку"
 
-#: cps/templates/detail.html:271
+#: cps/templates/detail.html:289
 msgid "Edit metadata"
 msgstr "Редактировать метаданные"
 
@@ -1491,12 +1700,12 @@ msgstr "Добавить"
 msgid "Do you really want to delete this domain rule?"
 msgstr "Вы действительно желаете удалить это правило домена?"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:210
+#: cps/templates/feed.xml:21 cps/templates/layout.html:171
 msgid "Next"
 msgstr "Дальше"
 
-#: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:44 cps/templates/layout.html:45
+#: cps/templates/feed.xml:33 cps/templates/layout.html:44
+#: cps/templates/layout.html:45
 msgid "Search"
 msgstr "Поиск"
 
@@ -1508,75 +1717,63 @@ msgstr ""
 msgid "Discover (Random Books)"
 msgstr "Обзор (Случайные Книги)"
 
+#: cps/templates/index.html:65
+msgid "Group by series"
+msgstr ""
+
 #: cps/templates/index.xml:6
 msgid "Start"
 msgstr "Старт"
 
-#: cps/templates/index.xml:18 cps/templates/layout.html:141
-msgid "Hot Books"
-msgstr "Популярные Книги"
-
-#: cps/templates/index.xml:22
+#: cps/templates/index.xml:21
 msgid "Popular publications from this catalog based on Downloads."
 msgstr "Популярные книги в этом каталоге, на основе количества Скачиваний"
 
-#: cps/templates/index.xml:25 cps/templates/layout.html:144
-msgid "Best rated Books"
-msgstr "Книги с наилучшим рейтингом"
-
-#: cps/templates/index.xml:29
+#: cps/templates/index.xml:28
 msgid "Popular publications from this catalog based on Rating."
 msgstr "Популярные книги из этого каталога на основании Рейтинга"
 
-#: cps/templates/index.xml:32
+#: cps/templates/index.xml:31
 msgid "New Books"
 msgstr "Новые Книги"
 
-#: cps/templates/index.xml:36
+#: cps/templates/index.xml:35
 msgid "The latest Books"
 msgstr "Последние Книги"
 
-#: cps/templates/index.xml:43
+#: cps/templates/index.xml:42
 msgid "Show Random Books"
 msgstr "Показывать Случайные Сниги"
 
-#: cps/templates/index.xml:62 cps/templates/layout.html:162
-msgid "Authors"
-msgstr "Авторы"
-
-#: cps/templates/index.xml:66
+#: cps/templates/index.xml:65
 msgid "Books ordered by Author"
 msgstr "Книги, отсортированные по Автору"
 
-#: cps/templates/index.xml:69 cps/templates/layout.html:165
-msgid "Publishers"
-msgstr "Издатели"
-
-#: cps/templates/index.xml:73
+#: cps/templates/index.xml:72
 msgid "Books ordered by publisher"
 msgstr "Книги, отсортированные по издателю"
 
-#: cps/templates/index.xml:80
+#: cps/templates/index.xml:79
 msgid "Books ordered by category"
 msgstr "Книги, отсортированные по категории"
 
-#: cps/templates/index.xml:87
+#: cps/templates/index.xml:86
 msgid "Books ordered by series"
 msgstr "Книги, отсортированные по серии"
 
-#: cps/templates/index.xml:90 cps/templates/layout.html:171
+#: cps/templates/index.xml:89 cps/templates/layout.html:132
 msgid "Public Shelves"
 msgstr "Общие полки"
 
-#: cps/templates/index.xml:94
+#: cps/templates/index.xml:93
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr "Книги размещены на полках, и доступны всем"
 
-#: cps/templates/index.xml:98 cps/templates/layout.html:175
+#: cps/templates/index.xml:97 cps/templates/layout.html:136
 msgid "Your Shelves"
 msgstr "Ваши полки"
 
-#: cps/templates/index.xml:102
+#: cps/templates/index.xml:101
 msgid "User's own shelfs, only visible to the current user himself"
 msgstr "Пользовательские полки, видимые только самому пользователю"
 
@@ -1593,7 +1790,7 @@ msgid "Advanced Search"
 msgstr "Расширенный поиск"
 
 #: cps/templates/layout.html:76 cps/templates/read.html:71
-#: cps/templates/readcbr.html:89 cps/templates/readcbr.html:113
+#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
 msgid "Settings"
 msgstr "Настройки"
 
@@ -1609,7 +1806,7 @@ msgstr "Выход"
 msgid "Register"
 msgstr "Зарегистрироваться"
 
-#: cps/templates/layout.html:111 cps/templates/layout.html:257
+#: cps/templates/layout.html:111 cps/templates/layout.html:218
 msgid "Uploading..."
 msgstr "Загружается..."
 
@@ -1621,68 +1818,27 @@ msgstr "пожалуйста не обновляйте страницу"
 msgid "Browse"
 msgstr "Просмотр"
 
-#: cps/templates/layout.html:124
-msgid "Recently Added"
-msgstr "Недавно Добавленные"
-
-#: cps/templates/layout.html:129
-msgid "Sorted Books"
-msgstr "Сортировка Книг"
-
-#: cps/templates/layout.html:133 cps/templates/layout.html:134
-#: cps/templates/layout.html:135 cps/templates/layout.html:136
-msgid "Sort By"
-msgstr "Отсортировано по"
-
-#: cps/templates/layout.html:133
-msgid "Newest"
-msgstr "Новинки"
-
-#: cps/templates/layout.html:134
-msgid "Oldest"
-msgstr "Старое"
-
-#: cps/templates/layout.html:135
-msgid "Ascending"
-msgstr "По возрастанию"
-
-#: cps/templates/layout.html:136
-msgid "Descending"
-msgstr "По убыванию"
-
-#: cps/templates/layout.html:153
-msgid "Discover"
-msgstr "Обзор"
-
-#: cps/templates/layout.html:156
-msgid "Categories"
-msgstr "Категории"
-
-#: cps/templates/layout.html:168 cps/templates/search_form.html:74
-msgid "Languages"
-msgstr "Языки"
-
-#: cps/templates/layout.html:180
+#: cps/templates/layout.html:141
 msgid "Create a Shelf"
 msgstr "Создать книжную полку"
 
-#: cps/templates/layout.html:181 cps/templates/stats.html:3
+#: cps/templates/layout.html:142 cps/templates/stats.html:3
 msgid "About"
 msgstr "О программе"
 
-#: cps/templates/layout.html:195
+#: cps/templates/layout.html:156
 msgid "Previous"
 msgstr "Предыдущий"
 
-#: cps/templates/layout.html:222
+#: cps/templates/layout.html:183
 msgid "Book Details"
 msgstr "Подробнее о книге"
 
-#: cps/templates/layout.html:256
+#: cps/templates/layout.html:217
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:259
+#: cps/templates/layout.html:220
 msgid "Error"
 msgstr ""
 
@@ -1712,105 +1868,105 @@ msgstr "Каталог электронных книг Caliber-Web"
 msgid "Reflow text when sidebars are open."
 msgstr "Обновить размещение текста при открытии боковой панели"
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:88
 msgid "Keyboard Shortcuts"
 msgstr "Горячие клавиши"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:91
 msgid "Previous Page"
 msgstr "Предыдущая страница"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:92
 msgid "Next Page"
 msgstr "Следующая страница"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:93
 msgid "Scale to Best"
 msgstr "Масштабировать до лучшего"
 
-#: cps/templates/readcbr.html:100
+#: cps/templates/readcbr.html:94
 msgid "Scale to Width"
 msgstr "Масштабироваать по ширине"
 
-#: cps/templates/readcbr.html:101
+#: cps/templates/readcbr.html:95
 msgid "Scale to Height"
 msgstr "Масштабировать по высоте"
 
-#: cps/templates/readcbr.html:102
+#: cps/templates/readcbr.html:96
 msgid "Scale to Native"
 msgstr "Масштабировать до оригинала"
 
-#: cps/templates/readcbr.html:103
+#: cps/templates/readcbr.html:97
 msgid "Rotate Right"
 msgstr "Повернуть Вправо"
 
-#: cps/templates/readcbr.html:104
+#: cps/templates/readcbr.html:98
 msgid "Rotate Left"
 msgstr "Повернуть Влево"
 
-#: cps/templates/readcbr.html:105
+#: cps/templates/readcbr.html:99
 msgid "Flip Image"
 msgstr "Перевернуть изображение"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:115
 msgid "Light"
 msgstr "Светлая"
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:116
 msgid "Dark"
 msgstr "Темная"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:121
 msgid "Scale"
 msgstr "Масштаб"
 
-#: cps/templates/readcbr.html:130
+#: cps/templates/readcbr.html:124
 msgid "Best"
 msgstr "Лучшее"
 
-#: cps/templates/readcbr.html:131
+#: cps/templates/readcbr.html:125
 msgid "Width"
 msgstr "Ширина"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:126
 msgid "Height"
 msgstr "Длина"
 
-#: cps/templates/readcbr.html:133
+#: cps/templates/readcbr.html:127
 msgid "Native"
 msgstr "Оригинальный"
 
-#: cps/templates/readcbr.html:138
+#: cps/templates/readcbr.html:132
 msgid "Rotate"
 msgstr "Повернуть"
 
-#: cps/templates/readcbr.html:149
+#: cps/templates/readcbr.html:143
 msgid "Flip"
 msgstr "Перевернуть"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:146
 msgid "Horizontal"
 msgstr "Горизонтально"
 
-#: cps/templates/readcbr.html:153
+#: cps/templates/readcbr.html:147
 msgid "Vertical"
 msgstr "Вертикально"
 
-#: cps/templates/readcbr.html:158
+#: cps/templates/readcbr.html:152
 msgid "Direction"
 msgstr ""
 
-#: cps/templates/readcbr.html:161
+#: cps/templates/readcbr.html:155
 msgid "Left to Right"
 msgstr ""
 
-#: cps/templates/readcbr.html:162
+#: cps/templates/readcbr.html:156
 msgid "Right to Left"
 msgstr ""
 
 #: cps/templates/readpdf.html:29
-msgid "PDF.js viewer"
-msgstr "Просмотровщик PDF.js"
+msgid "PDF reader"
+msgstr ""
 
 #: cps/templates/readtxt.html:6
 msgid "Basic txt Reader"
@@ -1884,23 +2040,23 @@ msgstr "Рейтинг больше чем"
 msgid "Rating less than"
 msgstr "Рейтинг меньше чем"
 
-#: cps/templates/shelf.html:7
+#: cps/templates/shelf.html:10
 msgid "Delete this Shelf"
 msgstr "Удалить эту книжную полку"
 
-#: cps/templates/shelf.html:8
+#: cps/templates/shelf.html:11
 msgid "Edit Shelf"
 msgstr "Изменить Полку"
 
-#: cps/templates/shelf.html:9 cps/templates/shelf_order.html:11
+#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:11
 msgid "Change order"
 msgstr "Изменить порядок"
 
-#: cps/templates/shelf.html:68
+#: cps/templates/shelf.html:67
 msgid "Do you really want to delete the shelf?"
 msgstr "Вы действительно хотите удалить эту книжную полку?"
 
-#: cps/templates/shelf.html:71
+#: cps/templates/shelf.html:70
 msgid "Shelf will be lost for everybody and forever!"
 msgstr "Книжная полка будет безвозвратно удалена для всех"
 
@@ -1988,19 +2144,31 @@ msgstr "Сбросить пароль пользователя"
 msgid "Kindle E-Mail"
 msgstr "Адрес почты Kindle"
 
-#: cps/templates/user_edit.html:39
+#: cps/templates/user_edit.html:40
 msgid "Show books with language"
 msgstr "Показать книги на языках"
 
-#: cps/templates/user_edit.html:41
+#: cps/templates/user_edit.html:42
 msgid "Show all"
 msgstr "Показать все"
 
-#: cps/templates/user_edit.html:141
+#: cps/templates/user_edit.html:52
+msgid "OAuth Settings"
+msgstr ""
+
+#: cps/templates/user_edit.html:54
+msgid "Link"
+msgstr ""
+
+#: cps/templates/user_edit.html:56
+msgid "Unlink"
+msgstr ""
+
+#: cps/templates/user_edit.html:124
 msgid "Delete this user"
 msgstr "Удалить этого пользователя"
 
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:139
 msgid "Recent Downloads"
 msgstr "Недавние скачивания"
 
@@ -3282,3 +3450,45 @@ msgstr "Недавние скачивания"
 #~ msgid "Using your another device, login and visit "
 #~ msgstr ""
 
+#~ msgid "Newest Books"
+#~ msgstr "Новые Книги"
+
+#~ msgid "Oldest Books"
+#~ msgstr "Старые Книги"
+
+#~ msgid "Books (A-Z)"
+#~ msgstr "Книги (А-Я)"
+
+#~ msgid "Books (Z-A)"
+#~ msgstr "Книги (Я-А)"
+
+#~ msgid "Error opening eBook. Fileformat is not supported."
+#~ msgstr ""
+
+#~ msgid "File %(title)s"
+#~ msgstr ""
+
+#~ msgid "Show sorted books"
+#~ msgstr "Показывать отсортированные книги"
+
+#~ msgid "Sorted Books"
+#~ msgstr "Сортировка Книг"
+
+#~ msgid "Sort By"
+#~ msgstr "Отсортировано по"
+
+#~ msgid "Newest"
+#~ msgstr "Новинки"
+
+#~ msgid "Oldest"
+#~ msgstr "Старое"
+
+#~ msgid "Ascending"
+#~ msgstr "По возрастанию"
+
+#~ msgid "Descending"
+#~ msgstr "По убыванию"
+
+#~ msgid "PDF.js viewer"
+#~ msgstr "Просмотровщик PDF.js"
+
diff --git a/cps/translations/sv/LC_MESSAGES/messages.mo b/cps/translations/sv/LC_MESSAGES/messages.mo
index 429b0e9e..68378090 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 3c453ba5..7d190a51 100644
--- a/cps/translations/sv/LC_MESSAGES/messages.po
+++ b/cps/translations/sv/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2019-05-30 09:06+0200\n"
+"POT-Creation-Date: 2019-05-31 11:20+0200\n"
 "PO-Revision-Date: 2018-11-23 02:57+0100\n"
 "Last-Translator: Jonatan Nyberg <jonatan.nyberg.karl@gmail.com>\n"
 "Language: sv\n"
@@ -18,740 +18,929 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.6.0\n"
 
-#: cps/book_formats.py:199 cps/book_formats.py:200 cps/book_formats.py:204
-#: cps/book_formats.py:208 cps/book_formats.py:212 cps/converter.py:29
-#: cps/converter.py:45
-msgid "not installed"
-msgstr "inte installerad"
-
-#: cps/converter.py:40 cps/converter.py:56
-msgid "Excecution permissions missing"
-msgstr "Utförande behörighet saknas"
-
-#: cps/converter.py:66
-msgid "not configured"
-msgstr "inte konfigurerad"
-
-#: cps/helper.py:79
-#, python-format
-msgid "%(format)s format not found for book id: %(book)d"
-msgstr "%(format)s formatet hittades inte för bok-id: %(book)d"
-
-#: cps/helper.py:91
-#, python-format
-msgid "%(format)s not found on Google Drive: %(fn)s"
-msgstr "%(format)s hittades inte på Google Drive: %(fn)s"
-
-#: cps/helper.py:98 cps/helper.py:204 cps/templates/detail.html:45
-#: cps/templates/detail.html:49
-msgid "Send to Kindle"
-msgstr "Skicka till Kindle"
-
-#: cps/helper.py:99 cps/helper.py:117 cps/helper.py:206
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "Detta e-postmeddelande har skickats via Calibre-Web."
-
-#: cps/helper.py:110
-#, python-format
-msgid "%(format)s not found: %(fn)s"
-msgstr "%(format)s hittades inte: %(fn)s"
-
-#: cps/helper.py:115
-msgid "Calibre-Web test e-mail"
-msgstr "Calibre-Web test e-post"
-
-#: cps/helper.py:116
-msgid "Test e-mail"
-msgstr "Test e-post"
-
-#: cps/helper.py:132
-msgid "Get Started with Calibre-Web"
-msgstr "Kom igång med Calibre-Web"
-
-#: cps/helper.py:133
-#, python-format
-msgid "Registration e-mail for user: %(name)s"
-msgstr "Registrera e-post för användare: %(name)s"
-
-#: cps/helper.py:146 cps/helper.py:148 cps/helper.py:150 cps/helper.py:158
-#: cps/helper.py:160 cps/helper.py:162
-#, python-format
-msgid "Send %(format)s to Kindle"
-msgstr ""
-
-#: cps/helper.py:166
-#, python-format
-msgid "Convert %(orig)s to %(format)s and send to Kindle"
-msgstr ""
-
-#: cps/helper.py:205
-#, python-format
-msgid "E-mail: %(book)s"
-msgstr "E-post: %(book)s"
-
-#: cps/helper.py:208
-msgid "The requested file could not be read. Maybe wrong permissions?"
-msgstr "Den begärda filen kunde inte läsas. Kanske fel behörigheter?"
-
-#: cps/helper.py:316
-#, python-format
-msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "Byt namn på titel från: \"%(src)s\" till \"%(dest)s\" misslyckades med fel: %(error)s"
-
-#: cps/helper.py:326
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "Byt namn på författare från: \"%(src)s\" till \"%(dest)s\" misslyckades med fel: %(error)s"
-
-#: cps/helper.py:340
-#, python-format
-msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr ""
-
-#: cps/helper.py:366 cps/helper.py:376 cps/helper.py:384
-#, python-format
-msgid "File %(file)s not found on Google Drive"
-msgstr "Filen %(file)s hittades inte på Google Drive"
-
-#: cps/helper.py:405
-#, python-format
-msgid "Book path %(path)s not found on Google Drive"
-msgstr "Boksökvägen %(path)s hittades inte på Google Drive"
-
-#: cps/helper.py:556
-msgid "Error excecuting UnRar"
-msgstr "Fel vid körning av UnRar"
-
-#: cps/helper.py:558
-msgid "Unrar binary file not found"
-msgstr "Unrar binärfil hittades inte"
-
-#: cps/helper.py:585
-msgid "Waiting"
-msgstr "Väntar"
-
-#: cps/helper.py:587
-msgid "Failed"
-msgstr "Misslyckades"
-
-#: cps/helper.py:589
-msgid "Started"
-msgstr "Startad"
-
-#: cps/helper.py:591
-msgid "Finished"
-msgstr "Klar"
-
-#: cps/helper.py:593
-msgid "Unknown Status"
-msgstr "Okänd status"
-
-#: cps/helper.py:598
-msgid "E-mail: "
-msgstr "E-post: "
-
-#: cps/helper.py:600 cps/helper.py:604
-msgid "Convert: "
-msgstr "Konvertera: "
-
-#: cps/helper.py:602
-msgid "Upload: "
-msgstr "Överför: "
-
-#: cps/helper.py:606
-msgid "Unknown Task: "
-msgstr "Okänd uppgift: "
-
-#: cps/updater.py:251 cps/updater.py:410 cps/updater.py:423
-msgid "Unexpected data while reading update information"
-msgstr "Oväntade data vid läsning av uppdateringsinformation"
-
-#: cps/updater.py:258 cps/updater.py:416
-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:270 cps/updater.py:501 cps/updater.py:503 cps/web.py:1206
-msgid "HTTP Error"
-msgstr "HTTP-fel"
-
-#: cps/updater.py:272 cps/updater.py:505 cps/web.py:1207
-msgid "Connection error"
-msgstr "Anslutningsfel"
-
-#: cps/updater.py:274 cps/updater.py:507 cps/web.py:1208
-msgid "Timeout while establishing connection"
-msgstr "Tiden ute när du etablerade anslutning"
-
-#: cps/updater.py:276 cps/updater.py:509 cps/web.py:1209
-msgid "General error"
-msgstr "Allmänt fel"
-
-#: cps/updater.py:283 cps/updater.py:341 cps/updater.py:468
-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:335
-msgid "Could not fetch update information"
-msgstr "Kunde inte hämta uppdateringsinformation"
-
-#: cps/updater.py:403
-msgid "No release information available"
-msgstr ""
-
-#: cps/updater.py:449 cps/updater.py:458
-#, python-format
-msgid "A new update is available. Click on the button below to update to version: %(version)s"
-msgstr ""
-
-#: cps/updater.py:491 cps/web.py:2795
-msgid "Unknown"
-msgstr "Okänd"
-
-#: cps/web.py:1199
-msgid "Requesting update package"
-msgstr "Begär uppdateringspaketet"
-
-#: cps/web.py:1200
-msgid "Downloading update package"
-msgstr "Hämtar uppdateringspaketet"
-
-#: cps/web.py:1201
-msgid "Unzipping update package"
-msgstr "Packar upp uppdateringspaketet"
-
-#: cps/web.py:1202
-msgid "Replacing files"
-msgstr "Ersätta filer"
-
-#: cps/web.py:1203
-msgid "Database connections are closed"
-msgstr "Databasanslutningarna är stängda"
-
-#: cps/web.py:1204
-msgid "Stopping server"
-msgstr "Stoppar server"
-
-#: cps/web.py:1205
-msgid "Update finished, please press okay and reload page"
-msgstr "Uppdatering klar, tryck på okej och uppdatera sidan"
-
-#: cps/web.py:1206 cps/web.py:1207 cps/web.py:1208 cps/web.py:1209
-msgid "Update failed:"
-msgstr "Uppdateringen misslyckades:"
-
-#: cps/web.py:1235
-msgid "Recently Added Books"
-msgstr "Nyligen tillagda böcker"
-
-#: cps/web.py:1245
-msgid "Newest Books"
-msgstr "Nyaste böcker"
-
-#: cps/web.py:1257
-msgid "Oldest Books"
-msgstr "Äldsta böcker"
-
-#: cps/web.py:1269
-msgid "Books (A-Z)"
-msgstr "Böcker (A-Ö)"
-
-#: cps/web.py:1280
-msgid "Books (Z-A)"
-msgstr "Böcker (Ö-A)"
-
-#: cps/web.py:1309
-msgid "Hot Books (most downloaded)"
-msgstr "Heta böcker (mest hämtade)"
-
-#: cps/web.py:1322
-msgid "Best rated books"
-msgstr "Bäst rankade böcker"
-
-#: cps/templates/index.xml:39 cps/web.py:1335
-msgid "Random Books"
-msgstr "Slumpmässiga böcker"
-
-#: cps/web.py:1362 cps/web.py:1618 cps/web.py:2161
-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:1391
-msgid "Publisher list"
-msgstr "Lista över förlag"
-
-#: cps/web.py:1406
-#, python-format
-msgid "Publisher: %(name)s"
-msgstr "Förlag: %(name)s"
-
-#: cps/templates/index.xml:83 cps/web.py:1438
-msgid "Series list"
-msgstr "Serielista"
-
-#: cps/web.py:1452
-#, python-format
-msgid "Series: %(serie)s"
-msgstr "Serier: %(serie)s"
-
-#: cps/web.py:1478
-msgid "Available languages"
-msgstr "Tillgängliga språk"
-
-#: cps/web.py:1498
-#, python-format
-msgid "Language: %(name)s"
-msgstr "Språk: %(name)s"
-
-#: cps/templates/index.xml:76 cps/web.py:1509
-msgid "Category list"
-msgstr "Kategorilista"
-
-#: cps/web.py:1523
-#, python-format
-msgid "Category: %(name)s"
-msgstr "Kategori: %(name)s"
-
-#: cps/templates/layout.html:73 cps/web.py:1648
-msgid "Tasks"
-msgstr "Uppgifter"
-
-#: cps/web.py:1682
+#: cps/about.py:76
 msgid "Statistics"
 msgstr "Statistik"
 
-#: cps/web.py:1750
-msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
-msgstr ""
-
-#: cps/web.py:1795
-msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
-msgstr "Återuppringningsdomänen är inte verifierad, följ stegen för att verifiera domänen i Google utvecklarkonsol"
-
-#: cps/web.py:1871
+#: cps/admin.py:97
 msgid "Server restarted, please reload page"
 msgstr "Server startas om, vänligen uppdatera sidan"
 
-#: cps/web.py:1874
+#: cps/admin.py:100
 msgid "Performing shutdown of server, please close window"
 msgstr "Stänger servern, vänligen stäng fönstret"
 
-#: cps/web.py:1953
-msgid "Published after "
-msgstr "Publicerad efter "
+#: cps/admin.py:120 cps/updater.py:445
+msgid "Unknown"
+msgstr "Okänd"
 
-#: cps/web.py:1960
-msgid "Published before "
-msgstr "Publicerad före "
-
-#: cps/web.py:1974
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "Betyg <= %(rating)s"
-
-#: cps/web.py:1976
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "Betyg >= %(rating)s"
-
-#: cps/web.py:2036 cps/web.py:2045
-msgid "search"
-msgstr "sök"
-
-#: cps/templates/index.xml:47 cps/templates/index.xml:51
-#: cps/templates/layout.html:148 cps/web.py:2116
-msgid "Read Books"
-msgstr "Lästa böcker"
-
-#: cps/templates/index.xml:55 cps/templates/index.xml:59
-#: cps/templates/layout.html:150 cps/web.py:2119
-msgid "Unread Books"
-msgstr "Olästa böcker"
-
-#: cps/web.py:2171 cps/web.py:2173 cps/web.py:2175 cps/web.py:2187
-msgid "Read a Book"
-msgstr "Läs en bok"
-
-#: cps/web.py:2199
-msgid "Error opening eBook. Fileformat is not supported."
-msgstr ""
-
-#: cps/web.py:2249 cps/web.py:3170
-msgid "Please fill out all fields!"
-msgstr "Fyll i alla fält!"
-
-#: cps/web.py:2250 cps/web.py:2272 cps/web.py:2276 cps/web.py:2281
-#: cps/web.py:2283
-msgid "register"
-msgstr "registrera"
-
-#: cps/web.py:2271 cps/web.py:3389
-msgid "An unknown error occurred. Please try again later."
-msgstr "Ett okänt fel uppstod. Försök igen senare."
-
-#: cps/web.py:2274
-msgid "Your e-mail is not allowed to register"
-msgstr "Din e-post är inte tillåten att registrera"
-
-#: cps/web.py:2277
-msgid "Confirmation e-mail was send to your e-mail account."
-msgstr "Bekräftelsemail skickades till ditt e-postkonto."
-
-#: cps/web.py:2280
-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:2297 cps/web.py:2393
-#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
-msgstr "du är nu inloggad som: \"%(nickname)s\""
-
-#: cps/web.py:2302
-msgid "Wrong Username or Password"
-msgstr "Fel användarnamn eller lösenord"
-
-#: cps/web.py:2308 cps/web.py:2329
-msgid "login"
-msgstr "logga in"
-
-#: cps/web.py:2341 cps/web.py:2372
-msgid "Token not found"
-msgstr "Token hittades inte"
-
-#: cps/web.py:2349 cps/web.py:2380
-msgid "Token has expired"
-msgstr "Token har löpt ut"
-
-#: cps/web.py:2357
-msgid "Success! Please return to your device"
-msgstr "Lyckades! Vänligen återvänd till din enhet"
-
-#: cps/web.py:2407
-msgid "Please configure the SMTP mail settings first..."
-msgstr "Konfigurera SMTP-postinställningarna först..."
-
-#: cps/web.py:2412
-#, 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:2416
-#, 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:2418 cps/web.py:3223
-msgid "Please configure your kindle e-mail address first..."
-msgstr "Konfigurera din kindle-e-postadress först..."
-
-#: cps/web.py:2429 cps/web.py:2481
-msgid "Invalid shelf specified"
-msgstr "Ogiltig hylla specificerad"
-
-#: cps/web.py:2436
-#, python-format
-msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
-msgstr ""
-
-#: cps/web.py:2444
-msgid "You are not allowed to edit public shelves"
-msgstr "Du får inte redigera offentliga hyllor"
-
-#: cps/web.py:2453
-#, python-format
-msgid "Book is already part of the shelf: %(shelfname)s"
-msgstr "Boken är redan en del av hyllan: %(shelfname)s"
-
-#: cps/web.py:2467
-#, python-format
-msgid "Book has been added to shelf: %(sname)s"
-msgstr "Boken har lagts till i hyllan: %(sname)s"
-
-#: cps/web.py:2486
-#, python-format
-msgid "You are not allowed to add a book to the the shelf: %(name)s"
-msgstr "Du får inte lägga till en bok i hyllan: %(name)s"
-
-#: cps/web.py:2491
-msgid "User is not allowed to edit public shelves"
-msgstr "Användaren får inte redigera publika hyllor"
-
-#: cps/web.py:2509
-#, python-format
-msgid "Books are already part of the shelf: %(name)s"
-msgstr "Böcker är redan en del av hyllan: %(name)s"
-
-#: cps/web.py:2523
-#, python-format
-msgid "Books have been added to shelf: %(sname)s"
-msgstr "Böcker har lagts till hyllan: %(sname)s"
-
-#: cps/web.py:2525
-#, python-format
-msgid "Could not add books to shelf: %(sname)s"
-msgstr "Kunde inte lägga till böcker till hyllan: %(sname)s"
-
-#: cps/web.py:2562
-#, python-format
-msgid "Book has been removed from shelf: %(sname)s"
-msgstr "Boken har tagits bort från hyllan: %(sname)s"
-
-#: cps/web.py:2568
-#, python-format
-msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
-msgstr "Tyvärr har du inte rätt att ta bort en bok från den här hyllan: %(sname)s"
-
-#: cps/web.py:2589 cps/web.py:2613
-#, python-format
-msgid "A shelf with the name '%(title)s' already exists."
-msgstr "En hylla med namnet '%(title)s' finns redan."
-
-#: cps/web.py:2594
-#, python-format
-msgid "Shelf %(title)s created"
-msgstr "Hyllan %(title)s skapad"
-
-#: cps/web.py:2596 cps/web.py:2624
-msgid "There was an error"
-msgstr "Det fanns ett fel"
-
-#: cps/web.py:2597 cps/web.py:2599
-msgid "create a shelf"
-msgstr "skapa en hylla"
-
-#: cps/web.py:2622
-#, python-format
-msgid "Shelf %(title)s changed"
-msgstr "Hyllan %(title)s ändrad"
-
-#: cps/web.py:2625 cps/web.py:2627
-msgid "Edit a shelf"
-msgstr "Redigera en hylla"
-
-#: cps/web.py:2648
-#, python-format
-msgid "successfully deleted shelf %(name)s"
-msgstr "tog bort hyllan %(name)s"
-
-#: cps/web.py:2675
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Hylla: '%(name)s'"
-
-#: cps/web.py:2678
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "Fel vid öppning av hyllan. Hylla finns inte eller är inte tillgänglig"
-
-#: cps/web.py:2709
-#, python-format
-msgid "Change order of Shelf: '%(name)s'"
-msgstr "Ändra ordning på hyllan: '%(name)s'"
-
-#: cps/web.py:2738 cps/web.py:3176
-msgid "E-mail is not from valid domain"
-msgstr "E-posten är inte från giltig domän"
-
-#: cps/web.py:2740 cps/web.py:2782 cps/web.py:2785
-#, python-format
-msgid "%(name)s's profile"
-msgstr "%(name)ss profil"
-
-#: cps/web.py:2780
-msgid "Found an existing account for this e-mail address."
-msgstr "Hittade ett befintligt konto för den här e-postadressen."
-
-#: cps/web.py:2783
-msgid "Profile updated"
-msgstr "Profilen uppdaterad"
-
-#: cps/web.py:2814
+#: cps/admin.py:139
 msgid "Admin page"
 msgstr "Administrationssida"
 
-#: cps/web.py:2899 cps/web.py:3079
+#: cps/admin.py:208 cps/admin.py:486
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web konfiguration uppdaterad"
 
-#: cps/templates/admin.html:100 cps/web.py:2913
+#: cps/admin.py:222 cps/templates/admin.html:102
 msgid "UI Configuration"
 msgstr "Användargränssnitt konfiguration"
 
-#: cps/web.py:2931
+#: cps/admin.py:295
 msgid "Import of optional Google Drive requirements missing"
 msgstr "Import av valfri Google Drive krav saknas"
 
-#: cps/web.py:2934
+#: cps/admin.py:298
 msgid "client_secrets.json is missing or not readable"
 msgstr "client_secrets.json saknas eller inte kan läsas"
 
-#: cps/web.py:2939 cps/web.py:2968
+#: cps/admin.py:303 cps/admin.py:332
 msgid "client_secrets.json is not configured for web application"
 msgstr "client_secrets.json är inte konfigurerad för webbapplikation"
 
-#: cps/templates/admin.html:99 cps/web.py:2971 cps/web.py:2997 cps/web.py:3009
-#: cps/web.py:3054 cps/web.py:3069 cps/web.py:3088 cps/web.py:3096
-#: cps/web.py:3112
+#: cps/admin.py:335 cps/admin.py:361 cps/admin.py:373 cps/admin.py:398
+#: cps/admin.py:426 cps/admin.py:440 cps/admin.py:463 cps/admin.py:476
+#: cps/admin.py:494 cps/admin.py:501 cps/admin.py:516
+#: cps/templates/admin.html:101
 msgid "Basic Configuration"
 msgstr "Grundläggande konfiguration"
 
-#: cps/web.py:2994
+#: cps/admin.py:358
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr "Platsen för Keyfile är inte giltig, ange rätt sökväg"
 
-#: cps/web.py:3006
+#: cps/admin.py:370
 msgid "Certfile location is not valid, please enter correct path"
 msgstr "Platsen för Certfile är inte giltig, ange rätt sökväg"
 
-#: cps/web.py:3051
+#: cps/admin.py:395
+msgid "Please enter a LDAP provider and a DN"
+msgstr ""
+
+#: cps/admin.py:423
+msgid "Please enter Github oauth credentials"
+msgstr ""
+
+#: cps/admin.py:437
+msgid "Please enter Google oauth credentials"
+msgstr ""
+
+#: cps/admin.py:460
 msgid "Logfile location is not valid, please enter correct path"
 msgstr "Platsen för Logfile platsen är inte giltig, ange rätt sökväg"
 
-#: cps/web.py:3092
+#: cps/admin.py:498
 msgid "DB location is not valid, please enter correct path"
 msgstr "Platsen för DB är inte giltig, ange rätt sökväg"
 
-#: cps/templates/admin.html:33 cps/web.py:3172 cps/web.py:3178 cps/web.py:3194
+#: cps/admin.py:558 cps/web.py:1045
+msgid "Please fill out all fields!"
+msgstr "Fyll i alla fält!"
+
+#: cps/admin.py:560 cps/admin.py:566 cps/admin.py:582
+#: cps/templates/admin.html:35
 msgid "Add new user"
 msgstr "Lägg till ny användare"
 
-#: cps/web.py:3184
+#: cps/admin.py:564 cps/web.py:1248
+msgid "E-mail is not from valid domain"
+msgstr "E-posten är inte från giltig domän"
+
+#: cps/admin.py:572
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Användaren '%(user)s' skapad"
 
-#: cps/web.py:3188
+#: cps/admin.py:576
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Hittade ett befintligt konto för den här e-postadressen eller smeknamnet."
 
-#: cps/web.py:3218
+#: cps/admin.py:607
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Test-e-post skicka till %(kindlemail)s"
 
-#: cps/web.py:3221
+#: cps/admin.py:610
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Det gick inte att skicka Testmeddelandet: %(res)s"
 
-#: cps/web.py:3225
+#: cps/admin.py:612 cps/web.py:1029
+msgid "Please configure your kindle e-mail address first..."
+msgstr "Konfigurera din kindle-e-postadress först..."
+
+#: cps/admin.py:614
 msgid "E-mail server settings updated"
 msgstr "E-postserverinställningar uppdaterade"
 
-#: cps/web.py:3226
+#: cps/admin.py:615
 msgid "Edit e-mail server settings"
 msgstr "Redigera inställningar för e-postserver"
 
-#: cps/web.py:3251
+#: cps/admin.py:640
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Användaren '%(nick)s' borttagen"
 
-#: cps/web.py:3364
+#: cps/admin.py:711
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Användaren '%(nick)s' uppdaterad"
 
-#: cps/web.py:3367
+#: cps/admin.py:714
 msgid "An unknown error occured."
 msgstr "Ett okänt fel uppstod."
 
-#: cps/web.py:3369
+#: cps/admin.py:717
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Redigera användaren %(nick)s"
 
-#: cps/web.py:3386
+#: cps/admin.py:733
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Lösenord för användaren %(user)s återställd"
 
-#: cps/web.py:3400 cps/web.py:3592
+#: cps/admin.py:736 cps/web.py:1070
+msgid "An unknown error occurred. Please try again later."
+msgstr "Ett okänt fel uppstod. Försök igen senare."
+
+#: cps/admin.py:755
+msgid "Requesting update package"
+msgstr "Begär uppdateringspaketet"
+
+#: cps/admin.py:756
+msgid "Downloading update package"
+msgstr "Hämtar uppdateringspaketet"
+
+#: cps/admin.py:757
+msgid "Unzipping update package"
+msgstr "Packar upp uppdateringspaketet"
+
+#: cps/admin.py:758
+msgid "Replacing files"
+msgstr "Ersätta filer"
+
+#: cps/admin.py:759
+msgid "Database connections are closed"
+msgstr "Databasanslutningarna är stängda"
+
+#: cps/admin.py:760
+msgid "Stopping server"
+msgstr "Stoppar server"
+
+#: cps/admin.py:761
+msgid "Update finished, please press okay and reload page"
+msgstr "Uppdatering klar, tryck på okej och uppdatera sidan"
+
+#: cps/admin.py:762 cps/admin.py:763 cps/admin.py:764 cps/admin.py:765
+msgid "Update failed:"
+msgstr "Uppdateringen misslyckades:"
+
+#: cps/admin.py:762 cps/updater.py:277 cps/updater.py:456 cps/updater.py:458
+msgid "HTTP Error"
+msgstr "HTTP-fel"
+
+#: cps/admin.py:763 cps/updater.py:279 cps/updater.py:460
+msgid "Connection error"
+msgstr "Anslutningsfel"
+
+#: cps/admin.py:764 cps/updater.py:281 cps/updater.py:462
+msgid "Timeout while establishing connection"
+msgstr "Tiden ute när du etablerade anslutning"
+
+#: cps/admin.py:765 cps/updater.py:283 cps/updater.py:464
+msgid "General error"
+msgstr "Allmänt fel"
+
+#: cps/converter.py:31 cps/converter.py:48 cps/uploader.py:213
+#: cps/uploader.py:214 cps/uploader.py:218 cps/uploader.py:222
+#: cps/uploader.py:226
+msgid "not installed"
+msgstr "inte installerad"
+
+#: cps/converter.py:43 cps/converter.py:60
+msgid "Excecution permissions missing"
+msgstr "Utförande behörighet saknas"
+
+#: cps/converter.py:70
+msgid "not configured"
+msgstr "inte konfigurerad"
+
+#: cps/editbooks.py:218 cps/editbooks.py:432
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Det gick inte att öppna e-boken. Filen finns inte eller filen är inte tillgänglig"
 
-#: cps/web.py:3428
+#: cps/editbooks.py:246
 msgid "edit metadata"
 msgstr "redigera metadata"
 
-#: cps/web.py:3521 cps/web.py:3754
+#: cps/editbooks.py:325 cps/editbooks.py:595
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Filändelsen '%(ext)s' får inte laddas upp till den här servern"
 
-#: cps/web.py:3525 cps/web.py:3757
+#: cps/editbooks.py:329 cps/editbooks.py:599
 msgid "File to be uploaded must have an extension"
 msgstr "Filen som ska laddas upp måste ha en ändelse"
 
-#: cps/web.py:3537 cps/web.py:3776
+#: cps/editbooks.py:341 cps/editbooks.py:619
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Det gick inte att skapa sökväg %(path)s (behörighet nekad)."
 
-#: cps/web.py:3542
+#: cps/editbooks.py:346
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Det gick inte att lagra filen %(file)s."
 
-#: cps/web.py:3559
+#: cps/editbooks.py:363
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Filformatet %(ext)s lades till %(book)s"
 
-#: cps/web.py:3573 cps/web.py:3646
+#: cps/editbooks.py:382
+#, python-format
+msgid "Failed to create path for cover %(path)s (Permission denied)."
+msgstr ""
+
+#: cps/editbooks.py:390
+#, python-format
+msgid "Failed to store cover-file %(cover)s."
+msgstr ""
+
+#: cps/editbooks.py:393
+msgid "Cover-file is not a valid image file"
+msgstr ""
+
+#: cps/editbooks.py:399 cps/editbooks.py:413
 msgid "Cover is not a supported imageformat (jpg/png/webp), can't save"
 msgstr ""
 
-#: cps/web.py:3605 cps/web.py:3614
+#: cps/editbooks.py:445 cps/editbooks.py:454
 msgid "unknown"
 msgstr "okänd"
 
-#: cps/web.py:3694
+#: cps/editbooks.py:486
+msgid "Cover is not a jpg file, can't save"
+msgstr ""
+
+#: cps/editbooks.py:534
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s är inte ett giltigt språk"
 
-#: cps/web.py:3725
+#: cps/editbooks.py:565
 msgid "Metadata successfully updated"
 msgstr "Metadata uppdaterades"
 
-#: cps/web.py:3734
+#: cps/editbooks.py:574
 msgid "Error editing book, please check logfile for details"
 msgstr "Det gick inte att redigera boken, kontrollera loggfilen för mer information"
 
-#: cps/web.py:3780
+#: cps/editbooks.py:624
 #, python-format
 msgid "Failed to store file %(file)s (Permission denied)."
 msgstr "Det gick inte att lagra filen %(file)s (behörighet nekad)."
 
-#: cps/web.py:3785
+#: cps/editbooks.py:629
 #, python-format
 msgid "Failed to delete file %(file)s (Permission denied)."
 msgstr "Det gick inte att ta bort filen %(file)s (behörighet nekad)."
 
-#: cps/web.py:3867
+#: cps/editbooks.py:712
 #, python-format
-msgid "File %(title)s"
+msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/web.py:3896
+#: cps/editbooks.py:741
 msgid "Source or destination format for conversion missing"
 msgstr "Källa eller målformat för konvertering saknas"
 
-#: cps/web.py:3906
+#: cps/editbooks.py:751
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Boken är i kö för konvertering till %(book_format)s"
 
-#: cps/web.py:3910
+#: cps/editbooks.py:755
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Det gick inte att konvertera den här boken: %(res)s"
 
-#: cps/worker.py:305
+#: cps/gdrive.py:56
+msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
+msgstr ""
+
+#: cps/gdrive.py:101
+msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
+msgstr "Återuppringningsdomänen är inte verifierad, följ stegen för att verifiera domänen i Google utvecklarkonsol"
+
+#: cps/helper.py:97
+#, python-format
+msgid "%(format)s format not found for book id: %(book)d"
+msgstr "%(format)s formatet hittades inte för bok-id: %(book)d"
+
+#: cps/helper.py:109
+#, python-format
+msgid "%(format)s not found on Google Drive: %(fn)s"
+msgstr "%(format)s hittades inte på Google Drive: %(fn)s"
+
+#: cps/helper.py:116 cps/helper.py:223 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Skicka till Kindle"
+
+#: cps/helper.py:117 cps/helper.py:135 cps/helper.py:225
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "Detta e-postmeddelande har skickats via Calibre-Web."
+
+#: cps/helper.py:128
+#, python-format
+msgid "%(format)s not found: %(fn)s"
+msgstr "%(format)s hittades inte: %(fn)s"
+
+#: cps/helper.py:133
+msgid "Calibre-Web test e-mail"
+msgstr "Calibre-Web test e-post"
+
+#: cps/helper.py:134
+msgid "Test e-mail"
+msgstr "Test e-post"
+
+#: cps/helper.py:150
+msgid "Get Started with Calibre-Web"
+msgstr "Kom igång med Calibre-Web"
+
+#: cps/helper.py:151
+#, python-format
+msgid "Registration e-mail for user: %(name)s"
+msgstr "Registrera e-post för användare: %(name)s"
+
+#: cps/helper.py:165 cps/helper.py:167 cps/helper.py:169 cps/helper.py:177
+#: cps/helper.py:179 cps/helper.py:181
+#, python-format
+msgid "Send %(format)s to Kindle"
+msgstr ""
+
+#: cps/helper.py:185
+#, python-format
+msgid "Convert %(orig)s to %(format)s and send to Kindle"
+msgstr ""
+
+#: cps/helper.py:224
+#, python-format
+msgid "E-mail: %(book)s"
+msgstr "E-post: %(book)s"
+
+#: cps/helper.py:227
+msgid "The requested file could not be read. Maybe wrong permissions?"
+msgstr "Den begärda filen kunde inte läsas. Kanske fel behörigheter?"
+
+#: cps/helper.py:335
+#, python-format
+msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "Byt namn på titel från: \"%(src)s\" till \"%(dest)s\" misslyckades med fel: %(error)s"
+
+#: cps/helper.py:345
+#, python-format
+msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "Byt namn på författare från: \"%(src)s\" till \"%(dest)s\" misslyckades med fel: %(error)s"
+
+#: cps/helper.py:359
+#, python-format
+msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr ""
+
+#: cps/helper.py:385 cps/helper.py:395 cps/helper.py:403
+#, python-format
+msgid "File %(file)s not found on Google Drive"
+msgstr "Filen %(file)s hittades inte på Google Drive"
+
+#: cps/helper.py:424
+#, python-format
+msgid "Book path %(path)s not found on Google Drive"
+msgstr "Boksökvägen %(path)s hittades inte på Google Drive"
+
+#: cps/helper.py:584
+msgid "Error excecuting UnRar"
+msgstr "Fel vid körning av UnRar"
+
+#: cps/helper.py:586
+msgid "Unrar binary file not found"
+msgstr "Unrar binärfil hittades inte"
+
+#: cps/helper.py:614
+msgid "Waiting"
+msgstr "Väntar"
+
+#: cps/helper.py:616
+msgid "Failed"
+msgstr "Misslyckades"
+
+#: cps/helper.py:618
+msgid "Started"
+msgstr "Startad"
+
+#: cps/helper.py:620
+msgid "Finished"
+msgstr "Klar"
+
+#: cps/helper.py:622
+msgid "Unknown Status"
+msgstr "Okänd status"
+
+#: cps/helper.py:627
+msgid "E-mail: "
+msgstr "E-post: "
+
+#: cps/helper.py:629 cps/helper.py:633
+msgid "Convert: "
+msgstr "Konvertera: "
+
+#: cps/helper.py:631
+msgid "Upload: "
+msgstr "Överför: "
+
+#: cps/helper.py:635
+msgid "Unknown Task: "
+msgstr "Okänd uppgift: "
+
+#: cps/oauth_bb.py:87
+#, python-format
+msgid "Register with %s, "
+msgstr ""
+
+#: cps/oauth_bb.py:145
+msgid "Failed to log in with GitHub."
+msgstr ""
+
+#: cps/oauth_bb.py:150
+msgid "Failed to fetch user info from GitHub."
+msgstr ""
+
+#: cps/oauth_bb.py:161
+msgid "Failed to log in with Google."
+msgstr ""
+
+#: cps/oauth_bb.py:166
+msgid "Failed to fetch user info from Google."
+msgstr ""
+
+#: cps/oauth_bb.py:265
+#, python-format
+msgid "Unlink to %(oauth)s success."
+msgstr ""
+
+#: cps/oauth_bb.py:269
+#, python-format
+msgid "Unlink to %(oauth)s failed."
+msgstr ""
+
+#: cps/oauth_bb.py:272
+#, python-format
+msgid "Not linked to %(oauth)s."
+msgstr ""
+
+#: cps/oauth_bb.py:300
+msgid "GitHub Oauth error, please retry later."
+msgstr ""
+
+#: cps/oauth_bb.py:319
+msgid "Google Oauth error, please retry later."
+msgstr ""
+
+#: cps/shelf.py:40 cps/shelf.py:92
+msgid "Invalid shelf specified"
+msgstr "Ogiltig hylla specificerad"
+
+#: cps/shelf.py:47
+#, python-format
+msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
+msgstr ""
+
+#: cps/shelf.py:55
+msgid "You are not allowed to edit public shelves"
+msgstr "Du får inte redigera offentliga hyllor"
+
+#: cps/shelf.py:64
+#, python-format
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr "Boken är redan en del av hyllan: %(shelfname)s"
+
+#: cps/shelf.py:78
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "Boken har lagts till i hyllan: %(sname)s"
+
+#: cps/shelf.py:97
+#, python-format
+msgid "You are not allowed to add a book to the the shelf: %(name)s"
+msgstr "Du får inte lägga till en bok i hyllan: %(name)s"
+
+#: cps/shelf.py:102
+msgid "User is not allowed to edit public shelves"
+msgstr "Användaren får inte redigera publika hyllor"
+
+#: cps/shelf.py:120
+#, python-format
+msgid "Books are already part of the shelf: %(name)s"
+msgstr "Böcker är redan en del av hyllan: %(name)s"
+
+#: cps/shelf.py:134
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr "Böcker har lagts till hyllan: %(sname)s"
+
+#: cps/shelf.py:136
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr "Kunde inte lägga till böcker till hyllan: %(sname)s"
+
+#: cps/shelf.py:173
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "Boken har tagits bort från hyllan: %(sname)s"
+
+#: cps/shelf.py:179
+#, python-format
+msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
+msgstr "Tyvärr har du inte rätt att ta bort en bok från den här hyllan: %(sname)s"
+
+#: cps/shelf.py:200 cps/shelf.py:224
+#, python-format
+msgid "A shelf with the name '%(title)s' already exists."
+msgstr "En hylla med namnet '%(title)s' finns redan."
+
+#: cps/shelf.py:205
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "Hyllan %(title)s skapad"
+
+#: cps/shelf.py:207 cps/shelf.py:235
+msgid "There was an error"
+msgstr "Det fanns ett fel"
+
+#: cps/shelf.py:208 cps/shelf.py:210
+msgid "create a shelf"
+msgstr "skapa en hylla"
+
+#: cps/shelf.py:233
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "Hyllan %(title)s ändrad"
+
+#: cps/shelf.py:236 cps/shelf.py:238
+msgid "Edit a shelf"
+msgstr "Redigera en hylla"
+
+#: cps/shelf.py:259
+#, python-format
+msgid "successfully deleted shelf %(name)s"
+msgstr "tog bort hyllan %(name)s"
+
+#: cps/shelf.py:289
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Hylla: '%(name)s'"
+
+#: cps/shelf.py:292
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "Fel vid öppning av hyllan. Hylla finns inte eller är inte tillgänglig"
+
+#: cps/shelf.py:324
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "Ändra ordning på hyllan: '%(name)s'"
+
+#: cps/ub.py:111
+msgid "Recently Added"
+msgstr "Nyligen tillagda"
+
+#: cps/ub.py:113
+msgid "Show recent books"
+msgstr "Visa senaste böcker"
+
+#: cps/templates/index.xml:17 cps/ub.py:114
+msgid "Hot Books"
+msgstr "Heta böcker"
+
+#: cps/ub.py:115
+msgid "Show hot books"
+msgstr "Visa heta böcker"
+
+#: cps/templates/index.xml:24 cps/ub.py:118
+msgid "Best rated Books"
+msgstr "Bäst rankade böcker"
+
+#: cps/ub.py:120
+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:121
+#: cps/web.py:965
+msgid "Read Books"
+msgstr "Lästa böcker"
+
+#: cps/ub.py:123
+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:125
+#: cps/web.py:969
+msgid "Unread Books"
+msgstr "Olästa böcker"
+
+#: cps/ub.py:127
+msgid "Show unread"
+msgstr ""
+
+#: cps/ub.py:128
+msgid "Discover"
+msgstr "Upptäck"
+
+#: cps/ub.py:130
+msgid "Show random books"
+msgstr "Visa slumpmässiga böcker"
+
+#: cps/ub.py:131
+msgid "Categories"
+msgstr "Kategorier"
+
+#: cps/ub.py:133
+msgid "Show category selection"
+msgstr "Visa kategorival"
+
+#: cps/templates/book_edit.html:71 cps/templates/search_form.html:53
+#: cps/ub.py:134
+msgid "Series"
+msgstr "Serier"
+
+#: cps/ub.py:136
+msgid "Show series selection"
+msgstr "Visa serieval"
+
+#: cps/templates/index.xml:61 cps/ub.py:137
+msgid "Authors"
+msgstr "Författare"
+
+#: cps/ub.py:139
+msgid "Show author selection"
+msgstr "Visa författarval"
+
+#: cps/templates/index.xml:68 cps/ub.py:141
+msgid "Publishers"
+msgstr "Förlag"
+
+#: cps/ub.py:143
+msgid "Show publisher selection"
+msgstr "Visa urval av förlag"
+
+#: cps/templates/search_form.html:74 cps/ub.py:144
+msgid "Languages"
+msgstr "Språk"
+
+#: cps/ub.py:147
+msgid "Show language selection"
+msgstr "Visa språkval"
+
+#: cps/ub.py:148
+msgid "Ratings"
+msgstr ""
+
+#: cps/ub.py:150
+msgid "Show ratings selection"
+msgstr ""
+
+#: cps/ub.py:151
+msgid "File formats"
+msgstr ""
+
+#: cps/ub.py:153
+msgid "Show file formats selection"
+msgstr ""
+
+#: cps/updater.py:257 cps/updater.py:364 cps/updater.py:377
+msgid "Unexpected data while reading update information"
+msgstr "Oväntade data vid läsning av uppdateringsinformation"
+
+#: cps/updater.py:264 cps/updater.py:370
+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:290 cps/updater.py:422
+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:343
+msgid "Could not fetch update information"
+msgstr "Kunde inte hämta uppdateringsinformation"
+
+#: cps/updater.py:357
+msgid "No release information available"
+msgstr ""
+
+#: cps/updater.py:403 cps/updater.py:412
+#, python-format
+msgid "A new update is available. Click on the button below to update to version: %(version)s"
+msgstr ""
+
+#: cps/web.py:457
+msgid "Recently Added Books"
+msgstr "Nyligen tillagda böcker"
+
+#: cps/web.py:484
+msgid "Best rated books"
+msgstr "Bäst rankade böcker"
+
+#: cps/templates/index.xml:38 cps/web.py:492
+msgid "Random Books"
+msgstr "Slumpmässiga böcker"
+
+#: cps/web.py:516
+msgid "Books"
+msgstr ""
+
+#: cps/web.py:543
+msgid "Hot Books (most downloaded)"
+msgstr "Heta böcker (mest hämtade)"
+
+#: cps/web.py:553 cps/web.py:1294 cps/web.py:1383
+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:580
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr "Förlag: %(name)s"
+
+#: cps/web.py:591
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "Serier: %(serie)s"
+
+#: cps/web.py:602
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr ""
+
+#: cps/web.py:613
+#, python-format
+msgid "File format: %(format)s"
+msgstr ""
+
+#: cps/web.py:625
+#, python-format
+msgid "Category: %(name)s"
+msgstr "Kategori: %(name)s"
+
+#: cps/web.py:659
+msgid "Publisher list"
+msgstr "Lista över förlag"
+
+#: cps/templates/index.xml:82 cps/web.py:675
+msgid "Series list"
+msgstr "Serielista"
+
+#: cps/web.py:689
+msgid "Ratings list"
+msgstr ""
+
+#: cps/web.py:702
+msgid "File formats list"
+msgstr ""
+
+#: cps/web.py:730
+msgid "Available languages"
+msgstr "Tillgängliga språk"
+
+#: cps/web.py:750
+#, python-format
+msgid "Language: %(name)s"
+msgstr "Språk: %(name)s"
+
+#: cps/templates/index.xml:75 cps/web.py:764
+msgid "Category list"
+msgstr "Kategorilista"
+
+#: cps/templates/layout.html:73 cps/web.py:777
+msgid "Tasks"
+msgstr "Uppgifter"
+
+#: cps/web.py:841
+msgid "Published after "
+msgstr "Publicerad efter "
+
+#: cps/web.py:848
+msgid "Published before "
+msgstr "Publicerad före "
+
+#: cps/web.py:862
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "Betyg <= %(rating)s"
+
+#: cps/web.py:864
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "Betyg >= %(rating)s"
+
+#: cps/web.py:924 cps/web.py:933
+msgid "search"
+msgstr "sök"
+
+#: cps/web.py:1018
+msgid "Please configure the SMTP mail settings first..."
+msgstr "Konfigurera SMTP-postinställningarna först..."
+
+#: cps/web.py:1023
+#, 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:1027
+#, 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:1046 cps/web.py:1071 cps/web.py:1076 cps/web.py:1081
+#: cps/web.py:1085
+msgid "register"
+msgstr "registrera"
+
+#: cps/web.py:1073
+msgid "Your e-mail is not allowed to register"
+msgstr "Din e-post är inte tillåten att registrera"
+
+#: cps/web.py:1077
+msgid "Confirmation e-mail was send to your e-mail account."
+msgstr "Bekräftelsemail skickades till ditt e-postkonto."
+
+#: cps/web.py:1080
+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:1103 cps/web.py:1115
+#, python-format
+msgid "You are now logged in as: '%(nickname)s'"
+msgstr ""
+
+#: cps/web.py:1108 cps/web.py:1120
+msgid "Wrong Username or Password"
+msgstr "Fel användarnamn eller lösenord"
+
+#: cps/web.py:1111
+msgid "Could not login. LDAP server down, please contact your administrator"
+msgstr ""
+
+#: cps/web.py:1124 cps/web.py:1146
+msgid "login"
+msgstr "logga in"
+
+#: cps/web.py:1158 cps/web.py:1189
+msgid "Token not found"
+msgstr "Token hittades inte"
+
+#: cps/web.py:1166 cps/web.py:1197
+msgid "Token has expired"
+msgstr "Token har löpt ut"
+
+#: cps/web.py:1174
+msgid "Success! Please return to your device"
+msgstr "Lyckades! Vänligen återvänd till din enhet"
+
+#: cps/web.py:1210
+#, python-format
+msgid "you are now logged in as: '%(nickname)s'"
+msgstr "du är nu inloggad som: \"%(nickname)s\""
+
+#: cps/web.py:1250 cps/web.py:1277 cps/web.py:1281
+#, python-format
+msgid "%(name)s's profile"
+msgstr "%(name)ss profil"
+
+#: cps/web.py:1274
+msgid "Found an existing account for this e-mail address."
+msgstr "Hittade ett befintligt konto för den här e-postadressen."
+
+#: cps/web.py:1279
+msgid "Profile updated"
+msgstr "Profilen uppdaterad"
+
+#: cps/web.py:1304 cps/web.py:1306 cps/web.py:1308 cps/web.py:1314
+#: cps/web.py:1318
+msgid "Read a Book"
+msgstr "Läs en bok"
+
+#: cps/web.py:1328
+msgid "Error opening eBook. File does not exist or file is not accessible."
+msgstr ""
+
+#: cps/worker.py:308
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "E-bokkonverteraren misslyckades: %(error)s"
 
-#: cps/worker.py:316
+#: cps/worker.py:319
 #, python-format
 msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "Kindlegen misslyckades med fel %(error)s. Meddelande: %(message)s"
@@ -780,147 +969,152 @@ msgstr "DLS"
 msgid "Admin"
 msgstr "Administratör"
 
-#: cps/templates/admin.html:14 cps/templates/detail.html:22
-#: cps/templates/detail.html:31
+#: cps/templates/admin.html:14 cps/templates/detail.html:18
+#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/shelfdown.html:62
 msgid "Download"
 msgstr "Hämta"
 
-#: cps/templates/admin.html:15 cps/templates/layout.html:65
+#: cps/templates/admin.html:15
+msgid "View Ebooks"
+msgstr ""
+
+#: cps/templates/admin.html:16 cps/templates/layout.html:65
 msgid "Upload"
 msgstr "Ladda upp"
 
-#: cps/templates/admin.html:16
+#: cps/templates/admin.html:17
 msgid "Edit"
 msgstr "Redigera"
 
-#: cps/templates/admin.html:39
+#: cps/templates/admin.html:41
 msgid "SMTP e-mail server settings"
 msgstr "Inställningar för SMTP-e-postserver"
 
-#: cps/templates/admin.html:42 cps/templates/email_edit.html:11
+#: cps/templates/admin.html:44 cps/templates/email_edit.html:11
 msgid "SMTP hostname"
 msgstr "SMTP-värdnamn"
 
-#: cps/templates/admin.html:43
+#: cps/templates/admin.html:45
 msgid "SMTP port"
 msgstr "SMTP-port"
 
-#: cps/templates/admin.html:44
+#: cps/templates/admin.html:46
 msgid "SSL"
 msgstr "SSL"
 
-#: cps/templates/admin.html:45 cps/templates/email_edit.html:27
+#: cps/templates/admin.html:47 cps/templates/email_edit.html:27
 msgid "SMTP login"
 msgstr "SMTP-inloggning"
 
-#: cps/templates/admin.html:46
+#: cps/templates/admin.html:48
 msgid "From mail"
 msgstr "Från meddelande"
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:58
 msgid "Change SMTP settings"
 msgstr "Ändra SMTP-inställningar"
 
-#: cps/templates/admin.html:62
+#: cps/templates/admin.html:64
 msgid "Configuration"
 msgstr "Konfiguration"
 
-#: cps/templates/admin.html:65
+#: cps/templates/admin.html:67
 msgid "Calibre DB dir"
 msgstr "Calibre DB dir"
 
-#: cps/templates/admin.html:69
+#: cps/templates/admin.html:71
 msgid "Log level"
 msgstr "Loggnivå"
 
-#: cps/templates/admin.html:73
+#: cps/templates/admin.html:75
 msgid "Port"
 msgstr "Port"
 
-#: cps/templates/admin.html:79 cps/templates/config_view_edit.html:23
+#: cps/templates/admin.html:81 cps/templates/config_view_edit.html:23
 msgid "Books per page"
 msgstr "Böcker per sida"
 
-#: cps/templates/admin.html:83
+#: cps/templates/admin.html:85
 msgid "Uploading"
 msgstr "Laddar upp"
 
-#: cps/templates/admin.html:87
+#: cps/templates/admin.html:89
 msgid "Anonymous browsing"
 msgstr "Anonym surfning"
 
-#: cps/templates/admin.html:91
+#: cps/templates/admin.html:93
 msgid "Public registration"
 msgstr "Publik registrering"
 
-#: cps/templates/admin.html:95 cps/templates/remote_login.html:4
+#: cps/templates/admin.html:97 cps/templates/remote_login.html:4
 msgid "Remote login"
 msgstr "Fjärrinloggning"
 
-#: cps/templates/admin.html:106
+#: cps/templates/admin.html:108
 msgid "Administration"
 msgstr "Administration"
 
-#: cps/templates/admin.html:107
+#: cps/templates/admin.html:109
 msgid "Reconnect to Calibre DB"
 msgstr "Anslut till Calibre DB igen"
 
-#: cps/templates/admin.html:108
+#: cps/templates/admin.html:110
 msgid "Restart Calibre-Web"
 msgstr "Starta om Calibre-Web"
 
-#: cps/templates/admin.html:109
+#: cps/templates/admin.html:111
 msgid "Stop Calibre-Web"
 msgstr "Stoppa Calibre-Web"
 
-#: cps/templates/admin.html:115
+#: cps/templates/admin.html:117
 msgid "Update"
 msgstr "Uppdatera"
 
-#: cps/templates/admin.html:119
+#: cps/templates/admin.html:121
 msgid "Version"
 msgstr "Version"
 
-#: cps/templates/admin.html:120
+#: cps/templates/admin.html:122
 msgid "Details"
 msgstr "Detaljer"
 
-#: cps/templates/admin.html:126
+#: cps/templates/admin.html:128
 msgid "Current version"
 msgstr "Aktuell version"
 
-#: cps/templates/admin.html:132
+#: cps/templates/admin.html:134
 msgid "Check for update"
 msgstr "Sök efter uppdatering"
 
-#: cps/templates/admin.html:133
+#: cps/templates/admin.html:135
 msgid "Perform Update"
 msgstr "Utför uppdatering"
 
-#: cps/templates/admin.html:145
+#: cps/templates/admin.html:147
 msgid "Do you really want to restart Calibre-Web?"
 msgstr "Är du säker på att du vill starta om Calibre-Web?"
 
-#: cps/templates/admin.html:150 cps/templates/admin.html:164
-#: cps/templates/admin.html:184 cps/templates/shelf.html:73
+#: cps/templates/admin.html:152 cps/templates/admin.html:166
+#: cps/templates/admin.html:186 cps/templates/shelf.html:72
 msgid "Ok"
 msgstr "Ok"
 
-#: cps/templates/admin.html:151 cps/templates/admin.html:165
-#: cps/templates/book_edit.html:178 cps/templates/book_edit.html:200
-#: cps/templates/config_edit.html:226 cps/templates/config_view_edit.html:179
-#: cps/templates/email_edit.html:40 cps/templates/email_edit.html:75
-#: cps/templates/layout.html:28 cps/templates/shelf.html:74
+#: cps/templates/admin.html:153 cps/templates/admin.html:167
+#: cps/templates/book_edit.html:174 cps/templates/book_edit.html:196
+#: cps/templates/config_edit.html:281 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/user_edit.html:149
+#: cps/templates/user_edit.html:132
 msgid "Back"
 msgstr "Tillbaka"
 
-#: cps/templates/admin.html:163
+#: cps/templates/admin.html:165
 msgid "Do you really want to stop Calibre-Web?"
 msgstr "Är du säker på att du vill stoppa Calibre-Web?"
 
-#: cps/templates/admin.html:175
+#: cps/templates/admin.html:177
 msgid "Updating, please do not reload page"
 msgstr "Uppdaterar, vänligen uppdatera inte sidan"
 
@@ -932,176 +1126,176 @@ msgstr "via"
 msgid "In Library"
 msgstr "I biblioteket"
 
-#: cps/templates/author.html:50 cps/templates/author.html:97
-#: cps/templates/discover.html:28 cps/templates/index.html:31
-#: cps/templates/index.html:86 cps/templates/search.html:55
-#: cps/templates/shelf.html:37
+#: cps/templates/author.html:34 cps/templates/list.html:14
+#: cps/templates/search.html:41
+msgid "All"
+msgstr ""
+
+#: cps/templates/author.html:58 cps/templates/author.html:105
+#: 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 ""
 
-#: cps/templates/author.html:81
+#: cps/templates/author.html:89
 msgid "More by"
 msgstr "Mer av"
 
-#: cps/templates/book_edit.html:16
+#: cps/templates/book_edit.html:12
 msgid "Delete Book"
 msgstr "Ta bort boken"
 
-#: cps/templates/book_edit.html:19
+#: cps/templates/book_edit.html:15
 msgid "Delete formats:"
 msgstr "Ta bort format:"
 
-#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:199
-#: cps/templates/email_edit.html:73 cps/templates/email_edit.html:74
+#: cps/templates/book_edit.html:18 cps/templates/book_edit.html:195
+#: cps/templates/email_edit.html:73
 msgid "Delete"
 msgstr "Ta bort"
 
-#: cps/templates/book_edit.html:30
+#: cps/templates/book_edit.html:26
 msgid "Convert book format:"
 msgstr "Konvertera bokformat:"
 
-#: cps/templates/book_edit.html:34
+#: cps/templates/book_edit.html:30
 msgid "Convert from:"
 msgstr "Konvertera från:"
 
-#: cps/templates/book_edit.html:36 cps/templates/book_edit.html:43
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
 msgstr "välj ett alternativ"
 
-#: cps/templates/book_edit.html:41
+#: cps/templates/book_edit.html:37
 msgid "Convert to:"
 msgstr "Konvertera till:"
 
-#: cps/templates/book_edit.html:50
+#: cps/templates/book_edit.html:46
 msgid "Convert book"
 msgstr "Konvertera boken"
 
-#: cps/templates/book_edit.html:59 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:55 cps/templates/search_form.html:6
 msgid "Book Title"
 msgstr "Boktitel"
 
-#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:259
-#: cps/templates/book_edit.html:277 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:59 cps/templates/book_edit.html:255
+#: cps/templates/book_edit.html:273 cps/templates/search_form.html:10
 msgid "Author"
 msgstr "Författare"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:264
-#: cps/templates/book_edit.html:279 cps/templates/search_form.html:106
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:260
+#: cps/templates/book_edit.html:275 cps/templates/search_form.html:106
 msgid "Description"
 msgstr "Beskrivning"
 
-#: cps/templates/book_edit.html:71 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:67 cps/templates/search_form.html:33
 msgid "Tags"
 msgstr "Taggar"
 
-#: cps/templates/book_edit.html:75 cps/templates/layout.html:159
-#: cps/templates/search_form.html:53
-msgid "Series"
-msgstr "Serier"
-
-#: cps/templates/book_edit.html:79
+#: cps/templates/book_edit.html:75
 msgid "Series id"
 msgstr "Serier-id"
 
-#: cps/templates/book_edit.html:83
+#: cps/templates/book_edit.html:79
 msgid "Rating"
 msgstr "Betyg"
 
-#: cps/templates/book_edit.html:87
+#: cps/templates/book_edit.html:83
 msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
 msgstr "Omslagswebbadress (jpg, omslag hämtas och lagras i databasen, fältet är efteråt tomt igen)"
 
-#: cps/templates/book_edit.html:91
+#: cps/templates/book_edit.html:87
 msgid "Upload Cover from local drive"
 msgstr "Ladda upp omslag från lokal enhet"
 
-#: cps/templates/book_edit.html:96 cps/templates/detail.html:148
+#: cps/templates/book_edit.html:92 cps/templates/detail.html:168
 msgid "Publishing date"
 msgstr "Publiceringsdatum"
 
-#: cps/templates/book_edit.html:103 cps/templates/book_edit.html:261
-#: cps/templates/book_edit.html:278 cps/templates/detail.html:139
+#: cps/templates/book_edit.html:99 cps/templates/book_edit.html:257
+#: cps/templates/book_edit.html:274 cps/templates/detail.html:159
 #: cps/templates/search_form.html:14
 msgid "Publisher"
 msgstr "Förlag"
 
-#: cps/templates/book_edit.html:107 cps/templates/user_edit.html:31
+#: cps/templates/book_edit.html:103 cps/templates/user_edit.html:31
 msgid "Language"
 msgstr "Språk"
 
-#: cps/templates/book_edit.html:117 cps/templates/search_form.html:117
+#: cps/templates/book_edit.html:113 cps/templates/search_form.html:117
 msgid "Yes"
 msgstr "Ja"
 
-#: cps/templates/book_edit.html:118 cps/templates/search_form.html:118
+#: cps/templates/book_edit.html:114 cps/templates/search_form.html:118
 msgid "No"
 msgstr "Nej"
 
-#: cps/templates/book_edit.html:164
+#: cps/templates/book_edit.html:160
 msgid "Upload format"
 msgstr "Ladda upp format"
 
-#: cps/templates/book_edit.html:173
+#: cps/templates/book_edit.html:169
 msgid "view book after edit"
 msgstr "visa bok efter redigering"
 
-#: cps/templates/book_edit.html:176 cps/templates/book_edit.html:212
+#: cps/templates/book_edit.html:172 cps/templates/book_edit.html:208
 msgid "Get metadata"
 msgstr "Hämta metadata"
 
-#: cps/templates/book_edit.html:177 cps/templates/config_edit.html:224
-#: cps/templates/config_view_edit.html:178 cps/templates/login.html:20
+#: cps/templates/book_edit.html:173 cps/templates/config_edit.html:279
+#: cps/templates/config_view_edit.html:146 cps/templates/login.html:20
 #: cps/templates/search_form.html:150 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:147
+#: cps/templates/user_edit.html:130
 msgid "Submit"
 msgstr "Skicka"
 
-#: cps/templates/book_edit.html:191
+#: cps/templates/book_edit.html:187
 msgid "Are you really sure?"
 msgstr "Är du verkligen säker?"
 
-#: cps/templates/book_edit.html:194
+#: cps/templates/book_edit.html:190
 msgid "Book will be deleted from Calibre database"
 msgstr "Boken kommer att tas bort från Calibre-databasen"
 
-#: cps/templates/book_edit.html:195
+#: cps/templates/book_edit.html:191
 msgid "and from hard disk"
 msgstr "och från hårddisken"
 
-#: cps/templates/book_edit.html:215
+#: cps/templates/book_edit.html:211
 msgid "Keyword"
 msgstr "Sökord"
 
-#: cps/templates/book_edit.html:216
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr " Sök sökord "
 
-#: cps/templates/book_edit.html:218 cps/templates/layout.html:47
+#: cps/templates/book_edit.html:214 cps/templates/layout.html:47
 msgid "Go!"
 msgstr "Kör!"
 
-#: cps/templates/book_edit.html:222
+#: cps/templates/book_edit.html:218
 msgid "Click the cover to load metadata to the form"
 msgstr "Klicka på omslaget för att läsa in metadata till formuläret"
 
-#: cps/templates/book_edit.html:234 cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:230 cps/templates/book_edit.html:270
 msgid "Loading..."
 msgstr "Läser in..."
 
-#: cps/templates/book_edit.html:239 cps/templates/layout.html:226
-#: cps/templates/layout.html:258
+#: cps/templates/book_edit.html:235 cps/templates/layout.html:187
+#: cps/templates/layout.html:219
 msgid "Close"
 msgstr "Stäng"
 
-#: cps/templates/book_edit.html:266 cps/templates/book_edit.html:280
+#: cps/templates/book_edit.html:262 cps/templates/book_edit.html:276
 msgid "Source"
 msgstr "Källa"
 
-#: cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:271
 msgid "Search error!"
 msgstr "Sökningsfel!"
 
-#: cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:272
 msgid "No Result(s) found! Please try aonther keyword."
 msgstr "Inga resultat hittades! Försök med ett annat sökord."
 
@@ -1229,35 +1423,87 @@ msgstr "Goodreads API-nyckel"
 msgid "Goodreads API Secret"
 msgstr "Goodreads API-hemlighet"
 
-#: cps/templates/config_edit.html:187
+#: cps/templates/config_edit.html:181
+msgid "Login type"
+msgstr ""
+
+#: cps/templates/config_edit.html:183
+msgid "Use standard Authentication"
+msgstr ""
+
+#: cps/templates/config_edit.html:185
+msgid "Use LDAP Authentication"
+msgstr ""
+
+#: cps/templates/config_edit.html:188
+msgid "Use GitHub OAuth"
+msgstr ""
+
+#: cps/templates/config_edit.html:189
+msgid "Use Google OAuth"
+msgstr ""
+
+#: cps/templates/config_edit.html:196
+msgid "LDAP Provider URL"
+msgstr ""
+
+#: cps/templates/config_edit.html:200
+msgid "LDAP Distinguished Name (DN)"
+msgstr ""
+
+#: cps/templates/config_edit.html:208
+msgid "Obtain GitHub OAuth Credential"
+msgstr ""
+
+#: cps/templates/config_edit.html:211
+msgid "GitHub OAuth Client Id"
+msgstr ""
+
+#: cps/templates/config_edit.html:215
+msgid "GitHub OAuth Client Secret"
+msgstr ""
+
+#: cps/templates/config_edit.html:221
+msgid "Obtain Google OAuth Credential"
+msgstr ""
+
+#: cps/templates/config_edit.html:224
+msgid "Google OAuth Client Id"
+msgstr ""
+
+#: cps/templates/config_edit.html:228
+msgid "Google OAuth Client Secret"
+msgstr ""
+
+#: cps/templates/config_edit.html:242
 msgid "External binaries"
 msgstr "Externa binärer"
 
-#: cps/templates/config_edit.html:195
+#: cps/templates/config_edit.html:250
 msgid "No converter"
 msgstr "Ingen konverterare"
 
-#: cps/templates/config_edit.html:197
+#: cps/templates/config_edit.html:252
 msgid "Use Kindlegen"
 msgstr "Använd Kindlegen"
 
-#: cps/templates/config_edit.html:199
+#: cps/templates/config_edit.html:254
 msgid "Use calibre's ebook converter"
 msgstr "Använd calibres e-bokkonverterare"
 
-#: cps/templates/config_edit.html:203
+#: cps/templates/config_edit.html:258
 msgid "E-Book converter settings"
 msgstr "Inställningar för e-bokkonverteraren"
 
-#: cps/templates/config_edit.html:207
+#: cps/templates/config_edit.html:262
 msgid "Path to convertertool"
 msgstr "Sökväg till convertertool"
 
-#: cps/templates/config_edit.html:213
+#: cps/templates/config_edit.html:268
 msgid "Location of Unrar binary"
 msgstr "Plats för Unrar-binär"
 
-#: cps/templates/config_edit.html:229 cps/templates/layout.html:84
+#: cps/templates/config_edit.html:284 cps/templates/layout.html:84
 #: cps/templates/login.html:4
 msgid "Login"
 msgstr "Logga in"
@@ -1266,8 +1512,7 @@ msgstr "Logga in"
 msgid "View Configuration"
 msgstr "Visa konfiguration"
 
-#: cps/templates/config_view_edit.html:19 cps/templates/layout.html:135
-#: cps/templates/layout.html:136 cps/templates/shelf_edit.html:7
+#: cps/templates/config_view_edit.html:19 cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr "Titel"
 
@@ -1279,7 +1524,7 @@ msgstr "Antal slumpmässiga böcker att visa"
 msgid "No. of authors to show before hiding (0=disable hiding)"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:118
+#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:112
 msgid "Theme"
 msgstr "Tema"
 
@@ -1311,127 +1556,91 @@ msgstr "Taggar för vuxeninnehåll"
 msgid "Default settings for new users"
 msgstr "Standardinställningar för nya användare"
 
-#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:104
+#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:83
 msgid "Admin user"
 msgstr "Adminstratör användare"
 
-#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:113
+#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:92
 msgid "Allow Downloads"
 msgstr "Tillåt Hämtningar"
 
-#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:117
+#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:96
+msgid "Allow book viewer"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:100
 msgid "Allow Uploads"
 msgstr "Tillåt Uppladdningar"
 
-#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:121
+#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:104
 msgid "Allow Edit"
 msgstr "Tillåt Redigera"
 
-#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:125
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:108
 msgid "Allow Delete books"
 msgstr "Tillåt Ta bort böcker"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:130
+#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:113
 msgid "Allow Changing Password"
 msgstr "Tillåt Ändra lösenord"
 
-#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:134
+#: cps/templates/config_view_edit.html:109 cps/templates/user_edit.html:117
 msgid "Allow Editing Public Shelfs"
 msgstr "Tillåt Redigering av offentliga hyllor"
 
-#: cps/templates/config_view_edit.html:115
+#: cps/templates/config_view_edit.html:119
 msgid "Default visibilities for new users"
 msgstr "Standardvisibiliteter för nya användare"
 
-#: cps/templates/config_view_edit.html:123 cps/templates/user_edit.html:50
-msgid "Show random books"
-msgstr "Visa slumpmässiga böcker"
-
-#: cps/templates/config_view_edit.html:127 cps/templates/user_edit.html:54
-msgid "Show recent books"
-msgstr "Visa senaste böcker"
-
-#: cps/templates/config_view_edit.html:131 cps/templates/user_edit.html:58
-msgid "Show sorted books"
-msgstr "Visa sorterade böcker"
-
-#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:62
-msgid "Show hot books"
-msgstr "Visa heta böcker"
-
-#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:66
-msgid "Show best rated books"
-msgstr "Visa böcker med bästa betyg"
-
-#: cps/templates/config_view_edit.html:143 cps/templates/user_edit.html:70
-msgid "Show language selection"
-msgstr "Visa språkval"
-
-#: cps/templates/config_view_edit.html:147 cps/templates/user_edit.html:74
-msgid "Show series selection"
-msgstr "Visa serieval"
-
-#: cps/templates/config_view_edit.html:151 cps/templates/user_edit.html:78
-msgid "Show category selection"
-msgstr "Visa kategorival"
-
-#: cps/templates/config_view_edit.html:155 cps/templates/user_edit.html:82
-msgid "Show author selection"
-msgstr "Visa författarval"
-
-#: cps/templates/config_view_edit.html:159 cps/templates/user_edit.html:86
-msgid "Show publisher selection"
-msgstr "Visa urval av förlag"
-
-#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:91
-msgid "Show read and unread"
-msgstr "Visa lästa och olästa"
-
-#: cps/templates/config_view_edit.html:167 cps/templates/user_edit.html:96
+#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:75
 msgid "Show random books in detail view"
 msgstr "Visa slumpmässiga böcker i detaljvyn"
 
-#: cps/templates/config_view_edit.html:171 cps/templates/user_edit.html:109
+#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:88
 msgid "Show mature content"
 msgstr "Visa vuxeninnehåll"
 
-#: cps/templates/detail.html:63
+#: cps/templates/detail.html:59
 msgid "Read in browser"
 msgstr "Läs i webbläsaren"
 
-#: cps/templates/detail.html:100
+#: cps/templates/detail.html:73
+msgid "Listen in browser"
+msgstr ""
+
+#: cps/templates/detail.html:120
 msgid "Book"
 msgstr "Bok"
 
-#: cps/templates/detail.html:100
+#: cps/templates/detail.html:120
 msgid "of"
 msgstr "av"
 
-#: cps/templates/detail.html:106
+#: cps/templates/detail.html:126
 msgid "language"
 msgstr "språk"
 
-#: cps/templates/detail.html:185
+#: cps/templates/detail.html:203
 msgid "Mark As Unread"
 msgstr ""
 
-#: cps/templates/detail.html:185
+#: cps/templates/detail.html:203
 msgid "Mark As Read"
 msgstr ""
 
-#: cps/templates/detail.html:186
+#: cps/templates/detail.html:204
 msgid "Read"
 msgstr "Läst"
 
-#: cps/templates/detail.html:196
+#: cps/templates/detail.html:214 cps/templates/listenmp3.html:54
 msgid "Description:"
 msgstr "Beskrivning:"
 
-#: cps/templates/detail.html:209 cps/templates/search.html:14
+#: cps/templates/detail.html:227 cps/templates/search.html:14
 msgid "Add to shelf"
 msgstr "Lägg till hyllan"
 
-#: cps/templates/detail.html:271
+#: cps/templates/detail.html:289
 msgid "Edit metadata"
 msgstr "Redigera metadata"
 
@@ -1491,12 +1700,12 @@ msgstr "Lägg till"
 msgid "Do you really want to delete this domain rule?"
 msgstr "Är du säker på att du vill ta bort den här domänregeln?"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:210
+#: cps/templates/feed.xml:21 cps/templates/layout.html:171
 msgid "Next"
 msgstr "Nästa"
 
-#: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:44 cps/templates/layout.html:45
+#: cps/templates/feed.xml:33 cps/templates/layout.html:44
+#: cps/templates/layout.html:45
 msgid "Search"
 msgstr "Sök"
 
@@ -1508,75 +1717,63 @@ msgstr "Tillbaka till hemmet"
 msgid "Discover (Random Books)"
 msgstr "Upptäck (slumpmässiga böcker)"
 
+#: cps/templates/index.html:65
+msgid "Group by series"
+msgstr ""
+
 #: cps/templates/index.xml:6
 msgid "Start"
 msgstr "Starta"
 
-#: cps/templates/index.xml:18 cps/templates/layout.html:141
-msgid "Hot Books"
-msgstr "Heta böcker"
-
-#: cps/templates/index.xml:22
+#: cps/templates/index.xml:21
 msgid "Popular publications from this catalog based on Downloads."
 msgstr "Populära publikationer från den här katalogen baserad på hämtningar."
 
-#: cps/templates/index.xml:25 cps/templates/layout.html:144
-msgid "Best rated Books"
-msgstr "Bäst rankade böcker"
-
-#: cps/templates/index.xml:29
+#: cps/templates/index.xml:28
 msgid "Popular publications from this catalog based on Rating."
 msgstr "Populära publikationer från den här katalogen baserad på betyg."
 
-#: cps/templates/index.xml:32
+#: cps/templates/index.xml:31
 msgid "New Books"
 msgstr "Nya böcker"
 
-#: cps/templates/index.xml:36
+#: cps/templates/index.xml:35
 msgid "The latest Books"
 msgstr "De senaste böckerna"
 
-#: cps/templates/index.xml:43
+#: cps/templates/index.xml:42
 msgid "Show Random Books"
 msgstr "Visa slumpmässiga böcker"
 
-#: cps/templates/index.xml:62 cps/templates/layout.html:162
-msgid "Authors"
-msgstr "Författare"
-
-#: cps/templates/index.xml:66
+#: cps/templates/index.xml:65
 msgid "Books ordered by Author"
 msgstr "Böcker ordnade efter författare"
 
-#: cps/templates/index.xml:69 cps/templates/layout.html:165
-msgid "Publishers"
-msgstr "Förlag"
-
-#: cps/templates/index.xml:73
+#: cps/templates/index.xml:72
 msgid "Books ordered by publisher"
 msgstr "Böcker ordnade efter förlag"
 
-#: cps/templates/index.xml:80
+#: cps/templates/index.xml:79
 msgid "Books ordered by category"
 msgstr "Böcker ordnade efter kategori"
 
-#: cps/templates/index.xml:87
+#: cps/templates/index.xml:86
 msgid "Books ordered by series"
 msgstr "Böcker ordnade efter serier"
 
-#: cps/templates/index.xml:90 cps/templates/layout.html:171
+#: cps/templates/index.xml:89 cps/templates/layout.html:132
 msgid "Public Shelves"
 msgstr "Offentliga hyllor"
 
-#: cps/templates/index.xml:94
+#: cps/templates/index.xml:93
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr "Böcker organiserade i offentliga hyllor, synliga för alla"
 
-#: cps/templates/index.xml:98 cps/templates/layout.html:175
+#: cps/templates/index.xml:97 cps/templates/layout.html:136
 msgid "Your Shelves"
 msgstr "Dina hyllor"
 
-#: cps/templates/index.xml:102
+#: cps/templates/index.xml:101
 msgid "User's own shelfs, only visible to the current user himself"
 msgstr "Användarens egna hyllor, endast synliga för den aktuella användaren själv"
 
@@ -1593,7 +1790,7 @@ msgid "Advanced Search"
 msgstr "Avancerad sökning"
 
 #: cps/templates/layout.html:76 cps/templates/read.html:71
-#: cps/templates/readcbr.html:89 cps/templates/readcbr.html:113
+#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
 msgid "Settings"
 msgstr "Inställningar"
 
@@ -1609,7 +1806,7 @@ msgstr "Logga ut"
 msgid "Register"
 msgstr "Registrera"
 
-#: cps/templates/layout.html:111 cps/templates/layout.html:257
+#: cps/templates/layout.html:111 cps/templates/layout.html:218
 msgid "Uploading..."
 msgstr "Laddar upp..."
 
@@ -1621,68 +1818,27 @@ msgstr "uppdatera inte sidan"
 msgid "Browse"
 msgstr "Bläddra"
 
-#: cps/templates/layout.html:124
-msgid "Recently Added"
-msgstr "Nyligen tillagda"
-
-#: cps/templates/layout.html:129
-msgid "Sorted Books"
-msgstr "Sorterade böcker"
-
-#: cps/templates/layout.html:133 cps/templates/layout.html:134
-#: cps/templates/layout.html:135 cps/templates/layout.html:136
-msgid "Sort By"
-msgstr "Sortera efter"
-
-#: cps/templates/layout.html:133
-msgid "Newest"
-msgstr "Nyast"
-
-#: cps/templates/layout.html:134
-msgid "Oldest"
-msgstr "Äldst"
-
-#: cps/templates/layout.html:135
-msgid "Ascending"
-msgstr "Stigande"
-
-#: cps/templates/layout.html:136
-msgid "Descending"
-msgstr "Fallande"
-
-#: cps/templates/layout.html:153
-msgid "Discover"
-msgstr "Upptäck"
-
-#: cps/templates/layout.html:156
-msgid "Categories"
-msgstr "Kategorier"
-
-#: cps/templates/layout.html:168 cps/templates/search_form.html:74
-msgid "Languages"
-msgstr "Språk"
-
-#: cps/templates/layout.html:180
+#: cps/templates/layout.html:141
 msgid "Create a Shelf"
 msgstr "Skapa en hylla"
 
-#: cps/templates/layout.html:181 cps/templates/stats.html:3
+#: cps/templates/layout.html:142 cps/templates/stats.html:3
 msgid "About"
 msgstr "Om"
 
-#: cps/templates/layout.html:195
+#: cps/templates/layout.html:156
 msgid "Previous"
 msgstr "Föregående"
 
-#: cps/templates/layout.html:222
+#: cps/templates/layout.html:183
 msgid "Book Details"
 msgstr "Bokdetaljer"
 
-#: cps/templates/layout.html:256
+#: cps/templates/layout.html:217
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:259
+#: cps/templates/layout.html:220
 msgid "Error"
 msgstr ""
 
@@ -1712,105 +1868,105 @@ msgstr "Calibre-Web e-bokkatalog"
 msgid "Reflow text when sidebars are open."
 msgstr "Fyll i texten igen när sidofält är öppna."
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:88
 msgid "Keyboard Shortcuts"
 msgstr "Kortkommandon"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:91
 msgid "Previous Page"
 msgstr "Föregående sida"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:92
 msgid "Next Page"
 msgstr "Nästa sida"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:93
 msgid "Scale to Best"
 msgstr "Skala till bäst"
 
-#: cps/templates/readcbr.html:100
+#: cps/templates/readcbr.html:94
 msgid "Scale to Width"
 msgstr "Skala till bredd"
 
-#: cps/templates/readcbr.html:101
+#: cps/templates/readcbr.html:95
 msgid "Scale to Height"
 msgstr "Skala till höjd"
 
-#: cps/templates/readcbr.html:102
+#: cps/templates/readcbr.html:96
 msgid "Scale to Native"
 msgstr "Skala till ursprunglig"
 
-#: cps/templates/readcbr.html:103
+#: cps/templates/readcbr.html:97
 msgid "Rotate Right"
 msgstr "Rotera åt höger"
 
-#: cps/templates/readcbr.html:104
+#: cps/templates/readcbr.html:98
 msgid "Rotate Left"
 msgstr "Rotera åt vänster"
 
-#: cps/templates/readcbr.html:105
+#: cps/templates/readcbr.html:99
 msgid "Flip Image"
 msgstr "Vänd bilden"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:115
 msgid "Light"
 msgstr "Ljust"
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:116
 msgid "Dark"
 msgstr "Mörkt"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:121
 msgid "Scale"
 msgstr "Skala"
 
-#: cps/templates/readcbr.html:130
+#: cps/templates/readcbr.html:124
 msgid "Best"
 msgstr "Bäst"
 
-#: cps/templates/readcbr.html:131
+#: cps/templates/readcbr.html:125
 msgid "Width"
 msgstr "Bredd"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:126
 msgid "Height"
 msgstr "Höjd"
 
-#: cps/templates/readcbr.html:133
+#: cps/templates/readcbr.html:127
 msgid "Native"
 msgstr "Ursprunglig"
 
-#: cps/templates/readcbr.html:138
+#: cps/templates/readcbr.html:132
 msgid "Rotate"
 msgstr "Rotera"
 
-#: cps/templates/readcbr.html:149
+#: cps/templates/readcbr.html:143
 msgid "Flip"
 msgstr "Vänd"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:146
 msgid "Horizontal"
 msgstr "Horisontell"
 
-#: cps/templates/readcbr.html:153
+#: cps/templates/readcbr.html:147
 msgid "Vertical"
 msgstr "Vertikal"
 
-#: cps/templates/readcbr.html:158
+#: cps/templates/readcbr.html:152
 msgid "Direction"
 msgstr ""
 
-#: cps/templates/readcbr.html:161
+#: cps/templates/readcbr.html:155
 msgid "Left to Right"
 msgstr ""
 
-#: cps/templates/readcbr.html:162
+#: cps/templates/readcbr.html:156
 msgid "Right to Left"
 msgstr ""
 
 #: cps/templates/readpdf.html:29
-msgid "PDF.js viewer"
-msgstr "PDF.js visare"
+msgid "PDF reader"
+msgstr ""
 
 #: cps/templates/readtxt.html:6
 msgid "Basic txt Reader"
@@ -1884,23 +2040,23 @@ msgstr "Betyg större än"
 msgid "Rating less than"
 msgstr "Betyg mindre än"
 
-#: cps/templates/shelf.html:7
+#: cps/templates/shelf.html:10
 msgid "Delete this Shelf"
 msgstr "Ta bort den här hyllan"
 
-#: cps/templates/shelf.html:8
+#: cps/templates/shelf.html:11
 msgid "Edit Shelf"
 msgstr "Redigera hyllan"
 
-#: cps/templates/shelf.html:9 cps/templates/shelf_order.html:11
+#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:11
 msgid "Change order"
 msgstr "Ändra ordningen"
 
-#: cps/templates/shelf.html:68
+#: cps/templates/shelf.html:67
 msgid "Do you really want to delete the shelf?"
 msgstr "Är du säker på att du vill ta bort hyllan?"
 
-#: cps/templates/shelf.html:71
+#: cps/templates/shelf.html:70
 msgid "Shelf will be lost for everybody and forever!"
 msgstr "Hylla kommer att gå förlorad för alla och för alltid!"
 
@@ -1988,19 +2144,31 @@ msgstr "Återställ användarlösenordet"
 msgid "Kindle E-Mail"
 msgstr "Kindle e-post"
 
-#: cps/templates/user_edit.html:39
+#: cps/templates/user_edit.html:40
 msgid "Show books with language"
 msgstr "Visa böcker med språk"
 
-#: cps/templates/user_edit.html:41
+#: cps/templates/user_edit.html:42
 msgid "Show all"
 msgstr "Visa alla"
 
-#: cps/templates/user_edit.html:141
+#: cps/templates/user_edit.html:52
+msgid "OAuth Settings"
+msgstr ""
+
+#: cps/templates/user_edit.html:54
+msgid "Link"
+msgstr ""
+
+#: cps/templates/user_edit.html:56
+msgid "Unlink"
+msgstr ""
+
+#: cps/templates/user_edit.html:124
 msgid "Delete this user"
 msgstr "Ta bort den här användaren"
 
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:139
 msgid "Recent Downloads"
 msgstr "Senaste hämtningar"
 
@@ -2082,3 +2250,45 @@ msgstr "Senaste hämtningar"
 #~ msgid "Using your another device, login and visit "
 #~ msgstr ""
 
+#~ msgid "Newest Books"
+#~ msgstr "Nyaste böcker"
+
+#~ msgid "Oldest Books"
+#~ msgstr "Äldsta böcker"
+
+#~ msgid "Books (A-Z)"
+#~ msgstr "Böcker (A-Ö)"
+
+#~ msgid "Books (Z-A)"
+#~ msgstr "Böcker (Ö-A)"
+
+#~ msgid "Error opening eBook. Fileformat is not supported."
+#~ msgstr ""
+
+#~ msgid "File %(title)s"
+#~ msgstr ""
+
+#~ msgid "Show sorted books"
+#~ msgstr "Visa sorterade böcker"
+
+#~ msgid "Sorted Books"
+#~ msgstr "Sorterade böcker"
+
+#~ msgid "Sort By"
+#~ msgstr "Sortera efter"
+
+#~ msgid "Newest"
+#~ msgstr "Nyast"
+
+#~ msgid "Oldest"
+#~ msgstr "Äldst"
+
+#~ msgid "Ascending"
+#~ msgstr "Stigande"
+
+#~ msgid "Descending"
+#~ msgstr "Fallande"
+
+#~ msgid "PDF.js viewer"
+#~ msgstr "PDF.js visare"
+
diff --git a/cps/translations/uk/LC_MESSAGES/messages.mo b/cps/translations/uk/LC_MESSAGES/messages.mo
index e839f5e0..2104efe9 100644
Binary files a/cps/translations/uk/LC_MESSAGES/messages.mo and b/cps/translations/uk/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/uk/LC_MESSAGES/messages.po b/cps/translations/uk/LC_MESSAGES/messages.po
index cf09d5d6..07114412 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-05-30 09:06+0200\n"
+"POT-Creation-Date: 2019-05-31 11:20+0200\n"
 "PO-Revision-Date: 2017-04-30 00:47+0300\n"
 "Last-Translator: ABIS Team <biblio.if.abis@gmail.com>\n"
 "Language: uk\n"
@@ -17,740 +17,929 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.6.0\n"
 
-#: cps/book_formats.py:199 cps/book_formats.py:200 cps/book_formats.py:204
-#: cps/book_formats.py:208 cps/book_formats.py:212 cps/converter.py:29
-#: cps/converter.py:45
-msgid "not installed"
-msgstr "не встановлено"
-
-#: cps/converter.py:40 cps/converter.py:56
-msgid "Excecution permissions missing"
-msgstr "Відсутній дозвіл на виконання"
-
-#: cps/converter.py:66
-msgid "not configured"
-msgstr ""
-
-#: cps/helper.py:79
-#, python-format
-msgid "%(format)s format not found for book id: %(book)d"
-msgstr ""
-
-#: cps/helper.py:91
-#, python-format
-msgid "%(format)s not found on Google Drive: %(fn)s"
-msgstr ""
-
-#: cps/helper.py:98 cps/helper.py:204 cps/templates/detail.html:45
-#: cps/templates/detail.html:49
-msgid "Send to Kindle"
-msgstr "Відправити на Kindle"
-
-#: cps/helper.py:99 cps/helper.py:117 cps/helper.py:206
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr ""
-
-#: cps/helper.py:110
-#, python-format
-msgid "%(format)s not found: %(fn)s"
-msgstr ""
-
-#: cps/helper.py:115
-msgid "Calibre-Web test e-mail"
-msgstr ""
-
-#: cps/helper.py:116
-msgid "Test e-mail"
-msgstr ""
-
-#: cps/helper.py:132
-msgid "Get Started with Calibre-Web"
-msgstr ""
-
-#: cps/helper.py:133
-#, python-format
-msgid "Registration e-mail for user: %(name)s"
-msgstr ""
-
-#: cps/helper.py:146 cps/helper.py:148 cps/helper.py:150 cps/helper.py:158
-#: cps/helper.py:160 cps/helper.py:162
-#, python-format
-msgid "Send %(format)s to Kindle"
-msgstr ""
-
-#: cps/helper.py:166
-#, python-format
-msgid "Convert %(orig)s to %(format)s and send to Kindle"
-msgstr ""
-
-#: cps/helper.py:205
-#, python-format
-msgid "E-mail: %(book)s"
-msgstr ""
-
-#: cps/helper.py:208
-msgid "The requested file could not be read. Maybe wrong permissions?"
-msgstr ""
-
-#: cps/helper.py:316
-#, python-format
-msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr ""
-
-#: cps/helper.py:326
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr ""
-
-#: cps/helper.py:340
-#, python-format
-msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr ""
-
-#: cps/helper.py:366 cps/helper.py:376 cps/helper.py:384
-#, python-format
-msgid "File %(file)s not found on Google Drive"
-msgstr ""
-
-#: cps/helper.py:405
-#, python-format
-msgid "Book path %(path)s not found on Google Drive"
-msgstr ""
-
-#: cps/helper.py:556
-msgid "Error excecuting UnRar"
-msgstr ""
-
-#: cps/helper.py:558
-msgid "Unrar binary file not found"
-msgstr ""
-
-#: cps/helper.py:585
-msgid "Waiting"
-msgstr ""
-
-#: cps/helper.py:587
-msgid "Failed"
-msgstr ""
-
-#: cps/helper.py:589
-msgid "Started"
-msgstr ""
-
-#: cps/helper.py:591
-msgid "Finished"
-msgstr ""
-
-#: cps/helper.py:593
-msgid "Unknown Status"
-msgstr ""
-
-#: cps/helper.py:598
-msgid "E-mail: "
-msgstr ""
-
-#: cps/helper.py:600 cps/helper.py:604
-msgid "Convert: "
-msgstr ""
-
-#: cps/helper.py:602
-msgid "Upload: "
-msgstr ""
-
-#: cps/helper.py:606
-msgid "Unknown Task: "
-msgstr ""
-
-#: cps/updater.py:251 cps/updater.py:410 cps/updater.py:423
-msgid "Unexpected data while reading update information"
-msgstr ""
-
-#: cps/updater.py:258 cps/updater.py:416
-msgid "No update available. You already have the latest version installed"
-msgstr ""
-
-#: cps/updater.py:270 cps/updater.py:501 cps/updater.py:503 cps/web.py:1206
-msgid "HTTP Error"
-msgstr ""
-
-#: cps/updater.py:272 cps/updater.py:505 cps/web.py:1207
-msgid "Connection error"
-msgstr ""
-
-#: cps/updater.py:274 cps/updater.py:507 cps/web.py:1208
-msgid "Timeout while establishing connection"
-msgstr ""
-
-#: cps/updater.py:276 cps/updater.py:509 cps/web.py:1209
-msgid "General error"
-msgstr ""
-
-#: cps/updater.py:283 cps/updater.py:341 cps/updater.py:468
-msgid "A new update is available. Click on the button below to update to the latest version."
-msgstr ""
-
-#: cps/updater.py:335
-msgid "Could not fetch update information"
-msgstr ""
-
-#: cps/updater.py:403
-msgid "No release information available"
-msgstr ""
-
-#: cps/updater.py:449 cps/updater.py:458
-#, python-format
-msgid "A new update is available. Click on the button below to update to version: %(version)s"
-msgstr ""
-
-#: cps/updater.py:491 cps/web.py:2795
-msgid "Unknown"
-msgstr "Невідомий"
-
-#: cps/web.py:1199
-msgid "Requesting update package"
-msgstr "Перевірка оновлень"
-
-#: cps/web.py:1200
-msgid "Downloading update package"
-msgstr "Завантаження оновлень"
-
-#: cps/web.py:1201
-msgid "Unzipping update package"
-msgstr "Розпакування оновлення"
-
-#: cps/web.py:1202
-msgid "Replacing files"
-msgstr ""
-
-#: cps/web.py:1203
-msgid "Database connections are closed"
-msgstr "З'єднання з базою даних закрите"
-
-#: cps/web.py:1204
-msgid "Stopping server"
-msgstr ""
-
-#: cps/web.py:1205
-msgid "Update finished, please press okay and reload page"
-msgstr "Оновлення встановлені, натисніть ok і перезавантажте сторінку"
-
-#: cps/web.py:1206 cps/web.py:1207 cps/web.py:1208 cps/web.py:1209
-msgid "Update failed:"
-msgstr ""
-
-#: cps/web.py:1235
-msgid "Recently Added Books"
-msgstr "Нещодавно додані книги"
-
-#: cps/web.py:1245
-msgid "Newest Books"
-msgstr "Найновіші книги"
-
-#: cps/web.py:1257
-msgid "Oldest Books"
-msgstr "Найстаріші книги"
-
-#: cps/web.py:1269
-msgid "Books (A-Z)"
-msgstr "Книги (А-Я)"
-
-#: cps/web.py:1280
-msgid "Books (Z-A)"
-msgstr "Книги (Я-А)"
-
-#: cps/web.py:1309
-msgid "Hot Books (most downloaded)"
-msgstr "Популярні книги (найбільш завантажувані)"
-
-#: cps/web.py:1322
-msgid "Best rated books"
-msgstr "Книги з найкращим рейтингом"
-
-#: cps/templates/index.xml:39 cps/web.py:1335
-msgid "Random Books"
-msgstr "Випадковий список книг"
-
-#: cps/web.py:1362 cps/web.py:1618 cps/web.py:2161
-msgid "Error opening eBook. File does not exist or file is not accessible:"
-msgstr "Неможливо відкрити книгу. Файл не існує або немає доступу."
-
-#: cps/web.py:1391
-msgid "Publisher list"
-msgstr ""
-
-#: cps/web.py:1406
-#, python-format
-msgid "Publisher: %(name)s"
-msgstr ""
-
-#: cps/templates/index.xml:83 cps/web.py:1438
-msgid "Series list"
-msgstr "Список серій"
-
-#: cps/web.py:1452
-#, python-format
-msgid "Series: %(serie)s"
-msgstr "Серії: %(serie)s"
-
-#: cps/web.py:1478
-msgid "Available languages"
-msgstr "Доступні мови"
-
-#: cps/web.py:1498
-#, python-format
-msgid "Language: %(name)s"
-msgstr "Мова: %(name)s"
-
-#: cps/templates/index.xml:76 cps/web.py:1509
-msgid "Category list"
-msgstr "Список категорій"
-
-#: cps/web.py:1523
-#, python-format
-msgid "Category: %(name)s"
-msgstr "Категорія: %(name)s"
-
-#: cps/templates/layout.html:73 cps/web.py:1648
-msgid "Tasks"
-msgstr ""
-
-#: cps/web.py:1682
+#: cps/about.py:76
 msgid "Statistics"
 msgstr "Статистика"
 
-#: cps/web.py:1750
-msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
-msgstr ""
-
-#: cps/web.py:1795
-msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
-msgstr "Домен зворотнього зв'язку не підтверджено. Виконайте дії для підтвердження домену, будь-ласка"
-
-#: cps/web.py:1871
+#: cps/admin.py:97
 msgid "Server restarted, please reload page"
 msgstr "Сервер перезавантажено, будь-ласка, перезавантажте сторінку"
 
-#: cps/web.py:1874
+#: cps/admin.py:100
 msgid "Performing shutdown of server, please close window"
 msgstr "Виконується зупинка серверу, будь-ласка, закрийте вікно"
 
-#: cps/web.py:1953
-msgid "Published after "
-msgstr ""
+#: cps/admin.py:120 cps/updater.py:445
+msgid "Unknown"
+msgstr "Невідомий"
 
-#: cps/web.py:1960
-msgid "Published before "
-msgstr "Опубліковано до"
-
-#: cps/web.py:1974
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr ""
-
-#: cps/web.py:1976
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr ""
-
-#: cps/web.py:2036 cps/web.py:2045
-msgid "search"
-msgstr "пошук"
-
-#: cps/templates/index.xml:47 cps/templates/index.xml:51
-#: cps/templates/layout.html:148 cps/web.py:2116
-msgid "Read Books"
-msgstr "Прочитані книги"
-
-#: cps/templates/index.xml:55 cps/templates/index.xml:59
-#: cps/templates/layout.html:150 cps/web.py:2119
-msgid "Unread Books"
-msgstr "Непрочитані книги"
-
-#: cps/web.py:2171 cps/web.py:2173 cps/web.py:2175 cps/web.py:2187
-msgid "Read a Book"
-msgstr "Читати книгу"
-
-#: cps/web.py:2199
-msgid "Error opening eBook. Fileformat is not supported."
-msgstr ""
-
-#: cps/web.py:2249 cps/web.py:3170
-msgid "Please fill out all fields!"
-msgstr "Будь-ласка, заповніть всі поля!"
-
-#: cps/web.py:2250 cps/web.py:2272 cps/web.py:2276 cps/web.py:2281
-#: cps/web.py:2283
-msgid "register"
-msgstr "зареєструватись"
-
-#: cps/web.py:2271 cps/web.py:3389
-msgid "An unknown error occurred. Please try again later."
-msgstr ""
-
-#: cps/web.py:2274
-msgid "Your e-mail is not allowed to register"
-msgstr ""
-
-#: cps/web.py:2277
-msgid "Confirmation e-mail was send to your e-mail account."
-msgstr ""
-
-#: cps/web.py:2280
-msgid "This username or e-mail address is already in use."
-msgstr ""
-
-#: cps/web.py:2297 cps/web.py:2393
-#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
-msgstr "Ви увійшли як користувач: '%(nickname)s'"
-
-#: cps/web.py:2302
-msgid "Wrong Username or Password"
-msgstr "Помилка в імені користувача або паролі"
-
-#: cps/web.py:2308 cps/web.py:2329
-msgid "login"
-msgstr "увійти"
-
-#: cps/web.py:2341 cps/web.py:2372
-msgid "Token not found"
-msgstr "Токен не знайдено"
-
-#: cps/web.py:2349 cps/web.py:2380
-msgid "Token has expired"
-msgstr "Час дії токено вичерпано"
-
-#: cps/web.py:2357
-msgid "Success! Please return to your device"
-msgstr "Вдалося! Будь-ласка, поверніться до вашого пристрою"
-
-#: cps/web.py:2407
-msgid "Please configure the SMTP mail settings first..."
-msgstr "Будь-ласка, спочатку сконфігуруйте параметри SMTP"
-
-#: cps/web.py:2412
-#, python-format
-msgid "Book successfully queued for sending to %(kindlemail)s"
-msgstr ""
-
-#: cps/web.py:2416
-#, python-format
-msgid "There was an error sending this book: %(res)s"
-msgstr "Помилка при відправці книги: %(res)s"
-
-#: cps/web.py:2418 cps/web.py:3223
-msgid "Please configure your kindle e-mail address first..."
-msgstr ""
-
-#: cps/web.py:2429 cps/web.py:2481
-msgid "Invalid shelf specified"
-msgstr ""
-
-#: cps/web.py:2436
-#, python-format
-msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
-msgstr ""
-
-#: cps/web.py:2444
-msgid "You are not allowed to edit public shelves"
-msgstr ""
-
-#: cps/web.py:2453
-#, python-format
-msgid "Book is already part of the shelf: %(shelfname)s"
-msgstr ""
-
-#: cps/web.py:2467
-#, python-format
-msgid "Book has been added to shelf: %(sname)s"
-msgstr "Книга додана на книжкову полицю: %(sname)s"
-
-#: cps/web.py:2486
-#, python-format
-msgid "You are not allowed to add a book to the the shelf: %(name)s"
-msgstr ""
-
-#: cps/web.py:2491
-msgid "User is not allowed to edit public shelves"
-msgstr ""
-
-#: cps/web.py:2509
-#, python-format
-msgid "Books are already part of the shelf: %(name)s"
-msgstr ""
-
-#: cps/web.py:2523
-#, python-format
-msgid "Books have been added to shelf: %(sname)s"
-msgstr ""
-
-#: cps/web.py:2525
-#, python-format
-msgid "Could not add books to shelf: %(sname)s"
-msgstr ""
-
-#: cps/web.py:2562
-#, python-format
-msgid "Book has been removed from shelf: %(sname)s"
-msgstr "Книга видалена з книжкової полиці: %(sname)s"
-
-#: cps/web.py:2568
-#, python-format
-msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
-msgstr "Вибачте, але у вас немає дозволу для видалення книги з цієї полиці"
-
-#: cps/web.py:2589 cps/web.py:2613
-#, python-format
-msgid "A shelf with the name '%(title)s' already exists."
-msgstr "Книжкова полиця з назвою '%(title)s' уже существует."
-
-#: cps/web.py:2594
-#, python-format
-msgid "Shelf %(title)s created"
-msgstr "Створена книжкова полиця %(title)s"
-
-#: cps/web.py:2596 cps/web.py:2624
-msgid "There was an error"
-msgstr "Сталась помилка"
-
-#: cps/web.py:2597 cps/web.py:2599
-msgid "create a shelf"
-msgstr "створити книжкову полицю"
-
-#: cps/web.py:2622
-#, python-format
-msgid "Shelf %(title)s changed"
-msgstr "Книжкова полиця %(title)s змінена"
-
-#: cps/web.py:2625 cps/web.py:2627
-msgid "Edit a shelf"
-msgstr "Змінити книжкову полицю"
-
-#: cps/web.py:2648
-#, python-format
-msgid "successfully deleted shelf %(name)s"
-msgstr "Книжкова полиця %(name)s видалена"
-
-#: cps/web.py:2675
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "Книжкова полиця: '%(name)s'"
-
-#: cps/web.py:2678
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "Помилка при відкриванні полиці. Полиця не існує або до неї відсутній доступ"
-
-#: cps/web.py:2709
-#, python-format
-msgid "Change order of Shelf: '%(name)s'"
-msgstr "Змінити розташування книжкової полиці '%(name)s'"
-
-#: cps/web.py:2738 cps/web.py:3176
-msgid "E-mail is not from valid domain"
-msgstr ""
-
-#: cps/web.py:2740 cps/web.py:2782 cps/web.py:2785
-#, python-format
-msgid "%(name)s's profile"
-msgstr "Профіль %(name)s"
-
-#: cps/web.py:2780
-msgid "Found an existing account for this e-mail address."
-msgstr ""
-
-#: cps/web.py:2783
-msgid "Profile updated"
-msgstr "Профіль оновлено"
-
-#: cps/web.py:2814
+#: cps/admin.py:139
 msgid "Admin page"
 msgstr "Сторінка адміністратора"
 
-#: cps/web.py:2899 cps/web.py:3079
+#: cps/admin.py:208 cps/admin.py:486
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
-#: cps/templates/admin.html:100 cps/web.py:2913
+#: cps/admin.py:222 cps/templates/admin.html:102
 msgid "UI Configuration"
 msgstr "Конфігурація інтерфейсу"
 
-#: cps/web.py:2931
+#: cps/admin.py:295
 msgid "Import of optional Google Drive requirements missing"
 msgstr "Імпорт додаткових вимог Google Drive відсутній"
 
-#: cps/web.py:2934
+#: cps/admin.py:298
 msgid "client_secrets.json is missing or not readable"
 msgstr "Неможливо зчитати client_secrets.json або він відсутній"
 
-#: cps/web.py:2939 cps/web.py:2968
+#: cps/admin.py:303 cps/admin.py:332
 msgid "client_secrets.json is not configured for web application"
 msgstr "Неможливо зконфігурувати client_secrets.json для веб-додатку"
 
-#: cps/templates/admin.html:99 cps/web.py:2971 cps/web.py:2997 cps/web.py:3009
-#: cps/web.py:3054 cps/web.py:3069 cps/web.py:3088 cps/web.py:3096
-#: cps/web.py:3112
+#: cps/admin.py:335 cps/admin.py:361 cps/admin.py:373 cps/admin.py:398
+#: cps/admin.py:426 cps/admin.py:440 cps/admin.py:463 cps/admin.py:476
+#: cps/admin.py:494 cps/admin.py:501 cps/admin.py:516
+#: cps/templates/admin.html:101
 msgid "Basic Configuration"
 msgstr "Настройки сервера"
 
-#: cps/web.py:2994
+#: cps/admin.py:358
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr "Невідомий шлях до Keyfile. Будь-ласка введіть коректний"
 
-#: cps/web.py:3006
+#: cps/admin.py:370
 msgid "Certfile location is not valid, please enter correct path"
 msgstr "Невідомий шлях до Certfile. Будь-ласка введіть коректний"
 
-#: cps/web.py:3051
+#: cps/admin.py:395
+msgid "Please enter a LDAP provider and a DN"
+msgstr ""
+
+#: cps/admin.py:423
+msgid "Please enter Github oauth credentials"
+msgstr ""
+
+#: cps/admin.py:437
+msgid "Please enter Google oauth credentials"
+msgstr ""
+
+#: cps/admin.py:460
 msgid "Logfile location is not valid, please enter correct path"
 msgstr "Невідомий шлях до Logfile. Будь-ласка введіть коректний"
 
-#: cps/web.py:3092
+#: cps/admin.py:498
 msgid "DB location is not valid, please enter correct path"
 msgstr "Невідомий шлях до БД. Будь-ласка введіть коректний"
 
-#: cps/templates/admin.html:33 cps/web.py:3172 cps/web.py:3178 cps/web.py:3194
+#: cps/admin.py:558 cps/web.py:1045
+msgid "Please fill out all fields!"
+msgstr "Будь-ласка, заповніть всі поля!"
+
+#: cps/admin.py:560 cps/admin.py:566 cps/admin.py:582
+#: cps/templates/admin.html:35
 msgid "Add new user"
 msgstr "Додати користувача"
 
-#: cps/web.py:3184
+#: cps/admin.py:564 cps/web.py:1248
+msgid "E-mail is not from valid domain"
+msgstr ""
+
+#: cps/admin.py:572
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Користувач '%(user)s' додан"
 
-#: cps/web.py:3188
+#: cps/admin.py:576
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/web.py:3218
+#: cps/admin.py:607
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:3221
+#: cps/admin.py:610
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/web.py:3225
+#: cps/admin.py:612 cps/web.py:1029
+msgid "Please configure your kindle e-mail address first..."
+msgstr ""
+
+#: cps/admin.py:614
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/web.py:3226
+#: cps/admin.py:615
 msgid "Edit e-mail server settings"
 msgstr ""
 
-#: cps/web.py:3251
+#: cps/admin.py:640
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Користувача '%(nick)s' видалено"
 
-#: cps/web.py:3364
+#: cps/admin.py:711
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Користувача '%(nick)s' оновлено"
 
-#: cps/web.py:3367
+#: cps/admin.py:714
 msgid "An unknown error occured."
 msgstr "Сталась невідома помилка"
 
-#: cps/web.py:3369
+#: cps/admin.py:717
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Змінити користувача %(nick)s"
 
-#: cps/web.py:3386
+#: cps/admin.py:733
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/web.py:3400 cps/web.py:3592
+#: cps/admin.py:736 cps/web.py:1070
+msgid "An unknown error occurred. Please try again later."
+msgstr ""
+
+#: cps/admin.py:755
+msgid "Requesting update package"
+msgstr "Перевірка оновлень"
+
+#: cps/admin.py:756
+msgid "Downloading update package"
+msgstr "Завантаження оновлень"
+
+#: cps/admin.py:757
+msgid "Unzipping update package"
+msgstr "Розпакування оновлення"
+
+#: cps/admin.py:758
+msgid "Replacing files"
+msgstr ""
+
+#: cps/admin.py:759
+msgid "Database connections are closed"
+msgstr "З'єднання з базою даних закрите"
+
+#: cps/admin.py:760
+msgid "Stopping server"
+msgstr ""
+
+#: cps/admin.py:761
+msgid "Update finished, please press okay and reload page"
+msgstr "Оновлення встановлені, натисніть ok і перезавантажте сторінку"
+
+#: cps/admin.py:762 cps/admin.py:763 cps/admin.py:764 cps/admin.py:765
+msgid "Update failed:"
+msgstr ""
+
+#: cps/admin.py:762 cps/updater.py:277 cps/updater.py:456 cps/updater.py:458
+msgid "HTTP Error"
+msgstr ""
+
+#: cps/admin.py:763 cps/updater.py:279 cps/updater.py:460
+msgid "Connection error"
+msgstr ""
+
+#: cps/admin.py:764 cps/updater.py:281 cps/updater.py:462
+msgid "Timeout while establishing connection"
+msgstr ""
+
+#: cps/admin.py:765 cps/updater.py:283 cps/updater.py:464
+msgid "General error"
+msgstr ""
+
+#: cps/converter.py:31 cps/converter.py:48 cps/uploader.py:213
+#: cps/uploader.py:214 cps/uploader.py:218 cps/uploader.py:222
+#: cps/uploader.py:226
+msgid "not installed"
+msgstr "не встановлено"
+
+#: cps/converter.py:43 cps/converter.py:60
+msgid "Excecution permissions missing"
+msgstr "Відсутній дозвіл на виконання"
+
+#: cps/converter.py:70
+msgid "not configured"
+msgstr ""
+
+#: cps/editbooks.py:218 cps/editbooks.py:432
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "Сталась помилка при відкриванні eBook. Файл не існує або відсутній доступ до нього"
 
-#: cps/web.py:3428
+#: cps/editbooks.py:246
 msgid "edit metadata"
 msgstr "змінити метадані"
 
-#: cps/web.py:3521 cps/web.py:3754
+#: cps/editbooks.py:325 cps/editbooks.py:595
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr ""
 
-#: cps/web.py:3525 cps/web.py:3757
+#: cps/editbooks.py:329 cps/editbooks.py:599
 msgid "File to be uploaded must have an extension"
 msgstr "Завантажувальний файл повинен мати розширення"
 
-#: cps/web.py:3537 cps/web.py:3776
+#: cps/editbooks.py:341 cps/editbooks.py:619
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:3542
+#: cps/editbooks.py:346
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr ""
 
-#: cps/web.py:3559
+#: cps/editbooks.py:363
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr ""
 
-#: cps/web.py:3573 cps/web.py:3646
+#: cps/editbooks.py:382
+#, python-format
+msgid "Failed to create path for cover %(path)s (Permission denied)."
+msgstr ""
+
+#: cps/editbooks.py:390
+#, python-format
+msgid "Failed to store cover-file %(cover)s."
+msgstr ""
+
+#: cps/editbooks.py:393
+msgid "Cover-file is not a valid image file"
+msgstr ""
+
+#: cps/editbooks.py:399 cps/editbooks.py:413
 msgid "Cover is not a supported imageformat (jpg/png/webp), can't save"
 msgstr ""
 
-#: cps/web.py:3605 cps/web.py:3614
+#: cps/editbooks.py:445 cps/editbooks.py:454
 msgid "unknown"
 msgstr "невідомий"
 
-#: cps/web.py:3694
+#: cps/editbooks.py:486
+msgid "Cover is not a jpg file, can't save"
+msgstr ""
+
+#: cps/editbooks.py:534
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr ""
 
-#: cps/web.py:3725
+#: cps/editbooks.py:565
 msgid "Metadata successfully updated"
 msgstr ""
 
-#: cps/web.py:3734
+#: cps/editbooks.py:574
 msgid "Error editing book, please check logfile for details"
 msgstr "Сталась помилка при редагуванні книги. Будь-ласка, перевірте лог-файл для деталей"
 
-#: cps/web.py:3780
+#: cps/editbooks.py:624
 #, python-format
 msgid "Failed to store file %(file)s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:3785
+#: cps/editbooks.py:629
 #, python-format
 msgid "Failed to delete file %(file)s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:3867
+#: cps/editbooks.py:712
 #, python-format
-msgid "File %(title)s"
+msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/web.py:3896
+#: cps/editbooks.py:741
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/web.py:3906
+#: cps/editbooks.py:751
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/web.py:3910
+#: cps/editbooks.py:755
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
 
-#: cps/worker.py:305
+#: cps/gdrive.py:56
+msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
+msgstr ""
+
+#: cps/gdrive.py:101
+msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
+msgstr "Домен зворотнього зв'язку не підтверджено. Виконайте дії для підтвердження домену, будь-ласка"
+
+#: cps/helper.py:97
+#, python-format
+msgid "%(format)s format not found for book id: %(book)d"
+msgstr ""
+
+#: cps/helper.py:109
+#, python-format
+msgid "%(format)s not found on Google Drive: %(fn)s"
+msgstr ""
+
+#: cps/helper.py:116 cps/helper.py:223 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "Відправити на Kindle"
+
+#: cps/helper.py:117 cps/helper.py:135 cps/helper.py:225
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr ""
+
+#: cps/helper.py:128
+#, python-format
+msgid "%(format)s not found: %(fn)s"
+msgstr ""
+
+#: cps/helper.py:133
+msgid "Calibre-Web test e-mail"
+msgstr ""
+
+#: cps/helper.py:134
+msgid "Test e-mail"
+msgstr ""
+
+#: cps/helper.py:150
+msgid "Get Started with Calibre-Web"
+msgstr ""
+
+#: cps/helper.py:151
+#, python-format
+msgid "Registration e-mail for user: %(name)s"
+msgstr ""
+
+#: cps/helper.py:165 cps/helper.py:167 cps/helper.py:169 cps/helper.py:177
+#: cps/helper.py:179 cps/helper.py:181
+#, python-format
+msgid "Send %(format)s to Kindle"
+msgstr ""
+
+#: cps/helper.py:185
+#, python-format
+msgid "Convert %(orig)s to %(format)s and send to Kindle"
+msgstr ""
+
+#: cps/helper.py:224
+#, python-format
+msgid "E-mail: %(book)s"
+msgstr ""
+
+#: cps/helper.py:227
+msgid "The requested file could not be read. Maybe wrong permissions?"
+msgstr ""
+
+#: cps/helper.py:335
+#, python-format
+msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr ""
+
+#: cps/helper.py:345
+#, python-format
+msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr ""
+
+#: cps/helper.py:359
+#, python-format
+msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr ""
+
+#: cps/helper.py:385 cps/helper.py:395 cps/helper.py:403
+#, python-format
+msgid "File %(file)s not found on Google Drive"
+msgstr ""
+
+#: cps/helper.py:424
+#, python-format
+msgid "Book path %(path)s not found on Google Drive"
+msgstr ""
+
+#: cps/helper.py:584
+msgid "Error excecuting UnRar"
+msgstr ""
+
+#: cps/helper.py:586
+msgid "Unrar binary file not found"
+msgstr ""
+
+#: cps/helper.py:614
+msgid "Waiting"
+msgstr ""
+
+#: cps/helper.py:616
+msgid "Failed"
+msgstr ""
+
+#: cps/helper.py:618
+msgid "Started"
+msgstr ""
+
+#: cps/helper.py:620
+msgid "Finished"
+msgstr ""
+
+#: cps/helper.py:622
+msgid "Unknown Status"
+msgstr ""
+
+#: cps/helper.py:627
+msgid "E-mail: "
+msgstr ""
+
+#: cps/helper.py:629 cps/helper.py:633
+msgid "Convert: "
+msgstr ""
+
+#: cps/helper.py:631
+msgid "Upload: "
+msgstr ""
+
+#: cps/helper.py:635
+msgid "Unknown Task: "
+msgstr ""
+
+#: cps/oauth_bb.py:87
+#, python-format
+msgid "Register with %s, "
+msgstr ""
+
+#: cps/oauth_bb.py:145
+msgid "Failed to log in with GitHub."
+msgstr ""
+
+#: cps/oauth_bb.py:150
+msgid "Failed to fetch user info from GitHub."
+msgstr ""
+
+#: cps/oauth_bb.py:161
+msgid "Failed to log in with Google."
+msgstr ""
+
+#: cps/oauth_bb.py:166
+msgid "Failed to fetch user info from Google."
+msgstr ""
+
+#: cps/oauth_bb.py:265
+#, python-format
+msgid "Unlink to %(oauth)s success."
+msgstr ""
+
+#: cps/oauth_bb.py:269
+#, python-format
+msgid "Unlink to %(oauth)s failed."
+msgstr ""
+
+#: cps/oauth_bb.py:272
+#, python-format
+msgid "Not linked to %(oauth)s."
+msgstr ""
+
+#: cps/oauth_bb.py:300
+msgid "GitHub Oauth error, please retry later."
+msgstr ""
+
+#: cps/oauth_bb.py:319
+msgid "Google Oauth error, please retry later."
+msgstr ""
+
+#: cps/shelf.py:40 cps/shelf.py:92
+msgid "Invalid shelf specified"
+msgstr ""
+
+#: cps/shelf.py:47
+#, python-format
+msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
+msgstr ""
+
+#: cps/shelf.py:55
+msgid "You are not allowed to edit public shelves"
+msgstr ""
+
+#: cps/shelf.py:64
+#, python-format
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr ""
+
+#: cps/shelf.py:78
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "Книга додана на книжкову полицю: %(sname)s"
+
+#: cps/shelf.py:97
+#, python-format
+msgid "You are not allowed to add a book to the the shelf: %(name)s"
+msgstr ""
+
+#: cps/shelf.py:102
+msgid "User is not allowed to edit public shelves"
+msgstr ""
+
+#: cps/shelf.py:120
+#, python-format
+msgid "Books are already part of the shelf: %(name)s"
+msgstr ""
+
+#: cps/shelf.py:134
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr ""
+
+#: cps/shelf.py:136
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr ""
+
+#: cps/shelf.py:173
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "Книга видалена з книжкової полиці: %(sname)s"
+
+#: cps/shelf.py:179
+#, python-format
+msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
+msgstr "Вибачте, але у вас немає дозволу для видалення книги з цієї полиці"
+
+#: cps/shelf.py:200 cps/shelf.py:224
+#, python-format
+msgid "A shelf with the name '%(title)s' already exists."
+msgstr "Книжкова полиця з назвою '%(title)s' уже существует."
+
+#: cps/shelf.py:205
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "Створена книжкова полиця %(title)s"
+
+#: cps/shelf.py:207 cps/shelf.py:235
+msgid "There was an error"
+msgstr "Сталась помилка"
+
+#: cps/shelf.py:208 cps/shelf.py:210
+msgid "create a shelf"
+msgstr "створити книжкову полицю"
+
+#: cps/shelf.py:233
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "Книжкова полиця %(title)s змінена"
+
+#: cps/shelf.py:236 cps/shelf.py:238
+msgid "Edit a shelf"
+msgstr "Змінити книжкову полицю"
+
+#: cps/shelf.py:259
+#, python-format
+msgid "successfully deleted shelf %(name)s"
+msgstr "Книжкова полиця %(name)s видалена"
+
+#: cps/shelf.py:289
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "Книжкова полиця: '%(name)s'"
+
+#: cps/shelf.py:292
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "Помилка при відкриванні полиці. Полиця не існує або до неї відсутній доступ"
+
+#: cps/shelf.py:324
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "Змінити розташування книжкової полиці '%(name)s'"
+
+#: cps/ub.py:111
+msgid "Recently Added"
+msgstr "Останні додані"
+
+#: cps/ub.py:113
+msgid "Show recent books"
+msgstr "Показувати останні книги"
+
+#: cps/templates/index.xml:17 cps/ub.py:114
+msgid "Hot Books"
+msgstr "Популярні книги"
+
+#: cps/ub.py:115
+msgid "Show hot books"
+msgstr "Показувати популярні книги"
+
+#: cps/templates/index.xml:24 cps/ub.py:118
+msgid "Best rated Books"
+msgstr "Книги з найкращим рейтингом"
+
+#: cps/ub.py:120
+msgid "Show best rated books"
+msgstr "Показувати книги з найвищим рейтингом"
+
+#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:121
+#: cps/web.py:965
+msgid "Read Books"
+msgstr "Прочитані книги"
+
+#: cps/ub.py:123
+msgid "Show read and unread"
+msgstr "Показувати прочитані та непрочитані книги"
+
+#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:125
+#: cps/web.py:969
+msgid "Unread Books"
+msgstr "Непрочитані книги"
+
+#: cps/ub.py:127
+msgid "Show unread"
+msgstr ""
+
+#: cps/ub.py:128
+msgid "Discover"
+msgstr "Огляд"
+
+#: cps/ub.py:130
+msgid "Show random books"
+msgstr "Показувати випадкові книги"
+
+#: cps/ub.py:131
+msgid "Categories"
+msgstr "Категорії"
+
+#: cps/ub.py:133
+msgid "Show category selection"
+msgstr "Показувати вибір категорії"
+
+#: cps/templates/book_edit.html:71 cps/templates/search_form.html:53
+#: cps/ub.py:134
+msgid "Series"
+msgstr "Серії"
+
+#: cps/ub.py:136
+msgid "Show series selection"
+msgstr "Показувати вибір серії"
+
+#: cps/templates/index.xml:61 cps/ub.py:137
+msgid "Authors"
+msgstr "Автори"
+
+#: cps/ub.py:139
+msgid "Show author selection"
+msgstr "Показувати вибір автора"
+
+#: cps/templates/index.xml:68 cps/ub.py:141
+msgid "Publishers"
+msgstr ""
+
+#: cps/ub.py:143
+msgid "Show publisher selection"
+msgstr ""
+
+#: cps/templates/search_form.html:74 cps/ub.py:144
+msgid "Languages"
+msgstr "Мови"
+
+#: cps/ub.py:147
+msgid "Show language selection"
+msgstr "Показувати вибір мови"
+
+#: cps/ub.py:148
+msgid "Ratings"
+msgstr ""
+
+#: cps/ub.py:150
+msgid "Show ratings selection"
+msgstr ""
+
+#: cps/ub.py:151
+msgid "File formats"
+msgstr ""
+
+#: cps/ub.py:153
+msgid "Show file formats selection"
+msgstr ""
+
+#: cps/updater.py:257 cps/updater.py:364 cps/updater.py:377
+msgid "Unexpected data while reading update information"
+msgstr ""
+
+#: cps/updater.py:264 cps/updater.py:370
+msgid "No update available. You already have the latest version installed"
+msgstr ""
+
+#: cps/updater.py:290 cps/updater.py:422
+msgid "A new update is available. Click on the button below to update to the latest version."
+msgstr ""
+
+#: cps/updater.py:343
+msgid "Could not fetch update information"
+msgstr ""
+
+#: cps/updater.py:357
+msgid "No release information available"
+msgstr ""
+
+#: cps/updater.py:403 cps/updater.py:412
+#, python-format
+msgid "A new update is available. Click on the button below to update to version: %(version)s"
+msgstr ""
+
+#: cps/web.py:457
+msgid "Recently Added Books"
+msgstr "Нещодавно додані книги"
+
+#: cps/web.py:484
+msgid "Best rated books"
+msgstr "Книги з найкращим рейтингом"
+
+#: cps/templates/index.xml:38 cps/web.py:492
+msgid "Random Books"
+msgstr "Випадковий список книг"
+
+#: cps/web.py:516
+msgid "Books"
+msgstr ""
+
+#: cps/web.py:543
+msgid "Hot Books (most downloaded)"
+msgstr "Популярні книги (найбільш завантажувані)"
+
+#: cps/web.py:553 cps/web.py:1294 cps/web.py:1383
+msgid "Error opening eBook. File does not exist or file is not accessible:"
+msgstr "Неможливо відкрити книгу. Файл не існує або немає доступу."
+
+#: cps/web.py:580
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr ""
+
+#: cps/web.py:591
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "Серії: %(serie)s"
+
+#: cps/web.py:602
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr ""
+
+#: cps/web.py:613
+#, python-format
+msgid "File format: %(format)s"
+msgstr ""
+
+#: cps/web.py:625
+#, python-format
+msgid "Category: %(name)s"
+msgstr "Категорія: %(name)s"
+
+#: cps/web.py:659
+msgid "Publisher list"
+msgstr ""
+
+#: cps/templates/index.xml:82 cps/web.py:675
+msgid "Series list"
+msgstr "Список серій"
+
+#: cps/web.py:689
+msgid "Ratings list"
+msgstr ""
+
+#: cps/web.py:702
+msgid "File formats list"
+msgstr ""
+
+#: cps/web.py:730
+msgid "Available languages"
+msgstr "Доступні мови"
+
+#: cps/web.py:750
+#, python-format
+msgid "Language: %(name)s"
+msgstr "Мова: %(name)s"
+
+#: cps/templates/index.xml:75 cps/web.py:764
+msgid "Category list"
+msgstr "Список категорій"
+
+#: cps/templates/layout.html:73 cps/web.py:777
+msgid "Tasks"
+msgstr ""
+
+#: cps/web.py:841
+msgid "Published after "
+msgstr ""
+
+#: cps/web.py:848
+msgid "Published before "
+msgstr "Опубліковано до"
+
+#: cps/web.py:862
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr ""
+
+#: cps/web.py:864
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr ""
+
+#: cps/web.py:924 cps/web.py:933
+msgid "search"
+msgstr "пошук"
+
+#: cps/web.py:1018
+msgid "Please configure the SMTP mail settings first..."
+msgstr "Будь-ласка, спочатку сконфігуруйте параметри SMTP"
+
+#: cps/web.py:1023
+#, python-format
+msgid "Book successfully queued for sending to %(kindlemail)s"
+msgstr ""
+
+#: cps/web.py:1027
+#, python-format
+msgid "There was an error sending this book: %(res)s"
+msgstr "Помилка при відправці книги: %(res)s"
+
+#: cps/web.py:1046 cps/web.py:1071 cps/web.py:1076 cps/web.py:1081
+#: cps/web.py:1085
+msgid "register"
+msgstr "зареєструватись"
+
+#: cps/web.py:1073
+msgid "Your e-mail is not allowed to register"
+msgstr ""
+
+#: cps/web.py:1077
+msgid "Confirmation e-mail was send to your e-mail account."
+msgstr ""
+
+#: cps/web.py:1080
+msgid "This username or e-mail address is already in use."
+msgstr ""
+
+#: cps/web.py:1103 cps/web.py:1115
+#, python-format
+msgid "You are now logged in as: '%(nickname)s'"
+msgstr ""
+
+#: cps/web.py:1108 cps/web.py:1120
+msgid "Wrong Username or Password"
+msgstr "Помилка в імені користувача або паролі"
+
+#: cps/web.py:1111
+msgid "Could not login. LDAP server down, please contact your administrator"
+msgstr ""
+
+#: cps/web.py:1124 cps/web.py:1146
+msgid "login"
+msgstr "увійти"
+
+#: cps/web.py:1158 cps/web.py:1189
+msgid "Token not found"
+msgstr "Токен не знайдено"
+
+#: cps/web.py:1166 cps/web.py:1197
+msgid "Token has expired"
+msgstr "Час дії токено вичерпано"
+
+#: cps/web.py:1174
+msgid "Success! Please return to your device"
+msgstr "Вдалося! Будь-ласка, поверніться до вашого пристрою"
+
+#: cps/web.py:1210
+#, python-format
+msgid "you are now logged in as: '%(nickname)s'"
+msgstr "Ви увійшли як користувач: '%(nickname)s'"
+
+#: cps/web.py:1250 cps/web.py:1277 cps/web.py:1281
+#, python-format
+msgid "%(name)s's profile"
+msgstr "Профіль %(name)s"
+
+#: cps/web.py:1274
+msgid "Found an existing account for this e-mail address."
+msgstr ""
+
+#: cps/web.py:1279
+msgid "Profile updated"
+msgstr "Профіль оновлено"
+
+#: cps/web.py:1304 cps/web.py:1306 cps/web.py:1308 cps/web.py:1314
+#: cps/web.py:1318
+msgid "Read a Book"
+msgstr "Читати книгу"
+
+#: cps/web.py:1328
+msgid "Error opening eBook. File does not exist or file is not accessible."
+msgstr ""
+
+#: cps/worker.py:308
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr ""
 
-#: cps/worker.py:316
+#: cps/worker.py:319
 #, python-format
 msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "Kindlegen відхилено з помилкою %(error)s. Повідомлення: %(message)s "
@@ -779,147 +968,152 @@ msgstr "DLS"
 msgid "Admin"
 msgstr "Адмін"
 
-#: cps/templates/admin.html:14 cps/templates/detail.html:22
-#: cps/templates/detail.html:31
+#: cps/templates/admin.html:14 cps/templates/detail.html:18
+#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/shelfdown.html:62
 msgid "Download"
 msgstr "Завантажити"
 
-#: cps/templates/admin.html:15 cps/templates/layout.html:65
+#: cps/templates/admin.html:15
+msgid "View Ebooks"
+msgstr ""
+
+#: cps/templates/admin.html:16 cps/templates/layout.html:65
 msgid "Upload"
 msgstr "Додати нову книгу"
 
-#: cps/templates/admin.html:16
+#: cps/templates/admin.html:17
 msgid "Edit"
 msgstr "Редагувати"
 
-#: cps/templates/admin.html:39
+#: cps/templates/admin.html:41
 msgid "SMTP e-mail server settings"
 msgstr ""
 
-#: cps/templates/admin.html:42 cps/templates/email_edit.html:11
+#: cps/templates/admin.html:44 cps/templates/email_edit.html:11
 msgid "SMTP hostname"
 msgstr "SMTP-сервер"
 
-#: cps/templates/admin.html:43
+#: cps/templates/admin.html:45
 msgid "SMTP port"
 msgstr "SMTP-порт"
 
-#: cps/templates/admin.html:44
+#: cps/templates/admin.html:46
 msgid "SSL"
 msgstr "SSL"
 
-#: cps/templates/admin.html:45 cps/templates/email_edit.html:27
+#: cps/templates/admin.html:47 cps/templates/email_edit.html:27
 msgid "SMTP login"
 msgstr "SMTP логін"
 
-#: cps/templates/admin.html:46
+#: cps/templates/admin.html:48
 msgid "From mail"
 msgstr "Відправник"
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:58
 msgid "Change SMTP settings"
 msgstr "Змінити налаштування SMTP"
 
-#: cps/templates/admin.html:62
+#: cps/templates/admin.html:64
 msgid "Configuration"
 msgstr "Налаштування сервера"
 
-#: cps/templates/admin.html:65
+#: cps/templates/admin.html:67
 msgid "Calibre DB dir"
 msgstr "Папка Calibre DB"
 
-#: cps/templates/admin.html:69
+#: cps/templates/admin.html:71
 msgid "Log level"
 msgstr ""
 
-#: cps/templates/admin.html:73
+#: cps/templates/admin.html:75
 msgid "Port"
 msgstr "Порт"
 
-#: cps/templates/admin.html:79 cps/templates/config_view_edit.html:23
+#: cps/templates/admin.html:81 cps/templates/config_view_edit.html:23
 msgid "Books per page"
 msgstr "Кількість книг на сторінці"
 
-#: cps/templates/admin.html:83
+#: cps/templates/admin.html:85
 msgid "Uploading"
 msgstr "Загрузка на сервер"
 
-#: cps/templates/admin.html:87
+#: cps/templates/admin.html:89
 msgid "Anonymous browsing"
 msgstr "Анонімний перегляд"
 
-#: cps/templates/admin.html:91
+#: cps/templates/admin.html:93
 msgid "Public registration"
 msgstr "Публічна реєстрація"
 
-#: cps/templates/admin.html:95 cps/templates/remote_login.html:4
+#: cps/templates/admin.html:97 cps/templates/remote_login.html:4
 msgid "Remote login"
 msgstr ""
 
-#: cps/templates/admin.html:106
+#: cps/templates/admin.html:108
 msgid "Administration"
 msgstr "Адміністрування"
 
-#: cps/templates/admin.html:107
+#: cps/templates/admin.html:109
 msgid "Reconnect to Calibre DB"
 msgstr "Повторне підключення до БД Calibre"
 
-#: cps/templates/admin.html:108
+#: cps/templates/admin.html:110
 msgid "Restart Calibre-Web"
 msgstr ""
 
-#: cps/templates/admin.html:109
+#: cps/templates/admin.html:111
 msgid "Stop Calibre-Web"
 msgstr ""
 
-#: cps/templates/admin.html:115
+#: cps/templates/admin.html:117
 msgid "Update"
 msgstr ""
 
-#: cps/templates/admin.html:119
+#: cps/templates/admin.html:121
 msgid "Version"
 msgstr ""
 
-#: cps/templates/admin.html:120
+#: cps/templates/admin.html:122
 msgid "Details"
 msgstr ""
 
-#: cps/templates/admin.html:126
+#: cps/templates/admin.html:128
 msgid "Current version"
 msgstr ""
 
-#: cps/templates/admin.html:132
+#: cps/templates/admin.html:134
 msgid "Check for update"
 msgstr "Перевірка оновлень"
 
-#: cps/templates/admin.html:133
+#: cps/templates/admin.html:135
 msgid "Perform Update"
 msgstr "Встановити оновлення"
 
-#: cps/templates/admin.html:145
+#: cps/templates/admin.html:147
 msgid "Do you really want to restart Calibre-Web?"
 msgstr ""
 
-#: cps/templates/admin.html:150 cps/templates/admin.html:164
-#: cps/templates/admin.html:184 cps/templates/shelf.html:73
+#: cps/templates/admin.html:152 cps/templates/admin.html:166
+#: cps/templates/admin.html:186 cps/templates/shelf.html:72
 msgid "Ok"
 msgstr "Ok"
 
-#: cps/templates/admin.html:151 cps/templates/admin.html:165
-#: cps/templates/book_edit.html:178 cps/templates/book_edit.html:200
-#: cps/templates/config_edit.html:226 cps/templates/config_view_edit.html:179
-#: cps/templates/email_edit.html:40 cps/templates/email_edit.html:75
-#: cps/templates/layout.html:28 cps/templates/shelf.html:74
+#: cps/templates/admin.html:153 cps/templates/admin.html:167
+#: cps/templates/book_edit.html:174 cps/templates/book_edit.html:196
+#: cps/templates/config_edit.html:281 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/user_edit.html:149
+#: cps/templates/user_edit.html:132
 msgid "Back"
 msgstr "Назад"
 
-#: cps/templates/admin.html:163
+#: cps/templates/admin.html:165
 msgid "Do you really want to stop Calibre-Web?"
 msgstr ""
 
-#: cps/templates/admin.html:175
+#: cps/templates/admin.html:177
 msgid "Updating, please do not reload page"
 msgstr "Встановлення оновлень, будь-ласка, не оновлюйте сторінку"
 
@@ -931,176 +1125,176 @@ msgstr "через"
 msgid "In Library"
 msgstr "У бібліотеці"
 
-#: cps/templates/author.html:50 cps/templates/author.html:97
-#: cps/templates/discover.html:28 cps/templates/index.html:31
-#: cps/templates/index.html:86 cps/templates/search.html:55
-#: cps/templates/shelf.html:37
+#: cps/templates/author.html:34 cps/templates/list.html:14
+#: cps/templates/search.html:41
+msgid "All"
+msgstr ""
+
+#: cps/templates/author.html:58 cps/templates/author.html:105
+#: 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 ""
 
-#: cps/templates/author.html:81
+#: cps/templates/author.html:89
 msgid "More by"
 msgstr "Більше за"
 
-#: cps/templates/book_edit.html:16
+#: cps/templates/book_edit.html:12
 msgid "Delete Book"
 msgstr "Видалити книгу"
 
-#: cps/templates/book_edit.html:19
+#: cps/templates/book_edit.html:15
 msgid "Delete formats:"
 msgstr ""
 
-#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:199
-#: cps/templates/email_edit.html:73 cps/templates/email_edit.html:74
+#: cps/templates/book_edit.html:18 cps/templates/book_edit.html:195
+#: cps/templates/email_edit.html:73
 msgid "Delete"
 msgstr "Видалити"
 
-#: cps/templates/book_edit.html:30
+#: cps/templates/book_edit.html:26
 msgid "Convert book format:"
 msgstr ""
 
-#: cps/templates/book_edit.html:34
+#: cps/templates/book_edit.html:30
 msgid "Convert from:"
 msgstr ""
 
-#: cps/templates/book_edit.html:36 cps/templates/book_edit.html:43
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
 msgstr ""
 
-#: cps/templates/book_edit.html:41
+#: cps/templates/book_edit.html:37
 msgid "Convert to:"
 msgstr ""
 
-#: cps/templates/book_edit.html:50
+#: cps/templates/book_edit.html:46
 msgid "Convert book"
 msgstr ""
 
-#: cps/templates/book_edit.html:59 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:55 cps/templates/search_form.html:6
 msgid "Book Title"
 msgstr "Назва книги"
 
-#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:259
-#: cps/templates/book_edit.html:277 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:59 cps/templates/book_edit.html:255
+#: cps/templates/book_edit.html:273 cps/templates/search_form.html:10
 msgid "Author"
 msgstr "Автор"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:264
-#: cps/templates/book_edit.html:279 cps/templates/search_form.html:106
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:260
+#: cps/templates/book_edit.html:275 cps/templates/search_form.html:106
 msgid "Description"
 msgstr "Опис"
 
-#: cps/templates/book_edit.html:71 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:67 cps/templates/search_form.html:33
 msgid "Tags"
 msgstr "Теги"
 
-#: cps/templates/book_edit.html:75 cps/templates/layout.html:159
-#: cps/templates/search_form.html:53
-msgid "Series"
-msgstr "Серії"
-
-#: cps/templates/book_edit.html:79
+#: cps/templates/book_edit.html:75
 msgid "Series id"
 msgstr "Серія"
 
-#: cps/templates/book_edit.html:83
+#: cps/templates/book_edit.html:79
 msgid "Rating"
 msgstr "Рейтинг"
 
-#: cps/templates/book_edit.html:87
+#: cps/templates/book_edit.html:83
 msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
 msgstr ""
 
-#: cps/templates/book_edit.html:91
+#: cps/templates/book_edit.html:87
 msgid "Upload Cover from local drive"
 msgstr ""
 
-#: cps/templates/book_edit.html:96 cps/templates/detail.html:148
+#: cps/templates/book_edit.html:92 cps/templates/detail.html:168
 msgid "Publishing date"
 msgstr "Опубліковано"
 
-#: cps/templates/book_edit.html:103 cps/templates/book_edit.html:261
-#: cps/templates/book_edit.html:278 cps/templates/detail.html:139
+#: cps/templates/book_edit.html:99 cps/templates/book_edit.html:257
+#: cps/templates/book_edit.html:274 cps/templates/detail.html:159
 #: cps/templates/search_form.html:14
 msgid "Publisher"
 msgstr "Видавець"
 
-#: cps/templates/book_edit.html:107 cps/templates/user_edit.html:31
+#: cps/templates/book_edit.html:103 cps/templates/user_edit.html:31
 msgid "Language"
 msgstr "Мова"
 
-#: cps/templates/book_edit.html:117 cps/templates/search_form.html:117
+#: cps/templates/book_edit.html:113 cps/templates/search_form.html:117
 msgid "Yes"
 msgstr "Так"
 
-#: cps/templates/book_edit.html:118 cps/templates/search_form.html:118
+#: cps/templates/book_edit.html:114 cps/templates/search_form.html:118
 msgid "No"
 msgstr "Ні"
 
-#: cps/templates/book_edit.html:164
+#: cps/templates/book_edit.html:160
 msgid "Upload format"
 msgstr "Формат завантаження"
 
-#: cps/templates/book_edit.html:173
+#: cps/templates/book_edit.html:169
 msgid "view book after edit"
 msgstr "переглянути книгу після редагування"
 
-#: cps/templates/book_edit.html:176 cps/templates/book_edit.html:212
+#: cps/templates/book_edit.html:172 cps/templates/book_edit.html:208
 msgid "Get metadata"
 msgstr "Отримати метадані"
 
-#: cps/templates/book_edit.html:177 cps/templates/config_edit.html:224
-#: cps/templates/config_view_edit.html:178 cps/templates/login.html:20
+#: cps/templates/book_edit.html:173 cps/templates/config_edit.html:279
+#: cps/templates/config_view_edit.html:146 cps/templates/login.html:20
 #: cps/templates/search_form.html:150 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:147
+#: cps/templates/user_edit.html:130
 msgid "Submit"
 msgstr "Зберегти"
 
-#: cps/templates/book_edit.html:191
+#: cps/templates/book_edit.html:187
 msgid "Are you really sure?"
 msgstr ""
 
-#: cps/templates/book_edit.html:194
+#: cps/templates/book_edit.html:190
 msgid "Book will be deleted from Calibre database"
 msgstr "Книга буде видалена з БД Calibre"
 
-#: cps/templates/book_edit.html:195
+#: cps/templates/book_edit.html:191
 msgid "and from hard disk"
 msgstr "і з диску"
 
-#: cps/templates/book_edit.html:215
+#: cps/templates/book_edit.html:211
 msgid "Keyword"
 msgstr "Ключове слово"
 
-#: cps/templates/book_edit.html:216
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr " Пошук по ключовому слову"
 
-#: cps/templates/book_edit.html:218 cps/templates/layout.html:47
+#: cps/templates/book_edit.html:214 cps/templates/layout.html:47
 msgid "Go!"
 msgstr "Шукати"
 
-#: cps/templates/book_edit.html:222
+#: cps/templates/book_edit.html:218
 msgid "Click the cover to load metadata to the form"
 msgstr "Натисніть на обкладинку, щоб отримати метадані"
 
-#: cps/templates/book_edit.html:234 cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:230 cps/templates/book_edit.html:270
 msgid "Loading..."
 msgstr "Завантаження..."
 
-#: cps/templates/book_edit.html:239 cps/templates/layout.html:226
-#: cps/templates/layout.html:258
+#: cps/templates/book_edit.html:235 cps/templates/layout.html:187
+#: cps/templates/layout.html:219
 msgid "Close"
 msgstr "Закрити"
 
-#: cps/templates/book_edit.html:266 cps/templates/book_edit.html:280
+#: cps/templates/book_edit.html:262 cps/templates/book_edit.html:276
 msgid "Source"
 msgstr "Джерело"
 
-#: cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:271
 msgid "Search error!"
 msgstr "Помилка пошуку!"
 
-#: cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:272
 msgid "No Result(s) found! Please try aonther keyword."
 msgstr ""
 
@@ -1228,35 +1422,87 @@ msgstr ""
 msgid "Goodreads API Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:187
+#: cps/templates/config_edit.html:181
+msgid "Login type"
+msgstr ""
+
+#: cps/templates/config_edit.html:183
+msgid "Use standard Authentication"
+msgstr ""
+
+#: cps/templates/config_edit.html:185
+msgid "Use LDAP Authentication"
+msgstr ""
+
+#: cps/templates/config_edit.html:188
+msgid "Use GitHub OAuth"
+msgstr ""
+
+#: cps/templates/config_edit.html:189
+msgid "Use Google OAuth"
+msgstr ""
+
+#: cps/templates/config_edit.html:196
+msgid "LDAP Provider URL"
+msgstr ""
+
+#: cps/templates/config_edit.html:200
+msgid "LDAP Distinguished Name (DN)"
+msgstr ""
+
+#: cps/templates/config_edit.html:208
+msgid "Obtain GitHub OAuth Credential"
+msgstr ""
+
+#: cps/templates/config_edit.html:211
+msgid "GitHub OAuth Client Id"
+msgstr ""
+
+#: cps/templates/config_edit.html:215
+msgid "GitHub OAuth Client Secret"
+msgstr ""
+
+#: cps/templates/config_edit.html:221
+msgid "Obtain Google OAuth Credential"
+msgstr ""
+
+#: cps/templates/config_edit.html:224
+msgid "Google OAuth Client Id"
+msgstr ""
+
+#: cps/templates/config_edit.html:228
+msgid "Google OAuth Client Secret"
+msgstr ""
+
+#: cps/templates/config_edit.html:242
 msgid "External binaries"
 msgstr ""
 
-#: cps/templates/config_edit.html:195
+#: cps/templates/config_edit.html:250
 msgid "No converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:197
+#: cps/templates/config_edit.html:252
 msgid "Use Kindlegen"
 msgstr ""
 
-#: cps/templates/config_edit.html:199
+#: cps/templates/config_edit.html:254
 msgid "Use calibre's ebook converter"
 msgstr ""
 
-#: cps/templates/config_edit.html:203
+#: cps/templates/config_edit.html:258
 msgid "E-Book converter settings"
 msgstr ""
 
-#: cps/templates/config_edit.html:207
+#: cps/templates/config_edit.html:262
 msgid "Path to convertertool"
 msgstr ""
 
-#: cps/templates/config_edit.html:213
+#: cps/templates/config_edit.html:268
 msgid "Location of Unrar binary"
 msgstr ""
 
-#: cps/templates/config_edit.html:229 cps/templates/layout.html:84
+#: cps/templates/config_edit.html:284 cps/templates/layout.html:84
 #: cps/templates/login.html:4
 msgid "Login"
 msgstr "Ім'я користувача"
@@ -1265,8 +1511,7 @@ msgstr "Ім'я користувача"
 msgid "View Configuration"
 msgstr "Переглянути налаштування"
 
-#: cps/templates/config_view_edit.html:19 cps/templates/layout.html:135
-#: cps/templates/layout.html:136 cps/templates/shelf_edit.html:7
+#: cps/templates/config_view_edit.html:19 cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr "Заголовок"
 
@@ -1278,7 +1523,7 @@ msgstr "Кількість показаних випадкових книг"
 msgid "No. of authors to show before hiding (0=disable hiding)"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:118
+#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:112
 msgid "Theme"
 msgstr "Тема"
 
@@ -1310,127 +1555,91 @@ msgstr ""
 msgid "Default settings for new users"
 msgstr "Налаштування по замовчуванню для нових користувачів"
 
-#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:104
+#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:83
 msgid "Admin user"
 msgstr "Керування сервером"
 
-#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:113
+#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:92
 msgid "Allow Downloads"
 msgstr "Дозволити завантажувати з сервера"
 
-#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:117
+#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:96
+msgid "Allow book viewer"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:100
 msgid "Allow Uploads"
 msgstr "Дозволити завантаження на сервер"
 
-#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:121
+#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:104
 msgid "Allow Edit"
 msgstr "Дозволити редагування книг"
 
-#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:125
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:108
 msgid "Allow Delete books"
 msgstr "Дозволити видалення книг"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:130
+#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:113
 msgid "Allow Changing Password"
 msgstr "Дозволити зміну пароля"
 
-#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:134
+#: cps/templates/config_view_edit.html:109 cps/templates/user_edit.html:117
 msgid "Allow Editing Public Shelfs"
 msgstr "Дозволити редагування публічних книжкових полиць"
 
-#: cps/templates/config_view_edit.html:115
+#: cps/templates/config_view_edit.html:119
 msgid "Default visibilities for new users"
 msgstr "Можливості за замовчуванням для нових користувачів"
 
-#: cps/templates/config_view_edit.html:123 cps/templates/user_edit.html:50
-msgid "Show random books"
-msgstr "Показувати випадкові книги"
-
-#: cps/templates/config_view_edit.html:127 cps/templates/user_edit.html:54
-msgid "Show recent books"
-msgstr "Показувати останні книги"
-
-#: cps/templates/config_view_edit.html:131 cps/templates/user_edit.html:58
-msgid "Show sorted books"
-msgstr "Показувати відсортовані книги"
-
-#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:62
-msgid "Show hot books"
-msgstr "Показувати популярні книги"
-
-#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:66
-msgid "Show best rated books"
-msgstr "Показувати книги з найвищим рейтингом"
-
-#: cps/templates/config_view_edit.html:143 cps/templates/user_edit.html:70
-msgid "Show language selection"
-msgstr "Показувати вибір мови"
-
-#: cps/templates/config_view_edit.html:147 cps/templates/user_edit.html:74
-msgid "Show series selection"
-msgstr "Показувати вибір серії"
-
-#: cps/templates/config_view_edit.html:151 cps/templates/user_edit.html:78
-msgid "Show category selection"
-msgstr "Показувати вибір категорії"
-
-#: cps/templates/config_view_edit.html:155 cps/templates/user_edit.html:82
-msgid "Show author selection"
-msgstr "Показувати вибір автора"
-
-#: cps/templates/config_view_edit.html:159 cps/templates/user_edit.html:86
-msgid "Show publisher selection"
-msgstr ""
-
-#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:91
-msgid "Show read and unread"
-msgstr "Показувати прочитані та непрочитані книги"
-
-#: cps/templates/config_view_edit.html:167 cps/templates/user_edit.html:96
+#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:75
 msgid "Show random books in detail view"
 msgstr "Показувати випадкові книги при перегляді деталей"
 
-#: cps/templates/config_view_edit.html:171 cps/templates/user_edit.html:109
+#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:88
 msgid "Show mature content"
 msgstr ""
 
-#: cps/templates/detail.html:63
+#: cps/templates/detail.html:59
 msgid "Read in browser"
 msgstr "Відкрити в браузері"
 
-#: cps/templates/detail.html:100
+#: cps/templates/detail.html:73
+msgid "Listen in browser"
+msgstr ""
+
+#: cps/templates/detail.html:120
 msgid "Book"
 msgstr "Книга"
 
-#: cps/templates/detail.html:100
+#: cps/templates/detail.html:120
 msgid "of"
 msgstr "з"
 
-#: cps/templates/detail.html:106
+#: cps/templates/detail.html:126
 msgid "language"
 msgstr "Мова"
 
-#: cps/templates/detail.html:185
+#: cps/templates/detail.html:203
 msgid "Mark As Unread"
 msgstr ""
 
-#: cps/templates/detail.html:185
+#: cps/templates/detail.html:203
 msgid "Mark As Read"
 msgstr ""
 
-#: cps/templates/detail.html:186
+#: cps/templates/detail.html:204
 msgid "Read"
 msgstr "Прочитано"
 
-#: cps/templates/detail.html:196
+#: cps/templates/detail.html:214 cps/templates/listenmp3.html:54
 msgid "Description:"
 msgstr "Опис:"
 
-#: cps/templates/detail.html:209 cps/templates/search.html:14
+#: cps/templates/detail.html:227 cps/templates/search.html:14
 msgid "Add to shelf"
 msgstr "Додати на книжкову полицю"
 
-#: cps/templates/detail.html:271
+#: cps/templates/detail.html:289
 msgid "Edit metadata"
 msgstr "Редагувати метадані"
 
@@ -1490,12 +1699,12 @@ msgstr ""
 msgid "Do you really want to delete this domain rule?"
 msgstr ""
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:210
+#: cps/templates/feed.xml:21 cps/templates/layout.html:171
 msgid "Next"
 msgstr "Далі"
 
-#: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:44 cps/templates/layout.html:45
+#: cps/templates/feed.xml:33 cps/templates/layout.html:44
+#: cps/templates/layout.html:45
 msgid "Search"
 msgstr "Пошук"
 
@@ -1507,75 +1716,63 @@ msgstr ""
 msgid "Discover (Random Books)"
 msgstr "Огляд (випадкові книги)"
 
+#: cps/templates/index.html:65
+msgid "Group by series"
+msgstr ""
+
 #: cps/templates/index.xml:6
 msgid "Start"
 msgstr "Старт"
 
-#: cps/templates/index.xml:18 cps/templates/layout.html:141
-msgid "Hot Books"
-msgstr "Популярні книги"
-
-#: cps/templates/index.xml:22
+#: cps/templates/index.xml:21
 msgid "Popular publications from this catalog based on Downloads."
 msgstr "Популярні книги в цьому каталозі, на основі кількості завантажень"
 
-#: cps/templates/index.xml:25 cps/templates/layout.html:144
-msgid "Best rated Books"
-msgstr "Книги з найкращим рейтингом"
-
-#: cps/templates/index.xml:29
+#: cps/templates/index.xml:28
 msgid "Popular publications from this catalog based on Rating."
 msgstr "Популярні книги з цього каталогу на основі рейтингу"
 
-#: cps/templates/index.xml:32
+#: cps/templates/index.xml:31
 msgid "New Books"
 msgstr "Нові книги"
 
-#: cps/templates/index.xml:36
+#: cps/templates/index.xml:35
 msgid "The latest Books"
 msgstr "Останні книги"
 
-#: cps/templates/index.xml:43
+#: cps/templates/index.xml:42
 msgid "Show Random Books"
 msgstr "Показувати випадкові книги"
 
-#: cps/templates/index.xml:62 cps/templates/layout.html:162
-msgid "Authors"
-msgstr "Автори"
-
-#: cps/templates/index.xml:66
+#: cps/templates/index.xml:65
 msgid "Books ordered by Author"
 msgstr "Книги відсортовані за автором"
 
-#: cps/templates/index.xml:69 cps/templates/layout.html:165
-msgid "Publishers"
-msgstr ""
-
-#: cps/templates/index.xml:73
+#: cps/templates/index.xml:72
 msgid "Books ordered by publisher"
 msgstr ""
 
-#: cps/templates/index.xml:80
+#: cps/templates/index.xml:79
 msgid "Books ordered by category"
 msgstr "Книги відсортовані за категоріями"
 
-#: cps/templates/index.xml:87
+#: cps/templates/index.xml:86
 msgid "Books ordered by series"
 msgstr "Книги відсортовані за серією"
 
-#: cps/templates/index.xml:90 cps/templates/layout.html:171
+#: cps/templates/index.xml:89 cps/templates/layout.html:132
 msgid "Public Shelves"
 msgstr "Загальні книжкові полиці"
 
-#: cps/templates/index.xml:94
+#: cps/templates/index.xml:93
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr "Книги, організовані на публічних полицях, видимі всім"
 
-#: cps/templates/index.xml:98 cps/templates/layout.html:175
+#: cps/templates/index.xml:97 cps/templates/layout.html:136
 msgid "Your Shelves"
 msgstr "Ваші книжкові полиці"
 
-#: cps/templates/index.xml:102
+#: cps/templates/index.xml:101
 msgid "User's own shelfs, only visible to the current user himself"
 msgstr "Власні полиці користувача, видимі тільки поточному користувачеві"
 
@@ -1592,7 +1789,7 @@ msgid "Advanced Search"
 msgstr "Розширений пошук"
 
 #: cps/templates/layout.html:76 cps/templates/read.html:71
-#: cps/templates/readcbr.html:89 cps/templates/readcbr.html:113
+#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
 msgid "Settings"
 msgstr "Налаштування"
 
@@ -1608,7 +1805,7 @@ msgstr "Вийти"
 msgid "Register"
 msgstr "Зареєструватись"
 
-#: cps/templates/layout.html:111 cps/templates/layout.html:257
+#: cps/templates/layout.html:111 cps/templates/layout.html:218
 msgid "Uploading..."
 msgstr "Завантаження..."
 
@@ -1620,68 +1817,27 @@ msgstr "будь ласка, не перезавантажуйте сторін
 msgid "Browse"
 msgstr "Перегляд"
 
-#: cps/templates/layout.html:124
-msgid "Recently Added"
-msgstr "Останні додані"
-
-#: cps/templates/layout.html:129
-msgid "Sorted Books"
-msgstr "Відсортовані книги"
-
-#: cps/templates/layout.html:133 cps/templates/layout.html:134
-#: cps/templates/layout.html:135 cps/templates/layout.html:136
-msgid "Sort By"
-msgstr "Сортувати за"
-
-#: cps/templates/layout.html:133
-msgid "Newest"
-msgstr "Найновіші"
-
-#: cps/templates/layout.html:134
-msgid "Oldest"
-msgstr "Найстаріші"
-
-#: cps/templates/layout.html:135
-msgid "Ascending"
-msgstr "За зростанням"
-
-#: cps/templates/layout.html:136
-msgid "Descending"
-msgstr "За спаданням"
-
-#: cps/templates/layout.html:153
-msgid "Discover"
-msgstr "Огляд"
-
-#: cps/templates/layout.html:156
-msgid "Categories"
-msgstr "Категорії"
-
-#: cps/templates/layout.html:168 cps/templates/search_form.html:74
-msgid "Languages"
-msgstr "Мови"
-
-#: cps/templates/layout.html:180
+#: cps/templates/layout.html:141
 msgid "Create a Shelf"
 msgstr "Створити книжкову полицю"
 
-#: cps/templates/layout.html:181 cps/templates/stats.html:3
+#: cps/templates/layout.html:142 cps/templates/stats.html:3
 msgid "About"
 msgstr "Про програму"
 
-#: cps/templates/layout.html:195
+#: cps/templates/layout.html:156
 msgid "Previous"
 msgstr "Попередній перегляд"
 
-#: cps/templates/layout.html:222
+#: cps/templates/layout.html:183
 msgid "Book Details"
 msgstr "Деталі"
 
-#: cps/templates/layout.html:256
+#: cps/templates/layout.html:217
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:259
+#: cps/templates/layout.html:220
 msgid "Error"
 msgstr ""
 
@@ -1711,105 +1867,105 @@ msgstr ""
 msgid "Reflow text when sidebars are open."
 msgstr "Переформатувати текст, коли відкриті бічні панелі."
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:88
 msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:91
 msgid "Previous Page"
 msgstr ""
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:92
 msgid "Next Page"
 msgstr ""
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:93
 msgid "Scale to Best"
 msgstr ""
 
-#: cps/templates/readcbr.html:100
+#: cps/templates/readcbr.html:94
 msgid "Scale to Width"
 msgstr ""
 
-#: cps/templates/readcbr.html:101
+#: cps/templates/readcbr.html:95
 msgid "Scale to Height"
 msgstr ""
 
-#: cps/templates/readcbr.html:102
+#: cps/templates/readcbr.html:96
 msgid "Scale to Native"
 msgstr ""
 
-#: cps/templates/readcbr.html:103
+#: cps/templates/readcbr.html:97
 msgid "Rotate Right"
 msgstr ""
 
-#: cps/templates/readcbr.html:104
+#: cps/templates/readcbr.html:98
 msgid "Rotate Left"
 msgstr ""
 
-#: cps/templates/readcbr.html:105
+#: cps/templates/readcbr.html:99
 msgid "Flip Image"
 msgstr ""
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:115
 msgid "Light"
 msgstr ""
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:116
 msgid "Dark"
 msgstr ""
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:121
 msgid "Scale"
 msgstr ""
 
-#: cps/templates/readcbr.html:130
+#: cps/templates/readcbr.html:124
 msgid "Best"
 msgstr ""
 
-#: cps/templates/readcbr.html:131
+#: cps/templates/readcbr.html:125
 msgid "Width"
 msgstr ""
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:126
 msgid "Height"
 msgstr ""
 
-#: cps/templates/readcbr.html:133
+#: cps/templates/readcbr.html:127
 msgid "Native"
 msgstr ""
 
-#: cps/templates/readcbr.html:138
+#: cps/templates/readcbr.html:132
 msgid "Rotate"
 msgstr ""
 
-#: cps/templates/readcbr.html:149
+#: cps/templates/readcbr.html:143
 msgid "Flip"
 msgstr ""
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:146
 msgid "Horizontal"
 msgstr ""
 
-#: cps/templates/readcbr.html:153
+#: cps/templates/readcbr.html:147
 msgid "Vertical"
 msgstr ""
 
-#: cps/templates/readcbr.html:158
+#: cps/templates/readcbr.html:152
 msgid "Direction"
 msgstr ""
 
-#: cps/templates/readcbr.html:161
+#: cps/templates/readcbr.html:155
 msgid "Left to Right"
 msgstr ""
 
-#: cps/templates/readcbr.html:162
+#: cps/templates/readcbr.html:156
 msgid "Right to Left"
 msgstr ""
 
 #: cps/templates/readpdf.html:29
-msgid "PDF.js viewer"
-msgstr "Переглядач PDF.js"
+msgid "PDF reader"
+msgstr ""
 
 #: cps/templates/readtxt.html:6
 msgid "Basic txt Reader"
@@ -1883,23 +2039,23 @@ msgstr ""
 msgid "Rating less than"
 msgstr ""
 
-#: cps/templates/shelf.html:7
+#: cps/templates/shelf.html:10
 msgid "Delete this Shelf"
 msgstr "Видалити цю книжкову полицю"
 
-#: cps/templates/shelf.html:8
+#: cps/templates/shelf.html:11
 msgid "Edit Shelf"
 msgstr ""
 
-#: cps/templates/shelf.html:9 cps/templates/shelf_order.html:11
+#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:11
 msgid "Change order"
 msgstr "Змінити порядок"
 
-#: cps/templates/shelf.html:68
+#: cps/templates/shelf.html:67
 msgid "Do you really want to delete the shelf?"
 msgstr "Ви справді хочете видалити книжкову полицю?"
 
-#: cps/templates/shelf.html:71
+#: cps/templates/shelf.html:70
 msgid "Shelf will be lost for everybody and forever!"
 msgstr "Книжкова полиця буде остаточно видалена для всіх"
 
@@ -1987,19 +2143,31 @@ msgstr ""
 msgid "Kindle E-Mail"
 msgstr "Електронний адрес Kindle"
 
-#: cps/templates/user_edit.html:39
+#: cps/templates/user_edit.html:40
 msgid "Show books with language"
 msgstr "Показувати книги на мовах"
 
-#: cps/templates/user_edit.html:41
+#: cps/templates/user_edit.html:42
 msgid "Show all"
 msgstr "Показати всі"
 
-#: cps/templates/user_edit.html:141
+#: cps/templates/user_edit.html:52
+msgid "OAuth Settings"
+msgstr ""
+
+#: cps/templates/user_edit.html:54
+msgid "Link"
+msgstr ""
+
+#: cps/templates/user_edit.html:56
+msgid "Unlink"
+msgstr ""
+
+#: cps/templates/user_edit.html:124
 msgid "Delete this user"
 msgstr "Видалити цього користувача"
 
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:139
 msgid "Recent Downloads"
 msgstr "Нещодавно переглянуті"
 
@@ -2177,3 +2345,45 @@ msgstr "Нещодавно переглянуті"
 #~ msgid "Using your another device, login and visit "
 #~ msgstr ""
 
+#~ msgid "Newest Books"
+#~ msgstr "Найновіші книги"
+
+#~ msgid "Oldest Books"
+#~ msgstr "Найстаріші книги"
+
+#~ msgid "Books (A-Z)"
+#~ msgstr "Книги (А-Я)"
+
+#~ msgid "Books (Z-A)"
+#~ msgstr "Книги (Я-А)"
+
+#~ msgid "Error opening eBook. Fileformat is not supported."
+#~ msgstr ""
+
+#~ msgid "File %(title)s"
+#~ msgstr ""
+
+#~ msgid "Show sorted books"
+#~ msgstr "Показувати відсортовані книги"
+
+#~ msgid "Sorted Books"
+#~ msgstr "Відсортовані книги"
+
+#~ msgid "Sort By"
+#~ msgstr "Сортувати за"
+
+#~ msgid "Newest"
+#~ msgstr "Найновіші"
+
+#~ msgid "Oldest"
+#~ msgstr "Найстаріші"
+
+#~ msgid "Ascending"
+#~ msgstr "За зростанням"
+
+#~ msgid "Descending"
+#~ msgstr "За спаданням"
+
+#~ msgid "PDF.js viewer"
+#~ msgstr "Переглядач PDF.js"
+
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
index 881d7af8..8fa2c6a4 100644
Binary files a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo and b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index 6b74c9b2..22fa2ef0 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-05-30 09:06+0200\n"
+"POT-Creation-Date: 2019-05-31 11:20+0200\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,740 +18,929 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.6.0\n"
 
-#: cps/book_formats.py:199 cps/book_formats.py:200 cps/book_formats.py:204
-#: cps/book_formats.py:208 cps/book_formats.py:212 cps/converter.py:29
-#: cps/converter.py:45
-msgid "not installed"
-msgstr "未安装"
-
-#: cps/converter.py:40 cps/converter.py:56
-msgid "Excecution permissions missing"
-msgstr "可执行权限缺失"
-
-#: cps/converter.py:66
-msgid "not configured"
-msgstr "未配置"
-
-#: cps/helper.py:79
-#, python-format
-msgid "%(format)s format not found for book id: %(book)d"
-msgstr "找不到id为 %(book)d 的书的 %(format)s 格式"
-
-#: cps/helper.py:91
-#, python-format
-msgid "%(format)s not found on Google Drive: %(fn)s"
-msgstr "Google Drive %(fn)s 上找不到 %(format)s"
-
-#: cps/helper.py:98 cps/helper.py:204 cps/templates/detail.html:45
-#: cps/templates/detail.html:49
-msgid "Send to Kindle"
-msgstr "发送到Kindle"
-
-#: cps/helper.py:99 cps/helper.py:117 cps/helper.py:206
-msgid "This e-mail has been sent via Calibre-Web."
-msgstr "此邮件已经通过Calibre-Web发送"
-
-#: cps/helper.py:110
-#, python-format
-msgid "%(format)s not found: %(fn)s"
-msgstr "找不到 %(format)s: %(fn)s"
-
-#: cps/helper.py:115
-msgid "Calibre-Web test e-mail"
-msgstr "Calibre-Web测试邮件"
-
-#: cps/helper.py:116
-msgid "Test e-mail"
-msgstr "测试邮件"
-
-#: cps/helper.py:132
-msgid "Get Started with Calibre-Web"
-msgstr "开启Calibre-Web之旅"
-
-#: cps/helper.py:133
-#, python-format
-msgid "Registration e-mail for user: %(name)s"
-msgstr "用户 %(name)s 的注册邮箱"
-
-#: cps/helper.py:146 cps/helper.py:148 cps/helper.py:150 cps/helper.py:158
-#: cps/helper.py:160 cps/helper.py:162
-#, python-format
-msgid "Send %(format)s to Kindle"
-msgstr ""
-
-#: cps/helper.py:166
-#, python-format
-msgid "Convert %(orig)s to %(format)s and send to Kindle"
-msgstr ""
-
-#: cps/helper.py:205
-#, python-format
-msgid "E-mail: %(book)s"
-msgstr ""
-
-#: cps/helper.py:208
-msgid "The requested file could not be read. Maybe wrong permissions?"
-msgstr "无法读取请求的文件。 可能有错误的权限设置？"
-
-#: cps/helper.py:316
-#, python-format
-msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "将标题从'%(src)s'改为'%(dest)s'时失败，出错信息: %(error)s"
-
-#: cps/helper.py:326
-#, python-format
-msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr "将作者从'%(src)s'改为'%(dest)s'时失败，出错信息: %(error)s"
-
-#: cps/helper.py:340
-#, python-format
-msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr ""
-
-#: cps/helper.py:366 cps/helper.py:376 cps/helper.py:384
-#, python-format
-msgid "File %(file)s not found on Google Drive"
-msgstr "Google Drive上找不到文件 %(file)s"
-
-#: cps/helper.py:405
-#, python-format
-msgid "Book path %(path)s not found on Google Drive"
-msgstr "Google Drive上找不到书籍路径 %(path)s"
-
-#: cps/helper.py:556
-msgid "Error excecuting UnRar"
-msgstr "执行UnRar时出错"
-
-#: cps/helper.py:558
-msgid "Unrar binary file not found"
-msgstr "找不到Unrar二进制文件"
-
-#: cps/helper.py:585
-msgid "Waiting"
-msgstr "等待中"
-
-#: cps/helper.py:587
-msgid "Failed"
-msgstr "失败"
-
-#: cps/helper.py:589
-msgid "Started"
-msgstr "已开始"
-
-#: cps/helper.py:591
-msgid "Finished"
-msgstr "已完成"
-
-#: cps/helper.py:593
-msgid "Unknown Status"
-msgstr "未知状态"
-
-#: cps/helper.py:598
-msgid "E-mail: "
-msgstr ""
-
-#: cps/helper.py:600 cps/helper.py:604
-msgid "Convert: "
-msgstr "转换："
-
-#: cps/helper.py:602
-msgid "Upload: "
-msgstr "上传："
-
-#: cps/helper.py:606
-msgid "Unknown Task: "
-msgstr "未知任务："
-
-#: cps/updater.py:251 cps/updater.py:410 cps/updater.py:423
-msgid "Unexpected data while reading update information"
-msgstr "读取更新信息时出现异常数据"
-
-#: cps/updater.py:258 cps/updater.py:416
-msgid "No update available. You already have the latest version installed"
-msgstr "没有可用更新。您已经安装了最新版本"
-
-#: cps/updater.py:270 cps/updater.py:501 cps/updater.py:503 cps/web.py:1206
-msgid "HTTP Error"
-msgstr "HTTP错误"
-
-#: cps/updater.py:272 cps/updater.py:505 cps/web.py:1207
-msgid "Connection error"
-msgstr "连接错误"
-
-#: cps/updater.py:274 cps/updater.py:507 cps/web.py:1208
-msgid "Timeout while establishing connection"
-msgstr "建立连接超时"
-
-#: cps/updater.py:276 cps/updater.py:509 cps/web.py:1209
-msgid "General error"
-msgstr "一般错误"
-
-#: cps/updater.py:283 cps/updater.py:341 cps/updater.py:468
-msgid "A new update is available. Click on the button below to update to the latest version."
-msgstr "有一个更新可用。点击正文按钮更新到最新版本。"
-
-#: cps/updater.py:335
-msgid "Could not fetch update information"
-msgstr "无法获取更新信息"
-
-#: cps/updater.py:403
-msgid "No release information available"
-msgstr ""
-
-#: cps/updater.py:449 cps/updater.py:458
-#, python-format
-msgid "A new update is available. Click on the button below to update to version: %(version)s"
-msgstr ""
-
-#: cps/updater.py:491 cps/web.py:2795
-msgid "Unknown"
-msgstr "未知"
-
-#: cps/web.py:1199
-msgid "Requesting update package"
-msgstr "正在请求更新包"
-
-#: cps/web.py:1200
-msgid "Downloading update package"
-msgstr "正在下载更新包"
-
-#: cps/web.py:1201
-msgid "Unzipping update package"
-msgstr "正在解压更新包"
-
-#: cps/web.py:1202
-msgid "Replacing files"
-msgstr "正在替换文件"
-
-#: cps/web.py:1203
-msgid "Database connections are closed"
-msgstr "数据库连接已关闭"
-
-#: cps/web.py:1204
-msgid "Stopping server"
-msgstr "正在停止服务器"
-
-#: cps/web.py:1205
-msgid "Update finished, please press okay and reload page"
-msgstr "更新完成，请按确定并刷新页面"
-
-#: cps/web.py:1206 cps/web.py:1207 cps/web.py:1208 cps/web.py:1209
-msgid "Update failed:"
-msgstr "更新失败："
-
-#: cps/web.py:1235
-msgid "Recently Added Books"
-msgstr "最近添加的书籍"
-
-#: cps/web.py:1245
-msgid "Newest Books"
-msgstr "最新书籍"
-
-#: cps/web.py:1257
-msgid "Oldest Books"
-msgstr "最旧书籍"
-
-#: cps/web.py:1269
-msgid "Books (A-Z)"
-msgstr "书籍 (A-Z)"
-
-#: cps/web.py:1280
-msgid "Books (Z-A)"
-msgstr "书籍 (Z-A)"
-
-#: cps/web.py:1309
-msgid "Hot Books (most downloaded)"
-msgstr "热门书籍(最多下载)"
-
-#: cps/web.py:1322
-msgid "Best rated books"
-msgstr "最高评分书籍"
-
-#: cps/templates/index.xml:39 cps/web.py:1335
-msgid "Random Books"
-msgstr "随机书籍"
-
-#: cps/web.py:1362 cps/web.py:1618 cps/web.py:2161
-msgid "Error opening eBook. File does not exist or file is not accessible:"
-msgstr "无法打开电子书。 文件不存在或者文件不可访问:"
-
-#: cps/web.py:1391
-msgid "Publisher list"
-msgstr "出版社列表"
-
-#: cps/web.py:1406
-#, python-format
-msgid "Publisher: %(name)s"
-msgstr "出版社： %(name)s"
-
-#: cps/templates/index.xml:83 cps/web.py:1438
-msgid "Series list"
-msgstr "丛书列表"
-
-#: cps/web.py:1452
-#, python-format
-msgid "Series: %(serie)s"
-msgstr "丛书: %(serie)s"
-
-#: cps/web.py:1478
-msgid "Available languages"
-msgstr "可用语言"
-
-#: cps/web.py:1498
-#, python-format
-msgid "Language: %(name)s"
-msgstr "语言: %(name)s"
-
-#: cps/templates/index.xml:76 cps/web.py:1509
-msgid "Category list"
-msgstr "分类列表"
-
-#: cps/web.py:1523
-#, python-format
-msgid "Category: %(name)s"
-msgstr "分类: %(name)s"
-
-#: cps/templates/layout.html:73 cps/web.py:1648
-msgid "Tasks"
-msgstr "任务"
-
-#: cps/web.py:1682
+#: cps/about.py:76
 msgid "Statistics"
 msgstr "统计"
 
-#: cps/web.py:1750
-msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
-msgstr ""
-
-#: cps/web.py:1795
-msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
-msgstr "回调域名尚未被校验，请在google开发者控制台按步骤校验域名"
-
-#: cps/web.py:1871
+#: cps/admin.py:97
 msgid "Server restarted, please reload page"
 msgstr "服务器已重启，请刷新页面"
 
-#: cps/web.py:1874
+#: cps/admin.py:100
 msgid "Performing shutdown of server, please close window"
 msgstr "正在关闭服务器，请关闭窗口"
 
-#: cps/web.py:1953
-msgid "Published after "
-msgstr "出版时晚于 "
+#: cps/admin.py:120 cps/updater.py:445
+msgid "Unknown"
+msgstr "未知"
 
-#: cps/web.py:1960
-msgid "Published before "
-msgstr "出版时早于 "
-
-#: cps/web.py:1974
-#, python-format
-msgid "Rating <= %(rating)s"
-msgstr "评分 <= %(rating)s"
-
-#: cps/web.py:1976
-#, python-format
-msgid "Rating >= %(rating)s"
-msgstr "评分 >= %(rating)s"
-
-#: cps/web.py:2036 cps/web.py:2045
-msgid "search"
-msgstr "搜索"
-
-#: cps/templates/index.xml:47 cps/templates/index.xml:51
-#: cps/templates/layout.html:148 cps/web.py:2116
-msgid "Read Books"
-msgstr "已读书籍"
-
-#: cps/templates/index.xml:55 cps/templates/index.xml:59
-#: cps/templates/layout.html:150 cps/web.py:2119
-msgid "Unread Books"
-msgstr "未读书籍"
-
-#: cps/web.py:2171 cps/web.py:2173 cps/web.py:2175 cps/web.py:2187
-msgid "Read a Book"
-msgstr "阅读一本书"
-
-#: cps/web.py:2199
-msgid "Error opening eBook. Fileformat is not supported."
-msgstr ""
-
-#: cps/web.py:2249 cps/web.py:3170
-msgid "Please fill out all fields!"
-msgstr "请填写所有字段"
-
-#: cps/web.py:2250 cps/web.py:2272 cps/web.py:2276 cps/web.py:2281
-#: cps/web.py:2283
-msgid "register"
-msgstr "注册"
-
-#: cps/web.py:2271 cps/web.py:3389
-msgid "An unknown error occurred. Please try again later."
-msgstr "发生一个未知错误，请稍后再试。"
-
-#: cps/web.py:2274
-msgid "Your e-mail is not allowed to register"
-msgstr "您的邮箱不能用来注册"
-
-#: cps/web.py:2277
-msgid "Confirmation e-mail was send to your e-mail account."
-msgstr "确认邮件已经发送到您的邮箱。"
-
-#: cps/web.py:2280
-msgid "This username or e-mail address is already in use."
-msgstr "这个用户名或者邮箱已经被使用。"
-
-#: cps/web.py:2297 cps/web.py:2393
-#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
-msgstr "您现在已以'%(nickname)s'身份登录"
-
-#: cps/web.py:2302
-msgid "Wrong Username or Password"
-msgstr "用户名或密码错误"
-
-#: cps/web.py:2308 cps/web.py:2329
-msgid "login"
-msgstr "登录"
-
-#: cps/web.py:2341 cps/web.py:2372
-msgid "Token not found"
-msgstr "找不到Token"
-
-#: cps/web.py:2349 cps/web.py:2380
-msgid "Token has expired"
-msgstr "Token已过期"
-
-#: cps/web.py:2357
-msgid "Success! Please return to your device"
-msgstr "成功！请返回您的设备"
-
-#: cps/web.py:2407
-msgid "Please configure the SMTP mail settings first..."
-msgstr "请先配置SMTP邮箱..."
-
-#: cps/web.py:2412
-#, python-format
-msgid "Book successfully queued for sending to %(kindlemail)s"
-msgstr "书籍已经被成功加入 %(kindlemail)s 的发送队列"
-
-#: cps/web.py:2416
-#, python-format
-msgid "There was an error sending this book: %(res)s"
-msgstr "发送这本书的时候出现错误: %(res)s"
-
-#: cps/web.py:2418 cps/web.py:3223
-msgid "Please configure your kindle e-mail address first..."
-msgstr "请先配置您的kindle邮箱..."
-
-#: cps/web.py:2429 cps/web.py:2481
-msgid "Invalid shelf specified"
-msgstr "指定的书架无效"
-
-#: cps/web.py:2436
-#, python-format
-msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
-msgstr "对不起，您没有添加书籍到书架 %(shelfname)s 的权限"
-
-#: cps/web.py:2444
-msgid "You are not allowed to edit public shelves"
-msgstr "您没有编辑书架的权限"
-
-#: cps/web.py:2453
-#, python-format
-msgid "Book is already part of the shelf: %(shelfname)s"
-msgstr "此书已经是书架 %(shelfname)s 的一部分"
-
-#: cps/web.py:2467
-#, python-format
-msgid "Book has been added to shelf: %(sname)s"
-msgstr "此书已被添加到书架: %(sname)s"
-
-#: cps/web.py:2486
-#, python-format
-msgid "You are not allowed to add a book to the the shelf: %(name)s"
-msgstr "您没有添加书籍到书架 %(name)s 的权限"
-
-#: cps/web.py:2491
-msgid "User is not allowed to edit public shelves"
-msgstr "用户没有编辑公开书架的权限"
-
-#: cps/web.py:2509
-#, python-format
-msgid "Books are already part of the shelf: %(name)s"
-msgstr "书籍已经在书架 %(name)s 中了"
-
-#: cps/web.py:2523
-#, python-format
-msgid "Books have been added to shelf: %(sname)s"
-msgstr "书籍已经被添加到书架 %(sname)s 中'"
-
-#: cps/web.py:2525
-#, python-format
-msgid "Could not add books to shelf: %(sname)s"
-msgstr "无法添加书籍到书架: %(sname)s"
-
-#: cps/web.py:2562
-#, python-format
-msgid "Book has been removed from shelf: %(sname)s"
-msgstr "此书已从书架 %(sname)s 中删除"
-
-#: cps/web.py:2568
-#, python-format
-msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
-msgstr "对不起，您没有从书架 %(sname)s 中删除书籍的权限"
-
-#: cps/web.py:2589 cps/web.py:2613
-#, python-format
-msgid "A shelf with the name '%(title)s' already exists."
-msgstr "已存在书架 '%(title)s'。"
-
-#: cps/web.py:2594
-#, python-format
-msgid "Shelf %(title)s created"
-msgstr "书架 %(title)s 已被创建"
-
-#: cps/web.py:2596 cps/web.py:2624
-msgid "There was an error"
-msgstr "发生错误"
-
-#: cps/web.py:2597 cps/web.py:2599
-msgid "create a shelf"
-msgstr "创建书架"
-
-#: cps/web.py:2622
-#, python-format
-msgid "Shelf %(title)s changed"
-msgstr "书架 %(title)s 已被修改"
-
-#: cps/web.py:2625 cps/web.py:2627
-msgid "Edit a shelf"
-msgstr "编辑书架"
-
-#: cps/web.py:2648
-#, python-format
-msgid "successfully deleted shelf %(name)s"
-msgstr "成功删除书架 %(name)s"
-
-#: cps/web.py:2675
-#, python-format
-msgid "Shelf: '%(name)s'"
-msgstr "书架: '%(name)s'"
-
-#: cps/web.py:2678
-msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr "打开书架出错。书架不存在或不可访问"
-
-#: cps/web.py:2709
-#, python-format
-msgid "Change order of Shelf: '%(name)s'"
-msgstr "修改书架 '%(name)s' 顺序"
-
-#: cps/web.py:2738 cps/web.py:3176
-msgid "E-mail is not from valid domain"
-msgstr "邮箱不在有效域中'"
-
-#: cps/web.py:2740 cps/web.py:2782 cps/web.py:2785
-#, python-format
-msgid "%(name)s's profile"
-msgstr "%(name)s 的资料"
-
-#: cps/web.py:2780
-msgid "Found an existing account for this e-mail address."
-msgstr "找到一个已有账号使用这个邮箱。"
-
-#: cps/web.py:2783
-msgid "Profile updated"
-msgstr "资料已更新"
-
-#: cps/web.py:2814
+#: cps/admin.py:139
 msgid "Admin page"
 msgstr "管理页"
 
-#: cps/web.py:2899 cps/web.py:3079
+#: cps/admin.py:208 cps/admin.py:486
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web配置已更新"
 
-#: cps/templates/admin.html:100 cps/web.py:2913
+#: cps/admin.py:222 cps/templates/admin.html:102
 msgid "UI Configuration"
 msgstr "UI配置"
 
-#: cps/web.py:2931
+#: cps/admin.py:295
 msgid "Import of optional Google Drive requirements missing"
 msgstr "可选的Google Drive依赖导入缺失"
 
-#: cps/web.py:2934
+#: cps/admin.py:298
 msgid "client_secrets.json is missing or not readable"
 msgstr "client_secrets.json文件缺失或不可读"
 
-#: cps/web.py:2939 cps/web.py:2968
+#: cps/admin.py:303 cps/admin.py:332
 msgid "client_secrets.json is not configured for web application"
 msgstr "没有为web应用配置client_secrets.json"
 
-#: cps/templates/admin.html:99 cps/web.py:2971 cps/web.py:2997 cps/web.py:3009
-#: cps/web.py:3054 cps/web.py:3069 cps/web.py:3088 cps/web.py:3096
-#: cps/web.py:3112
+#: cps/admin.py:335 cps/admin.py:361 cps/admin.py:373 cps/admin.py:398
+#: cps/admin.py:426 cps/admin.py:440 cps/admin.py:463 cps/admin.py:476
+#: cps/admin.py:494 cps/admin.py:501 cps/admin.py:516
+#: cps/templates/admin.html:101
 msgid "Basic Configuration"
 msgstr "基本配置"
 
-#: cps/web.py:2994
+#: cps/admin.py:358
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr "key文件位置无效，请输入正确路径"
 
-#: cps/web.py:3006
+#: cps/admin.py:370
 msgid "Certfile location is not valid, please enter correct path"
 msgstr "证书文件位置无效，请输入正确路径"
 
-#: cps/web.py:3051
+#: cps/admin.py:395
+msgid "Please enter a LDAP provider and a DN"
+msgstr ""
+
+#: cps/admin.py:423
+msgid "Please enter Github oauth credentials"
+msgstr ""
+
+#: cps/admin.py:437
+msgid "Please enter Google oauth credentials"
+msgstr ""
+
+#: cps/admin.py:460
 msgid "Logfile location is not valid, please enter correct path"
 msgstr "日志文件位置无效，请输入正确路径"
 
-#: cps/web.py:3092
+#: cps/admin.py:498
 msgid "DB location is not valid, please enter correct path"
 msgstr "DB位置无效，请输入正确路径"
 
-#: cps/templates/admin.html:33 cps/web.py:3172 cps/web.py:3178 cps/web.py:3194
+#: cps/admin.py:558 cps/web.py:1045
+msgid "Please fill out all fields!"
+msgstr "请填写所有字段"
+
+#: cps/admin.py:560 cps/admin.py:566 cps/admin.py:582
+#: cps/templates/admin.html:35
 msgid "Add new user"
 msgstr "添加新用户"
 
-#: cps/web.py:3184
+#: cps/admin.py:564 cps/web.py:1248
+msgid "E-mail is not from valid domain"
+msgstr "邮箱不在有效域中'"
+
+#: cps/admin.py:572
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "用户 '%(user)s' 已被创建"
 
-#: cps/web.py:3188
+#: cps/admin.py:576
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "此邮箱或昵称的账号已经存在。"
 
-#: cps/web.py:3218
+#: cps/admin.py:607
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "测试邮件已经被成功发到 %(kindlemail)s"
 
-#: cps/web.py:3221
+#: cps/admin.py:610
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "发送测试邮件出错了: %(res)s"
 
-#: cps/web.py:3225
+#: cps/admin.py:612 cps/web.py:1029
+msgid "Please configure your kindle e-mail address first..."
+msgstr "请先配置您的kindle邮箱..."
+
+#: cps/admin.py:614
 msgid "E-mail server settings updated"
 msgstr "已更新邮件服务器设置"
 
-#: cps/web.py:3226
+#: cps/admin.py:615
 msgid "Edit e-mail server settings"
 msgstr "编辑邮箱服务器设置"
 
-#: cps/web.py:3251
+#: cps/admin.py:640
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "用户 '%(nick)s' 已被删除"
 
-#: cps/web.py:3364
+#: cps/admin.py:711
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "用户 '%(nick)s' 已被更新"
 
-#: cps/web.py:3367
+#: cps/admin.py:714
 msgid "An unknown error occured."
 msgstr "发生未知错误。"
 
-#: cps/web.py:3369
+#: cps/admin.py:717
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "编辑用户 %(nick)s"
 
-#: cps/web.py:3386
+#: cps/admin.py:733
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "用户 %(user)s 的密码已重置"
 
-#: cps/web.py:3400 cps/web.py:3592
+#: cps/admin.py:736 cps/web.py:1070
+msgid "An unknown error occurred. Please try again later."
+msgstr "发生一个未知错误，请稍后再试。"
+
+#: cps/admin.py:755
+msgid "Requesting update package"
+msgstr "正在请求更新包"
+
+#: cps/admin.py:756
+msgid "Downloading update package"
+msgstr "正在下载更新包"
+
+#: cps/admin.py:757
+msgid "Unzipping update package"
+msgstr "正在解压更新包"
+
+#: cps/admin.py:758
+msgid "Replacing files"
+msgstr "正在替换文件"
+
+#: cps/admin.py:759
+msgid "Database connections are closed"
+msgstr "数据库连接已关闭"
+
+#: cps/admin.py:760
+msgid "Stopping server"
+msgstr "正在停止服务器"
+
+#: cps/admin.py:761
+msgid "Update finished, please press okay and reload page"
+msgstr "更新完成，请按确定并刷新页面"
+
+#: cps/admin.py:762 cps/admin.py:763 cps/admin.py:764 cps/admin.py:765
+msgid "Update failed:"
+msgstr "更新失败："
+
+#: cps/admin.py:762 cps/updater.py:277 cps/updater.py:456 cps/updater.py:458
+msgid "HTTP Error"
+msgstr "HTTP错误"
+
+#: cps/admin.py:763 cps/updater.py:279 cps/updater.py:460
+msgid "Connection error"
+msgstr "连接错误"
+
+#: cps/admin.py:764 cps/updater.py:281 cps/updater.py:462
+msgid "Timeout while establishing connection"
+msgstr "建立连接超时"
+
+#: cps/admin.py:765 cps/updater.py:283 cps/updater.py:464
+msgid "General error"
+msgstr "一般错误"
+
+#: cps/converter.py:31 cps/converter.py:48 cps/uploader.py:213
+#: cps/uploader.py:214 cps/uploader.py:218 cps/uploader.py:222
+#: cps/uploader.py:226
+msgid "not installed"
+msgstr "未安装"
+
+#: cps/converter.py:43 cps/converter.py:60
+msgid "Excecution permissions missing"
+msgstr "可执行权限缺失"
+
+#: cps/converter.py:70
+msgid "not configured"
+msgstr "未配置"
+
+#: cps/editbooks.py:218 cps/editbooks.py:432
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "打开电子书出错。文件不存在或不可访问"
 
-#: cps/web.py:3428
+#: cps/editbooks.py:246
 msgid "edit metadata"
 msgstr "编辑元数据"
 
-#: cps/web.py:3521 cps/web.py:3754
+#: cps/editbooks.py:325 cps/editbooks.py:595
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "不能上传后缀为　'%(ext)s'　的文件到此服务器"
 
-#: cps/web.py:3525 cps/web.py:3757
+#: cps/editbooks.py:329 cps/editbooks.py:599
 msgid "File to be uploaded must have an extension"
 msgstr "要上传的文件必须有一个后缀"
 
-#: cps/web.py:3537 cps/web.py:3776
+#: cps/editbooks.py:341 cps/editbooks.py:619
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "创建路径 %(path)s 失败(权限拒绝)。"
 
-#: cps/web.py:3542
+#: cps/editbooks.py:346
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "保存文件 %(file)s 失败。"
 
-#: cps/web.py:3559
+#: cps/editbooks.py:363
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "已添加 %(ext)s 格式到 %(book)s"
 
-#: cps/web.py:3573 cps/web.py:3646
+#: cps/editbooks.py:382
+#, python-format
+msgid "Failed to create path for cover %(path)s (Permission denied)."
+msgstr ""
+
+#: cps/editbooks.py:390
+#, python-format
+msgid "Failed to store cover-file %(cover)s."
+msgstr ""
+
+#: cps/editbooks.py:393
+msgid "Cover-file is not a valid image file"
+msgstr ""
+
+#: cps/editbooks.py:399 cps/editbooks.py:413
 msgid "Cover is not a supported imageformat (jpg/png/webp), can't save"
 msgstr ""
 
-#: cps/web.py:3605 cps/web.py:3614
+#: cps/editbooks.py:445 cps/editbooks.py:454
 msgid "unknown"
 msgstr "未知"
 
-#: cps/web.py:3694
+#: cps/editbooks.py:486
+msgid "Cover is not a jpg file, can't save"
+msgstr ""
+
+#: cps/editbooks.py:534
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr "%(langname)s 不是一种有效语言"
 
-#: cps/web.py:3725
+#: cps/editbooks.py:565
 msgid "Metadata successfully updated"
 msgstr "已成功更新元数据"
 
-#: cps/web.py:3734
+#: cps/editbooks.py:574
 msgid "Error editing book, please check logfile for details"
 msgstr "编辑书籍出错，详情请检查日志文件"
 
-#: cps/web.py:3780
+#: cps/editbooks.py:624
 #, python-format
 msgid "Failed to store file %(file)s (Permission denied)."
 msgstr "存储文件 %(file)s 失败(权限拒绝)。"
 
-#: cps/web.py:3785
+#: cps/editbooks.py:629
 #, python-format
 msgid "Failed to delete file %(file)s (Permission denied)."
 msgstr "删除文件 %(file)s 失败(权限拒绝)。"
 
-#: cps/web.py:3867
+#: cps/editbooks.py:712
 #, python-format
-msgid "File %(title)s"
+msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/web.py:3896
+#: cps/editbooks.py:741
 msgid "Source or destination format for conversion missing"
 msgstr "转换的源或目的格式缺失"
 
-#: cps/web.py:3906
+#: cps/editbooks.py:751
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "书籍已经被成功加入 %(book_format)s 的转换队列"
 
-#: cps/web.py:3910
+#: cps/editbooks.py:755
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "转换此书时出现错误： %(res)s"
 
-#: cps/worker.py:305
+#: cps/gdrive.py:56
+msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again"
+msgstr ""
+
+#: cps/gdrive.py:101
+msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
+msgstr "回调域名尚未被校验，请在google开发者控制台按步骤校验域名"
+
+#: cps/helper.py:97
+#, python-format
+msgid "%(format)s format not found for book id: %(book)d"
+msgstr "找不到id为 %(book)d 的书的 %(format)s 格式"
+
+#: cps/helper.py:109
+#, python-format
+msgid "%(format)s not found on Google Drive: %(fn)s"
+msgstr "Google Drive %(fn)s 上找不到 %(format)s"
+
+#: cps/helper.py:116 cps/helper.py:223 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
+msgid "Send to Kindle"
+msgstr "发送到Kindle"
+
+#: cps/helper.py:117 cps/helper.py:135 cps/helper.py:225
+msgid "This e-mail has been sent via Calibre-Web."
+msgstr "此邮件已经通过Calibre-Web发送"
+
+#: cps/helper.py:128
+#, python-format
+msgid "%(format)s not found: %(fn)s"
+msgstr "找不到 %(format)s: %(fn)s"
+
+#: cps/helper.py:133
+msgid "Calibre-Web test e-mail"
+msgstr "Calibre-Web测试邮件"
+
+#: cps/helper.py:134
+msgid "Test e-mail"
+msgstr "测试邮件"
+
+#: cps/helper.py:150
+msgid "Get Started with Calibre-Web"
+msgstr "开启Calibre-Web之旅"
+
+#: cps/helper.py:151
+#, python-format
+msgid "Registration e-mail for user: %(name)s"
+msgstr "用户 %(name)s 的注册邮箱"
+
+#: cps/helper.py:165 cps/helper.py:167 cps/helper.py:169 cps/helper.py:177
+#: cps/helper.py:179 cps/helper.py:181
+#, python-format
+msgid "Send %(format)s to Kindle"
+msgstr ""
+
+#: cps/helper.py:185
+#, python-format
+msgid "Convert %(orig)s to %(format)s and send to Kindle"
+msgstr ""
+
+#: cps/helper.py:224
+#, python-format
+msgid "E-mail: %(book)s"
+msgstr ""
+
+#: cps/helper.py:227
+msgid "The requested file could not be read. Maybe wrong permissions?"
+msgstr "无法读取请求的文件。 可能有错误的权限设置？"
+
+#: cps/helper.py:335
+#, python-format
+msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "将标题从'%(src)s'改为'%(dest)s'时失败，出错信息: %(error)s"
+
+#: cps/helper.py:345
+#, python-format
+msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr "将作者从'%(src)s'改为'%(dest)s'时失败，出错信息: %(error)s"
+
+#: cps/helper.py:359
+#, python-format
+msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
+msgstr ""
+
+#: cps/helper.py:385 cps/helper.py:395 cps/helper.py:403
+#, python-format
+msgid "File %(file)s not found on Google Drive"
+msgstr "Google Drive上找不到文件 %(file)s"
+
+#: cps/helper.py:424
+#, python-format
+msgid "Book path %(path)s not found on Google Drive"
+msgstr "Google Drive上找不到书籍路径 %(path)s"
+
+#: cps/helper.py:584
+msgid "Error excecuting UnRar"
+msgstr "执行UnRar时出错"
+
+#: cps/helper.py:586
+msgid "Unrar binary file not found"
+msgstr "找不到Unrar二进制文件"
+
+#: cps/helper.py:614
+msgid "Waiting"
+msgstr "等待中"
+
+#: cps/helper.py:616
+msgid "Failed"
+msgstr "失败"
+
+#: cps/helper.py:618
+msgid "Started"
+msgstr "已开始"
+
+#: cps/helper.py:620
+msgid "Finished"
+msgstr "已完成"
+
+#: cps/helper.py:622
+msgid "Unknown Status"
+msgstr "未知状态"
+
+#: cps/helper.py:627
+msgid "E-mail: "
+msgstr ""
+
+#: cps/helper.py:629 cps/helper.py:633
+msgid "Convert: "
+msgstr "转换："
+
+#: cps/helper.py:631
+msgid "Upload: "
+msgstr "上传："
+
+#: cps/helper.py:635
+msgid "Unknown Task: "
+msgstr "未知任务："
+
+#: cps/oauth_bb.py:87
+#, python-format
+msgid "Register with %s, "
+msgstr ""
+
+#: cps/oauth_bb.py:145
+msgid "Failed to log in with GitHub."
+msgstr ""
+
+#: cps/oauth_bb.py:150
+msgid "Failed to fetch user info from GitHub."
+msgstr ""
+
+#: cps/oauth_bb.py:161
+msgid "Failed to log in with Google."
+msgstr ""
+
+#: cps/oauth_bb.py:166
+msgid "Failed to fetch user info from Google."
+msgstr ""
+
+#: cps/oauth_bb.py:265
+#, python-format
+msgid "Unlink to %(oauth)s success."
+msgstr ""
+
+#: cps/oauth_bb.py:269
+#, python-format
+msgid "Unlink to %(oauth)s failed."
+msgstr ""
+
+#: cps/oauth_bb.py:272
+#, python-format
+msgid "Not linked to %(oauth)s."
+msgstr ""
+
+#: cps/oauth_bb.py:300
+msgid "GitHub Oauth error, please retry later."
+msgstr ""
+
+#: cps/oauth_bb.py:319
+msgid "Google Oauth error, please retry later."
+msgstr ""
+
+#: cps/shelf.py:40 cps/shelf.py:92
+msgid "Invalid shelf specified"
+msgstr "指定的书架无效"
+
+#: cps/shelf.py:47
+#, python-format
+msgid "Sorry you are not allowed to add a book to the the shelf: %(shelfname)s"
+msgstr "对不起，您没有添加书籍到书架 %(shelfname)s 的权限"
+
+#: cps/shelf.py:55
+msgid "You are not allowed to edit public shelves"
+msgstr "您没有编辑书架的权限"
+
+#: cps/shelf.py:64
+#, python-format
+msgid "Book is already part of the shelf: %(shelfname)s"
+msgstr "此书已经是书架 %(shelfname)s 的一部分"
+
+#: cps/shelf.py:78
+#, python-format
+msgid "Book has been added to shelf: %(sname)s"
+msgstr "此书已被添加到书架: %(sname)s"
+
+#: cps/shelf.py:97
+#, python-format
+msgid "You are not allowed to add a book to the the shelf: %(name)s"
+msgstr "您没有添加书籍到书架 %(name)s 的权限"
+
+#: cps/shelf.py:102
+msgid "User is not allowed to edit public shelves"
+msgstr "用户没有编辑公开书架的权限"
+
+#: cps/shelf.py:120
+#, python-format
+msgid "Books are already part of the shelf: %(name)s"
+msgstr "书籍已经在书架 %(name)s 中了"
+
+#: cps/shelf.py:134
+#, python-format
+msgid "Books have been added to shelf: %(sname)s"
+msgstr "书籍已经被添加到书架 %(sname)s 中'"
+
+#: cps/shelf.py:136
+#, python-format
+msgid "Could not add books to shelf: %(sname)s"
+msgstr "无法添加书籍到书架: %(sname)s"
+
+#: cps/shelf.py:173
+#, python-format
+msgid "Book has been removed from shelf: %(sname)s"
+msgstr "此书已从书架 %(sname)s 中删除"
+
+#: cps/shelf.py:179
+#, python-format
+msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
+msgstr "对不起，您没有从书架 %(sname)s 中删除书籍的权限"
+
+#: cps/shelf.py:200 cps/shelf.py:224
+#, python-format
+msgid "A shelf with the name '%(title)s' already exists."
+msgstr "已存在书架 '%(title)s'。"
+
+#: cps/shelf.py:205
+#, python-format
+msgid "Shelf %(title)s created"
+msgstr "书架 %(title)s 已被创建"
+
+#: cps/shelf.py:207 cps/shelf.py:235
+msgid "There was an error"
+msgstr "发生错误"
+
+#: cps/shelf.py:208 cps/shelf.py:210
+msgid "create a shelf"
+msgstr "创建书架"
+
+#: cps/shelf.py:233
+#, python-format
+msgid "Shelf %(title)s changed"
+msgstr "书架 %(title)s 已被修改"
+
+#: cps/shelf.py:236 cps/shelf.py:238
+msgid "Edit a shelf"
+msgstr "编辑书架"
+
+#: cps/shelf.py:259
+#, python-format
+msgid "successfully deleted shelf %(name)s"
+msgstr "成功删除书架 %(name)s"
+
+#: cps/shelf.py:289
+#, python-format
+msgid "Shelf: '%(name)s'"
+msgstr "书架: '%(name)s'"
+
+#: cps/shelf.py:292
+msgid "Error opening shelf. Shelf does not exist or is not accessible"
+msgstr "打开书架出错。书架不存在或不可访问"
+
+#: cps/shelf.py:324
+#, python-format
+msgid "Change order of Shelf: '%(name)s'"
+msgstr "修改书架 '%(name)s' 顺序"
+
+#: cps/ub.py:111
+msgid "Recently Added"
+msgstr "最近添加"
+
+#: cps/ub.py:113
+msgid "Show recent books"
+msgstr "显示最近书籍"
+
+#: cps/templates/index.xml:17 cps/ub.py:114
+msgid "Hot Books"
+msgstr "热门书籍"
+
+#: cps/ub.py:115
+msgid "Show hot books"
+msgstr "显示热门书籍"
+
+#: cps/templates/index.xml:24 cps/ub.py:118
+msgid "Best rated Books"
+msgstr "最高评分书籍"
+
+#: cps/ub.py:120
+msgid "Show best rated books"
+msgstr "显示最高评分书籍"
+
+#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:121
+#: cps/web.py:965
+msgid "Read Books"
+msgstr "已读书籍"
+
+#: cps/ub.py:123
+msgid "Show read and unread"
+msgstr "显示已读和未读"
+
+#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:125
+#: cps/web.py:969
+msgid "Unread Books"
+msgstr "未读书籍"
+
+#: cps/ub.py:127
+msgid "Show unread"
+msgstr ""
+
+#: cps/ub.py:128
+msgid "Discover"
+msgstr "发现"
+
+#: cps/ub.py:130
+msgid "Show random books"
+msgstr "显示随机书籍"
+
+#: cps/ub.py:131
+msgid "Categories"
+msgstr "分类"
+
+#: cps/ub.py:133
+msgid "Show category selection"
+msgstr "显示分类选择"
+
+#: cps/templates/book_edit.html:71 cps/templates/search_form.html:53
+#: cps/ub.py:134
+msgid "Series"
+msgstr "丛书"
+
+#: cps/ub.py:136
+msgid "Show series selection"
+msgstr "显示丛书选择"
+
+#: cps/templates/index.xml:61 cps/ub.py:137
+msgid "Authors"
+msgstr "作者"
+
+#: cps/ub.py:139
+msgid "Show author selection"
+msgstr "显示作者选择"
+
+#: cps/templates/index.xml:68 cps/ub.py:141
+msgid "Publishers"
+msgstr "出版社"
+
+#: cps/ub.py:143
+msgid "Show publisher selection"
+msgstr "显示出版社选择"
+
+#: cps/templates/search_form.html:74 cps/ub.py:144
+msgid "Languages"
+msgstr "语言"
+
+#: cps/ub.py:147
+msgid "Show language selection"
+msgstr "显示语言选择"
+
+#: cps/ub.py:148
+msgid "Ratings"
+msgstr ""
+
+#: cps/ub.py:150
+msgid "Show ratings selection"
+msgstr ""
+
+#: cps/ub.py:151
+msgid "File formats"
+msgstr ""
+
+#: cps/ub.py:153
+msgid "Show file formats selection"
+msgstr ""
+
+#: cps/updater.py:257 cps/updater.py:364 cps/updater.py:377
+msgid "Unexpected data while reading update information"
+msgstr "读取更新信息时出现异常数据"
+
+#: cps/updater.py:264 cps/updater.py:370
+msgid "No update available. You already have the latest version installed"
+msgstr "没有可用更新。您已经安装了最新版本"
+
+#: cps/updater.py:290 cps/updater.py:422
+msgid "A new update is available. Click on the button below to update to the latest version."
+msgstr "有一个更新可用。点击正文按钮更新到最新版本。"
+
+#: cps/updater.py:343
+msgid "Could not fetch update information"
+msgstr "无法获取更新信息"
+
+#: cps/updater.py:357
+msgid "No release information available"
+msgstr ""
+
+#: cps/updater.py:403 cps/updater.py:412
+#, python-format
+msgid "A new update is available. Click on the button below to update to version: %(version)s"
+msgstr ""
+
+#: cps/web.py:457
+msgid "Recently Added Books"
+msgstr "最近添加的书籍"
+
+#: cps/web.py:484
+msgid "Best rated books"
+msgstr "最高评分书籍"
+
+#: cps/templates/index.xml:38 cps/web.py:492
+msgid "Random Books"
+msgstr "随机书籍"
+
+#: cps/web.py:516
+msgid "Books"
+msgstr ""
+
+#: cps/web.py:543
+msgid "Hot Books (most downloaded)"
+msgstr "热门书籍(最多下载)"
+
+#: cps/web.py:553 cps/web.py:1294 cps/web.py:1383
+msgid "Error opening eBook. File does not exist or file is not accessible:"
+msgstr "无法打开电子书。 文件不存在或者文件不可访问:"
+
+#: cps/web.py:580
+#, python-format
+msgid "Publisher: %(name)s"
+msgstr "出版社： %(name)s"
+
+#: cps/web.py:591
+#, python-format
+msgid "Series: %(serie)s"
+msgstr "丛书: %(serie)s"
+
+#: cps/web.py:602
+#, python-format
+msgid "Rating: %(rating)s stars"
+msgstr ""
+
+#: cps/web.py:613
+#, python-format
+msgid "File format: %(format)s"
+msgstr ""
+
+#: cps/web.py:625
+#, python-format
+msgid "Category: %(name)s"
+msgstr "分类: %(name)s"
+
+#: cps/web.py:659
+msgid "Publisher list"
+msgstr "出版社列表"
+
+#: cps/templates/index.xml:82 cps/web.py:675
+msgid "Series list"
+msgstr "丛书列表"
+
+#: cps/web.py:689
+msgid "Ratings list"
+msgstr ""
+
+#: cps/web.py:702
+msgid "File formats list"
+msgstr ""
+
+#: cps/web.py:730
+msgid "Available languages"
+msgstr "可用语言"
+
+#: cps/web.py:750
+#, python-format
+msgid "Language: %(name)s"
+msgstr "语言: %(name)s"
+
+#: cps/templates/index.xml:75 cps/web.py:764
+msgid "Category list"
+msgstr "分类列表"
+
+#: cps/templates/layout.html:73 cps/web.py:777
+msgid "Tasks"
+msgstr "任务"
+
+#: cps/web.py:841
+msgid "Published after "
+msgstr "出版时晚于 "
+
+#: cps/web.py:848
+msgid "Published before "
+msgstr "出版时早于 "
+
+#: cps/web.py:862
+#, python-format
+msgid "Rating <= %(rating)s"
+msgstr "评分 <= %(rating)s"
+
+#: cps/web.py:864
+#, python-format
+msgid "Rating >= %(rating)s"
+msgstr "评分 >= %(rating)s"
+
+#: cps/web.py:924 cps/web.py:933
+msgid "search"
+msgstr "搜索"
+
+#: cps/web.py:1018
+msgid "Please configure the SMTP mail settings first..."
+msgstr "请先配置SMTP邮箱..."
+
+#: cps/web.py:1023
+#, python-format
+msgid "Book successfully queued for sending to %(kindlemail)s"
+msgstr "书籍已经被成功加入 %(kindlemail)s 的发送队列"
+
+#: cps/web.py:1027
+#, python-format
+msgid "There was an error sending this book: %(res)s"
+msgstr "发送这本书的时候出现错误: %(res)s"
+
+#: cps/web.py:1046 cps/web.py:1071 cps/web.py:1076 cps/web.py:1081
+#: cps/web.py:1085
+msgid "register"
+msgstr "注册"
+
+#: cps/web.py:1073
+msgid "Your e-mail is not allowed to register"
+msgstr "您的邮箱不能用来注册"
+
+#: cps/web.py:1077
+msgid "Confirmation e-mail was send to your e-mail account."
+msgstr "确认邮件已经发送到您的邮箱。"
+
+#: cps/web.py:1080
+msgid "This username or e-mail address is already in use."
+msgstr "这个用户名或者邮箱已经被使用。"
+
+#: cps/web.py:1103 cps/web.py:1115
+#, python-format
+msgid "You are now logged in as: '%(nickname)s'"
+msgstr ""
+
+#: cps/web.py:1108 cps/web.py:1120
+msgid "Wrong Username or Password"
+msgstr "用户名或密码错误"
+
+#: cps/web.py:1111
+msgid "Could not login. LDAP server down, please contact your administrator"
+msgstr ""
+
+#: cps/web.py:1124 cps/web.py:1146
+msgid "login"
+msgstr "登录"
+
+#: cps/web.py:1158 cps/web.py:1189
+msgid "Token not found"
+msgstr "找不到Token"
+
+#: cps/web.py:1166 cps/web.py:1197
+msgid "Token has expired"
+msgstr "Token已过期"
+
+#: cps/web.py:1174
+msgid "Success! Please return to your device"
+msgstr "成功！请返回您的设备"
+
+#: cps/web.py:1210
+#, python-format
+msgid "you are now logged in as: '%(nickname)s'"
+msgstr "您现在已以'%(nickname)s'身份登录"
+
+#: cps/web.py:1250 cps/web.py:1277 cps/web.py:1281
+#, python-format
+msgid "%(name)s's profile"
+msgstr "%(name)s 的资料"
+
+#: cps/web.py:1274
+msgid "Found an existing account for this e-mail address."
+msgstr "找到一个已有账号使用这个邮箱。"
+
+#: cps/web.py:1279
+msgid "Profile updated"
+msgstr "资料已更新"
+
+#: cps/web.py:1304 cps/web.py:1306 cps/web.py:1308 cps/web.py:1314
+#: cps/web.py:1318
+msgid "Read a Book"
+msgstr "阅读一本书"
+
+#: cps/web.py:1328
+msgid "Error opening eBook. File does not exist or file is not accessible."
+msgstr ""
+
+#: cps/worker.py:308
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
 msgstr "电子书转换器失败： %(error)s"
 
-#: cps/worker.py:316
+#: cps/worker.py:319
 #, python-format
 msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "Kindlegen 因为错误 %(error)s 失败。消息： %(message)s"
@@ -780,147 +969,152 @@ msgstr ""
 msgid "Admin"
 msgstr "管理"
 
-#: cps/templates/admin.html:14 cps/templates/detail.html:22
-#: cps/templates/detail.html:31
+#: cps/templates/admin.html:14 cps/templates/detail.html:18
+#: cps/templates/detail.html:27 cps/templates/shelf.html:6
+#: cps/templates/shelfdown.html:62
 msgid "Download"
 msgstr "下载"
 
-#: cps/templates/admin.html:15 cps/templates/layout.html:65
+#: cps/templates/admin.html:15
+msgid "View Ebooks"
+msgstr ""
+
+#: cps/templates/admin.html:16 cps/templates/layout.html:65
 msgid "Upload"
 msgstr "上传"
 
-#: cps/templates/admin.html:16
+#: cps/templates/admin.html:17
 msgid "Edit"
 msgstr "编辑"
 
-#: cps/templates/admin.html:39
+#: cps/templates/admin.html:41
 msgid "SMTP e-mail server settings"
 msgstr "SMTP邮件服务器设置"
 
-#: cps/templates/admin.html:42 cps/templates/email_edit.html:11
+#: cps/templates/admin.html:44 cps/templates/email_edit.html:11
 msgid "SMTP hostname"
 msgstr "SMTP地址"
 
-#: cps/templates/admin.html:43
+#: cps/templates/admin.html:45
 msgid "SMTP port"
 msgstr "SMTP端口"
 
-#: cps/templates/admin.html:44
+#: cps/templates/admin.html:46
 msgid "SSL"
 msgstr ""
 
-#: cps/templates/admin.html:45 cps/templates/email_edit.html:27
+#: cps/templates/admin.html:47 cps/templates/email_edit.html:27
 msgid "SMTP login"
 msgstr "SMTP用户名"
 
-#: cps/templates/admin.html:46
+#: cps/templates/admin.html:48
 msgid "From mail"
 msgstr "来自邮箱"
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:58
 msgid "Change SMTP settings"
 msgstr "修改SMTP设置"
 
-#: cps/templates/admin.html:62
+#: cps/templates/admin.html:64
 msgid "Configuration"
 msgstr "配置"
 
-#: cps/templates/admin.html:65
+#: cps/templates/admin.html:67
 msgid "Calibre DB dir"
 msgstr "Calibre DB目录"
 
-#: cps/templates/admin.html:69
+#: cps/templates/admin.html:71
 msgid "Log level"
 msgstr "日志级别"
 
-#: cps/templates/admin.html:73
+#: cps/templates/admin.html:75
 msgid "Port"
 msgstr "端口"
 
-#: cps/templates/admin.html:79 cps/templates/config_view_edit.html:23
+#: cps/templates/admin.html:81 cps/templates/config_view_edit.html:23
 msgid "Books per page"
 msgstr "每页书籍数"
 
-#: cps/templates/admin.html:83
+#: cps/templates/admin.html:85
 msgid "Uploading"
 msgstr "上传"
 
-#: cps/templates/admin.html:87
+#: cps/templates/admin.html:89
 msgid "Anonymous browsing"
 msgstr "匿名浏览"
 
-#: cps/templates/admin.html:91
+#: cps/templates/admin.html:93
 msgid "Public registration"
 msgstr "开放注册"
 
-#: cps/templates/admin.html:95 cps/templates/remote_login.html:4
+#: cps/templates/admin.html:97 cps/templates/remote_login.html:4
 msgid "Remote login"
 msgstr "远程登录"
 
-#: cps/templates/admin.html:106
+#: cps/templates/admin.html:108
 msgid "Administration"
 msgstr "管理"
 
-#: cps/templates/admin.html:107
+#: cps/templates/admin.html:109
 msgid "Reconnect to Calibre DB"
 msgstr "重新连接到Calibre数据库"
 
-#: cps/templates/admin.html:108
+#: cps/templates/admin.html:110
 msgid "Restart Calibre-Web"
 msgstr "重启 Calibre-Web"
 
-#: cps/templates/admin.html:109
+#: cps/templates/admin.html:111
 msgid "Stop Calibre-Web"
 msgstr "停止 Calibre-Web"
 
-#: cps/templates/admin.html:115
+#: cps/templates/admin.html:117
 msgid "Update"
 msgstr "更新"
 
-#: cps/templates/admin.html:119
+#: cps/templates/admin.html:121
 msgid "Version"
 msgstr "版本"
 
-#: cps/templates/admin.html:120
+#: cps/templates/admin.html:122
 msgid "Details"
 msgstr "详情"
 
-#: cps/templates/admin.html:126
+#: cps/templates/admin.html:128
 msgid "Current version"
 msgstr "当前版本"
 
-#: cps/templates/admin.html:132
+#: cps/templates/admin.html:134
 msgid "Check for update"
 msgstr "检查更新"
 
-#: cps/templates/admin.html:133
+#: cps/templates/admin.html:135
 msgid "Perform Update"
 msgstr "执行更新"
 
-#: cps/templates/admin.html:145
+#: cps/templates/admin.html:147
 msgid "Do you really want to restart Calibre-Web?"
 msgstr "您确定要重启 Calibre-Web 吗？"
 
-#: cps/templates/admin.html:150 cps/templates/admin.html:164
-#: cps/templates/admin.html:184 cps/templates/shelf.html:73
+#: cps/templates/admin.html:152 cps/templates/admin.html:166
+#: cps/templates/admin.html:186 cps/templates/shelf.html:72
 msgid "Ok"
 msgstr "确定"
 
-#: cps/templates/admin.html:151 cps/templates/admin.html:165
-#: cps/templates/book_edit.html:178 cps/templates/book_edit.html:200
-#: cps/templates/config_edit.html:226 cps/templates/config_view_edit.html:179
-#: cps/templates/email_edit.html:40 cps/templates/email_edit.html:75
-#: cps/templates/layout.html:28 cps/templates/shelf.html:74
+#: cps/templates/admin.html:153 cps/templates/admin.html:167
+#: cps/templates/book_edit.html:174 cps/templates/book_edit.html:196
+#: cps/templates/config_edit.html:281 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/user_edit.html:149
+#: cps/templates/user_edit.html:132
 msgid "Back"
 msgstr "后退"
 
-#: cps/templates/admin.html:163
+#: cps/templates/admin.html:165
 msgid "Do you really want to stop Calibre-Web?"
 msgstr "您确定要关闭 Calibre-Web 吗？"
 
-#: cps/templates/admin.html:175
+#: cps/templates/admin.html:177
 msgid "Updating, please do not reload page"
 msgstr "正在更新，请不要刷新页面"
 
@@ -932,176 +1126,176 @@ msgstr ""
 msgid "In Library"
 msgstr ""
 
-#: cps/templates/author.html:50 cps/templates/author.html:97
-#: cps/templates/discover.html:28 cps/templates/index.html:31
-#: cps/templates/index.html:86 cps/templates/search.html:55
-#: cps/templates/shelf.html:37
+#: cps/templates/author.html:34 cps/templates/list.html:14
+#: cps/templates/search.html:41
+msgid "All"
+msgstr ""
+
+#: cps/templates/author.html:58 cps/templates/author.html:105
+#: 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 ""
 
-#: cps/templates/author.html:81
+#: cps/templates/author.html:89
 msgid "More by"
 msgstr ""
 
-#: cps/templates/book_edit.html:16
+#: cps/templates/book_edit.html:12
 msgid "Delete Book"
 msgstr "删除书籍"
 
-#: cps/templates/book_edit.html:19
+#: cps/templates/book_edit.html:15
 msgid "Delete formats:"
 msgstr "删除格式:"
 
-#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:199
-#: cps/templates/email_edit.html:73 cps/templates/email_edit.html:74
+#: cps/templates/book_edit.html:18 cps/templates/book_edit.html:195
+#: cps/templates/email_edit.html:73
 msgid "Delete"
 msgstr "删除"
 
-#: cps/templates/book_edit.html:30
+#: cps/templates/book_edit.html:26
 msgid "Convert book format:"
 msgstr "转换书籍格式:"
 
-#: cps/templates/book_edit.html:34
+#: cps/templates/book_edit.html:30
 msgid "Convert from:"
 msgstr "从格式转换："
 
-#: cps/templates/book_edit.html:36 cps/templates/book_edit.html:43
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
 msgstr "选择一个选项"
 
-#: cps/templates/book_edit.html:41
+#: cps/templates/book_edit.html:37
 msgid "Convert to:"
 msgstr "转换到："
 
-#: cps/templates/book_edit.html:50
+#: cps/templates/book_edit.html:46
 msgid "Convert book"
 msgstr "转换书籍"
 
-#: cps/templates/book_edit.html:59 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:55 cps/templates/search_form.html:6
 msgid "Book Title"
 msgstr "书名"
 
-#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:259
-#: cps/templates/book_edit.html:277 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:59 cps/templates/book_edit.html:255
+#: cps/templates/book_edit.html:273 cps/templates/search_form.html:10
 msgid "Author"
 msgstr "作者"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:264
-#: cps/templates/book_edit.html:279 cps/templates/search_form.html:106
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:260
+#: cps/templates/book_edit.html:275 cps/templates/search_form.html:106
 msgid "Description"
 msgstr "简介"
 
-#: cps/templates/book_edit.html:71 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:67 cps/templates/search_form.html:33
 msgid "Tags"
 msgstr "标签"
 
-#: cps/templates/book_edit.html:75 cps/templates/layout.html:159
-#: cps/templates/search_form.html:53
-msgid "Series"
-msgstr "丛书"
-
-#: cps/templates/book_edit.html:79
+#: cps/templates/book_edit.html:75
 msgid "Series id"
 msgstr "丛书ID"
 
-#: cps/templates/book_edit.html:83
+#: cps/templates/book_edit.html:79
 msgid "Rating"
 msgstr "评分"
 
-#: cps/templates/book_edit.html:87
+#: cps/templates/book_edit.html:83
 msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
 msgstr "封面URL(jpg,封面会被下载被保存在数据库中，然后字段会被重新清空)"
 
-#: cps/templates/book_edit.html:91
+#: cps/templates/book_edit.html:87
 msgid "Upload Cover from local drive"
 msgstr "从本地磁盘上传封面"
 
-#: cps/templates/book_edit.html:96 cps/templates/detail.html:148
+#: cps/templates/book_edit.html:92 cps/templates/detail.html:168
 msgid "Publishing date"
 msgstr "出版日期"
 
-#: cps/templates/book_edit.html:103 cps/templates/book_edit.html:261
-#: cps/templates/book_edit.html:278 cps/templates/detail.html:139
+#: cps/templates/book_edit.html:99 cps/templates/book_edit.html:257
+#: cps/templates/book_edit.html:274 cps/templates/detail.html:159
 #: cps/templates/search_form.html:14
 msgid "Publisher"
 msgstr "出版社"
 
-#: cps/templates/book_edit.html:107 cps/templates/user_edit.html:31
+#: cps/templates/book_edit.html:103 cps/templates/user_edit.html:31
 msgid "Language"
 msgstr "语言"
 
-#: cps/templates/book_edit.html:117 cps/templates/search_form.html:117
+#: cps/templates/book_edit.html:113 cps/templates/search_form.html:117
 msgid "Yes"
 msgstr "确认"
 
-#: cps/templates/book_edit.html:118 cps/templates/search_form.html:118
+#: cps/templates/book_edit.html:114 cps/templates/search_form.html:118
 msgid "No"
 msgstr ""
 
-#: cps/templates/book_edit.html:164
+#: cps/templates/book_edit.html:160
 msgid "Upload format"
 msgstr "上传格式"
 
-#: cps/templates/book_edit.html:173
+#: cps/templates/book_edit.html:169
 msgid "view book after edit"
 msgstr "编辑后查看书籍"
 
-#: cps/templates/book_edit.html:176 cps/templates/book_edit.html:212
+#: cps/templates/book_edit.html:172 cps/templates/book_edit.html:208
 msgid "Get metadata"
 msgstr "获取元数据"
 
-#: cps/templates/book_edit.html:177 cps/templates/config_edit.html:224
-#: cps/templates/config_view_edit.html:178 cps/templates/login.html:20
+#: cps/templates/book_edit.html:173 cps/templates/config_edit.html:279
+#: cps/templates/config_view_edit.html:146 cps/templates/login.html:20
 #: cps/templates/search_form.html:150 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:147
+#: cps/templates/user_edit.html:130
 msgid "Submit"
 msgstr "提交"
 
-#: cps/templates/book_edit.html:191
+#: cps/templates/book_edit.html:187
 msgid "Are you really sure?"
 msgstr "您真的确认？"
 
-#: cps/templates/book_edit.html:194
+#: cps/templates/book_edit.html:190
 msgid "Book will be deleted from Calibre database"
 msgstr "书籍会被从Calibre数据库和硬盘中删除"
 
-#: cps/templates/book_edit.html:195
+#: cps/templates/book_edit.html:191
 msgid "and from hard disk"
 msgstr ""
 
-#: cps/templates/book_edit.html:215
+#: cps/templates/book_edit.html:211
 msgid "Keyword"
 msgstr "关键字"
 
-#: cps/templates/book_edit.html:216
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr "搜索关键字"
 
-#: cps/templates/book_edit.html:218 cps/templates/layout.html:47
+#: cps/templates/book_edit.html:214 cps/templates/layout.html:47
 msgid "Go!"
 msgstr "走起！"
 
-#: cps/templates/book_edit.html:222
+#: cps/templates/book_edit.html:218
 msgid "Click the cover to load metadata to the form"
 msgstr "点击封面加载元数据到表单"
 
-#: cps/templates/book_edit.html:234 cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:230 cps/templates/book_edit.html:270
 msgid "Loading..."
 msgstr "加载中..."
 
-#: cps/templates/book_edit.html:239 cps/templates/layout.html:226
-#: cps/templates/layout.html:258
+#: cps/templates/book_edit.html:235 cps/templates/layout.html:187
+#: cps/templates/layout.html:219
 msgid "Close"
 msgstr "关闭"
 
-#: cps/templates/book_edit.html:266 cps/templates/book_edit.html:280
+#: cps/templates/book_edit.html:262 cps/templates/book_edit.html:276
 msgid "Source"
 msgstr "来源"
 
-#: cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:271
 msgid "Search error!"
 msgstr "搜索错误"
 
-#: cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:272
 msgid "No Result(s) found! Please try aonther keyword."
 msgstr "找不到结果。请尝试另一个关键字"
 
@@ -1229,35 +1423,87 @@ msgstr ""
 msgid "Goodreads API Secret"
 msgstr ""
 
-#: cps/templates/config_edit.html:187
+#: cps/templates/config_edit.html:181
+msgid "Login type"
+msgstr ""
+
+#: cps/templates/config_edit.html:183
+msgid "Use standard Authentication"
+msgstr ""
+
+#: cps/templates/config_edit.html:185
+msgid "Use LDAP Authentication"
+msgstr ""
+
+#: cps/templates/config_edit.html:188
+msgid "Use GitHub OAuth"
+msgstr ""
+
+#: cps/templates/config_edit.html:189
+msgid "Use Google OAuth"
+msgstr ""
+
+#: cps/templates/config_edit.html:196
+msgid "LDAP Provider URL"
+msgstr ""
+
+#: cps/templates/config_edit.html:200
+msgid "LDAP Distinguished Name (DN)"
+msgstr ""
+
+#: cps/templates/config_edit.html:208
+msgid "Obtain GitHub OAuth Credential"
+msgstr ""
+
+#: cps/templates/config_edit.html:211
+msgid "GitHub OAuth Client Id"
+msgstr ""
+
+#: cps/templates/config_edit.html:215
+msgid "GitHub OAuth Client Secret"
+msgstr ""
+
+#: cps/templates/config_edit.html:221
+msgid "Obtain Google OAuth Credential"
+msgstr ""
+
+#: cps/templates/config_edit.html:224
+msgid "Google OAuth Client Id"
+msgstr ""
+
+#: cps/templates/config_edit.html:228
+msgid "Google OAuth Client Secret"
+msgstr ""
+
+#: cps/templates/config_edit.html:242
 msgid "External binaries"
 msgstr "外部二进制"
 
-#: cps/templates/config_edit.html:195
+#: cps/templates/config_edit.html:250
 msgid "No converter"
 msgstr "没有转换器"
 
-#: cps/templates/config_edit.html:197
+#: cps/templates/config_edit.html:252
 msgid "Use Kindlegen"
 msgstr "使用Kindlegen"
 
-#: cps/templates/config_edit.html:199
+#: cps/templates/config_edit.html:254
 msgid "Use calibre's ebook converter"
 msgstr "使用calibre的电子书转换器"
 
-#: cps/templates/config_edit.html:203
+#: cps/templates/config_edit.html:258
 msgid "E-Book converter settings"
 msgstr "电子书转换设置"
 
-#: cps/templates/config_edit.html:207
+#: cps/templates/config_edit.html:262
 msgid "Path to convertertool"
 msgstr "转换工具路径"
 
-#: cps/templates/config_edit.html:213
+#: cps/templates/config_edit.html:268
 msgid "Location of Unrar binary"
 msgstr "Unrar二进制位置"
 
-#: cps/templates/config_edit.html:229 cps/templates/layout.html:84
+#: cps/templates/config_edit.html:284 cps/templates/layout.html:84
 #: cps/templates/login.html:4
 msgid "Login"
 msgstr "登录"
@@ -1266,8 +1512,7 @@ msgstr "登录"
 msgid "View Configuration"
 msgstr "查看配置"
 
-#: cps/templates/config_view_edit.html:19 cps/templates/layout.html:135
-#: cps/templates/layout.html:136 cps/templates/shelf_edit.html:7
+#: cps/templates/config_view_edit.html:19 cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr "标题"
 
@@ -1279,7 +1524,7 @@ msgstr "随机书籍显示数量"
 msgid "No. of authors to show before hiding (0=disable hiding)"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:118
+#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:112
 msgid "Theme"
 msgstr "主题"
 
@@ -1311,127 +1556,91 @@ msgstr "成人内容标签"
 msgid "Default settings for new users"
 msgstr "新用户默认设置"
 
-#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:104
+#: cps/templates/config_view_edit.html:81 cps/templates/user_edit.html:83
 msgid "Admin user"
 msgstr "管理用户"
 
-#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:113
+#: cps/templates/config_view_edit.html:85 cps/templates/user_edit.html:92
 msgid "Allow Downloads"
 msgstr "允许下载"
 
-#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:117
+#: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:96
+msgid "Allow book viewer"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:100
 msgid "Allow Uploads"
 msgstr "允许上传"
 
-#: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:121
+#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:104
 msgid "Allow Edit"
 msgstr "允许编辑"
 
-#: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:125
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:108
 msgid "Allow Delete books"
 msgstr "允许删除书籍"
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:130
+#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:113
 msgid "Allow Changing Password"
 msgstr "允许修改密码"
 
-#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:134
+#: cps/templates/config_view_edit.html:109 cps/templates/user_edit.html:117
 msgid "Allow Editing Public Shelfs"
 msgstr "允许编辑公共书架"
 
-#: cps/templates/config_view_edit.html:115
+#: cps/templates/config_view_edit.html:119
 msgid "Default visibilities for new users"
 msgstr "新用户的默认显示权限"
 
-#: cps/templates/config_view_edit.html:123 cps/templates/user_edit.html:50
-msgid "Show random books"
-msgstr "显示随机书籍"
-
-#: cps/templates/config_view_edit.html:127 cps/templates/user_edit.html:54
-msgid "Show recent books"
-msgstr "显示最近书籍"
-
-#: cps/templates/config_view_edit.html:131 cps/templates/user_edit.html:58
-msgid "Show sorted books"
-msgstr "显示已排序书籍"
-
-#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:62
-msgid "Show hot books"
-msgstr "显示热门书籍"
-
-#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:66
-msgid "Show best rated books"
-msgstr "显示最高评分书籍"
-
-#: cps/templates/config_view_edit.html:143 cps/templates/user_edit.html:70
-msgid "Show language selection"
-msgstr "显示语言选择"
-
-#: cps/templates/config_view_edit.html:147 cps/templates/user_edit.html:74
-msgid "Show series selection"
-msgstr "显示丛书选择"
-
-#: cps/templates/config_view_edit.html:151 cps/templates/user_edit.html:78
-msgid "Show category selection"
-msgstr "显示分类选择"
-
-#: cps/templates/config_view_edit.html:155 cps/templates/user_edit.html:82
-msgid "Show author selection"
-msgstr "显示作者选择"
-
-#: cps/templates/config_view_edit.html:159 cps/templates/user_edit.html:86
-msgid "Show publisher selection"
-msgstr "显示出版社选择"
-
-#: cps/templates/config_view_edit.html:163 cps/templates/user_edit.html:91
-msgid "Show read and unread"
-msgstr "显示已读和未读"
-
-#: cps/templates/config_view_edit.html:167 cps/templates/user_edit.html:96
+#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:75
 msgid "Show random books in detail view"
 msgstr "在详情页显示随机书籍"
 
-#: cps/templates/config_view_edit.html:171 cps/templates/user_edit.html:109
+#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:88
 msgid "Show mature content"
 msgstr "显示成人内容"
 
-#: cps/templates/detail.html:63
+#: cps/templates/detail.html:59
 msgid "Read in browser"
 msgstr "在浏览器中阅读"
 
-#: cps/templates/detail.html:100
+#: cps/templates/detail.html:73
+msgid "Listen in browser"
+msgstr ""
+
+#: cps/templates/detail.html:120
 msgid "Book"
 msgstr ""
 
-#: cps/templates/detail.html:100
+#: cps/templates/detail.html:120
 msgid "of"
 msgstr ""
 
-#: cps/templates/detail.html:106
+#: cps/templates/detail.html:126
 msgid "language"
 msgstr "语言"
 
-#: cps/templates/detail.html:185
+#: cps/templates/detail.html:203
 msgid "Mark As Unread"
 msgstr ""
 
-#: cps/templates/detail.html:185
+#: cps/templates/detail.html:203
 msgid "Mark As Read"
 msgstr ""
 
-#: cps/templates/detail.html:186
+#: cps/templates/detail.html:204
 msgid "Read"
 msgstr ""
 
-#: cps/templates/detail.html:196
+#: cps/templates/detail.html:214 cps/templates/listenmp3.html:54
 msgid "Description:"
 msgstr "简介:"
 
-#: cps/templates/detail.html:209 cps/templates/search.html:14
+#: cps/templates/detail.html:227 cps/templates/search.html:14
 msgid "Add to shelf"
 msgstr "添加到书架"
 
-#: cps/templates/detail.html:271
+#: cps/templates/detail.html:289
 msgid "Edit metadata"
 msgstr "编辑元数据"
 
@@ -1491,12 +1700,12 @@ msgstr "添加"
 msgid "Do you really want to delete this domain rule?"
 msgstr "您确定要删除这条域名规则吗？"
 
-#: cps/templates/feed.xml:21 cps/templates/layout.html:210
+#: cps/templates/feed.xml:21 cps/templates/layout.html:171
 msgid "Next"
 msgstr "下一个"
 
-#: cps/templates/feed.xml:33 cps/templates/index.xml:11
-#: cps/templates/layout.html:44 cps/templates/layout.html:45
+#: cps/templates/feed.xml:33 cps/templates/layout.html:44
+#: cps/templates/layout.html:45
 msgid "Search"
 msgstr "搜索"
 
@@ -1508,75 +1717,63 @@ msgstr ""
 msgid "Discover (Random Books)"
 msgstr "发现(随机书籍)"
 
+#: cps/templates/index.html:65
+msgid "Group by series"
+msgstr ""
+
 #: cps/templates/index.xml:6
 msgid "Start"
 msgstr "开始"
 
-#: cps/templates/index.xml:18 cps/templates/layout.html:141
-msgid "Hot Books"
-msgstr "热门书籍"
-
-#: cps/templates/index.xml:22
+#: cps/templates/index.xml:21
 msgid "Popular publications from this catalog based on Downloads."
 msgstr "基于下载数的热门书籍"
 
-#: cps/templates/index.xml:25 cps/templates/layout.html:144
-msgid "Best rated Books"
-msgstr "最高评分书籍"
-
-#: cps/templates/index.xml:29
+#: cps/templates/index.xml:28
 msgid "Popular publications from this catalog based on Rating."
 msgstr "基于评分的热门书籍"
 
-#: cps/templates/index.xml:32
+#: cps/templates/index.xml:31
 msgid "New Books"
 msgstr "新书"
 
-#: cps/templates/index.xml:36
+#: cps/templates/index.xml:35
 msgid "The latest Books"
 msgstr "最新书籍"
 
-#: cps/templates/index.xml:43
+#: cps/templates/index.xml:42
 msgid "Show Random Books"
 msgstr "显示随机书籍"
 
-#: cps/templates/index.xml:62 cps/templates/layout.html:162
-msgid "Authors"
-msgstr "作者"
-
-#: cps/templates/index.xml:66
+#: cps/templates/index.xml:65
 msgid "Books ordered by Author"
 msgstr "书籍按作者排序"
 
-#: cps/templates/index.xml:69 cps/templates/layout.html:165
-msgid "Publishers"
-msgstr "出版社"
-
-#: cps/templates/index.xml:73
+#: cps/templates/index.xml:72
 msgid "Books ordered by publisher"
 msgstr "书籍按出版社排版"
 
-#: cps/templates/index.xml:80
+#: cps/templates/index.xml:79
 msgid "Books ordered by category"
 msgstr "书籍按分类排序"
 
-#: cps/templates/index.xml:87
+#: cps/templates/index.xml:86
 msgid "Books ordered by series"
 msgstr "书籍按丛书排序"
 
-#: cps/templates/index.xml:90 cps/templates/layout.html:171
+#: cps/templates/index.xml:89 cps/templates/layout.html:132
 msgid "Public Shelves"
 msgstr "公开书架"
 
-#: cps/templates/index.xml:94
+#: cps/templates/index.xml:93
 msgid "Books organized in public shelfs, visible to everyone"
 msgstr "公开书架中的书籍，对所有人都可见"
 
-#: cps/templates/index.xml:98 cps/templates/layout.html:175
+#: cps/templates/index.xml:97 cps/templates/layout.html:136
 msgid "Your Shelves"
 msgstr "您的书架"
 
-#: cps/templates/index.xml:102
+#: cps/templates/index.xml:101
 msgid "User's own shelfs, only visible to the current user himself"
 msgstr "用户私有书架，只对当前用户本身可见"
 
@@ -1593,7 +1790,7 @@ msgid "Advanced Search"
 msgstr "高级搜索"
 
 #: cps/templates/layout.html:76 cps/templates/read.html:71
-#: cps/templates/readcbr.html:89 cps/templates/readcbr.html:113
+#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
 msgid "Settings"
 msgstr "设置"
 
@@ -1609,7 +1806,7 @@ msgstr "注销"
 msgid "Register"
 msgstr "注册"
 
-#: cps/templates/layout.html:111 cps/templates/layout.html:257
+#: cps/templates/layout.html:111 cps/templates/layout.html:218
 msgid "Uploading..."
 msgstr "上传中..."
 
@@ -1621,68 +1818,27 @@ msgstr "请不要刷新页面"
 msgid "Browse"
 msgstr "浏览"
 
-#: cps/templates/layout.html:124
-msgid "Recently Added"
-msgstr "最近添加"
-
-#: cps/templates/layout.html:129
-msgid "Sorted Books"
-msgstr "已排序书籍"
-
-#: cps/templates/layout.html:133 cps/templates/layout.html:134
-#: cps/templates/layout.html:135 cps/templates/layout.html:136
-msgid "Sort By"
-msgstr "排序"
-
-#: cps/templates/layout.html:133
-msgid "Newest"
-msgstr "最新"
-
-#: cps/templates/layout.html:134
-msgid "Oldest"
-msgstr "最旧"
-
-#: cps/templates/layout.html:135
-msgid "Ascending"
-msgstr "升序"
-
-#: cps/templates/layout.html:136
-msgid "Descending"
-msgstr "降序"
-
-#: cps/templates/layout.html:153
-msgid "Discover"
-msgstr "发现"
-
-#: cps/templates/layout.html:156
-msgid "Categories"
-msgstr "分类"
-
-#: cps/templates/layout.html:168 cps/templates/search_form.html:74
-msgid "Languages"
-msgstr "语言"
-
-#: cps/templates/layout.html:180
+#: cps/templates/layout.html:141
 msgid "Create a Shelf"
 msgstr "创建书架"
 
-#: cps/templates/layout.html:181 cps/templates/stats.html:3
+#: cps/templates/layout.html:142 cps/templates/stats.html:3
 msgid "About"
 msgstr "关于"
 
-#: cps/templates/layout.html:195
+#: cps/templates/layout.html:156
 msgid "Previous"
 msgstr "上一个"
 
-#: cps/templates/layout.html:222
+#: cps/templates/layout.html:183
 msgid "Book Details"
 msgstr "书籍详情"
 
-#: cps/templates/layout.html:256
+#: cps/templates/layout.html:217
 msgid "Upload done, processing, please wait..."
 msgstr ""
 
-#: cps/templates/layout.html:259
+#: cps/templates/layout.html:220
 msgid "Error"
 msgstr ""
 
@@ -1712,105 +1868,105 @@ msgstr "Caliebre-Web电子书目录"
 msgid "Reflow text when sidebars are open."
 msgstr ""
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:88
 msgid "Keyboard Shortcuts"
 msgstr "快捷键"
 
-#: cps/templates/readcbr.html:97
+#: cps/templates/readcbr.html:91
 msgid "Previous Page"
 msgstr "上一页"
 
-#: cps/templates/readcbr.html:98
+#: cps/templates/readcbr.html:92
 msgid "Next Page"
 msgstr "下一页"
 
-#: cps/templates/readcbr.html:99
+#: cps/templates/readcbr.html:93
 msgid "Scale to Best"
 msgstr "缩放到最佳"
 
-#: cps/templates/readcbr.html:100
+#: cps/templates/readcbr.html:94
 msgid "Scale to Width"
 msgstr "按宽度缩放"
 
-#: cps/templates/readcbr.html:101
+#: cps/templates/readcbr.html:95
 msgid "Scale to Height"
 msgstr "按高度缩放"
 
-#: cps/templates/readcbr.html:102
+#: cps/templates/readcbr.html:96
 msgid "Scale to Native"
 msgstr ""
 
-#: cps/templates/readcbr.html:103
+#: cps/templates/readcbr.html:97
 msgid "Rotate Right"
 msgstr "向右旋转"
 
-#: cps/templates/readcbr.html:104
+#: cps/templates/readcbr.html:98
 msgid "Rotate Left"
 msgstr "向左旋转"
 
-#: cps/templates/readcbr.html:105
+#: cps/templates/readcbr.html:99
 msgid "Flip Image"
 msgstr "翻转图片"
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:115
 msgid "Light"
 msgstr "浅色"
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:116
 msgid "Dark"
 msgstr "深色"
 
-#: cps/templates/readcbr.html:127
+#: cps/templates/readcbr.html:121
 msgid "Scale"
 msgstr "缩放"
 
-#: cps/templates/readcbr.html:130
+#: cps/templates/readcbr.html:124
 msgid "Best"
 msgstr "最佳"
 
-#: cps/templates/readcbr.html:131
+#: cps/templates/readcbr.html:125
 msgid "Width"
 msgstr "宽度"
 
-#: cps/templates/readcbr.html:132
+#: cps/templates/readcbr.html:126
 msgid "Height"
 msgstr "高度"
 
-#: cps/templates/readcbr.html:133
+#: cps/templates/readcbr.html:127
 msgid "Native"
 msgstr ""
 
-#: cps/templates/readcbr.html:138
+#: cps/templates/readcbr.html:132
 msgid "Rotate"
 msgstr "旋转"
 
-#: cps/templates/readcbr.html:149
+#: cps/templates/readcbr.html:143
 msgid "Flip"
 msgstr "翻转"
 
-#: cps/templates/readcbr.html:152
+#: cps/templates/readcbr.html:146
 msgid "Horizontal"
 msgstr "水平"
 
-#: cps/templates/readcbr.html:153
+#: cps/templates/readcbr.html:147
 msgid "Vertical"
 msgstr "垂直"
 
-#: cps/templates/readcbr.html:158
+#: cps/templates/readcbr.html:152
 msgid "Direction"
 msgstr ""
 
-#: cps/templates/readcbr.html:161
+#: cps/templates/readcbr.html:155
 msgid "Left to Right"
 msgstr ""
 
-#: cps/templates/readcbr.html:162
+#: cps/templates/readcbr.html:156
 msgid "Right to Left"
 msgstr ""
 
 #: cps/templates/readpdf.html:29
-msgid "PDF.js viewer"
-msgstr "PDF.js 查看器"
+msgid "PDF reader"
+msgstr ""
 
 #: cps/templates/readtxt.html:6
 msgid "Basic txt Reader"
@@ -1884,23 +2040,23 @@ msgstr "评分大于"
 msgid "Rating less than"
 msgstr "评分小于"
 
-#: cps/templates/shelf.html:7
+#: cps/templates/shelf.html:10
 msgid "Delete this Shelf"
 msgstr "删除此书架"
 
-#: cps/templates/shelf.html:8
+#: cps/templates/shelf.html:11
 msgid "Edit Shelf"
 msgstr "编辑书架"
 
-#: cps/templates/shelf.html:9 cps/templates/shelf_order.html:11
+#: cps/templates/shelf.html:12 cps/templates/shelf_order.html:11
 msgid "Change order"
 msgstr "修改顺序"
 
-#: cps/templates/shelf.html:68
+#: cps/templates/shelf.html:67
 msgid "Do you really want to delete the shelf?"
 msgstr "您真的想要删除这个书架吗？"
 
-#: cps/templates/shelf.html:71
+#: cps/templates/shelf.html:70
 msgid "Shelf will be lost for everybody and forever!"
 msgstr "书架将会永远丢失！"
 
@@ -1988,19 +2144,31 @@ msgstr "重置用户密码"
 msgid "Kindle E-Mail"
 msgstr ""
 
-#: cps/templates/user_edit.html:39
+#: cps/templates/user_edit.html:40
 msgid "Show books with language"
 msgstr "按语言显示书籍"
 
-#: cps/templates/user_edit.html:41
+#: cps/templates/user_edit.html:42
 msgid "Show all"
 msgstr "显示全部"
 
-#: cps/templates/user_edit.html:141
+#: cps/templates/user_edit.html:52
+msgid "OAuth Settings"
+msgstr ""
+
+#: cps/templates/user_edit.html:54
+msgid "Link"
+msgstr ""
+
+#: cps/templates/user_edit.html:56
+msgid "Unlink"
+msgstr ""
+
+#: cps/templates/user_edit.html:124
 msgid "Delete this user"
 msgstr "删除此用户"
 
-#: cps/templates/user_edit.html:156
+#: cps/templates/user_edit.html:139
 msgid "Recent Downloads"
 msgstr "最近下载"
 
@@ -3282,3 +3450,45 @@ msgstr "最近下载"
 #~ msgid "Using your another device, login and visit "
 #~ msgstr ""
 
+#~ msgid "Newest Books"
+#~ msgstr "最新书籍"
+
+#~ msgid "Oldest Books"
+#~ msgstr "最旧书籍"
+
+#~ msgid "Books (A-Z)"
+#~ msgstr "书籍 (A-Z)"
+
+#~ msgid "Books (Z-A)"
+#~ msgstr "书籍 (Z-A)"
+
+#~ msgid "Error opening eBook. Fileformat is not supported."
+#~ msgstr ""
+
+#~ msgid "File %(title)s"
+#~ msgstr ""
+
+#~ msgid "Show sorted books"
+#~ msgstr "显示已排序书籍"
+
+#~ msgid "Sorted Books"
+#~ msgstr "已排序书籍"
+
+#~ msgid "Sort By"
+#~ msgstr "排序"
+
+#~ msgid "Newest"
+#~ msgstr "最新"
+
+#~ msgid "Oldest"
+#~ msgstr "最旧"
+
+#~ msgid "Ascending"
+#~ msgstr "升序"
+
+#~ msgid "Descending"
+#~ msgstr "降序"
+
+#~ msgid "PDF.js viewer"
+#~ msgstr "PDF.js 查看器"
+
diff --git a/messages.pot b/messages.pot
index c2c95e7e..458c614e 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-03-24 08:25+0100\n"
+"POT-Creation-Date: 2019-05-31 11:20+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -29,7 +29,7 @@ msgstr ""
 msgid "Performing shutdown of server, please close window"
 msgstr ""
 
-#: cps/admin.py:120 cps/updater.py:498
+#: cps/admin.py:120 cps/updater.py:445
 msgid "Unknown"
 msgstr ""
 
@@ -37,183 +37,184 @@ msgstr ""
 msgid "Admin page"
 msgstr ""
 
-#: cps/admin.py:206 cps/admin.py:484
+#: cps/admin.py:208 cps/admin.py:486
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
-#: cps/admin.py:220 cps/templates/admin.html:100
+#: cps/admin.py:222 cps/templates/admin.html:102
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/admin.py:293
+#: cps/admin.py:295
 msgid "Import of optional Google Drive requirements missing"
 msgstr ""
 
-#: cps/admin.py:296
+#: cps/admin.py:298
 msgid "client_secrets.json is missing or not readable"
 msgstr ""
 
-#: cps/admin.py:301 cps/admin.py:330
+#: cps/admin.py:303 cps/admin.py:332
 msgid "client_secrets.json is not configured for web application"
 msgstr ""
 
-#: cps/admin.py:333 cps/admin.py:359 cps/admin.py:371 cps/admin.py:396
-#: cps/admin.py:424 cps/admin.py:438 cps/admin.py:461 cps/admin.py:474
-#: cps/admin.py:492 cps/admin.py:499 cps/admin.py:514
-#: cps/templates/admin.html:99
+#: cps/admin.py:335 cps/admin.py:361 cps/admin.py:373 cps/admin.py:398
+#: cps/admin.py:426 cps/admin.py:440 cps/admin.py:463 cps/admin.py:476
+#: cps/admin.py:494 cps/admin.py:501 cps/admin.py:516
+#: cps/templates/admin.html:101
 msgid "Basic Configuration"
 msgstr ""
 
-#: cps/admin.py:356
+#: cps/admin.py:358
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/admin.py:368
+#: cps/admin.py:370
 msgid "Certfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/admin.py:393
+#: cps/admin.py:395
 msgid "Please enter a LDAP provider and a DN"
 msgstr ""
 
-#: cps/admin.py:421
+#: cps/admin.py:423
 msgid "Please enter Github oauth credentials"
 msgstr ""
 
-#: cps/admin.py:435
+#: cps/admin.py:437
 msgid "Please enter Google oauth credentials"
 msgstr ""
 
-#: cps/admin.py:458
+#: cps/admin.py:460
 msgid "Logfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/admin.py:496
+#: cps/admin.py:498
 msgid "DB location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/admin.py:556 cps/web.py:1055
+#: cps/admin.py:558 cps/web.py:1045
 msgid "Please fill out all fields!"
 msgstr ""
 
-#: cps/admin.py:558 cps/admin.py:564 cps/admin.py:580
-#: cps/templates/admin.html:33
+#: cps/admin.py:560 cps/admin.py:566 cps/admin.py:582
+#: cps/templates/admin.html:35
 msgid "Add new user"
 msgstr ""
 
-#: cps/admin.py:562 cps/web.py:1261
+#: cps/admin.py:564 cps/web.py:1248
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/admin.py:570
+#: cps/admin.py:572
 #, python-format
 msgid "User '%(user)s' created"
 msgstr ""
 
-#: cps/admin.py:574
+#: cps/admin.py:576
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/admin.py:605
+#: cps/admin.py:607
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/admin.py:608
+#: cps/admin.py:610
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/admin.py:610 cps/web.py:1039
+#: cps/admin.py:612 cps/web.py:1029
 msgid "Please configure your kindle e-mail address first..."
 msgstr ""
 
-#: cps/admin.py:612
+#: cps/admin.py:614
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/admin.py:613
+#: cps/admin.py:615
 msgid "Edit e-mail server settings"
 msgstr ""
 
-#: cps/admin.py:638
+#: cps/admin.py:640
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr ""
 
-#: cps/admin.py:704
+#: cps/admin.py:711
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr ""
 
-#: cps/admin.py:707
+#: cps/admin.py:714
 msgid "An unknown error occured."
 msgstr ""
 
-#: cps/admin.py:710
+#: cps/admin.py:717
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr ""
 
-#: cps/admin.py:726
+#: cps/admin.py:733
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:729 cps/web.py:1080
+#: cps/admin.py:736 cps/web.py:1070
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/admin.py:748
+#: cps/admin.py:755
 msgid "Requesting update package"
 msgstr ""
 
-#: cps/admin.py:749
+#: cps/admin.py:756
 msgid "Downloading update package"
 msgstr ""
 
-#: cps/admin.py:750
+#: cps/admin.py:757
 msgid "Unzipping update package"
 msgstr ""
 
-#: cps/admin.py:751
+#: cps/admin.py:758
 msgid "Replacing files"
 msgstr ""
 
-#: cps/admin.py:752
+#: cps/admin.py:759
 msgid "Database connections are closed"
 msgstr ""
 
-#: cps/admin.py:753
+#: cps/admin.py:760
 msgid "Stopping server"
 msgstr ""
 
-#: cps/admin.py:754
+#: cps/admin.py:761
 msgid "Update finished, please press okay and reload page"
 msgstr ""
 
-#: cps/admin.py:755 cps/admin.py:756 cps/admin.py:757 cps/admin.py:758
+#: cps/admin.py:762 cps/admin.py:763 cps/admin.py:764 cps/admin.py:765
 msgid "Update failed:"
 msgstr ""
 
-#: cps/admin.py:755 cps/updater.py:275 cps/updater.py:509 cps/updater.py:511
+#: cps/admin.py:762 cps/updater.py:277 cps/updater.py:456 cps/updater.py:458
 msgid "HTTP Error"
 msgstr ""
 
-#: cps/admin.py:756 cps/updater.py:277 cps/updater.py:513
+#: cps/admin.py:763 cps/updater.py:279 cps/updater.py:460
 msgid "Connection error"
 msgstr ""
 
-#: cps/admin.py:757 cps/updater.py:279 cps/updater.py:515
+#: cps/admin.py:764 cps/updater.py:281 cps/updater.py:462
 msgid "Timeout while establishing connection"
 msgstr ""
 
-#: cps/admin.py:758 cps/updater.py:281 cps/updater.py:517
+#: cps/admin.py:765 cps/updater.py:283 cps/updater.py:464
 msgid "General error"
 msgstr ""
 
-#: cps/converter.py:31 cps/converter.py:48 cps/uploader.py:159
-#: cps/uploader.py:160 cps/uploader.py:164 cps/uploader.py:168
+#: cps/converter.py:31 cps/converter.py:48 cps/uploader.py:213
+#: cps/uploader.py:214 cps/uploader.py:218 cps/uploader.py:222
+#: cps/uploader.py:226
 msgid "not installed"
 msgstr ""
 
@@ -225,7 +226,7 @@ msgstr ""
 msgid "not configured"
 msgstr ""
 
-#: cps/editbooks.py:218 cps/editbooks.py:410
+#: cps/editbooks.py:218 cps/editbooks.py:432
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr ""
 
@@ -233,16 +234,16 @@ msgstr ""
 msgid "edit metadata"
 msgstr ""
 
-#: cps/editbooks.py:325 cps/editbooks.py:572
+#: cps/editbooks.py:325 cps/editbooks.py:595
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr ""
 
-#: cps/editbooks.py:329 cps/editbooks.py:576
+#: cps/editbooks.py:329 cps/editbooks.py:599
 msgid "File to be uploaded must have an extension"
 msgstr ""
 
-#: cps/editbooks.py:341 cps/editbooks.py:596
+#: cps/editbooks.py:341 cps/editbooks.py:619
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr ""
@@ -257,66 +258,70 @@ msgstr ""
 msgid "File format %(ext)s added to %(book)s"
 msgstr ""
 
-#: cps/editbooks.py:381
+#: cps/editbooks.py:382
 #, python-format
 msgid "Failed to create path for cover %(path)s (Permission denied)."
 msgstr ""
 
-#: cps/editbooks.py:389
-msgid "Cover-file is not a valid image file"
-msgstr ""
-
-#: cps/editbooks.py:392
+#: cps/editbooks.py:390
 #, python-format
 msgid "Failed to store cover-file %(cover)s."
 msgstr ""
 
-#: cps/editbooks.py:422 cps/editbooks.py:431
+#: cps/editbooks.py:393
+msgid "Cover-file is not a valid image file"
+msgstr ""
+
+#: cps/editbooks.py:399 cps/editbooks.py:413
+msgid "Cover is not a supported imageformat (jpg/png/webp), can't save"
+msgstr ""
+
+#: cps/editbooks.py:445 cps/editbooks.py:454
 msgid "unknown"
 msgstr ""
 
-#: cps/editbooks.py:463
+#: cps/editbooks.py:486
 msgid "Cover is not a jpg file, can't save"
 msgstr ""
 
-#: cps/editbooks.py:511
+#: cps/editbooks.py:534
 #, python-format
 msgid "%(langname)s is not a valid language"
 msgstr ""
 
-#: cps/editbooks.py:542
+#: cps/editbooks.py:565
 msgid "Metadata successfully updated"
 msgstr ""
 
-#: cps/editbooks.py:551
+#: cps/editbooks.py:574
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/editbooks.py:601
+#: cps/editbooks.py:624
 #, python-format
 msgid "Failed to store file %(file)s (Permission denied)."
 msgstr ""
 
-#: cps/editbooks.py:606
+#: cps/editbooks.py:629
 #, python-format
 msgid "Failed to delete file %(file)s (Permission denied)."
 msgstr ""
 
-#: cps/editbooks.py:689
+#: cps/editbooks.py:712
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/editbooks.py:718
+#: cps/editbooks.py:741
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/editbooks.py:728
+#: cps/editbooks.py:751
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/editbooks.py:732
+#: cps/editbooks.py:755
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
@@ -329,133 +334,133 @@ msgstr ""
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr ""
 
-#: cps/helper.py:84
+#: cps/helper.py:97
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:96
+#: cps/helper.py:109
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:103 cps/helper.py:211 cps/templates/detail.html:45
-#: cps/templates/detail.html:49
+#: cps/helper.py:116 cps/helper.py:223 cps/templates/detail.html:41
+#: cps/templates/detail.html:45
 msgid "Send to Kindle"
 msgstr ""
 
-#: cps/helper.py:104 cps/helper.py:122 cps/helper.py:213
+#: cps/helper.py:117 cps/helper.py:135 cps/helper.py:225
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr ""
 
-#: cps/helper.py:115
+#: cps/helper.py:128
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:120
+#: cps/helper.py:133
 msgid "Calibre-Web test e-mail"
 msgstr ""
 
-#: cps/helper.py:121
+#: cps/helper.py:134
 msgid "Test e-mail"
 msgstr ""
 
-#: cps/helper.py:137
+#: cps/helper.py:150
 msgid "Get Started with Calibre-Web"
 msgstr ""
 
-#: cps/helper.py:138
+#: cps/helper.py:151
 #, python-format
 msgid "Registration e-mail for user: %(name)s"
 msgstr ""
 
-#: cps/helper.py:151 cps/helper.py:153 cps/helper.py:155 cps/helper.py:157
-#: cps/helper.py:163 cps/helper.py:165 cps/helper.py:167 cps/helper.py:169
+#: cps/helper.py:165 cps/helper.py:167 cps/helper.py:169 cps/helper.py:177
+#: cps/helper.py:179 cps/helper.py:181
 #, python-format
 msgid "Send %(format)s to Kindle"
 msgstr ""
 
-#: cps/helper.py:173 cps/helper.py:177
+#: cps/helper.py:185
 #, python-format
 msgid "Convert %(orig)s to %(format)s and send to Kindle"
 msgstr ""
 
-#: cps/helper.py:212
+#: cps/helper.py:224
 #, python-format
 msgid "E-mail: %(book)s"
 msgstr ""
 
-#: cps/helper.py:215
+#: cps/helper.py:227
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr ""
 
-#: cps/helper.py:323
+#: cps/helper.py:335
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr ""
 
-#: cps/helper.py:333
+#: cps/helper.py:345
 #, python-format
 msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr ""
 
-#: cps/helper.py:347
+#: cps/helper.py:359
 #, python-format
 msgid "Rename file in path '%(src)s' to '%(dest)s' failed with error: %(error)s"
 msgstr ""
 
-#: cps/helper.py:373 cps/helper.py:383 cps/helper.py:391
+#: cps/helper.py:385 cps/helper.py:395 cps/helper.py:403
 #, python-format
 msgid "File %(file)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:412
+#: cps/helper.py:424
 #, python-format
 msgid "Book path %(path)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:520
+#: cps/helper.py:584
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:522
+#: cps/helper.py:586
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/helper.py:553
+#: cps/helper.py:614
 msgid "Waiting"
 msgstr ""
 
-#: cps/helper.py:555
+#: cps/helper.py:616
 msgid "Failed"
 msgstr ""
 
-#: cps/helper.py:557
+#: cps/helper.py:618
 msgid "Started"
 msgstr ""
 
-#: cps/helper.py:559
+#: cps/helper.py:620
 msgid "Finished"
 msgstr ""
 
-#: cps/helper.py:561
+#: cps/helper.py:622
 msgid "Unknown Status"
 msgstr ""
 
-#: cps/helper.py:566
+#: cps/helper.py:627
 msgid "E-mail: "
 msgstr ""
 
-#: cps/helper.py:568 cps/helper.py:572
+#: cps/helper.py:629 cps/helper.py:633
 msgid "Convert: "
 msgstr ""
 
-#: cps/helper.py:570
+#: cps/helper.py:631
 msgid "Upload: "
 msgstr ""
 
-#: cps/helper.py:574
+#: cps/helper.py:635
 msgid "Unknown Task: "
 msgstr ""
 
@@ -606,325 +611,329 @@ msgstr ""
 msgid "Change order of Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/ub.py:107
+#: cps/ub.py:111
 msgid "Recently Added"
 msgstr ""
 
-#: cps/ub.py:109
+#: cps/ub.py:113
 msgid "Show recent books"
 msgstr ""
 
-#: cps/templates/index.xml:17 cps/ub.py:110
+#: cps/templates/index.xml:17 cps/ub.py:114
 msgid "Hot Books"
 msgstr ""
 
-#: cps/ub.py:111
+#: cps/ub.py:115
 msgid "Show hot books"
 msgstr ""
 
-#: cps/templates/index.xml:24 cps/ub.py:114
+#: cps/templates/index.xml:24 cps/ub.py:118
 msgid "Best rated Books"
 msgstr ""
 
-#: cps/ub.py:116
+#: cps/ub.py:120
 msgid "Show best rated books"
 msgstr ""
 
-#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:117
-#: cps/web.py:975
+#: cps/templates/index.xml:46 cps/templates/index.xml:50 cps/ub.py:121
+#: cps/web.py:965
 msgid "Read Books"
 msgstr ""
 
-#: cps/ub.py:119
+#: cps/ub.py:123
 msgid "Show read and unread"
 msgstr ""
 
-#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:121
-#: cps/web.py:979
+#: cps/templates/index.xml:53 cps/templates/index.xml:57 cps/ub.py:125
+#: cps/web.py:969
 msgid "Unread Books"
 msgstr ""
 
-#: cps/ub.py:123
+#: cps/ub.py:127
 msgid "Show unread"
 msgstr ""
 
-#: cps/ub.py:124
+#: cps/ub.py:128
 msgid "Discover"
 msgstr ""
 
-#: cps/ub.py:126
+#: cps/ub.py:130
 msgid "Show random books"
 msgstr ""
 
-#: cps/ub.py:127
+#: cps/ub.py:131
 msgid "Categories"
 msgstr ""
 
-#: cps/ub.py:129
+#: cps/ub.py:133
 msgid "Show category selection"
 msgstr ""
 
-#: cps/templates/book_edit.html:75 cps/templates/search_form.html:53
-#: cps/ub.py:130
+#: cps/templates/book_edit.html:71 cps/templates/search_form.html:53
+#: cps/ub.py:134
 msgid "Series"
 msgstr ""
 
-#: cps/ub.py:132
+#: cps/ub.py:136
 msgid "Show series selection"
 msgstr ""
 
-#: cps/templates/index.xml:61 cps/ub.py:133
+#: cps/templates/index.xml:61 cps/ub.py:137
 msgid "Authors"
 msgstr ""
 
-#: cps/ub.py:135
+#: cps/ub.py:139
 msgid "Show author selection"
 msgstr ""
 
-#: cps/templates/index.xml:68 cps/ub.py:137
+#: cps/templates/index.xml:68 cps/ub.py:141
 msgid "Publishers"
 msgstr ""
 
-#: cps/ub.py:139
+#: cps/ub.py:143
 msgid "Show publisher selection"
 msgstr ""
 
-#: cps/templates/search_form.html:74 cps/ub.py:140
+#: cps/templates/search_form.html:74 cps/ub.py:144
 msgid "Languages"
 msgstr ""
 
-#: cps/ub.py:143
+#: cps/ub.py:147
 msgid "Show language selection"
 msgstr ""
 
-#: cps/ub.py:144
+#: cps/ub.py:148
 msgid "Ratings"
 msgstr ""
 
-#: cps/ub.py:146
+#: cps/ub.py:150
 msgid "Show ratings selection"
 msgstr ""
 
-#: cps/ub.py:147
+#: cps/ub.py:151
 msgid "File formats"
 msgstr ""
 
-#: cps/ub.py:149
+#: cps/ub.py:153
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/updater.py:255 cps/updater.py:417 cps/updater.py:430
+#: cps/updater.py:257 cps/updater.py:364 cps/updater.py:377
 msgid "Unexpected data while reading update information"
 msgstr ""
 
-#: cps/updater.py:262 cps/updater.py:423
+#: cps/updater.py:264 cps/updater.py:370
 msgid "No update available. You already have the latest version installed"
 msgstr ""
 
-#: cps/updater.py:288 cps/updater.py:347 cps/updater.py:475
+#: cps/updater.py:290 cps/updater.py:422
 msgid "A new update is available. Click on the button below to update to the latest version."
 msgstr ""
 
-#: cps/updater.py:341
+#: cps/updater.py:343
 msgid "Could not fetch update information"
 msgstr ""
 
-#: cps/updater.py:410
+#: cps/updater.py:357
 msgid "No release information available"
 msgstr ""
 
-#: cps/updater.py:456 cps/updater.py:465
+#: cps/updater.py:403 cps/updater.py:412
 #, python-format
 msgid "A new update is available. Click on the button below to update to version: %(version)s"
 msgstr ""
 
-#: cps/web.py:464
+#: cps/web.py:457
 msgid "Recently Added Books"
 msgstr ""
 
-#: cps/web.py:491
+#: cps/web.py:484
 msgid "Best rated books"
 msgstr ""
 
-#: cps/templates/index.xml:38 cps/web.py:499
+#: cps/templates/index.xml:38 cps/web.py:492
 msgid "Random Books"
 msgstr ""
 
-#: cps/web.py:513
+#: cps/web.py:516
 msgid "Books"
 msgstr ""
 
-#: cps/web.py:540
+#: cps/web.py:543
 msgid "Hot Books (most downloaded)"
 msgstr ""
 
-#: cps/web.py:568 cps/web.py:1306 cps/web.py:1409
+#: cps/web.py:553 cps/web.py:1294 cps/web.py:1383
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr ""
 
-#: cps/web.py:599
-msgid "Publisher list"
-msgstr ""
-
-#: cps/web.py:614
+#: cps/web.py:580
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr ""
 
-#: cps/templates/index.xml:82 cps/web.py:630
-msgid "Series list"
-msgstr ""
-
-#: cps/web.py:644
+#: cps/web.py:591
 #, python-format
 msgid "Series: %(serie)s"
 msgstr ""
 
-#: cps/web.py:658
-msgid "Ratings list"
-msgstr ""
-
-#: cps/web.py:672
+#: cps/web.py:602
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:685
-msgid "File formats list"
-msgstr ""
-
-#: cps/web.py:699
+#: cps/web.py:613
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:727
-msgid "Available languages"
-msgstr ""
-
-#: cps/web.py:747
-#, python-format
-msgid "Language: %(name)s"
-msgstr ""
-
-#: cps/templates/index.xml:75 cps/web.py:761
-msgid "Category list"
-msgstr ""
-
-#: cps/web.py:776
+#: cps/web.py:625
 #, python-format
 msgid "Category: %(name)s"
 msgstr ""
 
-#: cps/templates/layout.html:73 cps/web.py:787
+#: cps/web.py:659
+msgid "Publisher list"
+msgstr ""
+
+#: cps/templates/index.xml:82 cps/web.py:675
+msgid "Series list"
+msgstr ""
+
+#: cps/web.py:689
+msgid "Ratings list"
+msgstr ""
+
+#: cps/web.py:702
+msgid "File formats list"
+msgstr ""
+
+#: cps/web.py:730
+msgid "Available languages"
+msgstr ""
+
+#: cps/web.py:750
+#, python-format
+msgid "Language: %(name)s"
+msgstr ""
+
+#: cps/templates/index.xml:75 cps/web.py:764
+msgid "Category list"
+msgstr ""
+
+#: cps/templates/layout.html:73 cps/web.py:777
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:851
+#: cps/web.py:841
 msgid "Published after "
 msgstr ""
 
-#: cps/web.py:858
+#: cps/web.py:848
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:872
+#: cps/web.py:862
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr ""
 
-#: cps/web.py:874
+#: cps/web.py:864
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr ""
 
-#: cps/web.py:935 cps/web.py:944
+#: cps/web.py:924 cps/web.py:933
 msgid "search"
 msgstr ""
 
-#: cps/web.py:1028
+#: cps/web.py:1018
 msgid "Please configure the SMTP mail settings first..."
 msgstr ""
 
-#: cps/web.py:1033
+#: cps/web.py:1023
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1037
+#: cps/web.py:1027
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1056 cps/web.py:1081 cps/web.py:1086 cps/web.py:1091
-#: cps/web.py:1095
+#: cps/web.py:1046 cps/web.py:1071 cps/web.py:1076 cps/web.py:1081
+#: cps/web.py:1085
 msgid "register"
 msgstr ""
 
-#: cps/web.py:1083
+#: cps/web.py:1073
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1087
+#: cps/web.py:1077
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1090
+#: cps/web.py:1080
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:1113 cps/web.py:1125
+#: cps/web.py:1103 cps/web.py:1115
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1118 cps/web.py:1130
+#: cps/web.py:1108 cps/web.py:1120
 msgid "Wrong Username or Password"
 msgstr ""
 
-#: cps/web.py:1121
+#: cps/web.py:1111
 msgid "Could not login. LDAP server down, please contact your administrator"
 msgstr ""
 
-#: cps/web.py:1136 cps/web.py:1158
+#: cps/web.py:1124 cps/web.py:1146
 msgid "login"
 msgstr ""
 
-#: cps/web.py:1170 cps/web.py:1201
+#: cps/web.py:1158 cps/web.py:1189
 msgid "Token not found"
 msgstr ""
 
-#: cps/web.py:1178 cps/web.py:1209
+#: cps/web.py:1166 cps/web.py:1197
 msgid "Token has expired"
 msgstr ""
 
-#: cps/web.py:1186
+#: cps/web.py:1174
 msgid "Success! Please return to your device"
 msgstr ""
 
-#: cps/web.py:1222
+#: cps/web.py:1210
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1263 cps/web.py:1290 cps/web.py:1294
+#: cps/web.py:1250 cps/web.py:1277 cps/web.py:1281
 #, python-format
 msgid "%(name)s's profile"
 msgstr ""
 
-#: cps/web.py:1287
+#: cps/web.py:1274
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/web.py:1292
+#: cps/web.py:1279
 msgid "Profile updated"
 msgstr ""
 
-#: cps/web.py:1316 cps/web.py:1318 cps/web.py:1320 cps/web.py:1324
-#: cps/web.py:1328 cps/web.py:1332 cps/web.py:1344
+#: cps/web.py:1304 cps/web.py:1306 cps/web.py:1308 cps/web.py:1314
+#: cps/web.py:1318
 msgid "Read a Book"
 msgstr ""
 
+#: cps/web.py:1328
+msgid "Error opening eBook. File does not exist or file is not accessible."
+msgstr ""
+
 #: cps/worker.py:308
 #, python-format
 msgid "Ebook-converter failed: %(error)s"
@@ -959,148 +968,152 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
-#: cps/templates/admin.html:14 cps/templates/detail.html:22
-#: cps/templates/detail.html:31 cps/templates/shelf.html:6
+#: cps/templates/admin.html:14 cps/templates/detail.html:18
+#: cps/templates/detail.html:27 cps/templates/shelf.html:6
 #: cps/templates/shelfdown.html:62
 msgid "Download"
 msgstr ""
 
-#: cps/templates/admin.html:15 cps/templates/layout.html:65
+#: cps/templates/admin.html:15
+msgid "View Ebooks"
+msgstr ""
+
+#: cps/templates/admin.html:16 cps/templates/layout.html:65
 msgid "Upload"
 msgstr ""
 
-#: cps/templates/admin.html:16
+#: cps/templates/admin.html:17
 msgid "Edit"
 msgstr ""
 
-#: cps/templates/admin.html:39
+#: cps/templates/admin.html:41
 msgid "SMTP e-mail server settings"
 msgstr ""
 
-#: cps/templates/admin.html:42 cps/templates/email_edit.html:11
+#: cps/templates/admin.html:44 cps/templates/email_edit.html:11
 msgid "SMTP hostname"
 msgstr ""
 
-#: cps/templates/admin.html:43
+#: cps/templates/admin.html:45
 msgid "SMTP port"
 msgstr ""
 
-#: cps/templates/admin.html:44
+#: cps/templates/admin.html:46
 msgid "SSL"
 msgstr ""
 
-#: cps/templates/admin.html:45 cps/templates/email_edit.html:27
+#: cps/templates/admin.html:47 cps/templates/email_edit.html:27
 msgid "SMTP login"
 msgstr ""
 
-#: cps/templates/admin.html:46
+#: cps/templates/admin.html:48
 msgid "From mail"
 msgstr ""
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:58
 msgid "Change SMTP settings"
 msgstr ""
 
-#: cps/templates/admin.html:62
+#: cps/templates/admin.html:64
 msgid "Configuration"
 msgstr ""
 
-#: cps/templates/admin.html:65
+#: cps/templates/admin.html:67
 msgid "Calibre DB dir"
 msgstr ""
 
-#: cps/templates/admin.html:69
+#: cps/templates/admin.html:71
 msgid "Log level"
 msgstr ""
 
-#: cps/templates/admin.html:73
+#: cps/templates/admin.html:75
 msgid "Port"
 msgstr ""
 
-#: cps/templates/admin.html:79 cps/templates/config_view_edit.html:23
+#: cps/templates/admin.html:81 cps/templates/config_view_edit.html:23
 msgid "Books per page"
 msgstr ""
 
-#: cps/templates/admin.html:83
+#: cps/templates/admin.html:85
 msgid "Uploading"
 msgstr ""
 
-#: cps/templates/admin.html:87
+#: cps/templates/admin.html:89
 msgid "Anonymous browsing"
 msgstr ""
 
-#: cps/templates/admin.html:91
+#: cps/templates/admin.html:93
 msgid "Public registration"
 msgstr ""
 
-#: cps/templates/admin.html:95 cps/templates/remote_login.html:4
+#: cps/templates/admin.html:97 cps/templates/remote_login.html:4
 msgid "Remote login"
 msgstr ""
 
-#: cps/templates/admin.html:106
+#: cps/templates/admin.html:108
 msgid "Administration"
 msgstr ""
 
-#: cps/templates/admin.html:107
+#: cps/templates/admin.html:109
 msgid "Reconnect to Calibre DB"
 msgstr ""
 
-#: cps/templates/admin.html:108
+#: cps/templates/admin.html:110
 msgid "Restart Calibre-Web"
 msgstr ""
 
-#: cps/templates/admin.html:109
+#: cps/templates/admin.html:111
 msgid "Stop Calibre-Web"
 msgstr ""
 
-#: cps/templates/admin.html:115
+#: cps/templates/admin.html:117
 msgid "Update"
 msgstr ""
 
-#: cps/templates/admin.html:119
+#: cps/templates/admin.html:121
 msgid "Version"
 msgstr ""
 
-#: cps/templates/admin.html:120
+#: cps/templates/admin.html:122
 msgid "Details"
 msgstr ""
 
-#: cps/templates/admin.html:126
+#: cps/templates/admin.html:128
 msgid "Current version"
 msgstr ""
 
-#: cps/templates/admin.html:132
+#: cps/templates/admin.html:134
 msgid "Check for update"
 msgstr ""
 
-#: cps/templates/admin.html:133
+#: cps/templates/admin.html:135
 msgid "Perform Update"
 msgstr ""
 
-#: cps/templates/admin.html:145
+#: cps/templates/admin.html:147
 msgid "Do you really want to restart Calibre-Web?"
 msgstr ""
 
-#: cps/templates/admin.html:150 cps/templates/admin.html:164
-#: cps/templates/admin.html:184 cps/templates/shelf.html:76
+#: cps/templates/admin.html:152 cps/templates/admin.html:166
+#: cps/templates/admin.html:186 cps/templates/shelf.html:72
 msgid "Ok"
 msgstr ""
 
-#: cps/templates/admin.html:151 cps/templates/admin.html:165
-#: cps/templates/book_edit.html:178 cps/templates/book_edit.html:200
-#: cps/templates/config_edit.html:281 cps/templates/config_view_edit.html:141
+#: cps/templates/admin.html:153 cps/templates/admin.html:167
+#: cps/templates/book_edit.html:174 cps/templates/book_edit.html:196
+#: cps/templates/config_edit.html:281 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:77
+#: cps/templates/layout.html:28 cps/templates/shelf.html:73
 #: cps/templates/shelf_edit.html:19 cps/templates/shelf_order.html:12
-#: cps/templates/user_edit.html:128
+#: cps/templates/user_edit.html:132
 msgid "Back"
 msgstr ""
 
-#: cps/templates/admin.html:163
+#: cps/templates/admin.html:165
 msgid "Do you really want to stop Calibre-Web?"
 msgstr ""
 
-#: cps/templates/admin.html:175
+#: cps/templates/admin.html:177
 msgid "Updating, please do not reload page"
 msgstr ""
 
@@ -1112,176 +1125,176 @@ msgstr ""
 msgid "In Library"
 msgstr ""
 
-#: cps/templates/author.html:34 cps/templates/list.html:9
+#: cps/templates/author.html:34 cps/templates/list.html:14
 #: cps/templates/search.html:41
 msgid "All"
 msgstr ""
 
-#: cps/templates/author.html:62 cps/templates/author.html:109
-#: cps/templates/discover.html:27 cps/templates/index.html:30
-#: cps/templates/index.html:97 cps/templates/search.html:67
-#: cps/templates/shelf.html:40
+#: cps/templates/author.html:58 cps/templates/author.html:105
+#: 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 ""
 
-#: cps/templates/author.html:93
+#: cps/templates/author.html:89
 msgid "More by"
 msgstr ""
 
-#: cps/templates/book_edit.html:16
+#: cps/templates/book_edit.html:12
 msgid "Delete Book"
 msgstr ""
 
-#: cps/templates/book_edit.html:19
+#: cps/templates/book_edit.html:15
 msgid "Delete formats:"
 msgstr ""
 
-#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:199
+#: cps/templates/book_edit.html:18 cps/templates/book_edit.html:195
 #: cps/templates/email_edit.html:73
 msgid "Delete"
 msgstr ""
 
-#: cps/templates/book_edit.html:30
+#: cps/templates/book_edit.html:26
 msgid "Convert book format:"
 msgstr ""
 
-#: cps/templates/book_edit.html:34
+#: cps/templates/book_edit.html:30
 msgid "Convert from:"
 msgstr ""
 
-#: cps/templates/book_edit.html:36 cps/templates/book_edit.html:43
+#: cps/templates/book_edit.html:32 cps/templates/book_edit.html:39
 msgid "select an option"
 msgstr ""
 
-#: cps/templates/book_edit.html:41
+#: cps/templates/book_edit.html:37
 msgid "Convert to:"
 msgstr ""
 
-#: cps/templates/book_edit.html:50
+#: cps/templates/book_edit.html:46
 msgid "Convert book"
 msgstr ""
 
-#: cps/templates/book_edit.html:59 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:55 cps/templates/search_form.html:6
 msgid "Book Title"
 msgstr ""
 
-#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:259
-#: cps/templates/book_edit.html:277 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:59 cps/templates/book_edit.html:255
+#: cps/templates/book_edit.html:273 cps/templates/search_form.html:10
 msgid "Author"
 msgstr ""
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:264
-#: cps/templates/book_edit.html:279 cps/templates/search_form.html:106
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:260
+#: cps/templates/book_edit.html:275 cps/templates/search_form.html:106
 msgid "Description"
 msgstr ""
 
-#: cps/templates/book_edit.html:71 cps/templates/search_form.html:33
+#: cps/templates/book_edit.html:67 cps/templates/search_form.html:33
 msgid "Tags"
 msgstr ""
 
-#: cps/templates/book_edit.html:79
+#: cps/templates/book_edit.html:75
 msgid "Series id"
 msgstr ""
 
-#: cps/templates/book_edit.html:83
+#: cps/templates/book_edit.html:79
 msgid "Rating"
 msgstr ""
 
-#: cps/templates/book_edit.html:87
+#: cps/templates/book_edit.html:83
 msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
 msgstr ""
 
-#: cps/templates/book_edit.html:91
+#: cps/templates/book_edit.html:87
 msgid "Upload Cover from local drive"
 msgstr ""
 
-#: cps/templates/book_edit.html:96 cps/templates/detail.html:172
+#: cps/templates/book_edit.html:92 cps/templates/detail.html:168
 msgid "Publishing date"
 msgstr ""
 
-#: cps/templates/book_edit.html:103 cps/templates/book_edit.html:261
-#: cps/templates/book_edit.html:278 cps/templates/detail.html:163
+#: cps/templates/book_edit.html:99 cps/templates/book_edit.html:257
+#: cps/templates/book_edit.html:274 cps/templates/detail.html:159
 #: cps/templates/search_form.html:14
 msgid "Publisher"
 msgstr ""
 
-#: cps/templates/book_edit.html:107 cps/templates/user_edit.html:31
+#: cps/templates/book_edit.html:103 cps/templates/user_edit.html:31
 msgid "Language"
 msgstr ""
 
-#: cps/templates/book_edit.html:117 cps/templates/search_form.html:117
+#: cps/templates/book_edit.html:113 cps/templates/search_form.html:117
 msgid "Yes"
 msgstr ""
 
-#: cps/templates/book_edit.html:118 cps/templates/search_form.html:118
+#: cps/templates/book_edit.html:114 cps/templates/search_form.html:118
 msgid "No"
 msgstr ""
 
-#: cps/templates/book_edit.html:164
+#: cps/templates/book_edit.html:160
 msgid "Upload format"
 msgstr ""
 
-#: cps/templates/book_edit.html:173
+#: cps/templates/book_edit.html:169
 msgid "view book after edit"
 msgstr ""
 
-#: cps/templates/book_edit.html:176 cps/templates/book_edit.html:212
+#: cps/templates/book_edit.html:172 cps/templates/book_edit.html:208
 msgid "Get metadata"
 msgstr ""
 
-#: cps/templates/book_edit.html:177 cps/templates/config_edit.html:279
-#: cps/templates/config_view_edit.html:140 cps/templates/login.html:20
+#: cps/templates/book_edit.html:173 cps/templates/config_edit.html:279
+#: cps/templates/config_view_edit.html:146 cps/templates/login.html:20
 #: cps/templates/search_form.html:150 cps/templates/shelf_edit.html:17
-#: cps/templates/user_edit.html:126
+#: cps/templates/user_edit.html:130
 msgid "Submit"
 msgstr ""
 
-#: cps/templates/book_edit.html:191
+#: cps/templates/book_edit.html:187
 msgid "Are you really sure?"
 msgstr ""
 
-#: cps/templates/book_edit.html:194
+#: cps/templates/book_edit.html:190
 msgid "Book will be deleted from Calibre database"
 msgstr ""
 
-#: cps/templates/book_edit.html:195
+#: cps/templates/book_edit.html:191
 msgid "and from hard disk"
 msgstr ""
 
-#: cps/templates/book_edit.html:215
+#: cps/templates/book_edit.html:211
 msgid "Keyword"
 msgstr ""
 
-#: cps/templates/book_edit.html:216
+#: cps/templates/book_edit.html:212
 msgid " Search keyword "
 msgstr ""
 
-#: cps/templates/book_edit.html:218 cps/templates/layout.html:47
+#: cps/templates/book_edit.html:214 cps/templates/layout.html:47
 msgid "Go!"
 msgstr ""
 
-#: cps/templates/book_edit.html:222
+#: cps/templates/book_edit.html:218
 msgid "Click the cover to load metadata to the form"
 msgstr ""
 
-#: cps/templates/book_edit.html:234 cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:230 cps/templates/book_edit.html:270
 msgid "Loading..."
 msgstr ""
 
-#: cps/templates/book_edit.html:239 cps/templates/layout.html:187
+#: cps/templates/book_edit.html:235 cps/templates/layout.html:187
 #: cps/templates/layout.html:219
 msgid "Close"
 msgstr ""
 
-#: cps/templates/book_edit.html:266 cps/templates/book_edit.html:280
+#: cps/templates/book_edit.html:262 cps/templates/book_edit.html:276
 msgid "Source"
 msgstr ""
 
-#: cps/templates/book_edit.html:275
+#: cps/templates/book_edit.html:271
 msgid "Search error!"
 msgstr ""
 
-#: cps/templates/book_edit.html:276
+#: cps/templates/book_edit.html:272
 msgid "No Result(s) found! Please try aonther keyword."
 msgstr ""
 
@@ -1510,7 +1523,7 @@ msgstr ""
 msgid "No. of authors to show before hiding (0=disable hiding)"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:108
+#: cps/templates/config_view_edit.html:35 cps/templates/readcbr.html:112
 msgid "Theme"
 msgstr ""
 
@@ -1551,78 +1564,82 @@ msgid "Allow Downloads"
 msgstr ""
 
 #: cps/templates/config_view_edit.html:89 cps/templates/user_edit.html:96
-msgid "Allow Uploads"
+msgid "Allow book viewer"
 msgstr ""
 
 #: cps/templates/config_view_edit.html:93 cps/templates/user_edit.html:100
-msgid "Allow Edit"
+msgid "Allow Uploads"
 msgstr ""
 
 #: cps/templates/config_view_edit.html:97 cps/templates/user_edit.html:104
+msgid "Allow Edit"
+msgstr ""
+
+#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:108
 msgid "Allow Delete books"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:101 cps/templates/user_edit.html:109
+#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:113
 msgid "Allow Changing Password"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:105 cps/templates/user_edit.html:113
+#: cps/templates/config_view_edit.html:109 cps/templates/user_edit.html:117
 msgid "Allow Editing Public Shelfs"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:115
+#: cps/templates/config_view_edit.html:119
 msgid "Default visibilities for new users"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:129 cps/templates/user_edit.html:75
+#: cps/templates/config_view_edit.html:135 cps/templates/user_edit.html:75
 msgid "Show random books in detail view"
 msgstr ""
 
-#: cps/templates/config_view_edit.html:133 cps/templates/user_edit.html:88
+#: cps/templates/config_view_edit.html:139 cps/templates/user_edit.html:88
 msgid "Show mature content"
 msgstr ""
 
-#: cps/templates/detail.html:63
+#: cps/templates/detail.html:59
 msgid "Read in browser"
 msgstr ""
 
-#: cps/templates/detail.html:77
+#: cps/templates/detail.html:73
 msgid "Listen in browser"
 msgstr ""
 
-#: cps/templates/detail.html:124
+#: cps/templates/detail.html:120
 msgid "Book"
 msgstr ""
 
-#: cps/templates/detail.html:124
+#: cps/templates/detail.html:120
 msgid "of"
 msgstr ""
 
-#: cps/templates/detail.html:130
+#: cps/templates/detail.html:126
 msgid "language"
 msgstr ""
 
-#: cps/templates/detail.html:209
+#: cps/templates/detail.html:203
 msgid "Mark As Unread"
 msgstr ""
 
-#: cps/templates/detail.html:209
+#: cps/templates/detail.html:203
 msgid "Mark As Read"
 msgstr ""
 
-#: cps/templates/detail.html:210
+#: cps/templates/detail.html:204
 msgid "Read"
 msgstr ""
 
-#: cps/templates/detail.html:220 cps/templates/listenmp3.html:56
+#: cps/templates/detail.html:214 cps/templates/listenmp3.html:54
 msgid "Description:"
 msgstr ""
 
-#: cps/templates/detail.html:233 cps/templates/search.html:14
+#: cps/templates/detail.html:227 cps/templates/search.html:14
 msgid "Add to shelf"
 msgstr ""
 
-#: cps/templates/detail.html:295
+#: cps/templates/detail.html:289
 msgid "Edit metadata"
 msgstr ""
 
@@ -1699,7 +1716,7 @@ msgstr ""
 msgid "Discover (Random Books)"
 msgstr ""
 
-#: cps/templates/index.html:69
+#: cps/templates/index.html:65
 msgid "Group by series"
 msgstr ""
 
@@ -1772,7 +1789,7 @@ msgid "Advanced Search"
 msgstr ""
 
 #: cps/templates/layout.html:76 cps/templates/read.html:71
-#: cps/templates/readcbr.html:79 cps/templates/readcbr.html:103
+#: cps/templates/readcbr.html:83 cps/templates/readcbr.html:107
 msgid "Settings"
 msgstr ""
 
@@ -1850,96 +1867,104 @@ msgstr ""
 msgid "Reflow text when sidebars are open."
 msgstr ""
 
-#: cps/templates/readcbr.html:84
+#: cps/templates/readcbr.html:88
 msgid "Keyboard Shortcuts"
 msgstr ""
 
-#: cps/templates/readcbr.html:87
+#: cps/templates/readcbr.html:91
 msgid "Previous Page"
 msgstr ""
 
-#: cps/templates/readcbr.html:88
+#: cps/templates/readcbr.html:92
 msgid "Next Page"
 msgstr ""
 
-#: cps/templates/readcbr.html:89
+#: cps/templates/readcbr.html:93
 msgid "Scale to Best"
 msgstr ""
 
-#: cps/templates/readcbr.html:90
+#: cps/templates/readcbr.html:94
 msgid "Scale to Width"
 msgstr ""
 
-#: cps/templates/readcbr.html:91
+#: cps/templates/readcbr.html:95
 msgid "Scale to Height"
 msgstr ""
 
-#: cps/templates/readcbr.html:92
+#: cps/templates/readcbr.html:96
 msgid "Scale to Native"
 msgstr ""
 
-#: cps/templates/readcbr.html:93
+#: cps/templates/readcbr.html:97
 msgid "Rotate Right"
 msgstr ""
 
-#: cps/templates/readcbr.html:94
+#: cps/templates/readcbr.html:98
 msgid "Rotate Left"
 msgstr ""
 
-#: cps/templates/readcbr.html:95
+#: cps/templates/readcbr.html:99
 msgid "Flip Image"
 msgstr ""
 
-#: cps/templates/readcbr.html:111
+#: cps/templates/readcbr.html:115
 msgid "Light"
 msgstr ""
 
-#: cps/templates/readcbr.html:112
+#: cps/templates/readcbr.html:116
 msgid "Dark"
 msgstr ""
 
-#: cps/templates/readcbr.html:117
+#: cps/templates/readcbr.html:121
 msgid "Scale"
 msgstr ""
 
-#: cps/templates/readcbr.html:120
+#: cps/templates/readcbr.html:124
 msgid "Best"
 msgstr ""
 
-#: cps/templates/readcbr.html:121
+#: cps/templates/readcbr.html:125
 msgid "Width"
 msgstr ""
 
-#: cps/templates/readcbr.html:122
+#: cps/templates/readcbr.html:126
 msgid "Height"
 msgstr ""
 
-#: cps/templates/readcbr.html:123
+#: cps/templates/readcbr.html:127
 msgid "Native"
 msgstr ""
 
-#: cps/templates/readcbr.html:128
+#: cps/templates/readcbr.html:132
 msgid "Rotate"
 msgstr ""
 
-#: cps/templates/readcbr.html:139
+#: cps/templates/readcbr.html:143
 msgid "Flip"
 msgstr ""
 
-#: cps/templates/readcbr.html:142
+#: cps/templates/readcbr.html:146
 msgid "Horizontal"
 msgstr ""
 
-#: cps/templates/readcbr.html:143
+#: cps/templates/readcbr.html:147
 msgid "Vertical"
 msgstr ""
 
-#: cps/templates/readpdf.html:29
-msgid "PDF.js viewer"
+#: cps/templates/readcbr.html:152
+msgid "Direction"
 msgstr ""
 
-#: cps/templates/readpdf.html:418
-msgid "Preparing document for printing..."
+#: cps/templates/readcbr.html:155
+msgid "Left to Right"
+msgstr ""
+
+#: cps/templates/readcbr.html:156
+msgid "Right to Left"
+msgstr ""
+
+#: cps/templates/readpdf.html:29
+msgid "PDF reader"
 msgstr ""
 
 #: cps/templates/readtxt.html:6
@@ -1963,17 +1988,17 @@ msgid "Your email address"
 msgstr ""
 
 #: cps/templates/remote_login.html:6
-msgid "Using your another device, visit"
-msgstr ""
-
-#: cps/templates/remote_login.html:6
-msgid "and log in"
+msgid "Use your other device, login and visit "
 msgstr ""
 
 #: cps/templates/remote_login.html:9
 msgid "Once you do so, you will automatically get logged in on this device."
 msgstr ""
 
+#: cps/templates/remote_login.html:12
+msgid "The link will expire after 10 minutes."
+msgstr ""
+
 #: cps/templates/search.html:5
 msgid "No Results for:"
 msgstr ""
@@ -2026,11 +2051,11 @@ msgstr ""
 msgid "Change order"
 msgstr ""
 
-#: cps/templates/shelf.html:71
+#: cps/templates/shelf.html:67
 msgid "Do you really want to delete the shelf?"
 msgstr ""
 
-#: cps/templates/shelf.html:74
+#: cps/templates/shelf.html:70
 msgid "Shelf will be lost for everybody and forever!"
 msgstr ""
 
@@ -2138,11 +2163,11 @@ msgstr ""
 msgid "Unlink"
 msgstr ""
 
-#: cps/templates/user_edit.html:120
+#: cps/templates/user_edit.html:124
 msgid "Delete this user"
 msgstr ""
 
-#: cps/templates/user_edit.html:135
+#: cps/templates/user_edit.html:139
 msgid "Recent Downloads"
 msgstr ""