diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index 46b0e815..e2907624 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -26,7 +26,7 @@
     {% endif %}
 {% endif %}
 
-{%  if display_convertbtn and conversion_formats|length > 0 %}
+{%  if source_formats|length > 0 and conversion_formats|length > 0 %}
   <div class="text-center more-stuff"><h4>{{_('Convert book format:')}}</h4>
       <form class="padded-bottom" action="{{ url_for('convert_bookformat', book_id=book.id) }}" method="post" id="book_convert_frm">
           <div class="form-group">
@@ -34,8 +34,8 @@
                   <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>
-                    {% for file in book.data %}
-                    <option>{{file.format}} </option>
+                    {% for format in source_formats %}
+                    <option>{{format|upper}} </option>
                     {% endfor %}
                   </select>
                   <label class="control-label" for="book_format_to">{{_('Convert to:')}}</label>
diff --git a/cps/translations/de/LC_MESSAGES/messages.po b/cps/translations/de/LC_MESSAGES/messages.po
index 44b85228..0a3a4b1c 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-09-08 14:49+0200\n"
+"POT-Creation-Date: 2018-09-09 17:57+0200\n"
 "PO-Revision-Date: 2016-07-12 19:54+0200\n"
 "Last-Translator: Ozzie Isaacs\n"
 "Language: de\n"
@@ -85,9 +85,7 @@ msgstr "Registrierungs E-Mail für Benutzer %(name)s"
 
 #: cps/helper.py:131 cps/helper.py:141
 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"
+msgstr "Es konnten keine passenden Formate für das Versenden per E-Mail gefunden werden"
 
 #: cps/helper.py:143 cps/templates/detail.html:44 cps/worker.py:224
 msgid "Send to Kindle"
@@ -100,23 +98,17 @@ msgstr "E-Mail: %(book)s"
 
 #: cps/helper.py:146
 msgid "The requested file could not be read. Maybe wrong permissions?"
-msgstr ""
-"Die angeforderte Datei konnte nicht gelesen werden. Evtl. falsche "
-"Zugriffsrechte?"
+msgstr "Die angeforderte Datei konnte nicht gelesen werden. Evtl. falsche Zugriffsrechte?"
 
 #: cps/helper.py:241
 #, python-format
 msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr ""
-"Umbenennen des Titelpfades '%(src)s' nach '%(dest)s' schlug fehl: "
-"%(error)s"
+msgstr "Umbenennen des Titelpfades '%(src)s' nach '%(dest)s' schlug fehl: %(error)s"
 
 #: cps/helper.py:250
 #, python-format
 msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
-msgstr ""
-"Umbenennen des Authorpfades '%(src)s' nach '%(dest)s' schlug fehl: "
-"%(error)s"
+msgstr "Umbenennen des Authorpfades '%(src)s' nach '%(dest)s' schlug fehl: %(error)s"
 
 #: cps/helper.py:272 cps/helper.py:281
 #, python-format
@@ -136,535 +128,528 @@ msgstr "Fehler bei der Ausführung von UnRar"
 msgid "Unrar binary file not found"
 msgstr "UnRar Datei nicht gefunden"
 
-#: cps/web.py:1114
+#: cps/web.py:1127
 msgid "Requesting update package"
 msgstr "Frage Update Paket an"
 
-#: cps/web.py:1115
+#: cps/web.py:1128
 msgid "Downloading update package"
 msgstr "Lade Update Paket herunter"
 
-#: cps/web.py:1116
+#: cps/web.py:1129
 msgid "Unzipping update package"
 msgstr "Entpacke Update Paket"
 
-#: cps/web.py:1117
+#: cps/web.py:1130
 msgid "Files are replaced"
 msgstr "Ersetze Dateien"
 
-#: cps/web.py:1118
+#: cps/web.py:1131
 msgid "Database connections are closed"
 msgstr "Schließe Datenbankverbindungen"
 
-#: cps/web.py:1119
+#: cps/web.py:1132
 msgid "Server is stopped"
 msgstr "Stoppe Server"
 
-#: cps/web.py:1120
+#: cps/web.py:1133
 msgid "Update finished, please press okay and reload page"
 msgstr "Update abgeschlossen, bitte okay drücken und Seite neu laden"
 
-#: cps/web.py:1140
+#: cps/web.py:1153
 msgid "Recently Added Books"
 msgstr "Kürzlich hinzugefügte Bücher"
 
-#: cps/web.py:1150
+#: cps/web.py:1163
 msgid "Newest Books"
 msgstr "Neueste Bücher"
 
-#: cps/web.py:1162
+#: cps/web.py:1175
 msgid "Oldest Books"
 msgstr "Älteste Bücher"
 
-#: cps/web.py:1174
+#: cps/web.py:1187
 msgid "Books (A-Z)"
 msgstr "Bücher (A-Z)"
 
-#: cps/web.py:1185
+#: cps/web.py:1198
 msgid "Books (Z-A)"
 msgstr "Bücher (Z-A)"
 
-#: cps/web.py:1214
+#: cps/web.py:1227
 msgid "Hot Books (most downloaded)"
 msgstr "Beliebte Bücher (die meisten Downloads)"
 
-#: cps/web.py:1227
+#: cps/web.py:1240
 msgid "Best rated books"
 msgstr "Best bewertete Bücher"
 
-#: cps/templates/index.xml:36 cps/web.py:1239
+#: cps/templates/index.xml:36 cps/web.py:1252
 msgid "Random Books"
 msgstr "Zufällige Bücher"
 
-#: cps/web.py:1254
+#: cps/web.py:1267
 msgid "Author list"
 msgstr "Autorenliste"
 
-#: cps/web.py:1266 cps/web.py:1329 cps/web.py:1484 cps/web.py:2036
+#: cps/web.py:1279 cps/web.py:1342 cps/web.py:1497 cps/web.py:2049
 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."
+msgstr "Buch öffnen fehlgeschlagen. Datei existiert nicht, oder ist nicht zugänglich."
 
-#: cps/templates/index.xml:73 cps/web.py:1313
+#: cps/templates/index.xml:73 cps/web.py:1326
 msgid "Series list"
 msgstr "Liste Serien"
 
-#: cps/web.py:1327
+#: cps/web.py:1340
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie: %(serie)s"
 
-#: cps/web.py:1354
+#: cps/web.py:1367
 msgid "Available languages"
 msgstr "Verfügbare Sprachen"
 
-#: cps/web.py:1371
+#: cps/web.py:1384
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Sprache: %(name)s"
 
-#: cps/templates/index.xml:66 cps/web.py:1382
+#: cps/templates/index.xml:66 cps/web.py:1395
 msgid "Category list"
 msgstr "Kategorieliste"
 
-#: cps/web.py:1396
+#: cps/web.py:1409
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategorie: %(name)s"
 
-#: cps/templates/layout.html:71 cps/web.py:1535
+#: cps/templates/layout.html:71 cps/web.py:1548
 msgid "Tasks"
 msgstr "Aufgaben"
 
-#: cps/web.py:1565
+#: cps/web.py:1578
 msgid "Statistics"
 msgstr "Statistiken"
 
-#: cps/web.py:1670
-msgid ""
-"Callback domain is not verified, please follow steps to verify domain in "
-"google developer console"
-msgstr ""
-"Callback Domain ist nicht verifiziert, bitte Domain in der Google "
-"Developer Console verifizieren"
+#: cps/web.py:1683
+msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
+msgstr "Callback Domain ist nicht verifiziert, bitte Domain in der Google Developer Console verifizieren"
 
-#: cps/web.py:1746
+#: cps/web.py:1758
 msgid "Server restarted, please reload page"
 msgstr "Server neu gestartet,bitte Seite neu laden"
 
-#: cps/web.py:1749
+#: cps/web.py:1761
 msgid "Performing shutdown of server, please close window"
 msgstr "Server wird runtergefahren, bitte Fenster schließen"
 
-#: cps/web.py:1767
+#: cps/web.py:1780
 msgid "Update done"
 msgstr "Update durchgeführt"
 
-#: cps/web.py:1837
+#: cps/web.py:1850
 msgid "Published after "
 msgstr "Herausgegeben nach dem "
 
-#: cps/web.py:1844
+#: cps/web.py:1857
 msgid "Published before "
 msgstr "Herausgegeben vor dem "
 
-#: cps/web.py:1858
+#: cps/web.py:1871
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Bewertung <= %(rating)s"
 
-#: cps/web.py:1860
+#: cps/web.py:1873
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Bewertung >= %(rating)s"
 
-#: cps/web.py:1919 cps/web.py:1928
+#: cps/web.py:1932 cps/web.py:1941
 msgid "search"
 msgstr "Suche"
 
 #: cps/templates/index.xml:44 cps/templates/index.xml:48
-#: cps/templates/layout.html:146 cps/web.py:1995
+#: cps/templates/layout.html:146 cps/web.py:2008
 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:1998
+#: cps/templates/layout.html:148 cps/web.py:2011
 msgid "Unread Books"
 msgstr "Ungelesene Bücher"
 
-#: cps/web.py:2046 cps/web.py:2048 cps/web.py:2050 cps/web.py:2062
+#: cps/web.py:2059 cps/web.py:2061 cps/web.py:2063 cps/web.py:2075
 msgid "Read a Book"
 msgstr "Lese ein Buch"
 
-#: cps/web.py:2128 cps/web.py:3006
+#: cps/web.py:2141 cps/web.py:3019
 msgid "Please fill out all fields!"
 msgstr "Bitte alle Felder ausfüllen!"
 
-#: cps/web.py:2129 cps/web.py:2150 cps/web.py:2154 cps/web.py:2159
-#: cps/web.py:2161
+#: cps/web.py:2142 cps/web.py:2163 cps/web.py:2167 cps/web.py:2172
+#: cps/web.py:2174
 msgid "register"
 msgstr "Registieren"
 
-#: cps/web.py:2149 cps/web.py:3222
+#: cps/web.py:2162 cps/web.py:3235
 msgid "An unknown error occurred. Please try again later."
 msgstr "Es ist ein unbekannter Fehler aufgetreten. Bitte später erneut versuchen."
 
-#: cps/web.py:2152
+#: cps/web.py:2165
 msgid "Your e-mail is not allowed to register"
 msgstr "Diese E-Mail ist nicht für die Registrierung zugelassen"
 
-#: cps/web.py:2155
+#: cps/web.py:2168
 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:2158
+#: cps/web.py:2171
 msgid "This username or e-mail address is already in use."
 msgstr "Benutzername oder E-Mailadresse ist bereits in Verwendung."
 
-#: cps/web.py:2175 cps/web.py:2271
+#: cps/web.py:2188 cps/web.py:2284
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Du bist nun eingeloggt als '%(nickname)s'"
 
-#: cps/web.py:2180
+#: cps/web.py:2193
 msgid "Wrong Username or Password"
 msgstr "Falscher Benutzername oder Passwort"
 
-#: cps/web.py:2186 cps/web.py:2207
+#: cps/web.py:2199 cps/web.py:2220
 msgid "login"
 msgstr "Login"
 
-#: cps/web.py:2219 cps/web.py:2250
+#: cps/web.py:2232 cps/web.py:2263
 msgid "Token not found"
 msgstr "Token wurde nicht gefunden"
 
-#: cps/web.py:2227 cps/web.py:2258
+#: cps/web.py:2240 cps/web.py:2271
 msgid "Token has expired"
 msgstr "Das Token ist abgelaufen"
 
-#: cps/web.py:2235
+#: cps/web.py:2248
 msgid "Success! Please return to your device"
 msgstr "Erfolg! Bitte zum Gerät zurückkehren"
 
-#: cps/web.py:2285
+#: cps/web.py:2298
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Bitte zuerst die SMTP Mail Einstellung konfigurieren ..."
 
-#: cps/web.py:2289
+#: cps/web.py:2302
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Buch erfolgreich zum Senden an %(kindlemail)s eingereiht"
 
-#: cps/web.py:2293
+#: cps/web.py:2306
 #, 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:2295 cps/web.py:3060
+#: cps/web.py:2308 cps/web.py:3073
 msgid "Please configure your kindle e-mail address first..."
 msgstr "Bitte zuerst die Kindle E-Mailadresse konfigurieren..."
 
-#: cps/web.py:2339
+#: cps/web.py:2352
 #, 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:2350
+#: cps/web.py:2363
 msgid "Invalid shelf specified"
 msgstr "Ungültiges Bücherregal angegeben"
 
-#: cps/web.py:2355
+#: cps/web.py:2368
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %(name)s"
 msgstr "Keine Erlaubnis ein Buch zum Bücherregal %(name)s  hinzuzufügen"
 
-#: cps/web.py:2360
+#: cps/web.py:2373
 msgid "User is not allowed to edit public shelves"
 msgstr "Benutzer hat keine Erlaubnis öffentliche Bücherregale zu editieren"
 
-#: cps/web.py:2378
+#: cps/web.py:2391
 #, python-format
 msgid "Books are already part of the shelf: %(name)s"
 msgstr "Bücher sind bereits Teil des Bücherregals %(name)s"
 
-#: cps/web.py:2392
+#: cps/web.py:2405
 #, 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:2394
+#: cps/web.py:2407
 #, 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:2431
+#: cps/web.py:2444
 #, 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:2437
+#: cps/web.py:2450
 #, 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:2457 cps/web.py:2481
+#: cps/web.py:2470 cps/web.py:2494
 #, 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:2462
+#: cps/web.py:2475
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Bücherregal %(title)s erzeugt"
 
-#: cps/web.py:2464 cps/web.py:2492
+#: cps/web.py:2477 cps/web.py:2505
 msgid "There was an error"
 msgstr "Es trat ein Fehler auf"
 
-#: cps/web.py:2465 cps/web.py:2467
+#: cps/web.py:2478 cps/web.py:2480
 msgid "create a shelf"
 msgstr "Bücherregal erzeugen"
 
-#: cps/web.py:2490
+#: cps/web.py:2503
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Bücherregal %(title)s verändert"
 
-#: cps/web.py:2493 cps/web.py:2495
+#: cps/web.py:2506 cps/web.py:2508
 msgid "Edit a shelf"
 msgstr "Bücherregal editieren"
 
-#: cps/web.py:2516
+#: cps/web.py:2529
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "Bücherregal %(name)s erfolgreich gelöscht"
 
-#: cps/web.py:2538
+#: cps/web.py:2551
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Bücherregal: '%(name)s'"
 
-#: cps/web.py:2541
+#: cps/web.py:2554
 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:2572
+#: cps/web.py:2585
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Reihenfolge in Bücherregal '%(name)s' verändern"
 
-#: cps/web.py:2601 cps/web.py:3012
+#: cps/web.py:2614 cps/web.py:3025
 msgid "E-mail is not from valid domain"
 msgstr "E-Mail ist nicht Teil einer gültigen Domain"
 
-#: cps/web.py:2603 cps/web.py:2644 cps/web.py:2647
+#: cps/web.py:2616 cps/web.py:2657 cps/web.py:2660
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's Profil"
 
-#: cps/web.py:2642
+#: cps/web.py:2655
 msgid "Found an existing account for this e-mail address."
 msgstr "Es exisitert bereits ein Benutzer für diese E-Mailadresse"
 
-#: cps/web.py:2645
+#: cps/web.py:2658
 msgid "Profile updated"
 msgstr "Profil aktualisiert"
 
-#: cps/web.py:2657
+#: cps/web.py:2670
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: cps/web.py:2671
+#: cps/web.py:2684
 msgid "Admin page"
 msgstr "Admin Seite"
 
-#: cps/web.py:2749 cps/web.py:2922
+#: cps/web.py:2762 cps/web.py:2935
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web Konfiguration wurde aktualisiert"
 
-#: cps/templates/admin.html:91 cps/web.py:2762
+#: cps/templates/admin.html:91 cps/web.py:2775
 msgid "UI Configuration"
 msgstr "Konfiguration Benutzeroberfläche"
 
-#: cps/web.py:2780
+#: cps/web.py:2793
 msgid "Import of optional Google Drive requirements missing"
 msgstr "Optionale Abhängigkeiten für Google Drive fehlen"
 
-#: cps/web.py:2783
+#: cps/web.py:2796
 msgid "client_secrets.json is missing or not readable"
 msgstr "client_secrets.json nicht vorhanden, oder nicht lesbar"
 
-#: cps/web.py:2788 cps/web.py:2815
+#: cps/web.py:2801 cps/web.py:2828
 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:2818 cps/web.py:2844 cps/web.py:2856
-#: cps/web.py:2898 cps/web.py:2913 cps/web.py:2930 cps/web.py:2937
-#: cps/web.py:2954
+#: cps/templates/admin.html:90 cps/web.py:2831 cps/web.py:2857 cps/web.py:2869
+#: cps/web.py:2911 cps/web.py:2926 cps/web.py:2943 cps/web.py:2950
+#: cps/web.py:2967
 msgid "Basic Configuration"
 msgstr "Basis Konfiguration"
 
-#: cps/web.py:2841
+#: cps/web.py:2854
 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:2853
+#: cps/web.py:2866
 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:2895
+#: cps/web.py:2908
 msgid "Logfile location is not valid, please enter correct path"
 msgstr "Speicherort Logdatei ist ungültig, bitte Pfad korrigieren"
 
-#: cps/web.py:2934
+#: cps/web.py:2947
 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:3008 cps/web.py:3014 cps/web.py:3030
+#: cps/templates/admin.html:31 cps/web.py:3021 cps/web.py:3027 cps/web.py:3043
 msgid "Add new user"
 msgstr "Neuen Benutzer hinzufügen"
 
-#: cps/web.py:3020
+#: cps/web.py:3033
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Benutzer '%(user)s' angelegt"
 
-#: cps/web.py:3024
+#: cps/web.py:3037
 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"
+msgstr "Es exisitert bereits ein Account für diese E-Mailadresse oder Benutzernamen"
 
-#: cps/web.py:3048 cps/web.py:3062
+#: cps/web.py:3061 cps/web.py:3075
 msgid "E-mail server settings updated"
 msgstr "E-Mail Server Einstellungen aktualisiert"
 
-#: cps/web.py:3055
+#: cps/web.py:3068
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Test E-Mail wurde erfolgreich an %(kindlemail)s versendet"
 
-#: cps/web.py:3058
+#: cps/web.py:3071
 #, 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:3063
+#: cps/web.py:3076
 msgid "Edit e-mail server settings"
 msgstr "E-Mail Server Einstellungen bearbeiten"
 
-#: cps/web.py:3088
+#: cps/web.py:3101
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Benutzer '%(nick)s' gelöscht"
 
-#: cps/web.py:3197
+#: cps/web.py:3210
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Benutzer '%(nick)s' aktualisiert"
 
-#: cps/web.py:3200
+#: cps/web.py:3213
 msgid "An unknown error occured."
 msgstr "Es ist ein unbekanter Fehler aufgetreten"
 
-#: cps/web.py:3202
+#: cps/web.py:3215
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Benutzer %(nick)s bearbeiten"
 
-#: cps/web.py:3219
+#: cps/web.py:3232
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Passwort für Benutzer %(user)s wurde zurückgesetzt"
 
-#: cps/web.py:3239
+#: cps/web.py:3252
 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"
+msgstr "Buch öffnen fehlgeschlagen. Datei existiert nicht, oder ist nicht zugänglich"
 
-#: cps/web.py:3270 cps/web.py:3546 cps/web.py:3551 cps/web.py:3706
+#: cps/web.py:3279 cps/web.py:3555 cps/web.py:3560 cps/web.py:3715
 msgid "edit metadata"
 msgstr "Metadaten editieren"
 
-#: cps/web.py:3284 cps/web.py:3576
+#: cps/web.py:3289 cps/web.py:3585
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Dateiendung '%(ext)s' kann nicht auf diesen Server hochgeladen werden"
 
-#: cps/web.py:3288 cps/web.py:3580
+#: cps/web.py:3293 cps/web.py:3589
 msgid "File to be uploaded must have an extension"
 msgstr "Dateien müssen eine Erweiterung haben, um hochgeladen zu werden"
 
-#: cps/web.py:3300 cps/web.py:3600
+#: cps/web.py:3305 cps/web.py:3609
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Fehler beim Erzeugen des Pfads %(path)s (Zugriff verweigert)"
 
-#: cps/web.py:3305
+#: cps/web.py:3310
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Fehler beim speichern der Datei %(file)s."
 
-#: cps/web.py:3321
+#: cps/web.py:3326
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Dateiformat %(ext)s zu %(book)s hinzugefügt"
 
-#: cps/web.py:3339
+#: cps/web.py:3343
 #, python-format
 msgid "Failed to create path for cover %(path)s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:3346
+#: cps/web.py:3350
 #, python-format
 msgid "Failed to store cover-file %(cover)s."
 msgstr "Fehler beim Speichern des Covers %(cover)s."
 
-#: cps/web.py:3349
+#: cps/web.py:3353
 msgid "Cover-file is not a valid image file"
 msgstr "Cover-Datei ist keine gültige Bilddatei"
 
-#: cps/web.py:3362 cps/web.py:3366
+#: cps/web.py:3370 cps/web.py:3374
 msgid "unknown"
 msgstr "Unbekannt"
 
-#: cps/web.py:3388
+#: cps/web.py:3396
 msgid "Cover is not a jpg file, can't save"
 msgstr "Cover ist keine JPG Datei, konnte nicht gespeichert werden"
 
-#: cps/web.py:3555
+#: cps/web.py:3442
+#, python-format
+msgid "%(langname)s is not a valid language"
+msgstr ""
+
+#: cps/web.py:3564
 msgid "Error editing book, please check logfile for details"
 msgstr "Fehler beim Editieren des Buchs, Details im Logfile"
 
-#: cps/web.py:3605
+#: cps/web.py:3614
 #, python-format
 msgid "Failed to store file %(file)s (Permission denied)."
 msgstr "Fehler beim speichern der Datei %(file)s (Zugriff verweigert)"
 
-#: cps/web.py:3610
+#: cps/web.py:3619
 #, python-format
 msgid "Failed to delete file %(file)s (Permission denied)."
 msgstr "Fehler beim Löschen von Datei %(file)s (Zugriff verweigert)"
 
-#: cps/web.py:3692
+#: cps/web.py:3701
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Datei %(file)s hochgeladen"
 
-#: cps/web.py:3722
+#: cps/web.py:3731
 msgid "Source or destination format for conversion missing"
 msgstr "Quell- oder Zielformat für Konvertierung fehlt"
 
-#: cps/web.py:3732
+#: cps/web.py:3741
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
-msgstr ""
-"Buch wurde erfolgreich für die Konvertierung in das %(book_format)s "
-"Format eingereiht"
+msgstr "Buch wurde erfolgreich für die Konvertierung in das %(book_format)s Format eingereiht"
 
-#: cps/web.py:3736
+#: cps/web.py:3745
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Es trat ein Fehlker beim Konvertieren des Buches auf: %(res)s"
@@ -940,12 +925,8 @@ msgid "Rating"
 msgstr "Bewertung"
 
 #: cps/templates/book_edit.html:87
-msgid ""
-"Cover URL (jpg, cover is downloaded and stored in database, field is "
-"afterwards empty again)"
-msgstr ""
-"Cover URL (jpg, Cover wird heruntergeladen und in der Datenbank "
-"gespeichert, Feld erscheint anschließend wieder leer)"
+msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
+msgstr "Cover URL (jpg, Cover wird heruntergeladen und in der Datenbank gespeichert, Feld erscheint anschließend wieder leer)"
 
 #: cps/templates/book_edit.html:91
 msgid "Upload Cover from local drive"
@@ -1320,9 +1301,7 @@ msgstr "Metadaten bearbeiten"
 
 #: cps/templates/email_edit.html:15
 msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
-msgstr ""
-"SMTP port (normalerweise 25 für unverschlüsseltes SMTP, 465 für SSL und "
-"587 für STARTTLS"
+msgstr "SMTP port (normalerweise 25 für unverschlüsseltes SMTP, 465 für SSL und 587 für STARTTLS"
 
 #: cps/templates/email_edit.html:19
 msgid "Encryption"
@@ -1451,9 +1430,7 @@ msgstr "Deine Bücherregale"
 
 #: cps/templates/index.xml:92
 msgid "User's own shelfs, only visible to the current user himself"
-msgstr ""
-"Persönliches Bücherregal des Benutzers, nur sichtbar für den aktuellen "
-"Benutzer"
+msgstr "Persönliches Bücherregal des Benutzers, nur sichtbar für den aktuellen Benutzer"
 
 #: cps/templates/layout.html:33
 msgid "Toggle navigation"
@@ -1867,11 +1844,3 @@ msgstr "Benutzer löschen"
 msgid "Recent Downloads"
 msgstr "Letzte Downloads"
 
-#~ msgid "Failed to create path for cover %(cover)s (Permission denied)."
-#~ msgstr ""
-#~ "Ordner erzeugen für Cover %(cover)s "
-#~ "fehlgeschalgen (Zugriff verweigert)."
-
-#~ msgid "File extension '%s' is not allowed to be uploaded to this server"
-#~ msgstr ""
-
diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po
index 4bebecd8..9ca0f0c0 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-09-08 14:49+0200\n"
+"POT-Creation-Date: 2018-09-09 17:57+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"
@@ -121,525 +121,528 @@ msgstr ""
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/web.py:1114
+#: cps/web.py:1127
 msgid "Requesting update package"
 msgstr "Solicitando paquete de actualización"
 
-#: cps/web.py:1115
+#: cps/web.py:1128
 msgid "Downloading update package"
 msgstr "Descargando paquete de actualización"
 
-#: cps/web.py:1116
+#: cps/web.py:1129
 msgid "Unzipping update package"
 msgstr "Descomprimiendo paquete de actualización"
 
-#: cps/web.py:1117
+#: cps/web.py:1130
 msgid "Files are replaced"
 msgstr "Ficheros sustituidos"
 
-#: cps/web.py:1118
+#: cps/web.py:1131
 msgid "Database connections are closed"
 msgstr "Los conexiones de base datos están cerradas"
 
-#: cps/web.py:1119
+#: cps/web.py:1132
 msgid "Server is stopped"
 msgstr "El servidor está detenido"
 
-#: cps/web.py:1120
+#: cps/web.py:1133
 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:1140
+#: cps/web.py:1153
 msgid "Recently Added Books"
 msgstr ""
 
-#: cps/web.py:1150
+#: cps/web.py:1163
 msgid "Newest Books"
 msgstr ""
 
-#: cps/web.py:1162
+#: cps/web.py:1175
 msgid "Oldest Books"
 msgstr ""
 
-#: cps/web.py:1174
+#: cps/web.py:1187
 msgid "Books (A-Z)"
 msgstr ""
 
-#: cps/web.py:1185
+#: cps/web.py:1198
 msgid "Books (Z-A)"
 msgstr ""
 
-#: cps/web.py:1214
+#: cps/web.py:1227
 msgid "Hot Books (most downloaded)"
 msgstr "Libros populares (los mas descargados)"
 
-#: cps/web.py:1227
+#: cps/web.py:1240
 msgid "Best rated books"
 msgstr "Libros mejor valorados"
 
-#: cps/templates/index.xml:36 cps/web.py:1239
+#: cps/templates/index.xml:36 cps/web.py:1252
 msgid "Random Books"
 msgstr "Libros al azar"
 
-#: cps/web.py:1254
+#: cps/web.py:1267
 msgid "Author list"
 msgstr "Lista de autores"
 
-#: cps/web.py:1266 cps/web.py:1329 cps/web.py:1484 cps/web.py:2036
+#: cps/web.py:1279 cps/web.py:1342 cps/web.py:1497 cps/web.py:2049
 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:1313
+#: cps/templates/index.xml:73 cps/web.py:1326
 msgid "Series list"
 msgstr "Lista de series"
 
-#: cps/web.py:1327
+#: cps/web.py:1340
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Series : %(serie)s"
 
-#: cps/web.py:1354
+#: cps/web.py:1367
 msgid "Available languages"
 msgstr "Lenguajes disponibles"
 
-#: cps/web.py:1371
+#: cps/web.py:1384
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Lenguaje: %(name)s"
 
-#: cps/templates/index.xml:66 cps/web.py:1382
+#: cps/templates/index.xml:66 cps/web.py:1395
 msgid "Category list"
 msgstr "Lista de categorias"
 
-#: cps/web.py:1396
+#: cps/web.py:1409
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoría : %(name)s"
 
-#: cps/templates/layout.html:71 cps/web.py:1535
+#: cps/templates/layout.html:71 cps/web.py:1548
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1565
+#: cps/web.py:1578
 msgid "Statistics"
 msgstr "Estadisticas"
 
-#: cps/web.py:1670
-msgid ""
-"Callback domain is not verified, please follow steps to verify domain in "
-"google developer console"
+#: cps/web.py:1683
+msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr ""
 
-#: cps/web.py:1746
+#: cps/web.py:1758
 msgid "Server restarted, please reload page"
 msgstr "Servidor reiniciado. Por favor, recargue la página"
 
-#: cps/web.py:1749
+#: cps/web.py:1761
 msgid "Performing shutdown of server, please close window"
 msgstr "Servidor en proceso de apagado. Por favor, cierre la ventana."
 
-#: cps/web.py:1767
+#: cps/web.py:1780
 msgid "Update done"
 msgstr "Actualización realizada"
 
-#: cps/web.py:1837
+#: cps/web.py:1850
 msgid "Published after "
 msgstr ""
 
-#: cps/web.py:1844
+#: cps/web.py:1857
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1858
+#: cps/web.py:1871
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1860
+#: cps/web.py:1873
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1919 cps/web.py:1928
+#: cps/web.py:1932 cps/web.py:1941
 msgid "search"
 msgstr "búsqueda"
 
 #: cps/templates/index.xml:44 cps/templates/index.xml:48
-#: cps/templates/layout.html:146 cps/web.py:1995
+#: cps/templates/layout.html:146 cps/web.py:2008
 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:1998
+#: cps/templates/layout.html:148 cps/web.py:2011
 msgid "Unread Books"
 msgstr "Libros no leídos"
 
-#: cps/web.py:2046 cps/web.py:2048 cps/web.py:2050 cps/web.py:2062
+#: cps/web.py:2059 cps/web.py:2061 cps/web.py:2063 cps/web.py:2075
 msgid "Read a Book"
 msgstr "Leer un libro"
 
-#: cps/web.py:2128 cps/web.py:3006
+#: cps/web.py:2141 cps/web.py:3019
 msgid "Please fill out all fields!"
 msgstr "¡Por favor completar todos los campos!"
 
-#: cps/web.py:2129 cps/web.py:2150 cps/web.py:2154 cps/web.py:2159
-#: cps/web.py:2161
+#: cps/web.py:2142 cps/web.py:2163 cps/web.py:2167 cps/web.py:2172
+#: cps/web.py:2174
 msgid "register"
 msgstr "registrarse"
 
-#: cps/web.py:2149 cps/web.py:3222
+#: cps/web.py:2162 cps/web.py:3235
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/web.py:2152
+#: cps/web.py:2165
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:2155
+#: cps/web.py:2168
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:2158
+#: cps/web.py:2171
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:2175 cps/web.py:2271
+#: cps/web.py:2188 cps/web.py:2284
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Sesion iniciada como : '%(nickname)s'"
 
-#: cps/web.py:2180
+#: cps/web.py:2193
 msgid "Wrong Username or Password"
 msgstr "Usuario o contraseña invalido"
 
-#: cps/web.py:2186 cps/web.py:2207
+#: cps/web.py:2199 cps/web.py:2220
 msgid "login"
 msgstr "Iniciar sesión"
 
-#: cps/web.py:2219 cps/web.py:2250
+#: cps/web.py:2232 cps/web.py:2263
 msgid "Token not found"
 msgstr ""
 
-#: cps/web.py:2227 cps/web.py:2258
+#: cps/web.py:2240 cps/web.py:2271
 msgid "Token has expired"
 msgstr ""
 
-#: cps/web.py:2235
+#: cps/web.py:2248
 msgid "Success! Please return to your device"
 msgstr ""
 
-#: cps/web.py:2285
+#: cps/web.py:2298
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configurar primero los parametros SMTP por favor..."
 
-#: cps/web.py:2289
+#: cps/web.py:2302
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:2293
+#: cps/web.py:2306
 #, 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:2295 cps/web.py:3060
+#: cps/web.py:2308 cps/web.py:3073
 msgid "Please configure your kindle e-mail address first..."
 msgstr ""
 
-#: cps/web.py:2339
+#: cps/web.py:2352
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "El libro fue agregado a el estante: %(sname)s"
 
-#: cps/web.py:2350
+#: cps/web.py:2363
 msgid "Invalid shelf specified"
 msgstr ""
 
-#: cps/web.py:2355
+#: cps/web.py:2368
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %(name)s"
 msgstr ""
 
-#: cps/web.py:2360
+#: cps/web.py:2373
 msgid "User is not allowed to edit public shelves"
 msgstr ""
 
-#: cps/web.py:2378
+#: cps/web.py:2391
 #, python-format
 msgid "Books are already part of the shelf: %(name)s"
 msgstr ""
 
-#: cps/web.py:2392
+#: cps/web.py:2405
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2394
+#: cps/web.py:2407
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2431
+#: cps/web.py:2444
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "El libro fue removido del estante: %(sname)s"
 
-#: cps/web.py:2437
+#: cps/web.py:2450
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2457 cps/web.py:2481
+#: cps/web.py:2470 cps/web.py:2494
 #, 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:2462
+#: cps/web.py:2475
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Estante %(title)s creado"
 
-#: cps/web.py:2464 cps/web.py:2492
+#: cps/web.py:2477 cps/web.py:2505
 msgid "There was an error"
 msgstr "Ha sucedido un error"
 
-#: cps/web.py:2465 cps/web.py:2467
+#: cps/web.py:2478 cps/web.py:2480
 msgid "create a shelf"
 msgstr "crear un estante"
 
-#: cps/web.py:2490
+#: cps/web.py:2503
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Estante %(title)s cambiado"
 
-#: cps/web.py:2493 cps/web.py:2495
+#: cps/web.py:2506 cps/web.py:2508
 msgid "Edit a shelf"
 msgstr "Editar un estante"
 
-#: cps/web.py:2516
+#: cps/web.py:2529
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "Estante %(name)s fue borrado correctamente"
 
-#: cps/web.py:2538
+#: cps/web.py:2551
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Estante: '%(name)s'"
 
-#: cps/web.py:2541
+#: cps/web.py:2554
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:2572
+#: cps/web.py:2585
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Cambiar orden del estante: '%(name)s'"
 
-#: cps/web.py:2601 cps/web.py:3012
+#: cps/web.py:2614 cps/web.py:3025
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/web.py:2603 cps/web.py:2644 cps/web.py:2647
+#: cps/web.py:2616 cps/web.py:2657 cps/web.py:2660
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Perfil de %(name)s"
 
-#: cps/web.py:2642
+#: cps/web.py:2655
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/web.py:2645
+#: cps/web.py:2658
 msgid "Profile updated"
 msgstr "Perfil actualizado"
 
-#: cps/web.py:2657
+#: cps/web.py:2670
 msgid "Unknown"
 msgstr ""
 
-#: cps/web.py:2671
+#: cps/web.py:2684
 msgid "Admin page"
 msgstr "Página de administración"
 
-#: cps/web.py:2749 cps/web.py:2922
+#: cps/web.py:2762 cps/web.py:2935
 msgid "Calibre-Web configuration updated"
 msgstr "onfiguración de Calibre-Web actualizada"
 
-#: cps/templates/admin.html:91 cps/web.py:2762
+#: cps/templates/admin.html:91 cps/web.py:2775
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/web.py:2780
+#: cps/web.py:2793
 msgid "Import of optional Google Drive requirements missing"
 msgstr ""
 
-#: cps/web.py:2783
+#: cps/web.py:2796
 msgid "client_secrets.json is missing or not readable"
 msgstr ""
 
-#: cps/web.py:2788 cps/web.py:2815
+#: cps/web.py:2801 cps/web.py:2828
 msgid "client_secrets.json is not configured for web application"
 msgstr ""
 
-#: cps/templates/admin.html:90 cps/web.py:2818 cps/web.py:2844 cps/web.py:2856
-#: cps/web.py:2898 cps/web.py:2913 cps/web.py:2930 cps/web.py:2937
-#: cps/web.py:2954
+#: cps/templates/admin.html:90 cps/web.py:2831 cps/web.py:2857 cps/web.py:2869
+#: cps/web.py:2911 cps/web.py:2926 cps/web.py:2943 cps/web.py:2950
+#: cps/web.py:2967
 msgid "Basic Configuration"
 msgstr "Configuración básica"
 
-#: cps/web.py:2841
+#: cps/web.py:2854
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2853
+#: cps/web.py:2866
 msgid "Certfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2895
+#: cps/web.py:2908
 msgid "Logfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2934
+#: cps/web.py:2947
 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:3008 cps/web.py:3014 cps/web.py:3030
+#: cps/templates/admin.html:31 cps/web.py:3021 cps/web.py:3027 cps/web.py:3043
 msgid "Add new user"
 msgstr "Agregar un nuevo usuario"
 
-#: cps/web.py:3020
+#: cps/web.py:3033
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Usuario '%(user)s' creado"
 
-#: cps/web.py:3024
+#: cps/web.py:3037
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/web.py:3048 cps/web.py:3062
+#: cps/web.py:3061 cps/web.py:3075
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/web.py:3055
+#: cps/web.py:3068
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:3058
+#: cps/web.py:3071
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/web.py:3063
+#: cps/web.py:3076
 msgid "Edit e-mail server settings"
 msgstr ""
 
-#: cps/web.py:3088
+#: cps/web.py:3101
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Usuario '%(nick)s' borrado"
 
-#: cps/web.py:3197
+#: cps/web.py:3210
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Usuario '%(nick)s'  actualizado"
 
-#: cps/web.py:3200
+#: cps/web.py:3213
 msgid "An unknown error occured."
 msgstr "Error inesperado."
 
-#: cps/web.py:3202
+#: cps/web.py:3215
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Editar Usuario %(nick)s"
 
-#: cps/web.py:3219
+#: cps/web.py:3232
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/web.py:3239
+#: cps/web.py:3252
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr ""
 
-#: cps/web.py:3270 cps/web.py:3546 cps/web.py:3551 cps/web.py:3706
+#: cps/web.py:3279 cps/web.py:3555 cps/web.py:3560 cps/web.py:3715
 msgid "edit metadata"
 msgstr "editar metainformación"
 
-#: cps/web.py:3284 cps/web.py:3576
+#: cps/web.py:3289 cps/web.py:3585
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "No se permite subir archivos con la extensión '%(ext)s' a este servidor"
 
-#: cps/web.py:3288 cps/web.py:3580
+#: cps/web.py:3293 cps/web.py:3589
 msgid "File to be uploaded must have an extension"
 msgstr "El archivo a subir debe tener una extensión"
 
-#: cps/web.py:3300 cps/web.py:3600
+#: cps/web.py:3305 cps/web.py:3609
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Fallo al crear la ruta %(path)s (permiso negado)"
 
-#: cps/web.py:3305
+#: cps/web.py:3310
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr ""
 
-#: cps/web.py:3321
+#: cps/web.py:3326
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr ""
 
-#: cps/web.py:3339
+#: cps/web.py:3343
 #, python-format
 msgid "Failed to create path for cover %(path)s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:3346
+#: cps/web.py:3350
 #, python-format
 msgid "Failed to store cover-file %(cover)s."
 msgstr ""
 
-#: cps/web.py:3349
+#: cps/web.py:3353
 msgid "Cover-file is not a valid image file"
 msgstr ""
 
-#: cps/web.py:3362 cps/web.py:3366
+#: cps/web.py:3370 cps/web.py:3374
 msgid "unknown"
 msgstr ""
 
-#: cps/web.py:3388
+#: cps/web.py:3396
 msgid "Cover is not a jpg file, can't save"
 msgstr ""
 
-#: cps/web.py:3555
+#: cps/web.py:3442
+#, python-format
+msgid "%(langname)s is not a valid language"
+msgstr ""
+
+#: cps/web.py:3564
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/web.py:3605
+#: cps/web.py:3614
 #, python-format
 msgid "Failed to store file %(file)s (Permission denied)."
 msgstr "Fallo al almacenar el archivo %(file)s (permiso negado)"
 
-#: cps/web.py:3610
+#: cps/web.py:3619
 #, python-format
 msgid "Failed to delete file %(file)s (Permission denied)."
 msgstr "Fallo al borrar el archivo %(file)s (permiso negado)"
 
-#: cps/web.py:3692
+#: cps/web.py:3701
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/web.py:3722
+#: cps/web.py:3731
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/web.py:3732
+#: cps/web.py:3741
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/web.py:3736
+#: cps/web.py:3745
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
@@ -915,9 +918,7 @@ msgid "Rating"
 msgstr "Puntaje"
 
 #: cps/templates/book_edit.html:87
-msgid ""
-"Cover URL (jpg, cover is downloaded and stored in database, field is "
-"afterwards empty again)"
+msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
 msgstr ""
 
 #: cps/templates/book_edit.html:91
@@ -1293,9 +1294,7 @@ msgstr "Editar la metadata"
 
 #: cps/templates/email_edit.html:15
 msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
-msgstr ""
-"Puerto SMTP (por lo general 25 para SMTP plano, 465 para SSL y 587 para "
-"STARTTLS)"
+msgstr "Puerto SMTP (por lo general 25 para SMTP plano, 465 para SSL y 587 para STARTTLS)"
 
 #: cps/templates/email_edit.html:19
 msgid "Encryption"
@@ -1847,9 +1846,7 @@ msgstr "Descargas Recientes"
 #~ msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Rename author from: '%(src)s' to "
-#~ "'%(dest)s' failed with error: %(error)s"
+#~ msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 #~ msgstr ""
 
 #~ msgid "Password for user %(user)s reset"
@@ -1871,7 +1868,5 @@ msgstr "Descargas Recientes"
 #~ msgstr ""
 
 #~ msgid "File extension \"%(ext)s\" is not allowed to be uploaded to this server"
-#~ msgstr ""
-#~ "No se permite subir archivos con "
-#~ "la extensión \"%(ext)s\" a este servidor"
+#~ msgstr "No se permite subir archivos con la extensión \"%(ext)s\" a este servidor"
 
diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index e9f50b58..8fa0e93a 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-09-08 20:58+0200\n"
+"POT-Creation-Date: 2018-09-09 17:57+0200\n"
 "PO-Revision-Date: 2018-09-08 17:48+0200\n"
 "Last-Translator: Nicolas Roudninski <nicoroud@gmail.com>\n"
 "Language: fr\n"
@@ -127,523 +127,528 @@ msgstr "Erreur d’exécution de la commande UnRar"
 msgid "Unrar binary file not found"
 msgstr "Le fichier exécutable UnRar est introuvable"
 
-#: cps/web.py:1117
+#: cps/web.py:1127
 msgid "Requesting update package"
 msgstr "Demander une mise à jour"
 
-#: cps/web.py:1118
+#: cps/web.py:1128
 msgid "Downloading update package"
 msgstr "Téléchargement la mise à jour"
 
-#: cps/web.py:1119
+#: cps/web.py:1129
 msgid "Unzipping update package"
 msgstr "Décompression de la mise à jour"
 
-#: cps/web.py:1120
+#: cps/web.py:1130
 msgid "Files are replaced"
 msgstr "Fichiers remplacés"
 
-#: cps/web.py:1121
+#: cps/web.py:1131
 msgid "Database connections are closed"
 msgstr "Connexion à la base de donnée fermée"
 
-#: cps/web.py:1122
+#: cps/web.py:1132
 msgid "Server is stopped"
 msgstr "Serveur arrêté"
 
-#: cps/web.py:1123
+#: cps/web.py:1133
 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:1143
+#: cps/web.py:1153
 msgid "Recently Added Books"
 msgstr "Ajouts récents"
 
-#: cps/web.py:1153
+#: cps/web.py:1163
 msgid "Newest Books"
 msgstr "Livres récents"
 
-#: cps/web.py:1165
+#: cps/web.py:1175
 msgid "Oldest Books"
 msgstr "Anciens livres"
 
-#: cps/web.py:1177
+#: cps/web.py:1187
 msgid "Books (A-Z)"
 msgstr "Livres (A-Z)"
 
-#: cps/web.py:1188
+#: cps/web.py:1198
 msgid "Books (Z-A)"
 msgstr "Livres (Z-A)"
 
-#: cps/web.py:1217
+#: cps/web.py:1227
 msgid "Hot Books (most downloaded)"
 msgstr "Livres populaires (les plus téléchargés)"
 
-#: cps/web.py:1230
+#: cps/web.py:1240
 msgid "Best rated books"
 msgstr "Livres les mieux notés"
 
-#: cps/templates/index.xml:36 cps/web.py:1242
+#: cps/templates/index.xml:36 cps/web.py:1252
 msgid "Random Books"
 msgstr "Livres au hasard"
 
-#: cps/web.py:1257
+#: cps/web.py:1267
 msgid "Author list"
 msgstr "Liste des auteurs"
 
-#: cps/web.py:1269 cps/web.py:1332 cps/web.py:1487 cps/web.py:2039
+#: cps/web.py:1279 cps/web.py:1342 cps/web.py:1497 cps/web.py:2049
 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:1316
+#: cps/templates/index.xml:73 cps/web.py:1326
 msgid "Series list"
 msgstr "Liste des séries"
 
-#: cps/web.py:1330
+#: cps/web.py:1340
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Séries : %(serie)s"
 
-#: cps/web.py:1357
+#: cps/web.py:1367
 msgid "Available languages"
 msgstr "Langues disponibles"
 
-#: cps/web.py:1374
+#: cps/web.py:1384
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Langue : %(name)s"
 
-#: cps/templates/index.xml:66 cps/web.py:1385
+#: cps/templates/index.xml:66 cps/web.py:1395
 msgid "Category list"
 msgstr "Liste des catégories"
 
-#: cps/web.py:1399
+#: cps/web.py:1409
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Catégorie : %(name)s"
 
-#: cps/templates/layout.html:71 cps/web.py:1538
+#: cps/templates/layout.html:71 cps/web.py:1548
 msgid "Tasks"
 msgstr "Tâches"
 
-#: cps/web.py:1568
+#: cps/web.py:1578
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: cps/web.py:1673
+#: cps/web.py:1683
 msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "Le domaine de retour d’appel (Callback domain) est non vérifié, Veuillez suivre les étapes nécessaires pour vérifier le domaine dans la console de développement de Google"
 
-#: cps/web.py:1748
+#: cps/web.py:1758
 msgid "Server restarted, please reload page"
 msgstr "Serveur redémarré, merci de rafraîchir la page"
 
-#: cps/web.py:1751
+#: cps/web.py:1761
 msgid "Performing shutdown of server, please close window"
 msgstr "Arrêt du serveur en cours, merci de fermer la fenêtre"
 
-#: cps/web.py:1770
+#: cps/web.py:1780
 msgid "Update done"
 msgstr "Mise à jour effectuée"
 
-#: cps/web.py:1840
+#: cps/web.py:1850
 msgid "Published after "
 msgstr "Publié après le "
 
-#: cps/web.py:1847
+#: cps/web.py:1857
 msgid "Published before "
 msgstr "Publié avant le "
 
-#: cps/web.py:1861
+#: cps/web.py:1871
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "Évaluation <= %(rating)s"
 
-#: cps/web.py:1863
+#: cps/web.py:1873
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "Évaluation >= %(rating)s"
 
-#: cps/web.py:1922 cps/web.py:1931
+#: cps/web.py:1932 cps/web.py:1941
 msgid "search"
 msgstr "recherche"
 
 #: cps/templates/index.xml:44 cps/templates/index.xml:48
-#: cps/templates/layout.html:146 cps/web.py:1998
+#: cps/templates/layout.html:146 cps/web.py:2008
 msgid "Read Books"
 msgstr "Livres lus"
 
 #: cps/templates/index.xml:52 cps/templates/index.xml:56
-#: cps/templates/layout.html:148 cps/web.py:2001
+#: cps/templates/layout.html:148 cps/web.py:2011
 msgid "Unread Books"
 msgstr "Livres non-lus"
 
-#: cps/web.py:2049 cps/web.py:2051 cps/web.py:2053 cps/web.py:2065
+#: cps/web.py:2059 cps/web.py:2061 cps/web.py:2063 cps/web.py:2075
 msgid "Read a Book"
 msgstr "Lire un livre"
 
-#: cps/web.py:2131 cps/web.py:3009
+#: cps/web.py:2141 cps/web.py:3019
 msgid "Please fill out all fields!"
 msgstr "SVP, complétez tous les champs !"
 
-#: cps/web.py:2132 cps/web.py:2153 cps/web.py:2157 cps/web.py:2162
-#: cps/web.py:2164
+#: cps/web.py:2142 cps/web.py:2163 cps/web.py:2167 cps/web.py:2172
+#: cps/web.py:2174
 msgid "register"
 msgstr "s’enregistrer"
 
-#: cps/web.py:2152 cps/web.py:3225
+#: cps/web.py:2162 cps/web.py:3235
 msgid "An unknown error occurred. Please try again later."
 msgstr "Une erreur inconnue est survenue. Veuillez réessayer plus tard."
 
-#: cps/web.py:2155
+#: cps/web.py:2165
 msgid "Your e-mail is not allowed to register"
 msgstr "Votre adresse de courriel n’est pas autorisé pour une inscription"
 
-#: cps/web.py:2158
+#: cps/web.py:2168
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "Le courriel de confirmation a été envoyé à votre adresse."
 
-#: cps/web.py:2161
+#: cps/web.py:2171
 msgid "This username or e-mail address is already in use."
 msgstr "Ce nom d’utilisateur ou cette adresse de courriel sont déjà utilisés."
 
-#: cps/web.py:2178 cps/web.py:2274
+#: cps/web.py:2188 cps/web.py:2284
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Vous êtes maintenant connecté sous : '%(nickname)s'"
 
-#: cps/web.py:2183
+#: cps/web.py:2193
 msgid "Wrong Username or Password"
 msgstr "Mauvais nom d'utilisateur ou mot de passe"
 
-#: cps/web.py:2189 cps/web.py:2210
+#: cps/web.py:2199 cps/web.py:2220
 msgid "login"
 msgstr "connexion"
 
-#: cps/web.py:2222 cps/web.py:2253
+#: cps/web.py:2232 cps/web.py:2263
 msgid "Token not found"
 msgstr "Jeton non trouvé"
 
-#: cps/web.py:2230 cps/web.py:2261
+#: cps/web.py:2240 cps/web.py:2271
 msgid "Token has expired"
 msgstr "Jeton expiré"
 
-#: cps/web.py:2238
+#: cps/web.py:2248
 msgid "Success! Please return to your device"
 msgstr "Réussite! Merci de vous tourner vers votre appareil"
 
-#: cps/web.py:2288
+#: cps/web.py:2298
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Veuillez configurer les paramètres SMTP au préalable…"
 
-#: cps/web.py:2292
+#: cps/web.py:2302
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "Le livre a été mis en file de traitement avec succès pour un envois vers %(kindlemail)s"
 
-#: cps/web.py:2296
+#: cps/web.py:2306
 #, 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:2298 cps/web.py:3063
+#: cps/web.py:2308 cps/web.py:3073
 msgid "Please configure your kindle e-mail address first..."
 msgstr "Veuillez configurer votre adresse de courriel Kindle en premier lieu…"
 
-#: cps/web.py:2342
+#: cps/web.py:2352
 #, 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:2353
+#: cps/web.py:2363
 msgid "Invalid shelf specified"
 msgstr "L’étagère indiquée est invalide"
 
-#: cps/web.py:2358
+#: cps/web.py:2368
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %(name)s"
 msgstr "Vous n’êtes pas autorisé à ajouter un livre dans l’étagère %(name)s"
 
-#: cps/web.py:2363
+#: cps/web.py:2373
 msgid "User is not allowed to edit public shelves"
 msgstr "L’utilisateur n’est pas autorisé à éditer les étagères publiques"
 
-#: cps/web.py:2381
+#: cps/web.py:2391
 #, python-format
 msgid "Books are already part of the shelf: %(name)s"
 msgstr "Ces livres sont déjà sur l’étagère : %(name)s"
 
-#: cps/web.py:2395
+#: cps/web.py:2405
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr "Les livres ont été ajoutés à l’étagère : %(sname)s"
 
-#: cps/web.py:2397
+#: cps/web.py:2407
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr "Impossible d’ajouter les livres à l’étagère : %(sname)s"
 
-#: cps/web.py:2434
+#: cps/web.py:2444
 #, 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:2440
+#: cps/web.py:2450
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr "Désolé, vous n’êtes pas autorisé à enlever un livre de cette étagère : %(sname)s"
 
-#: cps/web.py:2460 cps/web.py:2484
+#: cps/web.py:2470 cps/web.py:2494
 #, 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:2465
+#: cps/web.py:2475
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Étagère %(title)s créée"
 
-#: cps/web.py:2467 cps/web.py:2495
+#: cps/web.py:2477 cps/web.py:2505
 msgid "There was an error"
 msgstr "Il y a eu une erreur"
 
-#: cps/web.py:2468 cps/web.py:2470
+#: cps/web.py:2478 cps/web.py:2480
 msgid "create a shelf"
 msgstr "Créer une étagère"
 
-#: cps/web.py:2493
+#: cps/web.py:2503
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "L’étagère %(title)s a été modifiée"
 
-#: cps/web.py:2496 cps/web.py:2498
+#: cps/web.py:2506 cps/web.py:2508
 msgid "Edit a shelf"
 msgstr "Modifier une étagère"
 
-#: cps/web.py:2519
+#: cps/web.py:2529
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "l’étagère %(name)s a été supprimé avec succès"
 
-#: cps/web.py:2541
+#: cps/web.py:2551
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Étagère : '%(name)s'"
 
-#: cps/web.py:2544
+#: cps/web.py:2554
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "Erreur à l’ouverture de l’étagère. Elle n’existe plus ou n’est plus accessible."
 
-#: cps/web.py:2575
+#: cps/web.py:2585
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Modifier l’arrangement de l’étagère : ‘%(name)s’"
 
-#: cps/web.py:2604 cps/web.py:3015
+#: cps/web.py:2614 cps/web.py:3025
 msgid "E-mail is not from valid domain"
 msgstr "Cette adresse de courriel n’appartient pas à un domaine valide"
 
-#: cps/web.py:2606 cps/web.py:2647 cps/web.py:2650
+#: cps/web.py:2616 cps/web.py:2657 cps/web.py:2660
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil de %(name)s"
 
-#: cps/web.py:2645
+#: cps/web.py:2655
 msgid "Found an existing account for this e-mail address."
 msgstr "Un compte existant a été trouvé pour cette adresse de courriel"
 
-#: cps/web.py:2648
+#: cps/web.py:2658
 msgid "Profile updated"
 msgstr "Profil mis à jour"
 
-#: cps/web.py:2660
+#: cps/web.py:2670
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: cps/web.py:2674
+#: cps/web.py:2684
 msgid "Admin page"
 msgstr "Page administrateur"
 
-#: cps/web.py:2752 cps/web.py:2925
+#: cps/web.py:2762 cps/web.py:2935
 msgid "Calibre-Web configuration updated"
 msgstr "Configuration de Calibre-Web mise à jour"
 
-#: cps/templates/admin.html:91 cps/web.py:2765
+#: cps/templates/admin.html:91 cps/web.py:2775
 msgid "UI Configuration"
 msgstr "Configuration de l’interface utilisateur"
 
-#: cps/web.py:2783
+#: cps/web.py:2793
 msgid "Import of optional Google Drive requirements missing"
 msgstr "L’import des pré-requis optionnels pour Google Drive est manquant"
 
-#: cps/web.py:2786
+#: cps/web.py:2796
 msgid "client_secrets.json is missing or not readable"
 msgstr "client_secrets.json est manquant ou ne peut être lu"
 
-#: cps/web.py:2791 cps/web.py:2818
+#: cps/web.py:2801 cps/web.py:2828
 msgid "client_secrets.json is not configured for web application"
 msgstr "client_secrets.json n’est pas configuré pour une application web"
 
-#: cps/templates/admin.html:90 cps/web.py:2821 cps/web.py:2847 cps/web.py:2859
-#: cps/web.py:2901 cps/web.py:2916 cps/web.py:2933 cps/web.py:2940
-#: cps/web.py:2957
+#: cps/templates/admin.html:90 cps/web.py:2831 cps/web.py:2857 cps/web.py:2869
+#: cps/web.py:2911 cps/web.py:2926 cps/web.py:2943 cps/web.py:2950
+#: cps/web.py:2967
 msgid "Basic Configuration"
 msgstr "Configuration principale"
 
-#: cps/web.py:2844
+#: cps/web.py:2854
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr "L’emplacement du fichier de la clé de chiffrement (keyfile) n’est pas valide, veuillez saisir un chemin d’accès correct"
 
-#: cps/web.py:2856
+#: cps/web.py:2866
 msgid "Certfile location is not valid, please enter correct path"
 msgstr "L’emplacement du fichier de certificat (cert) n’est pas valide, veuillez saisir un chemin d’accès correct"
 
-#: cps/web.py:2898
+#: cps/web.py:2908
 msgid "Logfile location is not valid, please enter correct path"
 msgstr "L’emplacement du fichier de Log n’est pas valide, veuillez saisir un chemin d’accès correct"
 
-#: cps/web.py:2937
+#: cps/web.py:2947
 msgid "DB location is not valid, please enter correct path"
 msgstr "L’emplacement du fichier de base de donnée (DB) n’est pas valide, veuillez saisir un chemin d’accès correct"
 
-#: cps/templates/admin.html:31 cps/web.py:3011 cps/web.py:3017 cps/web.py:3033
+#: cps/templates/admin.html:31 cps/web.py:3021 cps/web.py:3027 cps/web.py:3043
 msgid "Add new user"
 msgstr "Ajouter un nouvel utilisateur"
 
-#: cps/web.py:3023
+#: cps/web.py:3033
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Utilisateur '%(user)s' créé"
 
-#: cps/web.py:3027
+#: cps/web.py:3037
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "Un compte existant a été trouvé pour cette adresse de courriel ou pour ce surnom."
 
-#: cps/web.py:3051 cps/web.py:3065
+#: cps/web.py:3061 cps/web.py:3075
 msgid "E-mail server settings updated"
 msgstr "Les paramètres du serveur de courriels ont été mis à jour"
 
-#: cps/web.py:3058
+#: cps/web.py:3068
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "Courriel de test envoyé avec succès sur %(kindlemail)s"
 
-#: cps/web.py:3061
+#: cps/web.py:3071
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "Il y a eu une erreur pendant l’envoi du courriel de test : %(res)s"
 
-#: cps/web.py:3066
+#: cps/web.py:3076
 msgid "Edit e-mail server settings"
 msgstr "Modifier les paramètres du serveur de courriels"
 
-#: cps/web.py:3091
+#: cps/web.py:3101
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Utilisateur '%(nick)s' supprimé"
 
-#: cps/web.py:3200
+#: cps/web.py:3210
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Utilisateur '%(nick)s'  mis à jour"
 
-#: cps/web.py:3203
+#: cps/web.py:3213
 msgid "An unknown error occured."
 msgstr "Oups ! Une erreur inconnue a eu lieu."
 
-#: cps/web.py:3205
+#: cps/web.py:3215
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Éditer l'utilisateur %(nick)s"
 
-#: cps/web.py:3222
+#: cps/web.py:3232
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "Le mot de passe de l’utilisateur %(user)s a été réinitialisé"
 
-#: cps/web.py:3242
+#: cps/web.py:3252
 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:3273 cps/web.py:3549 cps/web.py:3554 cps/web.py:3709
+#: cps/web.py:3279 cps/web.py:3555 cps/web.py:3560 cps/web.py:3715
 msgid "edit metadata"
 msgstr "modifier les métadonnées"
 
-#: cps/web.py:3287 cps/web.py:3579
+#: cps/web.py:3289 cps/web.py:3585
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "L’extension de fichier '%(ext)s' n’est pas autorisée pour être déposée sur ce serveur"
 
-#: cps/web.py:3291 cps/web.py:3583
+#: cps/web.py:3293 cps/web.py:3589
 msgid "File to be uploaded must have an extension"
 msgstr "Pour être déposé le fichier doit avoir une extension"
 
-#: cps/web.py:3303 cps/web.py:3603
+#: cps/web.py:3305 cps/web.py:3609
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Impossible de créer le chemin %(path)s (permission refusée)"
 
-#: cps/web.py:3308
+#: cps/web.py:3310
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Echec de la sauvegarde du fichier %(file)s."
 
-#: cps/web.py:3324
+#: cps/web.py:3326
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "Le format de fichier %(ext)s a été ajouté à %(book)s"
 
-#: cps/web.py:3342
+#: cps/web.py:3343
 #, python-format
 msgid "Failed to create path for cover %(path)s (Permission denied)."
 msgstr "Impossible de créer le chemin d’accès pour la couverture %(path)s (Autorisation refusée)"
 
-#: cps/web.py:3349
+#: cps/web.py:3350
 #, python-format
 msgid "Failed to store cover-file %(cover)s."
 msgstr "Echec de la sauvegarde du fichier de couverture %(cover)s."
 
-#: cps/web.py:3352
+#: cps/web.py:3353
 msgid "Cover-file is not a valid image file"
 msgstr "Le fichier de couverture n’est pas un fichier d’image valide"
 
-#: cps/web.py:3365 cps/web.py:3369
+#: cps/web.py:3370 cps/web.py:3374
 msgid "unknown"
 msgstr "inconnu"
 
-#: cps/web.py:3391
+#: cps/web.py:3396
 msgid "Cover is not a jpg file, can't save"
 msgstr "Le fichier de couverture n’est pas au format jpg, impossible de sauvegarder"
 
-#: cps/web.py:3558
+#: cps/web.py:3442
+#, python-format
+msgid "%(langname)s is not a valid language"
+msgstr ""
+
+#: cps/web.py:3564
 msgid "Error editing book, please check logfile for details"
 msgstr "Erreur d’édition du livre, veuillez consulter le journal (log) pour plus de détails"
 
-#: cps/web.py:3608
+#: cps/web.py:3614
 #, python-format
 msgid "Failed to store file %(file)s (Permission denied)."
 msgstr "Impossible d'enregistrer le fichier %(file)s (permission refusée)"
 
-#: cps/web.py:3613
+#: cps/web.py:3619
 #, python-format
 msgid "Failed to delete file %(file)s (Permission denied)."
 msgstr "Impossible de supprimer le fichier %(file)s (permission refusée)"
 
-#: cps/web.py:3695
+#: cps/web.py:3701
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "Fichier %(file)s déposé"
 
-#: cps/web.py:3725
+#: cps/web.py:3731
 msgid "Source or destination format for conversion missing"
 msgstr "Le format de conversion de la source ou de la destination est manquant"
 
-#: cps/web.py:3735
+#: cps/web.py:3741
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "Le livre a été mis avec succès en file de traitement pour conversion vers %(book_format)s"
 
-#: cps/web.py:3739
+#: cps/web.py:3745
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "Une erreur est survenue au cours de la conversion du livre : %(res)s"
diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po
index 6a21eeae..531ea494 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-09-08 14:49+0200\n"
+"POT-Creation-Date: 2018-09-09 17:57+0200\n"
 "PO-Revision-Date: 2017-04-04 15:09+0200\n"
 "Last-Translator: Marco Picone <marcovendere@gmail.com>\n"
 "Language: it\n"
@@ -121,533 +121,528 @@ msgstr ""
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/web.py:1114
+#: cps/web.py:1127
 msgid "Requesting update package"
 msgstr "Richiesta del pacchetto di aggiornamento"
 
-#: cps/web.py:1115
+#: cps/web.py:1128
 msgid "Downloading update package"
 msgstr "Scaricare il pacchetto di aggiornamento"
 
-#: cps/web.py:1116
+#: cps/web.py:1129
 msgid "Unzipping update package"
 msgstr "Decomprimere pacchetto di aggiornamento"
 
-#: cps/web.py:1117
+#: cps/web.py:1130
 msgid "Files are replaced"
 msgstr "I file vengono sostituiti"
 
-#: cps/web.py:1118
+#: cps/web.py:1131
 msgid "Database connections are closed"
 msgstr "Le connessioni di database sono chiuse"
 
-#: cps/web.py:1119
+#: cps/web.py:1132
 msgid "Server is stopped"
 msgstr "Il server viene arrestato"
 
-#: cps/web.py:1120
+#: cps/web.py:1133
 msgid "Update finished, please press okay and reload page"
 msgstr "Aggiornamento completato, prego premere bene e ricaricare pagina"
 
-#: cps/web.py:1140
+#: cps/web.py:1153
 msgid "Recently Added Books"
 msgstr "Libri aggiunti di recente"
 
-#: cps/web.py:1150
+#: cps/web.py:1163
 msgid "Newest Books"
 msgstr "I più nuovi libri"
 
-#: cps/web.py:1162
+#: cps/web.py:1175
 msgid "Oldest Books"
 msgstr "Libri più vecchi"
 
-#: cps/web.py:1174
+#: cps/web.py:1187
 msgid "Books (A-Z)"
 msgstr "Ebook (A-Z)"
 
-#: cps/web.py:1185
+#: cps/web.py:1198
 msgid "Books (Z-A)"
 msgstr "Ebook (Z-A)"
 
-#: cps/web.py:1214
+#: cps/web.py:1227
 msgid "Hot Books (most downloaded)"
 msgstr "Hot Books (più scaricati)"
 
-#: cps/web.py:1227
+#: cps/web.py:1240
 msgid "Best rated books"
 msgstr "I migliori libri valutati"
 
-#: cps/templates/index.xml:36 cps/web.py:1239
+#: cps/templates/index.xml:36 cps/web.py:1252
 msgid "Random Books"
 msgstr "Libri casuali"
 
-#: cps/web.py:1254
+#: cps/web.py:1267
 msgid "Author list"
 msgstr "Elenco degli autori"
 
-#: cps/web.py:1266 cps/web.py:1329 cps/web.py:1484 cps/web.py:2036
+#: cps/web.py:1279 cps/web.py:1342 cps/web.py:1497 cps/web.py:2049
 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:"
+msgstr "Errore durante l'apertura di eBook. Il file non esiste o il file non è accessibile:"
 
-#: cps/templates/index.xml:73 cps/web.py:1313
+#: cps/templates/index.xml:73 cps/web.py:1326
 msgid "Series list"
 msgstr "Lista delle serie"
 
-#: cps/web.py:1327
+#: cps/web.py:1340
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie :"
 
-#: cps/web.py:1354
+#: cps/web.py:1367
 msgid "Available languages"
 msgstr "Lingue disponibili"
 
-#: cps/web.py:1371
+#: cps/web.py:1384
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Lingue: %(name)s"
 
-#: cps/templates/index.xml:66 cps/web.py:1382
+#: cps/templates/index.xml:66 cps/web.py:1395
 msgid "Category list"
 msgstr "Elenco categorie"
 
-#: cps/web.py:1396
+#: cps/web.py:1409
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoria : %(name)s"
 
-#: cps/templates/layout.html:71 cps/web.py:1535
+#: cps/templates/layout.html:71 cps/web.py:1548
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1565
+#: cps/web.py:1578
 msgid "Statistics"
 msgstr "Statistica"
 
-#: cps/web.py:1670
-msgid ""
-"Callback domain is not verified, please follow steps to verify domain in "
-"google developer console"
+#: cps/web.py:1683
+msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr ""
 
-#: cps/web.py:1746
+#: cps/web.py:1758
 msgid "Server restarted, please reload page"
 msgstr "Server riavviato, ricarica pagina"
 
-#: cps/web.py:1749
+#: cps/web.py:1761
 msgid "Performing shutdown of server, please close window"
 msgstr "Eseguire l'arresto del server, chiudi la finestra."
 
-#: cps/web.py:1767
+#: cps/web.py:1780
 msgid "Update done"
 msgstr "Aggiornamento fatto"
 
-#: cps/web.py:1837
+#: cps/web.py:1850
 msgid "Published after "
 msgstr ""
 
-#: cps/web.py:1844
+#: cps/web.py:1857
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1858
+#: cps/web.py:1871
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1860
+#: cps/web.py:1873
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1919 cps/web.py:1928
+#: cps/web.py:1932 cps/web.py:1941
 msgid "search"
 msgstr "ricerca"
 
 #: cps/templates/index.xml:44 cps/templates/index.xml:48
-#: cps/templates/layout.html:146 cps/web.py:1995
+#: cps/templates/layout.html:146 cps/web.py:2008
 msgid "Read Books"
 msgstr "Leggere libri"
 
 #: cps/templates/index.xml:52 cps/templates/index.xml:56
-#: cps/templates/layout.html:148 cps/web.py:1998
+#: cps/templates/layout.html:148 cps/web.py:2011
 msgid "Unread Books"
 msgstr "Libri non letti"
 
-#: cps/web.py:2046 cps/web.py:2048 cps/web.py:2050 cps/web.py:2062
+#: cps/web.py:2059 cps/web.py:2061 cps/web.py:2063 cps/web.py:2075
 msgid "Read a Book"
 msgstr "Leggere un libro"
 
-#: cps/web.py:2128 cps/web.py:3006
+#: cps/web.py:2141 cps/web.py:3019
 msgid "Please fill out all fields!"
 msgstr "Compila tutti i campi"
 
-#: cps/web.py:2129 cps/web.py:2150 cps/web.py:2154 cps/web.py:2159
-#: cps/web.py:2161
+#: cps/web.py:2142 cps/web.py:2163 cps/web.py:2167 cps/web.py:2172
+#: cps/web.py:2174
 msgid "register"
 msgstr "Registrare"
 
-#: cps/web.py:2149 cps/web.py:3222
+#: cps/web.py:2162 cps/web.py:3235
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/web.py:2152
+#: cps/web.py:2165
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:2155
+#: cps/web.py:2168
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:2158
+#: cps/web.py:2171
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:2175 cps/web.py:2271
+#: cps/web.py:2188 cps/web.py:2284
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "ora sei connesso come : '%(nickname)s'"
 
-#: cps/web.py:2180
+#: cps/web.py:2193
 msgid "Wrong Username or Password"
 msgstr "Nome utente o password errata"
 
-#: cps/web.py:2186 cps/web.py:2207
+#: cps/web.py:2199 cps/web.py:2220
 msgid "login"
 msgstr "Accesso"
 
-#: cps/web.py:2219 cps/web.py:2250
+#: cps/web.py:2232 cps/web.py:2263
 msgid "Token not found"
 msgstr "Token non trovato"
 
-#: cps/web.py:2227 cps/web.py:2258
+#: cps/web.py:2240 cps/web.py:2271
 msgid "Token has expired"
 msgstr "Il token è scaduto"
 
-#: cps/web.py:2235
+#: cps/web.py:2248
 msgid "Success! Please return to your device"
 msgstr "Successo! Torna al tuo dispositivo"
 
-#: cps/web.py:2285
+#: cps/web.py:2298
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configurare prima le impostazioni della posta SMTP..."
 
-#: cps/web.py:2289
+#: cps/web.py:2302
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:2293
+#: cps/web.py:2306
 #, 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:2295 cps/web.py:3060
+#: cps/web.py:2308 cps/web.py:3073
 msgid "Please configure your kindle e-mail address first..."
 msgstr ""
 
-#: cps/web.py:2339
+#: cps/web.py:2352
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "Il libro è stato aggiunto alla mensola: %(sname)s"
 
-#: cps/web.py:2350
+#: cps/web.py:2363
 msgid "Invalid shelf specified"
 msgstr ""
 
-#: cps/web.py:2355
+#: cps/web.py:2368
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %(name)s"
 msgstr ""
 
-#: cps/web.py:2360
+#: cps/web.py:2373
 msgid "User is not allowed to edit public shelves"
 msgstr ""
 
-#: cps/web.py:2378
+#: cps/web.py:2391
 #, python-format
 msgid "Books are already part of the shelf: %(name)s"
 msgstr ""
 
-#: cps/web.py:2392
+#: cps/web.py:2405
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2394
+#: cps/web.py:2407
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2431
+#: cps/web.py:2444
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Il libro è stato rimosso dalla mensola: %(sname)s"
 
-#: cps/web.py:2437
+#: cps/web.py:2450
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2457 cps/web.py:2481
+#: cps/web.py:2470 cps/web.py:2494
 #, 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:2462
+#: cps/web.py:2475
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Mensola %(title)s creato"
 
-#: cps/web.py:2464 cps/web.py:2492
+#: cps/web.py:2477 cps/web.py:2505
 msgid "There was an error"
 msgstr "c'era un errore"
 
-#: cps/web.py:2465 cps/web.py:2467
+#: cps/web.py:2478 cps/web.py:2480
 msgid "create a shelf"
 msgstr "creare uno scaffale"
 
-#: cps/web.py:2490
+#: cps/web.py:2503
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Mensola %(title)s cambiato"
 
-#: cps/web.py:2493 cps/web.py:2495
+#: cps/web.py:2506 cps/web.py:2508
 msgid "Edit a shelf"
 msgstr "Modifica un ripiano"
 
-#: cps/web.py:2516
+#: cps/web.py:2529
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "cancellato con successo il ripiano %(name)s"
 
-#: cps/web.py:2538
+#: cps/web.py:2551
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Mensola: '%(name)s'"
 
-#: cps/web.py:2541
+#: cps/web.py:2554
 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"
+msgstr "Errore durante l'apertura dello scaffale. La mensola non esiste o non è accessibile"
 
-#: cps/web.py:2572
+#: cps/web.py:2585
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Modificare l'ordine della mensola: '%(name)s'"
 
-#: cps/web.py:2601 cps/web.py:3012
+#: cps/web.py:2614 cps/web.py:3025
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/web.py:2603 cps/web.py:2644 cps/web.py:2647
+#: cps/web.py:2616 cps/web.py:2657 cps/web.py:2660
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profilo di %(name)s"
 
-#: cps/web.py:2642
+#: cps/web.py:2655
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/web.py:2645
+#: cps/web.py:2658
 msgid "Profile updated"
 msgstr "Profilo aggiornato"
 
-#: cps/web.py:2657
+#: cps/web.py:2670
 msgid "Unknown"
 msgstr ""
 
-#: cps/web.py:2671
+#: cps/web.py:2684
 msgid "Admin page"
 msgstr "Pagina di amministrazione"
 
-#: cps/web.py:2749 cps/web.py:2922
+#: cps/web.py:2762 cps/web.py:2935
 msgid "Calibre-Web configuration updated"
 msgstr "Aggiornamento della configurazione del calibro-web"
 
-#: cps/templates/admin.html:91 cps/web.py:2762
+#: cps/templates/admin.html:91 cps/web.py:2775
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/web.py:2780
+#: cps/web.py:2793
 msgid "Import of optional Google Drive requirements missing"
 msgstr ""
 
-#: cps/web.py:2783
+#: cps/web.py:2796
 msgid "client_secrets.json is missing or not readable"
 msgstr ""
 
-#: cps/web.py:2788 cps/web.py:2815
+#: cps/web.py:2801 cps/web.py:2828
 msgid "client_secrets.json is not configured for web application"
 msgstr ""
 
-#: cps/templates/admin.html:90 cps/web.py:2818 cps/web.py:2844 cps/web.py:2856
-#: cps/web.py:2898 cps/web.py:2913 cps/web.py:2930 cps/web.py:2937
-#: cps/web.py:2954
+#: cps/templates/admin.html:90 cps/web.py:2831 cps/web.py:2857 cps/web.py:2869
+#: cps/web.py:2911 cps/web.py:2926 cps/web.py:2943 cps/web.py:2950
+#: cps/web.py:2967
 msgid "Basic Configuration"
 msgstr "Configurazione di base"
 
-#: cps/web.py:2841
+#: cps/web.py:2854
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2853
+#: cps/web.py:2866
 msgid "Certfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2895
+#: cps/web.py:2908
 msgid "Logfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2934
+#: cps/web.py:2947
 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:3008 cps/web.py:3014 cps/web.py:3030
+#: cps/templates/admin.html:31 cps/web.py:3021 cps/web.py:3027 cps/web.py:3043
 msgid "Add new user"
 msgstr "Aggiungi un nuovo utente"
 
-#: cps/web.py:3020
+#: cps/web.py:3033
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "utente '%(user)s' creato"
 
-#: cps/web.py:3024
+#: cps/web.py:3037
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/web.py:3048 cps/web.py:3062
+#: cps/web.py:3061 cps/web.py:3075
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/web.py:3055
+#: cps/web.py:3068
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:3058
+#: cps/web.py:3071
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/web.py:3063
+#: cps/web.py:3076
 msgid "Edit e-mail server settings"
 msgstr ""
 
-#: cps/web.py:3088
+#: cps/web.py:3101
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "utente '%(nick)s' cancellati"
 
-#: cps/web.py:3197
+#: cps/web.py:3210
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "utente '%(nick)s'  aggiornato"
 
-#: cps/web.py:3200
+#: cps/web.py:3213
 msgid "An unknown error occured."
 msgstr "Errore imprevisto."
 
-#: cps/web.py:3202
+#: cps/web.py:3215
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Modifica utente %(nick)s"
 
-#: cps/web.py:3219
+#: cps/web.py:3232
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/web.py:3239
+#: cps/web.py:3252
 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"
+msgstr "Errore durante l'apertura di eBook. Il file non esiste o il file non è accessibile"
 
-#: cps/web.py:3270 cps/web.py:3546 cps/web.py:3551 cps/web.py:3706
+#: cps/web.py:3279 cps/web.py:3555 cps/web.py:3560 cps/web.py:3715
 msgid "edit metadata"
 msgstr "modificare la metainformazione"
 
-#: cps/web.py:3284 cps/web.py:3576
+#: cps/web.py:3289 cps/web.py:3585
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
-msgstr ""
-"Non è consentito caricare i file con l'estensione '%(ext)s' a questo "
-"server"
+msgstr "Non è consentito caricare i file con l'estensione '%(ext)s' a questo server"
 
-#: cps/web.py:3288 cps/web.py:3580
+#: cps/web.py:3293 cps/web.py:3589
 msgid "File to be uploaded must have an extension"
 msgstr "Il file da caricare deve avere un'estensione"
 
-#: cps/web.py:3300 cps/web.py:3600
+#: cps/web.py:3305 cps/web.py:3609
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Impossibile creare il percorso %(path)s (autorizzazione negata)"
 
-#: cps/web.py:3305
+#: cps/web.py:3310
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr ""
 
-#: cps/web.py:3321
+#: cps/web.py:3326
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr ""
 
-#: cps/web.py:3339
+#: cps/web.py:3343
 #, python-format
 msgid "Failed to create path for cover %(path)s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:3346
+#: cps/web.py:3350
 #, python-format
 msgid "Failed to store cover-file %(cover)s."
 msgstr ""
 
-#: cps/web.py:3349
+#: cps/web.py:3353
 msgid "Cover-file is not a valid image file"
 msgstr ""
 
-#: cps/web.py:3362 cps/web.py:3366
+#: cps/web.py:3370 cps/web.py:3374
 msgid "unknown"
 msgstr "Sconosciuto"
 
-#: cps/web.py:3388
+#: cps/web.py:3396
 msgid "Cover is not a jpg file, can't save"
 msgstr ""
 
-#: cps/web.py:3555
+#: cps/web.py:3442
+#, python-format
+msgid "%(langname)s is not a valid language"
+msgstr ""
+
+#: cps/web.py:3564
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/web.py:3605
+#: cps/web.py:3614
 #, python-format
 msgid "Failed to store file %(file)s (Permission denied)."
 msgstr "Impossibile archiviare il file %(file)s (autorizzazione negata)"
 
-#: cps/web.py:3610
+#: cps/web.py:3619
 #, python-format
 msgid "Failed to delete file %(file)s (Permission denied)."
 msgstr "Impossibile eliminare il file %(file)s (autorizzazione negata)"
 
-#: cps/web.py:3692
+#: cps/web.py:3701
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/web.py:3722
+#: cps/web.py:3731
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/web.py:3732
+#: cps/web.py:3741
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/web.py:3736
+#: cps/web.py:3745
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
@@ -923,9 +918,7 @@ msgid "Rating"
 msgstr "Valutazione"
 
 #: cps/templates/book_edit.html:87
-msgid ""
-"Cover URL (jpg, cover is downloaded and stored in database, field is "
-"afterwards empty again)"
+msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
 msgstr ""
 
 #: cps/templates/book_edit.html:91
@@ -1301,9 +1294,7 @@ msgstr "Modifica metadati"
 
 #: cps/templates/email_edit.html:15
 msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
-msgstr ""
-"Puerto SMTP (por lo general 25 para SMTP plano, 465 para SSL y 587 para "
-"STARTTLS)"
+msgstr "Puerto SMTP (por lo general 25 para SMTP plano, 465 para SSL y 587 para STARTTLS)"
 
 #: cps/templates/email_edit.html:19
 msgid "Encryption"
@@ -1676,9 +1667,7 @@ msgstr "e accedi"
 
 #: cps/templates/remote_login.html:9
 msgid "Once you do so, you will automatically get logged in on this device."
-msgstr ""
-"Una volta fatto questo, ti verrà automaticamente connesso in questo "
-"dispositivo"
+msgstr "Una volta fatto questo, ti verrà automaticamente connesso in questo dispositivo"
 
 #: cps/templates/search.html:5
 msgid "No Results for:"
@@ -1857,9 +1846,7 @@ msgstr "Download Recenti"
 #~ msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Rename author from: '%(src)s' to "
-#~ "'%(dest)s' failed with error: %(error)s"
+#~ msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 #~ msgstr ""
 
 #~ msgid "Password for user %(user)s reset"
@@ -1881,8 +1868,5 @@ msgstr "Download Recenti"
 #~ msgstr ""
 
 #~ msgid "File extension \"%(ext)s\" is not allowed to be uploaded to this server"
-#~ msgstr ""
-#~ "Non è consentito caricare i file "
-#~ "con l'estensione \"%(ext)s\" a questo "
-#~ "server"
+#~ msgstr "Non è consentito caricare i file con l'estensione \"%(ext)s\" a questo server"
 
diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po
index 82ff9871..ea87fb19 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-09-08 14:49+0200\n"
+"POT-Creation-Date: 2018-09-09 17:57+0200\n"
 "PO-Revision-Date: 2018-02-07 02:20-0500\n"
 "Last-Translator: white <space_white@yahoo.com>\n"
 "Language: ja\n"
@@ -116,525 +116,528 @@ msgstr ""
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/web.py:1114
+#: cps/web.py:1127
 msgid "Requesting update package"
 msgstr "更新パッケージを要求します"
 
-#: cps/web.py:1115
+#: cps/web.py:1128
 msgid "Downloading update package"
 msgstr "更新パッケージをダウンロードします"
 
-#: cps/web.py:1116
+#: cps/web.py:1129
 msgid "Unzipping update package"
 msgstr "更新パッケージをZIP解凍します"
 
-#: cps/web.py:1117
+#: cps/web.py:1130
 msgid "Files are replaced"
 msgstr "ファイルを書き換えました"
 
-#: cps/web.py:1118
+#: cps/web.py:1131
 msgid "Database connections are closed"
 msgstr "データベースの接続が閉じられました"
 
-#: cps/web.py:1119
+#: cps/web.py:1132
 msgid "Server is stopped"
 msgstr "サーバがシャットダウンされました"
 
-#: cps/web.py:1120
+#: cps/web.py:1133
 msgid "Update finished, please press okay and reload page"
 msgstr "更新完了、Okayまたは再読み込みボタンを押してください"
 
-#: cps/web.py:1140
+#: cps/web.py:1153
 msgid "Recently Added Books"
 msgstr "最近追加された本"
 
-#: cps/web.py:1150
+#: cps/web.py:1163
 msgid "Newest Books"
 msgstr "最新の本"
 
-#: cps/web.py:1162
+#: cps/web.py:1175
 msgid "Oldest Books"
 msgstr "最古の本"
 
-#: cps/web.py:1174
+#: cps/web.py:1187
 msgid "Books (A-Z)"
 msgstr "本(A-Z)"
 
-#: cps/web.py:1185
+#: cps/web.py:1198
 msgid "Books (Z-A)"
 msgstr "本 (Z-A)"
 
-#: cps/web.py:1214
+#: cps/web.py:1227
 msgid "Hot Books (most downloaded)"
 msgstr "有名な本(ダウンロード数)"
 
-#: cps/web.py:1227
+#: cps/web.py:1240
 msgid "Best rated books"
 msgstr "最高評判の本"
 
-#: cps/templates/index.xml:36 cps/web.py:1239
+#: cps/templates/index.xml:36 cps/web.py:1252
 msgid "Random Books"
 msgstr "任意の本"
 
-#: cps/web.py:1254
+#: cps/web.py:1267
 msgid "Author list"
 msgstr "著者リスト"
 
-#: cps/web.py:1266 cps/web.py:1329 cps/web.py:1484 cps/web.py:2036
+#: cps/web.py:1279 cps/web.py:1342 cps/web.py:1497 cps/web.py:2049
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "電子本を開けません。ファイルは存在しないまたはアクセスできません"
 
-#: cps/templates/index.xml:73 cps/web.py:1313
+#: cps/templates/index.xml:73 cps/web.py:1326
 msgid "Series list"
 msgstr "叢書リスト"
 
-#: cps/web.py:1327
+#: cps/web.py:1340
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "叢書: %(serie)s"
 
-#: cps/web.py:1354
+#: cps/web.py:1367
 msgid "Available languages"
 msgstr "利用可能な言語"
 
-#: cps/web.py:1371
+#: cps/web.py:1384
 #, python-format
 msgid "Language: %(name)s"
 msgstr "言語: %(name)s"
 
-#: cps/templates/index.xml:66 cps/web.py:1382
+#: cps/templates/index.xml:66 cps/web.py:1395
 msgid "Category list"
 msgstr "カテゴリーリスト"
 
-#: cps/web.py:1396
+#: cps/web.py:1409
 #, python-format
 msgid "Category: %(name)s"
 msgstr "カテゴリー: %(name)s"
 
-#: cps/templates/layout.html:71 cps/web.py:1535
+#: cps/templates/layout.html:71 cps/web.py:1548
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1565
+#: cps/web.py:1578
 msgid "Statistics"
 msgstr "統計"
 
-#: cps/web.py:1670
-msgid ""
-"Callback domain is not verified, please follow steps to verify domain in "
-"google developer console"
+#: cps/web.py:1683
+msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr ""
 
-#: cps/web.py:1746
+#: cps/web.py:1758
 msgid "Server restarted, please reload page"
 msgstr "サーバを再起動しました、ページを再読み込みしてください"
 
-#: cps/web.py:1749
+#: cps/web.py:1761
 msgid "Performing shutdown of server, please close window"
 msgstr "サーバをシャットダウンします、ページを閉じてください"
 
-#: cps/web.py:1767
+#: cps/web.py:1780
 msgid "Update done"
 msgstr "更新完了"
 
-#: cps/web.py:1837
+#: cps/web.py:1850
 msgid "Published after "
 msgstr ""
 
-#: cps/web.py:1844
+#: cps/web.py:1857
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1858
+#: cps/web.py:1871
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1860
+#: cps/web.py:1873
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1919 cps/web.py:1928
+#: cps/web.py:1932 cps/web.py:1941
 msgid "search"
 msgstr "検索"
 
 #: cps/templates/index.xml:44 cps/templates/index.xml:48
-#: cps/templates/layout.html:146 cps/web.py:1995
+#: cps/templates/layout.html:146 cps/web.py:2008
 msgid "Read Books"
 msgstr "既読の本"
 
 #: cps/templates/index.xml:52 cps/templates/index.xml:56
-#: cps/templates/layout.html:148 cps/web.py:1998
+#: cps/templates/layout.html:148 cps/web.py:2011
 msgid "Unread Books"
 msgstr "未読の本"
 
-#: cps/web.py:2046 cps/web.py:2048 cps/web.py:2050 cps/web.py:2062
+#: cps/web.py:2059 cps/web.py:2061 cps/web.py:2063 cps/web.py:2075
 msgid "Read a Book"
 msgstr "本を読む"
 
-#: cps/web.py:2128 cps/web.py:3006
+#: cps/web.py:2141 cps/web.py:3019
 msgid "Please fill out all fields!"
 msgstr "全ての項目を入力してください"
 
-#: cps/web.py:2129 cps/web.py:2150 cps/web.py:2154 cps/web.py:2159
-#: cps/web.py:2161
+#: cps/web.py:2142 cps/web.py:2163 cps/web.py:2167 cps/web.py:2172
+#: cps/web.py:2174
 msgid "register"
 msgstr "登録"
 
-#: cps/web.py:2149 cps/web.py:3222
+#: cps/web.py:2162 cps/web.py:3235
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/web.py:2152
+#: cps/web.py:2165
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:2155
+#: cps/web.py:2168
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:2158
+#: cps/web.py:2171
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:2175 cps/web.py:2271
+#: cps/web.py:2188 cps/web.py:2284
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "%(nickname)s としてログインします"
 
-#: cps/web.py:2180
+#: cps/web.py:2193
 msgid "Wrong Username or Password"
 msgstr "ユーザ名またはパスワードは間違いました"
 
-#: cps/web.py:2186 cps/web.py:2207
+#: cps/web.py:2199 cps/web.py:2220
 msgid "login"
 msgstr "ログイン"
 
-#: cps/web.py:2219 cps/web.py:2250
+#: cps/web.py:2232 cps/web.py:2263
 msgid "Token not found"
 msgstr "トークンは見つかりません"
 
-#: cps/web.py:2227 cps/web.py:2258
+#: cps/web.py:2240 cps/web.py:2271
 msgid "Token has expired"
 msgstr "トークンは失効されました"
 
-#: cps/web.py:2235
+#: cps/web.py:2248
 msgid "Success! Please return to your device"
 msgstr "成功しまた！端末に戻ってください"
 
-#: cps/web.py:2285
+#: cps/web.py:2298
 msgid "Please configure the SMTP mail settings first..."
 msgstr "SMTPメールをまず設定してください"
 
-#: cps/web.py:2289
+#: cps/web.py:2302
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:2293
+#: cps/web.py:2306
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "%(res)s を送信する際にエーラが発生しました"
 
-#: cps/web.py:2295 cps/web.py:3060
+#: cps/web.py:2308 cps/web.py:3073
 msgid "Please configure your kindle e-mail address first..."
 msgstr ""
 
-#: cps/web.py:2339
+#: cps/web.py:2352
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "本 %(sname)s を書架に追加されました"
 
-#: cps/web.py:2350
+#: cps/web.py:2363
 msgid "Invalid shelf specified"
 msgstr ""
 
-#: cps/web.py:2355
+#: cps/web.py:2368
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %(name)s"
 msgstr ""
 
-#: cps/web.py:2360
+#: cps/web.py:2373
 msgid "User is not allowed to edit public shelves"
 msgstr ""
 
-#: cps/web.py:2378
+#: cps/web.py:2391
 #, python-format
 msgid "Books are already part of the shelf: %(name)s"
 msgstr ""
 
-#: cps/web.py:2392
+#: cps/web.py:2405
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2394
+#: cps/web.py:2407
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2431
+#: cps/web.py:2444
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "本 %(sname)s を書架から除去されました"
 
-#: cps/web.py:2437
+#: cps/web.py:2450
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2457 cps/web.py:2481
+#: cps/web.py:2470 cps/web.py:2494
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr "名前を使った書架 '%(title)s'　は既に存在しました"
 
-#: cps/web.py:2462
+#: cps/web.py:2475
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "書架%(title)s は作成されました"
 
-#: cps/web.py:2464 cps/web.py:2492
+#: cps/web.py:2477 cps/web.py:2505
 msgid "There was an error"
 msgstr "エーラが発生しました"
 
-#: cps/web.py:2465 cps/web.py:2467
+#: cps/web.py:2478 cps/web.py:2480
 msgid "create a shelf"
 msgstr "書架を作成する"
 
-#: cps/web.py:2490
+#: cps/web.py:2503
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "書架 %(title)s 変わりました"
 
-#: cps/web.py:2493 cps/web.py:2495
+#: cps/web.py:2506 cps/web.py:2508
 msgid "Edit a shelf"
 msgstr "書架を編集する"
 
-#: cps/web.py:2516
+#: cps/web.py:2529
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "%(name)s の書架を削除されました"
 
-#: cps/web.py:2538
+#: cps/web.py:2551
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "書架: '%(name)s'"
 
-#: cps/web.py:2541
+#: cps/web.py:2554
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "書架を開けません。書架は存在しないまたはアクセスできません"
 
-#: cps/web.py:2572
+#: cps/web.py:2585
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "'%(name)s' の書架の順番を入れ替える"
 
-#: cps/web.py:2601 cps/web.py:3012
+#: cps/web.py:2614 cps/web.py:3025
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/web.py:2603 cps/web.py:2644 cps/web.py:2647
+#: cps/web.py:2616 cps/web.py:2657 cps/web.py:2660
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)sのプロファイル"
 
-#: cps/web.py:2642
+#: cps/web.py:2655
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/web.py:2645
+#: cps/web.py:2658
 msgid "Profile updated"
 msgstr "プロファイルが更新されました"
 
-#: cps/web.py:2657
+#: cps/web.py:2670
 msgid "Unknown"
 msgstr ""
 
-#: cps/web.py:2671
+#: cps/web.py:2684
 msgid "Admin page"
 msgstr "管理者ページ"
 
-#: cps/web.py:2749 cps/web.py:2922
+#: cps/web.py:2762 cps/web.py:2935
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web 設定を更新されました"
 
-#: cps/templates/admin.html:91 cps/web.py:2762
+#: cps/templates/admin.html:91 cps/web.py:2775
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/web.py:2780
+#: cps/web.py:2793
 msgid "Import of optional Google Drive requirements missing"
 msgstr ""
 
-#: cps/web.py:2783
+#: cps/web.py:2796
 msgid "client_secrets.json is missing or not readable"
 msgstr ""
 
-#: cps/web.py:2788 cps/web.py:2815
+#: cps/web.py:2801 cps/web.py:2828
 msgid "client_secrets.json is not configured for web application"
 msgstr ""
 
-#: cps/templates/admin.html:90 cps/web.py:2818 cps/web.py:2844 cps/web.py:2856
-#: cps/web.py:2898 cps/web.py:2913 cps/web.py:2930 cps/web.py:2937
-#: cps/web.py:2954
+#: cps/templates/admin.html:90 cps/web.py:2831 cps/web.py:2857 cps/web.py:2869
+#: cps/web.py:2911 cps/web.py:2926 cps/web.py:2943 cps/web.py:2950
+#: cps/web.py:2967
 msgid "Basic Configuration"
 msgstr "基本設定"
 
-#: cps/web.py:2841
+#: cps/web.py:2854
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2853
+#: cps/web.py:2866
 msgid "Certfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2895
+#: cps/web.py:2908
 msgid "Logfile location is not valid, please enter correct path"
 msgstr "ログファイルの場所は不適切です。正しい場所を入力してください"
 
-#: cps/web.py:2934
+#: cps/web.py:2947
 msgid "DB location is not valid, please enter correct path"
 msgstr "データベースの場所は不適切です。正しい場所を入力してください"
 
-#: cps/templates/admin.html:31 cps/web.py:3008 cps/web.py:3014 cps/web.py:3030
+#: cps/templates/admin.html:31 cps/web.py:3021 cps/web.py:3027 cps/web.py:3043
 msgid "Add new user"
 msgstr "新規ユーザ追加"
 
-#: cps/web.py:3020
+#: cps/web.py:3033
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "ユーザ　'%(user)s' が作成されました"
 
-#: cps/web.py:3024
+#: cps/web.py:3037
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/web.py:3048 cps/web.py:3062
+#: cps/web.py:3061 cps/web.py:3075
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/web.py:3055
+#: cps/web.py:3068
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:3058
+#: cps/web.py:3071
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/web.py:3063
+#: cps/web.py:3076
 msgid "Edit e-mail server settings"
 msgstr ""
 
-#: cps/web.py:3088
+#: cps/web.py:3101
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "ユーザ '%(nick)s' 削除されました"
 
-#: cps/web.py:3197
+#: cps/web.py:3210
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "ユーザ '%(nick)s' 更新されました"
 
-#: cps/web.py:3200
+#: cps/web.py:3213
 msgid "An unknown error occured."
 msgstr "不明のエーラが発生しました"
 
-#: cps/web.py:3202
+#: cps/web.py:3215
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "ユーザ編集 %(nick)s"
 
-#: cps/web.py:3219
+#: cps/web.py:3232
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/web.py:3239
+#: cps/web.py:3252
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "電子本を開けません。ファイルは存在しないまたはアクセスできません"
 
-#: cps/web.py:3270 cps/web.py:3546 cps/web.py:3551 cps/web.py:3706
+#: cps/web.py:3279 cps/web.py:3555 cps/web.py:3560 cps/web.py:3715
 msgid "edit metadata"
 msgstr "メタデータを編集します"
 
-#: cps/web.py:3284 cps/web.py:3576
+#: cps/web.py:3289 cps/web.py:3585
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "ファイル拡張子 '%(ext)s' をこのサーバにアップロードする許可はありません"
 
-#: cps/web.py:3288 cps/web.py:3580
+#: cps/web.py:3293 cps/web.py:3589
 msgid "File to be uploaded must have an extension"
 msgstr "ファイルをアップロードするために拡張子が必要です"
 
-#: cps/web.py:3300 cps/web.py:3600
+#: cps/web.py:3305 cps/web.py:3609
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "場所 %(path)s の作成を失敗しました (許可拒否)"
 
-#: cps/web.py:3305
+#: cps/web.py:3310
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "フアイル %(file)s の保存を失敗しました"
 
-#: cps/web.py:3321
+#: cps/web.py:3326
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr ""
 
-#: cps/web.py:3339
+#: cps/web.py:3343
 #, python-format
 msgid "Failed to create path for cover %(path)s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:3346
+#: cps/web.py:3350
 #, python-format
 msgid "Failed to store cover-file %(cover)s."
 msgstr ""
 
-#: cps/web.py:3349
+#: cps/web.py:3353
 msgid "Cover-file is not a valid image file"
 msgstr ""
 
-#: cps/web.py:3362 cps/web.py:3366
+#: cps/web.py:3370 cps/web.py:3374
 msgid "unknown"
 msgstr "不明"
 
-#: cps/web.py:3388
+#: cps/web.py:3396
 msgid "Cover is not a jpg file, can't save"
 msgstr ""
 
-#: cps/web.py:3555
+#: cps/web.py:3442
+#, python-format
+msgid "%(langname)s is not a valid language"
+msgstr ""
+
+#: cps/web.py:3564
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/web.py:3605
+#: cps/web.py:3614
 #, python-format
 msgid "Failed to store file %(file)s (Permission denied)."
 msgstr "ファイル %(file)s の保存を失敗しました (許可拒否)"
 
-#: cps/web.py:3610
+#: cps/web.py:3619
 #, python-format
 msgid "Failed to delete file %(file)s (Permission denied)."
 msgstr "ファイル %(file)s の削除を失敗しました (許可拒否)"
 
-#: cps/web.py:3692
+#: cps/web.py:3701
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/web.py:3722
+#: cps/web.py:3731
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/web.py:3732
+#: cps/web.py:3741
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/web.py:3736
+#: cps/web.py:3745
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
@@ -910,9 +913,7 @@ msgid "Rating"
 msgstr "評価"
 
 #: cps/templates/book_edit.html:87
-msgid ""
-"Cover URL (jpg, cover is downloaded and stored in database, field is "
-"afterwards empty again)"
+msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
 msgstr ""
 
 #: cps/templates/book_edit.html:91
@@ -1840,9 +1841,7 @@ msgstr "最近ダウンロード"
 #~ msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 #~ msgstr "タイトルを'%(src)s'から'%(dest)s'の改名は失敗しました。エーラ: %(error)s"
 
-#~ msgid ""
-#~ "Rename author from: '%(src)s' to "
-#~ "'%(dest)s' failed with error: %(error)s"
+#~ msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 #~ msgstr "著者を'%(src)s'から'%(dest)s'の改名は失敗しました。エーラ：%(error)s"
 
 #~ msgid "Password for user %(user)s reset"
diff --git a/cps/translations/km/LC_MESSAGES/messages.po b/cps/translations/km/LC_MESSAGES/messages.po
index 4e58453e..85d933ed 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-09-08 14:49+0200\n"
+"POT-Creation-Date: 2018-09-09 17:57+0200\n"
 "PO-Revision-Date: 2018-08-27 17:06+0700\n"
 "Last-Translator: \n"
 "Language: km_KH\n"
@@ -115,527 +115,528 @@ msgstr ""
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/web.py:1114
+#: cps/web.py:1127
 msgid "Requesting update package"
 msgstr "កំពុងស្នើសុំឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/web.py:1115
+#: cps/web.py:1128
 msgid "Downloading update package"
 msgstr "កំពុងទាញយកឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/web.py:1116
+#: cps/web.py:1129
 msgid "Unzipping update package"
 msgstr "កំពុងពន្លាឯកសារបច្ចុប្បន្នភាព"
 
-#: cps/web.py:1117
+#: cps/web.py:1130
 msgid "Files are replaced"
 msgstr "ឯកសារត្រូវបានផ្លាស់ប្តូរ"
 
-#: cps/web.py:1118
+#: cps/web.py:1131
 msgid "Database connections are closed"
 msgstr "ទំនាក់ទំនងទៅមូលដ្ឋានទិន្នន័យត្រូវបានផ្តាច់"
 
-#: cps/web.py:1119
+#: cps/web.py:1132
 msgid "Server is stopped"
 msgstr "ម៉ាស៊ីន server ត្រូវបានបញ្ឈប់"
 
-#: cps/web.py:1120
+#: cps/web.py:1133
 msgid "Update finished, please press okay and reload page"
 msgstr "ការធ្វើបច្ចុប្បន្នភាពបានបញ្ចប់ សូមចុច okay រួចបើកទំព័រជាថ្មី"
 
-#: cps/web.py:1140
+#: cps/web.py:1153
 msgid "Recently Added Books"
 msgstr "សៀវភៅដែលទើបបានបន្ថែម"
 
-#: cps/web.py:1150
+#: cps/web.py:1163
 msgid "Newest Books"
 msgstr "សៀវភៅថ្មីៗជាងគេ"
 
-#: cps/web.py:1162
+#: cps/web.py:1175
 msgid "Oldest Books"
 msgstr "សៀវភៅចាស់ជាងគេ"
 
-#: cps/web.py:1174
+#: cps/web.py:1187
 msgid "Books (A-Z)"
 msgstr "សៀវភៅពី A ទៅ Z"
 
-#: cps/web.py:1185
+#: cps/web.py:1198
 msgid "Books (Z-A)"
 msgstr "សៀវភៅពី Z ទៅ A"
 
-#: cps/web.py:1214
+#: cps/web.py:1227
 msgid "Hot Books (most downloaded)"
 msgstr "សៀវភៅដែលត្រូវបានទាញយកច្រើនជាងគេ"
 
-#: cps/web.py:1227
+#: cps/web.py:1240
 msgid "Best rated books"
 msgstr "សៀវភៅដែលត្រូវបានវាយតម្លៃល្អជាងគេ"
 
-#: cps/templates/index.xml:36 cps/web.py:1239
+#: cps/templates/index.xml:36 cps/web.py:1252
 msgid "Random Books"
 msgstr "សៀវភៅចៃដន្យ"
 
-#: cps/web.py:1254
+#: cps/web.py:1267
 msgid "Author list"
 msgstr "បញ្ជីអ្នកនិពន្ធ"
 
-#: cps/web.py:1266 cps/web.py:1329 cps/web.py:1484 cps/web.py:2036
+#: cps/web.py:1279 cps/web.py:1342 cps/web.py:1497 cps/web.py:2049
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "មានបញ្ហាពេលបើកឯកសារ eBook ។ មិនមានឯកសារនេះ ឬមិនអាចបើកបាន៖"
 
-#: cps/templates/index.xml:73 cps/web.py:1313
+#: cps/templates/index.xml:73 cps/web.py:1326
 msgid "Series list"
 msgstr "បញ្ជីស៊េរី"
 
-#: cps/web.py:1327
+#: cps/web.py:1340
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "ស៊េរី៖ %(serie)s"
 
-#: cps/web.py:1354
+#: cps/web.py:1367
 msgid "Available languages"
 msgstr "ភាសាដែលមាន"
 
-#: cps/web.py:1371
+#: cps/web.py:1384
 #, python-format
 msgid "Language: %(name)s"
 msgstr "ភាសា៖ %(name)s"
 
-#: cps/templates/index.xml:66 cps/web.py:1382
+#: cps/templates/index.xml:66 cps/web.py:1395
 msgid "Category list"
 msgstr "បញ្ជីប្រភេទ"
 
-#: cps/web.py:1396
+#: cps/web.py:1409
 #, python-format
 msgid "Category: %(name)s"
 msgstr "ប្រភេទ៖ %(name)s"
 
-#: cps/templates/layout.html:71 cps/web.py:1535
+#: cps/templates/layout.html:71 cps/web.py:1548
 msgid "Tasks"
 msgstr "កិច្ចការនានា"
 
-#: cps/web.py:1565
+#: cps/web.py:1578
 msgid "Statistics"
 msgstr "ស្ថិតិ"
 
-#: cps/web.py:1670
-msgid ""
-"Callback domain is not verified, please follow steps to verify domain in "
-"google developer console"
-msgstr ""
-"Callback domain មិនទាន់បានផ្ទៀងផ្ទាត់ឲប្រើទេ "
-"សូមធ្វើតាមជំហានដើម្បីផ្ទៀងផ្ទាត់ domain នៅក្នុង Google Developer Console"
+#: cps/web.py:1683
+msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
+msgstr "Callback domain មិនទាន់បានផ្ទៀងផ្ទាត់ឲប្រើទេ សូមធ្វើតាមជំហានដើម្បីផ្ទៀងផ្ទាត់ domain នៅក្នុង Google Developer Console"
 
-#: cps/web.py:1746
+#: cps/web.py:1758
 msgid "Server restarted, please reload page"
 msgstr "ម៉ាស៊ីន server បានដំណើរការម្តងទៀត សូមបើកទំព័រជាថ្មី"
 
-#: cps/web.py:1749
+#: cps/web.py:1761
 msgid "Performing shutdown of server, please close window"
 msgstr "កំពុងបិទម៉ាស៊ីន server សូមបិទផ្ទាំងនេះ"
 
-#: cps/web.py:1767
+#: cps/web.py:1780
 msgid "Update done"
 msgstr "ការធ្វើបច្ចុប្បន្នភាពរួចរាល់"
 
-#: cps/web.py:1837
+#: cps/web.py:1850
 msgid "Published after "
 msgstr "បានបោះពុម្ភក្រោយ  "
 
-#: cps/web.py:1844
+#: cps/web.py:1857
 msgid "Published before "
 msgstr "បានបោះពុម្ភមុន  "
 
-#: cps/web.py:1858
+#: cps/web.py:1871
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "ការវាយតម្លៃ <= %(rating)s"
 
-#: cps/web.py:1860
+#: cps/web.py:1873
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "ការវាយតម្លៃ >= %(rating)s"
 
-#: cps/web.py:1919 cps/web.py:1928
+#: cps/web.py:1932 cps/web.py:1941
 msgid "search"
 msgstr "ស្វែងរក"
 
 #: cps/templates/index.xml:44 cps/templates/index.xml:48
-#: cps/templates/layout.html:146 cps/web.py:1995
+#: cps/templates/layout.html:146 cps/web.py:2008
 msgid "Read Books"
 msgstr "សៀវភៅដែលបានអានរួច"
 
 #: cps/templates/index.xml:52 cps/templates/index.xml:56
-#: cps/templates/layout.html:148 cps/web.py:1998
+#: cps/templates/layout.html:148 cps/web.py:2011
 msgid "Unread Books"
 msgstr "សៀវភៅដែលមិនទាន់បានអាន"
 
-#: cps/web.py:2046 cps/web.py:2048 cps/web.py:2050 cps/web.py:2062
+#: cps/web.py:2059 cps/web.py:2061 cps/web.py:2063 cps/web.py:2075
 msgid "Read a Book"
 msgstr "អានសៀវភៅ"
 
-#: cps/web.py:2128 cps/web.py:3006
+#: cps/web.py:2141 cps/web.py:3019
 msgid "Please fill out all fields!"
 msgstr "សូមបំពេញចន្លោះទាំងអស់!"
 
-#: cps/web.py:2129 cps/web.py:2150 cps/web.py:2154 cps/web.py:2159
-#: cps/web.py:2161
+#: cps/web.py:2142 cps/web.py:2163 cps/web.py:2167 cps/web.py:2172
+#: cps/web.py:2174
 msgid "register"
 msgstr "ចុះឈ្មោះ"
 
-#: cps/web.py:2149 cps/web.py:3222
+#: cps/web.py:2162 cps/web.py:3235
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/web.py:2152
+#: cps/web.py:2165
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:2155
+#: cps/web.py:2168
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:2158
+#: cps/web.py:2171
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:2175 cps/web.py:2271
+#: cps/web.py:2188 cps/web.py:2284
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "ឥឡូវអ្នកបានចូលដោយមានឈ្មោះថា៖ ‘%(nickname)s’"
 
-#: cps/web.py:2180
+#: cps/web.py:2193
 msgid "Wrong Username or Password"
 msgstr "ខុសឈ្មោះអ្នកប្រើប្រាស់ ឬលេខសម្ងាត់"
 
-#: cps/web.py:2186 cps/web.py:2207
+#: cps/web.py:2199 cps/web.py:2220
 msgid "login"
 msgstr "ចូលប្រើ"
 
-#: cps/web.py:2219 cps/web.py:2250
+#: cps/web.py:2232 cps/web.py:2263
 msgid "Token not found"
 msgstr "រកមិនឃើញវត្ថុតាង"
 
-#: cps/web.py:2227 cps/web.py:2258
+#: cps/web.py:2240 cps/web.py:2271
 msgid "Token has expired"
 msgstr "វត្ថុតាងហួសពេលកំណត់"
 
-#: cps/web.py:2235
+#: cps/web.py:2248
 msgid "Success! Please return to your device"
 msgstr "ជោគជ័យ! សូមវិលមកឧបករណ៍អ្នកវិញ"
 
-#: cps/web.py:2285
+#: cps/web.py:2298
 msgid "Please configure the SMTP mail settings first..."
 msgstr "សូមកំណត់អ៊ីមែល SMTP ជាមុនសិន"
 
-#: cps/web.py:2289
+#: cps/web.py:2302
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "សៀវភៅបានចូលជួរសម្រាប់ផ្ញើទៅ %(kindlemail)s ដោយជោគជ័យ"
 
-#: cps/web.py:2293
+#: cps/web.py:2306
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "មានបញ្ហានៅពេលផ្ញើសៀវភៅនេះ៖ %(res)s"
 
-#: cps/web.py:2295 cps/web.py:3060
+#: cps/web.py:2308 cps/web.py:3073
 msgid "Please configure your kindle e-mail address first..."
 msgstr ""
 
-#: cps/web.py:2339
+#: cps/web.py:2352
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "សៀវភៅត្រូវបានបន្ថែមទៅធ្នើ៖ %(sname)s"
 
-#: cps/web.py:2350
+#: cps/web.py:2363
 msgid "Invalid shelf specified"
 msgstr ""
 
-#: cps/web.py:2355
+#: cps/web.py:2368
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %(name)s"
 msgstr ""
 
-#: cps/web.py:2360
+#: cps/web.py:2373
 msgid "User is not allowed to edit public shelves"
 msgstr ""
 
-#: cps/web.py:2378
+#: cps/web.py:2391
 #, python-format
 msgid "Books are already part of the shelf: %(name)s"
 msgstr ""
 
-#: cps/web.py:2392
+#: cps/web.py:2405
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2394
+#: cps/web.py:2407
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2431
+#: cps/web.py:2444
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "សៀវភៅត្រូវបានដកចេញពីធ្នើ៖ %(sname)s"
 
-#: cps/web.py:2437
+#: cps/web.py:2450
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr "សូមអភ័យទោស អ្នកមិនមានសិទ្ធិដកសៀវភៅចេញពីធ្នើនេះទេ៖ %(sname)s"
 
-#: cps/web.py:2457 cps/web.py:2481
+#: cps/web.py:2470 cps/web.py:2494
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr "មានធ្នើដែលមានឈ្មោះ ‘%(title)s’ រួចហើយ។"
 
-#: cps/web.py:2462
+#: cps/web.py:2475
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "ធ្នើឈ្មោះ %(title)s ត្រូវបានបង្កើត"
 
-#: cps/web.py:2464 cps/web.py:2492
+#: cps/web.py:2477 cps/web.py:2505
 msgid "There was an error"
 msgstr "មានបញ្ហា"
 
-#: cps/web.py:2465 cps/web.py:2467
+#: cps/web.py:2478 cps/web.py:2480
 msgid "create a shelf"
 msgstr "បង្កើតធ្នើ"
 
-#: cps/web.py:2490
+#: cps/web.py:2503
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "ធ្នើឈ្មោះ %(title)s ត្រូវបានប្តូរ"
 
-#: cps/web.py:2493 cps/web.py:2495
+#: cps/web.py:2506 cps/web.py:2508
 msgid "Edit a shelf"
 msgstr "កែប្រែធ្នើ"
 
-#: cps/web.py:2516
+#: cps/web.py:2529
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "បានបង្កើតធ្នើឈ្មោះ %(name)s ដោយជោគជ័យ"
 
-#: cps/web.py:2538
+#: cps/web.py:2551
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "ធ្នើ៖ ‘%(name)s’"
 
-#: cps/web.py:2541
+#: cps/web.py:2554
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "មានបញ្ហាពេលបើកធ្នើ។ ពុំមានធ្នើ ឬមិនអាចបើកបាន"
 
-#: cps/web.py:2572
+#: cps/web.py:2585
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "ប្តូរលំដាប់ធ្នើ៖ ‘%(name)s’"
 
-#: cps/web.py:2601 cps/web.py:3012
+#: cps/web.py:2614 cps/web.py:3025
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/web.py:2603 cps/web.py:2644 cps/web.py:2647
+#: cps/web.py:2616 cps/web.py:2657 cps/web.py:2660
 #, python-format
 msgid "%(name)s's profile"
 msgstr "ព័ត៌មានសង្ខេបរបស់ %(name)s"
 
-#: cps/web.py:2642
+#: cps/web.py:2655
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/web.py:2645
+#: cps/web.py:2658
 msgid "Profile updated"
 msgstr "ព័ត៌មានសង្ខេបបានកែប្រែ"
 
-#: cps/web.py:2657
+#: cps/web.py:2670
 msgid "Unknown"
 msgstr "មិនដឹង"
 
-#: cps/web.py:2671
+#: cps/web.py:2684
 msgid "Admin page"
 msgstr "ទំព័ររដ្ឋបាល"
 
-#: cps/web.py:2749 cps/web.py:2922
+#: cps/web.py:2762 cps/web.py:2935
 msgid "Calibre-Web configuration updated"
 msgstr ""
 
-#: cps/templates/admin.html:91 cps/web.py:2762
+#: cps/templates/admin.html:91 cps/web.py:2775
 msgid "UI Configuration"
 msgstr "ការកំណត់ផ្ទាំងប្រើប្រាស់"
 
-#: cps/web.py:2780
+#: cps/web.py:2793
 msgid "Import of optional Google Drive requirements missing"
 msgstr "ខ្វះការនាំចូលតម្រូវការបន្ថែមរបស់ Google Drive"
 
-#: cps/web.py:2783
+#: cps/web.py:2796
 msgid "client_secrets.json is missing or not readable"
 msgstr "មិនមានឯកសារ client_secrets.json ឬមិនអាចបើកបាន"
 
-#: cps/web.py:2788 cps/web.py:2815
+#: cps/web.py:2801 cps/web.py:2828
 msgid "client_secrets.json is not configured for web application"
 msgstr "ឯកសារ client_secrets.json មិនទាន់បានកំណត់សម្រាប់កម្មវិធីវែប"
 
-#: cps/templates/admin.html:90 cps/web.py:2818 cps/web.py:2844 cps/web.py:2856
-#: cps/web.py:2898 cps/web.py:2913 cps/web.py:2930 cps/web.py:2937
-#: cps/web.py:2954
+#: cps/templates/admin.html:90 cps/web.py:2831 cps/web.py:2857 cps/web.py:2869
+#: cps/web.py:2911 cps/web.py:2926 cps/web.py:2943 cps/web.py:2950
+#: cps/web.py:2967
 msgid "Basic Configuration"
 msgstr "ការកំណត់សាមញ្ញ"
 
-#: cps/web.py:2841
+#: cps/web.py:2854
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr "ទីតាំងរបស់ keyfile មិនត្រឹមត្រូវ សូមបញ្ចូលទីតាំងត្រឹមត្រូវ"
 
-#: cps/web.py:2853
+#: cps/web.py:2866
 msgid "Certfile location is not valid, please enter correct path"
 msgstr "ទីតាំងរបស់ certfile មិនត្រឹមត្រូវ សូមបញ្ចូលទីតាំងត្រឹមត្រូវ"
 
-#: cps/web.py:2895
+#: cps/web.py:2908
 msgid "Logfile location is not valid, please enter correct path"
 msgstr "ទីតាំងរបស់ logfile មិនត្រឹមត្រូវ សូមបញ្ចូលទីតាំងត្រឹមត្រូវ"
 
-#: cps/web.py:2934
+#: cps/web.py:2947
 msgid "DB location is not valid, please enter correct path"
 msgstr "ទីតាំងរបស់ database មិនត្រឹមត្រូវ សូមបញ្ចូលទីតាំងត្រឹមត្រូវ"
 
-#: cps/templates/admin.html:31 cps/web.py:3008 cps/web.py:3014 cps/web.py:3030
+#: cps/templates/admin.html:31 cps/web.py:3021 cps/web.py:3027 cps/web.py:3043
 msgid "Add new user"
 msgstr "បន្ថែមអ្នកប្រើប្រាស់ថ្មី"
 
-#: cps/web.py:3020
+#: cps/web.py:3033
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "បានបង្កើតអ្នកប្រើប្រាស់ ‘%(user)s’"
 
-#: cps/web.py:3024
+#: cps/web.py:3037
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/web.py:3048 cps/web.py:3062
+#: cps/web.py:3061 cps/web.py:3075
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/web.py:3055
+#: cps/web.py:3068
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:3058
+#: cps/web.py:3071
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/web.py:3063
+#: cps/web.py:3076
 msgid "Edit e-mail server settings"
 msgstr ""
 
-#: cps/web.py:3088
+#: cps/web.py:3101
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "អ្នកប្រើប្រាស់ ‘%(nick)s’ ត្រូវបានលុប"
 
-#: cps/web.py:3197
+#: cps/web.py:3210
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "អ្នកប្រើប្រាស់ ‘%(nick)s’ ត្រូវបានកែប្រែ"
 
-#: cps/web.py:3200
+#: cps/web.py:3213
 msgid "An unknown error occured."
 msgstr "បញ្ហាដែលមិនដឹងបានកើតឡើង។"
 
-#: cps/web.py:3202
+#: cps/web.py:3215
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "កែប្រែអ្នកប្រើប្រាស់ %(nick)s"
 
-#: cps/web.py:3219
+#: cps/web.py:3232
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/web.py:3239
+#: cps/web.py:3252
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "មានបញ្ហាពេលបើកឯកសារ eBook ។ ពុំមានឯកសារ ឬឯកសារនេះមិនអាចបើកបាន"
 
-#: cps/web.py:3270 cps/web.py:3546 cps/web.py:3551 cps/web.py:3706
+#: cps/web.py:3279 cps/web.py:3555 cps/web.py:3560 cps/web.py:3715
 msgid "edit metadata"
 msgstr "កែប្រែទិន្នន័យមេតា"
 
-#: cps/web.py:3284 cps/web.py:3576
+#: cps/web.py:3289 cps/web.py:3585
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "ឯកសារប្រភេទ '%(ext)s' មិនត្រូវបានអនុញ្ញាតឲអាប់ឡូដទៅម៉ាស៊ីន server នេះទេ"
 
-#: cps/web.py:3288 cps/web.py:3580
+#: cps/web.py:3293 cps/web.py:3589
 msgid "File to be uploaded must have an extension"
 msgstr "ឯកសារដែលត្រូវអាប់ឡូដត្រូវមានកន្ទុយឯកសារ"
 
-#: cps/web.py:3300 cps/web.py:3600
+#: cps/web.py:3305 cps/web.py:3609
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "មិនអាចបង្កើតទីតាំង %(path)s (ពុំមានសិទ្ធិ)។"
 
-#: cps/web.py:3305
+#: cps/web.py:3310
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "មិនអាចរក្សាទុកឯកសារ %(file)s ។"
 
-#: cps/web.py:3321
+#: cps/web.py:3326
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "ឯកសារទម្រង់ %(ext)s ត្រូវបានបន្ថែមទៅ %(book)s"
 
-#: cps/web.py:3339
+#: cps/web.py:3343
 #, python-format
 msgid "Failed to create path for cover %(path)s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:3346
+#: cps/web.py:3350
 #, python-format
 msgid "Failed to store cover-file %(cover)s."
 msgstr ""
 
-#: cps/web.py:3349
+#: cps/web.py:3353
 msgid "Cover-file is not a valid image file"
 msgstr ""
 
-#: cps/web.py:3362 cps/web.py:3366
+#: cps/web.py:3370 cps/web.py:3374
 msgid "unknown"
 msgstr "មិនដឹង"
 
-#: cps/web.py:3388
+#: cps/web.py:3396
 msgid "Cover is not a jpg file, can't save"
 msgstr "គម្របមិនមែនជាឯកសារ JPG មិនអាចរក្សាទុក"
 
-#: cps/web.py:3555
+#: cps/web.py:3442
+#, python-format
+msgid "%(langname)s is not a valid language"
+msgstr ""
+
+#: cps/web.py:3564
 msgid "Error editing book, please check logfile for details"
 msgstr "មានបញ្ហាពេលកែប្រែសៀវភៅ សូមពិនិត្យមើល logfile សម្រាប់ព័ត៌មានបន្ថែម"
 
-#: cps/web.py:3605
+#: cps/web.py:3614
 #, python-format
 msgid "Failed to store file %(file)s (Permission denied)."
 msgstr "មិនអាចរក្សាទុកឯកសារ %(file)s (មិនមានសិទ្ធិ)។"
 
-#: cps/web.py:3610
+#: cps/web.py:3619
 #, python-format
 msgid "Failed to delete file %(file)s (Permission denied)."
 msgstr "មិនអាចលុបឯកសារ %(file)s (មិនមានសិទ្ធិ)។"
 
-#: cps/web.py:3692
+#: cps/web.py:3701
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "ឯកសារ %(file)s ត្រូវបានអាប់ឡូដ"
 
-#: cps/web.py:3722
+#: cps/web.py:3731
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/web.py:3732
+#: cps/web.py:3741
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/web.py:3736
+#: cps/web.py:3745
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
@@ -911,12 +912,8 @@ msgid "Rating"
 msgstr "ការវាយតម្លៃ"
 
 #: cps/templates/book_edit.html:87
-msgid ""
-"Cover URL (jpg, cover is downloaded and stored in database, field is "
-"afterwards empty again)"
-msgstr ""
-"URL របស់ក្របមុខ (ឯកសារ JPG ក្របមុខត្រូវបានទាញយក និងរក្សាទុកក្នុង database"
-" ក្រោយមកចន្លោះនេះទទេម្តងទៀត)"
+msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
+msgstr "URL របស់ក្របមុខ (ឯកសារ JPG ក្របមុខត្រូវបានទាញយក និងរក្សាទុកក្នុង database ក្រោយមកចន្លោះនេះទទេម្តងទៀត)"
 
 #: cps/templates/book_edit.html:91
 msgid "Upload Cover from local drive"
@@ -1291,9 +1288,7 @@ msgstr "កែប្រែទិន្នន័យមេតា"
 
 #: cps/templates/email_edit.html:15
 msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
-msgstr ""
-"លេខ port SMTP (ជាធម្មតាលេខ 25 សម្រាប់ SMTP ធម្មតា ឬ 465 សម្រាប់ SSL ឬ 587"
-" សម្រាប់ STARTTLS)"
+msgstr "លេខ port SMTP (ជាធម្មតាលេខ 25 សម្រាប់ SMTP ធម្មតា ឬ 465 សម្រាប់ SSL ឬ 587 សម្រាប់ STARTTLS)"
 
 #: cps/templates/email_edit.html:19
 msgid "Encryption"
@@ -1845,9 +1840,7 @@ msgstr "ការទាញយកថ្មីៗ"
 #~ msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 #~ msgstr "ប្តូរចំណងជើងពី “%(src)s” ទៅជា “%(dest)s” បរាជ័យដោយបញ្ហា: %(error)s"
 
-#~ msgid ""
-#~ "Rename author from: '%(src)s' to "
-#~ "'%(dest)s' failed with error: %(error)s"
+#~ msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 #~ msgstr "ប្តូរអ្នកនិពន្ធពី “%(src)s” ទៅជា “%(dest)s” បរាជ័យដោយបញ្ហា: %(error)s"
 
 #~ msgid "Password for user %(user)s reset"
diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po
index 268d9006..b46a2cd7 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-09-08 14:49+0200\n"
+"POT-Creation-Date: 2018-09-09 17:57+0200\n"
 "PO-Revision-Date: 2017-06-21 20:15+0200\n"
 "Last-Translator: \n"
 "Language: nl\n"
@@ -129,531 +129,528 @@ msgstr ""
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/web.py:1114
+#: cps/web.py:1127
 msgid "Requesting update package"
 msgstr "Update pakket wordt aangevraagd"
 
-#: cps/web.py:1115
+#: cps/web.py:1128
 msgid "Downloading update package"
 msgstr "Update pakket wordt gedownload"
 
-#: cps/web.py:1116
+#: cps/web.py:1129
 msgid "Unzipping update package"
 msgstr "Update pakket wordt uitgepakt"
 
-#: cps/web.py:1117
+#: cps/web.py:1130
 msgid "Files are replaced"
 msgstr "Bestanden zijn vervangen"
 
-#: cps/web.py:1118
+#: cps/web.py:1131
 msgid "Database connections are closed"
 msgstr "Database verbindingen zijn gesloten"
 
-#: cps/web.py:1119
+#: cps/web.py:1132
 msgid "Server is stopped"
 msgstr "Server is gestopt"
 
-#: cps/web.py:1120
+#: cps/web.py:1133
 msgid "Update finished, please press okay and reload page"
 msgstr "Update voltooid, klik op ok en herlaad de pagina"
 
-#: cps/web.py:1140
+#: cps/web.py:1153
 msgid "Recently Added Books"
 msgstr "Recent toegevoegde boeken"
 
-#: cps/web.py:1150
+#: cps/web.py:1163
 msgid "Newest Books"
 msgstr "Nieuwste boeken"
 
-#: cps/web.py:1162
+#: cps/web.py:1175
 msgid "Oldest Books"
 msgstr "Oudste boeken"
 
-#: cps/web.py:1174
+#: cps/web.py:1187
 msgid "Books (A-Z)"
 msgstr "Boeken (A-Z)"
 
-#: cps/web.py:1185
+#: cps/web.py:1198
 msgid "Books (Z-A)"
 msgstr "Boeken (A-Z)"
 
-#: cps/web.py:1214
+#: cps/web.py:1227
 msgid "Hot Books (most downloaded)"
 msgstr "Populaire boeken (meeste downloads)"
 
-#: cps/web.py:1227
+#: cps/web.py:1240
 msgid "Best rated books"
 msgstr "Best beoordeelde boeken"
 
-#: cps/templates/index.xml:36 cps/web.py:1239
+#: cps/templates/index.xml:36 cps/web.py:1252
 msgid "Random Books"
 msgstr "Willekeurige boeken"
 
-#: cps/web.py:1254
+#: cps/web.py:1267
 msgid "Author list"
 msgstr "Auteur lijst"
 
-#: cps/web.py:1266 cps/web.py:1329 cps/web.py:1484 cps/web.py:2036
+#: cps/web.py:1279 cps/web.py:1342 cps/web.py:1497 cps/web.py:2049
 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:"
+msgstr "Fout bij openen van het boek. Bestand bestaat niet of is niet toegankelijk:"
 
-#: cps/templates/index.xml:73 cps/web.py:1313
+#: cps/templates/index.xml:73 cps/web.py:1326
 msgid "Series list"
 msgstr "Serie lijst"
 
-#: cps/web.py:1327
+#: cps/web.py:1340
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie: %(serie)s"
 
-#: cps/web.py:1354
+#: cps/web.py:1367
 msgid "Available languages"
 msgstr "Beschikbare talen"
 
-#: cps/web.py:1371
+#: cps/web.py:1384
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Taal: %(name)s"
 
-#: cps/templates/index.xml:66 cps/web.py:1382
+#: cps/templates/index.xml:66 cps/web.py:1395
 msgid "Category list"
 msgstr "Categorie lijst"
 
-#: cps/web.py:1396
+#: cps/web.py:1409
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categorie: %(name)s"
 
-#: cps/templates/layout.html:71 cps/web.py:1535
+#: cps/templates/layout.html:71 cps/web.py:1548
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1565
+#: cps/web.py:1578
 msgid "Statistics"
 msgstr "Statistieken"
 
-#: cps/web.py:1670
-msgid ""
-"Callback domain is not verified, please follow steps to verify domain in "
-"google developer console"
+#: cps/web.py:1683
+msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr ""
 
-#: cps/web.py:1746
+#: cps/web.py:1758
 msgid "Server restarted, please reload page"
 msgstr "Server herstart, gelieve de pagina herladen"
 
-#: cps/web.py:1749
+#: cps/web.py:1761
 msgid "Performing shutdown of server, please close window"
 msgstr "Bezig met het stoppen van de server, gelieve venster te sluiten"
 
-#: cps/web.py:1767
+#: cps/web.py:1780
 msgid "Update done"
 msgstr "Update voltooid"
 
-#: cps/web.py:1837
+#: cps/web.py:1850
 msgid "Published after "
 msgstr ""
 
-#: cps/web.py:1844
+#: cps/web.py:1857
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1858
+#: cps/web.py:1871
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1860
+#: cps/web.py:1873
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1919 cps/web.py:1928
+#: cps/web.py:1932 cps/web.py:1941
 msgid "search"
 msgstr "zoek"
 
 #: cps/templates/index.xml:44 cps/templates/index.xml:48
-#: cps/templates/layout.html:146 cps/web.py:1995
+#: cps/templates/layout.html:146 cps/web.py:2008
 msgid "Read Books"
 msgstr "Gelezen Boeken"
 
 #: cps/templates/index.xml:52 cps/templates/index.xml:56
-#: cps/templates/layout.html:148 cps/web.py:1998
+#: cps/templates/layout.html:148 cps/web.py:2011
 msgid "Unread Books"
 msgstr "Ongelezen Boeken"
 
-#: cps/web.py:2046 cps/web.py:2048 cps/web.py:2050 cps/web.py:2062
+#: cps/web.py:2059 cps/web.py:2061 cps/web.py:2063 cps/web.py:2075
 msgid "Read a Book"
 msgstr "Lees een boek"
 
-#: cps/web.py:2128 cps/web.py:3006
+#: cps/web.py:2141 cps/web.py:3019
 msgid "Please fill out all fields!"
 msgstr "Gelieve alle velden in te vullen!"
 
-#: cps/web.py:2129 cps/web.py:2150 cps/web.py:2154 cps/web.py:2159
-#: cps/web.py:2161
+#: cps/web.py:2142 cps/web.py:2163 cps/web.py:2167 cps/web.py:2172
+#: cps/web.py:2174
 msgid "register"
 msgstr "registreer"
 
-#: cps/web.py:2149 cps/web.py:3222
+#: cps/web.py:2162 cps/web.py:3235
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/web.py:2152
+#: cps/web.py:2165
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:2155
+#: cps/web.py:2168
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:2158
+#: cps/web.py:2171
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:2175 cps/web.py:2271
+#: cps/web.py:2188 cps/web.py:2284
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "je bent nu ingelogd als: '%(nickname)s'"
 
-#: cps/web.py:2180
+#: cps/web.py:2193
 msgid "Wrong Username or Password"
 msgstr "Verkeerde gebruikersnaam of Wachtwoord"
 
-#: cps/web.py:2186 cps/web.py:2207
+#: cps/web.py:2199 cps/web.py:2220
 msgid "login"
 msgstr "login"
 
-#: cps/web.py:2219 cps/web.py:2250
+#: cps/web.py:2232 cps/web.py:2263
 msgid "Token not found"
 msgstr "Token niet gevonden"
 
-#: cps/web.py:2227 cps/web.py:2258
+#: cps/web.py:2240 cps/web.py:2271
 msgid "Token has expired"
 msgstr "Token is verlopen"
 
-#: cps/web.py:2235
+#: cps/web.py:2248
 msgid "Success! Please return to your device"
 msgstr "Gelukt! Ga terug naar je apparaat"
 
-#: cps/web.py:2285
+#: cps/web.py:2298
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Gelieve de SMTP mail instellingen eerst te configureren..."
 
-#: cps/web.py:2289
+#: cps/web.py:2302
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:2293
+#: cps/web.py:2306
 #, 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:2295 cps/web.py:3060
+#: cps/web.py:2308 cps/web.py:3073
 msgid "Please configure your kindle e-mail address first..."
 msgstr ""
 
-#: cps/web.py:2339
+#: cps/web.py:2352
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "Boek werd toegevoegd aan boekenplank: %(sname)s"
 
-#: cps/web.py:2350
+#: cps/web.py:2363
 msgid "Invalid shelf specified"
 msgstr ""
 
-#: cps/web.py:2355
+#: cps/web.py:2368
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %(name)s"
 msgstr ""
 
-#: cps/web.py:2360
+#: cps/web.py:2373
 msgid "User is not allowed to edit public shelves"
 msgstr ""
 
-#: cps/web.py:2378
+#: cps/web.py:2391
 #, python-format
 msgid "Books are already part of the shelf: %(name)s"
 msgstr ""
 
-#: cps/web.py:2392
+#: cps/web.py:2405
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2394
+#: cps/web.py:2407
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2431
+#: cps/web.py:2444
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Boek werd verwijderd van boekenplank: %(sname)s"
 
-#: cps/web.py:2437
+#: cps/web.py:2450
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2457 cps/web.py:2481
+#: cps/web.py:2470 cps/web.py:2494
 #, 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:2462
+#: cps/web.py:2475
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Boekenplank %(title)s aangemaakt"
 
-#: cps/web.py:2464 cps/web.py:2492
+#: cps/web.py:2477 cps/web.py:2505
 msgid "There was an error"
 msgstr "Er deed zich een fout voor"
 
-#: cps/web.py:2465 cps/web.py:2467
+#: cps/web.py:2478 cps/web.py:2480
 msgid "create a shelf"
 msgstr "maak een boekenplank"
 
-#: cps/web.py:2490
+#: cps/web.py:2503
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Boekenplank %(title)s gewijzigd"
 
-#: cps/web.py:2493 cps/web.py:2495
+#: cps/web.py:2506 cps/web.py:2508
 msgid "Edit a shelf"
 msgstr "Bewerk een boekenplank"
 
-#: cps/web.py:2516
+#: cps/web.py:2529
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "Boekenplank %(name)s succesvol gewist"
 
-#: cps/web.py:2538
+#: cps/web.py:2551
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Boekenplank: '%(name)s'"
 
-#: cps/web.py:2541
+#: cps/web.py:2554
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
-msgstr ""
-"Fout bij openen boekenplank. Boekenplank bestaat niet of is niet "
-"toegankelijk"
+msgstr "Fout bij openen boekenplank. Boekenplank bestaat niet of is niet toegankelijk"
 
-#: cps/web.py:2572
+#: cps/web.py:2585
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Verander volgorde van Boekenplank: '%(name)s'"
 
-#: cps/web.py:2601 cps/web.py:3012
+#: cps/web.py:2614 cps/web.py:3025
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/web.py:2603 cps/web.py:2644 cps/web.py:2647
+#: cps/web.py:2616 cps/web.py:2657 cps/web.py:2660
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's profiel"
 
-#: cps/web.py:2642
+#: cps/web.py:2655
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/web.py:2645
+#: cps/web.py:2658
 msgid "Profile updated"
 msgstr "Profiel aangepast"
 
-#: cps/web.py:2657
+#: cps/web.py:2670
 msgid "Unknown"
 msgstr ""
 
-#: cps/web.py:2671
+#: cps/web.py:2684
 msgid "Admin page"
 msgstr "Administratie pagina"
 
-#: cps/web.py:2749 cps/web.py:2922
+#: cps/web.py:2762 cps/web.py:2935
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web configuratie aangepast"
 
-#: cps/templates/admin.html:91 cps/web.py:2762
+#: cps/templates/admin.html:91 cps/web.py:2775
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/web.py:2780
+#: cps/web.py:2793
 msgid "Import of optional Google Drive requirements missing"
 msgstr ""
 
-#: cps/web.py:2783
+#: cps/web.py:2796
 msgid "client_secrets.json is missing or not readable"
 msgstr ""
 
-#: cps/web.py:2788 cps/web.py:2815
+#: cps/web.py:2801 cps/web.py:2828
 msgid "client_secrets.json is not configured for web application"
 msgstr ""
 
-#: cps/templates/admin.html:90 cps/web.py:2818 cps/web.py:2844 cps/web.py:2856
-#: cps/web.py:2898 cps/web.py:2913 cps/web.py:2930 cps/web.py:2937
-#: cps/web.py:2954
+#: cps/templates/admin.html:90 cps/web.py:2831 cps/web.py:2857 cps/web.py:2869
+#: cps/web.py:2911 cps/web.py:2926 cps/web.py:2943 cps/web.py:2950
+#: cps/web.py:2967
 msgid "Basic Configuration"
 msgstr "Basis configuratie"
 
-#: cps/web.py:2841
+#: cps/web.py:2854
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2853
+#: cps/web.py:2866
 msgid "Certfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2895
+#: cps/web.py:2908
 msgid "Logfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2934
+#: cps/web.py:2947
 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:3008 cps/web.py:3014 cps/web.py:3030
+#: cps/templates/admin.html:31 cps/web.py:3021 cps/web.py:3027 cps/web.py:3043
 msgid "Add new user"
 msgstr "Voeg nieuwe gebruiker toe"
 
-#: cps/web.py:3020
+#: cps/web.py:3033
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Gebruiker '%(user)s' aangemaakt"
 
-#: cps/web.py:3024
+#: cps/web.py:3037
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/web.py:3048 cps/web.py:3062
+#: cps/web.py:3061 cps/web.py:3075
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/web.py:3055
+#: cps/web.py:3068
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:3058
+#: cps/web.py:3071
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/web.py:3063
+#: cps/web.py:3076
 msgid "Edit e-mail server settings"
 msgstr ""
 
-#: cps/web.py:3088
+#: cps/web.py:3101
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Gebruiker '%(nick)s' verwijderd"
 
-#: cps/web.py:3197
+#: cps/web.py:3210
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Gebruiker '%(nick)s' aangepast"
 
-#: cps/web.py:3200
+#: cps/web.py:3213
 msgid "An unknown error occured."
 msgstr "Een onbekende fout deed zich voor."
 
-#: cps/web.py:3202
+#: cps/web.py:3215
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Bewerk gebruiker '%(nick)s'"
 
-#: cps/web.py:3219
+#: cps/web.py:3232
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/web.py:3239
+#: cps/web.py:3252
 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:3270 cps/web.py:3546 cps/web.py:3551 cps/web.py:3706
+#: cps/web.py:3279 cps/web.py:3555 cps/web.py:3560 cps/web.py:3715
 msgid "edit metadata"
 msgstr "Bewerk metadata"
 
-#: cps/web.py:3284 cps/web.py:3576
+#: cps/web.py:3289 cps/web.py:3585
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
-msgstr ""
-"Het uploaden van bestandsextensie '%(ext)s' is niet toegestaan op deze "
-"server"
+msgstr "Het uploaden van bestandsextensie '%(ext)s' is niet toegestaan op deze server"
 
-#: cps/web.py:3288 cps/web.py:3580
+#: cps/web.py:3293 cps/web.py:3589
 msgid "File to be uploaded must have an extension"
 msgstr "Up te loaden bestanden dienen een extensie te hebben"
 
-#: cps/web.py:3300 cps/web.py:3600
+#: cps/web.py:3305 cps/web.py:3609
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Het pad %(path)s aanmaken mislukt (Geen toestemming)."
 
-#: cps/web.py:3305
+#: cps/web.py:3310
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "Bestand opslaan niet gelukt voor %(file)s."
 
-#: cps/web.py:3321
+#: cps/web.py:3326
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr ""
 
-#: cps/web.py:3339
+#: cps/web.py:3343
 #, python-format
 msgid "Failed to create path for cover %(path)s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:3346
+#: cps/web.py:3350
 #, python-format
 msgid "Failed to store cover-file %(cover)s."
 msgstr ""
 
-#: cps/web.py:3349
+#: cps/web.py:3353
 msgid "Cover-file is not a valid image file"
 msgstr ""
 
-#: cps/web.py:3362 cps/web.py:3366
+#: cps/web.py:3370 cps/web.py:3374
 msgid "unknown"
 msgstr "onbekend"
 
-#: cps/web.py:3388
+#: cps/web.py:3396
 msgid "Cover is not a jpg file, can't save"
 msgstr ""
 
-#: cps/web.py:3555
+#: cps/web.py:3442
+#, python-format
+msgid "%(langname)s is not a valid language"
+msgstr ""
+
+#: cps/web.py:3564
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/web.py:3605
+#: cps/web.py:3614
 #, python-format
 msgid "Failed to store file %(file)s (Permission denied)."
 msgstr "Bestand %(file)s opslaan mislukt (Geen toestemming)."
 
-#: cps/web.py:3610
+#: cps/web.py:3619
 #, python-format
 msgid "Failed to delete file %(file)s (Permission denied)."
 msgstr "Bestand %(file)s wissen mislukt (Geen toestemming)."
 
-#: cps/web.py:3692
+#: cps/web.py:3701
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/web.py:3722
+#: cps/web.py:3731
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/web.py:3732
+#: cps/web.py:3741
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/web.py:3736
+#: cps/web.py:3745
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
@@ -929,9 +926,7 @@ msgid "Rating"
 msgstr "Beoordeling"
 
 #: cps/templates/book_edit.html:87
-msgid ""
-"Cover URL (jpg, cover is downloaded and stored in database, field is "
-"afterwards empty again)"
+msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
 msgstr ""
 
 #: cps/templates/book_edit.html:91
@@ -1307,9 +1302,7 @@ msgstr "Bewerk metadata"
 
 #: cps/templates/email_edit.html:15
 msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
-msgstr ""
-"SMTP poort (meestal 25 voor normale SMTP en 465 voor SSL en 587 voor "
-"STARTTLS)"
+msgstr "SMTP poort (meestal 25 voor normale SMTP en 465 voor SSL en 587 voor STARTTLS)"
 
 #: cps/templates/email_edit.html:19
 msgid "Encryption"
@@ -1867,9 +1860,7 @@ msgstr "Recente Downloads"
 #~ msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Rename author from: '%(src)s' to "
-#~ "'%(dest)s' failed with error: %(error)s"
+#~ msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 #~ msgstr ""
 
 #~ msgid "Password for user %(user)s reset"
@@ -1891,7 +1882,5 @@ msgstr "Recente Downloads"
 #~ msgstr ""
 
 #~ msgid "File extension \"%(ext)s\" is not allowed to be uploaded to this server"
-#~ msgstr ""
-#~ "Het uploaden van bestandsextensie \"%(ext)s\""
-#~ " is niet toegestaan op deze server"
+#~ msgstr "Het uploaden van bestandsextensie \"%(ext)s\" is niet toegestaan op deze server"
 
diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po
index 4eafc524..c458476f 100644
--- a/cps/translations/pl/LC_MESSAGES/messages.po
+++ b/cps/translations/pl/LC_MESSAGES/messages.po
@@ -12,13 +12,12 @@ 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-09-08 14:49+0200\n"
+"POT-Creation-Date: 2018-09-09 17:57+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"
 "Language-Team: \n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && "
-"(n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -120,527 +119,528 @@ msgstr ""
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/web.py:1114
+#: cps/web.py:1127
 msgid "Requesting update package"
 msgstr "Żądanie o pakiet aktualizacji"
 
-#: cps/web.py:1115
+#: cps/web.py:1128
 msgid "Downloading update package"
 msgstr "Pobieranie pakietu aktualizacji"
 
-#: cps/web.py:1116
+#: cps/web.py:1129
 msgid "Unzipping update package"
 msgstr "Rozpakowywanie pakietu aktualizacji"
 
-#: cps/web.py:1117
+#: cps/web.py:1130
 msgid "Files are replaced"
 msgstr "Pliki zostały zastąpione"
 
-#: cps/web.py:1118
+#: cps/web.py:1131
 msgid "Database connections are closed"
 msgstr "Połączenia z bazą danych zostały zakończone"
 
-#: cps/web.py:1119
+#: cps/web.py:1132
 msgid "Server is stopped"
 msgstr "Serwer jest zatrzymany"
 
-#: cps/web.py:1120
+#: cps/web.py:1133
 msgid "Update finished, please press okay and reload page"
 msgstr "Aktualizacja zakończona, proszę nacisnąć OK i odświeżyć stronę"
 
-#: cps/web.py:1140
+#: cps/web.py:1153
 msgid "Recently Added Books"
 msgstr ""
 
-#: cps/web.py:1150
+#: cps/web.py:1163
 msgid "Newest Books"
 msgstr ""
 
-#: cps/web.py:1162
+#: cps/web.py:1175
 msgid "Oldest Books"
 msgstr ""
 
-#: cps/web.py:1174
+#: cps/web.py:1187
 msgid "Books (A-Z)"
 msgstr ""
 
-#: cps/web.py:1185
+#: cps/web.py:1198
 msgid "Books (Z-A)"
 msgstr ""
 
-#: cps/web.py:1214
+#: cps/web.py:1227
 msgid "Hot Books (most downloaded)"
 msgstr "Najpopularniejsze książki (najczęściej pobierane)"
 
-#: cps/web.py:1227
+#: cps/web.py:1240
 msgid "Best rated books"
 msgstr "Najlepiej oceniane książki"
 
-#: cps/templates/index.xml:36 cps/web.py:1239
+#: cps/templates/index.xml:36 cps/web.py:1252
 msgid "Random Books"
 msgstr "Losowe książki"
 
-#: cps/web.py:1254
+#: cps/web.py:1267
 msgid "Author list"
 msgstr "Lista autorów"
 
-#: cps/web.py:1266 cps/web.py:1329 cps/web.py:1484 cps/web.py:2036
+#: cps/web.py:1279 cps/web.py:1342 cps/web.py:1497 cps/web.py:2049
 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:1313
+#: cps/templates/index.xml:73 cps/web.py:1326
 msgid "Series list"
 msgstr "Lista serii"
 
-#: cps/web.py:1327
+#: cps/web.py:1340
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Seria: %(serie)s"
 
-#: cps/web.py:1354
+#: cps/web.py:1367
 msgid "Available languages"
 msgstr "Dostępne języki"
 
-#: cps/web.py:1371
+#: cps/web.py:1384
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Język: %(name)s"
 
-#: cps/templates/index.xml:66 cps/web.py:1382
+#: cps/templates/index.xml:66 cps/web.py:1395
 msgid "Category list"
 msgstr "Lista kategorii"
 
-#: cps/web.py:1396
+#: cps/web.py:1409
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategoria: %(name)s"
 
-#: cps/templates/layout.html:71 cps/web.py:1535
+#: cps/templates/layout.html:71 cps/web.py:1548
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1565
+#: cps/web.py:1578
 msgid "Statistics"
 msgstr "Statystyki"
 
-#: cps/web.py:1670
-msgid ""
-"Callback domain is not verified, please follow steps to verify domain in "
-"google developer console"
+#: cps/web.py:1683
+msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr ""
 
-#: cps/web.py:1746
+#: cps/web.py:1758
 msgid "Server restarted, please reload page"
 msgstr "Serwer uruchomiony ponownie, proszę odświeżyć stronę"
 
-#: cps/web.py:1749
+#: cps/web.py:1761
 msgid "Performing shutdown of server, please close window"
 msgstr "Wykonano wyłączenie serwera, proszę zamknąć okno"
 
-#: cps/web.py:1767
+#: cps/web.py:1780
 msgid "Update done"
 msgstr "Aktualizacja zakończona"
 
-#: cps/web.py:1837
+#: cps/web.py:1850
 msgid "Published after "
 msgstr ""
 
-#: cps/web.py:1844
+#: cps/web.py:1857
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1858
+#: cps/web.py:1871
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1860
+#: cps/web.py:1873
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1919 cps/web.py:1928
+#: cps/web.py:1932 cps/web.py:1941
 msgid "search"
 msgstr "szukaj"
 
 #: cps/templates/index.xml:44 cps/templates/index.xml:48
-#: cps/templates/layout.html:146 cps/web.py:1995
+#: cps/templates/layout.html:146 cps/web.py:2008
 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:1998
+#: cps/templates/layout.html:148 cps/web.py:2011
 msgid "Unread Books"
 msgstr "Nieprzeczytane książki"
 
-#: cps/web.py:2046 cps/web.py:2048 cps/web.py:2050 cps/web.py:2062
+#: cps/web.py:2059 cps/web.py:2061 cps/web.py:2063 cps/web.py:2075
 msgid "Read a Book"
 msgstr "Czytaj książkę"
 
-#: cps/web.py:2128 cps/web.py:3006
+#: cps/web.py:2141 cps/web.py:3019
 msgid "Please fill out all fields!"
 msgstr "Proszę wypełnić wszystkie pola!"
 
-#: cps/web.py:2129 cps/web.py:2150 cps/web.py:2154 cps/web.py:2159
-#: cps/web.py:2161
+#: cps/web.py:2142 cps/web.py:2163 cps/web.py:2167 cps/web.py:2172
+#: cps/web.py:2174
 msgid "register"
 msgstr "rejestracja"
 
-#: cps/web.py:2149 cps/web.py:3222
+#: cps/web.py:2162 cps/web.py:3235
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/web.py:2152
+#: cps/web.py:2165
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:2155
+#: cps/web.py:2168
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:2158
+#: cps/web.py:2171
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:2175 cps/web.py:2271
+#: cps/web.py:2188 cps/web.py:2284
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Zalogowałeś się jako: '%(nickname)s'"
 
-#: cps/web.py:2180
+#: cps/web.py:2193
 msgid "Wrong Username or Password"
 msgstr "Błędna nazwa użytkownika lub hasło"
 
-#: cps/web.py:2186 cps/web.py:2207
+#: cps/web.py:2199 cps/web.py:2220
 msgid "login"
 msgstr "logowanie"
 
-#: cps/web.py:2219 cps/web.py:2250
+#: cps/web.py:2232 cps/web.py:2263
 msgid "Token not found"
 msgstr ""
 
-#: cps/web.py:2227 cps/web.py:2258
+#: cps/web.py:2240 cps/web.py:2271
 msgid "Token has expired"
 msgstr ""
 
-#: cps/web.py:2235
+#: cps/web.py:2248
 msgid "Success! Please return to your device"
 msgstr ""
 
-#: cps/web.py:2285
+#: cps/web.py:2298
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Proszę najpierw skonfigurować ustawienia SMTP poczty e-mail..."
 
-#: cps/web.py:2289
+#: cps/web.py:2302
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:2293
+#: cps/web.py:2306
 #, 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:2295 cps/web.py:3060
+#: cps/web.py:2308 cps/web.py:3073
 msgid "Please configure your kindle e-mail address first..."
 msgstr ""
 
-#: cps/web.py:2339
+#: cps/web.py:2352
 #, 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:2350
+#: cps/web.py:2363
 msgid "Invalid shelf specified"
 msgstr ""
 
-#: cps/web.py:2355
+#: cps/web.py:2368
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %(name)s"
 msgstr ""
 
-#: cps/web.py:2360
+#: cps/web.py:2373
 msgid "User is not allowed to edit public shelves"
 msgstr ""
 
-#: cps/web.py:2378
+#: cps/web.py:2391
 #, python-format
 msgid "Books are already part of the shelf: %(name)s"
 msgstr ""
 
-#: cps/web.py:2392
+#: cps/web.py:2405
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2394
+#: cps/web.py:2407
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2431
+#: cps/web.py:2444
 #, 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:2437
+#: cps/web.py:2450
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2457 cps/web.py:2481
+#: cps/web.py:2470 cps/web.py:2494
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr "Półka o nazwie '%(title)s' już istnieje."
 
-#: cps/web.py:2462
+#: cps/web.py:2475
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Półka %(title)s została utworzona"
 
-#: cps/web.py:2464 cps/web.py:2492
+#: cps/web.py:2477 cps/web.py:2505
 msgid "There was an error"
 msgstr "Wystąpił błąd"
 
-#: cps/web.py:2465 cps/web.py:2467
+#: cps/web.py:2478 cps/web.py:2480
 msgid "create a shelf"
 msgstr "utwórz półkę"
 
-#: cps/web.py:2490
+#: cps/web.py:2503
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Półka %(title)s została zmieniona"
 
-#: cps/web.py:2493 cps/web.py:2495
+#: cps/web.py:2506 cps/web.py:2508
 msgid "Edit a shelf"
 msgstr "Edytuj półkę"
 
-#: cps/web.py:2516
+#: cps/web.py:2529
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "pomyślnie usunięto półkę %(name)s"
 
-#: cps/web.py:2538
+#: cps/web.py:2551
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Półka: '%(name)s'"
 
-#: cps/web.py:2541
+#: cps/web.py:2554
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:2572
+#: cps/web.py:2585
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Zmieniono kolejność półki: '%(name)s'"
 
-#: cps/web.py:2601 cps/web.py:3012
+#: cps/web.py:2614 cps/web.py:3025
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/web.py:2603 cps/web.py:2644 cps/web.py:2647
+#: cps/web.py:2616 cps/web.py:2657 cps/web.py:2660
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil użytkownika %(name)s"
 
-#: cps/web.py:2642
+#: cps/web.py:2655
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/web.py:2645
+#: cps/web.py:2658
 msgid "Profile updated"
 msgstr "Zaktualizowano profil"
 
-#: cps/web.py:2657
+#: cps/web.py:2670
 msgid "Unknown"
 msgstr ""
 
-#: cps/web.py:2671
+#: cps/web.py:2684
 msgid "Admin page"
 msgstr "Portal administracyjny"
 
-#: cps/web.py:2749 cps/web.py:2922
+#: cps/web.py:2762 cps/web.py:2935
 msgid "Calibre-Web configuration updated"
 msgstr "Konfiguracja Calibre-Web została zaktualizowana"
 
-#: cps/templates/admin.html:91 cps/web.py:2762
+#: cps/templates/admin.html:91 cps/web.py:2775
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/web.py:2780
+#: cps/web.py:2793
 msgid "Import of optional Google Drive requirements missing"
 msgstr ""
 
-#: cps/web.py:2783
+#: cps/web.py:2796
 msgid "client_secrets.json is missing or not readable"
 msgstr ""
 
-#: cps/web.py:2788 cps/web.py:2815
+#: cps/web.py:2801 cps/web.py:2828
 msgid "client_secrets.json is not configured for web application"
 msgstr ""
 
-#: cps/templates/admin.html:90 cps/web.py:2818 cps/web.py:2844 cps/web.py:2856
-#: cps/web.py:2898 cps/web.py:2913 cps/web.py:2930 cps/web.py:2937
-#: cps/web.py:2954
+#: cps/templates/admin.html:90 cps/web.py:2831 cps/web.py:2857 cps/web.py:2869
+#: cps/web.py:2911 cps/web.py:2926 cps/web.py:2943 cps/web.py:2950
+#: cps/web.py:2967
 msgid "Basic Configuration"
 msgstr "Podstawowa konfiguracja"
 
-#: cps/web.py:2841
+#: cps/web.py:2854
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2853
+#: cps/web.py:2866
 msgid "Certfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2895
+#: cps/web.py:2908
 msgid "Logfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2934
+#: cps/web.py:2947
 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:3008 cps/web.py:3014 cps/web.py:3030
+#: cps/templates/admin.html:31 cps/web.py:3021 cps/web.py:3027 cps/web.py:3043
 msgid "Add new user"
 msgstr "Dodaj nowego użytkownika"
 
-#: cps/web.py:3020
+#: cps/web.py:3033
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Użytkownik '%(user)s' został utworzony"
 
-#: cps/web.py:3024
+#: cps/web.py:3037
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/web.py:3048 cps/web.py:3062
+#: cps/web.py:3061 cps/web.py:3075
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/web.py:3055
+#: cps/web.py:3068
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:3058
+#: cps/web.py:3071
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/web.py:3063
+#: cps/web.py:3076
 msgid "Edit e-mail server settings"
 msgstr ""
 
-#: cps/web.py:3088
+#: cps/web.py:3101
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Użytkownik '%(nick)s' został usunięty"
 
-#: cps/web.py:3197
+#: cps/web.py:3210
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Użytkownik '%(nick)s' został zaktualizowany"
 
-#: cps/web.py:3200
+#: cps/web.py:3213
 msgid "An unknown error occured."
 msgstr "Wystąpił nieznany błąd."
 
-#: cps/web.py:3202
+#: cps/web.py:3215
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Edytuj użytkownika %(nick)s"
 
-#: cps/web.py:3219
+#: cps/web.py:3232
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/web.py:3239
+#: cps/web.py:3252
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr ""
 
-#: cps/web.py:3270 cps/web.py:3546 cps/web.py:3551 cps/web.py:3706
+#: cps/web.py:3279 cps/web.py:3555 cps/web.py:3560 cps/web.py:3715
 msgid "edit metadata"
 msgstr "edytuj metadane"
 
-#: cps/web.py:3284 cps/web.py:3576
+#: cps/web.py:3289 cps/web.py:3585
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
-msgstr ""
-"Rozszerzenie pliku '%(ext)s' nie jest dozwolone do przesłania na ten "
-"serwer"
+msgstr "Rozszerzenie pliku '%(ext)s' nie jest dozwolone do przesłania na ten serwer"
 
-#: cps/web.py:3288 cps/web.py:3580
+#: cps/web.py:3293 cps/web.py:3589
 msgid "File to be uploaded must have an extension"
 msgstr "Plik do przesłania musi mieć rozszerzenie"
 
-#: cps/web.py:3300 cps/web.py:3600
+#: cps/web.py:3305 cps/web.py:3609
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Nie udało się utworzyć łącza %(path)s (Odmowa dostępu)."
 
-#: cps/web.py:3305
+#: cps/web.py:3310
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr ""
 
-#: cps/web.py:3321
+#: cps/web.py:3326
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr ""
 
-#: cps/web.py:3339
+#: cps/web.py:3343
 #, python-format
 msgid "Failed to create path for cover %(path)s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:3346
+#: cps/web.py:3350
 #, python-format
 msgid "Failed to store cover-file %(cover)s."
 msgstr ""
 
-#: cps/web.py:3349
+#: cps/web.py:3353
 msgid "Cover-file is not a valid image file"
 msgstr ""
 
-#: cps/web.py:3362 cps/web.py:3366
+#: cps/web.py:3370 cps/web.py:3374
 msgid "unknown"
 msgstr ""
 
-#: cps/web.py:3388
+#: cps/web.py:3396
 msgid "Cover is not a jpg file, can't save"
 msgstr ""
 
-#: cps/web.py:3555
+#: cps/web.py:3442
+#, python-format
+msgid "%(langname)s is not a valid language"
+msgstr ""
+
+#: cps/web.py:3564
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/web.py:3605
+#: cps/web.py:3614
 #, python-format
 msgid "Failed to store file %(file)s (Permission denied)."
 msgstr "Nie można przechowywać pliku %(file)s (Odmowa dostępu)."
 
-#: cps/web.py:3610
+#: cps/web.py:3619
 #, python-format
 msgid "Failed to delete file %(file)s (Permission denied)."
 msgstr "Nie udało się usunąć pliku %(file)s (Odmowa dostępu)."
 
-#: cps/web.py:3692
+#: cps/web.py:3701
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/web.py:3722
+#: cps/web.py:3731
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/web.py:3732
+#: cps/web.py:3741
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/web.py:3736
+#: cps/web.py:3745
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
@@ -916,9 +916,7 @@ msgid "Rating"
 msgstr "Ocena"
 
 #: cps/templates/book_edit.html:87
-msgid ""
-"Cover URL (jpg, cover is downloaded and stored in database, field is "
-"afterwards empty again)"
+msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
 msgstr ""
 
 #: cps/templates/book_edit.html:91
@@ -1295,9 +1293,7 @@ msgstr "Edytuj metadane"
 
 #: cps/templates/email_edit.html:15
 msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
-msgstr ""
-"Port serwera SMTP (używane 25 dla jawnego SMTP i 465 dla połączenia SSL i"
-" 587 dla połączenia STARTTLS)"
+msgstr "Port serwera SMTP (używane 25 dla jawnego SMTP i 465 dla połączenia SSL i 587 dla połączenia STARTTLS)"
 
 #: cps/templates/email_edit.html:19
 msgid "Encryption"
@@ -1856,9 +1852,7 @@ msgstr "Ostatnio pobierane"
 #~ msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Rename author from: '%(src)s' to "
-#~ "'%(dest)s' failed with error: %(error)s"
+#~ msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 #~ msgstr ""
 
 #~ msgid "Password for user %(user)s reset"
@@ -1880,7 +1874,5 @@ msgstr "Ostatnio pobierane"
 #~ msgstr ""
 
 #~ msgid "File extension \"%(ext)s\" is not allowed to be uploaded to this server"
-#~ msgstr ""
-#~ "Rozszerzenie pliku \"%(ext)s\" nie jest "
-#~ "dozwolone do przesłania na ten serwer"
+#~ msgstr "Rozszerzenie pliku \"%(ext)s\" nie jest dozwolone do przesłania na ten serwer"
 
diff --git a/cps/translations/ru/LC_MESSAGES/messages.po b/cps/translations/ru/LC_MESSAGES/messages.po
index 28defadc..6cfe7323 100644
--- a/cps/translations/ru/LC_MESSAGES/messages.po
+++ b/cps/translations/ru/LC_MESSAGES/messages.po
@@ -14,13 +14,12 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2018-09-08 14:49+0200\n"
+"POT-Creation-Date: 2018-09-09 17:57+0200\n"
 "PO-Revision-Date: 2017-04-30 00:47+0300\n"
 "Last-Translator: Pavel Korovin <p@tristero.se>\n"
 "Language: ru\n"
 "Language-Team: \n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
-"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -122,525 +121,528 @@ msgstr ""
 msgid "Unrar binary file not found"
 msgstr ""
 
-#: cps/web.py:1114
+#: cps/web.py:1127
 msgid "Requesting update package"
 msgstr "Проверка обновлений"
 
-#: cps/web.py:1115
+#: cps/web.py:1128
 msgid "Downloading update package"
 msgstr "Загрузка обновлений"
 
-#: cps/web.py:1116
+#: cps/web.py:1129
 msgid "Unzipping update package"
 msgstr "Распаковка обновлений"
 
-#: cps/web.py:1117
+#: cps/web.py:1130
 msgid "Files are replaced"
 msgstr "Файлы заменены"
 
-#: cps/web.py:1118
+#: cps/web.py:1131
 msgid "Database connections are closed"
 msgstr "Соеднинения с базой данных закрыты"
 
-#: cps/web.py:1119
+#: cps/web.py:1132
 msgid "Server is stopped"
 msgstr "Сервер остановлен"
 
-#: cps/web.py:1120
+#: cps/web.py:1133
 msgid "Update finished, please press okay and reload page"
 msgstr "Обновления установлены, нажмите okay и перезагрузите страницу"
 
-#: cps/web.py:1140
+#: cps/web.py:1153
 msgid "Recently Added Books"
 msgstr ""
 
-#: cps/web.py:1150
+#: cps/web.py:1163
 msgid "Newest Books"
 msgstr ""
 
-#: cps/web.py:1162
+#: cps/web.py:1175
 msgid "Oldest Books"
 msgstr ""
 
-#: cps/web.py:1174
+#: cps/web.py:1187
 msgid "Books (A-Z)"
 msgstr ""
 
-#: cps/web.py:1185
+#: cps/web.py:1198
 msgid "Books (Z-A)"
 msgstr ""
 
-#: cps/web.py:1214
+#: cps/web.py:1227
 msgid "Hot Books (most downloaded)"
 msgstr "Популярные книги (часто загружаемые)"
 
-#: cps/web.py:1227
+#: cps/web.py:1240
 msgid "Best rated books"
 msgstr "Книги с наивысшим рейтингом"
 
-#: cps/templates/index.xml:36 cps/web.py:1239
+#: cps/templates/index.xml:36 cps/web.py:1252
 msgid "Random Books"
 msgstr "Случайный выбор"
 
-#: cps/web.py:1254
+#: cps/web.py:1267
 msgid "Author list"
 msgstr "Авторы"
 
-#: cps/web.py:1266 cps/web.py:1329 cps/web.py:1484 cps/web.py:2036
+#: cps/web.py:1279 cps/web.py:1342 cps/web.py:1497 cps/web.py:2049
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "Невозможно открыть книгу. Файл не существует или недоступен."
 
-#: cps/templates/index.xml:73 cps/web.py:1313
+#: cps/templates/index.xml:73 cps/web.py:1326
 msgid "Series list"
 msgstr "Серии"
 
-#: cps/web.py:1327
+#: cps/web.py:1340
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Серии: %(serie)s"
 
-#: cps/web.py:1354
+#: cps/web.py:1367
 msgid "Available languages"
 msgstr "Языки"
 
-#: cps/web.py:1371
+#: cps/web.py:1384
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Язык: %(name)s"
 
-#: cps/templates/index.xml:66 cps/web.py:1382
+#: cps/templates/index.xml:66 cps/web.py:1395
 msgid "Category list"
 msgstr "Категории"
 
-#: cps/web.py:1396
+#: cps/web.py:1409
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Категория: %(name)s"
 
-#: cps/templates/layout.html:71 cps/web.py:1535
+#: cps/templates/layout.html:71 cps/web.py:1548
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1565
+#: cps/web.py:1578
 msgid "Statistics"
 msgstr "Статистика"
 
-#: cps/web.py:1670
-msgid ""
-"Callback domain is not verified, please follow steps to verify domain in "
-"google developer console"
+#: cps/web.py:1683
+msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr ""
 
-#: cps/web.py:1746
+#: cps/web.py:1758
 msgid "Server restarted, please reload page"
 msgstr "Сервер перезагружен, пожалуйста, перезагрузите страницу"
 
-#: cps/web.py:1749
+#: cps/web.py:1761
 msgid "Performing shutdown of server, please close window"
 msgstr "Производится остановка сервера, пожалуйста, закройте окно"
 
-#: cps/web.py:1767
+#: cps/web.py:1780
 msgid "Update done"
 msgstr "Обновление закончено"
 
-#: cps/web.py:1837
+#: cps/web.py:1850
 msgid "Published after "
 msgstr ""
 
-#: cps/web.py:1844
+#: cps/web.py:1857
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1858
+#: cps/web.py:1871
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1860
+#: cps/web.py:1873
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1919 cps/web.py:1928
+#: cps/web.py:1932 cps/web.py:1941
 msgid "search"
 msgstr "поиск"
 
 #: cps/templates/index.xml:44 cps/templates/index.xml:48
-#: cps/templates/layout.html:146 cps/web.py:1995
+#: cps/templates/layout.html:146 cps/web.py:2008
 msgid "Read Books"
 msgstr "Прочитанные"
 
 #: cps/templates/index.xml:52 cps/templates/index.xml:56
-#: cps/templates/layout.html:148 cps/web.py:1998
+#: cps/templates/layout.html:148 cps/web.py:2011
 msgid "Unread Books"
 msgstr "Непрочитанные"
 
-#: cps/web.py:2046 cps/web.py:2048 cps/web.py:2050 cps/web.py:2062
+#: cps/web.py:2059 cps/web.py:2061 cps/web.py:2063 cps/web.py:2075
 msgid "Read a Book"
 msgstr "Читать книгу"
 
-#: cps/web.py:2128 cps/web.py:3006
+#: cps/web.py:2141 cps/web.py:3019
 msgid "Please fill out all fields!"
 msgstr "Пожалуйста, заполните все поля!"
 
-#: cps/web.py:2129 cps/web.py:2150 cps/web.py:2154 cps/web.py:2159
-#: cps/web.py:2161
+#: cps/web.py:2142 cps/web.py:2163 cps/web.py:2167 cps/web.py:2172
+#: cps/web.py:2174
 msgid "register"
 msgstr "зарегистрироваться"
 
-#: cps/web.py:2149 cps/web.py:3222
+#: cps/web.py:2162 cps/web.py:3235
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
-#: cps/web.py:2152
+#: cps/web.py:2165
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:2155
+#: cps/web.py:2168
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:2158
+#: cps/web.py:2171
 msgid "This username or e-mail address is already in use."
 msgstr ""
 
-#: cps/web.py:2175 cps/web.py:2271
+#: cps/web.py:2188 cps/web.py:2284
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Вы вошли как пользователь '%(nickname)s'"
 
-#: cps/web.py:2180
+#: cps/web.py:2193
 msgid "Wrong Username or Password"
 msgstr "Ошибка в имени пользователя или пароле"
 
-#: cps/web.py:2186 cps/web.py:2207
+#: cps/web.py:2199 cps/web.py:2220
 msgid "login"
 msgstr "войти"
 
-#: cps/web.py:2219 cps/web.py:2250
+#: cps/web.py:2232 cps/web.py:2263
 msgid "Token not found"
 msgstr ""
 
-#: cps/web.py:2227 cps/web.py:2258
+#: cps/web.py:2240 cps/web.py:2271
 msgid "Token has expired"
 msgstr ""
 
-#: cps/web.py:2235
+#: cps/web.py:2248
 msgid "Success! Please return to your device"
 msgstr ""
 
-#: cps/web.py:2285
+#: cps/web.py:2298
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Пожалуйста, сначала сконфигурируйте параметры SMTP"
 
-#: cps/web.py:2289
+#: cps/web.py:2302
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:2293
+#: cps/web.py:2306
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "Ошибка при отправке книги: %(res)s"
 
-#: cps/web.py:2295 cps/web.py:3060
+#: cps/web.py:2308 cps/web.py:3073
 msgid "Please configure your kindle e-mail address first..."
 msgstr ""
 
-#: cps/web.py:2339
+#: cps/web.py:2352
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "Книга добавлена на книжную полку: %(sname)s"
 
-#: cps/web.py:2350
+#: cps/web.py:2363
 msgid "Invalid shelf specified"
 msgstr ""
 
-#: cps/web.py:2355
+#: cps/web.py:2368
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %(name)s"
 msgstr ""
 
-#: cps/web.py:2360
+#: cps/web.py:2373
 msgid "User is not allowed to edit public shelves"
 msgstr ""
 
-#: cps/web.py:2378
+#: cps/web.py:2391
 #, python-format
 msgid "Books are already part of the shelf: %(name)s"
 msgstr ""
 
-#: cps/web.py:2392
+#: cps/web.py:2405
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2394
+#: cps/web.py:2407
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2431
+#: cps/web.py:2444
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "Книга удалена с книжной полки: %(sname)s"
 
-#: cps/web.py:2437
+#: cps/web.py:2450
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:2457 cps/web.py:2481
+#: cps/web.py:2470 cps/web.py:2494
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr "Книжкная полка с названием '%(title)s' уже существует."
 
-#: cps/web.py:2462
+#: cps/web.py:2475
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Создана книжная полка %(title)s"
 
-#: cps/web.py:2464 cps/web.py:2492
+#: cps/web.py:2477 cps/web.py:2505
 msgid "There was an error"
 msgstr "Произошла ошибка"
 
-#: cps/web.py:2465 cps/web.py:2467
+#: cps/web.py:2478 cps/web.py:2480
 msgid "create a shelf"
 msgstr "создать книжную полку"
 
-#: cps/web.py:2490
+#: cps/web.py:2503
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Книжная полка %(title)s изменена"
 
-#: cps/web.py:2493 cps/web.py:2495
+#: cps/web.py:2506 cps/web.py:2508
 msgid "Edit a shelf"
 msgstr "Изменить книжную полку"
 
-#: cps/web.py:2516
+#: cps/web.py:2529
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "Книжная полка %(name)s удалена"
 
-#: cps/web.py:2538
+#: cps/web.py:2551
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Книжная полка: '%(name)s'"
 
-#: cps/web.py:2541
+#: cps/web.py:2554
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr ""
 
-#: cps/web.py:2572
+#: cps/web.py:2585
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Изменить расположение книжной полки '%(name)s'"
 
-#: cps/web.py:2601 cps/web.py:3012
+#: cps/web.py:2614 cps/web.py:3025
 msgid "E-mail is not from valid domain"
 msgstr ""
 
-#: cps/web.py:2603 cps/web.py:2644 cps/web.py:2647
+#: cps/web.py:2616 cps/web.py:2657 cps/web.py:2660
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Профиль %(name)s"
 
-#: cps/web.py:2642
+#: cps/web.py:2655
 msgid "Found an existing account for this e-mail address."
 msgstr ""
 
-#: cps/web.py:2645
+#: cps/web.py:2658
 msgid "Profile updated"
 msgstr "Профиль обновлён"
 
-#: cps/web.py:2657
+#: cps/web.py:2670
 msgid "Unknown"
 msgstr ""
 
-#: cps/web.py:2671
+#: cps/web.py:2684
 msgid "Admin page"
 msgstr "Администрирование"
 
-#: cps/web.py:2749 cps/web.py:2922
+#: cps/web.py:2762 cps/web.py:2935
 msgid "Calibre-Web configuration updated"
 msgstr "Конфигурация Calibre-Web обновлена"
 
-#: cps/templates/admin.html:91 cps/web.py:2762
+#: cps/templates/admin.html:91 cps/web.py:2775
 msgid "UI Configuration"
 msgstr ""
 
-#: cps/web.py:2780
+#: cps/web.py:2793
 msgid "Import of optional Google Drive requirements missing"
 msgstr ""
 
-#: cps/web.py:2783
+#: cps/web.py:2796
 msgid "client_secrets.json is missing or not readable"
 msgstr ""
 
-#: cps/web.py:2788 cps/web.py:2815
+#: cps/web.py:2801 cps/web.py:2828
 msgid "client_secrets.json is not configured for web application"
 msgstr ""
 
-#: cps/templates/admin.html:90 cps/web.py:2818 cps/web.py:2844 cps/web.py:2856
-#: cps/web.py:2898 cps/web.py:2913 cps/web.py:2930 cps/web.py:2937
-#: cps/web.py:2954
+#: cps/templates/admin.html:90 cps/web.py:2831 cps/web.py:2857 cps/web.py:2869
+#: cps/web.py:2911 cps/web.py:2926 cps/web.py:2943 cps/web.py:2950
+#: cps/web.py:2967
 msgid "Basic Configuration"
 msgstr "Настройки сервера"
 
-#: cps/web.py:2841
+#: cps/web.py:2854
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2853
+#: cps/web.py:2866
 msgid "Certfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2895
+#: cps/web.py:2908
 msgid "Logfile location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/web.py:2934
+#: cps/web.py:2947
 msgid "DB location is not valid, please enter correct path"
 msgstr "Неверный путь к фалу БД, пожалуйста, укажите правильное расположение БД"
 
-#: cps/templates/admin.html:31 cps/web.py:3008 cps/web.py:3014 cps/web.py:3030
+#: cps/templates/admin.html:31 cps/web.py:3021 cps/web.py:3027 cps/web.py:3043
 msgid "Add new user"
 msgstr "Добавить пользователя"
 
-#: cps/web.py:3020
+#: cps/web.py:3033
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Пользователь '%(user)s' добавлен"
 
-#: cps/web.py:3024
+#: cps/web.py:3037
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr ""
 
-#: cps/web.py:3048 cps/web.py:3062
+#: cps/web.py:3061 cps/web.py:3075
 msgid "E-mail server settings updated"
 msgstr ""
 
-#: cps/web.py:3055
+#: cps/web.py:3068
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:3058
+#: cps/web.py:3071
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr ""
 
-#: cps/web.py:3063
+#: cps/web.py:3076
 msgid "Edit e-mail server settings"
 msgstr ""
 
-#: cps/web.py:3088
+#: cps/web.py:3101
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Пользователь '%(nick)s' удалён"
 
-#: cps/web.py:3197
+#: cps/web.py:3210
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Пользователь '%(nick)s' обновлён"
 
-#: cps/web.py:3200
+#: cps/web.py:3213
 msgid "An unknown error occured."
 msgstr "Произошла неизвестная ошибка."
 
-#: cps/web.py:3202
+#: cps/web.py:3215
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Изменить пользователя %(nick)s"
 
-#: cps/web.py:3219
+#: cps/web.py:3232
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/web.py:3239
+#: cps/web.py:3252
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr ""
 
-#: cps/web.py:3270 cps/web.py:3546 cps/web.py:3551 cps/web.py:3706
+#: cps/web.py:3279 cps/web.py:3555 cps/web.py:3560 cps/web.py:3715
 msgid "edit metadata"
 msgstr "изменить метаданные"
 
-#: cps/web.py:3284 cps/web.py:3576
+#: cps/web.py:3289 cps/web.py:3585
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "Запрещена загрузка файлов с расширением '%(ext)s'"
 
-#: cps/web.py:3288 cps/web.py:3580
+#: cps/web.py:3293 cps/web.py:3589
 msgid "File to be uploaded must have an extension"
 msgstr "Загружаемый файл должен иметь расширение"
 
-#: cps/web.py:3300 cps/web.py:3600
+#: cps/web.py:3305 cps/web.py:3609
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "Ошибка при создании пути %(path)s (доступ запрещён)"
 
-#: cps/web.py:3305
+#: cps/web.py:3310
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr ""
 
-#: cps/web.py:3321
+#: cps/web.py:3326
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr ""
 
-#: cps/web.py:3339
+#: cps/web.py:3343
 #, python-format
 msgid "Failed to create path for cover %(path)s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:3346
+#: cps/web.py:3350
 #, python-format
 msgid "Failed to store cover-file %(cover)s."
 msgstr ""
 
-#: cps/web.py:3349
+#: cps/web.py:3353
 msgid "Cover-file is not a valid image file"
 msgstr ""
 
-#: cps/web.py:3362 cps/web.py:3366
+#: cps/web.py:3370 cps/web.py:3374
 msgid "unknown"
 msgstr "неизвестно"
 
-#: cps/web.py:3388
+#: cps/web.py:3396
 msgid "Cover is not a jpg file, can't save"
 msgstr ""
 
-#: cps/web.py:3555
+#: cps/web.py:3442
+#, python-format
+msgid "%(langname)s is not a valid language"
+msgstr ""
+
+#: cps/web.py:3564
 msgid "Error editing book, please check logfile for details"
 msgstr ""
 
-#: cps/web.py:3605
+#: cps/web.py:3614
 #, python-format
 msgid "Failed to store file %(file)s (Permission denied)."
 msgstr "Ошибка записи файоа %(file)s (доступ запрещён)"
 
-#: cps/web.py:3610
+#: cps/web.py:3619
 #, python-format
 msgid "Failed to delete file %(file)s (Permission denied)."
 msgstr "Ошибка удаления файла %(file)s (доступ запрещён)"
 
-#: cps/web.py:3692
+#: cps/web.py:3701
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr ""
 
-#: cps/web.py:3722
+#: cps/web.py:3731
 msgid "Source or destination format for conversion missing"
 msgstr ""
 
-#: cps/web.py:3732
+#: cps/web.py:3741
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr ""
 
-#: cps/web.py:3736
+#: cps/web.py:3745
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr ""
@@ -916,9 +918,7 @@ msgid "Rating"
 msgstr "Рейтинг"
 
 #: cps/templates/book_edit.html:87
-msgid ""
-"Cover URL (jpg, cover is downloaded and stored in database, field is "
-"afterwards empty again)"
+msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
 msgstr ""
 
 #: cps/templates/book_edit.html:91
@@ -1846,9 +1846,7 @@ msgstr "Недавние скачивания"
 #~ msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 #~ msgstr ""
 
-#~ msgid ""
-#~ "Rename author from: '%(src)s' to "
-#~ "'%(dest)s' failed with error: %(error)s"
+#~ msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 #~ msgstr ""
 
 #~ msgid "Password for user %(user)s reset"
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index 7ac69625..25cd38cb 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-09-08 14:49+0200\n"
+"POT-Creation-Date: 2018-09-09 17:57+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"
@@ -122,525 +122,528 @@ msgstr "执行UnRar时出错"
 msgid "Unrar binary file not found"
 msgstr "找不到Unrar二进制文件"
 
-#: cps/web.py:1114
+#: cps/web.py:1127
 msgid "Requesting update package"
 msgstr "正在请求更新包"
 
-#: cps/web.py:1115
+#: cps/web.py:1128
 msgid "Downloading update package"
 msgstr "正在下载更新包"
 
-#: cps/web.py:1116
+#: cps/web.py:1129
 msgid "Unzipping update package"
 msgstr "正在解压更新包"
 
-#: cps/web.py:1117
+#: cps/web.py:1130
 msgid "Files are replaced"
 msgstr "文件已替换"
 
-#: cps/web.py:1118
+#: cps/web.py:1131
 msgid "Database connections are closed"
 msgstr "数据库连接已关闭"
 
-#: cps/web.py:1119
+#: cps/web.py:1132
 msgid "Server is stopped"
 msgstr "服务器已停止"
 
-#: cps/web.py:1120
+#: cps/web.py:1133
 msgid "Update finished, please press okay and reload page"
 msgstr "更新完成，请按确定并刷新页面"
 
-#: cps/web.py:1140
+#: cps/web.py:1153
 msgid "Recently Added Books"
 msgstr "最近添加的书籍"
 
-#: cps/web.py:1150
+#: cps/web.py:1163
 msgid "Newest Books"
 msgstr "最新书籍"
 
-#: cps/web.py:1162
+#: cps/web.py:1175
 msgid "Oldest Books"
 msgstr "最旧书籍"
 
-#: cps/web.py:1174
+#: cps/web.py:1187
 msgid "Books (A-Z)"
 msgstr "书籍 (A-Z)"
 
-#: cps/web.py:1185
+#: cps/web.py:1198
 msgid "Books (Z-A)"
 msgstr "书籍 (Z-A)"
 
-#: cps/web.py:1214
+#: cps/web.py:1227
 msgid "Hot Books (most downloaded)"
 msgstr "热门书籍(最多下载)"
 
-#: cps/web.py:1227
+#: cps/web.py:1240
 msgid "Best rated books"
 msgstr "最高评分书籍"
 
-#: cps/templates/index.xml:36 cps/web.py:1239
+#: cps/templates/index.xml:36 cps/web.py:1252
 msgid "Random Books"
 msgstr "随机书籍"
 
-#: cps/web.py:1254
+#: cps/web.py:1267
 msgid "Author list"
 msgstr "作者列表"
 
-#: cps/web.py:1266 cps/web.py:1329 cps/web.py:1484 cps/web.py:2036
+#: cps/web.py:1279 cps/web.py:1342 cps/web.py:1497 cps/web.py:2049
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "无法打开电子书。 文件不存在或者文件不可访问:"
 
-#: cps/templates/index.xml:73 cps/web.py:1313
+#: cps/templates/index.xml:73 cps/web.py:1326
 msgid "Series list"
 msgstr "丛书列表"
 
-#: cps/web.py:1327
+#: cps/web.py:1340
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "丛书: %(serie)s"
 
-#: cps/web.py:1354
+#: cps/web.py:1367
 msgid "Available languages"
 msgstr "可用语言"
 
-#: cps/web.py:1371
+#: cps/web.py:1384
 #, python-format
 msgid "Language: %(name)s"
 msgstr "语言: %(name)s"
 
-#: cps/templates/index.xml:66 cps/web.py:1382
+#: cps/templates/index.xml:66 cps/web.py:1395
 msgid "Category list"
 msgstr "分类列表"
 
-#: cps/web.py:1396
+#: cps/web.py:1409
 #, python-format
 msgid "Category: %(name)s"
 msgstr "分类: %(name)s"
 
-#: cps/templates/layout.html:71 cps/web.py:1535
+#: cps/templates/layout.html:71 cps/web.py:1548
 msgid "Tasks"
 msgstr "任务"
 
-#: cps/web.py:1565
+#: cps/web.py:1578
 msgid "Statistics"
 msgstr "统计"
 
-#: cps/web.py:1670
-msgid ""
-"Callback domain is not verified, please follow steps to verify domain in "
-"google developer console"
+#: cps/web.py:1683
+msgid "Callback domain is not verified, please follow steps to verify domain in google developer console"
 msgstr "回调域名尚未被校验，请在google开发者控制台按步骤校验域名"
 
-#: cps/web.py:1746
+#: cps/web.py:1758
 msgid "Server restarted, please reload page"
 msgstr "服务器已重启，请刷新页面"
 
-#: cps/web.py:1749
+#: cps/web.py:1761
 msgid "Performing shutdown of server, please close window"
 msgstr "正在关闭服务器，请关闭窗口"
 
-#: cps/web.py:1767
+#: cps/web.py:1780
 msgid "Update done"
 msgstr "更新完成"
 
-#: cps/web.py:1837
+#: cps/web.py:1850
 msgid "Published after "
 msgstr ""
 
-#: cps/web.py:1844
+#: cps/web.py:1857
 msgid "Published before "
 msgstr "出版时早于 "
 
-#: cps/web.py:1858
+#: cps/web.py:1871
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr "评分 <= %(rating)s"
 
-#: cps/web.py:1860
+#: cps/web.py:1873
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr "评分 >= %(rating)s"
 
-#: cps/web.py:1919 cps/web.py:1928
+#: cps/web.py:1932 cps/web.py:1941
 msgid "search"
 msgstr "搜索"
 
 #: cps/templates/index.xml:44 cps/templates/index.xml:48
-#: cps/templates/layout.html:146 cps/web.py:1995
+#: cps/templates/layout.html:146 cps/web.py:2008
 msgid "Read Books"
 msgstr "已读书籍"
 
 #: cps/templates/index.xml:52 cps/templates/index.xml:56
-#: cps/templates/layout.html:148 cps/web.py:1998
+#: cps/templates/layout.html:148 cps/web.py:2011
 msgid "Unread Books"
 msgstr "未读书籍"
 
-#: cps/web.py:2046 cps/web.py:2048 cps/web.py:2050 cps/web.py:2062
+#: cps/web.py:2059 cps/web.py:2061 cps/web.py:2063 cps/web.py:2075
 msgid "Read a Book"
 msgstr "阅读一本书"
 
-#: cps/web.py:2128 cps/web.py:3006
+#: cps/web.py:2141 cps/web.py:3019
 msgid "Please fill out all fields!"
 msgstr "请填写所有字段"
 
-#: cps/web.py:2129 cps/web.py:2150 cps/web.py:2154 cps/web.py:2159
-#: cps/web.py:2161
+#: cps/web.py:2142 cps/web.py:2163 cps/web.py:2167 cps/web.py:2172
+#: cps/web.py:2174
 msgid "register"
 msgstr "注册"
 
-#: cps/web.py:2149 cps/web.py:3222
+#: cps/web.py:2162 cps/web.py:3235
 msgid "An unknown error occurred. Please try again later."
 msgstr "发生一个未知错误，请稍后再试。"
 
-#: cps/web.py:2152
+#: cps/web.py:2165
 msgid "Your e-mail is not allowed to register"
 msgstr "您的邮箱不能用来注册"
 
-#: cps/web.py:2155
+#: cps/web.py:2168
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr "确认邮件已经发送到您的邮箱。"
 
-#: cps/web.py:2158
+#: cps/web.py:2171
 msgid "This username or e-mail address is already in use."
 msgstr "这个用户名或者邮箱已经被使用。"
 
-#: cps/web.py:2175 cps/web.py:2271
+#: cps/web.py:2188 cps/web.py:2284
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "您现在已以'%(nickname)s'身份登录"
 
-#: cps/web.py:2180
+#: cps/web.py:2193
 msgid "Wrong Username or Password"
 msgstr "用户名或密码错误"
 
-#: cps/web.py:2186 cps/web.py:2207
+#: cps/web.py:2199 cps/web.py:2220
 msgid "login"
 msgstr "登录"
 
-#: cps/web.py:2219 cps/web.py:2250
+#: cps/web.py:2232 cps/web.py:2263
 msgid "Token not found"
 msgstr "找不到Token"
 
-#: cps/web.py:2227 cps/web.py:2258
+#: cps/web.py:2240 cps/web.py:2271
 msgid "Token has expired"
 msgstr "Token已过期"
 
-#: cps/web.py:2235
+#: cps/web.py:2248
 msgid "Success! Please return to your device"
 msgstr "成功！请返回您的设备"
 
-#: cps/web.py:2285
+#: cps/web.py:2298
 msgid "Please configure the SMTP mail settings first..."
 msgstr "请先配置SMTP邮箱..."
 
-#: cps/web.py:2289
+#: cps/web.py:2302
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr "书籍已经被成功加入 %(kindlemail)s 的发送队列"
 
-#: cps/web.py:2293
+#: cps/web.py:2306
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "发送这本书的时候出现错误: %(res)s"
 
-#: cps/web.py:2295 cps/web.py:3060
+#: cps/web.py:2308 cps/web.py:3073
 msgid "Please configure your kindle e-mail address first..."
 msgstr "请先配置您的kindle邮箱..."
 
-#: cps/web.py:2339
+#: cps/web.py:2352
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "此书已被添加到书架: %(sname)s"
 
-#: cps/web.py:2350
+#: cps/web.py:2363
 msgid "Invalid shelf specified"
 msgstr "指定的书架无效"
 
-#: cps/web.py:2355
+#: cps/web.py:2368
 #, python-format
 msgid "You are not allowed to add a book to the the shelf: %(name)s"
 msgstr "您没有添加书籍到书架 %(name)s 的权限"
 
-#: cps/web.py:2360
+#: cps/web.py:2373
 msgid "User is not allowed to edit public shelves"
 msgstr "用户没有编辑公开书架的权限"
 
-#: cps/web.py:2378
+#: cps/web.py:2391
 #, python-format
 msgid "Books are already part of the shelf: %(name)s"
 msgstr "书籍已经在书架 %(name)s 中了"
 
-#: cps/web.py:2392
+#: cps/web.py:2405
 #, python-format
 msgid "Books have been added to shelf: %(sname)s"
 msgstr "书籍已经被添加到书架 %(sname)s 中'"
 
-#: cps/web.py:2394
+#: cps/web.py:2407
 #, python-format
 msgid "Could not add books to shelf: %(sname)s"
 msgstr "无法添加书籍到书架: %(sname)s"
 
-#: cps/web.py:2431
+#: cps/web.py:2444
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "此书已从书架 %(sname)s 中删除"
 
-#: cps/web.py:2437
+#: cps/web.py:2450
 #, python-format
 msgid "Sorry you are not allowed to remove a book from this shelf: %(sname)s"
 msgstr "对不起，您没有从书架 %(sname)s 中删除书籍的权限"
 
-#: cps/web.py:2457 cps/web.py:2481
+#: cps/web.py:2470 cps/web.py:2494
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr "已存在书架 '%(title)s'。"
 
-#: cps/web.py:2462
+#: cps/web.py:2475
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "书架 %(title)s 已被创建"
 
-#: cps/web.py:2464 cps/web.py:2492
+#: cps/web.py:2477 cps/web.py:2505
 msgid "There was an error"
 msgstr "发生错误"
 
-#: cps/web.py:2465 cps/web.py:2467
+#: cps/web.py:2478 cps/web.py:2480
 msgid "create a shelf"
 msgstr "创建书架"
 
-#: cps/web.py:2490
+#: cps/web.py:2503
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "书架 %(title)s 已被修改"
 
-#: cps/web.py:2493 cps/web.py:2495
+#: cps/web.py:2506 cps/web.py:2508
 msgid "Edit a shelf"
 msgstr "编辑书架"
 
-#: cps/web.py:2516
+#: cps/web.py:2529
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "成功删除书架 %(name)s"
 
-#: cps/web.py:2538
+#: cps/web.py:2551
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "书架: '%(name)s'"
 
-#: cps/web.py:2541
+#: cps/web.py:2554
 msgid "Error opening shelf. Shelf does not exist or is not accessible"
 msgstr "打开书架出错。书架不存在或不可访问"
 
-#: cps/web.py:2572
+#: cps/web.py:2585
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "修改书架 '%(name)s' 顺序"
 
-#: cps/web.py:2601 cps/web.py:3012
+#: cps/web.py:2614 cps/web.py:3025
 msgid "E-mail is not from valid domain"
 msgstr "邮箱不在有效域中'"
 
-#: cps/web.py:2603 cps/web.py:2644 cps/web.py:2647
+#: cps/web.py:2616 cps/web.py:2657 cps/web.py:2660
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 的资料"
 
-#: cps/web.py:2642
+#: cps/web.py:2655
 msgid "Found an existing account for this e-mail address."
 msgstr "找到一个已有账号使用这个邮箱。"
 
-#: cps/web.py:2645
+#: cps/web.py:2658
 msgid "Profile updated"
 msgstr "资料已更新"
 
-#: cps/web.py:2657
+#: cps/web.py:2670
 msgid "Unknown"
 msgstr "未知"
 
-#: cps/web.py:2671
+#: cps/web.py:2684
 msgid "Admin page"
 msgstr "管理页"
 
-#: cps/web.py:2749 cps/web.py:2922
+#: cps/web.py:2762 cps/web.py:2935
 msgid "Calibre-Web configuration updated"
 msgstr "Calibre-Web配置已更新"
 
-#: cps/templates/admin.html:91 cps/web.py:2762
+#: cps/templates/admin.html:91 cps/web.py:2775
 msgid "UI Configuration"
 msgstr "UI配置"
 
-#: cps/web.py:2780
+#: cps/web.py:2793
 msgid "Import of optional Google Drive requirements missing"
 msgstr "可选的Google Drive依赖导入缺失"
 
-#: cps/web.py:2783
+#: cps/web.py:2796
 msgid "client_secrets.json is missing or not readable"
 msgstr "client_secrets.json文件缺失或不可读"
 
-#: cps/web.py:2788 cps/web.py:2815
+#: cps/web.py:2801 cps/web.py:2828
 msgid "client_secrets.json is not configured for web application"
 msgstr "没有为web应用配置client_secrets.json"
 
-#: cps/templates/admin.html:90 cps/web.py:2818 cps/web.py:2844 cps/web.py:2856
-#: cps/web.py:2898 cps/web.py:2913 cps/web.py:2930 cps/web.py:2937
-#: cps/web.py:2954
+#: cps/templates/admin.html:90 cps/web.py:2831 cps/web.py:2857 cps/web.py:2869
+#: cps/web.py:2911 cps/web.py:2926 cps/web.py:2943 cps/web.py:2950
+#: cps/web.py:2967
 msgid "Basic Configuration"
 msgstr "基本配置"
 
-#: cps/web.py:2841
+#: cps/web.py:2854
 msgid "Keyfile location is not valid, please enter correct path"
 msgstr "key文件位置无效，请输入正确路径"
 
-#: cps/web.py:2853
+#: cps/web.py:2866
 msgid "Certfile location is not valid, please enter correct path"
 msgstr "证书文件位置无效，请输入正确路径"
 
-#: cps/web.py:2895
+#: cps/web.py:2908
 msgid "Logfile location is not valid, please enter correct path"
 msgstr "日志文件位置无效，请输入正确路径"
 
-#: cps/web.py:2934
+#: cps/web.py:2947
 msgid "DB location is not valid, please enter correct path"
 msgstr "DB位置无效，请输入正确路径"
 
-#: cps/templates/admin.html:31 cps/web.py:3008 cps/web.py:3014 cps/web.py:3030
+#: cps/templates/admin.html:31 cps/web.py:3021 cps/web.py:3027 cps/web.py:3043
 msgid "Add new user"
 msgstr "添加新用户"
 
-#: cps/web.py:3020
+#: cps/web.py:3033
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "用户 '%(user)s' 已被创建"
 
-#: cps/web.py:3024
+#: cps/web.py:3037
 msgid "Found an existing account for this e-mail address or nickname."
 msgstr "此邮箱或昵称的账号已经存在。"
 
-#: cps/web.py:3048 cps/web.py:3062
+#: cps/web.py:3061 cps/web.py:3075
 msgid "E-mail server settings updated"
 msgstr "已更新邮件服务器设置"
 
-#: cps/web.py:3055
+#: cps/web.py:3068
 #, python-format
 msgid "Test e-mail successfully send to %(kindlemail)s"
 msgstr "测试邮件已经被成功发到 %(kindlemail)s"
 
-#: cps/web.py:3058
+#: cps/web.py:3071
 #, python-format
 msgid "There was an error sending the Test e-mail: %(res)s"
 msgstr "发送测试邮件出错了: %(res)s"
 
-#: cps/web.py:3063
+#: cps/web.py:3076
 msgid "Edit e-mail server settings"
 msgstr "编辑邮箱服务器设置"
 
-#: cps/web.py:3088
+#: cps/web.py:3101
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "用户 '%(nick)s' 已被删除"
 
-#: cps/web.py:3197
+#: cps/web.py:3210
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "用户 '%(nick)s' 已被更新"
 
-#: cps/web.py:3200
+#: cps/web.py:3213
 msgid "An unknown error occured."
 msgstr "发生未知错误。"
 
-#: cps/web.py:3202
+#: cps/web.py:3215
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "编辑用户 %(nick)s"
 
-#: cps/web.py:3219
+#: cps/web.py:3232
 #, python-format
 msgid "Password for user %(user)s reset"
 msgstr "用户 %(user)s 的密码已重置"
 
-#: cps/web.py:3239
+#: cps/web.py:3252
 msgid "Error opening eBook. File does not exist or file is not accessible"
 msgstr "打开电子书出错。文件不存在或不可访问"
 
-#: cps/web.py:3270 cps/web.py:3546 cps/web.py:3551 cps/web.py:3706
+#: cps/web.py:3279 cps/web.py:3555 cps/web.py:3560 cps/web.py:3715
 msgid "edit metadata"
 msgstr "编辑元数据"
 
-#: cps/web.py:3284 cps/web.py:3576
+#: cps/web.py:3289 cps/web.py:3585
 #, python-format
 msgid "File extension '%(ext)s' is not allowed to be uploaded to this server"
 msgstr "不能上传后缀为　'%(ext)s'　的文件到此服务器"
 
-#: cps/web.py:3288 cps/web.py:3580
+#: cps/web.py:3293 cps/web.py:3589
 msgid "File to be uploaded must have an extension"
 msgstr "要上传的文件必须有一个后缀"
 
-#: cps/web.py:3300 cps/web.py:3600
+#: cps/web.py:3305 cps/web.py:3609
 #, python-format
 msgid "Failed to create path %(path)s (Permission denied)."
 msgstr "创建路径 %(path)s 失败(权限拒绝)。"
 
-#: cps/web.py:3305
+#: cps/web.py:3310
 #, python-format
 msgid "Failed to store file %(file)s."
 msgstr "保存文件 %(file)s 失败。"
 
-#: cps/web.py:3321
+#: cps/web.py:3326
 #, python-format
 msgid "File format %(ext)s added to %(book)s"
 msgstr "已添加 %(ext)s 格式到 %(book)s"
 
-#: cps/web.py:3339
+#: cps/web.py:3343
 #, python-format
 msgid "Failed to create path for cover %(path)s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:3346
+#: cps/web.py:3350
 #, python-format
 msgid "Failed to store cover-file %(cover)s."
 msgstr "保存封面文件 %(cover)s 失败。"
 
-#: cps/web.py:3349
+#: cps/web.py:3353
 msgid "Cover-file is not a valid image file"
 msgstr "封面文件不是一个有效的图片文件"
 
-#: cps/web.py:3362 cps/web.py:3366
+#: cps/web.py:3370 cps/web.py:3374
 msgid "unknown"
 msgstr "未知"
 
-#: cps/web.py:3388
+#: cps/web.py:3396
 msgid "Cover is not a jpg file, can't save"
 msgstr "封面不是一个jpg文件，无法保存"
 
-#: cps/web.py:3555
+#: cps/web.py:3442
+#, python-format
+msgid "%(langname)s is not a valid language"
+msgstr ""
+
+#: cps/web.py:3564
 msgid "Error editing book, please check logfile for details"
 msgstr "编辑书籍出错，详情请检查日志文件"
 
-#: cps/web.py:3605
+#: cps/web.py:3614
 #, python-format
 msgid "Failed to store file %(file)s (Permission denied)."
 msgstr "存储文件 %(file)s 失败(权限拒绝)。"
 
-#: cps/web.py:3610
+#: cps/web.py:3619
 #, python-format
 msgid "Failed to delete file %(file)s (Permission denied)."
 msgstr "删除文件 %(file)s 失败(权限拒绝)。"
 
-#: cps/web.py:3692
+#: cps/web.py:3701
 #, python-format
 msgid "File %(file)s uploaded"
 msgstr "文件 %(file)s 已上传"
 
-#: cps/web.py:3722
+#: cps/web.py:3731
 msgid "Source or destination format for conversion missing"
 msgstr "转换的源或目的格式缺失"
 
-#: cps/web.py:3732
+#: cps/web.py:3741
 #, python-format
 msgid "Book successfully queued for converting to %(book_format)s"
 msgstr "书籍已经被成功加入 %(book_format)s 的转换队列"
 
-#: cps/web.py:3736
+#: cps/web.py:3745
 #, python-format
 msgid "There was an error converting this book: %(res)s"
 msgstr "转换此书时出现错误： %(res)s"
@@ -916,9 +919,7 @@ msgid "Rating"
 msgstr "评分"
 
 #: cps/templates/book_edit.html:87
-msgid ""
-"Cover URL (jpg, cover is downloaded and stored in database, field is "
-"afterwards empty again)"
+msgid "Cover URL (jpg, cover is downloaded and stored in database, field is afterwards empty again)"
 msgstr "封面URL(jpg,封面会被下载被保存在数据库中，然后字段会被重新清空)"
 
 #: cps/templates/book_edit.html:91
@@ -1849,9 +1850,7 @@ msgstr "最近下载"
 #~ msgid "Rename title from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 #~ msgstr "将标题从'%(src)s'改为'%(dest)s'时失败，出错信息: %(error)s"
 
-#~ msgid ""
-#~ "Rename author from: '%(src)s' to "
-#~ "'%(dest)s' failed with error: %(error)s"
+#~ msgid "Rename author from: '%(src)s' to '%(dest)s' failed with error: %(error)s"
 #~ msgstr "将作者从'%(src)s'改为'%(dest)s'时失败，出错信息: %(error)s"
 
 #~ msgid "Password for user %(user)s reset"
diff --git a/cps/web.py b/cps/web.py
index 777d508d..dbded0e0 100644
--- a/cps/web.py
+++ b/cps/web.py
@@ -107,10 +107,12 @@ current_milli_time = lambda: int(round(time.time() * 1000))
 # Global variables
 gdrive_watch_callback_token = 'target=calibreweb-watch_files'
 
-ALLOWED_EXTENSIONS = {'txt', 'pdf', 'epub', 'mobi', 'azw', 'azw3', 'cbr', 'cbz', 'cbt', 'djvu', 'prc', 'doc', 'docx',
+EXTENSIONS_UPLOAD = {'txt', 'pdf', 'epub', 'mobi', 'azw', 'azw3', 'cbr', 'cbz', 'cbt', 'djvu', 'prc', 'doc', 'docx',
                       'fb2'}
-# READER_EXTENSIONS = set(['txt', 'pdf', 'epub', 'zip', 'cbz', 'tar', 'cbt'] + (['rar','cbr'] if rar_support else []))
-# READER_EXTENSIONS = set(['txt', 'pdf', 'epub', 'zip', 'cbz', 'tar', 'cbt', 'rar', 'cbr'])
+EXTENSIONS_CONVERT = {'pdf', 'epub', 'mobi', 'azw3', 'docx', 'rtf', 'fb2', 'lit', 'lrf', 'txt'}
+
+# EXTENSIONS_READER = set(['txt', 'pdf', 'epub', 'zip', 'cbz', 'tar', 'cbt'] + (['rar','cbr'] if rar_support else []))
+
 
 def md5(fname):
     hash_md5 = hashlib.md5()
@@ -424,7 +426,7 @@ def yesno(value, yes, no):
 def canread(ext):
     if isinstance(ext, db.Data):
         ext = ext.format
-    return ext.lower() in READER_EXTENSIONS'''
+    return ext.lower() in EXTENSIONS_READER'''
 
 
 def admin_required(f):
@@ -3256,13 +3258,14 @@ def edit_book(book_id):
         author_names.append(authr.name.replace('|', ','))
 
     # Option for showing convertbook button
+    valid_source_formats=list()
     if config.config_ebookconverter == 2:
-        display_convertbtn = True
-    else:
-        display_convertbtn = False
+        for file in book.data:
+            if file.format.lower() in EXTENSIONS_CONVERT:
+                valid_source_formats.append(file.format.lower())
 
     # Determine what formats don't already exist
-    allowed_conversion_formats = ALLOWED_EXTENSIONS.copy()
+    allowed_conversion_formats = EXTENSIONS_CONVERT.copy()
     for file in book.data:
         try:
             allowed_conversion_formats.remove(file.format.lower())
@@ -3274,8 +3277,9 @@ def edit_book(book_id):
     # Show form
     if request.method != 'POST':
         return render_title_template('book_edit.html', book=book, authors=author_names, cc=cc,
-                                     title=_(u"edit metadata"), page="editbook", display_convertbtn=display_convertbtn,
-                                     conversion_formats=allowed_conversion_formats)
+                                     title=_(u"edit metadata"), page="editbook",
+                                     conversion_formats=allowed_conversion_formats,
+                                     source_formats=valid_source_formats)
     # Check and handle Uploaded file
     if 'btn-upload-format' in request.files:
         requested_file = request.files['btn-upload-format']
@@ -3283,7 +3287,7 @@ def edit_book(book_id):
         if requested_file.filename != '':
             if '.' in requested_file.filename:
                 file_ext = requested_file.filename.rsplit('.', 1)[-1].lower()
-                if file_ext not in ALLOWED_EXTENSIONS:
+                if file_ext not in EXTENSIONS_UPLOAD:
                     flash(_("File extension '%(ext)s' is not allowed to be uploaded to this server", ext=file_ext),
                           category="error")
                     return redirect(url_for('show_book', book_id=book.id))
@@ -3578,7 +3582,7 @@ def upload():
             # check if file extension is correct
             if '.' in requested_file.filename:
                 file_ext = requested_file.filename.rsplit('.', 1)[-1].lower()
-                if file_ext not in ALLOWED_EXTENSIONS:
+                if file_ext not in EXTENSIONS_UPLOAD:
                     flash(
                         _("File extension '%(ext)s' is not allowed to be uploaded to this server",
                           ext=file_ext), category="error")