diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index 86b7281e..5139683a 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -104,7 +104,7 @@
{{_('view book after edit')}}
- {{_('Get Metadata')}}
+ {{_('Get metadata')}}
{{_('Back')}}
diff --git a/cps/translations/de/LC_MESSAGES/messages.mo b/cps/translations/de/LC_MESSAGES/messages.mo
index 03a0f9d5..f2588a9c 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 4fc78ec6..7a99a6f4 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-11 09:09+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"
@@ -121,7 +121,7 @@ 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:2193
+#: 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 "
@@ -221,7 +221,7 @@ msgstr "Buch erfolgreich versandt an %(kindlemail)s"
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:1423 cps/web.py:1867
msgid "Please configure your kindle email address first..."
msgstr "Bitte die Kindle E-Mail Adresse zuuerst konfigurieren..."
@@ -325,67 +325,67 @@ msgstr ""
msgid "Mail settings updated"
msgstr "E-Mail Einstellungen aktualisiert"
-#: cps/web.py:1861
+#: 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:1864
+#: 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:1866
+#: cps/web.py:1869
msgid "E-Mail settings updated"
msgstr "E-Mail Einstellungen wurde aktualisiert"
-#: cps/web.py:1867
+#: cps/web.py:1870
msgid "Edit mail settings"
msgstr "E-Mail Einstellungen editieren"
-#: cps/web.py:1895
+#: cps/web.py:1898
#, python-format
msgid "User '%(nick)s' deleted"
msgstr "Benutzer '%(nick)s' gelöscht"
-#: cps/web.py:1976
+#: cps/web.py:1979
#, python-format
msgid "User '%(nick)s' updated"
msgstr "Benutzer '%(nick)s' aktualisiert"
-#: cps/web.py:1979
+#: cps/web.py:1982
msgid "An unknown error occured."
msgstr "Es ist ein unbekanter Fehler aufgetreten"
-#: cps/web.py:1982
+#: cps/web.py:1985
#, python-format
msgid "Edit User %(nick)s"
msgstr "Benutzer %(nick)s bearbeiten"
-#: cps/web.py:2188 cps/web.py:2191 cps/web.py:2301
+#: cps/web.py:2191 cps/web.py:2194 cps/web.py:2304
msgid "edit metadata"
msgstr "Metadaten editieren"
-#: cps/web.py:2212
+#: cps/web.py:2215
#, 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:2218
+#: cps/web.py:2221
msgid "File to be uploaded must have an extension"
msgstr "Datei müssen eine Erweiterung haben, um hochgeladen zu werden"
-#: cps/web.py:2235
+#: 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:2240
+#: 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:2245
+#: cps/web.py:2248
#, python-format
msgid "Failed to delete file %s (Permission denied)."
msgstr "Fehler beim Löschen von Datei %s (Zugriff verweigert)"
@@ -600,8 +600,8 @@ msgstr "Nein"
msgid "view book after edit"
msgstr "Buch nach Bearbeitung ansehen"
-#: cps/templates/book_edit.html:107
-msgid "Get Metadata"
+#: 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
@@ -610,10 +610,6 @@ msgstr "Metadaten laden"
msgid "Submit"
msgstr "Abschicken"
-#: cps/templates/book_edit.html:118
-msgid "Get metadata"
-msgstr "Metadaten laden"
-
#: cps/templates/book_edit.html:121
msgid "Keyword"
msgstr "Suchbegriff"
diff --git a/cps/translations/es/LC_MESSAGES/messages.mo b/cps/translations/es/LC_MESSAGES/messages.mo
index a7571071..63da8cab 100644
Binary files a/cps/translations/es/LC_MESSAGES/messages.mo and b/cps/translations/es/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po
index 1bc4a558..73da1e5c 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-11 09:09+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 \n"
"Language: es\n"
@@ -112,7 +112,7 @@ msgid "Author: %(name)s"
msgstr ""
#: cps/web.py:923 cps/web.py:951 cps/web.py:1059 cps/web.py:1309
-#: cps/web.py:2193
+#: 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"
@@ -210,7 +210,7 @@ msgstr "Envio de Libro a %(kindlemail)s correctamente"
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:1423 cps/web.py:1867
msgid "Please configure your kindle email address first..."
msgstr "Configurar primero la dirección de correo Kindle por favor..."
@@ -312,67 +312,67 @@ msgstr "Se ha encontrado una cuenta vinculada a esta cuenta de correo o usuario.
msgid "Mail settings updated"
msgstr "Parametros de correo actualizados"
-#: cps/web.py:1861
+#: 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:1864
+#: 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:1866
+#: cps/web.py:1869
msgid "E-Mail settings updated"
msgstr ""
-#: cps/web.py:1867
+#: cps/web.py:1870
msgid "Edit mail settings"
msgstr "Editar parametros de correo"
-#: cps/web.py:1895
+#: cps/web.py:1898
#, python-format
msgid "User '%(nick)s' deleted"
msgstr "Usuario '%(nick)s' borrado"
-#: cps/web.py:1976
+#: cps/web.py:1979
#, python-format
msgid "User '%(nick)s' updated"
msgstr "Usuario '%(nick)s' Actualizado"
-#: cps/web.py:1979
+#: cps/web.py:1982
msgid "An unknown error occured."
msgstr "Oups ! Error inesperado."
-#: cps/web.py:1982
+#: cps/web.py:1985
#, python-format
msgid "Edit User %(nick)s"
msgstr "Editar Usuario %(nick)s"
-#: cps/web.py:2188 cps/web.py:2191 cps/web.py:2301
+#: cps/web.py:2191 cps/web.py:2194 cps/web.py:2304
msgid "edit metadata"
msgstr ""
-#: cps/web.py:2212
+#: cps/web.py:2215
#, python-format
msgid "File extension \"%s\" is not allowed to be uploaded to this server"
msgstr ""
-#: cps/web.py:2218
+#: cps/web.py:2221
msgid "File to be uploaded must have an extension"
msgstr ""
-#: cps/web.py:2235
+#: 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:2240
+#: 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:2245
+#: cps/web.py:2248
#, python-format
msgid "Failed to delete file %s (Permission denied)."
msgstr "Fallo al borrar el archivo %s (permiso negado)"
@@ -587,8 +587,8 @@ msgstr "No"
msgid "view book after edit"
msgstr "Ver libro tras la edicion"
-#: cps/templates/book_edit.html:107
-msgid "Get Metadata"
+#: 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
@@ -597,10 +597,6 @@ msgstr ""
msgid "Submit"
msgstr "Enviar"
-#: cps/templates/book_edit.html:118
-msgid "Get metadata"
-msgstr ""
-
#: cps/templates/book_edit.html:121
msgid "Keyword"
msgstr ""
diff --git a/cps/translations/fr/LC_MESSAGES/messages.mo b/cps/translations/fr/LC_MESSAGES/messages.mo
index ed2a9916..bb01a9a4 100644
Binary files a/cps/translations/fr/LC_MESSAGES/messages.mo and b/cps/translations/fr/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index c1f64144..9eee3c16 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-11 09:09+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 \n"
"Language: fr\n"
@@ -118,7 +118,7 @@ msgid "Author: %(name)s"
msgstr ""
#: cps/web.py:923 cps/web.py:951 cps/web.py:1059 cps/web.py:1309
-#: cps/web.py:2193
+#: 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 "
@@ -218,7 +218,7 @@ msgstr "Livres envoyés à %(kindlemail)s avec succès"
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:1423 cps/web.py:1867
msgid "Please configure your kindle email address first..."
msgstr "Veuillez configurer votre adresse kindle d'abord..."
@@ -320,67 +320,67 @@ msgstr "Un compte avec cette adresse de courriel ou ce surnom existe déjà."
msgid "Mail settings updated"
msgstr "Paramètres de courriel mis à jour"
-#: cps/web.py:1861
+#: cps/web.py:1862
#, python-format
msgid "Test E-Mail successfully send to %(kindlemail)s"
msgstr ""
-#: cps/web.py:1864
+#: cps/web.py:1865
#, python-format
msgid "There was an error sending the Test E-Mail: %(res)s"
msgstr ""
-#: cps/web.py:1866
+#: cps/web.py:1869
msgid "E-Mail settings updated"
msgstr ""
-#: cps/web.py:1867
+#: cps/web.py:1870
msgid "Edit mail settings"
msgstr "Éditer les paramètres de courriel"
-#: cps/web.py:1895
+#: cps/web.py:1898
#, python-format
msgid "User '%(nick)s' deleted"
msgstr "Utilisateur '%(nick)s' supprimé"
-#: cps/web.py:1976
+#: cps/web.py:1979
#, python-format
msgid "User '%(nick)s' updated"
msgstr "Utilisateur '%(nick)s' mis à jour"
-#: cps/web.py:1979
+#: cps/web.py:1982
msgid "An unknown error occured."
msgstr "Oups ! Une erreur inconnue a eu lieu."
-#: cps/web.py:1982
+#: cps/web.py:1985
#, python-format
msgid "Edit User %(nick)s"
msgstr "Éditer l'utilisateur %(nick)s"
-#: cps/web.py:2188 cps/web.py:2191 cps/web.py:2301
+#: cps/web.py:2191 cps/web.py:2194 cps/web.py:2304
msgid "edit metadata"
msgstr ""
-#: cps/web.py:2212
+#: cps/web.py:2215
#, python-format
msgid "File extension \"%s\" is not allowed to be uploaded to this server"
msgstr ""
-#: cps/web.py:2218
+#: cps/web.py:2221
msgid "File to be uploaded must have an extension"
msgstr ""
-#: cps/web.py:2235
+#: 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:2240
+#: 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:2245
+#: cps/web.py:2248
#, python-format
msgid "Failed to delete file %s (Permission denied)."
msgstr "Impossible de supprimer le fichier %s (permission refusée)"
@@ -595,8 +595,8 @@ msgstr "Non"
msgid "view book after edit"
msgstr "Voir le livre après l'édition"
-#: cps/templates/book_edit.html:107
-msgid "Get Metadata"
+#: 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
@@ -605,10 +605,6 @@ msgstr ""
msgid "Submit"
msgstr "Soumettre"
-#: cps/templates/book_edit.html:118
-msgid "Get metadata"
-msgstr ""
-
#: cps/templates/book_edit.html:121
msgid "Keyword"
msgstr ""
diff --git a/cps/translations/pl/LC_MESSAGES/messages.mo b/cps/translations/pl/LC_MESSAGES/messages.mo
index d303afa3..661a4bb9 100644
Binary files a/cps/translations/pl/LC_MESSAGES/messages.mo and b/cps/translations/pl/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po
index 8589a43f..dcc48b6c 100644
--- a/cps/translations/pl/LC_MESSAGES/messages.po
+++ b/cps/translations/pl/LC_MESSAGES/messages.po
@@ -10,10 +10,10 @@
# GNOME PL Team , 2001
msgid ""
msgstr ""
-"Project-Id-Version: Calibre Web - polski (POT: 2017-02-20 19:47)\n"
+"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-11 09:09+0100\n"
-"PO-Revision-Date: 2017-02-11 15:56+0100\n"
+"POT-Creation-Date: 2017-03-12 19:10+0100\n"
+"PO-Revision-Date: 2017-03-11 14:53+0100\n"
"Last-Translator: Radosław Kierznowski \n"
"Language: pl\n"
"Language-Team: \n"
@@ -113,7 +113,7 @@ 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:2193
+#: cps/web.py:2196
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:"
@@ -211,7 +211,7 @@ msgstr "Książka została pomyślnie wysłana do %(kindlemail)s"
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:1423 cps/web.py:1867
msgid "Please configure your kindle email address first..."
msgstr "Proszę najpierw skonfigurować adres e-mail swojego kindla..."
@@ -313,67 +313,67 @@ msgstr "Znaleziono istniejące konto dla tego adresu e-mail lub nazwy użytkowni
msgid "Mail settings updated"
msgstr "Zaktualizowano ustawienia poczty e-mail"
-#: cps/web.py:1861
+#: cps/web.py:1862
#, 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:1864
+#: cps/web.py:1865
#, 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:1866
+#: cps/web.py:1869
msgid "E-Mail settings updated"
msgstr "Zaktualizowano ustawienia e-mail"
-#: cps/web.py:1867
+#: cps/web.py:1870
msgid "Edit mail settings"
msgstr "Edytuj ustawienia poczty e-mail"
-#: cps/web.py:1895
+#: cps/web.py:1898
#, python-format
msgid "User '%(nick)s' deleted"
msgstr "Użytkownik '%(nick)s' został usunięty"
-#: cps/web.py:1976
+#: cps/web.py:1979
#, python-format
msgid "User '%(nick)s' updated"
msgstr "Użytkownik '%(nick)s' został zaktualizowany"
-#: cps/web.py:1979
+#: cps/web.py:1982
msgid "An unknown error occured."
msgstr "Wystąpił nieznany błąd."
-#: cps/web.py:1982
+#: cps/web.py:1985
#, python-format
msgid "Edit User %(nick)s"
msgstr "Edytuj użytkownika %(nick)s"
-#: cps/web.py:2188 cps/web.py:2191 cps/web.py:2301
+#: cps/web.py:2191 cps/web.py:2194 cps/web.py:2304
msgid "edit metadata"
msgstr "edytuj metadane"
-#: cps/web.py:2212
+#: cps/web.py:2215
#, 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:2218
+#: cps/web.py:2221
msgid "File to be uploaded must have an extension"
msgstr "Plik do przesłania musi mieć rozszerzenie"
-#: cps/web.py:2235
+#: cps/web.py:2238
#, python-format
msgid "Failed to create path %s (Permission denied)."
msgstr "Nie udało się utworzyć łącza %s (Odmowa dostępu)."
-#: cps/web.py:2240
+#: cps/web.py:2243
#, python-format
msgid "Failed to store file %s (Permission denied)."
msgstr "Nie można przechowywać pliku %s (Odmowa dostępu)."
-#: cps/web.py:2245
+#: cps/web.py:2248
#, python-format
msgid "Failed to delete file %s (Permission denied)."
msgstr "Nie udało się usunąć pliku %s (Odmowa dostępu)."
@@ -496,11 +496,11 @@ msgstr "Znacznik czasowy nowej wersji"
#: cps/templates/admin.html:83
msgid "Reconnect to Calibre DB"
-msgstr ""
+msgstr "Połącz ponownie z bazą danych Calibre"
#: cps/templates/admin.html:84
msgid "Restart Calibre-web"
-msgstr "Zrestartuj Calibre Web"
+msgstr "Uruchom ponownie Calibre Web"
#: cps/templates/admin.html:85
msgid "Stop Calibre-web"
@@ -588,9 +588,9 @@ msgstr "Nie"
msgid "view book after edit"
msgstr "wyświetl książkę po edycji"
-#: cps/templates/book_edit.html:107
-msgid "Get Metadata"
-msgstr ""
+#: cps/templates/book_edit.html:107 cps/templates/book_edit.html:118
+msgid "Get metadata"
+msgstr "Uzyskaj metadane"
#: cps/templates/book_edit.html:108 cps/templates/config_edit.html:76
#: cps/templates/login.html:19 cps/templates/search_form.html:79
@@ -598,17 +598,13 @@ msgstr ""
msgid "Submit"
msgstr "Wyślij"
-#: cps/templates/book_edit.html:118
-msgid "Get metadata"
-msgstr ""
-
#: cps/templates/book_edit.html:121
msgid "Keyword"
-msgstr ""
+msgstr "Słowo kluczowe"
#: cps/templates/book_edit.html:122
msgid " Search keyword "
-msgstr ""
+msgstr " Szukaj słowa kluczowego "
#: cps/templates/book_edit.html:124 cps/templates/layout.html:60
msgid "Go!"
@@ -616,23 +612,23 @@ msgstr "Idź!"
#: cps/templates/book_edit.html:125
msgid "Click the cover to load metadata to the form"
-msgstr ""
+msgstr "Kliknij okładkę, aby załadować metadane do formularza"
#: cps/templates/book_edit.html:129 cps/templates/book_edit.html:142
msgid "Loading..."
-msgstr ""
+msgstr "Ładowanie..."
#: cps/templates/book_edit.html:132
msgid "Close"
-msgstr ""
+msgstr "Zamknij"
#: cps/templates/book_edit.html:143
msgid "Search error!"
-msgstr ""
+msgstr "Błąd wyszukiwania!"
#: cps/templates/book_edit.html:144
msgid "No Result! Please try anonther keyword."
-msgstr ""
+msgstr "Brak wyników! Spróbuj innego słowa kluczowego."
#: cps/templates/book_edit.html:146 cps/templates/detail.html:76
#: cps/templates/search_form.html:14
@@ -641,7 +637,7 @@ msgstr "Wydawca"
#: cps/templates/book_edit.html:148
msgid "Source"
-msgstr ""
+msgstr "Źródło"
#: cps/templates/config_edit.html:7
msgid "Location of Calibre database"
@@ -661,7 +657,7 @@ msgstr "Liczba losowych książek do pokazania"
#: cps/templates/config_edit.html:27
msgid "Regular expression for ignoring columns"
-msgstr ""
+msgstr "Wyrażenie regularne dla ignorowanych kolumn"
#: cps/templates/config_edit.html:31
msgid "Regular expression for title sorting"
@@ -983,19 +979,19 @@ msgstr "Statystyki biblioteki Calibre"
#: cps/templates/stats.html:8
msgid "Books in this Library"
-msgstr "Książek w bibliotece"
+msgstr "Książki"
#: cps/templates/stats.html:12
msgid "Authors in this Library"
-msgstr "Autorów w bibliotece"
+msgstr "Autorzy"
#: cps/templates/stats.html:16
msgid "Categories in this Library"
-msgstr "Kategorii w bibliotece"
+msgstr "Kategorie"
#: cps/templates/stats.html:20
msgid "Series in this Library"
-msgstr "Serii w tej bibliotece"
+msgstr "Serie"
#: cps/templates/stats.html:24
msgid "Linked libraries"
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
index cabfffc3..b02c863b 100644
Binary files a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo and b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo differ
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index 3c59be09..7cccf973 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-11 09:09+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 \n"
"Language: zh_Hans_CN\n"
@@ -113,7 +113,7 @@ 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:2193
+#: cps/web.py:2196
msgid "Error opening eBook. File does not exist or file is not accessible:"
msgstr "无法打开电子书。 文件不存在或者文件不可访问:"
@@ -211,7 +211,7 @@ msgstr "此书已被成功发给 %(kindlemail)s"
msgid "There was an error sending this book: %(res)s"
msgstr "发送这本书的时候出现错误: %(res)s"
-#: cps/web.py:1423
+#: cps/web.py:1423 cps/web.py:1867
msgid "Please configure your kindle email address first..."
msgstr "请先配置您的kindle电子邮箱地址..."
@@ -313,67 +313,67 @@ msgstr "已找到使用此邮箱或昵称的账号。"
msgid "Mail settings updated"
msgstr "邮箱设置已更新"
-#: cps/web.py:1861
+#: cps/web.py:1862
#, python-format
msgid "Test E-Mail successfully send to %(kindlemail)s"
msgstr "测试邮件已成功发送到 %(kindlemail)s"
-#: cps/web.py:1864
+#: cps/web.py:1865
#, python-format
msgid "There was an error sending the Test E-Mail: %(res)s"
msgstr "发送测试邮件时发生错误: %(res)s"
-#: cps/web.py:1866
+#: cps/web.py:1869
msgid "E-Mail settings updated"
msgstr "E-Mail 设置已更新"
-#: cps/web.py:1867
+#: cps/web.py:1870
msgid "Edit mail settings"
msgstr "编辑邮箱设置"
-#: cps/web.py:1895
+#: cps/web.py:1898
#, python-format
msgid "User '%(nick)s' deleted"
msgstr "用户 '%(nick)s' 已被删除"
-#: cps/web.py:1976
+#: cps/web.py:1979
#, python-format
msgid "User '%(nick)s' updated"
msgstr "用户 '%(nick)s' 已被更新"
-#: cps/web.py:1979
+#: cps/web.py:1982
msgid "An unknown error occured."
msgstr "发生未知错误。"
-#: cps/web.py:1982
+#: cps/web.py:1985
#, python-format
msgid "Edit User %(nick)s"
msgstr "编辑用户 %(nick)s"
-#: cps/web.py:2188 cps/web.py:2191 cps/web.py:2301
+#: cps/web.py:2191 cps/web.py:2194 cps/web.py:2304
msgid "edit metadata"
msgstr "编辑元数据"
-#: cps/web.py:2212
+#: cps/web.py:2215
#, python-format
msgid "File extension \"%s\" is not allowed to be uploaded to this server"
msgstr "不能上传后缀为 \"%s\" 的文件到此服务器"
-#: cps/web.py:2218
+#: cps/web.py:2221
msgid "File to be uploaded must have an extension"
msgstr "要上传的文件必须有一个后缀"
-#: cps/web.py:2235
+#: cps/web.py:2238
#, python-format
msgid "Failed to create path %s (Permission denied)."
msgstr "创建路径 %s 失败(权限拒绝)。"
-#: cps/web.py:2240
+#: cps/web.py:2243
#, python-format
msgid "Failed to store file %s (Permission denied)."
msgstr "存储文件 %s 失败(权限拒绝)。"
-#: cps/web.py:2245
+#: cps/web.py:2248
#, python-format
msgid "Failed to delete file %s (Permission denied)."
msgstr "删除文件 %s 失败(权限拒绝)。"
@@ -588,8 +588,8 @@ msgstr ""
msgid "view book after edit"
msgstr "编辑后查看书籍"
-#: cps/templates/book_edit.html:107
-msgid "Get Metadata"
+#: 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
@@ -598,10 +598,6 @@ msgstr ""
msgid "Submit"
msgstr "提交"
-#: cps/templates/book_edit.html:118
-msgid "Get metadata"
-msgstr ""
-
#: cps/templates/book_edit.html:121
msgid "Keyword"
msgstr ""
diff --git a/cps/web.py b/cps/web.py
index 07d7fb63..0e19dec0 100755
--- a/cps/web.py
+++ b/cps/web.py
@@ -1856,12 +1856,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"))
diff --git a/messages.pot b/messages.pot
index 64f66819..71481769 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-11 09:09+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 \n"
"Language-Team: LANGUAGE \n"
@@ -104,7 +104,7 @@ msgid "Author: %(name)s"
msgstr ""
#: cps/web.py:923 cps/web.py:951 cps/web.py:1059 cps/web.py:1309
-#: cps/web.py:2193
+#: cps/web.py:2196
msgid "Error opening eBook. File does not exist or file is not accessible:"
msgstr ""
@@ -202,7 +202,7 @@ msgstr ""
msgid "There was an error sending this book: %(res)s"
msgstr ""
-#: cps/web.py:1423
+#: cps/web.py:1423 cps/web.py:1867
msgid "Please configure your kindle email address first..."
msgstr ""
@@ -304,67 +304,67 @@ msgstr ""
msgid "Mail settings updated"
msgstr ""
-#: cps/web.py:1861
+#: cps/web.py:1862
#, python-format
msgid "Test E-Mail successfully send to %(kindlemail)s"
msgstr ""
-#: cps/web.py:1864
+#: cps/web.py:1865
#, python-format
msgid "There was an error sending the Test E-Mail: %(res)s"
msgstr ""
-#: cps/web.py:1866
+#: cps/web.py:1869
msgid "E-Mail settings updated"
msgstr ""
-#: cps/web.py:1867
+#: cps/web.py:1870
msgid "Edit mail settings"
msgstr ""
-#: cps/web.py:1895
+#: cps/web.py:1898
#, python-format
msgid "User '%(nick)s' deleted"
msgstr ""
-#: cps/web.py:1976
+#: cps/web.py:1979
#, python-format
msgid "User '%(nick)s' updated"
msgstr ""
-#: cps/web.py:1979
+#: cps/web.py:1982
msgid "An unknown error occured."
msgstr ""
-#: cps/web.py:1982
+#: cps/web.py:1985
#, python-format
msgid "Edit User %(nick)s"
msgstr ""
-#: cps/web.py:2188 cps/web.py:2191 cps/web.py:2301
+#: cps/web.py:2191 cps/web.py:2194 cps/web.py:2304
msgid "edit metadata"
msgstr ""
-#: cps/web.py:2212
+#: cps/web.py:2215
#, python-format
msgid "File extension \"%s\" is not allowed to be uploaded to this server"
msgstr ""
-#: cps/web.py:2218
+#: cps/web.py:2221
msgid "File to be uploaded must have an extension"
msgstr ""
-#: cps/web.py:2235
+#: cps/web.py:2238
#, python-format
msgid "Failed to create path %s (Permission denied)."
msgstr ""
-#: cps/web.py:2240
+#: cps/web.py:2243
#, python-format
msgid "Failed to store file %s (Permission denied)."
msgstr ""
-#: cps/web.py:2245
+#: cps/web.py:2248
#, python-format
msgid "Failed to delete file %s (Permission denied)."
msgstr ""
@@ -579,8 +579,8 @@ msgstr ""
msgid "view book after edit"
msgstr ""
-#: cps/templates/book_edit.html:107
-msgid "Get Metadata"
+#: 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
@@ -589,10 +589,6 @@ msgstr ""
msgid "Submit"
msgstr ""
-#: cps/templates/book_edit.html:118
-msgid "Get metadata"
-msgstr ""
-
#: cps/templates/book_edit.html:121
msgid "Keyword"
msgstr ""