diff --git a/cps/translations/de/LC_MESSAGES/messages.mo b/cps/translations/de/LC_MESSAGES/messages.mo
index 7d5b5303..7723d8b7 100644
Binary files a/cps/translations/de/LC_MESSAGES/messages.mo and b/cps/translations/de/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/de/LC_MESSAGES/messages.po b/cps/translations/de/LC_MESSAGES/messages.po
index afa80df0..01837a24 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: 2017-01-21 11:44+0100\n"
+"POT-Creation-Date: 2017-01-28 20:35+0100\n"
 "PO-Revision-Date: 2016-07-12 19:54+0200\n"
 "Last-Translator: Ozzie Isaacs\n"
 "Language: de\n"
@@ -32,290 +32,314 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-#: cps/book_formats.py:109 cps/book_formats.py:113 cps/web.py:948
+#: cps/book_formats.py:109 cps/book_formats.py:113 cps/web.py:982
 msgid "not installed"
 msgstr "Nicht installiert"
 
-#: cps/helper.py:98
+#: cps/helper.py:136
+#, python-format
+msgid "Failed to send mail: %s"
+msgstr "E-Mail: %s konnte nicht gesendet werden"
+
+#: cps/helper.py:143
 msgid "Calibre-web test email"
 msgstr "Calibre-web Test E-Mail"
 
-#: cps/helper.py:99 cps/helper.py:155
+#: cps/helper.py:144 cps/helper.py:154
 msgid "This email has been sent via calibre web."
 msgstr "Die E-Mail wurde via calibre-web versendet"
 
-#: cps/helper.py:136 cps/helper.py:225
-#, python-format
-msgid "Failed to send mail: %s"
-msgstr "E-Mail: %s konnte nicht gesendet werden"
-
-#: cps/helper.py:154 cps/templates/detail.html:127
+#: cps/helper.py:153 cps/templates/detail.html:129
 msgid "Send to Kindle"
 msgstr "An Kindle senden"
 
-#: cps/helper.py:177 cps/helper.py:192
+#: cps/helper.py:171 cps/helper.py:186
 msgid "Could not find any formats suitable for sending by email"
 msgstr ""
 "Konnte keine Formate finden welche für das versenden per E-Mail geeignet "
 "sind"
 
-#: cps/helper.py:186
+#: cps/helper.py:180
 msgid "Could not convert epub to mobi"
 msgstr "Konnte .epub nicht nach .mobi konvertieren"
 
-#: cps/helper.py:245
+#: cps/helper.py:206
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "Die angeforderte Datei konnte nicht gelesen werden. Falsche Dateirechte?"
 
-#: cps/ub.py:259
+#: cps/ub.py:380
 msgid "Guest"
 msgstr "Gast"
 
-#: cps/web.py:742
+#: cps/web.py:774
 msgid "Latest Books"
 msgstr "Letzte Bücher"
 
-#: cps/web.py:767
+#: cps/web.py:799
 msgid "Hot Books (most downloaded)"
 msgstr "Beliebte Bücher (die meisten Downloads)"
 
-#: cps/templates/index.xml:29 cps/web.py:775
+#: cps/templates/index.xml:29 cps/web.py:808
 msgid "Random Books"
 msgstr "Zufällige Bücher"
 
-#: cps/web.py:788
+#: cps/web.py:821
 msgid "Author list"
 msgstr "Autorenliste"
 
-#: cps/web.py:805
+#: cps/web.py:838
 #, python-format
 msgid "Author: %(nam)s"
 msgstr "Autor: %(nam)s"
 
-#: cps/templates/index.xml:50 cps/web.py:818
+#: cps/templates/index.xml:50 cps/web.py:851
 msgid "Series list"
 msgstr "Liste Serien"
 
-#: cps/web.py:829
+#: cps/web.py:862
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie: %(serie)s"
 
-#: cps/web.py:831 cps/web.py:927 cps/web.py:1126 cps/web.py:1874
+#: cps/web.py:864 cps/web.py:961 cps/web.py:1179 cps/web.py:2041
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr ""
 "Buch öffnen fehlgeschlagen. Datei existiert nicht, oder ist nicht "
 "zugänglich."
 
-#: cps/web.py:862
+#: cps/web.py:895
 msgid "Available languages"
 msgstr "Verfügbare Sprachen"
 
-#: cps/web.py:877
+#: cps/web.py:910
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Sprache: %(name)s"
 
-#: cps/templates/index.xml:43 cps/web.py:890
+#: cps/templates/index.xml:43 cps/web.py:923
 msgid "Category list"
 msgstr "Kategorieliste"
 
-#: cps/web.py:900
+#: cps/web.py:933
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategorie: %(name)s"
 
-#: cps/web.py:956
+#: cps/web.py:992
 msgid "Statistics"
 msgstr "Statistiken"
 
-#: cps/web.py:965
-msgid "Server restarts"
-msgstr "Server startet neu"
+#: cps/web.py:1013
+msgid "Performing Restart, please reload page"
+msgstr "Führe Neustart durch, bitte Seite neu laden"
+
+#: cps/web.py:1015
+msgid "Performing shutdown of server, please close window"
+msgstr "Server wird runtergefahren, bitte Fenster schließen"
 
-#: cps/web.py:1102 cps/web.py:1109 cps/web.py:1116 cps/web.py:1123
+#: cps/web.py:1091 cps/web.py:1104
+msgid "search"
+msgstr "Suche"
+
+#: cps/web.py:1155 cps/web.py:1162 cps/web.py:1169 cps/web.py:1176
 msgid "Read a Book"
 msgstr "Lese ein Buch"
 
-#: cps/web.py:1172 cps/web.py:1510
+#: cps/web.py:1227 cps/web.py:1649
 msgid "Please fill out all fields!"
 msgstr "Bitte alle Felder ausfüllen!"
 
-#: cps/web.py:1188
+#: cps/web.py:1228 cps/web.py:1244 cps/web.py:1249 cps/web.py:1251
+msgid "register"
+msgstr "Registieren"
+
+#: cps/web.py:1243
 msgid "An unknown error occured. Please try again later."
 msgstr "Es ist ein unbekannter Fehler aufgetreten. Bitte später erneut versuchen."
 
-#: cps/web.py:1193
+#: cps/web.py:1248
 msgid "This username or email address is already in use."
 msgstr "Der Benutzername oder die E-Mailadresse ist in bereits in Benutzung."
 
-#: cps/web.py:1196
-msgid "register"
-msgstr "Registieren"
-
-#: cps/web.py:1212
+#: cps/web.py:1266
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Du bist nun eingeloggt als '%(nickname)s'"
 
-#: cps/web.py:1216
+#: cps/web.py:1270
 msgid "Wrong Username or Password"
 msgstr "Falscher Benutzername oder Passwort"
 
-#: cps/web.py:1218
+#: cps/web.py:1272
 msgid "login"
 msgstr "Login"
 
-#: cps/web.py:1235
+#: cps/web.py:1289
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Bitte zuerst die SMTP Mail Einstellung konfigurieren ..."
 
-#: cps/web.py:1239
+#: cps/web.py:1293
 #, python-format
 msgid "Book successfully send to %(kindlemail)s"
 msgstr "Buch erfolgreich versandt an %(kindlemail)s"
 
-#: cps/web.py:1243
+#: cps/web.py:1297
 #, 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:1245
+#: cps/web.py:1299
 msgid "Please configure your kindle email address first..."
 msgstr "Bitte die Kindle E-Mail Adresse zuuerst konfigurieren..."
 
-#: cps/web.py:1265
+#: cps/web.py:1319
 #, 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:1286
+#: cps/web.py:1340
 #, 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:1304 cps/web.py:1325
+#: cps/web.py:1359 cps/web.py:1383
 #, 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:1309
+#: cps/web.py:1364
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Bücherregal %(title)s erzeugt"
 
-#: cps/web.py:1311 cps/web.py:1336
+#: cps/web.py:1366 cps/web.py:1394
 msgid "There was an error"
 msgstr "Es trat ein Fehler auf"
 
-#: cps/web.py:1312 cps/web.py:1314
+#: cps/web.py:1367 cps/web.py:1369
 msgid "create a shelf"
 msgstr "Bücherregal erzeugen"
 
-#: cps/web.py:1334
+#: cps/web.py:1392
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Bücherregal %(title)s verändert"
 
-#: cps/web.py:1337 cps/web.py:1339
+#: cps/web.py:1395 cps/web.py:1397
 msgid "Edit a shelf"
 msgstr "Bücherregal editieren"
 
-#: cps/web.py:1360
+#: cps/web.py:1415
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "Bücherregal %(name)s erfolgreich gelöscht"
 
-#: cps/web.py:1381
+#: cps/web.py:1437
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Bücherregal: '%(name)s'"
 
-#: cps/web.py:1409
+#: cps/web.py:1468
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Reihenfolge in Bücherregal '%(name)s' verändern"
 
-#: cps/web.py:1469
+#: cps/web.py:1528
 msgid "Found an existing account for this email address."
 msgstr "Es existiert ein Benutzerkonto für diese E-Mailadresse"
 
-#: cps/web.py:1471 cps/web.py:1474
+#: cps/web.py:1530 cps/web.py:1534
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's Profil"
 
-#: cps/web.py:1472
+#: cps/web.py:1531
 msgid "Profile updated"
 msgstr "Profil aktualisiert"
 
-#: cps/web.py:1483 cps/web.py:1491
+#: cps/web.py:1544
 msgid "Admin page"
 msgstr "Admin Seite"
 
-#: cps/templates/admin.html:33 cps/web.py:1511
+#: cps/web.py:1604
+msgid "Calibre-web configuration updated"
+msgstr "Calibre-web Konfiguration wurde aktualisiert"
+
+#: cps/web.py:1611 cps/web.py:1617 cps/web.py:1630
+msgid "Basic Configuration"
+msgstr "Basis Konfiguration"
+
+#: cps/web.py:1615
+msgid "DB location is not valid, please enter correct path"
+msgstr "DB Speicherort ist ungültig, bitte Pfad korrigieren"
+
+#: cps/templates/admin.html:33 cps/web.py:1651 cps/web.py:1693
 msgid "Add new user"
 msgstr "Neuen Benutzer hinzufügen"
 
-#: cps/web.py:1544
+#: cps/web.py:1687
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Benutzer '%(user)s' angelegt"
 
-#: cps/web.py:1548
+#: cps/web.py:1691
 msgid "Found an existing account for this email address or nickname."
 msgstr ""
 "Es existiert ein Benutzerkonto für diese Emailadresse oder den "
 "Benutzernamen."
 
-#: cps/web.py:1568
+#: cps/web.py:1711
 msgid "Mail settings updated"
 msgstr "E-Mail Einstellungen aktualisiert"
 
-#: cps/web.py:1574
+#: cps/web.py:1717
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr "Test E-Mail erfolgreich an %(kindlemail)s versendet"
 
-#: cps/web.py:1577
+#: cps/web.py:1720
 #, python-format
 msgid "There was an error sending the Test E-Mail: %(res)s"
 msgstr "Fehler beim versenden der Test E-Mail: %(res)s"
 
-#: cps/web.py:1578
+#: cps/web.py:1721
 msgid "Edit mail settings"
 msgstr "E-Mail Einstellungen editieren"
 
-#: cps/web.py:1606
+#: cps/web.py:1749
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Benutzer '%(nick)s' gelöscht"
 
-#: cps/web.py:1661
+#: cps/web.py:1825
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Benutzer '%(nick)s' aktualisiert"
 
-#: cps/web.py:1664
+#: cps/web.py:1828
 msgid "An unknown error occured."
 msgstr "Es ist ein unbekanter Fehler aufgetreten"
 
-#: cps/web.py:1666
+#: cps/web.py:1831
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Benutzer %(nick)s bearbeiten"
 
-#: cps/web.py:1904
+#: cps/web.py:2036 cps/web.py:2039 cps/web.py:2113
+msgid "edit metadata"
+msgstr "Metadaten editieren"
+
+#: cps/web.py:2071
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Fehler beim Erzeugen des Pfads %s (Zugriff verweigert)"
 
-#: cps/web.py:1909
+#: cps/web.py:2076
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Fehler beim speichern der Datei %s (Zugriff verweigert)"
 
-#: cps/web.py:1914
+#: cps/web.py:2081
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Fehler beim Löschen von Datei %s (Zugriff verweigert)"
@@ -344,7 +368,7 @@ msgstr "DLS"
 msgid "Admin"
 msgstr "Admin"
 
-#: cps/templates/admin.html:12 cps/templates/detail.html:114
+#: cps/templates/admin.html:12 cps/templates/detail.html:116
 msgid "Download"
 msgstr "Download"
 
@@ -392,15 +416,15 @@ msgstr "Absenderadresse"
 msgid "Change SMTP settings"
 msgstr "SMTP Einstellungen ändern"
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:56 cps/templates/admin.html:76
 msgid "Configuration"
 msgstr "Konfiguration"
 
 #: cps/templates/admin.html:59
-msgid "Log File"
-msgstr "Log Datei"
+msgid "Calibre DB dir"
+msgstr "Calibre DB Pfad"
 
-#: cps/templates/admin.html:60
+#: cps/templates/admin.html:60 cps/templates/config_edit.html:32
 msgid "Log Level"
 msgstr "Log Level"
 
@@ -408,7 +432,7 @@ msgstr "Log Level"
 msgid "Port"
 msgstr "Port"
 
-#: cps/templates/admin.html:62
+#: cps/templates/admin.html:62 cps/templates/config_edit.html:19
 msgid "Books per page"
 msgstr "Bücher pro Seite"
 
@@ -424,102 +448,156 @@ msgstr "Öffentliche Registrierung"
 msgid "Anonymous browsing"
 msgstr "Anonymer Zugriff"
 
-#: cps/templates/admin.html:76
+#: cps/templates/admin.html:77
 msgid "Administration"
 msgstr "Administration"
 
-#: cps/templates/admin.html:78
+#: cps/templates/admin.html:79
 msgid "Restart Calibre-web"
 msgstr "Calibre-web Neustarten"
 
-#: cps/templates/detail.html:38
-msgid "Book"
-msgstr "Buch"
-
-#: cps/templates/detail.html:38
-msgid "of"
-msgstr "von"
-
-#: cps/templates/detail.html:44
-msgid "language"
-msgstr "Sprache"
+#: cps/templates/admin.html:80
+msgid "Stop Calibre-web"
+msgstr "Stoppe Calibre-web"
 
-#: cps/templates/detail.html:103
-msgid "Description:"
-msgstr "Beschreibung"
+#: cps/templates/admin.html:91
+msgid "Do you really want to restart Calibre-web?"
+msgstr "Calibre-web wirklich neustarten?"
 
-#: cps/templates/detail.html:131
-msgid "Read in browser"
-msgstr "Im Browser lesen"
+#: cps/templates/admin.html:92 cps/templates/admin.html:107
+msgid "Ok"
+msgstr "Ok"
 
-#: cps/templates/detail.html:151
-msgid "Add to shelf"
-msgstr "Zu Bücherregal hinzufügen"
+#: cps/templates/admin.html:93 cps/templates/admin.html:108
+#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:54
+#: cps/templates/email_edit.html:36 cps/templates/shelf_edit.html:17
+#: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:107
+msgid "Back"
+msgstr "Zurück"
 
-#: cps/templates/detail.html:191
-msgid "Edit metadata"
-msgstr "Metadaten bearbeiten"
+#: cps/templates/admin.html:106
+msgid "Do you really want to stop Calibre-web?"
+msgstr "Calibre-web wirklich stoppen"
 
-#: cps/templates/edit_book.html:14 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:16 cps/templates/search_form.html:6
 msgid "Book Title"
 msgstr "Buchtitel"
 
-#: cps/templates/edit_book.html:18 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:20 cps/templates/search_form.html:10
 msgid "Author"
 msgstr "Autor"
 
-#: cps/templates/edit_book.html:22
+#: cps/templates/book_edit.html:24
 msgid "Description"
 msgstr "Beschreibung"
 
-#: cps/templates/edit_book.html:26 cps/templates/search_form.html:13
+#: cps/templates/book_edit.html:28 cps/templates/search_form.html:13
 msgid "Tags"
 msgstr "Tags"
 
-#: cps/templates/edit_book.html:31 cps/templates/layout.html:133
+#: cps/templates/book_edit.html:33 cps/templates/layout.html:133
 #: cps/templates/search_form.html:33
 msgid "Series"
 msgstr "Serien"
 
-#: cps/templates/edit_book.html:35
+#: cps/templates/book_edit.html:37
 msgid "Series id"
 msgstr "Serien ID"
 
-#: cps/templates/edit_book.html:39
+#: cps/templates/book_edit.html:41
 msgid "Rating"
 msgstr "Bewertung"
 
-#: cps/templates/edit_book.html:43
+#: cps/templates/book_edit.html:45
 msgid "Cover URL (jpg)"
 msgstr "Cover URL (jpg)"
 
-#: cps/templates/edit_book.html:48 cps/templates/user_edit.html:27
+#: cps/templates/book_edit.html:50 cps/templates/user_edit.html:27
 msgid "Language"
 msgstr "Sprache"
 
-#: cps/templates/edit_book.html:59
+#: cps/templates/book_edit.html:61
 msgid "Yes"
 msgstr "Ja"
 
-#: cps/templates/edit_book.html:60
+#: cps/templates/book_edit.html:62
 msgid "No"
 msgstr "Nein"
 
-#: cps/templates/edit_book.html:102
+#: cps/templates/book_edit.html:104
 msgid "view book after edit"
 msgstr "Buch nach Bearbeitung ansehen"
 
-#: cps/templates/edit_book.html:105 cps/templates/login.html:19
-#: cps/templates/search_form.html:75 cps/templates/shelf_edit.html:15
-#: cps/templates/user_edit.html:97
+#: cps/templates/book_edit.html:107 cps/templates/config_edit.html:52
+#: cps/templates/login.html:19 cps/templates/search_form.html:75
+#: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:105
 msgid "Submit"
 msgstr "Abschicken"
 
-#: cps/templates/edit_book.html:106 cps/templates/email_edit.html:36
-#: cps/templates/shelf_edit.html:17 cps/templates/shelf_order.html:12
-#: cps/templates/user_edit.html:99
-msgid "Back"
-msgstr "Zurück"
+#: cps/templates/config_edit.html:7
+msgid "Location of Calibre database"
+msgstr "Speicherort der Calibre Datenbank"
+
+#: cps/templates/config_edit.html:11
+msgid "Server Port"
+msgstr "Server Port"
+
+#: cps/templates/config_edit.html:15 cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Titel"
+
+#: cps/templates/config_edit.html:23
+msgid "No. of random books to show"
+msgstr "Anzahl Anzeige zufällige Bücher"
+
+#: cps/templates/config_edit.html:28
+msgid "Regular expression for title sorting"
+msgstr "Regulärer Ausdruck für Titelsortierung"
+
+#: cps/templates/config_edit.html:42
+msgid "Enable uploading"
+msgstr "Hochladen aktivieren"
+
+#: cps/templates/config_edit.html:46
+msgid "Enable anonymous browsing"
+msgstr "Anonymes Browsen aktivieren"
+
+#: cps/templates/config_edit.html:50
+msgid "Enable public registration"
+msgstr "Öffentliche Registrierung aktivieren"
+
+#: cps/templates/config_edit.html:57 cps/templates/layout.html:91
+#: cps/templates/login.html:4
+msgid "Login"
+msgstr "Login"
+
+#: cps/templates/detail.html:40
+msgid "Book"
+msgstr "Buch"
+
+#: cps/templates/detail.html:40
+msgid "of"
+msgstr "von"
+
+#: cps/templates/detail.html:46
+msgid "language"
+msgstr "Sprache"
+
+#: cps/templates/detail.html:105
+msgid "Description:"
+msgstr "Beschreibung"
+
+#: cps/templates/detail.html:133
+msgid "Read in browser"
+msgstr "Im Browser lesen"
+
+#: cps/templates/detail.html:153
+msgid "Add to shelf"
+msgstr "Zu Bücherregal hinzufügen"
+
+#: cps/templates/detail.html:193
+msgid "Edit metadata"
+msgstr "Metadaten bearbeiten"
 
 #: cps/templates/email_edit.html:11
 msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
@@ -623,10 +701,6 @@ msgstr "Erweiterte Suche"
 msgid "Logout"
 msgstr "Logout"
 
-#: cps/templates/layout.html:91 cps/templates/login.html:4
-msgid "Login"
-msgstr "Login"
-
 #: cps/templates/layout.html:92 cps/templates/register.html:18
 msgid "Register"
 msgstr "Registrieren"
@@ -745,10 +819,6 @@ msgstr "Bücherregal umbenennen"
 msgid "Change order"
 msgstr "Reihenfolge ändern"
 
-#: cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "Titel"
-
 #: cps/templates/shelf_edit.html:12
 msgid "should the shelf be public?"
 msgstr "Soll das Bücherregal öffentlich sein?"
@@ -807,37 +877,45 @@ msgstr "Zeige Sprachauswahl"
 
 #: cps/templates/user_edit.html:57
 msgid "Show series selection"
-msgstr "Zeige Auswahl Serien"
+msgstr "Zeige Serienauswahl"
 
 #: cps/templates/user_edit.html:61
 msgid "Show category selection"
-msgstr "Zeige Kategorie Auswahl"
+msgstr "Zeige Kategorienauswahl"
+
+#: cps/templates/user_edit.html:65
+msgid "Show author selection"
+msgstr "Zeige Autorenauswahl"
+
+#: cps/templates/user_edit.html:69
+msgid "Show random books in detail view"
+msgstr "Zeige zufällige Bücher in der Detailansicht"
 
-#: cps/templates/user_edit.html:68
+#: cps/templates/user_edit.html:76
 msgid "Admin user"
 msgstr "Admin Benutzer"
 
-#: cps/templates/user_edit.html:73
+#: cps/templates/user_edit.html:81
 msgid "Allow Downloads"
 msgstr "Downloads erlauben"
 
-#: cps/templates/user_edit.html:77
+#: cps/templates/user_edit.html:85
 msgid "Allow Uploads"
 msgstr "Uploads erlauben"
 
-#: cps/templates/user_edit.html:81
+#: cps/templates/user_edit.html:89
 msgid "Allow Edit"
 msgstr "Bearbeiten erlauben"
 
-#: cps/templates/user_edit.html:86
+#: cps/templates/user_edit.html:94
 msgid "Allow Changing Password"
 msgstr "Passwort ändern erlauben"
 
-#: cps/templates/user_edit.html:93
+#: cps/templates/user_edit.html:101
 msgid "Delete this user"
 msgstr "Benutzer löschen"
 
-#: cps/templates/user_edit.html:104
+#: cps/templates/user_edit.html:112
 msgid "Recent Downloads"
 msgstr "Letzte Downloads"
 
diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po
index d55eed7b..cdec2672 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: 2017-01-21 11:44+0100\n"
+"POT-Creation-Date: 2017-01-28 20:35+0100\n"
 "PO-Revision-Date: 2016-11-13 18:35+0100\n"
 "Last-Translator: Juan F. Villa <juan.villa@paisdelconocimiento.org>\n"
 "Language: es\n"
@@ -25,284 +25,308 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-#: cps/book_formats.py:109 cps/book_formats.py:113 cps/web.py:948
+#: cps/book_formats.py:109 cps/book_formats.py:113 cps/web.py:982
 msgid "not installed"
 msgstr "No instalado"
 
-#: cps/helper.py:98
+#: cps/helper.py:136
+#, python-format
+msgid "Failed to send mail: %s"
+msgstr "Fallo al enviar el correo : %s"
+
+#: cps/helper.py:143
 msgid "Calibre-web test email"
 msgstr "Prueba de Correo Calibre-web"
 
-#: cps/helper.py:99 cps/helper.py:155
+#: cps/helper.py:144 cps/helper.py:154
 msgid "This email has been sent via calibre web."
 msgstr "Este mensaje ha sido enviado via Calibre Web."
 
-#: cps/helper.py:136 cps/helper.py:225
-#, python-format
-msgid "Failed to send mail: %s"
-msgstr "Fallo al enviar el correo : %s"
-
-#: cps/helper.py:154 cps/templates/detail.html:127
+#: cps/helper.py:153 cps/templates/detail.html:129
 msgid "Send to Kindle"
 msgstr "Enviar a Kindle"
 
-#: cps/helper.py:177 cps/helper.py:192
+#: cps/helper.py:171 cps/helper.py:186
 msgid "Could not find any formats suitable for sending by email"
 msgstr "Formato no compatible para enviar por correo electronico"
 
-#: cps/helper.py:186
+#: cps/helper.py:180
 msgid "Could not convert epub to mobi"
 msgstr "No fue posible convertir de epub a mobi"
 
-#: cps/helper.py:245
+#: cps/helper.py:206
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "El fichero solicitado no puede ser leido. Problema de permisos?"
 
-#: cps/ub.py:259
+#: cps/ub.py:380
 msgid "Guest"
 msgstr ""
 
-#: cps/web.py:742
+#: cps/web.py:774
 msgid "Latest Books"
 msgstr "Libros recientes"
 
-#: cps/web.py:767
+#: cps/web.py:799
 msgid "Hot Books (most downloaded)"
 msgstr "Libros Populares (los mas descargados)"
 
-#: cps/templates/index.xml:29 cps/web.py:775
+#: cps/templates/index.xml:29 cps/web.py:808
 msgid "Random Books"
 msgstr "Libros al Azar"
 
-#: cps/web.py:788
+#: cps/web.py:821
 msgid "Author list"
 msgstr "Lista de Autores"
 
-#: cps/web.py:805
+#: cps/web.py:838
 #, python-format
 msgid "Author: %(nam)s"
 msgstr "Autor : %(nam)s"
 
-#: cps/templates/index.xml:50 cps/web.py:818
+#: cps/templates/index.xml:50 cps/web.py:851
 msgid "Series list"
 msgstr "lista de Series"
 
-#: cps/web.py:829
+#: cps/web.py:862
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Series : %(serie)s"
 
-#: cps/web.py:831 cps/web.py:927 cps/web.py:1126 cps/web.py:1874
+#: cps/web.py:864 cps/web.py:961 cps/web.py:1179 cps/web.py:2041
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "Error en apertura del Objeto. El archivo no existe o no es accesible"
 
-#: cps/web.py:862
+#: cps/web.py:895
 msgid "Available languages"
 msgstr "Lenguajes disponibles"
 
-#: cps/web.py:877
+#: cps/web.py:910
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Lenguaje: %(name)s"
 
-#: cps/templates/index.xml:43 cps/web.py:890
+#: cps/templates/index.xml:43 cps/web.py:923
 msgid "Category list"
 msgstr "Lista de Categorias"
 
-#: cps/web.py:900
+#: cps/web.py:933
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoria : %(name)s"
 
-#: cps/web.py:956
+#: cps/web.py:992
 msgid "Statistics"
 msgstr "Estadisticas"
 
-#: cps/web.py:965
-msgid "Server restarts"
-msgstr "Reinicio del Servidor"
+#: cps/web.py:1013
+msgid "Performing Restart, please reload page"
+msgstr ""
+
+#: cps/web.py:1015
+msgid "Performing shutdown of server, please close window"
+msgstr ""
+
+#: cps/web.py:1091 cps/web.py:1104
+msgid "search"
+msgstr ""
 
-#: cps/web.py:1102 cps/web.py:1109 cps/web.py:1116 cps/web.py:1123
+#: cps/web.py:1155 cps/web.py:1162 cps/web.py:1169 cps/web.py:1176
 msgid "Read a Book"
 msgstr "Leer un Libro"
 
-#: cps/web.py:1172 cps/web.py:1510
+#: cps/web.py:1227 cps/web.py:1649
 msgid "Please fill out all fields!"
 msgstr "Por favor llenar todos los campos!"
 
-#: cps/web.py:1188
+#: cps/web.py:1228 cps/web.py:1244 cps/web.py:1249 cps/web.py:1251
+msgid "register"
+msgstr "Registrarse"
+
+#: cps/web.py:1243
 msgid "An unknown error occured. Please try again later."
 msgstr "Ocurrio un error. Intentar de nuevo mas tarde."
 
-#: cps/web.py:1193
+#: cps/web.py:1248
 msgid "This username or email address is already in use."
 msgstr "Usuario o direccion de correo en uso."
 
-#: cps/web.py:1196
-msgid "register"
-msgstr "Registrarse"
-
-#: cps/web.py:1212
+#: cps/web.py:1266
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Sesion iniciada como : '%(nickname)s'"
 
-#: cps/web.py:1216
+#: cps/web.py:1270
 msgid "Wrong Username or Password"
 msgstr "Usuario o contraseña invalido"
 
-#: cps/web.py:1218
+#: cps/web.py:1272
 msgid "login"
 msgstr "Iniciar Sesion"
 
-#: cps/web.py:1235
+#: cps/web.py:1289
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configurar primero los parametros SMTP por favor..."
 
-#: cps/web.py:1239
+#: cps/web.py:1293
 #, python-format
 msgid "Book successfully send to %(kindlemail)s"
 msgstr "Envio de Libro a %(kindlemail)s correctamente"
 
-#: cps/web.py:1243
+#: cps/web.py:1297
 #, 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:1245
+#: cps/web.py:1299
 msgid "Please configure your kindle email address first..."
 msgstr "Configurar primero la dirección de correo Kindle por favor..."
 
-#: cps/web.py:1265
+#: cps/web.py:1319
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "El libro fue agregado a el estante: %(sname)s"
 
-#: cps/web.py:1286
+#: cps/web.py:1340
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "El libro fue removido del estante: %(sname)s"
 
-#: cps/web.py:1304 cps/web.py:1325
+#: cps/web.py:1359 cps/web.py:1383
 #, 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:1309
+#: cps/web.py:1364
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Estante %(title)s creado"
 
-#: cps/web.py:1311 cps/web.py:1336
+#: cps/web.py:1366 cps/web.py:1394
 msgid "There was an error"
 msgstr "Hemos tenido un error"
 
-#: cps/web.py:1312 cps/web.py:1314
+#: cps/web.py:1367 cps/web.py:1369
 msgid "create a shelf"
 msgstr "Crear un Estante"
 
-#: cps/web.py:1334
+#: cps/web.py:1392
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr ""
 
-#: cps/web.py:1337 cps/web.py:1339
+#: cps/web.py:1395 cps/web.py:1397
 msgid "Edit a shelf"
 msgstr ""
 
-#: cps/web.py:1360
+#: cps/web.py:1415
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "Estante %(name)s fue borrado correctamente"
 
-#: cps/web.py:1381
+#: cps/web.py:1437
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Estante: '%(name)s'"
 
-#: cps/web.py:1409
+#: cps/web.py:1468
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/web.py:1469
+#: cps/web.py:1528
 msgid "Found an existing account for this email address."
 msgstr "Existe una cuenta vinculada a esta cuenta de correo."
 
-#: cps/web.py:1471 cps/web.py:1474
+#: cps/web.py:1530 cps/web.py:1534
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Perfil de %(name)s"
 
-#: cps/web.py:1472
+#: cps/web.py:1531
 msgid "Profile updated"
 msgstr "Perfil actualizado"
 
-#: cps/web.py:1483 cps/web.py:1491
+#: cps/web.py:1544
 msgid "Admin page"
 msgstr ""
 
-#: cps/templates/admin.html:33 cps/web.py:1511
+#: cps/web.py:1604
+msgid "Calibre-web configuration updated"
+msgstr ""
+
+#: cps/web.py:1611 cps/web.py:1617 cps/web.py:1630
+msgid "Basic Configuration"
+msgstr ""
+
+#: cps/web.py:1615
+msgid "DB location is not valid, please enter correct path"
+msgstr ""
+
+#: cps/templates/admin.html:33 cps/web.py:1651 cps/web.py:1693
 msgid "Add new user"
 msgstr "Agregar un nuevo usuario"
 
-#: cps/web.py:1544
+#: cps/web.py:1687
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Usuario '%(user)s' creado"
 
-#: cps/web.py:1548
+#: cps/web.py:1691
 msgid "Found an existing account for this email address or nickname."
 msgstr "Se ha encontrado una cuenta vinculada a esta cuenta de correo o usuario."
 
-#: cps/web.py:1568
+#: cps/web.py:1711
 msgid "Mail settings updated"
 msgstr "Parametros de correo actualizados"
 
-#: cps/web.py:1574
+#: cps/web.py:1717
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr "Exito al realizar envio de prueba a %(kindlemail)s"
 
-#: cps/web.py:1577
+#: cps/web.py:1720
 #, python-format
 msgid "There was an error sending the Test E-Mail: %(res)s"
 msgstr "Error al realizar envio de prueba a E-Mail: %(res)s"
 
-#: cps/web.py:1578
+#: cps/web.py:1721
 msgid "Edit mail settings"
 msgstr "Editar parametros de correo"
 
-#: cps/web.py:1606
+#: cps/web.py:1749
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Usuario '%(nick)s' borrado"
 
-#: cps/web.py:1661
+#: cps/web.py:1825
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Usuario '%(nick)s'  Actualizado"
 
-#: cps/web.py:1664
+#: cps/web.py:1828
 msgid "An unknown error occured."
 msgstr "Oups ! Error inesperado."
 
-#: cps/web.py:1666
+#: cps/web.py:1831
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Editar Usuario %(nick)s"
 
-#: cps/web.py:1904
+#: cps/web.py:2036 cps/web.py:2039 cps/web.py:2113
+msgid "edit metadata"
+msgstr ""
+
+#: cps/web.py:2071
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Fallo al crear la ruta %s (permiso negado)"
 
-#: cps/web.py:1909
+#: cps/web.py:2076
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Fallo al almacenar el archivo %s (permiso negado)"
 
-#: cps/web.py:1914
+#: cps/web.py:2081
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Fallo al borrar el archivo %s (permiso negado)"
@@ -331,7 +355,7 @@ msgstr "DLS"
 msgid "Admin"
 msgstr "Administracion"
 
-#: cps/templates/admin.html:12 cps/templates/detail.html:114
+#: cps/templates/admin.html:12 cps/templates/detail.html:116
 msgid "Download"
 msgstr "Descarga"
 
@@ -379,15 +403,15 @@ msgstr "Desde el correo"
 msgid "Change SMTP settings"
 msgstr "Cambiar parametros smtp"
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:56 cps/templates/admin.html:76
 msgid "Configuration"
 msgstr ""
 
 #: cps/templates/admin.html:59
-msgid "Log File"
+msgid "Calibre DB dir"
 msgstr ""
 
-#: cps/templates/admin.html:60
+#: cps/templates/admin.html:60 cps/templates/config_edit.html:32
 msgid "Log Level"
 msgstr ""
 
@@ -395,7 +419,7 @@ msgstr ""
 msgid "Port"
 msgstr ""
 
-#: cps/templates/admin.html:62
+#: cps/templates/admin.html:62 cps/templates/config_edit.html:19
 msgid "Books per page"
 msgstr ""
 
@@ -411,102 +435,156 @@ msgstr ""
 msgid "Anonymous browsing"
 msgstr ""
 
-#: cps/templates/admin.html:76
+#: cps/templates/admin.html:77
 msgid "Administration"
 msgstr ""
 
-#: cps/templates/admin.html:78
+#: cps/templates/admin.html:79
 msgid "Restart Calibre-web"
 msgstr ""
 
-#: cps/templates/detail.html:38
-msgid "Book"
-msgstr "Libro"
-
-#: cps/templates/detail.html:38
-msgid "of"
-msgstr "de"
-
-#: cps/templates/detail.html:44
-msgid "language"
-msgstr "Lenguaje"
+#: cps/templates/admin.html:80
+msgid "Stop Calibre-web"
+msgstr ""
 
-#: cps/templates/detail.html:103
-msgid "Description:"
-msgstr "Descripcion :"
+#: cps/templates/admin.html:91
+msgid "Do you really want to restart Calibre-web?"
+msgstr ""
 
-#: cps/templates/detail.html:131
-msgid "Read in browser"
-msgstr "Ver en el navegador"
+#: cps/templates/admin.html:92 cps/templates/admin.html:107
+msgid "Ok"
+msgstr ""
 
-#: cps/templates/detail.html:151
-msgid "Add to shelf"
-msgstr "Agregar al estante"
+#: cps/templates/admin.html:93 cps/templates/admin.html:108
+#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:54
+#: cps/templates/email_edit.html:36 cps/templates/shelf_edit.html:17
+#: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:107
+msgid "Back"
+msgstr "Regresar"
 
-#: cps/templates/detail.html:191
-msgid "Edit metadata"
-msgstr "Editar la metadata"
+#: cps/templates/admin.html:106
+msgid "Do you really want to stop Calibre-web?"
+msgstr ""
 
-#: cps/templates/edit_book.html:14 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:16 cps/templates/search_form.html:6
 msgid "Book Title"
 msgstr "Titulo del Libro"
 
-#: cps/templates/edit_book.html:18 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:20 cps/templates/search_form.html:10
 msgid "Author"
 msgstr "Autor"
 
-#: cps/templates/edit_book.html:22
+#: cps/templates/book_edit.html:24
 msgid "Description"
 msgstr "Descripcion"
 
-#: cps/templates/edit_book.html:26 cps/templates/search_form.html:13
+#: cps/templates/book_edit.html:28 cps/templates/search_form.html:13
 msgid "Tags"
 msgstr "Etiqueta"
 
-#: cps/templates/edit_book.html:31 cps/templates/layout.html:133
+#: cps/templates/book_edit.html:33 cps/templates/layout.html:133
 #: cps/templates/search_form.html:33
 msgid "Series"
 msgstr "Series"
 
-#: cps/templates/edit_book.html:35
+#: cps/templates/book_edit.html:37
 msgid "Series id"
 msgstr "Id de la serie"
 
-#: cps/templates/edit_book.html:39
+#: cps/templates/book_edit.html:41
 msgid "Rating"
 msgstr "Puntaje"
 
-#: cps/templates/edit_book.html:43
+#: cps/templates/book_edit.html:45
 msgid "Cover URL (jpg)"
 msgstr "URL de la Cubierta (jpg)"
 
-#: cps/templates/edit_book.html:48 cps/templates/user_edit.html:27
+#: cps/templates/book_edit.html:50 cps/templates/user_edit.html:27
 msgid "Language"
 msgstr "Lenguaje"
 
-#: cps/templates/edit_book.html:59
+#: cps/templates/book_edit.html:61
 msgid "Yes"
 msgstr "Si"
 
-#: cps/templates/edit_book.html:60
+#: cps/templates/book_edit.html:62
 msgid "No"
 msgstr "No"
 
-#: cps/templates/edit_book.html:102
+#: cps/templates/book_edit.html:104
 msgid "view book after edit"
 msgstr "Ver libro tras la edicion"
 
-#: cps/templates/edit_book.html:105 cps/templates/login.html:19
-#: cps/templates/search_form.html:75 cps/templates/shelf_edit.html:15
-#: cps/templates/user_edit.html:97
+#: cps/templates/book_edit.html:107 cps/templates/config_edit.html:52
+#: cps/templates/login.html:19 cps/templates/search_form.html:75
+#: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:105
 msgid "Submit"
 msgstr "Enviar"
 
-#: cps/templates/edit_book.html:106 cps/templates/email_edit.html:36
-#: cps/templates/shelf_edit.html:17 cps/templates/shelf_order.html:12
-#: cps/templates/user_edit.html:99
-msgid "Back"
-msgstr "Regresar"
+#: cps/templates/config_edit.html:7
+msgid "Location of Calibre database"
+msgstr ""
+
+#: cps/templates/config_edit.html:11
+msgid "Server Port"
+msgstr ""
+
+#: cps/templates/config_edit.html:15 cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Titulo"
+
+#: cps/templates/config_edit.html:23
+msgid "No. of random books to show"
+msgstr ""
+
+#: cps/templates/config_edit.html:28
+msgid "Regular expression for title sorting"
+msgstr ""
+
+#: cps/templates/config_edit.html:42
+msgid "Enable uploading"
+msgstr ""
+
+#: cps/templates/config_edit.html:46
+msgid "Enable anonymous browsing"
+msgstr ""
+
+#: cps/templates/config_edit.html:50
+msgid "Enable public registration"
+msgstr ""
+
+#: cps/templates/config_edit.html:57 cps/templates/layout.html:91
+#: cps/templates/login.html:4
+msgid "Login"
+msgstr "Inicio de Sesion"
+
+#: cps/templates/detail.html:40
+msgid "Book"
+msgstr "Libro"
+
+#: cps/templates/detail.html:40
+msgid "of"
+msgstr "de"
+
+#: cps/templates/detail.html:46
+msgid "language"
+msgstr "Lenguaje"
+
+#: cps/templates/detail.html:105
+msgid "Description:"
+msgstr "Descripcion :"
+
+#: cps/templates/detail.html:133
+msgid "Read in browser"
+msgstr "Ver en el navegador"
+
+#: cps/templates/detail.html:153
+msgid "Add to shelf"
+msgstr "Agregar al estante"
+
+#: cps/templates/detail.html:193
+msgid "Edit metadata"
+msgstr "Editar la metadata"
 
 #: cps/templates/email_edit.html:11
 msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
@@ -608,10 +686,6 @@ msgstr "Busqueda avanzada"
 msgid "Logout"
 msgstr "Cerrar Sesion"
 
-#: cps/templates/layout.html:91 cps/templates/login.html:4
-msgid "Login"
-msgstr "Inicio de Sesion"
-
 #: cps/templates/layout.html:92 cps/templates/register.html:18
 msgid "Register"
 msgstr "Registro"
@@ -730,10 +804,6 @@ msgstr "Editar nombre del estante"
 msgid "Change order"
 msgstr ""
 
-#: cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "Titulo"
-
 #: cps/templates/shelf_edit.html:12
 msgid "should the shelf be public?"
 msgstr "Debe ser el estante publico?"
@@ -798,31 +868,39 @@ msgstr "Mostrar series seleccionadas"
 msgid "Show category selection"
 msgstr "Mostrar categorias elegidas"
 
-#: cps/templates/user_edit.html:68
+#: cps/templates/user_edit.html:65
+msgid "Show author selection"
+msgstr ""
+
+#: cps/templates/user_edit.html:69
+msgid "Show random books in detail view"
+msgstr ""
+
+#: cps/templates/user_edit.html:76
 msgid "Admin user"
 msgstr "Usuario Administrador"
 
-#: cps/templates/user_edit.html:73
+#: cps/templates/user_edit.html:81
 msgid "Allow Downloads"
 msgstr "Permitir descargas"
 
-#: cps/templates/user_edit.html:77
+#: cps/templates/user_edit.html:85
 msgid "Allow Uploads"
 msgstr "Permitir subidas de archivos"
 
-#: cps/templates/user_edit.html:81
+#: cps/templates/user_edit.html:89
 msgid "Allow Edit"
 msgstr "Permitir editar"
 
-#: cps/templates/user_edit.html:86
+#: cps/templates/user_edit.html:94
 msgid "Allow Changing Password"
 msgstr "Permitir cambiar la clave"
 
-#: cps/templates/user_edit.html:93
+#: cps/templates/user_edit.html:101
 msgid "Delete this user"
 msgstr "Borrar este usuario"
 
-#: cps/templates/user_edit.html:104
+#: cps/templates/user_edit.html:112
 msgid "Recent Downloads"
 msgstr "Descargas Recientes"
 
diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index 293eef7b..eafc7a81 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: 2017-01-21 11:44+0100\n"
+"POT-Creation-Date: 2017-01-28 20:35+0100\n"
 "PO-Revision-Date: 2016-11-13 18:35+0100\n"
 "Last-Translator: Nicolas Roudninski <nicoroud@gmail.com>\n"
 "Language: fr\n"
@@ -31,288 +31,312 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-#: cps/book_formats.py:109 cps/book_formats.py:113 cps/web.py:948
+#: cps/book_formats.py:109 cps/book_formats.py:113 cps/web.py:982
 msgid "not installed"
 msgstr ""
 
-#: cps/helper.py:98
+#: cps/helper.py:136
+#, python-format
+msgid "Failed to send mail: %s"
+msgstr "Impossible d'envoyer le courriel : %s"
+
+#: cps/helper.py:143
 msgid "Calibre-web test email"
 msgstr ""
 
-#: cps/helper.py:99 cps/helper.py:155
+#: cps/helper.py:144 cps/helper.py:154
 msgid "This email has been sent via calibre web."
 msgstr "Ce message a été envoyé depuis calibre web."
 
-#: cps/helper.py:136 cps/helper.py:225
-#, python-format
-msgid "Failed to send mail: %s"
-msgstr "Impossible d'envoyer le courriel : %s"
-
-#: cps/helper.py:154 cps/templates/detail.html:127
+#: cps/helper.py:153 cps/templates/detail.html:129
 msgid "Send to Kindle"
 msgstr "Envoyer ver Kindle"
 
-#: cps/helper.py:177 cps/helper.py:192
+#: cps/helper.py:171 cps/helper.py:186
 msgid "Could not find any formats suitable for sending by email"
 msgstr "Impossible de trouver un format adapté à envoyer par courriel"
 
-#: cps/helper.py:186
+#: cps/helper.py:180
 msgid "Could not convert epub to mobi"
 msgstr "Impossible de convertir epub vers mobi"
 
-#: cps/helper.py:245
+#: cps/helper.py:206
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr ""
 "Le fichier demandé ne peux pas être lu. Peut-être de mauvaises "
 "permissions ?"
 
-#: cps/ub.py:259
+#: cps/ub.py:380
 msgid "Guest"
 msgstr ""
 
-#: cps/web.py:742
+#: cps/web.py:774
 msgid "Latest Books"
 msgstr "Derniers livres"
 
-#: cps/web.py:767
+#: cps/web.py:799
 msgid "Hot Books (most downloaded)"
 msgstr "Livres populaires (les plus téléchargés)"
 
-#: cps/templates/index.xml:29 cps/web.py:775
+#: cps/templates/index.xml:29 cps/web.py:808
 msgid "Random Books"
 msgstr "Livres au hasard"
 
-#: cps/web.py:788
+#: cps/web.py:821
 msgid "Author list"
 msgstr "Liste des auteurs"
 
-#: cps/web.py:805
+#: cps/web.py:838
 #, python-format
 msgid "Author: %(nam)s"
 msgstr "Auteur : %(nam)s"
 
-#: cps/templates/index.xml:50 cps/web.py:818
+#: cps/templates/index.xml:50 cps/web.py:851
 msgid "Series list"
 msgstr "Liste des séries"
 
-#: cps/web.py:829
+#: cps/web.py:862
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Séries : %(serie)s"
 
-#: cps/web.py:831 cps/web.py:927 cps/web.py:1126 cps/web.py:1874
+#: cps/web.py:864 cps/web.py:961 cps/web.py:1179 cps/web.py:2041
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr ""
 "Erreur d'ouverture du livre numérique. Le fichier n'existe pas ou n'est "
 "pas accessible :"
 
-#: cps/web.py:862
+#: cps/web.py:895
 msgid "Available languages"
 msgstr "Langues disponibles"
 
-#: cps/web.py:877
+#: cps/web.py:910
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Langue : %(name)s"
 
-#: cps/templates/index.xml:43 cps/web.py:890
+#: cps/templates/index.xml:43 cps/web.py:923
 msgid "Category list"
 msgstr "Liste des catégories"
 
-#: cps/web.py:900
+#: cps/web.py:933
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Catégorie : %(name)s"
 
-#: cps/web.py:956
+#: cps/web.py:992
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: cps/web.py:965
-msgid "Server restarts"
+#: cps/web.py:1013
+msgid "Performing Restart, please reload page"
+msgstr ""
+
+#: cps/web.py:1015
+msgid "Performing shutdown of server, please close window"
+msgstr ""
+
+#: cps/web.py:1091 cps/web.py:1104
+msgid "search"
 msgstr ""
 
-#: cps/web.py:1102 cps/web.py:1109 cps/web.py:1116 cps/web.py:1123
+#: cps/web.py:1155 cps/web.py:1162 cps/web.py:1169 cps/web.py:1176
 msgid "Read a Book"
 msgstr "Lire un livre"
 
-#: cps/web.py:1172 cps/web.py:1510
+#: cps/web.py:1227 cps/web.py:1649
 msgid "Please fill out all fields!"
 msgstr "SVP, complétez tous les champs !"
 
-#: cps/web.py:1188
+#: cps/web.py:1228 cps/web.py:1244 cps/web.py:1249 cps/web.py:1251
+msgid "register"
+msgstr "S'enregistrer"
+
+#: cps/web.py:1243
 msgid "An unknown error occured. Please try again later."
 msgstr "Une erreur a eu lieu. Merci de réessayez plus tard."
 
-#: cps/web.py:1193
+#: cps/web.py:1248
 msgid "This username or email address is already in use."
 msgstr "Ce nom d'utilisateur ou cette adresse de courriel est déjà utilisée."
 
-#: cps/web.py:1196
-msgid "register"
-msgstr "S'enregistrer"
-
-#: cps/web.py:1212
+#: cps/web.py:1266
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Vous êtes maintenant connecté sous : '%(nickname)s'"
 
-#: cps/web.py:1216
+#: cps/web.py:1270
 msgid "Wrong Username or Password"
 msgstr "Mauvais nom d'utilisateur ou mot de passe"
 
-#: cps/web.py:1218
+#: cps/web.py:1272
 msgid "login"
 msgstr "Connexion"
 
-#: cps/web.py:1235
+#: cps/web.py:1289
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Veillez configurer les paramètres smtp d'abord..."
 
-#: cps/web.py:1239
+#: cps/web.py:1293
 #, python-format
 msgid "Book successfully send to %(kindlemail)s"
 msgstr "Livres envoyés à %(kindlemail)s avec succès"
 
-#: cps/web.py:1243
+#: cps/web.py:1297
 #, 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:1245
+#: cps/web.py:1299
 msgid "Please configure your kindle email address first..."
 msgstr "Veuillez configurer votre adresse kindle d'abord..."
 
-#: cps/web.py:1265
+#: cps/web.py:1319
 #, 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:1286
+#: cps/web.py:1340
 #, 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:1304 cps/web.py:1325
+#: cps/web.py:1359 cps/web.py:1383
 #, 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:1309
+#: cps/web.py:1364
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Étagère %(title)s créée"
 
-#: cps/web.py:1311 cps/web.py:1336
+#: cps/web.py:1366 cps/web.py:1394
 msgid "There was an error"
 msgstr "Il y a eu une erreur"
 
-#: cps/web.py:1312 cps/web.py:1314
+#: cps/web.py:1367 cps/web.py:1369
 msgid "create a shelf"
 msgstr "Créer une étagère"
 
-#: cps/web.py:1334
+#: cps/web.py:1392
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr ""
 
-#: cps/web.py:1337 cps/web.py:1339
+#: cps/web.py:1395 cps/web.py:1397
 msgid "Edit a shelf"
 msgstr ""
 
-#: cps/web.py:1360
+#: cps/web.py:1415
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "L'étagère %(name)s a été supprimé avec succès"
 
-#: cps/web.py:1381
+#: cps/web.py:1437
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Étagère : '%(name)s'"
 
-#: cps/web.py:1409
+#: cps/web.py:1468
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/web.py:1469
+#: cps/web.py:1528
 msgid "Found an existing account for this email address."
 msgstr "Un compte avec cette adresse de courriel existe déjà."
 
-#: cps/web.py:1471 cps/web.py:1474
+#: cps/web.py:1530 cps/web.py:1534
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil de %(name)s"
 
-#: cps/web.py:1472
+#: cps/web.py:1531
 msgid "Profile updated"
 msgstr "Profil mis à jour"
 
-#: cps/web.py:1483 cps/web.py:1491
+#: cps/web.py:1544
 msgid "Admin page"
 msgstr ""
 
-#: cps/templates/admin.html:33 cps/web.py:1511
+#: cps/web.py:1604
+msgid "Calibre-web configuration updated"
+msgstr ""
+
+#: cps/web.py:1611 cps/web.py:1617 cps/web.py:1630
+msgid "Basic Configuration"
+msgstr ""
+
+#: cps/web.py:1615
+msgid "DB location is not valid, please enter correct path"
+msgstr ""
+
+#: cps/templates/admin.html:33 cps/web.py:1651 cps/web.py:1693
 msgid "Add new user"
 msgstr "Ajouter un nouvel utilisateur"
 
-#: cps/web.py:1544
+#: cps/web.py:1687
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Utilisateur '%(user)s' créé"
 
-#: cps/web.py:1548
+#: cps/web.py:1691
 msgid "Found an existing account for this email address or nickname."
 msgstr "Un compte avec cette adresse de courriel ou ce surnom existe déjà."
 
-#: cps/web.py:1568
+#: cps/web.py:1711
 msgid "Mail settings updated"
 msgstr "Paramètres de courriel mis à jour"
 
-#: cps/web.py:1574
+#: cps/web.py:1717
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1577
+#: cps/web.py:1720
 #, python-format
 msgid "There was an error sending the Test E-Mail: %(res)s"
 msgstr ""
 
-#: cps/web.py:1578
+#: cps/web.py:1721
 msgid "Edit mail settings"
 msgstr "Éditer les paramètres de courriel"
 
-#: cps/web.py:1606
+#: cps/web.py:1749
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Utilisateur '%(nick)s' supprimé"
 
-#: cps/web.py:1661
+#: cps/web.py:1825
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Utilisateur '%(nick)s'  mis à jour"
 
-#: cps/web.py:1664
+#: cps/web.py:1828
 msgid "An unknown error occured."
 msgstr "Oups ! Une erreur inconnue a eu lieu."
 
-#: cps/web.py:1666
+#: cps/web.py:1831
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Éditer l'utilisateur %(nick)s"
 
-#: cps/web.py:1904
+#: cps/web.py:2036 cps/web.py:2039 cps/web.py:2113
+msgid "edit metadata"
+msgstr ""
+
+#: cps/web.py:2071
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Impossible de créer le chemin %s (permission refusée)"
 
-#: cps/web.py:1909
+#: cps/web.py:2076
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Impossible d'enregistrer le fichier %s (permission refusée)"
 
-#: cps/web.py:1914
+#: cps/web.py:2081
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Impossible de supprimer le fichier %s (permission refusée)"
@@ -341,7 +365,7 @@ msgstr "DLS"
 msgid "Admin"
 msgstr "Administration"
 
-#: cps/templates/admin.html:12 cps/templates/detail.html:114
+#: cps/templates/admin.html:12 cps/templates/detail.html:116
 msgid "Download"
 msgstr "Télécharger"
 
@@ -389,15 +413,15 @@ msgstr "Expéditeur des courriels"
 msgid "Change SMTP settings"
 msgstr "Changer les paramètre smtp"
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:56 cps/templates/admin.html:76
 msgid "Configuration"
 msgstr ""
 
 #: cps/templates/admin.html:59
-msgid "Log File"
+msgid "Calibre DB dir"
 msgstr ""
 
-#: cps/templates/admin.html:60
+#: cps/templates/admin.html:60 cps/templates/config_edit.html:32
 msgid "Log Level"
 msgstr ""
 
@@ -405,7 +429,7 @@ msgstr ""
 msgid "Port"
 msgstr ""
 
-#: cps/templates/admin.html:62
+#: cps/templates/admin.html:62 cps/templates/config_edit.html:19
 msgid "Books per page"
 msgstr ""
 
@@ -421,102 +445,156 @@ msgstr ""
 msgid "Anonymous browsing"
 msgstr ""
 
-#: cps/templates/admin.html:76
+#: cps/templates/admin.html:77
 msgid "Administration"
 msgstr ""
 
-#: cps/templates/admin.html:78
+#: cps/templates/admin.html:79
 msgid "Restart Calibre-web"
 msgstr ""
 
-#: cps/templates/detail.html:38
-msgid "Book"
-msgstr "Livre"
-
-#: cps/templates/detail.html:38
-msgid "of"
+#: cps/templates/admin.html:80
+msgid "Stop Calibre-web"
 msgstr ""
 
-#: cps/templates/detail.html:44
-msgid "language"
-msgstr "Langue"
-
-#: cps/templates/detail.html:103
-msgid "Description:"
-msgstr "Description :"
+#: cps/templates/admin.html:91
+msgid "Do you really want to restart Calibre-web?"
+msgstr ""
 
-#: cps/templates/detail.html:131
-msgid "Read in browser"
-msgstr "Lire dans le navigateur"
+#: cps/templates/admin.html:92 cps/templates/admin.html:107
+msgid "Ok"
+msgstr ""
 
-#: cps/templates/detail.html:151
-msgid "Add to shelf"
-msgstr "Ajouter à l'étagère"
+#: cps/templates/admin.html:93 cps/templates/admin.html:108
+#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:54
+#: cps/templates/email_edit.html:36 cps/templates/shelf_edit.html:17
+#: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:107
+msgid "Back"
+msgstr "Retour"
 
-#: cps/templates/detail.html:191
-msgid "Edit metadata"
-msgstr "Éditer les métadonnées"
+#: cps/templates/admin.html:106
+msgid "Do you really want to stop Calibre-web?"
+msgstr ""
 
-#: cps/templates/edit_book.html:14 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:16 cps/templates/search_form.html:6
 msgid "Book Title"
 msgstr "Titre du livre"
 
-#: cps/templates/edit_book.html:18 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:20 cps/templates/search_form.html:10
 msgid "Author"
 msgstr "Auteur"
 
-#: cps/templates/edit_book.html:22
+#: cps/templates/book_edit.html:24
 msgid "Description"
 msgstr "Description"
 
-#: cps/templates/edit_book.html:26 cps/templates/search_form.html:13
+#: cps/templates/book_edit.html:28 cps/templates/search_form.html:13
 msgid "Tags"
 msgstr "Étiquette"
 
-#: cps/templates/edit_book.html:31 cps/templates/layout.html:133
+#: cps/templates/book_edit.html:33 cps/templates/layout.html:133
 #: cps/templates/search_form.html:33
 msgid "Series"
 msgstr "Séries"
 
-#: cps/templates/edit_book.html:35
+#: cps/templates/book_edit.html:37
 msgid "Series id"
 msgstr "Id de série"
 
-#: cps/templates/edit_book.html:39
+#: cps/templates/book_edit.html:41
 msgid "Rating"
 msgstr "Évaluation"
 
-#: cps/templates/edit_book.html:43
+#: cps/templates/book_edit.html:45
 msgid "Cover URL (jpg)"
 msgstr "Adresse de la couverture (jpg)"
 
-#: cps/templates/edit_book.html:48 cps/templates/user_edit.html:27
+#: cps/templates/book_edit.html:50 cps/templates/user_edit.html:27
 msgid "Language"
 msgstr "Langue"
 
-#: cps/templates/edit_book.html:59
+#: cps/templates/book_edit.html:61
 msgid "Yes"
 msgstr "Oui"
 
-#: cps/templates/edit_book.html:60
+#: cps/templates/book_edit.html:62
 msgid "No"
 msgstr "Non"
 
-#: cps/templates/edit_book.html:102
+#: cps/templates/book_edit.html:104
 msgid "view book after edit"
 msgstr "Voir le livre après l'édition"
 
-#: cps/templates/edit_book.html:105 cps/templates/login.html:19
-#: cps/templates/search_form.html:75 cps/templates/shelf_edit.html:15
-#: cps/templates/user_edit.html:97
+#: cps/templates/book_edit.html:107 cps/templates/config_edit.html:52
+#: cps/templates/login.html:19 cps/templates/search_form.html:75
+#: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:105
 msgid "Submit"
 msgstr "Soumettre"
 
-#: cps/templates/edit_book.html:106 cps/templates/email_edit.html:36
-#: cps/templates/shelf_edit.html:17 cps/templates/shelf_order.html:12
-#: cps/templates/user_edit.html:99
-msgid "Back"
-msgstr "Retour"
+#: cps/templates/config_edit.html:7
+msgid "Location of Calibre database"
+msgstr ""
+
+#: cps/templates/config_edit.html:11
+msgid "Server Port"
+msgstr ""
+
+#: cps/templates/config_edit.html:15 cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr "Titre"
+
+#: cps/templates/config_edit.html:23
+msgid "No. of random books to show"
+msgstr ""
+
+#: cps/templates/config_edit.html:28
+msgid "Regular expression for title sorting"
+msgstr ""
+
+#: cps/templates/config_edit.html:42
+msgid "Enable uploading"
+msgstr ""
+
+#: cps/templates/config_edit.html:46
+msgid "Enable anonymous browsing"
+msgstr ""
+
+#: cps/templates/config_edit.html:50
+msgid "Enable public registration"
+msgstr ""
+
+#: cps/templates/config_edit.html:57 cps/templates/layout.html:91
+#: cps/templates/login.html:4
+msgid "Login"
+msgstr "Connexion"
+
+#: cps/templates/detail.html:40
+msgid "Book"
+msgstr "Livre"
+
+#: cps/templates/detail.html:40
+msgid "of"
+msgstr ""
+
+#: cps/templates/detail.html:46
+msgid "language"
+msgstr "Langue"
+
+#: cps/templates/detail.html:105
+msgid "Description:"
+msgstr "Description :"
+
+#: cps/templates/detail.html:133
+msgid "Read in browser"
+msgstr "Lire dans le navigateur"
+
+#: cps/templates/detail.html:153
+msgid "Add to shelf"
+msgstr "Ajouter à l'étagère"
+
+#: cps/templates/detail.html:193
+msgid "Edit metadata"
+msgstr "Éditer les métadonnées"
 
 #: cps/templates/email_edit.html:11
 msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
@@ -618,10 +696,6 @@ msgstr "Recherche avancée"
 msgid "Logout"
 msgstr "Déconnexion"
 
-#: cps/templates/layout.html:91 cps/templates/login.html:4
-msgid "Login"
-msgstr "Connexion"
-
 #: cps/templates/layout.html:92 cps/templates/register.html:18
 msgid "Register"
 msgstr "S'enregistrer"
@@ -740,10 +814,6 @@ msgstr ""
 msgid "Change order"
 msgstr ""
 
-#: cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr "Titre"
-
 #: cps/templates/shelf_edit.html:12
 msgid "should the shelf be public?"
 msgstr "Cette étagère doit-elle être publique ?"
@@ -808,31 +878,39 @@ msgstr "Montrer la sélection des séries"
 msgid "Show category selection"
 msgstr "Montrer la sélection des catégories"
 
-#: cps/templates/user_edit.html:68
+#: cps/templates/user_edit.html:65
+msgid "Show author selection"
+msgstr ""
+
+#: cps/templates/user_edit.html:69
+msgid "Show random books in detail view"
+msgstr ""
+
+#: cps/templates/user_edit.html:76
 msgid "Admin user"
 msgstr "Utilisateur admin"
 
-#: cps/templates/user_edit.html:73
+#: cps/templates/user_edit.html:81
 msgid "Allow Downloads"
 msgstr "Permettre les téléchargements"
 
-#: cps/templates/user_edit.html:77
+#: cps/templates/user_edit.html:85
 msgid "Allow Uploads"
 msgstr "Permettre les téléversements"
 
-#: cps/templates/user_edit.html:81
+#: cps/templates/user_edit.html:89
 msgid "Allow Edit"
 msgstr "Permettre l'édition"
 
-#: cps/templates/user_edit.html:86
+#: cps/templates/user_edit.html:94
 msgid "Allow Changing Password"
 msgstr "Permettre le changement de mot de passe"
 
-#: cps/templates/user_edit.html:93
+#: cps/templates/user_edit.html:101
 msgid "Delete this user"
 msgstr "Supprimer cet utilisateur"
 
-#: cps/templates/user_edit.html:104
+#: cps/templates/user_edit.html:112
 msgid "Recent Downloads"
 msgstr "Téléchargements récents"
 
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index b392864c..02aef35c 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: 2017-01-21 11:44+0100\n"
+"POT-Creation-Date: 2017-01-28 20:35+0100\n"
 "PO-Revision-Date: 2017-01-06 17:00+0800\n"
 "Last-Translator: dalin <dalin.lin@gmail.com>\n"
 "Language: zh_Hans_CN\n"
@@ -26,284 +26,308 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-#: cps/book_formats.py:109 cps/book_formats.py:113 cps/web.py:948
+#: cps/book_formats.py:109 cps/book_formats.py:113 cps/web.py:982
 msgid "not installed"
 msgstr "未安装"
 
-#: cps/helper.py:98
+#: cps/helper.py:136
+#, python-format
+msgid "Failed to send mail: %s"
+msgstr "发送邮件失败: %s"
+
+#: cps/helper.py:143
 msgid "Calibre-web test email"
 msgstr "Calibre-web 测试邮件"
 
-#: cps/helper.py:99 cps/helper.py:155
+#: cps/helper.py:144 cps/helper.py:154
 msgid "This email has been sent via calibre web."
 msgstr "此邮件由calibre web发送"
 
-#: cps/helper.py:136 cps/helper.py:225
-#, python-format
-msgid "Failed to send mail: %s"
-msgstr "发送邮件失败: %s"
-
-#: cps/helper.py:154 cps/templates/detail.html:127
+#: cps/helper.py:153 cps/templates/detail.html:129
 msgid "Send to Kindle"
 msgstr "发送到Kindle"
 
-#: cps/helper.py:177 cps/helper.py:192
+#: cps/helper.py:171 cps/helper.py:186
 msgid "Could not find any formats suitable for sending by email"
 msgstr "无法找到适合邮件发送的格式"
 
-#: cps/helper.py:186
+#: cps/helper.py:180
 msgid "Could not convert epub to mobi"
 msgstr "无法转换epub到mobi"
 
-#: cps/helper.py:245
+#: cps/helper.py:206
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr "无法读取所请求的文件。可能是错误权限不对？"
 
-#: cps/ub.py:259
+#: cps/ub.py:380
 msgid "Guest"
 msgstr ""
 
-#: cps/web.py:742
+#: cps/web.py:774
 msgid "Latest Books"
 msgstr "最新书籍"
 
-#: cps/web.py:767
+#: cps/web.py:799
 msgid "Hot Books (most downloaded)"
 msgstr "热门书籍(最多下载)"
 
-#: cps/templates/index.xml:29 cps/web.py:775
+#: cps/templates/index.xml:29 cps/web.py:808
 msgid "Random Books"
 msgstr "随机书籍"
 
-#: cps/web.py:788
+#: cps/web.py:821
 msgid "Author list"
 msgstr "作者列表"
 
-#: cps/web.py:805
+#: cps/web.py:838
 #, python-format
 msgid "Author: %(nam)s"
 msgstr "作者: %(nam)s"
 
-#: cps/templates/index.xml:50 cps/web.py:818
+#: cps/templates/index.xml:50 cps/web.py:851
 msgid "Series list"
 msgstr "丛书列表"
 
-#: cps/web.py:829
+#: cps/web.py:862
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "丛书: %(serie)s"
 
-#: cps/web.py:831 cps/web.py:927 cps/web.py:1126 cps/web.py:1874
+#: cps/web.py:864 cps/web.py:961 cps/web.py:1179 cps/web.py:2041
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "无法打开电子书。 文件不存在或者文件不可访问:"
 
-#: cps/web.py:862
+#: cps/web.py:895
 msgid "Available languages"
 msgstr "可用语言"
 
-#: cps/web.py:877
+#: cps/web.py:910
 #, python-format
 msgid "Language: %(name)s"
 msgstr "语言: %(name)s"
 
-#: cps/templates/index.xml:43 cps/web.py:890
+#: cps/templates/index.xml:43 cps/web.py:923
 msgid "Category list"
 msgstr "分类列表"
 
-#: cps/web.py:900
+#: cps/web.py:933
 #, python-format
 msgid "Category: %(name)s"
 msgstr "分类: %(name)s"
 
-#: cps/web.py:956
+#: cps/web.py:992
 msgid "Statistics"
 msgstr "统计"
 
-#: cps/web.py:965
-msgid "Server restarts"
-msgstr "重启服务器"
+#: cps/web.py:1013
+msgid "Performing Restart, please reload page"
+msgstr ""
 
-#: cps/web.py:1102 cps/web.py:1109 cps/web.py:1116 cps/web.py:1123
+#: cps/web.py:1015
+msgid "Performing shutdown of server, please close window"
+msgstr ""
+
+#: cps/web.py:1091 cps/web.py:1104
+msgid "search"
+msgstr ""
+
+#: cps/web.py:1155 cps/web.py:1162 cps/web.py:1169 cps/web.py:1176
 msgid "Read a Book"
 msgstr "阅读一本书"
 
-#: cps/web.py:1172 cps/web.py:1510
+#: cps/web.py:1227 cps/web.py:1649
 msgid "Please fill out all fields!"
 msgstr "请填写所有字段"
 
-#: cps/web.py:1188
+#: cps/web.py:1228 cps/web.py:1244 cps/web.py:1249 cps/web.py:1251
+msgid "register"
+msgstr "注册"
+
+#: cps/web.py:1243
 msgid "An unknown error occured. Please try again later."
 msgstr "发生一个未知错误。请稍后再试。"
 
-#: cps/web.py:1193
+#: cps/web.py:1248
 msgid "This username or email address is already in use."
 msgstr "此用户名或邮箱已被使用。"
 
-#: cps/web.py:1196
-msgid "register"
-msgstr "注册"
-
-#: cps/web.py:1212
+#: cps/web.py:1266
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "您现在已以'%(nickname)s'身份登录"
 
-#: cps/web.py:1216
+#: cps/web.py:1270
 msgid "Wrong Username or Password"
 msgstr "用户名或密码错误"
 
-#: cps/web.py:1218
+#: cps/web.py:1272
 msgid "login"
 msgstr "登录"
 
-#: cps/web.py:1235
+#: cps/web.py:1289
 msgid "Please configure the SMTP mail settings first..."
 msgstr "请先配置SMTP邮箱..."
 
-#: cps/web.py:1239
+#: cps/web.py:1293
 #, python-format
 msgid "Book successfully send to %(kindlemail)s"
 msgstr "此书已被成功发给 %(kindlemail)s"
 
-#: cps/web.py:1243
+#: cps/web.py:1297
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "发送这本书的时候出现错误: %(res)s"
 
-#: cps/web.py:1245
+#: cps/web.py:1299
 msgid "Please configure your kindle email address first..."
 msgstr "请先配置您的kindle电子邮箱地址..."
 
-#: cps/web.py:1265
+#: cps/web.py:1319
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "此书已被添加到书架: %(sname)s"
 
-#: cps/web.py:1286
+#: cps/web.py:1340
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "此书已从书架 %(sname)s 中删除"
 
-#: cps/web.py:1304 cps/web.py:1325
+#: cps/web.py:1359 cps/web.py:1383
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr "已存在书架 '%(title)s'。"
 
-#: cps/web.py:1309
+#: cps/web.py:1364
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "书架 %(title)s 已被创建"
 
-#: cps/web.py:1311 cps/web.py:1336
+#: cps/web.py:1366 cps/web.py:1394
 msgid "There was an error"
 msgstr "发生错误"
 
-#: cps/web.py:1312 cps/web.py:1314
+#: cps/web.py:1367 cps/web.py:1369
 msgid "create a shelf"
 msgstr "创建书架"
 
-#: cps/web.py:1334
+#: cps/web.py:1392
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "书架 %(title)s 已被修改"
 
-#: cps/web.py:1337 cps/web.py:1339
+#: cps/web.py:1395 cps/web.py:1397
 msgid "Edit a shelf"
 msgstr "编辑书架"
 
-#: cps/web.py:1360
+#: cps/web.py:1415
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "成功删除书架 %(name)s"
 
-#: cps/web.py:1381
+#: cps/web.py:1437
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "书架: '%(name)s'"
 
-#: cps/web.py:1409
+#: cps/web.py:1468
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "修改书架 '%(name)s' 顺序"
 
-#: cps/web.py:1469
+#: cps/web.py:1528
 msgid "Found an existing account for this email address."
 msgstr "找到已使用此邮箱的账号。"
 
-#: cps/web.py:1471 cps/web.py:1474
+#: cps/web.py:1530 cps/web.py:1534
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 的资料"
 
-#: cps/web.py:1472
+#: cps/web.py:1531
 msgid "Profile updated"
 msgstr "资料已更新"
 
-#: cps/web.py:1483 cps/web.py:1491
+#: cps/web.py:1544
 msgid "Admin page"
 msgstr "管理页"
 
-#: cps/templates/admin.html:33 cps/web.py:1511
+#: cps/web.py:1604
+msgid "Calibre-web configuration updated"
+msgstr ""
+
+#: cps/web.py:1611 cps/web.py:1617 cps/web.py:1630
+msgid "Basic Configuration"
+msgstr ""
+
+#: cps/web.py:1615
+msgid "DB location is not valid, please enter correct path"
+msgstr ""
+
+#: cps/templates/admin.html:33 cps/web.py:1651 cps/web.py:1693
 msgid "Add new user"
 msgstr "添加新用户"
 
-#: cps/web.py:1544
+#: cps/web.py:1687
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "用户 '%(user)s' 已被创建"
 
-#: cps/web.py:1548
+#: cps/web.py:1691
 msgid "Found an existing account for this email address or nickname."
 msgstr "已找到使用此邮箱或昵称的账号。"
 
-#: cps/web.py:1568
+#: cps/web.py:1711
 msgid "Mail settings updated"
 msgstr "邮箱设置已更新"
 
-#: cps/web.py:1574
+#: cps/web.py:1717
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr "测试邮件已成功发送到 %(kindlemail)s"
 
-#: cps/web.py:1577
+#: cps/web.py:1720
 #, python-format
 msgid "There was an error sending the Test E-Mail: %(res)s"
 msgstr "发送测试邮件时发生错误: %(res)s"
 
-#: cps/web.py:1578
+#: cps/web.py:1721
 msgid "Edit mail settings"
 msgstr "编辑邮箱设置"
 
-#: cps/web.py:1606
+#: cps/web.py:1749
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "用户 '%(nick)s' 已被删除"
 
-#: cps/web.py:1661
+#: cps/web.py:1825
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "用户 '%(nick)s' 已被更新"
 
-#: cps/web.py:1664
+#: cps/web.py:1828
 msgid "An unknown error occured."
 msgstr "发生未知错误。"
 
-#: cps/web.py:1666
+#: cps/web.py:1831
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "编辑用户 %(nick)s"
 
-#: cps/web.py:1904
+#: cps/web.py:2036 cps/web.py:2039 cps/web.py:2113
+msgid "edit metadata"
+msgstr ""
+
+#: cps/web.py:2071
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "创建路径 %s 失败(权限拒绝)。"
 
-#: cps/web.py:1909
+#: cps/web.py:2076
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "存储文件 %s 失败(权限拒绝)。"
 
-#: cps/web.py:1914
+#: cps/web.py:2081
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "删除文件 %s 失败(权限拒绝)。"
@@ -332,7 +356,7 @@ msgstr ""
 msgid "Admin"
 msgstr "管理"
 
-#: cps/templates/admin.html:12 cps/templates/detail.html:114
+#: cps/templates/admin.html:12 cps/templates/detail.html:116
 msgid "Download"
 msgstr "下载"
 
@@ -380,15 +404,15 @@ msgstr "来自邮箱"
 msgid "Change SMTP settings"
 msgstr "修改SMTP设置"
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:56 cps/templates/admin.html:76
 msgid "Configuration"
 msgstr "配置"
 
 #: cps/templates/admin.html:59
-msgid "Log File"
-msgstr "日志文件"
+msgid "Calibre DB dir"
+msgstr ""
 
-#: cps/templates/admin.html:60
+#: cps/templates/admin.html:60 cps/templates/config_edit.html:32
 msgid "Log Level"
 msgstr "日志级别"
 
@@ -396,7 +420,7 @@ msgstr "日志级别"
 msgid "Port"
 msgstr "端口"
 
-#: cps/templates/admin.html:62
+#: cps/templates/admin.html:62 cps/templates/config_edit.html:19
 msgid "Books per page"
 msgstr "每页书籍数"
 
@@ -412,102 +436,156 @@ msgstr "开放注册"
 msgid "Anonymous browsing"
 msgstr "匿名浏览"
 
-#: cps/templates/admin.html:76
+#: cps/templates/admin.html:77
 msgid "Administration"
 msgstr "管理"
 
-#: cps/templates/admin.html:78
+#: cps/templates/admin.html:79
 msgid "Restart Calibre-web"
 msgstr "重启 Calibre-web"
 
-#: cps/templates/detail.html:38
-msgid "Book"
+#: cps/templates/admin.html:80
+msgid "Stop Calibre-web"
 msgstr ""
 
-#: cps/templates/detail.html:38
-msgid "of"
+#: cps/templates/admin.html:91
+msgid "Do you really want to restart Calibre-web?"
 msgstr ""
 
-#: cps/templates/detail.html:44
-msgid "language"
-msgstr "语言"
-
-#: cps/templates/detail.html:103
-msgid "Description:"
-msgstr "简介:"
-
-#: cps/templates/detail.html:131
-msgid "Read in browser"
-msgstr "在浏览器中阅读"
+#: cps/templates/admin.html:92 cps/templates/admin.html:107
+msgid "Ok"
+msgstr ""
 
-#: cps/templates/detail.html:151
-msgid "Add to shelf"
-msgstr "添加到书架"
+#: cps/templates/admin.html:93 cps/templates/admin.html:108
+#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:54
+#: cps/templates/email_edit.html:36 cps/templates/shelf_edit.html:17
+#: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:107
+msgid "Back"
+msgstr "后退"
 
-#: cps/templates/detail.html:191
-msgid "Edit metadata"
-msgstr "编辑元数据"
+#: cps/templates/admin.html:106
+msgid "Do you really want to stop Calibre-web?"
+msgstr ""
 
-#: cps/templates/edit_book.html:14 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:16 cps/templates/search_form.html:6
 msgid "Book Title"
 msgstr "书名"
 
-#: cps/templates/edit_book.html:18 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:20 cps/templates/search_form.html:10
 msgid "Author"
 msgstr "作者"
 
-#: cps/templates/edit_book.html:22
+#: cps/templates/book_edit.html:24
 msgid "Description"
 msgstr "简介"
 
-#: cps/templates/edit_book.html:26 cps/templates/search_form.html:13
+#: cps/templates/book_edit.html:28 cps/templates/search_form.html:13
 msgid "Tags"
 msgstr "标签"
 
-#: cps/templates/edit_book.html:31 cps/templates/layout.html:133
+#: cps/templates/book_edit.html:33 cps/templates/layout.html:133
 #: cps/templates/search_form.html:33
 msgid "Series"
 msgstr "丛书"
 
-#: cps/templates/edit_book.html:35
+#: cps/templates/book_edit.html:37
 msgid "Series id"
 msgstr "丛书ID"
 
-#: cps/templates/edit_book.html:39
+#: cps/templates/book_edit.html:41
 msgid "Rating"
 msgstr "评分"
 
-#: cps/templates/edit_book.html:43
+#: cps/templates/book_edit.html:45
 msgid "Cover URL (jpg)"
 msgstr "封面URL (jpg)"
 
-#: cps/templates/edit_book.html:48 cps/templates/user_edit.html:27
+#: cps/templates/book_edit.html:50 cps/templates/user_edit.html:27
 msgid "Language"
 msgstr "语言"
 
-#: cps/templates/edit_book.html:59
+#: cps/templates/book_edit.html:61
 msgid "Yes"
 msgstr "确认"
 
-#: cps/templates/edit_book.html:60
+#: cps/templates/book_edit.html:62
 msgid "No"
 msgstr ""
 
-#: cps/templates/edit_book.html:102
+#: cps/templates/book_edit.html:104
 msgid "view book after edit"
 msgstr "编辑后查看书籍"
 
-#: cps/templates/edit_book.html:105 cps/templates/login.html:19
-#: cps/templates/search_form.html:75 cps/templates/shelf_edit.html:15
-#: cps/templates/user_edit.html:97
+#: cps/templates/book_edit.html:107 cps/templates/config_edit.html:52
+#: cps/templates/login.html:19 cps/templates/search_form.html:75
+#: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:105
 msgid "Submit"
 msgstr "提交"
 
-#: cps/templates/edit_book.html:106 cps/templates/email_edit.html:36
-#: cps/templates/shelf_edit.html:17 cps/templates/shelf_order.html:12
-#: cps/templates/user_edit.html:99
-msgid "Back"
-msgstr "后退"
+#: cps/templates/config_edit.html:7
+msgid "Location of Calibre database"
+msgstr ""
+
+#: cps/templates/config_edit.html:11
+msgid "Server Port"
+msgstr ""
+
+#: cps/templates/config_edit.html:15 cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr ""
+
+#: cps/templates/config_edit.html:23
+msgid "No. of random books to show"
+msgstr ""
+
+#: cps/templates/config_edit.html:28
+msgid "Regular expression for title sorting"
+msgstr ""
+
+#: cps/templates/config_edit.html:42
+msgid "Enable uploading"
+msgstr ""
+
+#: cps/templates/config_edit.html:46
+msgid "Enable anonymous browsing"
+msgstr ""
+
+#: cps/templates/config_edit.html:50
+msgid "Enable public registration"
+msgstr ""
+
+#: cps/templates/config_edit.html:57 cps/templates/layout.html:91
+#: cps/templates/login.html:4
+msgid "Login"
+msgstr "登录"
+
+#: cps/templates/detail.html:40
+msgid "Book"
+msgstr ""
+
+#: cps/templates/detail.html:40
+msgid "of"
+msgstr ""
+
+#: cps/templates/detail.html:46
+msgid "language"
+msgstr "语言"
+
+#: cps/templates/detail.html:105
+msgid "Description:"
+msgstr "简介:"
+
+#: cps/templates/detail.html:133
+msgid "Read in browser"
+msgstr "在浏览器中阅读"
+
+#: cps/templates/detail.html:153
+msgid "Add to shelf"
+msgstr "添加到书架"
+
+#: cps/templates/detail.html:193
+msgid "Edit metadata"
+msgstr "编辑元数据"
 
 #: cps/templates/email_edit.html:11
 msgid "SMTP port (usually 25 for plain SMTP and 465 for SSL and 587 for STARTTLS)"
@@ -609,10 +687,6 @@ msgstr "高级搜索"
 msgid "Logout"
 msgstr "注销"
 
-#: cps/templates/layout.html:91 cps/templates/login.html:4
-msgid "Login"
-msgstr "登录"
-
 #: cps/templates/layout.html:92 cps/templates/register.html:18
 msgid "Register"
 msgstr "注册"
@@ -731,10 +805,6 @@ msgstr "编辑书架名"
 msgid "Change order"
 msgstr "修改顺序"
 
-#: cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr ""
-
 #: cps/templates/shelf_edit.html:12
 msgid "should the shelf be public?"
 msgstr "要公开此书架吗？"
@@ -799,31 +869,39 @@ msgstr "显示丛书选择"
 msgid "Show category selection"
 msgstr "显示分类选择"
 
-#: cps/templates/user_edit.html:68
+#: cps/templates/user_edit.html:65
+msgid "Show author selection"
+msgstr ""
+
+#: cps/templates/user_edit.html:69
+msgid "Show random books in detail view"
+msgstr ""
+
+#: cps/templates/user_edit.html:76
 msgid "Admin user"
 msgstr "管理用户"
 
-#: cps/templates/user_edit.html:73
+#: cps/templates/user_edit.html:81
 msgid "Allow Downloads"
 msgstr "允许下载"
 
-#: cps/templates/user_edit.html:77
+#: cps/templates/user_edit.html:85
 msgid "Allow Uploads"
 msgstr "允许上传"
 
-#: cps/templates/user_edit.html:81
+#: cps/templates/user_edit.html:89
 msgid "Allow Edit"
 msgstr "允许编辑"
 
-#: cps/templates/user_edit.html:86
+#: cps/templates/user_edit.html:94
 msgid "Allow Changing Password"
 msgstr "允许修改密码"
 
-#: cps/templates/user_edit.html:93
+#: cps/templates/user_edit.html:101
 msgid "Delete this user"
 msgstr "删除此用户"
 
-#: cps/templates/user_edit.html:104
+#: cps/templates/user_edit.html:112
 msgid "Recent Downloads"
 msgstr "最近下载"
 
diff --git a/messages.pot b/messages.pot
index 97f67c0f..93c2d81a 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-01-18 19:12+0100\n"
+"POT-Creation-Date: 2017-01-28 20:35+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,284 +17,308 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-#: cps/book_formats.py:109 cps/book_formats.py:113 cps/web.py:948
+#: cps/book_formats.py:109 cps/book_formats.py:113 cps/web.py:982
 msgid "not installed"
 msgstr ""
 
-#: cps/helper.py:98
-msgid "Calibre-web test email"
+#: cps/helper.py:136
+#, python-format
+msgid "Failed to send mail: %s"
 msgstr ""
 
-#: cps/helper.py:99 cps/helper.py:155
-msgid "This email has been sent via calibre web."
+#: cps/helper.py:143
+msgid "Calibre-web test email"
 msgstr ""
 
-#: cps/helper.py:136 cps/helper.py:225
-#, python-format
-msgid "Failed to send mail: %s"
+#: cps/helper.py:144 cps/helper.py:154
+msgid "This email has been sent via calibre web."
 msgstr ""
 
-#: cps/helper.py:154 cps/templates/detail.html:127
+#: cps/helper.py:153 cps/templates/detail.html:129
 msgid "Send to Kindle"
 msgstr ""
 
-#: cps/helper.py:177 cps/helper.py:192
+#: cps/helper.py:171 cps/helper.py:186
 msgid "Could not find any formats suitable for sending by email"
 msgstr ""
 
-#: cps/helper.py:186
+#: cps/helper.py:180
 msgid "Could not convert epub to mobi"
 msgstr ""
 
-#: cps/helper.py:245
+#: cps/helper.py:206
 msgid "The requested file could not be read. Maybe wrong permissions?"
 msgstr ""
 
-#: cps/ub.py:259
+#: cps/ub.py:380
 msgid "Guest"
 msgstr ""
 
-#: cps/web.py:742
+#: cps/web.py:774
 msgid "Latest Books"
 msgstr ""
 
-#: cps/web.py:767
+#: cps/web.py:799
 msgid "Hot Books (most downloaded)"
 msgstr ""
 
-#: cps/templates/index.xml:29 cps/web.py:775
+#: cps/templates/index.xml:29 cps/web.py:808
 msgid "Random Books"
 msgstr ""
 
-#: cps/web.py:788
+#: cps/web.py:821
 msgid "Author list"
 msgstr ""
 
-#: cps/web.py:805
+#: cps/web.py:838
 #, python-format
 msgid "Author: %(nam)s"
 msgstr ""
 
-#: cps/templates/index.xml:50 cps/web.py:818
+#: cps/templates/index.xml:50 cps/web.py:851
 msgid "Series list"
 msgstr ""
 
-#: cps/web.py:829
+#: cps/web.py:862
 #, python-format
 msgid "Series: %(serie)s"
 msgstr ""
 
-#: cps/web.py:831 cps/web.py:927 cps/web.py:1126 cps/web.py:1874
+#: cps/web.py:864 cps/web.py:961 cps/web.py:1179 cps/web.py:2041
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr ""
 
-#: cps/web.py:862
+#: cps/web.py:895
 msgid "Available languages"
 msgstr ""
 
-#: cps/web.py:877
+#: cps/web.py:910
 #, python-format
 msgid "Language: %(name)s"
 msgstr ""
 
-#: cps/templates/index.xml:43 cps/web.py:890
+#: cps/templates/index.xml:43 cps/web.py:923
 msgid "Category list"
 msgstr ""
 
-#: cps/web.py:900
+#: cps/web.py:933
 #, python-format
 msgid "Category: %(name)s"
 msgstr ""
 
-#: cps/web.py:956
+#: cps/web.py:992
 msgid "Statistics"
 msgstr ""
 
-#: cps/web.py:965
-msgid "Server restarts"
+#: cps/web.py:1013
+msgid "Performing Restart, please reload page"
+msgstr ""
+
+#: cps/web.py:1015
+msgid "Performing shutdown of server, please close window"
 msgstr ""
 
-#: cps/web.py:1102 cps/web.py:1109 cps/web.py:1116 cps/web.py:1123
+#: cps/web.py:1091 cps/web.py:1104
+msgid "search"
+msgstr ""
+
+#: cps/web.py:1155 cps/web.py:1162 cps/web.py:1169 cps/web.py:1176
 msgid "Read a Book"
 msgstr ""
 
-#: cps/web.py:1172 cps/web.py:1510
+#: cps/web.py:1227 cps/web.py:1649
 msgid "Please fill out all fields!"
 msgstr ""
 
-#: cps/web.py:1188
-msgid "An unknown error occured. Please try again later."
+#: cps/web.py:1228 cps/web.py:1244 cps/web.py:1249 cps/web.py:1251
+msgid "register"
 msgstr ""
 
-#: cps/web.py:1193
-msgid "This username or email address is already in use."
+#: cps/web.py:1243
+msgid "An unknown error occured. Please try again later."
 msgstr ""
 
-#: cps/web.py:1196
-msgid "register"
+#: cps/web.py:1248
+msgid "This username or email address is already in use."
 msgstr ""
 
-#: cps/web.py:1212
+#: cps/web.py:1266
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1216
+#: cps/web.py:1270
 msgid "Wrong Username or Password"
 msgstr ""
 
-#: cps/web.py:1218
+#: cps/web.py:1272
 msgid "login"
 msgstr ""
 
-#: cps/web.py:1235
+#: cps/web.py:1289
 msgid "Please configure the SMTP mail settings first..."
 msgstr ""
 
-#: cps/web.py:1239
+#: cps/web.py:1293
 #, python-format
 msgid "Book successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1243
+#: cps/web.py:1297
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1245
+#: cps/web.py:1299
 msgid "Please configure your kindle email address first..."
 msgstr ""
 
-#: cps/web.py:1265
+#: cps/web.py:1319
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:1286
+#: cps/web.py:1340
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:1304 cps/web.py:1325
+#: cps/web.py:1359 cps/web.py:1383
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/web.py:1309
+#: cps/web.py:1364
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr ""
 
-#: cps/web.py:1311 cps/web.py:1336
+#: cps/web.py:1366 cps/web.py:1394
 msgid "There was an error"
 msgstr ""
 
-#: cps/web.py:1312 cps/web.py:1314
+#: cps/web.py:1367 cps/web.py:1369
 msgid "create a shelf"
 msgstr ""
 
-#: cps/web.py:1334
+#: cps/web.py:1392
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr ""
 
-#: cps/web.py:1337 cps/web.py:1339
+#: cps/web.py:1395 cps/web.py:1397
 msgid "Edit a shelf"
 msgstr ""
 
-#: cps/web.py:1360
+#: cps/web.py:1415
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr ""
 
-#: cps/web.py:1381
+#: cps/web.py:1437
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/web.py:1409
+#: cps/web.py:1468
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/web.py:1469
+#: cps/web.py:1528
 msgid "Found an existing account for this email address."
 msgstr ""
 
-#: cps/web.py:1471 cps/web.py:1474
+#: cps/web.py:1530 cps/web.py:1534
 #, python-format
 msgid "%(name)s's profile"
 msgstr ""
 
-#: cps/web.py:1472
+#: cps/web.py:1531
 msgid "Profile updated"
 msgstr ""
 
-#: cps/web.py:1483 cps/web.py:1491
+#: cps/web.py:1544
 msgid "Admin page"
 msgstr ""
 
-#: cps/templates/admin.html:33 cps/web.py:1511
+#: cps/web.py:1604
+msgid "Calibre-web configuration updated"
+msgstr ""
+
+#: cps/web.py:1611 cps/web.py:1617 cps/web.py:1630
+msgid "Basic Configuration"
+msgstr ""
+
+#: cps/web.py:1615
+msgid "DB location is not valid, please enter correct path"
+msgstr ""
+
+#: cps/templates/admin.html:33 cps/web.py:1651 cps/web.py:1693
 msgid "Add new user"
 msgstr ""
 
-#: cps/web.py:1544
+#: cps/web.py:1687
 #, python-format
 msgid "User '%(user)s' created"
 msgstr ""
 
-#: cps/web.py:1548
+#: cps/web.py:1691
 msgid "Found an existing account for this email address or nickname."
 msgstr ""
 
-#: cps/web.py:1568
+#: cps/web.py:1711
 msgid "Mail settings updated"
 msgstr ""
 
-#: cps/web.py:1574
+#: cps/web.py:1717
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1577
+#: cps/web.py:1720
 #, python-format
 msgid "There was an error sending the Test E-Mail: %(res)s"
 msgstr ""
 
-#: cps/web.py:1578
+#: cps/web.py:1721
 msgid "Edit mail settings"
 msgstr ""
 
-#: cps/web.py:1606
+#: cps/web.py:1749
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr ""
 
-#: cps/web.py:1661
+#: cps/web.py:1825
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr ""
 
-#: cps/web.py:1664
+#: cps/web.py:1828
 msgid "An unknown error occured."
 msgstr ""
 
-#: cps/web.py:1666
+#: cps/web.py:1831
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr ""
 
-#: cps/web.py:1904
+#: cps/web.py:2036 cps/web.py:2039 cps/web.py:2113
+msgid "edit metadata"
+msgstr ""
+
+#: cps/web.py:2071
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:1909
+#: cps/web.py:2076
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:1914
+#: cps/web.py:2081
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr ""
@@ -323,7 +347,7 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
-#: cps/templates/admin.html:12 cps/templates/detail.html:114
+#: cps/templates/admin.html:12 cps/templates/detail.html:116
 msgid "Download"
 msgstr ""
 
@@ -371,15 +395,15 @@ msgstr ""
 msgid "Change SMTP settings"
 msgstr ""
 
-#: cps/templates/admin.html:56
+#: cps/templates/admin.html:56 cps/templates/admin.html:76
 msgid "Configuration"
 msgstr ""
 
 #: cps/templates/admin.html:59
-msgid "Log File"
+msgid "Calibre DB dir"
 msgstr ""
 
-#: cps/templates/admin.html:60
+#: cps/templates/admin.html:60 cps/templates/config_edit.html:32
 msgid "Log Level"
 msgstr ""
 
@@ -387,7 +411,7 @@ msgstr ""
 msgid "Port"
 msgstr ""
 
-#: cps/templates/admin.html:62
+#: cps/templates/admin.html:62 cps/templates/config_edit.html:19
 msgid "Books per page"
 msgstr ""
 
@@ -403,101 +427,155 @@ msgstr ""
 msgid "Anonymous browsing"
 msgstr ""
 
-#: cps/templates/admin.html:76
+#: cps/templates/admin.html:77
 msgid "Administration"
 msgstr ""
 
-#: cps/templates/admin.html:78
+#: cps/templates/admin.html:79
 msgid "Restart Calibre-web"
 msgstr ""
 
-#: cps/templates/detail.html:38
-msgid "Book"
-msgstr ""
-
-#: cps/templates/detail.html:38
-msgid "of"
-msgstr ""
-
-#: cps/templates/detail.html:44
-msgid "language"
+#: cps/templates/admin.html:80
+msgid "Stop Calibre-web"
 msgstr ""
 
-#: cps/templates/detail.html:103
-msgid "Description:"
+#: cps/templates/admin.html:91
+msgid "Do you really want to restart Calibre-web?"
 msgstr ""
 
-#: cps/templates/detail.html:131
-msgid "Read in browser"
+#: cps/templates/admin.html:92 cps/templates/admin.html:107
+msgid "Ok"
 msgstr ""
 
-#: cps/templates/detail.html:151
-msgid "Add to shelf"
+#: cps/templates/admin.html:93 cps/templates/admin.html:108
+#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:54
+#: cps/templates/email_edit.html:36 cps/templates/shelf_edit.html:17
+#: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:107
+msgid "Back"
 msgstr ""
 
-#: cps/templates/detail.html:191
-msgid "Edit metadata"
+#: cps/templates/admin.html:106
+msgid "Do you really want to stop Calibre-web?"
 msgstr ""
 
-#: cps/templates/edit_book.html:14 cps/templates/search_form.html:6
+#: cps/templates/book_edit.html:16 cps/templates/search_form.html:6
 msgid "Book Title"
 msgstr ""
 
-#: cps/templates/edit_book.html:18 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:20 cps/templates/search_form.html:10
 msgid "Author"
 msgstr ""
 
-#: cps/templates/edit_book.html:22
+#: cps/templates/book_edit.html:24
 msgid "Description"
 msgstr ""
 
-#: cps/templates/edit_book.html:26 cps/templates/search_form.html:13
+#: cps/templates/book_edit.html:28 cps/templates/search_form.html:13
 msgid "Tags"
 msgstr ""
 
-#: cps/templates/edit_book.html:31 cps/templates/layout.html:133
+#: cps/templates/book_edit.html:33 cps/templates/layout.html:133
 #: cps/templates/search_form.html:33
 msgid "Series"
 msgstr ""
 
-#: cps/templates/edit_book.html:35
+#: cps/templates/book_edit.html:37
 msgid "Series id"
 msgstr ""
 
-#: cps/templates/edit_book.html:39
+#: cps/templates/book_edit.html:41
 msgid "Rating"
 msgstr ""
 
-#: cps/templates/edit_book.html:43
+#: cps/templates/book_edit.html:45
 msgid "Cover URL (jpg)"
 msgstr ""
 
-#: cps/templates/edit_book.html:48 cps/templates/user_edit.html:27
+#: cps/templates/book_edit.html:50 cps/templates/user_edit.html:27
 msgid "Language"
 msgstr ""
 
-#: cps/templates/edit_book.html:59
+#: cps/templates/book_edit.html:61
 msgid "Yes"
 msgstr ""
 
-#: cps/templates/edit_book.html:60
+#: cps/templates/book_edit.html:62
 msgid "No"
 msgstr ""
 
-#: cps/templates/edit_book.html:102
+#: cps/templates/book_edit.html:104
 msgid "view book after edit"
 msgstr ""
 
-#: cps/templates/edit_book.html:105 cps/templates/login.html:19
-#: cps/templates/search_form.html:75 cps/templates/shelf_edit.html:15
-#: cps/templates/user_edit.html:97
+#: cps/templates/book_edit.html:107 cps/templates/config_edit.html:52
+#: cps/templates/login.html:19 cps/templates/search_form.html:75
+#: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:105
 msgid "Submit"
 msgstr ""
 
-#: cps/templates/edit_book.html:106 cps/templates/email_edit.html:36
-#: cps/templates/shelf_edit.html:17 cps/templates/shelf_order.html:12
-#: cps/templates/user_edit.html:99
-msgid "Back"
+#: cps/templates/config_edit.html:7
+msgid "Location of Calibre database"
+msgstr ""
+
+#: cps/templates/config_edit.html:11
+msgid "Server Port"
+msgstr ""
+
+#: cps/templates/config_edit.html:15 cps/templates/shelf_edit.html:7
+msgid "Title"
+msgstr ""
+
+#: cps/templates/config_edit.html:23
+msgid "No. of random books to show"
+msgstr ""
+
+#: cps/templates/config_edit.html:28
+msgid "Regular expression for title sorting"
+msgstr ""
+
+#: cps/templates/config_edit.html:42
+msgid "Enable uploading"
+msgstr ""
+
+#: cps/templates/config_edit.html:46
+msgid "Enable anonymous browsing"
+msgstr ""
+
+#: cps/templates/config_edit.html:50
+msgid "Enable public registration"
+msgstr ""
+
+#: cps/templates/config_edit.html:57 cps/templates/layout.html:91
+#: cps/templates/login.html:4
+msgid "Login"
+msgstr ""
+
+#: cps/templates/detail.html:40
+msgid "Book"
+msgstr ""
+
+#: cps/templates/detail.html:40
+msgid "of"
+msgstr ""
+
+#: cps/templates/detail.html:46
+msgid "language"
+msgstr ""
+
+#: cps/templates/detail.html:105
+msgid "Description:"
+msgstr ""
+
+#: cps/templates/detail.html:133
+msgid "Read in browser"
+msgstr ""
+
+#: cps/templates/detail.html:153
+msgid "Add to shelf"
+msgstr ""
+
+#: cps/templates/detail.html:193
+msgid "Edit metadata"
 msgstr ""
 
 #: cps/templates/email_edit.html:11
@@ -600,10 +678,6 @@ msgstr ""
 msgid "Logout"
 msgstr ""
 
-#: cps/templates/layout.html:91 cps/templates/login.html:4
-msgid "Login"
-msgstr ""
-
 #: cps/templates/layout.html:92 cps/templates/register.html:18
 msgid "Register"
 msgstr ""
@@ -722,10 +796,6 @@ msgstr ""
 msgid "Change order"
 msgstr ""
 
-#: cps/templates/shelf_edit.html:7
-msgid "Title"
-msgstr ""
-
 #: cps/templates/shelf_edit.html:12
 msgid "should the shelf be public?"
 msgstr ""
@@ -790,31 +860,39 @@ msgstr ""
 msgid "Show category selection"
 msgstr ""
 
-#: cps/templates/user_edit.html:68
+#: cps/templates/user_edit.html:65
+msgid "Show author selection"
+msgstr ""
+
+#: cps/templates/user_edit.html:69
+msgid "Show random books in detail view"
+msgstr ""
+
+#: cps/templates/user_edit.html:76
 msgid "Admin user"
 msgstr ""
 
-#: cps/templates/user_edit.html:73
+#: cps/templates/user_edit.html:81
 msgid "Allow Downloads"
 msgstr ""
 
-#: cps/templates/user_edit.html:77
+#: cps/templates/user_edit.html:85
 msgid "Allow Uploads"
 msgstr ""
 
-#: cps/templates/user_edit.html:81
+#: cps/templates/user_edit.html:89
 msgid "Allow Edit"
 msgstr ""
 
-#: cps/templates/user_edit.html:86
+#: cps/templates/user_edit.html:94
 msgid "Allow Changing Password"
 msgstr ""
 
-#: cps/templates/user_edit.html:93
+#: cps/templates/user_edit.html:101
 msgid "Delete this user"
 msgstr ""
 
-#: cps/templates/user_edit.html:104
+#: cps/templates/user_edit.html:112
 msgid "Recent Downloads"
 msgstr ""