+
{% if g.user.role_download() %}
{% if entry.Books.data|length %}
diff --git a/cps/templates/user_edit.html b/cps/templates/user_edit.html
old mode 100755
new mode 100644
index 4aff7ee2..fba2f599
--- a/cps/templates/user_edit.html
+++ b/cps/templates/user_edit.html
@@ -12,7 +12,7 @@
{% endif %}
- {{_('E-mail Address')}}
+ {{_('Email')}}
{% if ( g.user and g.user.role_passwd() or g.user.role_admin() ) and not content.role_anonymous() %}
@@ -25,7 +25,7 @@
{% endif %}
- {{_('Send to E-Reader E-mail Address')}}
+ {{_('Send to eReader Email')}}
{% if not content.role_anonymous() %}
diff --git a/cps/templates/user_table.html b/cps/templates/user_table.html
old mode 100755
new mode 100644
index cd0295d5..fb81ff3a
--- a/cps/templates/user_table.html
+++ b/cps/templates/user_table.html
@@ -132,8 +132,8 @@
{{ user_table_row('name', _('Enter Username'), _('Username'), true) }}
- {{ user_table_row('email', _('Enter E-mail Address'), _('E-mail Address'), true) }}
- {{ user_table_row('kindle_mail', _('Enter E-Reader E-mail Address'), _('E-Reader E-mail'), false) }}
+ {{ user_table_row('email', _('Enter Email'), _('Email'), true) }}
+ {{ user_table_row('kindle_mail', _('Enter eReader Email'), _('eReader Email'), false) }}
{{ user_select_translations('locale', url_for('admin.table_get_locale'), _('Locale'), true) }}
{{ user_select_languages('default_language', url_for('admin.table_get_default_lang'), _('Visible Book Languages'), true) }}
{{ user_table_row('allowed_tags', _("Edit Allowed Tags"), _("Allowed Tags"), false, tags) }}
@@ -152,18 +152,18 @@
{{ user_single_checkbox_row("kobo_only_shelves_sync", _('Sync selected Shelves with Kobo'))}}
{% endif %}
{{ user_checkbox_row("sidebar_view", "detail_random", _('Show Random Books in Detail View'), visiblility, sidebar_settings)}}
- {{ user_checkbox_row("sidebar_view", "sidebar_language", _('Show language selection'), visiblility, sidebar_settings)}}
- {{ user_checkbox_row("sidebar_view", "sidebar_read_and_unread", _('Show read/unread selection'), visiblility, sidebar_settings)}}
- {{ user_checkbox_row("sidebar_view", "sidebar_series", _('Show series selection'), visiblility, sidebar_settings)}}
- {{ user_checkbox_row("sidebar_view", "sidebar_category", _('Show category selection'), visiblility, sidebar_settings)}}
- {{ user_checkbox_row("sidebar_view", "sidebar_random", _('Show random books'), visiblility, sidebar_settings)}}
- {{ user_checkbox_row("sidebar_view", "sidebar_author", _('Show author selection'), visiblility, sidebar_settings)}}
+ {{ user_checkbox_row("sidebar_view", "sidebar_language", _('Show Language Section'), visiblility, sidebar_settings)}}
+ {{ user_checkbox_row("sidebar_view", "sidebar_read_and_unread", _('Show Read/Unread Section'), visiblility, sidebar_settings)}}
+ {{ user_checkbox_row("sidebar_view", "sidebar_series", _('Show Series Section'), visiblility, sidebar_settings)}}
+ {{ user_checkbox_row("sidebar_view", "sidebar_category", _('Show Category Section'), visiblility, sidebar_settings)}}
+ {{ user_checkbox_row("sidebar_view", "sidebar_random", _('Show Random Books'), visiblility, sidebar_settings)}}
+ {{ user_checkbox_row("sidebar_view", "sidebar_author", _('Show Author Section'), visiblility, sidebar_settings)}}
{{ user_checkbox_row("sidebar_view", "sidebar_best_rated", _('Show Top Rated Books'), visiblility, sidebar_settings)}}
{{ user_checkbox_row("sidebar_view", "sidebar_read_and_unread", _('Show Random Books'), visiblility, sidebar_settings)}}
- {{ user_checkbox_row("sidebar_view", "sidebar_publisher", _('Show publisher selection'), visiblility, sidebar_settings)}}
- {{ user_checkbox_row("sidebar_view", "sidebar_rating", _('Show ratings selection'), visiblility, sidebar_settings)}}
- {{ user_checkbox_row("sidebar_view", "sidebar_format", _('Show file formats selection'), visiblility, sidebar_settings)}}
- {{ user_checkbox_row("sidebar_view", "sidebar_archived", _('Show archived books'), visiblility, sidebar_settings)}}
+ {{ user_checkbox_row("sidebar_view", "sidebar_publisher", _('Show Publisher Section'), visiblility, sidebar_settings)}}
+ {{ user_checkbox_row("sidebar_view", "sidebar_rating", _('Show Ratings Section'), visiblility, sidebar_settings)}}
+ {{ user_checkbox_row("sidebar_view", "sidebar_format", _('Show File Formats Section'), visiblility, sidebar_settings)}}
+ {{ user_checkbox_row("sidebar_view", "sidebar_archived", _('Show Archived Books'), visiblility, sidebar_settings)}}
{{ user_checkbox_row("sidebar_view", "sidebar_download", _('Show Downloaded Books'), visiblility, sidebar_settings)}}
{{ user_checkbox_row("sidebar_view", "sidebar_list", _('Show Books List'), visiblility, sidebar_settings)}}
{{_('Delete User')}}
diff --git a/cps/translations/cs/LC_MESSAGES/messages.po b/cps/translations/cs/LC_MESSAGES/messages.po
index faf6e2d6..47f17229 100644
--- a/cps/translations/cs/LC_MESSAGES/messages.po
+++ b/cps/translations/cs/LC_MESSAGES/messages.po
@@ -284,7 +284,7 @@ msgid "Add new user"
msgstr "Přidat nového uživatele"
#: cps/admin.py:1268 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
+msgid "Edit Email Server Settings"
msgstr "Změnit SMTP nastavení"
#: cps/admin.py:1287
@@ -297,7 +297,7 @@ msgstr ""
#: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
#, python-format
-msgid "Database error: %(error)s."
+msgid "Oops! Database Error: %(error)s."
msgstr "Chyba databáze: %(error)s."
#: cps/admin.py:1316
@@ -315,7 +315,7 @@ msgid "Please configure your e-mail address first..."
msgstr "Prvně nastavte svou e-mailovou adresu..."
#: cps/admin.py:1323
-msgid "E-mail server settings updated"
+msgid "Email Server Settings updated"
msgstr "Nastavení e-mailového serveru aktualizováno"
#: cps/admin.py:1346 cps/templates/admin.html:191
@@ -336,7 +336,7 @@ msgstr ""
#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
#: cps/web.py:1320
-msgid "An unknown error occurred. Please try again later."
+msgid "Oops! An unknown error occurred. Please try again later."
msgstr "Neznámá chyba. Opakujte prosím později."
#: cps/admin.py:1386
@@ -354,7 +354,7 @@ msgid "Password for user %(user)s reset"
msgstr "Heslo pro uživatele %(user)s resetováno"
#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first..."
+msgid "Please configure the SMTP mail settings first."
msgstr "Nejprve nakonfigurujte nastavení pošty SMTP..."
#: cps/admin.py:1445
@@ -472,7 +472,7 @@ msgid "Database Configuration"
msgstr "Konfigurace funkcí"
#: cps/admin.py:1871 cps/web.py:1233
-msgid "Please fill out all fields!"
+msgid "Oops! Please complete all fields."
msgstr "Vyplňte všechna pole!"
#: cps/admin.py:1879
@@ -486,7 +486,7 @@ msgstr "Uživatel '%(user)s' vytvořen"
#: cps/admin.py:1902
#, fuzzy
-msgid "Found an existing account for this e-mail address or name."
+msgid "Oops! An account already exists for this Email. or name."
msgstr "Byl nalezen existující účet pro tuto e-mailovou adresu nebo přezdívku."
#: cps/admin.py:1932
@@ -503,7 +503,7 @@ msgid "No admin user remaining, can't delete user"
msgstr "Nezbývá žádný správce, nemůžete jej odstranit"
#: cps/admin.py:1992 cps/web.py:1371
-msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
+msgid "Email can't be empty and has to be a valid Email"
msgstr ""
#: cps/admin.py:2018
@@ -533,7 +533,7 @@ msgstr "Žádné"
#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
#: cps/web.py:1504 cps/web.py:1549
-msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
msgstr "Jejda! Vybraná kniha není k dispozici. Soubor neexistuje nebo není přístupný"
#: cps/editbooks.py:154 cps/editbooks.py:1221
@@ -665,7 +665,7 @@ msgstr "%(format)s nenalezen: %(fn)s"
#: cps/helper.py:97 cps/helper.py:226 cps/templates/detail.html:42
#: cps/templates/detail.html:46
#, fuzzy
-msgid "Send to E-Reader"
+msgid "Send to eReader"
msgstr "Poslat do Kindle"
#: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
@@ -753,7 +753,7 @@ msgstr "Cesta ke knize %(path)s nebyla nalezena na Google Drive"
#: cps/helper.py:644 cps/web.py:1416
#, fuzzy
-msgid "Found an existing account for this e-mail address"
+msgid "Oops! An account already exists for this Email."
msgstr "Byl nalezen existující účet pro tuto e-mailovou adresu."
#: cps/helper.py:652
@@ -834,7 +834,7 @@ msgstr "Registrovat s %(provider)s"
#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "nyní jste přihlášen jako: '%(nickname)s'"
#: cps/oauth_bb.py:148
@@ -1331,20 +1331,20 @@ msgstr "Seznam formátů"
#: cps/web.py:1203
#, python-format
-msgid "Book successfully queued for sending to %(kindlemail)s"
+msgid "Success! Book queued for sending to %(eReadermail)s"
msgstr "Kniha byla úspěšně zařazena do fronty pro odeslání na %(kindlemail)s"
#: cps/web.py:1207
#, python-format
-msgid "Oops! There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending book: %(res)s"
msgstr "Při odesílání této knihy došlo k chybě: %(res)s"
#: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle E-mail Address."
+msgid "Please update your profile with a valid Send to Kindle Email Address."
msgstr "Nejprve nakonfigurujte vaši kindle e-mailovou adresu.."
#: cps/web.py:1226
-msgid "E-Mail server is not configured, please contact your administrator!"
+msgid "Oops! Email server is not configured, please contact your administrator."
msgstr "E-mailový server není nakonfigurován, kontaktujte svého správce!"
#: cps/templates/layout.html:68 cps/templates/layout.html:102
@@ -1355,51 +1355,51 @@ msgid "Register"
msgstr "Registrovat"
#: cps/web.py:1262
-msgid "Your e-mail is not allowed to register"
+msgid "Oops! Your Email is not allowed."
msgstr "Váš e-mail nemá povolení k registraci"
#: cps/web.py:1266
-msgid "Confirmation e-mail was send to your e-mail account."
+msgid "Success! Confirmation Email has been sent."
msgstr "Potvrzovací e-mail byl odeslán na váš účet."
#: cps/web.py:1280
-msgid "Cannot activate LDAP authentication"
+msgid "Oops! Cannot activate LDAP authentication"
msgstr "Nelze aktivovat ověření LDAP"
#: cps/web.py:1299
#, python-format
-msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
+msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
msgstr "Záložní přihlášení jako: ‘%(nickname)s’, server LDAP není dosažitelný nebo neznámý uživatel"
#: cps/web.py:1305
#, python-format
-msgid "Could not login: %(message)s"
+msgid "Oops! Login Failed: %(message)s"
msgstr "Nelze se přihlásit: %(message)s"
#: cps/web.py:1309 cps/web.py:1334
-msgid "Wrong Username or Password"
+msgid "Oops! Invalid Username or Password."
msgstr "Špatné uživatelské jméno nebo heslo"
#: cps/web.py:1316
-msgid "New Password was send to your email address"
+msgid "Success! New Password was sent to your Email."
msgstr "Nové heslo bylo zasláno na vaši emailovou adresu"
#: cps/web.py:1322
-msgid "Please enter valid username to reset password"
+msgid "Oops! Please enter a valid username to reset password"
msgstr "Zadejte platné uživatelské jméno pro obnovení hesla"
#: cps/web.py:1329
#, python-format
-msgid "You are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "Nyní jste přihlášeni jako: '%(nickname)s'"
#: cps/web.py:1396 cps/web.py:1445
#, python-format
-msgid "%(name)s's profile"
+msgid "%(name)s's Profile"
msgstr "%(name)s profil"
#: cps/web.py:1412
-msgid "Profile updated"
+msgid Success! Profile updated"
msgstr "Profil aktualizován"
#: cps/services/gmail.py:58
@@ -1492,12 +1492,12 @@ msgstr "Přezdívka"
#: cps/templates/admin.html:14 cps/templates/register.html:14
#: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
-msgid "E-mail Address"
+msgid "Email"
msgstr "E-mail"
#: cps/templates/admin.html:15 cps/templates/user_edit.html:28
#, fuzzy
-msgid "Send to E-Reader E-mail Address"
+msgid "Send to eReader Email"
msgstr "Poslat do Kindle e-mailová adresa"
#: cps/templates/admin.html:17 cps/templates/layout.html:91
@@ -1545,7 +1545,7 @@ msgid "Import LDAP Users"
msgstr "Importovat LDAP uživatele"
#: cps/templates/admin.html:62
-msgid "E-mail Server Settings"
+msgid "Email Server Settings"
msgstr "Nastavení e-mailového serveru SMTP"
#: cps/templates/admin.html:67 cps/templates/email_edit.html:31
@@ -1566,11 +1566,11 @@ msgstr "SMTP přihlášení"
#: cps/templates/admin.html:83 cps/templates/admin.html:94
#: cps/templates/email_edit.html:55
-msgid "From E-mail"
+msgid "From Email"
msgstr "Z e-mailu"
#: cps/templates/admin.html:90
-msgid "E-Mail Service"
+msgid "EMail Service"
msgstr ""
#: cps/templates/admin.html:91
@@ -1643,15 +1643,15 @@ msgid "Scheduled Tasks"
msgstr ""
#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
-msgid "Time at which tasks start to run"
+msgid "Start Time"
msgstr ""
#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
-msgid "Maximum tasks duration"
+msgid "Maximum Duration"
msgstr ""
#: cps/templates/admin.html:178
-msgid "Generate book cover thumbnails"
+msgid "Generate Thumbnails"
msgstr ""
#: cps/templates/admin.html:182
@@ -1659,11 +1659,11 @@ msgid "Generate series cover thumbnails"
msgstr ""
#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
-msgid "Reconnect to Calibre Library"
+msgid "Reconnect Calibre Database"
msgstr ""
#: cps/templates/admin.html:193
-msgid "Refresh Thumbnail Cover Cache"
+msgid "Refresh Thumbnail Cache"
msgstr ""
#: cps/templates/admin.html:199
@@ -1703,7 +1703,7 @@ msgid "Details"
msgstr "Detaily"
#: cps/templates/admin.html:227
-msgid "Current version"
+msgid "Current Version"
msgstr "Současná verze"
#: cps/templates/admin.html:234
@@ -2180,7 +2180,7 @@ msgid "Enable Public Registration"
msgstr "Povolit veřejnou registraci"
#: cps/templates/config_edit.html:127
-msgid "Use E-Mail as Username"
+msgid "Use Email as Username"
msgstr "Použít e-mail jako přezdívku"
#: cps/templates/config_edit.html:132
@@ -2535,7 +2535,7 @@ msgid "Edit Metadata"
msgstr "Upravit metadata"
#: cps/templates/email_edit.html:13
-msgid "Choose Server Type"
+msgid "Email Account Type"
msgstr ""
#: cps/templates/email_edit.html:15
@@ -3070,7 +3070,7 @@ msgid "Choose a username"
msgstr "Zvolte uživatelské jméno"
#: cps/templates/register.html:15
-msgid "Your email address"
+msgid "Your Email"
msgstr "Vaše e-mailová adresa"
#: cps/templates/remote_login.html:5
@@ -3090,7 +3090,7 @@ msgid "This verification link will expire in 10 minutes."
msgstr "Tento ověřovací odkaz vyprší za 10 minut."
#: cps/templates/schedule_edit.html:29
-msgid "Generate Book Cover Thumbnails"
+msgid "Generate Thumbnails"
msgstr ""
#: cps/templates/schedule_edit.html:33
@@ -3326,12 +3326,12 @@ msgstr "Zvolte uživatelské jméno"
#: cps/templates/user_table.html:135
#, fuzzy
-msgid "Enter E-mail Address"
+msgid "Enter Email Address"
msgstr "Vaše e-mailová adresa"
#: cps/templates/user_table.html:136
#, fuzzy
-msgid "Enter E-Reader E-mail Address"
+msgid "Enter E-Reader Email Address"
msgstr "Poslat do Kindle e-mailová adresa"
#: cps/templates/user_table.html:136
diff --git a/cps/translations/de/LC_MESSAGES/messages.po b/cps/translations/de/LC_MESSAGES/messages.po
index 51ba838d..f73daf0e 100644
--- a/cps/translations/de/LC_MESSAGES/messages.po
+++ b/cps/translations/de/LC_MESSAGES/messages.po
@@ -279,7 +279,7 @@ msgid "Add new user"
msgstr "Neuen Benutzer hinzufügen"
#: cps/admin.py:1268 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
+msgid "Edit Email Server Settings"
msgstr "SMTP-Einstellungen ändern"
#: cps/admin.py:1287
@@ -292,7 +292,7 @@ msgstr "Gmail Account Verifikation erfolgreich"
#: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
#, python-format
-msgid "Database error: %(error)s."
+msgid "Oops! Database Error: %(error)s."
msgstr "Datenbankfehler: %(error)s."
#: cps/admin.py:1316
@@ -310,7 +310,7 @@ msgid "Please configure your e-mail address first..."
msgstr "Bitte zuerst E-Mail Adresse konfigurieren..."
#: cps/admin.py:1323
-msgid "E-mail server settings updated"
+msgid "Email Server Settings updated"
msgstr "Einstellungen des E-Mail-Servers aktualisiert"
#: cps/admin.py:1346 cps/templates/admin.html:191
@@ -331,7 +331,7 @@ msgstr "Einstellungen für Geplante Aufgaben aktualisiert"
#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
#: cps/web.py:1320
-msgid "An unknown error occurred. Please try again later."
+msgid "Oops! An unknown error occurred. Please try again later."
msgstr "Es ist ein unbekannter Fehler aufgetreten. Bitte später erneut versuchen."
#: cps/admin.py:1386
@@ -349,7 +349,7 @@ msgid "Password for user %(user)s reset"
msgstr "Passwort für Benutzer %(user)s wurde zurückgesetzt"
#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first..."
+msgid "Please configure the SMTP mail settings first."
msgstr "Bitte zuerst die SMTP-Einstellung konfigurieren ..."
#: cps/admin.py:1445
@@ -463,7 +463,7 @@ msgid "Database Configuration"
msgstr "Datenbank-Konfiguration"
#: cps/admin.py:1871 cps/web.py:1233
-msgid "Please fill out all fields!"
+msgid "Oops! Please complete all fields."
msgstr "Bitte alle Felder ausfüllen!"
#: cps/admin.py:1879
@@ -476,7 +476,7 @@ msgid "User '%(user)s' created"
msgstr "Benutzer '%(user)s' angelegt"
#: cps/admin.py:1902
-msgid "Found an existing account for this e-mail address or name."
+msgid "Oops! An account already exists for this Email. or name."
msgstr "Es existiert bereits ein Account für diese E-Mailadresse oder diesen Benutzernamen."
#: cps/admin.py:1932
@@ -493,7 +493,7 @@ msgid "No admin user remaining, can't delete user"
msgstr "Benutzer kann nicht gelöscht werden, es wäre kein Admin Benutzer übrig"
#: cps/admin.py:1992 cps/web.py:1371
-msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
+msgid "Email can't be empty and has to be a valid Email"
msgstr ""
#: cps/admin.py:2018
@@ -523,7 +523,7 @@ msgstr "Keine"
#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
#: cps/web.py:1504 cps/web.py:1549
-msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
msgstr "Öffnen des Buchs fehlgeschlagen. Datei existiert nicht oder ist nicht zugänglich"
#: cps/editbooks.py:154 cps/editbooks.py:1221
@@ -654,7 +654,7 @@ msgstr "%(format)s nicht gefunden: %(fn)s"
#: cps/helper.py:97 cps/helper.py:226 cps/templates/detail.html:42
#: cps/templates/detail.html:46
-msgid "Send to E-Reader"
+msgid "Send to eReader"
msgstr "An E-Reader senden"
#: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
@@ -741,7 +741,7 @@ msgid "Book path %(path)s not found on Google Drive"
msgstr "Buchpfad %(path)s wurde nicht auf Google Drive gefunden"
#: cps/helper.py:644 cps/web.py:1416
-msgid "Found an existing account for this e-mail address"
+msgid "Oops! An account already exists for this Email."
msgstr "Es existiert bereits ein Benutzer für diese E-Mailadresse"
#: cps/helper.py:652
@@ -820,7 +820,7 @@ msgstr "Anmelden mit %(provider)s"
#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "Du bist nun eingeloggt als '%(nickname)s'"
#: cps/oauth_bb.py:148
@@ -1314,20 +1314,20 @@ msgstr "Liste der Dateiformate"
#: cps/web.py:1203
#, python-format
-msgid "Book successfully queued for sending to %(kindlemail)s"
+msgid "Success! Book queued for sending to %(eReadermail)s"
msgstr "Buch erfolgreich zum Senden an %(kindlemail)s eingereiht"
#: cps/web.py:1207
#, python-format
-msgid "Oops! There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending book: %(res)s"
msgstr "Beim Senden des Buchs trat ein Fehler auf: %(res)s"
#: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle E-mail Address."
+msgid "Please update your profile with a valid Send to Kindle Email Address."
msgstr "Bitte zuerst die Kindle E-Mailadresse konfigurieren..."
#: cps/web.py:1226
-msgid "E-Mail server is not configured, please contact your administrator!"
+msgid "Oops! Email server is not configured, please contact your administrator."
msgstr "Der E-Mail Server ist nicht konfigurierte, bitte den Administrator kontaktieren!"
#: cps/templates/layout.html:68 cps/templates/layout.html:102
@@ -1338,51 +1338,51 @@ msgid "Register"
msgstr "Registrieren"
#: cps/web.py:1262
-msgid "Your e-mail is not allowed to register"
+msgid "Oops! Your Email is not allowed."
msgstr "Diese E-Mail ist nicht für die Registrierung zugelassen"
#: cps/web.py:1266
-msgid "Confirmation e-mail was send to your e-mail account."
+msgid "Success! Confirmation Email has been sent."
msgstr "Eine Bestätigungs-E-Mail wurde an deinen E-Mail Account versendet."
#: cps/web.py:1280
-msgid "Cannot activate LDAP authentication"
+msgid "Oops! Cannot activate LDAP authentication"
msgstr "LDAP-Authentifizierung kann nicht aktiviert werden"
#: cps/web.py:1299
#, python-format
-msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
+msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
msgstr "Rückfall Login als: '%(nickname)s', LDAP Server ist nicht erreichbar, oder der Nutzer ist unbekannt"
#: cps/web.py:1305
#, python-format
-msgid "Could not login: %(message)s"
+msgid "Oops! Login Failed: %(message)s"
msgstr "Login nicht erfolgreich: %(message)s"
#: cps/web.py:1309 cps/web.py:1334
-msgid "Wrong Username or Password"
+msgid "Oops! Invalid Username or Password."
msgstr "Falscher Benutzername oder Passwort"
#: cps/web.py:1316
-msgid "New Password was send to your email address"
+msgid "Success! New Password was sent to your Email."
msgstr "Das neue Passwort wurde an die E-Mail Adresse verschickt"
#: cps/web.py:1322
-msgid "Please enter valid username to reset password"
+msgid "Oops! Please enter a valid username to reset password"
msgstr "Bitte einen gültigen Benutzernamen zum Zurücksetzen des Passworts angeben"
#: cps/web.py:1329
#, python-format
-msgid "You are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "Eingeloggt als: '%(nickname)s'"
#: cps/web.py:1396 cps/web.py:1445
#, python-format
-msgid "%(name)s's profile"
+msgid "%(name)s's Profile"
msgstr "%(name)s's Profil"
#: cps/web.py:1412
-msgid "Profile updated"
+msgid Success! Profile updated"
msgstr "Profil aktualisiert"
#: cps/services/gmail.py:58
@@ -1475,11 +1475,11 @@ msgstr "Benutzername"
#: cps/templates/admin.html:14 cps/templates/register.html:14
#: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
-msgid "E-mail Address"
+msgid "Email"
msgstr "E-Mail"
#: cps/templates/admin.html:15 cps/templates/user_edit.html:28
-msgid "Send to E-Reader E-mail Address"
+msgid "Send to eReader Email"
msgstr "An E-Reader E-Mail Adresse senden"
#: cps/templates/admin.html:17 cps/templates/layout.html:91
@@ -1527,7 +1527,7 @@ msgid "Import LDAP Users"
msgstr "LDAP Benutzer importieren"
#: cps/templates/admin.html:62
-msgid "E-mail Server Settings"
+msgid "Email Server Settings"
msgstr "Einstellungen des SMTP-Servers"
#: cps/templates/admin.html:67 cps/templates/email_edit.html:31
@@ -1548,12 +1548,12 @@ msgstr "SMTP-Login"
#: cps/templates/admin.html:83 cps/templates/admin.html:94
#: cps/templates/email_edit.html:55
-msgid "From E-mail"
+msgid "From Email"
msgstr "Absenderadresse"
#: cps/templates/admin.html:90
-msgid "E-Mail Service"
-msgstr "E-Mail Service"
+msgid "EMail Service"
+msgstr "EMail Service"
#: cps/templates/admin.html:91
msgid "Gmail via Oauth2"
@@ -1624,15 +1624,15 @@ msgid "Scheduled Tasks"
msgstr "Geplante Aufgabe"
#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
-msgid "Time at which tasks start to run"
+msgid "Start Time"
msgstr "Zeitpunkt an dem die Aufgabe startet"
#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
-msgid "Maximum tasks duration"
+msgid "Maximum Duration"
msgstr "Maximale Aufgabendauer"
#: cps/templates/admin.html:178
-msgid "Generate book cover thumbnails"
+msgid "Generate Thumbnails"
msgstr "Buchcover Miniaturansichten erzeugen"
#: cps/templates/admin.html:182
@@ -1640,11 +1640,11 @@ msgid "Generate series cover thumbnails"
msgstr "Seriencover Miniaturansichten erzeugen"
#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
-msgid "Reconnect to Calibre Library"
+msgid "Reconnect Calibre Database"
msgstr "Mit Calibre Bibliothek neuverbinden"
#: cps/templates/admin.html:193
-msgid "Refresh Thumbnail Cover Cache"
+msgid "Refresh Thumbnail Cache"
msgstr "Cover Miniaturansichten aktualisieren"
#: cps/templates/admin.html:199
@@ -1684,7 +1684,7 @@ msgid "Details"
msgstr "Details"
#: cps/templates/admin.html:227
-msgid "Current version"
+msgid "Current Version"
msgstr "Aktuelle Version"
#: cps/templates/admin.html:234
@@ -2157,7 +2157,7 @@ msgid "Enable Public Registration"
msgstr "Öffentliche Registrierung aktivieren"
#: cps/templates/config_edit.html:127
-msgid "Use E-Mail as Username"
+msgid "Use Email as Username"
msgstr "Benutze E-Mail als Benutzername"
#: cps/templates/config_edit.html:132
@@ -2510,7 +2510,7 @@ msgid "Edit Metadata"
msgstr "Metadaten bearbeiten"
#: cps/templates/email_edit.html:13
-msgid "Choose Server Type"
+msgid "Email Account Type"
msgstr "Wähle Server Typ"
#: cps/templates/email_edit.html:15
@@ -3036,7 +3036,7 @@ msgid "Choose a username"
msgstr "Wähle einen Benutzernamen"
#: cps/templates/register.html:15
-msgid "Your email address"
+msgid "Your Email"
msgstr "Deine E-Mail-Adresse"
#: cps/templates/remote_login.html:5
@@ -3056,7 +3056,7 @@ msgid "This verification link will expire in 10 minutes."
msgstr "Dieser Link wird in 10 Minuten ablaufen."
#: cps/templates/schedule_edit.html:29
-msgid "Generate Book Cover Thumbnails"
+msgid "Generate Thumbnails"
msgstr "Thumbnails für Bücher Cover erzeugen"
#: cps/templates/schedule_edit.html:33
@@ -3288,11 +3288,11 @@ msgid "Enter Username"
msgstr "Benutzernamen eingeben"
#: cps/templates/user_table.html:135
-msgid "Enter E-mail Address"
+msgid "Enter Email Address"
msgstr "E-Mail-Adresse eingeben"
#: cps/templates/user_table.html:136
-msgid "Enter E-Reader E-mail Address"
+msgid "Enter E-Reader Email Address"
msgstr "E-Reader E-Mail Adresse eingeben"
#: cps/templates/user_table.html:136
diff --git a/cps/translations/el/LC_MESSAGES/messages.po b/cps/translations/el/LC_MESSAGES/messages.po
index 70fb6e31..860d995d 100644
--- a/cps/translations/el/LC_MESSAGES/messages.po
+++ b/cps/translations/el/LC_MESSAGES/messages.po
@@ -284,7 +284,7 @@ msgid "Add new user"
msgstr "Προσθήκη νέου χρήστη"
#: cps/admin.py:1268 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
+msgid "Edit Email Server Settings"
msgstr "Επεξεργασία Ρυθμίσεων E-mail Διακομιστή"
#: cps/admin.py:1287
@@ -297,7 +297,7 @@ msgstr ""
#: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
#, python-format
-msgid "Database error: %(error)s."
+msgid "Oops! Database Error: %(error)s."
msgstr "Σφάλμα βάσης δεδομένων: %(error)s."
#: cps/admin.py:1316
@@ -315,7 +315,7 @@ msgid "Please configure your e-mail address first..."
msgstr "Παρακαλούμε ρύθμισε πρώτα τη διεύθυνση e-mail σου..."
#: cps/admin.py:1323
-msgid "E-mail server settings updated"
+msgid "Email Server Settings updated"
msgstr "Ενημερώθηκαν οι ρυθμίσεις E-mail διακομιστή"
#: cps/admin.py:1346 cps/templates/admin.html:191
@@ -336,7 +336,7 @@ msgstr ""
#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
#: cps/web.py:1320
-msgid "An unknown error occurred. Please try again later."
+msgid "Oops! An unknown error occurred. Please try again later."
msgstr "Προέκυψε ένα άγνωστο σφάλμα. Παρακαλούμε δοκίμασε ξανά αργότερα."
#: cps/admin.py:1386
@@ -354,7 +354,7 @@ msgid "Password for user %(user)s reset"
msgstr "Κωδικός για επαναφορά %(user) χρήστη/ών"
#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first..."
+msgid "Please configure the SMTP mail settings first."
msgstr "Παρακαλούμε διαμόρφωσε πρώτα τις ρυθμίσεις ταχυδρομείου SMTP..."
#: cps/admin.py:1445
@@ -472,7 +472,7 @@ msgid "Database Configuration"
msgstr "Διαμόρφωση Λειτουργίας"
#: cps/admin.py:1871 cps/web.py:1233
-msgid "Please fill out all fields!"
+msgid "Oops! Please complete all fields."
msgstr "Παρακαλούμε συμπλήρωσε όλα τα πεδία!"
#: cps/admin.py:1879
@@ -486,7 +486,7 @@ msgstr "Χρήστης/ες '%(user)s' δημιουργήθηκαν"
#: cps/admin.py:1902
#, fuzzy
-msgid "Found an existing account for this e-mail address or name."
+msgid "Oops! An account already exists for this Email. or name."
msgstr "Βρέθηκε ένας ήδη υπάρχον λογαριασμός για αυτή τη διεύθυνση e-mail ή όνομα χρήστη."
#: cps/admin.py:1932
@@ -503,7 +503,7 @@ msgid "No admin user remaining, can't delete user"
msgstr "Δεν έχει απομείνει χρήστης διαχειριστής, δεν μπορεί να διαγραφεί ο χρήστης"
#: cps/admin.py:1992 cps/web.py:1371
-msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
+msgid "Email can't be empty and has to be a valid Email"
msgstr ""
#: cps/admin.py:2018
@@ -533,7 +533,7 @@ msgstr "Κανένα"
#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
#: cps/web.py:1504 cps/web.py:1549
-msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
msgstr "Oυπς! Ο επιλεγμένος τίτλος βιβλίου δεν είναι διαθέσιμος. Το αρχείο δεν υπάρχει ή δεν είναι προσβάσιμο"
#: cps/editbooks.py:154 cps/editbooks.py:1221
@@ -665,7 +665,7 @@ msgstr "%(format)s δεν βρέθηκε: %(fn)s"
#: cps/helper.py:97 cps/helper.py:226 cps/templates/detail.html:42
#: cps/templates/detail.html:46
#, fuzzy
-msgid "Send to E-Reader"
+msgid "Send to eReader"
msgstr "Αποστολή στο Kindle"
#: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
@@ -753,7 +753,7 @@ msgstr "Η πορεία βιβλίου %(path)s δεν βρέθηκε στο Goo
#: cps/helper.py:644 cps/web.py:1416
#, fuzzy
-msgid "Found an existing account for this e-mail address"
+msgid "Oops! An account already exists for this Email."
msgstr "Βρέθηκε ένας ήδη υπάρχον λογαριασμός για αυτή τη διεύθυνση e-mail."
#: cps/helper.py:652
@@ -834,7 +834,7 @@ msgstr "Εγγραφή με %(provider)s"
#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "τώρα έχεις συνδεθεί ως: '%(nickname)s'"
#: cps/oauth_bb.py:148
@@ -1331,20 +1331,20 @@ msgstr "Λίστα μορφών αρχείου"
#: cps/web.py:1203
#, python-format
-msgid "Book successfully queued for sending to %(kindlemail)s"
+msgid "Success! Book queued for sending to %(eReadermail)s"
msgstr "Το βιβλίο έχει επιτυχώς μπει σε σειρά για αποστολή στο %(kindlemail)s"
#: cps/web.py:1207
#, python-format
-msgid "Oops! There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending book: %(res)s"
msgstr "Oυπς! Υπήρξε ένα σφάλμα κατά την αποστολή αυτού του βιβλίου: %(res)s"
#: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle E-mail Address."
+msgid "Please update your profile with a valid Send to Kindle Email Address."
msgstr "Παρακαλούμε ενημέρωσε το προφίλ σου με μια έγκυρη Διεύθυνση E-mail Αποστολής στο Kindle."
#: cps/web.py:1226
-msgid "E-Mail server is not configured, please contact your administrator!"
+msgid "Oops! Email server is not configured, please contact your administrator."
msgstr "Ο διακομιστής E-Mail δεν έχει διαμορφωθεί, παρακαλούμε επικοινώνησε με το διαχειριστή σου!"
#: cps/templates/layout.html:68 cps/templates/layout.html:102
@@ -1355,51 +1355,51 @@ msgid "Register"
msgstr "Εγγραφή"
#: cps/web.py:1262
-msgid "Your e-mail is not allowed to register"
+msgid "Oops! Your Email is not allowed."
msgstr "Η διεύθυνση e-mail σου δεν επιτρέπεται να εγγραφεί"
#: cps/web.py:1266
-msgid "Confirmation e-mail was send to your e-mail account."
+msgid "Success! Confirmation Email has been sent."
msgstr "Το e-mail επιβεβαίωσης έχει σταλεί στον e-mail λογαριασμό σου."
#: cps/web.py:1280
-msgid "Cannot activate LDAP authentication"
+msgid "Oops! Cannot activate LDAP authentication"
msgstr "Δεν μπόρεσε να ενεργοποιηθεί η επαλήθευση LDAP"
#: cps/web.py:1299
#, python-format
-msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
+msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
msgstr "Εναλλακτική Σύνδεση ως: '%(nickname)s', Ο Διακομιστής LDAP δεν είναι προσβάσιμος, ή ο χρήστης δεν είναι γνωστός"
#: cps/web.py:1305
#, python-format
-msgid "Could not login: %(message)s"
+msgid "Oops! Login Failed: %(message)s"
msgstr "Δεν μπόρεσε να συνδεθεί: %(message)s"
#: cps/web.py:1309 cps/web.py:1334
-msgid "Wrong Username or Password"
+msgid "Oops! Invalid Username or Password."
msgstr "Λανθασμένο Όνομα Χρήστη ή Κωδικός"
#: cps/web.py:1316
-msgid "New Password was send to your email address"
+msgid "Success! New Password was sent to your Email."
msgstr "Ο Νέος Κωδικός έχει σταλεί στη διεύθυνση email σου"
#: cps/web.py:1322
-msgid "Please enter valid username to reset password"
+msgid "Oops! Please enter a valid username to reset password"
msgstr "Παρακαλούμε συμπλήρωσε ένα έγκυρο όνομα χρήστη για επαναφορά του κωδικού"
#: cps/web.py:1329
#, python-format
-msgid "You are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "Έχεις συνδεθεί ως: '%(nickname)s'"
#: cps/web.py:1396 cps/web.py:1445
#, python-format
-msgid "%(name)s's profile"
+msgid "%(name)s's Profile"
msgstr "%(name)s's προφίλ"
#: cps/web.py:1412
-msgid "Profile updated"
+msgid Success! Profile updated"
msgstr "Το προφίλ ενημερώθηκε"
#: cps/services/gmail.py:58
@@ -1492,12 +1492,12 @@ msgstr "Όνομα Χρήστη"
#: cps/templates/admin.html:14 cps/templates/register.html:14
#: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
-msgid "E-mail Address"
+msgid "Email"
msgstr "Διεύθυνση E-mail"
#: cps/templates/admin.html:15 cps/templates/user_edit.html:28
#, fuzzy
-msgid "Send to E-Reader E-mail Address"
+msgid "Send to eReader Email"
msgstr "Διεύθυνση E-mail Αποστολής στο Kindle"
#: cps/templates/admin.html:17 cps/templates/layout.html:91
@@ -1545,7 +1545,7 @@ msgid "Import LDAP Users"
msgstr "Εισαγωγή Χρηστών LDAP"
#: cps/templates/admin.html:62
-msgid "E-mail Server Settings"
+msgid "Email Server Settings"
msgstr "Ρυθμίσεις E-mail Διακομιστή"
#: cps/templates/admin.html:67 cps/templates/email_edit.html:31
@@ -1566,11 +1566,11 @@ msgstr "Σύνδεση SMTP"
#: cps/templates/admin.html:83 cps/templates/admin.html:94
#: cps/templates/email_edit.html:55
-msgid "From E-mail"
+msgid "From Email"
msgstr "Από E-mail"
#: cps/templates/admin.html:90
-msgid "E-Mail Service"
+msgid "EMail Service"
msgstr ""
#: cps/templates/admin.html:91
@@ -1643,15 +1643,15 @@ msgid "Scheduled Tasks"
msgstr ""
#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
-msgid "Time at which tasks start to run"
+msgid "Start Time"
msgstr ""
#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
-msgid "Maximum tasks duration"
+msgid "Maximum Duration"
msgstr ""
#: cps/templates/admin.html:178
-msgid "Generate book cover thumbnails"
+msgid "Generate Thumbnails"
msgstr ""
#: cps/templates/admin.html:182
@@ -1659,11 +1659,11 @@ msgid "Generate series cover thumbnails"
msgstr ""
#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
-msgid "Reconnect to Calibre Library"
+msgid "Reconnect Calibre Database"
msgstr ""
#: cps/templates/admin.html:193
-msgid "Refresh Thumbnail Cover Cache"
+msgid "Refresh Thumbnail Cache"
msgstr ""
#: cps/templates/admin.html:199
@@ -1703,7 +1703,7 @@ msgid "Details"
msgstr "Λεπτομέρειες"
#: cps/templates/admin.html:227
-msgid "Current version"
+msgid "Current Version"
msgstr "Τρέχουσα έκδοση"
#: cps/templates/admin.html:234
@@ -2180,7 +2180,7 @@ msgid "Enable Public Registration"
msgstr "Ενεργοποίηση Δημόσιας Εγγραφής"
#: cps/templates/config_edit.html:127
-msgid "Use E-Mail as Username"
+msgid "Use Email as Username"
msgstr "Χρήση E-Mail ως Όνομα Χρήστη"
#: cps/templates/config_edit.html:132
@@ -2535,7 +2535,7 @@ msgid "Edit Metadata"
msgstr "Επεξεργασία Μεταδεδομένων"
#: cps/templates/email_edit.html:13
-msgid "Choose Server Type"
+msgid "Email Account Type"
msgstr ""
#: cps/templates/email_edit.html:15
@@ -3070,7 +3070,7 @@ msgid "Choose a username"
msgstr "Επιλογή ενός ονόματος χρήστη"
#: cps/templates/register.html:15
-msgid "Your email address"
+msgid "Your Email"
msgstr "Η διεύθυνση email σου"
#: cps/templates/remote_login.html:5
@@ -3090,7 +3090,7 @@ msgid "This verification link will expire in 10 minutes."
msgstr "Αυτός ο σύνδεσμος επαλήθευσης θα λήξει σε 10 λεπτά."
#: cps/templates/schedule_edit.html:29
-msgid "Generate Book Cover Thumbnails"
+msgid "Generate Thumbnails"
msgstr ""
#: cps/templates/schedule_edit.html:33
@@ -3326,12 +3326,12 @@ msgstr "Επιλογή ενός ονόματος χρήστη"
#: cps/templates/user_table.html:135
#, fuzzy
-msgid "Enter E-mail Address"
+msgid "Enter Email Address"
msgstr "Η διεύθυνση email σου"
#: cps/templates/user_table.html:136
#, fuzzy
-msgid "Enter E-Reader E-mail Address"
+msgid "Enter E-Reader Email Address"
msgstr "Διεύθυνση E-mail Αποστολής στο Kindle"
#: cps/templates/user_table.html:136
diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po
index c0950f6f..fc8d23e8 100644
--- a/cps/translations/es/LC_MESSAGES/messages.po
+++ b/cps/translations/es/LC_MESSAGES/messages.po
@@ -288,7 +288,7 @@ msgid "Add new user"
msgstr "Añadir un nuevo usuario"
#: cps/admin.py:1268 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
+msgid "Edit Email Server Settings"
msgstr "Cambiar parámetros de correo"
#: cps/admin.py:1287
@@ -301,7 +301,7 @@ msgstr "Verificación de cuenta de Gmail exitosa"
#: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
#, python-format
-msgid "Database error: %(error)s."
+msgid "Oops! Database Error: %(error)s."
msgstr "Error en la base de datos: %(error)s."
#: cps/admin.py:1316
@@ -319,7 +319,7 @@ msgid "Please configure your e-mail address first..."
msgstr "Por favor, configure su correo electrónico primero..."
#: cps/admin.py:1323
-msgid "E-mail server settings updated"
+msgid "Email Server Settings updated"
msgstr "Actualizados los ajustes del servidor de correo electrónico"
#: cps/admin.py:1346 cps/templates/admin.html:191
@@ -340,7 +340,7 @@ msgstr ""
#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
#: cps/web.py:1320
-msgid "An unknown error occurred. Please try again later."
+msgid "Oops! An unknown error occurred. Please try again later."
msgstr "Ha ocurrido un error desconocido. Por favor vuelva a intentarlo más tarde."
#: cps/admin.py:1386
@@ -358,7 +358,7 @@ msgid "Password for user %(user)s reset"
msgstr "Contraseña para el usuario %(user)s reinicializada"
#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first..."
+msgid "Please configure the SMTP mail settings first."
msgstr "Configura primero los parámetros del servidor SMTP..."
#: cps/admin.py:1445
@@ -476,7 +476,7 @@ msgid "Database Configuration"
msgstr "Configuración de la base de datos"
#: cps/admin.py:1871 cps/web.py:1233
-msgid "Please fill out all fields!"
+msgid "Oops! Please complete all fields."
msgstr "¡Por favor, rellena todos los campos!"
#: cps/admin.py:1879
@@ -490,7 +490,7 @@ msgstr "Usuario '%(user)s' creado"
#: cps/admin.py:1902
#, fuzzy
-msgid "Found an existing account for this e-mail address or name."
+msgid "Oops! An account already exists for this Email. or name."
msgstr "Encontrada una cuenta existente para este correo electrónico o nombre de usuario."
#: cps/admin.py:1932
@@ -507,7 +507,7 @@ msgid "No admin user remaining, can't delete user"
msgstr "No queda ningún usuario administrador, no se puede borrar al usuario"
#: cps/admin.py:1992 cps/web.py:1371
-msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
+msgid "Email can't be empty and has to be a valid Email"
msgstr ""
#: cps/admin.py:2018
@@ -537,7 +537,7 @@ msgstr "Ninguno"
#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
#: cps/web.py:1504 cps/web.py:1549
-msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
msgstr "oh, oh, el libro seleccionado no está disponible. El archivo no existe o no es accesible"
#: cps/editbooks.py:154 cps/editbooks.py:1221
@@ -669,7 +669,7 @@ msgstr "%(format)s no encontrado: %(fn)s"
#: cps/helper.py:97 cps/helper.py:226 cps/templates/detail.html:42
#: cps/templates/detail.html:46
#, fuzzy
-msgid "Send to E-Reader"
+msgid "Send to eReader"
msgstr "Enviar al Kindle"
#: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
@@ -757,7 +757,7 @@ msgstr "La ruta %(path)s del libro no fue encontrada en Google Drive"
#: cps/helper.py:644 cps/web.py:1416
#, fuzzy
-msgid "Found an existing account for this e-mail address"
+msgid "Oops! An account already exists for this Email."
msgstr "Encontrada una cuenta existente para esa dirección de correo electrónico"
#: cps/helper.py:652
@@ -838,7 +838,7 @@ msgstr "Registrado con %(provider)s"
#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "has iniciado sesión como : '%(nickname)s'"
#: cps/oauth_bb.py:148
@@ -1335,20 +1335,20 @@ msgstr "Lista de formatos"
#: cps/web.py:1203
#, python-format
-msgid "Book successfully queued for sending to %(kindlemail)s"
+msgid "Success! Book queued for sending to %(eReadermail)s"
msgstr "Libro puesto en la cola de envío a %(kindlemail)s"
#: cps/web.py:1207
#, python-format
-msgid "Oops! There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending book: %(res)s"
msgstr "Ha sucedido un error en el envío del libro: %(res)s"
#: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle E-mail Address."
+msgid "Please update your profile with a valid Send to Kindle Email Address."
msgstr "Por favor actualiza tu perfil con la dirección de correo de su kindle..."
#: cps/web.py:1226
-msgid "E-Mail server is not configured, please contact your administrator!"
+msgid "Oops! Email server is not configured, please contact your administrator."
msgstr "El servidor de correo no está configurado, por favor, ¡avisa a tu administrador!"
#: cps/templates/layout.html:68 cps/templates/layout.html:102
@@ -1359,51 +1359,51 @@ msgid "Register"
msgstr "Registro"
#: cps/web.py:1262
-msgid "Your e-mail is not allowed to register"
+msgid "Oops! Your Email is not allowed."
msgstr "Su correo electrónico no está permitido para registrarse"
#: cps/web.py:1266
-msgid "Confirmation e-mail was send to your e-mail account."
+msgid "Success! Confirmation Email has been sent."
msgstr "Se ha enviado un correo electrónico de verificación a su cuenta de correo."
#: cps/web.py:1280
-msgid "Cannot activate LDAP authentication"
+msgid "Oops! Cannot activate LDAP authentication"
msgstr "No se puede activar la autenticación LDAP"
#: cps/web.py:1299
#, python-format
-msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
+msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
msgstr "Fallback login como: '%(nickname)s', no se puede acceder al servidor LDAP o usuario desconocido"
#: cps/web.py:1305
#, python-format
-msgid "Could not login: %(message)s"
+msgid "Oops! Login Failed: %(message)s"
msgstr "No se pudo entrar: %(message)s"
#: cps/web.py:1309 cps/web.py:1334
-msgid "Wrong Username or Password"
+msgid "Oops! Invalid Username or Password."
msgstr "Usuario o contraseña inválido"
#: cps/web.py:1316
-msgid "New Password was send to your email address"
+msgid "Success! New Password was sent to your Email."
msgstr "Una nueva contraseña se ha enviado a su cuenta de correo electrónico"
#: cps/web.py:1322
-msgid "Please enter valid username to reset password"
+msgid "Oops! Please enter a valid username to reset password"
msgstr "Por favor, introduce un usuario válido para restablecer la contraseña"
#: cps/web.py:1329
#, python-format
-msgid "You are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "Ahora estás conectado como: '%(nickname)s'"
#: cps/web.py:1396 cps/web.py:1445
#, python-format
-msgid "%(name)s's profile"
+msgid "%(name)s's Profile"
msgstr "Perfil de %(name)s"
#: cps/web.py:1412
-msgid "Profile updated"
+msgid Success! Profile updated"
msgstr "Perfil actualizado"
#: cps/services/gmail.py:58
@@ -1496,12 +1496,12 @@ msgstr "Nombre de usuario"
#: cps/templates/admin.html:14 cps/templates/register.html:14
#: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
-msgid "E-mail Address"
+msgid "Email"
msgstr "Correo electrónico"
#: cps/templates/admin.html:15 cps/templates/user_edit.html:28
#, fuzzy
-msgid "Send to E-Reader E-mail Address"
+msgid "Send to eReader Email"
msgstr "Enviar al correo de Kindle"
#: cps/templates/admin.html:17 cps/templates/layout.html:91
@@ -1549,7 +1549,7 @@ msgid "Import LDAP Users"
msgstr "Importar usuarios LDAP"
#: cps/templates/admin.html:62
-msgid "E-mail Server Settings"
+msgid "Email Server Settings"
msgstr "Ajustes del servidor de correo electrónico"
#: cps/templates/admin.html:67 cps/templates/email_edit.html:31
@@ -1570,11 +1570,11 @@ msgstr "Login SMTP"
#: cps/templates/admin.html:83 cps/templates/admin.html:94
#: cps/templates/email_edit.html:55
-msgid "From E-mail"
+msgid "From Email"
msgstr "Desde el correo"
#: cps/templates/admin.html:90
-msgid "E-Mail Service"
+msgid "EMail Service"
msgstr "Servicio de Correo"
#: cps/templates/admin.html:91
@@ -1647,15 +1647,15 @@ msgid "Scheduled Tasks"
msgstr ""
#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
-msgid "Time at which tasks start to run"
+msgid "Start Time"
msgstr ""
#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
-msgid "Maximum tasks duration"
+msgid "Maximum Duration"
msgstr ""
#: cps/templates/admin.html:178
-msgid "Generate book cover thumbnails"
+msgid "Generate Thumbnails"
msgstr ""
#: cps/templates/admin.html:182
@@ -1663,11 +1663,11 @@ msgid "Generate series cover thumbnails"
msgstr ""
#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
-msgid "Reconnect to Calibre Library"
+msgid "Reconnect Calibre Database"
msgstr ""
#: cps/templates/admin.html:193
-msgid "Refresh Thumbnail Cover Cache"
+msgid "Refresh Thumbnail Cache"
msgstr ""
#: cps/templates/admin.html:199
@@ -1707,7 +1707,7 @@ msgid "Details"
msgstr "Detalles"
#: cps/templates/admin.html:227
-msgid "Current version"
+msgid "Current Version"
msgstr "Versión actual"
#: cps/templates/admin.html:234
@@ -2184,7 +2184,7 @@ msgid "Enable Public Registration"
msgstr "Permitir registro público"
#: cps/templates/config_edit.html:127
-msgid "Use E-Mail as Username"
+msgid "Use Email as Username"
msgstr "Utilizar eMail como nombre de usuario"
#: cps/templates/config_edit.html:132
@@ -2539,7 +2539,7 @@ msgid "Edit Metadata"
msgstr "Editar metadatos"
#: cps/templates/email_edit.html:13
-msgid "Choose Server Type"
+msgid "Email Account Type"
msgstr "Elige tipo de servidor"
#: cps/templates/email_edit.html:15
@@ -3074,7 +3074,7 @@ msgid "Choose a username"
msgstr "Escoger un nombre de usuario"
#: cps/templates/register.html:15
-msgid "Your email address"
+msgid "Your Email"
msgstr "Tu dirección de correo"
#: cps/templates/remote_login.html:5
@@ -3094,7 +3094,7 @@ msgid "This verification link will expire in 10 minutes."
msgstr "El enlace expirará después de 10 minutos."
#: cps/templates/schedule_edit.html:29
-msgid "Generate Book Cover Thumbnails"
+msgid "Generate Thumbnails"
msgstr ""
#: cps/templates/schedule_edit.html:33
@@ -3330,12 +3330,12 @@ msgstr "Introduce el nombre de usuario"
#: cps/templates/user_table.html:135
#, fuzzy
-msgid "Enter E-mail Address"
+msgid "Enter Email Address"
msgstr "Introduce la dirección de correo electrónico"
#: cps/templates/user_table.html:136
#, fuzzy
-msgid "Enter E-Reader E-mail Address"
+msgid "Enter E-Reader Email Address"
msgstr "Introduce la dirección de correo electrónico Kindle"
#: cps/templates/user_table.html:136
diff --git a/cps/translations/fi/LC_MESSAGES/messages.po b/cps/translations/fi/LC_MESSAGES/messages.po
index 2bf8aad5..aaf99c6b 100644
--- a/cps/translations/fi/LC_MESSAGES/messages.po
+++ b/cps/translations/fi/LC_MESSAGES/messages.po
@@ -284,7 +284,7 @@ msgid "Add new user"
msgstr "Lisää uusi käyttäjä"
#: cps/admin.py:1268 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
+msgid "Edit Email Server Settings"
msgstr "Muuta SMTP asetuksia"
#: cps/admin.py:1287
@@ -297,7 +297,7 @@ msgstr ""
#: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
#, python-format
-msgid "Database error: %(error)s."
+msgid "Oops! Database Error: %(error)s."
msgstr ""
#: cps/admin.py:1316
@@ -315,7 +315,7 @@ msgid "Please configure your e-mail address first..."
msgstr ""
#: cps/admin.py:1323
-msgid "E-mail server settings updated"
+msgid "Email Server Settings updated"
msgstr "Sähköpostipalvelimen tiedot päivitetty"
#: cps/admin.py:1346 cps/templates/admin.html:191
@@ -336,7 +336,7 @@ msgstr ""
#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
#: cps/web.py:1320
-msgid "An unknown error occurred. Please try again later."
+msgid "Oops! An unknown error occurred. Please try again later."
msgstr "Tapahtui tuntematon virhe. Yritä myöhemmin uudelleen."
#: cps/admin.py:1386
@@ -354,7 +354,7 @@ msgid "Password for user %(user)s reset"
msgstr "Käyttäjän %(user)s salasana palautettu"
#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first..."
+msgid "Please configure the SMTP mail settings first."
msgstr "Ole hyvä ja aseta SMTP postiasetukset ensin..."
#: cps/admin.py:1445
@@ -470,7 +470,7 @@ msgid "Database Configuration"
msgstr "Ominaisuuksien asetukset"
#: cps/admin.py:1871 cps/web.py:1233
-msgid "Please fill out all fields!"
+msgid "Oops! Please complete all fields."
msgstr "Ole hyvä ja täytä kaikki kentät!"
#: cps/admin.py:1879
@@ -484,7 +484,7 @@ msgstr "Käyttäjä '%(user)s' lisätty"
#: cps/admin.py:1902
#, fuzzy
-msgid "Found an existing account for this e-mail address or name."
+msgid "Oops! An account already exists for this Email. or name."
msgstr "Tälle sähköpostiosoitteelle tai tunnukselle löytyi jo tili."
#: cps/admin.py:1932
@@ -501,7 +501,7 @@ msgid "No admin user remaining, can't delete user"
msgstr "Pääkäyttäjiä ei jää jäljelle, käyttäjää ei voi poistaa"
#: cps/admin.py:1992 cps/web.py:1371
-msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
+msgid "Email can't be empty and has to be a valid Email"
msgstr ""
#: cps/admin.py:2018
@@ -531,7 +531,7 @@ msgstr "Ei mitään"
#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
#: cps/web.py:1504 cps/web.py:1549
-msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
msgstr "Virhe eKirjan avaamisessa. Tiedostoa ei ole tai se ei ole saatavilla:"
#: cps/editbooks.py:154 cps/editbooks.py:1221
@@ -663,7 +663,7 @@ msgstr "%(format)s ei löydy: %(fn)s"
#: cps/helper.py:97 cps/helper.py:226 cps/templates/detail.html:42
#: cps/templates/detail.html:46
#, fuzzy
-msgid "Send to E-Reader"
+msgid "Send to eReader"
msgstr "Lähetä Kindleen"
#: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
@@ -751,7 +751,7 @@ msgstr "Kirjan polkua %(path)s ei löytynyt Google Drivesta"
#: cps/helper.py:644 cps/web.py:1416
#, fuzzy
-msgid "Found an existing account for this e-mail address"
+msgid "Oops! An account already exists for this Email."
msgstr "Tälle sähköpostiosoitteelle läytyi jo käyttäjätunnus."
#: cps/helper.py:652
@@ -830,7 +830,7 @@ msgstr "Rekisteröi tuottajalle %(provider)s"
#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "olet nyt kirjautunut tunnuksella: \"%(nickname)s\""
#: cps/oauth_bb.py:148
@@ -1327,20 +1327,20 @@ msgstr "Tiedostomuotolistaus"
#: cps/web.py:1203
#, python-format
-msgid "Book successfully queued for sending to %(kindlemail)s"
+msgid "Success! Book queued for sending to %(eReadermail)s"
msgstr "Kirja lisätty onnistuneeksi lähetettäväksi osoitteeseen %(kindlemail)s"
#: cps/web.py:1207
#, python-format
-msgid "Oops! There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending book: %(res)s"
msgstr "Kirjan: %(res)s lähettämisessa tapahtui virhe"
#: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle E-mail Address."
+msgid "Please update your profile with a valid Send to Kindle Email Address."
msgstr "Ole hyvä ja aseta Kindle sähköpostiosoite ensin..."
#: cps/web.py:1226
-msgid "E-Mail server is not configured, please contact your administrator!"
+msgid "Oops! Email server is not configured, please contact your administrator."
msgstr ""
#: cps/templates/layout.html:68 cps/templates/layout.html:102
@@ -1351,51 +1351,51 @@ msgid "Register"
msgstr "Rekisteröi"
#: cps/web.py:1262
-msgid "Your e-mail is not allowed to register"
+msgid "Oops! Your Email is not allowed."
msgstr "Sähköpostiosoitteellasi ei ole sallittua rekisteröityä"
#: cps/web.py:1266
-msgid "Confirmation e-mail was send to your e-mail account."
+msgid "Success! Confirmation Email has been sent."
msgstr "Vahvistusviesti on lähetetty sähköpostiosoitteeseesi."
#: cps/web.py:1280
-msgid "Cannot activate LDAP authentication"
+msgid "Oops! Cannot activate LDAP authentication"
msgstr "LDAP autnetikoinnin aktivointi ei onnistu"
#: cps/web.py:1299
#, python-format
-msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
+msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
msgstr ""
#: cps/web.py:1305
#, python-format
-msgid "Could not login: %(message)s"
+msgid "Oops! Login Failed: %(message)s"
msgstr ""
#: cps/web.py:1309 cps/web.py:1334
-msgid "Wrong Username or Password"
+msgid "Oops! Invalid Username or Password."
msgstr "Väärä käyttäjätunnus tai salasana"
#: cps/web.py:1316
-msgid "New Password was send to your email address"
+msgid "Success! New Password was sent to your Email."
msgstr ""
#: cps/web.py:1322
-msgid "Please enter valid username to reset password"
+msgid "Oops! Please enter a valid username to reset password"
msgstr ""
#: cps/web.py:1329
#, python-format
-msgid "You are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "olet kirjautunut tunnuksella: '%(nickname)s'"
#: cps/web.py:1396 cps/web.py:1445
#, python-format
-msgid "%(name)s's profile"
+msgid "%(name)s's Profile"
msgstr "%(name)sn profiili"
#: cps/web.py:1412
-msgid "Profile updated"
+msgid Success! Profile updated"
msgstr "Profiili päivitetty"
#: cps/services/gmail.py:58
@@ -1488,12 +1488,12 @@ msgstr "Lempinimi"
#: cps/templates/admin.html:14 cps/templates/register.html:14
#: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
-msgid "E-mail Address"
+msgid "Email"
msgstr "Sähköposti"
#: cps/templates/admin.html:15 cps/templates/user_edit.html:28
#, fuzzy
-msgid "Send to E-Reader E-mail Address"
+msgid "Send to eReader Email"
msgstr "Kindle"
#: cps/templates/admin.html:17 cps/templates/layout.html:91
@@ -1541,7 +1541,7 @@ msgid "Import LDAP Users"
msgstr ""
#: cps/templates/admin.html:62
-msgid "E-mail Server Settings"
+msgid "Email Server Settings"
msgstr "SMTP sähköpostipalvelimen asetukset"
#: cps/templates/admin.html:67 cps/templates/email_edit.html:31
@@ -1562,11 +1562,11 @@ msgstr "SMTP tunnus"
#: cps/templates/admin.html:83 cps/templates/admin.html:94
#: cps/templates/email_edit.html:55
-msgid "From E-mail"
+msgid "From Email"
msgstr "Lähettäjän sähköposti"
#: cps/templates/admin.html:90
-msgid "E-Mail Service"
+msgid "EMail Service"
msgstr ""
#: cps/templates/admin.html:91
@@ -1639,15 +1639,15 @@ msgid "Scheduled Tasks"
msgstr ""
#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
-msgid "Time at which tasks start to run"
+msgid "Start Time"
msgstr ""
#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
-msgid "Maximum tasks duration"
+msgid "Maximum Duration"
msgstr ""
#: cps/templates/admin.html:178
-msgid "Generate book cover thumbnails"
+msgid "Generate Thumbnails"
msgstr ""
#: cps/templates/admin.html:182
@@ -1655,11 +1655,11 @@ msgid "Generate series cover thumbnails"
msgstr ""
#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
-msgid "Reconnect to Calibre Library"
+msgid "Reconnect Calibre Database"
msgstr ""
#: cps/templates/admin.html:193
-msgid "Refresh Thumbnail Cover Cache"
+msgid "Refresh Thumbnail Cache"
msgstr ""
#: cps/templates/admin.html:199
@@ -1699,7 +1699,7 @@ msgid "Details"
msgstr "Yksityiskohdat"
#: cps/templates/admin.html:227
-msgid "Current version"
+msgid "Current Version"
msgstr "Nykyinen versio"
#: cps/templates/admin.html:234
@@ -2175,7 +2175,7 @@ msgid "Enable Public Registration"
msgstr "Salli julkinen rekisteröinti"
#: cps/templates/config_edit.html:127
-msgid "Use E-Mail as Username"
+msgid "Use Email as Username"
msgstr ""
#: cps/templates/config_edit.html:132
@@ -2530,7 +2530,7 @@ msgid "Edit Metadata"
msgstr "Muokkaa metadataa"
#: cps/templates/email_edit.html:13
-msgid "Choose Server Type"
+msgid "Email Account Type"
msgstr ""
#: cps/templates/email_edit.html:15
@@ -3063,7 +3063,7 @@ msgid "Choose a username"
msgstr "Valitse käyttäjänimi"
#: cps/templates/register.html:15
-msgid "Your email address"
+msgid "Your Email"
msgstr "Sähköpostiosoitteesi"
#: cps/templates/remote_login.html:5
@@ -3083,7 +3083,7 @@ msgid "This verification link will expire in 10 minutes."
msgstr "Linkki vanhenee 10 minuutissa."
#: cps/templates/schedule_edit.html:29
-msgid "Generate Book Cover Thumbnails"
+msgid "Generate Thumbnails"
msgstr ""
#: cps/templates/schedule_edit.html:33
@@ -3319,12 +3319,12 @@ msgstr "Valitse käyttäjänimi"
#: cps/templates/user_table.html:135
#, fuzzy
-msgid "Enter E-mail Address"
+msgid "Enter Email Address"
msgstr "Sähköpostiosoitteesi"
#: cps/templates/user_table.html:136
#, fuzzy
-msgid "Enter E-Reader E-mail Address"
+msgid "Enter E-Reader Email Address"
msgstr "Kindle"
#: cps/templates/user_table.html:136
diff --git a/cps/translations/fr/LC_MESSAGES/messages.po b/cps/translations/fr/LC_MESSAGES/messages.po
index 6bf12169..d3a493ba 100644
--- a/cps/translations/fr/LC_MESSAGES/messages.po
+++ b/cps/translations/fr/LC_MESSAGES/messages.po
@@ -300,7 +300,7 @@ msgid "Add new user"
msgstr "Ajouter un nouvel utilisateur"
#: cps/admin.py:1268 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
+msgid "Edit Email Server Settings"
msgstr "Modifier les paramètres du serveur de courriels"
#: cps/admin.py:1287
@@ -313,7 +313,7 @@ msgstr "La vérification du compte Gmail réussie"
#: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
#, python-format
-msgid "Database error: %(error)s."
+msgid "Oops! Database Error: %(error)s."
msgstr "Erreur de la base de données: %(error)s."
#: cps/admin.py:1316
@@ -331,7 +331,7 @@ msgid "Please configure your e-mail address first..."
msgstr "Veuillez d'abord configurer votre adresse de courriel..."
#: cps/admin.py:1323
-msgid "E-mail server settings updated"
+msgid "Email Server Settings updated"
msgstr "Les paramètres du serveur de courriels ont été mis à jour"
#: cps/admin.py:1346 cps/templates/admin.html:191
@@ -352,7 +352,7 @@ msgstr ""
#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
#: cps/web.py:1320
-msgid "An unknown error occurred. Please try again later."
+msgid "Oops! An unknown error occurred. Please try again later."
msgstr "Une erreur inconnue est survenue. Veuillez réessayer plus tard."
#: cps/admin.py:1386
@@ -370,7 +370,7 @@ msgid "Password for user %(user)s reset"
msgstr "Le mot de passe de l’utilisateur %(user)s a été réinitialisé"
#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first..."
+msgid "Please configure the SMTP mail settings first."
msgstr "Veuillez configurer les paramètres SMTP au préalable..."
#: cps/admin.py:1445
@@ -488,7 +488,7 @@ msgid "Database Configuration"
msgstr "Configuration des options"
#: cps/admin.py:1871 cps/web.py:1233
-msgid "Please fill out all fields!"
+msgid "Oops! Please complete all fields."
msgstr "Veuillez compléter tous les champs !"
#: cps/admin.py:1879
@@ -502,7 +502,7 @@ msgstr "Utilisateur '%(user)s' créé"
#: cps/admin.py:1902
#, fuzzy
-msgid "Found an existing account for this e-mail address or name."
+msgid "Oops! An account already exists for this Email. or name."
msgstr "Un compte existant a été trouvé pour cette adresse de courriel ou pour ce surnom."
#: cps/admin.py:1932
@@ -519,7 +519,7 @@ msgid "No admin user remaining, can't delete user"
msgstr "Aucun utilisateur admin restant, impossible de supprimer l’utilisateur"
#: cps/admin.py:1992 cps/web.py:1371
-msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
+msgid "Email can't be empty and has to be a valid Email"
msgstr ""
#: cps/admin.py:2018
@@ -549,7 +549,7 @@ msgstr "Aucun"
#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
#: cps/web.py:1504 cps/web.py:1549
-msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
msgstr "Erreur d'ouverture du livre numérique. Le fichier n'existe pas ou n'est pas accessible"
#: cps/editbooks.py:154 cps/editbooks.py:1221
@@ -681,7 +681,7 @@ msgstr "%(format)s introuvable : %(fn)s"
#: cps/helper.py:97 cps/helper.py:226 cps/templates/detail.html:42
#: cps/templates/detail.html:46
#, fuzzy
-msgid "Send to E-Reader"
+msgid "Send to eReader"
msgstr "Envoyer vers Kindle"
#: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
@@ -769,7 +769,7 @@ msgstr "Le chemin du livre %(path)s n'a pas été trouvé dans Google Drive"
#: cps/helper.py:644 cps/web.py:1416
#, fuzzy
-msgid "Found an existing account for this e-mail address"
+msgid "Oops! An account already exists for this Email."
msgstr "Un compte existant a été trouvé pour cette adresse de courriel."
#: cps/helper.py:652
@@ -850,7 +850,7 @@ msgstr "Enregistrer avec %(provider)s"
#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "vous êtes maintenant connecté comme : '%(nickname)s'"
#: cps/oauth_bb.py:148
@@ -1347,20 +1347,20 @@ msgstr "Liste de formats de fichiers"
#: cps/web.py:1203
#, python-format
-msgid "Book successfully queued for sending to %(kindlemail)s"
+msgid "Success! Book queued for sending to %(eReadermail)s"
msgstr "Le livre a été mis en file de traitement avec succès pour un envoi vers %(kindlemail)s"
#: cps/web.py:1207
#, python-format
-msgid "Oops! There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending book: %(res)s"
msgstr "Il y a eu une erreur en envoyant ce livre : %(res)s"
#: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle E-mail Address."
+msgid "Please update your profile with a valid Send to Kindle Email Address."
msgstr "Veuillez mettre à jour votre profil avec une adresse de courriel Kindle valide."
#: cps/web.py:1226
-msgid "E-Mail server is not configured, please contact your administrator!"
+msgid "Oops! Email server is not configured, please contact your administrator."
msgstr "Le serveur de courriel n'est pas configuré, veuillez contacter votre administrateur!"
#: cps/templates/layout.html:68 cps/templates/layout.html:102
@@ -1371,51 +1371,51 @@ msgid "Register"
msgstr "Créer un compte"
#: cps/web.py:1262
-msgid "Your e-mail is not allowed to register"
+msgid "Oops! Your Email is not allowed."
msgstr "Votre adresse de courriel n’est pas autorisé pour une inscription"
#: cps/web.py:1266
-msgid "Confirmation e-mail was send to your e-mail account."
+msgid "Success! Confirmation Email has been sent."
msgstr "Le courriel de confirmation a été envoyé à votre adresse."
#: cps/web.py:1280
-msgid "Cannot activate LDAP authentication"
+msgid "Oops! Cannot activate LDAP authentication"
msgstr "Impossible d’activer l’authentification LDAP"
#: cps/web.py:1299
#, python-format
-msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
+msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
msgstr "Connexion de secours comme: '%(nickname)s', le serveur LDAP est indisponible, ou l'utilisateur est inconnu"
#: cps/web.py:1305
#, python-format
-msgid "Could not login: %(message)s"
+msgid "Oops! Login Failed: %(message)s"
msgstr "Impossible de se connecter: %(message)s"
#: cps/web.py:1309 cps/web.py:1334
-msgid "Wrong Username or Password"
+msgid "Oops! Invalid Username or Password."
msgstr "Mauvais nom d'utilisateur ou mot de passe"
#: cps/web.py:1316
-msgid "New Password was send to your email address"
+msgid "Success! New Password was sent to your Email."
msgstr "Le nouveau mot de passe a été envoyé vers votre adresse de courriel"
#: cps/web.py:1322
-msgid "Please enter valid username to reset password"
+msgid "Oops! Please enter a valid username to reset password"
msgstr "Veuillez entrer un nom d'utilisateur valide pour réinitialiser le mot de passe"
#: cps/web.py:1329
#, python-format
-msgid "You are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "Vous êtes maintenant connecté en tant que : ‘%(nickname)s’"
#: cps/web.py:1396 cps/web.py:1445
#, python-format
-msgid "%(name)s's profile"
+msgid "%(name)s's Profile"
msgstr "Profil de %(name)s"
#: cps/web.py:1412
-msgid "Profile updated"
+msgid Success! Profile updated"
msgstr "Profil mis à jour"
#: cps/services/gmail.py:58
@@ -1508,12 +1508,12 @@ msgstr "Nom d'utilisateur"
#: cps/templates/admin.html:14 cps/templates/register.html:14
#: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
-msgid "E-mail Address"
+msgid "Email"
msgstr "Adresse de courriel"
#: cps/templates/admin.html:15 cps/templates/user_edit.html:28
#, fuzzy
-msgid "Send to E-Reader E-mail Address"
+msgid "Send to eReader Email"
msgstr "Envoyer vers une adresse de courriel Kindle"
#: cps/templates/admin.html:17 cps/templates/layout.html:91
@@ -1561,7 +1561,7 @@ msgid "Import LDAP Users"
msgstr "Importer des utilisateurs LDAP"
#: cps/templates/admin.html:62
-msgid "E-mail Server Settings"
+msgid "Email Server Settings"
msgstr "Paramètres du serveur de courriels"
#: cps/templates/admin.html:67 cps/templates/email_edit.html:31
@@ -1582,11 +1582,11 @@ msgstr "Compte utilisateur SMTP"
#: cps/templates/admin.html:83 cps/templates/admin.html:94
#: cps/templates/email_edit.html:55
-msgid "From E-mail"
+msgid "From Email"
msgstr "Expéditeur des courriels"
#: cps/templates/admin.html:90
-msgid "E-Mail Service"
+msgid "EMail Service"
msgstr "Service courriel"
#: cps/templates/admin.html:91
@@ -1659,15 +1659,15 @@ msgid "Scheduled Tasks"
msgstr ""
#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
-msgid "Time at which tasks start to run"
+msgid "Start Time"
msgstr ""
#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
-msgid "Maximum tasks duration"
+msgid "Maximum Duration"
msgstr ""
#: cps/templates/admin.html:178
-msgid "Generate book cover thumbnails"
+msgid "Generate Thumbnails"
msgstr ""
#: cps/templates/admin.html:182
@@ -1675,11 +1675,11 @@ msgid "Generate series cover thumbnails"
msgstr ""
#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
-msgid "Reconnect to Calibre Library"
+msgid "Reconnect Calibre Database"
msgstr ""
#: cps/templates/admin.html:193
-msgid "Refresh Thumbnail Cover Cache"
+msgid "Refresh Thumbnail Cache"
msgstr ""
#: cps/templates/admin.html:199
@@ -1719,7 +1719,7 @@ msgid "Details"
msgstr "Détails"
#: cps/templates/admin.html:227
-msgid "Current version"
+msgid "Current Version"
msgstr "Version actuelle"
#: cps/templates/admin.html:234
@@ -2196,7 +2196,7 @@ msgid "Enable Public Registration"
msgstr "Autoriser l’inscription publique"
#: cps/templates/config_edit.html:127
-msgid "Use E-Mail as Username"
+msgid "Use Email as Username"
msgstr "Utiliser l'e-mail comme nom d'utilisateur"
#: cps/templates/config_edit.html:132
@@ -2551,7 +2551,7 @@ msgid "Edit Metadata"
msgstr "Éditer les métadonnées"
#: cps/templates/email_edit.html:13
-msgid "Choose Server Type"
+msgid "Email Account Type"
msgstr "Choisissez le type de serveur"
#: cps/templates/email_edit.html:15
@@ -3086,7 +3086,7 @@ msgid "Choose a username"
msgstr "Choisissez un nom d'utilisateur"
#: cps/templates/register.html:15
-msgid "Your email address"
+msgid "Your Email"
msgstr "Votre adresse de courriel"
#: cps/templates/remote_login.html:5
@@ -3106,7 +3106,7 @@ msgid "This verification link will expire in 10 minutes."
msgstr "Le lien expirera après 10 minutes."
#: cps/templates/schedule_edit.html:29
-msgid "Generate Book Cover Thumbnails"
+msgid "Generate Thumbnails"
msgstr ""
#: cps/templates/schedule_edit.html:33
@@ -3342,12 +3342,12 @@ msgstr "Choisissez un nom d'utilisateur"
#: cps/templates/user_table.html:135
#, fuzzy
-msgid "Enter E-mail Address"
+msgid "Enter Email Address"
msgstr "Votre adresse de courriel"
#: cps/templates/user_table.html:136
#, fuzzy
-msgid "Enter E-Reader E-mail Address"
+msgid "Enter E-Reader Email Address"
msgstr "Envoyer vers une adresse de courriel Kindle"
#: cps/templates/user_table.html:136
diff --git a/cps/translations/gl/LC_MESSAGES/messages.po b/cps/translations/gl/LC_MESSAGES/messages.po
index 463b33d5..119d43a6 100644
--- a/cps/translations/gl/LC_MESSAGES/messages.po
+++ b/cps/translations/gl/LC_MESSAGES/messages.po
@@ -277,7 +277,7 @@ msgid "Add new user"
msgstr "Engadir un usuario novo"
#: cps/admin.py:1268 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
+msgid "Edit Email Server Settings"
msgstr "Cambiar os parámetros do correo"
#: cps/admin.py:1287
@@ -290,7 +290,7 @@ msgstr "Verificación da conta de Gmail exitosa"
#: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
#, python-format
-msgid "Database error: %(error)s."
+msgid "Oops! Database Error: %(error)s."
msgstr "Error na base de datos: %(error)s."
#: cps/admin.py:1316
@@ -308,7 +308,7 @@ msgid "Please configure your e-mail address first..."
msgstr "Por favor, configure o seu correo electrónico primeiro..."
#: cps/admin.py:1323
-msgid "E-mail server settings updated"
+msgid "Email Server Settings updated"
msgstr "Actualizáronse os axustes do servidor de correo electrónico"
#: cps/admin.py:1346 cps/templates/admin.html:191
@@ -329,7 +329,7 @@ msgstr "Actualizouse a configuración das tarefas programadas"
#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
#: cps/web.py:1320
-msgid "An unknown error occurred. Please try again later."
+msgid "Oops! An unknown error occurred. Please try again later."
msgstr "Sucedeu un erro descoñecido. Por favor volva a intentalo máis tarde."
#: cps/admin.py:1386
@@ -347,7 +347,7 @@ msgid "Password for user %(user)s reset"
msgstr "Reiniciada a contrasinal para o usuario %(user)s"
#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first..."
+msgid "Please configure the SMTP mail settings first."
msgstr "Configura primeiro os parámetros do servidor SMTP..."
#: cps/admin.py:1445
@@ -461,7 +461,7 @@ msgid "Database Configuration"
msgstr "Configuración da base de datos"
#: cps/admin.py:1871 cps/web.py:1233
-msgid "Please fill out all fields!"
+msgid "Oops! Please complete all fields."
msgstr "Por favor, cubra todos os campos!"
#: cps/admin.py:1879
@@ -474,7 +474,7 @@ msgid "User '%(user)s' created"
msgstr "Usuario '%(user)s' creado"
#: cps/admin.py:1902
-msgid "Found an existing account for this e-mail address or name."
+msgid "Oops! An account already exists for this Email. or name."
msgstr "Atopada unha conta existente para este correo electrónico ou nome de usuario."
#: cps/admin.py:1932
@@ -491,7 +491,7 @@ msgid "No admin user remaining, can't delete user"
msgstr "Non queda ningún usuario administrador, non se pode borrar ao usuario"
#: cps/admin.py:1992 cps/web.py:1371
-msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
+msgid "Email can't be empty and has to be a valid Email"
msgstr ""
#: cps/admin.py:2018
@@ -521,7 +521,7 @@ msgstr "Ningún"
#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
#: cps/web.py:1504 cps/web.py:1549
-msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
msgstr "oh, oh, o libro seleccionado non está disponible. O arquivo non existe ou non está accesible"
#: cps/editbooks.py:154 cps/editbooks.py:1221
@@ -652,7 +652,7 @@ msgstr "%(format)s non atopado: %(fn)s"
#: cps/helper.py:97 cps/helper.py:226 cps/templates/detail.html:42
#: cps/templates/detail.html:46
-msgid "Send to E-Reader"
+msgid "Send to eReader"
msgstr "Enviar ao Kindle"
#: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
@@ -739,7 +739,7 @@ msgid "Book path %(path)s not found on Google Drive"
msgstr "A ruta %(path)s do libro non se atopou en Google Drive"
#: cps/helper.py:644 cps/web.py:1416
-msgid "Found an existing account for this e-mail address"
+msgid "Oops! An account already exists for this Email."
msgstr "Atopada unha conta existente para ese enderezo de correo electrónico"
#: cps/helper.py:652
@@ -818,7 +818,7 @@ msgstr "Rexistrado con %(provider)s"
#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "Iniciou sesión como : '%(nickname)s'"
#: cps/oauth_bb.py:148
@@ -1312,20 +1312,20 @@ msgstr "Lista de formatos"
#: cps/web.py:1203
#, python-format
-msgid "Book successfully queued for sending to %(kindlemail)s"
+msgid "Success! Book queued for sending to %(eReadermail)s"
msgstr "Libro posto na cola de envío a %(kindlemail)s"
#: cps/web.py:1207
#, python-format
-msgid "Oops! There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending book: %(res)s"
msgstr "Oh, oh! Houbo un erro no envío do libro: %(res)s"
#: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle E-mail Address."
+msgid "Please update your profile with a valid Send to Kindle Email Address."
msgstr "Por favor actualiza o teu perfil co enderezo de correo do teu kindle..."
#: cps/web.py:1226
-msgid "E-Mail server is not configured, please contact your administrator!"
+msgid "Oops! Email server is not configured, please contact your administrator."
msgstr "O servidor de correo non está configurado, por favor, avisa ao teu administrador!"
#: cps/templates/layout.html:68 cps/templates/layout.html:102
@@ -1336,51 +1336,51 @@ msgid "Register"
msgstr "Rexistro"
#: cps/web.py:1262
-msgid "Your e-mail is not allowed to register"
+msgid "Oops! Your Email is not allowed."
msgstr "O seu correo electrónico non está permitido para rexistrarse"
#: cps/web.py:1266
-msgid "Confirmation e-mail was send to your e-mail account."
+msgid "Success! Confirmation Email has been sent."
msgstr "Mandouse un correo electrónico de verificación á súa conta de correo."
#: cps/web.py:1280
-msgid "Cannot activate LDAP authentication"
+msgid "Oops! Cannot activate LDAP authentication"
msgstr "Non se pode activar a autenticación LDAP"
#: cps/web.py:1299
#, python-format
-msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
+msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
msgstr "Fallback login como: '%(nickname)s', non se pode acceder ao servidor LDAP ou usuario descoñecido"
#: cps/web.py:1305
#, python-format
-msgid "Could not login: %(message)s"
+msgid "Oops! Login Failed: %(message)s"
msgstr "Non se puido entrar: %(message)s"
#: cps/web.py:1309 cps/web.py:1334
-msgid "Wrong Username or Password"
+msgid "Oops! Invalid Username or Password."
msgstr "Usuario ou contrasinal no válido"
#: cps/web.py:1316
-msgid "New Password was send to your email address"
+msgid "Success! New Password was sent to your Email."
msgstr "Unha nova contrasinal enviouse ao seu enderezo de correo electrónico"
#: cps/web.py:1322
-msgid "Please enter valid username to reset password"
+msgid "Oops! Please enter a valid username to reset password"
msgstr "Por favor, introduce un usuario válido para restablecer a contrasinal"
#: cps/web.py:1329
#, python-format
-msgid "You are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "Agora estás conectado como: '%(nickname)s'"
#: cps/web.py:1396 cps/web.py:1445
#, python-format
-msgid "%(name)s's profile"
+msgid "%(name)s's Profile"
msgstr "Perfil de %(name)s"
#: cps/web.py:1412
-msgid "Profile updated"
+msgid Success! Profile updated"
msgstr "Perfil actualizado"
#: cps/services/gmail.py:58
@@ -1473,11 +1473,11 @@ msgstr "Nome de usuario"
#: cps/templates/admin.html:14 cps/templates/register.html:14
#: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
-msgid "E-mail Address"
+msgid "Email"
msgstr "Enderezo de correo electrónico"
#: cps/templates/admin.html:15 cps/templates/user_edit.html:28
-msgid "Send to E-Reader E-mail Address"
+msgid "Send to eReader Email"
msgstr "Enviar ao enderezo de correo electrónico do Kindle"
#: cps/templates/admin.html:17 cps/templates/layout.html:91
@@ -1525,7 +1525,7 @@ msgid "Import LDAP Users"
msgstr "Importar usuarios LDAP"
#: cps/templates/admin.html:62
-msgid "E-mail Server Settings"
+msgid "Email Server Settings"
msgstr "Axustes do servidor de correo electrónico"
#: cps/templates/admin.html:67 cps/templates/email_edit.html:31
@@ -1546,11 +1546,11 @@ msgstr "Login SMTP"
#: cps/templates/admin.html:83 cps/templates/admin.html:94
#: cps/templates/email_edit.html:55
-msgid "From E-mail"
+msgid "From Email"
msgstr "Dende o correo electrónico"
#: cps/templates/admin.html:90
-msgid "E-Mail Service"
+msgid "EMail Service"
msgstr "Servizo de correo electrónico"
#: cps/templates/admin.html:91
@@ -1622,15 +1622,15 @@ msgid "Scheduled Tasks"
msgstr "Tarefas programadas"
#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
-msgid "Time at which tasks start to run"
+msgid "Start Time"
msgstr "Hora de comezo das tarefas"
#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
-msgid "Maximum tasks duration"
+msgid "Maximum Duration"
msgstr "Duración máxima das tarefas"
#: cps/templates/admin.html:178
-msgid "Generate book cover thumbnails"
+msgid "Generate Thumbnails"
msgstr "Xerar as miniaturas das cubertas dos libros"
#: cps/templates/admin.html:182
@@ -1638,11 +1638,11 @@ msgid "Generate series cover thumbnails"
msgstr "Xerar as miniaturas das cubertas das series"
#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
-msgid "Reconnect to Calibre Library"
+msgid "Reconnect Calibre Database"
msgstr "Reconectar á librería de Calibre"
#: cps/templates/admin.html:193
-msgid "Refresh Thumbnail Cover Cache"
+msgid "Refresh Thumbnail Cache"
msgstr "Refrescar a caché de miniaturas das cubertas"
#: cps/templates/admin.html:199
@@ -1682,7 +1682,7 @@ msgid "Details"
msgstr "Detalles"
#: cps/templates/admin.html:227
-msgid "Current version"
+msgid "Current Version"
msgstr "Versión actual"
#: cps/templates/admin.html:234
@@ -2155,7 +2155,7 @@ msgid "Enable Public Registration"
msgstr "Permitir rexistro público"
#: cps/templates/config_edit.html:127
-msgid "Use E-Mail as Username"
+msgid "Use Email as Username"
msgstr "Utilizar correo electrónico como nome de usuario"
#: cps/templates/config_edit.html:132
@@ -2508,7 +2508,7 @@ msgid "Edit Metadata"
msgstr "Editar metadatos"
#: cps/templates/email_edit.html:13
-msgid "Choose Server Type"
+msgid "Email Account Type"
msgstr "Escolle tipo de servidor"
#: cps/templates/email_edit.html:15
@@ -3034,7 +3034,7 @@ msgid "Choose a username"
msgstr "Escolla un nome de usuario"
#: cps/templates/register.html:15
-msgid "Your email address"
+msgid "Your Email"
msgstr "O teu enderezo de correo"
#: cps/templates/remote_login.html:5
@@ -3054,7 +3054,7 @@ msgid "This verification link will expire in 10 minutes."
msgstr "O enlace de verificación caducará despois de 10 minutos."
#: cps/templates/schedule_edit.html:29
-msgid "Generate Book Cover Thumbnails"
+msgid "Generate Thumbnails"
msgstr "Xerar miniaturas de cubertas de libros"
#: cps/templates/schedule_edit.html:33
@@ -3286,11 +3286,11 @@ msgid "Enter Username"
msgstr "Introduce o nome do usuario"
#: cps/templates/user_table.html:135
-msgid "Enter E-mail Address"
+msgid "Enter Email Address"
msgstr "Introduce o enderezo de correo electrónico"
#: cps/templates/user_table.html:136
-msgid "Enter E-Reader E-mail Address"
+msgid "Enter E-Reader Email Address"
msgstr "Introduce o enderezo de correo electrónico Kindle"
#: cps/templates/user_table.html:136
diff --git a/cps/translations/hu/LC_MESSAGES/messages.po b/cps/translations/hu/LC_MESSAGES/messages.po
index 79010fb8..ac2c89c1 100644
--- a/cps/translations/hu/LC_MESSAGES/messages.po
+++ b/cps/translations/hu/LC_MESSAGES/messages.po
@@ -284,7 +284,7 @@ msgid "Add new user"
msgstr "Új felhasználó hozzáadása"
#: cps/admin.py:1268 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
+msgid "Edit Email Server Settings"
msgstr "SMTP beállítások változtatása"
#: cps/admin.py:1287
@@ -297,7 +297,7 @@ msgstr ""
#: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
#, python-format
-msgid "Database error: %(error)s."
+msgid "Oops! Database Error: %(error)s."
msgstr ""
#: cps/admin.py:1316
@@ -315,7 +315,7 @@ msgid "Please configure your e-mail address first..."
msgstr ""
#: cps/admin.py:1323
-msgid "E-mail server settings updated"
+msgid "Email Server Settings updated"
msgstr "Az e-mail kiszolgáló beállításai frissítve."
#: cps/admin.py:1346 cps/templates/admin.html:191
@@ -336,7 +336,7 @@ msgstr ""
#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
#: cps/web.py:1320
-msgid "An unknown error occurred. Please try again later."
+msgid "Oops! An unknown error occurred. Please try again later."
msgstr "Ismeretlen hiba történt. Próbáld újra később!"
#: cps/admin.py:1386
@@ -354,7 +354,7 @@ msgid "Password for user %(user)s reset"
msgstr "A(z) %(user)s felhasználó jelszavának alaphelyzetbe állítása"
#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first..."
+msgid "Please configure the SMTP mail settings first."
msgstr "Először be kell állítani az SMTP levelező beállításokat..."
#: cps/admin.py:1445
@@ -470,7 +470,7 @@ msgid "Database Configuration"
msgstr "Funkciók beállítása"
#: cps/admin.py:1871 cps/web.py:1233
-msgid "Please fill out all fields!"
+msgid "Oops! Please complete all fields."
msgstr "Az összes mezőt ki kell tölteni!"
#: cps/admin.py:1879
@@ -484,7 +484,7 @@ msgstr "A következő felhasználó létrehozva: %(user)s"
#: cps/admin.py:1902
#, fuzzy
-msgid "Found an existing account for this e-mail address or name."
+msgid "Oops! An account already exists for this Email. or name."
msgstr "Már létezik felhasználó ehhez az e-mail címhez vagy felhasználói névhez."
#: cps/admin.py:1932
@@ -501,7 +501,7 @@ msgid "No admin user remaining, can't delete user"
msgstr ""
#: cps/admin.py:1992 cps/web.py:1371
-msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
+msgid "Email can't be empty and has to be a valid Email"
msgstr ""
#: cps/admin.py:2018
@@ -531,7 +531,7 @@ msgstr "Nincs"
#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
#: cps/web.py:1504 cps/web.py:1549
-msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
msgstr "Hiba történt az e-könyv megnyitásakor. A fájl nem létezik vagy nem érhető el:"
#: cps/editbooks.py:154 cps/editbooks.py:1221
@@ -663,7 +663,7 @@ msgstr "%(format)s nem található: %(fn)s"
#: cps/helper.py:97 cps/helper.py:226 cps/templates/detail.html:42
#: cps/templates/detail.html:46
#, fuzzy
-msgid "Send to E-Reader"
+msgid "Send to eReader"
msgstr "Küldés Kindle-re"
#: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
@@ -751,7 +751,7 @@ msgstr "A könyv elérési útja (\"%(path)s\") nem található a Google Drive-o
#: cps/helper.py:644 cps/web.py:1416
#, fuzzy
-msgid "Found an existing account for this e-mail address"
+msgid "Oops! An account already exists for this Email."
msgstr "Már létezik felhasználó ehhez az e-mail címhez."
#: cps/helper.py:652
@@ -830,7 +830,7 @@ msgstr ""
#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "Be vagy jelentkezve mint: %(nickname)s"
#: cps/oauth_bb.py:148
@@ -1327,20 +1327,20 @@ msgstr ""
#: cps/web.py:1203
#, python-format
-msgid "Book successfully queued for sending to %(kindlemail)s"
+msgid "Success! Book queued for sending to %(eReadermail)s"
msgstr "A könyv sikeresen küldésre lett jelölve a következő címre: %(kindlemail)s"
#: cps/web.py:1207
#, python-format
-msgid "Oops! There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending book: %(res)s"
msgstr "Hiba történt a könyv küldésekor: %(res)s"
#: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle E-mail Address."
+msgid "Please update your profile with a valid Send to Kindle Email Address."
msgstr "Először be kell állítani a kindle e-mail címet..."
#: cps/web.py:1226
-msgid "E-Mail server is not configured, please contact your administrator!"
+msgid "Oops! Email server is not configured, please contact your administrator."
msgstr ""
#: cps/templates/layout.html:68 cps/templates/layout.html:102
@@ -1351,51 +1351,51 @@ msgid "Register"
msgstr "Regisztrálás"
#: cps/web.py:1262
-msgid "Your e-mail is not allowed to register"
+msgid "Oops! Your Email is not allowed."
msgstr "Nem engedélyezett a megadott e-mail cím bejegyzése"
#: cps/web.py:1266
-msgid "Confirmation e-mail was send to your e-mail account."
+msgid "Success! Confirmation Email has been sent."
msgstr "Jóváhagyó levél elküldve az email címedre."
#: cps/web.py:1280
-msgid "Cannot activate LDAP authentication"
+msgid "Oops! Cannot activate LDAP authentication"
msgstr ""
#: cps/web.py:1299
#, python-format
-msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
+msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
msgstr ""
#: cps/web.py:1305
#, python-format
-msgid "Could not login: %(message)s"
+msgid "Oops! Login Failed: %(message)s"
msgstr ""
#: cps/web.py:1309 cps/web.py:1334
-msgid "Wrong Username or Password"
+msgid "Oops! Invalid Username or Password."
msgstr "Rossz felhasználó név vagy jelszó!"
#: cps/web.py:1316
-msgid "New Password was send to your email address"
+msgid "Success! New Password was sent to your Email."
msgstr ""
#: cps/web.py:1322
-msgid "Please enter valid username to reset password"
+msgid "Oops! Please enter a valid username to reset password"
msgstr ""
#: cps/web.py:1329
#, python-format
-msgid "You are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr ""
#: cps/web.py:1396 cps/web.py:1445
#, python-format
-msgid "%(name)s's profile"
+msgid "%(name)s's Profile"
msgstr "%(name)s profilja"
#: cps/web.py:1412
-msgid "Profile updated"
+msgid Success! Profile updated"
msgstr "A profil frissítve."
#: cps/services/gmail.py:58
@@ -1488,12 +1488,12 @@ msgstr "Felhasználói név"
#: cps/templates/admin.html:14 cps/templates/register.html:14
#: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
-msgid "E-mail Address"
+msgid "Email"
msgstr "E-mail"
#: cps/templates/admin.html:15 cps/templates/user_edit.html:28
#, fuzzy
-msgid "Send to E-Reader E-mail Address"
+msgid "Send to eReader Email"
msgstr "Kindle"
#: cps/templates/admin.html:17 cps/templates/layout.html:91
@@ -1541,7 +1541,7 @@ msgid "Import LDAP Users"
msgstr ""
#: cps/templates/admin.html:62
-msgid "E-mail Server Settings"
+msgid "Email Server Settings"
msgstr "SMTP e-mail kiszolgáló beállítások"
#: cps/templates/admin.html:67 cps/templates/email_edit.html:31
@@ -1562,11 +1562,11 @@ msgstr "SMTP felhasználó"
#: cps/templates/admin.html:83 cps/templates/admin.html:94
#: cps/templates/email_edit.html:55
-msgid "From E-mail"
+msgid "From Email"
msgstr "Küldő e-mail cím"
#: cps/templates/admin.html:90
-msgid "E-Mail Service"
+msgid "EMail Service"
msgstr ""
#: cps/templates/admin.html:91
@@ -1639,15 +1639,15 @@ msgid "Scheduled Tasks"
msgstr ""
#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
-msgid "Time at which tasks start to run"
+msgid "Start Time"
msgstr ""
#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
-msgid "Maximum tasks duration"
+msgid "Maximum Duration"
msgstr ""
#: cps/templates/admin.html:178
-msgid "Generate book cover thumbnails"
+msgid "Generate Thumbnails"
msgstr ""
#: cps/templates/admin.html:182
@@ -1655,11 +1655,11 @@ msgid "Generate series cover thumbnails"
msgstr ""
#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
-msgid "Reconnect to Calibre Library"
+msgid "Reconnect Calibre Database"
msgstr ""
#: cps/templates/admin.html:193
-msgid "Refresh Thumbnail Cover Cache"
+msgid "Refresh Thumbnail Cache"
msgstr ""
#: cps/templates/admin.html:199
@@ -1699,7 +1699,7 @@ msgid "Details"
msgstr "Részletek"
#: cps/templates/admin.html:227
-msgid "Current version"
+msgid "Current Version"
msgstr "Jelenlegi verzió"
#: cps/templates/admin.html:234
@@ -2175,7 +2175,7 @@ msgid "Enable Public Registration"
msgstr "Nyilvános regisztráció engedélyezése"
#: cps/templates/config_edit.html:127
-msgid "Use E-Mail as Username"
+msgid "Use Email as Username"
msgstr ""
#: cps/templates/config_edit.html:132
@@ -2530,7 +2530,7 @@ msgid "Edit Metadata"
msgstr "Metaadatok szerkesztése"
#: cps/templates/email_edit.html:13
-msgid "Choose Server Type"
+msgid "Email Account Type"
msgstr ""
#: cps/templates/email_edit.html:15
@@ -3059,7 +3059,7 @@ msgid "Choose a username"
msgstr "Válassz egy felhasználónevet"
#: cps/templates/register.html:15
-msgid "Your email address"
+msgid "Your Email"
msgstr "Az e-mail címed"
#: cps/templates/remote_login.html:5
@@ -3079,7 +3079,7 @@ msgid "This verification link will expire in 10 minutes."
msgstr ""
#: cps/templates/schedule_edit.html:29
-msgid "Generate Book Cover Thumbnails"
+msgid "Generate Thumbnails"
msgstr ""
#: cps/templates/schedule_edit.html:33
@@ -3315,12 +3315,12 @@ msgstr "Válassz egy felhasználónevet"
#: cps/templates/user_table.html:135
#, fuzzy
-msgid "Enter E-mail Address"
+msgid "Enter Email Address"
msgstr "Az e-mail címed"
#: cps/templates/user_table.html:136
#, fuzzy
-msgid "Enter E-Reader E-mail Address"
+msgid "Enter E-Reader Email Address"
msgstr "Kindle"
#: cps/templates/user_table.html:136
diff --git a/cps/translations/id/LC_MESSAGES/messages.po b/cps/translations/id/LC_MESSAGES/messages.po
index 8c334988..e9f2698e 100644
--- a/cps/translations/id/LC_MESSAGES/messages.po
+++ b/cps/translations/id/LC_MESSAGES/messages.po
@@ -279,7 +279,7 @@ msgid "Add new user"
msgstr "Tambahkan pengguna baru"
#: cps/admin.py:1268 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
+msgid "Edit Email Server Settings"
msgstr "Edit Pengaturan Server Email"
#: cps/admin.py:1287
@@ -292,7 +292,7 @@ msgstr "Verifikasi Akun Gmail Berhasil"
#: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
#, python-format
-msgid "Database error: %(error)s."
+msgid "Oops! Database Error: %(error)s."
msgstr "Kesalahan basis data: %(error)s"
#: cps/admin.py:1316
@@ -310,7 +310,7 @@ msgid "Please configure your e-mail address first..."
msgstr "Harap atur alamat email Anda terlebih dahulu.."
#: cps/admin.py:1323
-msgid "E-mail server settings updated"
+msgid "Email Server Settings updated"
msgstr "Setelan server email diperbarui"
#: cps/admin.py:1346 cps/templates/admin.html:191
@@ -331,7 +331,7 @@ msgstr "Pengaturan tugas terjadwal diperbarui"
#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
#: cps/web.py:1320
-msgid "An unknown error occurred. Please try again later."
+msgid "Oops! An unknown error occurred. Please try again later."
msgstr "Terjadi kesalahan yang tidak diketahui. Coba lagi nanti."
#: cps/admin.py:1386
@@ -349,7 +349,7 @@ msgid "Password for user %(user)s reset"
msgstr "Kata sandi untuk pengaturan ulang pengguna %(user) "
#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first..."
+msgid "Please configure the SMTP mail settings first."
msgstr "Harap atur pengaturan email SMTP terlebih dahulu..."
#: cps/admin.py:1445
@@ -463,7 +463,7 @@ msgid "Database Configuration"
msgstr "Pengaturan Basis Data"
#: cps/admin.py:1871 cps/web.py:1233
-msgid "Please fill out all fields!"
+msgid "Oops! Please complete all fields."
msgstr "Harap masukkan seluruh isian!"
#: cps/admin.py:1879
@@ -476,7 +476,7 @@ msgid "User '%(user)s' created"
msgstr "Pengguna '%(user)s' telah dibuat"
#: cps/admin.py:1902
-msgid "Found an existing account for this e-mail address or name."
+msgid "Oops! An account already exists for this Email. or name."
msgstr "Ditemukan akun yang ada untuk alamat email atau nama ini."
#: cps/admin.py:1932
@@ -493,7 +493,7 @@ msgid "No admin user remaining, can't delete user"
msgstr "Tidak ada pengguna admin tersisa, tidak dapat menghapus pengguna"
#: cps/admin.py:1992 cps/web.py:1371
-msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
+msgid "Email can't be empty and has to be a valid Email"
msgstr "Alamat email tidak boleh kosong dan harus berupa email yang valid"
#: cps/admin.py:2018
@@ -523,7 +523,7 @@ msgstr "Tidak ada"
#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
#: cps/web.py:1504 cps/web.py:1549
-msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
msgstr "Ups! Judul buku yang dipilih tidak tersedia. Berkas tidak ada atau tidak dapat diakses"
#: cps/editbooks.py:154 cps/editbooks.py:1221
@@ -654,7 +654,7 @@ msgstr "%(format)s tidak ditemukan: %(fn)s"
#: cps/helper.py:97 cps/helper.py:226 cps/templates/detail.html:42
#: cps/templates/detail.html:46
-msgid "Send to E-Reader"
+msgid "Send to eReader"
msgstr "Kirim ke E-Reader"
#: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
@@ -741,7 +741,7 @@ msgid "Book path %(path)s not found on Google Drive"
msgstr "Jalur buku %(path)s tidak ditemukan di Google Drive"
#: cps/helper.py:644 cps/web.py:1416
-msgid "Found an existing account for this e-mail address"
+msgid "Oops! An account already exists for this Email."
msgstr "Ditemukan akun yang ada untuk alamat email ini"
#: cps/helper.py:652
@@ -821,7 +821,7 @@ msgstr "Daftar dengan %(provider)s"
#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "Anda sekarang login sebagai: %(nickname)s"
#: cps/oauth_bb.py:148
@@ -1315,20 +1315,20 @@ msgstr "Daftar format berkas"
#: cps/web.py:1203
#, python-format
-msgid "Book successfully queued for sending to %(kindlemail)s"
+msgid "Success! Book queued for sending to %(eReadermail)s"
msgstr "Buku telah diantrikan untuk dikirim ke %(kindlemail)s"
#: cps/web.py:1207
#, python-format
-msgid "Oops! There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending book: %(res)s"
msgstr "Oops! Terjadi kesalahan saat mengirim buku: %(res)s"
#: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle E-mail Address."
+msgid "Please update your profile with a valid Send to Kindle Email Address."
msgstr "Harap perbarui profil Anda dengan alamat e-mail Kirim ke Kindle yang valid."
#: cps/web.py:1226
-msgid "E-Mail server is not configured, please contact your administrator!"
+msgid "Oops! Email server is not configured, please contact your administrator."
msgstr "Server email belum diatur, silakan hubungi administrator!"
#: cps/templates/layout.html:68 cps/templates/layout.html:102
@@ -1339,51 +1339,51 @@ msgid "Register"
msgstr "Daftar"
#: cps/web.py:1262
-msgid "Your e-mail is not allowed to register"
+msgid "Oops! Your Email is not allowed."
msgstr "Alamat email Anda tidak diizinkan untuk mendaftar"
#: cps/web.py:1266
-msgid "Confirmation e-mail was send to your e-mail account."
+msgid "Success! Confirmation Email has been sent."
msgstr "E-mail konfirmasi telah dikirimkan ke alamat email Anda."
#: cps/web.py:1280
-msgid "Cannot activate LDAP authentication"
+msgid "Oops! Cannot activate LDAP authentication"
msgstr "Tidak dapat mengaktifkan autentikasi LDAP."
#: cps/web.py:1299
#, python-format
-msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
+msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
msgstr "Login Pengganti sebagai: '%(nickname)s', Server LDAP tidak dapat dijangkau, atau pengguna tidak diketahui."
#: cps/web.py:1305
#, python-format
-msgid "Could not login: %(message)s"
+msgid "Oops! Login Failed: %(message)s"
msgstr "Tidak dapat login: %(message)s"
#: cps/web.py:1309 cps/web.py:1334
-msgid "Wrong Username or Password"
+msgid "Oops! Invalid Username or Password."
msgstr "Pengguna atau Kata Sandi salah"
#: cps/web.py:1316
-msgid "New Password was send to your email address"
+msgid "Success! New Password was sent to your Email."
msgstr "Kata Sandi baru telah dikirimkan ke alamat email Anda"
#: cps/web.py:1322
-msgid "Please enter valid username to reset password"
+msgid "Oops! Please enter a valid username to reset password"
msgstr "Harap masukkan pengguna valid untuk mengatur ulang kata sandi"
#: cps/web.py:1329
#, python-format
-msgid "You are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "Anda telah masuk sebagai: '%(nickname)s'"
#: cps/web.py:1396 cps/web.py:1445
#, python-format
-msgid "%(name)s's profile"
+msgid "%(name)s's Profile"
msgstr "Profil %(name)s"
#: cps/web.py:1412
-msgid "Profile updated"
+msgid Success! Profile updated"
msgstr "Profil diperbarui"
#: cps/services/gmail.py:58
@@ -1476,11 +1476,11 @@ msgstr "Nama Pengguna"
#: cps/templates/admin.html:14 cps/templates/register.html:14
#: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
-msgid "E-mail Address"
+msgid "Email"
msgstr "Alamat Email"
#: cps/templates/admin.html:15 cps/templates/user_edit.html:28
-msgid "Send to E-Reader E-mail Address"
+msgid "Send to eReader Email"
msgstr "Alamat E-mail untuk Kirim ke E-Reader"
#: cps/templates/admin.html:17 cps/templates/layout.html:91
@@ -1528,7 +1528,7 @@ msgid "Import LDAP Users"
msgstr "Impor Pengguna LDAP"
#: cps/templates/admin.html:62
-msgid "E-mail Server Settings"
+msgid "Email Server Settings"
msgstr "Pengaturan Server Email"
#: cps/templates/admin.html:67 cps/templates/email_edit.html:31
@@ -1549,11 +1549,11 @@ msgstr "Login SMTP"
#: cps/templates/admin.html:83 cps/templates/admin.html:94
#: cps/templates/email_edit.html:55
-msgid "From E-mail"
+msgid "From Email"
msgstr "Dari Email"
#: cps/templates/admin.html:90
-msgid "E-Mail Service"
+msgid "EMail Service"
msgstr "Layanan Email"
#: cps/templates/admin.html:91
@@ -1625,15 +1625,15 @@ msgid "Scheduled Tasks"
msgstr "Tugas Terjadwal"
#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
-msgid "Time at which tasks start to run"
+msgid "Start Time"
msgstr "Waktu saat tugas mulai dijalankan"
#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
-msgid "Maximum tasks duration"
+msgid "Maximum Duration"
msgstr "Durasi tugas maksimum"
#: cps/templates/admin.html:178
-msgid "Generate book cover thumbnails"
+msgid "Generate Thumbnails"
msgstr "Buat thumbnail sampul buku"
#: cps/templates/admin.html:182
@@ -1641,11 +1641,11 @@ msgid "Generate series cover thumbnails"
msgstr "Buat thumbnail sampul seri"
#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
-msgid "Reconnect to Calibre Library"
+msgid "Reconnect Calibre Database"
msgstr "Sambungkan kembali ke Perpustakaan Caliber"
#: cps/templates/admin.html:193
-msgid "Refresh Thumbnail Cover Cache"
+msgid "Refresh Thumbnail Cache"
msgstr "Segarkan Cache Thumbnail Sampul"
#: cps/templates/admin.html:199
@@ -1685,7 +1685,7 @@ msgid "Details"
msgstr "Detail"
#: cps/templates/admin.html:227
-msgid "Current version"
+msgid "Current Version"
msgstr "Versi saat ini"
#: cps/templates/admin.html:234
@@ -2158,7 +2158,7 @@ msgid "Enable Public Registration"
msgstr "Izinkan Registrasi Publik"
#: cps/templates/config_edit.html:127
-msgid "Use E-Mail as Username"
+msgid "Use Email as Username"
msgstr "Gunakan Email sebagai Nama Pengguna"
#: cps/templates/config_edit.html:132
@@ -2511,7 +2511,7 @@ msgid "Edit Metadata"
msgstr "Edit Metadata"
#: cps/templates/email_edit.html:13
-msgid "Choose Server Type"
+msgid "Email Account Type"
msgstr "Pilih Jenis Server"
#: cps/templates/email_edit.html:15
@@ -3037,7 +3037,7 @@ msgid "Choose a username"
msgstr "Pilih nama pengguna"
#: cps/templates/register.html:15
-msgid "Your email address"
+msgid "Your Email"
msgstr "Alamat email Anda"
#: cps/templates/remote_login.html:5
@@ -3057,7 +3057,7 @@ msgid "This verification link will expire in 10 minutes."
msgstr "Tautan verifikasi ini akan kedaluwarsa dalam 10 menit."
#: cps/templates/schedule_edit.html:29
-msgid "Generate Book Cover Thumbnails"
+msgid "Generate Thumbnails"
msgstr "Hasilkan Thumbnail Sampul Buku"
#: cps/templates/schedule_edit.html:33
@@ -3289,11 +3289,11 @@ msgid "Enter Username"
msgstr "Masukkan Nama Pengguna"
#: cps/templates/user_table.html:135
-msgid "Enter E-mail Address"
+msgid "Enter Email Address"
msgstr "Masukkan Alamat Email"
#: cps/templates/user_table.html:136
-msgid "Enter E-Reader E-mail Address"
+msgid "Enter E-Reader Email Address"
msgstr "Masukkan Alamat Email E-Reader"
#: cps/templates/user_table.html:136
diff --git a/cps/translations/it/LC_MESSAGES/messages.po b/cps/translations/it/LC_MESSAGES/messages.po
index 844f12af..9031350d 100644
--- a/cps/translations/it/LC_MESSAGES/messages.po
+++ b/cps/translations/it/LC_MESSAGES/messages.po
@@ -277,7 +277,7 @@ msgid "Add new user"
msgstr "Aggiungi un nuovo utente"
#: cps/admin.py:1268 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
+msgid "Edit Email Server Settings"
msgstr "Modifica le impostazioni del server e-mail"
#: cps/admin.py:1287
@@ -290,7 +290,7 @@ msgstr "L'account Gmail è stato verificato con successo"
#: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
#, python-format
-msgid "Database error: %(error)s."
+msgid "Oops! Database Error: %(error)s."
msgstr "Errore nel database: %(error)s."
#: cps/admin.py:1316
@@ -308,7 +308,7 @@ msgid "Please configure your e-mail address first..."
msgstr "Per favore prima configura il tuo indirizzo e-mail..."
#: cps/admin.py:1323
-msgid "E-mail server settings updated"
+msgid "Email Server Settings updated"
msgstr "Configurazione del server e-mail aggiornata"
#: cps/admin.py:1346 cps/templates/admin.html:191
@@ -329,7 +329,7 @@ msgstr "Impostazioni delle attività pianificate aggiornate"
#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
#: cps/web.py:1320
-msgid "An unknown error occurred. Please try again later."
+msgid "Oops! An unknown error occurred. Please try again later."
msgstr "Si è verificato un errore sconosciuto: per favore riprova."
#: cps/admin.py:1386
@@ -347,7 +347,7 @@ msgid "Password for user %(user)s reset"
msgstr "La password dell'utente %(user)s è stata resettata"
#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first..."
+msgid "Please configure the SMTP mail settings first."
msgstr "Configura dapprima le impostazioni del server SMTP..."
#: cps/admin.py:1445
@@ -461,7 +461,7 @@ msgid "Database Configuration"
msgstr "Configurazione del Database"
#: cps/admin.py:1871 cps/web.py:1233
-msgid "Please fill out all fields!"
+msgid "Oops! Please complete all fields."
msgstr "Per favore compila tutti i campi!"
#: cps/admin.py:1879
@@ -474,7 +474,7 @@ msgid "User '%(user)s' created"
msgstr "L'utente '%(user)s' è stato creato"
#: cps/admin.py:1902
-msgid "Found an existing account for this e-mail address or name."
+msgid "Oops! An account already exists for this Email. or name."
msgstr "Trovato un account esistente con questo e-mail o nome di utente"
#: cps/admin.py:1932
@@ -491,7 +491,7 @@ msgid "No admin user remaining, can't delete user"
msgstr "Non rimarrebbe nessun utente amministratore, non posso eliminare l'utente"
#: cps/admin.py:1992 cps/web.py:1371
-msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
+msgid "Email can't be empty and has to be a valid Email"
msgstr "L'indirizzo e-mail non può essere vuoto e deve essere un recapito valido"
#: cps/admin.py:2018
@@ -521,7 +521,7 @@ msgstr "Nessuna"
#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
#: cps/web.py:1504 cps/web.py:1549
-msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
msgstr "Errore durante l'apertura del libro selezionato. Il file non esiste o il file non è accessibile"
#: cps/editbooks.py:154 cps/editbooks.py:1221
@@ -652,7 +652,7 @@ msgstr "%(format)s non trovato: %(fn)s"
#: cps/helper.py:97 cps/helper.py:226 cps/templates/detail.html:42
#: cps/templates/detail.html:46
-msgid "Send to E-Reader"
+msgid "Send to eReader"
msgstr "Invia al lettore elettronico"
#: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
@@ -739,7 +739,7 @@ msgid "Book path %(path)s not found on Google Drive"
msgstr "Non ho trovato la cartella %(path)s del libro su Google Drive"
#: cps/helper.py:644 cps/web.py:1416
-msgid "Found an existing account for this e-mail address"
+msgid "Oops! An account already exists for this Email."
msgstr "Ho trovato un account creato in precedenza con questo indirizzo e-mail."
#: cps/helper.py:652
@@ -817,7 +817,7 @@ msgstr "Registra con %(provider)s"
#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "ora sei connesso come: '%(nickname)s'"
#: cps/oauth_bb.py:148
@@ -1311,20 +1311,20 @@ msgstr "Elenco dei formati"
#: cps/web.py:1203
#, python-format
-msgid "Book successfully queued for sending to %(kindlemail)s"
+msgid "Success! Book queued for sending to %(eReadermail)s"
msgstr "Libro accodato con successo per essere spedito a %(kindlemail)s"
#: cps/web.py:1207
#, python-format
-msgid "Oops! There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending book: %(res)s"
msgstr "Oops! Si è verificato un errore durante l'invio di questo libro: %(res)s"
#: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle E-mail Address."
+msgid "Please update your profile with a valid Send to Kindle Email Address."
msgstr "Per favore aggiorna il tuo profilo con un indirizzo e-mail Kindle a cui inviare i libri."
#: cps/web.py:1226
-msgid "E-Mail server is not configured, please contact your administrator!"
+msgid "Oops! Email server is not configured, please contact your administrator."
msgstr "Il server e-mail non è configurato, per favore contatta l'amministratore"
#: cps/templates/layout.html:68 cps/templates/layout.html:102
@@ -1335,51 +1335,51 @@ msgid "Register"
msgstr "Registra"
#: cps/web.py:1262
-msgid "Your e-mail is not allowed to register"
+msgid "Oops! Your Email is not allowed."
msgstr "Il tuo e-mail non è autorizzato alla registrazione"
#: cps/web.py:1266
-msgid "Confirmation e-mail was send to your e-mail account."
+msgid "Success! Confirmation Email has been sent."
msgstr "Un messaggio di conferma è stato inviato al tuo recapito e-mail."
#: cps/web.py:1280
-msgid "Cannot activate LDAP authentication"
+msgid "Oops! Cannot activate LDAP authentication"
msgstr "Non posso attivare l'autenticazione LDAP"
#: cps/web.py:1299
#, python-format
-msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
+msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
msgstr "Fallback login come: '%(nickname)s', il server LDAP non è raggiungibile o l'utente è sconosciuto"
#: cps/web.py:1305
#, python-format
-msgid "Could not login: %(message)s"
+msgid "Oops! Login Failed: %(message)s"
msgstr "Non posso accedere: %(message)s"
#: cps/web.py:1309 cps/web.py:1334
-msgid "Wrong Username or Password"
+msgid "Oops! Invalid Username or Password."
msgstr "Nome utente o password errati"
#: cps/web.py:1316
-msgid "New Password was send to your email address"
+msgid "Success! New Password was sent to your Email."
msgstr "Una nuova password è stata inviata al tuo recapito e-mail"
#: cps/web.py:1322
-msgid "Please enter valid username to reset password"
+msgid "Oops! Please enter a valid username to reset password"
msgstr "Per favore digita un nome di utente valido per resettare la password"
#: cps/web.py:1329
#, python-format
-msgid "You are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "Ora sei connesso come '%(nickname)s'"
#: cps/web.py:1396 cps/web.py:1445
#, python-format
-msgid "%(name)s's profile"
+msgid "%(name)s's Profile"
msgstr "Profilo di %(name)s"
#: cps/web.py:1412
-msgid "Profile updated"
+msgid Success! Profile updated"
msgstr "Profilo aggiornato"
#: cps/services/gmail.py:58
@@ -1471,11 +1471,11 @@ msgstr "Utente"
#: cps/templates/admin.html:14 cps/templates/register.html:14
#: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
-msgid "E-mail Address"
+msgid "Email"
msgstr "Indirizzo e-mail"
#: cps/templates/admin.html:15 cps/templates/user_edit.html:28
-msgid "Send to E-Reader E-mail Address"
+msgid "Send to eReader Email"
msgstr "Invia all'indirizzo e-mail del lettore elettronico"
#: cps/templates/admin.html:17 cps/templates/layout.html:91
@@ -1523,7 +1523,7 @@ msgid "Import LDAP Users"
msgstr "Importa gli utenti LDAP"
#: cps/templates/admin.html:62
-msgid "E-mail Server Settings"
+msgid "Email Server Settings"
msgstr "Configurazione server e-mail"
#: cps/templates/admin.html:67 cps/templates/email_edit.html:31
@@ -1544,11 +1544,11 @@ msgstr "Login SMTP"
#: cps/templates/admin.html:83 cps/templates/admin.html:94
#: cps/templates/email_edit.html:55
-msgid "From E-mail"
+msgid "From Email"
msgstr "E-mail da"
#: cps/templates/admin.html:90
-msgid "E-Mail Service"
+msgid "EMail Service"
msgstr "Servizio e-mail"
#: cps/templates/admin.html:91
@@ -1620,15 +1620,15 @@ msgid "Scheduled Tasks"
msgstr "Attività pianificate"
#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
-msgid "Time at which tasks start to run"
+msgid "Start Time"
msgstr "Ora in cui le attività sono avviate"
#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
-msgid "Maximum tasks duration"
+msgid "Maximum Duration"
msgstr "Massima durata delle attività"
#: cps/templates/admin.html:178
-msgid "Generate book cover thumbnails"
+msgid "Generate Thumbnails"
msgstr "Generazione delle miniature delle copertine"
#: cps/templates/admin.html:182
@@ -1636,11 +1636,11 @@ msgid "Generate series cover thumbnails"
msgstr "Generazione delle miniature delle serie"
#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
-msgid "Reconnect to Calibre Library"
+msgid "Reconnect Calibre Database"
msgstr "Ricollegare alla libreria di Calibre"
#: cps/templates/admin.html:193
-msgid "Refresh Thumbnail Cover Cache"
+msgid "Refresh Thumbnail Cache"
msgstr "Aggiornare la cache delle miniature delle copertine"
#: cps/templates/admin.html:199
@@ -1680,7 +1680,7 @@ msgid "Details"
msgstr "Dettagli"
#: cps/templates/admin.html:227
-msgid "Current version"
+msgid "Current Version"
msgstr "Versione attuale"
#: cps/templates/admin.html:234
@@ -2153,7 +2153,7 @@ msgid "Enable Public Registration"
msgstr "Abilita la registrazione pubblica"
#: cps/templates/config_edit.html:127
-msgid "Use E-Mail as Username"
+msgid "Use Email as Username"
msgstr "Utilizza l'e-mail quale nome di utente"
#: cps/templates/config_edit.html:132
@@ -2506,7 +2506,7 @@ msgid "Edit Metadata"
msgstr "Modifica metadati"
#: cps/templates/email_edit.html:13
-msgid "Choose Server Type"
+msgid "Email Account Type"
msgstr "Scegli il tipo di server"
#: cps/templates/email_edit.html:15
@@ -3032,7 +3032,7 @@ msgid "Choose a username"
msgstr "Scegli un nome utente"
#: cps/templates/register.html:15
-msgid "Your email address"
+msgid "Your Email"
msgstr "Il tuo indirizzo e-mail"
#: cps/templates/remote_login.html:5
@@ -3052,7 +3052,7 @@ msgid "This verification link will expire in 10 minutes."
msgstr "Il link scadrà tra 10 minuti."
#: cps/templates/schedule_edit.html:29
-msgid "Generate Book Cover Thumbnails"
+msgid "Generate Thumbnails"
msgstr "Genera miniature delle copertine dei libri"
#: cps/templates/schedule_edit.html:33
@@ -3284,11 +3284,11 @@ msgid "Enter Username"
msgstr "Digita il nome utente"
#: cps/templates/user_table.html:135
-msgid "Enter E-mail Address"
+msgid "Enter Email Address"
msgstr "Digita l'indirizzo e-mail"
#: cps/templates/user_table.html:136
-msgid "Enter E-Reader E-mail Address"
+msgid "Enter E-Reader Email Address"
msgstr "Digita l'e-mail del lettore elettronico"
#: cps/templates/user_table.html:136
diff --git a/cps/translations/ja/LC_MESSAGES/messages.po b/cps/translations/ja/LC_MESSAGES/messages.po
index ce845444..80a58a78 100644
--- a/cps/translations/ja/LC_MESSAGES/messages.po
+++ b/cps/translations/ja/LC_MESSAGES/messages.po
@@ -279,7 +279,7 @@ msgid "Add new user"
msgstr "新規ユーザー追加"
#: cps/admin.py:1268 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
+msgid "Edit Email Server Settings"
msgstr "メールサーバー設定を編集"
#: cps/admin.py:1287
@@ -292,7 +292,7 @@ msgstr "Gmailアカウントを認証しました"
#: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
#, python-format
-msgid "Database error: %(error)s."
+msgid "Oops! Database Error: %(error)s."
msgstr "DBエラー: %(error)s"
#: cps/admin.py:1316
@@ -310,7 +310,7 @@ msgid "Please configure your e-mail address first..."
msgstr "初めにメールアドレスを設定してください"
#: cps/admin.py:1323
-msgid "E-mail server settings updated"
+msgid "Email Server Settings updated"
msgstr "メールサーバーの設定を更新しました"
#: cps/admin.py:1346 cps/templates/admin.html:191
@@ -331,7 +331,7 @@ msgstr "スケジュールタスクの設定を更新しました"
#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
#: cps/web.py:1320
-msgid "An unknown error occurred. Please try again later."
+msgid "Oops! An unknown error occurred. Please try again later."
msgstr "不明なエラーが発生しました。あとで再試行してください。"
#: cps/admin.py:1386
@@ -349,7 +349,7 @@ msgid "Password for user %(user)s reset"
msgstr "ユーザー %(user)s のパスワードをリセット"
#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first..."
+msgid "Please configure the SMTP mail settings first."
msgstr "初めにSMTPメールの設定をしてください"
#: cps/admin.py:1445
@@ -463,7 +463,7 @@ msgid "Database Configuration"
msgstr "DB設定"
#: cps/admin.py:1871 cps/web.py:1233
-msgid "Please fill out all fields!"
+msgid "Oops! Please complete all fields."
msgstr "全ての項目を入力してください"
#: cps/admin.py:1879
@@ -476,7 +476,7 @@ msgid "User '%(user)s' created"
msgstr "ユーザー '%(user)s' を作成しました"
#: cps/admin.py:1902
-msgid "Found an existing account for this e-mail address or name."
+msgid "Oops! An account already exists for this Email. or name."
msgstr "このメールアドレスかニックネームで登録されたアカウントがすでに存在します。"
#: cps/admin.py:1932
@@ -493,7 +493,7 @@ msgid "No admin user remaining, can't delete user"
msgstr "管理者ユーザーが残っておらず、ユーザーを削除できません"
#: cps/admin.py:1992 cps/web.py:1371
-msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
+msgid "Email can't be empty and has to be a valid Email"
msgstr ""
#: cps/admin.py:2018
@@ -523,7 +523,7 @@ msgstr "なし"
#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
#: cps/web.py:1504 cps/web.py:1549
-msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
msgstr "選択した本は利用できません。ファイルが存在しないか、アクセスできません"
#: cps/editbooks.py:154 cps/editbooks.py:1221
@@ -654,7 +654,7 @@ msgstr "%(format)s がありません: %(fn)s"
#: cps/helper.py:97 cps/helper.py:226 cps/templates/detail.html:42
#: cps/templates/detail.html:46
-msgid "Send to E-Reader"
+msgid "Send to eReader"
msgstr "E-Readerに送信"
#: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
@@ -741,7 +741,7 @@ msgid "Book path %(path)s not found on Google Drive"
msgstr "本のパス %(path)s はGoogleドライブ上にありません"
#: cps/helper.py:644 cps/web.py:1416
-msgid "Found an existing account for this e-mail address"
+msgid "Oops! An account already exists for this Email."
msgstr "このメールアドレスで登録されたアカウントがすでに存在します"
#: cps/helper.py:652
@@ -821,7 +821,7 @@ msgstr "%(provider)s で登録"
#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "%(nickname)s としてログイン中"
#: cps/oauth_bb.py:148
@@ -1315,20 +1315,20 @@ msgstr "ファイル形式一覧"
#: cps/web.py:1203
#, python-format
-msgid "Book successfully queued for sending to %(kindlemail)s"
+msgid "Success! Book queued for sending to %(eReadermail)s"
msgstr "本の %(kindlemail)s への送信がキューに追加されました"
#: cps/web.py:1207
#, python-format
-msgid "Oops! There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending book: %(res)s"
msgstr "%(res)s を送信中にエラーが発生しました"
#: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle E-mail Address."
+msgid "Please update your profile with a valid Send to Kindle Email Address."
msgstr "初めにKindleのメールアドレスを設定してください"
#: cps/web.py:1226
-msgid "E-Mail server is not configured, please contact your administrator!"
+msgid "Oops! Email server is not configured, please contact your administrator."
msgstr "メールサーバーが設定されていません。管理者に連絡してください"
#: cps/templates/layout.html:68 cps/templates/layout.html:102
@@ -1339,51 +1339,51 @@ msgid "Register"
msgstr "登録"
#: cps/web.py:1262
-msgid "Your e-mail is not allowed to register"
+msgid "Oops! Your Email is not allowed."
msgstr "このメールアドレスは登録が許可されていません"
#: cps/web.py:1266
-msgid "Confirmation e-mail was send to your e-mail account."
+msgid "Success! Confirmation Email has been sent."
msgstr "確認メールがこのメールアドレスに送信されました。"
#: cps/web.py:1280
-msgid "Cannot activate LDAP authentication"
+msgid "Oops! Cannot activate LDAP authentication"
msgstr "LDAP認証を有効化できません"
#: cps/web.py:1299
#, python-format
-msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
+msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
msgstr "代わりに '%(nickname)s' としてログインします。LDAPサーバーにアクセスできないか、ユーザーが存在しません"
#: cps/web.py:1305
#, python-format
-msgid "Could not login: %(message)s"
+msgid "Oops! Login Failed: %(message)s"
msgstr "ログインできません: %(message)s"
#: cps/web.py:1309 cps/web.py:1334
-msgid "Wrong Username or Password"
+msgid "Oops! Invalid Username or Password."
msgstr "ユーザー名またはパスワードが違います"
#: cps/web.py:1316
-msgid "New Password was send to your email address"
+msgid "Success! New Password was sent to your Email."
msgstr "新しいパスワードがあなたのメールアドレスに送信されました"
#: cps/web.py:1322
-msgid "Please enter valid username to reset password"
+msgid "Oops! Please enter a valid username to reset password"
msgstr "パスワードをリセットするには、有効なユーザー名を入力してください"
#: cps/web.py:1329
#, python-format
-msgid "You are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "'%(nickname)s' としてログインしました"
#: cps/web.py:1396 cps/web.py:1445
#, python-format
-msgid "%(name)s's profile"
+msgid "%(name)s's Profile"
msgstr "%(name)s のプロフィール"
#: cps/web.py:1412
-msgid "Profile updated"
+msgid Success! Profile updated"
msgstr "プロフィールを更新しました"
#: cps/services/gmail.py:58
@@ -1476,11 +1476,11 @@ msgstr "ユーザー名"
#: cps/templates/admin.html:14 cps/templates/register.html:14
#: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
-msgid "E-mail Address"
+msgid "Email"
msgstr "メールアドレス"
#: cps/templates/admin.html:15 cps/templates/user_edit.html:28
-msgid "Send to E-Reader E-mail Address"
+msgid "Send to eReader Email"
msgstr "E-Readerメールアドレス"
#: cps/templates/admin.html:17 cps/templates/layout.html:91
@@ -1528,7 +1528,7 @@ msgid "Import LDAP Users"
msgstr "LDAPユーザーをインポート"
#: cps/templates/admin.html:62
-msgid "E-mail Server Settings"
+msgid "Email Server Settings"
msgstr "メールサーバー設定"
#: cps/templates/admin.html:67 cps/templates/email_edit.html:31
@@ -1549,11 +1549,11 @@ msgstr "SMTPログイン"
#: cps/templates/admin.html:83 cps/templates/admin.html:94
#: cps/templates/email_edit.html:55
-msgid "From E-mail"
+msgid "From Email"
msgstr "Fromメールアドレス"
#: cps/templates/admin.html:90
-msgid "E-Mail Service"
+msgid "EMail Service"
msgstr "メールサービス"
#: cps/templates/admin.html:91
@@ -1625,15 +1625,15 @@ msgid "Scheduled Tasks"
msgstr "スケジュールタスク"
#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
-msgid "Time at which tasks start to run"
+msgid "Start Time"
msgstr "タスクを開始する時間"
#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
-msgid "Maximum tasks duration"
+msgid "Maximum Duration"
msgstr "最大タスク継続時間"
#: cps/templates/admin.html:178
-msgid "Generate book cover thumbnails"
+msgid "Generate Thumbnails"
msgstr "本の表紙サムネイルを生成"
#: cps/templates/admin.html:182
@@ -1641,11 +1641,11 @@ msgid "Generate series cover thumbnails"
msgstr "シリーズの表紙サムネイルを生成"
#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
-msgid "Reconnect to Calibre Library"
+msgid "Reconnect Calibre Database"
msgstr "Calibreライブラリに再接続"
#: cps/templates/admin.html:193
-msgid "Refresh Thumbnail Cover Cache"
+msgid "Refresh Thumbnail Cache"
msgstr "表紙サムネイルのキャッシュを更新"
#: cps/templates/admin.html:199
@@ -1685,7 +1685,7 @@ msgid "Details"
msgstr "詳細"
#: cps/templates/admin.html:227
-msgid "Current version"
+msgid "Current Version"
msgstr "現在のバージョン"
#: cps/templates/admin.html:234
@@ -2158,7 +2158,7 @@ msgid "Enable Public Registration"
msgstr "誰でも登録可能にする"
#: cps/templates/config_edit.html:127
-msgid "Use E-Mail as Username"
+msgid "Use Email as Username"
msgstr "メールアドレスをユーザー名として使う"
#: cps/templates/config_edit.html:132
@@ -2511,7 +2511,7 @@ msgid "Edit Metadata"
msgstr "メタデータを編集"
#: cps/templates/email_edit.html:13
-msgid "Choose Server Type"
+msgid "Email Account Type"
msgstr "サーバーの種類を選択"
#: cps/templates/email_edit.html:15
@@ -3037,7 +3037,7 @@ msgid "Choose a username"
msgstr "ユーザー名を入力してください"
#: cps/templates/register.html:15
-msgid "Your email address"
+msgid "Your Email"
msgstr "メールアドレス"
#: cps/templates/remote_login.html:5
@@ -3057,7 +3057,7 @@ msgid "This verification link will expire in 10 minutes."
msgstr "この確認リンクの有効期限は10分です。"
#: cps/templates/schedule_edit.html:29
-msgid "Generate Book Cover Thumbnails"
+msgid "Generate Thumbnails"
msgstr "本の表紙サムネイルを生成"
#: cps/templates/schedule_edit.html:33
@@ -3289,11 +3289,11 @@ msgid "Enter Username"
msgstr "ユーザー名を入力してください"
#: cps/templates/user_table.html:135
-msgid "Enter E-mail Address"
+msgid "Enter Email Address"
msgstr "メールアドレスを入力してください"
#: cps/templates/user_table.html:136
-msgid "Enter E-Reader E-mail Address"
+msgid "Enter E-Reader Email Address"
msgstr "E-Readerメールアドレスを入力してください"
#: cps/templates/user_table.html:136
diff --git a/cps/translations/km/LC_MESSAGES/messages.po b/cps/translations/km/LC_MESSAGES/messages.po
index 8ad31ebc..396df295 100644
--- a/cps/translations/km/LC_MESSAGES/messages.po
+++ b/cps/translations/km/LC_MESSAGES/messages.po
@@ -285,7 +285,7 @@ msgid "Add new user"
msgstr "បន្ថែមអ្នកប្រើប្រាស់ថ្មី"
#: cps/admin.py:1268 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
+msgid "Edit Email Server Settings"
msgstr "ប្តូរការកំណត់ SMTP"
#: cps/admin.py:1287
@@ -298,7 +298,7 @@ msgstr ""
#: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
#, python-format
-msgid "Database error: %(error)s."
+msgid "Oops! Database Error: %(error)s."
msgstr ""
#: cps/admin.py:1316
@@ -316,7 +316,7 @@ msgid "Please configure your e-mail address first..."
msgstr ""
#: cps/admin.py:1323
-msgid "E-mail server settings updated"
+msgid "Email Server Settings updated"
msgstr ""
#: cps/admin.py:1346 cps/templates/admin.html:191
@@ -337,7 +337,7 @@ msgstr ""
#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
#: cps/web.py:1320
-msgid "An unknown error occurred. Please try again later."
+msgid "Oops! An unknown error occurred. Please try again later."
msgstr ""
#: cps/admin.py:1386
@@ -355,7 +355,7 @@ msgid "Password for user %(user)s reset"
msgstr ""
#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first..."
+msgid "Please configure the SMTP mail settings first."
msgstr "សូមកំណត់អ៊ីមែល SMTP ជាមុនសិន"
#: cps/admin.py:1445
@@ -471,7 +471,7 @@ msgid "Database Configuration"
msgstr "ការកំណត់មុខងារ"
#: cps/admin.py:1871 cps/web.py:1233
-msgid "Please fill out all fields!"
+msgid "Oops! Please complete all fields."
msgstr "សូមបំពេញចន្លោះទាំងអស់!"
#: cps/admin.py:1879
@@ -484,7 +484,7 @@ msgid "User '%(user)s' created"
msgstr "បានបង្កើតអ្នកប្រើប្រាស់ ‘%(user)s’"
#: cps/admin.py:1902
-msgid "Found an existing account for this e-mail address or name."
+msgid "Oops! An account already exists for this Email. or name."
msgstr ""
#: cps/admin.py:1932
@@ -501,7 +501,7 @@ msgid "No admin user remaining, can't delete user"
msgstr ""
#: cps/admin.py:1992 cps/web.py:1371
-msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
+msgid "Email can't be empty and has to be a valid Email"
msgstr ""
#: cps/admin.py:2018
@@ -531,7 +531,7 @@ msgstr "គ្មាន"
#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
#: cps/web.py:1504 cps/web.py:1549
-msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
msgstr ""
#: cps/editbooks.py:154 cps/editbooks.py:1221
@@ -663,7 +663,7 @@ msgstr ""
#: cps/helper.py:97 cps/helper.py:226 cps/templates/detail.html:42
#: cps/templates/detail.html:46
#, fuzzy
-msgid "Send to E-Reader"
+msgid "Send to eReader"
msgstr "ផ្ញើទៅ Kindle"
#: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
@@ -750,7 +750,7 @@ msgid "Book path %(path)s not found on Google Drive"
msgstr "ទីតាំងសៀវភៅ %(path)s រកមិនឃើញក្នុង Google Drive"
#: cps/helper.py:644 cps/web.py:1416
-msgid "Found an existing account for this e-mail address"
+msgid "Oops! An account already exists for this Email."
msgstr ""
#: cps/helper.py:652
@@ -829,7 +829,7 @@ msgstr ""
#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "ឥឡូវអ្នកបានចូលដោយមានឈ្មោះថា៖ ‘%(nickname)s’"
#: cps/oauth_bb.py:148
@@ -1325,20 +1325,20 @@ msgstr ""
#: cps/web.py:1203
#, python-format
-msgid "Book successfully queued for sending to %(kindlemail)s"
+msgid "Success! Book queued for sending to %(eReadermail)s"
msgstr "សៀវភៅបានចូលជួរសម្រាប់ផ្ញើទៅ %(kindlemail)s ដោយជោគជ័យ"
#: cps/web.py:1207
#, python-format
-msgid "Oops! There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending book: %(res)s"
msgstr "មានបញ្ហានៅពេលផ្ញើសៀវភៅនេះ៖ %(res)s"
#: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle E-mail Address."
+msgid "Please update your profile with a valid Send to Kindle Email Address."
msgstr ""
#: cps/web.py:1226
-msgid "E-Mail server is not configured, please contact your administrator!"
+msgid "Oops! Email server is not configured, please contact your administrator."
msgstr ""
#: cps/templates/layout.html:68 cps/templates/layout.html:102
@@ -1349,51 +1349,51 @@ msgid "Register"
msgstr "ចុះឈ្មោះ"
#: cps/web.py:1262
-msgid "Your e-mail is not allowed to register"
+msgid "Oops! Your Email is not allowed."
msgstr ""
#: cps/web.py:1266
-msgid "Confirmation e-mail was send to your e-mail account."
+msgid "Success! Confirmation Email has been sent."
msgstr ""
#: cps/web.py:1280
-msgid "Cannot activate LDAP authentication"
+msgid "Oops! Cannot activate LDAP authentication"
msgstr ""
#: cps/web.py:1299
#, python-format
-msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
+msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
msgstr ""
#: cps/web.py:1305
#, python-format
-msgid "Could not login: %(message)s"
+msgid "Oops! Login Failed: %(message)s"
msgstr ""
#: cps/web.py:1309 cps/web.py:1334
-msgid "Wrong Username or Password"
+msgid "Oops! Invalid Username or Password."
msgstr "ខុសឈ្មោះអ្នកប្រើប្រាស់ ឬលេខសម្ងាត់"
#: cps/web.py:1316
-msgid "New Password was send to your email address"
+msgid "Success! New Password was sent to your Email."
msgstr ""
#: cps/web.py:1322
-msgid "Please enter valid username to reset password"
+msgid "Oops! Please enter a valid username to reset password"
msgstr ""
#: cps/web.py:1329
#, python-format
-msgid "You are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr ""
#: cps/web.py:1396 cps/web.py:1445
#, python-format
-msgid "%(name)s's profile"
+msgid "%(name)s's Profile"
msgstr "ព័ត៌មានសង្ខេបរបស់ %(name)s"
#: cps/web.py:1412
-msgid "Profile updated"
+msgid Success! Profile updated"
msgstr "ព័ត៌មានសង្ខេបបានកែប្រែ"
#: cps/services/gmail.py:58
@@ -1486,12 +1486,12 @@ msgstr "ឈ្មោះហៅក្រៅ"
#: cps/templates/admin.html:14 cps/templates/register.html:14
#: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
-msgid "E-mail Address"
+msgid "Email"
msgstr ""
#: cps/templates/admin.html:15 cps/templates/user_edit.html:28
#, fuzzy
-msgid "Send to E-Reader E-mail Address"
+msgid "Send to eReader Email"
msgstr "ឧបករណ៍ Kindle"
#: cps/templates/admin.html:17 cps/templates/layout.html:91
@@ -1539,7 +1539,7 @@ msgid "Import LDAP Users"
msgstr ""
#: cps/templates/admin.html:62
-msgid "E-mail Server Settings"
+msgid "Email Server Settings"
msgstr ""
#: cps/templates/admin.html:67 cps/templates/email_edit.html:31
@@ -1560,11 +1560,11 @@ msgstr "អ្នកចូលប្រើ SMTP"
#: cps/templates/admin.html:83 cps/templates/admin.html:94
#: cps/templates/email_edit.html:55
-msgid "From E-mail"
+msgid "From Email"
msgstr "ពីអ៊ីមែល"
#: cps/templates/admin.html:90
-msgid "E-Mail Service"
+msgid "EMail Service"
msgstr ""
#: cps/templates/admin.html:91
@@ -1637,15 +1637,15 @@ msgid "Scheduled Tasks"
msgstr ""
#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
-msgid "Time at which tasks start to run"
+msgid "Start Time"
msgstr ""
#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
-msgid "Maximum tasks duration"
+msgid "Maximum Duration"
msgstr ""
#: cps/templates/admin.html:178
-msgid "Generate book cover thumbnails"
+msgid "Generate Thumbnails"
msgstr ""
#: cps/templates/admin.html:182
@@ -1653,11 +1653,11 @@ msgid "Generate series cover thumbnails"
msgstr ""
#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
-msgid "Reconnect to Calibre Library"
+msgid "Reconnect Calibre Database"
msgstr ""
#: cps/templates/admin.html:193
-msgid "Refresh Thumbnail Cover Cache"
+msgid "Refresh Thumbnail Cache"
msgstr ""
#: cps/templates/admin.html:199
@@ -1697,7 +1697,7 @@ msgid "Details"
msgstr ""
#: cps/templates/admin.html:227
-msgid "Current version"
+msgid "Current Version"
msgstr ""
#: cps/templates/admin.html:234
@@ -2172,7 +2172,7 @@ msgid "Enable Public Registration"
msgstr "អនុញ្ញាតការចុះឈ្មោះសាធារណៈ"
#: cps/templates/config_edit.html:127
-msgid "Use E-Mail as Username"
+msgid "Use Email as Username"
msgstr ""
#: cps/templates/config_edit.html:132
@@ -2527,7 +2527,7 @@ msgid "Edit Metadata"
msgstr "កែប្រែទិន្នន័យមេតា"
#: cps/templates/email_edit.html:13
-msgid "Choose Server Type"
+msgid "Email Account Type"
msgstr ""
#: cps/templates/email_edit.html:15
@@ -3056,7 +3056,7 @@ msgid "Choose a username"
msgstr "ជ្រើសរើសឈ្មោះអ្នកប្រើប្រាស់"
#: cps/templates/register.html:15
-msgid "Your email address"
+msgid "Your Email"
msgstr "អាសយដ្ឋានអ៊ីមែលរបស់អ្នក"
#: cps/templates/remote_login.html:5
@@ -3076,7 +3076,7 @@ msgid "This verification link will expire in 10 minutes."
msgstr ""
#: cps/templates/schedule_edit.html:29
-msgid "Generate Book Cover Thumbnails"
+msgid "Generate Thumbnails"
msgstr ""
#: cps/templates/schedule_edit.html:33
@@ -3312,12 +3312,12 @@ msgstr "ជ្រើសរើសឈ្មោះអ្នកប្រើប្រ
#: cps/templates/user_table.html:135
#, fuzzy
-msgid "Enter E-mail Address"
+msgid "Enter Email Address"
msgstr "អាសយដ្ឋានអ៊ីមែលរបស់អ្នក"
#: cps/templates/user_table.html:136
#, fuzzy
-msgid "Enter E-Reader E-mail Address"
+msgid "Enter E-Reader Email Address"
msgstr "ឧបករណ៍ Kindle"
#: cps/templates/user_table.html:136
diff --git a/cps/translations/ko/LC_MESSAGES/messages.po b/cps/translations/ko/LC_MESSAGES/messages.po
index 7ebad104..22e8ab74 100644
--- a/cps/translations/ko/LC_MESSAGES/messages.po
+++ b/cps/translations/ko/LC_MESSAGES/messages.po
@@ -278,7 +278,7 @@ msgid "Add new user"
msgstr "새 사용자 추가"
#: cps/admin.py:1268 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
+msgid "Edit Email Server Settings"
msgstr "이메일 서버 설정 편집"
#: cps/admin.py:1287
@@ -291,7 +291,7 @@ msgstr "Gmail 계정 인증 성공"
#: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
#, python-format
-msgid "Database error: %(error)s."
+msgid "Oops! Database Error: %(error)s."
msgstr "데이터베이스 오류: %(error)s."
#: cps/admin.py:1316
@@ -309,7 +309,7 @@ msgid "Please configure your e-mail address first..."
msgstr "먼저 이메일 주소를 구성하십시오..."
#: cps/admin.py:1323
-msgid "E-mail server settings updated"
+msgid "Email Server Settings updated"
msgstr "이메일 서버 설정 업데이트됨"
#: cps/admin.py:1346 cps/templates/admin.html:191
@@ -330,7 +330,7 @@ msgstr ""
#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
#: cps/web.py:1320
-msgid "An unknown error occurred. Please try again later."
+msgid "Oops! An unknown error occurred. Please try again later."
msgstr "알 수없는 오류가 발생했습니다. 나중에 다시 시도 해주십시오."
#: cps/admin.py:1386
@@ -348,7 +348,7 @@ msgid "Password for user %(user)s reset"
msgstr "사용자 %(user)s의 비밀번호 재설정"
#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first..."
+msgid "Please configure the SMTP mail settings first."
msgstr "먼저 SMTP 메일 설정을 구성하십시오..."
#: cps/admin.py:1445
@@ -462,7 +462,7 @@ msgid "Database Configuration"
msgstr "데이터베이스 구성"
#: cps/admin.py:1871 cps/web.py:1233
-msgid "Please fill out all fields!"
+msgid "Oops! Please complete all fields."
msgstr "모든 필드를 채워주십시오!"
#: cps/admin.py:1879
@@ -475,7 +475,7 @@ msgid "User '%(user)s' created"
msgstr "사용자 '%(user)s'이(가) 생성됨"
#: cps/admin.py:1902
-msgid "Found an existing account for this e-mail address or name."
+msgid "Oops! An account already exists for this Email. or name."
msgstr "동일한 이메일 주소 또는 이름이 이미 등록되어 있습니다."
#: cps/admin.py:1932
@@ -492,7 +492,7 @@ msgid "No admin user remaining, can't delete user"
msgstr "관리자 계정이 하나 뿐일 때는 관리자 권한을 삭제할 수 없음"
#: cps/admin.py:1992 cps/web.py:1371
-msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
+msgid "Email can't be empty and has to be a valid Email"
msgstr ""
#: cps/admin.py:2018
@@ -522,7 +522,7 @@ msgstr "None"
#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
#: cps/web.py:1504 cps/web.py:1549
-msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
msgstr "선택한 책 제목을 사용할 수 없습니다. 파일이 존재하지 않거나 액세스할 수 없습니다"
#: cps/editbooks.py:154 cps/editbooks.py:1221
@@ -654,7 +654,7 @@ msgstr "%(format)s을(를) 찾을 수 없음: %(fn)s"
#: cps/helper.py:97 cps/helper.py:226 cps/templates/detail.html:42
#: cps/templates/detail.html:46
#, fuzzy
-msgid "Send to E-Reader"
+msgid "Send to eReader"
msgstr "킨들로 보내기"
#: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
@@ -741,7 +741,7 @@ msgid "Book path %(path)s not found on Google Drive"
msgstr "Google 드라이브에서 책 경로 %(path)s을(를) 찾을 수 없습니다"
#: cps/helper.py:644 cps/web.py:1416
-msgid "Found an existing account for this e-mail address"
+msgid "Oops! An account already exists for this Email."
msgstr "등록되어 있는 이메일 주소입니다"
#: cps/helper.py:652
@@ -822,7 +822,7 @@ msgstr "%(provider)s에 등록"
#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "다음 사용자로 로그인했습니다: '%(nickname)s'"
#: cps/oauth_bb.py:148
@@ -1317,20 +1317,20 @@ msgstr "파일 유형 목록"
#: cps/web.py:1203
#, python-format
-msgid "Book successfully queued for sending to %(kindlemail)s"
+msgid "Success! Book queued for sending to %(eReadermail)s"
msgstr "성공적으로 %(kindlemail)s에 보내기 예약이 되었습니다"
#: cps/web.py:1207
#, python-format
-msgid "Oops! There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending book: %(res)s"
msgstr "책을 보내는 중에 오류 발생: %(res)s"
#: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle E-mail Address."
+msgid "Please update your profile with a valid Send to Kindle Email Address."
msgstr "Kindle로 보내는 유효한 이메일 주소로 프로필을 업데이트하십시오."
#: cps/web.py:1226
-msgid "E-Mail server is not configured, please contact your administrator!"
+msgid "Oops! Email server is not configured, please contact your administrator."
msgstr "이메일 서버가 구성되지 않았습니다. 관리자에게 문의하십시오!"
#: cps/templates/layout.html:68 cps/templates/layout.html:102
@@ -1341,51 +1341,51 @@ msgid "Register"
msgstr "등록"
#: cps/web.py:1262
-msgid "Your e-mail is not allowed to register"
+msgid "Oops! Your Email is not allowed."
msgstr "이메일을 등록할 수 없습니다"
#: cps/web.py:1266
-msgid "Confirmation e-mail was send to your e-mail account."
+msgid "Success! Confirmation Email has been sent."
msgstr "확인을 위한 이메일이 발송되었습니다."
#: cps/web.py:1280
-msgid "Cannot activate LDAP authentication"
+msgid "Oops! Cannot activate LDAP authentication"
msgstr "LDAP 인증을 활성화할 수 없습니다"
#: cps/web.py:1299
#, python-format
-msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
+msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
msgstr "대체 로그인: '%(nickname)s', LDAP 서버에 연결할 수 없음 또는 사용자를 알 수 없음"
#: cps/web.py:1305
#, python-format
-msgid "Could not login: %(message)s"
+msgid "Oops! Login Failed: %(message)s"
msgstr "로그인 실패: %(message)s"
#: cps/web.py:1309 cps/web.py:1334
-msgid "Wrong Username or Password"
+msgid "Oops! Invalid Username or Password."
msgstr "잘못된 사용자명 또는 비밀번호"
#: cps/web.py:1316
-msgid "New Password was send to your email address"
+msgid "Success! New Password was sent to your Email."
msgstr "새 비밀번호가 이메일로 전송되었습니다"
#: cps/web.py:1322
-msgid "Please enter valid username to reset password"
+msgid "Oops! Please enter a valid username to reset password"
msgstr "비밀번호를 재설정하려면 유효한 사용자 이름을 입력하십시오"
#: cps/web.py:1329
#, python-format
-msgid "You are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "다음 사용자로 로그인: '%(nickname)s"
#: cps/web.py:1396 cps/web.py:1445
#, python-format
-msgid "%(name)s's profile"
+msgid "%(name)s's Profile"
msgstr "%(name)s 프로필"
#: cps/web.py:1412
-msgid "Profile updated"
+msgid Success! Profile updated"
msgstr "프로필이 업데이트 됨"
#: cps/services/gmail.py:58
@@ -1478,12 +1478,12 @@ msgstr "사용자명"
#: cps/templates/admin.html:14 cps/templates/register.html:14
#: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
-msgid "E-mail Address"
+msgid "Email"
msgstr "이메일 주소"
#: cps/templates/admin.html:15 cps/templates/user_edit.html:28
#, fuzzy
-msgid "Send to E-Reader E-mail Address"
+msgid "Send to eReader Email"
msgstr "킨들로 보내기 이메일 주소"
#: cps/templates/admin.html:17 cps/templates/layout.html:91
@@ -1531,7 +1531,7 @@ msgid "Import LDAP Users"
msgstr "LDAP 사용자 가져오기"
#: cps/templates/admin.html:62
-msgid "E-mail Server Settings"
+msgid "Email Server Settings"
msgstr "이메일 서버 설정"
#: cps/templates/admin.html:67 cps/templates/email_edit.html:31
@@ -1552,12 +1552,12 @@ msgstr "SMTP Login"
#: cps/templates/admin.html:83 cps/templates/admin.html:94
#: cps/templates/email_edit.html:55
-msgid "From E-mail"
-msgstr "From E-mail"
+msgid "From Email"
+msgstr "From Email"
#: cps/templates/admin.html:90
-msgid "E-Mail Service"
-msgstr "E-Mail Service"
+msgid "EMail Service"
+msgstr "EMail Service"
#: cps/templates/admin.html:91
msgid "Gmail via Oauth2"
@@ -1628,15 +1628,15 @@ msgid "Scheduled Tasks"
msgstr ""
#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
-msgid "Time at which tasks start to run"
+msgid "Start Time"
msgstr ""
#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
-msgid "Maximum tasks duration"
+msgid "Maximum Duration"
msgstr ""
#: cps/templates/admin.html:178
-msgid "Generate book cover thumbnails"
+msgid "Generate Thumbnails"
msgstr ""
#: cps/templates/admin.html:182
@@ -1644,11 +1644,11 @@ msgid "Generate series cover thumbnails"
msgstr ""
#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
-msgid "Reconnect to Calibre Library"
+msgid "Reconnect Calibre Database"
msgstr ""
#: cps/templates/admin.html:193
-msgid "Refresh Thumbnail Cover Cache"
+msgid "Refresh Thumbnail Cache"
msgstr ""
#: cps/templates/admin.html:199
@@ -1688,7 +1688,7 @@ msgid "Details"
msgstr "세부 정보"
#: cps/templates/admin.html:227
-msgid "Current version"
+msgid "Current Version"
msgstr "현재 버전"
#: cps/templates/admin.html:234
@@ -2161,7 +2161,7 @@ msgid "Enable Public Registration"
msgstr "공개 등록 활성화"
#: cps/templates/config_edit.html:127
-msgid "Use E-Mail as Username"
+msgid "Use Email as Username"
msgstr "이메일을 사용자 이름으로 사용"
#: cps/templates/config_edit.html:132
@@ -2514,7 +2514,7 @@ msgid "Edit Metadata"
msgstr "메타저오 편집"
#: cps/templates/email_edit.html:13
-msgid "Choose Server Type"
+msgid "Email Account Type"
msgstr "서버 유형 선택"
#: cps/templates/email_edit.html:15
@@ -3042,7 +3042,7 @@ msgid "Choose a username"
msgstr "사용자 이름 선택"
#: cps/templates/register.html:15
-msgid "Your email address"
+msgid "Your Email"
msgstr "이메일 주소"
#: cps/templates/remote_login.html:5
@@ -3062,7 +3062,7 @@ msgid "This verification link will expire in 10 minutes."
msgstr "이 확인 링크는 10분 후에 만료됩니다."
#: cps/templates/schedule_edit.html:29
-msgid "Generate Book Cover Thumbnails"
+msgid "Generate Thumbnails"
msgstr ""
#: cps/templates/schedule_edit.html:33
@@ -3294,12 +3294,12 @@ msgid "Enter Username"
msgstr "사용자 이름"
#: cps/templates/user_table.html:135
-msgid "Enter E-mail Address"
+msgid "Enter Email Address"
msgstr "이메일 주소 입력"
#: cps/templates/user_table.html:136
#, fuzzy
-msgid "Enter E-Reader E-mail Address"
+msgid "Enter E-Reader Email Address"
msgstr "킨들 이메일 주소 입력"
#: cps/templates/user_table.html:136
diff --git a/cps/translations/nl/LC_MESSAGES/messages.po b/cps/translations/nl/LC_MESSAGES/messages.po
index 0948ad14..fd3bb9e0 100644
--- a/cps/translations/nl/LC_MESSAGES/messages.po
+++ b/cps/translations/nl/LC_MESSAGES/messages.po
@@ -285,7 +285,7 @@ msgid "Add new user"
msgstr "Gebruiker toevoegen"
#: cps/admin.py:1268 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
+msgid "Edit Email Server Settings"
msgstr "SMTP-instellingen bewerken"
#: cps/admin.py:1287
@@ -298,7 +298,7 @@ msgstr "Gmail Account succesvol geverifieerd"
#: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
#, python-format
-msgid "Database error: %(error)s."
+msgid "Oops! Database Error: %(error)s."
msgstr "Database fout: %(error)s."
#: cps/admin.py:1316
@@ -316,7 +316,7 @@ msgid "Please configure your e-mail address first..."
msgstr "Gelieve eerst je e-mail adres configureren..."
#: cps/admin.py:1323
-msgid "E-mail server settings updated"
+msgid "Email Server Settings updated"
msgstr "E-mailserver-instellingen bijgewerkt"
#: cps/admin.py:1346 cps/templates/admin.html:191
@@ -337,7 +337,7 @@ msgstr ""
#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
#: cps/web.py:1320
-msgid "An unknown error occurred. Please try again later."
+msgid "Oops! An unknown error occurred. Please try again later."
msgstr "Onbekende fout opgetreden. Probeer het later nog eens."
#: cps/admin.py:1386
@@ -355,7 +355,7 @@ msgid "Password for user %(user)s reset"
msgstr "Wachtwoord voor gebruiker %(user)s is hersteld"
#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first..."
+msgid "Please configure the SMTP mail settings first."
msgstr "Stel eerst SMTP-mail in..."
#: cps/admin.py:1445
@@ -473,7 +473,7 @@ msgid "Database Configuration"
msgstr "Databaseconfiguratie"
#: cps/admin.py:1871 cps/web.py:1233
-msgid "Please fill out all fields!"
+msgid "Oops! Please complete all fields."
msgstr "Vul alle velden in!"
#: cps/admin.py:1879
@@ -487,7 +487,7 @@ msgstr "Gebruiker '%(user)s' aangemaakt"
#: cps/admin.py:1902
#, fuzzy
-msgid "Found an existing account for this e-mail address or name."
+msgid "Oops! An account already exists for this Email. or name."
msgstr "Bestaand account met dit e-mailadres of deze gebruikersnaam aangetroffen."
#: cps/admin.py:1932
@@ -504,7 +504,7 @@ msgid "No admin user remaining, can't delete user"
msgstr "Kan laatste systeembeheerder niet verwijderen"
#: cps/admin.py:1992 cps/web.py:1371
-msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
+msgid "Email can't be empty and has to be a valid Email"
msgstr ""
#: cps/admin.py:2018
@@ -534,7 +534,7 @@ msgstr "Geen"
#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
#: cps/web.py:1504 cps/web.py:1549
-msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
msgstr "Oeps! Geselecteerd boek is niet beschikbaar. Bestand bestaat niet of is niet toegankelijk"
#: cps/editbooks.py:154 cps/editbooks.py:1221
@@ -666,7 +666,7 @@ msgstr "%(format)s niet gevonden %(fn)s"
#: cps/helper.py:97 cps/helper.py:226 cps/templates/detail.html:42
#: cps/templates/detail.html:46
#, fuzzy
-msgid "Send to E-Reader"
+msgid "Send to eReader"
msgstr "Versturen naar Kindle"
#: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
@@ -754,7 +754,7 @@ msgstr "Boeken locatie '%(path)s' niet aangetroffen op Google Drive"
#: cps/helper.py:644 cps/web.py:1416
#, fuzzy
-msgid "Found an existing account for this e-mail address"
+msgid "Oops! An account already exists for this Email."
msgstr "Bestaand account met dit e-mailadres aangetroffen."
#: cps/helper.py:652
@@ -835,7 +835,7 @@ msgstr "Aanmelden bij %(provider)s"
#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "je bent ingelogd als: '%(nickname)s'"
#: cps/oauth_bb.py:148
@@ -1332,20 +1332,20 @@ msgstr "Alle bestandsformaten"
#: cps/web.py:1203
#, python-format
-msgid "Book successfully queued for sending to %(kindlemail)s"
+msgid "Success! Book queued for sending to %(eReadermail)s"
msgstr "Het boek is in de wachtrij geplaatst om te worden verstuurd aan %(kindlemail)s"
#: cps/web.py:1207
#, python-format
-msgid "Oops! There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending book: %(res)s"
msgstr "Fout opgetreden bij het versturen van dit boek: %(res)s"
#: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle E-mail Address."
+msgid "Please update your profile with a valid Send to Kindle Email Address."
msgstr "Stel je kindle-e-mailadres in..."
#: cps/web.py:1226
-msgid "E-Mail server is not configured, please contact your administrator!"
+msgid "Oops! Email server is not configured, please contact your administrator."
msgstr "E-mailserver is niet geconfigureerd, neem contact op met de beheerder!"
#: cps/templates/layout.html:68 cps/templates/layout.html:102
@@ -1356,51 +1356,51 @@ msgid "Register"
msgstr "Registreren"
#: cps/web.py:1262
-msgid "Your e-mail is not allowed to register"
+msgid "Oops! Your Email is not allowed."
msgstr "Dit e-mailadres mag niet worden gebruikt voor registratie"
#: cps/web.py:1266
-msgid "Confirmation e-mail was send to your e-mail account."
+msgid "Success! Confirmation Email has been sent."
msgstr "Er is een bevestigings-e-mail verstuurd naar je e-mailadres."
#: cps/web.py:1280
-msgid "Cannot activate LDAP authentication"
+msgid "Oops! Cannot activate LDAP authentication"
msgstr "Kan de LDAP authenticatie niet activeren"
#: cps/web.py:1299
#, python-format
-msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
+msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
msgstr "Terugvallen op login: '%(nickname)s', LDAP Server is onbereikbaar, of de gebruiker is onbekend"
#: cps/web.py:1305
#, python-format
-msgid "Could not login: %(message)s"
+msgid "Oops! Login Failed: %(message)s"
msgstr "Inloggen mislukt: %(message)s"
#: cps/web.py:1309 cps/web.py:1334
-msgid "Wrong Username or Password"
+msgid "Oops! Invalid Username or Password."
msgstr "Verkeerde gebruikersnaam of wachtwoord"
#: cps/web.py:1316
-msgid "New Password was send to your email address"
+msgid "Success! New Password was sent to your Email."
msgstr "Een nieuw wachtwoord is verzonden naar je e-mailadres"
#: cps/web.py:1322
-msgid "Please enter valid username to reset password"
+msgid "Oops! Please enter a valid username to reset password"
msgstr "Geef een geldige gebruikersnaam op om je wachtwoord te herstellen"
#: cps/web.py:1329
#, python-format
-msgid "You are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "Je bent ingelogd als: '%(nickname)s'"
#: cps/web.py:1396 cps/web.py:1445
#, python-format
-msgid "%(name)s's profile"
+msgid "%(name)s's Profile"
msgstr "%(name)ss profiel"
#: cps/web.py:1412
-msgid "Profile updated"
+msgid Success! Profile updated"
msgstr "Profiel bijgewerkt"
#: cps/services/gmail.py:58
@@ -1493,12 +1493,12 @@ msgstr "Gebruikersnaam"
#: cps/templates/admin.html:14 cps/templates/register.html:14
#: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
-msgid "E-mail Address"
+msgid "Email"
msgstr "E-mailadres"
#: cps/templates/admin.html:15 cps/templates/user_edit.html:28
#, fuzzy
-msgid "Send to E-Reader E-mail Address"
+msgid "Send to eReader Email"
msgstr "Kindle-e-mailadres"
#: cps/templates/admin.html:17 cps/templates/layout.html:91
@@ -1546,7 +1546,7 @@ msgid "Import LDAP Users"
msgstr "LDAP gebruikers importeren"
#: cps/templates/admin.html:62
-msgid "E-mail Server Settings"
+msgid "Email Server Settings"
msgstr "SMTP-serverinstellingen"
#: cps/templates/admin.html:67 cps/templates/email_edit.html:31
@@ -1567,12 +1567,12 @@ msgstr "SMTP-gebruikersnaam"
#: cps/templates/admin.html:83 cps/templates/admin.html:94
#: cps/templates/email_edit.html:55
-msgid "From E-mail"
+msgid "From Email"
msgstr "Van e-mail"
#: cps/templates/admin.html:90
-msgid "E-Mail Service"
-msgstr "E-Mail Service"
+msgid "EMail Service"
+msgstr "EMail Service"
#: cps/templates/admin.html:91
msgid "Gmail via Oauth2"
@@ -1644,15 +1644,15 @@ msgid "Scheduled Tasks"
msgstr ""
#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
-msgid "Time at which tasks start to run"
+msgid "Start Time"
msgstr ""
#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
-msgid "Maximum tasks duration"
+msgid "Maximum Duration"
msgstr ""
#: cps/templates/admin.html:178
-msgid "Generate book cover thumbnails"
+msgid "Generate Thumbnails"
msgstr ""
#: cps/templates/admin.html:182
@@ -1660,11 +1660,11 @@ msgid "Generate series cover thumbnails"
msgstr ""
#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
-msgid "Reconnect to Calibre Library"
+msgid "Reconnect Calibre Database"
msgstr ""
#: cps/templates/admin.html:193
-msgid "Refresh Thumbnail Cover Cache"
+msgid "Refresh Thumbnail Cache"
msgstr ""
#: cps/templates/admin.html:199
@@ -1704,7 +1704,7 @@ msgid "Details"
msgstr "Details"
#: cps/templates/admin.html:227
-msgid "Current version"
+msgid "Current Version"
msgstr "Huidige versie"
#: cps/templates/admin.html:234
@@ -2181,7 +2181,7 @@ msgid "Enable Public Registration"
msgstr "Openbare registratie inschakelen"
#: cps/templates/config_edit.html:127
-msgid "Use E-Mail as Username"
+msgid "Use Email as Username"
msgstr "Gebruik e-mail als inlognaam"
#: cps/templates/config_edit.html:132
@@ -2536,7 +2536,7 @@ msgid "Edit Metadata"
msgstr "Metagegevens bewerken"
#: cps/templates/email_edit.html:13
-msgid "Choose Server Type"
+msgid "Email Account Type"
msgstr "Kies Server Type"
#: cps/templates/email_edit.html:15
@@ -3071,7 +3071,7 @@ msgid "Choose a username"
msgstr "Kies een gebruikersnaam"
#: cps/templates/register.html:15
-msgid "Your email address"
+msgid "Your Email"
msgstr "Je e-mailadres"
#: cps/templates/remote_login.html:5
@@ -3091,7 +3091,7 @@ msgid "This verification link will expire in 10 minutes."
msgstr "De link vervalt na 10 minuten."
#: cps/templates/schedule_edit.html:29
-msgid "Generate Book Cover Thumbnails"
+msgid "Generate Thumbnails"
msgstr ""
#: cps/templates/schedule_edit.html:33
@@ -3324,12 +3324,12 @@ msgid "Enter Username"
msgstr "Voer gebruikersnaam in"
#: cps/templates/user_table.html:135
-msgid "Enter E-mail Address"
+msgid "Enter Email Address"
msgstr "Voer e-mailadres in"
#: cps/templates/user_table.html:136
#, fuzzy
-msgid "Enter E-Reader E-mail Address"
+msgid "Enter E-Reader Email Address"
msgstr "Voer Kindle-e-mailadres in"
#: cps/templates/user_table.html:136
diff --git a/cps/translations/pl/LC_MESSAGES/messages.po b/cps/translations/pl/LC_MESSAGES/messages.po
index 30c64f7d..cf351cf5 100644
--- a/cps/translations/pl/LC_MESSAGES/messages.po
+++ b/cps/translations/pl/LC_MESSAGES/messages.po
@@ -285,7 +285,7 @@ msgid "Add new user"
msgstr "Dodaj nowego użytkownika"
#: cps/admin.py:1268 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
+msgid "Edit Email Server Settings"
msgstr "Zmień ustawienia SMTP"
#: cps/admin.py:1287
@@ -298,7 +298,7 @@ msgstr "Weryfikacja konta Gmail przebiegła pomyślnie"
#: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
#, python-format
-msgid "Database error: %(error)s."
+msgid "Oops! Database Error: %(error)s."
msgstr "Błąd bazy danych: %(error)s."
#: cps/admin.py:1316
@@ -316,7 +316,7 @@ msgid "Please configure your e-mail address first..."
msgstr "Najpierw skonfiguruj swój adres e-mail..."
#: cps/admin.py:1323
-msgid "E-mail server settings updated"
+msgid "Email Server Settings updated"
msgstr "Zaktualizowano ustawienia serwera poczty e-mail"
#: cps/admin.py:1346 cps/templates/admin.html:191
@@ -337,7 +337,7 @@ msgstr ""
#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
#: cps/web.py:1320
-msgid "An unknown error occurred. Please try again later."
+msgid "Oops! An unknown error occurred. Please try again later."
msgstr "Wystąpił nieznany błąd. Spróbuj ponownie później."
#: cps/admin.py:1386
@@ -356,7 +356,7 @@ msgid "Password for user %(user)s reset"
msgstr "Zrestartowano hasło użytkownika %(user)s"
#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first..."
+msgid "Please configure the SMTP mail settings first."
msgstr "Proszę najpierw skonfigurować ustawienia SMTP poczty e-mail..."
#: cps/admin.py:1445
@@ -474,7 +474,7 @@ msgid "Database Configuration"
msgstr "Konfiguracja bazy danych"
#: cps/admin.py:1871 cps/web.py:1233
-msgid "Please fill out all fields!"
+msgid "Oops! Please complete all fields."
msgstr "Proszę wypełnić wszystkie pola!"
#: cps/admin.py:1879
@@ -487,7 +487,7 @@ msgid "User '%(user)s' created"
msgstr "Użytkownik '%(user)s' został utworzony"
#: cps/admin.py:1902
-msgid "Found an existing account for this e-mail address or name."
+msgid "Oops! An account already exists for this Email. or name."
msgstr "Znaleziono istniejące konto dla tego adresu e-mail lub nazwy."
#: cps/admin.py:1932
@@ -505,7 +505,7 @@ msgid "No admin user remaining, can't delete user"
msgstr "Nie można usunąć użytkownika. Brak na serwerze innego konta z prawami administratora"
#: cps/admin.py:1992 cps/web.py:1371
-msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
+msgid "Email can't be empty and has to be a valid Email"
msgstr ""
#: cps/admin.py:2018
@@ -535,7 +535,7 @@ msgstr "Brak"
#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
#: cps/web.py:1504 cps/web.py:1549
-msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
msgstr "Błąd otwierania e-booka. Plik nie istnieje lub jest niedostępny"
#: cps/editbooks.py:154 cps/editbooks.py:1221
@@ -667,7 +667,7 @@ msgstr "%(format)s nie znaleziono: %(fn)s"
#: cps/helper.py:97 cps/helper.py:226 cps/templates/detail.html:42
#: cps/templates/detail.html:46
#, fuzzy
-msgid "Send to E-Reader"
+msgid "Send to eReader"
msgstr "Wyślij do Kindle"
#: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
@@ -756,7 +756,7 @@ msgid "Book path %(path)s not found on Google Drive"
msgstr "Nie znaleziono ścieżki do książki %(path)s na Google Drive"
#: cps/helper.py:644 cps/web.py:1416
-msgid "Found an existing account for this e-mail address"
+msgid "Oops! An account already exists for this Email."
msgstr "Znaleziono istniejące konto dla tego adresu e-mail"
#: cps/helper.py:652
@@ -838,7 +838,7 @@ msgstr "Zarejestruj się %(provider)s"
#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "zalogowałeś się jako: '%(nickname)s'"
#: cps/oauth_bb.py:148
@@ -1336,20 +1336,20 @@ msgstr "Lista formatów"
#: cps/web.py:1203
#, python-format
-msgid "Book successfully queued for sending to %(kindlemail)s"
+msgid "Success! Book queued for sending to %(eReadermail)s"
msgstr "Książka została umieszczona w kolejce do wysłania do %(kindlemail)s"
#: cps/web.py:1207
#, python-format
-msgid "Oops! There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending book: %(res)s"
msgstr "Wystąpił błąd podczas wysyłania tej książki: %(res)s"
#: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle E-mail Address."
+msgid "Please update your profile with a valid Send to Kindle Email Address."
msgstr "Najpierw skonfiguruj adres e-mail Kindle..."
#: cps/web.py:1226
-msgid "E-Mail server is not configured, please contact your administrator!"
+msgid "Oops! Email server is not configured, please contact your administrator."
msgstr "Serwer e-mail nie jest skonfigurowany, skontaktuj się z administratorem!"
#: cps/templates/layout.html:68 cps/templates/layout.html:102
@@ -1360,51 +1360,51 @@ msgid "Register"
msgstr "Zarejestruj się"
#: cps/web.py:1262
-msgid "Your e-mail is not allowed to register"
+msgid "Oops! Your Email is not allowed."
msgstr "Twój e-mail nie może się zarejestrować"
#: cps/web.py:1266
-msgid "Confirmation e-mail was send to your e-mail account."
+msgid "Success! Confirmation Email has been sent."
msgstr "Wiadomość e-mail z potwierdzeniem została wysłana na Twoje konto e-mail."
#: cps/web.py:1280
-msgid "Cannot activate LDAP authentication"
+msgid "Oops! Cannot activate LDAP authentication"
msgstr "Nie można aktywować uwierzytelniania LDAP"
#: cps/web.py:1299
#, python-format
-msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
-msgstr "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
+msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
+msgstr "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
#: cps/web.py:1305
#, python-format
-msgid "Could not login: %(message)s"
+msgid "Oops! Login Failed: %(message)s"
msgstr "Nie można zalogować: %(message)s"
#: cps/web.py:1309 cps/web.py:1334
-msgid "Wrong Username or Password"
+msgid "Oops! Invalid Username or Password."
msgstr "Błędna nazwa użytkownika lub hasło"
#: cps/web.py:1316
-msgid "New Password was send to your email address"
+msgid "Success! New Password was sent to your Email."
msgstr "Nowe hasło zostało wysłane na Twój adres e-mail"
#: cps/web.py:1322
-msgid "Please enter valid username to reset password"
+msgid "Oops! Please enter a valid username to reset password"
msgstr "Wprowadź prawidłową nazwę użytkownika, aby zresetować hasło"
#: cps/web.py:1329
#, python-format
-msgid "You are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "Jesteś teraz zalogowany jako: '%(nickname)s'"
#: cps/web.py:1396 cps/web.py:1445
#, python-format
-msgid "%(name)s's profile"
+msgid "%(name)s's Profile"
msgstr "Profil użytkownika %(name)s"
#: cps/web.py:1412
-msgid "Profile updated"
+msgid Success! Profile updated"
msgstr "Zaktualizowano profil"
#: cps/services/gmail.py:58
@@ -1497,12 +1497,12 @@ msgstr "Nazwa użytkownika"
#: cps/templates/admin.html:14 cps/templates/register.html:14
#: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
-msgid "E-mail Address"
+msgid "Email"
msgstr "E-mail"
#: cps/templates/admin.html:15 cps/templates/user_edit.html:28
#, fuzzy
-msgid "Send to E-Reader E-mail Address"
+msgid "Send to eReader Email"
msgstr "Adres e-mail dla wysyłania do Kindle"
# ???
@@ -1553,7 +1553,7 @@ msgid "Import LDAP Users"
msgstr "Importuj użytkowników LDAP"
#: cps/templates/admin.html:62
-msgid "E-mail Server Settings"
+msgid "Email Server Settings"
msgstr "Ustawienia serwera e-mail SMTP"
#: cps/templates/admin.html:67 cps/templates/email_edit.html:31
@@ -1574,11 +1574,11 @@ msgstr "Nazwa użytkownika SMTP"
#: cps/templates/admin.html:83 cps/templates/admin.html:94
#: cps/templates/email_edit.html:55
-msgid "From E-mail"
+msgid "From Email"
msgstr "Wyślij z adresu e-mail"
#: cps/templates/admin.html:90
-msgid "E-Mail Service"
+msgid "EMail Service"
msgstr "Usługa e-mail"
#: cps/templates/admin.html:91
@@ -1650,15 +1650,15 @@ msgid "Scheduled Tasks"
msgstr ""
#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
-msgid "Time at which tasks start to run"
+msgid "Start Time"
msgstr ""
#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
-msgid "Maximum tasks duration"
+msgid "Maximum Duration"
msgstr ""
#: cps/templates/admin.html:178
-msgid "Generate book cover thumbnails"
+msgid "Generate Thumbnails"
msgstr ""
#: cps/templates/admin.html:182
@@ -1666,11 +1666,11 @@ msgid "Generate series cover thumbnails"
msgstr ""
#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
-msgid "Reconnect to Calibre Library"
+msgid "Reconnect Calibre Database"
msgstr ""
#: cps/templates/admin.html:193
-msgid "Refresh Thumbnail Cover Cache"
+msgid "Refresh Thumbnail Cache"
msgstr ""
#: cps/templates/admin.html:199
@@ -1710,7 +1710,7 @@ msgid "Details"
msgstr "Szczegóły"
#: cps/templates/admin.html:227
-msgid "Current version"
+msgid "Current Version"
msgstr "Bieżąca wersja"
#: cps/templates/admin.html:234
@@ -2193,7 +2193,7 @@ msgid "Enable Public Registration"
msgstr "Włącz publiczną rejestrację"
#: cps/templates/config_edit.html:127
-msgid "Use E-Mail as Username"
+msgid "Use Email as Username"
msgstr "Użyj e-maila jako nazwy użytkownika"
#: cps/templates/config_edit.html:132
@@ -2548,7 +2548,7 @@ msgid "Edit Metadata"
msgstr "Edytuj metadane"
#: cps/templates/email_edit.html:13
-msgid "Choose Server Type"
+msgid "Email Account Type"
msgstr "Wybierz typ serwera"
#: cps/templates/email_edit.html:15
@@ -3087,7 +3087,7 @@ msgid "Choose a username"
msgstr "Wybierz nazwę użytkownika"
#: cps/templates/register.html:15
-msgid "Your email address"
+msgid "Your Email"
msgstr "Twój adres e-mail"
#: cps/templates/remote_login.html:5
@@ -3107,7 +3107,7 @@ msgid "This verification link will expire in 10 minutes."
msgstr "Link wygaśnie po 10 minutach."
#: cps/templates/schedule_edit.html:29
-msgid "Generate Book Cover Thumbnails"
+msgid "Generate Thumbnails"
msgstr ""
#: cps/templates/schedule_edit.html:33
@@ -3340,12 +3340,12 @@ msgid "Enter Username"
msgstr "Wprowadź nazwę użytkownika"
#: cps/templates/user_table.html:135
-msgid "Enter E-mail Address"
+msgid "Enter Email Address"
msgstr "Wpisz adres e-mail"
#: cps/templates/user_table.html:136
#, fuzzy
-msgid "Enter E-Reader E-mail Address"
+msgid "Enter E-Reader Email Address"
msgstr "Wprowadź adres e-mail Kindle"
#: cps/templates/user_table.html:136
diff --git a/cps/translations/pt_BR/LC_MESSAGES/messages.po b/cps/translations/pt_BR/LC_MESSAGES/messages.po
index bbe01e1f..581148e6 100644
--- a/cps/translations/pt_BR/LC_MESSAGES/messages.po
+++ b/cps/translations/pt_BR/LC_MESSAGES/messages.po
@@ -276,7 +276,7 @@ msgid "Add new user"
msgstr "Adicionar novo usuário"
#: cps/admin.py:1268 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
+msgid "Edit Email Server Settings"
msgstr "Editar configurações do servidor de e-mail"
#: cps/admin.py:1287
@@ -289,7 +289,7 @@ msgstr "Verificação da Conta Gmail com Sucesso"
#: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
#, python-format
-msgid "Database error: %(error)s."
+msgid "Oops! Database Error: %(error)s."
msgstr "Erro de banco de dados: %(error)s."
#: cps/admin.py:1316
@@ -307,7 +307,7 @@ msgid "Please configure your e-mail address first..."
msgstr "Por favor, configure seu endereço de e-mail primeiro..."
#: cps/admin.py:1323
-msgid "E-mail server settings updated"
+msgid "Email Server Settings updated"
msgstr "Atualização das configurações do servidor de e-mail"
#: cps/admin.py:1346 cps/templates/admin.html:191
@@ -328,7 +328,7 @@ msgstr "Configurações de tarefas agendadas atualizadas"
#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
#: cps/web.py:1320
-msgid "An unknown error occurred. Please try again later."
+msgid "Oops! An unknown error occurred. Please try again later."
msgstr "Ocorreu um erro desconhecido. Por favor, tente novamente mais tarde."
#: cps/admin.py:1386
@@ -346,7 +346,7 @@ msgid "Password for user %(user)s reset"
msgstr "Senha do usuário %(user)s redefinida"
#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first..."
+msgid "Please configure the SMTP mail settings first."
msgstr "Por favor, configure primeiro as configurações de correio SMTP..."
#: cps/admin.py:1445
@@ -460,7 +460,7 @@ msgid "Database Configuration"
msgstr "Configuração do Banco de Dados"
#: cps/admin.py:1871 cps/web.py:1233
-msgid "Please fill out all fields!"
+msgid "Oops! Please complete all fields."
msgstr "Por favor, preencha todos os campos!"
#: cps/admin.py:1879
@@ -473,7 +473,7 @@ msgid "User '%(user)s' created"
msgstr "Usuário '%(user)s' criado"
#: cps/admin.py:1902
-msgid "Found an existing account for this e-mail address or name."
+msgid "Oops! An account already exists for this Email. or name."
msgstr "Encontrada uma conta existente para este endereço de e-mail ou apelido."
#: cps/admin.py:1932
@@ -490,7 +490,7 @@ msgid "No admin user remaining, can't delete user"
msgstr "Nenhum usuário administrador restante, não é possível apagar o usuário"
#: cps/admin.py:1992 cps/web.py:1371
-msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
+msgid "Email can't be empty and has to be a valid Email"
msgstr ""
#: cps/admin.py:2018
@@ -520,7 +520,7 @@ msgstr "Nenhum"
#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
#: cps/web.py:1504 cps/web.py:1549
-msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
msgstr "Oops! O Livro selecionado não está disponível. O arquivo não existe ou não é acessível"
#: cps/editbooks.py:154 cps/editbooks.py:1221
@@ -651,7 +651,7 @@ msgstr "%(format)s não encontrado: %(fn)s"
#: cps/helper.py:97 cps/helper.py:226 cps/templates/detail.html:42
#: cps/templates/detail.html:46
-msgid "Send to E-Reader"
+msgid "Send to eReader"
msgstr "Enviar para E-Reader"
#: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
@@ -738,7 +738,7 @@ msgid "Book path %(path)s not found on Google Drive"
msgstr "Caminho do livro %(path)s não encontrado no Google Drive"
#: cps/helper.py:644 cps/web.py:1416
-msgid "Found an existing account for this e-mail address"
+msgid "Oops! An account already exists for this Email."
msgstr "Encontrada uma conta existente para este endereço de e-mail."
#: cps/helper.py:652
@@ -818,7 +818,7 @@ msgstr "Registre-se com %(provider)s"
#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "agora você está logado como: '%(nickname)s'"
#: cps/oauth_bb.py:148
@@ -1312,20 +1312,20 @@ msgstr "Lista de formatos de arquivo"
#: cps/web.py:1203
#, python-format
-msgid "Book successfully queued for sending to %(kindlemail)s"
+msgid "Success! Book queued for sending to %(eReadermail)s"
msgstr "Livro enfileirado com sucesso para envio para %(kindlemail)s"
#: cps/web.py:1207
#, python-format
-msgid "Oops! There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending book: %(res)s"
msgstr "Ops! Ocorreu um erro ao enviar este livro: %(res)s"
#: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle E-mail Address."
+msgid "Please update your profile with a valid Send to Kindle Email Address."
msgstr "Por favor, atualize seu perfil com um endereço de e-mail Envie Para o Kindle válido."
#: cps/web.py:1226
-msgid "E-Mail server is not configured, please contact your administrator!"
+msgid "Oops! Email server is not configured, please contact your administrator."
msgstr "O servidor de E-Mail não está configurado, por favor contacte o seu administrador!"
#: cps/templates/layout.html:68 cps/templates/layout.html:102
@@ -1336,51 +1336,51 @@ msgid "Register"
msgstr "Registe-se"
#: cps/web.py:1262
-msgid "Your e-mail is not allowed to register"
+msgid "Oops! Your Email is not allowed."
msgstr "Seu e-mail não tem permissão para registrar"
#: cps/web.py:1266
-msgid "Confirmation e-mail was send to your e-mail account."
+msgid "Success! Confirmation Email has been sent."
msgstr "O e-mail de confirmação foi enviado para a sua conta de e-mail."
#: cps/web.py:1280
-msgid "Cannot activate LDAP authentication"
+msgid "Oops! Cannot activate LDAP authentication"
msgstr "Não é possível ativar a autenticação LDAP"
#: cps/web.py:1299
#, python-format
-msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
+msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
msgstr "Login de reserva como:'%(nickname)s', servidor LDAP não acessível ou usuário desconhecido"
#: cps/web.py:1305
#, python-format
-msgid "Could not login: %(message)s"
+msgid "Oops! Login Failed: %(message)s"
msgstr "Não foi possível fazer o login: %(message)s"
#: cps/web.py:1309 cps/web.py:1334
-msgid "Wrong Username or Password"
+msgid "Oops! Invalid Username or Password."
msgstr "Nome de Usuário ou Senha incorretos"
#: cps/web.py:1316
-msgid "New Password was send to your email address"
+msgid "Success! New Password was sent to your Email."
msgstr "Nova Senha foi enviada para seu endereço de e-mail"
#: cps/web.py:1322
-msgid "Please enter valid username to reset password"
+msgid "Oops! Please enter a valid username to reset password"
msgstr "Por favor, digite um nome de usuário válido para redefinir a senha"
#: cps/web.py:1329
#, python-format
-msgid "You are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "Você agora está logado como: '%(nickname)s'"
#: cps/web.py:1396 cps/web.py:1445
#, python-format
-msgid "%(name)s's profile"
+msgid "%(name)s's Profile"
msgstr "Perfil de %(name)s"
#: cps/web.py:1412
-msgid "Profile updated"
+msgid Success! Profile updated"
msgstr "Perfil atualizado"
#: cps/services/gmail.py:58
@@ -1473,11 +1473,11 @@ msgstr "Nome de usuário"
#: cps/templates/admin.html:14 cps/templates/register.html:14
#: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
-msgid "E-mail Address"
+msgid "Email"
msgstr "Endereço de e-mail"
#: cps/templates/admin.html:15 cps/templates/user_edit.html:28
-msgid "Send to E-Reader E-mail Address"
+msgid "Send to eReader Email"
msgstr "Enviar para o endereço de e-mail do E-Reader"
#: cps/templates/admin.html:17 cps/templates/layout.html:91
@@ -1525,7 +1525,7 @@ msgid "Import LDAP Users"
msgstr "Importar usuários LDAP"
#: cps/templates/admin.html:62
-msgid "E-mail Server Settings"
+msgid "Email Server Settings"
msgstr "Configurações do servidor de e-mail"
#: cps/templates/admin.html:67 cps/templates/email_edit.html:31
@@ -1546,11 +1546,11 @@ msgstr "Login SMTP"
#: cps/templates/admin.html:83 cps/templates/admin.html:94
#: cps/templates/email_edit.html:55
-msgid "From E-mail"
+msgid "From Email"
msgstr "Do E-mail"
#: cps/templates/admin.html:90
-msgid "E-Mail Service"
+msgid "EMail Service"
msgstr "Serviço de E-Mail"
#: cps/templates/admin.html:91
@@ -1622,15 +1622,15 @@ msgid "Scheduled Tasks"
msgstr "Tarefas Agendadas"
#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
-msgid "Time at which tasks start to run"
+msgid "Start Time"
msgstr "Hora em que as tarefas começam a ser executadas"
#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
-msgid "Maximum tasks duration"
+msgid "Maximum Duration"
msgstr "Duração máxima das tarefas"
#: cps/templates/admin.html:178
-msgid "Generate book cover thumbnails"
+msgid "Generate Thumbnails"
msgstr "Gerar miniaturas de capa de livro"
#: cps/templates/admin.html:182
@@ -1638,11 +1638,11 @@ msgid "Generate series cover thumbnails"
msgstr "Gerar miniaturas de capa de séries"
#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
-msgid "Reconnect to Calibre Library"
+msgid "Reconnect Calibre Database"
msgstr "Reconectar à Biblioteca do Calibre"
#: cps/templates/admin.html:193
-msgid "Refresh Thumbnail Cover Cache"
+msgid "Refresh Thumbnail Cache"
msgstr "Atualizar Cache de Capas de Miniaturas"
#: cps/templates/admin.html:199
@@ -1682,7 +1682,7 @@ msgid "Details"
msgstr "Detalhes"
#: cps/templates/admin.html:227
-msgid "Current version"
+msgid "Current Version"
msgstr "Versão atual"
#: cps/templates/admin.html:234
@@ -2155,7 +2155,7 @@ msgid "Enable Public Registration"
msgstr "Habilitar Registro Público"
#: cps/templates/config_edit.html:127
-msgid "Use E-Mail as Username"
+msgid "Use Email as Username"
msgstr "Use e-mail como nome de usuário"
#: cps/templates/config_edit.html:132
@@ -2508,7 +2508,7 @@ msgid "Edit Metadata"
msgstr "Editar Metadados"
#: cps/templates/email_edit.html:13
-msgid "Choose Server Type"
+msgid "Email Account Type"
msgstr "Escolha o Tipo do Servidor"
#: cps/templates/email_edit.html:15
@@ -3034,7 +3034,7 @@ msgid "Choose a username"
msgstr "Escolha um nome de usuário"
#: cps/templates/register.html:15
-msgid "Your email address"
+msgid "Your Email"
msgstr "Seu endereço de e-mail"
#: cps/templates/remote_login.html:5
@@ -3054,7 +3054,7 @@ msgid "This verification link will expire in 10 minutes."
msgstr "Este link de verificação irá expirar em 10 minutos."
#: cps/templates/schedule_edit.html:29
-msgid "Generate Book Cover Thumbnails"
+msgid "Generate Thumbnails"
msgstr "Gerar miniaturas de capa de Livro"
#: cps/templates/schedule_edit.html:33
@@ -3286,11 +3286,11 @@ msgid "Enter Username"
msgstr "Escolha um nome de usuário"
#: cps/templates/user_table.html:135
-msgid "Enter E-mail Address"
+msgid "Enter Email Address"
msgstr "Seu endereço de e-mail"
#: cps/templates/user_table.html:136
-msgid "Enter E-Reader E-mail Address"
+msgid "Enter E-Reader Email Address"
msgstr "Digite o endereço de e-mail do E-Reader"
#: cps/templates/user_table.html:136
diff --git a/cps/translations/ru/LC_MESSAGES/messages.po b/cps/translations/ru/LC_MESSAGES/messages.po
index dbe2db56..47c15e07 100644
--- a/cps/translations/ru/LC_MESSAGES/messages.po
+++ b/cps/translations/ru/LC_MESSAGES/messages.po
@@ -286,7 +286,7 @@ msgid "Add new user"
msgstr "Добавить пользователя"
#: cps/admin.py:1268 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
+msgid "Edit Email Server Settings"
msgstr "Изменить настройки SMTP"
#: cps/admin.py:1287
@@ -299,7 +299,7 @@ msgstr ""
#: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
#, python-format
-msgid "Database error: %(error)s."
+msgid "Oops! Database Error: %(error)s."
msgstr ""
#: cps/admin.py:1316
@@ -317,7 +317,7 @@ msgid "Please configure your e-mail address first..."
msgstr "Пожалуйста, сначала настройте свой адрес электронной почты ..."
#: cps/admin.py:1323
-msgid "E-mail server settings updated"
+msgid "Email Server Settings updated"
msgstr "Настройки E-mail сервера обновлены"
#: cps/admin.py:1346 cps/templates/admin.html:191
@@ -338,7 +338,7 @@ msgstr ""
#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
#: cps/web.py:1320
-msgid "An unknown error occurred. Please try again later."
+msgid "Oops! An unknown error occurred. Please try again later."
msgstr "Неизвестная ошибка. Попробуйте позже."
#: cps/admin.py:1386
@@ -356,7 +356,7 @@ msgid "Password for user %(user)s reset"
msgstr "Пароль для пользователя %(user)s сброшен"
#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first..."
+msgid "Please configure the SMTP mail settings first."
msgstr "Пожалуйста, сперва настройте параметры SMTP....."
#: cps/admin.py:1445
@@ -474,7 +474,7 @@ msgid "Database Configuration"
msgstr "Дополнительный Настройки"
#: cps/admin.py:1871 cps/web.py:1233
-msgid "Please fill out all fields!"
+msgid "Oops! Please complete all fields."
msgstr "Пожалуйста, заполните все поля!"
#: cps/admin.py:1879
@@ -488,7 +488,7 @@ msgstr "Пользователь '%(user)s' добавлен"
#: cps/admin.py:1902
#, fuzzy
-msgid "Found an existing account for this e-mail address or name."
+msgid "Oops! An account already exists for this Email. or name."
msgstr "Для этого адреса электронной почты или логина уже есть учётная запись."
#: cps/admin.py:1932
@@ -505,7 +505,7 @@ msgid "No admin user remaining, can't delete user"
msgstr "Это последний администратор, невозможно удалить пользователя"
#: cps/admin.py:1992 cps/web.py:1371
-msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
+msgid "Email can't be empty and has to be a valid Email"
msgstr ""
#: cps/admin.py:2018
@@ -535,7 +535,7 @@ msgstr "Нет"
#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
#: cps/web.py:1504 cps/web.py:1549
-msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
msgstr "Невозможно открыть книгу. Файл не существует или недоступен"
#: cps/editbooks.py:154 cps/editbooks.py:1221
@@ -667,7 +667,7 @@ msgstr "%(format)s не найден: %(fn)s"
#: cps/helper.py:97 cps/helper.py:226 cps/templates/detail.html:42
#: cps/templates/detail.html:46
#, fuzzy
-msgid "Send to E-Reader"
+msgid "Send to eReader"
msgstr "Отправить на Kindle"
#: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
@@ -755,7 +755,7 @@ msgstr "Путь книги %(path)s не найден на Google Drive"
#: cps/helper.py:644 cps/web.py:1416
#, fuzzy
-msgid "Found an existing account for this e-mail address"
+msgid "Oops! An account already exists for this Email."
msgstr "Этот адрес электронной почты уже зарегистрирован."
#: cps/helper.py:652
@@ -835,7 +835,7 @@ msgstr "Зарегистрируйтесь с %(provider)s"
#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "вы вошли как пользователь '%(nickname)s'"
#: cps/oauth_bb.py:148
@@ -1332,20 +1332,20 @@ msgstr "Список форматов файлов"
#: cps/web.py:1203
#, python-format
-msgid "Book successfully queued for sending to %(kindlemail)s"
+msgid "Success! Book queued for sending to %(eReadermail)s"
msgstr "Книга успешно поставлена в очередь для отправки на %(kindlemail)s"
#: cps/web.py:1207
#, python-format
-msgid "Oops! There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending book: %(res)s"
msgstr "При отправке этой книги произошла ошибка: %(res)s"
#: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle E-mail Address."
+msgid "Please update your profile with a valid Send to Kindle Email Address."
msgstr "Пожалуйста, сначала настройте e-mail на вашем kindle..."
#: cps/web.py:1226
-msgid "E-Mail server is not configured, please contact your administrator!"
+msgid "Oops! Email server is not configured, please contact your administrator."
msgstr "Сервер электронной почты не настроен, обратитесь к администратору !"
#: cps/templates/layout.html:68 cps/templates/layout.html:102
@@ -1356,51 +1356,51 @@ msgid "Register"
msgstr "Зарегистрироваться"
#: cps/web.py:1262
-msgid "Your e-mail is not allowed to register"
+msgid "Oops! Your Email is not allowed."
msgstr "Ваш e-mail не подходит для регистрации"
#: cps/web.py:1266
-msgid "Confirmation e-mail was send to your e-mail account."
+msgid "Success! Confirmation Email has been sent."
msgstr "Письмо с подтверждением отправлено вам на e-mail."
#: cps/web.py:1280
-msgid "Cannot activate LDAP authentication"
+msgid "Oops! Cannot activate LDAP authentication"
msgstr "Не удается активировать LDAP аутентификацию"
#: cps/web.py:1299
#, python-format
-msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
+msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
msgstr "Резервный вход в систему как: '%(nickname)s', LDAP-сервер недоступен или пользователь не известен"
#: cps/web.py:1305
#, python-format
-msgid "Could not login: %(message)s"
+msgid "Oops! Login Failed: %(message)s"
msgstr "Не удалось войти: %(message)s"
#: cps/web.py:1309 cps/web.py:1334
-msgid "Wrong Username or Password"
+msgid "Oops! Invalid Username or Password."
msgstr "Ошибка в имени пользователя или пароле"
#: cps/web.py:1316
-msgid "New Password was send to your email address"
+msgid "Success! New Password was sent to your Email."
msgstr "Новый пароль был отправлен на ваш адрес электронной почты"
#: cps/web.py:1322
-msgid "Please enter valid username to reset password"
+msgid "Oops! Please enter a valid username to reset password"
msgstr "Пожалуйста, введите действительное имя пользователя для сброса пароля"
#: cps/web.py:1329
#, python-format
-msgid "You are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "Вы вошли как: '%(nickname)s'"
#: cps/web.py:1396 cps/web.py:1445
#, python-format
-msgid "%(name)s's profile"
+msgid "%(name)s's Profile"
msgstr "Профиль %(name)s's"
#: cps/web.py:1412
-msgid "Profile updated"
+msgid Success! Profile updated"
msgstr "Профиль обновлён"
#: cps/services/gmail.py:58
@@ -1493,12 +1493,12 @@ msgstr "Имя пользователя"
#: cps/templates/admin.html:14 cps/templates/register.html:14
#: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
-msgid "E-mail Address"
+msgid "Email"
msgstr "Адрес электронной почты"
#: cps/templates/admin.html:15 cps/templates/user_edit.html:28
#, fuzzy
-msgid "Send to E-Reader E-mail Address"
+msgid "Send to eReader Email"
msgstr "Отправить на Kindle Адрес электронной почты"
#: cps/templates/admin.html:17 cps/templates/layout.html:91
@@ -1546,7 +1546,7 @@ msgid "Import LDAP Users"
msgstr "Импорт пользователей LDAP"
#: cps/templates/admin.html:62
-msgid "E-mail Server Settings"
+msgid "Email Server Settings"
msgstr "Настройки SMTP-сервера"
#: cps/templates/admin.html:67 cps/templates/email_edit.html:31
@@ -1567,11 +1567,11 @@ msgstr "SMTP-логин"
#: cps/templates/admin.html:83 cps/templates/admin.html:94
#: cps/templates/email_edit.html:55
-msgid "From E-mail"
+msgid "From Email"
msgstr "Отправитель"
#: cps/templates/admin.html:90
-msgid "E-Mail Service"
+msgid "EMail Service"
msgstr ""
#: cps/templates/admin.html:91
@@ -1644,15 +1644,15 @@ msgid "Scheduled Tasks"
msgstr ""
#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
-msgid "Time at which tasks start to run"
+msgid "Start Time"
msgstr ""
#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
-msgid "Maximum tasks duration"
+msgid "Maximum Duration"
msgstr ""
#: cps/templates/admin.html:178
-msgid "Generate book cover thumbnails"
+msgid "Generate Thumbnails"
msgstr ""
#: cps/templates/admin.html:182
@@ -1660,11 +1660,11 @@ msgid "Generate series cover thumbnails"
msgstr ""
#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
-msgid "Reconnect to Calibre Library"
+msgid "Reconnect Calibre Database"
msgstr ""
#: cps/templates/admin.html:193
-msgid "Refresh Thumbnail Cover Cache"
+msgid "Refresh Thumbnail Cache"
msgstr ""
#: cps/templates/admin.html:199
@@ -1704,7 +1704,7 @@ msgid "Details"
msgstr "Подробности"
#: cps/templates/admin.html:227
-msgid "Current version"
+msgid "Current Version"
msgstr "Текущая версия"
#: cps/templates/admin.html:234
@@ -2181,7 +2181,7 @@ msgid "Enable Public Registration"
msgstr "Разрешить публичную регистрацию"
#: cps/templates/config_edit.html:127
-msgid "Use E-Mail as Username"
+msgid "Use Email as Username"
msgstr ""
#: cps/templates/config_edit.html:132
@@ -2536,7 +2536,7 @@ msgid "Edit Metadata"
msgstr "Редактировать метаданные"
#: cps/templates/email_edit.html:13
-msgid "Choose Server Type"
+msgid "Email Account Type"
msgstr ""
#: cps/templates/email_edit.html:15
@@ -3071,7 +3071,7 @@ msgid "Choose a username"
msgstr "Выберите имя пользователя"
#: cps/templates/register.html:15
-msgid "Your email address"
+msgid "Your Email"
msgstr "Ваш email-адрес"
#: cps/templates/remote_login.html:5
@@ -3091,7 +3091,7 @@ msgid "This verification link will expire in 10 minutes."
msgstr "Срок действия ссылки истекает через 10 минут."
#: cps/templates/schedule_edit.html:29
-msgid "Generate Book Cover Thumbnails"
+msgid "Generate Thumbnails"
msgstr ""
#: cps/templates/schedule_edit.html:33
@@ -3327,12 +3327,12 @@ msgstr "Выберите имя пользователя"
#: cps/templates/user_table.html:135
#, fuzzy
-msgid "Enter E-mail Address"
+msgid "Enter Email Address"
msgstr "Ваш email-адрес"
#: cps/templates/user_table.html:136
#, fuzzy
-msgid "Enter E-Reader E-mail Address"
+msgid "Enter E-Reader Email Address"
msgstr "Отправить на Kindle Адрес электронной почты"
#: cps/templates/user_table.html:136
diff --git a/cps/translations/sv/LC_MESSAGES/messages.po b/cps/translations/sv/LC_MESSAGES/messages.po
index b592ea8b..f8aab418 100644
--- a/cps/translations/sv/LC_MESSAGES/messages.po
+++ b/cps/translations/sv/LC_MESSAGES/messages.po
@@ -283,7 +283,7 @@ msgid "Add new user"
msgstr "Lägg till ny användare"
#: cps/admin.py:1268 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
+msgid "Edit Email Server Settings"
msgstr "Ändra SMTP-inställningar"
#: cps/admin.py:1287
@@ -297,7 +297,7 @@ msgstr "Verifiering av G-mail-kontot lyckades"
#: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
#, python-format
-msgid "Database error: %(error)s."
+msgid "Oops! Database Error: %(error)s."
msgstr "Databasfel: %(error)s."
#: cps/admin.py:1316
@@ -315,7 +315,7 @@ msgid "Please configure your e-mail address first..."
msgstr "Vänligen konfigurera din e-postadress först..."
#: cps/admin.py:1323
-msgid "E-mail server settings updated"
+msgid "Email Server Settings updated"
msgstr "E-postserverinställningar uppdaterade"
#: cps/admin.py:1346 cps/templates/admin.html:191
@@ -336,7 +336,7 @@ msgstr ""
#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
#: cps/web.py:1320
-msgid "An unknown error occurred. Please try again later."
+msgid "Oops! An unknown error occurred. Please try again later."
msgstr "Ett okänt fel uppstod. Försök igen senare."
#: cps/admin.py:1386
@@ -354,7 +354,7 @@ msgid "Password for user %(user)s reset"
msgstr "Lösenord för användaren %(user)s återställd"
#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first..."
+msgid "Please configure the SMTP mail settings first."
msgstr "Konfigurera SMTP-postinställningarna först..."
#: cps/admin.py:1445
@@ -472,7 +472,7 @@ msgid "Database Configuration"
msgstr "Funktion konfiguration"
#: cps/admin.py:1871 cps/web.py:1233
-msgid "Please fill out all fields!"
+msgid "Oops! Please complete all fields."
msgstr "Fyll i alla fält!"
#: cps/admin.py:1879
@@ -485,7 +485,7 @@ msgid "User '%(user)s' created"
msgstr "Användaren '%(user)s' skapad"
#: cps/admin.py:1902
-msgid "Found an existing account for this e-mail address or name."
+msgid "Oops! An account already exists for this Email. or name."
msgstr "Hittade ett befintligt konto för den här e-postadressen eller namnet."
#: cps/admin.py:1932
@@ -502,7 +502,7 @@ msgid "No admin user remaining, can't delete user"
msgstr "Ingen adminstratörsanvändare kvar, kan inte ta bort användaren"
#: cps/admin.py:1992 cps/web.py:1371
-msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
+msgid "Email can't be empty and has to be a valid Email"
msgstr ""
#: cps/admin.py:2018
@@ -532,7 +532,7 @@ msgstr "Ingen"
#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
#: cps/web.py:1504 cps/web.py:1549
-msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
msgstr "Hoppsan! Vald boktitel är inte tillgänglig. Filen finns inte eller är inte tillgänglig"
#: cps/editbooks.py:154 cps/editbooks.py:1221
@@ -664,7 +664,7 @@ msgstr "%(format)s hittades inte: %(fn)s"
#: cps/helper.py:97 cps/helper.py:226 cps/templates/detail.html:42
#: cps/templates/detail.html:46
#, fuzzy
-msgid "Send to E-Reader"
+msgid "Send to eReader"
msgstr "Skicka till Kindle"
#: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
@@ -751,7 +751,7 @@ msgid "Book path %(path)s not found on Google Drive"
msgstr "Boksökvägen %(path)s hittades inte på Google Drive"
#: cps/helper.py:644 cps/web.py:1416
-msgid "Found an existing account for this e-mail address"
+msgid "Oops! An account already exists for this Email."
msgstr "Hittade ett befintligt konto för den här e-postadressen"
#: cps/helper.py:652
@@ -832,7 +832,7 @@ msgstr "Registrera dig med %(provider)s"
#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "du är nu inloggad som: \"%(nickname)s\""
#: cps/oauth_bb.py:148
@@ -1329,20 +1329,20 @@ msgstr "Lista över filformat"
#: cps/web.py:1203
#, python-format
-msgid "Book successfully queued for sending to %(kindlemail)s"
+msgid "Success! Book queued for sending to %(eReadermail)s"
msgstr "Boken är i kö för att skicka till %(kindlemail)s"
#: cps/web.py:1207
#, python-format
-msgid "Oops! There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending book: %(res)s"
msgstr "Det gick inte att skicka den här boken: %(res)s"
#: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle E-mail Address."
+msgid "Please update your profile with a valid Send to Kindle Email Address."
msgstr "Konfigurera din kindle-e-postadress först..."
#: cps/web.py:1226
-msgid "E-Mail server is not configured, please contact your administrator!"
+msgid "Oops! Email server is not configured, please contact your administrator."
msgstr "E-postservern är inte konfigurerad, kontakta din administratör!"
#: cps/templates/layout.html:68 cps/templates/layout.html:102
@@ -1353,51 +1353,51 @@ msgid "Register"
msgstr "Registrera"
#: cps/web.py:1262
-msgid "Your e-mail is not allowed to register"
+msgid "Oops! Your Email is not allowed."
msgstr "Din e-post är inte tillåten att registrera"
#: cps/web.py:1266
-msgid "Confirmation e-mail was send to your e-mail account."
+msgid "Success! Confirmation Email has been sent."
msgstr "Bekräftelsemail skickades till ditt e-postkonto."
#: cps/web.py:1280
-msgid "Cannot activate LDAP authentication"
+msgid "Oops! Cannot activate LDAP authentication"
msgstr "Det går inte att aktivera LDAP-autentisering"
#: cps/web.py:1299
#, python-format
-msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
+msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
msgstr ""
#: cps/web.py:1305
#, python-format
-msgid "Could not login: %(message)s"
+msgid "Oops! Login Failed: %(message)s"
msgstr "Det gick inte att logga in: %(message)s"
#: cps/web.py:1309 cps/web.py:1334
-msgid "Wrong Username or Password"
+msgid "Oops! Invalid Username or Password."
msgstr "Fel användarnamn eller lösenord"
#: cps/web.py:1316
-msgid "New Password was send to your email address"
+msgid "Success! New Password was sent to your Email."
msgstr "Nytt lösenord skickades till din e-postadress"
#: cps/web.py:1322
-msgid "Please enter valid username to reset password"
+msgid "Oops! Please enter a valid username to reset password"
msgstr "Ange giltigt användarnamn för att återställa lösenordet"
#: cps/web.py:1329
#, python-format
-msgid "You are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "Du är nu inloggad som: \"%(nickname)s\""
#: cps/web.py:1396 cps/web.py:1445
#, python-format
-msgid "%(name)s's profile"
+msgid "%(name)s's Profile"
msgstr "%(name)ss profil"
#: cps/web.py:1412
-msgid "Profile updated"
+msgid Success! Profile updated"
msgstr "Profilen uppdaterad"
#: cps/services/gmail.py:58
@@ -1490,12 +1490,12 @@ msgstr "Smeknamn"
#: cps/templates/admin.html:14 cps/templates/register.html:14
#: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
-msgid "E-mail Address"
+msgid "Email"
msgstr "E-post"
#: cps/templates/admin.html:15 cps/templates/user_edit.html:28
#, fuzzy
-msgid "Send to E-Reader E-mail Address"
+msgid "Send to eReader Email"
msgstr "Kindle"
#: cps/templates/admin.html:17 cps/templates/layout.html:91
@@ -1543,7 +1543,7 @@ msgid "Import LDAP Users"
msgstr "Importera LDAP-användare"
#: cps/templates/admin.html:62
-msgid "E-mail Server Settings"
+msgid "Email Server Settings"
msgstr "Inställningar för SMTP-e-postserver"
#: cps/templates/admin.html:67 cps/templates/email_edit.html:31
@@ -1564,11 +1564,11 @@ msgstr "SMTP-inloggning"
#: cps/templates/admin.html:83 cps/templates/admin.html:94
#: cps/templates/email_edit.html:55
-msgid "From E-mail"
+msgid "From Email"
msgstr "Från meddelande"
#: cps/templates/admin.html:90
-msgid "E-Mail Service"
+msgid "EMail Service"
msgstr "E-posttjänst"
#: cps/templates/admin.html:91
@@ -1641,15 +1641,15 @@ msgid "Scheduled Tasks"
msgstr ""
#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
-msgid "Time at which tasks start to run"
+msgid "Start Time"
msgstr ""
#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
-msgid "Maximum tasks duration"
+msgid "Maximum Duration"
msgstr ""
#: cps/templates/admin.html:178
-msgid "Generate book cover thumbnails"
+msgid "Generate Thumbnails"
msgstr ""
#: cps/templates/admin.html:182
@@ -1657,11 +1657,11 @@ msgid "Generate series cover thumbnails"
msgstr ""
#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
-msgid "Reconnect to Calibre Library"
+msgid "Reconnect Calibre Database"
msgstr ""
#: cps/templates/admin.html:193
-msgid "Refresh Thumbnail Cover Cache"
+msgid "Refresh Thumbnail Cache"
msgstr ""
#: cps/templates/admin.html:199
@@ -1701,7 +1701,7 @@ msgid "Details"
msgstr "Detaljer"
#: cps/templates/admin.html:227
-msgid "Current version"
+msgid "Current Version"
msgstr "Aktuell version"
#: cps/templates/admin.html:234
@@ -2178,7 +2178,7 @@ msgid "Enable Public Registration"
msgstr "Aktivera offentlig registrering"
#: cps/templates/config_edit.html:127
-msgid "Use E-Mail as Username"
+msgid "Use Email as Username"
msgstr "Använd e-post som användarnamn"
#: cps/templates/config_edit.html:132
@@ -2533,7 +2533,7 @@ msgid "Edit Metadata"
msgstr "Redigera metadata"
#: cps/templates/email_edit.html:13
-msgid "Choose Server Type"
+msgid "Email Account Type"
msgstr "Välj servertyp"
#: cps/templates/email_edit.html:15
@@ -3068,7 +3068,7 @@ msgid "Choose a username"
msgstr "Välj ett användarnamn"
#: cps/templates/register.html:15
-msgid "Your email address"
+msgid "Your Email"
msgstr "Din e-postadress"
#: cps/templates/remote_login.html:5
@@ -3088,7 +3088,7 @@ msgid "This verification link will expire in 10 minutes."
msgstr "Länken går ut efter 10 minuter."
#: cps/templates/schedule_edit.html:29
-msgid "Generate Book Cover Thumbnails"
+msgid "Generate Thumbnails"
msgstr ""
#: cps/templates/schedule_edit.html:33
@@ -3320,12 +3320,12 @@ msgid "Enter Username"
msgstr "Ange användarnamn"
#: cps/templates/user_table.html:135
-msgid "Enter E-mail Address"
+msgid "Enter Email Address"
msgstr "Ange e-postadress"
#: cps/templates/user_table.html:136
#, fuzzy
-msgid "Enter E-Reader E-mail Address"
+msgid "Enter E-Reader Email Address"
msgstr "Ange Kindle e-postadress"
#: cps/templates/user_table.html:136
diff --git a/cps/translations/tr/LC_MESSAGES/messages.po b/cps/translations/tr/LC_MESSAGES/messages.po
index df7fa302..abc5f6e5 100644
--- a/cps/translations/tr/LC_MESSAGES/messages.po
+++ b/cps/translations/tr/LC_MESSAGES/messages.po
@@ -280,7 +280,7 @@ msgid "Add new user"
msgstr "Yeni kullanıcı ekle"
#: cps/admin.py:1268 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
+msgid "Edit Email Server Settings"
msgstr ""
#: cps/admin.py:1287
@@ -293,7 +293,7 @@ msgstr ""
#: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
#, python-format
-msgid "Database error: %(error)s."
+msgid "Oops! Database Error: %(error)s."
msgstr ""
#: cps/admin.py:1316
@@ -311,7 +311,7 @@ msgid "Please configure your e-mail address first..."
msgstr "Lütfen önce e-posta adresinizi ayarlayın..."
#: cps/admin.py:1323
-msgid "E-mail server settings updated"
+msgid "Email Server Settings updated"
msgstr "E-posta sunucusu ayarları güncellendi"
#: cps/admin.py:1346 cps/templates/admin.html:191
@@ -332,7 +332,7 @@ msgstr ""
#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
#: cps/web.py:1320
-msgid "An unknown error occurred. Please try again later."
+msgid "Oops! An unknown error occurred. Please try again later."
msgstr "Bilinmeyen bir hata oluştu. Lütfen daha sonra tekrar deneyiniz."
#: cps/admin.py:1386
@@ -350,7 +350,7 @@ msgid "Password for user %(user)s reset"
msgstr "%(user)s kullanıcısının şifresi sıfırlandı"
#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first..."
+msgid "Please configure the SMTP mail settings first."
msgstr "Lütfen önce SMTP e-posta ayarlarını ayarlayın..."
#: cps/admin.py:1445
@@ -467,7 +467,7 @@ msgid "Database Configuration"
msgstr "Özellik Yapılandırması"
#: cps/admin.py:1871 cps/web.py:1233
-msgid "Please fill out all fields!"
+msgid "Oops! Please complete all fields."
msgstr "Lütfen tüm alanları doldurun!"
#: cps/admin.py:1879
@@ -481,7 +481,7 @@ msgstr "'%(user)s' kullanıcısı oluşturuldu"
#: cps/admin.py:1902
#, fuzzy
-msgid "Found an existing account for this e-mail address or name."
+msgid "Oops! An account already exists for this Email. or name."
msgstr "Bu e-posta adresi veya kullanıcı adı için zaten bir hesap var."
#: cps/admin.py:1932
@@ -498,7 +498,7 @@ msgid "No admin user remaining, can't delete user"
msgstr "Başka yönetici kullanıcı olmadığından silinemedi"
#: cps/admin.py:1992 cps/web.py:1371
-msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
+msgid "Email can't be empty and has to be a valid Email"
msgstr ""
#: cps/admin.py:2018
@@ -528,7 +528,7 @@ msgstr "Hiçbiri"
#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
#: cps/web.py:1504 cps/web.py:1549
-msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
msgstr ""
#: cps/editbooks.py:154 cps/editbooks.py:1221
@@ -660,7 +660,7 @@ msgstr "%(format)s bulunamadı: %(fn)s"
#: cps/helper.py:97 cps/helper.py:226 cps/templates/detail.html:42
#: cps/templates/detail.html:46
#, fuzzy
-msgid "Send to E-Reader"
+msgid "Send to eReader"
msgstr "Kindle'a gönder"
#: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
@@ -748,7 +748,7 @@ msgstr "eKitap yolu %(path)s Google Drive'da bulunamadı"
#: cps/helper.py:644 cps/web.py:1416
#, fuzzy
-msgid "Found an existing account for this e-mail address"
+msgid "Oops! An account already exists for this Email."
msgstr "Bu e-posta adresi için bir hesap mevcut."
#: cps/helper.py:652
@@ -827,7 +827,7 @@ msgstr "%(provider)s ile Kaydol"
#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "giriş yaptınız: '%(nickname)s'"
#: cps/oauth_bb.py:148
@@ -1324,20 +1324,20 @@ msgstr "Biçim listesi"
#: cps/web.py:1203
#, python-format
-msgid "Book successfully queued for sending to %(kindlemail)s"
+msgid "Success! Book queued for sending to %(eReadermail)s"
msgstr "%(kindlemail)s'a gönderilmek üzere başarıyla sıraya alındı"
#: cps/web.py:1207
#, python-format
-msgid "Oops! There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending book: %(res)s"
msgstr ""
#: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle E-mail Address."
+msgid "Please update your profile with a valid Send to Kindle Email Address."
msgstr ""
#: cps/web.py:1226
-msgid "E-Mail server is not configured, please contact your administrator!"
+msgid "Oops! Email server is not configured, please contact your administrator."
msgstr "E-Posta sunucusu ayarlanmadı, lütfen yöneticinizle iletişime geçin!"
#: cps/templates/layout.html:68 cps/templates/layout.html:102
@@ -1348,51 +1348,51 @@ msgid "Register"
msgstr "Kayıt ol"
#: cps/web.py:1262
-msgid "Your e-mail is not allowed to register"
+msgid "Oops! Your Email is not allowed."
msgstr "E-posta adresinizle kaydolunmasına izin verilmiyor"
#: cps/web.py:1266
-msgid "Confirmation e-mail was send to your e-mail account."
+msgid "Success! Confirmation Email has been sent."
msgstr "Onay e-Postası hesabınıza gönderildi."
#: cps/web.py:1280
-msgid "Cannot activate LDAP authentication"
+msgid "Oops! Cannot activate LDAP authentication"
msgstr "LDAP Kimlik Doğrulaması etkinleştirilemiyor"
#: cps/web.py:1299
#, python-format
-msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
+msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
msgstr ""
#: cps/web.py:1305
#, python-format
-msgid "Could not login: %(message)s"
+msgid "Oops! Login Failed: %(message)s"
msgstr ""
#: cps/web.py:1309 cps/web.py:1334
-msgid "Wrong Username or Password"
+msgid "Oops! Invalid Username or Password."
msgstr "Yanlış Kullanıcı adı ya da Şifre"
#: cps/web.py:1316
-msgid "New Password was send to your email address"
+msgid "Success! New Password was sent to your Email."
msgstr "Yeni şifre e-Posta adresinize gönderildi"
#: cps/web.py:1322
-msgid "Please enter valid username to reset password"
+msgid "Oops! Please enter a valid username to reset password"
msgstr "Şifrenizi sıfırlayabilmek için lütfen geçerli bir kullanıcı adı giriniz"
#: cps/web.py:1329
#, python-format
-msgid "You are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "Giriş yaptınız: '%(nickname)s'"
#: cps/web.py:1396 cps/web.py:1445
#, python-format
-msgid "%(name)s's profile"
+msgid "%(name)s's Profile"
msgstr "%(name)s Profili"
#: cps/web.py:1412
-msgid "Profile updated"
+msgid Success! Profile updated"
msgstr "Profil güncellendi"
#: cps/services/gmail.py:58
@@ -1485,12 +1485,12 @@ msgstr "Kullanıcı adı"
#: cps/templates/admin.html:14 cps/templates/register.html:14
#: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
-msgid "E-mail Address"
+msgid "Email"
msgstr ""
#: cps/templates/admin.html:15 cps/templates/user_edit.html:28
#, fuzzy
-msgid "Send to E-Reader E-mail Address"
+msgid "Send to eReader Email"
msgstr "E-Posta adresiniz"
#: cps/templates/admin.html:17 cps/templates/layout.html:91
@@ -1538,7 +1538,7 @@ msgid "Import LDAP Users"
msgstr ""
#: cps/templates/admin.html:62
-msgid "E-mail Server Settings"
+msgid "Email Server Settings"
msgstr ""
#: cps/templates/admin.html:67 cps/templates/email_edit.html:31
@@ -1559,11 +1559,11 @@ msgstr ""
#: cps/templates/admin.html:83 cps/templates/admin.html:94
#: cps/templates/email_edit.html:55
-msgid "From E-mail"
+msgid "From Email"
msgstr ""
#: cps/templates/admin.html:90
-msgid "E-Mail Service"
+msgid "EMail Service"
msgstr ""
#: cps/templates/admin.html:91
@@ -1636,15 +1636,15 @@ msgid "Scheduled Tasks"
msgstr ""
#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
-msgid "Time at which tasks start to run"
+msgid "Start Time"
msgstr ""
#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
-msgid "Maximum tasks duration"
+msgid "Maximum Duration"
msgstr ""
#: cps/templates/admin.html:178
-msgid "Generate book cover thumbnails"
+msgid "Generate Thumbnails"
msgstr ""
#: cps/templates/admin.html:182
@@ -1652,11 +1652,11 @@ msgid "Generate series cover thumbnails"
msgstr ""
#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
-msgid "Reconnect to Calibre Library"
+msgid "Reconnect Calibre Database"
msgstr ""
#: cps/templates/admin.html:193
-msgid "Refresh Thumbnail Cover Cache"
+msgid "Refresh Thumbnail Cache"
msgstr ""
#: cps/templates/admin.html:199
@@ -1696,7 +1696,7 @@ msgid "Details"
msgstr "Detaylar"
#: cps/templates/admin.html:227
-msgid "Current version"
+msgid "Current Version"
msgstr "Geçerli sürüm"
#: cps/templates/admin.html:234
@@ -2172,7 +2172,7 @@ msgid "Enable Public Registration"
msgstr ""
#: cps/templates/config_edit.html:127
-msgid "Use E-Mail as Username"
+msgid "Use Email as Username"
msgstr ""
#: cps/templates/config_edit.html:132
@@ -2526,7 +2526,7 @@ msgid "Edit Metadata"
msgstr ""
#: cps/templates/email_edit.html:13
-msgid "Choose Server Type"
+msgid "Email Account Type"
msgstr ""
#: cps/templates/email_edit.html:15
@@ -3060,7 +3060,7 @@ msgid "Choose a username"
msgstr "Kullanıcı adı seç"
#: cps/templates/register.html:15
-msgid "Your email address"
+msgid "Your Email"
msgstr "E-Posta adresiniz"
#: cps/templates/remote_login.html:5
@@ -3080,7 +3080,7 @@ msgid "This verification link will expire in 10 minutes."
msgstr ""
#: cps/templates/schedule_edit.html:29
-msgid "Generate Book Cover Thumbnails"
+msgid "Generate Thumbnails"
msgstr ""
#: cps/templates/schedule_edit.html:33
@@ -3315,12 +3315,12 @@ msgstr "Kullanıcı adı seç"
#: cps/templates/user_table.html:135
#, fuzzy
-msgid "Enter E-mail Address"
+msgid "Enter Email Address"
msgstr "E-Posta adresiniz"
#: cps/templates/user_table.html:136
#, fuzzy
-msgid "Enter E-Reader E-mail Address"
+msgid "Enter E-Reader Email Address"
msgstr "E-Posta adresiniz"
#: cps/templates/user_table.html:136
diff --git a/cps/translations/uk/LC_MESSAGES/messages.po b/cps/translations/uk/LC_MESSAGES/messages.po
index 54ff44ee..449de6d3 100644
--- a/cps/translations/uk/LC_MESSAGES/messages.po
+++ b/cps/translations/uk/LC_MESSAGES/messages.po
@@ -282,7 +282,7 @@ msgid "Add new user"
msgstr "Додати користувача"
#: cps/admin.py:1268 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
+msgid "Edit Email Server Settings"
msgstr "Змінити налаштування SMTP"
#: cps/admin.py:1287
@@ -295,7 +295,7 @@ msgstr ""
#: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
#, python-format
-msgid "Database error: %(error)s."
+msgid "Oops! Database Error: %(error)s."
msgstr ""
#: cps/admin.py:1316
@@ -313,7 +313,7 @@ msgid "Please configure your e-mail address first..."
msgstr ""
#: cps/admin.py:1323
-msgid "E-mail server settings updated"
+msgid "Email Server Settings updated"
msgstr ""
#: cps/admin.py:1346 cps/templates/admin.html:191
@@ -334,7 +334,7 @@ msgstr ""
#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
#: cps/web.py:1320
-msgid "An unknown error occurred. Please try again later."
+msgid "Oops! An unknown error occurred. Please try again later."
msgstr ""
#: cps/admin.py:1386
@@ -352,7 +352,7 @@ msgid "Password for user %(user)s reset"
msgstr ""
#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first..."
+msgid "Please configure the SMTP mail settings first."
msgstr "Будь-ласка, спочатку сконфігуруйте параметри SMTP"
#: cps/admin.py:1445
@@ -468,7 +468,7 @@ msgid "Database Configuration"
msgstr "Особливі налаштування"
#: cps/admin.py:1871 cps/web.py:1233
-msgid "Please fill out all fields!"
+msgid "Oops! Please complete all fields."
msgstr "Будь-ласка, заповніть всі поля!"
#: cps/admin.py:1879
@@ -481,7 +481,7 @@ msgid "User '%(user)s' created"
msgstr "Користувач '%(user)s' додан"
#: cps/admin.py:1902
-msgid "Found an existing account for this e-mail address or name."
+msgid "Oops! An account already exists for this Email. or name."
msgstr ""
#: cps/admin.py:1932
@@ -498,7 +498,7 @@ msgid "No admin user remaining, can't delete user"
msgstr ""
#: cps/admin.py:1992 cps/web.py:1371
-msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
+msgid "Email can't be empty and has to be a valid Email"
msgstr ""
#: cps/admin.py:2018
@@ -528,7 +528,7 @@ msgstr "Ні"
#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
#: cps/web.py:1504 cps/web.py:1549
-msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
msgstr "Неможливо відкрити книгу. Файл не існує або немає доступу."
#: cps/editbooks.py:154 cps/editbooks.py:1221
@@ -660,7 +660,7 @@ msgstr ""
#: cps/helper.py:97 cps/helper.py:226 cps/templates/detail.html:42
#: cps/templates/detail.html:46
#, fuzzy
-msgid "Send to E-Reader"
+msgid "Send to eReader"
msgstr "Відправити на Kindle"
#: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
@@ -747,7 +747,7 @@ msgid "Book path %(path)s not found on Google Drive"
msgstr ""
#: cps/helper.py:644 cps/web.py:1416
-msgid "Found an existing account for this e-mail address"
+msgid "Oops! An account already exists for this Email."
msgstr ""
#: cps/helper.py:652
@@ -826,7 +826,7 @@ msgstr ""
#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "Ви увійшли як користувач: '%(nickname)s'"
#: cps/oauth_bb.py:148
@@ -1322,20 +1322,20 @@ msgstr "Список форматів файлу"
#: cps/web.py:1203
#, python-format
-msgid "Book successfully queued for sending to %(kindlemail)s"
+msgid "Success! Book queued for sending to %(eReadermail)s"
msgstr ""
#: cps/web.py:1207
#, python-format
-msgid "Oops! There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending book: %(res)s"
msgstr "Помилка при відправці книги: %(res)s"
#: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle E-mail Address."
+msgid "Please update your profile with a valid Send to Kindle Email Address."
msgstr ""
#: cps/web.py:1226
-msgid "E-Mail server is not configured, please contact your administrator!"
+msgid "Oops! Email server is not configured, please contact your administrator."
msgstr ""
#: cps/templates/layout.html:68 cps/templates/layout.html:102
@@ -1346,51 +1346,51 @@ msgid "Register"
msgstr "Зареєструватись"
#: cps/web.py:1262
-msgid "Your e-mail is not allowed to register"
+msgid "Oops! Your Email is not allowed."
msgstr ""
#: cps/web.py:1266
-msgid "Confirmation e-mail was send to your e-mail account."
+msgid "Success! Confirmation Email has been sent."
msgstr ""
#: cps/web.py:1280
-msgid "Cannot activate LDAP authentication"
+msgid "Oops! Cannot activate LDAP authentication"
msgstr ""
#: cps/web.py:1299
#, python-format
-msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
+msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
msgstr ""
#: cps/web.py:1305
#, python-format
-msgid "Could not login: %(message)s"
+msgid "Oops! Login Failed: %(message)s"
msgstr ""
#: cps/web.py:1309 cps/web.py:1334
-msgid "Wrong Username or Password"
+msgid "Oops! Invalid Username or Password."
msgstr "Помилка в імені користувача або паролі"
#: cps/web.py:1316
-msgid "New Password was send to your email address"
+msgid "Success! New Password was sent to your Email."
msgstr ""
#: cps/web.py:1322
-msgid "Please enter valid username to reset password"
+msgid "Oops! Please enter a valid username to reset password"
msgstr ""
#: cps/web.py:1329
#, python-format
-msgid "You are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr ""
#: cps/web.py:1396 cps/web.py:1445
#, python-format
-msgid "%(name)s's profile"
+msgid "%(name)s's Profile"
msgstr "Профіль %(name)s"
#: cps/web.py:1412
-msgid "Profile updated"
+msgid Success! Profile updated"
msgstr "Профіль оновлено"
#: cps/services/gmail.py:58
@@ -1483,12 +1483,12 @@ msgstr "Ім'я користувача"
#: cps/templates/admin.html:14 cps/templates/register.html:14
#: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
-msgid "E-mail Address"
+msgid "Email"
msgstr ""
#: cps/templates/admin.html:15 cps/templates/user_edit.html:28
#, fuzzy
-msgid "Send to E-Reader E-mail Address"
+msgid "Send to eReader Email"
msgstr "Kindle"
#: cps/templates/admin.html:17 cps/templates/layout.html:91
@@ -1536,7 +1536,7 @@ msgid "Import LDAP Users"
msgstr ""
#: cps/templates/admin.html:62
-msgid "E-mail Server Settings"
+msgid "Email Server Settings"
msgstr ""
#: cps/templates/admin.html:67 cps/templates/email_edit.html:31
@@ -1557,11 +1557,11 @@ msgstr "SMTP логін"
#: cps/templates/admin.html:83 cps/templates/admin.html:94
#: cps/templates/email_edit.html:55
-msgid "From E-mail"
+msgid "From Email"
msgstr "Відправник"
#: cps/templates/admin.html:90
-msgid "E-Mail Service"
+msgid "EMail Service"
msgstr ""
#: cps/templates/admin.html:91
@@ -1634,15 +1634,15 @@ msgid "Scheduled Tasks"
msgstr "Заплановані завдання"
#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
-msgid "Time at which tasks start to run"
+msgid "Start Time"
msgstr ""
#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
-msgid "Maximum tasks duration"
+msgid "Maximum Duration"
msgstr "Максимальний час завдання"
#: cps/templates/admin.html:178
-msgid "Generate book cover thumbnails"
+msgid "Generate Thumbnails"
msgstr ""
#: cps/templates/admin.html:182
@@ -1650,11 +1650,11 @@ msgid "Generate series cover thumbnails"
msgstr ""
#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
-msgid "Reconnect to Calibre Library"
+msgid "Reconnect Calibre Database"
msgstr ""
#: cps/templates/admin.html:193
-msgid "Refresh Thumbnail Cover Cache"
+msgid "Refresh Thumbnail Cache"
msgstr ""
#: cps/templates/admin.html:199
@@ -1694,7 +1694,7 @@ msgid "Details"
msgstr "Деталі"
#: cps/templates/admin.html:227
-msgid "Current version"
+msgid "Current Version"
msgstr "Поточна версія"
#: cps/templates/admin.html:234
@@ -2169,7 +2169,7 @@ msgid "Enable Public Registration"
msgstr "Дозволити публічну реєстрацію"
#: cps/templates/config_edit.html:127
-msgid "Use E-Mail as Username"
+msgid "Use Email as Username"
msgstr ""
#: cps/templates/config_edit.html:132
@@ -2524,7 +2524,7 @@ msgid "Edit Metadata"
msgstr "Редагувати метадані"
#: cps/templates/email_edit.html:13
-msgid "Choose Server Type"
+msgid "Email Account Type"
msgstr ""
#: cps/templates/email_edit.html:15
@@ -3053,7 +3053,7 @@ msgid "Choose a username"
msgstr "Виберіть ім'я користувача"
#: cps/templates/register.html:15
-msgid "Your email address"
+msgid "Your Email"
msgstr "Ваш email-адрес"
#: cps/templates/remote_login.html:5
@@ -3073,7 +3073,7 @@ msgid "This verification link will expire in 10 minutes."
msgstr ""
#: cps/templates/schedule_edit.html:29
-msgid "Generate Book Cover Thumbnails"
+msgid "Generate Thumbnails"
msgstr ""
#: cps/templates/schedule_edit.html:33
@@ -3309,12 +3309,12 @@ msgstr "Виберіть ім'я користувача"
#: cps/templates/user_table.html:135
#, fuzzy
-msgid "Enter E-mail Address"
+msgid "Enter Email Address"
msgstr "Ваш email-адрес"
#: cps/templates/user_table.html:136
#, fuzzy
-msgid "Enter E-Reader E-mail Address"
+msgid "Enter E-Reader Email Address"
msgstr "Ваш email-адрес"
#: cps/templates/user_table.html:136
diff --git a/cps/translations/vi/LC_MESSAGES/messages.po b/cps/translations/vi/LC_MESSAGES/messages.po
index 39202b57..52bc76a6 100644
--- a/cps/translations/vi/LC_MESSAGES/messages.po
+++ b/cps/translations/vi/LC_MESSAGES/messages.po
@@ -275,7 +275,7 @@ msgid "Add new user"
msgstr "Thêm người dùng mới"
#: cps/admin.py:1268 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
+msgid "Edit Email Server Settings"
msgstr ""
#: cps/admin.py:1287
@@ -288,7 +288,7 @@ msgstr ""
#: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
#, python-format
-msgid "Database error: %(error)s."
+msgid "Oops! Database Error: %(error)s."
msgstr "Lỗi cơ sở dữ liệu: %(error)s."
#: cps/admin.py:1316
@@ -306,7 +306,7 @@ msgid "Please configure your e-mail address first..."
msgstr ""
#: cps/admin.py:1323
-msgid "E-mail server settings updated"
+msgid "Email Server Settings updated"
msgstr ""
#: cps/admin.py:1346 cps/templates/admin.html:191
@@ -328,7 +328,7 @@ msgstr "Thiết lập cơ sở dữ lieu đã được cập nhật"
#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
#: cps/web.py:1320
-msgid "An unknown error occurred. Please try again later."
+msgid "Oops! An unknown error occurred. Please try again later."
msgstr "Lỗi không xác định xảy ra. Xin hãy thử lại sau."
#: cps/admin.py:1386
@@ -346,7 +346,7 @@ msgid "Password for user %(user)s reset"
msgstr ""
#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first..."
+msgid "Please configure the SMTP mail settings first."
msgstr ""
#: cps/admin.py:1445
@@ -460,7 +460,7 @@ msgid "Database Configuration"
msgstr "Thiết lập cơ sở dữ lieu :)))"
#: cps/admin.py:1871 cps/web.py:1233
-msgid "Please fill out all fields!"
+msgid "Oops! Please complete all fields."
msgstr "Hãy điền hết các trường!"
#: cps/admin.py:1879
@@ -473,7 +473,7 @@ msgid "User '%(user)s' created"
msgstr "Người dùng '%(user)s' đã được tạo"
#: cps/admin.py:1902
-msgid "Found an existing account for this e-mail address or name."
+msgid "Oops! An account already exists for this Email. or name."
msgstr "Người dùng với địa chỉ email hoặc tên đã tồn tại."
#: cps/admin.py:1932
@@ -490,7 +490,7 @@ msgid "No admin user remaining, can't delete user"
msgstr ""
#: cps/admin.py:1992 cps/web.py:1371
-msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
+msgid "Email can't be empty and has to be a valid Email"
msgstr ""
#: cps/admin.py:2018
@@ -520,7 +520,7 @@ msgstr "None"
#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
#: cps/web.py:1504 cps/web.py:1549
-msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
msgstr ""
#: cps/editbooks.py:154 cps/editbooks.py:1221
@@ -652,7 +652,7 @@ msgstr "%(format)s không tìm thấy: %(fn)s"
#: cps/helper.py:97 cps/helper.py:226 cps/templates/detail.html:42
#: cps/templates/detail.html:46
#, fuzzy
-msgid "Send to E-Reader"
+msgid "Send to eReader"
msgstr "Gửi tới Kindle"
#: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
@@ -739,7 +739,7 @@ msgid "Book path %(path)s not found on Google Drive"
msgstr "Không tìm thấy được dẫn sách %(path)s trên Google Drive"
#: cps/helper.py:644 cps/web.py:1416
-msgid "Found an existing account for this e-mail address"
+msgid "Oops! An account already exists for this Email."
msgstr "Tìm thấy một tài khoản đã toàn tại cho địa chỉ email này"
#: cps/helper.py:652
@@ -818,7 +818,7 @@ msgstr ""
#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr ""
#: cps/oauth_bb.py:148
@@ -1314,20 +1314,20 @@ msgstr "Danh sách định dạng file"
#: cps/web.py:1203
#, python-format
-msgid "Book successfully queued for sending to %(kindlemail)s"
+msgid "Success! Book queued for sending to %(eReadermail)s"
msgstr ""
#: cps/web.py:1207
#, python-format
-msgid "Oops! There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending book: %(res)s"
msgstr ""
#: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle E-mail Address."
+msgid "Please update your profile with a valid Send to Kindle Email Address."
msgstr ""
#: cps/web.py:1226
-msgid "E-Mail server is not configured, please contact your administrator!"
+msgid "Oops! Email server is not configured, please contact your administrator."
msgstr ""
#: cps/templates/layout.html:68 cps/templates/layout.html:102
@@ -1338,51 +1338,51 @@ msgid "Register"
msgstr "Đăng ký"
#: cps/web.py:1262
-msgid "Your e-mail is not allowed to register"
+msgid "Oops! Your Email is not allowed."
msgstr "Email của bạn không được cho phép để đăng ký"
#: cps/web.py:1266
-msgid "Confirmation e-mail was send to your e-mail account."
+msgid "Success! Confirmation Email has been sent."
msgstr ""
#: cps/web.py:1280
-msgid "Cannot activate LDAP authentication"
+msgid "Oops! Cannot activate LDAP authentication"
msgstr ""
#: cps/web.py:1299
#, python-format
-msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
+msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
msgstr ""
#: cps/web.py:1305
#, python-format
-msgid "Could not login: %(message)s"
+msgid "Oops! Login Failed: %(message)s"
msgstr "Không thể đăng nhập: %(message)s"
#: cps/web.py:1309 cps/web.py:1334
-msgid "Wrong Username or Password"
+msgid "Oops! Invalid Username or Password."
msgstr "Tên đăng nhập hoặc mật khẩu không đúng"
#: cps/web.py:1316
-msgid "New Password was send to your email address"
+msgid "Success! New Password was sent to your Email."
msgstr "Mật khẩu mới đã được gửi đến email của bạn"
#: cps/web.py:1322
-msgid "Please enter valid username to reset password"
+msgid "Oops! Please enter a valid username to reset password"
msgstr ""
#: cps/web.py:1329
#, python-format
-msgid "You are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr ""
#: cps/web.py:1396 cps/web.py:1445
#, python-format
-msgid "%(name)s's profile"
+msgid "%(name)s's Profile"
msgstr ""
#: cps/web.py:1412
-msgid "Profile updated"
+msgid Success! Profile updated"
msgstr ""
#: cps/services/gmail.py:58
@@ -1477,12 +1477,12 @@ msgstr "Tên người dùng"
#: cps/templates/admin.html:14 cps/templates/register.html:14
#: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
-msgid "E-mail Address"
+msgid "Email"
msgstr "Địa chỉ email"
#: cps/templates/admin.html:15 cps/templates/user_edit.html:28
#, fuzzy
-msgid "Send to E-Reader E-mail Address"
+msgid "Send to eReader Email"
msgstr "Kindle"
#: cps/templates/admin.html:17 cps/templates/layout.html:91
@@ -1530,7 +1530,7 @@ msgid "Import LDAP Users"
msgstr ""
#: cps/templates/admin.html:62
-msgid "E-mail Server Settings"
+msgid "Email Server Settings"
msgstr "Thiết lập máy chủ email"
#: cps/templates/admin.html:67 cps/templates/email_edit.html:31
@@ -1551,11 +1551,11 @@ msgstr "Đăng nhập SMTP"
#: cps/templates/admin.html:83 cps/templates/admin.html:94
#: cps/templates/email_edit.html:55
-msgid "From E-mail"
+msgid "From Email"
msgstr "Từ E-mail"
#: cps/templates/admin.html:90
-msgid "E-Mail Service"
+msgid "EMail Service"
msgstr "Dịch vụ E-Mail"
#: cps/templates/admin.html:91
@@ -1627,15 +1627,15 @@ msgid "Scheduled Tasks"
msgstr ""
#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
-msgid "Time at which tasks start to run"
+msgid "Start Time"
msgstr ""
#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
-msgid "Maximum tasks duration"
+msgid "Maximum Duration"
msgstr ""
#: cps/templates/admin.html:178
-msgid "Generate book cover thumbnails"
+msgid "Generate Thumbnails"
msgstr ""
#: cps/templates/admin.html:182
@@ -1644,11 +1644,11 @@ msgstr ""
#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
#, fuzzy
-msgid "Reconnect to Calibre Library"
+msgid "Reconnect Calibre Database"
msgstr "Kết nối lại với cơ sở dữ liệu Calibre"
#: cps/templates/admin.html:193
-msgid "Refresh Thumbnail Cover Cache"
+msgid "Refresh Thumbnail Cache"
msgstr ""
#: cps/templates/admin.html:199
@@ -1689,7 +1689,7 @@ msgid "Details"
msgstr "Chi tiết"
#: cps/templates/admin.html:227
-msgid "Current version"
+msgid "Current Version"
msgstr "Phiên bản hiện tại"
#: cps/templates/admin.html:234
@@ -2162,7 +2162,7 @@ msgid "Enable Public Registration"
msgstr ""
#: cps/templates/config_edit.html:127
-msgid "Use E-Mail as Username"
+msgid "Use Email as Username"
msgstr ""
#: cps/templates/config_edit.html:132
@@ -2515,7 +2515,7 @@ msgid "Edit Metadata"
msgstr "Chỉnh sửa Metadata"
#: cps/templates/email_edit.html:13
-msgid "Choose Server Type"
+msgid "Email Account Type"
msgstr "Chọn kiểu server"
#: cps/templates/email_edit.html:15
@@ -3043,7 +3043,7 @@ msgid "Choose a username"
msgstr "Chọn tên người dùng"
#: cps/templates/register.html:15
-msgid "Your email address"
+msgid "Your Email"
msgstr "Địa chỉ email của bạn"
#: cps/templates/remote_login.html:5
@@ -3063,7 +3063,7 @@ msgid "This verification link will expire in 10 minutes."
msgstr "Link xác nhận này sẽ hết hạn trong 10 phút."
#: cps/templates/schedule_edit.html:29
-msgid "Generate Book Cover Thumbnails"
+msgid "Generate Thumbnails"
msgstr ""
#: cps/templates/schedule_edit.html:33
@@ -3296,12 +3296,12 @@ msgid "Enter Username"
msgstr "Nhập tên người dùng"
#: cps/templates/user_table.html:135
-msgid "Enter E-mail Address"
+msgid "Enter Email Address"
msgstr "Nhập địa chỉ E-mail"
#: cps/templates/user_table.html:136
#, fuzzy
-msgid "Enter E-Reader E-mail Address"
+msgid "Enter E-Reader Email Address"
msgstr "Nhập địa chỉ E-mail Kindle"
#: cps/templates/user_table.html:136
diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index 9d858f1a..e4b28b26 100644
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@@ -278,7 +278,7 @@ msgid "Add new user"
msgstr "添加新用户"
#: cps/admin.py:1268 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
+msgid "Edit Email Server Settings"
msgstr "编辑邮件服务器设置"
#: cps/admin.py:1287
@@ -291,7 +291,7 @@ msgstr "G-Mail 账号校验成功"
#: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
#, python-format
-msgid "Database error: %(error)s."
+msgid "Oops! Database Error: %(error)s."
msgstr "数据库错误:%(error)s。"
#: cps/admin.py:1316
@@ -309,7 +309,7 @@ msgid "Please configure your e-mail address first..."
msgstr "请先配置您的邮箱地址..."
#: cps/admin.py:1323
-msgid "E-mail server settings updated"
+msgid "Email Server Settings updated"
msgstr "邮件服务器设置已更新"
#: cps/admin.py:1346 cps/templates/admin.html:191
@@ -330,7 +330,7 @@ msgstr "已更新计划任务设置"
#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
#: cps/web.py:1320
-msgid "An unknown error occurred. Please try again later."
+msgid "Oops! An unknown error occurred. Please try again later."
msgstr "发生一个未知错误,请稍后再试。"
#: cps/admin.py:1386
@@ -348,7 +348,7 @@ msgid "Password for user %(user)s reset"
msgstr "用户 %(user)s 的密码已重置"
#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first..."
+msgid "Please configure the SMTP mail settings first."
msgstr "请先配置 SMTP 邮箱设置..."
#: cps/admin.py:1445
@@ -462,7 +462,7 @@ msgid "Database Configuration"
msgstr "数据库配置"
#: cps/admin.py:1871 cps/web.py:1233
-msgid "Please fill out all fields!"
+msgid "Oops! Please complete all fields."
msgstr "请填写所有字段!"
#: cps/admin.py:1879
@@ -475,7 +475,7 @@ msgid "User '%(user)s' created"
msgstr "用户“%(user)s”已创建"
#: cps/admin.py:1902
-msgid "Found an existing account for this e-mail address or name."
+msgid "Oops! An account already exists for this Email. or name."
msgstr "使用此邮箱或用户名的账号已经存在。"
#: cps/admin.py:1932
@@ -492,7 +492,7 @@ msgid "No admin user remaining, can't delete user"
msgstr "管理员账户不存在,无法删除用户"
#: cps/admin.py:1992 cps/web.py:1371
-msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
+msgid "Email can't be empty and has to be a valid Email"
msgstr "电子邮件地址不能为空,并且必须是有效的电子邮件"
#: cps/admin.py:2018
@@ -522,7 +522,7 @@ msgstr "无"
#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
#: cps/web.py:1504 cps/web.py:1549
-msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
msgstr "糟糕!选择书名无法打开。文件不存在或者文件不可访问"
#: cps/editbooks.py:154 cps/editbooks.py:1221
@@ -653,7 +653,7 @@ msgstr "找不到 %(format)s:%(fn)s"
#: cps/helper.py:97 cps/helper.py:226 cps/templates/detail.html:42
#: cps/templates/detail.html:46
-msgid "Send to E-Reader"
+msgid "Send to eReader"
msgstr "发送到电子阅读器"
#: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
@@ -740,7 +740,7 @@ msgid "Book path %(path)s not found on Google Drive"
msgstr "Google Drive 上找不到书籍路径 %(path)s"
#: cps/helper.py:644 cps/web.py:1416
-msgid "Found an existing account for this e-mail address"
+msgid "Oops! An account already exists for this Email."
msgstr "使用此邮箱的账号已经存在。"
#: cps/helper.py:652
@@ -818,7 +818,7 @@ msgstr "使用 %(provider)s 注册"
#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "您现在已以“%(nickname)s”身份登录"
#: cps/oauth_bb.py:148
@@ -1312,20 +1312,20 @@ msgstr "文件格式列表"
#: cps/web.py:1203
#, python-format
-msgid "Book successfully queued for sending to %(kindlemail)s"
+msgid "Success! Book queued for sending to %(eReadermail)s"
msgstr "书籍已经成功加入 %(kindlemail)s 的发送队列"
#: cps/web.py:1207
#, python-format
-msgid "Oops! There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending book: %(res)s"
msgstr "糟糕!发送这本书籍的时候出现错误:%(res)s"
#: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle E-mail Address."
+msgid "Please update your profile with a valid Send to Kindle Email Address."
msgstr "请先配置您的 Kindle 邮箱。"
#: cps/web.py:1226
-msgid "E-Mail server is not configured, please contact your administrator!"
+msgid "Oops! Email server is not configured, please contact your administrator."
msgstr "邮件服务未配置,请联系网站管理员!"
#: cps/templates/layout.html:68 cps/templates/layout.html:102
@@ -1336,51 +1336,51 @@ msgid "Register"
msgstr "注册"
#: cps/web.py:1262
-msgid "Your e-mail is not allowed to register"
+msgid "Oops! Your Email is not allowed."
msgstr "您的电子邮件不允许注册"
#: cps/web.py:1266
-msgid "Confirmation e-mail was send to your e-mail account."
+msgid "Success! Confirmation Email has been sent."
msgstr "确认邮件已经发送到您的邮箱。"
#: cps/web.py:1280
-msgid "Cannot activate LDAP authentication"
+msgid "Oops! Cannot activate LDAP authentication"
msgstr "无法激活 LDAP 认证"
#: cps/web.py:1299
#, python-format
-msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
+msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
msgstr "后备登录“%(nickname)s”:无法访问 LDAP 服务器,或用户未知"
#: cps/web.py:1305
#, python-format
-msgid "Could not login: %(message)s"
+msgid "Oops! Login Failed: %(message)s"
msgstr "无法登录:%(message)s"
#: cps/web.py:1309 cps/web.py:1334
-msgid "Wrong Username or Password"
+msgid "Oops! Invalid Username or Password."
msgstr "用户名或密码错误"
#: cps/web.py:1316
-msgid "New Password was send to your email address"
+msgid "Success! New Password was sent to your Email."
msgstr "新密码已发送到您的邮箱"
#: cps/web.py:1322
-msgid "Please enter valid username to reset password"
+msgid "Oops! Please enter a valid username to reset password"
msgstr "请输入有效的用户名进行密码重置"
#: cps/web.py:1329
#, python-format
-msgid "You are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "您现在已以“%(nickname)s”登录"
#: cps/web.py:1396 cps/web.py:1445
#, python-format
-msgid "%(name)s's profile"
+msgid "%(name)s's Profile"
msgstr "%(name)s 的用户配置"
#: cps/web.py:1412
-msgid "Profile updated"
+msgid Success! Profile updated"
msgstr "资料已更新"
#: cps/services/gmail.py:58
@@ -1472,11 +1472,11 @@ msgstr "用户名"
#: cps/templates/admin.html:14 cps/templates/register.html:14
#: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
-msgid "E-mail Address"
+msgid "Email"
msgstr "邮箱地址"
#: cps/templates/admin.html:15 cps/templates/user_edit.html:28
-msgid "Send to E-Reader E-mail Address"
+msgid "Send to eReader Email"
msgstr "接收书籍的电子阅读器邮箱地址"
#: cps/templates/admin.html:17 cps/templates/layout.html:91
@@ -1524,7 +1524,7 @@ msgid "Import LDAP Users"
msgstr "导入 LDAP 用户"
#: cps/templates/admin.html:62
-msgid "E-mail Server Settings"
+msgid "Email Server Settings"
msgstr "SMTP 邮件服务器设置"
#: cps/templates/admin.html:67 cps/templates/email_edit.html:31
@@ -1545,11 +1545,11 @@ msgstr "SMTP 用户名"
#: cps/templates/admin.html:83 cps/templates/admin.html:94
#: cps/templates/email_edit.html:55
-msgid "From E-mail"
+msgid "From Email"
msgstr "发件人邮箱"
#: cps/templates/admin.html:90
-msgid "E-Mail Service"
+msgid "EMail Service"
msgstr "电子邮件服务"
#: cps/templates/admin.html:91
@@ -1621,15 +1621,15 @@ msgid "Scheduled Tasks"
msgstr "计划任务"
#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
-msgid "Time at which tasks start to run"
+msgid "Start Time"
msgstr "任务开始运行的时间"
#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
-msgid "Maximum tasks duration"
+msgid "Maximum Duration"
msgstr "最长任务持续时间"
#: cps/templates/admin.html:178
-msgid "Generate book cover thumbnails"
+msgid "Generate Thumbnails"
msgstr "生成书籍封面缩略图"
#: cps/templates/admin.html:182
@@ -1637,11 +1637,11 @@ msgid "Generate series cover thumbnails"
msgstr "生成丛书封面缩略图"
#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
-msgid "Reconnect to Calibre Library"
+msgid "Reconnect Calibre Database"
msgstr "重新连接到 Calibre 库"
#: cps/templates/admin.html:193
-msgid "Refresh Thumbnail Cover Cache"
+msgid "Refresh Thumbnail Cache"
msgstr "刷新封面缩略图缓存"
#: cps/templates/admin.html:199
@@ -1681,7 +1681,7 @@ msgid "Details"
msgstr "详情"
#: cps/templates/admin.html:227
-msgid "Current version"
+msgid "Current Version"
msgstr "当前版本"
#: cps/templates/admin.html:234
@@ -2154,7 +2154,7 @@ msgid "Enable Public Registration"
msgstr "启用注册"
#: cps/templates/config_edit.html:127
-msgid "Use E-Mail as Username"
+msgid "Use Email as Username"
msgstr "使用邮箱或用户名"
#: cps/templates/config_edit.html:132
@@ -2507,7 +2507,7 @@ msgid "Edit Metadata"
msgstr "编辑元数据"
#: cps/templates/email_edit.html:13
-msgid "Choose Server Type"
+msgid "Email Account Type"
msgstr "选择服务器类型"
#: cps/templates/email_edit.html:15
@@ -3033,7 +3033,7 @@ msgid "Choose a username"
msgstr "选择一个用户名"
#: cps/templates/register.html:15
-msgid "Your email address"
+msgid "Your Email"
msgstr "您的邮箱地址"
#: cps/templates/remote_login.html:5
@@ -3053,7 +3053,7 @@ msgid "This verification link will expire in 10 minutes."
msgstr "此验证链接将在10分钟后失效。"
#: cps/templates/schedule_edit.html:29
-msgid "Generate Book Cover Thumbnails"
+msgid "Generate Thumbnails"
msgstr "生成书籍封面缩略图"
#: cps/templates/schedule_edit.html:33
@@ -3285,11 +3285,11 @@ msgid "Enter Username"
msgstr "输入用户名"
#: cps/templates/user_table.html:135
-msgid "Enter E-mail Address"
+msgid "Enter Email Address"
msgstr "输入邮箱地址"
#: cps/templates/user_table.html:136
-msgid "Enter E-Reader E-mail Address"
+msgid "Enter E-Reader Email Address"
msgstr "输入电子阅读器邮箱地址"
#: cps/templates/user_table.html:136
diff --git a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
index 8349a459..0d152623 100644
--- a/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hant_TW/LC_MESSAGES/messages.po
@@ -279,7 +279,7 @@ msgid "Add new user"
msgstr "添加新用戶"
#: cps/admin.py:1268 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
+msgid "Edit Email Server Settings"
msgstr "編輯郵件服務器設置"
#: cps/admin.py:1287
@@ -292,7 +292,7 @@ msgstr "G-Mail賬號驗證成功"
#: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
#, python-format
-msgid "Database error: %(error)s."
+msgid "Oops! Database Error: %(error)s."
msgstr "數據庫錯誤:%(error)s。"
#: cps/admin.py:1316
@@ -310,7 +310,7 @@ msgid "Please configure your e-mail address first..."
msgstr "請先配置您的郵箱地址..."
#: cps/admin.py:1323
-msgid "E-mail server settings updated"
+msgid "Email Server Settings updated"
msgstr "郵件服務器設置已更新"
#: cps/admin.py:1346 cps/templates/admin.html:191
@@ -331,7 +331,7 @@ msgstr ""
#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
#: cps/web.py:1320
-msgid "An unknown error occurred. Please try again later."
+msgid "Oops! An unknown error occurred. Please try again later."
msgstr "發生一個未知錯誤,請稍後再試。"
#: cps/admin.py:1386
@@ -349,7 +349,7 @@ msgid "Password for user %(user)s reset"
msgstr "用戶 %(user)s 的密碼已重置"
#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first..."
+msgid "Please configure the SMTP mail settings first."
msgstr "請先配置SMTP郵箱設置..."
#: cps/admin.py:1445
@@ -465,7 +465,7 @@ msgid "Database Configuration"
msgstr "數據庫配置"
#: cps/admin.py:1871 cps/web.py:1233
-msgid "Please fill out all fields!"
+msgid "Oops! Please complete all fields."
msgstr "請填寫所有欄位!"
#: cps/admin.py:1879
@@ -478,7 +478,7 @@ msgid "User '%(user)s' created"
msgstr "用戶“%(user)s”已創建"
#: cps/admin.py:1902
-msgid "Found an existing account for this e-mail address or name."
+msgid "Oops! An account already exists for this Email. or name."
msgstr "使用此郵箱或用戶名的賬號已經存在。"
#: cps/admin.py:1932
@@ -495,7 +495,7 @@ msgid "No admin user remaining, can't delete user"
msgstr "管理員賬戶不存在,無法刪除用戶"
#: cps/admin.py:1992 cps/web.py:1371
-msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
+msgid "Email can't be empty and has to be a valid Email"
msgstr ""
#: cps/admin.py:2018
@@ -525,7 +525,7 @@ msgstr "無"
#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
#: cps/web.py:1504 cps/web.py:1549
-msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
msgstr "糟糕!選擇書名無法打開。文件不存在或者文件不可訪問"
#: cps/editbooks.py:154 cps/editbooks.py:1221
@@ -657,7 +657,7 @@ msgstr "找不到 %(format)s:%(fn)s"
#: cps/helper.py:97 cps/helper.py:226 cps/templates/detail.html:42
#: cps/templates/detail.html:46
#, fuzzy
-msgid "Send to E-Reader"
+msgid "Send to eReader"
msgstr "發送到Kindle"
#: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
@@ -744,7 +744,7 @@ msgid "Book path %(path)s not found on Google Drive"
msgstr "Google Drive上找不到書籍路徑 %(path)s"
#: cps/helper.py:644 cps/web.py:1416
-msgid "Found an existing account for this e-mail address"
+msgid "Oops! An account already exists for this Email."
msgstr "使用此郵箱的賬號已經存在。"
#: cps/helper.py:652
@@ -825,7 +825,7 @@ msgstr "使用 %(provider)s 註冊"
#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "您現在已以“%(nickname)s”身份登入"
#: cps/oauth_bb.py:148
@@ -1320,20 +1320,20 @@ msgstr "文件格式列表"
#: cps/web.py:1203
#, python-format
-msgid "Book successfully queued for sending to %(kindlemail)s"
+msgid "Success! Book queued for sending to %(eReadermail)s"
msgstr "書籍已經成功加入 %(kindlemail)s 的發送隊列"
#: cps/web.py:1207
#, python-format
-msgid "Oops! There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending book: %(res)s"
msgstr "糟糕!發送這本書籍的時候出現錯誤:%(res)s"
#: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle E-mail Address."
+msgid "Please update your profile with a valid Send to Kindle Email Address."
msgstr "請先設置您的kindle郵箱。"
#: cps/web.py:1226
-msgid "E-Mail server is not configured, please contact your administrator!"
+msgid "Oops! Email server is not configured, please contact your administrator."
msgstr "郵件服務未配置,請聯繫網站管理員!"
#: cps/templates/layout.html:68 cps/templates/layout.html:102
@@ -1344,51 +1344,51 @@ msgid "Register"
msgstr "註冊"
#: cps/web.py:1262
-msgid "Your e-mail is not allowed to register"
+msgid "Oops! Your Email is not allowed."
msgstr "您的電子郵件不允許註冊"
#: cps/web.py:1266
-msgid "Confirmation e-mail was send to your e-mail account."
+msgid "Success! Confirmation Email has been sent."
msgstr "確認郵件已經發送到您的郵箱。"
#: cps/web.py:1280
-msgid "Cannot activate LDAP authentication"
+msgid "Oops! Cannot activate LDAP authentication"
msgstr "無法激活LDAP認證"
#: cps/web.py:1299
#, python-format
-msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
+msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
msgstr "備援登入“%(nickname)s”:無法訪問LDAP伺服器,或用戶未知"
#: cps/web.py:1305
#, python-format
-msgid "Could not login: %(message)s"
+msgid "Oops! Login Failed: %(message)s"
msgstr "無法登入:%(message)s"
#: cps/web.py:1309 cps/web.py:1334
-msgid "Wrong Username or Password"
+msgid "Oops! Invalid Username or Password."
msgstr "用戶名或密碼錯誤"
#: cps/web.py:1316
-msgid "New Password was send to your email address"
+msgid "Success! New Password was sent to your Email."
msgstr "新密碼已發送到您的郵箱"
#: cps/web.py:1322
-msgid "Please enter valid username to reset password"
+msgid "Oops! Please enter a valid username to reset password"
msgstr "請輸入有效的用戶名進行密碼重置"
#: cps/web.py:1329
#, python-format
-msgid "You are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr "您現在已以“%(nickname)s”登入"
#: cps/web.py:1396 cps/web.py:1445
#, python-format
-msgid "%(name)s's profile"
+msgid "%(name)s's Profile"
msgstr "%(name)s 的用戶配置"
#: cps/web.py:1412
-msgid "Profile updated"
+msgid Success! Profile updated"
msgstr "資料已更新"
#: cps/services/gmail.py:58
@@ -1481,12 +1481,12 @@ msgstr "用戶名"
#: cps/templates/admin.html:14 cps/templates/register.html:14
#: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
-msgid "E-mail Address"
+msgid "Email"
msgstr "郵箱地址"
#: cps/templates/admin.html:15 cps/templates/user_edit.html:28
#, fuzzy
-msgid "Send to E-Reader E-mail Address"
+msgid "Send to eReader Email"
msgstr "接收書籍的Kindle郵箱地址"
#: cps/templates/admin.html:17 cps/templates/layout.html:91
@@ -1534,7 +1534,7 @@ msgid "Import LDAP Users"
msgstr "導入LDAP用戶"
#: cps/templates/admin.html:62
-msgid "E-mail Server Settings"
+msgid "Email Server Settings"
msgstr "SMTP郵件服務器設置"
#: cps/templates/admin.html:67 cps/templates/email_edit.html:31
@@ -1555,11 +1555,11 @@ msgstr "SMTP用戶名"
#: cps/templates/admin.html:83 cps/templates/admin.html:94
#: cps/templates/email_edit.html:55
-msgid "From E-mail"
+msgid "From Email"
msgstr "發信人郵箱"
#: cps/templates/admin.html:90
-msgid "E-Mail Service"
+msgid "EMail Service"
msgstr "電子郵件服務"
#: cps/templates/admin.html:91
@@ -1631,15 +1631,15 @@ msgid "Scheduled Tasks"
msgstr ""
#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
-msgid "Time at which tasks start to run"
+msgid "Start Time"
msgstr ""
#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
-msgid "Maximum tasks duration"
+msgid "Maximum Duration"
msgstr ""
#: cps/templates/admin.html:178
-msgid "Generate book cover thumbnails"
+msgid "Generate Thumbnails"
msgstr ""
#: cps/templates/admin.html:182
@@ -1647,11 +1647,11 @@ msgid "Generate series cover thumbnails"
msgstr ""
#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
-msgid "Reconnect to Calibre Library"
+msgid "Reconnect Calibre Database"
msgstr ""
#: cps/templates/admin.html:193
-msgid "Refresh Thumbnail Cover Cache"
+msgid "Refresh Thumbnail Cache"
msgstr ""
#: cps/templates/admin.html:199
@@ -1691,7 +1691,7 @@ msgid "Details"
msgstr "詳情"
#: cps/templates/admin.html:227
-msgid "Current version"
+msgid "Current Version"
msgstr "當前版本"
#: cps/templates/admin.html:234
@@ -2167,7 +2167,7 @@ msgid "Enable Public Registration"
msgstr "啟用註冊"
#: cps/templates/config_edit.html:127
-msgid "Use E-Mail as Username"
+msgid "Use Email as Username"
msgstr "使用郵箱或用戶名"
#: cps/templates/config_edit.html:132
@@ -2522,7 +2522,7 @@ msgid "Edit Metadata"
msgstr "編輯元數據"
#: cps/templates/email_edit.html:13
-msgid "Choose Server Type"
+msgid "Email Account Type"
msgstr "選擇伺服器類型"
#: cps/templates/email_edit.html:15
@@ -3050,7 +3050,7 @@ msgid "Choose a username"
msgstr "選擇一個用戶名"
#: cps/templates/register.html:15
-msgid "Your email address"
+msgid "Your Email"
msgstr "您的郵箱地址"
#: cps/templates/remote_login.html:5
@@ -3070,7 +3070,7 @@ msgid "This verification link will expire in 10 minutes."
msgstr "此驗證連接將在10分鐘後失效。"
#: cps/templates/schedule_edit.html:29
-msgid "Generate Book Cover Thumbnails"
+msgid "Generate Thumbnails"
msgstr ""
#: cps/templates/schedule_edit.html:33
@@ -3302,12 +3302,12 @@ msgid "Enter Username"
msgstr "輸入用戶名"
#: cps/templates/user_table.html:135
-msgid "Enter E-mail Address"
+msgid "Enter Email Address"
msgstr "輸入郵箱地址"
#: cps/templates/user_table.html:136
#, fuzzy
-msgid "Enter E-Reader E-mail Address"
+msgid "Enter E-Reader Email Address"
msgstr "輸入Kindle郵箱地址"
#: cps/templates/user_table.html:136
diff --git a/cps/updater.py b/cps/updater.py
index 13d774bf..fa13c44b 100644
--- a/cps/updater.py
+++ b/cps/updater.py
@@ -327,7 +327,7 @@ class Updater(threading.Thread):
@classmethod
def _stable_version_info(cls):
log.debug("Stable version: {}".format(constants.STABLE_VERSION))
- return constants.STABLE_VERSION # Current version
+ return constants.STABLE_VERSION # Current Version
@classmethod
def dry_run(cls):
diff --git a/cps/web.py b/cps/web.py
old mode 100755
new mode 100644
index 196fe367..d2302b8c
--- a/cps/web.py
+++ b/cps/web.py
@@ -403,7 +403,7 @@ def render_books_list(data, sort_param, book_id, page):
db.Books.id == db.books_series_link.c.book,
db.Series)
return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
- title=_(u"Books"), page=website, order=order[1])
+ title=_("Books"), page=website, order=order[1])
def render_rated_books(page, book_id, order):
@@ -418,7 +418,7 @@ def render_rated_books(page, book_id, order):
db.Series)
return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
- id=book_id, title=_(u"Top Rated Books"), page="rated", order=order[1])
+ id=book_id, title=_("Top Rated Books"), page="rated", order=order[1])
else:
abort(404)
@@ -430,7 +430,7 @@ def render_discover_books(book_id):
config_read_column=config.config_read_column)
pagination = Pagination(1, config.config_books_per_page, config.config_books_per_page)
return render_title_template('index.html', random=false(), entries=entries, pagination=pagination, id=book_id,
- title=_(u"Discover (Random Books)"), page="discover")
+ title=_("Discover (Random Books)"), page="discover")
else:
abort(404)
@@ -466,7 +466,7 @@ def render_hot_books(page, order):
num_books = entries.__len__()
pagination = Pagination(page, config.config_books_per_page, num_books)
return render_title_template('index.html', random=random, entries=entries, pagination=pagination,
- title=_(u"Hot Books (Most Downloaded)"), page="hot", order=order[1])
+ title=_("Hot Books (Most Downloaded)"), page="hot", order=order[1])
else:
abort(404)
@@ -497,7 +497,7 @@ def render_downloaded_books(page, order, user_id):
entries=entries,
pagination=pagination,
id=user_id,
- title=_(u"Downloaded books by %(user)s", user=user.name),
+ title=_("Downloaded books by %(user)s", user=user.name),
page="download",
order=order[1])
else:
@@ -514,7 +514,7 @@ def render_author_books(page, author_id, order):
db.books_series_link.c.book == db.Books.id,
db.Series)
if entries is None or not len(entries):
- flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"),
+ flash(_("Oops! Selected book is unavailable. File does not exist or is not accessible"),
category="error")
return redirect(url_for("web.index"))
if constants.sqlalchemy_version2:
@@ -530,7 +530,7 @@ def render_author_books(page, author_id, order):
book_entries = [entry.Books for entry in entries]
other_books = services.goodreads_support.get_other_books(author_info, book_entries)
return render_title_template('author.html', entries=entries, pagination=pagination, id=author_id,
- title=_(u"Author: %(name)s", name=author_name), author=author_info,
+ title=_("Author: %(name)s", name=author_name), author=author_info,
other_books=other_books, page="author", order=order[1])
@@ -566,7 +566,7 @@ def render_publisher_books(page, book_id, order):
abort(404)
return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=book_id,
- title=_(u"Publisher: %(name)s", name=publisher),
+ title=_("Publisher: %(name)s", name=publisher),
page="publisher",
order=order[1])
@@ -594,7 +594,7 @@ def render_series_books(page, book_id, order):
else:
abort(404)
return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id,
- title=_(u"Series: %(serie)s", serie=series_name), page="series", order=order[1])
+ title=_("Series: %(serie)s", serie=series_name), page="series", order=order[1])
def render_ratings_books(page, book_id, order):
@@ -609,7 +609,7 @@ def render_ratings_books(page, book_id, order):
db.Books.id == db.books_series_link.c.book,
db.Series,
db.books_ratings_link, db.Ratings)
- title = _(u"Rating: None")
+ title = _("Rating: None")
rating = -1
else:
name = calibre_db.session.query(db.Ratings).filter(db.Ratings.id == book_id).first()
@@ -618,7 +618,7 @@ def render_ratings_books(page, book_id, order):
db.Books.ratings.any(db.Ratings.id == book_id),
[order[0][0]],
True, config.config_read_column)
- title = _(u"Rating: %(rating)s stars", rating=int(name.rating / 2))
+ title = _("Rating: %(rating)s stars", rating=int(name.rating / 2))
rating = name.rating
if title and rating <= 10:
return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id,
@@ -636,7 +636,7 @@ def render_formats_books(page, book_id, order):
[order[0][0]],
True, config.config_read_column)
return render_title_template('index.html', random=random, pagination=pagination, entries=entries, id=book_id,
- title=_(u"File format: %(format)s", format=name.format),
+ title=_("File format: %(format)s", format=name.format),
page="formats",
order=order[1])
else:
@@ -673,7 +673,7 @@ def render_category_books(page, book_id, order):
else:
abort(404)
return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=book_id,
- title=_(u"Category: %(name)s", name=tagsname), page="category", order=order[1])
+ title=_("Category: %(name)s", name=tagsname), page="category", order=order[1])
def render_language_books(page, name, order):
@@ -700,7 +700,7 @@ def render_language_books(page, name, order):
[order[0][0]],
True, config.config_read_column)
return render_title_template('index.html', random=random, entries=entries, pagination=pagination, id=name,
- title=_(u"Language: %(name)s", name=lang_name), page="language", order=order[1])
+ title=_("Language: %(name)s", name=lang_name), page="language", order=order[1])
def render_read_books(page, are_read, as_xml=False, order=None):
@@ -796,7 +796,7 @@ def books_list(data, sort_param, book_id, page):
def books_table():
visibility = current_user.view_settings.get('table', {})
cc = calibre_db.get_cc_columns(config, filter_config_custom_read=True)
- return render_title_template('book_table.html', title=_(u"Books List"), cc=cc, page="book_table",
+ return render_title_template('book_table.html', title=_("Books List"), cc=cc, page="book_table",
visiblility=visibility)
@@ -938,7 +938,7 @@ def download_list():
.filter(ub.User.role.op('&')(constants.ROLE_ANONYMOUS) != constants.ROLE_ANONYMOUS) \
.group_by(func.upper(func.substr(ub.User.name, 1, 1))).all()
return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=char_list,
- title=_(u"Downloads"), page="downloadlist", data="download", order=order_no)
+ title=_("Downloads"), page="downloadlist", data="download", order=order_no)
else:
abort(404)
@@ -966,7 +966,7 @@ def publisher_list():
entries = sorted(entries, key=lambda x: x[0].name.lower(), reverse=not order_no)
char_list = generate_char_list(entries)
return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=char_list,
- title=_(u"Publishers"), page="publisherlist", data="publisher", order=order_no)
+ title=_("Publishers"), page="publisherlist", data="publisher", order=order_no)
else:
abort(404)
@@ -995,14 +995,14 @@ def series_list():
entries.append([db.Category(_("None"), "-1"), no_series_count])
entries = sorted(entries, key=lambda x: x[0].name.lower(), reverse=not order_no)
return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=char_list,
- title=_(u"Series"), page="serieslist", data="series", order=order_no)
+ title=_("Series"), page="serieslist", data="series", order=order_no)
else:
entries = calibre_db.session.query(db.Books, func.count('books_series_link').label('count'),
func.max(db.Books.series_index), db.Books.id) \
.join(db.books_series_link).join(db.Series).filter(calibre_db.common_filters()) \
.group_by(text('books_series_link.series')).order_by(order).all()
return render_title_template('grid.html', entries=entries, folder='web.books_list', charlist=char_list,
- title=_(u"Series"), page="serieslist", data="series", bodyClass="grid-view",
+ title=_("Series"), page="serieslist", data="series", bodyClass="grid-view",
order=order_no)
else:
abort(404)
@@ -1031,7 +1031,7 @@ def ratings_list():
entries.append([db.Category(_("None"), "-1", -1), no_rating_count])
entries = sorted(entries, key=lambda x: x[0].rating, reverse=not order_no)
return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=list(),
- title=_(u"Ratings list"), page="ratingslist", data="ratings", order=order_no)
+ title=_("Ratings list"), page="ratingslist", data="ratings", order=order_no)
else:
abort(404)
@@ -1058,7 +1058,7 @@ def formats_list():
if no_format_count:
entries.append([db.Category(_("None"), "-1"), no_format_count])
return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=list(),
- title=_(u"File formats list"), page="formatslist", data="formats", order=order_no)
+ title=_("File formats list"), page="formatslist", data="formats", order=order_no)
else:
abort(404)
@@ -1071,7 +1071,7 @@ def language_overview():
languages = calibre_db.speaking_language(reverse_order=not order_no, with_count=True)
char_list = generate_char_list(languages)
return render_title_template('list.html', entries=languages, folder='web.books_list', charlist=char_list,
- title=_(u"Languages"), page="langlist", data="language", order=order_no)
+ title=_("Languages"), page="langlist", data="language", order=order_no)
else:
abort(404)
@@ -1099,7 +1099,7 @@ def category_list():
entries = sorted(entries, key=lambda x: x[0].name.lower(), reverse=not order_no)
char_list = generate_char_list(entries)
return render_title_template('list.html', entries=entries, folder='web.books_list', charlist=char_list,
- title=_(u"Categories"), page="catlist", data="category", order=order_no)
+ title=_("Categories"), page="catlist", data="category", order=order_no)
else:
abort(404)
@@ -1195,18 +1195,18 @@ def download_link(book_id, book_format, anyname):
@download_required
def send_to_ereader(book_id, book_format, convert):
if not config.get_mail_server_configured():
- flash(_(u"Please configure the SMTP mail settings first..."), category="error")
- elif current_user.kindle_mail:
- result = send_mail(book_id, book_format, convert, current_user.kindle_mail, config.config_calibre_dir,
+ flash(_("Please configure the SMTP mail settings first."), category="error")
+ elif current_user.eReader_mail:
+ result = send_mail(book_id, book_format, convert, current_user.eReader_mail, config.config_calibre_dir,
current_user.name)
if result is None:
- flash(_(u"Book successfully queued for sending to %(kindlemail)s", kindlemail=current_user.kindle_mail),
+ flash(_("Success! Book queued for sending to %(eReadermail)s", eReadermail=current_user.eReader_mail),
category="success")
ub.update_download(book_id, int(current_user.id))
else:
- flash(_(u"Oops! There was an error sending this book: %(res)s", res=result), category="error")
+ flash(_("Oops! There was an error sending book: %(res)s", res=result), category="error")
else:
- flash(_(u"Please update your profile with a valid Send to Kindle E-mail Address."), category="error")
+ flash(_("Oops! Please update your profile with a valid eReader Email."), category="error")
if "HTTP_REFERER" in request.environ:
return redirect(request.environ["HTTP_REFERER"])
else:
@@ -1223,14 +1223,14 @@ def register():
if current_user is not None and current_user.is_authenticated:
return redirect(url_for('web.index'))
if not config.get_mail_server_configured():
- flash(_(u"E-Mail server is not configured, please contact your administrator!"), category="error")
+ flash(_("Oops! Email server is not configured, please contact your administrator."), category="error")
return render_title_template('register.html', title=_("Register"), page="register")
if request.method == "POST":
to_save = request.form.to_dict()
nickname = to_save.get("email", "").strip() if config.config_register_email else to_save.get('name')
if not nickname or not to_save.get("email"):
- flash(_(u"Please fill out all fields!"), category="error")
+ flash(_("Oops! Please complete all fields."), category="error")
return render_title_template('register.html', title=_("Register"), page="register")
try:
nickname = check_username(nickname)
@@ -1256,14 +1256,14 @@ def register():
send_registration_mail(to_save.get("email", "").strip(), nickname, password)
except Exception:
ub.session.rollback()
- flash(_(u"An unknown error occurred. Please try again later."), category="error")
+ flash(_("Oops! An unknown error occurred. Please try again later."), category="error")
return render_title_template('register.html', title=_("Register"), page="register")
else:
- flash(_(u"Your e-mail is not allowed to register"), category="error")
- log.warning('Registering failed for user "{}" e-mail address: {}'.format(nickname,
+ flash(_("Oops! Your Email is not allowed."), category="error")
+ log.warning('Registering failed for user "{}" Email: {}'.format(nickname,
to_save.get("email","")))
return render_title_template('register.html', title=_("Register"), page="register")
- flash(_(u"Confirmation e-mail was send to your e-mail account."), category="success")
+ flash(_("Success! Confirmation Email has been sent."), category="success")
return redirect(url_for('web.login'))
if feature_support['oauth']:
@@ -1276,8 +1276,8 @@ def login():
if current_user is not None and current_user.is_authenticated:
return redirect(url_for('web.index'))
if config.config_login_type == constants.LOGIN_LDAP and not services.ldap:
- log.error(u"Cannot activate LDAP authentication")
- flash(_(u"Cannot activate LDAP authentication"), category="error")
+ log.error("Cannot activate LDAP authentication")
+ flash(_("Oops! Cannot activate LDAP authentication"), category="error")
if request.method == "POST":
form = request.form.to_dict()
user = ub.session.query(ub.User).filter(func.lower(ub.User.name) == form['username'].strip().lower()) \
@@ -1287,8 +1287,8 @@ def login():
if login_result:
login_user(user, remember=bool(form.get('remember_me')))
ub.store_user_session()
- log.debug(u"You are now logged in as: '{}'".format(user.name))
- flash(_(u"you are now logged in as: '%(nickname)s'", nickname=user.name),
+ log.debug("You are now logged in as: '{}'".format(user.name))
+ flash(_("Success! You are now logged in as: %(nickname)s", nickname=user.name),
category="success")
return redirect_back(url_for("web.index"))
elif login_result is None and user and check_password_hash(str(user.password), form['password']) \
@@ -1296,48 +1296,48 @@ def login():
login_user(user, remember=bool(form.get('remember_me')))
ub.store_user_session()
log.info("Local Fallback Login as: '{}'".format(user.name))
- flash(_(u"Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known",
+ flash(_("Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known",
nickname=user.name),
category="warning")
return redirect_back(url_for("web.index"))
elif login_result is None:
log.info(error)
- flash(_(u"Could not login: %(message)s", message=error), category="error")
+ flash(_("Oops! Login Failed: %(message)s", message=error), category="error")
else:
ip_address = request.headers.get('X-Forwarded-For', request.remote_addr)
log.warning('LDAP Login failed for user "%s" IP-address: %s', form['username'], ip_address)
- flash(_(u"Wrong Username or Password"), category="error")
+ flash(_("Oops! Invalid Username or Password."), category="error")
else:
ip_address = request.headers.get('X-Forwarded-For', request.remote_addr)
if form.get('forgot', "") == 'forgot':
if user is not None and user.name != "Guest":
ret, __ = reset_password(user.id)
if ret == 1:
- flash(_(u"New Password was send to your email address"), category="info")
+ flash(_("Success! New Password was sent to your Email."), category="info")
log.info('Password reset for user "%s" IP-address: %s', form['username'], ip_address)
else:
- log.error(u"An unknown error occurred. Please try again later")
- flash(_(u"An unknown error occurred. Please try again later."), category="error")
+ log.error("An unknown error occurred. Please try again later")
+ flash(_("Oops! An unknown error occurred. Please try again later."), category="error")
else:
- flash(_(u"Please enter valid username to reset password"), category="error")
+ flash(_("Oops! Please enter a valid username to reset password"), category="error")
log.warning('Username missing for password reset IP-address: %s', ip_address)
else:
if user and check_password_hash(str(user.password), form['password']) and user.name != "Guest":
login_user(user, remember=bool(form.get('remember_me')))
ub.store_user_session()
- log.debug(u"You are now logged in as: '%s'", user.name)
- flash(_(u"You are now logged in as: '%(nickname)s'", nickname=user.name), category="success")
+ log.debug("You are now logged in as: '%s'", user.name)
+ flash(_("Success! You are now logged in as: %(nickname)s", nickname=user.name), category="success")
config.config_is_initial = False
return redirect_back(url_for("web.index"))
else:
log.warning('Login failed for user "{}" IP-address: {}'.format(form['username'], ip_address))
- flash(_(u"Wrong Username or Password"), category="error")
+ flash(_("Oops! Invalid Username or Password."), category="error")
next_url = request.args.get('next', default=url_for("web.index"), type=str)
if url_for("web.logout") == next_url:
next_url = url_for("web.index")
return render_title_template('login.html',
- title=_(u"Login"),
+ title=_("Login"),
next_url=next_url,
config=config,
oauth_check=oauth_check,
@@ -1352,7 +1352,7 @@ def logout():
logout_user()
if feature_support['oauth'] and (config.config_login_type == 2 or config.config_login_type == 3):
logout_oauth_user()
- log.debug(u"User logged out")
+ log.debug("User logged out")
return redirect(url_for('web.login'))
@@ -1364,11 +1364,11 @@ def change_profile(kobo_support, local_oauth_check, oauth_status, translations,
if to_save.get("password"):
current_user.password = generate_password_hash(to_save.get("password"))
try:
- if to_save.get("kindle_mail", current_user.kindle_mail) != current_user.kindle_mail:
- current_user.kindle_mail = valid_email(to_save.get("kindle_mail"))
+ if to_save.get("eReader_mail", current_user.eReader_mail) != current_user.eReader_mail:
+ current_user.eReader_mail = valid_email(to_save.get("eReader_mail"))
new_email = valid_email(to_save.get("email", current_user.email))
if not new_email:
- raise Exception(_(u"E-Mail Address can't be empty and has to be a valid E-Mail"))
+ raise Exception(_("Email can't be empty and has to be a valid Email"))
if new_email != current_user.email:
current_user.email = check_email(new_email)
if current_user.role_admin():
@@ -1393,7 +1393,7 @@ def change_profile(kobo_support, local_oauth_check, oauth_status, translations,
translations=translations,
profile=1,
languages=languages,
- title=_(u"%(name)s's profile", name=current_user.name),
+ title=_("%(name)s's Profile", name=current_user.name),
page="me",
kobo_support=kobo_support,
registered_oauth=local_oauth_check,
@@ -1409,16 +1409,16 @@ def change_profile(kobo_support, local_oauth_check, oauth_status, translations,
try:
ub.session.commit()
- flash(_(u"Profile updated"), category="success")
- log.debug(u"Profile updated")
+ flash(_("Success! Profile Updated"), category="success")
+ log.debug(Success! Profile updated")
except IntegrityError:
ub.session.rollback()
- flash(_(u"Found an existing account for this e-mail address"), category="error")
- log.debug(u"Found an existing account for this e-mail address")
+ flash(_("Oops! An account already exists for this Email."), category="error")
+ log.debug("Found an existing account for this Email")
except OperationalError as e:
ub.session.rollback()
log.error("Database error: %s", e)
- flash(_(u"Database error: %(error)s.", error=e), category="error")
+ flash(_("Oops! Database Error: %(error)s.", error=e), category="error")
@web.route("/me", methods=["GET", "POST"])
@@ -1442,7 +1442,7 @@ def profile():
languages=languages,
content=current_user,
kobo_support=kobo_support,
- title=_(u"%(name)s's profile", name=current_user.name),
+ title=_("%(name)s's Profile", name=current_user.name),
page="me",
registered_oauth=local_oauth_check,
oauth_status=oauth_status)
@@ -1459,9 +1459,9 @@ def read_book(book_id, book_format):
book.ordered_authors = calibre_db.order_authors([book], False)
if not book:
- flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"),
+ flash(_("Oops! Selected book is unavailable. File does not exist or is not accessible"),
category="error")
- log.debug(u"Oops! Selected book title is unavailable. File does not exist or is not accessible")
+ log.debug("Selected book is unavailable. File does not exist or is not accessible")
return redirect(url_for("web.index"))
# check if book has a bookmark
@@ -1471,22 +1471,22 @@ def read_book(book_id, book_format):
ub.Bookmark.book_id == book_id,
ub.Bookmark.format == book_format.upper())).first()
if book_format.lower() == "epub":
- log.debug(u"Start epub reader for %d", book_id)
+ log.debug("Start epub reader for %d", book_id)
return render_title_template('read.html', bookid=book_id, title=book.title, bookmark=bookmark)
elif book_format.lower() == "pdf":
- log.debug(u"Start pdf reader for %d", book_id)
+ log.debug("Start pdf reader for %d", book_id)
return render_title_template('readpdf.html', pdffile=book_id, title=book.title)
elif book_format.lower() == "txt":
- log.debug(u"Start txt reader for %d", book_id)
+ log.debug("Start txt reader for %d", book_id)
return render_title_template('readtxt.html', txtfile=book_id, title=book.title)
elif book_format.lower() == "djvu":
- log.debug(u"Start djvu reader for %d", book_id)
+ log.debug("Start djvu reader for %d", book_id)
return render_title_template('readdjvu.html', djvufile=book_id, title=book.title)
else:
for fileExt in constants.EXTENSIONS_AUDIO:
if book_format.lower() == fileExt:
entries = calibre_db.get_filtered_book(book_id)
- log.debug(u"Start mp3 listening for %d", book_id)
+ log.debug("Start mp3 listening for %d", book_id)
return render_title_template('listenmp3.html', mp3file=book_id, audioformat=book_format.lower(),
entry=entries, bookmark=bookmark)
for fileExt in ["cbr", "cbt", "cbz"]:
@@ -1497,11 +1497,11 @@ def read_book(book_id, book_format):
title = title + " - " + book.series[0].name
if book.series_index:
title = title + " #" + '{0:.2f}'.format(book.series_index).rstrip('0').rstrip('.')
- log.debug(u"Start comic reader for %d", book_id)
+ log.debug("Start comic reader for %d", book_id)
return render_title_template('readcbr.html', comicfile=all_name, title=title,
extension=fileExt)
- log.debug(u"Oops! Selected book title is unavailable. File does not exist or is not accessible")
- flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"),
+ log.debug("Selected book is unavailable. File does not exist or is not accessible")
+ flash(_("Oops! Selected book is unavailable. File does not exist or is not accessible"),
category="error")
return redirect(url_for("web.index"))
@@ -1545,7 +1545,7 @@ def show_book(book_id):
books_shelfs=book_in_shelves,
page="book")
else:
- log.debug(u"Oops! Selected book title is unavailable. File does not exist or is not accessible")
- flash(_(u"Oops! Selected book title is unavailable. File does not exist or is not accessible"),
+ log.debug("Selected book is unavailable. File does not exist or is not accessible")
+ flash(_("Oops! Selected book is unavailable. File does not exist or is not accessible"),
category="error")
return redirect(url_for("web.index"))
diff --git a/messages.pot b/messages.pot
index 949d4886..16675806 100644
--- a/messages.pot
+++ b/messages.pot
@@ -277,7 +277,7 @@ msgid "Add new user"
msgstr ""
#: cps/admin.py:1268 cps/templates/admin.html:100
-msgid "Edit E-mail Server Settings"
+msgid "Edit Email Server Settings"
msgstr ""
#: cps/admin.py:1287
@@ -290,7 +290,7 @@ msgstr ""
#: cps/shelf.py:185 cps/shelf.py:235 cps/shelf.py:272 cps/shelf.py:343
#: cps/shelf.py:457 cps/tasks/convert.py:136 cps/web.py:1421
#, python-format
-msgid "Database error: %(error)s."
+msgid "Oops! Database Error: %(error)s."
msgstr ""
#: cps/admin.py:1316
@@ -308,7 +308,7 @@ msgid "Please configure your e-mail address first..."
msgstr ""
#: cps/admin.py:1323
-msgid "E-mail server settings updated"
+msgid "Email Server Settings updated"
msgstr ""
#: cps/admin.py:1346 cps/templates/admin.html:191
@@ -329,7 +329,7 @@ msgstr ""
#: cps/admin.py:1382 cps/admin.py:1431 cps/admin.py:2022 cps/web.py:1259
#: cps/web.py:1320
-msgid "An unknown error occurred. Please try again later."
+msgid "Oops! An unknown error occurred. Please try again later."
msgstr ""
#: cps/admin.py:1386
@@ -347,7 +347,7 @@ msgid "Password for user %(user)s reset"
msgstr ""
#: cps/admin.py:1434 cps/web.py:1198
-msgid "Please configure the SMTP mail settings first..."
+msgid "Please configure the SMTP mail settings first."
msgstr ""
#: cps/admin.py:1445
@@ -461,7 +461,7 @@ msgid "Database Configuration"
msgstr ""
#: cps/admin.py:1871 cps/web.py:1233
-msgid "Please fill out all fields!"
+msgid "Oops! Please complete all fields."
msgstr ""
#: cps/admin.py:1879
@@ -474,7 +474,7 @@ msgid "User '%(user)s' created"
msgstr ""
#: cps/admin.py:1902
-msgid "Found an existing account for this e-mail address or name."
+msgid "Oops! An account already exists for this Email. or name."
msgstr ""
#: cps/admin.py:1932
@@ -491,7 +491,7 @@ msgid "No admin user remaining, can't delete user"
msgstr ""
#: cps/admin.py:1992 cps/web.py:1371
-msgid "E-Mail Address can't be empty and has to be a valid E-Mail"
+msgid "Email can't be empty and has to be a valid Email"
msgstr ""
#: cps/admin.py:2018
@@ -521,7 +521,7 @@ msgstr ""
#: cps/editbooks.py:110 cps/editbooks.py:895 cps/web.py:517 cps/web.py:1462
#: cps/web.py:1504 cps/web.py:1549
-msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
+msgid "Oops! Selected book is unavailable. File does not exist or is not accessible"
msgstr ""
#: cps/editbooks.py:154 cps/editbooks.py:1221
@@ -652,7 +652,7 @@ msgstr ""
#: cps/helper.py:97 cps/helper.py:226 cps/templates/detail.html:42
#: cps/templates/detail.html:46
-msgid "Send to E-Reader"
+msgid "Send to eReader"
msgstr ""
#: cps/helper.py:98 cps/helper.py:116 cps/helper.py:228
@@ -739,7 +739,7 @@ msgid "Book path %(path)s not found on Google Drive"
msgstr ""
#: cps/helper.py:644 cps/web.py:1416
-msgid "Found an existing account for this e-mail address"
+msgid "Oops! An account already exists for this Email."
msgstr ""
#: cps/helper.py:652
@@ -817,7 +817,7 @@ msgstr ""
#: cps/oauth_bb.py:138 cps/remotelogin.py:130 cps/web.py:1291
#, python-format
-msgid "you are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr ""
#: cps/oauth_bb.py:148
@@ -1311,20 +1311,20 @@ msgstr ""
#: cps/web.py:1203
#, python-format
-msgid "Book successfully queued for sending to %(kindlemail)s"
+msgid "Success! Book queued for sending to %(eReadermail)s"
msgstr ""
#: cps/web.py:1207
#, python-format
-msgid "Oops! There was an error sending this book: %(res)s"
+msgid "Oops! There was an error sending book: %(res)s"
msgstr ""
#: cps/web.py:1209
-msgid "Please update your profile with a valid Send to Kindle E-mail Address."
+msgid "Please update your profile with a valid Send to Kindle Email Address."
msgstr ""
#: cps/web.py:1226
-msgid "E-Mail server is not configured, please contact your administrator!"
+msgid "Oops! Email server is not configured, please contact your administrator."
msgstr ""
#: cps/templates/layout.html:68 cps/templates/layout.html:102
@@ -1335,51 +1335,51 @@ msgid "Register"
msgstr ""
#: cps/web.py:1262
-msgid "Your e-mail is not allowed to register"
+msgid "Oops! Your Email is not allowed."
msgstr ""
#: cps/web.py:1266
-msgid "Confirmation e-mail was send to your e-mail account."
+msgid "Success! Confirmation Email has been sent."
msgstr ""
#: cps/web.py:1280
-msgid "Cannot activate LDAP authentication"
+msgid "Oops! Cannot activate LDAP authentication"
msgstr ""
#: cps/web.py:1299
#, python-format
-msgid "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not known"
+msgid "Fallback Login as: %(nickname)s, LDAP Server not reachable, or user not known"
msgstr ""
#: cps/web.py:1305
#, python-format
-msgid "Could not login: %(message)s"
+msgid "Oops! Login Failed: %(message)s"
msgstr ""
#: cps/web.py:1309 cps/web.py:1334
-msgid "Wrong Username or Password"
+msgid "Oops! Invalid Username or Password."
msgstr ""
#: cps/web.py:1316
-msgid "New Password was send to your email address"
+msgid "Success! New Password was sent to your Email."
msgstr ""
#: cps/web.py:1322
-msgid "Please enter valid username to reset password"
+msgid "Oops! Please enter a valid username to reset password"
msgstr ""
#: cps/web.py:1329
#, python-format
-msgid "You are now logged in as: '%(nickname)s'"
+msgid "Success! You are now logged in as: %(nickname)s"
msgstr ""
#: cps/web.py:1396 cps/web.py:1445
#, python-format
-msgid "%(name)s's profile"
+msgid "%(name)s's Profile"
msgstr ""
#: cps/web.py:1412
-msgid "Profile updated"
+msgid Success! Profile updated"
msgstr ""
#: cps/services/gmail.py:58
@@ -1471,11 +1471,11 @@ msgstr ""
#: cps/templates/admin.html:14 cps/templates/register.html:14
#: cps/templates/user_edit.html:15 cps/templates/user_table.html:135
-msgid "E-mail Address"
+msgid "Email"
msgstr ""
#: cps/templates/admin.html:15 cps/templates/user_edit.html:28
-msgid "Send to E-Reader E-mail Address"
+msgid "Send to eReader Email"
msgstr ""
#: cps/templates/admin.html:17 cps/templates/layout.html:91
@@ -1523,7 +1523,7 @@ msgid "Import LDAP Users"
msgstr ""
#: cps/templates/admin.html:62
-msgid "E-mail Server Settings"
+msgid "Email Server Settings"
msgstr ""
#: cps/templates/admin.html:67 cps/templates/email_edit.html:31
@@ -1544,11 +1544,11 @@ msgstr ""
#: cps/templates/admin.html:83 cps/templates/admin.html:94
#: cps/templates/email_edit.html:55
-msgid "From E-mail"
+msgid "From Email"
msgstr ""
#: cps/templates/admin.html:90
-msgid "E-Mail Service"
+msgid "EMail Service"
msgstr ""
#: cps/templates/admin.html:91
@@ -1620,15 +1620,15 @@ msgid "Scheduled Tasks"
msgstr ""
#: cps/templates/admin.html:170 cps/templates/schedule_edit.html:12
-msgid "Time at which tasks start to run"
+msgid "Start Time"
msgstr ""
#: cps/templates/admin.html:174 cps/templates/schedule_edit.html:20
-msgid "Maximum tasks duration"
+msgid "Maximum Duration"
msgstr ""
#: cps/templates/admin.html:178
-msgid "Generate book cover thumbnails"
+msgid "Generate Thumbnails"
msgstr ""
#: cps/templates/admin.html:182
@@ -1636,11 +1636,11 @@ msgid "Generate series cover thumbnails"
msgstr ""
#: cps/templates/admin.html:186 cps/templates/schedule_edit.html:37
-msgid "Reconnect to Calibre Library"
+msgid "Reconnect Calibre Database"
msgstr ""
#: cps/templates/admin.html:193
-msgid "Refresh Thumbnail Cover Cache"
+msgid "Refresh Thumbnail Cache"
msgstr ""
#: cps/templates/admin.html:199
@@ -1680,7 +1680,7 @@ msgid "Details"
msgstr ""
#: cps/templates/admin.html:227
-msgid "Current version"
+msgid "Current Version"
msgstr ""
#: cps/templates/admin.html:234
@@ -2153,7 +2153,7 @@ msgid "Enable Public Registration"
msgstr ""
#: cps/templates/config_edit.html:127
-msgid "Use E-Mail as Username"
+msgid "Use Email as Username"
msgstr ""
#: cps/templates/config_edit.html:132
@@ -2506,7 +2506,7 @@ msgid "Edit Metadata"
msgstr ""
#: cps/templates/email_edit.html:13
-msgid "Choose Server Type"
+msgid "Email Account Type"
msgstr ""
#: cps/templates/email_edit.html:15
@@ -3032,7 +3032,7 @@ msgid "Choose a username"
msgstr ""
#: cps/templates/register.html:15
-msgid "Your email address"
+msgid "Your Email"
msgstr ""
#: cps/templates/remote_login.html:5
@@ -3052,7 +3052,7 @@ msgid "This verification link will expire in 10 minutes."
msgstr ""
#: cps/templates/schedule_edit.html:29
-msgid "Generate Book Cover Thumbnails"
+msgid "Generate Thumbnails"
msgstr ""
#: cps/templates/schedule_edit.html:33
@@ -3284,11 +3284,11 @@ msgid "Enter Username"
msgstr ""
#: cps/templates/user_table.html:135
-msgid "Enter E-mail Address"
+msgid "Enter Email Address"
msgstr ""
#: cps/templates/user_table.html:136
-msgid "Enter E-Reader E-mail Address"
+msgid "Enter E-Reader Email Address"
msgstr ""
#: cps/templates/user_table.html:136