Merge branch 'master' into fix/python3-patch-20170308

8 years ago · 59bf568f7e
parent d7afbdc349 74a3e6842a
commit 59bf568f7e
14 changed files with 24138 additions and 16146 deletions
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@ -104,7 +104,7 @@
        <input name="detail_view" type="checkbox" checked> {{_('view book after edit')}}
      </label>
    </div>
-    <a href="#" id="get_meta" class="btn btn-default" data-toggle="modal" data-target="#metaModal">{{_('Get Metadata')}}</a>
+    <a href="#" id="get_meta" class="btn btn-default" data-toggle="modal" data-target="#metaModal">{{_('Get metadata')}}</a>
    <button type="submit" class="btn btn-default">{{_('Submit')}}</button>
    <a href="{{ url_for('show_book',id=book.id) }}" class="btn btn-default">{{_('Back')}}</a>
  </form>
@ -150,9 +150,7 @@
 </script>
 <script src="{{ url_for('static', filename='js/libs/typeahead.bundle.js') }}"></script>
 <script src="{{ url_for('static', filename='js/edit_books.js') }}"></script>
-<<<<<<< HEAD
 <script src="{{ url_for('static', filename='js/libs/bootstrap-rating-input.min.js') }}"></script>
-=======
 <script src="{{ url_for('static', filename='js/get_meta.js') }}"></script>
 {% endblock %}
 {% block header %}
--- a/cps/templates/detail.html
+++ b/cps/templates/detail.html
@ -126,7 +126,7 @@
              </button>
              <ul class="dropdown-menu" aria-labelledby="btnGroupDrop1">
                {% for format in entry.data %}
-                <li><a href="{{ url_for('get_download_link', book_id=entry.id, format=format.format|lower) }}">{{format.format}}</a></li>
+                <li><a href="{{ url_for('get_download_link_ext', book_id=entry.id, format=format.format|lower, anyname=entry.id|string+'.'+format.format) }}">{{format.format}}</a></li>
                {%endfor%}
              </ul>
            </div>
--- a/cps/translations/de/LC_MESSAGES/messages.mo
+++ b/cps/translations/de/LC_MESSAGES/messages.mo
--- 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-02-27 21:10+0100\n"
+"POT-Creation-Date: 2017-03-12 19:10+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:111 cps/book_formats.py:115 cps/web.py:1041
+#: cps/book_formats.py:113 cps/book_formats.py:117 cps/web.py:1082
 msgid "not installed"
 msgstr "Nicht installiert"

-#: cps/helper.py:152
+#: cps/helper.py:159
 #, python-format
 msgid "Failed to send mail: %s"
 msgstr "E-Mail: %s konnte nicht gesendet werden"

-#: cps/helper.py:159
+#: cps/helper.py:166
 msgid "Calibre-web test email"
 msgstr "Calibre-web Test E-Mail"

-#: cps/helper.py:160 cps/helper.py:172
+#: cps/helper.py:167 cps/helper.py:179
 msgid "This email has been sent via calibre web."
 msgstr "Die E-Mail wurde via calibre-web versendet"

-#: cps/helper.py:169 cps/templates/detail.html:136
+#: cps/helper.py:176 cps/templates/detail.html:136
 msgid "Send to Kindle"
 msgstr "An Kindle senden"

-#: cps/helper.py:189 cps/helper.py:204
+#: cps/helper.py:196 cps/helper.py:211
 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:198
+#: cps/helper.py:205
 msgid "Could not convert epub to mobi"
 msgstr "Konnte .epub nicht nach .mobi konvertieren"

-#: cps/ub.py:433
+#: cps/ub.py:442
 msgid "Guest"
 msgstr "Gast"

-#: cps/web.py:742
+#: cps/web.py:768
 msgid "Requesting update package"
 msgstr "Frage Update Paket an"

-#: cps/web.py:743
+#: cps/web.py:769
 msgid "Downloading update package"
 msgstr "Lade Update Paket herunter"

-#: cps/web.py:744
+#: cps/web.py:770
 msgid "Unzipping update package"
 msgstr "Entpacke Update Paket"

-#: cps/web.py:745
+#: cps/web.py:771
 msgid "Files are replaced"
 msgstr "Ersetze Dateien"

-#: cps/web.py:746
+#: cps/web.py:772
 msgid "Database connections are closed"
 msgstr "Schließe Datenbankverbindungen"

-#: cps/web.py:747
+#: cps/web.py:773
 msgid "Server is stopped"
 msgstr "Stoppe Server"

-#: cps/web.py:748
+#: cps/web.py:774
 msgid "Update finished, please press okay and reload page"
 msgstr "Update abgeschlossen, bitte okay drücken und Seite neu laden"

-#: cps/web.py:821
+#: cps/web.py:847
 msgid "Latest Books"
 msgstr "Letzte Bücher"

-#: cps/web.py:846
+#: cps/web.py:878
 msgid "Hot Books (most downloaded)"
 msgstr "Beliebte Bücher (die meisten Downloads)"

-#: cps/web.py:856
+#: cps/web.py:888
 msgid "Best rated books"
 msgstr "Best bewertete Bücher"

-#: cps/templates/index.xml:36 cps/web.py:865
+#: cps/templates/index.xml:36 cps/web.py:897
 msgid "Random Books"
 msgstr "Zufällige Bücher"

-#: cps/web.py:878
+#: cps/web.py:910
 msgid "Author list"
 msgstr "Autorenliste"

-#: cps/web.py:889
+#: cps/web.py:921
 #, python-format
 msgid "Author: %(name)s"
 msgstr "Autor: %(name)s"

-#: cps/web.py:891 cps/web.py:919 cps/web.py:1018 cps/web.py:1261
-#: cps/web.py:2143
+#: cps/web.py:923 cps/web.py:951 cps/web.py:1059 cps/web.py:1309
+#: cps/web.py:2196
 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:905
+#: cps/templates/index.xml:57 cps/web.py:937
 msgid "Series list"
 msgstr "Liste Serien"

-#: cps/web.py:917
+#: cps/web.py:949
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Serie: %(serie)s"

-#: cps/web.py:950
+#: cps/web.py:982
 msgid "Available languages"
 msgstr "Verfügbare Sprachen"

-#: cps/web.py:965
+#: cps/web.py:997
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Sprache: %(name)s"

-#: cps/templates/index.xml:50 cps/web.py:978
+#: cps/templates/index.xml:50 cps/web.py:1010
 msgid "Category list"
 msgstr "Kategorieliste"

-#: cps/web.py:990
+#: cps/web.py:1022
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Kategorie: %(name)s"

-#: cps/web.py:1062
+#: cps/web.py:1105
 msgid "Statistics"
 msgstr "Statistiken"

-#: cps/web.py:1083
+#: cps/web.py:1126
 msgid "Server restarted, please reload page"
 msgstr "Server neu gestartet,bitte Seite neu laden"

-#: cps/web.py:1085
+#: cps/web.py:1128
 msgid "Performing shutdown of server, please close window"
 msgstr "Server wird runtergefahren, bitte Fenster schließen"

-#: cps/web.py:1095
+#: cps/web.py:1143
 msgid "Update done"
 msgstr "Update durchgeführt"

-#: cps/web.py:1173 cps/web.py:1186
+#: cps/web.py:1221 cps/web.py:1234
 msgid "search"
 msgstr "Suche"

-#: cps/web.py:1237 cps/web.py:1244 cps/web.py:1251 cps/web.py:1258
+#: cps/web.py:1285 cps/web.py:1292 cps/web.py:1299 cps/web.py:1306
 msgid "Read a Book"
 msgstr "Lese ein Buch"

-#: cps/web.py:1302 cps/web.py:1739
+#: cps/web.py:1350 cps/web.py:1789
 msgid "Please fill out all fields!"
 msgstr "Bitte alle Felder ausfüllen!"

-#: cps/web.py:1303 cps/web.py:1319 cps/web.py:1324 cps/web.py:1326
+#: cps/web.py:1351 cps/web.py:1367 cps/web.py:1372 cps/web.py:1374
 msgid "register"
 msgstr "Registieren"

-#: cps/web.py:1318
+#: cps/web.py:1366
 msgid "An unknown error occured. Please try again later."
 msgstr "Es ist ein unbekannter Fehler aufgetreten. Bitte später erneut versuchen."

-#: cps/web.py:1323
+#: cps/web.py:1371
 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:1341
+#: cps/web.py:1389
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Du bist nun eingeloggt als '%(nickname)s'"

-#: cps/web.py:1346
+#: cps/web.py:1394
 msgid "Wrong Username or Password"
 msgstr "Falscher Benutzername oder Passwort"

-#: cps/web.py:1348
+#: cps/web.py:1396
 msgid "login"
 msgstr "Login"

-#: cps/web.py:1365
+#: cps/web.py:1413
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Bitte zuerst die SMTP Mail Einstellung konfigurieren ..."

-#: cps/web.py:1369
+#: cps/web.py:1417
 #, python-format
 msgid "Book successfully send to %(kindlemail)s"
 msgstr "Buch erfolgreich versandt an %(kindlemail)s"

-#: cps/web.py:1373
+#: cps/web.py:1421
 #, 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:1375
+#: cps/web.py:1423 cps/web.py:1867
 msgid "Please configure your kindle email address first..."
 msgstr "Bitte die Kindle E-Mail Adresse zuuerst konfigurieren..."

-#: cps/web.py:1395
+#: cps/web.py:1443
 #, 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:1416
+#: cps/web.py:1464
 #, 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:1435 cps/web.py:1459
+#: cps/web.py:1483 cps/web.py:1507
 #, 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:1440
+#: cps/web.py:1488
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Bücherregal %(title)s erzeugt"

-#: cps/web.py:1442 cps/web.py:1470
+#: cps/web.py:1490 cps/web.py:1518
 msgid "There was an error"
 msgstr "Es trat ein Fehler auf"

-#: cps/web.py:1443 cps/web.py:1445
+#: cps/web.py:1491 cps/web.py:1493
 msgid "create a shelf"
 msgstr "Bücherregal erzeugen"

-#: cps/web.py:1468
+#: cps/web.py:1516
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "Bücherregal %(title)s verändert"

-#: cps/web.py:1471 cps/web.py:1473
+#: cps/web.py:1519 cps/web.py:1521
 msgid "Edit a shelf"
 msgstr "Bücherregal editieren"

-#: cps/web.py:1491
+#: cps/web.py:1539
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "Bücherregal %(name)s erfolgreich gelöscht"

-#: cps/web.py:1513
+#: cps/web.py:1561
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Bücherregal: '%(name)s'"

-#: cps/web.py:1544
+#: cps/web.py:1592
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "Reihenfolge in Bücherregal '%(name)s' verändern"

-#: cps/web.py:1606
+#: cps/web.py:1654
 msgid "Found an existing account for this email address."
 msgstr "Es existiert ein Benutzerkonto für diese E-Mailadresse"

-#: cps/web.py:1608 cps/web.py:1612
+#: cps/web.py:1656 cps/web.py:1660
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s's Profil"

-#: cps/web.py:1609
+#: cps/web.py:1657
 msgid "Profile updated"
 msgstr "Profil aktualisiert"

-#: cps/web.py:1623
+#: cps/web.py:1671
 msgid "Admin page"
 msgstr "Admin Seite"

-#: cps/web.py:1694
+#: cps/web.py:1744
 msgid "Calibre-web configuration updated"
 msgstr "Calibre-web Konfiguration wurde aktualisiert"

-#: cps/web.py:1701 cps/web.py:1707 cps/web.py:1720
+#: cps/web.py:1751 cps/web.py:1757 cps/web.py:1770
 msgid "Basic Configuration"
 msgstr "Basis Konfiguration"

-#: cps/web.py:1705
+#: cps/web.py:1755
 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:1741 cps/web.py:1787
+#: cps/templates/admin.html:34 cps/web.py:1791 cps/web.py:1837
 msgid "Add new user"
 msgstr "Neuen Benutzer hinzufügen"

-#: cps/web.py:1779
+#: cps/web.py:1829
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Benutzer '%(user)s' angelegt"

-#: cps/web.py:1783
+#: cps/web.py:1833
 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:1805
+#: cps/web.py:1855
 msgid "Mail settings updated"
 msgstr "E-Mail Einstellungen aktualisiert"

-#: cps/web.py:1811
+#: cps/web.py:1862
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr "Test E-Mail erfolgreich an %(kindlemail)s versendet"

-#: cps/web.py:1814
+#: cps/web.py:1865
 #, 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:1816
+#: cps/web.py:1869
 msgid "E-Mail settings updated"
-msgstr ""
+msgstr "E-Mail Einstellungen wurde aktualisiert"

-#: cps/web.py:1817
+#: cps/web.py:1870
 msgid "Edit mail settings"
 msgstr "E-Mail Einstellungen editieren"

-#: cps/web.py:1845
+#: cps/web.py:1898
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Benutzer '%(nick)s' gelöscht"

-#: cps/web.py:1926
+#: cps/web.py:1979
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Benutzer '%(nick)s' aktualisiert"

-#: cps/web.py:1929
+#: cps/web.py:1982
 msgid "An unknown error occured."
 msgstr "Es ist ein unbekanter Fehler aufgetreten"

-#: cps/web.py:1932
+#: cps/web.py:1985
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Benutzer %(nick)s bearbeiten"

-#: cps/web.py:2138 cps/web.py:2141 cps/web.py:2228
+#: cps/web.py:2191 cps/web.py:2194 cps/web.py:2304
 msgid "edit metadata"
 msgstr "Metadaten editieren"

-#: cps/web.py:2162
+#: cps/web.py:2215
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
-msgstr ""
+msgstr "Die Dateiendung \"%s\" kann nicht auf diesen Server hochgeladen werden"

-#: cps/web.py:2168
+#: cps/web.py:2221
 msgid "File to be uploaded must have an extension"
-msgstr ""
+msgstr "Datei müssen eine Erweiterung haben, um hochgeladen zu werden"

-#: cps/web.py:2185
+#: cps/web.py:2238
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Fehler beim Erzeugen des Pfads %s (Zugriff verweigert)"

-#: cps/web.py:2190
+#: cps/web.py:2243
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Fehler beim speichern der Datei %s (Zugriff verweigert)"

-#: cps/web.py:2195
+#: cps/web.py:2248
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Fehler beim Löschen von Datei %s (Zugriff verweigert)"
@ -470,7 +470,7 @@ msgstr "Konfiguration"
 msgid "Calibre DB dir"
 msgstr "Calibre DB Pfad"

-#: cps/templates/admin.html:61 cps/templates/config_edit.html:32
+#: cps/templates/admin.html:61 cps/templates/config_edit.html:35
 msgid "Log Level"
 msgstr "Log Level"

@ -507,42 +507,46 @@ msgid "Newest commit timestamp"
 msgstr "Neuestes Commit Datum"

 #: cps/templates/admin.html:83
+msgid "Reconnect to Calibre DB"
+msgstr "Calibre-DB neu verbinden"
+
+#: cps/templates/admin.html:84
 msgid "Restart Calibre-web"
 msgstr "Calibre-web Neustarten"

-#: cps/templates/admin.html:84
+#: cps/templates/admin.html:85
 msgid "Stop Calibre-web"
 msgstr "Stoppe Calibre-web"

-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:86
 msgid "Check for update"
 msgstr "Suche nach Update"

-#: cps/templates/admin.html:86
+#: cps/templates/admin.html:87
 msgid "Perform Update"
 msgstr "Update durchführen"

-#: cps/templates/admin.html:96
+#: cps/templates/admin.html:97
 msgid "Do you really want to restart Calibre-web?"
 msgstr "Calibre-web wirklich neustarten?"

-#: cps/templates/admin.html:101 cps/templates/admin.html:115
-#: cps/templates/admin.html:136
+#: cps/templates/admin.html:102 cps/templates/admin.html:116
+#: cps/templates/admin.html:137
 msgid "Ok"
 msgstr "Ok"

-#: cps/templates/admin.html:102 cps/templates/admin.html:116
-#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:75
+#: cps/templates/admin.html:103 cps/templates/admin.html:117
+#: cps/templates/book_edit.html:109 cps/templates/config_edit.html:78
 #: cps/templates/email_edit.html:36 cps/templates/shelf_edit.html:17
 #: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:116
 msgid "Back"
 msgstr "Zurück"

-#: cps/templates/admin.html:114
+#: cps/templates/admin.html:115
 msgid "Do you really want to stop Calibre-web?"
 msgstr "Calibre-web wirklich stoppen"

-#: cps/templates/admin.html:127
+#: cps/templates/admin.html:128
 msgid "Updating, please do not reload page"
 msgstr "Updatevorgang, bitte Seite nicht neu laden"

@ -550,11 +554,12 @@ msgstr "Updatevorgang, bitte Seite nicht neu laden"
 msgid "Book Title"
 msgstr "Buchtitel"

-#: cps/templates/book_edit.html:20 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:20 cps/templates/book_edit.html:145
+#: cps/templates/search_form.html:10
 msgid "Author"
 msgstr "Autor"

-#: cps/templates/book_edit.html:24
+#: cps/templates/book_edit.html:24 cps/templates/book_edit.html:147
 msgid "Description"
 msgstr "Beschreibung"

@ -595,12 +600,57 @@ msgstr "Nein"
 msgid "view book after edit"
 msgstr "Buch nach Bearbeitung ansehen"

-#: cps/templates/book_edit.html:107 cps/templates/config_edit.html:73
+#: cps/templates/book_edit.html:107 cps/templates/book_edit.html:118
+msgid "Get metadata"
+msgstr "Metadaten laden"
+
+#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:76
 #: cps/templates/login.html:19 cps/templates/search_form.html:79
 #: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:114
 msgid "Submit"
 msgstr "Abschicken"

+#: cps/templates/book_edit.html:121
+msgid "Keyword"
+msgstr "Suchbegriff"
+
+#: cps/templates/book_edit.html:122
+msgid " Search keyword "
+msgstr "Suchbegriff"
+
+#: cps/templates/book_edit.html:124 cps/templates/layout.html:60
+msgid "Go!"
+msgstr "Los!"
+
+#: cps/templates/book_edit.html:125
+msgid "Click the cover to load metadata to the form"
+msgstr "Klicke auf das Bild um die Metadaten zu übertragen"
+
+#: cps/templates/book_edit.html:129 cps/templates/book_edit.html:142
+msgid "Loading..."
+msgstr "Lade..."
+
+#: cps/templates/book_edit.html:132
+msgid "Close"
+msgstr "Schließen"
+
+#: cps/templates/book_edit.html:143
+msgid "Search error!"
+msgstr "Fehler bei Suche!"
+
+#: cps/templates/book_edit.html:144
+msgid "No Result! Please try anonther keyword."
+msgstr "Kein Ergebniss! Bitte anderen Begriff versuchen"
+
+#: cps/templates/book_edit.html:146 cps/templates/detail.html:76
+#: cps/templates/search_form.html:14
+msgid "Publisher"
+msgstr "Herausgeber"
+
+#: cps/templates/book_edit.html:148
+msgid "Source"
+msgstr "Quelle"
+
 #: cps/templates/config_edit.html:7
 msgid "Location of Calibre database"
 msgstr "Speicherort der Calibre Datenbank"
@ -617,47 +667,51 @@ msgstr "Titel"
 msgid "No. of random books to show"
 msgstr "Anzahl Anzeige zufällige Bücher"

-#: cps/templates/config_edit.html:28
+#: cps/templates/config_edit.html:27
+msgid "Regular expression for ignoring columns"
+msgstr "Regulärer Ausdruck um Spalten zu ignorien"
+
+#: cps/templates/config_edit.html:31
 msgid "Regular expression for title sorting"
 msgstr "Regulärer Ausdruck für Titelsortierung"

-#: cps/templates/config_edit.html:42
+#: cps/templates/config_edit.html:45
 msgid "Enable uploading"
 msgstr "Hochladen aktivieren"

-#: cps/templates/config_edit.html:46
+#: cps/templates/config_edit.html:49
 msgid "Enable anonymous browsing"
 msgstr "Anonymes Browsen aktivieren"

-#: cps/templates/config_edit.html:50
+#: cps/templates/config_edit.html:53
 msgid "Enable public registration"
 msgstr "Öffentliche Registrierung aktivieren"

-#: cps/templates/config_edit.html:52
+#: cps/templates/config_edit.html:55
 msgid "Default Settings for new users"
 msgstr "Default Einstellungen für neue Benutzer"

-#: cps/templates/config_edit.html:55 cps/templates/user_edit.html:83
+#: cps/templates/config_edit.html:58 cps/templates/user_edit.html:83
 msgid "Admin user"
 msgstr "Admin Benutzer"

-#: cps/templates/config_edit.html:59 cps/templates/user_edit.html:88
+#: cps/templates/config_edit.html:62 cps/templates/user_edit.html:88
 msgid "Allow Downloads"
 msgstr "Downloads erlauben"

-#: cps/templates/config_edit.html:63 cps/templates/user_edit.html:92
+#: cps/templates/config_edit.html:66 cps/templates/user_edit.html:92
 msgid "Allow Uploads"
 msgstr "Uploads erlauben"

-#: cps/templates/config_edit.html:67 cps/templates/user_edit.html:96
+#: cps/templates/config_edit.html:70 cps/templates/user_edit.html:96
 msgid "Allow Edit"
 msgstr "Bearbeiten erlauben"

-#: cps/templates/config_edit.html:71 cps/templates/user_edit.html:101
+#: cps/templates/config_edit.html:74 cps/templates/user_edit.html:101
 msgid "Allow Changing Password"
 msgstr "Passwort ändern erlauben"

-#: cps/templates/config_edit.html:78 cps/templates/layout.html:93
+#: cps/templates/config_edit.html:81 cps/templates/layout.html:93
 #: cps/templates/login.html:4
 msgid "Login"
 msgstr "Login"
@ -674,10 +728,6 @@ msgstr "von"
 msgid "language"
 msgstr "Sprache"

-#: cps/templates/detail.html:76 cps/templates/search_form.html:14
-msgid "Publisher"
-msgstr ""
-
 #: cps/templates/detail.html:81
 msgid "Publishing date"
 msgstr "Herausgabedatum"
@ -796,10 +846,6 @@ msgstr "Bücher nach Reihen geordnet"
 msgid "Toggle navigation"
 msgstr "Nagivation umschalten"

-#: cps/templates/layout.html:60
-msgid "Go!"
-msgstr "Los!"
-
 #: cps/templates/layout.html:68
 msgid "Advanced Search"
 msgstr "Erweiterte Suche"
--- a/cps/translations/es/LC_MESSAGES/messages.mo
+++ b/cps/translations/es/LC_MESSAGES/messages.mo
--- 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-02-27 21:10+0100\n"
+"POT-Creation-Date: 2017-03-12 19:10+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:111 cps/book_formats.py:115 cps/web.py:1041
+#: cps/book_formats.py:113 cps/book_formats.py:117 cps/web.py:1082
 msgid "not installed"
 msgstr "No instalado"

-#: cps/helper.py:152
+#: cps/helper.py:159
 #, python-format
 msgid "Failed to send mail: %s"
 msgstr "Fallo al enviar el correo : %s"

-#: cps/helper.py:159
+#: cps/helper.py:166
 msgid "Calibre-web test email"
 msgstr "Prueba de Correo Calibre-web"

-#: cps/helper.py:160 cps/helper.py:172
+#: cps/helper.py:167 cps/helper.py:179
 msgid "This email has been sent via calibre web."
 msgstr "Este mensaje ha sido enviado via Calibre Web."

-#: cps/helper.py:169 cps/templates/detail.html:136
+#: cps/helper.py:176 cps/templates/detail.html:136
 msgid "Send to Kindle"
 msgstr "Enviar a Kindle"

-#: cps/helper.py:189 cps/helper.py:204
+#: cps/helper.py:196 cps/helper.py:211
 msgid "Could not find any formats suitable for sending by email"
 msgstr "Formato no compatible para enviar por correo electronico"

-#: cps/helper.py:198
+#: cps/helper.py:205
 msgid "Could not convert epub to mobi"
 msgstr "No fue posible convertir de epub a mobi"

-#: cps/ub.py:433
+#: cps/ub.py:442
 msgid "Guest"
 msgstr ""

-#: cps/web.py:742
+#: cps/web.py:768
 msgid "Requesting update package"
 msgstr ""

-#: cps/web.py:743
+#: cps/web.py:769
 msgid "Downloading update package"
 msgstr ""

-#: cps/web.py:744
+#: cps/web.py:770
 msgid "Unzipping update package"
 msgstr ""

-#: cps/web.py:745
+#: cps/web.py:771
 msgid "Files are replaced"
 msgstr ""

-#: cps/web.py:746
+#: cps/web.py:772
 msgid "Database connections are closed"
 msgstr ""

-#: cps/web.py:747
+#: cps/web.py:773
 msgid "Server is stopped"
 msgstr ""

-#: cps/web.py:748
+#: cps/web.py:774
 msgid "Update finished, please press okay and reload page"
 msgstr ""

-#: cps/web.py:821
+#: cps/web.py:847
 msgid "Latest Books"
 msgstr "Libros recientes"

-#: cps/web.py:846
+#: cps/web.py:878
 msgid "Hot Books (most downloaded)"
 msgstr "Libros Populares (los mas descargados)"

-#: cps/web.py:856
+#: cps/web.py:888
 msgid "Best rated books"
 msgstr ""

-#: cps/templates/index.xml:36 cps/web.py:865
+#: cps/templates/index.xml:36 cps/web.py:897
 msgid "Random Books"
 msgstr "Libros al Azar"

-#: cps/web.py:878
+#: cps/web.py:910
 msgid "Author list"
 msgstr "Lista de Autores"

-#: cps/web.py:889
+#: cps/web.py:921
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""

-#: cps/web.py:891 cps/web.py:919 cps/web.py:1018 cps/web.py:1261
-#: cps/web.py:2143
+#: cps/web.py:923 cps/web.py:951 cps/web.py:1059 cps/web.py:1309
+#: cps/web.py:2196
 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:905
+#: cps/templates/index.xml:57 cps/web.py:937
 msgid "Series list"
 msgstr "lista de Series"

-#: cps/web.py:917
+#: cps/web.py:949
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Series : %(serie)s"

-#: cps/web.py:950
+#: cps/web.py:982
 msgid "Available languages"
 msgstr "Lenguajes disponibles"

-#: cps/web.py:965
+#: cps/web.py:997
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Lenguaje: %(name)s"

-#: cps/templates/index.xml:50 cps/web.py:978
+#: cps/templates/index.xml:50 cps/web.py:1010
 msgid "Category list"
 msgstr "Lista de Categorias"

-#: cps/web.py:990
+#: cps/web.py:1022
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Categoria : %(name)s"

-#: cps/web.py:1062
+#: cps/web.py:1105
 msgid "Statistics"
 msgstr "Estadisticas"

-#: cps/web.py:1083
+#: cps/web.py:1126
 msgid "Server restarted, please reload page"
 msgstr ""

-#: cps/web.py:1085
+#: cps/web.py:1128
 msgid "Performing shutdown of server, please close window"
 msgstr ""

-#: cps/web.py:1095
+#: cps/web.py:1143
 msgid "Update done"
 msgstr ""

-#: cps/web.py:1173 cps/web.py:1186
+#: cps/web.py:1221 cps/web.py:1234
 msgid "search"
 msgstr ""

-#: cps/web.py:1237 cps/web.py:1244 cps/web.py:1251 cps/web.py:1258
+#: cps/web.py:1285 cps/web.py:1292 cps/web.py:1299 cps/web.py:1306
 msgid "Read a Book"
 msgstr "Leer un Libro"

-#: cps/web.py:1302 cps/web.py:1739
+#: cps/web.py:1350 cps/web.py:1789
 msgid "Please fill out all fields!"
 msgstr "Por favor llenar todos los campos!"

-#: cps/web.py:1303 cps/web.py:1319 cps/web.py:1324 cps/web.py:1326
+#: cps/web.py:1351 cps/web.py:1367 cps/web.py:1372 cps/web.py:1374
 msgid "register"
 msgstr "Registrarse"

-#: cps/web.py:1318
+#: cps/web.py:1366
 msgid "An unknown error occured. Please try again later."
 msgstr "Ocurrio un error. Intentar de nuevo mas tarde."

-#: cps/web.py:1323
+#: cps/web.py:1371
 msgid "This username or email address is already in use."
 msgstr "Usuario o direccion de correo en uso."

-#: cps/web.py:1341
+#: cps/web.py:1389
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Sesion iniciada como : '%(nickname)s'"

-#: cps/web.py:1346
+#: cps/web.py:1394
 msgid "Wrong Username or Password"
 msgstr "Usuario o contraseña invalido"

-#: cps/web.py:1348
+#: cps/web.py:1396
 msgid "login"
 msgstr "Iniciar Sesion"

-#: cps/web.py:1365
+#: cps/web.py:1413
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Configurar primero los parametros SMTP por favor..."

-#: cps/web.py:1369
+#: cps/web.py:1417
 #, python-format
 msgid "Book successfully send to %(kindlemail)s"
 msgstr "Envio de Libro a %(kindlemail)s correctamente"

-#: cps/web.py:1373
+#: cps/web.py:1421
 #, 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:1375
+#: cps/web.py:1423 cps/web.py:1867
 msgid "Please configure your kindle email address first..."
 msgstr "Configurar primero la dirección de correo Kindle por favor..."

-#: cps/web.py:1395
+#: cps/web.py:1443
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "El libro fue agregado a el estante: %(sname)s"

-#: cps/web.py:1416
+#: cps/web.py:1464
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "El libro fue removido del estante: %(sname)s"

-#: cps/web.py:1435 cps/web.py:1459
+#: cps/web.py:1483 cps/web.py:1507
 #, 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:1440
+#: cps/web.py:1488
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Estante %(title)s creado"

-#: cps/web.py:1442 cps/web.py:1470
+#: cps/web.py:1490 cps/web.py:1518
 msgid "There was an error"
 msgstr "Hemos tenido un error"

-#: cps/web.py:1443 cps/web.py:1445
+#: cps/web.py:1491 cps/web.py:1493
 msgid "create a shelf"
 msgstr "Crear un Estante"

-#: cps/web.py:1468
+#: cps/web.py:1516
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr ""

-#: cps/web.py:1471 cps/web.py:1473
+#: cps/web.py:1519 cps/web.py:1521
 msgid "Edit a shelf"
 msgstr ""

-#: cps/web.py:1491
+#: cps/web.py:1539
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "Estante %(name)s fue borrado correctamente"

-#: cps/web.py:1513
+#: cps/web.py:1561
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Estante: '%(name)s'"

-#: cps/web.py:1544
+#: cps/web.py:1592
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr ""

-#: cps/web.py:1606
+#: cps/web.py:1654
 msgid "Found an existing account for this email address."
 msgstr "Existe una cuenta vinculada a esta cuenta de correo."

-#: cps/web.py:1608 cps/web.py:1612
+#: cps/web.py:1656 cps/web.py:1660
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Perfil de %(name)s"

-#: cps/web.py:1609
+#: cps/web.py:1657
 msgid "Profile updated"
 msgstr "Perfil actualizado"

-#: cps/web.py:1623
+#: cps/web.py:1671
 msgid "Admin page"
 msgstr ""

-#: cps/web.py:1694
+#: cps/web.py:1744
 msgid "Calibre-web configuration updated"
 msgstr ""

-#: cps/web.py:1701 cps/web.py:1707 cps/web.py:1720
+#: cps/web.py:1751 cps/web.py:1757 cps/web.py:1770
 msgid "Basic Configuration"
 msgstr ""

-#: cps/web.py:1705
+#: cps/web.py:1755
 msgid "DB location is not valid, please enter correct path"
 msgstr ""

-#: cps/templates/admin.html:34 cps/web.py:1741 cps/web.py:1787
+#: cps/templates/admin.html:34 cps/web.py:1791 cps/web.py:1837
 msgid "Add new user"
 msgstr "Agregar un nuevo usuario"

-#: cps/web.py:1779
+#: cps/web.py:1829
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Usuario '%(user)s' creado"

-#: cps/web.py:1783
+#: cps/web.py:1833
 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:1805
+#: cps/web.py:1855
 msgid "Mail settings updated"
 msgstr "Parametros de correo actualizados"

-#: cps/web.py:1811
+#: cps/web.py:1862
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr "Exito al realizar envio de prueba a %(kindlemail)s"

-#: cps/web.py:1814
+#: cps/web.py:1865
 #, 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:1816
+#: cps/web.py:1869
 msgid "E-Mail settings updated"
 msgstr ""

-#: cps/web.py:1817
+#: cps/web.py:1870
 msgid "Edit mail settings"
 msgstr "Editar parametros de correo"

-#: cps/web.py:1845
+#: cps/web.py:1898
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Usuario '%(nick)s' borrado"

-#: cps/web.py:1926
+#: cps/web.py:1979
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Usuario '%(nick)s'  Actualizado"

-#: cps/web.py:1929
+#: cps/web.py:1982
 msgid "An unknown error occured."
 msgstr "Oups ! Error inesperado."

-#: cps/web.py:1932
+#: cps/web.py:1985
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Editar Usuario %(nick)s"

-#: cps/web.py:2138 cps/web.py:2141 cps/web.py:2228
+#: cps/web.py:2191 cps/web.py:2194 cps/web.py:2304
 msgid "edit metadata"
 msgstr ""

-#: cps/web.py:2162
+#: cps/web.py:2215
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr ""

-#: cps/web.py:2168
+#: cps/web.py:2221
 msgid "File to be uploaded must have an extension"
 msgstr ""

-#: cps/web.py:2185
+#: cps/web.py:2238
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Fallo al crear la ruta %s (permiso negado)"

-#: cps/web.py:2190
+#: cps/web.py:2243
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Fallo al almacenar el archivo %s (permiso negado)"

-#: cps/web.py:2195
+#: cps/web.py:2248
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Fallo al borrar el archivo %s (permiso negado)"
@ -457,7 +457,7 @@ msgstr ""
 msgid "Calibre DB dir"
 msgstr ""

-#: cps/templates/admin.html:61 cps/templates/config_edit.html:32
+#: cps/templates/admin.html:61 cps/templates/config_edit.html:35
 msgid "Log Level"
 msgstr ""

@ -494,42 +494,46 @@ msgid "Newest commit timestamp"
 msgstr ""

 #: cps/templates/admin.html:83
-msgid "Restart Calibre-web"
+msgid "Reconnect to Calibre DB"
 msgstr ""

 #: cps/templates/admin.html:84
-msgid "Stop Calibre-web"
+msgid "Restart Calibre-web"
 msgstr ""

 #: cps/templates/admin.html:85
-msgid "Check for update"
+msgid "Stop Calibre-web"
 msgstr ""

 #: cps/templates/admin.html:86
+msgid "Check for update"
+msgstr ""
+
+#: cps/templates/admin.html:87
 msgid "Perform Update"
 msgstr ""

-#: cps/templates/admin.html:96
+#: cps/templates/admin.html:97
 msgid "Do you really want to restart Calibre-web?"
 msgstr ""

-#: cps/templates/admin.html:101 cps/templates/admin.html:115
-#: cps/templates/admin.html:136
+#: cps/templates/admin.html:102 cps/templates/admin.html:116
+#: cps/templates/admin.html:137
 msgid "Ok"
 msgstr ""

-#: cps/templates/admin.html:102 cps/templates/admin.html:116
-#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:75
+#: cps/templates/admin.html:103 cps/templates/admin.html:117
+#: cps/templates/book_edit.html:109 cps/templates/config_edit.html:78
 #: cps/templates/email_edit.html:36 cps/templates/shelf_edit.html:17
 #: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:116
 msgid "Back"
 msgstr "Regresar"

-#: cps/templates/admin.html:114
+#: cps/templates/admin.html:115
 msgid "Do you really want to stop Calibre-web?"
 msgstr ""

-#: cps/templates/admin.html:127
+#: cps/templates/admin.html:128
 msgid "Updating, please do not reload page"
 msgstr ""

@ -537,11 +541,12 @@ msgstr ""
 msgid "Book Title"
 msgstr "Titulo del Libro"

-#: cps/templates/book_edit.html:20 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:20 cps/templates/book_edit.html:145
+#: cps/templates/search_form.html:10
 msgid "Author"
 msgstr "Autor"

-#: cps/templates/book_edit.html:24
+#: cps/templates/book_edit.html:24 cps/templates/book_edit.html:147
 msgid "Description"
 msgstr "Descripcion"

@ -582,12 +587,57 @@ msgstr "No"
 msgid "view book after edit"
 msgstr "Ver libro tras la edicion"

-#: cps/templates/book_edit.html:107 cps/templates/config_edit.html:73
+#: cps/templates/book_edit.html:107 cps/templates/book_edit.html:118
+msgid "Get metadata"
+msgstr ""
+
+#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:76
 #: cps/templates/login.html:19 cps/templates/search_form.html:79
 #: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:114
 msgid "Submit"
 msgstr "Enviar"

+#: cps/templates/book_edit.html:121
+msgid "Keyword"
+msgstr ""
+
+#: cps/templates/book_edit.html:122
+msgid " Search keyword "
+msgstr ""
+
+#: cps/templates/book_edit.html:124 cps/templates/layout.html:60
+msgid "Go!"
+msgstr "Vamos!"
+
+#: cps/templates/book_edit.html:125
+msgid "Click the cover to load metadata to the form"
+msgstr ""
+
+#: cps/templates/book_edit.html:129 cps/templates/book_edit.html:142
+msgid "Loading..."
+msgstr ""
+
+#: cps/templates/book_edit.html:132
+msgid "Close"
+msgstr ""
+
+#: cps/templates/book_edit.html:143
+msgid "Search error!"
+msgstr ""
+
+#: cps/templates/book_edit.html:144
+msgid "No Result! Please try anonther keyword."
+msgstr ""
+
+#: cps/templates/book_edit.html:146 cps/templates/detail.html:76
+#: cps/templates/search_form.html:14
+msgid "Publisher"
+msgstr ""
+
+#: cps/templates/book_edit.html:148
+msgid "Source"
+msgstr ""
+
 #: cps/templates/config_edit.html:7
 msgid "Location of Calibre database"
 msgstr ""
@ -604,47 +654,51 @@ msgstr "Titulo"
 msgid "No. of random books to show"
 msgstr ""

-#: cps/templates/config_edit.html:28
+#: cps/templates/config_edit.html:27
+msgid "Regular expression for ignoring columns"
+msgstr ""
+
+#: cps/templates/config_edit.html:31
 msgid "Regular expression for title sorting"
 msgstr ""

-#: cps/templates/config_edit.html:42
+#: cps/templates/config_edit.html:45
 msgid "Enable uploading"
 msgstr ""

-#: cps/templates/config_edit.html:46
+#: cps/templates/config_edit.html:49
 msgid "Enable anonymous browsing"
 msgstr ""

-#: cps/templates/config_edit.html:50
+#: cps/templates/config_edit.html:53
 msgid "Enable public registration"
 msgstr ""

-#: cps/templates/config_edit.html:52
+#: cps/templates/config_edit.html:55
 msgid "Default Settings for new users"
 msgstr ""

-#: cps/templates/config_edit.html:55 cps/templates/user_edit.html:83
+#: cps/templates/config_edit.html:58 cps/templates/user_edit.html:83
 msgid "Admin user"
 msgstr "Usuario Administrador"

-#: cps/templates/config_edit.html:59 cps/templates/user_edit.html:88
+#: cps/templates/config_edit.html:62 cps/templates/user_edit.html:88
 msgid "Allow Downloads"
 msgstr "Permitir descargas"

-#: cps/templates/config_edit.html:63 cps/templates/user_edit.html:92
+#: cps/templates/config_edit.html:66 cps/templates/user_edit.html:92
 msgid "Allow Uploads"
 msgstr "Permitir subidas de archivos"

-#: cps/templates/config_edit.html:67 cps/templates/user_edit.html:96
+#: cps/templates/config_edit.html:70 cps/templates/user_edit.html:96
 msgid "Allow Edit"
 msgstr "Permitir editar"

-#: cps/templates/config_edit.html:71 cps/templates/user_edit.html:101
+#: cps/templates/config_edit.html:74 cps/templates/user_edit.html:101
 msgid "Allow Changing Password"
 msgstr "Permitir cambiar la clave"

-#: cps/templates/config_edit.html:78 cps/templates/layout.html:93
+#: cps/templates/config_edit.html:81 cps/templates/layout.html:93
 #: cps/templates/login.html:4
 msgid "Login"
 msgstr "Inicio de Sesion"
@ -661,10 +715,6 @@ msgstr "de"
 msgid "language"
 msgstr "Lenguaje"

-#: cps/templates/detail.html:76 cps/templates/search_form.html:14
-msgid "Publisher"
-msgstr ""
-
 #: cps/templates/detail.html:81
 msgid "Publishing date"
 msgstr ""
@ -781,10 +831,6 @@ msgstr "Libros ordenados por Series"
 msgid "Toggle navigation"
 msgstr ""

-#: cps/templates/layout.html:60
-msgid "Go!"
-msgstr "Vamos!"
-
 #: cps/templates/layout.html:68
 msgid "Advanced Search"
 msgstr "Busqueda avanzada"
--- a/cps/translations/fr/LC_MESSAGES/messages.mo
+++ b/cps/translations/fr/LC_MESSAGES/messages.mo
--- 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-02-27 21:10+0100\n"
+"POT-Creation-Date: 2017-03-12 19:10+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:111 cps/book_formats.py:115 cps/web.py:1041
+#: cps/book_formats.py:113 cps/book_formats.py:117 cps/web.py:1082
 msgid "not installed"
 msgstr ""

-#: cps/helper.py:152
+#: cps/helper.py:159
 #, python-format
 msgid "Failed to send mail: %s"
 msgstr "Impossible d'envoyer le courriel : %s"

-#: cps/helper.py:159
+#: cps/helper.py:166
 msgid "Calibre-web test email"
 msgstr ""

-#: cps/helper.py:160 cps/helper.py:172
+#: cps/helper.py:167 cps/helper.py:179
 msgid "This email has been sent via calibre web."
 msgstr "Ce message a été envoyé depuis calibre web."

-#: cps/helper.py:169 cps/templates/detail.html:136
+#: cps/helper.py:176 cps/templates/detail.html:136
 msgid "Send to Kindle"
 msgstr "Envoyer ver Kindle"

-#: cps/helper.py:189 cps/helper.py:204
+#: cps/helper.py:196 cps/helper.py:211
 msgid "Could not find any formats suitable for sending by email"
 msgstr "Impossible de trouver un format adapté à envoyer par courriel"

-#: cps/helper.py:198
+#: cps/helper.py:205
 msgid "Could not convert epub to mobi"
 msgstr "Impossible de convertir epub vers mobi"

-#: cps/ub.py:433
+#: cps/ub.py:442
 msgid "Guest"
 msgstr ""

-#: cps/web.py:742
+#: cps/web.py:768
 msgid "Requesting update package"
 msgstr ""

-#: cps/web.py:743
+#: cps/web.py:769
 msgid "Downloading update package"
 msgstr ""

-#: cps/web.py:744
+#: cps/web.py:770
 msgid "Unzipping update package"
 msgstr ""

-#: cps/web.py:745
+#: cps/web.py:771
 msgid "Files are replaced"
 msgstr ""

-#: cps/web.py:746
+#: cps/web.py:772
 msgid "Database connections are closed"
 msgstr ""

-#: cps/web.py:747
+#: cps/web.py:773
 msgid "Server is stopped"
 msgstr ""

-#: cps/web.py:748
+#: cps/web.py:774
 msgid "Update finished, please press okay and reload page"
 msgstr ""

-#: cps/web.py:821
+#: cps/web.py:847
 msgid "Latest Books"
 msgstr "Derniers livres"

-#: cps/web.py:846
+#: cps/web.py:878
 msgid "Hot Books (most downloaded)"
 msgstr "Livres populaires (les plus téléchargés)"

-#: cps/web.py:856
+#: cps/web.py:888
 msgid "Best rated books"
 msgstr ""

-#: cps/templates/index.xml:36 cps/web.py:865
+#: cps/templates/index.xml:36 cps/web.py:897
 msgid "Random Books"
 msgstr "Livres au hasard"

-#: cps/web.py:878
+#: cps/web.py:910
 msgid "Author list"
 msgstr "Liste des auteurs"

-#: cps/web.py:889
+#: cps/web.py:921
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""

-#: cps/web.py:891 cps/web.py:919 cps/web.py:1018 cps/web.py:1261
-#: cps/web.py:2143
+#: cps/web.py:923 cps/web.py:951 cps/web.py:1059 cps/web.py:1309
+#: cps/web.py:2196
 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:905
+#: cps/templates/index.xml:57 cps/web.py:937
 msgid "Series list"
 msgstr "Liste des séries"

-#: cps/web.py:917
+#: cps/web.py:949
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "Séries : %(serie)s"

-#: cps/web.py:950
+#: cps/web.py:982
 msgid "Available languages"
 msgstr "Langues disponibles"

-#: cps/web.py:965
+#: cps/web.py:997
 #, python-format
 msgid "Language: %(name)s"
 msgstr "Langue : %(name)s"

-#: cps/templates/index.xml:50 cps/web.py:978
+#: cps/templates/index.xml:50 cps/web.py:1010
 msgid "Category list"
 msgstr "Liste des catégories"

-#: cps/web.py:990
+#: cps/web.py:1022
 #, python-format
 msgid "Category: %(name)s"
 msgstr "Catégorie : %(name)s"

-#: cps/web.py:1062
+#: cps/web.py:1105
 msgid "Statistics"
 msgstr "Statistiques"

-#: cps/web.py:1083
+#: cps/web.py:1126
 msgid "Server restarted, please reload page"
 msgstr ""

-#: cps/web.py:1085
+#: cps/web.py:1128
 msgid "Performing shutdown of server, please close window"
 msgstr ""

-#: cps/web.py:1095
+#: cps/web.py:1143
 msgid "Update done"
 msgstr ""

-#: cps/web.py:1173 cps/web.py:1186
+#: cps/web.py:1221 cps/web.py:1234
 msgid "search"
 msgstr ""

-#: cps/web.py:1237 cps/web.py:1244 cps/web.py:1251 cps/web.py:1258
+#: cps/web.py:1285 cps/web.py:1292 cps/web.py:1299 cps/web.py:1306
 msgid "Read a Book"
 msgstr "Lire un livre"

-#: cps/web.py:1302 cps/web.py:1739
+#: cps/web.py:1350 cps/web.py:1789
 msgid "Please fill out all fields!"
 msgstr "SVP, complétez tous les champs !"

-#: cps/web.py:1303 cps/web.py:1319 cps/web.py:1324 cps/web.py:1326
+#: cps/web.py:1351 cps/web.py:1367 cps/web.py:1372 cps/web.py:1374
 msgid "register"
 msgstr "S'enregistrer"

-#: cps/web.py:1318
+#: cps/web.py:1366
 msgid "An unknown error occured. Please try again later."
 msgstr "Une erreur a eu lieu. Merci de réessayez plus tard."

-#: cps/web.py:1323
+#: cps/web.py:1371
 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:1341
+#: cps/web.py:1389
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "Vous êtes maintenant connecté sous : '%(nickname)s'"

-#: cps/web.py:1346
+#: cps/web.py:1394
 msgid "Wrong Username or Password"
 msgstr "Mauvais nom d'utilisateur ou mot de passe"

-#: cps/web.py:1348
+#: cps/web.py:1396
 msgid "login"
 msgstr "Connexion"

-#: cps/web.py:1365
+#: cps/web.py:1413
 msgid "Please configure the SMTP mail settings first..."
 msgstr "Veillez configurer les paramètres smtp d'abord..."

-#: cps/web.py:1369
+#: cps/web.py:1417
 #, python-format
 msgid "Book successfully send to %(kindlemail)s"
 msgstr "Livres envoyés à %(kindlemail)s avec succès"

-#: cps/web.py:1373
+#: cps/web.py:1421
 #, 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:1375
+#: cps/web.py:1423 cps/web.py:1867
 msgid "Please configure your kindle email address first..."
 msgstr "Veuillez configurer votre adresse kindle d'abord..."

-#: cps/web.py:1395
+#: cps/web.py:1443
 #, 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:1416
+#: cps/web.py:1464
 #, 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:1435 cps/web.py:1459
+#: cps/web.py:1483 cps/web.py:1507
 #, 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:1440
+#: cps/web.py:1488
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "Étagère %(title)s créée"

-#: cps/web.py:1442 cps/web.py:1470
+#: cps/web.py:1490 cps/web.py:1518
 msgid "There was an error"
 msgstr "Il y a eu une erreur"

-#: cps/web.py:1443 cps/web.py:1445
+#: cps/web.py:1491 cps/web.py:1493
 msgid "create a shelf"
 msgstr "Créer une étagère"

-#: cps/web.py:1468
+#: cps/web.py:1516
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr ""

-#: cps/web.py:1471 cps/web.py:1473
+#: cps/web.py:1519 cps/web.py:1521
 msgid "Edit a shelf"
 msgstr ""

-#: cps/web.py:1491
+#: cps/web.py:1539
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "L'étagère %(name)s a été supprimé avec succès"

-#: cps/web.py:1513
+#: cps/web.py:1561
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "Étagère : '%(name)s'"

-#: cps/web.py:1544
+#: cps/web.py:1592
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr ""

-#: cps/web.py:1606
+#: cps/web.py:1654
 msgid "Found an existing account for this email address."
 msgstr "Un compte avec cette adresse de courriel existe déjà."

-#: cps/web.py:1608 cps/web.py:1612
+#: cps/web.py:1656 cps/web.py:1660
 #, python-format
 msgid "%(name)s's profile"
 msgstr "Profil de %(name)s"

-#: cps/web.py:1609
+#: cps/web.py:1657
 msgid "Profile updated"
 msgstr "Profil mis à jour"

-#: cps/web.py:1623
+#: cps/web.py:1671
 msgid "Admin page"
 msgstr ""

-#: cps/web.py:1694
+#: cps/web.py:1744
 msgid "Calibre-web configuration updated"
 msgstr ""

-#: cps/web.py:1701 cps/web.py:1707 cps/web.py:1720
+#: cps/web.py:1751 cps/web.py:1757 cps/web.py:1770
 msgid "Basic Configuration"
 msgstr ""

-#: cps/web.py:1705
+#: cps/web.py:1755
 msgid "DB location is not valid, please enter correct path"
 msgstr ""

-#: cps/templates/admin.html:34 cps/web.py:1741 cps/web.py:1787
+#: cps/templates/admin.html:34 cps/web.py:1791 cps/web.py:1837
 msgid "Add new user"
 msgstr "Ajouter un nouvel utilisateur"

-#: cps/web.py:1779
+#: cps/web.py:1829
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "Utilisateur '%(user)s' créé"

-#: cps/web.py:1783
+#: cps/web.py:1833
 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:1805
+#: cps/web.py:1855
 msgid "Mail settings updated"
 msgstr "Paramètres de courriel mis à jour"

-#: cps/web.py:1811
+#: cps/web.py:1862
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr ""

-#: cps/web.py:1814
+#: cps/web.py:1865
 #, python-format
 msgid "There was an error sending the Test E-Mail: %(res)s"
 msgstr ""

-#: cps/web.py:1816
+#: cps/web.py:1869
 msgid "E-Mail settings updated"
 msgstr ""

-#: cps/web.py:1817
+#: cps/web.py:1870
 msgid "Edit mail settings"
 msgstr "Éditer les paramètres de courriel"

-#: cps/web.py:1845
+#: cps/web.py:1898
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "Utilisateur '%(nick)s' supprimé"

-#: cps/web.py:1926
+#: cps/web.py:1979
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "Utilisateur '%(nick)s'  mis à jour"

-#: cps/web.py:1929
+#: cps/web.py:1982
 msgid "An unknown error occured."
 msgstr "Oups ! Une erreur inconnue a eu lieu."

-#: cps/web.py:1932
+#: cps/web.py:1985
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "Éditer l'utilisateur %(nick)s"

-#: cps/web.py:2138 cps/web.py:2141 cps/web.py:2228
+#: cps/web.py:2191 cps/web.py:2194 cps/web.py:2304
 msgid "edit metadata"
 msgstr ""

-#: cps/web.py:2162
+#: cps/web.py:2215
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr ""

-#: cps/web.py:2168
+#: cps/web.py:2221
 msgid "File to be uploaded must have an extension"
 msgstr ""

-#: cps/web.py:2185
+#: cps/web.py:2238
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "Impossible de créer le chemin %s (permission refusée)"

-#: cps/web.py:2190
+#: cps/web.py:2243
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "Impossible d'enregistrer le fichier %s (permission refusée)"

-#: cps/web.py:2195
+#: cps/web.py:2248
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "Impossible de supprimer le fichier %s (permission refusée)"
@ -465,7 +465,7 @@ msgstr ""
 msgid "Calibre DB dir"
 msgstr ""

-#: cps/templates/admin.html:61 cps/templates/config_edit.html:32
+#: cps/templates/admin.html:61 cps/templates/config_edit.html:35
 msgid "Log Level"
 msgstr ""

@ -502,42 +502,46 @@ msgid "Newest commit timestamp"
 msgstr ""

 #: cps/templates/admin.html:83
-msgid "Restart Calibre-web"
+msgid "Reconnect to Calibre DB"
 msgstr ""

 #: cps/templates/admin.html:84
-msgid "Stop Calibre-web"
+msgid "Restart Calibre-web"
 msgstr ""

 #: cps/templates/admin.html:85
-msgid "Check for update"
+msgid "Stop Calibre-web"
 msgstr ""

 #: cps/templates/admin.html:86
+msgid "Check for update"
+msgstr ""
+
+#: cps/templates/admin.html:87
 msgid "Perform Update"
 msgstr ""

-#: cps/templates/admin.html:96
+#: cps/templates/admin.html:97
 msgid "Do you really want to restart Calibre-web?"
 msgstr ""

-#: cps/templates/admin.html:101 cps/templates/admin.html:115
-#: cps/templates/admin.html:136
+#: cps/templates/admin.html:102 cps/templates/admin.html:116
+#: cps/templates/admin.html:137
 msgid "Ok"
 msgstr ""

-#: cps/templates/admin.html:102 cps/templates/admin.html:116
-#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:75
+#: cps/templates/admin.html:103 cps/templates/admin.html:117
+#: cps/templates/book_edit.html:109 cps/templates/config_edit.html:78
 #: cps/templates/email_edit.html:36 cps/templates/shelf_edit.html:17
 #: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:116
 msgid "Back"
 msgstr "Retour"

-#: cps/templates/admin.html:114
+#: cps/templates/admin.html:115
 msgid "Do you really want to stop Calibre-web?"
 msgstr ""

-#: cps/templates/admin.html:127
+#: cps/templates/admin.html:128
 msgid "Updating, please do not reload page"
 msgstr ""

@ -545,11 +549,12 @@ msgstr ""
 msgid "Book Title"
 msgstr "Titre du livre"

-#: cps/templates/book_edit.html:20 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:20 cps/templates/book_edit.html:145
+#: cps/templates/search_form.html:10
 msgid "Author"
 msgstr "Auteur"

-#: cps/templates/book_edit.html:24
+#: cps/templates/book_edit.html:24 cps/templates/book_edit.html:147
 msgid "Description"
 msgstr "Description"

@ -590,12 +595,57 @@ msgstr "Non"
 msgid "view book after edit"
 msgstr "Voir le livre après l'édition"

-#: cps/templates/book_edit.html:107 cps/templates/config_edit.html:73
+#: cps/templates/book_edit.html:107 cps/templates/book_edit.html:118
+msgid "Get metadata"
+msgstr ""
+
+#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:76
 #: cps/templates/login.html:19 cps/templates/search_form.html:79
 #: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:114
 msgid "Submit"
 msgstr "Soumettre"

+#: cps/templates/book_edit.html:121
+msgid "Keyword"
+msgstr ""
+
+#: cps/templates/book_edit.html:122
+msgid " Search keyword "
+msgstr ""
+
+#: cps/templates/book_edit.html:124 cps/templates/layout.html:60
+msgid "Go!"
+msgstr "Allez !"
+
+#: cps/templates/book_edit.html:125
+msgid "Click the cover to load metadata to the form"
+msgstr ""
+
+#: cps/templates/book_edit.html:129 cps/templates/book_edit.html:142
+msgid "Loading..."
+msgstr ""
+
+#: cps/templates/book_edit.html:132
+msgid "Close"
+msgstr ""
+
+#: cps/templates/book_edit.html:143
+msgid "Search error!"
+msgstr ""
+
+#: cps/templates/book_edit.html:144
+msgid "No Result! Please try anonther keyword."
+msgstr ""
+
+#: cps/templates/book_edit.html:146 cps/templates/detail.html:76
+#: cps/templates/search_form.html:14
+msgid "Publisher"
+msgstr ""
+
+#: cps/templates/book_edit.html:148
+msgid "Source"
+msgstr ""
+
 #: cps/templates/config_edit.html:7
 msgid "Location of Calibre database"
 msgstr ""
@ -612,47 +662,51 @@ msgstr "Titre"
 msgid "No. of random books to show"
 msgstr ""

-#: cps/templates/config_edit.html:28
+#: cps/templates/config_edit.html:27
+msgid "Regular expression for ignoring columns"
+msgstr ""
+
+#: cps/templates/config_edit.html:31
 msgid "Regular expression for title sorting"
 msgstr ""

-#: cps/templates/config_edit.html:42
+#: cps/templates/config_edit.html:45
 msgid "Enable uploading"
 msgstr ""

-#: cps/templates/config_edit.html:46
+#: cps/templates/config_edit.html:49
 msgid "Enable anonymous browsing"
 msgstr ""

-#: cps/templates/config_edit.html:50
+#: cps/templates/config_edit.html:53
 msgid "Enable public registration"
 msgstr ""

-#: cps/templates/config_edit.html:52
+#: cps/templates/config_edit.html:55
 msgid "Default Settings for new users"
 msgstr ""

-#: cps/templates/config_edit.html:55 cps/templates/user_edit.html:83
+#: cps/templates/config_edit.html:58 cps/templates/user_edit.html:83
 msgid "Admin user"
 msgstr "Utilisateur admin"

-#: cps/templates/config_edit.html:59 cps/templates/user_edit.html:88
+#: cps/templates/config_edit.html:62 cps/templates/user_edit.html:88
 msgid "Allow Downloads"
 msgstr "Permettre les téléchargements"

-#: cps/templates/config_edit.html:63 cps/templates/user_edit.html:92
+#: cps/templates/config_edit.html:66 cps/templates/user_edit.html:92
 msgid "Allow Uploads"
 msgstr "Permettre les téléversements"

-#: cps/templates/config_edit.html:67 cps/templates/user_edit.html:96
+#: cps/templates/config_edit.html:70 cps/templates/user_edit.html:96
 msgid "Allow Edit"
 msgstr "Permettre l'édition"

-#: cps/templates/config_edit.html:71 cps/templates/user_edit.html:101
+#: cps/templates/config_edit.html:74 cps/templates/user_edit.html:101
 msgid "Allow Changing Password"
 msgstr "Permettre le changement de mot de passe"

-#: cps/templates/config_edit.html:78 cps/templates/layout.html:93
+#: cps/templates/config_edit.html:81 cps/templates/layout.html:93
 #: cps/templates/login.html:4
 msgid "Login"
 msgstr "Connexion"
@ -669,10 +723,6 @@ msgstr ""
 msgid "language"
 msgstr "Langue"

-#: cps/templates/detail.html:76 cps/templates/search_form.html:14
-msgid "Publisher"
-msgstr ""
-
 #: cps/templates/detail.html:81
 msgid "Publishing date"
 msgstr ""
@ -789,10 +839,6 @@ msgstr "Livres classés par série"
 msgid "Toggle navigation"
 msgstr "Basculer la navigation"

-#: cps/templates/layout.html:60
-msgid "Go!"
-msgstr "Allez !"
-
 #: cps/templates/layout.html:68
 msgid "Advanced Search"
 msgstr "Recherche avancée"
--- a/cps/translations/pl/LC_MESSAGES/messages.mo
+++ b/cps/translations/pl/LC_MESSAGES/messages.mo
--- a/cps/translations/pl/LC_MESSAGES/messages.po
+++ b/cps/translations/pl/LC_MESSAGES/messages.po
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
--- 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-02-27 21:10+0100\n"
+"POT-Creation-Date: 2017-03-12 19:10+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:111 cps/book_formats.py:115 cps/web.py:1041
+#: cps/book_formats.py:113 cps/book_formats.py:117 cps/web.py:1082
 msgid "not installed"
 msgstr "未安装"

-#: cps/helper.py:152
+#: cps/helper.py:159
 #, python-format
 msgid "Failed to send mail: %s"
 msgstr "发送邮件失败: %s"

-#: cps/helper.py:159
+#: cps/helper.py:166
 msgid "Calibre-web test email"
 msgstr "Calibre-web 测试邮件"

-#: cps/helper.py:160 cps/helper.py:172
+#: cps/helper.py:167 cps/helper.py:179
 msgid "This email has been sent via calibre web."
 msgstr "此邮件由calibre web发送"

-#: cps/helper.py:169 cps/templates/detail.html:136
+#: cps/helper.py:176 cps/templates/detail.html:136
 msgid "Send to Kindle"
 msgstr "发送到Kindle"

-#: cps/helper.py:189 cps/helper.py:204
+#: cps/helper.py:196 cps/helper.py:211
 msgid "Could not find any formats suitable for sending by email"
 msgstr "无法找到适合邮件发送的格式"

-#: cps/helper.py:198
+#: cps/helper.py:205
 msgid "Could not convert epub to mobi"
 msgstr "无法转换epub到mobi"

-#: cps/ub.py:433
+#: cps/ub.py:442
 msgid "Guest"
 msgstr "游客"

-#: cps/web.py:742
+#: cps/web.py:768
 msgid "Requesting update package"
 msgstr "正在请求更新包"

-#: cps/web.py:743
+#: cps/web.py:769
 msgid "Downloading update package"
 msgstr "正在下载更新包"

-#: cps/web.py:744
+#: cps/web.py:770
 msgid "Unzipping update package"
 msgstr "正在解压更新包"

-#: cps/web.py:745
+#: cps/web.py:771
 msgid "Files are replaced"
 msgstr "文件已替换"

-#: cps/web.py:746
+#: cps/web.py:772
 msgid "Database connections are closed"
 msgstr "数据库连接已关闭"

-#: cps/web.py:747
+#: cps/web.py:773
 msgid "Server is stopped"
 msgstr "服务器已停止"

-#: cps/web.py:748
+#: cps/web.py:774
 msgid "Update finished, please press okay and reload page"
 msgstr "更新完成，请按确定并刷新页面"

-#: cps/web.py:821
+#: cps/web.py:847
 msgid "Latest Books"
 msgstr "最新书籍"

-#: cps/web.py:846
+#: cps/web.py:878
 msgid "Hot Books (most downloaded)"
 msgstr "热门书籍(最多下载)"

-#: cps/web.py:856
+#: cps/web.py:888
 msgid "Best rated books"
 msgstr "最高评分书籍"

-#: cps/templates/index.xml:36 cps/web.py:865
+#: cps/templates/index.xml:36 cps/web.py:897
 msgid "Random Books"
 msgstr "随机书籍"

-#: cps/web.py:878
+#: cps/web.py:910
 msgid "Author list"
 msgstr "作者列表"

-#: cps/web.py:889
+#: cps/web.py:921
 #, python-forma, python-format
 msgid "Author: %(name)s"
 msgstr "作者： %(name)s"

-#: cps/web.py:891 cps/web.py:919 cps/web.py:1018 cps/web.py:1261
-#: cps/web.py:2143
+#: cps/web.py:923 cps/web.py:951 cps/web.py:1059 cps/web.py:1309
+#: cps/web.py:2196
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr "无法打开电子书。 文件不存在或者文件不可访问:"

-#: cps/templates/index.xml:57 cps/web.py:905
+#: cps/templates/index.xml:57 cps/web.py:937
 msgid "Series list"
 msgstr "丛书列表"

-#: cps/web.py:917
+#: cps/web.py:949
 #, python-format
 msgid "Series: %(serie)s"
 msgstr "丛书: %(serie)s"

-#: cps/web.py:950
+#: cps/web.py:982
 msgid "Available languages"
 msgstr "可用语言"

-#: cps/web.py:965
+#: cps/web.py:997
 #, python-format
 msgid "Language: %(name)s"
 msgstr "语言: %(name)s"

-#: cps/templates/index.xml:50 cps/web.py:978
+#: cps/templates/index.xml:50 cps/web.py:1010
 msgid "Category list"
 msgstr "分类列表"

-#: cps/web.py:990
+#: cps/web.py:1022
 #, python-format
 msgid "Category: %(name)s"
 msgstr "分类: %(name)s"

-#: cps/web.py:1062
+#: cps/web.py:1105
 msgid "Statistics"
 msgstr "统计"

-#: cps/web.py:1083
+#: cps/web.py:1126
 msgid "Server restarted, please reload page"
 msgstr "服务器已重启，请刷新页面"

-#: cps/web.py:1085
+#: cps/web.py:1128
 msgid "Performing shutdown of server, please close window"
 msgstr "正在关闭服务器，请关闭窗口"

-#: cps/web.py:1095
+#: cps/web.py:1143
 msgid "Update done"
 msgstr "更新完成"

-#: cps/web.py:1173 cps/web.py:1186
+#: cps/web.py:1221 cps/web.py:1234
 msgid "search"
 msgstr "搜索"

-#: cps/web.py:1237 cps/web.py:1244 cps/web.py:1251 cps/web.py:1258
+#: cps/web.py:1285 cps/web.py:1292 cps/web.py:1299 cps/web.py:1306
 msgid "Read a Book"
 msgstr "阅读一本书"

-#: cps/web.py:1302 cps/web.py:1739
+#: cps/web.py:1350 cps/web.py:1789
 msgid "Please fill out all fields!"
 msgstr "请填写所有字段"

-#: cps/web.py:1303 cps/web.py:1319 cps/web.py:1324 cps/web.py:1326
+#: cps/web.py:1351 cps/web.py:1367 cps/web.py:1372 cps/web.py:1374
 msgid "register"
 msgstr "注册"

-#: cps/web.py:1318
+#: cps/web.py:1366
 msgid "An unknown error occured. Please try again later."
 msgstr "发生一个未知错误。请稍后再试。"

-#: cps/web.py:1323
+#: cps/web.py:1371
 msgid "This username or email address is already in use."
 msgstr "此用户名或邮箱已被使用。"

-#: cps/web.py:1341
+#: cps/web.py:1389
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr "您现在已以'%(nickname)s'身份登录"

-#: cps/web.py:1346
+#: cps/web.py:1394
 msgid "Wrong Username or Password"
 msgstr "用户名或密码错误"

-#: cps/web.py:1348
+#: cps/web.py:1396
 msgid "login"
 msgstr "登录"

-#: cps/web.py:1365
+#: cps/web.py:1413
 msgid "Please configure the SMTP mail settings first..."
 msgstr "请先配置SMTP邮箱..."

-#: cps/web.py:1369
+#: cps/web.py:1417
 #, python-format
 msgid "Book successfully send to %(kindlemail)s"
 msgstr "此书已被成功发给 %(kindlemail)s"

-#: cps/web.py:1373
+#: cps/web.py:1421
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr "发送这本书的时候出现错误: %(res)s"

-#: cps/web.py:1375
+#: cps/web.py:1423 cps/web.py:1867
 msgid "Please configure your kindle email address first..."
 msgstr "请先配置您的kindle电子邮箱地址..."

-#: cps/web.py:1395
+#: cps/web.py:1443
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr "此书已被添加到书架: %(sname)s"

-#: cps/web.py:1416
+#: cps/web.py:1464
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr "此书已从书架 %(sname)s 中删除"

-#: cps/web.py:1435 cps/web.py:1459
+#: cps/web.py:1483 cps/web.py:1507
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr "已存在书架 '%(title)s'。"

-#: cps/web.py:1440
+#: cps/web.py:1488
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr "书架 %(title)s 已被创建"

-#: cps/web.py:1442 cps/web.py:1470
+#: cps/web.py:1490 cps/web.py:1518
 msgid "There was an error"
 msgstr "发生错误"

-#: cps/web.py:1443 cps/web.py:1445
+#: cps/web.py:1491 cps/web.py:1493
 msgid "create a shelf"
 msgstr "创建书架"

-#: cps/web.py:1468
+#: cps/web.py:1516
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr "书架 %(title)s 已被修改"

-#: cps/web.py:1471 cps/web.py:1473
+#: cps/web.py:1519 cps/web.py:1521
 msgid "Edit a shelf"
 msgstr "编辑书架"

-#: cps/web.py:1491
+#: cps/web.py:1539
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr "成功删除书架 %(name)s"

-#: cps/web.py:1513
+#: cps/web.py:1561
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr "书架: '%(name)s'"

-#: cps/web.py:1544
+#: cps/web.py:1592
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr "修改书架 '%(name)s' 顺序"

-#: cps/web.py:1606
+#: cps/web.py:1654
 msgid "Found an existing account for this email address."
 msgstr "找到已使用此邮箱的账号。"

-#: cps/web.py:1608 cps/web.py:1612
+#: cps/web.py:1656 cps/web.py:1660
 #, python-format
 msgid "%(name)s's profile"
 msgstr "%(name)s 的资料"

-#: cps/web.py:1609
+#: cps/web.py:1657
 msgid "Profile updated"
 msgstr "资料已更新"

-#: cps/web.py:1623
+#: cps/web.py:1671
 msgid "Admin page"
 msgstr "管理页"

-#: cps/web.py:1694
+#: cps/web.py:1744
 msgid "Calibre-web configuration updated"
 msgstr "Calibre-web配置已更新"

-#: cps/web.py:1701 cps/web.py:1707 cps/web.py:1720
+#: cps/web.py:1751 cps/web.py:1757 cps/web.py:1770
 msgid "Basic Configuration"
 msgstr "基本配置"

-#: cps/web.py:1705
+#: cps/web.py:1755
 msgid "DB location is not valid, please enter correct path"
 msgstr "DB位置无效，请输入正确路径"

-#: cps/templates/admin.html:34 cps/web.py:1741 cps/web.py:1787
+#: cps/templates/admin.html:34 cps/web.py:1791 cps/web.py:1837
 msgid "Add new user"
 msgstr "添加新用户"

-#: cps/web.py:1779
+#: cps/web.py:1829
 #, python-format
 msgid "User '%(user)s' created"
 msgstr "用户 '%(user)s' 已被创建"

-#: cps/web.py:1783
+#: cps/web.py:1833
 msgid "Found an existing account for this email address or nickname."
 msgstr "已找到使用此邮箱或昵称的账号。"

-#: cps/web.py:1805
+#: cps/web.py:1855
 msgid "Mail settings updated"
 msgstr "邮箱设置已更新"

-#: cps/web.py:1811
+#: cps/web.py:1862
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr "测试邮件已成功发送到 %(kindlemail)s"

-#: cps/web.py:1814
+#: cps/web.py:1865
 #, python-format
 msgid "There was an error sending the Test E-Mail: %(res)s"
 msgstr "发送测试邮件时发生错误: %(res)s"

-#: cps/web.py:1816
+#: cps/web.py:1869
 msgid "E-Mail settings updated"
 msgstr "E-Mail 设置已更新"

-#: cps/web.py:1817
+#: cps/web.py:1870
 msgid "Edit mail settings"
 msgstr "编辑邮箱设置"

-#: cps/web.py:1845
+#: cps/web.py:1898
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr "用户 '%(nick)s' 已被删除"

-#: cps/web.py:1926
+#: cps/web.py:1979
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr "用户 '%(nick)s' 已被更新"

-#: cps/web.py:1929
+#: cps/web.py:1982
 msgid "An unknown error occured."
 msgstr "发生未知错误。"

-#: cps/web.py:1932
+#: cps/web.py:1985
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr "编辑用户 %(nick)s"

-#: cps/web.py:2138 cps/web.py:2141 cps/web.py:2228
+#: cps/web.py:2191 cps/web.py:2194 cps/web.py:2304
 msgid "edit metadata"
 msgstr "编辑元数据"

-#: cps/web.py:2162
+#: cps/web.py:2215
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr "不能上传后缀为　\"%s\"　的文件到此服务器"

-#: cps/web.py:2168
+#: cps/web.py:2221
 msgid "File to be uploaded must have an extension"
 msgstr "要上传的文件必须有一个后缀"

-#: cps/web.py:2185
+#: cps/web.py:2238
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr "创建路径 %s 失败(权限拒绝)。"

-#: cps/web.py:2190
+#: cps/web.py:2243
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr "存储文件 %s 失败(权限拒绝)。"

-#: cps/web.py:2195
+#: cps/web.py:2248
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr "删除文件 %s 失败(权限拒绝)。"
@ -458,7 +458,7 @@ msgstr "配置"
 msgid "Calibre DB dir"
 msgstr "Calibre DB目录"

-#: cps/templates/admin.html:61 cps/templates/config_edit.html:32
+#: cps/templates/admin.html:61 cps/templates/config_edit.html:35
 msgid "Log Level"
 msgstr "日志级别"

@ -495,42 +495,46 @@ msgid "Newest commit timestamp"
 msgstr "最新提交时间戳"

 #: cps/templates/admin.html:83
+msgid "Reconnect to Calibre DB"
+msgstr ""
+
+#: cps/templates/admin.html:84
 msgid "Restart Calibre-web"
 msgstr "重启 Calibre-web"

-#: cps/templates/admin.html:84
+#: cps/templates/admin.html:85
 msgid "Stop Calibre-web"
 msgstr "停止 Calibre-web"

-#: cps/templates/admin.html:85
+#: cps/templates/admin.html:86
 msgid "Check for update"
 msgstr "检查更新"

-#: cps/templates/admin.html:86
+#: cps/templates/admin.html:87
 msgid "Perform Update"
 msgstr "执行更新"

-#: cps/templates/admin.html:96
+#: cps/templates/admin.html:97
 msgid "Do you really want to restart Calibre-web?"
 msgstr "您确定要重启 Calibre-web 吗？"

-#: cps/templates/admin.html:101 cps/templates/admin.html:115
-#: cps/templates/admin.html:136
+#: cps/templates/admin.html:102 cps/templates/admin.html:116
+#: cps/templates/admin.html:137
 msgid "Ok"
 msgstr "确定"

-#: cps/templates/admin.html:102 cps/templates/admin.html:116
-#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:75
+#: cps/templates/admin.html:103 cps/templates/admin.html:117
+#: cps/templates/book_edit.html:109 cps/templates/config_edit.html:78
 #: cps/templates/email_edit.html:36 cps/templates/shelf_edit.html:17
 #: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:116
 msgid "Back"
 msgstr "后退"

-#: cps/templates/admin.html:114
+#: cps/templates/admin.html:115
 msgid "Do you really want to stop Calibre-web?"
 msgstr "您确定要关闭 Calibre-web 吗？"

-#: cps/templates/admin.html:127
+#: cps/templates/admin.html:128
 msgid "Updating, please do not reload page"
 msgstr "正在更新，请不要刷新页面"

@ -538,11 +542,12 @@ msgstr "正在更新，请不要刷新页面"
 msgid "Book Title"
 msgstr "书名"

-#: cps/templates/book_edit.html:20 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:20 cps/templates/book_edit.html:145
+#: cps/templates/search_form.html:10
 msgid "Author"
 msgstr "作者"

-#: cps/templates/book_edit.html:24
+#: cps/templates/book_edit.html:24 cps/templates/book_edit.html:147
 msgid "Description"
 msgstr "简介"

@ -583,12 +588,57 @@ msgstr ""
 msgid "view book after edit"
 msgstr "编辑后查看书籍"

-#: cps/templates/book_edit.html:107 cps/templates/config_edit.html:73
+#: cps/templates/book_edit.html:107 cps/templates/book_edit.html:118
+msgid "Get metadata"
+msgstr ""
+
+#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:76
 #: cps/templates/login.html:19 cps/templates/search_form.html:79
 #: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:114
 msgid "Submit"
 msgstr "提交"

+#: cps/templates/book_edit.html:121
+msgid "Keyword"
+msgstr ""
+
+#: cps/templates/book_edit.html:122
+msgid " Search keyword "
+msgstr ""
+
+#: cps/templates/book_edit.html:124 cps/templates/layout.html:60
+msgid "Go!"
+msgstr "走起！"
+
+#: cps/templates/book_edit.html:125
+msgid "Click the cover to load metadata to the form"
+msgstr ""
+
+#: cps/templates/book_edit.html:129 cps/templates/book_edit.html:142
+msgid "Loading..."
+msgstr ""
+
+#: cps/templates/book_edit.html:132
+msgid "Close"
+msgstr ""
+
+#: cps/templates/book_edit.html:143
+msgid "Search error!"
+msgstr ""
+
+#: cps/templates/book_edit.html:144
+msgid "No Result! Please try anonther keyword."
+msgstr ""
+
+#: cps/templates/book_edit.html:146 cps/templates/detail.html:76
+#: cps/templates/search_form.html:14
+msgid "Publisher"
+msgstr ""
+
+#: cps/templates/book_edit.html:148
+msgid "Source"
+msgstr ""
+
 #: cps/templates/config_edit.html:7
 msgid "Location of Calibre database"
 msgstr "Calibre 数据库位置"
@ -605,47 +655,51 @@ msgstr "标题"
 msgid "No. of random books to show"
 msgstr "随机书籍显示数量"

-#: cps/templates/config_edit.html:28
+#: cps/templates/config_edit.html:27
+msgid "Regular expression for ignoring columns"
+msgstr ""
+
+#: cps/templates/config_edit.html:31
 msgid "Regular expression for title sorting"
 msgstr "标题排序的正则表达式"

-#: cps/templates/config_edit.html:42
+#: cps/templates/config_edit.html:45
 msgid "Enable uploading"
 msgstr "启用上传"

-#: cps/templates/config_edit.html:46
+#: cps/templates/config_edit.html:49
 msgid "Enable anonymous browsing"
 msgstr "启用匿名浏览"

-#: cps/templates/config_edit.html:50
+#: cps/templates/config_edit.html:53
 msgid "Enable public registration"
 msgstr "启用注册"

-#: cps/templates/config_edit.html:52
+#: cps/templates/config_edit.html:55
 msgid "Default Settings for new users"
 msgstr "新用户默认设置"

-#: cps/templates/config_edit.html:55 cps/templates/user_edit.html:83
+#: cps/templates/config_edit.html:58 cps/templates/user_edit.html:83
 msgid "Admin user"
 msgstr "管理用户"

-#: cps/templates/config_edit.html:59 cps/templates/user_edit.html:88
+#: cps/templates/config_edit.html:62 cps/templates/user_edit.html:88
 msgid "Allow Downloads"
 msgstr "允许下载"

-#: cps/templates/config_edit.html:63 cps/templates/user_edit.html:92
+#: cps/templates/config_edit.html:66 cps/templates/user_edit.html:92
 msgid "Allow Uploads"
 msgstr "允许上传"

-#: cps/templates/config_edit.html:67 cps/templates/user_edit.html:96
+#: cps/templates/config_edit.html:70 cps/templates/user_edit.html:96
 msgid "Allow Edit"
 msgstr "允许编辑"

-#: cps/templates/config_edit.html:71 cps/templates/user_edit.html:101
+#: cps/templates/config_edit.html:74 cps/templates/user_edit.html:101
 msgid "Allow Changing Password"
 msgstr "允许修改密码"

-#: cps/templates/config_edit.html:78 cps/templates/layout.html:93
+#: cps/templates/config_edit.html:81 cps/templates/layout.html:93
 #: cps/templates/login.html:4
 msgid "Login"
 msgstr "登录"
@ -662,10 +716,6 @@ msgstr ""
 msgid "language"
 msgstr "语言"

-#: cps/templates/detail.html:76 cps/templates/search_form.html:14
-msgid "Publisher"
-msgstr ""
-
 #: cps/templates/detail.html:81
 msgid "Publishing date"
 msgstr "出版日期"
@ -782,10 +832,6 @@ msgstr "书籍按丛书排序"
 msgid "Toggle navigation"
 msgstr "切换导航"

-#: cps/templates/layout.html:60
-msgid "Go!"
-msgstr "走起！"
-
 #: cps/templates/layout.html:68
 msgid "Advanced Search"
 msgstr "高级搜索"
--- a/cps/web.py
+++ b/cps/web.py
@ -60,9 +60,8 @@ except ImportError as e:

 try:
    from wand.image import Image
-
    use_generic_pdf_cover = False
-except ImportError as e:
+except ImportError:
    use_generic_pdf_cover = True
 from cgi import escape

@ -1312,7 +1311,6 @@ def read_book(book_id, format):
        flash(_(u"Error opening eBook. File does not exist or file is not accessible:"), category="error")
        return redirect(url_for("index"))

-
@app.route("/download/<int:book_id>/<format>")
@login_required_if_no_ano
@download_required
@ -1339,6 +1337,11 @@ def get_download_link(book_id, format):
    else:
        abort(404)

+@app.route("/download/<int:book_id>/<format>/<anyname>")
+@login_required_if_no_ano
+@download_required
+def get_download_link_ext(book_id, format, anyname):
+    return get_download_link(book_id, format)

@app.route('/register', methods=['GET', 'POST'])
 def register():
@ -1859,12 +1862,15 @@ def edit_mailsettings():
        except e:
            flash(e, category="error")
        if "test" in to_save and to_save["test"]:
-            result = helper.send_test_mail(current_user.kindle_mail)
-            if result is None:
-                flash(_(u"Test E-Mail successfully send to %(kindlemail)s", kindlemail=current_user.kindle_mail),
-                      category="success")
+            if current_user.kindle_mail:
+                result = helper.send_test_mail(current_user.kindle_mail)
+                if result is None:
+                    flash(_(u"Test E-Mail successfully send to %(kindlemail)s", kindlemail=current_user.kindle_mail),
+                          category="success")
+                else:
+                    flash(_(u"There was an error sending the Test E-Mail: %(res)s", res=result), category="error")
            else:
-                flash(_(u"There was an error sending the Test E-Mail: %(res)s", res=result), category="error")
+                flash(_(u"Please configure your kindle email address first..."), category="error")
        else:
            flash(_(u"E-Mail settings updated"), category="success")
    return render_title_template("email_edit.html", content=content, title=_(u"Edit mail settings"))
--- 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-02-27 21:10+0100\n"
+"POT-Creation-Date: 2017-03-12 19:10+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:111 cps/book_formats.py:115 cps/web.py:1041
+#: cps/book_formats.py:113 cps/book_formats.py:117 cps/web.py:1082
 msgid "not installed"
 msgstr ""

-#: cps/helper.py:152
+#: cps/helper.py:159
 #, python-format
 msgid "Failed to send mail: %s"
 msgstr ""

-#: cps/helper.py:159
+#: cps/helper.py:166
 msgid "Calibre-web test email"
 msgstr ""

-#: cps/helper.py:160 cps/helper.py:172
+#: cps/helper.py:167 cps/helper.py:179
 msgid "This email has been sent via calibre web."
 msgstr ""

-#: cps/helper.py:169 cps/templates/detail.html:136
+#: cps/helper.py:176 cps/templates/detail.html:136
 msgid "Send to Kindle"
 msgstr ""

-#: cps/helper.py:189 cps/helper.py:204
+#: cps/helper.py:196 cps/helper.py:211
 msgid "Could not find any formats suitable for sending by email"
 msgstr ""

-#: cps/helper.py:198
+#: cps/helper.py:205
 msgid "Could not convert epub to mobi"
 msgstr ""

-#: cps/ub.py:433
+#: cps/ub.py:442
 msgid "Guest"
 msgstr ""

-#: cps/web.py:742
+#: cps/web.py:768
 msgid "Requesting update package"
 msgstr ""

-#: cps/web.py:743
+#: cps/web.py:769
 msgid "Downloading update package"
 msgstr ""

-#: cps/web.py:744
+#: cps/web.py:770
 msgid "Unzipping update package"
 msgstr ""

-#: cps/web.py:745
+#: cps/web.py:771
 msgid "Files are replaced"
 msgstr ""

-#: cps/web.py:746
+#: cps/web.py:772
 msgid "Database connections are closed"
 msgstr ""

-#: cps/web.py:747
+#: cps/web.py:773
 msgid "Server is stopped"
 msgstr ""

-#: cps/web.py:748
+#: cps/web.py:774
 msgid "Update finished, please press okay and reload page"
 msgstr ""

-#: cps/web.py:821
+#: cps/web.py:847
 msgid "Latest Books"
 msgstr ""

-#: cps/web.py:846
+#: cps/web.py:878
 msgid "Hot Books (most downloaded)"
 msgstr ""

-#: cps/web.py:856
+#: cps/web.py:888
 msgid "Best rated books"
 msgstr ""

-#: cps/templates/index.xml:36 cps/web.py:865
+#: cps/templates/index.xml:36 cps/web.py:897
 msgid "Random Books"
 msgstr ""

-#: cps/web.py:878
+#: cps/web.py:910
 msgid "Author list"
 msgstr ""

-#: cps/web.py:889
+#: cps/web.py:921
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""

-#: cps/web.py:891 cps/web.py:919 cps/web.py:1018 cps/web.py:1261
-#: cps/web.py:2143
+#: cps/web.py:923 cps/web.py:951 cps/web.py:1059 cps/web.py:1309
+#: cps/web.py:2196
 msgid "Error opening eBook. File does not exist or file is not accessible:"
 msgstr ""

-#: cps/templates/index.xml:57 cps/web.py:905
+#: cps/templates/index.xml:57 cps/web.py:937
 msgid "Series list"
 msgstr ""

-#: cps/web.py:917
+#: cps/web.py:949
 #, python-format
 msgid "Series: %(serie)s"
 msgstr ""

-#: cps/web.py:950
+#: cps/web.py:982
 msgid "Available languages"
 msgstr ""

-#: cps/web.py:965
+#: cps/web.py:997
 #, python-format
 msgid "Language: %(name)s"
 msgstr ""

-#: cps/templates/index.xml:50 cps/web.py:978
+#: cps/templates/index.xml:50 cps/web.py:1010
 msgid "Category list"
 msgstr ""

-#: cps/web.py:990
+#: cps/web.py:1022
 #, python-format
 msgid "Category: %(name)s"
 msgstr ""

-#: cps/web.py:1062
+#: cps/web.py:1105
 msgid "Statistics"
 msgstr ""

-#: cps/web.py:1083
+#: cps/web.py:1126
 msgid "Server restarted, please reload page"
 msgstr ""

-#: cps/web.py:1085
+#: cps/web.py:1128
 msgid "Performing shutdown of server, please close window"
 msgstr ""

-#: cps/web.py:1095
+#: cps/web.py:1143
 msgid "Update done"
 msgstr ""

-#: cps/web.py:1173 cps/web.py:1186
+#: cps/web.py:1221 cps/web.py:1234
 msgid "search"
 msgstr ""

-#: cps/web.py:1237 cps/web.py:1244 cps/web.py:1251 cps/web.py:1258
+#: cps/web.py:1285 cps/web.py:1292 cps/web.py:1299 cps/web.py:1306
 msgid "Read a Book"
 msgstr ""

-#: cps/web.py:1302 cps/web.py:1739
+#: cps/web.py:1350 cps/web.py:1789
 msgid "Please fill out all fields!"
 msgstr ""

-#: cps/web.py:1303 cps/web.py:1319 cps/web.py:1324 cps/web.py:1326
+#: cps/web.py:1351 cps/web.py:1367 cps/web.py:1372 cps/web.py:1374
 msgid "register"
 msgstr ""

-#: cps/web.py:1318
+#: cps/web.py:1366
 msgid "An unknown error occured. Please try again later."
 msgstr ""

-#: cps/web.py:1323
+#: cps/web.py:1371
 msgid "This username or email address is already in use."
 msgstr ""

-#: cps/web.py:1341
+#: cps/web.py:1389
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr ""

-#: cps/web.py:1346
+#: cps/web.py:1394
 msgid "Wrong Username or Password"
 msgstr ""

-#: cps/web.py:1348
+#: cps/web.py:1396
 msgid "login"
 msgstr ""

-#: cps/web.py:1365
+#: cps/web.py:1413
 msgid "Please configure the SMTP mail settings first..."
 msgstr ""

-#: cps/web.py:1369
+#: cps/web.py:1417
 #, python-format
 msgid "Book successfully send to %(kindlemail)s"
 msgstr ""

-#: cps/web.py:1373
+#: cps/web.py:1421
 #, python-format
 msgid "There was an error sending this book: %(res)s"
 msgstr ""

-#: cps/web.py:1375
+#: cps/web.py:1423 cps/web.py:1867
 msgid "Please configure your kindle email address first..."
 msgstr ""

-#: cps/web.py:1395
+#: cps/web.py:1443
 #, python-format
 msgid "Book has been added to shelf: %(sname)s"
 msgstr ""

-#: cps/web.py:1416
+#: cps/web.py:1464
 #, python-format
 msgid "Book has been removed from shelf: %(sname)s"
 msgstr ""

-#: cps/web.py:1435 cps/web.py:1459
+#: cps/web.py:1483 cps/web.py:1507
 #, python-format
 msgid "A shelf with the name '%(title)s' already exists."
 msgstr ""

-#: cps/web.py:1440
+#: cps/web.py:1488
 #, python-format
 msgid "Shelf %(title)s created"
 msgstr ""

-#: cps/web.py:1442 cps/web.py:1470
+#: cps/web.py:1490 cps/web.py:1518
 msgid "There was an error"
 msgstr ""

-#: cps/web.py:1443 cps/web.py:1445
+#: cps/web.py:1491 cps/web.py:1493
 msgid "create a shelf"
 msgstr ""

-#: cps/web.py:1468
+#: cps/web.py:1516
 #, python-format
 msgid "Shelf %(title)s changed"
 msgstr ""

-#: cps/web.py:1471 cps/web.py:1473
+#: cps/web.py:1519 cps/web.py:1521
 msgid "Edit a shelf"
 msgstr ""

-#: cps/web.py:1491
+#: cps/web.py:1539
 #, python-format
 msgid "successfully deleted shelf %(name)s"
 msgstr ""

-#: cps/web.py:1513
+#: cps/web.py:1561
 #, python-format
 msgid "Shelf: '%(name)s'"
 msgstr ""

-#: cps/web.py:1544
+#: cps/web.py:1592
 #, python-format
 msgid "Change order of Shelf: '%(name)s'"
 msgstr ""

-#: cps/web.py:1606
+#: cps/web.py:1654
 msgid "Found an existing account for this email address."
 msgstr ""

-#: cps/web.py:1608 cps/web.py:1612
+#: cps/web.py:1656 cps/web.py:1660
 #, python-format
 msgid "%(name)s's profile"
 msgstr ""

-#: cps/web.py:1609
+#: cps/web.py:1657
 msgid "Profile updated"
 msgstr ""

-#: cps/web.py:1623
+#: cps/web.py:1671
 msgid "Admin page"
 msgstr ""

-#: cps/web.py:1694
+#: cps/web.py:1744
 msgid "Calibre-web configuration updated"
 msgstr ""

-#: cps/web.py:1701 cps/web.py:1707 cps/web.py:1720
+#: cps/web.py:1751 cps/web.py:1757 cps/web.py:1770
 msgid "Basic Configuration"
 msgstr ""

-#: cps/web.py:1705
+#: cps/web.py:1755
 msgid "DB location is not valid, please enter correct path"
 msgstr ""

-#: cps/templates/admin.html:34 cps/web.py:1741 cps/web.py:1787
+#: cps/templates/admin.html:34 cps/web.py:1791 cps/web.py:1837
 msgid "Add new user"
 msgstr ""

-#: cps/web.py:1779
+#: cps/web.py:1829
 #, python-format
 msgid "User '%(user)s' created"
 msgstr ""

-#: cps/web.py:1783
+#: cps/web.py:1833
 msgid "Found an existing account for this email address or nickname."
 msgstr ""

-#: cps/web.py:1805
+#: cps/web.py:1855
 msgid "Mail settings updated"
 msgstr ""

-#: cps/web.py:1811
+#: cps/web.py:1862
 #, python-format
 msgid "Test E-Mail successfully send to %(kindlemail)s"
 msgstr ""

-#: cps/web.py:1814
+#: cps/web.py:1865
 #, python-format
 msgid "There was an error sending the Test E-Mail: %(res)s"
 msgstr ""

-#: cps/web.py:1816
+#: cps/web.py:1869
 msgid "E-Mail settings updated"
 msgstr ""

-#: cps/web.py:1817
+#: cps/web.py:1870
 msgid "Edit mail settings"
 msgstr ""

-#: cps/web.py:1845
+#: cps/web.py:1898
 #, python-format
 msgid "User '%(nick)s' deleted"
 msgstr ""

-#: cps/web.py:1926
+#: cps/web.py:1979
 #, python-format
 msgid "User '%(nick)s' updated"
 msgstr ""

-#: cps/web.py:1929
+#: cps/web.py:1982
 msgid "An unknown error occured."
 msgstr ""

-#: cps/web.py:1932
+#: cps/web.py:1985
 #, python-format
 msgid "Edit User %(nick)s"
 msgstr ""

-#: cps/web.py:2138 cps/web.py:2141 cps/web.py:2228
+#: cps/web.py:2191 cps/web.py:2194 cps/web.py:2304
 msgid "edit metadata"
 msgstr ""

-#: cps/web.py:2162
+#: cps/web.py:2215
 #, python-format
 msgid "File extension \"%s\" is not allowed to be uploaded to this server"
 msgstr ""

-#: cps/web.py:2168
+#: cps/web.py:2221
 msgid "File to be uploaded must have an extension"
 msgstr ""

-#: cps/web.py:2185
+#: cps/web.py:2238
 #, python-format
 msgid "Failed to create path %s (Permission denied)."
 msgstr ""

-#: cps/web.py:2190
+#: cps/web.py:2243
 #, python-format
 msgid "Failed to store file %s (Permission denied)."
 msgstr ""

-#: cps/web.py:2195
+#: cps/web.py:2248
 #, python-format
 msgid "Failed to delete file %s (Permission denied)."
 msgstr ""
@ -449,7 +449,7 @@ msgstr ""
 msgid "Calibre DB dir"
 msgstr ""

-#: cps/templates/admin.html:61 cps/templates/config_edit.html:32
+#: cps/templates/admin.html:61 cps/templates/config_edit.html:35
 msgid "Log Level"
 msgstr ""

@ -486,42 +486,46 @@ msgid "Newest commit timestamp"
 msgstr ""

 #: cps/templates/admin.html:83
-msgid "Restart Calibre-web"
+msgid "Reconnect to Calibre DB"
 msgstr ""

 #: cps/templates/admin.html:84
-msgid "Stop Calibre-web"
+msgid "Restart Calibre-web"
 msgstr ""

 #: cps/templates/admin.html:85
-msgid "Check for update"
+msgid "Stop Calibre-web"
 msgstr ""

 #: cps/templates/admin.html:86
+msgid "Check for update"
+msgstr ""
+
+#: cps/templates/admin.html:87
 msgid "Perform Update"
 msgstr ""

-#: cps/templates/admin.html:96
+#: cps/templates/admin.html:97
 msgid "Do you really want to restart Calibre-web?"
 msgstr ""

-#: cps/templates/admin.html:101 cps/templates/admin.html:115
-#: cps/templates/admin.html:136
+#: cps/templates/admin.html:102 cps/templates/admin.html:116
+#: cps/templates/admin.html:137
 msgid "Ok"
 msgstr ""

-#: cps/templates/admin.html:102 cps/templates/admin.html:116
-#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:75
+#: cps/templates/admin.html:103 cps/templates/admin.html:117
+#: cps/templates/book_edit.html:109 cps/templates/config_edit.html:78
 #: cps/templates/email_edit.html:36 cps/templates/shelf_edit.html:17
 #: cps/templates/shelf_order.html:12 cps/templates/user_edit.html:116
 msgid "Back"
 msgstr ""

-#: cps/templates/admin.html:114
+#: cps/templates/admin.html:115
 msgid "Do you really want to stop Calibre-web?"
 msgstr ""

-#: cps/templates/admin.html:127
+#: cps/templates/admin.html:128
 msgid "Updating, please do not reload page"
 msgstr ""

@ -529,11 +533,12 @@ msgstr ""
 msgid "Book Title"
 msgstr ""

-#: cps/templates/book_edit.html:20 cps/templates/search_form.html:10
+#: cps/templates/book_edit.html:20 cps/templates/book_edit.html:145
+#: cps/templates/search_form.html:10
 msgid "Author"
 msgstr ""

-#: cps/templates/book_edit.html:24
+#: cps/templates/book_edit.html:24 cps/templates/book_edit.html:147
 msgid "Description"
 msgstr ""

@ -574,12 +579,57 @@ msgstr ""
 msgid "view book after edit"
 msgstr ""

-#: cps/templates/book_edit.html:107 cps/templates/config_edit.html:73
+#: cps/templates/book_edit.html:107 cps/templates/book_edit.html:118
+msgid "Get metadata"
+msgstr ""
+
+#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:76
 #: cps/templates/login.html:19 cps/templates/search_form.html:79
 #: cps/templates/shelf_edit.html:15 cps/templates/user_edit.html:114
 msgid "Submit"
 msgstr ""

+#: cps/templates/book_edit.html:121
+msgid "Keyword"
+msgstr ""
+
+#: cps/templates/book_edit.html:122
+msgid " Search keyword "
+msgstr ""
+
+#: cps/templates/book_edit.html:124 cps/templates/layout.html:60
+msgid "Go!"
+msgstr ""
+
+#: cps/templates/book_edit.html:125
+msgid "Click the cover to load metadata to the form"
+msgstr ""
+
+#: cps/templates/book_edit.html:129 cps/templates/book_edit.html:142
+msgid "Loading..."
+msgstr ""
+
+#: cps/templates/book_edit.html:132
+msgid "Close"
+msgstr ""
+
+#: cps/templates/book_edit.html:143
+msgid "Search error!"
+msgstr ""
+
+#: cps/templates/book_edit.html:144
+msgid "No Result! Please try anonther keyword."
+msgstr ""
+
+#: cps/templates/book_edit.html:146 cps/templates/detail.html:76
+#: cps/templates/search_form.html:14
+msgid "Publisher"
+msgstr ""
+
+#: cps/templates/book_edit.html:148
+msgid "Source"
+msgstr ""
+
 #: cps/templates/config_edit.html:7
 msgid "Location of Calibre database"
 msgstr ""
@ -596,47 +646,51 @@ msgstr ""
 msgid "No. of random books to show"
 msgstr ""

-#: cps/templates/config_edit.html:28
+#: cps/templates/config_edit.html:27
+msgid "Regular expression for ignoring columns"
+msgstr ""
+
+#: cps/templates/config_edit.html:31
 msgid "Regular expression for title sorting"
 msgstr ""

-#: cps/templates/config_edit.html:42
+#: cps/templates/config_edit.html:45
 msgid "Enable uploading"
 msgstr ""

-#: cps/templates/config_edit.html:46
+#: cps/templates/config_edit.html:49
 msgid "Enable anonymous browsing"
 msgstr ""

-#: cps/templates/config_edit.html:50
+#: cps/templates/config_edit.html:53
 msgid "Enable public registration"
 msgstr ""

-#: cps/templates/config_edit.html:52
+#: cps/templates/config_edit.html:55
 msgid "Default Settings for new users"
 msgstr ""

-#: cps/templates/config_edit.html:55 cps/templates/user_edit.html:83
+#: cps/templates/config_edit.html:58 cps/templates/user_edit.html:83
 msgid "Admin user"
 msgstr ""

-#: cps/templates/config_edit.html:59 cps/templates/user_edit.html:88
+#: cps/templates/config_edit.html:62 cps/templates/user_edit.html:88
 msgid "Allow Downloads"
 msgstr ""

-#: cps/templates/config_edit.html:63 cps/templates/user_edit.html:92
+#: cps/templates/config_edit.html:66 cps/templates/user_edit.html:92
 msgid "Allow Uploads"
 msgstr ""

-#: cps/templates/config_edit.html:67 cps/templates/user_edit.html:96
+#: cps/templates/config_edit.html:70 cps/templates/user_edit.html:96
 msgid "Allow Edit"
 msgstr ""

-#: cps/templates/config_edit.html:71 cps/templates/user_edit.html:101
+#: cps/templates/config_edit.html:74 cps/templates/user_edit.html:101
 msgid "Allow Changing Password"
 msgstr ""

-#: cps/templates/config_edit.html:78 cps/templates/layout.html:93
+#: cps/templates/config_edit.html:81 cps/templates/layout.html:93
 #: cps/templates/login.html:4
 msgid "Login"
 msgstr ""
@ -653,10 +707,6 @@ msgstr ""
 msgid "language"
 msgstr ""

-#: cps/templates/detail.html:76 cps/templates/search_form.html:14
-msgid "Publisher"
-msgstr ""
-
 #: cps/templates/detail.html:81
 msgid "Publishing date"
 msgstr ""
@ -773,10 +823,6 @@ msgstr ""
 msgid "Toggle navigation"
 msgstr ""

-#: cps/templates/layout.html:60
-msgid "Go!"
-msgstr ""
-
 #: cps/templates/layout.html:68
 msgid "Advanced Search"
 msgstr ""