diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index 680b41bb..46b0e815 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -33,14 +33,14 @@
               <div class="text-left">
                   <label class="control-label" for="book_format_from">{{_('Convert from:')}}</label>
                   <select class="form-control" name="book_format_from" id="book_format_from">
-                    <option disabled selected value> -- select an option -- </option>
+                    <option disabled selected value> -- {{_('select an option')}} -- </option>
                     {% for file in book.data %}
                     <option>{{file.format}} </option>
                     {% endfor %}
                   </select>
                   <label class="control-label" for="book_format_to">{{_('Convert to:')}}</label>
                   <select class="form-control" name="book_format_to" id="book_format_to">
-                    <option disabled selected value> -- select an option -- </option>
+                    <option disabled selected value> -- {{_('select an option')}} -- </option>
                     {% for format in conversion_formats %}
                     <option>{{format|upper}} </option>
                     {% endfor %}
diff --git a/cps/translations/de/LC_MESSAGES/messages.mo b/cps/translations/de/LC_MESSAGES/messages.mo
index 291e8343..2066bd85 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 f3a98127..48db1a26 100644
--- a/cps/translations/de/LC_MESSAGES/messages.po
+++ b/cps/translations/de/LC_MESSAGES/messages.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2018-08-31 14:58+0200\n"
+"POT-Creation-Date: 2018-09-03 19:09+0200\n"
 "PO-Revision-Date: 2016-07-12 19:54+0200\n"
 "Last-Translator: Ozzie Isaacs\n"
 "Language: de\n"
@@ -41,208 +41,203 @@ msgstr "Nicht installiert"
 msgid "Excecution permissions missing"
 msgstr "Ausführungsberechtigung nicht vorhanden"
 
-#: cps/helper.py:56
+#: cps/helper.py:57
 #, python-format
-msgid "Epub format not found for book id: %(book)d"
-msgstr "Epub Format für Buch ID: %(book)d nicht gefunden"
+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:75
+#: cps/helper.py:69
+#, 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:76
 #, python-format
 msgid "Convert: %s"
 msgstr "Konvertiere: %s"
 
-#: cps/helper.py:84
+#: cps/helper.py:78
+#, python-format
+msgid "Convert to %(format)s: %(book)s"
+msgstr "Konvertiere %(book)s in %(format)s: "
+
+#: cps/helper.py:85
+#, python-format
+msgid "%(format)s not found: %(fn)s"
+msgstr "%(format)s nicht gefunden: %(fn)s"
+
+#: cps/helper.py:90
 msgid "Calibre-Web test e-mail"
 msgstr "Calibre-Web Test E-Mail"
 
-#: cps/helper.py:85
+#: cps/helper.py:91
 msgid "Test e-mail"
 msgstr "Test E-Mail"
 
-#: cps/helper.py:100
+#: cps/helper.py:106
 msgid "Get Started with Calibre-Web"
 msgstr "Loslegen mit Calibre-Web"
 
-#: cps/helper.py:101
+#: cps/helper.py:107
 #, python-format
 msgid "Registration e-mail for user: %s"
 msgstr "Registrierungs E-Mail für Benutzer %s"
 
-#: cps/helper.py:124 cps/helper.py:134
+#: cps/helper.py:130 cps/helper.py:140
 msgid "Could not find any formats suitable for sending by e-mail"
 msgstr ""
 "Es konnten keine passenden Formate für das Versenden per E-Mail gefunden "
 "werden"
 
-#: cps/helper.py:136 cps/templates/detail.html:44 cps/worker.py:224
+#: cps/helper.py:142 cps/templates/detail.html:44 cps/worker.py:224
 msgid "Send to Kindle"
 msgstr "An Kindle senden"
 
-#: cps/helper.py:137
+#: cps/helper.py:143
 #, python-format
 msgid "E-Mail: %s"
 msgstr "E-Mail: %s"
 
-#: cps/helper.py:139
+#: cps/helper.py:145
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr ""
 "Die angeforderter Dazei konnte nicht gelesen werden. Evtl. falsche "
 "Zugriffsrechte"
 
-#: cps/helper.py:147
-#, 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:159
-#, 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:171 cps/helper.py:178
-#, python-format
-msgid "Convert to %(format)s: %(book)s"
-msgstr "Konvertiere %(book)s in %(format)s: "
-
-#: cps/helper.py:184
-#, python-format
-msgid "%(format)s not found: %(fn)s"
-msgstr "%(format)s nicht gefunden: %(fn)s"
-
-#: cps/helper.py:280
+#: cps/helper.py:240
 #, python-format
 msgid "Rename title from: \"%s\" to \"%s\" failed with error: %s"
 msgstr "Umbenennen des Titelpfades \"%s\" nach \"%s\" schlug fehl: %s"
 
-#: cps/helper.py:289
+#: cps/helper.py:249
 #, python-format
 msgid "Rename author from: \"%s\" to \"%s\" failed with error: %s"
 msgstr "Umbenennen des Authorpfades \"%s\" nach \"%s\" schlug fehl: %s"
 
-#: cps/helper.py:312 cps/helper.py:321
+#: cps/helper.py:272 cps/helper.py:281
 #, python-format
 msgid "File %s not found on Google Drive"
 msgstr "Datei %s wirde nicht auf Google Drive gefunden"
 
-#: cps/helper.py:339
+#: cps/helper.py:299
 #, python-format
 msgid "Book path %s not found on Google Drive"
 msgstr "Buchpfad %s wurde nicht auf Google Drive gefunden"
 
-#: cps/helper.py:584
+#: cps/helper.py:544
 msgid "Error excecuting UnRar"
 msgstr "Fehler bei der Ausführung von UnRar"
 
-#: cps/helper.py:586
+#: cps/helper.py:546
 msgid "Unrar binary file not found"
 msgstr "UnRar Datei nicht gefunden"
 
-#: cps/web.py:1138
+#: cps/web.py:1120
 msgid "Requesting update package"
 msgstr "Frage Update Paket an"
 
-#: cps/web.py:1139
+#: cps/web.py:1121
 msgid "Downloading update package"
 msgstr "Lade Update Paket herunter"
 
-#: cps/web.py:1140
+#: cps/web.py:1122
 msgid "Unzipping update package"
 msgstr "Entpacke Update Paket"
 
-#: cps/web.py:1141
+#: cps/web.py:1123
 msgid "Files are replaced"
 msgstr "Ersetze Dateien"
 
-#: cps/web.py:1142
+#: cps/web.py:1124
 msgid "Database connections are closed"
 msgstr "Schließe Datenbankverbindungen"
 
-#: cps/web.py:1143
+#: cps/web.py:1125
 msgid "Server is stopped"
 msgstr "Stoppe Server"
 
-#: cps/web.py:1144
+#: cps/web.py:1126
 msgid "Update finished, please press okay and reload page"
 msgstr "Update abgeschlossen, bitte okay drücken und Seite neu laden"
 
-#: cps/web.py:1164
+#: cps/web.py:1146
 msgid "Recently Added Books"
 msgstr "Kürzlich hinzugefügte Bücher"
 
-#: cps/web.py:1174
+#: cps/web.py:1156
 msgid "Newest Books"
 msgstr "Neueste Bücher"
 
-#: cps/web.py:1186
+#: cps/web.py:1168
 msgid "Oldest Books"
 msgstr "Älteste Bücher"
 
-#: cps/web.py:1198
+#: cps/web.py:1180
 msgid "Books (A-Z)"
 msgstr "Bücher (A-Z)"
 
-#: cps/web.py:1209
+#: cps/web.py:1191
 msgid "Books (Z-A)"
 msgstr "Bücher (Z-A)"
 
-#: cps/web.py:1238
+#: cps/web.py:1220
 msgid "Hot Books (most downloaded)"
 msgstr "Beliebte Bücher (die meisten Downloads)"
 
-#: cps/web.py:1251
+#: cps/web.py:1233
 msgid "Best rated books"
 msgstr "Best bewertete Bücher"
 
-#: cps/templates/index.xml:36 cps/web.py:1263
+#: cps/templates/index.xml:36 cps/web.py:1245
 msgid "Random Books"
 msgstr "Zufällige Bücher"
 
-#: cps/web.py:1278
+#: cps/web.py:1260
 msgid "Author list"
 msgstr "Autorenliste"
 
-#: cps/web.py:1290 cps/web.py:1353 cps/web.py:1508 cps/web.py:2060
+#: cps/web.py:1272 cps/web.py:1335 cps/web.py:1490 cps/web.py:2042
 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/templates/index.xml:73 cps/web.py:1337
+#: cps/templates/index.xml:73 cps/web.py:1319
 msgid "Series list"
 msgstr "Liste Serien"
 
-#: cps/web.py:1351
+#: cps/web.py:1333
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie: %(serie)s"
 
-#: cps/web.py:1378
+#: cps/web.py:1360
 msgid "Available languages"
 msgstr "Verfügbare Sprachen"
 
-#: cps/web.py:1395
+#: cps/web.py:1377
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Sprache: %(name)s"
 
-#: cps/templates/index.xml:66 cps/web.py:1406
+#: cps/templates/index.xml:66 cps/web.py:1388
 msgid "Category list"
 msgstr "Kategorieliste"
 
-#: cps/web.py:1420
+#: cps/web.py:1402
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategorie: %(name)s"
 
-#: cps/templates/layout.html:71 cps/web.py:1559
+#: cps/templates/layout.html:71 cps/web.py:1541
 msgid "Tasks"
 msgstr "Aufgaben"
 
-#: cps/web.py:1589
+#: cps/web.py:1571
 msgid "Statistics"
 msgstr "Statistiken"
 
-#: cps/web.py:1694
+#: cps/web.py:1676
 msgid ""
 "Callback domain is not verified, please follow steps to verify domain in "
 "google developer console"
@@ -250,433 +245,433 @@ msgstr ""
 "Callback Domain ist nicht verifiziert, bitte Domain in der Google "
 "Developer Console verifizieren"
 
-#: cps/web.py:1770
+#: cps/web.py:1752
 msgid "Server restarted, please reload page"
 msgstr "Server neu gestartet,bitte Seite neu laden"
 
-#: cps/web.py:1773
+#: cps/web.py:1755
 msgid "Performing shutdown of server, please close window"
 msgstr "Server wird runtergefahren, bitte Fenster schließen"
 
-#: cps/web.py:1791
+#: cps/web.py:1773
 msgid "Update done"
 msgstr "Update durchgeführt"
 
-#: cps/web.py:1847 cps/web.py:1884
+#: cps/web.py:1833 cps/web.py:1870
 #, python-format
 msgid "%s: %s"
 msgstr "%s: %s"
 
-#: cps/web.py:1859
+#: cps/web.py:1845
 #, python-format
 msgid "Published after %s"
 msgstr "Herausgegeben nach dem %s"
 
-#: cps/web.py:1864
+#: cps/web.py:1850
 msgid "Published before "
 msgstr "Herausgegeben vor dem %s"
 
-#: cps/web.py:1878
+#: cps/web.py:1864
 #, python-format
 msgid "Rating <= %s"
 msgstr "Bewertung <= %s"
 
-#: cps/web.py:1880
+#: cps/web.py:1866
 #, python-format
 msgid "Rating >= %s"
 msgstr "Bewertung >= %s"
 
-#: cps/web.py:1939 cps/web.py:1948
+#: cps/web.py:1925 cps/web.py:1934
 msgid "search"
 msgstr "Suche"
 
 #: cps/templates/index.xml:44 cps/templates/index.xml:48
-#: cps/templates/layout.html:146 cps/web.py:2015
+#: cps/templates/layout.html:146 cps/web.py:2001
 msgid "Read Books"
 msgstr "Gelesene Bücher"
 
 #: cps/templates/index.xml:52 cps/templates/index.xml:56
-#: cps/templates/layout.html:148 cps/web.py:2018
+#: cps/templates/layout.html:148 cps/web.py:2004
 msgid "Unread Books"
 msgstr "Ungelesene Bücher"
 
-#: cps/web.py:2070 cps/web.py:2072 cps/web.py:2074 cps/web.py:2086
+#: cps/web.py:2052 cps/web.py:2054 cps/web.py:2056 cps/web.py:2068
 msgid "Read a Book"
 msgstr "Lese ein Buch"
 
-#: cps/web.py:2152 cps/web.py:3029
+#: cps/web.py:2134 cps/web.py:3011
 msgid "Please fill out all fields!"
 msgstr "Bitte alle Felder ausfüllen!"
 
-#: cps/web.py:2153 cps/web.py:2174 cps/web.py:2178 cps/web.py:2183
-#: cps/web.py:2185
+#: cps/web.py:2135 cps/web.py:2156 cps/web.py:2160 cps/web.py:2165
+#: cps/web.py:2167
 msgid "register"
 msgstr "Registieren"
 
-#: cps/web.py:2173 cps/web.py:3245
+#: cps/web.py:2155 cps/web.py:3227
 msgid "An unknown error occurred. Please try again later."
 msgstr "Es ist ein unbekannter Fehler aufgetreten. Bitte später erneut versuchen."
 
-#: cps/web.py:2176
+#: cps/web.py:2158
 msgid "Your e-mail is not allowed to register"
 msgstr "Diese E-Mail ist nicht für die Registrierung zugelassen"
 
-#: cps/web.py:2179
+#: cps/web.py:2161
 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:2182
+#: cps/web.py:2164
 msgid "This username or e-mail address is already in use."
 msgstr "Benutzername oder E-Mailadresse ist bereits in Verwendung."
 
-#: cps/web.py:2199 cps/web.py:2295
+#: cps/web.py:2181 cps/web.py:2277
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Du bist nun eingeloggt als '%(nickname)s'"
 
-#: cps/web.py:2204
+#: cps/web.py:2186
 msgid "Wrong Username or Password"
 msgstr "Falscher Benutzername oder Passwort"
 
-#: cps/web.py:2210 cps/web.py:2231
+#: cps/web.py:2192 cps/web.py:2213
 msgid "login"
 msgstr "Login"
 
-#: cps/web.py:2243 cps/web.py:2274
+#: cps/web.py:2225 cps/web.py:2256
 msgid "Token not found"
 msgstr "Token wurde nicht gefunden"
 
-#: cps/web.py:2251 cps/web.py:2282
+#: cps/web.py:2233 cps/web.py:2264
 msgid "Token has expired"
 msgstr "Das Token ist abgelaufen"
 
-#: cps/web.py:2259
+#: cps/web.py:2241
 msgid "Success! Please return to your device"
 msgstr "Erfolg! Bitte zum Gerät zurückkehren"
 
-#: cps/web.py:2309
+#: cps/web.py:2291
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Bitte zuerst die SMTP Mail Einstellung konfigurieren ..."
 
-#: cps/web.py:2313
+#: cps/web.py:2295
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Buch erfolgreich zum Senden an %(kindlemail)s eingereiht"
 
-#: cps/web.py:2317
+#: cps/web.py:2299
 #, 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:2319 cps/web.py:3083
+#: cps/web.py:2301 cps/web.py:3065
 msgid "Please configure your kindle e-mail address first..."
 msgstr "Bitte zuerst die Kindle E-Mailadresse konfigurieren..."
 
-#: cps/web.py:2363
+#: cps/web.py:2345
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "Das Buch wurde dem Bücherregal: %(sname)s hinzugefügt"
 
-#: cps/web.py:2374
+#: cps/web.py:2356
 msgid "Invalid shelf specified"
 msgstr "Ungültiges Bücherregal angegeben"
 
-#: cps/web.py:2379
+#: cps/web.py:2361
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %s"
 msgstr "Keine Erlaubnis ein Buch zum Bücherregal %s  hinzuzufügen"
 
-#: cps/web.py:2384
+#: cps/web.py:2366
 msgid "User is not allowed to edit public shelves"
 msgstr "Benutzer hat keine Erlaubnis öffentliche Bücherregale zu editieren"
 
-#: cps/web.py:2402
+#: cps/web.py:2384
 #, python-format
 msgid "Books are already part of the shelf: %s"
 msgstr "Bücher sind bereits Teil des Bücherregals %s"
 
-#: cps/web.py:2416
+#: cps/web.py:2398
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr "Bücher wurden zum Bücherregal %(sname)s hinzugefügt"
 
-#: cps/web.py:2418
+#: cps/web.py:2400
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr "Bücher konnten nicht zum Bücherregal %(sname)s hinzugefügt werden"
 
-#: cps/web.py:2455
+#: cps/web.py:2437
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Das Buch wurde aus dem Bücherregal: %(sname)s entfernt"
 
-#: cps/web.py:2461
+#: cps/web.py:2443
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr "Keine Erlaubnis das Buch aus dem Bücherregal %(sname)s zu entfernen"
 
-#: cps/web.py:2481 cps/web.py:2505
+#: cps/web.py:2463 cps/web.py:2487
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr "Es existiert bereits ein Bücheregal mit dem Titel '%(title)s'"
 
-#: cps/web.py:2486
+#: cps/web.py:2468
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Bücherregal %(title)s erzeugt"
 
-#: cps/web.py:2488 cps/web.py:2516
+#: cps/web.py:2470 cps/web.py:2498
 msgid "There was an error"
 msgstr "Es trat ein Fehler auf"
 
-#: cps/web.py:2489 cps/web.py:2491
+#: cps/web.py:2471 cps/web.py:2473
 msgid "create a shelf"
 msgstr "Bücherregal erzeugen"
 
-#: cps/web.py:2514
+#: cps/web.py:2496
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Bücherregal %(title)s verändert"
 
-#: cps/web.py:2517 cps/web.py:2519
+#: cps/web.py:2499 cps/web.py:2501
 msgid "Edit a shelf"
 msgstr "Bücherregal editieren"
 
-#: cps/web.py:2540
+#: cps/web.py:2522
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "Bücherregal %(name)s erfolgreich gelöscht"
 
-#: cps/web.py:2562
+#: cps/web.py:2544
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Bücherregal: '%(name)s'"
 
-#: cps/web.py:2565
+#: cps/web.py:2547
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Fehler beim Öffnen. Bücherregel exisitert nicht oder ist nicht zugänglich"
 
-#: cps/web.py:2596
+#: cps/web.py:2578
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Reihenfolge in Bücherregal '%(name)s' verändern"
 
-#: cps/web.py:2625 cps/web.py:3035
+#: cps/web.py:2607 cps/web.py:3017
 msgid "E-mail is not from valid domain"
 msgstr "E-Mail ist nicht Teil einer gültigen Domain"
 
-#: cps/web.py:2627 cps/web.py:2668 cps/web.py:2671
+#: cps/web.py:2609 cps/web.py:2650 cps/web.py:2653
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's Profil"
 
-#: cps/web.py:2666
+#: cps/web.py:2648
 msgid "Found an existing account for this e-mail address."
 msgstr "Es exisitert bereits ein Benutzer für diese E-Mailadresse"
 
-#: cps/web.py:2669
+#: cps/web.py:2651
 msgid "Profile updated"
 msgstr "Profil aktualisiert"
 
-#: cps/web.py:2681
+#: cps/web.py:2663
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: cps/web.py:2695
+#: cps/web.py:2677
 msgid "Admin page"
 msgstr "Admin Seite"
 
-#: cps/web.py:2773 cps/web.py:2945
+#: cps/web.py:2755 cps/web.py:2927
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web Konfiguration wurde aktualisiert"
 
-#: cps/templates/admin.html:91 cps/web.py:2786
+#: cps/templates/admin.html:91 cps/web.py:2768
 msgid "UI Configuration"
 msgstr "Konfiguration Benutzeroberfläche"
 
-#: cps/web.py:2803
+#: cps/web.py:2785
 msgid "Import of optional Google Drive requirements missing"
 msgstr "Optionale Abhängigkeiten für Google Drive fehlen"
 
-#: cps/web.py:2806
+#: cps/web.py:2788
 msgid "client_secrets.json is missing or not readable"
 msgstr "client_secrets.json nicht vorhanden, oder nicht lesbar"
 
-#: cps/web.py:2811 cps/web.py:2838
+#: cps/web.py:2793 cps/web.py:2820
 msgid "client_secrets.json is not configured for web application"
 msgstr "client_secrets.json nicht als Webapplication konfiguriert"
 
-#: cps/templates/admin.html:90 cps/web.py:2841 cps/web.py:2867 cps/web.py:2879
-#: cps/web.py:2921 cps/web.py:2936 cps/web.py:2953 cps/web.py:2960
-#: cps/web.py:2977
+#: cps/templates/admin.html:90 cps/web.py:2823 cps/web.py:2849 cps/web.py:2861
+#: cps/web.py:2903 cps/web.py:2918 cps/web.py:2935 cps/web.py:2942
+#: cps/web.py:2959
 msgid "Basic Configuration"
 msgstr "Basis Konfiguration"
 
-#: cps/web.py:2864
+#: cps/web.py:2846
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr "SSL-Keydatei Speicherort ist ungültig, bitte gültigen Pfad angeben"
 
-#: cps/web.py:2876
+#: cps/web.py:2858
 msgid "Certfile location is not valid, please enter correct path"
 msgstr "SSL-Certdatei Speicherort ist ungültig, bitte gültigen Pfad angeben"
 
-#: cps/web.py:2918
+#: cps/web.py:2900
 msgid "Logfile location is not valid, please enter correct path"
 msgstr "Speicherort Logdatei ist ungültig, bitte Pfad korrigieren"
 
-#: cps/web.py:2957
+#: cps/web.py:2939
 msgid "DB location is not valid, please enter correct path"
 msgstr "DB Speicherort ist ungültig, bitte Pfad korrigieren"
 
-#: cps/templates/admin.html:31 cps/web.py:3031 cps/web.py:3037 cps/web.py:3053
+#: cps/templates/admin.html:31 cps/web.py:3013 cps/web.py:3019 cps/web.py:3035
 msgid "Add new user"
 msgstr "Neuen Benutzer hinzufügen"
 
-#: cps/web.py:3043
+#: cps/web.py:3025
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Benutzer '%(user)s' angelegt"
 
-#: cps/web.py:3047
+#: cps/web.py:3029
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 "Es exisitert bereits ein Account für diese E-Mailadresse oder "
 "Benutzernamen"
 
-#: cps/web.py:3071 cps/web.py:3085
+#: cps/web.py:3053 cps/web.py:3067
 msgid "E-mail server settings updated"
 msgstr "E-Mail Server Einstellungen aktualisiert"
 
-#: cps/web.py:3078
+#: cps/web.py:3060
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Test E-Mail wurde erfolgreich an %(kindlemail)s versendet"
 
-#: cps/web.py:3081
+#: cps/web.py:3063
 #, 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/web.py:3086
+#: cps/web.py:3068
 msgid "Edit e-mail server settings"
 msgstr "E-Mail Server Einstellungen bearbeiten"
 
-#: cps/web.py:3111
+#: cps/web.py:3093
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Benutzer '%(nick)s' gelöscht"
 
-#: cps/web.py:3220
+#: cps/web.py:3202
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Benutzer '%(nick)s' aktualisiert"
 
-#: cps/web.py:3223
+#: cps/web.py:3205
 msgid "An unknown error occured."
 msgstr "Es ist ein unbekanter Fehler aufgetreten"
 
-#: cps/web.py:3225
+#: cps/web.py:3207
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Benutzer %(nick)s bearbeiten"
 
-#: cps/web.py:3242
+#: cps/web.py:3224
 #, python-format
 msgid "Password for user %s reset"
 msgstr "Password für Benutzer %s wurde zurückgesetzt"
 
-#: cps/web.py:3262
+#: cps/web.py:3244
 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:3294 cps/web.py:3556 cps/web.py:3561 cps/web.py:3716
+#: cps/web.py:3275 cps/web.py:3551 cps/web.py:3556 cps/web.py:3711
 msgid "edit metadata"
 msgstr "Metadaten editieren"
 
-#: cps/web.py:3308 cps/web.py:3586
+#: cps/web.py:3289 cps/web.py:3581
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr "Die Dateiendung \"%s\" kann nicht auf diesen Server hochgeladen werden"
 
-#: cps/web.py:3312 cps/web.py:3590
+#: cps/web.py:3293 cps/web.py:3585
 msgid "File to be uploaded must have an extension"
 msgstr "Dateien müssen eine Erweiterung haben, um hochgeladen zu werden"
 
-#: cps/web.py:3324 cps/web.py:3610
+#: cps/web.py:3305 cps/web.py:3605
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Fehler beim Erzeugen des Pfads %s (Zugriff verweigert)"
 
-#: cps/web.py:3329
+#: cps/web.py:3310
 #, python-format
 msgid "Failed to store file %s."
 msgstr "Fehler beim speichern der Datei %s."
 
-#: cps/web.py:3345
+#: cps/web.py:3326
 #, python-format
 msgid "File format %s added to %s"
 msgstr "Dateiformat %s zu %s hinzugefügt"
 
-#: cps/web.py:3363
+#: cps/web.py:3344
 #, python-format
 msgid "Failed to create path for cover %s (Permission denied)."
 msgstr "Ordner erzeugen für Cover %s fehlgeschalgen (Zugriff verweigert)."
 
-#: cps/web.py:3370
+#: cps/web.py:3351
 #, python-format
 msgid "Failed to store cover-file %s."
 msgstr "Fehler beim Speichern des Covers %s."
 
-#: cps/web.py:3373
+#: cps/web.py:3354
 msgid "Cover-file is not a valid image file"
 msgstr "Cover-Datei ist keine gültige Bilddatei"
 
-#: cps/web.py:3386 cps/web.py:3390
+#: cps/web.py:3367 cps/web.py:3371
 msgid "unknown"
 msgstr "Unbekannt"
 
-#: cps/web.py:3412
+#: cps/web.py:3393
 msgid "Cover is not a jpg file, can't save"
 msgstr "Cover ist keine JPG Datei, konnte nicht gespeichert werden"
 
-#: cps/web.py:3565
+#: cps/web.py:3560
 msgid "Error editing book, please check logfile for details"
 msgstr "Fehler beim Editieren des Buchs, Details im Logfile"
 
-#: cps/web.py:3615
+#: cps/web.py:3610
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Fehler beim speichern der Datei %s (Zugriff verweigert)"
 
-#: cps/web.py:3620
+#: cps/web.py:3615
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Fehler beim Löschen von Datei %s (Zugriff verweigert)"
 
-#: cps/web.py:3702
+#: cps/web.py:3697
 #, python-format
 msgid "File %s uploaded"
 msgstr "DAtei %s hochgeladen"
 
-#: cps/web.py:3732
+#: cps/web.py:3727
 msgid "Source or destination format for conversion missing"
 msgstr "Quell- oder Zielformat für Konvertierung fehlt"
 
-#: cps/web.py:3742
+#: cps/web.py:3737
 #, 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 "
 "eingereiht"
 
-#: cps/web.py:3746
+#: cps/web.py:3741
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Es trat ein Fehlker beim Konvertieren des Buches auf: %(res)s"
 
-#: cps/worker.py:215 cps/worker.py:385
+#: cps/worker.py:215 cps/worker.py:387
 msgid "Started"
 msgstr "Gestartet"
 
@@ -700,19 +695,19 @@ msgstr "Fehler EBook-converter: %s"
 msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "Kindlegen Aufruf mit Fehler %(error)s. Text: %(message)s fehlgeschlagen "
 
-#: cps/worker.py:316 cps/worker.py:375 cps/worker.py:437
+#: cps/worker.py:317 cps/worker.py:377 cps/worker.py:438
 msgid "Finished"
 msgstr "Beendet"
 
-#: cps/worker.py:342 cps/worker.py:361
+#: cps/worker.py:344 cps/worker.py:363
 msgid "Waiting"
 msgstr "Wartend"
 
-#: cps/worker.py:349
+#: cps/worker.py:351
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr "Diese E-Mail wurde durch Calibre-Web versendet."
 
-#: cps/worker.py:463
+#: cps/worker.py:472
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
@@ -859,7 +854,7 @@ msgid "Ok"
 msgstr "Ok"
 
 #: cps/templates/admin.html:116 cps/templates/admin.html:130
-#: cps/templates/book_edit.html:176 cps/templates/book_edit.html:198
+#: cps/templates/book_edit.html:178 cps/templates/book_edit.html:200
 #: cps/templates/config_edit.html:212 cps/templates/config_view_edit.html:164
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:75
 #: cps/templates/shelf.html:60 cps/templates/shelf_edit.html:19
@@ -895,7 +890,7 @@ msgstr "Buch löschen"
 msgid "Delete formats:"
 msgstr "Lösche Formate:"
 
-#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:197
+#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:199
 #: cps/templates/email_edit.html:73 cps/templates/email_edit.html:74
 msgid "Delete"
 msgstr "Löschen"
@@ -908,6 +903,10 @@ msgstr "Konvertiere Buch Format:"
 msgid "Convert from:"
 msgstr "Konvertiere von:"
 
+#: cps/templates/book_edit.html:36 cps/templates/book_edit.html:43
+msgid "select an option"
+msgstr "Wähle eine Option"
+
 #: cps/templates/book_edit.html:41
 msgid "Convert to:"
 msgstr "Konvertiere nach"
@@ -920,13 +919,13 @@ msgstr "Konvertiere Buch"
 msgid "Book Title"
 msgstr "Buchtitel"
 
-#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:257
-#: cps/templates/book_edit.html:275 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:259
+#: cps/templates/book_edit.html:277 cps/templates/search_form.html:10
 msgid "Author"
 msgstr "Autor"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:262
-#: cps/templates/book_edit.html:277 cps/templates/search_form.html:106
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:264
+#: cps/templates/book_edit.html:279 cps/templates/search_form.html:106
 msgid "Description"
 msgstr "Beschreibung"
 
@@ -934,20 +933,20 @@ msgstr "Beschreibung"
 msgid "Tags"
 msgstr "Tags"
 
-#: cps/templates/book_edit.html:76 cps/templates/layout.html:157
+#: cps/templates/book_edit.html:75 cps/templates/layout.html:157
 #: cps/templates/search_form.html:53
 msgid "Series"
 msgstr "Serien"
 
-#: cps/templates/book_edit.html:80
+#: cps/templates/book_edit.html:79
 msgid "Series id"
 msgstr "Serien ID"
 
-#: cps/templates/book_edit.html:84
+#: cps/templates/book_edit.html:83
 msgid "Rating"
 msgstr "Bewertung"
 
-#: cps/templates/book_edit.html:88
+#: cps/templates/book_edit.html:87
 msgid ""
 "Cover URL (jpg, cover is downloaded and stored in database, field is "
 "afterwards empty again)"
@@ -955,95 +954,96 @@ msgstr ""
 "Cover URL (jpg, Cover wird heruntergeladen und in der Datenbank "
 "gespeichert, Feld erscheint anschließend wieder leer)"
 
-#: cps/templates/book_edit.html:92
+#: cps/templates/book_edit.html:91
 msgid "Upload Cover from local drive"
 msgstr "Cover von lokalem Laufwerk hinzufügen"
 
-#: cps/templates/book_edit.html:97 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:96 cps/templates/detail.html:131
 msgid "Publishing date"
 msgstr "Herausgabedatum"
 
-#: cps/templates/book_edit.html:104 cps/templates/user_edit.html:33
+#: cps/templates/book_edit.html:103 cps/templates/book_edit.html:261
+#: cps/templates/book_edit.html:278 cps/templates/detail.html:126
+#: cps/templates/search_form.html:14
+msgid "Publisher"
+msgstr "Herausgeber"
+
+#: cps/templates/book_edit.html:107 cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Sprache"
 
-#: cps/templates/book_edit.html:115 cps/templates/search_form.html:117
+#: cps/templates/book_edit.html:117 cps/templates/search_form.html:117
 msgid "Yes"
 msgstr "Ja"
 
-#: cps/templates/book_edit.html:116 cps/templates/search_form.html:118
+#: cps/templates/book_edit.html:118 cps/templates/search_form.html:118
 msgid "No"
 msgstr "Nein"
 
-#: cps/templates/book_edit.html:162
+#: cps/templates/book_edit.html:164
 msgid "Upload format"
 msgstr "Format hochladen"
 
-#: cps/templates/book_edit.html:171
+#: cps/templates/book_edit.html:173
 msgid "view book after edit"
 msgstr "Buch nach Bearbeitung ansehen"
 
-#: cps/templates/book_edit.html:174 cps/templates/book_edit.html:210
+#: cps/templates/book_edit.html:176 cps/templates/book_edit.html:212
 msgid "Get metadata"
 msgstr "Metadaten laden"
 
-#: cps/templates/book_edit.html:175 cps/templates/config_edit.html:210
+#: cps/templates/book_edit.html:177 cps/templates/config_edit.html:210
 #: cps/templates/config_view_edit.html:163 cps/templates/login.html:20
 #: cps/templates/search_form.html:153 cps/templates/shelf_edit.html:17
 #: cps/templates/user_edit.html:151
 msgid "Submit"
 msgstr "Abschicken"
 
-#: cps/templates/book_edit.html:189
+#: cps/templates/book_edit.html:191
 msgid "Are you really sure?"
 msgstr "Sicher?"
 
-#: cps/templates/book_edit.html:192
+#: cps/templates/book_edit.html:194
 msgid "Book will be deleted from Calibre database"
 msgstr "Das Buch wird aus der Calibre Datenbank"
 
-#: cps/templates/book_edit.html:193
+#: cps/templates/book_edit.html:195
 msgid "and from hard disk"
 msgstr "und von der Festplatte gelöscht"
 
-#: cps/templates/book_edit.html:213
+#: cps/templates/book_edit.html:215
 msgid "Keyword"
 msgstr "Suchbegriff"
 
-#: cps/templates/book_edit.html:214
+#: cps/templates/book_edit.html:216
 msgid " Search keyword "
 msgstr "Suchbegriff"
 
-#: cps/templates/book_edit.html:216 cps/templates/layout.html:46
+#: cps/templates/book_edit.html:218 cps/templates/layout.html:46
 msgid "Go!"
 msgstr "Los!"
 
-#: cps/templates/book_edit.html:220
+#: cps/templates/book_edit.html:222
 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:232 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:234 cps/templates/book_edit.html:274
 msgid "Loading..."
 msgstr "Lade..."
 
-#: cps/templates/book_edit.html:237 cps/templates/layout.html:221
+#: cps/templates/book_edit.html:239 cps/templates/layout.html:221
 msgid "Close"
 msgstr "Schließen"
 
-#: cps/templates/book_edit.html:259 cps/templates/book_edit.html:276
-#: cps/templates/detail.html:126 cps/templates/search_form.html:14
-msgid "Publisher"
-msgstr "Herausgeber"
-
-#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
+#: cps/templates/book_edit.html:266 cps/templates/book_edit.html:280
 msgid "Source"
 msgstr "Quelle"
 
-#: cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:275
 msgid "Search error!"
 msgstr "Fehler bei Suche!"
 
-#: cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:276
 msgid "No Result(s) found! Please try aonther keyword."
 msgstr "Keine Ergebnisse gefunden! Bitte ein anderes Schlüsselwort benutzen"
 
@@ -1317,7 +1317,7 @@ msgstr "Gelesen"
 msgid "Description:"
 msgstr "Beschreibung"
 
-#: cps/templates/detail.html:189 cps/templates/search.html:16
+#: cps/templates/detail.html:189 cps/templates/search.html:14
 msgid "Add to shelf"
 msgstr "Zu Bücherregal hinzufügen"
 
@@ -1706,15 +1706,15 @@ msgstr "und logge Dich ein"
 msgid "Once you do so, you will automatically get logged in on this device."
 msgstr "Danach wirst Du automatisch auf diesem Gerät eingeloggt sein"
 
-#: cps/templates/search.html:6
+#: cps/templates/search.html:5
 msgid "No Results for:"
 msgstr "Keine Ergebnisse für:"
 
-#: cps/templates/search.html:7
+#: cps/templates/search.html:6
 msgid "Please try a different search"
 msgstr "Versuche eine andere Suche"
 
-#: cps/templates/search.html:9
+#: cps/templates/search.html:8
 msgid "Results for:"
 msgstr "Ergebnisse für:"
 
diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po
index 1c8ac318..e1af2c0d 100644
--- a/cps/translations/es/LC_MESSAGES/messages.po
+++ b/cps/translations/es/LC_MESSAGES/messages.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2018-08-31 14:58+0200\n"
+"POT-Creation-Date: 2018-09-03 19:09+0200\n"
 "PO-Revision-Date: 2017-04-04 15:09+0200\n"
 "Last-Translator: Juan F. Villa <juan.villa@paisdelconocimiento.org>\n"
 "Language: es\n"
@@ -34,628 +34,623 @@ msgstr "No instalado"
 msgid "Excecution permissions missing"
 msgstr ""
 
-#: cps/helper.py:56
-#, python-format
-msgid "Epub format not found for book id: %(book)d"
-msgstr ""
-
-#: cps/helper.py:75
-#, python-format
-msgid "Convert: %s"
-msgstr ""
-
-#: cps/helper.py:84
-msgid "Calibre-Web test e-mail"
-msgstr ""
-
-#: cps/helper.py:85
-msgid "Test e-mail"
-msgstr ""
-
-#: cps/helper.py:100
-msgid "Get Started with Calibre-Web"
-msgstr ""
-
-#: cps/helper.py:101
-#, python-format
-msgid "Registration e-mail for user: %s"
-msgstr ""
-
-#: cps/helper.py:124 cps/helper.py:134
-msgid "Could not find any formats suitable for sending by e-mail"
-msgstr ""
-
-#: cps/helper.py:136 cps/templates/detail.html:44 cps/worker.py:224
-msgid "Send to Kindle"
-msgstr "Enviar a Kindle"
-
-#: cps/helper.py:137
-#, python-format
-msgid "E-Mail: %s"
-msgstr ""
-
-#: cps/helper.py:139
-msgid "The requested file could not be read. Maybe wrong permissions?"
-msgstr ""
-
-#: cps/helper.py:147
+#: cps/helper.py:57
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:159
+#: cps/helper.py:69
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:171 cps/helper.py:178
+#: cps/helper.py:76
+#, python-format
+msgid "Convert: %s"
+msgstr ""
+
+#: cps/helper.py:78
 #, python-format
 msgid "Convert to %(format)s: %(book)s"
 msgstr ""
 
-#: cps/helper.py:184
+#: cps/helper.py:85
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:280
+#: cps/helper.py:90
+msgid "Calibre-Web test e-mail"
+msgstr ""
+
+#: cps/helper.py:91
+msgid "Test e-mail"
+msgstr ""
+
+#: cps/helper.py:106
+msgid "Get Started with Calibre-Web"
+msgstr ""
+
+#: cps/helper.py:107
+#, python-format
+msgid "Registration e-mail for user: %s"
+msgstr ""
+
+#: cps/helper.py:130 cps/helper.py:140
+msgid "Could not find any formats suitable for sending by e-mail"
+msgstr ""
+
+#: cps/helper.py:142 cps/templates/detail.html:44 cps/worker.py:224
+msgid "Send to Kindle"
+msgstr "Enviar a Kindle"
+
+#: cps/helper.py:143
+#, python-format
+msgid "E-Mail: %s"
+msgstr ""
+
+#: cps/helper.py:145
+msgid "The requested file could not be read. Maybe wrong permissions?"
+msgstr ""
+
+#: cps/helper.py:240
 #, python-format
 msgid "Rename title from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:289
+#: cps/helper.py:249
 #, python-format
 msgid "Rename author from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:312 cps/helper.py:321
+#: cps/helper.py:272 cps/helper.py:281
 #, python-format
 msgid "File %s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:339
+#: cps/helper.py:299
 #, python-format
 msgid "Book path %s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:584
+#: cps/helper.py:544
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:586
+#: cps/helper.py:546
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/web.py:1138
+#: cps/web.py:1120
 msgid "Requesting update package"
 msgstr "Solicitando paquete de actualización"
 
-#: cps/web.py:1139
+#: cps/web.py:1121
 msgid "Downloading update package"
 msgstr "Descargando paquete de actualización"
 
-#: cps/web.py:1140
+#: cps/web.py:1122
 msgid "Unzipping update package"
 msgstr "Descomprimiendo paquete de actualización"
 
-#: cps/web.py:1141
+#: cps/web.py:1123
 msgid "Files are replaced"
 msgstr "Ficheros sustituidos"
 
-#: cps/web.py:1142
+#: cps/web.py:1124
 msgid "Database connections are closed"
 msgstr "Los conexiones de base datos están cerradas"
 
-#: cps/web.py:1143
+#: cps/web.py:1125
 msgid "Server is stopped"
 msgstr "El servidor está detenido"
 
-#: cps/web.py:1144
+#: cps/web.py:1126
 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:1164
+#: cps/web.py:1146
 msgid "Recently Added Books"
 msgstr ""
 
-#: cps/web.py:1174
+#: cps/web.py:1156
 msgid "Newest Books"
 msgstr ""
 
-#: cps/web.py:1186
+#: cps/web.py:1168
 msgid "Oldest Books"
 msgstr ""
 
-#: cps/web.py:1198
+#: cps/web.py:1180
 msgid "Books (A-Z)"
 msgstr ""
 
-#: cps/web.py:1209
+#: cps/web.py:1191
 msgid "Books (Z-A)"
 msgstr ""
 
-#: cps/web.py:1238
+#: cps/web.py:1220
 msgid "Hot Books (most downloaded)"
 msgstr "Libros populares (los mas descargados)"
 
-#: cps/web.py:1251
+#: cps/web.py:1233
 msgid "Best rated books"
 msgstr "Libros mejor valorados"
 
-#: cps/templates/index.xml:36 cps/web.py:1263
+#: cps/templates/index.xml:36 cps/web.py:1245
 msgid "Random Books"
 msgstr "Libros al azar"
 
-#: cps/web.py:1278
+#: cps/web.py:1260
 msgid "Author list"
 msgstr "Lista de autores"
 
-#: cps/web.py:1290 cps/web.py:1353 cps/web.py:1508 cps/web.py:2060
+#: cps/web.py:1272 cps/web.py:1335 cps/web.py:1490 cps/web.py:2042
 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/templates/index.xml:73 cps/web.py:1337
+#: cps/templates/index.xml:73 cps/web.py:1319
 msgid "Series list"
 msgstr "Lista de series"
 
-#: cps/web.py:1351
+#: cps/web.py:1333
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Series : %(serie)s"
 
-#: cps/web.py:1378
+#: cps/web.py:1360
 msgid "Available languages"
 msgstr "Lenguajes disponibles"
 
-#: cps/web.py:1395
+#: cps/web.py:1377
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Lenguaje: %(name)s"
 
-#: cps/templates/index.xml:66 cps/web.py:1406
+#: cps/templates/index.xml:66 cps/web.py:1388
 msgid "Category list"
 msgstr "Lista de categorias"
 
-#: cps/web.py:1420
+#: cps/web.py:1402
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoría : %(name)s"
 
-#: cps/templates/layout.html:71 cps/web.py:1559
+#: cps/templates/layout.html:71 cps/web.py:1541
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1589
+#: cps/web.py:1571
 msgid "Statistics"
 msgstr "Estadisticas"
 
-#: cps/web.py:1694
+#: cps/web.py:1676
 msgid ""
 "Callback domain is not verified, please follow steps to verify domain in "
 "google developer console"
 msgstr ""
 
-#: cps/web.py:1770
+#: cps/web.py:1752
 msgid "Server restarted, please reload page"
 msgstr "Servidor reiniciado. Por favor, recargue la página"
 
-#: cps/web.py:1773
+#: cps/web.py:1755
 msgid "Performing shutdown of server, please close window"
 msgstr "Servidor en proceso de apagado. Por favor, cierre la ventana."
 
-#: cps/web.py:1791
+#: cps/web.py:1773
 msgid "Update done"
 msgstr "Actualización realizada"
 
-#: cps/web.py:1847 cps/web.py:1884
+#: cps/web.py:1833 cps/web.py:1870
 #, python-format
 msgid "%s: %s"
 msgstr ""
 
-#: cps/web.py:1859
+#: cps/web.py:1845
 #, python-format
 msgid "Published after %s"
 msgstr ""
 
-#: cps/web.py:1864
+#: cps/web.py:1850
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1878
+#: cps/web.py:1864
 #, python-format
 msgid "Rating <= %s"
 msgstr ""
 
-#: cps/web.py:1880
+#: cps/web.py:1866
 #, python-format
 msgid "Rating >= %s"
 msgstr ""
 
-#: cps/web.py:1939 cps/web.py:1948
+#: cps/web.py:1925 cps/web.py:1934
 msgid "search"
 msgstr "búsqueda"
 
 #: cps/templates/index.xml:44 cps/templates/index.xml:48
-#: cps/templates/layout.html:146 cps/web.py:2015
+#: cps/templates/layout.html:146 cps/web.py:2001
 msgid "Read Books"
 msgstr "Libros leídos"
 
 #: cps/templates/index.xml:52 cps/templates/index.xml:56
-#: cps/templates/layout.html:148 cps/web.py:2018
+#: cps/templates/layout.html:148 cps/web.py:2004
 msgid "Unread Books"
 msgstr "Libros no leídos"
 
-#: cps/web.py:2070 cps/web.py:2072 cps/web.py:2074 cps/web.py:2086
+#: cps/web.py:2052 cps/web.py:2054 cps/web.py:2056 cps/web.py:2068
 msgid "Read a Book"
 msgstr "Leer un libro"
 
-#: cps/web.py:2152 cps/web.py:3029
+#: cps/web.py:2134 cps/web.py:3011
 msgid "Please fill out all fields!"
 msgstr "¡Por favor completar todos los campos!"
 
-#: cps/web.py:2153 cps/web.py:2174 cps/web.py:2178 cps/web.py:2183
-#: cps/web.py:2185
+#: cps/web.py:2135 cps/web.py:2156 cps/web.py:2160 cps/web.py:2165
+#: cps/web.py:2167
 msgid "register"
 msgstr "registrarse"
 
-#: cps/web.py:2173 cps/web.py:3245
+#: cps/web.py:2155 cps/web.py:3227
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/web.py:2176
+#: cps/web.py:2158
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:2179
+#: cps/web.py:2161
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:2182
+#: cps/web.py:2164
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:2199 cps/web.py:2295
+#: cps/web.py:2181 cps/web.py:2277
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Sesion iniciada como : '%(nickname)s'"
 
-#: cps/web.py:2204
+#: cps/web.py:2186
 msgid "Wrong Username or Password"
 msgstr "Usuario o contraseña invalido"
 
-#: cps/web.py:2210 cps/web.py:2231
+#: cps/web.py:2192 cps/web.py:2213
 msgid "login"
 msgstr "Iniciar sesión"
 
-#: cps/web.py:2243 cps/web.py:2274
+#: cps/web.py:2225 cps/web.py:2256
 msgid "Token not found"
 msgstr ""
 
-#: cps/web.py:2251 cps/web.py:2282
+#: cps/web.py:2233 cps/web.py:2264
 msgid "Token has expired"
 msgstr ""
 
-#: cps/web.py:2259
+#: cps/web.py:2241
 msgid "Success! Please return to your device"
 msgstr ""
 
-#: cps/web.py:2309
+#: cps/web.py:2291
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configurar primero los parametros SMTP por favor..."
 
-#: cps/web.py:2313
+#: cps/web.py:2295
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:2317
+#: cps/web.py:2299
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "Ha sucedido un error en el envio del Libro: %(res)s"
 
-#: cps/web.py:2319 cps/web.py:3083
+#: cps/web.py:2301 cps/web.py:3065
 msgid "Please configure your kindle e-mail address first..."
 msgstr ""
 
-#: cps/web.py:2363
+#: cps/web.py:2345
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "El libro fue agregado a el estante: %(sname)s"
 
-#: cps/web.py:2374
+#: cps/web.py:2356
 msgid "Invalid shelf specified"
 msgstr ""
 
-#: cps/web.py:2379
+#: cps/web.py:2361
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %s"
 msgstr ""
 
-#: cps/web.py:2384
+#: cps/web.py:2366
 msgid "User is not allowed to edit public shelves"
 msgstr ""
 
-#: cps/web.py:2402
+#: cps/web.py:2384
 #, python-format
 msgid "Books are already part of the shelf: %s"
 msgstr ""
 
-#: cps/web.py:2416
+#: cps/web.py:2398
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2418
+#: cps/web.py:2400
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2455
+#: cps/web.py:2437
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "El libro fue removido del estante: %(sname)s"
 
-#: cps/web.py:2461
+#: cps/web.py:2443
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2481 cps/web.py:2505
+#: cps/web.py:2463 cps/web.py:2487
 #, 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:2486
+#: cps/web.py:2468
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Estante %(title)s creado"
 
-#: cps/web.py:2488 cps/web.py:2516
+#: cps/web.py:2470 cps/web.py:2498
 msgid "There was an error"
 msgstr "Ha sucedido un error"
 
-#: cps/web.py:2489 cps/web.py:2491
+#: cps/web.py:2471 cps/web.py:2473
 msgid "create a shelf"
 msgstr "crear un estante"
 
-#: cps/web.py:2514
+#: cps/web.py:2496
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Estante %(title)s cambiado"
 
-#: cps/web.py:2517 cps/web.py:2519
+#: cps/web.py:2499 cps/web.py:2501
 msgid "Edit a shelf"
 msgstr "Editar un estante"
 
-#: cps/web.py:2540
+#: cps/web.py:2522
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "Estante %(name)s fue borrado correctamente"
 
-#: cps/web.py:2562
+#: cps/web.py:2544
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Estante: '%(name)s'"
 
-#: cps/web.py:2565
+#: cps/web.py:2547
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:2596
+#: cps/web.py:2578
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Cambiar orden del estante: '%(name)s'"
 
-#: cps/web.py:2625 cps/web.py:3035
+#: cps/web.py:2607 cps/web.py:3017
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/web.py:2627 cps/web.py:2668 cps/web.py:2671
+#: cps/web.py:2609 cps/web.py:2650 cps/web.py:2653
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Perfil de %(name)s"
 
-#: cps/web.py:2666
+#: cps/web.py:2648
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/web.py:2669
+#: cps/web.py:2651
 msgid "Profile updated"
 msgstr "Perfil actualizado"
 
-#: cps/web.py:2681
+#: cps/web.py:2663
 msgid "Unknown"
 msgstr ""
 
-#: cps/web.py:2695
+#: cps/web.py:2677
 msgid "Admin page"
 msgstr "Página de administración"
 
-#: cps/web.py:2773 cps/web.py:2945
+#: cps/web.py:2755 cps/web.py:2927
 msgid "Calibre-Web configuration updated"
 msgstr "Configuración de Calibre-Web actualizada"
 
-#: cps/templates/admin.html:91 cps/web.py:2786
+#: cps/templates/admin.html:91 cps/web.py:2768
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/web.py:2803
+#: cps/web.py:2785
 msgid "Import of optional Google Drive requirements missing"
 msgstr ""
 
-#: cps/web.py:2806
+#: cps/web.py:2788
 msgid "client_secrets.json is missing or not readable"
 msgstr ""
 
-#: cps/web.py:2811 cps/web.py:2838
+#: cps/web.py:2793 cps/web.py:2820
 msgid "client_secrets.json is not configured for web application"
 msgstr ""
 
-#: cps/templates/admin.html:90 cps/web.py:2841 cps/web.py:2867 cps/web.py:2879
-#: cps/web.py:2921 cps/web.py:2936 cps/web.py:2953 cps/web.py:2960
-#: cps/web.py:2977
+#: cps/templates/admin.html:90 cps/web.py:2823 cps/web.py:2849 cps/web.py:2861
+#: cps/web.py:2903 cps/web.py:2918 cps/web.py:2935 cps/web.py:2942
+#: cps/web.py:2959
 msgid "Basic Configuration"
 msgstr "Configuración básica"
 
-#: cps/web.py:2864
+#: cps/web.py:2846
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2876
+#: cps/web.py:2858
 msgid "Certfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2918
+#: cps/web.py:2900
 msgid "Logfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2957
+#: cps/web.py:2939
 msgid "DB location is not valid, please enter correct path"
 msgstr "Localicación de la BD inválida. Por favor, introduzca la ruta correcta."
 
-#: cps/templates/admin.html:31 cps/web.py:3031 cps/web.py:3037 cps/web.py:3053
+#: cps/templates/admin.html:31 cps/web.py:3013 cps/web.py:3019 cps/web.py:3035
 msgid "Add new user"
 msgstr "Agregar un nuevo usuario"
 
-#: cps/web.py:3043
+#: cps/web.py:3025
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Usuario '%(user)s' creado"
 
-#: cps/web.py:3047
+#: cps/web.py:3029
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/web.py:3071 cps/web.py:3085
+#: cps/web.py:3053 cps/web.py:3067
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/web.py:3078
+#: cps/web.py:3060
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:3081
+#: cps/web.py:3063
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/web.py:3086
+#: cps/web.py:3068
 msgid "Edit e-mail server settings"
 msgstr ""
 
-#: cps/web.py:3111
+#: cps/web.py:3093
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Usuario '%(nick)s' borrado"
 
-#: cps/web.py:3220
+#: cps/web.py:3202
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Usuario '%(nick)s'  actualizado"
 
-#: cps/web.py:3223
+#: cps/web.py:3205
 msgid "An unknown error occured."
 msgstr "Error inesperado."
 
-#: cps/web.py:3225
+#: cps/web.py:3207
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Editar Usuario %(nick)s"
 
-#: cps/web.py:3242
+#: cps/web.py:3224
 #, python-format
 msgid "Password for user %s reset"
 msgstr ""
 
-#: cps/web.py:3262
+#: cps/web.py:3244
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr ""
 
-#: cps/web.py:3294 cps/web.py:3556 cps/web.py:3561 cps/web.py:3716
+#: cps/web.py:3275 cps/web.py:3551 cps/web.py:3556 cps/web.py:3711
 msgid "edit metadata"
 msgstr "editar metainformación"
 
-#: cps/web.py:3308 cps/web.py:3586
+#: cps/web.py:3289 cps/web.py:3581
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr "No se permite subir archivos con la extensión \"%s\" a este servidor"
 
-#: cps/web.py:3312 cps/web.py:3590
+#: cps/web.py:3293 cps/web.py:3585
 msgid "File to be uploaded must have an extension"
 msgstr "El archivo a subir debe tener una extensión"
 
-#: cps/web.py:3324 cps/web.py:3610
+#: cps/web.py:3305 cps/web.py:3605
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Fallo al crear la ruta %s (permiso negado)"
 
-#: cps/web.py:3329
+#: cps/web.py:3310
 #, python-format
 msgid "Failed to store file %s."
 msgstr ""
 
-#: cps/web.py:3345
+#: cps/web.py:3326
 #, python-format
 msgid "File format %s added to %s"
 msgstr ""
 
-#: cps/web.py:3363
+#: cps/web.py:3344
 #, python-format
 msgid "Failed to create path for cover %s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:3370
+#: cps/web.py:3351
 #, python-format
 msgid "Failed to store cover-file %s."
 msgstr ""
 
-#: cps/web.py:3373
+#: cps/web.py:3354
 msgid "Cover-file is not a valid image file"
 msgstr ""
 
-#: cps/web.py:3386 cps/web.py:3390
+#: cps/web.py:3367 cps/web.py:3371
 msgid "unknown"
 msgstr ""
 
-#: cps/web.py:3412
+#: cps/web.py:3393
 msgid "Cover is not a jpg file, can't save"
 msgstr ""
 
-#: cps/web.py:3565
+#: cps/web.py:3560
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/web.py:3615
+#: cps/web.py:3610
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Fallo al almacenar el archivo %s (permiso negado)"
 
-#: cps/web.py:3620
+#: cps/web.py:3615
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Fallo al borrar el archivo %s (permiso negado)"
 
-#: cps/web.py:3702
+#: cps/web.py:3697
 #, python-format
 msgid "File %s uploaded"
 msgstr ""
 
-#: cps/web.py:3732
+#: cps/web.py:3727
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/web.py:3742
+#: cps/web.py:3737
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/web.py:3746
+#: cps/web.py:3741
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
 
-#: cps/worker.py:215 cps/worker.py:385
+#: cps/worker.py:215 cps/worker.py:387
 msgid "Started"
 msgstr ""
 
@@ -679,19 +674,19 @@ msgstr ""
 msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr ""
 
-#: cps/worker.py:316 cps/worker.py:375 cps/worker.py:437
+#: cps/worker.py:317 cps/worker.py:377 cps/worker.py:438
 msgid "Finished"
 msgstr ""
 
-#: cps/worker.py:342 cps/worker.py:361
+#: cps/worker.py:344 cps/worker.py:363
 msgid "Waiting"
 msgstr ""
 
-#: cps/worker.py:349
+#: cps/worker.py:351
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr ""
 
-#: cps/worker.py:463
+#: cps/worker.py:472
 msgid "Failed"
 msgstr ""
 
@@ -838,7 +833,7 @@ msgid "Ok"
 msgstr "Ok"
 
 #: cps/templates/admin.html:116 cps/templates/admin.html:130
-#: cps/templates/book_edit.html:176 cps/templates/book_edit.html:198
+#: cps/templates/book_edit.html:178 cps/templates/book_edit.html:200
 #: cps/templates/config_edit.html:212 cps/templates/config_view_edit.html:164
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:75
 #: cps/templates/shelf.html:60 cps/templates/shelf_edit.html:19
@@ -874,7 +869,7 @@ msgstr ""
 msgid "Delete formats:"
 msgstr ""
 
-#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:197
+#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:199
 #: cps/templates/email_edit.html:73 cps/templates/email_edit.html:74
 msgid "Delete"
 msgstr ""
@@ -887,6 +882,10 @@ msgstr ""
 msgid "Convert from:"
 msgstr ""
 
+#: cps/templates/book_edit.html:36 cps/templates/book_edit.html:43
+msgid "select an option"
+msgstr ""
+
 #: cps/templates/book_edit.html:41
 msgid "Convert to:"
 msgstr ""
@@ -899,13 +898,13 @@ msgstr ""
 msgid "Book Title"
 msgstr "Titulo del Libro"
 
-#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:257
-#: cps/templates/book_edit.html:275 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:259
+#: cps/templates/book_edit.html:277 cps/templates/search_form.html:10
 msgid "Author"
 msgstr "Autor"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:262
-#: cps/templates/book_edit.html:277 cps/templates/search_form.html:106
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:264
+#: cps/templates/book_edit.html:279 cps/templates/search_form.html:106
 msgid "Description"
 msgstr "Descripcion"
 
@@ -913,114 +912,115 @@ msgstr "Descripcion"
 msgid "Tags"
 msgstr "Etiqueta"
 
-#: cps/templates/book_edit.html:76 cps/templates/layout.html:157
+#: cps/templates/book_edit.html:75 cps/templates/layout.html:157
 #: cps/templates/search_form.html:53
 msgid "Series"
 msgstr "Series"
 
-#: cps/templates/book_edit.html:80
+#: cps/templates/book_edit.html:79
 msgid "Series id"
 msgstr "Id de la serie"
 
-#: cps/templates/book_edit.html:84
+#: cps/templates/book_edit.html:83
 msgid "Rating"
 msgstr "Puntaje"
 
-#: cps/templates/book_edit.html:88
+#: cps/templates/book_edit.html:87
 msgid ""
 "Cover URL (jpg, cover is downloaded and stored in database, field is "
 "afterwards empty again)"
 msgstr ""
 
-#: cps/templates/book_edit.html:92
+#: cps/templates/book_edit.html:91
 msgid "Upload Cover from local drive"
 msgstr ""
 
-#: cps/templates/book_edit.html:97 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:96 cps/templates/detail.html:131
 msgid "Publishing date"
 msgstr "Fecha de publicación"
 
-#: cps/templates/book_edit.html:104 cps/templates/user_edit.html:33
+#: cps/templates/book_edit.html:103 cps/templates/book_edit.html:261
+#: cps/templates/book_edit.html:278 cps/templates/detail.html:126
+#: cps/templates/search_form.html:14
+msgid "Publisher"
+msgstr "Editor"
+
+#: cps/templates/book_edit.html:107 cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Lenguaje"
 
-#: cps/templates/book_edit.html:115 cps/templates/search_form.html:117
+#: cps/templates/book_edit.html:117 cps/templates/search_form.html:117
 msgid "Yes"
 msgstr "Si"
 
-#: cps/templates/book_edit.html:116 cps/templates/search_form.html:118
+#: cps/templates/book_edit.html:118 cps/templates/search_form.html:118
 msgid "No"
 msgstr "No"
 
-#: cps/templates/book_edit.html:162
+#: cps/templates/book_edit.html:164
 msgid "Upload format"
 msgstr "Subir formato"
 
-#: cps/templates/book_edit.html:171
+#: cps/templates/book_edit.html:173
 msgid "view book after edit"
 msgstr "Ver libro tras la edicion"
 
-#: cps/templates/book_edit.html:174 cps/templates/book_edit.html:210
+#: cps/templates/book_edit.html:176 cps/templates/book_edit.html:212
 msgid "Get metadata"
 msgstr "Obtener metainformación"
 
-#: cps/templates/book_edit.html:175 cps/templates/config_edit.html:210
+#: cps/templates/book_edit.html:177 cps/templates/config_edit.html:210
 #: cps/templates/config_view_edit.html:163 cps/templates/login.html:20
 #: cps/templates/search_form.html:153 cps/templates/shelf_edit.html:17
 #: cps/templates/user_edit.html:151
 msgid "Submit"
 msgstr "Enviar"
 
-#: cps/templates/book_edit.html:189
+#: cps/templates/book_edit.html:191
 msgid "Are you really sure?"
 msgstr ""
 
-#: cps/templates/book_edit.html:192
+#: cps/templates/book_edit.html:194
 msgid "Book will be deleted from Calibre database"
 msgstr ""
 
-#: cps/templates/book_edit.html:193
+#: cps/templates/book_edit.html:195
 msgid "and from hard disk"
 msgstr ""
 
-#: cps/templates/book_edit.html:213
+#: cps/templates/book_edit.html:215
 msgid "Keyword"
 msgstr "Palabra clave"
 
-#: cps/templates/book_edit.html:214
+#: cps/templates/book_edit.html:216
 msgid " Search keyword "
 msgstr "Buscar palabras clave"
 
-#: cps/templates/book_edit.html:216 cps/templates/layout.html:46
+#: cps/templates/book_edit.html:218 cps/templates/layout.html:46
 msgid "Go!"
 msgstr "¡Vamos!"
 
-#: cps/templates/book_edit.html:220
+#: cps/templates/book_edit.html:222
 msgid "Click the cover to load metadata to the form"
 msgstr "Haga clic en la portada para cargar la metainformación en el formulario"
 
-#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:234 cps/templates/book_edit.html:274
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: cps/templates/book_edit.html:237 cps/templates/layout.html:221
+#: cps/templates/book_edit.html:239 cps/templates/layout.html:221
 msgid "Close"
 msgstr "Cerrar"
 
-#: cps/templates/book_edit.html:259 cps/templates/book_edit.html:276
-#: cps/templates/detail.html:126 cps/templates/search_form.html:14
-msgid "Publisher"
-msgstr "Editor"
-
-#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
+#: cps/templates/book_edit.html:266 cps/templates/book_edit.html:280
 msgid "Source"
 msgstr "Origen"
 
-#: cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:275
 msgid "Search error!"
 msgstr "¡Error en la búsqueda!"
 
-#: cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:276
 msgid "No Result(s) found! Please try aonther keyword."
 msgstr ""
 
@@ -1294,7 +1294,7 @@ msgstr "Leer"
 msgid "Description:"
 msgstr "Descripcion :"
 
-#: cps/templates/detail.html:189 cps/templates/search.html:16
+#: cps/templates/detail.html:189 cps/templates/search.html:14
 msgid "Add to shelf"
 msgstr "Agregar al estante"
 
@@ -1681,15 +1681,15 @@ msgstr ""
 msgid "Once you do so, you will automatically get logged in on this device."
 msgstr ""
 
-#: cps/templates/search.html:6
+#: cps/templates/search.html:5
 msgid "No Results for:"
 msgstr "Sin resultados para:"
 
-#: cps/templates/search.html:7
+#: cps/templates/search.html:6
 msgid "Please try a different search"
 msgstr "Intente una busqueda diferente"
 
-#: cps/templates/search.html:9
+#: cps/templates/search.html:8
 msgid "Results for:"
 msgstr "Resultados para:"
 
diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index 25651b75..00e41bb5 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: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2018-08-31 14:58+0200\n"
+"POT-Creation-Date: 2018-09-03 19:09+0200\n"
 "PO-Revision-Date: 2017-10-26 22:42+0200\n"
 "Last-Translator: Nicolas Roudninski <nicoroud@gmail.com>\n"
 "Language: fr\n"
@@ -40,632 +40,627 @@ msgstr "non installé"
 msgid "Excecution permissions missing"
 msgstr ""
 
-#: cps/helper.py:56
-#, python-format
-msgid "Epub format not found for book id: %(book)d"
-msgstr ""
-
-#: cps/helper.py:75
-#, python-format
-msgid "Convert: %s"
-msgstr ""
-
-#: cps/helper.py:84
-msgid "Calibre-Web test e-mail"
-msgstr ""
-
-#: cps/helper.py:85
-msgid "Test e-mail"
-msgstr ""
-
-#: cps/helper.py:100
-msgid "Get Started with Calibre-Web"
-msgstr ""
-
-#: cps/helper.py:101
-#, python-format
-msgid "Registration e-mail for user: %s"
-msgstr ""
-
-#: cps/helper.py:124 cps/helper.py:134
-msgid "Could not find any formats suitable for sending by e-mail"
-msgstr ""
-
-#: cps/helper.py:136 cps/templates/detail.html:44 cps/worker.py:224
-msgid "Send to Kindle"
-msgstr "Envoyer vers Kindle"
-
-#: cps/helper.py:137
-#, python-format
-msgid "E-Mail: %s"
-msgstr ""
-
-#: cps/helper.py:139
-msgid "The requested file could not be read. Maybe wrong permissions?"
-msgstr ""
-
-#: cps/helper.py:147
+#: cps/helper.py:57
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:159
+#: cps/helper.py:69
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:171 cps/helper.py:178
+#: cps/helper.py:76
+#, python-format
+msgid "Convert: %s"
+msgstr ""
+
+#: cps/helper.py:78
 #, python-format
 msgid "Convert to %(format)s: %(book)s"
 msgstr ""
 
-#: cps/helper.py:184
+#: cps/helper.py:85
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:280
+#: cps/helper.py:90
+msgid "Calibre-Web test e-mail"
+msgstr ""
+
+#: cps/helper.py:91
+msgid "Test e-mail"
+msgstr ""
+
+#: cps/helper.py:106
+msgid "Get Started with Calibre-Web"
+msgstr ""
+
+#: cps/helper.py:107
+#, python-format
+msgid "Registration e-mail for user: %s"
+msgstr ""
+
+#: cps/helper.py:130 cps/helper.py:140
+msgid "Could not find any formats suitable for sending by e-mail"
+msgstr ""
+
+#: cps/helper.py:142 cps/templates/detail.html:44 cps/worker.py:224
+msgid "Send to Kindle"
+msgstr "Envoyer vers Kindle"
+
+#: cps/helper.py:143
+#, python-format
+msgid "E-Mail: %s"
+msgstr ""
+
+#: cps/helper.py:145
+msgid "The requested file could not be read. Maybe wrong permissions?"
+msgstr ""
+
+#: cps/helper.py:240
 #, python-format
 msgid "Rename title from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:289
+#: cps/helper.py:249
 #, python-format
 msgid "Rename author from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:312 cps/helper.py:321
+#: cps/helper.py:272 cps/helper.py:281
 #, python-format
 msgid "File %s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:339
+#: cps/helper.py:299
 #, python-format
 msgid "Book path %s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:584
+#: cps/helper.py:544
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:586
+#: cps/helper.py:546
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/web.py:1138
+#: cps/web.py:1120
 msgid "Requesting update package"
 msgstr ""
 
-#: cps/web.py:1139
+#: cps/web.py:1121
 msgid "Downloading update package"
 msgstr "Téléchargement la mise à jour"
 
-#: cps/web.py:1140
+#: cps/web.py:1122
 msgid "Unzipping update package"
 msgstr "Décompression de la mise à jour"
 
-#: cps/web.py:1141
+#: cps/web.py:1123
 msgid "Files are replaced"
 msgstr "Fichiers remplacés"
 
-#: cps/web.py:1142
+#: cps/web.py:1124
 msgid "Database connections are closed"
 msgstr "Connexion à la base de donnée fermée"
 
-#: cps/web.py:1143
+#: cps/web.py:1125
 msgid "Server is stopped"
 msgstr "Serveur arrêté"
 
-#: cps/web.py:1144
+#: cps/web.py:1126
 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:1164
+#: cps/web.py:1146
 msgid "Recently Added Books"
 msgstr "Ajouts récents"
 
-#: cps/web.py:1174
+#: cps/web.py:1156
 msgid "Newest Books"
 msgstr "Livres récents"
 
-#: cps/web.py:1186
+#: cps/web.py:1168
 msgid "Oldest Books"
 msgstr "Anciens livres"
 
-#: cps/web.py:1198
+#: cps/web.py:1180
 msgid "Books (A-Z)"
 msgstr "Livres (A-Z)"
 
-#: cps/web.py:1209
+#: cps/web.py:1191
 msgid "Books (Z-A)"
 msgstr "Livres (Z-A)"
 
-#: cps/web.py:1238
+#: cps/web.py:1220
 msgid "Hot Books (most downloaded)"
 msgstr "Livres populaires (les plus téléchargés)"
 
-#: cps/web.py:1251
+#: cps/web.py:1233
 msgid "Best rated books"
 msgstr "Livres les mieux notés"
 
-#: cps/templates/index.xml:36 cps/web.py:1263
+#: cps/templates/index.xml:36 cps/web.py:1245
 msgid "Random Books"
 msgstr "Livres au hasard"
 
-#: cps/web.py:1278
+#: cps/web.py:1260
 msgid "Author list"
 msgstr "Liste des auteurs"
 
-#: cps/web.py:1290 cps/web.py:1353 cps/web.py:1508 cps/web.py:2060
+#: cps/web.py:1272 cps/web.py:1335 cps/web.py:1490 cps/web.py:2042
 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/templates/index.xml:73 cps/web.py:1337
+#: cps/templates/index.xml:73 cps/web.py:1319
 msgid "Series list"
 msgstr "Liste des séries"
 
-#: cps/web.py:1351
+#: cps/web.py:1333
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Séries : %(serie)s"
 
-#: cps/web.py:1378
+#: cps/web.py:1360
 msgid "Available languages"
 msgstr "Langues disponibles"
 
-#: cps/web.py:1395
+#: cps/web.py:1377
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Langue : %(name)s"
 
-#: cps/templates/index.xml:66 cps/web.py:1406
+#: cps/templates/index.xml:66 cps/web.py:1388
 msgid "Category list"
 msgstr "Liste des catégories"
 
-#: cps/web.py:1420
+#: cps/web.py:1402
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Catégorie : %(name)s"
 
-#: cps/templates/layout.html:71 cps/web.py:1559
+#: cps/templates/layout.html:71 cps/web.py:1541
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1589
+#: cps/web.py:1571
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: cps/web.py:1694
+#: cps/web.py:1676
 msgid ""
 "Callback domain is not verified, please follow steps to verify domain in "
 "google developer console"
 msgstr ""
 
-#: cps/web.py:1770
+#: cps/web.py:1752
 msgid "Server restarted, please reload page"
 msgstr "Serveur redémarré, merci de rafraîchir la page"
 
-#: cps/web.py:1773
+#: cps/web.py:1755
 msgid "Performing shutdown of server, please close window"
 msgstr ""
 
-#: cps/web.py:1791
+#: cps/web.py:1773
 msgid "Update done"
 msgstr "Mise à jour effectuée"
 
-#: cps/web.py:1847 cps/web.py:1884
+#: cps/web.py:1833 cps/web.py:1870
 #, python-format
 msgid "%s: %s"
 msgstr ""
 
-#: cps/web.py:1859
+#: cps/web.py:1845
 #, python-format
 msgid "Published after %s"
 msgstr ""
 
-#: cps/web.py:1864
+#: cps/web.py:1850
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1878
+#: cps/web.py:1864
 #, python-format
 msgid "Rating <= %s"
 msgstr ""
 
-#: cps/web.py:1880
+#: cps/web.py:1866
 #, python-format
 msgid "Rating >= %s"
 msgstr ""
 
-#: cps/web.py:1939 cps/web.py:1948
+#: cps/web.py:1925 cps/web.py:1934
 msgid "search"
 msgstr "recherche"
 
 #: cps/templates/index.xml:44 cps/templates/index.xml:48
-#: cps/templates/layout.html:146 cps/web.py:2015
+#: cps/templates/layout.html:146 cps/web.py:2001
 msgid "Read Books"
 msgstr "Livres lus"
 
 #: cps/templates/index.xml:52 cps/templates/index.xml:56
-#: cps/templates/layout.html:148 cps/web.py:2018
+#: cps/templates/layout.html:148 cps/web.py:2004
 msgid "Unread Books"
 msgstr "Livres non-lus"
 
-#: cps/web.py:2070 cps/web.py:2072 cps/web.py:2074 cps/web.py:2086
+#: cps/web.py:2052 cps/web.py:2054 cps/web.py:2056 cps/web.py:2068
 msgid "Read a Book"
 msgstr "Lire un livre"
 
-#: cps/web.py:2152 cps/web.py:3029
+#: cps/web.py:2134 cps/web.py:3011
 msgid "Please fill out all fields!"
 msgstr "SVP, complétez tous les champs !"
 
-#: cps/web.py:2153 cps/web.py:2174 cps/web.py:2178 cps/web.py:2183
-#: cps/web.py:2185
+#: cps/web.py:2135 cps/web.py:2156 cps/web.py:2160 cps/web.py:2165
+#: cps/web.py:2167
 msgid "register"
 msgstr "s’enregistrer"
 
-#: cps/web.py:2173 cps/web.py:3245
+#: cps/web.py:2155 cps/web.py:3227
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/web.py:2176
+#: cps/web.py:2158
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:2179
+#: cps/web.py:2161
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:2182
+#: cps/web.py:2164
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:2199 cps/web.py:2295
+#: cps/web.py:2181 cps/web.py:2277
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Vous êtes maintenant connecté sous : '%(nickname)s'"
 
-#: cps/web.py:2204
+#: cps/web.py:2186
 msgid "Wrong Username or Password"
 msgstr "Mauvais nom d'utilisateur ou mot de passe"
 
-#: cps/web.py:2210 cps/web.py:2231
+#: cps/web.py:2192 cps/web.py:2213
 msgid "login"
 msgstr "connexion"
 
-#: cps/web.py:2243 cps/web.py:2274
+#: cps/web.py:2225 cps/web.py:2256
 msgid "Token not found"
 msgstr "Jeton non trouvé"
 
-#: cps/web.py:2251 cps/web.py:2282
+#: cps/web.py:2233 cps/web.py:2264
 msgid "Token has expired"
 msgstr "Jeton expiré"
 
-#: cps/web.py:2259
+#: cps/web.py:2241
 msgid "Success! Please return to your device"
 msgstr "Réussite! Merci de vous tourner vers votre appareil"
 
-#: cps/web.py:2309
+#: cps/web.py:2291
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Veillez configurer les paramètres smtp d'abord..."
 
-#: cps/web.py:2313
+#: cps/web.py:2295
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:2317
+#: cps/web.py:2299
 #, 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:2319 cps/web.py:3083
+#: cps/web.py:2301 cps/web.py:3065
 msgid "Please configure your kindle e-mail address first..."
 msgstr ""
 
-#: cps/web.py:2363
+#: cps/web.py:2345
 #, 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:2374
+#: cps/web.py:2356
 msgid "Invalid shelf specified"
 msgstr ""
 
-#: cps/web.py:2379
+#: cps/web.py:2361
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %s"
 msgstr ""
 
-#: cps/web.py:2384
+#: cps/web.py:2366
 msgid "User is not allowed to edit public shelves"
 msgstr ""
 
-#: cps/web.py:2402
+#: cps/web.py:2384
 #, python-format
 msgid "Books are already part of the shelf: %s"
 msgstr ""
 
-#: cps/web.py:2416
+#: cps/web.py:2398
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2418
+#: cps/web.py:2400
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2455
+#: cps/web.py:2437
 #, 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:2461
+#: cps/web.py:2443
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2481 cps/web.py:2505
+#: cps/web.py:2463 cps/web.py:2487
 #, 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:2486
+#: cps/web.py:2468
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Étagère %(title)s créée"
 
-#: cps/web.py:2488 cps/web.py:2516
+#: cps/web.py:2470 cps/web.py:2498
 msgid "There was an error"
 msgstr "Il y a eu une erreur"
 
-#: cps/web.py:2489 cps/web.py:2491
+#: cps/web.py:2471 cps/web.py:2473
 msgid "create a shelf"
 msgstr "créer une étagère"
 
-#: cps/web.py:2514
+#: cps/web.py:2496
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr ""
 
-#: cps/web.py:2517 cps/web.py:2519
+#: cps/web.py:2499 cps/web.py:2501
 msgid "Edit a shelf"
 msgstr "Modifier une étagère"
 
-#: cps/web.py:2540
+#: cps/web.py:2522
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "l’étagère %(name)s a été supprimé avec succès"
 
-#: cps/web.py:2562
+#: cps/web.py:2544
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Étagère : '%(name)s'"
 
-#: cps/web.py:2565
+#: cps/web.py:2547
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:2596
+#: cps/web.py:2578
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/web.py:2625 cps/web.py:3035
+#: cps/web.py:2607 cps/web.py:3017
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/web.py:2627 cps/web.py:2668 cps/web.py:2671
+#: cps/web.py:2609 cps/web.py:2650 cps/web.py:2653
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil de %(name)s"
 
-#: cps/web.py:2666
+#: cps/web.py:2648
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/web.py:2669
+#: cps/web.py:2651
 msgid "Profile updated"
 msgstr "Profil mis à jour"
 
-#: cps/web.py:2681
+#: cps/web.py:2663
 msgid "Unknown"
 msgstr ""
 
-#: cps/web.py:2695
+#: cps/web.py:2677
 msgid "Admin page"
 msgstr "Page administrateur"
 
-#: cps/web.py:2773 cps/web.py:2945
+#: cps/web.py:2755 cps/web.py:2927
 msgid "Calibre-Web configuration updated"
 msgstr "Configuration de Calibre-Web mise à jour"
 
-#: cps/templates/admin.html:91 cps/web.py:2786
+#: cps/templates/admin.html:91 cps/web.py:2768
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/web.py:2803
+#: cps/web.py:2785
 msgid "Import of optional Google Drive requirements missing"
 msgstr ""
 
-#: cps/web.py:2806
+#: cps/web.py:2788
 msgid "client_secrets.json is missing or not readable"
 msgstr ""
 
-#: cps/web.py:2811 cps/web.py:2838
+#: cps/web.py:2793 cps/web.py:2820
 msgid "client_secrets.json is not configured for web application"
 msgstr ""
 
-#: cps/templates/admin.html:90 cps/web.py:2841 cps/web.py:2867 cps/web.py:2879
-#: cps/web.py:2921 cps/web.py:2936 cps/web.py:2953 cps/web.py:2960
-#: cps/web.py:2977
+#: cps/templates/admin.html:90 cps/web.py:2823 cps/web.py:2849 cps/web.py:2861
+#: cps/web.py:2903 cps/web.py:2918 cps/web.py:2935 cps/web.py:2942
+#: cps/web.py:2959
 msgid "Basic Configuration"
 msgstr "Configuration basique"
 
-#: cps/web.py:2864
+#: cps/web.py:2846
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2876
+#: cps/web.py:2858
 msgid "Certfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2918
+#: cps/web.py:2900
 msgid "Logfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2957
+#: cps/web.py:2939
 msgid "DB location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/templates/admin.html:31 cps/web.py:3031 cps/web.py:3037 cps/web.py:3053
+#: cps/templates/admin.html:31 cps/web.py:3013 cps/web.py:3019 cps/web.py:3035
 msgid "Add new user"
 msgstr "Ajouter un nouvel utilisateur"
 
-#: cps/web.py:3043
+#: cps/web.py:3025
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Utilisateur '%(user)s' créé"
 
-#: cps/web.py:3047
+#: cps/web.py:3029
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/web.py:3071 cps/web.py:3085
+#: cps/web.py:3053 cps/web.py:3067
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/web.py:3078
+#: cps/web.py:3060
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:3081
+#: cps/web.py:3063
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/web.py:3086
+#: cps/web.py:3068
 msgid "Edit e-mail server settings"
 msgstr ""
 
-#: cps/web.py:3111
+#: cps/web.py:3093
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Utilisateur '%(nick)s' supprimé"
 
-#: cps/web.py:3220
+#: cps/web.py:3202
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Utilisateur '%(nick)s'  mis à jour"
 
-#: cps/web.py:3223
+#: cps/web.py:3205
 msgid "An unknown error occured."
 msgstr "Oups ! Une erreur inconnue a eu lieu."
 
-#: cps/web.py:3225
+#: cps/web.py:3207
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Éditer l'utilisateur %(nick)s"
 
-#: cps/web.py:3242
+#: cps/web.py:3224
 #, python-format
 msgid "Password for user %s reset"
 msgstr ""
 
-#: cps/web.py:3262
+#: cps/web.py:3244
 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:3294 cps/web.py:3556 cps/web.py:3561 cps/web.py:3716
+#: cps/web.py:3275 cps/web.py:3551 cps/web.py:3556 cps/web.py:3711
 msgid "edit metadata"
 msgstr "modifier les métadonnées"
 
-#: cps/web.py:3308 cps/web.py:3586
+#: cps/web.py:3289 cps/web.py:3581
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr ""
 
-#: cps/web.py:3312 cps/web.py:3590
+#: cps/web.py:3293 cps/web.py:3585
 msgid "File to be uploaded must have an extension"
 msgstr "Pour être téléverser le fichier doit avoir une extension"
 
-#: cps/web.py:3324 cps/web.py:3610
+#: cps/web.py:3305 cps/web.py:3605
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Impossible de créer le chemin %s (permission refusée)"
 
-#: cps/web.py:3329
+#: cps/web.py:3310
 #, python-format
 msgid "Failed to store file %s."
 msgstr ""
 
-#: cps/web.py:3345
+#: cps/web.py:3326
 #, python-format
 msgid "File format %s added to %s"
 msgstr ""
 
-#: cps/web.py:3363
+#: cps/web.py:3344
 #, python-format
 msgid "Failed to create path for cover %s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:3370
+#: cps/web.py:3351
 #, python-format
 msgid "Failed to store cover-file %s."
 msgstr ""
 
-#: cps/web.py:3373
+#: cps/web.py:3354
 msgid "Cover-file is not a valid image file"
 msgstr ""
 
-#: cps/web.py:3386 cps/web.py:3390
+#: cps/web.py:3367 cps/web.py:3371
 msgid "unknown"
 msgstr "inconnu"
 
-#: cps/web.py:3412
+#: cps/web.py:3393
 msgid "Cover is not a jpg file, can't save"
 msgstr ""
 
-#: cps/web.py:3565
+#: cps/web.py:3560
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/web.py:3615
+#: cps/web.py:3610
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Impossible d'enregistrer le fichier %s (permission refusée)"
 
-#: cps/web.py:3620
+#: cps/web.py:3615
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Impossible de supprimer le fichier %s (permission refusée)"
 
-#: cps/web.py:3702
+#: cps/web.py:3697
 #, python-format
 msgid "File %s uploaded"
 msgstr ""
 
-#: cps/web.py:3732
+#: cps/web.py:3727
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/web.py:3742
+#: cps/web.py:3737
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/web.py:3746
+#: cps/web.py:3741
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
 
-#: cps/worker.py:215 cps/worker.py:385
+#: cps/worker.py:215 cps/worker.py:387
 msgid "Started"
 msgstr ""
 
@@ -689,19 +684,19 @@ msgstr ""
 msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr ""
 
-#: cps/worker.py:316 cps/worker.py:375 cps/worker.py:437
+#: cps/worker.py:317 cps/worker.py:377 cps/worker.py:438
 msgid "Finished"
 msgstr ""
 
-#: cps/worker.py:342 cps/worker.py:361
+#: cps/worker.py:344 cps/worker.py:363
 msgid "Waiting"
 msgstr ""
 
-#: cps/worker.py:349
+#: cps/worker.py:351
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr ""
 
-#: cps/worker.py:463
+#: cps/worker.py:472
 msgid "Failed"
 msgstr ""
 
@@ -848,7 +843,7 @@ msgid "Ok"
 msgstr "D’accord"
 
 #: cps/templates/admin.html:116 cps/templates/admin.html:130
-#: cps/templates/book_edit.html:176 cps/templates/book_edit.html:198
+#: cps/templates/book_edit.html:178 cps/templates/book_edit.html:200
 #: cps/templates/config_edit.html:212 cps/templates/config_view_edit.html:164
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:75
 #: cps/templates/shelf.html:60 cps/templates/shelf_edit.html:19
@@ -884,7 +879,7 @@ msgstr "Effacer le livre"
 msgid "Delete formats:"
 msgstr ""
 
-#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:197
+#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:199
 #: cps/templates/email_edit.html:73 cps/templates/email_edit.html:74
 msgid "Delete"
 msgstr "Supprimer"
@@ -897,6 +892,10 @@ msgstr ""
 msgid "Convert from:"
 msgstr ""
 
+#: cps/templates/book_edit.html:36 cps/templates/book_edit.html:43
+msgid "select an option"
+msgstr ""
+
 #: cps/templates/book_edit.html:41
 msgid "Convert to:"
 msgstr ""
@@ -909,13 +908,13 @@ msgstr ""
 msgid "Book Title"
 msgstr "Titre du livre"
 
-#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:257
-#: cps/templates/book_edit.html:275 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:259
+#: cps/templates/book_edit.html:277 cps/templates/search_form.html:10
 msgid "Author"
 msgstr "Auteur"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:262
-#: cps/templates/book_edit.html:277 cps/templates/search_form.html:106
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:264
+#: cps/templates/book_edit.html:279 cps/templates/search_form.html:106
 msgid "Description"
 msgstr "Description"
 
@@ -923,114 +922,115 @@ msgstr "Description"
 msgid "Tags"
 msgstr "Étiquette"
 
-#: cps/templates/book_edit.html:76 cps/templates/layout.html:157
+#: cps/templates/book_edit.html:75 cps/templates/layout.html:157
 #: cps/templates/search_form.html:53
 msgid "Series"
 msgstr "Séries"
 
-#: cps/templates/book_edit.html:80
+#: cps/templates/book_edit.html:79
 msgid "Series id"
 msgstr "Id de série"
 
-#: cps/templates/book_edit.html:84
+#: cps/templates/book_edit.html:83
 msgid "Rating"
 msgstr "Évaluation"
 
-#: cps/templates/book_edit.html:88
+#: cps/templates/book_edit.html:87
 msgid ""
 "Cover URL (jpg, cover is downloaded and stored in database, field is "
 "afterwards empty again)"
 msgstr ""
 
-#: cps/templates/book_edit.html:92
+#: cps/templates/book_edit.html:91
 msgid "Upload Cover from local drive"
 msgstr ""
 
-#: cps/templates/book_edit.html:97 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:96 cps/templates/detail.html:131
 msgid "Publishing date"
 msgstr "Date de publication"
 
-#: cps/templates/book_edit.html:104 cps/templates/user_edit.html:33
+#: cps/templates/book_edit.html:103 cps/templates/book_edit.html:261
+#: cps/templates/book_edit.html:278 cps/templates/detail.html:126
+#: cps/templates/search_form.html:14
+msgid "Publisher"
+msgstr "Editeur"
+
+#: cps/templates/book_edit.html:107 cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Langue"
 
-#: cps/templates/book_edit.html:115 cps/templates/search_form.html:117
+#: cps/templates/book_edit.html:117 cps/templates/search_form.html:117
 msgid "Yes"
 msgstr "Oui"
 
-#: cps/templates/book_edit.html:116 cps/templates/search_form.html:118
+#: cps/templates/book_edit.html:118 cps/templates/search_form.html:118
 msgid "No"
 msgstr "Non"
 
-#: cps/templates/book_edit.html:162
+#: cps/templates/book_edit.html:164
 msgid "Upload format"
 msgstr ""
 
-#: cps/templates/book_edit.html:171
+#: cps/templates/book_edit.html:173
 msgid "view book after edit"
 msgstr "voir le livre après l'édition"
 
-#: cps/templates/book_edit.html:174 cps/templates/book_edit.html:210
+#: cps/templates/book_edit.html:176 cps/templates/book_edit.html:212
 msgid "Get metadata"
 msgstr "Obtenir les métadonnées"
 
-#: cps/templates/book_edit.html:175 cps/templates/config_edit.html:210
+#: cps/templates/book_edit.html:177 cps/templates/config_edit.html:210
 #: cps/templates/config_view_edit.html:163 cps/templates/login.html:20
 #: cps/templates/search_form.html:153 cps/templates/shelf_edit.html:17
 #: cps/templates/user_edit.html:151
 msgid "Submit"
 msgstr "Soumettre"
 
-#: cps/templates/book_edit.html:189
+#: cps/templates/book_edit.html:191
 msgid "Are you really sure?"
 msgstr "Etes-vous vraiment sur?"
 
-#: cps/templates/book_edit.html:192
+#: cps/templates/book_edit.html:194
 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:193
+#: cps/templates/book_edit.html:195
 msgid "and from hard disk"
 msgstr "et du disque dur"
 
-#: cps/templates/book_edit.html:213
+#: cps/templates/book_edit.html:215
 msgid "Keyword"
 msgstr "Mot-clé"
 
-#: cps/templates/book_edit.html:214
+#: cps/templates/book_edit.html:216
 msgid " Search keyword "
 msgstr " Rechercher le mot-clé "
 
-#: cps/templates/book_edit.html:216 cps/templates/layout.html:46
+#: cps/templates/book_edit.html:218 cps/templates/layout.html:46
 msgid "Go!"
 msgstr "Allez !"
 
-#: cps/templates/book_edit.html:220
+#: cps/templates/book_edit.html:222
 msgid "Click the cover to load metadata to the form"
 msgstr ""
 
-#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:234 cps/templates/book_edit.html:274
 msgid "Loading..."
 msgstr "Chargement…"
 
-#: cps/templates/book_edit.html:237 cps/templates/layout.html:221
+#: cps/templates/book_edit.html:239 cps/templates/layout.html:221
 msgid "Close"
 msgstr "Fermer"
 
-#: cps/templates/book_edit.html:259 cps/templates/book_edit.html:276
-#: cps/templates/detail.html:126 cps/templates/search_form.html:14
-msgid "Publisher"
-msgstr "Editeur"
-
-#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
+#: cps/templates/book_edit.html:266 cps/templates/book_edit.html:280
 msgid "Source"
 msgstr "Source"
 
-#: cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:275
 msgid "Search error!"
 msgstr "Rechercher les erreur!"
 
-#: cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:276
 msgid "No Result(s) found! Please try aonther keyword."
 msgstr ""
 
@@ -1304,7 +1304,7 @@ msgstr "Lu"
 msgid "Description:"
 msgstr "Description :"
 
-#: cps/templates/detail.html:189 cps/templates/search.html:16
+#: cps/templates/detail.html:189 cps/templates/search.html:14
 msgid "Add to shelf"
 msgstr "Ajouter à l'étagère"
 
@@ -1693,15 +1693,15 @@ msgstr "et s’authentifier"
 msgid "Once you do so, you will automatically get logged in on this device."
 msgstr ""
 
-#: cps/templates/search.html:6
+#: cps/templates/search.html:5
 msgid "No Results for:"
 msgstr "Aucun résultat pour :"
 
-#: cps/templates/search.html:7
+#: cps/templates/search.html:6
 msgid "Please try a different search"
 msgstr "Essayer une recherche différente"
 
-#: cps/templates/search.html:9
+#: cps/templates/search.html:8
 msgid "Results for:"
 msgstr "Résultats pour :"
 
diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po
index e10abbc0..3b50ca51 100644
--- a/cps/translations/it/LC_MESSAGES/messages.po
+++ b/cps/translations/it/LC_MESSAGES/messages.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2018-08-31 14:58+0200\n"
+"POT-Creation-Date: 2018-09-03 19:09+0200\n"
 "PO-Revision-Date: 2017-04-04 15:09+0200\n"
 "Last-Translator: Marco Picone <marcovendere@gmail.com>\n"
 "Language: it\n"
@@ -34,634 +34,629 @@ msgstr "non installato"
 msgid "Excecution permissions missing"
 msgstr "Mancano autorizzazioni di esecuzione"
 
-#: cps/helper.py:56
-#, python-format
-msgid "Epub format not found for book id: %(book)d"
-msgstr ""
-
-#: cps/helper.py:75
-#, python-format
-msgid "Convert: %s"
-msgstr ""
-
-#: cps/helper.py:84
-msgid "Calibre-Web test e-mail"
-msgstr ""
-
-#: cps/helper.py:85
-msgid "Test e-mail"
-msgstr ""
-
-#: cps/helper.py:100
-msgid "Get Started with Calibre-Web"
-msgstr ""
-
-#: cps/helper.py:101
-#, python-format
-msgid "Registration e-mail for user: %s"
-msgstr ""
-
-#: cps/helper.py:124 cps/helper.py:134
-msgid "Could not find any formats suitable for sending by e-mail"
-msgstr ""
-
-#: cps/helper.py:136 cps/templates/detail.html:44 cps/worker.py:224
-msgid "Send to Kindle"
-msgstr "Invia a Kindle"
-
-#: cps/helper.py:137
-#, python-format
-msgid "E-Mail: %s"
-msgstr ""
-
-#: cps/helper.py:139
-msgid "The requested file could not be read. Maybe wrong permissions?"
-msgstr ""
-
-#: cps/helper.py:147
+#: cps/helper.py:57
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:159
+#: cps/helper.py:69
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:171 cps/helper.py:178
+#: cps/helper.py:76
+#, python-format
+msgid "Convert: %s"
+msgstr ""
+
+#: cps/helper.py:78
 #, python-format
 msgid "Convert to %(format)s: %(book)s"
 msgstr ""
 
-#: cps/helper.py:184
+#: cps/helper.py:85
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:280
+#: cps/helper.py:90
+msgid "Calibre-Web test e-mail"
+msgstr ""
+
+#: cps/helper.py:91
+msgid "Test e-mail"
+msgstr ""
+
+#: cps/helper.py:106
+msgid "Get Started with Calibre-Web"
+msgstr ""
+
+#: cps/helper.py:107
+#, python-format
+msgid "Registration e-mail for user: %s"
+msgstr ""
+
+#: cps/helper.py:130 cps/helper.py:140
+msgid "Could not find any formats suitable for sending by e-mail"
+msgstr ""
+
+#: cps/helper.py:142 cps/templates/detail.html:44 cps/worker.py:224
+msgid "Send to Kindle"
+msgstr "Invia a Kindle"
+
+#: cps/helper.py:143
+#, python-format
+msgid "E-Mail: %s"
+msgstr ""
+
+#: cps/helper.py:145
+msgid "The requested file could not be read. Maybe wrong permissions?"
+msgstr ""
+
+#: cps/helper.py:240
 #, python-format
 msgid "Rename title from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:289
+#: cps/helper.py:249
 #, python-format
 msgid "Rename author from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:312 cps/helper.py:321
+#: cps/helper.py:272 cps/helper.py:281
 #, python-format
 msgid "File %s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:339
+#: cps/helper.py:299
 #, python-format
 msgid "Book path %s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:584
+#: cps/helper.py:544
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:586
+#: cps/helper.py:546
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/web.py:1138
+#: cps/web.py:1120
 msgid "Requesting update package"
 msgstr "Richiesta del pacchetto di aggiornamento"
 
-#: cps/web.py:1139
+#: cps/web.py:1121
 msgid "Downloading update package"
 msgstr "Scaricare il pacchetto di aggiornamento"
 
-#: cps/web.py:1140
+#: cps/web.py:1122
 msgid "Unzipping update package"
 msgstr "Decomprimere pacchetto di aggiornamento"
 
-#: cps/web.py:1141
+#: cps/web.py:1123
 msgid "Files are replaced"
 msgstr "I file vengono sostituiti"
 
-#: cps/web.py:1142
+#: cps/web.py:1124
 msgid "Database connections are closed"
 msgstr "Le connessioni di database sono chiuse"
 
-#: cps/web.py:1143
+#: cps/web.py:1125
 msgid "Server is stopped"
 msgstr "Il server viene arrestato"
 
-#: cps/web.py:1144
+#: cps/web.py:1126
 msgid "Update finished, please press okay and reload page"
 msgstr "Aggiornamento completato, prego premere bene e ricaricare pagina"
 
-#: cps/web.py:1164
+#: cps/web.py:1146
 msgid "Recently Added Books"
 msgstr "Libri aggiunti di recente"
 
-#: cps/web.py:1174
+#: cps/web.py:1156
 msgid "Newest Books"
 msgstr "I più nuovi libri"
 
-#: cps/web.py:1186
+#: cps/web.py:1168
 msgid "Oldest Books"
 msgstr "Libri più vecchi"
 
-#: cps/web.py:1198
+#: cps/web.py:1180
 msgid "Books (A-Z)"
 msgstr "Ebook (A-Z)"
 
-#: cps/web.py:1209
+#: cps/web.py:1191
 msgid "Books (Z-A)"
 msgstr "Ebook (Z-A)"
 
-#: cps/web.py:1238
+#: cps/web.py:1220
 msgid "Hot Books (most downloaded)"
 msgstr "Hot Books (più scaricati)"
 
-#: cps/web.py:1251
+#: cps/web.py:1233
 msgid "Best rated books"
 msgstr "I migliori libri valutati"
 
-#: cps/templates/index.xml:36 cps/web.py:1263
+#: cps/templates/index.xml:36 cps/web.py:1245
 msgid "Random Books"
 msgstr "Libri casuali"
 
-#: cps/web.py:1278
+#: cps/web.py:1260
 msgid "Author list"
 msgstr "Elenco degli autori"
 
-#: cps/web.py:1290 cps/web.py:1353 cps/web.py:1508 cps/web.py:2060
+#: cps/web.py:1272 cps/web.py:1335 cps/web.py:1490 cps/web.py:2042
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr ""
 "Errore durante l'apertura di eBook. Il file non esiste o il file non è "
 "accessibile:"
 
-#: cps/templates/index.xml:73 cps/web.py:1337
+#: cps/templates/index.xml:73 cps/web.py:1319
 msgid "Series list"
 msgstr "Lista delle serie"
 
-#: cps/web.py:1351
+#: cps/web.py:1333
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie :"
 
-#: cps/web.py:1378
+#: cps/web.py:1360
 msgid "Available languages"
 msgstr "Lingue disponibili"
 
-#: cps/web.py:1395
+#: cps/web.py:1377
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Lingue: %(name)s"
 
-#: cps/templates/index.xml:66 cps/web.py:1406
+#: cps/templates/index.xml:66 cps/web.py:1388
 msgid "Category list"
 msgstr "Elenco categorie"
 
-#: cps/web.py:1420
+#: cps/web.py:1402
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoria : %(name)s"
 
-#: cps/templates/layout.html:71 cps/web.py:1559
+#: cps/templates/layout.html:71 cps/web.py:1541
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1589
+#: cps/web.py:1571
 msgid "Statistics"
 msgstr "Statistica"
 
-#: cps/web.py:1694
+#: cps/web.py:1676
 msgid ""
 "Callback domain is not verified, please follow steps to verify domain in "
 "google developer console"
 msgstr ""
 
-#: cps/web.py:1770
+#: cps/web.py:1752
 msgid "Server restarted, please reload page"
 msgstr "Server riavviato, ricarica pagina"
 
-#: cps/web.py:1773
+#: cps/web.py:1755
 msgid "Performing shutdown of server, please close window"
 msgstr "Eseguire l'arresto del server, chiudi la finestra."
 
-#: cps/web.py:1791
+#: cps/web.py:1773
 msgid "Update done"
 msgstr "Aggiornamento fatto"
 
-#: cps/web.py:1847 cps/web.py:1884
+#: cps/web.py:1833 cps/web.py:1870
 #, python-format
 msgid "%s: %s"
 msgstr ""
 
-#: cps/web.py:1859
+#: cps/web.py:1845
 #, python-format
 msgid "Published after %s"
 msgstr ""
 
-#: cps/web.py:1864
+#: cps/web.py:1850
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1878
+#: cps/web.py:1864
 #, python-format
 msgid "Rating <= %s"
 msgstr ""
 
-#: cps/web.py:1880
+#: cps/web.py:1866
 #, python-format
 msgid "Rating >= %s"
 msgstr ""
 
-#: cps/web.py:1939 cps/web.py:1948
+#: cps/web.py:1925 cps/web.py:1934
 msgid "search"
 msgstr "ricerca"
 
 #: cps/templates/index.xml:44 cps/templates/index.xml:48
-#: cps/templates/layout.html:146 cps/web.py:2015
+#: cps/templates/layout.html:146 cps/web.py:2001
 msgid "Read Books"
 msgstr "Leggere libri"
 
 #: cps/templates/index.xml:52 cps/templates/index.xml:56
-#: cps/templates/layout.html:148 cps/web.py:2018
+#: cps/templates/layout.html:148 cps/web.py:2004
 msgid "Unread Books"
 msgstr "Libri non letti"
 
-#: cps/web.py:2070 cps/web.py:2072 cps/web.py:2074 cps/web.py:2086
+#: cps/web.py:2052 cps/web.py:2054 cps/web.py:2056 cps/web.py:2068
 msgid "Read a Book"
 msgstr "Leggere un libro"
 
-#: cps/web.py:2152 cps/web.py:3029
+#: cps/web.py:2134 cps/web.py:3011
 msgid "Please fill out all fields!"
 msgstr "Compila tutti i campi"
 
-#: cps/web.py:2153 cps/web.py:2174 cps/web.py:2178 cps/web.py:2183
-#: cps/web.py:2185
+#: cps/web.py:2135 cps/web.py:2156 cps/web.py:2160 cps/web.py:2165
+#: cps/web.py:2167
 msgid "register"
 msgstr "Registrare"
 
-#: cps/web.py:2173 cps/web.py:3245
+#: cps/web.py:2155 cps/web.py:3227
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/web.py:2176
+#: cps/web.py:2158
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:2179
+#: cps/web.py:2161
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:2182
+#: cps/web.py:2164
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:2199 cps/web.py:2295
+#: cps/web.py:2181 cps/web.py:2277
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "ora sei connesso come : '%(nickname)s'"
 
-#: cps/web.py:2204
+#: cps/web.py:2186
 msgid "Wrong Username or Password"
 msgstr "Nome utente o password errata"
 
-#: cps/web.py:2210 cps/web.py:2231
+#: cps/web.py:2192 cps/web.py:2213
 msgid "login"
 msgstr "Accesso"
 
-#: cps/web.py:2243 cps/web.py:2274
+#: cps/web.py:2225 cps/web.py:2256
 msgid "Token not found"
 msgstr "Token non trovato"
 
-#: cps/web.py:2251 cps/web.py:2282
+#: cps/web.py:2233 cps/web.py:2264
 msgid "Token has expired"
 msgstr "Il token è scaduto"
 
-#: cps/web.py:2259
+#: cps/web.py:2241
 msgid "Success! Please return to your device"
 msgstr "Successo! Torna al tuo dispositivo"
 
-#: cps/web.py:2309
+#: cps/web.py:2291
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configurare prima le impostazioni della posta SMTP..."
 
-#: cps/web.py:2313
+#: cps/web.py:2295
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:2317
+#: cps/web.py:2299
 #, 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:2319 cps/web.py:3083
+#: cps/web.py:2301 cps/web.py:3065
 msgid "Please configure your kindle e-mail address first..."
 msgstr ""
 
-#: cps/web.py:2363
+#: cps/web.py:2345
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "Il libro è stato aggiunto alla mensola: %(sname)s"
 
-#: cps/web.py:2374
+#: cps/web.py:2356
 msgid "Invalid shelf specified"
 msgstr ""
 
-#: cps/web.py:2379
+#: cps/web.py:2361
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %s"
 msgstr ""
 
-#: cps/web.py:2384
+#: cps/web.py:2366
 msgid "User is not allowed to edit public shelves"
 msgstr ""
 
-#: cps/web.py:2402
+#: cps/web.py:2384
 #, python-format
 msgid "Books are already part of the shelf: %s"
 msgstr ""
 
-#: cps/web.py:2416
+#: cps/web.py:2398
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2418
+#: cps/web.py:2400
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2455
+#: cps/web.py:2437
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Il libro è stato rimosso dalla mensola: %(sname)s"
 
-#: cps/web.py:2461
+#: cps/web.py:2443
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2481 cps/web.py:2505
+#: cps/web.py:2463 cps/web.py:2487
 #, 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:2486
+#: cps/web.py:2468
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Mensola %(title)s creato"
 
-#: cps/web.py:2488 cps/web.py:2516
+#: cps/web.py:2470 cps/web.py:2498
 msgid "There was an error"
 msgstr "c'era un errore"
 
-#: cps/web.py:2489 cps/web.py:2491
+#: cps/web.py:2471 cps/web.py:2473
 msgid "create a shelf"
 msgstr "creare uno scaffale"
 
-#: cps/web.py:2514
+#: cps/web.py:2496
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Mensola %(title)s cambiato"
 
-#: cps/web.py:2517 cps/web.py:2519
+#: cps/web.py:2499 cps/web.py:2501
 msgid "Edit a shelf"
 msgstr "Modifica un ripiano"
 
-#: cps/web.py:2540
+#: cps/web.py:2522
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "cancellato con successo il ripiano %(name)s"
 
-#: cps/web.py:2562
+#: cps/web.py:2544
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Mensola: '%(name)s'"
 
-#: cps/web.py:2565
+#: cps/web.py:2547
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 "Errore durante l'apertura dello scaffale. La mensola non esiste o non è "
 "accessibile"
 
-#: cps/web.py:2596
+#: cps/web.py:2578
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Modificare l'ordine della mensola: '%(name)s'"
 
-#: cps/web.py:2625 cps/web.py:3035
+#: cps/web.py:2607 cps/web.py:3017
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/web.py:2627 cps/web.py:2668 cps/web.py:2671
+#: cps/web.py:2609 cps/web.py:2650 cps/web.py:2653
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profilo di %(name)s"
 
-#: cps/web.py:2666
+#: cps/web.py:2648
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/web.py:2669
+#: cps/web.py:2651
 msgid "Profile updated"
 msgstr "Profilo aggiornato"
 
-#: cps/web.py:2681
+#: cps/web.py:2663
 msgid "Unknown"
 msgstr ""
 
-#: cps/web.py:2695
+#: cps/web.py:2677
 msgid "Admin page"
 msgstr "Pagina di amministrazione"
 
-#: cps/web.py:2773 cps/web.py:2945
+#: cps/web.py:2755 cps/web.py:2927
 msgid "Calibre-Web configuration updated"
 msgstr "Aggiornamento della configurazione del calibro-web"
 
-#: cps/templates/admin.html:91 cps/web.py:2786
+#: cps/templates/admin.html:91 cps/web.py:2768
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/web.py:2803
+#: cps/web.py:2785
 msgid "Import of optional Google Drive requirements missing"
 msgstr ""
 
-#: cps/web.py:2806
+#: cps/web.py:2788
 msgid "client_secrets.json is missing or not readable"
 msgstr ""
 
-#: cps/web.py:2811 cps/web.py:2838
+#: cps/web.py:2793 cps/web.py:2820
 msgid "client_secrets.json is not configured for web application"
 msgstr ""
 
-#: cps/templates/admin.html:90 cps/web.py:2841 cps/web.py:2867 cps/web.py:2879
-#: cps/web.py:2921 cps/web.py:2936 cps/web.py:2953 cps/web.py:2960
-#: cps/web.py:2977
+#: cps/templates/admin.html:90 cps/web.py:2823 cps/web.py:2849 cps/web.py:2861
+#: cps/web.py:2903 cps/web.py:2918 cps/web.py:2935 cps/web.py:2942
+#: cps/web.py:2959
 msgid "Basic Configuration"
 msgstr "Configurazione di base"
 
-#: cps/web.py:2864
+#: cps/web.py:2846
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2876
+#: cps/web.py:2858
 msgid "Certfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2918
+#: cps/web.py:2900
 msgid "Logfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2957
+#: cps/web.py:2939
 msgid "DB location is not valid, please enter correct path"
 msgstr "Posizione DB non valida. Inserisci il percorso corretto."
 
-#: cps/templates/admin.html:31 cps/web.py:3031 cps/web.py:3037 cps/web.py:3053
+#: cps/templates/admin.html:31 cps/web.py:3013 cps/web.py:3019 cps/web.py:3035
 msgid "Add new user"
 msgstr "Aggiungi un nuovo utente"
 
-#: cps/web.py:3043
+#: cps/web.py:3025
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "utente '%(user)s' creato"
 
-#: cps/web.py:3047
+#: cps/web.py:3029
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/web.py:3071 cps/web.py:3085
+#: cps/web.py:3053 cps/web.py:3067
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/web.py:3078
+#: cps/web.py:3060
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:3081
+#: cps/web.py:3063
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/web.py:3086
+#: cps/web.py:3068
 msgid "Edit e-mail server settings"
 msgstr ""
 
-#: cps/web.py:3111
+#: cps/web.py:3093
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "utente '%(nick)s' cancellati"
 
-#: cps/web.py:3220
+#: cps/web.py:3202
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "utente '%(nick)s'  aggiornato"
 
-#: cps/web.py:3223
+#: cps/web.py:3205
 msgid "An unknown error occured."
 msgstr "Errore imprevisto."
 
-#: cps/web.py:3225
+#: cps/web.py:3207
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Modifica utente %(nick)s"
 
-#: cps/web.py:3242
+#: cps/web.py:3224
 #, python-format
 msgid "Password for user %s reset"
 msgstr ""
 
-#: cps/web.py:3262
+#: cps/web.py:3244
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr ""
 "Errore durante l'apertura di eBook. Il file non esiste o il file non è "
 "accessibile"
 
-#: cps/web.py:3294 cps/web.py:3556 cps/web.py:3561 cps/web.py:3716
+#: cps/web.py:3275 cps/web.py:3551 cps/web.py:3556 cps/web.py:3711
 msgid "edit metadata"
 msgstr "modificare la metainformazione"
 
-#: cps/web.py:3308 cps/web.py:3586
+#: cps/web.py:3289 cps/web.py:3581
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr "Non è consentito caricare i file con l'estensione \"%s\" a questo server"
 
-#: cps/web.py:3312 cps/web.py:3590
+#: cps/web.py:3293 cps/web.py:3585
 msgid "File to be uploaded must have an extension"
 msgstr "Il file da caricare deve avere un'estensione"
 
-#: cps/web.py:3324 cps/web.py:3610
+#: cps/web.py:3305 cps/web.py:3605
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Impossibile creare il percorso %s (autorizzazione negata)"
 
-#: cps/web.py:3329
+#: cps/web.py:3310
 #, python-format
 msgid "Failed to store file %s."
 msgstr ""
 
-#: cps/web.py:3345
+#: cps/web.py:3326
 #, python-format
 msgid "File format %s added to %s"
 msgstr ""
 
-#: cps/web.py:3363
+#: cps/web.py:3344
 #, python-format
 msgid "Failed to create path for cover %s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:3370
+#: cps/web.py:3351
 #, python-format
 msgid "Failed to store cover-file %s."
 msgstr ""
 
-#: cps/web.py:3373
+#: cps/web.py:3354
 msgid "Cover-file is not a valid image file"
 msgstr ""
 
-#: cps/web.py:3386 cps/web.py:3390
+#: cps/web.py:3367 cps/web.py:3371
 msgid "unknown"
 msgstr "Sconosciuto"
 
-#: cps/web.py:3412
+#: cps/web.py:3393
 msgid "Cover is not a jpg file, can't save"
 msgstr ""
 
-#: cps/web.py:3565
+#: cps/web.py:3560
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/web.py:3615
+#: cps/web.py:3610
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Impossibile archiviare il file %s (autorizzazione negata)"
 
-#: cps/web.py:3620
+#: cps/web.py:3615
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Impossibile eliminare il file %s (autorizzazione negata)"
 
-#: cps/web.py:3702
+#: cps/web.py:3697
 #, python-format
 msgid "File %s uploaded"
 msgstr ""
 
-#: cps/web.py:3732
+#: cps/web.py:3727
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/web.py:3742
+#: cps/web.py:3737
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/web.py:3746
+#: cps/web.py:3741
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
 
-#: cps/worker.py:215 cps/worker.py:385
+#: cps/worker.py:215 cps/worker.py:387
 msgid "Started"
 msgstr ""
 
@@ -685,19 +680,19 @@ msgstr ""
 msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "errore"
 
-#: cps/worker.py:316 cps/worker.py:375 cps/worker.py:437
+#: cps/worker.py:317 cps/worker.py:377 cps/worker.py:438
 msgid "Finished"
 msgstr ""
 
-#: cps/worker.py:342 cps/worker.py:361
+#: cps/worker.py:344 cps/worker.py:363
 msgid "Waiting"
 msgstr ""
 
-#: cps/worker.py:349
+#: cps/worker.py:351
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr ""
 
-#: cps/worker.py:463
+#: cps/worker.py:472
 msgid "Failed"
 msgstr ""
 
@@ -844,7 +839,7 @@ msgid "Ok"
 msgstr "Ok"
 
 #: cps/templates/admin.html:116 cps/templates/admin.html:130
-#: cps/templates/book_edit.html:176 cps/templates/book_edit.html:198
+#: cps/templates/book_edit.html:178 cps/templates/book_edit.html:200
 #: cps/templates/config_edit.html:212 cps/templates/config_view_edit.html:164
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:75
 #: cps/templates/shelf.html:60 cps/templates/shelf_edit.html:19
@@ -880,7 +875,7 @@ msgstr "Elimina libro"
 msgid "Delete formats:"
 msgstr ""
 
-#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:197
+#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:199
 #: cps/templates/email_edit.html:73 cps/templates/email_edit.html:74
 msgid "Delete"
 msgstr "Elimina"
@@ -893,6 +888,10 @@ msgstr ""
 msgid "Convert from:"
 msgstr ""
 
+#: cps/templates/book_edit.html:36 cps/templates/book_edit.html:43
+msgid "select an option"
+msgstr ""
+
 #: cps/templates/book_edit.html:41
 msgid "Convert to:"
 msgstr ""
@@ -905,13 +904,13 @@ msgstr ""
 msgid "Book Title"
 msgstr "Titolo del libro"
 
-#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:257
-#: cps/templates/book_edit.html:275 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:259
+#: cps/templates/book_edit.html:277 cps/templates/search_form.html:10
 msgid "Author"
 msgstr "Autore"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:262
-#: cps/templates/book_edit.html:277 cps/templates/search_form.html:106
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:264
+#: cps/templates/book_edit.html:279 cps/templates/search_form.html:106
 msgid "Description"
 msgstr "Descrizione"
 
@@ -919,114 +918,115 @@ msgstr "Descrizione"
 msgid "Tags"
 msgstr "Tags"
 
-#: cps/templates/book_edit.html:76 cps/templates/layout.html:157
+#: cps/templates/book_edit.html:75 cps/templates/layout.html:157
 #: cps/templates/search_form.html:53
 msgid "Series"
 msgstr "Serie"
 
-#: cps/templates/book_edit.html:80
+#: cps/templates/book_edit.html:79
 msgid "Series id"
 msgstr "Series id"
 
-#: cps/templates/book_edit.html:84
+#: cps/templates/book_edit.html:83
 msgid "Rating"
 msgstr "Valutazione"
 
-#: cps/templates/book_edit.html:88
+#: cps/templates/book_edit.html:87
 msgid ""
 "Cover URL (jpg, cover is downloaded and stored in database, field is "
 "afterwards empty again)"
 msgstr ""
 
-#: cps/templates/book_edit.html:92
+#: cps/templates/book_edit.html:91
 msgid "Upload Cover from local drive"
 msgstr ""
 
-#: cps/templates/book_edit.html:97 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:96 cps/templates/detail.html:131
 msgid "Publishing date"
 msgstr "Data di pubblicazione"
 
-#: cps/templates/book_edit.html:104 cps/templates/user_edit.html:33
+#: cps/templates/book_edit.html:103 cps/templates/book_edit.html:261
+#: cps/templates/book_edit.html:278 cps/templates/detail.html:126
+#: cps/templates/search_form.html:14
+msgid "Publisher"
+msgstr "Editore"
+
+#: cps/templates/book_edit.html:107 cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Lingua"
 
-#: cps/templates/book_edit.html:115 cps/templates/search_form.html:117
+#: cps/templates/book_edit.html:117 cps/templates/search_form.html:117
 msgid "Yes"
 msgstr "Si"
 
-#: cps/templates/book_edit.html:116 cps/templates/search_form.html:118
+#: cps/templates/book_edit.html:118 cps/templates/search_form.html:118
 msgid "No"
 msgstr "No"
 
-#: cps/templates/book_edit.html:162
+#: cps/templates/book_edit.html:164
 msgid "Upload format"
 msgstr ""
 
-#: cps/templates/book_edit.html:171
+#: cps/templates/book_edit.html:173
 msgid "view book after edit"
 msgstr "visualizzare il libro dopo la modifica"
 
-#: cps/templates/book_edit.html:174 cps/templates/book_edit.html:210
+#: cps/templates/book_edit.html:176 cps/templates/book_edit.html:212
 msgid "Get metadata"
 msgstr "Ottieni metadati"
 
-#: cps/templates/book_edit.html:175 cps/templates/config_edit.html:210
+#: cps/templates/book_edit.html:177 cps/templates/config_edit.html:210
 #: cps/templates/config_view_edit.html:163 cps/templates/login.html:20
 #: cps/templates/search_form.html:153 cps/templates/shelf_edit.html:17
 #: cps/templates/user_edit.html:151
 msgid "Submit"
 msgstr "Sottoscrivi"
 
-#: cps/templates/book_edit.html:189
+#: cps/templates/book_edit.html:191
 msgid "Are you really sure?"
 msgstr "Sei davvero sicuro?"
 
-#: cps/templates/book_edit.html:192
+#: cps/templates/book_edit.html:194
 msgid "Book will be deleted from Calibre database"
 msgstr "l libro verrà cancellato dal database Calibre\""
 
-#: cps/templates/book_edit.html:193
+#: cps/templates/book_edit.html:195
 msgid "and from hard disk"
 msgstr "e dal disco rigido"
 
-#: cps/templates/book_edit.html:213
+#: cps/templates/book_edit.html:215
 msgid "Keyword"
 msgstr "Parola chiave"
 
-#: cps/templates/book_edit.html:214
+#: cps/templates/book_edit.html:216
 msgid " Search keyword "
 msgstr "Cerca parola chiave"
 
-#: cps/templates/book_edit.html:216 cps/templates/layout.html:46
+#: cps/templates/book_edit.html:218 cps/templates/layout.html:46
 msgid "Go!"
 msgstr "Partire"
 
-#: cps/templates/book_edit.html:220
+#: cps/templates/book_edit.html:222
 msgid "Click the cover to load metadata to the form"
 msgstr "Fai clic sul coperchio per caricare i metadati nel modulo"
 
-#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:234 cps/templates/book_edit.html:274
 msgid "Loading..."
 msgstr "Caricamento in corso..."
 
-#: cps/templates/book_edit.html:237 cps/templates/layout.html:221
+#: cps/templates/book_edit.html:239 cps/templates/layout.html:221
 msgid "Close"
 msgstr "Chiuso"
 
-#: cps/templates/book_edit.html:259 cps/templates/book_edit.html:276
-#: cps/templates/detail.html:126 cps/templates/search_form.html:14
-msgid "Publisher"
-msgstr "Editore"
-
-#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
+#: cps/templates/book_edit.html:266 cps/templates/book_edit.html:280
 msgid "Source"
 msgstr "fonte"
 
-#: cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:275
 msgid "Search error!"
 msgstr "Errore di ricerca!"
 
-#: cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:276
 msgid "No Result(s) found! Please try aonther keyword."
 msgstr ""
 
@@ -1300,7 +1300,7 @@ msgstr "Leggere"
 msgid "Description:"
 msgstr "Descrizione :"
 
-#: cps/templates/detail.html:189 cps/templates/search.html:16
+#: cps/templates/detail.html:189 cps/templates/search.html:14
 msgid "Add to shelf"
 msgstr "Aggiungi al ripiano"
 
@@ -1689,15 +1689,15 @@ msgstr ""
 "Una volta fatto questo, ti verrà automaticamente connesso in questo "
 "dispositivo"
 
-#: cps/templates/search.html:6
+#: cps/templates/search.html:5
 msgid "No Results for:"
 msgstr "Nessun risultato per:"
 
-#: cps/templates/search.html:7
+#: cps/templates/search.html:6
 msgid "Please try a different search"
 msgstr "Prova una ricerca diversa"
 
-#: cps/templates/search.html:9
+#: cps/templates/search.html:8
 msgid "Results for:"
 msgstr "Risultati per:"
 
diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po
index 0a5efc3f..b152895d 100644
--- a/cps/translations/ja/LC_MESSAGES/messages.po
+++ b/cps/translations/ja/LC_MESSAGES/messages.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2018-08-31 14:58+0200\n"
+"POT-Creation-Date: 2018-09-03 19:09+0200\n"
 "PO-Revision-Date: 2018-02-07 02:20-0500\n"
 "Last-Translator: white <space_white@yahoo.com>\n"
 "Language: ja\n"
@@ -29,628 +29,623 @@ msgstr "インストールされません"
 msgid "Excecution permissions missing"
 msgstr "実行許可はありません"
 
-#: cps/helper.py:56
-#, python-format
-msgid "Epub format not found for book id: %(book)d"
-msgstr ""
-
-#: cps/helper.py:75
-#, python-format
-msgid "Convert: %s"
-msgstr ""
-
-#: cps/helper.py:84
-msgid "Calibre-Web test e-mail"
-msgstr ""
-
-#: cps/helper.py:85
-msgid "Test e-mail"
-msgstr ""
-
-#: cps/helper.py:100
-msgid "Get Started with Calibre-Web"
-msgstr ""
-
-#: cps/helper.py:101
-#, python-format
-msgid "Registration e-mail for user: %s"
-msgstr ""
-
-#: cps/helper.py:124 cps/helper.py:134
-msgid "Could not find any formats suitable for sending by e-mail"
-msgstr ""
-
-#: cps/helper.py:136 cps/templates/detail.html:44 cps/worker.py:224
-msgid "Send to Kindle"
-msgstr "Kindleに送信する"
-
-#: cps/helper.py:137
-#, python-format
-msgid "E-Mail: %s"
-msgstr ""
-
-#: cps/helper.py:139
-msgid "The requested file could not be read. Maybe wrong permissions?"
-msgstr ""
-
-#: cps/helper.py:147
+#: cps/helper.py:57
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:159
+#: cps/helper.py:69
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:171 cps/helper.py:178
+#: cps/helper.py:76
+#, python-format
+msgid "Convert: %s"
+msgstr ""
+
+#: cps/helper.py:78
 #, python-format
 msgid "Convert to %(format)s: %(book)s"
 msgstr ""
 
-#: cps/helper.py:184
+#: cps/helper.py:85
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:280
+#: cps/helper.py:90
+msgid "Calibre-Web test e-mail"
+msgstr ""
+
+#: cps/helper.py:91
+msgid "Test e-mail"
+msgstr ""
+
+#: cps/helper.py:106
+msgid "Get Started with Calibre-Web"
+msgstr ""
+
+#: cps/helper.py:107
+#, python-format
+msgid "Registration e-mail for user: %s"
+msgstr ""
+
+#: cps/helper.py:130 cps/helper.py:140
+msgid "Could not find any formats suitable for sending by e-mail"
+msgstr ""
+
+#: cps/helper.py:142 cps/templates/detail.html:44 cps/worker.py:224
+msgid "Send to Kindle"
+msgstr "Kindleに送信する"
+
+#: cps/helper.py:143
+#, python-format
+msgid "E-Mail: %s"
+msgstr ""
+
+#: cps/helper.py:145
+msgid "The requested file could not be read. Maybe wrong permissions?"
+msgstr ""
+
+#: cps/helper.py:240
 #, python-format
 msgid "Rename title from: \"%s\" to \"%s\" failed with error: %s"
 msgstr "タイトルを\"%s\"から\"%s\"の改名は失敗しました。エーラ: %s"
 
-#: cps/helper.py:289
+#: cps/helper.py:249
 #, python-format
 msgid "Rename author from: \"%s\" to \"%s\" failed with error: %s"
 msgstr "著者を\"%s\"から\"%s\"の改名は失敗しました。エーラ：%s"
 
-#: cps/helper.py:312 cps/helper.py:321
+#: cps/helper.py:272 cps/helper.py:281
 #, python-format
 msgid "File %s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:339
+#: cps/helper.py:299
 #, python-format
 msgid "Book path %s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:584
+#: cps/helper.py:544
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:586
+#: cps/helper.py:546
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/web.py:1138
+#: cps/web.py:1120
 msgid "Requesting update package"
 msgstr "更新パッケージを要求します"
 
-#: cps/web.py:1139
+#: cps/web.py:1121
 msgid "Downloading update package"
 msgstr "更新パッケージをダウンロードします"
 
-#: cps/web.py:1140
+#: cps/web.py:1122
 msgid "Unzipping update package"
 msgstr "更新パッケージをZIP解凍します"
 
-#: cps/web.py:1141
+#: cps/web.py:1123
 msgid "Files are replaced"
 msgstr "ファイルを書き換えました"
 
-#: cps/web.py:1142
+#: cps/web.py:1124
 msgid "Database connections are closed"
 msgstr "データベースの接続が閉じられました"
 
-#: cps/web.py:1143
+#: cps/web.py:1125
 msgid "Server is stopped"
 msgstr "サーバがシャットダウンされました"
 
-#: cps/web.py:1144
+#: cps/web.py:1126
 msgid "Update finished, please press okay and reload page"
 msgstr "更新完了、Okayまたは再読み込みボタンを押してください"
 
-#: cps/web.py:1164
+#: cps/web.py:1146
 msgid "Recently Added Books"
 msgstr "最近追加された本"
 
-#: cps/web.py:1174
+#: cps/web.py:1156
 msgid "Newest Books"
 msgstr "最新の本"
 
-#: cps/web.py:1186
+#: cps/web.py:1168
 msgid "Oldest Books"
 msgstr "最古の本"
 
-#: cps/web.py:1198
+#: cps/web.py:1180
 msgid "Books (A-Z)"
 msgstr "本(A-Z)"
 
-#: cps/web.py:1209
+#: cps/web.py:1191
 msgid "Books (Z-A)"
 msgstr "本 (Z-A)"
 
-#: cps/web.py:1238
+#: cps/web.py:1220
 msgid "Hot Books (most downloaded)"
 msgstr "有名な本(ダウンロード数)"
 
-#: cps/web.py:1251
+#: cps/web.py:1233
 msgid "Best rated books"
 msgstr "最高評判の本"
 
-#: cps/templates/index.xml:36 cps/web.py:1263
+#: cps/templates/index.xml:36 cps/web.py:1245
 msgid "Random Books"
 msgstr "任意の本"
 
-#: cps/web.py:1278
+#: cps/web.py:1260
 msgid "Author list"
 msgstr "著者リスト"
 
-#: cps/web.py:1290 cps/web.py:1353 cps/web.py:1508 cps/web.py:2060
+#: cps/web.py:1272 cps/web.py:1335 cps/web.py:1490 cps/web.py:2042
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "電子本を開けません。ファイルは存在しないまたはアクセスできません"
 
-#: cps/templates/index.xml:73 cps/web.py:1337
+#: cps/templates/index.xml:73 cps/web.py:1319
 msgid "Series list"
 msgstr "叢書リスト"
 
-#: cps/web.py:1351
+#: cps/web.py:1333
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "叢書: %(serie)s"
 
-#: cps/web.py:1378
+#: cps/web.py:1360
 msgid "Available languages"
 msgstr "利用可能な言語"
 
-#: cps/web.py:1395
+#: cps/web.py:1377
 #, python-format
 msgid "Language: %(name)s"
 msgstr "言語: %(name)s"
 
-#: cps/templates/index.xml:66 cps/web.py:1406
+#: cps/templates/index.xml:66 cps/web.py:1388
 msgid "Category list"
 msgstr "カテゴリーリスト"
 
-#: cps/web.py:1420
+#: cps/web.py:1402
 #, python-format
 msgid "Category: %(name)s"
 msgstr "カテゴリー: %(name)s"
 
-#: cps/templates/layout.html:71 cps/web.py:1559
+#: cps/templates/layout.html:71 cps/web.py:1541
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1589
+#: cps/web.py:1571
 msgid "Statistics"
 msgstr "統計"
 
-#: cps/web.py:1694
+#: cps/web.py:1676
 msgid ""
 "Callback domain is not verified, please follow steps to verify domain in "
 "google developer console"
 msgstr ""
 
-#: cps/web.py:1770
+#: cps/web.py:1752
 msgid "Server restarted, please reload page"
 msgstr "サーバを再起動しました、ページを再読み込みしてください"
 
-#: cps/web.py:1773
+#: cps/web.py:1755
 msgid "Performing shutdown of server, please close window"
 msgstr "サーバをシャットダウンします、ページを閉じてください"
 
-#: cps/web.py:1791
+#: cps/web.py:1773
 msgid "Update done"
 msgstr "更新完了"
 
-#: cps/web.py:1847 cps/web.py:1884
+#: cps/web.py:1833 cps/web.py:1870
 #, python-format
 msgid "%s: %s"
 msgstr ""
 
-#: cps/web.py:1859
+#: cps/web.py:1845
 #, python-format
 msgid "Published after %s"
 msgstr ""
 
-#: cps/web.py:1864
+#: cps/web.py:1850
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1878
+#: cps/web.py:1864
 #, python-format
 msgid "Rating <= %s"
 msgstr ""
 
-#: cps/web.py:1880
+#: cps/web.py:1866
 #, python-format
 msgid "Rating >= %s"
 msgstr ""
 
-#: cps/web.py:1939 cps/web.py:1948
+#: cps/web.py:1925 cps/web.py:1934
 msgid "search"
 msgstr "検索"
 
 #: cps/templates/index.xml:44 cps/templates/index.xml:48
-#: cps/templates/layout.html:146 cps/web.py:2015
+#: cps/templates/layout.html:146 cps/web.py:2001
 msgid "Read Books"
 msgstr "既読の本"
 
 #: cps/templates/index.xml:52 cps/templates/index.xml:56
-#: cps/templates/layout.html:148 cps/web.py:2018
+#: cps/templates/layout.html:148 cps/web.py:2004
 msgid "Unread Books"
 msgstr "未読の本"
 
-#: cps/web.py:2070 cps/web.py:2072 cps/web.py:2074 cps/web.py:2086
+#: cps/web.py:2052 cps/web.py:2054 cps/web.py:2056 cps/web.py:2068
 msgid "Read a Book"
 msgstr "本を読む"
 
-#: cps/web.py:2152 cps/web.py:3029
+#: cps/web.py:2134 cps/web.py:3011
 msgid "Please fill out all fields!"
 msgstr "全ての項目を入力してください"
 
-#: cps/web.py:2153 cps/web.py:2174 cps/web.py:2178 cps/web.py:2183
-#: cps/web.py:2185
+#: cps/web.py:2135 cps/web.py:2156 cps/web.py:2160 cps/web.py:2165
+#: cps/web.py:2167
 msgid "register"
 msgstr "登録"
 
-#: cps/web.py:2173 cps/web.py:3245
+#: cps/web.py:2155 cps/web.py:3227
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/web.py:2176
+#: cps/web.py:2158
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:2179
+#: cps/web.py:2161
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:2182
+#: cps/web.py:2164
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:2199 cps/web.py:2295
+#: cps/web.py:2181 cps/web.py:2277
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "%(nickname)s としてログインします"
 
-#: cps/web.py:2204
+#: cps/web.py:2186
 msgid "Wrong Username or Password"
 msgstr "ユーザ名またはパスワードは間違いました"
 
-#: cps/web.py:2210 cps/web.py:2231
+#: cps/web.py:2192 cps/web.py:2213
 msgid "login"
 msgstr "ログイン"
 
-#: cps/web.py:2243 cps/web.py:2274
+#: cps/web.py:2225 cps/web.py:2256
 msgid "Token not found"
 msgstr "トークンは見つかりません"
 
-#: cps/web.py:2251 cps/web.py:2282
+#: cps/web.py:2233 cps/web.py:2264
 msgid "Token has expired"
 msgstr "トークンは失効されました"
 
-#: cps/web.py:2259
+#: cps/web.py:2241
 msgid "Success! Please return to your device"
 msgstr "成功しまた！端末に戻ってください"
 
-#: cps/web.py:2309
+#: cps/web.py:2291
 msgid "Please configure the SMTP mail settings first..."
 msgstr "SMTPメールをまず設定してください"
 
-#: cps/web.py:2313
+#: cps/web.py:2295
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:2317
+#: cps/web.py:2299
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "%(res)s を送信する際にエーラが発生しました"
 
-#: cps/web.py:2319 cps/web.py:3083
+#: cps/web.py:2301 cps/web.py:3065
 msgid "Please configure your kindle e-mail address first..."
 msgstr ""
 
-#: cps/web.py:2363
+#: cps/web.py:2345
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "本 %(sname)s を書架に追加されました"
 
-#: cps/web.py:2374
+#: cps/web.py:2356
 msgid "Invalid shelf specified"
 msgstr ""
 
-#: cps/web.py:2379
+#: cps/web.py:2361
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %s"
 msgstr ""
 
-#: cps/web.py:2384
+#: cps/web.py:2366
 msgid "User is not allowed to edit public shelves"
 msgstr ""
 
-#: cps/web.py:2402
+#: cps/web.py:2384
 #, python-format
 msgid "Books are already part of the shelf: %s"
 msgstr ""
 
-#: cps/web.py:2416
+#: cps/web.py:2398
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2418
+#: cps/web.py:2400
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2455
+#: cps/web.py:2437
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "本 %(sname)s を書架から除去されました"
 
-#: cps/web.py:2461
+#: cps/web.py:2443
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2481 cps/web.py:2505
+#: cps/web.py:2463 cps/web.py:2487
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr "名前を使った書架 '%(title)s'　は既に存在しました"
 
-#: cps/web.py:2486
+#: cps/web.py:2468
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "書架%(title)s は作成されました"
 
-#: cps/web.py:2488 cps/web.py:2516
+#: cps/web.py:2470 cps/web.py:2498
 msgid "There was an error"
 msgstr "エーラが発生しました"
 
-#: cps/web.py:2489 cps/web.py:2491
+#: cps/web.py:2471 cps/web.py:2473
 msgid "create a shelf"
 msgstr "書架を作成する"
 
-#: cps/web.py:2514
+#: cps/web.py:2496
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "書架 %(title)s 変わりました"
 
-#: cps/web.py:2517 cps/web.py:2519
+#: cps/web.py:2499 cps/web.py:2501
 msgid "Edit a shelf"
 msgstr "書架を編集する"
 
-#: cps/web.py:2540
+#: cps/web.py:2522
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "%(name)s の書架を削除されました"
 
-#: cps/web.py:2562
+#: cps/web.py:2544
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "書架: '%(name)s'"
 
-#: cps/web.py:2565
+#: cps/web.py:2547
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "書架を開けません。書架は存在しないまたはアクセスできません"
 
-#: cps/web.py:2596
+#: cps/web.py:2578
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "'%(name)s' の書架の順番を入れ替える"
 
-#: cps/web.py:2625 cps/web.py:3035
+#: cps/web.py:2607 cps/web.py:3017
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/web.py:2627 cps/web.py:2668 cps/web.py:2671
+#: cps/web.py:2609 cps/web.py:2650 cps/web.py:2653
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)sのプロファイル"
 
-#: cps/web.py:2666
+#: cps/web.py:2648
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/web.py:2669
+#: cps/web.py:2651
 msgid "Profile updated"
 msgstr "プロファイルが更新されました"
 
-#: cps/web.py:2681
+#: cps/web.py:2663
 msgid "Unknown"
 msgstr ""
 
-#: cps/web.py:2695
+#: cps/web.py:2677
 msgid "Admin page"
 msgstr "管理者ページ"
 
-#: cps/web.py:2773 cps/web.py:2945
+#: cps/web.py:2755 cps/web.py:2927
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web 設定を更新されました"
 
-#: cps/templates/admin.html:91 cps/web.py:2786
+#: cps/templates/admin.html:91 cps/web.py:2768
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/web.py:2803
+#: cps/web.py:2785
 msgid "Import of optional Google Drive requirements missing"
 msgstr ""
 
-#: cps/web.py:2806
+#: cps/web.py:2788
 msgid "client_secrets.json is missing or not readable"
 msgstr ""
 
-#: cps/web.py:2811 cps/web.py:2838
+#: cps/web.py:2793 cps/web.py:2820
 msgid "client_secrets.json is not configured for web application"
 msgstr ""
 
-#: cps/templates/admin.html:90 cps/web.py:2841 cps/web.py:2867 cps/web.py:2879
-#: cps/web.py:2921 cps/web.py:2936 cps/web.py:2953 cps/web.py:2960
-#: cps/web.py:2977
+#: cps/templates/admin.html:90 cps/web.py:2823 cps/web.py:2849 cps/web.py:2861
+#: cps/web.py:2903 cps/web.py:2918 cps/web.py:2935 cps/web.py:2942
+#: cps/web.py:2959
 msgid "Basic Configuration"
 msgstr "基本設定"
 
-#: cps/web.py:2864
+#: cps/web.py:2846
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2876
+#: cps/web.py:2858
 msgid "Certfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2918
+#: cps/web.py:2900
 msgid "Logfile location is not valid, please enter correct path"
 msgstr "ログファイルの場所は不適切です。正しい場所を入力してください"
 
-#: cps/web.py:2957
+#: cps/web.py:2939
 msgid "DB location is not valid, please enter correct path"
 msgstr "データベースの場所は不適切です。正しい場所を入力してください"
 
-#: cps/templates/admin.html:31 cps/web.py:3031 cps/web.py:3037 cps/web.py:3053
+#: cps/templates/admin.html:31 cps/web.py:3013 cps/web.py:3019 cps/web.py:3035
 msgid "Add new user"
 msgstr "新規ユーザ追加"
 
-#: cps/web.py:3043
+#: cps/web.py:3025
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "ユーザ　'%(user)s' が作成されました"
 
-#: cps/web.py:3047
+#: cps/web.py:3029
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/web.py:3071 cps/web.py:3085
+#: cps/web.py:3053 cps/web.py:3067
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/web.py:3078
+#: cps/web.py:3060
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:3081
+#: cps/web.py:3063
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/web.py:3086
+#: cps/web.py:3068
 msgid "Edit e-mail server settings"
 msgstr ""
 
-#: cps/web.py:3111
+#: cps/web.py:3093
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "ユーザ '%(nick)s' 削除されました"
 
-#: cps/web.py:3220
+#: cps/web.py:3202
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "ユーザ '%(nick)s' 更新されました"
 
-#: cps/web.py:3223
+#: cps/web.py:3205
 msgid "An unknown error occured."
 msgstr "不明のエーラが発生しました"
 
-#: cps/web.py:3225
+#: cps/web.py:3207
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "ユーザ編集 %(nick)s"
 
-#: cps/web.py:3242
+#: cps/web.py:3224
 #, python-format
 msgid "Password for user %s reset"
 msgstr ""
 
-#: cps/web.py:3262
+#: cps/web.py:3244
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "電子本を開けません。ファイルは存在しないまたはアクセスできません"
 
-#: cps/web.py:3294 cps/web.py:3556 cps/web.py:3561 cps/web.py:3716
+#: cps/web.py:3275 cps/web.py:3551 cps/web.py:3556 cps/web.py:3711
 msgid "edit metadata"
 msgstr "メタデータを編集します"
 
-#: cps/web.py:3308 cps/web.py:3586
+#: cps/web.py:3289 cps/web.py:3581
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr "ファイル拡張子 \"%s\" をこのサーバにアップロードする許可はありません"
 
-#: cps/web.py:3312 cps/web.py:3590
+#: cps/web.py:3293 cps/web.py:3585
 msgid "File to be uploaded must have an extension"
 msgstr "ファイルをアップロードするために拡張子が必要です"
 
-#: cps/web.py:3324 cps/web.py:3610
+#: cps/web.py:3305 cps/web.py:3605
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "場所 %s の作成を失敗しました (許可拒否)"
 
-#: cps/web.py:3329
+#: cps/web.py:3310
 #, python-format
 msgid "Failed to store file %s."
 msgstr "フアイル %s の保存を失敗しました"
 
-#: cps/web.py:3345
+#: cps/web.py:3326
 #, python-format
 msgid "File format %s added to %s"
 msgstr ""
 
-#: cps/web.py:3363
+#: cps/web.py:3344
 #, python-format
 msgid "Failed to create path for cover %s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:3370
+#: cps/web.py:3351
 #, python-format
 msgid "Failed to store cover-file %s."
 msgstr ""
 
-#: cps/web.py:3373
+#: cps/web.py:3354
 msgid "Cover-file is not a valid image file"
 msgstr ""
 
-#: cps/web.py:3386 cps/web.py:3390
+#: cps/web.py:3367 cps/web.py:3371
 msgid "unknown"
 msgstr "不明"
 
-#: cps/web.py:3412
+#: cps/web.py:3393
 msgid "Cover is not a jpg file, can't save"
 msgstr ""
 
-#: cps/web.py:3565
+#: cps/web.py:3560
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/web.py:3615
+#: cps/web.py:3610
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "ファイル %s の保存を失敗しました (許可拒否)"
 
-#: cps/web.py:3620
+#: cps/web.py:3615
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "ファイル %s の削除を失敗しました (許可拒否)"
 
-#: cps/web.py:3702
+#: cps/web.py:3697
 #, python-format
 msgid "File %s uploaded"
 msgstr ""
 
-#: cps/web.py:3732
+#: cps/web.py:3727
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/web.py:3742
+#: cps/web.py:3737
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/web.py:3746
+#: cps/web.py:3741
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
 
-#: cps/worker.py:215 cps/worker.py:385
+#: cps/worker.py:215 cps/worker.py:387
 msgid "Started"
 msgstr ""
 
@@ -674,19 +669,19 @@ msgstr ""
 msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "Kindlegen 失敗しました、エーラ %(error)s. メッセージ: %(message)s"
 
-#: cps/worker.py:316 cps/worker.py:375 cps/worker.py:437
+#: cps/worker.py:317 cps/worker.py:377 cps/worker.py:438
 msgid "Finished"
 msgstr ""
 
-#: cps/worker.py:342 cps/worker.py:361
+#: cps/worker.py:344 cps/worker.py:363
 msgid "Waiting"
 msgstr ""
 
-#: cps/worker.py:349
+#: cps/worker.py:351
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr ""
 
-#: cps/worker.py:463
+#: cps/worker.py:472
 msgid "Failed"
 msgstr ""
 
@@ -833,7 +828,7 @@ msgid "Ok"
 msgstr "はい"
 
 #: cps/templates/admin.html:116 cps/templates/admin.html:130
-#: cps/templates/book_edit.html:176 cps/templates/book_edit.html:198
+#: cps/templates/book_edit.html:178 cps/templates/book_edit.html:200
 #: cps/templates/config_edit.html:212 cps/templates/config_view_edit.html:164
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:75
 #: cps/templates/shelf.html:60 cps/templates/shelf_edit.html:19
@@ -869,7 +864,7 @@ msgstr "本を削除"
 msgid "Delete formats:"
 msgstr ""
 
-#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:197
+#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:199
 #: cps/templates/email_edit.html:73 cps/templates/email_edit.html:74
 msgid "Delete"
 msgstr "削除"
@@ -882,6 +877,10 @@ msgstr ""
 msgid "Convert from:"
 msgstr ""
 
+#: cps/templates/book_edit.html:36 cps/templates/book_edit.html:43
+msgid "select an option"
+msgstr ""
+
 #: cps/templates/book_edit.html:41
 msgid "Convert to:"
 msgstr ""
@@ -894,13 +893,13 @@ msgstr ""
 msgid "Book Title"
 msgstr "本のタイトル"
 
-#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:257
-#: cps/templates/book_edit.html:275 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:259
+#: cps/templates/book_edit.html:277 cps/templates/search_form.html:10
 msgid "Author"
 msgstr "著者"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:262
-#: cps/templates/book_edit.html:277 cps/templates/search_form.html:106
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:264
+#: cps/templates/book_edit.html:279 cps/templates/search_form.html:106
 msgid "Description"
 msgstr "詳細"
 
@@ -908,114 +907,115 @@ msgstr "詳細"
 msgid "Tags"
 msgstr "タグ"
 
-#: cps/templates/book_edit.html:76 cps/templates/layout.html:157
+#: cps/templates/book_edit.html:75 cps/templates/layout.html:157
 #: cps/templates/search_form.html:53
 msgid "Series"
 msgstr "叢書"
 
-#: cps/templates/book_edit.html:80
+#: cps/templates/book_edit.html:79
 msgid "Series id"
 msgstr "叢書番号"
 
-#: cps/templates/book_edit.html:84
+#: cps/templates/book_edit.html:83
 msgid "Rating"
 msgstr "評価"
 
-#: cps/templates/book_edit.html:88
+#: cps/templates/book_edit.html:87
 msgid ""
 "Cover URL (jpg, cover is downloaded and stored in database, field is "
 "afterwards empty again)"
 msgstr ""
 
-#: cps/templates/book_edit.html:92
+#: cps/templates/book_edit.html:91
 msgid "Upload Cover from local drive"
 msgstr ""
 
-#: cps/templates/book_edit.html:97 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:96 cps/templates/detail.html:131
 msgid "Publishing date"
 msgstr "発行日"
 
-#: cps/templates/book_edit.html:104 cps/templates/user_edit.html:33
+#: cps/templates/book_edit.html:103 cps/templates/book_edit.html:261
+#: cps/templates/book_edit.html:278 cps/templates/detail.html:126
+#: cps/templates/search_form.html:14
+msgid "Publisher"
+msgstr "出版社"
+
+#: cps/templates/book_edit.html:107 cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "言語"
 
-#: cps/templates/book_edit.html:115 cps/templates/search_form.html:117
+#: cps/templates/book_edit.html:117 cps/templates/search_form.html:117
 msgid "Yes"
 msgstr "はい"
 
-#: cps/templates/book_edit.html:116 cps/templates/search_form.html:118
+#: cps/templates/book_edit.html:118 cps/templates/search_form.html:118
 msgid "No"
 msgstr "いいえ"
 
-#: cps/templates/book_edit.html:162
+#: cps/templates/book_edit.html:164
 msgid "Upload format"
 msgstr "アップロード拡張子"
 
-#: cps/templates/book_edit.html:171
+#: cps/templates/book_edit.html:173
 msgid "view book after edit"
 msgstr "編集してから本を表示します"
 
-#: cps/templates/book_edit.html:174 cps/templates/book_edit.html:210
+#: cps/templates/book_edit.html:176 cps/templates/book_edit.html:212
 msgid "Get metadata"
 msgstr "メタデータを取得します"
 
-#: cps/templates/book_edit.html:175 cps/templates/config_edit.html:210
+#: cps/templates/book_edit.html:177 cps/templates/config_edit.html:210
 #: cps/templates/config_view_edit.html:163 cps/templates/login.html:20
 #: cps/templates/search_form.html:153 cps/templates/shelf_edit.html:17
 #: cps/templates/user_edit.html:151
 msgid "Submit"
 msgstr "提出"
 
-#: cps/templates/book_edit.html:189
+#: cps/templates/book_edit.html:191
 msgid "Are you really sure?"
 msgstr "宜しいですか?"
 
-#: cps/templates/book_edit.html:192
+#: cps/templates/book_edit.html:194
 msgid "Book will be deleted from Calibre database"
 msgstr "この本はCalibreデータベースから削除されます"
 
-#: cps/templates/book_edit.html:193
+#: cps/templates/book_edit.html:195
 msgid "and from hard disk"
 msgstr "とハードディクスから"
 
-#: cps/templates/book_edit.html:213
+#: cps/templates/book_edit.html:215
 msgid "Keyword"
 msgstr "キーワード"
 
-#: cps/templates/book_edit.html:214
+#: cps/templates/book_edit.html:216
 msgid " Search keyword "
 msgstr "キーワードを検索します"
 
-#: cps/templates/book_edit.html:216 cps/templates/layout.html:46
+#: cps/templates/book_edit.html:218 cps/templates/layout.html:46
 msgid "Go!"
 msgstr "行く"
 
-#: cps/templates/book_edit.html:220
+#: cps/templates/book_edit.html:222
 msgid "Click the cover to load metadata to the form"
 msgstr "メタデータをフォームに読み込むためにカバーをクリックしてください"
 
-#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:234 cps/templates/book_edit.html:274
 msgid "Loading..."
 msgstr "読み込み中..."
 
-#: cps/templates/book_edit.html:237 cps/templates/layout.html:221
+#: cps/templates/book_edit.html:239 cps/templates/layout.html:221
 msgid "Close"
 msgstr "閉じる"
 
-#: cps/templates/book_edit.html:259 cps/templates/book_edit.html:276
-#: cps/templates/detail.html:126 cps/templates/search_form.html:14
-msgid "Publisher"
-msgstr "出版社"
-
-#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
+#: cps/templates/book_edit.html:266 cps/templates/book_edit.html:280
 msgid "Source"
 msgstr "ソース"
 
-#: cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:275
 msgid "Search error!"
 msgstr "検索エーラ!"
 
-#: cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:276
 msgid "No Result(s) found! Please try aonther keyword."
 msgstr ""
 
@@ -1289,7 +1289,7 @@ msgstr "読む"
 msgid "Description:"
 msgstr "詳細:"
 
-#: cps/templates/detail.html:189 cps/templates/search.html:16
+#: cps/templates/detail.html:189 cps/templates/search.html:14
 msgid "Add to shelf"
 msgstr "書架に追加"
 
@@ -1674,15 +1674,15 @@ msgstr "とログイン"
 msgid "Once you do so, you will automatically get logged in on this device."
 msgstr "やってたら、自動的にこの端末にログインします"
 
-#: cps/templates/search.html:6
+#: cps/templates/search.html:5
 msgid "No Results for:"
 msgstr "結果なし:"
 
-#: cps/templates/search.html:7
+#: cps/templates/search.html:6
 msgid "Please try a different search"
 msgstr "他の検索を試してくだい"
 
-#: cps/templates/search.html:9
+#: cps/templates/search.html:8
 msgid "Results for:"
 msgstr "結果:"
 
diff --git a/cps/translations/km/LC_MESSAGES/messages.po b/cps/translations/km/LC_MESSAGES/messages.po
index 61f3ed98..62c319a6 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: 2018-08-31 14:58+0200\n"
+"POT-Creation-Date: 2018-09-03 19:09+0200\n"
 "PO-Revision-Date: 2018-08-27 17:06+0700\n"
 "Last-Translator: \n"
 "Language: km_KH\n"
@@ -28,202 +28,197 @@ msgstr "មិនបានតម្លើង"
 msgid "Excecution permissions missing"
 msgstr "ខ្វះសិទ្ធិប្រតិបត្តិការ"
 
-#: cps/helper.py:56
-#, python-format
-msgid "Epub format not found for book id: %(book)d"
-msgstr ""
-
-#: cps/helper.py:75
-#, python-format
-msgid "Convert: %s"
-msgstr "បម្លែង៖ %s"
-
-#: cps/helper.py:84
-msgid "Calibre-Web test e-mail"
-msgstr ""
-
-#: cps/helper.py:85
-msgid "Test e-mail"
-msgstr ""
-
-#: cps/helper.py:100
-msgid "Get Started with Calibre-Web"
-msgstr ""
-
-#: cps/helper.py:101
-#, python-format
-msgid "Registration e-mail for user: %s"
-msgstr ""
-
-#: cps/helper.py:124 cps/helper.py:134
-msgid "Could not find any formats suitable for sending by e-mail"
-msgstr ""
-
-#: cps/helper.py:136 cps/templates/detail.html:44 cps/worker.py:224
-msgid "Send to Kindle"
-msgstr "ផ្ញើទៅ Kindle"
-
-#: cps/helper.py:137
-#, python-format
-msgid "E-Mail: %s"
-msgstr "អ៊ីមែល៖ %s"
-
-#: cps/helper.py:139
-msgid "The requested file could not be read. Maybe wrong permissions?"
-msgstr "ឯកសារដែលបានស្នើសុំមិនអាចបើកបានទេ។ អាចនឹងខុសសិទ្ធិប្រើប្រាស់ទេដឹង?"
-
-#: cps/helper.py:147
+#: cps/helper.py:57
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:159
+#: cps/helper.py:69
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:171 cps/helper.py:178
+#: cps/helper.py:76
+#, python-format
+msgid "Convert: %s"
+msgstr "បម្លែង៖ %s"
+
+#: cps/helper.py:78
 #, python-format
 msgid "Convert to %(format)s: %(book)s"
 msgstr ""
 
-#: cps/helper.py:184
+#: cps/helper.py:85
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:280
+#: cps/helper.py:90
+msgid "Calibre-Web test e-mail"
+msgstr ""
+
+#: cps/helper.py:91
+msgid "Test e-mail"
+msgstr ""
+
+#: cps/helper.py:106
+msgid "Get Started with Calibre-Web"
+msgstr ""
+
+#: cps/helper.py:107
+#, python-format
+msgid "Registration e-mail for user: %s"
+msgstr ""
+
+#: cps/helper.py:130 cps/helper.py:140
+msgid "Could not find any formats suitable for sending by e-mail"
+msgstr ""
+
+#: cps/helper.py:142 cps/templates/detail.html:44 cps/worker.py:224
+msgid "Send to Kindle"
+msgstr "ផ្ញើទៅ Kindle"
+
+#: cps/helper.py:143
+#, python-format
+msgid "E-Mail: %s"
+msgstr "អ៊ីមែល៖ %s"
+
+#: cps/helper.py:145
+msgid "The requested file could not be read. Maybe wrong permissions?"
+msgstr "ឯកសារដែលបានស្នើសុំមិនអាចបើកបានទេ។ អាចនឹងខុសសិទ្ធិប្រើប្រាស់ទេដឹង?"
+
+#: cps/helper.py:240
 #, python-format
 msgid "Rename title from: \"%s\" to \"%s\" failed with error: %s"
 msgstr "ប្តូរចំណងជើងពី “%s” ទៅជា “%s” បរាជ័យដោយបញ្ហា: %s"
 
-#: cps/helper.py:289
+#: cps/helper.py:249
 #, python-format
 msgid "Rename author from: \"%s\" to \"%s\" failed with error: %s"
 msgstr "ប្តូរអ្នកនិពន្ធពី “%s” ទៅជា “%s” បរាជ័យដោយបញ្ហា: %s"
 
-#: cps/helper.py:312 cps/helper.py:321
+#: cps/helper.py:272 cps/helper.py:281
 #, python-format
 msgid "File %s not found on Google Drive"
 msgstr "ឯកសារ %s រកមិនឃើញក្នុង Google Drive"
 
-#: cps/helper.py:339
+#: cps/helper.py:299
 #, python-format
 msgid "Book path %s not found on Google Drive"
 msgstr "ទីតាំងសៀវភៅ %s រកមិនឃើញក្នុង Google Drive"
 
-#: cps/helper.py:584
+#: cps/helper.py:544
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:586
+#: cps/helper.py:546
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/web.py:1138
+#: cps/web.py:1120
 msgid "Requesting update package"
 msgstr "កំពុងស្នើសុំឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/web.py:1139
+#: cps/web.py:1121
 msgid "Downloading update package"
 msgstr "កំពុងទាញយកឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/web.py:1140
+#: cps/web.py:1122
 msgid "Unzipping update package"
 msgstr "កំពុងពន្លាឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/web.py:1141
+#: cps/web.py:1123
 msgid "Files are replaced"
 msgstr "ឯកសារត្រូវបានផ្លាស់ប្តូរ"
 
-#: cps/web.py:1142
+#: cps/web.py:1124
 msgid "Database connections are closed"
 msgstr "ទំនាក់ទំនងទៅមូលដ្ឋានទិន្នន័យត្រូវបានផ្តាច់"
 
-#: cps/web.py:1143
+#: cps/web.py:1125
 msgid "Server is stopped"
 msgstr "ម៉ាស៊ីន server ត្រូវបានបញ្ឈប់"
 
-#: cps/web.py:1144
+#: cps/web.py:1126
 msgid "Update finished, please press okay and reload page"
 msgstr "ការធ្វើបច្ចុប្បន្នភាពបានបញ្ចប់ សូមចុច okay រួចបើកទំព័រជាថ្មី"
 
-#: cps/web.py:1164
+#: cps/web.py:1146
 msgid "Recently Added Books"
 msgstr "សៀវភៅដែលទើបបានបន្ថែម"
 
-#: cps/web.py:1174
+#: cps/web.py:1156
 msgid "Newest Books"
 msgstr "សៀវភៅថ្មីៗជាងគេ"
 
-#: cps/web.py:1186
+#: cps/web.py:1168
 msgid "Oldest Books"
 msgstr "សៀវភៅចាស់ជាងគេ"
 
-#: cps/web.py:1198
+#: cps/web.py:1180
 msgid "Books (A-Z)"
 msgstr "សៀវភៅពី A ទៅ Z"
 
-#: cps/web.py:1209
+#: cps/web.py:1191
 msgid "Books (Z-A)"
 msgstr "សៀវភៅពី Z ទៅ A"
 
-#: cps/web.py:1238
+#: cps/web.py:1220
 msgid "Hot Books (most downloaded)"
 msgstr "សៀវភៅដែលត្រូវបានទាញយកច្រើនជាងគេ"
 
-#: cps/web.py:1251
+#: cps/web.py:1233
 msgid "Best rated books"
 msgstr "សៀវភៅដែលត្រូវបានវាយតម្លៃល្អជាងគេ"
 
-#: cps/templates/index.xml:36 cps/web.py:1263
+#: cps/templates/index.xml:36 cps/web.py:1245
 msgid "Random Books"
 msgstr "សៀវភៅចៃដន្យ"
 
-#: cps/web.py:1278
+#: cps/web.py:1260
 msgid "Author list"
 msgstr "បញ្ជីអ្នកនិពន្ធ"
 
-#: cps/web.py:1290 cps/web.py:1353 cps/web.py:1508 cps/web.py:2060
+#: cps/web.py:1272 cps/web.py:1335 cps/web.py:1490 cps/web.py:2042
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "មានបញ្ហាពេលបើកឯកសារ eBook ។ មិនមានឯកសារនេះ ឬមិនអាចបើកបាន៖"
 
-#: cps/templates/index.xml:73 cps/web.py:1337
+#: cps/templates/index.xml:73 cps/web.py:1319
 msgid "Series list"
 msgstr "បញ្ជីស៊េរី"
 
-#: cps/web.py:1351
+#: cps/web.py:1333
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "ស៊េរី៖ %(serie)s"
 
-#: cps/web.py:1378
+#: cps/web.py:1360
 msgid "Available languages"
 msgstr "ភាសាដែលមាន"
 
-#: cps/web.py:1395
+#: cps/web.py:1377
 #, python-format
 msgid "Language: %(name)s"
 msgstr "ភាសា៖ %(name)s"
 
-#: cps/templates/index.xml:66 cps/web.py:1406
+#: cps/templates/index.xml:66 cps/web.py:1388
 msgid "Category list"
 msgstr "បញ្ជីប្រភេទ"
 
-#: cps/web.py:1420
+#: cps/web.py:1402
 #, python-format
 msgid "Category: %(name)s"
 msgstr "ប្រភេទ៖ %(name)s"
 
-#: cps/templates/layout.html:71 cps/web.py:1559
+#: cps/templates/layout.html:71 cps/web.py:1541
 msgid "Tasks"
 msgstr "កិច្ចការនានា"
 
-#: cps/web.py:1589
+#: cps/web.py:1571
 msgid "Statistics"
 msgstr "ស្ថិតិ"
 
-#: cps/web.py:1694
+#: cps/web.py:1676
 msgid ""
 "Callback domain is not verified, please follow steps to verify domain in "
 "google developer console"
@@ -231,427 +226,427 @@ msgstr ""
 "Callback domain មិនទាន់បានផ្ទៀងផ្ទាត់ឲប្រើទេ "
 "សូមធ្វើតាមជំហានដើម្បីផ្ទៀងផ្ទាត់ domain នៅក្នុង Google Developer Console"
 
-#: cps/web.py:1770
+#: cps/web.py:1752
 msgid "Server restarted, please reload page"
 msgstr "ម៉ាស៊ីន server បានដំណើរការម្តងទៀត សូមបើកទំព័រជាថ្មី"
 
-#: cps/web.py:1773
+#: cps/web.py:1755
 msgid "Performing shutdown of server, please close window"
 msgstr "កំពុងបិទម៉ាស៊ីន server សូមបិទផ្ទាំងនេះ"
 
-#: cps/web.py:1791
+#: cps/web.py:1773
 msgid "Update done"
 msgstr "ការធ្វើបច្ចុប្បន្នភាពរួចរាល់"
 
-#: cps/web.py:1847 cps/web.py:1884
+#: cps/web.py:1833 cps/web.py:1870
 #, python-format
 msgid "%s: %s"
 msgstr "%s៖ %s"
 
-#: cps/web.py:1859
+#: cps/web.py:1845
 #, python-format
 msgid "Published after %s"
 msgstr "បានបោះពុម្ភក្រោយ %s"
 
-#: cps/web.py:1864
+#: cps/web.py:1850
 msgid "Published before "
 msgstr "បានបោះពុម្ភមុន %s "
 
-#: cps/web.py:1878
+#: cps/web.py:1864
 #, python-format
 msgid "Rating <= %s"
 msgstr "ការវាយតម្លៃ <= %s"
 
-#: cps/web.py:1880
+#: cps/web.py:1866
 #, python-format
 msgid "Rating >= %s"
 msgstr "ការវាយតម្លៃ >= %s"
 
-#: cps/web.py:1939 cps/web.py:1948
+#: cps/web.py:1925 cps/web.py:1934
 msgid "search"
 msgstr "ស្វែងរក"
 
 #: cps/templates/index.xml:44 cps/templates/index.xml:48
-#: cps/templates/layout.html:146 cps/web.py:2015
+#: cps/templates/layout.html:146 cps/web.py:2001
 msgid "Read Books"
 msgstr "សៀវភៅដែលបានអានរួច"
 
 #: cps/templates/index.xml:52 cps/templates/index.xml:56
-#: cps/templates/layout.html:148 cps/web.py:2018
+#: cps/templates/layout.html:148 cps/web.py:2004
 msgid "Unread Books"
 msgstr "សៀវភៅដែលមិនទាន់បានអាន"
 
-#: cps/web.py:2070 cps/web.py:2072 cps/web.py:2074 cps/web.py:2086
+#: cps/web.py:2052 cps/web.py:2054 cps/web.py:2056 cps/web.py:2068
 msgid "Read a Book"
 msgstr "អានសៀវភៅ"
 
-#: cps/web.py:2152 cps/web.py:3029
+#: cps/web.py:2134 cps/web.py:3011
 msgid "Please fill out all fields!"
 msgstr "សូមបំពេញចន្លោះទាំងអស់!"
 
-#: cps/web.py:2153 cps/web.py:2174 cps/web.py:2178 cps/web.py:2183
-#: cps/web.py:2185
+#: cps/web.py:2135 cps/web.py:2156 cps/web.py:2160 cps/web.py:2165
+#: cps/web.py:2167
 msgid "register"
 msgstr "ចុះឈ្មោះ"
 
-#: cps/web.py:2173 cps/web.py:3245
+#: cps/web.py:2155 cps/web.py:3227
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/web.py:2176
+#: cps/web.py:2158
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:2179
+#: cps/web.py:2161
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:2182
+#: cps/web.py:2164
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:2199 cps/web.py:2295
+#: cps/web.py:2181 cps/web.py:2277
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "ឥឡូវអ្នកបានចូលដោយមានឈ្មោះថា៖ ‘%(nickname)s’"
 
-#: cps/web.py:2204
+#: cps/web.py:2186
 msgid "Wrong Username or Password"
 msgstr "ខុសឈ្មោះអ្នកប្រើប្រាស់ ឬលេខសម្ងាត់"
 
-#: cps/web.py:2210 cps/web.py:2231
+#: cps/web.py:2192 cps/web.py:2213
 msgid "login"
 msgstr "ចូលប្រើ"
 
-#: cps/web.py:2243 cps/web.py:2274
+#: cps/web.py:2225 cps/web.py:2256
 msgid "Token not found"
 msgstr "រកមិនឃើញវត្ថុតាង"
 
-#: cps/web.py:2251 cps/web.py:2282
+#: cps/web.py:2233 cps/web.py:2264
 msgid "Token has expired"
 msgstr "វត្ថុតាងហួសពេលកំណត់"
 
-#: cps/web.py:2259
+#: cps/web.py:2241
 msgid "Success! Please return to your device"
 msgstr "ជោគជ័យ! សូមវិលមកឧបករណ៍អ្នកវិញ"
 
-#: cps/web.py:2309
+#: cps/web.py:2291
 msgid "Please configure the SMTP mail settings first..."
 msgstr "សូមកំណត់អ៊ីមែល SMTP ជាមុនសិន"
 
-#: cps/web.py:2313
+#: cps/web.py:2295
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "សៀវភៅបានចូលជួរសម្រាប់ផ្ញើទៅ %(kindlemail)s ដោយជោគជ័យ"
 
-#: cps/web.py:2317
+#: cps/web.py:2299
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "មានបញ្ហានៅពេលផ្ញើសៀវភៅនេះ៖ %(res)s"
 
-#: cps/web.py:2319 cps/web.py:3083
+#: cps/web.py:2301 cps/web.py:3065
 msgid "Please configure your kindle e-mail address first..."
 msgstr ""
 
-#: cps/web.py:2363
+#: cps/web.py:2345
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "សៀវភៅត្រូវបានបន្ថែមទៅធ្នើ៖ %(sname)s"
 
-#: cps/web.py:2374
+#: cps/web.py:2356
 msgid "Invalid shelf specified"
 msgstr ""
 
-#: cps/web.py:2379
+#: cps/web.py:2361
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %s"
 msgstr ""
 
-#: cps/web.py:2384
+#: cps/web.py:2366
 msgid "User is not allowed to edit public shelves"
 msgstr ""
 
-#: cps/web.py:2402
+#: cps/web.py:2384
 #, python-format
 msgid "Books are already part of the shelf: %s"
 msgstr ""
 
-#: cps/web.py:2416
+#: cps/web.py:2398
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2418
+#: cps/web.py:2400
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2455
+#: cps/web.py:2437
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "សៀវភៅត្រូវបានដកចេញពីធ្នើ៖ %(sname)s"
 
-#: cps/web.py:2461
+#: cps/web.py:2443
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr "សូមអភ័យទោស អ្នកមិនមានសិទ្ធិដកសៀវភៅចេញពីធ្នើនេះទេ៖ %(sname)s"
 
-#: cps/web.py:2481 cps/web.py:2505
+#: cps/web.py:2463 cps/web.py:2487
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr "មានធ្នើដែលមានឈ្មោះ ‘%(title)s’ រួចហើយ។"
 
-#: cps/web.py:2486
+#: cps/web.py:2468
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "ធ្នើឈ្មោះ %(title)s ត្រូវបានបង្កើត"
 
-#: cps/web.py:2488 cps/web.py:2516
+#: cps/web.py:2470 cps/web.py:2498
 msgid "There was an error"
 msgstr "មានបញ្ហា"
 
-#: cps/web.py:2489 cps/web.py:2491
+#: cps/web.py:2471 cps/web.py:2473
 msgid "create a shelf"
 msgstr "បង្កើតធ្នើ"
 
-#: cps/web.py:2514
+#: cps/web.py:2496
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "ធ្នើឈ្មោះ %(title)s ត្រូវបានប្តូរ"
 
-#: cps/web.py:2517 cps/web.py:2519
+#: cps/web.py:2499 cps/web.py:2501
 msgid "Edit a shelf"
 msgstr "កែប្រែធ្នើ"
 
-#: cps/web.py:2540
+#: cps/web.py:2522
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "បានបង្កើតធ្នើឈ្មោះ %(name)s ដោយជោគជ័យ"
 
-#: cps/web.py:2562
+#: cps/web.py:2544
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "ធ្នើ៖ ‘%(name)s’"
 
-#: cps/web.py:2565
+#: cps/web.py:2547
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "មានបញ្ហាពេលបើកធ្នើ។ ពុំមានធ្នើ ឬមិនអាចបើកបាន"
 
-#: cps/web.py:2596
+#: cps/web.py:2578
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "ប្តូរលំដាប់ធ្នើ៖ ‘%(name)s’"
 
-#: cps/web.py:2625 cps/web.py:3035
+#: cps/web.py:2607 cps/web.py:3017
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/web.py:2627 cps/web.py:2668 cps/web.py:2671
+#: cps/web.py:2609 cps/web.py:2650 cps/web.py:2653
 #, python-format
 msgid "%(name)s's profile"
 msgstr "ព័ត៌មានសង្ខេបរបស់ %(name)s"
 
-#: cps/web.py:2666
+#: cps/web.py:2648
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/web.py:2669
+#: cps/web.py:2651
 msgid "Profile updated"
 msgstr "ព័ត៌មានសង្ខេបបានកែប្រែ"
 
-#: cps/web.py:2681
+#: cps/web.py:2663
 msgid "Unknown"
 msgstr "មិនដឹង"
 
-#: cps/web.py:2695
+#: cps/web.py:2677
 msgid "Admin page"
 msgstr "ទំព័ររដ្ឋបាល"
 
-#: cps/web.py:2773 cps/web.py:2945
+#: cps/web.py:2755 cps/web.py:2927
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
-#: cps/templates/admin.html:91 cps/web.py:2786
+#: cps/templates/admin.html:91 cps/web.py:2768
 msgid "UI Configuration"
 msgstr "ការកំណត់ផ្ទាំងប្រើប្រាស់"
 
-#: cps/web.py:2803
+#: cps/web.py:2785
 msgid "Import of optional Google Drive requirements missing"
 msgstr "ខ្វះការនាំចូលតម្រូវការបន្ថែមរបស់ Google Drive"
 
-#: cps/web.py:2806
+#: cps/web.py:2788
 msgid "client_secrets.json is missing or not readable"
 msgstr "មិនមានឯកសារ client_secrets.json ឬមិនអាចបើកបាន"
 
-#: cps/web.py:2811 cps/web.py:2838
+#: cps/web.py:2793 cps/web.py:2820
 msgid "client_secrets.json is not configured for web application"
 msgstr "ឯកសារ client_secrets.json មិនទាន់បានកំណត់សម្រាប់កម្មវិធីវែប"
 
-#: cps/templates/admin.html:90 cps/web.py:2841 cps/web.py:2867 cps/web.py:2879
-#: cps/web.py:2921 cps/web.py:2936 cps/web.py:2953 cps/web.py:2960
-#: cps/web.py:2977
+#: cps/templates/admin.html:90 cps/web.py:2823 cps/web.py:2849 cps/web.py:2861
+#: cps/web.py:2903 cps/web.py:2918 cps/web.py:2935 cps/web.py:2942
+#: cps/web.py:2959
 msgid "Basic Configuration"
 msgstr "ការកំណត់សាមញ្ញ"
 
-#: cps/web.py:2864
+#: cps/web.py:2846
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr "ទីតាំងរបស់ keyfile មិនត្រឹមត្រូវ សូមបញ្ចូលទីតាំងត្រឹមត្រូវ"
 
-#: cps/web.py:2876
+#: cps/web.py:2858
 msgid "Certfile location is not valid, please enter correct path"
 msgstr "ទីតាំងរបស់ certfile មិនត្រឹមត្រូវ សូមបញ្ចូលទីតាំងត្រឹមត្រូវ"
 
-#: cps/web.py:2918
+#: cps/web.py:2900
 msgid "Logfile location is not valid, please enter correct path"
 msgstr "ទីតាំងរបស់ logfile មិនត្រឹមត្រូវ សូមបញ្ចូលទីតាំងត្រឹមត្រូវ"
 
-#: cps/web.py:2957
+#: cps/web.py:2939
 msgid "DB location is not valid, please enter correct path"
 msgstr "ទីតាំងរបស់ database មិនត្រឹមត្រូវ សូមបញ្ចូលទីតាំងត្រឹមត្រូវ"
 
-#: cps/templates/admin.html:31 cps/web.py:3031 cps/web.py:3037 cps/web.py:3053
+#: cps/templates/admin.html:31 cps/web.py:3013 cps/web.py:3019 cps/web.py:3035
 msgid "Add new user"
 msgstr "បន្ថែមអ្នកប្រើប្រាស់ថ្មី"
 
-#: cps/web.py:3043
+#: cps/web.py:3025
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "បានបង្កើតអ្នកប្រើប្រាស់ ‘%(user)s’"
 
-#: cps/web.py:3047
+#: cps/web.py:3029
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/web.py:3071 cps/web.py:3085
+#: cps/web.py:3053 cps/web.py:3067
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/web.py:3078
+#: cps/web.py:3060
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:3081
+#: cps/web.py:3063
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/web.py:3086
+#: cps/web.py:3068
 msgid "Edit e-mail server settings"
 msgstr ""
 
-#: cps/web.py:3111
+#: cps/web.py:3093
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "អ្នកប្រើប្រាស់ ‘%(nick)s’ ត្រូវបានលុប"
 
-#: cps/web.py:3220
+#: cps/web.py:3202
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "អ្នកប្រើប្រាស់ ‘%(nick)s’ ត្រូវបានកែប្រែ"
 
-#: cps/web.py:3223
+#: cps/web.py:3205
 msgid "An unknown error occured."
 msgstr "បញ្ហាដែលមិនដឹងបានកើតឡើង។"
 
-#: cps/web.py:3225
+#: cps/web.py:3207
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "កែប្រែអ្នកប្រើប្រាស់ %(nick)s"
 
-#: cps/web.py:3242
+#: cps/web.py:3224
 #, python-format
 msgid "Password for user %s reset"
 msgstr ""
 
-#: cps/web.py:3262
+#: cps/web.py:3244
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "មានបញ្ហាពេលបើកឯកសារ eBook ។ ពុំមានឯកសារ ឬឯកសារនេះមិនអាចបើកបាន"
 
-#: cps/web.py:3294 cps/web.py:3556 cps/web.py:3561 cps/web.py:3716
+#: cps/web.py:3275 cps/web.py:3551 cps/web.py:3556 cps/web.py:3711
 msgid "edit metadata"
 msgstr "កែប្រែទិន្នន័យមេតា"
 
-#: cps/web.py:3308 cps/web.py:3586
+#: cps/web.py:3289 cps/web.py:3581
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr "ឯកសារប្រភេទ “%s” មិនត្រូវបានអនុញ្ញាតឲអាប់ឡូដទៅម៉ាស៊ីន server នេះទេ"
 
-#: cps/web.py:3312 cps/web.py:3590
+#: cps/web.py:3293 cps/web.py:3585
 msgid "File to be uploaded must have an extension"
 msgstr "ឯកសារដែលត្រូវអាប់ឡូដត្រូវមានកន្ទុយឯកសារ"
 
-#: cps/web.py:3324 cps/web.py:3610
+#: cps/web.py:3305 cps/web.py:3605
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "មិនអាចបង្កើតទីតាំង %s (ពុំមានសិទ្ធិ)។"
 
-#: cps/web.py:3329
+#: cps/web.py:3310
 #, python-format
 msgid "Failed to store file %s."
 msgstr "មិនអាចរក្សាទុកឯកសារ %s ។"
 
-#: cps/web.py:3345
+#: cps/web.py:3326
 #, python-format
 msgid "File format %s added to %s"
 msgstr "ឯកសារទម្រង់ %s ត្រូវបានបន្ថែមទៅ %s"
 
-#: cps/web.py:3363
+#: cps/web.py:3344
 #, python-format
 msgid "Failed to create path for cover %s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:3370
+#: cps/web.py:3351
 #, python-format
 msgid "Failed to store cover-file %s."
 msgstr ""
 
-#: cps/web.py:3373
+#: cps/web.py:3354
 msgid "Cover-file is not a valid image file"
 msgstr ""
 
-#: cps/web.py:3386 cps/web.py:3390
+#: cps/web.py:3367 cps/web.py:3371
 msgid "unknown"
 msgstr "មិនដឹង"
 
-#: cps/web.py:3412
+#: cps/web.py:3393
 msgid "Cover is not a jpg file, can't save"
 msgstr "គម្របមិនមែនជាឯកសារ JPG មិនអាចរក្សាទុក"
 
-#: cps/web.py:3565
+#: cps/web.py:3560
 msgid "Error editing book, please check logfile for details"
 msgstr "មានបញ្ហាពេលកែប្រែសៀវភៅ សូមពិនិត្យមើល logfile សម្រាប់ព័ត៌មានបន្ថែម"
 
-#: cps/web.py:3615
+#: cps/web.py:3610
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "មិនអាចរក្សាទុកឯកសារ %s (មិនមានសិទ្ធិ)។"
 
-#: cps/web.py:3620
+#: cps/web.py:3615
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "មិនអាចលុបឯកសារ %s (មិនមានសិទ្ធិ)។"
 
-#: cps/web.py:3702
+#: cps/web.py:3697
 #, python-format
 msgid "File %s uploaded"
 msgstr "ឯកសារ %s ត្រូវបានអាប់ឡូដ"
 
-#: cps/web.py:3732
+#: cps/web.py:3727
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/web.py:3742
+#: cps/web.py:3737
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/web.py:3746
+#: cps/web.py:3741
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
 
-#: cps/worker.py:215 cps/worker.py:385
+#: cps/worker.py:215 cps/worker.py:387
 msgid "Started"
 msgstr "បានចាប់ផ្តើម"
 
@@ -675,19 +670,19 @@ msgstr "Ebook-converter បានបរាជ័យ៖ %s"
 msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "Kindlegen បានបរាជ័យដោយមានកំហុស %(error)s. សារ៖ %(message)s"
 
-#: cps/worker.py:316 cps/worker.py:375 cps/worker.py:437
+#: cps/worker.py:317 cps/worker.py:377 cps/worker.py:438
 msgid "Finished"
 msgstr "បានបញ្ចប់"
 
-#: cps/worker.py:342 cps/worker.py:361
+#: cps/worker.py:344 cps/worker.py:363
 msgid "Waiting"
 msgstr "កំពុងរង់ចាំ"
 
-#: cps/worker.py:349
+#: cps/worker.py:351
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr ""
 
-#: cps/worker.py:463
+#: cps/worker.py:472
 msgid "Failed"
 msgstr "បានបរាជ័យ"
 
@@ -834,7 +829,7 @@ msgid "Ok"
 msgstr "បាទ/ចាស"
 
 #: cps/templates/admin.html:116 cps/templates/admin.html:130
-#: cps/templates/book_edit.html:176 cps/templates/book_edit.html:198
+#: cps/templates/book_edit.html:178 cps/templates/book_edit.html:200
 #: cps/templates/config_edit.html:212 cps/templates/config_view_edit.html:164
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:75
 #: cps/templates/shelf.html:60 cps/templates/shelf_edit.html:19
@@ -870,7 +865,7 @@ msgstr "លុបសៀវភៅ"
 msgid "Delete formats:"
 msgstr "លុបឯកសារទម្រង់៖"
 
-#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:197
+#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:199
 #: cps/templates/email_edit.html:73 cps/templates/email_edit.html:74
 msgid "Delete"
 msgstr "លុប"
@@ -883,6 +878,10 @@ msgstr ""
 msgid "Convert from:"
 msgstr ""
 
+#: cps/templates/book_edit.html:36 cps/templates/book_edit.html:43
+msgid "select an option"
+msgstr ""
+
 #: cps/templates/book_edit.html:41
 msgid "Convert to:"
 msgstr ""
@@ -895,13 +894,13 @@ msgstr ""
 msgid "Book Title"
 msgstr "ចំណងជើងសៀវភៅ"
 
-#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:257
-#: cps/templates/book_edit.html:275 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:259
+#: cps/templates/book_edit.html:277 cps/templates/search_form.html:10
 msgid "Author"
 msgstr "អ្នកនិពន្ធ"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:262
-#: cps/templates/book_edit.html:277 cps/templates/search_form.html:106
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:264
+#: cps/templates/book_edit.html:279 cps/templates/search_form.html:106
 msgid "Description"
 msgstr "ពិពណ៌នា"
 
@@ -909,20 +908,20 @@ msgstr "ពិពណ៌នា"
 msgid "Tags"
 msgstr "Tag"
 
-#: cps/templates/book_edit.html:76 cps/templates/layout.html:157
+#: cps/templates/book_edit.html:75 cps/templates/layout.html:157
 #: cps/templates/search_form.html:53
 msgid "Series"
 msgstr "ស៊េរី"
 
-#: cps/templates/book_edit.html:80
+#: cps/templates/book_edit.html:79
 msgid "Series id"
 msgstr "លេខសម្គាល់ស៊េរី"
 
-#: cps/templates/book_edit.html:84
+#: cps/templates/book_edit.html:83
 msgid "Rating"
 msgstr "ការវាយតម្លៃ"
 
-#: cps/templates/book_edit.html:88
+#: cps/templates/book_edit.html:87
 msgid ""
 "Cover URL (jpg, cover is downloaded and stored in database, field is "
 "afterwards empty again)"
@@ -930,95 +929,96 @@ msgstr ""
 "URL របស់ក្របមុខ (ឯកសារ JPG ក្របមុខត្រូវបានទាញយក និងរក្សាទុកក្នុង database"
 " ក្រោយមកចន្លោះនេះទទេម្តងទៀត)"
 
-#: cps/templates/book_edit.html:92
+#: cps/templates/book_edit.html:91
 msgid "Upload Cover from local drive"
 msgstr ""
 
-#: cps/templates/book_edit.html:97 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:96 cps/templates/detail.html:131
 msgid "Publishing date"
 msgstr "ថ្ងៃបោះពុម្ភ"
 
-#: cps/templates/book_edit.html:104 cps/templates/user_edit.html:33
+#: cps/templates/book_edit.html:103 cps/templates/book_edit.html:261
+#: cps/templates/book_edit.html:278 cps/templates/detail.html:126
+#: cps/templates/search_form.html:14
+msgid "Publisher"
+msgstr "អ្នកបោះពុម្ភ"
+
+#: cps/templates/book_edit.html:107 cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "ភាសា"
 
-#: cps/templates/book_edit.html:115 cps/templates/search_form.html:117
+#: cps/templates/book_edit.html:117 cps/templates/search_form.html:117
 msgid "Yes"
 msgstr "បាទ/ចាស"
 
-#: cps/templates/book_edit.html:116 cps/templates/search_form.html:118
+#: cps/templates/book_edit.html:118 cps/templates/search_form.html:118
 msgid "No"
 msgstr "ទេ"
 
-#: cps/templates/book_edit.html:162
+#: cps/templates/book_edit.html:164
 msgid "Upload format"
 msgstr "ទម្រង់អាប់ឡូដ"
 
-#: cps/templates/book_edit.html:171
+#: cps/templates/book_edit.html:173
 msgid "view book after edit"
 msgstr "មើលសៀវភៅក្រោយពីកែប្រែ"
 
-#: cps/templates/book_edit.html:174 cps/templates/book_edit.html:210
+#: cps/templates/book_edit.html:176 cps/templates/book_edit.html:212
 msgid "Get metadata"
 msgstr "មើលទិន្នន័យមេតា"
 
-#: cps/templates/book_edit.html:175 cps/templates/config_edit.html:210
+#: cps/templates/book_edit.html:177 cps/templates/config_edit.html:210
 #: cps/templates/config_view_edit.html:163 cps/templates/login.html:20
 #: cps/templates/search_form.html:153 cps/templates/shelf_edit.html:17
 #: cps/templates/user_edit.html:151
 msgid "Submit"
 msgstr "បញ្ចូល"
 
-#: cps/templates/book_edit.html:189
+#: cps/templates/book_edit.html:191
 msgid "Are you really sure?"
 msgstr ""
 
-#: cps/templates/book_edit.html:192
+#: cps/templates/book_edit.html:194
 msgid "Book will be deleted from Calibre database"
 msgstr "សៀវភៅនឹងត្រូវលុបចេញពី database របស់ Calibre"
 
-#: cps/templates/book_edit.html:193
+#: cps/templates/book_edit.html:195
 msgid "and from hard disk"
 msgstr "និងពីថាសរឹង"
 
-#: cps/templates/book_edit.html:213
+#: cps/templates/book_edit.html:215
 msgid "Keyword"
 msgstr "ពាក្យគន្លឹះ"
 
-#: cps/templates/book_edit.html:214
+#: cps/templates/book_edit.html:216
 msgid " Search keyword "
 msgstr "ស្វែងរកពាក្យគន្លឹះ"
 
-#: cps/templates/book_edit.html:216 cps/templates/layout.html:46
+#: cps/templates/book_edit.html:218 cps/templates/layout.html:46
 msgid "Go!"
 msgstr "ទៅ!"
 
-#: cps/templates/book_edit.html:220
+#: cps/templates/book_edit.html:222
 msgid "Click the cover to load metadata to the form"
 msgstr "ចុចលើគម្របដើម្បីបញ្ចូលទិន្នន័យមេតាទៅក្នុង form"
 
-#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:234 cps/templates/book_edit.html:274
 msgid "Loading..."
 msgstr "កំពុងដំណើរការ..."
 
-#: cps/templates/book_edit.html:237 cps/templates/layout.html:221
+#: cps/templates/book_edit.html:239 cps/templates/layout.html:221
 msgid "Close"
 msgstr "បិទ"
 
-#: cps/templates/book_edit.html:259 cps/templates/book_edit.html:276
-#: cps/templates/detail.html:126 cps/templates/search_form.html:14
-msgid "Publisher"
-msgstr "អ្នកបោះពុម្ភ"
-
-#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
+#: cps/templates/book_edit.html:266 cps/templates/book_edit.html:280
 msgid "Source"
 msgstr "ប្រភព"
 
-#: cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:275
 msgid "Search error!"
 msgstr "ការស្វែងរកមានកំហុស!"
 
-#: cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:276
 msgid "No Result(s) found! Please try aonther keyword."
 msgstr ""
 
@@ -1292,7 +1292,7 @@ msgstr "អាន"
 msgid "Description:"
 msgstr "ពិពណ៌នា"
 
-#: cps/templates/detail.html:189 cps/templates/search.html:16
+#: cps/templates/detail.html:189 cps/templates/search.html:14
 msgid "Add to shelf"
 msgstr "បន្ថែមទៅធ្នើ"
 
@@ -1679,15 +1679,15 @@ msgstr "រួចចូលប្រើប្រាស់"
 msgid "Once you do so, you will automatically get logged in on this device."
 msgstr "ក្រោយពីនេះ អ្នកនឹងត្រូវបានឲចូលប្រើប្រាស់ក្នុងឧបករណ៍នេះដោយស្វ័យប្រវត្តិ។"
 
-#: cps/templates/search.html:6
+#: cps/templates/search.html:5
 msgid "No Results for:"
 msgstr "គ្មានលទ្ធផលសម្រាប់៖"
 
-#: cps/templates/search.html:7
+#: cps/templates/search.html:6
 msgid "Please try a different search"
 msgstr "សូមសាកល្បងស្វែងរកផ្សេងទៀត"
 
-#: cps/templates/search.html:9
+#: cps/templates/search.html:8
 msgid "Results for:"
 msgstr "លទ្ធផលសម្រាប់៖"
 
diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po
index 3a080b0f..6c7370db 100644
--- a/cps/translations/nl/LC_MESSAGES/messages.po
+++ b/cps/translations/nl/LC_MESSAGES/messages.po
@@ -22,7 +22,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: 2018-08-31 14:58+0200\n"
+"POT-Creation-Date: 2018-09-03 19:09+0200\n"
 "PO-Revision-Date: 2017-06-21 20:15+0200\n"
 "Last-Translator: \n"
 "Language: nl\n"
@@ -42,632 +42,627 @@ msgstr "niet geïnstalleerd"
 msgid "Excecution permissions missing"
 msgstr "Rechten om uit te voeren ontbreken"
 
-#: cps/helper.py:56
-#, python-format
-msgid "Epub format not found for book id: %(book)d"
-msgstr ""
-
-#: cps/helper.py:75
-#, python-format
-msgid "Convert: %s"
-msgstr ""
-
-#: cps/helper.py:84
-msgid "Calibre-Web test e-mail"
-msgstr ""
-
-#: cps/helper.py:85
-msgid "Test e-mail"
-msgstr ""
-
-#: cps/helper.py:100
-msgid "Get Started with Calibre-Web"
-msgstr ""
-
-#: cps/helper.py:101
-#, python-format
-msgid "Registration e-mail for user: %s"
-msgstr ""
-
-#: cps/helper.py:124 cps/helper.py:134
-msgid "Could not find any formats suitable for sending by e-mail"
-msgstr ""
-
-#: cps/helper.py:136 cps/templates/detail.html:44 cps/worker.py:224
-msgid "Send to Kindle"
-msgstr "Stuur naar Kindle:"
-
-#: cps/helper.py:137
-#, python-format
-msgid "E-Mail: %s"
-msgstr ""
-
-#: cps/helper.py:139
-msgid "The requested file could not be read. Maybe wrong permissions?"
-msgstr ""
-
-#: cps/helper.py:147
+#: cps/helper.py:57
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:159
+#: cps/helper.py:69
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:171 cps/helper.py:178
+#: cps/helper.py:76
+#, python-format
+msgid "Convert: %s"
+msgstr ""
+
+#: cps/helper.py:78
 #, python-format
 msgid "Convert to %(format)s: %(book)s"
 msgstr ""
 
-#: cps/helper.py:184
+#: cps/helper.py:85
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:280
+#: cps/helper.py:90
+msgid "Calibre-Web test e-mail"
+msgstr ""
+
+#: cps/helper.py:91
+msgid "Test e-mail"
+msgstr ""
+
+#: cps/helper.py:106
+msgid "Get Started with Calibre-Web"
+msgstr ""
+
+#: cps/helper.py:107
+#, python-format
+msgid "Registration e-mail for user: %s"
+msgstr ""
+
+#: cps/helper.py:130 cps/helper.py:140
+msgid "Could not find any formats suitable for sending by e-mail"
+msgstr ""
+
+#: cps/helper.py:142 cps/templates/detail.html:44 cps/worker.py:224
+msgid "Send to Kindle"
+msgstr "Stuur naar Kindle:"
+
+#: cps/helper.py:143
+#, python-format
+msgid "E-Mail: %s"
+msgstr ""
+
+#: cps/helper.py:145
+msgid "The requested file could not be read. Maybe wrong permissions?"
+msgstr ""
+
+#: cps/helper.py:240
 #, python-format
 msgid "Rename title from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:289
+#: cps/helper.py:249
 #, python-format
 msgid "Rename author from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:312 cps/helper.py:321
+#: cps/helper.py:272 cps/helper.py:281
 #, python-format
 msgid "File %s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:339
+#: cps/helper.py:299
 #, python-format
 msgid "Book path %s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:584
+#: cps/helper.py:544
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:586
+#: cps/helper.py:546
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/web.py:1138
+#: cps/web.py:1120
 msgid "Requesting update package"
 msgstr "Update pakket wordt aangevraagd"
 
-#: cps/web.py:1139
+#: cps/web.py:1121
 msgid "Downloading update package"
 msgstr "Update pakket wordt gedownload"
 
-#: cps/web.py:1140
+#: cps/web.py:1122
 msgid "Unzipping update package"
 msgstr "Update pakket wordt uitgepakt"
 
-#: cps/web.py:1141
+#: cps/web.py:1123
 msgid "Files are replaced"
 msgstr "Bestanden zijn vervangen"
 
-#: cps/web.py:1142
+#: cps/web.py:1124
 msgid "Database connections are closed"
 msgstr "Database verbindingen zijn gesloten"
 
-#: cps/web.py:1143
+#: cps/web.py:1125
 msgid "Server is stopped"
 msgstr "Server is gestopt"
 
-#: cps/web.py:1144
+#: cps/web.py:1126
 msgid "Update finished, please press okay and reload page"
 msgstr "Update voltooid, klik op ok en herlaad de pagina"
 
-#: cps/web.py:1164
+#: cps/web.py:1146
 msgid "Recently Added Books"
 msgstr "Recent toegevoegde boeken"
 
-#: cps/web.py:1174
+#: cps/web.py:1156
 msgid "Newest Books"
 msgstr "Nieuwste boeken"
 
-#: cps/web.py:1186
+#: cps/web.py:1168
 msgid "Oldest Books"
 msgstr "Oudste boeken"
 
-#: cps/web.py:1198
+#: cps/web.py:1180
 msgid "Books (A-Z)"
 msgstr "Boeken (A-Z)"
 
-#: cps/web.py:1209
+#: cps/web.py:1191
 msgid "Books (Z-A)"
 msgstr "Boeken (A-Z)"
 
-#: cps/web.py:1238
+#: cps/web.py:1220
 msgid "Hot Books (most downloaded)"
 msgstr "Populaire boeken (meeste downloads)"
 
-#: cps/web.py:1251
+#: cps/web.py:1233
 msgid "Best rated books"
 msgstr "Best beoordeelde boeken"
 
-#: cps/templates/index.xml:36 cps/web.py:1263
+#: cps/templates/index.xml:36 cps/web.py:1245
 msgid "Random Books"
 msgstr "Willekeurige boeken"
 
-#: cps/web.py:1278
+#: cps/web.py:1260
 msgid "Author list"
 msgstr "Auteur lijst"
 
-#: cps/web.py:1290 cps/web.py:1353 cps/web.py:1508 cps/web.py:2060
+#: cps/web.py:1272 cps/web.py:1335 cps/web.py:1490 cps/web.py:2042
 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/templates/index.xml:73 cps/web.py:1337
+#: cps/templates/index.xml:73 cps/web.py:1319
 msgid "Series list"
 msgstr "Serie lijst"
 
-#: cps/web.py:1351
+#: cps/web.py:1333
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie: %(serie)s"
 
-#: cps/web.py:1378
+#: cps/web.py:1360
 msgid "Available languages"
 msgstr "Beschikbare talen"
 
-#: cps/web.py:1395
+#: cps/web.py:1377
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Taal: %(name)s"
 
-#: cps/templates/index.xml:66 cps/web.py:1406
+#: cps/templates/index.xml:66 cps/web.py:1388
 msgid "Category list"
 msgstr "Categorie lijst"
 
-#: cps/web.py:1420
+#: cps/web.py:1402
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categorie: %(name)s"
 
-#: cps/templates/layout.html:71 cps/web.py:1559
+#: cps/templates/layout.html:71 cps/web.py:1541
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1589
+#: cps/web.py:1571
 msgid "Statistics"
 msgstr "Statistieken"
 
-#: cps/web.py:1694
+#: cps/web.py:1676
 msgid ""
 "Callback domain is not verified, please follow steps to verify domain in "
 "google developer console"
 msgstr ""
 
-#: cps/web.py:1770
+#: cps/web.py:1752
 msgid "Server restarted, please reload page"
 msgstr "Server herstart, gelieve de pagina herladen"
 
-#: cps/web.py:1773
+#: cps/web.py:1755
 msgid "Performing shutdown of server, please close window"
 msgstr "Bezig met het stoppen van de server, gelieve venster te sluiten"
 
-#: cps/web.py:1791
+#: cps/web.py:1773
 msgid "Update done"
 msgstr "Update voltooid"
 
-#: cps/web.py:1847 cps/web.py:1884
+#: cps/web.py:1833 cps/web.py:1870
 #, python-format
 msgid "%s: %s"
 msgstr ""
 
-#: cps/web.py:1859
+#: cps/web.py:1845
 #, python-format
 msgid "Published after %s"
 msgstr ""
 
-#: cps/web.py:1864
+#: cps/web.py:1850
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1878
+#: cps/web.py:1864
 #, python-format
 msgid "Rating <= %s"
 msgstr ""
 
-#: cps/web.py:1880
+#: cps/web.py:1866
 #, python-format
 msgid "Rating >= %s"
 msgstr ""
 
-#: cps/web.py:1939 cps/web.py:1948
+#: cps/web.py:1925 cps/web.py:1934
 msgid "search"
 msgstr "zoek"
 
 #: cps/templates/index.xml:44 cps/templates/index.xml:48
-#: cps/templates/layout.html:146 cps/web.py:2015
+#: cps/templates/layout.html:146 cps/web.py:2001
 msgid "Read Books"
 msgstr "Gelezen Boeken"
 
 #: cps/templates/index.xml:52 cps/templates/index.xml:56
-#: cps/templates/layout.html:148 cps/web.py:2018
+#: cps/templates/layout.html:148 cps/web.py:2004
 msgid "Unread Books"
 msgstr "Ongelezen Boeken"
 
-#: cps/web.py:2070 cps/web.py:2072 cps/web.py:2074 cps/web.py:2086
+#: cps/web.py:2052 cps/web.py:2054 cps/web.py:2056 cps/web.py:2068
 msgid "Read a Book"
 msgstr "Lees een boek"
 
-#: cps/web.py:2152 cps/web.py:3029
+#: cps/web.py:2134 cps/web.py:3011
 msgid "Please fill out all fields!"
 msgstr "Gelieve alle velden in te vullen!"
 
-#: cps/web.py:2153 cps/web.py:2174 cps/web.py:2178 cps/web.py:2183
-#: cps/web.py:2185
+#: cps/web.py:2135 cps/web.py:2156 cps/web.py:2160 cps/web.py:2165
+#: cps/web.py:2167
 msgid "register"
 msgstr "registreer"
 
-#: cps/web.py:2173 cps/web.py:3245
+#: cps/web.py:2155 cps/web.py:3227
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/web.py:2176
+#: cps/web.py:2158
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:2179
+#: cps/web.py:2161
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:2182
+#: cps/web.py:2164
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:2199 cps/web.py:2295
+#: cps/web.py:2181 cps/web.py:2277
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "je bent nu ingelogd als: '%(nickname)s'"
 
-#: cps/web.py:2204
+#: cps/web.py:2186
 msgid "Wrong Username or Password"
 msgstr "Verkeerde gebruikersnaam of Wachtwoord"
 
-#: cps/web.py:2210 cps/web.py:2231
+#: cps/web.py:2192 cps/web.py:2213
 msgid "login"
 msgstr "login"
 
-#: cps/web.py:2243 cps/web.py:2274
+#: cps/web.py:2225 cps/web.py:2256
 msgid "Token not found"
 msgstr "Token niet gevonden"
 
-#: cps/web.py:2251 cps/web.py:2282
+#: cps/web.py:2233 cps/web.py:2264
 msgid "Token has expired"
 msgstr "Token is verlopen"
 
-#: cps/web.py:2259
+#: cps/web.py:2241
 msgid "Success! Please return to your device"
 msgstr "Gelukt! Ga terug naar je apparaat"
 
-#: cps/web.py:2309
+#: cps/web.py:2291
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Gelieve de SMTP mail instellingen eerst te configureren..."
 
-#: cps/web.py:2313
+#: cps/web.py:2295
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:2317
+#: cps/web.py:2299
 #, 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:2319 cps/web.py:3083
+#: cps/web.py:2301 cps/web.py:3065
 msgid "Please configure your kindle e-mail address first..."
 msgstr ""
 
-#: cps/web.py:2363
+#: cps/web.py:2345
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "Boek werd toegevoegd aan boekenplank: %(sname)s"
 
-#: cps/web.py:2374
+#: cps/web.py:2356
 msgid "Invalid shelf specified"
 msgstr ""
 
-#: cps/web.py:2379
+#: cps/web.py:2361
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %s"
 msgstr ""
 
-#: cps/web.py:2384
+#: cps/web.py:2366
 msgid "User is not allowed to edit public shelves"
 msgstr ""
 
-#: cps/web.py:2402
+#: cps/web.py:2384
 #, python-format
 msgid "Books are already part of the shelf: %s"
 msgstr ""
 
-#: cps/web.py:2416
+#: cps/web.py:2398
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2418
+#: cps/web.py:2400
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2455
+#: cps/web.py:2437
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Boek werd verwijderd van boekenplank: %(sname)s"
 
-#: cps/web.py:2461
+#: cps/web.py:2443
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2481 cps/web.py:2505
+#: cps/web.py:2463 cps/web.py:2487
 #, 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:2486
+#: cps/web.py:2468
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Boekenplank %(title)s aangemaakt"
 
-#: cps/web.py:2488 cps/web.py:2516
+#: cps/web.py:2470 cps/web.py:2498
 msgid "There was an error"
 msgstr "Er deed zich een fout voor"
 
-#: cps/web.py:2489 cps/web.py:2491
+#: cps/web.py:2471 cps/web.py:2473
 msgid "create a shelf"
 msgstr "maak een boekenplank"
 
-#: cps/web.py:2514
+#: cps/web.py:2496
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Boekenplank %(title)s gewijzigd"
 
-#: cps/web.py:2517 cps/web.py:2519
+#: cps/web.py:2499 cps/web.py:2501
 msgid "Edit a shelf"
 msgstr "Bewerk een boekenplank"
 
-#: cps/web.py:2540
+#: cps/web.py:2522
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "Boekenplank %(name)s succesvol gewist"
 
-#: cps/web.py:2562
+#: cps/web.py:2544
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Boekenplank: '%(name)s'"
 
-#: cps/web.py:2565
+#: cps/web.py:2547
 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:2596
+#: cps/web.py:2578
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Verander volgorde van Boekenplank: '%(name)s'"
 
-#: cps/web.py:2625 cps/web.py:3035
+#: cps/web.py:2607 cps/web.py:3017
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/web.py:2627 cps/web.py:2668 cps/web.py:2671
+#: cps/web.py:2609 cps/web.py:2650 cps/web.py:2653
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's profiel"
 
-#: cps/web.py:2666
+#: cps/web.py:2648
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/web.py:2669
+#: cps/web.py:2651
 msgid "Profile updated"
 msgstr "Profiel aangepast"
 
-#: cps/web.py:2681
+#: cps/web.py:2663
 msgid "Unknown"
 msgstr ""
 
-#: cps/web.py:2695
+#: cps/web.py:2677
 msgid "Admin page"
 msgstr "Administratie pagina"
 
-#: cps/web.py:2773 cps/web.py:2945
+#: cps/web.py:2755 cps/web.py:2927
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web configuratie aangepast"
 
-#: cps/templates/admin.html:91 cps/web.py:2786
+#: cps/templates/admin.html:91 cps/web.py:2768
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/web.py:2803
+#: cps/web.py:2785
 msgid "Import of optional Google Drive requirements missing"
 msgstr ""
 
-#: cps/web.py:2806
+#: cps/web.py:2788
 msgid "client_secrets.json is missing or not readable"
 msgstr ""
 
-#: cps/web.py:2811 cps/web.py:2838
+#: cps/web.py:2793 cps/web.py:2820
 msgid "client_secrets.json is not configured for web application"
 msgstr ""
 
-#: cps/templates/admin.html:90 cps/web.py:2841 cps/web.py:2867 cps/web.py:2879
-#: cps/web.py:2921 cps/web.py:2936 cps/web.py:2953 cps/web.py:2960
-#: cps/web.py:2977
+#: cps/templates/admin.html:90 cps/web.py:2823 cps/web.py:2849 cps/web.py:2861
+#: cps/web.py:2903 cps/web.py:2918 cps/web.py:2935 cps/web.py:2942
+#: cps/web.py:2959
 msgid "Basic Configuration"
 msgstr "Basis configuratie"
 
-#: cps/web.py:2864
+#: cps/web.py:2846
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2876
+#: cps/web.py:2858
 msgid "Certfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2918
+#: cps/web.py:2900
 msgid "Logfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2957
+#: cps/web.py:2939
 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:31 cps/web.py:3031 cps/web.py:3037 cps/web.py:3053
+#: cps/templates/admin.html:31 cps/web.py:3013 cps/web.py:3019 cps/web.py:3035
 msgid "Add new user"
 msgstr "Voeg nieuwe gebruiker toe"
 
-#: cps/web.py:3043
+#: cps/web.py:3025
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Gebruiker '%(user)s' aangemaakt"
 
-#: cps/web.py:3047
+#: cps/web.py:3029
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/web.py:3071 cps/web.py:3085
+#: cps/web.py:3053 cps/web.py:3067
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/web.py:3078
+#: cps/web.py:3060
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:3081
+#: cps/web.py:3063
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/web.py:3086
+#: cps/web.py:3068
 msgid "Edit e-mail server settings"
 msgstr ""
 
-#: cps/web.py:3111
+#: cps/web.py:3093
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Gebruiker '%(nick)s' verwijderd"
 
-#: cps/web.py:3220
+#: cps/web.py:3202
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Gebruiker '%(nick)s' aangepast"
 
-#: cps/web.py:3223
+#: cps/web.py:3205
 msgid "An unknown error occured."
 msgstr "Een onbekende fout deed zich voor."
 
-#: cps/web.py:3225
+#: cps/web.py:3207
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Bewerk gebruiker '%(nick)s'"
 
-#: cps/web.py:3242
+#: cps/web.py:3224
 #, python-format
 msgid "Password for user %s reset"
 msgstr ""
 
-#: cps/web.py:3262
+#: cps/web.py:3244
 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:3294 cps/web.py:3556 cps/web.py:3561 cps/web.py:3716
+#: cps/web.py:3275 cps/web.py:3551 cps/web.py:3556 cps/web.py:3711
 msgid "edit metadata"
 msgstr "Bewerk metadata"
 
-#: cps/web.py:3308 cps/web.py:3586
+#: cps/web.py:3289 cps/web.py:3581
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr "Het uploaden van bestandsextensie \"%s\" is niet toegestaan op deze server"
 
-#: cps/web.py:3312 cps/web.py:3590
+#: cps/web.py:3293 cps/web.py:3585
 msgid "File to be uploaded must have an extension"
 msgstr "Up te loaden bestanden dienen een extensie te hebben"
 
-#: cps/web.py:3324 cps/web.py:3610
+#: cps/web.py:3305 cps/web.py:3605
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Het pad %s aanmaken mislukt (Geen toestemming)."
 
-#: cps/web.py:3329
+#: cps/web.py:3310
 #, python-format
 msgid "Failed to store file %s."
 msgstr "Bestand opslaan niet gelukt voor %s."
 
-#: cps/web.py:3345
+#: cps/web.py:3326
 #, python-format
 msgid "File format %s added to %s"
 msgstr ""
 
-#: cps/web.py:3363
+#: cps/web.py:3344
 #, python-format
 msgid "Failed to create path for cover %s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:3370
+#: cps/web.py:3351
 #, python-format
 msgid "Failed to store cover-file %s."
 msgstr ""
 
-#: cps/web.py:3373
+#: cps/web.py:3354
 msgid "Cover-file is not a valid image file"
 msgstr ""
 
-#: cps/web.py:3386 cps/web.py:3390
+#: cps/web.py:3367 cps/web.py:3371
 msgid "unknown"
 msgstr "onbekend"
 
-#: cps/web.py:3412
+#: cps/web.py:3393
 msgid "Cover is not a jpg file, can't save"
 msgstr ""
 
-#: cps/web.py:3565
+#: cps/web.py:3560
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/web.py:3615
+#: cps/web.py:3610
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Bestand %s opslaan mislukt (Geen toestemming)."
 
-#: cps/web.py:3620
+#: cps/web.py:3615
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Bestand %s wissen mislukt (Geen toestemming)."
 
-#: cps/web.py:3702
+#: cps/web.py:3697
 #, python-format
 msgid "File %s uploaded"
 msgstr ""
 
-#: cps/web.py:3732
+#: cps/web.py:3727
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/web.py:3742
+#: cps/web.py:3737
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/web.py:3746
+#: cps/web.py:3741
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
 
-#: cps/worker.py:215 cps/worker.py:385
+#: cps/worker.py:215 cps/worker.py:387
 msgid "Started"
 msgstr ""
 
@@ -691,19 +686,19 @@ msgstr ""
 msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "Kindlegen gefaald met Error %(error)s. Bericht: %(message)s"
 
-#: cps/worker.py:316 cps/worker.py:375 cps/worker.py:437
+#: cps/worker.py:317 cps/worker.py:377 cps/worker.py:438
 msgid "Finished"
 msgstr ""
 
-#: cps/worker.py:342 cps/worker.py:361
+#: cps/worker.py:344 cps/worker.py:363
 msgid "Waiting"
 msgstr ""
 
-#: cps/worker.py:349
+#: cps/worker.py:351
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr ""
 
-#: cps/worker.py:463
+#: cps/worker.py:472
 msgid "Failed"
 msgstr ""
 
@@ -850,7 +845,7 @@ msgid "Ok"
 msgstr "Ok"
 
 #: cps/templates/admin.html:116 cps/templates/admin.html:130
-#: cps/templates/book_edit.html:176 cps/templates/book_edit.html:198
+#: cps/templates/book_edit.html:178 cps/templates/book_edit.html:200
 #: cps/templates/config_edit.html:212 cps/templates/config_view_edit.html:164
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:75
 #: cps/templates/shelf.html:60 cps/templates/shelf_edit.html:19
@@ -886,7 +881,7 @@ msgstr "Wis boek"
 msgid "Delete formats:"
 msgstr ""
 
-#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:197
+#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:199
 #: cps/templates/email_edit.html:73 cps/templates/email_edit.html:74
 msgid "Delete"
 msgstr "Wis"
@@ -899,6 +894,10 @@ msgstr ""
 msgid "Convert from:"
 msgstr ""
 
+#: cps/templates/book_edit.html:36 cps/templates/book_edit.html:43
+msgid "select an option"
+msgstr ""
+
 #: cps/templates/book_edit.html:41
 msgid "Convert to:"
 msgstr ""
@@ -911,13 +910,13 @@ msgstr ""
 msgid "Book Title"
 msgstr "Boek titel"
 
-#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:257
-#: cps/templates/book_edit.html:275 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:259
+#: cps/templates/book_edit.html:277 cps/templates/search_form.html:10
 msgid "Author"
 msgstr "Auteur"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:262
-#: cps/templates/book_edit.html:277 cps/templates/search_form.html:106
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:264
+#: cps/templates/book_edit.html:279 cps/templates/search_form.html:106
 msgid "Description"
 msgstr "Omschrijving"
 
@@ -925,114 +924,115 @@ msgstr "Omschrijving"
 msgid "Tags"
 msgstr "Tags"
 
-#: cps/templates/book_edit.html:76 cps/templates/layout.html:157
+#: cps/templates/book_edit.html:75 cps/templates/layout.html:157
 #: cps/templates/search_form.html:53
 msgid "Series"
 msgstr "Series"
 
-#: cps/templates/book_edit.html:80
+#: cps/templates/book_edit.html:79
 msgid "Series id"
 msgstr "Series id"
 
-#: cps/templates/book_edit.html:84
+#: cps/templates/book_edit.html:83
 msgid "Rating"
 msgstr "Beoordeling"
 
-#: cps/templates/book_edit.html:88
+#: cps/templates/book_edit.html:87
 msgid ""
 "Cover URL (jpg, cover is downloaded and stored in database, field is "
 "afterwards empty again)"
 msgstr ""
 
-#: cps/templates/book_edit.html:92
+#: cps/templates/book_edit.html:91
 msgid "Upload Cover from local drive"
 msgstr ""
 
-#: cps/templates/book_edit.html:97 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:96 cps/templates/detail.html:131
 msgid "Publishing date"
 msgstr "Publicatie datum"
 
-#: cps/templates/book_edit.html:104 cps/templates/user_edit.html:33
+#: cps/templates/book_edit.html:103 cps/templates/book_edit.html:261
+#: cps/templates/book_edit.html:278 cps/templates/detail.html:126
+#: cps/templates/search_form.html:14
+msgid "Publisher"
+msgstr "Uitgever"
+
+#: cps/templates/book_edit.html:107 cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Taal"
 
-#: cps/templates/book_edit.html:115 cps/templates/search_form.html:117
+#: cps/templates/book_edit.html:117 cps/templates/search_form.html:117
 msgid "Yes"
 msgstr "Ja"
 
-#: cps/templates/book_edit.html:116 cps/templates/search_form.html:118
+#: cps/templates/book_edit.html:118 cps/templates/search_form.html:118
 msgid "No"
 msgstr "Nee"
 
-#: cps/templates/book_edit.html:162
+#: cps/templates/book_edit.html:164
 msgid "Upload format"
 msgstr "Upload type"
 
-#: cps/templates/book_edit.html:171
+#: cps/templates/book_edit.html:173
 msgid "view book after edit"
 msgstr "bekijk boek na bewerking"
 
-#: cps/templates/book_edit.html:174 cps/templates/book_edit.html:210
+#: cps/templates/book_edit.html:176 cps/templates/book_edit.html:212
 msgid "Get metadata"
 msgstr "Verkrijg metadata"
 
-#: cps/templates/book_edit.html:175 cps/templates/config_edit.html:210
+#: cps/templates/book_edit.html:177 cps/templates/config_edit.html:210
 #: cps/templates/config_view_edit.html:163 cps/templates/login.html:20
 #: cps/templates/search_form.html:153 cps/templates/shelf_edit.html:17
 #: cps/templates/user_edit.html:151
 msgid "Submit"
 msgstr "Opslaan"
 
-#: cps/templates/book_edit.html:189
+#: cps/templates/book_edit.html:191
 msgid "Are you really sure?"
 msgstr "Ben je zeker?"
 
-#: cps/templates/book_edit.html:192
+#: cps/templates/book_edit.html:194
 msgid "Book will be deleted from Calibre database"
 msgstr "Boek wordt nu gewist uit de Calibre database"
 
-#: cps/templates/book_edit.html:193
+#: cps/templates/book_edit.html:195
 msgid "and from hard disk"
 msgstr "en van de harde schijf"
 
-#: cps/templates/book_edit.html:213
+#: cps/templates/book_edit.html:215
 msgid "Keyword"
 msgstr "Zoekwoord"
 
-#: cps/templates/book_edit.html:214
+#: cps/templates/book_edit.html:216
 msgid " Search keyword "
 msgstr "Zoek voor zoekwoord"
 
-#: cps/templates/book_edit.html:216 cps/templates/layout.html:46
+#: cps/templates/book_edit.html:218 cps/templates/layout.html:46
 msgid "Go!"
 msgstr "Start!"
 
-#: cps/templates/book_edit.html:220
+#: cps/templates/book_edit.html:222
 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:232 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:234 cps/templates/book_edit.html:274
 msgid "Loading..."
 msgstr "Aan het laden..."
 
-#: cps/templates/book_edit.html:237 cps/templates/layout.html:221
+#: cps/templates/book_edit.html:239 cps/templates/layout.html:221
 msgid "Close"
 msgstr "Sluit"
 
-#: cps/templates/book_edit.html:259 cps/templates/book_edit.html:276
-#: cps/templates/detail.html:126 cps/templates/search_form.html:14
-msgid "Publisher"
-msgstr "Uitgever"
-
-#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
+#: cps/templates/book_edit.html:266 cps/templates/book_edit.html:280
 msgid "Source"
 msgstr "Bron"
 
-#: cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:275
 msgid "Search error!"
 msgstr "Zoek fout!"
 
-#: cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:276
 msgid "No Result(s) found! Please try aonther keyword."
 msgstr ""
 
@@ -1306,7 +1306,7 @@ msgstr "Lees"
 msgid "Description:"
 msgstr "Omschrijving:"
 
-#: cps/templates/detail.html:189 cps/templates/search.html:16
+#: cps/templates/detail.html:189 cps/templates/search.html:14
 msgid "Add to shelf"
 msgstr "Voeg toe aan boekenplank"
 
@@ -1693,15 +1693,15 @@ msgstr "en log in"
 msgid "Once you do so, you will automatically get logged in on this device."
 msgstr "Eenmaal gedaan wordt je automagisch op dit apparaat ingelogd."
 
-#: cps/templates/search.html:6
+#: cps/templates/search.html:5
 msgid "No Results for:"
 msgstr "Geen resultaat voor:"
 
-#: cps/templates/search.html:7
+#: cps/templates/search.html:6
 msgid "Please try a different search"
 msgstr "Gelieve een ander zoekwoord proberen"
 
-#: cps/templates/search.html:9
+#: cps/templates/search.html:8
 msgid "Results for:"
 msgstr "Resultaten voor:"
 
diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po
index fb4f5df7..7a7c0fb0 100644
--- a/cps/translations/pl/LC_MESSAGES/messages.po
+++ b/cps/translations/pl/LC_MESSAGES/messages.po
@@ -12,7 +12,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: 2018-08-31 14:58+0200\n"
+"POT-Creation-Date: 2018-09-03 19:09+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"
@@ -33,628 +33,623 @@ msgstr "nie zainstalowane"
 msgid "Excecution permissions missing"
 msgstr ""
 
-#: cps/helper.py:56
-#, python-format
-msgid "Epub format not found for book id: %(book)d"
-msgstr ""
-
-#: cps/helper.py:75
-#, python-format
-msgid "Convert: %s"
-msgstr ""
-
-#: cps/helper.py:84
-msgid "Calibre-Web test e-mail"
-msgstr ""
-
-#: cps/helper.py:85
-msgid "Test e-mail"
-msgstr ""
-
-#: cps/helper.py:100
-msgid "Get Started with Calibre-Web"
-msgstr ""
-
-#: cps/helper.py:101
-#, python-format
-msgid "Registration e-mail for user: %s"
-msgstr ""
-
-#: cps/helper.py:124 cps/helper.py:134
-msgid "Could not find any formats suitable for sending by e-mail"
-msgstr ""
-
-#: cps/helper.py:136 cps/templates/detail.html:44 cps/worker.py:224
-msgid "Send to Kindle"
-msgstr "Wyślij do Kindle"
-
-#: cps/helper.py:137
-#, python-format
-msgid "E-Mail: %s"
-msgstr ""
-
-#: cps/helper.py:139
-msgid "The requested file could not be read. Maybe wrong permissions?"
-msgstr ""
-
-#: cps/helper.py:147
+#: cps/helper.py:57
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:159
+#: cps/helper.py:69
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:171 cps/helper.py:178
+#: cps/helper.py:76
+#, python-format
+msgid "Convert: %s"
+msgstr ""
+
+#: cps/helper.py:78
 #, python-format
 msgid "Convert to %(format)s: %(book)s"
 msgstr ""
 
-#: cps/helper.py:184
+#: cps/helper.py:85
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:280
+#: cps/helper.py:90
+msgid "Calibre-Web test e-mail"
+msgstr ""
+
+#: cps/helper.py:91
+msgid "Test e-mail"
+msgstr ""
+
+#: cps/helper.py:106
+msgid "Get Started with Calibre-Web"
+msgstr ""
+
+#: cps/helper.py:107
+#, python-format
+msgid "Registration e-mail for user: %s"
+msgstr ""
+
+#: cps/helper.py:130 cps/helper.py:140
+msgid "Could not find any formats suitable for sending by e-mail"
+msgstr ""
+
+#: cps/helper.py:142 cps/templates/detail.html:44 cps/worker.py:224
+msgid "Send to Kindle"
+msgstr "Wyślij do Kindle"
+
+#: cps/helper.py:143
+#, python-format
+msgid "E-Mail: %s"
+msgstr ""
+
+#: cps/helper.py:145
+msgid "The requested file could not be read. Maybe wrong permissions?"
+msgstr ""
+
+#: cps/helper.py:240
 #, python-format
 msgid "Rename title from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:289
+#: cps/helper.py:249
 #, python-format
 msgid "Rename author from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:312 cps/helper.py:321
+#: cps/helper.py:272 cps/helper.py:281
 #, python-format
 msgid "File %s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:339
+#: cps/helper.py:299
 #, python-format
 msgid "Book path %s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:584
+#: cps/helper.py:544
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:586
+#: cps/helper.py:546
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/web.py:1138
+#: cps/web.py:1120
 msgid "Requesting update package"
 msgstr "Żądanie o pakiet aktualizacji"
 
-#: cps/web.py:1139
+#: cps/web.py:1121
 msgid "Downloading update package"
 msgstr "Pobieranie pakietu aktualizacji"
 
-#: cps/web.py:1140
+#: cps/web.py:1122
 msgid "Unzipping update package"
 msgstr "Rozpakowywanie pakietu aktualizacji"
 
-#: cps/web.py:1141
+#: cps/web.py:1123
 msgid "Files are replaced"
 msgstr "Pliki zostały zastąpione"
 
-#: cps/web.py:1142
+#: cps/web.py:1124
 msgid "Database connections are closed"
 msgstr "Połączenia z bazą danych zostały zakończone"
 
-#: cps/web.py:1143
+#: cps/web.py:1125
 msgid "Server is stopped"
 msgstr "Serwer jest zatrzymany"
 
-#: cps/web.py:1144
+#: cps/web.py:1126
 msgid "Update finished, please press okay and reload page"
 msgstr "Aktualizacja zakończona, proszę nacisnąć OK i odświeżyć stronę"
 
-#: cps/web.py:1164
+#: cps/web.py:1146
 msgid "Recently Added Books"
 msgstr ""
 
-#: cps/web.py:1174
+#: cps/web.py:1156
 msgid "Newest Books"
 msgstr ""
 
-#: cps/web.py:1186
+#: cps/web.py:1168
 msgid "Oldest Books"
 msgstr ""
 
-#: cps/web.py:1198
+#: cps/web.py:1180
 msgid "Books (A-Z)"
 msgstr ""
 
-#: cps/web.py:1209
+#: cps/web.py:1191
 msgid "Books (Z-A)"
 msgstr ""
 
-#: cps/web.py:1238
+#: cps/web.py:1220
 msgid "Hot Books (most downloaded)"
 msgstr "Najpopularniejsze książki (najczęściej pobierane)"
 
-#: cps/web.py:1251
+#: cps/web.py:1233
 msgid "Best rated books"
 msgstr "Najlepiej oceniane książki"
 
-#: cps/templates/index.xml:36 cps/web.py:1263
+#: cps/templates/index.xml:36 cps/web.py:1245
 msgid "Random Books"
 msgstr "Losowe książki"
 
-#: cps/web.py:1278
+#: cps/web.py:1260
 msgid "Author list"
 msgstr "Lista autorów"
 
-#: cps/web.py:1290 cps/web.py:1353 cps/web.py:1508 cps/web.py:2060
+#: cps/web.py:1272 cps/web.py:1335 cps/web.py:1490 cps/web.py:2042
 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/templates/index.xml:73 cps/web.py:1337
+#: cps/templates/index.xml:73 cps/web.py:1319
 msgid "Series list"
 msgstr "Lista serii"
 
-#: cps/web.py:1351
+#: cps/web.py:1333
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Seria: %(serie)s"
 
-#: cps/web.py:1378
+#: cps/web.py:1360
 msgid "Available languages"
 msgstr "Dostępne języki"
 
-#: cps/web.py:1395
+#: cps/web.py:1377
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Język: %(name)s"
 
-#: cps/templates/index.xml:66 cps/web.py:1406
+#: cps/templates/index.xml:66 cps/web.py:1388
 msgid "Category list"
 msgstr "Lista kategorii"
 
-#: cps/web.py:1420
+#: cps/web.py:1402
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategoria: %(name)s"
 
-#: cps/templates/layout.html:71 cps/web.py:1559
+#: cps/templates/layout.html:71 cps/web.py:1541
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1589
+#: cps/web.py:1571
 msgid "Statistics"
 msgstr "Statystyki"
 
-#: cps/web.py:1694
+#: cps/web.py:1676
 msgid ""
 "Callback domain is not verified, please follow steps to verify domain in "
 "google developer console"
 msgstr ""
 
-#: cps/web.py:1770
+#: cps/web.py:1752
 msgid "Server restarted, please reload page"
 msgstr "Serwer uruchomiony ponownie, proszę odświeżyć stronę"
 
-#: cps/web.py:1773
+#: cps/web.py:1755
 msgid "Performing shutdown of server, please close window"
 msgstr "Wykonano wyłączenie serwera, proszę zamknąć okno"
 
-#: cps/web.py:1791
+#: cps/web.py:1773
 msgid "Update done"
 msgstr "Aktualizacja zakończona"
 
-#: cps/web.py:1847 cps/web.py:1884
+#: cps/web.py:1833 cps/web.py:1870
 #, python-format
 msgid "%s: %s"
 msgstr ""
 
-#: cps/web.py:1859
+#: cps/web.py:1845
 #, python-format
 msgid "Published after %s"
 msgstr ""
 
-#: cps/web.py:1864
+#: cps/web.py:1850
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1878
+#: cps/web.py:1864
 #, python-format
 msgid "Rating <= %s"
 msgstr ""
 
-#: cps/web.py:1880
+#: cps/web.py:1866
 #, python-format
 msgid "Rating >= %s"
 msgstr ""
 
-#: cps/web.py:1939 cps/web.py:1948
+#: cps/web.py:1925 cps/web.py:1934
 msgid "search"
 msgstr "szukaj"
 
 #: cps/templates/index.xml:44 cps/templates/index.xml:48
-#: cps/templates/layout.html:146 cps/web.py:2015
+#: cps/templates/layout.html:146 cps/web.py:2001
 msgid "Read Books"
 msgstr "Przeczytane książki"
 
 #: cps/templates/index.xml:52 cps/templates/index.xml:56
-#: cps/templates/layout.html:148 cps/web.py:2018
+#: cps/templates/layout.html:148 cps/web.py:2004
 msgid "Unread Books"
 msgstr "Nieprzeczytane książki"
 
-#: cps/web.py:2070 cps/web.py:2072 cps/web.py:2074 cps/web.py:2086
+#: cps/web.py:2052 cps/web.py:2054 cps/web.py:2056 cps/web.py:2068
 msgid "Read a Book"
 msgstr "Czytaj książkę"
 
-#: cps/web.py:2152 cps/web.py:3029
+#: cps/web.py:2134 cps/web.py:3011
 msgid "Please fill out all fields!"
 msgstr "Proszę wypełnić wszystkie pola!"
 
-#: cps/web.py:2153 cps/web.py:2174 cps/web.py:2178 cps/web.py:2183
-#: cps/web.py:2185
+#: cps/web.py:2135 cps/web.py:2156 cps/web.py:2160 cps/web.py:2165
+#: cps/web.py:2167
 msgid "register"
 msgstr "rejestracja"
 
-#: cps/web.py:2173 cps/web.py:3245
+#: cps/web.py:2155 cps/web.py:3227
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/web.py:2176
+#: cps/web.py:2158
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:2179
+#: cps/web.py:2161
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:2182
+#: cps/web.py:2164
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:2199 cps/web.py:2295
+#: cps/web.py:2181 cps/web.py:2277
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Zalogowałeś się jako: '%(nickname)s'"
 
-#: cps/web.py:2204
+#: cps/web.py:2186
 msgid "Wrong Username or Password"
 msgstr "Błędna nazwa użytkownika lub hasło"
 
-#: cps/web.py:2210 cps/web.py:2231
+#: cps/web.py:2192 cps/web.py:2213
 msgid "login"
 msgstr "logowanie"
 
-#: cps/web.py:2243 cps/web.py:2274
+#: cps/web.py:2225 cps/web.py:2256
 msgid "Token not found"
 msgstr ""
 
-#: cps/web.py:2251 cps/web.py:2282
+#: cps/web.py:2233 cps/web.py:2264
 msgid "Token has expired"
 msgstr ""
 
-#: cps/web.py:2259
+#: cps/web.py:2241
 msgid "Success! Please return to your device"
 msgstr ""
 
-#: cps/web.py:2309
+#: cps/web.py:2291
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Proszę najpierw skonfigurować ustawienia SMTP poczty e-mail..."
 
-#: cps/web.py:2313
+#: cps/web.py:2295
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:2317
+#: cps/web.py:2299
 #, 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:2319 cps/web.py:3083
+#: cps/web.py:2301 cps/web.py:3065
 msgid "Please configure your kindle e-mail address first..."
 msgstr ""
 
-#: cps/web.py:2363
+#: cps/web.py:2345
 #, 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:2374
+#: cps/web.py:2356
 msgid "Invalid shelf specified"
 msgstr ""
 
-#: cps/web.py:2379
+#: cps/web.py:2361
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %s"
 msgstr ""
 
-#: cps/web.py:2384
+#: cps/web.py:2366
 msgid "User is not allowed to edit public shelves"
 msgstr ""
 
-#: cps/web.py:2402
+#: cps/web.py:2384
 #, python-format
 msgid "Books are already part of the shelf: %s"
 msgstr ""
 
-#: cps/web.py:2416
+#: cps/web.py:2398
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2418
+#: cps/web.py:2400
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2455
+#: cps/web.py:2437
 #, 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:2461
+#: cps/web.py:2443
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2481 cps/web.py:2505
+#: cps/web.py:2463 cps/web.py:2487
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr "Półka o nazwie '%(title)s' już istnieje."
 
-#: cps/web.py:2486
+#: cps/web.py:2468
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Półka %(title)s została utworzona"
 
-#: cps/web.py:2488 cps/web.py:2516
+#: cps/web.py:2470 cps/web.py:2498
 msgid "There was an error"
 msgstr "Wystąpił błąd"
 
-#: cps/web.py:2489 cps/web.py:2491
+#: cps/web.py:2471 cps/web.py:2473
 msgid "create a shelf"
 msgstr "utwórz półkę"
 
-#: cps/web.py:2514
+#: cps/web.py:2496
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Półka %(title)s została zmieniona"
 
-#: cps/web.py:2517 cps/web.py:2519
+#: cps/web.py:2499 cps/web.py:2501
 msgid "Edit a shelf"
 msgstr "Edytuj półkę"
 
-#: cps/web.py:2540
+#: cps/web.py:2522
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "pomyślnie usunięto półkę %(name)s"
 
-#: cps/web.py:2562
+#: cps/web.py:2544
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Półka: '%(name)s'"
 
-#: cps/web.py:2565
+#: cps/web.py:2547
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:2596
+#: cps/web.py:2578
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Zmieniono kolejność półki: '%(name)s'"
 
-#: cps/web.py:2625 cps/web.py:3035
+#: cps/web.py:2607 cps/web.py:3017
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/web.py:2627 cps/web.py:2668 cps/web.py:2671
+#: cps/web.py:2609 cps/web.py:2650 cps/web.py:2653
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil użytkownika %(name)s"
 
-#: cps/web.py:2666
+#: cps/web.py:2648
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/web.py:2669
+#: cps/web.py:2651
 msgid "Profile updated"
 msgstr "Zaktualizowano profil"
 
-#: cps/web.py:2681
+#: cps/web.py:2663
 msgid "Unknown"
 msgstr ""
 
-#: cps/web.py:2695
+#: cps/web.py:2677
 msgid "Admin page"
 msgstr "Portal administracyjny"
 
-#: cps/web.py:2773 cps/web.py:2945
+#: cps/web.py:2755 cps/web.py:2927
 msgid "Calibre-Web configuration updated"
 msgstr "Konfiguracja Calibre-Web została zaktualizowana"
 
-#: cps/templates/admin.html:91 cps/web.py:2786
+#: cps/templates/admin.html:91 cps/web.py:2768
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/web.py:2803
+#: cps/web.py:2785
 msgid "Import of optional Google Drive requirements missing"
 msgstr ""
 
-#: cps/web.py:2806
+#: cps/web.py:2788
 msgid "client_secrets.json is missing or not readable"
 msgstr ""
 
-#: cps/web.py:2811 cps/web.py:2838
+#: cps/web.py:2793 cps/web.py:2820
 msgid "client_secrets.json is not configured for web application"
 msgstr ""
 
-#: cps/templates/admin.html:90 cps/web.py:2841 cps/web.py:2867 cps/web.py:2879
-#: cps/web.py:2921 cps/web.py:2936 cps/web.py:2953 cps/web.py:2960
-#: cps/web.py:2977
+#: cps/templates/admin.html:90 cps/web.py:2823 cps/web.py:2849 cps/web.py:2861
+#: cps/web.py:2903 cps/web.py:2918 cps/web.py:2935 cps/web.py:2942
+#: cps/web.py:2959
 msgid "Basic Configuration"
 msgstr "Podstawowa konfiguracja"
 
-#: cps/web.py:2864
+#: cps/web.py:2846
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2876
+#: cps/web.py:2858
 msgid "Certfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2918
+#: cps/web.py:2900
 msgid "Logfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2957
+#: cps/web.py:2939
 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:31 cps/web.py:3031 cps/web.py:3037 cps/web.py:3053
+#: cps/templates/admin.html:31 cps/web.py:3013 cps/web.py:3019 cps/web.py:3035
 msgid "Add new user"
 msgstr "Dodaj nowego użytkownika"
 
-#: cps/web.py:3043
+#: cps/web.py:3025
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Użytkownik '%(user)s' został utworzony"
 
-#: cps/web.py:3047
+#: cps/web.py:3029
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/web.py:3071 cps/web.py:3085
+#: cps/web.py:3053 cps/web.py:3067
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/web.py:3078
+#: cps/web.py:3060
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:3081
+#: cps/web.py:3063
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/web.py:3086
+#: cps/web.py:3068
 msgid "Edit e-mail server settings"
 msgstr ""
 
-#: cps/web.py:3111
+#: cps/web.py:3093
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Użytkownik '%(nick)s' został usunięty"
 
-#: cps/web.py:3220
+#: cps/web.py:3202
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Użytkownik '%(nick)s' został zaktualizowany"
 
-#: cps/web.py:3223
+#: cps/web.py:3205
 msgid "An unknown error occured."
 msgstr "Wystąpił nieznany błąd."
 
-#: cps/web.py:3225
+#: cps/web.py:3207
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Edytuj użytkownika %(nick)s"
 
-#: cps/web.py:3242
+#: cps/web.py:3224
 #, python-format
 msgid "Password for user %s reset"
 msgstr ""
 
-#: cps/web.py:3262
+#: cps/web.py:3244
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr ""
 
-#: cps/web.py:3294 cps/web.py:3556 cps/web.py:3561 cps/web.py:3716
+#: cps/web.py:3275 cps/web.py:3551 cps/web.py:3556 cps/web.py:3711
 msgid "edit metadata"
 msgstr "edytuj metadane"
 
-#: cps/web.py:3308 cps/web.py:3586
+#: cps/web.py:3289 cps/web.py:3581
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr "Rozszerzenie pliku \"%s\" nie jest dozwolone do przesłania na ten serwer"
 
-#: cps/web.py:3312 cps/web.py:3590
+#: cps/web.py:3293 cps/web.py:3585
 msgid "File to be uploaded must have an extension"
 msgstr "Plik do przesłania musi mieć rozszerzenie"
 
-#: cps/web.py:3324 cps/web.py:3610
+#: cps/web.py:3305 cps/web.py:3605
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Nie udało się utworzyć łącza %s (Odmowa dostępu)."
 
-#: cps/web.py:3329
+#: cps/web.py:3310
 #, python-format
 msgid "Failed to store file %s."
 msgstr ""
 
-#: cps/web.py:3345
+#: cps/web.py:3326
 #, python-format
 msgid "File format %s added to %s"
 msgstr ""
 
-#: cps/web.py:3363
+#: cps/web.py:3344
 #, python-format
 msgid "Failed to create path for cover %s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:3370
+#: cps/web.py:3351
 #, python-format
 msgid "Failed to store cover-file %s."
 msgstr ""
 
-#: cps/web.py:3373
+#: cps/web.py:3354
 msgid "Cover-file is not a valid image file"
 msgstr ""
 
-#: cps/web.py:3386 cps/web.py:3390
+#: cps/web.py:3367 cps/web.py:3371
 msgid "unknown"
 msgstr ""
 
-#: cps/web.py:3412
+#: cps/web.py:3393
 msgid "Cover is not a jpg file, can't save"
 msgstr ""
 
-#: cps/web.py:3565
+#: cps/web.py:3560
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/web.py:3615
+#: cps/web.py:3610
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Nie można przechowywać pliku %s (Odmowa dostępu)."
 
-#: cps/web.py:3620
+#: cps/web.py:3615
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Nie udało się usunąć pliku %s (Odmowa dostępu)."
 
-#: cps/web.py:3702
+#: cps/web.py:3697
 #, python-format
 msgid "File %s uploaded"
 msgstr ""
 
-#: cps/web.py:3732
+#: cps/web.py:3727
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/web.py:3742
+#: cps/web.py:3737
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/web.py:3746
+#: cps/web.py:3741
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
 
-#: cps/worker.py:215 cps/worker.py:385
+#: cps/worker.py:215 cps/worker.py:387
 msgid "Started"
 msgstr ""
 
@@ -678,19 +673,19 @@ msgstr ""
 msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr ""
 
-#: cps/worker.py:316 cps/worker.py:375 cps/worker.py:437
+#: cps/worker.py:317 cps/worker.py:377 cps/worker.py:438
 msgid "Finished"
 msgstr ""
 
-#: cps/worker.py:342 cps/worker.py:361
+#: cps/worker.py:344 cps/worker.py:363
 msgid "Waiting"
 msgstr ""
 
-#: cps/worker.py:349
+#: cps/worker.py:351
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr ""
 
-#: cps/worker.py:463
+#: cps/worker.py:472
 msgid "Failed"
 msgstr ""
 
@@ -837,7 +832,7 @@ msgid "Ok"
 msgstr "OK"
 
 #: cps/templates/admin.html:116 cps/templates/admin.html:130
-#: cps/templates/book_edit.html:176 cps/templates/book_edit.html:198
+#: cps/templates/book_edit.html:178 cps/templates/book_edit.html:200
 #: cps/templates/config_edit.html:212 cps/templates/config_view_edit.html:164
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:75
 #: cps/templates/shelf.html:60 cps/templates/shelf_edit.html:19
@@ -873,7 +868,7 @@ msgstr ""
 msgid "Delete formats:"
 msgstr ""
 
-#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:197
+#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:199
 #: cps/templates/email_edit.html:73 cps/templates/email_edit.html:74
 msgid "Delete"
 msgstr ""
@@ -886,6 +881,10 @@ msgstr ""
 msgid "Convert from:"
 msgstr ""
 
+#: cps/templates/book_edit.html:36 cps/templates/book_edit.html:43
+msgid "select an option"
+msgstr ""
+
 #: cps/templates/book_edit.html:41
 msgid "Convert to:"
 msgstr ""
@@ -898,13 +897,13 @@ msgstr ""
 msgid "Book Title"
 msgstr "Tytuł książki"
 
-#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:257
-#: cps/templates/book_edit.html:275 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:259
+#: cps/templates/book_edit.html:277 cps/templates/search_form.html:10
 msgid "Author"
 msgstr "Autor"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:262
-#: cps/templates/book_edit.html:277 cps/templates/search_form.html:106
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:264
+#: cps/templates/book_edit.html:279 cps/templates/search_form.html:106
 msgid "Description"
 msgstr "Opis"
 
@@ -912,114 +911,115 @@ msgstr "Opis"
 msgid "Tags"
 msgstr "Tagi"
 
-#: cps/templates/book_edit.html:76 cps/templates/layout.html:157
+#: cps/templates/book_edit.html:75 cps/templates/layout.html:157
 #: cps/templates/search_form.html:53
 msgid "Series"
 msgstr "Seria"
 
-#: cps/templates/book_edit.html:80
+#: cps/templates/book_edit.html:79
 msgid "Series id"
 msgstr "ID serii"
 
-#: cps/templates/book_edit.html:84
+#: cps/templates/book_edit.html:83
 msgid "Rating"
 msgstr "Ocena"
 
-#: cps/templates/book_edit.html:88
+#: cps/templates/book_edit.html:87
 msgid ""
 "Cover URL (jpg, cover is downloaded and stored in database, field is "
 "afterwards empty again)"
 msgstr ""
 
-#: cps/templates/book_edit.html:92
+#: cps/templates/book_edit.html:91
 msgid "Upload Cover from local drive"
 msgstr ""
 
-#: cps/templates/book_edit.html:97 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:96 cps/templates/detail.html:131
 msgid "Publishing date"
 msgstr "Data publikacji"
 
-#: cps/templates/book_edit.html:104 cps/templates/user_edit.html:33
+#: cps/templates/book_edit.html:103 cps/templates/book_edit.html:261
+#: cps/templates/book_edit.html:278 cps/templates/detail.html:126
+#: cps/templates/search_form.html:14
+msgid "Publisher"
+msgstr "Wydawca"
+
+#: cps/templates/book_edit.html:107 cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Język"
 
-#: cps/templates/book_edit.html:115 cps/templates/search_form.html:117
+#: cps/templates/book_edit.html:117 cps/templates/search_form.html:117
 msgid "Yes"
 msgstr "Tak"
 
-#: cps/templates/book_edit.html:116 cps/templates/search_form.html:118
+#: cps/templates/book_edit.html:118 cps/templates/search_form.html:118
 msgid "No"
 msgstr "Nie"
 
-#: cps/templates/book_edit.html:162
+#: cps/templates/book_edit.html:164
 msgid "Upload format"
 msgstr ""
 
-#: cps/templates/book_edit.html:171
+#: cps/templates/book_edit.html:173
 msgid "view book after edit"
 msgstr "wyświetl książkę po edycji"
 
-#: cps/templates/book_edit.html:174 cps/templates/book_edit.html:210
+#: cps/templates/book_edit.html:176 cps/templates/book_edit.html:212
 msgid "Get metadata"
 msgstr "Uzyskaj metadane"
 
-#: cps/templates/book_edit.html:175 cps/templates/config_edit.html:210
+#: cps/templates/book_edit.html:177 cps/templates/config_edit.html:210
 #: cps/templates/config_view_edit.html:163 cps/templates/login.html:20
 #: cps/templates/search_form.html:153 cps/templates/shelf_edit.html:17
 #: cps/templates/user_edit.html:151
 msgid "Submit"
 msgstr "Wyślij"
 
-#: cps/templates/book_edit.html:189
+#: cps/templates/book_edit.html:191
 msgid "Are you really sure?"
 msgstr ""
 
-#: cps/templates/book_edit.html:192
+#: cps/templates/book_edit.html:194
 msgid "Book will be deleted from Calibre database"
 msgstr ""
 
-#: cps/templates/book_edit.html:193
+#: cps/templates/book_edit.html:195
 msgid "and from hard disk"
 msgstr ""
 
-#: cps/templates/book_edit.html:213
+#: cps/templates/book_edit.html:215
 msgid "Keyword"
 msgstr "Słowo kluczowe"
 
-#: cps/templates/book_edit.html:214
+#: cps/templates/book_edit.html:216
 msgid " Search keyword "
 msgstr " Szukaj słowa kluczowego "
 
-#: cps/templates/book_edit.html:216 cps/templates/layout.html:46
+#: cps/templates/book_edit.html:218 cps/templates/layout.html:46
 msgid "Go!"
 msgstr "Idź!"
 
-#: cps/templates/book_edit.html:220
+#: cps/templates/book_edit.html:222
 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:232 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:234 cps/templates/book_edit.html:274
 msgid "Loading..."
 msgstr "Ładowanie..."
 
-#: cps/templates/book_edit.html:237 cps/templates/layout.html:221
+#: cps/templates/book_edit.html:239 cps/templates/layout.html:221
 msgid "Close"
 msgstr "Zamknij"
 
-#: cps/templates/book_edit.html:259 cps/templates/book_edit.html:276
-#: cps/templates/detail.html:126 cps/templates/search_form.html:14
-msgid "Publisher"
-msgstr "Wydawca"
-
-#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
+#: cps/templates/book_edit.html:266 cps/templates/book_edit.html:280
 msgid "Source"
 msgstr "Źródło"
 
-#: cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:275
 msgid "Search error!"
 msgstr "Błąd wyszukiwania!"
 
-#: cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:276
 msgid "No Result(s) found! Please try aonther keyword."
 msgstr ""
 
@@ -1294,7 +1294,7 @@ msgstr "Czytaj"
 msgid "Description:"
 msgstr "Opis:"
 
-#: cps/templates/detail.html:189 cps/templates/search.html:16
+#: cps/templates/detail.html:189 cps/templates/search.html:14
 msgid "Add to shelf"
 msgstr "Dodaj do półki"
 
@@ -1682,15 +1682,15 @@ msgstr ""
 msgid "Once you do so, you will automatically get logged in on this device."
 msgstr ""
 
-#: cps/templates/search.html:6
+#: cps/templates/search.html:5
 msgid "No Results for:"
 msgstr "Brak wyników dla:"
 
-#: cps/templates/search.html:7
+#: cps/templates/search.html:6
 msgid "Please try a different search"
 msgstr "Proszę wypróbować podobne wyszukiwanie"
 
-#: cps/templates/search.html:9
+#: cps/templates/search.html:8
 msgid "Results for:"
 msgstr "Wyniki dla:"
 
diff --git a/cps/translations/ru/LC_MESSAGES/messages.po b/cps/translations/ru/LC_MESSAGES/messages.po
index 4512dda6..0be007a9 100644
--- a/cps/translations/ru/LC_MESSAGES/messages.po
+++ b/cps/translations/ru/LC_MESSAGES/messages.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2018-08-31 14:58+0200\n"
+"POT-Creation-Date: 2018-09-03 19:09+0200\n"
 "PO-Revision-Date: 2017-04-30 00:47+0300\n"
 "Last-Translator: Pavel Korovin <p@tristero.se>\n"
 "Language: ru\n"
@@ -35,628 +35,623 @@ msgstr "Отсутствует"
 msgid "Excecution permissions missing"
 msgstr ""
 
-#: cps/helper.py:56
-#, python-format
-msgid "Epub format not found for book id: %(book)d"
-msgstr ""
-
-#: cps/helper.py:75
-#, python-format
-msgid "Convert: %s"
-msgstr ""
-
-#: cps/helper.py:84
-msgid "Calibre-Web test e-mail"
-msgstr ""
-
-#: cps/helper.py:85
-msgid "Test e-mail"
-msgstr ""
-
-#: cps/helper.py:100
-msgid "Get Started with Calibre-Web"
-msgstr ""
-
-#: cps/helper.py:101
-#, python-format
-msgid "Registration e-mail for user: %s"
-msgstr ""
-
-#: cps/helper.py:124 cps/helper.py:134
-msgid "Could not find any formats suitable for sending by e-mail"
-msgstr ""
-
-#: cps/helper.py:136 cps/templates/detail.html:44 cps/worker.py:224
-msgid "Send to Kindle"
-msgstr "Отправить на Kindle"
-
-#: cps/helper.py:137
-#, python-format
-msgid "E-Mail: %s"
-msgstr ""
-
-#: cps/helper.py:139
-msgid "The requested file could not be read. Maybe wrong permissions?"
-msgstr ""
-
-#: cps/helper.py:147
+#: cps/helper.py:57
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:159
+#: cps/helper.py:69
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:171 cps/helper.py:178
+#: cps/helper.py:76
+#, python-format
+msgid "Convert: %s"
+msgstr ""
+
+#: cps/helper.py:78
 #, python-format
 msgid "Convert to %(format)s: %(book)s"
 msgstr ""
 
-#: cps/helper.py:184
+#: cps/helper.py:85
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:280
+#: cps/helper.py:90
+msgid "Calibre-Web test e-mail"
+msgstr ""
+
+#: cps/helper.py:91
+msgid "Test e-mail"
+msgstr ""
+
+#: cps/helper.py:106
+msgid "Get Started with Calibre-Web"
+msgstr ""
+
+#: cps/helper.py:107
+#, python-format
+msgid "Registration e-mail for user: %s"
+msgstr ""
+
+#: cps/helper.py:130 cps/helper.py:140
+msgid "Could not find any formats suitable for sending by e-mail"
+msgstr ""
+
+#: cps/helper.py:142 cps/templates/detail.html:44 cps/worker.py:224
+msgid "Send to Kindle"
+msgstr "Отправить на Kindle"
+
+#: cps/helper.py:143
+#, python-format
+msgid "E-Mail: %s"
+msgstr ""
+
+#: cps/helper.py:145
+msgid "The requested file could not be read. Maybe wrong permissions?"
+msgstr ""
+
+#: cps/helper.py:240
 #, python-format
 msgid "Rename title from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:289
+#: cps/helper.py:249
 #, python-format
 msgid "Rename author from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:312 cps/helper.py:321
+#: cps/helper.py:272 cps/helper.py:281
 #, python-format
 msgid "File %s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:339
+#: cps/helper.py:299
 #, python-format
 msgid "Book path %s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:584
+#: cps/helper.py:544
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:586
+#: cps/helper.py:546
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/web.py:1138
+#: cps/web.py:1120
 msgid "Requesting update package"
 msgstr "Проверка обновлений"
 
-#: cps/web.py:1139
+#: cps/web.py:1121
 msgid "Downloading update package"
 msgstr "Загрузка обновлений"
 
-#: cps/web.py:1140
+#: cps/web.py:1122
 msgid "Unzipping update package"
 msgstr "Распаковка обновлений"
 
-#: cps/web.py:1141
+#: cps/web.py:1123
 msgid "Files are replaced"
 msgstr "Файлы заменены"
 
-#: cps/web.py:1142
+#: cps/web.py:1124
 msgid "Database connections are closed"
 msgstr "Соеднинения с базой данных закрыты"
 
-#: cps/web.py:1143
+#: cps/web.py:1125
 msgid "Server is stopped"
 msgstr "Сервер остановлен"
 
-#: cps/web.py:1144
+#: cps/web.py:1126
 msgid "Update finished, please press okay and reload page"
 msgstr "Обновления установлены, нажмите okay и перезагрузите страницу"
 
-#: cps/web.py:1164
+#: cps/web.py:1146
 msgid "Recently Added Books"
 msgstr ""
 
-#: cps/web.py:1174
+#: cps/web.py:1156
 msgid "Newest Books"
 msgstr ""
 
-#: cps/web.py:1186
+#: cps/web.py:1168
 msgid "Oldest Books"
 msgstr ""
 
-#: cps/web.py:1198
+#: cps/web.py:1180
 msgid "Books (A-Z)"
 msgstr ""
 
-#: cps/web.py:1209
+#: cps/web.py:1191
 msgid "Books (Z-A)"
 msgstr ""
 
-#: cps/web.py:1238
+#: cps/web.py:1220
 msgid "Hot Books (most downloaded)"
 msgstr "Популярные книги (часто загружаемые)"
 
-#: cps/web.py:1251
+#: cps/web.py:1233
 msgid "Best rated books"
 msgstr "Книги с наивысшим рейтингом"
 
-#: cps/templates/index.xml:36 cps/web.py:1263
+#: cps/templates/index.xml:36 cps/web.py:1245
 msgid "Random Books"
 msgstr "Случайный выбор"
 
-#: cps/web.py:1278
+#: cps/web.py:1260
 msgid "Author list"
 msgstr "Авторы"
 
-#: cps/web.py:1290 cps/web.py:1353 cps/web.py:1508 cps/web.py:2060
+#: cps/web.py:1272 cps/web.py:1335 cps/web.py:1490 cps/web.py:2042
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "Невозможно открыть книгу. Файл не существует или недоступен."
 
-#: cps/templates/index.xml:73 cps/web.py:1337
+#: cps/templates/index.xml:73 cps/web.py:1319
 msgid "Series list"
 msgstr "Серии"
 
-#: cps/web.py:1351
+#: cps/web.py:1333
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Серии: %(serie)s"
 
-#: cps/web.py:1378
+#: cps/web.py:1360
 msgid "Available languages"
 msgstr "Языки"
 
-#: cps/web.py:1395
+#: cps/web.py:1377
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Язык: %(name)s"
 
-#: cps/templates/index.xml:66 cps/web.py:1406
+#: cps/templates/index.xml:66 cps/web.py:1388
 msgid "Category list"
 msgstr "Категории"
 
-#: cps/web.py:1420
+#: cps/web.py:1402
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Категория: %(name)s"
 
-#: cps/templates/layout.html:71 cps/web.py:1559
+#: cps/templates/layout.html:71 cps/web.py:1541
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1589
+#: cps/web.py:1571
 msgid "Statistics"
 msgstr "Статистика"
 
-#: cps/web.py:1694
+#: cps/web.py:1676
 msgid ""
 "Callback domain is not verified, please follow steps to verify domain in "
 "google developer console"
 msgstr ""
 
-#: cps/web.py:1770
+#: cps/web.py:1752
 msgid "Server restarted, please reload page"
 msgstr "Сервер перезагружен, пожалуйста, перезагрузите страницу"
 
-#: cps/web.py:1773
+#: cps/web.py:1755
 msgid "Performing shutdown of server, please close window"
 msgstr "Производится остановка сервера, пожалуйста, закройте окно"
 
-#: cps/web.py:1791
+#: cps/web.py:1773
 msgid "Update done"
 msgstr "Обновление закончено"
 
-#: cps/web.py:1847 cps/web.py:1884
+#: cps/web.py:1833 cps/web.py:1870
 #, python-format
 msgid "%s: %s"
 msgstr ""
 
-#: cps/web.py:1859
+#: cps/web.py:1845
 #, python-format
 msgid "Published after %s"
 msgstr ""
 
-#: cps/web.py:1864
+#: cps/web.py:1850
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1878
+#: cps/web.py:1864
 #, python-format
 msgid "Rating <= %s"
 msgstr ""
 
-#: cps/web.py:1880
+#: cps/web.py:1866
 #, python-format
 msgid "Rating >= %s"
 msgstr ""
 
-#: cps/web.py:1939 cps/web.py:1948
+#: cps/web.py:1925 cps/web.py:1934
 msgid "search"
 msgstr "поиск"
 
 #: cps/templates/index.xml:44 cps/templates/index.xml:48
-#: cps/templates/layout.html:146 cps/web.py:2015
+#: cps/templates/layout.html:146 cps/web.py:2001
 msgid "Read Books"
 msgstr "Прочитанные"
 
 #: cps/templates/index.xml:52 cps/templates/index.xml:56
-#: cps/templates/layout.html:148 cps/web.py:2018
+#: cps/templates/layout.html:148 cps/web.py:2004
 msgid "Unread Books"
 msgstr "Непрочитанные"
 
-#: cps/web.py:2070 cps/web.py:2072 cps/web.py:2074 cps/web.py:2086
+#: cps/web.py:2052 cps/web.py:2054 cps/web.py:2056 cps/web.py:2068
 msgid "Read a Book"
 msgstr "Читать книгу"
 
-#: cps/web.py:2152 cps/web.py:3029
+#: cps/web.py:2134 cps/web.py:3011
 msgid "Please fill out all fields!"
 msgstr "Пожалуйста, заполните все поля!"
 
-#: cps/web.py:2153 cps/web.py:2174 cps/web.py:2178 cps/web.py:2183
-#: cps/web.py:2185
+#: cps/web.py:2135 cps/web.py:2156 cps/web.py:2160 cps/web.py:2165
+#: cps/web.py:2167
 msgid "register"
 msgstr "зарегистрироваться"
 
-#: cps/web.py:2173 cps/web.py:3245
+#: cps/web.py:2155 cps/web.py:3227
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/web.py:2176
+#: cps/web.py:2158
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:2179
+#: cps/web.py:2161
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:2182
+#: cps/web.py:2164
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:2199 cps/web.py:2295
+#: cps/web.py:2181 cps/web.py:2277
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Вы вошли как пользователь '%(nickname)s'"
 
-#: cps/web.py:2204
+#: cps/web.py:2186
 msgid "Wrong Username or Password"
 msgstr "Ошибка в имени пользователя или пароле"
 
-#: cps/web.py:2210 cps/web.py:2231
+#: cps/web.py:2192 cps/web.py:2213
 msgid "login"
 msgstr "войти"
 
-#: cps/web.py:2243 cps/web.py:2274
+#: cps/web.py:2225 cps/web.py:2256
 msgid "Token not found"
 msgstr ""
 
-#: cps/web.py:2251 cps/web.py:2282
+#: cps/web.py:2233 cps/web.py:2264
 msgid "Token has expired"
 msgstr ""
 
-#: cps/web.py:2259
+#: cps/web.py:2241
 msgid "Success! Please return to your device"
 msgstr ""
 
-#: cps/web.py:2309
+#: cps/web.py:2291
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Пожалуйста, сначала сконфигурируйте параметры SMTP"
 
-#: cps/web.py:2313
+#: cps/web.py:2295
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:2317
+#: cps/web.py:2299
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "Ошибка при отправке книги: %(res)s"
 
-#: cps/web.py:2319 cps/web.py:3083
+#: cps/web.py:2301 cps/web.py:3065
 msgid "Please configure your kindle e-mail address first..."
 msgstr ""
 
-#: cps/web.py:2363
+#: cps/web.py:2345
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "Книга добавлена на книжную полку: %(sname)s"
 
-#: cps/web.py:2374
+#: cps/web.py:2356
 msgid "Invalid shelf specified"
 msgstr ""
 
-#: cps/web.py:2379
+#: cps/web.py:2361
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %s"
 msgstr ""
 
-#: cps/web.py:2384
+#: cps/web.py:2366
 msgid "User is not allowed to edit public shelves"
 msgstr ""
 
-#: cps/web.py:2402
+#: cps/web.py:2384
 #, python-format
 msgid "Books are already part of the shelf: %s"
 msgstr ""
 
-#: cps/web.py:2416
+#: cps/web.py:2398
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2418
+#: cps/web.py:2400
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2455
+#: cps/web.py:2437
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Книга удалена с книжной полки: %(sname)s"
 
-#: cps/web.py:2461
+#: cps/web.py:2443
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2481 cps/web.py:2505
+#: cps/web.py:2463 cps/web.py:2487
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr "Книжкная полка с названием '%(title)s' уже существует."
 
-#: cps/web.py:2486
+#: cps/web.py:2468
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Создана книжная полка %(title)s"
 
-#: cps/web.py:2488 cps/web.py:2516
+#: cps/web.py:2470 cps/web.py:2498
 msgid "There was an error"
 msgstr "Произошла ошибка"
 
-#: cps/web.py:2489 cps/web.py:2491
+#: cps/web.py:2471 cps/web.py:2473
 msgid "create a shelf"
 msgstr "создать книжную полку"
 
-#: cps/web.py:2514
+#: cps/web.py:2496
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Книжная полка %(title)s изменена"
 
-#: cps/web.py:2517 cps/web.py:2519
+#: cps/web.py:2499 cps/web.py:2501
 msgid "Edit a shelf"
 msgstr "Изменить книжную полку"
 
-#: cps/web.py:2540
+#: cps/web.py:2522
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "Книжная полка %(name)s удалена"
 
-#: cps/web.py:2562
+#: cps/web.py:2544
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Книжная полка: '%(name)s'"
 
-#: cps/web.py:2565
+#: cps/web.py:2547
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:2596
+#: cps/web.py:2578
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Изменить расположение книжной полки '%(name)s'"
 
-#: cps/web.py:2625 cps/web.py:3035
+#: cps/web.py:2607 cps/web.py:3017
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/web.py:2627 cps/web.py:2668 cps/web.py:2671
+#: cps/web.py:2609 cps/web.py:2650 cps/web.py:2653
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Профиль %(name)s"
 
-#: cps/web.py:2666
+#: cps/web.py:2648
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/web.py:2669
+#: cps/web.py:2651
 msgid "Profile updated"
 msgstr "Профиль обновлён"
 
-#: cps/web.py:2681
+#: cps/web.py:2663
 msgid "Unknown"
 msgstr ""
 
-#: cps/web.py:2695
+#: cps/web.py:2677
 msgid "Admin page"
 msgstr "Администрирование"
 
-#: cps/web.py:2773 cps/web.py:2945
+#: cps/web.py:2755 cps/web.py:2927
 msgid "Calibre-Web configuration updated"
 msgstr "Конфигурация Calibre-Web обновлена"
 
-#: cps/templates/admin.html:91 cps/web.py:2786
+#: cps/templates/admin.html:91 cps/web.py:2768
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/web.py:2803
+#: cps/web.py:2785
 msgid "Import of optional Google Drive requirements missing"
 msgstr ""
 
-#: cps/web.py:2806
+#: cps/web.py:2788
 msgid "client_secrets.json is missing or not readable"
 msgstr ""
 
-#: cps/web.py:2811 cps/web.py:2838
+#: cps/web.py:2793 cps/web.py:2820
 msgid "client_secrets.json is not configured for web application"
 msgstr ""
 
-#: cps/templates/admin.html:90 cps/web.py:2841 cps/web.py:2867 cps/web.py:2879
-#: cps/web.py:2921 cps/web.py:2936 cps/web.py:2953 cps/web.py:2960
-#: cps/web.py:2977
+#: cps/templates/admin.html:90 cps/web.py:2823 cps/web.py:2849 cps/web.py:2861
+#: cps/web.py:2903 cps/web.py:2918 cps/web.py:2935 cps/web.py:2942
+#: cps/web.py:2959
 msgid "Basic Configuration"
 msgstr "Настройки сервера"
 
-#: cps/web.py:2864
+#: cps/web.py:2846
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2876
+#: cps/web.py:2858
 msgid "Certfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2918
+#: cps/web.py:2900
 msgid "Logfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2957
+#: cps/web.py:2939
 msgid "DB location is not valid, please enter correct path"
 msgstr "Неверный путь к фалу БД, пожалуйста, укажите правильное расположение БД"
 
-#: cps/templates/admin.html:31 cps/web.py:3031 cps/web.py:3037 cps/web.py:3053
+#: cps/templates/admin.html:31 cps/web.py:3013 cps/web.py:3019 cps/web.py:3035
 msgid "Add new user"
 msgstr "Добавить пользователя"
 
-#: cps/web.py:3043
+#: cps/web.py:3025
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Пользователь '%(user)s' добавлен"
 
-#: cps/web.py:3047
+#: cps/web.py:3029
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/web.py:3071 cps/web.py:3085
+#: cps/web.py:3053 cps/web.py:3067
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/web.py:3078
+#: cps/web.py:3060
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:3081
+#: cps/web.py:3063
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/web.py:3086
+#: cps/web.py:3068
 msgid "Edit e-mail server settings"
 msgstr ""
 
-#: cps/web.py:3111
+#: cps/web.py:3093
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Пользователь '%(nick)s' удалён"
 
-#: cps/web.py:3220
+#: cps/web.py:3202
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Пользователь '%(nick)s' обновлён"
 
-#: cps/web.py:3223
+#: cps/web.py:3205
 msgid "An unknown error occured."
 msgstr "Произошла неизвестная ошибка."
 
-#: cps/web.py:3225
+#: cps/web.py:3207
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Изменить пользователя %(nick)s"
 
-#: cps/web.py:3242
+#: cps/web.py:3224
 #, python-format
 msgid "Password for user %s reset"
 msgstr ""
 
-#: cps/web.py:3262
+#: cps/web.py:3244
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr ""
 
-#: cps/web.py:3294 cps/web.py:3556 cps/web.py:3561 cps/web.py:3716
+#: cps/web.py:3275 cps/web.py:3551 cps/web.py:3556 cps/web.py:3711
 msgid "edit metadata"
 msgstr "изменить метаданные"
 
-#: cps/web.py:3308 cps/web.py:3586
+#: cps/web.py:3289 cps/web.py:3581
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr "Запрещена загрузка файлов с расширением \"%s\""
 
-#: cps/web.py:3312 cps/web.py:3590
+#: cps/web.py:3293 cps/web.py:3585
 msgid "File to be uploaded must have an extension"
 msgstr "Загружаемый файл должен иметь расширение"
 
-#: cps/web.py:3324 cps/web.py:3610
+#: cps/web.py:3305 cps/web.py:3605
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Ошибка при создании пути %s (доступ запрещён)"
 
-#: cps/web.py:3329
+#: cps/web.py:3310
 #, python-format
 msgid "Failed to store file %s."
 msgstr ""
 
-#: cps/web.py:3345
+#: cps/web.py:3326
 #, python-format
 msgid "File format %s added to %s"
 msgstr ""
 
-#: cps/web.py:3363
+#: cps/web.py:3344
 #, python-format
 msgid "Failed to create path for cover %s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:3370
+#: cps/web.py:3351
 #, python-format
 msgid "Failed to store cover-file %s."
 msgstr ""
 
-#: cps/web.py:3373
+#: cps/web.py:3354
 msgid "Cover-file is not a valid image file"
 msgstr ""
 
-#: cps/web.py:3386 cps/web.py:3390
+#: cps/web.py:3367 cps/web.py:3371
 msgid "unknown"
 msgstr "неизвестно"
 
-#: cps/web.py:3412
+#: cps/web.py:3393
 msgid "Cover is not a jpg file, can't save"
 msgstr ""
 
-#: cps/web.py:3565
+#: cps/web.py:3560
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/web.py:3615
+#: cps/web.py:3610
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Ошибка записи файоа %s (доступ запрещён)"
 
-#: cps/web.py:3620
+#: cps/web.py:3615
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Ошибка удаления файла %s (доступ запрещён)"
 
-#: cps/web.py:3702
+#: cps/web.py:3697
 #, python-format
 msgid "File %s uploaded"
 msgstr ""
 
-#: cps/web.py:3732
+#: cps/web.py:3727
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/web.py:3742
+#: cps/web.py:3737
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/web.py:3746
+#: cps/web.py:3741
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
 
-#: cps/worker.py:215 cps/worker.py:385
+#: cps/worker.py:215 cps/worker.py:387
 msgid "Started"
 msgstr ""
 
@@ -680,19 +675,19 @@ msgstr ""
 msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr ""
 
-#: cps/worker.py:316 cps/worker.py:375 cps/worker.py:437
+#: cps/worker.py:317 cps/worker.py:377 cps/worker.py:438
 msgid "Finished"
 msgstr ""
 
-#: cps/worker.py:342 cps/worker.py:361
+#: cps/worker.py:344 cps/worker.py:363
 msgid "Waiting"
 msgstr ""
 
-#: cps/worker.py:349
+#: cps/worker.py:351
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr ""
 
-#: cps/worker.py:463
+#: cps/worker.py:472
 msgid "Failed"
 msgstr ""
 
@@ -839,7 +834,7 @@ msgid "Ok"
 msgstr "Ok"
 
 #: cps/templates/admin.html:116 cps/templates/admin.html:130
-#: cps/templates/book_edit.html:176 cps/templates/book_edit.html:198
+#: cps/templates/book_edit.html:178 cps/templates/book_edit.html:200
 #: cps/templates/config_edit.html:212 cps/templates/config_view_edit.html:164
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:75
 #: cps/templates/shelf.html:60 cps/templates/shelf_edit.html:19
@@ -875,7 +870,7 @@ msgstr "Удалить книгу"
 msgid "Delete formats:"
 msgstr ""
 
-#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:197
+#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:199
 #: cps/templates/email_edit.html:73 cps/templates/email_edit.html:74
 msgid "Delete"
 msgstr "Удалить"
@@ -888,6 +883,10 @@ msgstr ""
 msgid "Convert from:"
 msgstr ""
 
+#: cps/templates/book_edit.html:36 cps/templates/book_edit.html:43
+msgid "select an option"
+msgstr ""
+
 #: cps/templates/book_edit.html:41
 msgid "Convert to:"
 msgstr ""
@@ -900,13 +899,13 @@ msgstr ""
 msgid "Book Title"
 msgstr "Название"
 
-#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:257
-#: cps/templates/book_edit.html:275 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:259
+#: cps/templates/book_edit.html:277 cps/templates/search_form.html:10
 msgid "Author"
 msgstr "Автор"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:262
-#: cps/templates/book_edit.html:277 cps/templates/search_form.html:106
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:264
+#: cps/templates/book_edit.html:279 cps/templates/search_form.html:106
 msgid "Description"
 msgstr "Описание"
 
@@ -914,114 +913,115 @@ msgstr "Описание"
 msgid "Tags"
 msgstr "Теги"
 
-#: cps/templates/book_edit.html:76 cps/templates/layout.html:157
+#: cps/templates/book_edit.html:75 cps/templates/layout.html:157
 #: cps/templates/search_form.html:53
 msgid "Series"
 msgstr "Серии"
 
-#: cps/templates/book_edit.html:80
+#: cps/templates/book_edit.html:79
 msgid "Series id"
 msgstr "Серия"
 
-#: cps/templates/book_edit.html:84
+#: cps/templates/book_edit.html:83
 msgid "Rating"
 msgstr "Рейтинг"
 
-#: cps/templates/book_edit.html:88
+#: cps/templates/book_edit.html:87
 msgid ""
 "Cover URL (jpg, cover is downloaded and stored in database, field is "
 "afterwards empty again)"
 msgstr ""
 
-#: cps/templates/book_edit.html:92
+#: cps/templates/book_edit.html:91
 msgid "Upload Cover from local drive"
 msgstr ""
 
-#: cps/templates/book_edit.html:97 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:96 cps/templates/detail.html:131
 msgid "Publishing date"
 msgstr "Опубликовано"
 
-#: cps/templates/book_edit.html:104 cps/templates/user_edit.html:33
+#: cps/templates/book_edit.html:103 cps/templates/book_edit.html:261
+#: cps/templates/book_edit.html:278 cps/templates/detail.html:126
+#: cps/templates/search_form.html:14
+msgid "Publisher"
+msgstr "Издатель"
+
+#: cps/templates/book_edit.html:107 cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "Язык"
 
-#: cps/templates/book_edit.html:115 cps/templates/search_form.html:117
+#: cps/templates/book_edit.html:117 cps/templates/search_form.html:117
 msgid "Yes"
 msgstr "Да"
 
-#: cps/templates/book_edit.html:116 cps/templates/search_form.html:118
+#: cps/templates/book_edit.html:118 cps/templates/search_form.html:118
 msgid "No"
 msgstr "Нет"
 
-#: cps/templates/book_edit.html:162
+#: cps/templates/book_edit.html:164
 msgid "Upload format"
 msgstr ""
 
-#: cps/templates/book_edit.html:171
+#: cps/templates/book_edit.html:173
 msgid "view book after edit"
 msgstr "смотреть книгу после редактирования"
 
-#: cps/templates/book_edit.html:174 cps/templates/book_edit.html:210
+#: cps/templates/book_edit.html:176 cps/templates/book_edit.html:212
 msgid "Get metadata"
 msgstr "Получить метаданные"
 
-#: cps/templates/book_edit.html:175 cps/templates/config_edit.html:210
+#: cps/templates/book_edit.html:177 cps/templates/config_edit.html:210
 #: cps/templates/config_view_edit.html:163 cps/templates/login.html:20
 #: cps/templates/search_form.html:153 cps/templates/shelf_edit.html:17
 #: cps/templates/user_edit.html:151
 msgid "Submit"
 msgstr "Отправить"
 
-#: cps/templates/book_edit.html:189
+#: cps/templates/book_edit.html:191
 msgid "Are you really sure?"
 msgstr "Вы действительно уверены?"
 
-#: cps/templates/book_edit.html:192
+#: cps/templates/book_edit.html:194
 msgid "Book will be deleted from Calibre database"
 msgstr "Книга будет удалена из БД Calibre"
 
-#: cps/templates/book_edit.html:193
+#: cps/templates/book_edit.html:195
 msgid "and from hard disk"
 msgstr "и с диска"
 
-#: cps/templates/book_edit.html:213
+#: cps/templates/book_edit.html:215
 msgid "Keyword"
 msgstr "Ключевое слово"
 
-#: cps/templates/book_edit.html:214
+#: cps/templates/book_edit.html:216
 msgid " Search keyword "
 msgstr " Поиск по ключевому слову"
 
-#: cps/templates/book_edit.html:216 cps/templates/layout.html:46
+#: cps/templates/book_edit.html:218 cps/templates/layout.html:46
 msgid "Go!"
 msgstr "Искать"
 
-#: cps/templates/book_edit.html:220
+#: cps/templates/book_edit.html:222
 msgid "Click the cover to load metadata to the form"
 msgstr "Нажмите на обложку, чтобы получить метаданные"
 
-#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:234 cps/templates/book_edit.html:274
 msgid "Loading..."
 msgstr "Загрузка..."
 
-#: cps/templates/book_edit.html:237 cps/templates/layout.html:221
+#: cps/templates/book_edit.html:239 cps/templates/layout.html:221
 msgid "Close"
 msgstr "Закрыть"
 
-#: cps/templates/book_edit.html:259 cps/templates/book_edit.html:276
-#: cps/templates/detail.html:126 cps/templates/search_form.html:14
-msgid "Publisher"
-msgstr "Издатель"
-
-#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
+#: cps/templates/book_edit.html:266 cps/templates/book_edit.html:280
 msgid "Source"
 msgstr "Источник"
 
-#: cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:275
 msgid "Search error!"
 msgstr "Ошибка поиска!"
 
-#: cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:276
 msgid "No Result(s) found! Please try aonther keyword."
 msgstr ""
 
@@ -1295,7 +1295,7 @@ msgstr "Прочитано"
 msgid "Description:"
 msgstr "Описание:"
 
-#: cps/templates/detail.html:189 cps/templates/search.html:16
+#: cps/templates/detail.html:189 cps/templates/search.html:14
 msgid "Add to shelf"
 msgstr "Добавить на книжную полку"
 
@@ -1680,15 +1680,15 @@ msgstr ""
 msgid "Once you do so, you will automatically get logged in on this device."
 msgstr ""
 
-#: cps/templates/search.html:6
+#: cps/templates/search.html:5
 msgid "No Results for:"
 msgstr "Ничего не найдено по запросу:"
 
-#: cps/templates/search.html:7
+#: cps/templates/search.html:6
 msgid "Please try a different search"
 msgstr "Попробуйте изменить критерии поиск"
 
-#: cps/templates/search.html:9
+#: cps/templates/search.html:8
 msgid "Results for:"
 msgstr "Результаты для:"
 
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index 1f808ebf..4b6062ea 100644
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2018-08-31 14:58+0200\n"
+"POT-Creation-Date: 2018-09-03 19:09+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"
@@ -35,628 +35,623 @@ msgstr "未安装"
 msgid "Excecution permissions missing"
 msgstr "可执行权限缺失"
 
-#: cps/helper.py:56
-#, python-format
-msgid "Epub format not found for book id: %(book)d"
-msgstr ""
-
-#: cps/helper.py:75
-#, python-format
-msgid "Convert: %s"
-msgstr ""
-
-#: cps/helper.py:84
-msgid "Calibre-Web test e-mail"
-msgstr ""
-
-#: cps/helper.py:85
-msgid "Test e-mail"
-msgstr ""
-
-#: cps/helper.py:100
-msgid "Get Started with Calibre-Web"
-msgstr ""
-
-#: cps/helper.py:101
-#, python-format
-msgid "Registration e-mail for user: %s"
-msgstr ""
-
-#: cps/helper.py:124 cps/helper.py:134
-msgid "Could not find any formats suitable for sending by e-mail"
-msgstr ""
-
-#: cps/helper.py:136 cps/templates/detail.html:44 cps/worker.py:224
-msgid "Send to Kindle"
-msgstr "发送到Kindle"
-
-#: cps/helper.py:137
-#, python-format
-msgid "E-Mail: %s"
-msgstr ""
-
-#: cps/helper.py:139
-msgid "The requested file could not be read. Maybe wrong permissions?"
-msgstr ""
-
-#: cps/helper.py:147
+#: cps/helper.py:57
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:159
+#: cps/helper.py:69
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:171 cps/helper.py:178
+#: cps/helper.py:76
+#, python-format
+msgid "Convert: %s"
+msgstr ""
+
+#: cps/helper.py:78
 #, python-format
 msgid "Convert to %(format)s: %(book)s"
 msgstr ""
 
-#: cps/helper.py:184
+#: cps/helper.py:85
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:280
+#: cps/helper.py:90
+msgid "Calibre-Web test e-mail"
+msgstr ""
+
+#: cps/helper.py:91
+msgid "Test e-mail"
+msgstr ""
+
+#: cps/helper.py:106
+msgid "Get Started with Calibre-Web"
+msgstr ""
+
+#: cps/helper.py:107
+#, python-format
+msgid "Registration e-mail for user: %s"
+msgstr ""
+
+#: cps/helper.py:130 cps/helper.py:140
+msgid "Could not find any formats suitable for sending by e-mail"
+msgstr ""
+
+#: cps/helper.py:142 cps/templates/detail.html:44 cps/worker.py:224
+msgid "Send to Kindle"
+msgstr "发送到Kindle"
+
+#: cps/helper.py:143
+#, python-format
+msgid "E-Mail: %s"
+msgstr ""
+
+#: cps/helper.py:145
+msgid "The requested file could not be read. Maybe wrong permissions?"
+msgstr ""
+
+#: cps/helper.py:240
 #, python-format
 msgid "Rename title from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:289
+#: cps/helper.py:249
 #, python-format
 msgid "Rename author from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:312 cps/helper.py:321
+#: cps/helper.py:272 cps/helper.py:281
 #, python-format
 msgid "File %s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:339
+#: cps/helper.py:299
 #, python-format
 msgid "Book path %s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:584
+#: cps/helper.py:544
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:586
+#: cps/helper.py:546
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/web.py:1138
+#: cps/web.py:1120
 msgid "Requesting update package"
 msgstr "正在请求更新包"
 
-#: cps/web.py:1139
+#: cps/web.py:1121
 msgid "Downloading update package"
 msgstr "正在下载更新包"
 
-#: cps/web.py:1140
+#: cps/web.py:1122
 msgid "Unzipping update package"
 msgstr "正在解压更新包"
 
-#: cps/web.py:1141
+#: cps/web.py:1123
 msgid "Files are replaced"
 msgstr "文件已替换"
 
-#: cps/web.py:1142
+#: cps/web.py:1124
 msgid "Database connections are closed"
 msgstr "数据库连接已关闭"
 
-#: cps/web.py:1143
+#: cps/web.py:1125
 msgid "Server is stopped"
 msgstr "服务器已停止"
 
-#: cps/web.py:1144
+#: cps/web.py:1126
 msgid "Update finished, please press okay and reload page"
 msgstr "更新完成，请按确定并刷新页面"
 
-#: cps/web.py:1164
+#: cps/web.py:1146
 msgid "Recently Added Books"
 msgstr "最近添加的书籍"
 
-#: cps/web.py:1174
+#: cps/web.py:1156
 msgid "Newest Books"
 msgstr "最新书籍"
 
-#: cps/web.py:1186
+#: cps/web.py:1168
 msgid "Oldest Books"
 msgstr "最旧书籍"
 
-#: cps/web.py:1198
+#: cps/web.py:1180
 msgid "Books (A-Z)"
 msgstr "书籍 (A-Z)"
 
-#: cps/web.py:1209
+#: cps/web.py:1191
 msgid "Books (Z-A)"
 msgstr "书籍 (Z-A)"
 
-#: cps/web.py:1238
+#: cps/web.py:1220
 msgid "Hot Books (most downloaded)"
 msgstr "热门书籍(最多下载)"
 
-#: cps/web.py:1251
+#: cps/web.py:1233
 msgid "Best rated books"
 msgstr "最高评分书籍"
 
-#: cps/templates/index.xml:36 cps/web.py:1263
+#: cps/templates/index.xml:36 cps/web.py:1245
 msgid "Random Books"
 msgstr "随机书籍"
 
-#: cps/web.py:1278
+#: cps/web.py:1260
 msgid "Author list"
 msgstr "作者列表"
 
-#: cps/web.py:1290 cps/web.py:1353 cps/web.py:1508 cps/web.py:2060
+#: cps/web.py:1272 cps/web.py:1335 cps/web.py:1490 cps/web.py:2042
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "无法打开电子书。 文件不存在或者文件不可访问:"
 
-#: cps/templates/index.xml:73 cps/web.py:1337
+#: cps/templates/index.xml:73 cps/web.py:1319
 msgid "Series list"
 msgstr "丛书列表"
 
-#: cps/web.py:1351
+#: cps/web.py:1333
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "丛书: %(serie)s"
 
-#: cps/web.py:1378
+#: cps/web.py:1360
 msgid "Available languages"
 msgstr "可用语言"
 
-#: cps/web.py:1395
+#: cps/web.py:1377
 #, python-format
 msgid "Language: %(name)s"
 msgstr "语言: %(name)s"
 
-#: cps/templates/index.xml:66 cps/web.py:1406
+#: cps/templates/index.xml:66 cps/web.py:1388
 msgid "Category list"
 msgstr "分类列表"
 
-#: cps/web.py:1420
+#: cps/web.py:1402
 #, python-format
 msgid "Category: %(name)s"
 msgstr "分类: %(name)s"
 
-#: cps/templates/layout.html:71 cps/web.py:1559
+#: cps/templates/layout.html:71 cps/web.py:1541
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1589
+#: cps/web.py:1571
 msgid "Statistics"
 msgstr "统计"
 
-#: cps/web.py:1694
+#: cps/web.py:1676
 msgid ""
 "Callback domain is not verified, please follow steps to verify domain in "
 "google developer console"
 msgstr ""
 
-#: cps/web.py:1770
+#: cps/web.py:1752
 msgid "Server restarted, please reload page"
 msgstr "服务器已重启，请刷新页面"
 
-#: cps/web.py:1773
+#: cps/web.py:1755
 msgid "Performing shutdown of server, please close window"
 msgstr "正在关闭服务器，请关闭窗口"
 
-#: cps/web.py:1791
+#: cps/web.py:1773
 msgid "Update done"
 msgstr "更新完成"
 
-#: cps/web.py:1847 cps/web.py:1884
+#: cps/web.py:1833 cps/web.py:1870
 #, python-format
 msgid "%s: %s"
 msgstr ""
 
-#: cps/web.py:1859
+#: cps/web.py:1845
 #, python-format
 msgid "Published after %s"
 msgstr ""
 
-#: cps/web.py:1864
+#: cps/web.py:1850
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1878
+#: cps/web.py:1864
 #, python-format
 msgid "Rating <= %s"
 msgstr ""
 
-#: cps/web.py:1880
+#: cps/web.py:1866
 #, python-format
 msgid "Rating >= %s"
 msgstr ""
 
-#: cps/web.py:1939 cps/web.py:1948
+#: cps/web.py:1925 cps/web.py:1934
 msgid "search"
 msgstr "搜索"
 
 #: cps/templates/index.xml:44 cps/templates/index.xml:48
-#: cps/templates/layout.html:146 cps/web.py:2015
+#: cps/templates/layout.html:146 cps/web.py:2001
 msgid "Read Books"
 msgstr "已读书籍"
 
 #: cps/templates/index.xml:52 cps/templates/index.xml:56
-#: cps/templates/layout.html:148 cps/web.py:2018
+#: cps/templates/layout.html:148 cps/web.py:2004
 msgid "Unread Books"
 msgstr "未读书籍"
 
-#: cps/web.py:2070 cps/web.py:2072 cps/web.py:2074 cps/web.py:2086
+#: cps/web.py:2052 cps/web.py:2054 cps/web.py:2056 cps/web.py:2068
 msgid "Read a Book"
 msgstr "阅读一本书"
 
-#: cps/web.py:2152 cps/web.py:3029
+#: cps/web.py:2134 cps/web.py:3011
 msgid "Please fill out all fields!"
 msgstr "请填写所有字段"
 
-#: cps/web.py:2153 cps/web.py:2174 cps/web.py:2178 cps/web.py:2183
-#: cps/web.py:2185
+#: cps/web.py:2135 cps/web.py:2156 cps/web.py:2160 cps/web.py:2165
+#: cps/web.py:2167
 msgid "register"
 msgstr "注册"
 
-#: cps/web.py:2173 cps/web.py:3245
+#: cps/web.py:2155 cps/web.py:3227
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/web.py:2176
+#: cps/web.py:2158
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:2179
+#: cps/web.py:2161
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:2182
+#: cps/web.py:2164
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:2199 cps/web.py:2295
+#: cps/web.py:2181 cps/web.py:2277
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "您现在已以'%(nickname)s'身份登录"
 
-#: cps/web.py:2204
+#: cps/web.py:2186
 msgid "Wrong Username or Password"
 msgstr "用户名或密码错误"
 
-#: cps/web.py:2210 cps/web.py:2231
+#: cps/web.py:2192 cps/web.py:2213
 msgid "login"
 msgstr "登录"
 
-#: cps/web.py:2243 cps/web.py:2274
+#: cps/web.py:2225 cps/web.py:2256
 msgid "Token not found"
 msgstr "找不到Token"
 
-#: cps/web.py:2251 cps/web.py:2282
+#: cps/web.py:2233 cps/web.py:2264
 msgid "Token has expired"
 msgstr "Token已过期"
 
-#: cps/web.py:2259
+#: cps/web.py:2241
 msgid "Success! Please return to your device"
 msgstr "成功！请返回您的设备"
 
-#: cps/web.py:2309
+#: cps/web.py:2291
 msgid "Please configure the SMTP mail settings first..."
 msgstr "请先配置SMTP邮箱..."
 
-#: cps/web.py:2313
+#: cps/web.py:2295
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:2317
+#: cps/web.py:2299
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "发送这本书的时候出现错误: %(res)s"
 
-#: cps/web.py:2319 cps/web.py:3083
+#: cps/web.py:2301 cps/web.py:3065
 msgid "Please configure your kindle e-mail address first..."
 msgstr ""
 
-#: cps/web.py:2363
+#: cps/web.py:2345
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "此书已被添加到书架: %(sname)s"
 
-#: cps/web.py:2374
+#: cps/web.py:2356
 msgid "Invalid shelf specified"
 msgstr ""
 
-#: cps/web.py:2379
+#: cps/web.py:2361
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %s"
 msgstr ""
 
-#: cps/web.py:2384
+#: cps/web.py:2366
 msgid "User is not allowed to edit public shelves"
 msgstr ""
 
-#: cps/web.py:2402
+#: cps/web.py:2384
 #, python-format
 msgid "Books are already part of the shelf: %s"
 msgstr ""
 
-#: cps/web.py:2416
+#: cps/web.py:2398
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2418
+#: cps/web.py:2400
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2455
+#: cps/web.py:2437
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "此书已从书架 %(sname)s 中删除"
 
-#: cps/web.py:2461
+#: cps/web.py:2443
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2481 cps/web.py:2505
+#: cps/web.py:2463 cps/web.py:2487
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr "已存在书架 '%(title)s'。"
 
-#: cps/web.py:2486
+#: cps/web.py:2468
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "书架 %(title)s 已被创建"
 
-#: cps/web.py:2488 cps/web.py:2516
+#: cps/web.py:2470 cps/web.py:2498
 msgid "There was an error"
 msgstr "发生错误"
 
-#: cps/web.py:2489 cps/web.py:2491
+#: cps/web.py:2471 cps/web.py:2473
 msgid "create a shelf"
 msgstr "创建书架"
 
-#: cps/web.py:2514
+#: cps/web.py:2496
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "书架 %(title)s 已被修改"
 
-#: cps/web.py:2517 cps/web.py:2519
+#: cps/web.py:2499 cps/web.py:2501
 msgid "Edit a shelf"
 msgstr "编辑书架"
 
-#: cps/web.py:2540
+#: cps/web.py:2522
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "成功删除书架 %(name)s"
 
-#: cps/web.py:2562
+#: cps/web.py:2544
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "书架: '%(name)s'"
 
-#: cps/web.py:2565
+#: cps/web.py:2547
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "打开书架出错。书架不存在或不可访问"
 
-#: cps/web.py:2596
+#: cps/web.py:2578
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "修改书架 '%(name)s' 顺序"
 
-#: cps/web.py:2625 cps/web.py:3035
+#: cps/web.py:2607 cps/web.py:3017
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/web.py:2627 cps/web.py:2668 cps/web.py:2671
+#: cps/web.py:2609 cps/web.py:2650 cps/web.py:2653
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 的资料"
 
-#: cps/web.py:2666
+#: cps/web.py:2648
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/web.py:2669
+#: cps/web.py:2651
 msgid "Profile updated"
 msgstr "资料已更新"
 
-#: cps/web.py:2681
+#: cps/web.py:2663
 msgid "Unknown"
 msgstr ""
 
-#: cps/web.py:2695
+#: cps/web.py:2677
 msgid "Admin page"
 msgstr "管理页"
 
-#: cps/web.py:2773 cps/web.py:2945
+#: cps/web.py:2755 cps/web.py:2927
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web配置已更新"
 
-#: cps/templates/admin.html:91 cps/web.py:2786
+#: cps/templates/admin.html:91 cps/web.py:2768
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/web.py:2803
+#: cps/web.py:2785
 msgid "Import of optional Google Drive requirements missing"
 msgstr ""
 
-#: cps/web.py:2806
+#: cps/web.py:2788
 msgid "client_secrets.json is missing or not readable"
 msgstr ""
 
-#: cps/web.py:2811 cps/web.py:2838
+#: cps/web.py:2793 cps/web.py:2820
 msgid "client_secrets.json is not configured for web application"
 msgstr ""
 
-#: cps/templates/admin.html:90 cps/web.py:2841 cps/web.py:2867 cps/web.py:2879
-#: cps/web.py:2921 cps/web.py:2936 cps/web.py:2953 cps/web.py:2960
-#: cps/web.py:2977
+#: cps/templates/admin.html:90 cps/web.py:2823 cps/web.py:2849 cps/web.py:2861
+#: cps/web.py:2903 cps/web.py:2918 cps/web.py:2935 cps/web.py:2942
+#: cps/web.py:2959
 msgid "Basic Configuration"
 msgstr "基本配置"
 
-#: cps/web.py:2864
+#: cps/web.py:2846
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2876
+#: cps/web.py:2858
 msgid "Certfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2918
+#: cps/web.py:2900
 msgid "Logfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2957
+#: cps/web.py:2939
 msgid "DB location is not valid, please enter correct path"
 msgstr "DB位置无效，请输入正确路径"
 
-#: cps/templates/admin.html:31 cps/web.py:3031 cps/web.py:3037 cps/web.py:3053
+#: cps/templates/admin.html:31 cps/web.py:3013 cps/web.py:3019 cps/web.py:3035
 msgid "Add new user"
 msgstr "添加新用户"
 
-#: cps/web.py:3043
+#: cps/web.py:3025
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "用户 '%(user)s' 已被创建"
 
-#: cps/web.py:3047
+#: cps/web.py:3029
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/web.py:3071 cps/web.py:3085
+#: cps/web.py:3053 cps/web.py:3067
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/web.py:3078
+#: cps/web.py:3060
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:3081
+#: cps/web.py:3063
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/web.py:3086
+#: cps/web.py:3068
 msgid "Edit e-mail server settings"
 msgstr ""
 
-#: cps/web.py:3111
+#: cps/web.py:3093
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "用户 '%(nick)s' 已被删除"
 
-#: cps/web.py:3220
+#: cps/web.py:3202
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "用户 '%(nick)s' 已被更新"
 
-#: cps/web.py:3223
+#: cps/web.py:3205
 msgid "An unknown error occured."
 msgstr "发生未知错误。"
 
-#: cps/web.py:3225
+#: cps/web.py:3207
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "编辑用户 %(nick)s"
 
-#: cps/web.py:3242
+#: cps/web.py:3224
 #, python-format
 msgid "Password for user %s reset"
 msgstr ""
 
-#: cps/web.py:3262
+#: cps/web.py:3244
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "打开电子书出错。文件不存在或不可访问"
 
-#: cps/web.py:3294 cps/web.py:3556 cps/web.py:3561 cps/web.py:3716
+#: cps/web.py:3275 cps/web.py:3551 cps/web.py:3556 cps/web.py:3711
 msgid "edit metadata"
 msgstr "编辑元数据"
 
-#: cps/web.py:3308 cps/web.py:3586
+#: cps/web.py:3289 cps/web.py:3581
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr "不能上传后缀为　\"%s\"　的文件到此服务器"
 
-#: cps/web.py:3312 cps/web.py:3590
+#: cps/web.py:3293 cps/web.py:3585
 msgid "File to be uploaded must have an extension"
 msgstr "要上传的文件必须有一个后缀"
 
-#: cps/web.py:3324 cps/web.py:3610
+#: cps/web.py:3305 cps/web.py:3605
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "创建路径 %s 失败(权限拒绝)。"
 
-#: cps/web.py:3329
+#: cps/web.py:3310
 #, python-format
 msgid "Failed to store file %s."
 msgstr ""
 
-#: cps/web.py:3345
+#: cps/web.py:3326
 #, python-format
 msgid "File format %s added to %s"
 msgstr ""
 
-#: cps/web.py:3363
+#: cps/web.py:3344
 #, python-format
 msgid "Failed to create path for cover %s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:3370
+#: cps/web.py:3351
 #, python-format
 msgid "Failed to store cover-file %s."
 msgstr ""
 
-#: cps/web.py:3373
+#: cps/web.py:3354
 msgid "Cover-file is not a valid image file"
 msgstr ""
 
-#: cps/web.py:3386 cps/web.py:3390
+#: cps/web.py:3367 cps/web.py:3371
 msgid "unknown"
 msgstr "未知"
 
-#: cps/web.py:3412
+#: cps/web.py:3393
 msgid "Cover is not a jpg file, can't save"
 msgstr ""
 
-#: cps/web.py:3565
+#: cps/web.py:3560
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/web.py:3615
+#: cps/web.py:3610
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "存储文件 %s 失败(权限拒绝)。"
 
-#: cps/web.py:3620
+#: cps/web.py:3615
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "删除文件 %s 失败(权限拒绝)。"
 
-#: cps/web.py:3702
+#: cps/web.py:3697
 #, python-format
 msgid "File %s uploaded"
 msgstr ""
 
-#: cps/web.py:3732
+#: cps/web.py:3727
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/web.py:3742
+#: cps/web.py:3737
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/web.py:3746
+#: cps/web.py:3741
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
 
-#: cps/worker.py:215 cps/worker.py:385
+#: cps/worker.py:215 cps/worker.py:387
 msgid "Started"
 msgstr ""
 
@@ -680,19 +675,19 @@ msgstr ""
 msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr "Kindlegen 因为错误 %(error)s 失败。消息： %(message)s"
 
-#: cps/worker.py:316 cps/worker.py:375 cps/worker.py:437
+#: cps/worker.py:317 cps/worker.py:377 cps/worker.py:438
 msgid "Finished"
 msgstr ""
 
-#: cps/worker.py:342 cps/worker.py:361
+#: cps/worker.py:344 cps/worker.py:363
 msgid "Waiting"
 msgstr ""
 
-#: cps/worker.py:349
+#: cps/worker.py:351
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr ""
 
-#: cps/worker.py:463
+#: cps/worker.py:472
 msgid "Failed"
 msgstr ""
 
@@ -839,7 +834,7 @@ msgid "Ok"
 msgstr "确定"
 
 #: cps/templates/admin.html:116 cps/templates/admin.html:130
-#: cps/templates/book_edit.html:176 cps/templates/book_edit.html:198
+#: cps/templates/book_edit.html:178 cps/templates/book_edit.html:200
 #: cps/templates/config_edit.html:212 cps/templates/config_view_edit.html:164
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:75
 #: cps/templates/shelf.html:60 cps/templates/shelf_edit.html:19
@@ -875,7 +870,7 @@ msgstr "删除书籍"
 msgid "Delete formats:"
 msgstr ""
 
-#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:197
+#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:199
 #: cps/templates/email_edit.html:73 cps/templates/email_edit.html:74
 msgid "Delete"
 msgstr "删除"
@@ -888,6 +883,10 @@ msgstr ""
 msgid "Convert from:"
 msgstr ""
 
+#: cps/templates/book_edit.html:36 cps/templates/book_edit.html:43
+msgid "select an option"
+msgstr ""
+
 #: cps/templates/book_edit.html:41
 msgid "Convert to:"
 msgstr ""
@@ -900,13 +899,13 @@ msgstr ""
 msgid "Book Title"
 msgstr "书名"
 
-#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:257
-#: cps/templates/book_edit.html:275 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:259
+#: cps/templates/book_edit.html:277 cps/templates/search_form.html:10
 msgid "Author"
 msgstr "作者"
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:262
-#: cps/templates/book_edit.html:277 cps/templates/search_form.html:106
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:264
+#: cps/templates/book_edit.html:279 cps/templates/search_form.html:106
 msgid "Description"
 msgstr "简介"
 
@@ -914,114 +913,115 @@ msgstr "简介"
 msgid "Tags"
 msgstr "标签"
 
-#: cps/templates/book_edit.html:76 cps/templates/layout.html:157
+#: cps/templates/book_edit.html:75 cps/templates/layout.html:157
 #: cps/templates/search_form.html:53
 msgid "Series"
 msgstr "丛书"
 
-#: cps/templates/book_edit.html:80
+#: cps/templates/book_edit.html:79
 msgid "Series id"
 msgstr "丛书ID"
 
-#: cps/templates/book_edit.html:84
+#: cps/templates/book_edit.html:83
 msgid "Rating"
 msgstr "评分"
 
-#: cps/templates/book_edit.html:88
+#: cps/templates/book_edit.html:87
 msgid ""
 "Cover URL (jpg, cover is downloaded and stored in database, field is "
 "afterwards empty again)"
 msgstr ""
 
-#: cps/templates/book_edit.html:92
+#: cps/templates/book_edit.html:91
 msgid "Upload Cover from local drive"
 msgstr ""
 
-#: cps/templates/book_edit.html:97 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:96 cps/templates/detail.html:131
 msgid "Publishing date"
 msgstr "出版日期"
 
-#: cps/templates/book_edit.html:104 cps/templates/user_edit.html:33
+#: cps/templates/book_edit.html:103 cps/templates/book_edit.html:261
+#: cps/templates/book_edit.html:278 cps/templates/detail.html:126
+#: cps/templates/search_form.html:14
+msgid "Publisher"
+msgstr "出版社"
+
+#: cps/templates/book_edit.html:107 cps/templates/user_edit.html:33
 msgid "Language"
 msgstr "语言"
 
-#: cps/templates/book_edit.html:115 cps/templates/search_form.html:117
+#: cps/templates/book_edit.html:117 cps/templates/search_form.html:117
 msgid "Yes"
 msgstr "确认"
 
-#: cps/templates/book_edit.html:116 cps/templates/search_form.html:118
+#: cps/templates/book_edit.html:118 cps/templates/search_form.html:118
 msgid "No"
 msgstr ""
 
-#: cps/templates/book_edit.html:162
+#: cps/templates/book_edit.html:164
 msgid "Upload format"
 msgstr ""
 
-#: cps/templates/book_edit.html:171
+#: cps/templates/book_edit.html:173
 msgid "view book after edit"
 msgstr "编辑后查看书籍"
 
-#: cps/templates/book_edit.html:174 cps/templates/book_edit.html:210
+#: cps/templates/book_edit.html:176 cps/templates/book_edit.html:212
 msgid "Get metadata"
 msgstr "获取元数据"
 
-#: cps/templates/book_edit.html:175 cps/templates/config_edit.html:210
+#: cps/templates/book_edit.html:177 cps/templates/config_edit.html:210
 #: cps/templates/config_view_edit.html:163 cps/templates/login.html:20
 #: cps/templates/search_form.html:153 cps/templates/shelf_edit.html:17
 #: cps/templates/user_edit.html:151
 msgid "Submit"
 msgstr "提交"
 
-#: cps/templates/book_edit.html:189
+#: cps/templates/book_edit.html:191
 msgid "Are you really sure?"
 msgstr "您真的确认？"
 
-#: cps/templates/book_edit.html:192
+#: cps/templates/book_edit.html:194
 msgid "Book will be deleted from Calibre database"
 msgstr "书籍会被从Calibre数据库和硬盘中删除"
 
-#: cps/templates/book_edit.html:193
+#: cps/templates/book_edit.html:195
 msgid "and from hard disk"
 msgstr ""
 
-#: cps/templates/book_edit.html:213
+#: cps/templates/book_edit.html:215
 msgid "Keyword"
 msgstr "关键字"
 
-#: cps/templates/book_edit.html:214
+#: cps/templates/book_edit.html:216
 msgid " Search keyword "
 msgstr "搜索关键字"
 
-#: cps/templates/book_edit.html:216 cps/templates/layout.html:46
+#: cps/templates/book_edit.html:218 cps/templates/layout.html:46
 msgid "Go!"
 msgstr "走起！"
 
-#: cps/templates/book_edit.html:220
+#: cps/templates/book_edit.html:222
 msgid "Click the cover to load metadata to the form"
 msgstr "点击封面加载元数据到表单"
 
-#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:234 cps/templates/book_edit.html:274
 msgid "Loading..."
 msgstr "加载中..."
 
-#: cps/templates/book_edit.html:237 cps/templates/layout.html:221
+#: cps/templates/book_edit.html:239 cps/templates/layout.html:221
 msgid "Close"
 msgstr "关闭"
 
-#: cps/templates/book_edit.html:259 cps/templates/book_edit.html:276
-#: cps/templates/detail.html:126 cps/templates/search_form.html:14
-msgid "Publisher"
-msgstr "出版社"
-
-#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
+#: cps/templates/book_edit.html:266 cps/templates/book_edit.html:280
 msgid "Source"
 msgstr "来源"
 
-#: cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:275
 msgid "Search error!"
 msgstr "搜索错误"
 
-#: cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:276
 msgid "No Result(s) found! Please try aonther keyword."
 msgstr ""
 
@@ -1295,7 +1295,7 @@ msgstr ""
 msgid "Description:"
 msgstr "简介:"
 
-#: cps/templates/detail.html:189 cps/templates/search.html:16
+#: cps/templates/detail.html:189 cps/templates/search.html:14
 msgid "Add to shelf"
 msgstr "添加到书架"
 
@@ -1680,15 +1680,15 @@ msgstr "和登录"
 msgid "Once you do so, you will automatically get logged in on this device."
 msgstr "一旦您这样做了，您在这个设备上会自动登录。"
 
-#: cps/templates/search.html:6
+#: cps/templates/search.html:5
 msgid "No Results for:"
 msgstr "找不到结果:"
 
-#: cps/templates/search.html:7
+#: cps/templates/search.html:6
 msgid "Please try a different search"
 msgstr "请尝试别的关键字"
 
-#: cps/templates/search.html:9
+#: cps/templates/search.html:8
 msgid "Results for:"
 msgstr "结果:"
 
diff --git a/cps/web.py b/cps/web.py
index 7de1c62a..2a9f6d47 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -1780,6 +1780,10 @@ def search():
     term = request.args.get("query").strip().lower()
     if term:
         entries = get_search_results(term)
+        ids = list()
+        for element in entries:
+            ids.append(element.id)
+        ub.searched_ids[current_user.id] = ids
         return render_title_template('search.html', searchterm=term, entries=entries, page="search")
     else:
         return render_title_template('search.html', searchterm="", page="search")
diff --git a/messages.pot b/messages.pot
index 69e080ee..1c410118 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: 2018-08-31 14:58+0200\n"
+"POT-Creation-Date: 2018-09-03 19:09+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"
@@ -26,626 +26,621 @@ msgstr ""
 msgid "Excecution permissions missing"
 msgstr ""
 
-#: cps/helper.py:56
-#, python-format
-msgid "Epub format not found for book id: %(book)d"
-msgstr ""
-
-#: cps/helper.py:75
-#, python-format
-msgid "Convert: %s"
-msgstr ""
-
-#: cps/helper.py:84
-msgid "Calibre-Web test e-mail"
-msgstr ""
-
-#: cps/helper.py:85
-msgid "Test e-mail"
-msgstr ""
-
-#: cps/helper.py:100
-msgid "Get Started with Calibre-Web"
-msgstr ""
-
-#: cps/helper.py:101
-#, python-format
-msgid "Registration e-mail for user: %s"
-msgstr ""
-
-#: cps/helper.py:124 cps/helper.py:134
-msgid "Could not find any formats suitable for sending by e-mail"
-msgstr ""
-
-#: cps/helper.py:136 cps/templates/detail.html:44 cps/worker.py:224
-msgid "Send to Kindle"
-msgstr ""
-
-#: cps/helper.py:137
-#, python-format
-msgid "E-Mail: %s"
-msgstr ""
-
-#: cps/helper.py:139
-msgid "The requested file could not be read. Maybe wrong permissions?"
-msgstr ""
-
-#: cps/helper.py:147
+#: cps/helper.py:57
 #, python-format
 msgid "%(format)s format not found for book id: %(book)d"
 msgstr ""
 
-#: cps/helper.py:159
+#: cps/helper.py:69
 #, python-format
 msgid "%(format)s not found on Google Drive: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:171 cps/helper.py:178
+#: cps/helper.py:76
+#, python-format
+msgid "Convert: %s"
+msgstr ""
+
+#: cps/helper.py:78
 #, python-format
 msgid "Convert to %(format)s: %(book)s"
 msgstr ""
 
-#: cps/helper.py:184
+#: cps/helper.py:85
 #, python-format
 msgid "%(format)s not found: %(fn)s"
 msgstr ""
 
-#: cps/helper.py:280
+#: cps/helper.py:90
+msgid "Calibre-Web test e-mail"
+msgstr ""
+
+#: cps/helper.py:91
+msgid "Test e-mail"
+msgstr ""
+
+#: cps/helper.py:106
+msgid "Get Started with Calibre-Web"
+msgstr ""
+
+#: cps/helper.py:107
+#, python-format
+msgid "Registration e-mail for user: %s"
+msgstr ""
+
+#: cps/helper.py:130 cps/helper.py:140
+msgid "Could not find any formats suitable for sending by e-mail"
+msgstr ""
+
+#: cps/helper.py:142 cps/templates/detail.html:44 cps/worker.py:224
+msgid "Send to Kindle"
+msgstr ""
+
+#: cps/helper.py:143
+#, python-format
+msgid "E-Mail: %s"
+msgstr ""
+
+#: cps/helper.py:145
+msgid "The requested file could not be read. Maybe wrong permissions?"
+msgstr ""
+
+#: cps/helper.py:240
 #, python-format
 msgid "Rename title from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:289
+#: cps/helper.py:249
 #, python-format
 msgid "Rename author from: \"%s\" to \"%s\" failed with error: %s"
 msgstr ""
 
-#: cps/helper.py:312 cps/helper.py:321
+#: cps/helper.py:272 cps/helper.py:281
 #, python-format
 msgid "File %s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:339
+#: cps/helper.py:299
 #, python-format
 msgid "Book path %s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:584
+#: cps/helper.py:544
 msgid "Error excecuting UnRar"
 msgstr ""
 
-#: cps/helper.py:586
+#: cps/helper.py:546
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/web.py:1138
+#: cps/web.py:1120
 msgid "Requesting update package"
 msgstr ""
 
-#: cps/web.py:1139
+#: cps/web.py:1121
 msgid "Downloading update package"
 msgstr ""
 
-#: cps/web.py:1140
+#: cps/web.py:1122
 msgid "Unzipping update package"
 msgstr ""
 
-#: cps/web.py:1141
+#: cps/web.py:1123
 msgid "Files are replaced"
 msgstr ""
 
-#: cps/web.py:1142
+#: cps/web.py:1124
 msgid "Database connections are closed"
 msgstr ""
 
-#: cps/web.py:1143
+#: cps/web.py:1125
 msgid "Server is stopped"
 msgstr ""
 
-#: cps/web.py:1144
+#: cps/web.py:1126
 msgid "Update finished, please press okay and reload page"
 msgstr ""
 
-#: cps/web.py:1164
+#: cps/web.py:1146
 msgid "Recently Added Books"
 msgstr ""
 
-#: cps/web.py:1174
+#: cps/web.py:1156
 msgid "Newest Books"
 msgstr ""
 
-#: cps/web.py:1186
+#: cps/web.py:1168
 msgid "Oldest Books"
 msgstr ""
 
-#: cps/web.py:1198
+#: cps/web.py:1180
 msgid "Books (A-Z)"
 msgstr ""
 
-#: cps/web.py:1209
+#: cps/web.py:1191
 msgid "Books (Z-A)"
 msgstr ""
 
-#: cps/web.py:1238
+#: cps/web.py:1220
 msgid "Hot Books (most downloaded)"
 msgstr ""
 
-#: cps/web.py:1251
+#: cps/web.py:1233
 msgid "Best rated books"
 msgstr ""
 
-#: cps/templates/index.xml:36 cps/web.py:1263
+#: cps/templates/index.xml:36 cps/web.py:1245
 msgid "Random Books"
 msgstr ""
 
-#: cps/web.py:1278
+#: cps/web.py:1260
 msgid "Author list"
 msgstr ""
 
-#: cps/web.py:1290 cps/web.py:1353 cps/web.py:1508 cps/web.py:2060
+#: cps/web.py:1272 cps/web.py:1335 cps/web.py:1490 cps/web.py:2042
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr ""
 
-#: cps/templates/index.xml:73 cps/web.py:1337
+#: cps/templates/index.xml:73 cps/web.py:1319
 msgid "Series list"
 msgstr ""
 
-#: cps/web.py:1351
+#: cps/web.py:1333
 #, python-format
 msgid "Series: %(serie)s"
 msgstr ""
 
-#: cps/web.py:1378
+#: cps/web.py:1360
 msgid "Available languages"
 msgstr ""
 
-#: cps/web.py:1395
+#: cps/web.py:1377
 #, python-format
 msgid "Language: %(name)s"
 msgstr ""
 
-#: cps/templates/index.xml:66 cps/web.py:1406
+#: cps/templates/index.xml:66 cps/web.py:1388
 msgid "Category list"
 msgstr ""
 
-#: cps/web.py:1420
+#: cps/web.py:1402
 #, python-format
 msgid "Category: %(name)s"
 msgstr ""
 
-#: cps/templates/layout.html:71 cps/web.py:1559
+#: cps/templates/layout.html:71 cps/web.py:1541
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1589
+#: cps/web.py:1571
 msgid "Statistics"
 msgstr ""
 
-#: cps/web.py:1694
+#: cps/web.py:1676
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr ""
 
-#: cps/web.py:1770
+#: cps/web.py:1752
 msgid "Server restarted, please reload page"
 msgstr ""
 
-#: cps/web.py:1773
+#: cps/web.py:1755
 msgid "Performing shutdown of server, please close window"
 msgstr ""
 
-#: cps/web.py:1791
+#: cps/web.py:1773
 msgid "Update done"
 msgstr ""
 
-#: cps/web.py:1847 cps/web.py:1884
+#: cps/web.py:1833 cps/web.py:1870
 #, python-format
 msgid "%s: %s"
 msgstr ""
 
-#: cps/web.py:1859
+#: cps/web.py:1845
 #, python-format
 msgid "Published after %s"
 msgstr ""
 
-#: cps/web.py:1864
+#: cps/web.py:1850
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1878
+#: cps/web.py:1864
 #, python-format
 msgid "Rating <= %s"
 msgstr ""
 
-#: cps/web.py:1880
+#: cps/web.py:1866
 #, python-format
 msgid "Rating >= %s"
 msgstr ""
 
-#: cps/web.py:1939 cps/web.py:1948
+#: cps/web.py:1925 cps/web.py:1934
 msgid "search"
 msgstr ""
 
 #: cps/templates/index.xml:44 cps/templates/index.xml:48
-#: cps/templates/layout.html:146 cps/web.py:2015
+#: cps/templates/layout.html:146 cps/web.py:2001
 msgid "Read Books"
 msgstr ""
 
 #: cps/templates/index.xml:52 cps/templates/index.xml:56
-#: cps/templates/layout.html:148 cps/web.py:2018
+#: cps/templates/layout.html:148 cps/web.py:2004
 msgid "Unread Books"
 msgstr ""
 
-#: cps/web.py:2070 cps/web.py:2072 cps/web.py:2074 cps/web.py:2086
+#: cps/web.py:2052 cps/web.py:2054 cps/web.py:2056 cps/web.py:2068
 msgid "Read a Book"
 msgstr ""
 
-#: cps/web.py:2152 cps/web.py:3029
+#: cps/web.py:2134 cps/web.py:3011
 msgid "Please fill out all fields!"
 msgstr ""
 
-#: cps/web.py:2153 cps/web.py:2174 cps/web.py:2178 cps/web.py:2183
-#: cps/web.py:2185
+#: cps/web.py:2135 cps/web.py:2156 cps/web.py:2160 cps/web.py:2165
+#: cps/web.py:2167
 msgid "register"
 msgstr ""
 
-#: cps/web.py:2173 cps/web.py:3245
+#: cps/web.py:2155 cps/web.py:3227
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/web.py:2176
+#: cps/web.py:2158
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:2179
+#: cps/web.py:2161
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:2182
+#: cps/web.py:2164
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:2199 cps/web.py:2295
+#: cps/web.py:2181 cps/web.py:2277
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:2204
+#: cps/web.py:2186
 msgid "Wrong Username or Password"
 msgstr ""
 
-#: cps/web.py:2210 cps/web.py:2231
+#: cps/web.py:2192 cps/web.py:2213
 msgid "login"
 msgstr ""
 
-#: cps/web.py:2243 cps/web.py:2274
+#: cps/web.py:2225 cps/web.py:2256
 msgid "Token not found"
 msgstr ""
 
-#: cps/web.py:2251 cps/web.py:2282
+#: cps/web.py:2233 cps/web.py:2264
 msgid "Token has expired"
 msgstr ""
 
-#: cps/web.py:2259
+#: cps/web.py:2241
 msgid "Success! Please return to your device"
 msgstr ""
 
-#: cps/web.py:2309
+#: cps/web.py:2291
 msgid "Please configure the SMTP mail settings first..."
 msgstr ""
 
-#: cps/web.py:2313
+#: cps/web.py:2295
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:2317
+#: cps/web.py:2299
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:2319 cps/web.py:3083
+#: cps/web.py:2301 cps/web.py:3065
 msgid "Please configure your kindle e-mail address first..."
 msgstr ""
 
-#: cps/web.py:2363
+#: cps/web.py:2345
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2374
+#: cps/web.py:2356
 msgid "Invalid shelf specified"
 msgstr ""
 
-#: cps/web.py:2379
+#: cps/web.py:2361
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %s"
 msgstr ""
 
-#: cps/web.py:2384
+#: cps/web.py:2366
 msgid "User is not allowed to edit public shelves"
 msgstr ""
 
-#: cps/web.py:2402
+#: cps/web.py:2384
 #, python-format
 msgid "Books are already part of the shelf: %s"
 msgstr ""
 
-#: cps/web.py:2416
+#: cps/web.py:2398
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2418
+#: cps/web.py:2400
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2455
+#: cps/web.py:2437
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2461
+#: cps/web.py:2443
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2481 cps/web.py:2505
+#: cps/web.py:2463 cps/web.py:2487
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/web.py:2486
+#: cps/web.py:2468
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr ""
 
-#: cps/web.py:2488 cps/web.py:2516
+#: cps/web.py:2470 cps/web.py:2498
 msgid "There was an error"
 msgstr ""
 
-#: cps/web.py:2489 cps/web.py:2491
+#: cps/web.py:2471 cps/web.py:2473
 msgid "create a shelf"
 msgstr ""
 
-#: cps/web.py:2514
+#: cps/web.py:2496
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr ""
 
-#: cps/web.py:2517 cps/web.py:2519
+#: cps/web.py:2499 cps/web.py:2501
 msgid "Edit a shelf"
 msgstr ""
 
-#: cps/web.py:2540
+#: cps/web.py:2522
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr ""
 
-#: cps/web.py:2562
+#: cps/web.py:2544
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/web.py:2565
+#: cps/web.py:2547
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:2596
+#: cps/web.py:2578
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/web.py:2625 cps/web.py:3035
+#: cps/web.py:2607 cps/web.py:3017
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/web.py:2627 cps/web.py:2668 cps/web.py:2671
+#: cps/web.py:2609 cps/web.py:2650 cps/web.py:2653
 #, python-format
 msgid "%(name)s's profile"
 msgstr ""
 
-#: cps/web.py:2666
+#: cps/web.py:2648
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/web.py:2669
+#: cps/web.py:2651
 msgid "Profile updated"
 msgstr ""
 
-#: cps/web.py:2681
+#: cps/web.py:2663
 msgid "Unknown"
 msgstr ""
 
-#: cps/web.py:2695
+#: cps/web.py:2677
 msgid "Admin page"
 msgstr ""
 
-#: cps/web.py:2773 cps/web.py:2945
+#: cps/web.py:2755 cps/web.py:2927
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
-#: cps/templates/admin.html:91 cps/web.py:2786
+#: cps/templates/admin.html:91 cps/web.py:2768
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/web.py:2803
+#: cps/web.py:2785
 msgid "Import of optional Google Drive requirements missing"
 msgstr ""
 
-#: cps/web.py:2806
+#: cps/web.py:2788
 msgid "client_secrets.json is missing or not readable"
 msgstr ""
 
-#: cps/web.py:2811 cps/web.py:2838
+#: cps/web.py:2793 cps/web.py:2820
 msgid "client_secrets.json is not configured for web application"
 msgstr ""
 
-#: cps/templates/admin.html:90 cps/web.py:2841 cps/web.py:2867 cps/web.py:2879
-#: cps/web.py:2921 cps/web.py:2936 cps/web.py:2953 cps/web.py:2960
-#: cps/web.py:2977
+#: cps/templates/admin.html:90 cps/web.py:2823 cps/web.py:2849 cps/web.py:2861
+#: cps/web.py:2903 cps/web.py:2918 cps/web.py:2935 cps/web.py:2942
+#: cps/web.py:2959
 msgid "Basic Configuration"
 msgstr ""
 
-#: cps/web.py:2864
+#: cps/web.py:2846
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2876
+#: cps/web.py:2858
 msgid "Certfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2918
+#: cps/web.py:2900
 msgid "Logfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2957
+#: cps/web.py:2939
 msgid "DB location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/templates/admin.html:31 cps/web.py:3031 cps/web.py:3037 cps/web.py:3053
+#: cps/templates/admin.html:31 cps/web.py:3013 cps/web.py:3019 cps/web.py:3035
 msgid "Add new user"
 msgstr ""
 
-#: cps/web.py:3043
+#: cps/web.py:3025
 #, python-format
 msgid "User '%(user)s' created"
 msgstr ""
 
-#: cps/web.py:3047
+#: cps/web.py:3029
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/web.py:3071 cps/web.py:3085
+#: cps/web.py:3053 cps/web.py:3067
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/web.py:3078
+#: cps/web.py:3060
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:3081
+#: cps/web.py:3063
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/web.py:3086
+#: cps/web.py:3068
 msgid "Edit e-mail server settings"
 msgstr ""
 
-#: cps/web.py:3111
+#: cps/web.py:3093
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr ""
 
-#: cps/web.py:3220
+#: cps/web.py:3202
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr ""
 
-#: cps/web.py:3223
+#: cps/web.py:3205
 msgid "An unknown error occured."
 msgstr ""
 
-#: cps/web.py:3225
+#: cps/web.py:3207
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr ""
 
-#: cps/web.py:3242
+#: cps/web.py:3224
 #, python-format
 msgid "Password for user %s reset"
 msgstr ""
 
-#: cps/web.py:3262
+#: cps/web.py:3244
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr ""
 
-#: cps/web.py:3294 cps/web.py:3556 cps/web.py:3561 cps/web.py:3716
+#: cps/web.py:3275 cps/web.py:3551 cps/web.py:3556 cps/web.py:3711
 msgid "edit metadata"
 msgstr ""
 
-#: cps/web.py:3308 cps/web.py:3586
+#: cps/web.py:3289 cps/web.py:3581
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr ""
 
-#: cps/web.py:3312 cps/web.py:3590
+#: cps/web.py:3293 cps/web.py:3585
 msgid "File to be uploaded must have an extension"
 msgstr ""
 
-#: cps/web.py:3324 cps/web.py:3610
+#: cps/web.py:3305 cps/web.py:3605
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:3329
+#: cps/web.py:3310
 #, python-format
 msgid "Failed to store file %s."
 msgstr ""
 
-#: cps/web.py:3345
+#: cps/web.py:3326
 #, python-format
 msgid "File format %s added to %s"
 msgstr ""
 
-#: cps/web.py:3363
+#: cps/web.py:3344
 #, python-format
 msgid "Failed to create path for cover %s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:3370
+#: cps/web.py:3351
 #, python-format
 msgid "Failed to store cover-file %s."
 msgstr ""
 
-#: cps/web.py:3373
+#: cps/web.py:3354
 msgid "Cover-file is not a valid image file"
 msgstr ""
 
-#: cps/web.py:3386 cps/web.py:3390
+#: cps/web.py:3367 cps/web.py:3371
 msgid "unknown"
 msgstr ""
 
-#: cps/web.py:3412
+#: cps/web.py:3393
 msgid "Cover is not a jpg file, can't save"
 msgstr ""
 
-#: cps/web.py:3565
+#: cps/web.py:3560
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/web.py:3615
+#: cps/web.py:3610
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:3620
+#: cps/web.py:3615
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:3702
+#: cps/web.py:3697
 #, python-format
 msgid "File %s uploaded"
 msgstr ""
 
-#: cps/web.py:3732
+#: cps/web.py:3727
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/web.py:3742
+#: cps/web.py:3737
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/web.py:3746
+#: cps/web.py:3741
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
 
-#: cps/worker.py:215 cps/worker.py:385
+#: cps/worker.py:215 cps/worker.py:387
 msgid "Started"
 msgstr ""
 
@@ -669,19 +664,19 @@ msgstr ""
 msgid "Kindlegen failed with Error %(error)s. Message: %(message)s"
 msgstr ""
 
-#: cps/worker.py:316 cps/worker.py:375 cps/worker.py:437
+#: cps/worker.py:317 cps/worker.py:377 cps/worker.py:438
 msgid "Finished"
 msgstr ""
 
-#: cps/worker.py:342 cps/worker.py:361
+#: cps/worker.py:344 cps/worker.py:363
 msgid "Waiting"
 msgstr ""
 
-#: cps/worker.py:349
+#: cps/worker.py:351
 msgid "This e-mail has been sent via Calibre-Web."
 msgstr ""
 
-#: cps/worker.py:463
+#: cps/worker.py:472
 msgid "Failed"
 msgstr ""
 
@@ -828,7 +823,7 @@ msgid "Ok"
 msgstr ""
 
 #: cps/templates/admin.html:116 cps/templates/admin.html:130
-#: cps/templates/book_edit.html:176 cps/templates/book_edit.html:198
+#: cps/templates/book_edit.html:178 cps/templates/book_edit.html:200
 #: cps/templates/config_edit.html:212 cps/templates/config_view_edit.html:164
 #: cps/templates/email_edit.html:40 cps/templates/email_edit.html:75
 #: cps/templates/shelf.html:60 cps/templates/shelf_edit.html:19
@@ -864,7 +859,7 @@ msgstr ""
 msgid "Delete formats:"
 msgstr ""
 
-#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:197
+#: cps/templates/book_edit.html:22 cps/templates/book_edit.html:199
 #: cps/templates/email_edit.html:73 cps/templates/email_edit.html:74
 msgid "Delete"
 msgstr ""
@@ -877,6 +872,10 @@ msgstr ""
 msgid "Convert from:"
 msgstr ""
 
+#: cps/templates/book_edit.html:36 cps/templates/book_edit.html:43
+msgid "select an option"
+msgstr ""
+
 #: cps/templates/book_edit.html:41
 msgid "Convert to:"
 msgstr ""
@@ -889,13 +888,13 @@ msgstr ""
 msgid "Book Title"
 msgstr ""
 
-#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:257
-#: cps/templates/book_edit.html:275 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:63 cps/templates/book_edit.html:259
+#: cps/templates/book_edit.html:277 cps/templates/search_form.html:10
 msgid "Author"
 msgstr ""
 
-#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:262
-#: cps/templates/book_edit.html:277 cps/templates/search_form.html:106
+#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:264
+#: cps/templates/book_edit.html:279 cps/templates/search_form.html:106
 msgid "Description"
 msgstr ""
 
@@ -903,112 +902,113 @@ msgstr ""
 msgid "Tags"
 msgstr ""
 
-#: cps/templates/book_edit.html:76 cps/templates/layout.html:157
+#: cps/templates/book_edit.html:75 cps/templates/layout.html:157
 #: cps/templates/search_form.html:53
 msgid "Series"
 msgstr ""
 
-#: cps/templates/book_edit.html:80
+#: cps/templates/book_edit.html:79
 msgid "Series id"
 msgstr ""
 
-#: cps/templates/book_edit.html:84
+#: cps/templates/book_edit.html:83
 msgid "Rating"
 msgstr ""
 
-#: cps/templates/book_edit.html:88
+#: cps/templates/book_edit.html:87
 msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
 msgstr ""
 
-#: cps/templates/book_edit.html:92
+#: cps/templates/book_edit.html:91
 msgid "Upload Cover from local drive"
 msgstr ""
 
-#: cps/templates/book_edit.html:97 cps/templates/detail.html:131
+#: cps/templates/book_edit.html:96 cps/templates/detail.html:131
 msgid "Publishing date"
 msgstr ""
 
-#: cps/templates/book_edit.html:104 cps/templates/user_edit.html:33
+#: cps/templates/book_edit.html:103 cps/templates/book_edit.html:261
+#: cps/templates/book_edit.html:278 cps/templates/detail.html:126
+#: cps/templates/search_form.html:14
+msgid "Publisher"
+msgstr ""
+
+#: cps/templates/book_edit.html:107 cps/templates/user_edit.html:33
 msgid "Language"
 msgstr ""
 
-#: cps/templates/book_edit.html:115 cps/templates/search_form.html:117
+#: cps/templates/book_edit.html:117 cps/templates/search_form.html:117
 msgid "Yes"
 msgstr ""
 
-#: cps/templates/book_edit.html:116 cps/templates/search_form.html:118
+#: cps/templates/book_edit.html:118 cps/templates/search_form.html:118
 msgid "No"
 msgstr ""
 
-#: cps/templates/book_edit.html:162
+#: cps/templates/book_edit.html:164
 msgid "Upload format"
 msgstr ""
 
-#: cps/templates/book_edit.html:171
+#: cps/templates/book_edit.html:173
 msgid "view book after edit"
 msgstr ""
 
-#: cps/templates/book_edit.html:174 cps/templates/book_edit.html:210
+#: cps/templates/book_edit.html:176 cps/templates/book_edit.html:212
 msgid "Get metadata"
 msgstr ""
 
-#: cps/templates/book_edit.html:175 cps/templates/config_edit.html:210
+#: cps/templates/book_edit.html:177 cps/templates/config_edit.html:210
 #: cps/templates/config_view_edit.html:163 cps/templates/login.html:20
 #: cps/templates/search_form.html:153 cps/templates/shelf_edit.html:17
 #: cps/templates/user_edit.html:151
 msgid "Submit"
 msgstr ""
 
-#: cps/templates/book_edit.html:189
+#: cps/templates/book_edit.html:191
 msgid "Are you really sure?"
 msgstr ""
 
-#: cps/templates/book_edit.html:192
+#: cps/templates/book_edit.html:194
 msgid "Book will be deleted from Calibre database"
 msgstr ""
 
-#: cps/templates/book_edit.html:193
+#: cps/templates/book_edit.html:195
 msgid "and from hard disk"
 msgstr ""
 
-#: cps/templates/book_edit.html:213
+#: cps/templates/book_edit.html:215
 msgid "Keyword"
 msgstr ""
 
-#: cps/templates/book_edit.html:214
+#: cps/templates/book_edit.html:216
 msgid " Search keyword "
 msgstr ""
 
-#: cps/templates/book_edit.html:216 cps/templates/layout.html:46
+#: cps/templates/book_edit.html:218 cps/templates/layout.html:46
 msgid "Go!"
 msgstr ""
 
-#: cps/templates/book_edit.html:220
+#: cps/templates/book_edit.html:222
 msgid "Click the cover to load metadata to the form"
 msgstr ""
 
-#: cps/templates/book_edit.html:232 cps/templates/book_edit.html:272
+#: cps/templates/book_edit.html:234 cps/templates/book_edit.html:274
 msgid "Loading..."
 msgstr ""
 
-#: cps/templates/book_edit.html:237 cps/templates/layout.html:221
+#: cps/templates/book_edit.html:239 cps/templates/layout.html:221
 msgid "Close"
 msgstr ""
 
-#: cps/templates/book_edit.html:259 cps/templates/book_edit.html:276
-#: cps/templates/detail.html:126 cps/templates/search_form.html:14
-msgid "Publisher"
-msgstr ""
-
-#: cps/templates/book_edit.html:264 cps/templates/book_edit.html:278
+#: cps/templates/book_edit.html:266 cps/templates/book_edit.html:280
 msgid "Source"
 msgstr ""
 
-#: cps/templates/book_edit.html:273
+#: cps/templates/book_edit.html:275
 msgid "Search error!"
 msgstr ""
 
-#: cps/templates/book_edit.html:274
+#: cps/templates/book_edit.html:276
 msgid "No Result(s) found! Please try aonther keyword."
 msgstr ""
 
@@ -1282,7 +1282,7 @@ msgstr ""
 msgid "Description:"
 msgstr ""
 
-#: cps/templates/detail.html:189 cps/templates/search.html:16
+#: cps/templates/detail.html:189 cps/templates/search.html:14
 msgid "Add to shelf"
 msgstr ""
 
@@ -1667,15 +1667,15 @@ msgstr ""
 msgid "Once you do so, you will automatically get logged in on this device."
 msgstr ""
 
-#: cps/templates/search.html:6
+#: cps/templates/search.html:5
 msgid "No Results for:"
 msgstr ""
 
-#: cps/templates/search.html:7
+#: cps/templates/search.html:6
 msgid "Please try a different search"
 msgstr ""
 
-#: cps/templates/search.html:9
+#: cps/templates/search.html:8
 msgid "Results for:"
 msgstr ""