diff --git a/cps/templates/index.xml b/cps/templates/index.xml
index be1946b3..6fa1bacb 100644
--- a/cps/templates/index.xml
+++ b/cps/templates/index.xml
@@ -39,6 +39,20 @@
     <id>{{url_for('feed_discover')}}</id>
     <content type="text">{{_('Show Random Books')}}</content>
   </entry>
+  <entry>
+    <title>{{_('Read Books')}}</title>
+    <link type="application/atom+xml;profile=opds-catalog;type=feed;kind=acquisition" href="{{url_for('feed_read_books')}}" />
+    <link rel="subsection" href="{{url_for('feed_read_books')}}" type="application/atom+xml;profile=opds-catalog;type=feed;kind=acquisition"/>
+    <id>{{url_for('feed_read_books')}}</id>
+    <content type="text">{{_('Read Books')}}</content>
+  </entry>
+  <entry>
+    <title>{{_('Unread Books')}}</title>
+    <link type="application/atom+xml;profile=opds-catalog;type=feed;kind=acquisition" href="{{url_for('feed_unread_books')}}" />
+    <link rel="subsection" href="{{url_for('feed_unread_books')}}" type="application/atom+xml;profile=opds-catalog;type=feed;kind=acquisition"/>
+    <id>{{url_for('feed_unread_books')}}</id>
+    <content type="text">{{_('Unread Books')}}</content>
+  </entry>
   <entry>
     <title>{{_('Authors')}}</title>
     <link type="application/atom+xml;profile=opds-catalog;type=feed;kind=acquisition" href="{{url_for('feed_authorindex')}}"/>
diff --git a/cps/translations/de/LC_MESSAGES/messages.mo b/cps/translations/de/LC_MESSAGES/messages.mo
index f2588a9c..be5a5b8b 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 7a99a6f4..96f39f11 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-03-12 19:10+0100\n"
+"POT-Creation-Date: 2017-03-19 19:20+0100\n"
 "PO-Revision-Date: 2016-07-12 19:54+0200\n"
 "Last-Translator: Ozzie Isaacs\n"
 "Language: de\n"
@@ -32,360 +32,360 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-#: cps/book_formats.py:113 cps/book_formats.py:117 cps/web.py:1082
+#: cps/book_formats.py:113 cps/book_formats.py:117 cps/web.py:1244
 msgid "not installed"
 msgstr "Nicht installiert"
 
-#: cps/helper.py:159
+#: cps/helper.py:164
 #, python-format
 msgid "Failed to send mail: %s"
 msgstr "E-Mail: %s konnte nicht gesendet werden"
 
-#: cps/helper.py:166
+#: cps/helper.py:171
 msgid "Calibre-web test email"
 msgstr "Calibre-web Test E-Mail"
 
-#: cps/helper.py:167 cps/helper.py:179
+#: cps/helper.py:172 cps/helper.py:184
 msgid "This email has been sent via calibre web."
 msgstr "Die E-Mail wurde via calibre-web versendet"
 
-#: cps/helper.py:176 cps/templates/detail.html:136
+#: cps/helper.py:181 cps/templates/detail.html:146
 msgid "Send to Kindle"
 msgstr "An Kindle senden"
 
-#: cps/helper.py:196 cps/helper.py:211
+#: cps/helper.py:201 cps/helper.py:216
 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:205
+#: cps/helper.py:210
 msgid "Could not convert epub to mobi"
 msgstr "Konnte .epub nicht nach .mobi konvertieren"
 
-#: cps/ub.py:442
+#: cps/ub.py:488
 msgid "Guest"
 msgstr "Gast"
 
-#: cps/web.py:768
+#: cps/web.py:904
 msgid "Requesting update package"
 msgstr "Frage Update Paket an"
 
-#: cps/web.py:769
+#: cps/web.py:905
 msgid "Downloading update package"
 msgstr "Lade Update Paket herunter"
 
-#: cps/web.py:770
+#: cps/web.py:906
 msgid "Unzipping update package"
 msgstr "Entpacke Update Paket"
 
-#: cps/web.py:771
+#: cps/web.py:907
 msgid "Files are replaced"
 msgstr "Ersetze Dateien"
 
-#: cps/web.py:772
+#: cps/web.py:908
 msgid "Database connections are closed"
 msgstr "Schließe Datenbankverbindungen"
 
-#: cps/web.py:773
+#: cps/web.py:909
 msgid "Server is stopped"
 msgstr "Stoppe Server"
 
-#: cps/web.py:774
+#: cps/web.py:910
 msgid "Update finished, please press okay and reload page"
 msgstr "Update abgeschlossen, bitte okay drücken und Seite neu laden"
 
-#: cps/web.py:847
+#: cps/web.py:983
 msgid "Latest Books"
 msgstr "Letzte Bücher"
 
-#: cps/web.py:878
+#: cps/web.py:1014
 msgid "Hot Books (most downloaded)"
 msgstr "Beliebte Bücher (die meisten Downloads)"
 
-#: cps/web.py:888
+#: cps/web.py:1024
 msgid "Best rated books"
 msgstr "Best bewertete Bücher"
 
-#: cps/templates/index.xml:36 cps/web.py:897
+#: cps/templates/index.xml:36 cps/web.py:1033
 msgid "Random Books"
 msgstr "Zufällige Bücher"
 
-#: cps/web.py:910
+#: cps/web.py:1046
 msgid "Author list"
 msgstr "Autorenliste"
 
-#: cps/web.py:921
+#: cps/web.py:1057
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autor: %(name)s"
 
-#: cps/web.py:923 cps/web.py:951 cps/web.py:1059 cps/web.py:1309
-#: cps/web.py:2196
+#: cps/web.py:1059 cps/web.py:1087 cps/web.py:1221 cps/web.py:1626
+#: cps/web.py:2579
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr ""
 "Buch öffnen fehlgeschlagen. Datei existiert nicht, oder ist nicht "
 "zugänglich."
 
-#: cps/templates/index.xml:57 cps/web.py:937
+#: cps/templates/index.xml:71 cps/web.py:1073
 msgid "Series list"
 msgstr "Liste Serien"
 
-#: cps/web.py:949
+#: cps/web.py:1085
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie: %(serie)s"
 
-#: cps/web.py:982
+#: cps/web.py:1118
 msgid "Available languages"
 msgstr "Verfügbare Sprachen"
 
-#: cps/web.py:997
+#: cps/web.py:1133
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Sprache: %(name)s"
 
-#: cps/templates/index.xml:50 cps/web.py:1010
+#: cps/templates/index.xml:64 cps/web.py:1146
 msgid "Category list"
 msgstr "Kategorieliste"
 
-#: cps/web.py:1022
+#: cps/web.py:1158
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategorie: %(name)s"
 
-#: cps/web.py:1105
+#: cps/web.py:1267
 msgid "Statistics"
 msgstr "Statistiken"
 
-#: cps/web.py:1126
+#: cps/web.py:1375
 msgid "Server restarted, please reload page"
 msgstr "Server neu gestartet,bitte Seite neu laden"
 
-#: cps/web.py:1128
+#: cps/web.py:1377
 msgid "Performing shutdown of server, please close window"
 msgstr "Server wird runtergefahren, bitte Fenster schließen"
 
-#: cps/web.py:1143
+#: cps/web.py:1392
 msgid "Update done"
 msgstr "Update durchgeführt"
 
-#: cps/web.py:1221 cps/web.py:1234
+#: cps/web.py:1470 cps/web.py:1483
 msgid "search"
 msgstr "Suche"
 
-#: cps/web.py:1285 cps/web.py:1292 cps/web.py:1299 cps/web.py:1306
+#: cps/web.py:1602 cps/web.py:1609 cps/web.py:1616 cps/web.py:1623
 msgid "Read a Book"
 msgstr "Lese ein Buch"
 
-#: cps/web.py:1350 cps/web.py:1789
+#: cps/web.py:1676 cps/web.py:2152
 msgid "Please fill out all fields!"
 msgstr "Bitte alle Felder ausfüllen!"
 
-#: cps/web.py:1351 cps/web.py:1367 cps/web.py:1372 cps/web.py:1374
+#: cps/web.py:1677 cps/web.py:1693 cps/web.py:1698 cps/web.py:1700
 msgid "register"
 msgstr "Registieren"
 
-#: cps/web.py:1366
+#: cps/web.py:1692
 msgid "An unknown error occured. Please try again later."
 msgstr "Es ist ein unbekannter Fehler aufgetreten. Bitte später erneut versuchen."
 
-#: cps/web.py:1371
+#: cps/web.py:1697
 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:1389
+#: cps/web.py:1715
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Du bist nun eingeloggt als '%(nickname)s'"
 
-#: cps/web.py:1394
+#: cps/web.py:1720
 msgid "Wrong Username or Password"
 msgstr "Falscher Benutzername oder Passwort"
 
-#: cps/web.py:1396
+#: cps/web.py:1722
 msgid "login"
 msgstr "Login"
 
-#: cps/web.py:1413
+#: cps/web.py:1739
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Bitte zuerst die SMTP Mail Einstellung konfigurieren ..."
 
-#: cps/web.py:1417
+#: cps/web.py:1743
 #, python-format
 msgid "Book successfully send to %(kindlemail)s"
 msgstr "Buch erfolgreich versandt an %(kindlemail)s"
 
-#: cps/web.py:1421
+#: cps/web.py:1747
 #, 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:1423 cps/web.py:1867
+#: cps/web.py:1749 cps/web.py:2232
 msgid "Please configure your kindle email address first..."
 msgstr "Bitte die Kindle E-Mail Adresse zuuerst konfigurieren..."
 
-#: cps/web.py:1443
+#: cps/web.py:1774
 #, 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:1464
+#: cps/web.py:1793
 #, 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:1483 cps/web.py:1507
+#: cps/web.py:1812 cps/web.py:1836
 #, 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:1488
+#: cps/web.py:1817
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Bücherregal %(title)s erzeugt"
 
-#: cps/web.py:1490 cps/web.py:1518
+#: cps/web.py:1819 cps/web.py:1847
 msgid "There was an error"
 msgstr "Es trat ein Fehler auf"
 
-#: cps/web.py:1491 cps/web.py:1493
+#: cps/web.py:1820 cps/web.py:1822
 msgid "create a shelf"
 msgstr "Bücherregal erzeugen"
 
-#: cps/web.py:1516
+#: cps/web.py:1845
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Bücherregal %(title)s verändert"
 
-#: cps/web.py:1519 cps/web.py:1521
+#: cps/web.py:1848 cps/web.py:1850
 msgid "Edit a shelf"
 msgstr "Bücherregal editieren"
 
-#: cps/web.py:1539
+#: cps/web.py:1868
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "Bücherregal %(name)s erfolgreich gelöscht"
 
-#: cps/web.py:1561
+#: cps/web.py:1890
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Bücherregal: '%(name)s'"
 
-#: cps/web.py:1592
+#: cps/web.py:1921
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Reihenfolge in Bücherregal '%(name)s' verändern"
 
-#: cps/web.py:1654
+#: cps/web.py:1985
 msgid "Found an existing account for this email address."
 msgstr "Es existiert ein Benutzerkonto für diese E-Mailadresse"
 
-#: cps/web.py:1656 cps/web.py:1660
+#: cps/web.py:1987 cps/web.py:1991
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's Profil"
 
-#: cps/web.py:1657
+#: cps/web.py:1988
 msgid "Profile updated"
 msgstr "Profil aktualisiert"
 
-#: cps/web.py:1671
+#: cps/web.py:2002
 msgid "Admin page"
 msgstr "Admin Seite"
 
-#: cps/web.py:1744
+#: cps/web.py:2106
 msgid "Calibre-web configuration updated"
 msgstr "Calibre-web Konfiguration wurde aktualisiert"
 
-#: cps/web.py:1751 cps/web.py:1757 cps/web.py:1770
+#: cps/web.py:2113 cps/web.py:2119 cps/web.py:2133
 msgid "Basic Configuration"
 msgstr "Basis Konfiguration"
 
-#: cps/web.py:1755
+#: cps/web.py:2117
 msgid "DB location is not valid, please enter correct path"
 msgstr "DB Speicherort ist ungültig, bitte Pfad korrigieren"
 
-#: cps/templates/admin.html:34 cps/web.py:1791 cps/web.py:1837
+#: cps/templates/admin.html:34 cps/web.py:2154 cps/web.py:2202
 msgid "Add new user"
 msgstr "Neuen Benutzer hinzufügen"
 
-#: cps/web.py:1829
+#: cps/web.py:2194
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Benutzer '%(user)s' angelegt"
 
-#: cps/web.py:1833
+#: cps/web.py:2198
 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:1855
+#: cps/web.py:2220
 msgid "Mail settings updated"
 msgstr "E-Mail Einstellungen aktualisiert"
 
-#: cps/web.py:1862
+#: cps/web.py:2227
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr "Test E-Mail erfolgreich an %(kindlemail)s versendet"
 
-#: cps/web.py:1865
+#: cps/web.py:2230
 #, 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:1869
+#: cps/web.py:2234
 msgid "E-Mail settings updated"
 msgstr "E-Mail Einstellungen wurde aktualisiert"
 
-#: cps/web.py:1870
+#: cps/web.py:2235
 msgid "Edit mail settings"
 msgstr "E-Mail Einstellungen editieren"
 
-#: cps/web.py:1898
+#: cps/web.py:2263
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Benutzer '%(nick)s' gelöscht"
 
-#: cps/web.py:1979
+#: cps/web.py:2349
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Benutzer '%(nick)s' aktualisiert"
 
-#: cps/web.py:1982
+#: cps/web.py:2352
 msgid "An unknown error occured."
 msgstr "Es ist ein unbekanter Fehler aufgetreten"
 
-#: cps/web.py:1985
+#: cps/web.py:2355
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Benutzer %(nick)s bearbeiten"
 
-#: cps/web.py:2191 cps/web.py:2194 cps/web.py:2304
+#: cps/web.py:2574 cps/web.py:2577 cps/web.py:2689
 msgid "edit metadata"
 msgstr "Metadaten editieren"
 
-#: cps/web.py:2215
+#: cps/web.py:2598
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr "Die Dateiendung \"%s\" kann nicht auf diesen Server hochgeladen werden"
 
-#: cps/web.py:2221
+#: cps/web.py:2604
 msgid "File to be uploaded must have an extension"
 msgstr "Datei müssen eine Erweiterung haben, um hochgeladen zu werden"
 
-#: cps/web.py:2238
+#: cps/web.py:2621
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Fehler beim Erzeugen des Pfads %s (Zugriff verweigert)"
 
-#: cps/web.py:2243
+#: cps/web.py:2626
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Fehler beim speichern der Datei %s (Zugriff verweigert)"
 
-#: cps/web.py:2248
+#: cps/web.py:2631
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Fehler beim Löschen von Datei %s (Zugriff verweigert)"
@@ -414,7 +414,7 @@ msgstr "DLS"
 msgid "Admin"
 msgstr "Admin"
 
-#: cps/templates/admin.html:13 cps/templates/detail.html:124
+#: cps/templates/admin.html:13 cps/templates/detail.html:134
 msgid "Download"
 msgstr "Download"
 
@@ -470,7 +470,7 @@ msgstr "Konfiguration"
 msgid "Calibre DB dir"
 msgstr "Calibre DB Pfad"
 
-#: cps/templates/admin.html:61 cps/templates/config_edit.html:35
+#: cps/templates/admin.html:61 cps/templates/config_edit.html:76
 msgid "Log Level"
 msgstr "Log Level"
 
@@ -478,7 +478,7 @@ msgstr "Log Level"
 msgid "Port"
 msgstr "Port"
 
-#: cps/templates/admin.html:63 cps/templates/config_edit.html:19
+#: cps/templates/admin.html:63 cps/templates/config_edit.html:60
 msgid "Books per page"
 msgstr "Bücher pro Seite"
 
@@ -536,9 +536,9 @@ msgid "Ok"
 msgstr "Ok"
 
 #: cps/templates/admin.html:103 cps/templates/admin.html:117
-#: cps/templates/book_edit.html:109 cps/templates/config_edit.html:78
+#: cps/templates/book_edit.html:109 cps/templates/config_edit.html:119
 #: cps/templates/email_edit.html:36 cps/templates/shelf_edit.html:17
-#: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:116
+#: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:120
 msgid "Back"
 msgstr "Zurück"
 
@@ -567,7 +567,7 @@ msgstr "Beschreibung"
 msgid "Tags"
 msgstr "Tags"
 
-#: cps/templates/book_edit.html:33 cps/templates/layout.html:138
+#: cps/templates/book_edit.html:33 cps/templates/layout.html:142
 #: cps/templates/search_form.html:37
 msgid "Series"
 msgstr "Serien"
@@ -604,9 +604,9 @@ msgstr "Buch nach Bearbeitung ansehen"
 msgid "Get metadata"
 msgstr "Metadaten laden"
 
-#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:76
+#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:117
 #: cps/templates/login.html:19 cps/templates/search_form.html:79
-#: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:114
+#: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:118
 msgid "Submit"
 msgstr "Abschicken"
 
@@ -655,63 +655,87 @@ msgstr "Quelle"
 msgid "Location of Calibre database"
 msgstr "Speicherort der Calibre Datenbank"
 
-#: cps/templates/config_edit.html:11
+#: cps/templates/config_edit.html:13
+msgid "Use google drive?"
+msgstr "Google Drive benutzen"
+
+#: cps/templates/config_edit.html:17
+msgid "Client id"
+msgstr "Benutzer Id"
+
+#: cps/templates/config_edit.html:21
+msgid "Client secret"
+msgstr "Benutzer Secret"
+
+#: cps/templates/config_edit.html:25
+msgid "Calibre Base URL"
+msgstr "Calibnre Basis URL"
+
+#: cps/templates/config_edit.html:29
+msgid "Google drive Calibre folder"
+msgstr "Google Drive Calibre Ordner"
+
+#: cps/templates/config_edit.html:38
+msgid "Metadata Watch Channel ID"
+msgstr "Matadata Überwachungs-ID"
+
+#: cps/templates/config_edit.html:52
 msgid "Server Port"
 msgstr "Server Port"
 
-#: cps/templates/config_edit.html:15 cps/templates/shelf_edit.html:7
+#: cps/templates/config_edit.html:56 cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr "Titel"
 
-#: cps/templates/config_edit.html:23
+#: cps/templates/config_edit.html:64
 msgid "No. of random books to show"
 msgstr "Anzahl Anzeige zufällige Bücher"
 
-#: cps/templates/config_edit.html:27
+#: cps/templates/config_edit.html:68
 msgid "Regular expression for ignoring columns"
 msgstr "Regulärer Ausdruck um Spalten zu ignorien"
 
-#: cps/templates/config_edit.html:31
+#: cps/templates/config_edit.html:72
 msgid "Regular expression for title sorting"
 msgstr "Regulärer Ausdruck für Titelsortierung"
 
-#: cps/templates/config_edit.html:45
+#: cps/templates/config_edit.html:86
 msgid "Enable uploading"
 msgstr "Hochladen aktivieren"
 
-#: cps/templates/config_edit.html:49
+#: cps/templates/config_edit.html:90
 msgid "Enable anonymous browsing"
 msgstr "Anonymes Browsen aktivieren"
 
-#: cps/templates/config_edit.html:53
+#: cps/templates/config_edit.html:94
 msgid "Enable public registration"
 msgstr "Öffentliche Registrierung aktivieren"
 
-#: cps/templates/config_edit.html:55
+#: cps/templates/config_edit.html:96
 msgid "Default Settings for new users"
 msgstr "Default Einstellungen für neue Benutzer"
 
-#: cps/templates/config_edit.html:58 cps/templates/user_edit.html:83
+#: cps/templates/config_edit.html:99 cps/templates/user_edit.html:87
 msgid "Admin user"
 msgstr "Admin Benutzer"
 
-#: cps/templates/config_edit.html:62 cps/templates/user_edit.html:88
+#: cps/templates/config_edit.html:103 cps/templates/user_edit.html:92
 msgid "Allow Downloads"
 msgstr "Downloads erlauben"
 
-#: cps/templates/config_edit.html:66 cps/templates/user_edit.html:92
+#: cps/templates/config_edit.html:107 cps/templates/user_edit.html:96
 msgid "Allow Uploads"
 msgstr "Uploads erlauben"
 
-#: cps/templates/config_edit.html:70 cps/templates/user_edit.html:96
+#: cps/templates/config_edit.html:111 cps/templates/user_edit.html:100
 msgid "Allow Edit"
 msgstr "Bearbeiten erlauben"
 
-#: cps/templates/config_edit.html:74 cps/templates/user_edit.html:101
+#: cps/templates/config_edit.html:115 cps/templates/user_edit.html:105
 msgid "Allow Changing Password"
 msgstr "Passwort ändern erlauben"
 
-#: cps/templates/config_edit.html:81 cps/templates/layout.html:93
+#: cps/templates/config_edit.html:122 cps/templates/layout.html:93
 #: cps/templates/login.html:4
 msgid "Login"
 msgstr "Login"
@@ -732,19 +756,23 @@ msgstr "Sprache"
 msgid "Publishing date"
 msgstr "Herausgabedatum"
 
-#: cps/templates/detail.html:113
+#: cps/templates/detail.html:115
+msgid "Read"
+msgstr "Gelesen"
+
+#: cps/templates/detail.html:123
 msgid "Description:"
 msgstr "Beschreibung"
 
-#: cps/templates/detail.html:141
+#: cps/templates/detail.html:151
 msgid "Read in browser"
 msgstr "Im Browser lesen"
 
-#: cps/templates/detail.html:161
+#: cps/templates/detail.html:171
 msgid "Add to shelf"
 msgstr "Zu Bücherregal hinzufügen"
 
-#: cps/templates/detail.html:201
+#: cps/templates/detail.html:211
 msgid "Edit metadata"
 msgstr "Metadaten bearbeiten"
 
@@ -826,19 +854,29 @@ msgstr "Die neuesten Bücher"
 msgid "Show Random Books"
 msgstr "Zeige zufällige Bücher"
 
-#: cps/templates/index.xml:43 cps/templates/layout.html:140
+#: cps/templates/index.xml:43 cps/templates/index.xml:47
+#: cps/templates/layout.html:132
+msgid "Read Books"
+msgstr "Gelesene Bücher"
+
+#: cps/templates/index.xml:50 cps/templates/index.xml:54
+#: cps/templates/layout.html:133
+msgid "Unread Books"
+msgstr "Ungelesene Bücher"
+
+#: cps/templates/index.xml:57 cps/templates/layout.html:144
 msgid "Authors"
 msgstr "Autoren"
 
-#: cps/templates/index.xml:47
+#: cps/templates/index.xml:61
 msgid "Books ordered by Author"
 msgstr "Bücher nach Autoren sortiert"
 
-#: cps/templates/index.xml:54
+#: cps/templates/index.xml:68
 msgid "Books ordered by category"
 msgstr "Bücher nach Kategorien sortiert"
 
-#: cps/templates/index.xml:61
+#: cps/templates/index.xml:75
 msgid "Books ordered by series"
 msgstr "Bücher nach Reihen geordnet"
 
@@ -862,31 +900,31 @@ msgstr "Registrieren"
 msgid "Browse"
 msgstr "Browsen"
 
-#: cps/templates/layout.html:132
+#: cps/templates/layout.html:136
 msgid "Discover"
 msgstr "Entdecke"
 
-#: cps/templates/layout.html:135
+#: cps/templates/layout.html:139
 msgid "Categories"
 msgstr "Kategorien"
 
-#: cps/templates/layout.html:142 cps/templates/search_form.html:58
+#: cps/templates/layout.html:146 cps/templates/search_form.html:58
 msgid "Languages"
 msgstr "Sprachen"
 
-#: cps/templates/layout.html:145
+#: cps/templates/layout.html:149
 msgid "Public Shelves"
 msgstr "Öffentiche Bücherregale"
 
-#: cps/templates/layout.html:149
+#: cps/templates/layout.html:153
 msgid "Your Shelves"
 msgstr "Deine Bücherregale"
 
-#: cps/templates/layout.html:154
+#: cps/templates/layout.html:158
 msgid "Create a Shelf"
 msgstr "Bücherregal erzeugen"
 
-#: cps/templates/layout.html:155
+#: cps/templates/layout.html:159
 msgid "About"
 msgstr "Über"
 
@@ -1057,14 +1095,18 @@ msgid "Show author selection"
 msgstr "Zeige Autorenauswahl"
 
 #: cps/templates/user_edit.html:75
+msgid "Show read and unread"
+msgstr "Zeige Gelesen/Ungelesen Auswahl"
+
+#: cps/templates/user_edit.html:79
 msgid "Show random books in detail view"
 msgstr "Zeige zufällige Bücher in der Detailansicht"
 
-#: cps/templates/user_edit.html:108
+#: cps/templates/user_edit.html:112
 msgid "Delete this user"
 msgstr "Benutzer löschen"
 
-#: cps/templates/user_edit.html:123
+#: cps/templates/user_edit.html:127
 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 73da1e5c..62cc82b0 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-03-12 19:10+0100\n"
+"POT-Creation-Date: 2017-03-19 19:20+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,354 +25,354 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-#: cps/book_formats.py:113 cps/book_formats.py:117 cps/web.py:1082
+#: cps/book_formats.py:113 cps/book_formats.py:117 cps/web.py:1244
 msgid "not installed"
 msgstr "No instalado"
 
-#: cps/helper.py:159
+#: cps/helper.py:164
 #, python-format
 msgid "Failed to send mail: %s"
 msgstr "Fallo al enviar el correo : %s"
 
-#: cps/helper.py:166
+#: cps/helper.py:171
 msgid "Calibre-web test email"
 msgstr "Prueba de Correo Calibre-web"
 
-#: cps/helper.py:167 cps/helper.py:179
+#: cps/helper.py:172 cps/helper.py:184
 msgid "This email has been sent via calibre web."
 msgstr "Este mensaje ha sido enviado via Calibre Web."
 
-#: cps/helper.py:176 cps/templates/detail.html:136
+#: cps/helper.py:181 cps/templates/detail.html:146
 msgid "Send to Kindle"
 msgstr "Enviar a Kindle"
 
-#: cps/helper.py:196 cps/helper.py:211
+#: cps/helper.py:201 cps/helper.py:216
 msgid "Could not find any formats suitable for sending by email"
 msgstr "Formato no compatible para enviar por correo electronico"
 
-#: cps/helper.py:205
+#: cps/helper.py:210
 msgid "Could not convert epub to mobi"
 msgstr "No fue posible convertir de epub a mobi"
 
-#: cps/ub.py:442
+#: cps/ub.py:488
 msgid "Guest"
 msgstr ""
 
-#: cps/web.py:768
+#: cps/web.py:904
 msgid "Requesting update package"
 msgstr ""
 
-#: cps/web.py:769
+#: cps/web.py:905
 msgid "Downloading update package"
 msgstr ""
 
-#: cps/web.py:770
+#: cps/web.py:906
 msgid "Unzipping update package"
 msgstr ""
 
-#: cps/web.py:771
+#: cps/web.py:907
 msgid "Files are replaced"
 msgstr ""
 
-#: cps/web.py:772
+#: cps/web.py:908
 msgid "Database connections are closed"
 msgstr ""
 
-#: cps/web.py:773
+#: cps/web.py:909
 msgid "Server is stopped"
 msgstr ""
 
-#: cps/web.py:774
+#: cps/web.py:910
 msgid "Update finished, please press okay and reload page"
 msgstr ""
 
-#: cps/web.py:847
+#: cps/web.py:983
 msgid "Latest Books"
 msgstr "Libros recientes"
 
-#: cps/web.py:878
+#: cps/web.py:1014
 msgid "Hot Books (most downloaded)"
 msgstr "Libros Populares (los mas descargados)"
 
-#: cps/web.py:888
+#: cps/web.py:1024
 msgid "Best rated books"
 msgstr ""
 
-#: cps/templates/index.xml:36 cps/web.py:897
+#: cps/templates/index.xml:36 cps/web.py:1033
 msgid "Random Books"
 msgstr "Libros al Azar"
 
-#: cps/web.py:910
+#: cps/web.py:1046
 msgid "Author list"
 msgstr "Lista de Autores"
 
-#: cps/web.py:921
+#: cps/web.py:1057
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:923 cps/web.py:951 cps/web.py:1059 cps/web.py:1309
-#: cps/web.py:2196
+#: cps/web.py:1059 cps/web.py:1087 cps/web.py:1221 cps/web.py:1626
+#: cps/web.py:2579
 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/templates/index.xml:57 cps/web.py:937
+#: cps/templates/index.xml:71 cps/web.py:1073
 msgid "Series list"
 msgstr "lista de Series"
 
-#: cps/web.py:949
+#: cps/web.py:1085
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Series : %(serie)s"
 
-#: cps/web.py:982
+#: cps/web.py:1118
 msgid "Available languages"
 msgstr "Lenguajes disponibles"
 
-#: cps/web.py:997
+#: cps/web.py:1133
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Lenguaje: %(name)s"
 
-#: cps/templates/index.xml:50 cps/web.py:1010
+#: cps/templates/index.xml:64 cps/web.py:1146
 msgid "Category list"
 msgstr "Lista de Categorias"
 
-#: cps/web.py:1022
+#: cps/web.py:1158
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoria : %(name)s"
 
-#: cps/web.py:1105
+#: cps/web.py:1267
 msgid "Statistics"
 msgstr "Estadisticas"
 
-#: cps/web.py:1126
+#: cps/web.py:1375
 msgid "Server restarted, please reload page"
 msgstr ""
 
-#: cps/web.py:1128
+#: cps/web.py:1377
 msgid "Performing shutdown of server, please close window"
 msgstr ""
 
-#: cps/web.py:1143
+#: cps/web.py:1392
 msgid "Update done"
 msgstr ""
 
-#: cps/web.py:1221 cps/web.py:1234
+#: cps/web.py:1470 cps/web.py:1483
 msgid "search"
 msgstr ""
 
-#: cps/web.py:1285 cps/web.py:1292 cps/web.py:1299 cps/web.py:1306
+#: cps/web.py:1602 cps/web.py:1609 cps/web.py:1616 cps/web.py:1623
 msgid "Read a Book"
 msgstr "Leer un Libro"
 
-#: cps/web.py:1350 cps/web.py:1789
+#: cps/web.py:1676 cps/web.py:2152
 msgid "Please fill out all fields!"
 msgstr "Por favor llenar todos los campos!"
 
-#: cps/web.py:1351 cps/web.py:1367 cps/web.py:1372 cps/web.py:1374
+#: cps/web.py:1677 cps/web.py:1693 cps/web.py:1698 cps/web.py:1700
 msgid "register"
 msgstr "Registrarse"
 
-#: cps/web.py:1366
+#: cps/web.py:1692
 msgid "An unknown error occured. Please try again later."
 msgstr "Ocurrio un error. Intentar de nuevo mas tarde."
 
-#: cps/web.py:1371
+#: cps/web.py:1697
 msgid "This username or email address is already in use."
 msgstr "Usuario o direccion de correo en uso."
 
-#: cps/web.py:1389
+#: cps/web.py:1715
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Sesion iniciada como : '%(nickname)s'"
 
-#: cps/web.py:1394
+#: cps/web.py:1720
 msgid "Wrong Username or Password"
 msgstr "Usuario o contraseña invalido"
 
-#: cps/web.py:1396
+#: cps/web.py:1722
 msgid "login"
 msgstr "Iniciar Sesion"
 
-#: cps/web.py:1413
+#: cps/web.py:1739
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configurar primero los parametros SMTP por favor..."
 
-#: cps/web.py:1417
+#: cps/web.py:1743
 #, python-format
 msgid "Book successfully send to %(kindlemail)s"
 msgstr "Envio de Libro a %(kindlemail)s correctamente"
 
-#: cps/web.py:1421
+#: cps/web.py:1747
 #, 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:1423 cps/web.py:1867
+#: cps/web.py:1749 cps/web.py:2232
 msgid "Please configure your kindle email address first..."
 msgstr "Configurar primero la dirección de correo Kindle por favor..."
 
-#: cps/web.py:1443
+#: cps/web.py:1774
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "El libro fue agregado a el estante: %(sname)s"
 
-#: cps/web.py:1464
+#: cps/web.py:1793
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "El libro fue removido del estante: %(sname)s"
 
-#: cps/web.py:1483 cps/web.py:1507
+#: cps/web.py:1812 cps/web.py:1836
 #, 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:1488
+#: cps/web.py:1817
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Estante %(title)s creado"
 
-#: cps/web.py:1490 cps/web.py:1518
+#: cps/web.py:1819 cps/web.py:1847
 msgid "There was an error"
 msgstr "Hemos tenido un error"
 
-#: cps/web.py:1491 cps/web.py:1493
+#: cps/web.py:1820 cps/web.py:1822
 msgid "create a shelf"
 msgstr "Crear un Estante"
 
-#: cps/web.py:1516
+#: cps/web.py:1845
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr ""
 
-#: cps/web.py:1519 cps/web.py:1521
+#: cps/web.py:1848 cps/web.py:1850
 msgid "Edit a shelf"
 msgstr ""
 
-#: cps/web.py:1539
+#: cps/web.py:1868
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "Estante %(name)s fue borrado correctamente"
 
-#: cps/web.py:1561
+#: cps/web.py:1890
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Estante: '%(name)s'"
 
-#: cps/web.py:1592
+#: cps/web.py:1921
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/web.py:1654
+#: cps/web.py:1985
 msgid "Found an existing account for this email address."
 msgstr "Existe una cuenta vinculada a esta cuenta de correo."
 
-#: cps/web.py:1656 cps/web.py:1660
+#: cps/web.py:1987 cps/web.py:1991
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Perfil de %(name)s"
 
-#: cps/web.py:1657
+#: cps/web.py:1988
 msgid "Profile updated"
 msgstr "Perfil actualizado"
 
-#: cps/web.py:1671
+#: cps/web.py:2002
 msgid "Admin page"
 msgstr ""
 
-#: cps/web.py:1744
+#: cps/web.py:2106
 msgid "Calibre-web configuration updated"
 msgstr ""
 
-#: cps/web.py:1751 cps/web.py:1757 cps/web.py:1770
+#: cps/web.py:2113 cps/web.py:2119 cps/web.py:2133
 msgid "Basic Configuration"
 msgstr ""
 
-#: cps/web.py:1755
+#: cps/web.py:2117
 msgid "DB location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/templates/admin.html:34 cps/web.py:1791 cps/web.py:1837
+#: cps/templates/admin.html:34 cps/web.py:2154 cps/web.py:2202
 msgid "Add new user"
 msgstr "Agregar un nuevo usuario"
 
-#: cps/web.py:1829
+#: cps/web.py:2194
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Usuario '%(user)s' creado"
 
-#: cps/web.py:1833
+#: cps/web.py:2198
 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:1855
+#: cps/web.py:2220
 msgid "Mail settings updated"
 msgstr "Parametros de correo actualizados"
 
-#: cps/web.py:1862
+#: cps/web.py:2227
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr "Exito al realizar envio de prueba a %(kindlemail)s"
 
-#: cps/web.py:1865
+#: cps/web.py:2230
 #, 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:1869
+#: cps/web.py:2234
 msgid "E-Mail settings updated"
 msgstr ""
 
-#: cps/web.py:1870
+#: cps/web.py:2235
 msgid "Edit mail settings"
 msgstr "Editar parametros de correo"
 
-#: cps/web.py:1898
+#: cps/web.py:2263
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Usuario '%(nick)s' borrado"
 
-#: cps/web.py:1979
+#: cps/web.py:2349
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Usuario '%(nick)s'  Actualizado"
 
-#: cps/web.py:1982
+#: cps/web.py:2352
 msgid "An unknown error occured."
 msgstr "Oups ! Error inesperado."
 
-#: cps/web.py:1985
+#: cps/web.py:2355
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Editar Usuario %(nick)s"
 
-#: cps/web.py:2191 cps/web.py:2194 cps/web.py:2304
+#: cps/web.py:2574 cps/web.py:2577 cps/web.py:2689
 msgid "edit metadata"
 msgstr ""
 
-#: cps/web.py:2215
+#: cps/web.py:2598
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr ""
 
-#: cps/web.py:2221
+#: cps/web.py:2604
 msgid "File to be uploaded must have an extension"
 msgstr ""
 
-#: cps/web.py:2238
+#: cps/web.py:2621
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Fallo al crear la ruta %s (permiso negado)"
 
-#: cps/web.py:2243
+#: cps/web.py:2626
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Fallo al almacenar el archivo %s (permiso negado)"
 
-#: cps/web.py:2248
+#: cps/web.py:2631
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Fallo al borrar el archivo %s (permiso negado)"
@@ -401,7 +401,7 @@ msgstr "DLS"
 msgid "Admin"
 msgstr "Administracion"
 
-#: cps/templates/admin.html:13 cps/templates/detail.html:124
+#: cps/templates/admin.html:13 cps/templates/detail.html:134
 msgid "Download"
 msgstr "Descarga"
 
@@ -457,7 +457,7 @@ msgstr ""
 msgid "Calibre DB dir"
 msgstr ""
 
-#: cps/templates/admin.html:61 cps/templates/config_edit.html:35
+#: cps/templates/admin.html:61 cps/templates/config_edit.html:76
 msgid "Log Level"
 msgstr ""
 
@@ -465,7 +465,7 @@ msgstr ""
 msgid "Port"
 msgstr ""
 
-#: cps/templates/admin.html:63 cps/templates/config_edit.html:19
+#: cps/templates/admin.html:63 cps/templates/config_edit.html:60
 msgid "Books per page"
 msgstr ""
 
@@ -523,9 +523,9 @@ msgid "Ok"
 msgstr ""
 
 #: cps/templates/admin.html:103 cps/templates/admin.html:117
-#: cps/templates/book_edit.html:109 cps/templates/config_edit.html:78
+#: cps/templates/book_edit.html:109 cps/templates/config_edit.html:119
 #: cps/templates/email_edit.html:36 cps/templates/shelf_edit.html:17
-#: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:116
+#: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:120
 msgid "Back"
 msgstr "Regresar"
 
@@ -554,7 +554,7 @@ msgstr "Descripcion"
 msgid "Tags"
 msgstr "Etiqueta"
 
-#: cps/templates/book_edit.html:33 cps/templates/layout.html:138
+#: cps/templates/book_edit.html:33 cps/templates/layout.html:142
 #: cps/templates/search_form.html:37
 msgid "Series"
 msgstr "Series"
@@ -591,9 +591,9 @@ msgstr "Ver libro tras la edicion"
 msgid "Get metadata"
 msgstr ""
 
-#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:76
+#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:117
 #: cps/templates/login.html:19 cps/templates/search_form.html:79
-#: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:114
+#: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:118
 msgid "Submit"
 msgstr "Enviar"
 
@@ -642,63 +642,87 @@ msgstr ""
 msgid "Location of Calibre database"
 msgstr ""
 
-#: cps/templates/config_edit.html:11
+#: cps/templates/config_edit.html:13
+msgid "Use google drive?"
+msgstr ""
+
+#: cps/templates/config_edit.html:17
+msgid "Client id"
+msgstr ""
+
+#: cps/templates/config_edit.html:21
+msgid "Client secret"
+msgstr ""
+
+#: cps/templates/config_edit.html:25
+msgid "Calibre Base URL"
+msgstr ""
+
+#: cps/templates/config_edit.html:29
+msgid "Google drive Calibre folder"
+msgstr ""
+
+#: cps/templates/config_edit.html:38
+msgid "Metadata Watch Channel ID"
+msgstr ""
+
+#: cps/templates/config_edit.html:52
 msgid "Server Port"
 msgstr ""
 
-#: cps/templates/config_edit.html:15 cps/templates/shelf_edit.html:7
+#: cps/templates/config_edit.html:56 cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr "Titulo"
 
-#: cps/templates/config_edit.html:23
+#: cps/templates/config_edit.html:64
 msgid "No. of random books to show"
 msgstr ""
 
-#: cps/templates/config_edit.html:27
+#: cps/templates/config_edit.html:68
 msgid "Regular expression for ignoring columns"
 msgstr ""
 
-#: cps/templates/config_edit.html:31
+#: cps/templates/config_edit.html:72
 msgid "Regular expression for title sorting"
 msgstr ""
 
-#: cps/templates/config_edit.html:45
+#: cps/templates/config_edit.html:86
 msgid "Enable uploading"
 msgstr ""
 
-#: cps/templates/config_edit.html:49
+#: cps/templates/config_edit.html:90
 msgid "Enable anonymous browsing"
 msgstr ""
 
-#: cps/templates/config_edit.html:53
+#: cps/templates/config_edit.html:94
 msgid "Enable public registration"
 msgstr ""
 
-#: cps/templates/config_edit.html:55
+#: cps/templates/config_edit.html:96
 msgid "Default Settings for new users"
 msgstr ""
 
-#: cps/templates/config_edit.html:58 cps/templates/user_edit.html:83
+#: cps/templates/config_edit.html:99 cps/templates/user_edit.html:87
 msgid "Admin user"
 msgstr "Usuario Administrador"
 
-#: cps/templates/config_edit.html:62 cps/templates/user_edit.html:88
+#: cps/templates/config_edit.html:103 cps/templates/user_edit.html:92
 msgid "Allow Downloads"
 msgstr "Permitir descargas"
 
-#: cps/templates/config_edit.html:66 cps/templates/user_edit.html:92
+#: cps/templates/config_edit.html:107 cps/templates/user_edit.html:96
 msgid "Allow Uploads"
 msgstr "Permitir subidas de archivos"
 
-#: cps/templates/config_edit.html:70 cps/templates/user_edit.html:96
+#: cps/templates/config_edit.html:111 cps/templates/user_edit.html:100
 msgid "Allow Edit"
 msgstr "Permitir editar"
 
-#: cps/templates/config_edit.html:74 cps/templates/user_edit.html:101
+#: cps/templates/config_edit.html:115 cps/templates/user_edit.html:105
 msgid "Allow Changing Password"
 msgstr "Permitir cambiar la clave"
 
-#: cps/templates/config_edit.html:81 cps/templates/layout.html:93
+#: cps/templates/config_edit.html:122 cps/templates/layout.html:93
 #: cps/templates/login.html:4
 msgid "Login"
 msgstr "Inicio de Sesion"
@@ -719,19 +743,23 @@ msgstr "Lenguaje"
 msgid "Publishing date"
 msgstr ""
 
-#: cps/templates/detail.html:113
+#: cps/templates/detail.html:115
+msgid "Read"
+msgstr ""
+
+#: cps/templates/detail.html:123
 msgid "Description:"
 msgstr "Descripcion :"
 
-#: cps/templates/detail.html:141
+#: cps/templates/detail.html:151
 msgid "Read in browser"
 msgstr "Ver en el navegador"
 
-#: cps/templates/detail.html:161
+#: cps/templates/detail.html:171
 msgid "Add to shelf"
 msgstr "Agregar al estante"
 
-#: cps/templates/detail.html:201
+#: cps/templates/detail.html:211
 msgid "Edit metadata"
 msgstr "Editar la metadata"
 
@@ -811,19 +839,29 @@ msgstr "Libros Recientes"
 msgid "Show Random Books"
 msgstr "Mostrar libros al azar"
 
-#: cps/templates/index.xml:43 cps/templates/layout.html:140
+#: cps/templates/index.xml:43 cps/templates/index.xml:47
+#: cps/templates/layout.html:132
+msgid "Read Books"
+msgstr ""
+
+#: cps/templates/index.xml:50 cps/templates/index.xml:54
+#: cps/templates/layout.html:133
+msgid "Unread Books"
+msgstr ""
+
+#: cps/templates/index.xml:57 cps/templates/layout.html:144
 msgid "Authors"
 msgstr "Autores"
 
-#: cps/templates/index.xml:47
+#: cps/templates/index.xml:61
 msgid "Books ordered by Author"
 msgstr "Libros ordenados por Autor"
 
-#: cps/templates/index.xml:54
+#: cps/templates/index.xml:68
 msgid "Books ordered by category"
 msgstr "Libros ordenados por Categorias"
 
-#: cps/templates/index.xml:61
+#: cps/templates/index.xml:75
 msgid "Books ordered by series"
 msgstr "Libros ordenados por Series"
 
@@ -847,31 +885,31 @@ msgstr "Registro"
 msgid "Browse"
 msgstr "Explorar"
 
-#: cps/templates/layout.html:132
+#: cps/templates/layout.html:136
 msgid "Discover"
 msgstr "Descubrir"
 
-#: cps/templates/layout.html:135
+#: cps/templates/layout.html:139
 msgid "Categories"
 msgstr "Categoria"
 
-#: cps/templates/layout.html:142 cps/templates/search_form.html:58
+#: cps/templates/layout.html:146 cps/templates/search_form.html:58
 msgid "Languages"
 msgstr "Lenguaje"
 
-#: cps/templates/layout.html:145
+#: cps/templates/layout.html:149
 msgid "Public Shelves"
 msgstr "Estantes Publicos"
 
-#: cps/templates/layout.html:149
+#: cps/templates/layout.html:153
 msgid "Your Shelves"
 msgstr "Sus Estantes"
 
-#: cps/templates/layout.html:154
+#: cps/templates/layout.html:158
 msgid "Create a Shelf"
 msgstr "Crear un estante"
 
-#: cps/templates/layout.html:155
+#: cps/templates/layout.html:159
 msgid "About"
 msgstr "Acerca de"
 
@@ -1042,14 +1080,18 @@ msgid "Show author selection"
 msgstr ""
 
 #: cps/templates/user_edit.html:75
+msgid "Show read and unread"
+msgstr ""
+
+#: cps/templates/user_edit.html:79
 msgid "Show random books in detail view"
 msgstr ""
 
-#: cps/templates/user_edit.html:108
+#: cps/templates/user_edit.html:112
 msgid "Delete this user"
 msgstr "Borrar este usuario"
 
-#: cps/templates/user_edit.html:123
+#: cps/templates/user_edit.html:127
 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 9eee3c16..c31e7107 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-03-12 19:10+0100\n"
+"POT-Creation-Date: 2017-03-19 19:20+0100\n"
 "PO-Revision-Date: 2016-11-13 18:35+0100\n"
 "Last-Translator: Nicolas Roudninski <nicoroud@gmail.com>\n"
 "Language: fr\n"
@@ -31,356 +31,356 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-#: cps/book_formats.py:113 cps/book_formats.py:117 cps/web.py:1082
+#: cps/book_formats.py:113 cps/book_formats.py:117 cps/web.py:1244
 msgid "not installed"
 msgstr ""
 
-#: cps/helper.py:159
+#: cps/helper.py:164
 #, python-format
 msgid "Failed to send mail: %s"
 msgstr "Impossible d'envoyer le courriel : %s"
 
-#: cps/helper.py:166
+#: cps/helper.py:171
 msgid "Calibre-web test email"
 msgstr ""
 
-#: cps/helper.py:167 cps/helper.py:179
+#: cps/helper.py:172 cps/helper.py:184
 msgid "This email has been sent via calibre web."
 msgstr "Ce message a été envoyé depuis calibre web."
 
-#: cps/helper.py:176 cps/templates/detail.html:136
+#: cps/helper.py:181 cps/templates/detail.html:146
 msgid "Send to Kindle"
 msgstr "Envoyer ver Kindle"
 
-#: cps/helper.py:196 cps/helper.py:211
+#: cps/helper.py:201 cps/helper.py:216
 msgid "Could not find any formats suitable for sending by email"
 msgstr "Impossible de trouver un format adapté à envoyer par courriel"
 
-#: cps/helper.py:205
+#: cps/helper.py:210
 msgid "Could not convert epub to mobi"
 msgstr "Impossible de convertir epub vers mobi"
 
-#: cps/ub.py:442
+#: cps/ub.py:488
 msgid "Guest"
 msgstr ""
 
-#: cps/web.py:768
+#: cps/web.py:904
 msgid "Requesting update package"
 msgstr ""
 
-#: cps/web.py:769
+#: cps/web.py:905
 msgid "Downloading update package"
 msgstr ""
 
-#: cps/web.py:770
+#: cps/web.py:906
 msgid "Unzipping update package"
 msgstr ""
 
-#: cps/web.py:771
+#: cps/web.py:907
 msgid "Files are replaced"
 msgstr ""
 
-#: cps/web.py:772
+#: cps/web.py:908
 msgid "Database connections are closed"
 msgstr ""
 
-#: cps/web.py:773
+#: cps/web.py:909
 msgid "Server is stopped"
 msgstr ""
 
-#: cps/web.py:774
+#: cps/web.py:910
 msgid "Update finished, please press okay and reload page"
 msgstr ""
 
-#: cps/web.py:847
+#: cps/web.py:983
 msgid "Latest Books"
 msgstr "Derniers livres"
 
-#: cps/web.py:878
+#: cps/web.py:1014
 msgid "Hot Books (most downloaded)"
 msgstr "Livres populaires (les plus téléchargés)"
 
-#: cps/web.py:888
+#: cps/web.py:1024
 msgid "Best rated books"
 msgstr ""
 
-#: cps/templates/index.xml:36 cps/web.py:897
+#: cps/templates/index.xml:36 cps/web.py:1033
 msgid "Random Books"
 msgstr "Livres au hasard"
 
-#: cps/web.py:910
+#: cps/web.py:1046
 msgid "Author list"
 msgstr "Liste des auteurs"
 
-#: cps/web.py:921
+#: cps/web.py:1057
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:923 cps/web.py:951 cps/web.py:1059 cps/web.py:1309
-#: cps/web.py:2196
+#: cps/web.py:1059 cps/web.py:1087 cps/web.py:1221 cps/web.py:1626
+#: cps/web.py:2579
 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:57 cps/web.py:937
+#: cps/templates/index.xml:71 cps/web.py:1073
 msgid "Series list"
 msgstr "Liste des séries"
 
-#: cps/web.py:949
+#: cps/web.py:1085
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Séries : %(serie)s"
 
-#: cps/web.py:982
+#: cps/web.py:1118
 msgid "Available languages"
 msgstr "Langues disponibles"
 
-#: cps/web.py:997
+#: cps/web.py:1133
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Langue : %(name)s"
 
-#: cps/templates/index.xml:50 cps/web.py:1010
+#: cps/templates/index.xml:64 cps/web.py:1146
 msgid "Category list"
 msgstr "Liste des catégories"
 
-#: cps/web.py:1022
+#: cps/web.py:1158
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Catégorie : %(name)s"
 
-#: cps/web.py:1105
+#: cps/web.py:1267
 msgid "Statistics"
 msgstr "Statistiques"
 
-#: cps/web.py:1126
+#: cps/web.py:1375
 msgid "Server restarted, please reload page"
 msgstr ""
 
-#: cps/web.py:1128
+#: cps/web.py:1377
 msgid "Performing shutdown of server, please close window"
 msgstr ""
 
-#: cps/web.py:1143
+#: cps/web.py:1392
 msgid "Update done"
 msgstr ""
 
-#: cps/web.py:1221 cps/web.py:1234
+#: cps/web.py:1470 cps/web.py:1483
 msgid "search"
 msgstr ""
 
-#: cps/web.py:1285 cps/web.py:1292 cps/web.py:1299 cps/web.py:1306
+#: cps/web.py:1602 cps/web.py:1609 cps/web.py:1616 cps/web.py:1623
 msgid "Read a Book"
 msgstr "Lire un livre"
 
-#: cps/web.py:1350 cps/web.py:1789
+#: cps/web.py:1676 cps/web.py:2152
 msgid "Please fill out all fields!"
 msgstr "SVP, complétez tous les champs !"
 
-#: cps/web.py:1351 cps/web.py:1367 cps/web.py:1372 cps/web.py:1374
+#: cps/web.py:1677 cps/web.py:1693 cps/web.py:1698 cps/web.py:1700
 msgid "register"
 msgstr "S'enregistrer"
 
-#: cps/web.py:1366
+#: cps/web.py:1692
 msgid "An unknown error occured. Please try again later."
 msgstr "Une erreur a eu lieu. Merci de réessayez plus tard."
 
-#: cps/web.py:1371
+#: cps/web.py:1697
 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:1389
+#: cps/web.py:1715
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Vous êtes maintenant connecté sous : '%(nickname)s'"
 
-#: cps/web.py:1394
+#: cps/web.py:1720
 msgid "Wrong Username or Password"
 msgstr "Mauvais nom d'utilisateur ou mot de passe"
 
-#: cps/web.py:1396
+#: cps/web.py:1722
 msgid "login"
 msgstr "Connexion"
 
-#: cps/web.py:1413
+#: cps/web.py:1739
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Veillez configurer les paramètres smtp d'abord..."
 
-#: cps/web.py:1417
+#: cps/web.py:1743
 #, python-format
 msgid "Book successfully send to %(kindlemail)s"
 msgstr "Livres envoyés à %(kindlemail)s avec succès"
 
-#: cps/web.py:1421
+#: cps/web.py:1747
 #, 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:1423 cps/web.py:1867
+#: cps/web.py:1749 cps/web.py:2232
 msgid "Please configure your kindle email address first..."
 msgstr "Veuillez configurer votre adresse kindle d'abord..."
 
-#: cps/web.py:1443
+#: cps/web.py:1774
 #, 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:1464
+#: cps/web.py:1793
 #, 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:1483 cps/web.py:1507
+#: cps/web.py:1812 cps/web.py:1836
 #, 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:1488
+#: cps/web.py:1817
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Étagère %(title)s créée"
 
-#: cps/web.py:1490 cps/web.py:1518
+#: cps/web.py:1819 cps/web.py:1847
 msgid "There was an error"
 msgstr "Il y a eu une erreur"
 
-#: cps/web.py:1491 cps/web.py:1493
+#: cps/web.py:1820 cps/web.py:1822
 msgid "create a shelf"
 msgstr "Créer une étagère"
 
-#: cps/web.py:1516
+#: cps/web.py:1845
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr ""
 
-#: cps/web.py:1519 cps/web.py:1521
+#: cps/web.py:1848 cps/web.py:1850
 msgid "Edit a shelf"
 msgstr ""
 
-#: cps/web.py:1539
+#: cps/web.py:1868
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "L'étagère %(name)s a été supprimé avec succès"
 
-#: cps/web.py:1561
+#: cps/web.py:1890
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Étagère : '%(name)s'"
 
-#: cps/web.py:1592
+#: cps/web.py:1921
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/web.py:1654
+#: cps/web.py:1985
 msgid "Found an existing account for this email address."
 msgstr "Un compte avec cette adresse de courriel existe déjà."
 
-#: cps/web.py:1656 cps/web.py:1660
+#: cps/web.py:1987 cps/web.py:1991
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil de %(name)s"
 
-#: cps/web.py:1657
+#: cps/web.py:1988
 msgid "Profile updated"
 msgstr "Profil mis à jour"
 
-#: cps/web.py:1671
+#: cps/web.py:2002
 msgid "Admin page"
 msgstr ""
 
-#: cps/web.py:1744
+#: cps/web.py:2106
 msgid "Calibre-web configuration updated"
 msgstr ""
 
-#: cps/web.py:1751 cps/web.py:1757 cps/web.py:1770
+#: cps/web.py:2113 cps/web.py:2119 cps/web.py:2133
 msgid "Basic Configuration"
 msgstr ""
 
-#: cps/web.py:1755
+#: cps/web.py:2117
 msgid "DB location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/templates/admin.html:34 cps/web.py:1791 cps/web.py:1837
+#: cps/templates/admin.html:34 cps/web.py:2154 cps/web.py:2202
 msgid "Add new user"
 msgstr "Ajouter un nouvel utilisateur"
 
-#: cps/web.py:1829
+#: cps/web.py:2194
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Utilisateur '%(user)s' créé"
 
-#: cps/web.py:1833
+#: cps/web.py:2198
 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:1855
+#: cps/web.py:2220
 msgid "Mail settings updated"
 msgstr "Paramètres de courriel mis à jour"
 
-#: cps/web.py:1862
+#: cps/web.py:2227
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1865
+#: cps/web.py:2230
 #, python-format
 msgid "There was an error sending the Test E-Mail: %(res)s"
 msgstr ""
 
-#: cps/web.py:1869
+#: cps/web.py:2234
 msgid "E-Mail settings updated"
 msgstr ""
 
-#: cps/web.py:1870
+#: cps/web.py:2235
 msgid "Edit mail settings"
 msgstr "Éditer les paramètres de courriel"
 
-#: cps/web.py:1898
+#: cps/web.py:2263
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Utilisateur '%(nick)s' supprimé"
 
-#: cps/web.py:1979
+#: cps/web.py:2349
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Utilisateur '%(nick)s'  mis à jour"
 
-#: cps/web.py:1982
+#: cps/web.py:2352
 msgid "An unknown error occured."
 msgstr "Oups ! Une erreur inconnue a eu lieu."
 
-#: cps/web.py:1985
+#: cps/web.py:2355
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Éditer l'utilisateur %(nick)s"
 
-#: cps/web.py:2191 cps/web.py:2194 cps/web.py:2304
+#: cps/web.py:2574 cps/web.py:2577 cps/web.py:2689
 msgid "edit metadata"
 msgstr ""
 
-#: cps/web.py:2215
+#: cps/web.py:2598
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr ""
 
-#: cps/web.py:2221
+#: cps/web.py:2604
 msgid "File to be uploaded must have an extension"
 msgstr ""
 
-#: cps/web.py:2238
+#: cps/web.py:2621
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Impossible de créer le chemin %s (permission refusée)"
 
-#: cps/web.py:2243
+#: cps/web.py:2626
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Impossible d'enregistrer le fichier %s (permission refusée)"
 
-#: cps/web.py:2248
+#: cps/web.py:2631
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Impossible de supprimer le fichier %s (permission refusée)"
@@ -409,7 +409,7 @@ msgstr "DLS"
 msgid "Admin"
 msgstr "Administration"
 
-#: cps/templates/admin.html:13 cps/templates/detail.html:124
+#: cps/templates/admin.html:13 cps/templates/detail.html:134
 msgid "Download"
 msgstr "Télécharger"
 
@@ -465,7 +465,7 @@ msgstr ""
 msgid "Calibre DB dir"
 msgstr ""
 
-#: cps/templates/admin.html:61 cps/templates/config_edit.html:35
+#: cps/templates/admin.html:61 cps/templates/config_edit.html:76
 msgid "Log Level"
 msgstr ""
 
@@ -473,7 +473,7 @@ msgstr ""
 msgid "Port"
 msgstr ""
 
-#: cps/templates/admin.html:63 cps/templates/config_edit.html:19
+#: cps/templates/admin.html:63 cps/templates/config_edit.html:60
 msgid "Books per page"
 msgstr ""
 
@@ -531,9 +531,9 @@ msgid "Ok"
 msgstr ""
 
 #: cps/templates/admin.html:103 cps/templates/admin.html:117
-#: cps/templates/book_edit.html:109 cps/templates/config_edit.html:78
+#: cps/templates/book_edit.html:109 cps/templates/config_edit.html:119
 #: cps/templates/email_edit.html:36 cps/templates/shelf_edit.html:17
-#: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:116
+#: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:120
 msgid "Back"
 msgstr "Retour"
 
@@ -562,7 +562,7 @@ msgstr "Description"
 msgid "Tags"
 msgstr "Étiquette"
 
-#: cps/templates/book_edit.html:33 cps/templates/layout.html:138
+#: cps/templates/book_edit.html:33 cps/templates/layout.html:142
 #: cps/templates/search_form.html:37
 msgid "Series"
 msgstr "Séries"
@@ -599,9 +599,9 @@ msgstr "Voir le livre après l'édition"
 msgid "Get metadata"
 msgstr ""
 
-#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:76
+#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:117
 #: cps/templates/login.html:19 cps/templates/search_form.html:79
-#: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:114
+#: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:118
 msgid "Submit"
 msgstr "Soumettre"
 
@@ -650,63 +650,87 @@ msgstr ""
 msgid "Location of Calibre database"
 msgstr ""
 
-#: cps/templates/config_edit.html:11
+#: cps/templates/config_edit.html:13
+msgid "Use google drive?"
+msgstr ""
+
+#: cps/templates/config_edit.html:17
+msgid "Client id"
+msgstr ""
+
+#: cps/templates/config_edit.html:21
+msgid "Client secret"
+msgstr ""
+
+#: cps/templates/config_edit.html:25
+msgid "Calibre Base URL"
+msgstr ""
+
+#: cps/templates/config_edit.html:29
+msgid "Google drive Calibre folder"
+msgstr ""
+
+#: cps/templates/config_edit.html:38
+msgid "Metadata Watch Channel ID"
+msgstr ""
+
+#: cps/templates/config_edit.html:52
 msgid "Server Port"
 msgstr ""
 
-#: cps/templates/config_edit.html:15 cps/templates/shelf_edit.html:7
+#: cps/templates/config_edit.html:56 cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr "Titre"
 
-#: cps/templates/config_edit.html:23
+#: cps/templates/config_edit.html:64
 msgid "No. of random books to show"
 msgstr ""
 
-#: cps/templates/config_edit.html:27
+#: cps/templates/config_edit.html:68
 msgid "Regular expression for ignoring columns"
 msgstr ""
 
-#: cps/templates/config_edit.html:31
+#: cps/templates/config_edit.html:72
 msgid "Regular expression for title sorting"
 msgstr ""
 
-#: cps/templates/config_edit.html:45
+#: cps/templates/config_edit.html:86
 msgid "Enable uploading"
 msgstr ""
 
-#: cps/templates/config_edit.html:49
+#: cps/templates/config_edit.html:90
 msgid "Enable anonymous browsing"
 msgstr ""
 
-#: cps/templates/config_edit.html:53
+#: cps/templates/config_edit.html:94
 msgid "Enable public registration"
 msgstr ""
 
-#: cps/templates/config_edit.html:55
+#: cps/templates/config_edit.html:96
 msgid "Default Settings for new users"
 msgstr ""
 
-#: cps/templates/config_edit.html:58 cps/templates/user_edit.html:83
+#: cps/templates/config_edit.html:99 cps/templates/user_edit.html:87
 msgid "Admin user"
 msgstr "Utilisateur admin"
 
-#: cps/templates/config_edit.html:62 cps/templates/user_edit.html:88
+#: cps/templates/config_edit.html:103 cps/templates/user_edit.html:92
 msgid "Allow Downloads"
 msgstr "Permettre les téléchargements"
 
-#: cps/templates/config_edit.html:66 cps/templates/user_edit.html:92
+#: cps/templates/config_edit.html:107 cps/templates/user_edit.html:96
 msgid "Allow Uploads"
 msgstr "Permettre les téléversements"
 
-#: cps/templates/config_edit.html:70 cps/templates/user_edit.html:96
+#: cps/templates/config_edit.html:111 cps/templates/user_edit.html:100
 msgid "Allow Edit"
 msgstr "Permettre l'édition"
 
-#: cps/templates/config_edit.html:74 cps/templates/user_edit.html:101
+#: cps/templates/config_edit.html:115 cps/templates/user_edit.html:105
 msgid "Allow Changing Password"
 msgstr "Permettre le changement de mot de passe"
 
-#: cps/templates/config_edit.html:81 cps/templates/layout.html:93
+#: cps/templates/config_edit.html:122 cps/templates/layout.html:93
 #: cps/templates/login.html:4
 msgid "Login"
 msgstr "Connexion"
@@ -727,19 +751,23 @@ msgstr "Langue"
 msgid "Publishing date"
 msgstr ""
 
-#: cps/templates/detail.html:113
+#: cps/templates/detail.html:115
+msgid "Read"
+msgstr ""
+
+#: cps/templates/detail.html:123
 msgid "Description:"
 msgstr "Description :"
 
-#: cps/templates/detail.html:141
+#: cps/templates/detail.html:151
 msgid "Read in browser"
 msgstr "Lire dans le navigateur"
 
-#: cps/templates/detail.html:161
+#: cps/templates/detail.html:171
 msgid "Add to shelf"
 msgstr "Ajouter à l'étagère"
 
-#: cps/templates/detail.html:201
+#: cps/templates/detail.html:211
 msgid "Edit metadata"
 msgstr "Éditer les métadonnées"
 
@@ -819,19 +847,29 @@ msgstr "Les derniers livres"
 msgid "Show Random Books"
 msgstr "Montrer des livres au hasard"
 
-#: cps/templates/index.xml:43 cps/templates/layout.html:140
+#: cps/templates/index.xml:43 cps/templates/index.xml:47
+#: cps/templates/layout.html:132
+msgid "Read Books"
+msgstr ""
+
+#: cps/templates/index.xml:50 cps/templates/index.xml:54
+#: cps/templates/layout.html:133
+msgid "Unread Books"
+msgstr ""
+
+#: cps/templates/index.xml:57 cps/templates/layout.html:144
 msgid "Authors"
 msgstr "Auteurs"
 
-#: cps/templates/index.xml:47
+#: cps/templates/index.xml:61
 msgid "Books ordered by Author"
 msgstr "Livres classés par auteur"
 
-#: cps/templates/index.xml:54
+#: cps/templates/index.xml:68
 msgid "Books ordered by category"
 msgstr "Livres classés par catégorie"
 
-#: cps/templates/index.xml:61
+#: cps/templates/index.xml:75
 msgid "Books ordered by series"
 msgstr "Livres classés par série"
 
@@ -855,31 +893,31 @@ msgstr "S'enregistrer"
 msgid "Browse"
 msgstr "Explorer"
 
-#: cps/templates/layout.html:132
+#: cps/templates/layout.html:136
 msgid "Discover"
 msgstr "Découvrir"
 
-#: cps/templates/layout.html:135
+#: cps/templates/layout.html:139
 msgid "Categories"
 msgstr "Catégories"
 
-#: cps/templates/layout.html:142 cps/templates/search_form.html:58
+#: cps/templates/layout.html:146 cps/templates/search_form.html:58
 msgid "Languages"
 msgstr "Langues"
 
-#: cps/templates/layout.html:145
+#: cps/templates/layout.html:149
 msgid "Public Shelves"
 msgstr "Étagères publiques"
 
-#: cps/templates/layout.html:149
+#: cps/templates/layout.html:153
 msgid "Your Shelves"
 msgstr "Vos étagères"
 
-#: cps/templates/layout.html:154
+#: cps/templates/layout.html:158
 msgid "Create a Shelf"
 msgstr "Créer une étagère"
 
-#: cps/templates/layout.html:155
+#: cps/templates/layout.html:159
 msgid "About"
 msgstr "À popos"
 
@@ -1050,14 +1088,18 @@ msgid "Show author selection"
 msgstr ""
 
 #: cps/templates/user_edit.html:75
+msgid "Show read and unread"
+msgstr ""
+
+#: cps/templates/user_edit.html:79
 msgid "Show random books in detail view"
 msgstr ""
 
-#: cps/templates/user_edit.html:108
+#: cps/templates/user_edit.html:112
 msgid "Delete this user"
 msgstr "Supprimer cet utilisateur"
 
-#: cps/templates/user_edit.html:123
+#: cps/templates/user_edit.html:127
 msgid "Recent Downloads"
 msgstr "Téléchargements récents"
 
diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po
index dcc48b6c..9a394e9d 100644
--- a/cps/translations/pl/LC_MESSAGES/messages.po
+++ b/cps/translations/pl/LC_MESSAGES/messages.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Calibre Web - polski (POT: 2017-03-11 09:09)\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2017-03-12 19:10+0100\n"
+"POT-Creation-Date: 2017-03-19 19:20+0100\n"
 "PO-Revision-Date: 2017-03-11 14:53+0100\n"
 "Last-Translator: Radosław Kierznowski <radek.kierznowski@outlook.com>\n"
 "Language: pl\n"
@@ -24,356 +24,356 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-#: cps/book_formats.py:113 cps/book_formats.py:117 cps/web.py:1082
+#: cps/book_formats.py:113 cps/book_formats.py:117 cps/web.py:1244
 msgid "not installed"
 msgstr "nie zainstalowane"
 
-#: cps/helper.py:159
+#: cps/helper.py:164
 #, python-format
 msgid "Failed to send mail: %s"
 msgstr "Nie można wysłać poczty: %s"
 
-#: cps/helper.py:166
+#: cps/helper.py:171
 msgid "Calibre-web test email"
 msgstr "Calibre-web testowy email"
 
-#: cps/helper.py:167 cps/helper.py:179
+#: cps/helper.py:172 cps/helper.py:184
 msgid "This email has been sent via calibre web."
 msgstr "Ten e-mail został wysłany przez Calibre Web."
 
-#: cps/helper.py:176 cps/templates/detail.html:136
+#: cps/helper.py:181 cps/templates/detail.html:146
 msgid "Send to Kindle"
 msgstr "Wyślij do Kindle"
 
-#: cps/helper.py:196 cps/helper.py:211
+#: cps/helper.py:201 cps/helper.py:216
 msgid "Could not find any formats suitable for sending by email"
 msgstr ""
 "Nie można znaleźć żadnych formatów przystosowane do wysyłania pocztą "
 "e-mail"
 
-#: cps/helper.py:205
+#: cps/helper.py:210
 msgid "Could not convert epub to mobi"
 msgstr "Nie można konwertować epub do mobi"
 
-#: cps/ub.py:442
+#: cps/ub.py:488
 msgid "Guest"
 msgstr "Gość"
 
-#: cps/web.py:768
+#: cps/web.py:904
 msgid "Requesting update package"
 msgstr "Żądanie o pakiet aktualizacji"
 
-#: cps/web.py:769
+#: cps/web.py:905
 msgid "Downloading update package"
 msgstr "Pobieranie pakietu aktualizacji"
 
-#: cps/web.py:770
+#: cps/web.py:906
 msgid "Unzipping update package"
 msgstr "Rozpakowywanie pakietu aktualizacji"
 
-#: cps/web.py:771
+#: cps/web.py:907
 msgid "Files are replaced"
 msgstr "Pliki zostały zastąpione"
 
-#: cps/web.py:772
+#: cps/web.py:908
 msgid "Database connections are closed"
 msgstr "Połączenia z bazą danych zostały zakończone"
 
-#: cps/web.py:773
+#: cps/web.py:909
 msgid "Server is stopped"
 msgstr "Serwer jest zatrzymany"
 
-#: cps/web.py:774
+#: cps/web.py:910
 msgid "Update finished, please press okay and reload page"
 msgstr "Aktualizacja zakończona, proszę nacisnąć OK i odświeżyć stronę"
 
-#: cps/web.py:847
+#: cps/web.py:983
 msgid "Latest Books"
 msgstr "Ostatnie książki"
 
-#: cps/web.py:878
+#: cps/web.py:1014
 msgid "Hot Books (most downloaded)"
 msgstr "Najpopularniejsze książki (najczęściej pobierane)"
 
-#: cps/web.py:888
+#: cps/web.py:1024
 msgid "Best rated books"
 msgstr "Najlepiej oceniane książki"
 
-#: cps/templates/index.xml:36 cps/web.py:897
+#: cps/templates/index.xml:36 cps/web.py:1033
 msgid "Random Books"
 msgstr "Losowe książki"
 
-#: cps/web.py:910
+#: cps/web.py:1046
 msgid "Author list"
 msgstr "Lista autorów"
 
-#: cps/web.py:921
+#: cps/web.py:1057
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autor: %(name)s"
 
-#: cps/web.py:923 cps/web.py:951 cps/web.py:1059 cps/web.py:1309
-#: cps/web.py:2196
+#: cps/web.py:1059 cps/web.py:1087 cps/web.py:1221 cps/web.py:1626
+#: cps/web.py:2579
 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:57 cps/web.py:937
+#: cps/templates/index.xml:71 cps/web.py:1073
 msgid "Series list"
 msgstr "Lista serii"
 
-#: cps/web.py:949
+#: cps/web.py:1085
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Seria: %(serie)s"
 
-#: cps/web.py:982
+#: cps/web.py:1118
 msgid "Available languages"
 msgstr "Dostępne języki"
 
-#: cps/web.py:997
+#: cps/web.py:1133
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Język: %(name)s"
 
-#: cps/templates/index.xml:50 cps/web.py:1010
+#: cps/templates/index.xml:64 cps/web.py:1146
 msgid "Category list"
 msgstr "Lista kategorii"
 
-#: cps/web.py:1022
+#: cps/web.py:1158
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategoria: %(name)s"
 
-#: cps/web.py:1105
+#: cps/web.py:1267
 msgid "Statistics"
 msgstr "Statystyki"
 
-#: cps/web.py:1126
+#: cps/web.py:1375
 msgid "Server restarted, please reload page"
 msgstr "Serwer uruchomiony ponownie, proszę odświeżyć stronę"
 
-#: cps/web.py:1128
+#: cps/web.py:1377
 msgid "Performing shutdown of server, please close window"
 msgstr "Wykonano wyłączenie serwera, proszę zamknąć okno"
 
-#: cps/web.py:1143
+#: cps/web.py:1392
 msgid "Update done"
 msgstr "Aktualizacja zakończona"
 
-#: cps/web.py:1221 cps/web.py:1234
+#: cps/web.py:1470 cps/web.py:1483
 msgid "search"
 msgstr "szukaj"
 
-#: cps/web.py:1285 cps/web.py:1292 cps/web.py:1299 cps/web.py:1306
+#: cps/web.py:1602 cps/web.py:1609 cps/web.py:1616 cps/web.py:1623
 msgid "Read a Book"
 msgstr "Czytaj książkę"
 
-#: cps/web.py:1350 cps/web.py:1789
+#: cps/web.py:1676 cps/web.py:2152
 msgid "Please fill out all fields!"
 msgstr "Proszę wypełnić wszystkie pola!"
 
-#: cps/web.py:1351 cps/web.py:1367 cps/web.py:1372 cps/web.py:1374
+#: cps/web.py:1677 cps/web.py:1693 cps/web.py:1698 cps/web.py:1700
 msgid "register"
 msgstr "rejestracja"
 
-#: cps/web.py:1366
+#: cps/web.py:1692
 msgid "An unknown error occured. Please try again later."
 msgstr "Wystąpił nieznany błąd. Spróbuj ponownie później."
 
-#: cps/web.py:1371
+#: cps/web.py:1697
 msgid "This username or email address is already in use."
 msgstr "Nazwa użytkownika lub adres e-mail jest już w użyciu."
 
-#: cps/web.py:1389
+#: cps/web.py:1715
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Zalogowałeś się jako: '%(nickname)s'"
 
-#: cps/web.py:1394
+#: cps/web.py:1720
 msgid "Wrong Username or Password"
 msgstr "Błędna nazwa użytkownika lub hasło"
 
-#: cps/web.py:1396
+#: cps/web.py:1722
 msgid "login"
 msgstr "logowanie"
 
-#: cps/web.py:1413
+#: cps/web.py:1739
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Proszę najpierw skonfigurować ustawienia SMTP poczty e-mail..."
 
-#: cps/web.py:1417
+#: cps/web.py:1743
 #, python-format
 msgid "Book successfully send to %(kindlemail)s"
 msgstr "Książka została pomyślnie wysłana do %(kindlemail)s"
 
-#: cps/web.py:1421
+#: cps/web.py:1747
 #, 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:1423 cps/web.py:1867
+#: cps/web.py:1749 cps/web.py:2232
 msgid "Please configure your kindle email address first..."
 msgstr "Proszę najpierw skonfigurować adres e-mail swojego kindla..."
 
-#: cps/web.py:1443
+#: cps/web.py:1774
 #, 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:1464
+#: cps/web.py:1793
 #, 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:1483 cps/web.py:1507
+#: cps/web.py:1812 cps/web.py:1836
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr "Półka o nazwie '%(title)s' już istnieje."
 
-#: cps/web.py:1488
+#: cps/web.py:1817
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Półka %(title)s została utworzona"
 
-#: cps/web.py:1490 cps/web.py:1518
+#: cps/web.py:1819 cps/web.py:1847
 msgid "There was an error"
 msgstr "Wystąpił błąd"
 
-#: cps/web.py:1491 cps/web.py:1493
+#: cps/web.py:1820 cps/web.py:1822
 msgid "create a shelf"
 msgstr "utwórz półkę"
 
-#: cps/web.py:1516
+#: cps/web.py:1845
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Półka %(title)s została zmieniona"
 
-#: cps/web.py:1519 cps/web.py:1521
+#: cps/web.py:1848 cps/web.py:1850
 msgid "Edit a shelf"
 msgstr "Edytuj półkę"
 
-#: cps/web.py:1539
+#: cps/web.py:1868
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "pomyślnie usunięto półkę %(name)s"
 
-#: cps/web.py:1561
+#: cps/web.py:1890
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Półka: '%(name)s'"
 
-#: cps/web.py:1592
+#: cps/web.py:1921
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Zmieniono kolejność półki: '%(name)s'"
 
-#: cps/web.py:1654
+#: cps/web.py:1985
 msgid "Found an existing account for this email address."
 msgstr "Znaleziono istniejące konto dla tego adresu e-mail."
 
-#: cps/web.py:1656 cps/web.py:1660
+#: cps/web.py:1987 cps/web.py:1991
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil użytkownika %(name)s"
 
-#: cps/web.py:1657
+#: cps/web.py:1988
 msgid "Profile updated"
 msgstr "Zaktualizowano profil"
 
-#: cps/web.py:1671
+#: cps/web.py:2002
 msgid "Admin page"
 msgstr "Portal administracyjny"
 
-#: cps/web.py:1744
+#: cps/web.py:2106
 msgid "Calibre-web configuration updated"
 msgstr "Konfiguracja Calibre-web została zaktualizowana"
 
-#: cps/web.py:1751 cps/web.py:1757 cps/web.py:1770
+#: cps/web.py:2113 cps/web.py:2119 cps/web.py:2133
 msgid "Basic Configuration"
 msgstr "Podstawowa konfiguracja"
 
-#: cps/web.py:1755
+#: cps/web.py:2117
 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:34 cps/web.py:1791 cps/web.py:1837
+#: cps/templates/admin.html:34 cps/web.py:2154 cps/web.py:2202
 msgid "Add new user"
 msgstr "Dodaj nowego użytkownika"
 
-#: cps/web.py:1829
+#: cps/web.py:2194
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Użytkownik '%(user)s' został utworzony"
 
-#: cps/web.py:1833
+#: cps/web.py:2198
 msgid "Found an existing account for this email address or nickname."
 msgstr "Znaleziono istniejące konto dla tego adresu e-mail lub nazwy użytkownika."
 
-#: cps/web.py:1855
+#: cps/web.py:2220
 msgid "Mail settings updated"
 msgstr "Zaktualizowano ustawienia poczty e-mail"
 
-#: cps/web.py:1862
+#: cps/web.py:2227
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr "Testowy e-mail został pomyślnie wysłany do %(kindlemail)s"
 
-#: cps/web.py:1865
+#: cps/web.py:2230
 #, python-format
 msgid "There was an error sending the Test E-Mail: %(res)s"
 msgstr "Wystąpił błąd podczas wysyłania testowej wiadomości e-mail: %(res)s"
 
-#: cps/web.py:1869
+#: cps/web.py:2234
 msgid "E-Mail settings updated"
 msgstr "Zaktualizowano ustawienia e-mail"
 
-#: cps/web.py:1870
+#: cps/web.py:2235
 msgid "Edit mail settings"
 msgstr "Edytuj ustawienia poczty e-mail"
 
-#: cps/web.py:1898
+#: cps/web.py:2263
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Użytkownik '%(nick)s' został usunięty"
 
-#: cps/web.py:1979
+#: cps/web.py:2349
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Użytkownik '%(nick)s' został zaktualizowany"
 
-#: cps/web.py:1982
+#: cps/web.py:2352
 msgid "An unknown error occured."
 msgstr "Wystąpił nieznany błąd."
 
-#: cps/web.py:1985
+#: cps/web.py:2355
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Edytuj użytkownika %(nick)s"
 
-#: cps/web.py:2191 cps/web.py:2194 cps/web.py:2304
+#: cps/web.py:2574 cps/web.py:2577 cps/web.py:2689
 msgid "edit metadata"
 msgstr "edytuj metadane"
 
-#: cps/web.py:2215
+#: cps/web.py:2598
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr "Rozszerzenie pliku \"%s\" nie jest dozwolone do przesłania na ten serwer"
 
-#: cps/web.py:2221
+#: cps/web.py:2604
 msgid "File to be uploaded must have an extension"
 msgstr "Plik do przesłania musi mieć rozszerzenie"
 
-#: cps/web.py:2238
+#: cps/web.py:2621
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Nie udało się utworzyć łącza %s (Odmowa dostępu)."
 
-#: cps/web.py:2243
+#: cps/web.py:2626
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Nie można przechowywać pliku %s (Odmowa dostępu)."
 
-#: cps/web.py:2248
+#: cps/web.py:2631
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Nie udało się usunąć pliku %s (Odmowa dostępu)."
@@ -402,7 +402,7 @@ msgstr "DLS"
 msgid "Admin"
 msgstr "Portal administracyjny"
 
-#: cps/templates/admin.html:13 cps/templates/detail.html:124
+#: cps/templates/admin.html:13 cps/templates/detail.html:134
 msgid "Download"
 msgstr "Pobierz"
 
@@ -458,7 +458,7 @@ msgstr "Konfiguracja"
 msgid "Calibre DB dir"
 msgstr "Folder bazy danych Calibre"
 
-#: cps/templates/admin.html:61 cps/templates/config_edit.html:35
+#: cps/templates/admin.html:61 cps/templates/config_edit.html:76
 msgid "Log Level"
 msgstr "Poziom logów"
 
@@ -466,7 +466,7 @@ msgstr "Poziom logów"
 msgid "Port"
 msgstr "Port"
 
-#: cps/templates/admin.html:63 cps/templates/config_edit.html:19
+#: cps/templates/admin.html:63 cps/templates/config_edit.html:60
 msgid "Books per page"
 msgstr "Ilość książek na stronie"
 
@@ -524,9 +524,9 @@ msgid "Ok"
 msgstr "OK"
 
 #: cps/templates/admin.html:103 cps/templates/admin.html:117
-#: cps/templates/book_edit.html:109 cps/templates/config_edit.html:78
+#: cps/templates/book_edit.html:109 cps/templates/config_edit.html:119
 #: cps/templates/email_edit.html:36 cps/templates/shelf_edit.html:17
-#: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:116
+#: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:120
 msgid "Back"
 msgstr "Wróć"
 
@@ -555,7 +555,7 @@ msgstr "Opis"
 msgid "Tags"
 msgstr "Tagi"
 
-#: cps/templates/book_edit.html:33 cps/templates/layout.html:138
+#: cps/templates/book_edit.html:33 cps/templates/layout.html:142
 #: cps/templates/search_form.html:37
 msgid "Series"
 msgstr "Seria"
@@ -592,9 +592,9 @@ msgstr "wyświetl książkę po edycji"
 msgid "Get metadata"
 msgstr "Uzyskaj metadane"
 
-#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:76
+#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:117
 #: cps/templates/login.html:19 cps/templates/search_form.html:79
-#: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:114
+#: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:118
 msgid "Submit"
 msgstr "Wyślij"
 
@@ -643,63 +643,87 @@ msgstr "Źródło"
 msgid "Location of Calibre database"
 msgstr "Lokalizacja bazy danych Calibre"
 
-#: cps/templates/config_edit.html:11
+#: cps/templates/config_edit.html:13
+msgid "Use google drive?"
+msgstr ""
+
+#: cps/templates/config_edit.html:17
+msgid "Client id"
+msgstr ""
+
+#: cps/templates/config_edit.html:21
+msgid "Client secret"
+msgstr ""
+
+#: cps/templates/config_edit.html:25
+msgid "Calibre Base URL"
+msgstr ""
+
+#: cps/templates/config_edit.html:29
+msgid "Google drive Calibre folder"
+msgstr ""
+
+#: cps/templates/config_edit.html:38
+msgid "Metadata Watch Channel ID"
+msgstr ""
+
+#: cps/templates/config_edit.html:52
 msgid "Server Port"
 msgstr "Port serwera"
 
-#: cps/templates/config_edit.html:15 cps/templates/shelf_edit.html:7
+#: cps/templates/config_edit.html:56 cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr "Tytuł"
 
-#: cps/templates/config_edit.html:23
+#: cps/templates/config_edit.html:64
 msgid "No. of random books to show"
 msgstr "Liczba losowych książek do pokazania"
 
-#: cps/templates/config_edit.html:27
+#: cps/templates/config_edit.html:68
 msgid "Regular expression for ignoring columns"
 msgstr "Wyrażenie regularne dla ignorowanych kolumn"
 
-#: cps/templates/config_edit.html:31
+#: cps/templates/config_edit.html:72
 msgid "Regular expression for title sorting"
 msgstr "Wyrażenie regularne dla tytułu sortującego"
 
-#: cps/templates/config_edit.html:45
+#: cps/templates/config_edit.html:86
 msgid "Enable uploading"
 msgstr "Włącz wysyłanie"
 
-#: cps/templates/config_edit.html:49
+#: cps/templates/config_edit.html:90
 msgid "Enable anonymous browsing"
 msgstr "Włącz anonimowe przeglądanie"
 
-#: cps/templates/config_edit.html:53
+#: cps/templates/config_edit.html:94
 msgid "Enable public registration"
 msgstr "Włącz publiczną rejestrację"
 
-#: cps/templates/config_edit.html:55
+#: cps/templates/config_edit.html:96
 msgid "Default Settings for new users"
 msgstr "Domyślne ustawienia dla nowych użytkowników"
 
-#: cps/templates/config_edit.html:58 cps/templates/user_edit.html:83
+#: cps/templates/config_edit.html:99 cps/templates/user_edit.html:87
 msgid "Admin user"
 msgstr "Użytkownik z uprawnieniami administratora"
 
-#: cps/templates/config_edit.html:62 cps/templates/user_edit.html:88
+#: cps/templates/config_edit.html:103 cps/templates/user_edit.html:92
 msgid "Allow Downloads"
 msgstr "Zezwalaj na pobieranie"
 
-#: cps/templates/config_edit.html:66 cps/templates/user_edit.html:92
+#: cps/templates/config_edit.html:107 cps/templates/user_edit.html:96
 msgid "Allow Uploads"
 msgstr "Zezwalaj na wysyłanie"
 
-#: cps/templates/config_edit.html:70 cps/templates/user_edit.html:96
+#: cps/templates/config_edit.html:111 cps/templates/user_edit.html:100
 msgid "Allow Edit"
 msgstr "Zezwalaj na edycję"
 
-#: cps/templates/config_edit.html:74 cps/templates/user_edit.html:101
+#: cps/templates/config_edit.html:115 cps/templates/user_edit.html:105
 msgid "Allow Changing Password"
 msgstr "Zezwalaj na zmianę hasła"
 
-#: cps/templates/config_edit.html:81 cps/templates/layout.html:93
+#: cps/templates/config_edit.html:122 cps/templates/layout.html:93
 #: cps/templates/login.html:4
 msgid "Login"
 msgstr "Zaloguj się"
@@ -720,19 +744,23 @@ msgstr "język"
 msgid "Publishing date"
 msgstr "Data publikacji"
 
-#: cps/templates/detail.html:113
+#: cps/templates/detail.html:115
+msgid "Read"
+msgstr ""
+
+#: cps/templates/detail.html:123
 msgid "Description:"
 msgstr "Opis:"
 
-#: cps/templates/detail.html:141
+#: cps/templates/detail.html:151
 msgid "Read in browser"
 msgstr "Czytaj w przeglądarce"
 
-#: cps/templates/detail.html:161
+#: cps/templates/detail.html:171
 msgid "Add to shelf"
 msgstr "Dodaj do półki"
 
-#: cps/templates/detail.html:201
+#: cps/templates/detail.html:211
 msgid "Edit metadata"
 msgstr "Edytuj metadane"
 
@@ -814,19 +842,29 @@ msgstr "Ostatnie książki"
 msgid "Show Random Books"
 msgstr "Pokazuj losowe książki"
 
-#: cps/templates/index.xml:43 cps/templates/layout.html:140
+#: cps/templates/index.xml:43 cps/templates/index.xml:47
+#: cps/templates/layout.html:132
+msgid "Read Books"
+msgstr ""
+
+#: cps/templates/index.xml:50 cps/templates/index.xml:54
+#: cps/templates/layout.html:133
+msgid "Unread Books"
+msgstr ""
+
+#: cps/templates/index.xml:57 cps/templates/layout.html:144
 msgid "Authors"
 msgstr "Autorzy"
 
-#: cps/templates/index.xml:47
+#: cps/templates/index.xml:61
 msgid "Books ordered by Author"
 msgstr "Książki sortowane według autorów"
 
-#: cps/templates/index.xml:54
+#: cps/templates/index.xml:68
 msgid "Books ordered by category"
 msgstr "Książki sortowane według kategorii"
 
-#: cps/templates/index.xml:61
+#: cps/templates/index.xml:75
 msgid "Books ordered by series"
 msgstr "Książki sortowane według serii"
 
@@ -850,31 +888,31 @@ msgstr "Zarejestruj się"
 msgid "Browse"
 msgstr "Przeglądaj"
 
-#: cps/templates/layout.html:132
+#: cps/templates/layout.html:136
 msgid "Discover"
 msgstr "Odkrywaj"
 
-#: cps/templates/layout.html:135
+#: cps/templates/layout.html:139
 msgid "Categories"
 msgstr "Kategorie"
 
-#: cps/templates/layout.html:142 cps/templates/search_form.html:58
+#: cps/templates/layout.html:146 cps/templates/search_form.html:58
 msgid "Languages"
 msgstr "Języki"
 
-#: cps/templates/layout.html:145
+#: cps/templates/layout.html:149
 msgid "Public Shelves"
 msgstr "Publiczne półki"
 
-#: cps/templates/layout.html:149
+#: cps/templates/layout.html:153
 msgid "Your Shelves"
 msgstr "Twoje półki"
 
-#: cps/templates/layout.html:154
+#: cps/templates/layout.html:158
 msgid "Create a Shelf"
 msgstr "Utwórz półkę"
 
-#: cps/templates/layout.html:155
+#: cps/templates/layout.html:159
 msgid "About"
 msgstr "O programie"
 
@@ -1046,14 +1084,18 @@ msgid "Show author selection"
 msgstr "Pokaż wybór autora"
 
 #: cps/templates/user_edit.html:75
+msgid "Show read and unread"
+msgstr ""
+
+#: cps/templates/user_edit.html:79
 msgid "Show random books in detail view"
 msgstr "Pokaz losowe książki w widoku szczegółowym"
 
-#: cps/templates/user_edit.html:108
+#: cps/templates/user_edit.html:112
 msgid "Delete this user"
 msgstr "Usuń tego użytkownika"
 
-#: cps/templates/user_edit.html:123
+#: cps/templates/user_edit.html:127
 msgid "Recent Downloads"
 msgstr "Ostatnio pobierane"
 
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index 7cccf973..7c4d6361 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-03-12 19:10+0100\n"
+"POT-Creation-Date: 2017-03-19 19:20+0100\n"
 "PO-Revision-Date: 2017-01-06 17:00+0000\n"
 "Last-Translator: dalin <dalin.lin@gmail.com>\n"
 "Language: zh_Hans_CN\n"
@@ -26,354 +26,354 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-#: cps/book_formats.py:113 cps/book_formats.py:117 cps/web.py:1082
+#: cps/book_formats.py:113 cps/book_formats.py:117 cps/web.py:1244
 msgid "not installed"
 msgstr "未安装"
 
-#: cps/helper.py:159
+#: cps/helper.py:164
 #, python-format
 msgid "Failed to send mail: %s"
 msgstr "发送邮件失败: %s"
 
-#: cps/helper.py:166
+#: cps/helper.py:171
 msgid "Calibre-web test email"
 msgstr "Calibre-web 测试邮件"
 
-#: cps/helper.py:167 cps/helper.py:179
+#: cps/helper.py:172 cps/helper.py:184
 msgid "This email has been sent via calibre web."
 msgstr "此邮件由calibre web发送"
 
-#: cps/helper.py:176 cps/templates/detail.html:136
+#: cps/helper.py:181 cps/templates/detail.html:146
 msgid "Send to Kindle"
 msgstr "发送到Kindle"
 
-#: cps/helper.py:196 cps/helper.py:211
+#: cps/helper.py:201 cps/helper.py:216
 msgid "Could not find any formats suitable for sending by email"
 msgstr "无法找到适合邮件发送的格式"
 
-#: cps/helper.py:205
+#: cps/helper.py:210
 msgid "Could not convert epub to mobi"
 msgstr "无法转换epub到mobi"
 
-#: cps/ub.py:442
+#: cps/ub.py:488
 msgid "Guest"
 msgstr "游客"
 
-#: cps/web.py:768
+#: cps/web.py:904
 msgid "Requesting update package"
 msgstr "正在请求更新包"
 
-#: cps/web.py:769
+#: cps/web.py:905
 msgid "Downloading update package"
 msgstr "正在下载更新包"
 
-#: cps/web.py:770
+#: cps/web.py:906
 msgid "Unzipping update package"
 msgstr "正在解压更新包"
 
-#: cps/web.py:771
+#: cps/web.py:907
 msgid "Files are replaced"
 msgstr "文件已替换"
 
-#: cps/web.py:772
+#: cps/web.py:908
 msgid "Database connections are closed"
 msgstr "数据库连接已关闭"
 
-#: cps/web.py:773
+#: cps/web.py:909
 msgid "Server is stopped"
 msgstr "服务器已停止"
 
-#: cps/web.py:774
+#: cps/web.py:910
 msgid "Update finished, please press okay and reload page"
 msgstr "更新完成，请按确定并刷新页面"
 
-#: cps/web.py:847
+#: cps/web.py:983
 msgid "Latest Books"
 msgstr "最新书籍"
 
-#: cps/web.py:878
+#: cps/web.py:1014
 msgid "Hot Books (most downloaded)"
 msgstr "热门书籍(最多下载)"
 
-#: cps/web.py:888
+#: cps/web.py:1024
 msgid "Best rated books"
 msgstr "最高评分书籍"
 
-#: cps/templates/index.xml:36 cps/web.py:897
+#: cps/templates/index.xml:36 cps/web.py:1033
 msgid "Random Books"
 msgstr "随机书籍"
 
-#: cps/web.py:910
+#: cps/web.py:1046
 msgid "Author list"
 msgstr "作者列表"
 
-#: cps/web.py:921
+#: cps/web.py:1057
 #, python-forma, python-format
 msgid "Author: %(name)s"
 msgstr "作者： %(name)s"
 
-#: cps/web.py:923 cps/web.py:951 cps/web.py:1059 cps/web.py:1309
-#: cps/web.py:2196
+#: cps/web.py:1059 cps/web.py:1087 cps/web.py:1221 cps/web.py:1626
+#: cps/web.py:2579
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "无法打开电子书。 文件不存在或者文件不可访问:"
 
-#: cps/templates/index.xml:57 cps/web.py:937
+#: cps/templates/index.xml:71 cps/web.py:1073
 msgid "Series list"
 msgstr "丛书列表"
 
-#: cps/web.py:949
+#: cps/web.py:1085
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "丛书: %(serie)s"
 
-#: cps/web.py:982
+#: cps/web.py:1118
 msgid "Available languages"
 msgstr "可用语言"
 
-#: cps/web.py:997
+#: cps/web.py:1133
 #, python-format
 msgid "Language: %(name)s"
 msgstr "语言: %(name)s"
 
-#: cps/templates/index.xml:50 cps/web.py:1010
+#: cps/templates/index.xml:64 cps/web.py:1146
 msgid "Category list"
 msgstr "分类列表"
 
-#: cps/web.py:1022
+#: cps/web.py:1158
 #, python-format
 msgid "Category: %(name)s"
 msgstr "分类: %(name)s"
 
-#: cps/web.py:1105
+#: cps/web.py:1267
 msgid "Statistics"
 msgstr "统计"
 
-#: cps/web.py:1126
+#: cps/web.py:1375
 msgid "Server restarted, please reload page"
 msgstr "服务器已重启，请刷新页面"
 
-#: cps/web.py:1128
+#: cps/web.py:1377
 msgid "Performing shutdown of server, please close window"
 msgstr "正在关闭服务器，请关闭窗口"
 
-#: cps/web.py:1143
+#: cps/web.py:1392
 msgid "Update done"
 msgstr "更新完成"
 
-#: cps/web.py:1221 cps/web.py:1234
+#: cps/web.py:1470 cps/web.py:1483
 msgid "search"
 msgstr "搜索"
 
-#: cps/web.py:1285 cps/web.py:1292 cps/web.py:1299 cps/web.py:1306
+#: cps/web.py:1602 cps/web.py:1609 cps/web.py:1616 cps/web.py:1623
 msgid "Read a Book"
 msgstr "阅读一本书"
 
-#: cps/web.py:1350 cps/web.py:1789
+#: cps/web.py:1676 cps/web.py:2152
 msgid "Please fill out all fields!"
 msgstr "请填写所有字段"
 
-#: cps/web.py:1351 cps/web.py:1367 cps/web.py:1372 cps/web.py:1374
+#: cps/web.py:1677 cps/web.py:1693 cps/web.py:1698 cps/web.py:1700
 msgid "register"
 msgstr "注册"
 
-#: cps/web.py:1366
+#: cps/web.py:1692
 msgid "An unknown error occured. Please try again later."
 msgstr "发生一个未知错误。请稍后再试。"
 
-#: cps/web.py:1371
+#: cps/web.py:1697
 msgid "This username or email address is already in use."
 msgstr "此用户名或邮箱已被使用。"
 
-#: cps/web.py:1389
+#: cps/web.py:1715
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "您现在已以'%(nickname)s'身份登录"
 
-#: cps/web.py:1394
+#: cps/web.py:1720
 msgid "Wrong Username or Password"
 msgstr "用户名或密码错误"
 
-#: cps/web.py:1396
+#: cps/web.py:1722
 msgid "login"
 msgstr "登录"
 
-#: cps/web.py:1413
+#: cps/web.py:1739
 msgid "Please configure the SMTP mail settings first..."
 msgstr "请先配置SMTP邮箱..."
 
-#: cps/web.py:1417
+#: cps/web.py:1743
 #, python-format
 msgid "Book successfully send to %(kindlemail)s"
 msgstr "此书已被成功发给 %(kindlemail)s"
 
-#: cps/web.py:1421
+#: cps/web.py:1747
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "发送这本书的时候出现错误: %(res)s"
 
-#: cps/web.py:1423 cps/web.py:1867
+#: cps/web.py:1749 cps/web.py:2232
 msgid "Please configure your kindle email address first..."
 msgstr "请先配置您的kindle电子邮箱地址..."
 
-#: cps/web.py:1443
+#: cps/web.py:1774
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "此书已被添加到书架: %(sname)s"
 
-#: cps/web.py:1464
+#: cps/web.py:1793
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "此书已从书架 %(sname)s 中删除"
 
-#: cps/web.py:1483 cps/web.py:1507
+#: cps/web.py:1812 cps/web.py:1836
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr "已存在书架 '%(title)s'。"
 
-#: cps/web.py:1488
+#: cps/web.py:1817
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "书架 %(title)s 已被创建"
 
-#: cps/web.py:1490 cps/web.py:1518
+#: cps/web.py:1819 cps/web.py:1847
 msgid "There was an error"
 msgstr "发生错误"
 
-#: cps/web.py:1491 cps/web.py:1493
+#: cps/web.py:1820 cps/web.py:1822
 msgid "create a shelf"
 msgstr "创建书架"
 
-#: cps/web.py:1516
+#: cps/web.py:1845
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "书架 %(title)s 已被修改"
 
-#: cps/web.py:1519 cps/web.py:1521
+#: cps/web.py:1848 cps/web.py:1850
 msgid "Edit a shelf"
 msgstr "编辑书架"
 
-#: cps/web.py:1539
+#: cps/web.py:1868
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "成功删除书架 %(name)s"
 
-#: cps/web.py:1561
+#: cps/web.py:1890
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "书架: '%(name)s'"
 
-#: cps/web.py:1592
+#: cps/web.py:1921
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "修改书架 '%(name)s' 顺序"
 
-#: cps/web.py:1654
+#: cps/web.py:1985
 msgid "Found an existing account for this email address."
 msgstr "找到已使用此邮箱的账号。"
 
-#: cps/web.py:1656 cps/web.py:1660
+#: cps/web.py:1987 cps/web.py:1991
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 的资料"
 
-#: cps/web.py:1657
+#: cps/web.py:1988
 msgid "Profile updated"
 msgstr "资料已更新"
 
-#: cps/web.py:1671
+#: cps/web.py:2002
 msgid "Admin page"
 msgstr "管理页"
 
-#: cps/web.py:1744
+#: cps/web.py:2106
 msgid "Calibre-web configuration updated"
 msgstr "Calibre-web配置已更新"
 
-#: cps/web.py:1751 cps/web.py:1757 cps/web.py:1770
+#: cps/web.py:2113 cps/web.py:2119 cps/web.py:2133
 msgid "Basic Configuration"
 msgstr "基本配置"
 
-#: cps/web.py:1755
+#: cps/web.py:2117
 msgid "DB location is not valid, please enter correct path"
 msgstr "DB位置无效，请输入正确路径"
 
-#: cps/templates/admin.html:34 cps/web.py:1791 cps/web.py:1837
+#: cps/templates/admin.html:34 cps/web.py:2154 cps/web.py:2202
 msgid "Add new user"
 msgstr "添加新用户"
 
-#: cps/web.py:1829
+#: cps/web.py:2194
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "用户 '%(user)s' 已被创建"
 
-#: cps/web.py:1833
+#: cps/web.py:2198
 msgid "Found an existing account for this email address or nickname."
 msgstr "已找到使用此邮箱或昵称的账号。"
 
-#: cps/web.py:1855
+#: cps/web.py:2220
 msgid "Mail settings updated"
 msgstr "邮箱设置已更新"
 
-#: cps/web.py:1862
+#: cps/web.py:2227
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr "测试邮件已成功发送到 %(kindlemail)s"
 
-#: cps/web.py:1865
+#: cps/web.py:2230
 #, python-format
 msgid "There was an error sending the Test E-Mail: %(res)s"
 msgstr "发送测试邮件时发生错误: %(res)s"
 
-#: cps/web.py:1869
+#: cps/web.py:2234
 msgid "E-Mail settings updated"
 msgstr "E-Mail 设置已更新"
 
-#: cps/web.py:1870
+#: cps/web.py:2235
 msgid "Edit mail settings"
 msgstr "编辑邮箱设置"
 
-#: cps/web.py:1898
+#: cps/web.py:2263
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "用户 '%(nick)s' 已被删除"
 
-#: cps/web.py:1979
+#: cps/web.py:2349
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "用户 '%(nick)s' 已被更新"
 
-#: cps/web.py:1982
+#: cps/web.py:2352
 msgid "An unknown error occured."
 msgstr "发生未知错误。"
 
-#: cps/web.py:1985
+#: cps/web.py:2355
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "编辑用户 %(nick)s"
 
-#: cps/web.py:2191 cps/web.py:2194 cps/web.py:2304
+#: cps/web.py:2574 cps/web.py:2577 cps/web.py:2689
 msgid "edit metadata"
 msgstr "编辑元数据"
 
-#: cps/web.py:2215
+#: cps/web.py:2598
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr "不能上传后缀为　\"%s\"　的文件到此服务器"
 
-#: cps/web.py:2221
+#: cps/web.py:2604
 msgid "File to be uploaded must have an extension"
 msgstr "要上传的文件必须有一个后缀"
 
-#: cps/web.py:2238
+#: cps/web.py:2621
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "创建路径 %s 失败(权限拒绝)。"
 
-#: cps/web.py:2243
+#: cps/web.py:2626
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "存储文件 %s 失败(权限拒绝)。"
 
-#: cps/web.py:2248
+#: cps/web.py:2631
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "删除文件 %s 失败(权限拒绝)。"
@@ -402,7 +402,7 @@ msgstr ""
 msgid "Admin"
 msgstr "管理"
 
-#: cps/templates/admin.html:13 cps/templates/detail.html:124
+#: cps/templates/admin.html:13 cps/templates/detail.html:134
 msgid "Download"
 msgstr "下载"
 
@@ -458,7 +458,7 @@ msgstr "配置"
 msgid "Calibre DB dir"
 msgstr "Calibre DB目录"
 
-#: cps/templates/admin.html:61 cps/templates/config_edit.html:35
+#: cps/templates/admin.html:61 cps/templates/config_edit.html:76
 msgid "Log Level"
 msgstr "日志级别"
 
@@ -466,7 +466,7 @@ msgstr "日志级别"
 msgid "Port"
 msgstr "端口"
 
-#: cps/templates/admin.html:63 cps/templates/config_edit.html:19
+#: cps/templates/admin.html:63 cps/templates/config_edit.html:60
 msgid "Books per page"
 msgstr "每页书籍数"
 
@@ -524,9 +524,9 @@ msgid "Ok"
 msgstr "确定"
 
 #: cps/templates/admin.html:103 cps/templates/admin.html:117
-#: cps/templates/book_edit.html:109 cps/templates/config_edit.html:78
+#: cps/templates/book_edit.html:109 cps/templates/config_edit.html:119
 #: cps/templates/email_edit.html:36 cps/templates/shelf_edit.html:17
-#: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:116
+#: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:120
 msgid "Back"
 msgstr "后退"
 
@@ -555,7 +555,7 @@ msgstr "简介"
 msgid "Tags"
 msgstr "标签"
 
-#: cps/templates/book_edit.html:33 cps/templates/layout.html:138
+#: cps/templates/book_edit.html:33 cps/templates/layout.html:142
 #: cps/templates/search_form.html:37
 msgid "Series"
 msgstr "丛书"
@@ -592,9 +592,9 @@ msgstr "编辑后查看书籍"
 msgid "Get metadata"
 msgstr ""
 
-#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:76
+#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:117
 #: cps/templates/login.html:19 cps/templates/search_form.html:79
-#: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:114
+#: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:118
 msgid "Submit"
 msgstr "提交"
 
@@ -643,63 +643,87 @@ msgstr ""
 msgid "Location of Calibre database"
 msgstr "Calibre 数据库位置"
 
-#: cps/templates/config_edit.html:11
+#: cps/templates/config_edit.html:13
+msgid "Use google drive?"
+msgstr ""
+
+#: cps/templates/config_edit.html:17
+msgid "Client id"
+msgstr ""
+
+#: cps/templates/config_edit.html:21
+msgid "Client secret"
+msgstr ""
+
+#: cps/templates/config_edit.html:25
+msgid "Calibre Base URL"
+msgstr ""
+
+#: cps/templates/config_edit.html:29
+msgid "Google drive Calibre folder"
+msgstr ""
+
+#: cps/templates/config_edit.html:38
+msgid "Metadata Watch Channel ID"
+msgstr ""
+
+#: cps/templates/config_edit.html:52
 msgid "Server Port"
 msgstr "服务器端口"
 
-#: cps/templates/config_edit.html:15 cps/templates/shelf_edit.html:7
+#: cps/templates/config_edit.html:56 cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr "标题"
 
-#: cps/templates/config_edit.html:23
+#: cps/templates/config_edit.html:64
 msgid "No. of random books to show"
 msgstr "随机书籍显示数量"
 
-#: cps/templates/config_edit.html:27
+#: cps/templates/config_edit.html:68
 msgid "Regular expression for ignoring columns"
 msgstr ""
 
-#: cps/templates/config_edit.html:31
+#: cps/templates/config_edit.html:72
 msgid "Regular expression for title sorting"
 msgstr "标题排序的正则表达式"
 
-#: cps/templates/config_edit.html:45
+#: cps/templates/config_edit.html:86
 msgid "Enable uploading"
 msgstr "启用上传"
 
-#: cps/templates/config_edit.html:49
+#: cps/templates/config_edit.html:90
 msgid "Enable anonymous browsing"
 msgstr "启用匿名浏览"
 
-#: cps/templates/config_edit.html:53
+#: cps/templates/config_edit.html:94
 msgid "Enable public registration"
 msgstr "启用注册"
 
-#: cps/templates/config_edit.html:55
+#: cps/templates/config_edit.html:96
 msgid "Default Settings for new users"
 msgstr "新用户默认设置"
 
-#: cps/templates/config_edit.html:58 cps/templates/user_edit.html:83
+#: cps/templates/config_edit.html:99 cps/templates/user_edit.html:87
 msgid "Admin user"
 msgstr "管理用户"
 
-#: cps/templates/config_edit.html:62 cps/templates/user_edit.html:88
+#: cps/templates/config_edit.html:103 cps/templates/user_edit.html:92
 msgid "Allow Downloads"
 msgstr "允许下载"
 
-#: cps/templates/config_edit.html:66 cps/templates/user_edit.html:92
+#: cps/templates/config_edit.html:107 cps/templates/user_edit.html:96
 msgid "Allow Uploads"
 msgstr "允许上传"
 
-#: cps/templates/config_edit.html:70 cps/templates/user_edit.html:96
+#: cps/templates/config_edit.html:111 cps/templates/user_edit.html:100
 msgid "Allow Edit"
 msgstr "允许编辑"
 
-#: cps/templates/config_edit.html:74 cps/templates/user_edit.html:101
+#: cps/templates/config_edit.html:115 cps/templates/user_edit.html:105
 msgid "Allow Changing Password"
 msgstr "允许修改密码"
 
-#: cps/templates/config_edit.html:81 cps/templates/layout.html:93
+#: cps/templates/config_edit.html:122 cps/templates/layout.html:93
 #: cps/templates/login.html:4
 msgid "Login"
 msgstr "登录"
@@ -720,19 +744,23 @@ msgstr "语言"
 msgid "Publishing date"
 msgstr "出版日期"
 
-#: cps/templates/detail.html:113
+#: cps/templates/detail.html:115
+msgid "Read"
+msgstr ""
+
+#: cps/templates/detail.html:123
 msgid "Description:"
 msgstr "简介:"
 
-#: cps/templates/detail.html:141
+#: cps/templates/detail.html:151
 msgid "Read in browser"
 msgstr "在浏览器中阅读"
 
-#: cps/templates/detail.html:161
+#: cps/templates/detail.html:171
 msgid "Add to shelf"
 msgstr "添加到书架"
 
-#: cps/templates/detail.html:201
+#: cps/templates/detail.html:211
 msgid "Edit metadata"
 msgstr "编辑元数据"
 
@@ -812,19 +840,29 @@ msgstr "最新书籍"
 msgid "Show Random Books"
 msgstr "显示随机书籍"
 
-#: cps/templates/index.xml:43 cps/templates/layout.html:140
+#: cps/templates/index.xml:43 cps/templates/index.xml:47
+#: cps/templates/layout.html:132
+msgid "Read Books"
+msgstr ""
+
+#: cps/templates/index.xml:50 cps/templates/index.xml:54
+#: cps/templates/layout.html:133
+msgid "Unread Books"
+msgstr ""
+
+#: cps/templates/index.xml:57 cps/templates/layout.html:144
 msgid "Authors"
 msgstr "作者"
 
-#: cps/templates/index.xml:47
+#: cps/templates/index.xml:61
 msgid "Books ordered by Author"
 msgstr "书籍按作者排序"
 
-#: cps/templates/index.xml:54
+#: cps/templates/index.xml:68
 msgid "Books ordered by category"
 msgstr "书籍按分类排序"
 
-#: cps/templates/index.xml:61
+#: cps/templates/index.xml:75
 msgid "Books ordered by series"
 msgstr "书籍按丛书排序"
 
@@ -848,31 +886,31 @@ msgstr "注册"
 msgid "Browse"
 msgstr "浏览"
 
-#: cps/templates/layout.html:132
+#: cps/templates/layout.html:136
 msgid "Discover"
 msgstr "发现"
 
-#: cps/templates/layout.html:135
+#: cps/templates/layout.html:139
 msgid "Categories"
 msgstr "分类"
 
-#: cps/templates/layout.html:142 cps/templates/search_form.html:58
+#: cps/templates/layout.html:146 cps/templates/search_form.html:58
 msgid "Languages"
 msgstr "语言"
 
-#: cps/templates/layout.html:145
+#: cps/templates/layout.html:149
 msgid "Public Shelves"
 msgstr "公开书架"
 
-#: cps/templates/layout.html:149
+#: cps/templates/layout.html:153
 msgid "Your Shelves"
 msgstr "您的书架"
 
-#: cps/templates/layout.html:154
+#: cps/templates/layout.html:158
 msgid "Create a Shelf"
 msgstr "创建书架"
 
-#: cps/templates/layout.html:155
+#: cps/templates/layout.html:159
 msgid "About"
 msgstr "关于"
 
@@ -1043,14 +1081,18 @@ msgid "Show author selection"
 msgstr "显示作者选择"
 
 #: cps/templates/user_edit.html:75
+msgid "Show read and unread"
+msgstr ""
+
+#: cps/templates/user_edit.html:79
 msgid "Show random books in detail view"
 msgstr "在详情页显示随机书籍"
 
-#: cps/templates/user_edit.html:108
+#: cps/templates/user_edit.html:112
 msgid "Delete this user"
 msgstr "删除此用户"
 
-#: cps/templates/user_edit.html:123
+#: cps/templates/user_edit.html:127
 msgid "Recent Downloads"
 msgstr "最近下载"
 
diff --git a/cps/web.py b/cps/web.py
index 6855f84d..1510b292 100755
--- a/cps/web.py
+++ b/cps/web.py
@@ -1757,6 +1757,11 @@ def add_to_shelf(shelf_id, book_id):
         flash("Sorry you are not allowed to add a book to the the shelf: %s" % shelf.name)
         return redirect(url_for('index'))
     maxOrder = ub.session.query(func.max(ub.BookShelf.order)).filter(ub.BookShelf.shelf == shelf_id).first()
+    book_in_shelf=ub.session.query(ub.BookShelf).filter(ub.BookShelf.shelf == shelf_id,
+                                          ub.BookShelf.book_id == book_id).first()
+    if book_in_shelf:
+        flash("Book is already part of the shelf: %s" % shelf.name)
+        return redirect(url_for('index'))
     if maxOrder[0] is None:
         maxOrder = 0
     else:
@@ -1766,8 +1771,6 @@ def add_to_shelf(shelf_id, book_id):
     ub.session.commit()
 
     flash(_(u"Book has been added to shelf: %(sname)s", sname=shelf.name), category="success")
-
-    # return redirect(url_for('show_book', id=book_id))
     return redirect(request.environ["HTTP_REFERER"])
 
 
diff --git a/messages.pot b/messages.pot
index 71481769..a05a70e8 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-03-12 19:10+0100\n"
+"POT-Creation-Date: 2017-03-19 19:20+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,354 +17,354 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 2.3.4\n"
 
-#: cps/book_formats.py:113 cps/book_formats.py:117 cps/web.py:1082
+#: cps/book_formats.py:113 cps/book_formats.py:117 cps/web.py:1244
 msgid "not installed"
 msgstr ""
 
-#: cps/helper.py:159
+#: cps/helper.py:164
 #, python-format
 msgid "Failed to send mail: %s"
 msgstr ""
 
-#: cps/helper.py:166
+#: cps/helper.py:171
 msgid "Calibre-web test email"
 msgstr ""
 
-#: cps/helper.py:167 cps/helper.py:179
+#: cps/helper.py:172 cps/helper.py:184
 msgid "This email has been sent via calibre web."
 msgstr ""
 
-#: cps/helper.py:176 cps/templates/detail.html:136
+#: cps/helper.py:181 cps/templates/detail.html:146
 msgid "Send to Kindle"
 msgstr ""
 
-#: cps/helper.py:196 cps/helper.py:211
+#: cps/helper.py:201 cps/helper.py:216
 msgid "Could not find any formats suitable for sending by email"
 msgstr ""
 
-#: cps/helper.py:205
+#: cps/helper.py:210
 msgid "Could not convert epub to mobi"
 msgstr ""
 
-#: cps/ub.py:442
+#: cps/ub.py:488
 msgid "Guest"
 msgstr ""
 
-#: cps/web.py:768
+#: cps/web.py:904
 msgid "Requesting update package"
 msgstr ""
 
-#: cps/web.py:769
+#: cps/web.py:905
 msgid "Downloading update package"
 msgstr ""
 
-#: cps/web.py:770
+#: cps/web.py:906
 msgid "Unzipping update package"
 msgstr ""
 
-#: cps/web.py:771
+#: cps/web.py:907
 msgid "Files are replaced"
 msgstr ""
 
-#: cps/web.py:772
+#: cps/web.py:908
 msgid "Database connections are closed"
 msgstr ""
 
-#: cps/web.py:773
+#: cps/web.py:909
 msgid "Server is stopped"
 msgstr ""
 
-#: cps/web.py:774
+#: cps/web.py:910
 msgid "Update finished, please press okay and reload page"
 msgstr ""
 
-#: cps/web.py:847
+#: cps/web.py:983
 msgid "Latest Books"
 msgstr ""
 
-#: cps/web.py:878
+#: cps/web.py:1014
 msgid "Hot Books (most downloaded)"
 msgstr ""
 
-#: cps/web.py:888
+#: cps/web.py:1024
 msgid "Best rated books"
 msgstr ""
 
-#: cps/templates/index.xml:36 cps/web.py:897
+#: cps/templates/index.xml:36 cps/web.py:1033
 msgid "Random Books"
 msgstr ""
 
-#: cps/web.py:910
+#: cps/web.py:1046
 msgid "Author list"
 msgstr ""
 
-#: cps/web.py:921
+#: cps/web.py:1057
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:923 cps/web.py:951 cps/web.py:1059 cps/web.py:1309
-#: cps/web.py:2196
+#: cps/web.py:1059 cps/web.py:1087 cps/web.py:1221 cps/web.py:1626
+#: cps/web.py:2579
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr ""
 
-#: cps/templates/index.xml:57 cps/web.py:937
+#: cps/templates/index.xml:71 cps/web.py:1073
 msgid "Series list"
 msgstr ""
 
-#: cps/web.py:949
+#: cps/web.py:1085
 #, python-format
 msgid "Series: %(serie)s"
 msgstr ""
 
-#: cps/web.py:982
+#: cps/web.py:1118
 msgid "Available languages"
 msgstr ""
 
-#: cps/web.py:997
+#: cps/web.py:1133
 #, python-format
 msgid "Language: %(name)s"
 msgstr ""
 
-#: cps/templates/index.xml:50 cps/web.py:1010
+#: cps/templates/index.xml:64 cps/web.py:1146
 msgid "Category list"
 msgstr ""
 
-#: cps/web.py:1022
+#: cps/web.py:1158
 #, python-format
 msgid "Category: %(name)s"
 msgstr ""
 
-#: cps/web.py:1105
+#: cps/web.py:1267
 msgid "Statistics"
 msgstr ""
 
-#: cps/web.py:1126
+#: cps/web.py:1375
 msgid "Server restarted, please reload page"
 msgstr ""
 
-#: cps/web.py:1128
+#: cps/web.py:1377
 msgid "Performing shutdown of server, please close window"
 msgstr ""
 
-#: cps/web.py:1143
+#: cps/web.py:1392
 msgid "Update done"
 msgstr ""
 
-#: cps/web.py:1221 cps/web.py:1234
+#: cps/web.py:1470 cps/web.py:1483
 msgid "search"
 msgstr ""
 
-#: cps/web.py:1285 cps/web.py:1292 cps/web.py:1299 cps/web.py:1306
+#: cps/web.py:1602 cps/web.py:1609 cps/web.py:1616 cps/web.py:1623
 msgid "Read a Book"
 msgstr ""
 
-#: cps/web.py:1350 cps/web.py:1789
+#: cps/web.py:1676 cps/web.py:2152
 msgid "Please fill out all fields!"
 msgstr ""
 
-#: cps/web.py:1351 cps/web.py:1367 cps/web.py:1372 cps/web.py:1374
+#: cps/web.py:1677 cps/web.py:1693 cps/web.py:1698 cps/web.py:1700
 msgid "register"
 msgstr ""
 
-#: cps/web.py:1366
+#: cps/web.py:1692
 msgid "An unknown error occured. Please try again later."
 msgstr ""
 
-#: cps/web.py:1371
+#: cps/web.py:1697
 msgid "This username or email address is already in use."
 msgstr ""
 
-#: cps/web.py:1389
+#: cps/web.py:1715
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1394
+#: cps/web.py:1720
 msgid "Wrong Username or Password"
 msgstr ""
 
-#: cps/web.py:1396
+#: cps/web.py:1722
 msgid "login"
 msgstr ""
 
-#: cps/web.py:1413
+#: cps/web.py:1739
 msgid "Please configure the SMTP mail settings first..."
 msgstr ""
 
-#: cps/web.py:1417
+#: cps/web.py:1743
 #, python-format
 msgid "Book successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1421
+#: cps/web.py:1747
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1423 cps/web.py:1867
+#: cps/web.py:1749 cps/web.py:2232
 msgid "Please configure your kindle email address first..."
 msgstr ""
 
-#: cps/web.py:1443
+#: cps/web.py:1774
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:1464
+#: cps/web.py:1793
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr ""
 
-#: cps/web.py:1483 cps/web.py:1507
+#: cps/web.py:1812 cps/web.py:1836
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr ""
 
-#: cps/web.py:1488
+#: cps/web.py:1817
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr ""
 
-#: cps/web.py:1490 cps/web.py:1518
+#: cps/web.py:1819 cps/web.py:1847
 msgid "There was an error"
 msgstr ""
 
-#: cps/web.py:1491 cps/web.py:1493
+#: cps/web.py:1820 cps/web.py:1822
 msgid "create a shelf"
 msgstr ""
 
-#: cps/web.py:1516
+#: cps/web.py:1845
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr ""
 
-#: cps/web.py:1519 cps/web.py:1521
+#: cps/web.py:1848 cps/web.py:1850
 msgid "Edit a shelf"
 msgstr ""
 
-#: cps/web.py:1539
+#: cps/web.py:1868
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr ""
 
-#: cps/web.py:1561
+#: cps/web.py:1890
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/web.py:1592
+#: cps/web.py:1921
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr ""
 
-#: cps/web.py:1654
+#: cps/web.py:1985
 msgid "Found an existing account for this email address."
 msgstr ""
 
-#: cps/web.py:1656 cps/web.py:1660
+#: cps/web.py:1987 cps/web.py:1991
 #, python-format
 msgid "%(name)s's profile"
 msgstr ""
 
-#: cps/web.py:1657
+#: cps/web.py:1988
 msgid "Profile updated"
 msgstr ""
 
-#: cps/web.py:1671
+#: cps/web.py:2002
 msgid "Admin page"
 msgstr ""
 
-#: cps/web.py:1744
+#: cps/web.py:2106
 msgid "Calibre-web configuration updated"
 msgstr ""
 
-#: cps/web.py:1751 cps/web.py:1757 cps/web.py:1770
+#: cps/web.py:2113 cps/web.py:2119 cps/web.py:2133
 msgid "Basic Configuration"
 msgstr ""
 
-#: cps/web.py:1755
+#: cps/web.py:2117
 msgid "DB location is not valid, please enter correct path"
 msgstr ""
 
-#: cps/templates/admin.html:34 cps/web.py:1791 cps/web.py:1837
+#: cps/templates/admin.html:34 cps/web.py:2154 cps/web.py:2202
 msgid "Add new user"
 msgstr ""
 
-#: cps/web.py:1829
+#: cps/web.py:2194
 #, python-format
 msgid "User '%(user)s' created"
 msgstr ""
 
-#: cps/web.py:1833
+#: cps/web.py:2198
 msgid "Found an existing account for this email address or nickname."
 msgstr ""
 
-#: cps/web.py:1855
+#: cps/web.py:2220
 msgid "Mail settings updated"
 msgstr ""
 
-#: cps/web.py:1862
+#: cps/web.py:2227
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1865
+#: cps/web.py:2230
 #, python-format
 msgid "There was an error sending the Test E-Mail: %(res)s"
 msgstr ""
 
-#: cps/web.py:1869
+#: cps/web.py:2234
 msgid "E-Mail settings updated"
 msgstr ""
 
-#: cps/web.py:1870
+#: cps/web.py:2235
 msgid "Edit mail settings"
 msgstr ""
 
-#: cps/web.py:1898
+#: cps/web.py:2263
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr ""
 
-#: cps/web.py:1979
+#: cps/web.py:2349
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr ""
 
-#: cps/web.py:1982
+#: cps/web.py:2352
 msgid "An unknown error occured."
 msgstr ""
 
-#: cps/web.py:1985
+#: cps/web.py:2355
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr ""
 
-#: cps/web.py:2191 cps/web.py:2194 cps/web.py:2304
+#: cps/web.py:2574 cps/web.py:2577 cps/web.py:2689
 msgid "edit metadata"
 msgstr ""
 
-#: cps/web.py:2215
+#: cps/web.py:2598
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr ""
 
-#: cps/web.py:2221
+#: cps/web.py:2604
 msgid "File to be uploaded must have an extension"
 msgstr ""
 
-#: cps/web.py:2238
+#: cps/web.py:2621
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:2243
+#: cps/web.py:2626
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr ""
 
-#: cps/web.py:2248
+#: cps/web.py:2631
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr ""
@@ -393,7 +393,7 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
-#: cps/templates/admin.html:13 cps/templates/detail.html:124
+#: cps/templates/admin.html:13 cps/templates/detail.html:134
 msgid "Download"
 msgstr ""
 
@@ -449,7 +449,7 @@ msgstr ""
 msgid "Calibre DB dir"
 msgstr ""
 
-#: cps/templates/admin.html:61 cps/templates/config_edit.html:35
+#: cps/templates/admin.html:61 cps/templates/config_edit.html:76
 msgid "Log Level"
 msgstr ""
 
@@ -457,7 +457,7 @@ msgstr ""
 msgid "Port"
 msgstr ""
 
-#: cps/templates/admin.html:63 cps/templates/config_edit.html:19
+#: cps/templates/admin.html:63 cps/templates/config_edit.html:60
 msgid "Books per page"
 msgstr ""
 
@@ -515,9 +515,9 @@ msgid "Ok"
 msgstr ""
 
 #: cps/templates/admin.html:103 cps/templates/admin.html:117
-#: cps/templates/book_edit.html:109 cps/templates/config_edit.html:78
+#: cps/templates/book_edit.html:109 cps/templates/config_edit.html:119
 #: cps/templates/email_edit.html:36 cps/templates/shelf_edit.html:17
-#: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:116
+#: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:120
 msgid "Back"
 msgstr ""
 
@@ -546,7 +546,7 @@ msgstr ""
 msgid "Tags"
 msgstr ""
 
-#: cps/templates/book_edit.html:33 cps/templates/layout.html:138
+#: cps/templates/book_edit.html:33 cps/templates/layout.html:142
 #: cps/templates/search_form.html:37
 msgid "Series"
 msgstr ""
@@ -583,9 +583,9 @@ msgstr ""
 msgid "Get metadata"
 msgstr ""
 
-#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:76
+#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:117
 #: cps/templates/login.html:19 cps/templates/search_form.html:79
-#: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:114
+#: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:118
 msgid "Submit"
 msgstr ""
 
@@ -634,63 +634,87 @@ msgstr ""
 msgid "Location of Calibre database"
 msgstr ""
 
-#: cps/templates/config_edit.html:11
+#: cps/templates/config_edit.html:13
+msgid "Use google drive?"
+msgstr ""
+
+#: cps/templates/config_edit.html:17
+msgid "Client id"
+msgstr ""
+
+#: cps/templates/config_edit.html:21
+msgid "Client secret"
+msgstr ""
+
+#: cps/templates/config_edit.html:25
+msgid "Calibre Base URL"
+msgstr ""
+
+#: cps/templates/config_edit.html:29
+msgid "Google drive Calibre folder"
+msgstr ""
+
+#: cps/templates/config_edit.html:38
+msgid "Metadata Watch Channel ID"
+msgstr ""
+
+#: cps/templates/config_edit.html:52
 msgid "Server Port"
 msgstr ""
 
-#: cps/templates/config_edit.html:15 cps/templates/shelf_edit.html:7
+#: cps/templates/config_edit.html:56 cps/templates/shelf_edit.html:7
 msgid "Title"
 msgstr ""
 
-#: cps/templates/config_edit.html:23
+#: cps/templates/config_edit.html:64
 msgid "No. of random books to show"
 msgstr ""
 
-#: cps/templates/config_edit.html:27
+#: cps/templates/config_edit.html:68
 msgid "Regular expression for ignoring columns"
 msgstr ""
 
-#: cps/templates/config_edit.html:31
+#: cps/templates/config_edit.html:72
 msgid "Regular expression for title sorting"
 msgstr ""
 
-#: cps/templates/config_edit.html:45
+#: cps/templates/config_edit.html:86
 msgid "Enable uploading"
 msgstr ""
 
-#: cps/templates/config_edit.html:49
+#: cps/templates/config_edit.html:90
 msgid "Enable anonymous browsing"
 msgstr ""
 
-#: cps/templates/config_edit.html:53
+#: cps/templates/config_edit.html:94
 msgid "Enable public registration"
 msgstr ""
 
-#: cps/templates/config_edit.html:55
+#: cps/templates/config_edit.html:96
 msgid "Default Settings for new users"
 msgstr ""
 
-#: cps/templates/config_edit.html:58 cps/templates/user_edit.html:83
+#: cps/templates/config_edit.html:99 cps/templates/user_edit.html:87
 msgid "Admin user"
 msgstr ""
 
-#: cps/templates/config_edit.html:62 cps/templates/user_edit.html:88
+#: cps/templates/config_edit.html:103 cps/templates/user_edit.html:92
 msgid "Allow Downloads"
 msgstr ""
 
-#: cps/templates/config_edit.html:66 cps/templates/user_edit.html:92
+#: cps/templates/config_edit.html:107 cps/templates/user_edit.html:96
 msgid "Allow Uploads"
 msgstr ""
 
-#: cps/templates/config_edit.html:70 cps/templates/user_edit.html:96
+#: cps/templates/config_edit.html:111 cps/templates/user_edit.html:100
 msgid "Allow Edit"
 msgstr ""
 
-#: cps/templates/config_edit.html:74 cps/templates/user_edit.html:101
+#: cps/templates/config_edit.html:115 cps/templates/user_edit.html:105
 msgid "Allow Changing Password"
 msgstr ""
 
-#: cps/templates/config_edit.html:81 cps/templates/layout.html:93
+#: cps/templates/config_edit.html:122 cps/templates/layout.html:93
 #: cps/templates/login.html:4
 msgid "Login"
 msgstr ""
@@ -711,19 +735,23 @@ msgstr ""
 msgid "Publishing date"
 msgstr ""
 
-#: cps/templates/detail.html:113
+#: cps/templates/detail.html:115
+msgid "Read"
+msgstr ""
+
+#: cps/templates/detail.html:123
 msgid "Description:"
 msgstr ""
 
-#: cps/templates/detail.html:141
+#: cps/templates/detail.html:151
 msgid "Read in browser"
 msgstr ""
 
-#: cps/templates/detail.html:161
+#: cps/templates/detail.html:171
 msgid "Add to shelf"
 msgstr ""
 
-#: cps/templates/detail.html:201
+#: cps/templates/detail.html:211
 msgid "Edit metadata"
 msgstr ""
 
@@ -803,19 +831,29 @@ msgstr ""
 msgid "Show Random Books"
 msgstr ""
 
-#: cps/templates/index.xml:43 cps/templates/layout.html:140
+#: cps/templates/index.xml:43 cps/templates/index.xml:47
+#: cps/templates/layout.html:132
+msgid "Read Books"
+msgstr ""
+
+#: cps/templates/index.xml:50 cps/templates/index.xml:54
+#: cps/templates/layout.html:133
+msgid "Unread Books"
+msgstr ""
+
+#: cps/templates/index.xml:57 cps/templates/layout.html:144
 msgid "Authors"
 msgstr ""
 
-#: cps/templates/index.xml:47
+#: cps/templates/index.xml:61
 msgid "Books ordered by Author"
 msgstr ""
 
-#: cps/templates/index.xml:54
+#: cps/templates/index.xml:68
 msgid "Books ordered by category"
 msgstr ""
 
-#: cps/templates/index.xml:61
+#: cps/templates/index.xml:75
 msgid "Books ordered by series"
 msgstr ""
 
@@ -839,31 +877,31 @@ msgstr ""
 msgid "Browse"
 msgstr ""
 
-#: cps/templates/layout.html:132
+#: cps/templates/layout.html:136
 msgid "Discover"
 msgstr ""
 
-#: cps/templates/layout.html:135
+#: cps/templates/layout.html:139
 msgid "Categories"
 msgstr ""
 
-#: cps/templates/layout.html:142 cps/templates/search_form.html:58
+#: cps/templates/layout.html:146 cps/templates/search_form.html:58
 msgid "Languages"
 msgstr ""
 
-#: cps/templates/layout.html:145
+#: cps/templates/layout.html:149
 msgid "Public Shelves"
 msgstr ""
 
-#: cps/templates/layout.html:149
+#: cps/templates/layout.html:153
 msgid "Your Shelves"
 msgstr ""
 
-#: cps/templates/layout.html:154
+#: cps/templates/layout.html:158
 msgid "Create a Shelf"
 msgstr ""
 
-#: cps/templates/layout.html:155
+#: cps/templates/layout.html:159
 msgid "About"
 msgstr ""
 
@@ -1034,14 +1072,18 @@ msgid "Show author selection"
 msgstr ""
 
 #: cps/templates/user_edit.html:75
+msgid "Show read and unread"
+msgstr ""
+
+#: cps/templates/user_edit.html:79
 msgid "Show random books in detail view"
 msgstr ""
 
-#: cps/templates/user_edit.html:108
+#: cps/templates/user_edit.html:112
 msgid "Delete this user"
 msgstr ""
 
-#: cps/templates/user_edit.html:123
+#: cps/templates/user_edit.html:127
 msgid "Recent Downloads"
 msgstr ""