Merge branch 'master' into master

messages.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2021-12-01 11:37+0800\n"
+"POT-Creation-Date: 2021-12-04 10:53+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -308,7 +308,7 @@ msgstr ""
 msgid "Database Configuration"
 msgstr ""
 
-#: cps/admin.py:1340 cps/web.py:1492
+#: cps/admin.py:1340 cps/web.py:1487
 msgid "Please fill out all fields!"
 msgstr ""
 
@@ -352,7 +352,7 @@ msgstr ""
 msgid "User '%(nick)s' updated"
 msgstr ""
 
-#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1517 cps/web.py:1580
+#: cps/admin.py:1478 cps/admin.py:1610 cps/web.py:1512 cps/web.py:1575
 msgid "An unknown error occurred. Please try again later."
 msgstr ""
 
@@ -387,7 +387,7 @@ msgstr ""
 msgid "Password for user %(user)s reset"
 msgstr ""
 
-#: cps/admin.py:1613 cps/web.py:1457
+#: cps/admin.py:1613 cps/web.py:1452
 msgid "Please configure the SMTP mail settings first..."
 msgstr ""
 
@@ -485,7 +485,7 @@ msgstr ""
 msgid "Execution permissions missing"
 msgstr ""
 
-#: cps/db.py:651 cps/web.py:672 cps/web.py:1168
+#: cps/db.py:651 cps/web.py:675 cps/web.py:1163
 #, python-format
 msgid "Custom Column No.%(column)d is not existing in calibre database"
 msgstr ""
@@ -498,11 +498,9 @@ msgstr ""
 msgid "Book Successfully Deleted"
 msgstr ""
 
-#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:528 cps/web.py:1719
-#: cps/web.py:1760 cps/web.py:1827
-msgid ""
-"Oops! Selected book title is unavailable. File does not exist or is not "
-"accessible"
+#: cps/editbooks.py:372 cps/editbooks.py:759 cps/web.py:531 cps/web.py:1714
+#: cps/web.py:1755 cps/web.py:1822
+msgid "Oops! Selected book title is unavailable. File does not exist or is not accessible"
 msgstr ""
 
 #: cps/editbooks.py:406
@@ -538,7 +536,7 @@ msgstr ""
 msgid "Failed to store file %(file)s."
 msgstr ""
 
-#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1680
+#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1675
 #, python-format
 msgid "Database error: %(error)s."
 msgstr ""
@@ -561,9 +559,7 @@ msgid "Error editing book, please check logfile for details"
 msgstr ""
 
 #: cps/editbooks.py:895
-msgid ""
-"Uploaded book probably exists in the library, consider to change before "
-"upload new: "
+msgid "Uploaded book probably exists in the library, consider to change before upload new: "
 msgstr ""
 
 #: cps/editbooks.py:993
@@ -704,7 +700,7 @@ msgstr ""
 msgid "Book path %(path)s not found on Google Drive"
 msgstr ""
 
-#: cps/helper.py:507 cps/web.py:1675
+#: cps/helper.py:507 cps/web.py:1670
 msgid "Found an existing account for this e-mail address"
 msgstr ""
 
@@ -787,7 +783,7 @@ msgstr ""
 msgid "Register with %(provider)s"
 msgstr ""
 
-#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1551
+#: cps/oauth_bb.py:138 cps/remotelogin.py:133 cps/web.py:1546
 #, python-format
 msgid "you are now logged in as: '%(nickname)s'"
 msgstr ""
@@ -853,7 +849,7 @@ msgid "{} Stars"
 msgstr ""
 
 #: cps/remotelogin.py:65 cps/templates/layout.html:84
-#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600
+#: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1595
 msgid "Login"
 msgstr ""
 
@@ -869,7 +865,7 @@ msgstr ""
 msgid "Success! Please return to your device"
 msgstr ""
 
-#: cps/render_template.py:39 cps/web.py:421
+#: cps/render_template.py:39 cps/web.py:424
 msgid "Books"
 msgstr ""
 
@@ -894,7 +890,7 @@ msgstr ""
 msgid "Show Downloaded Books"
 msgstr ""
 
-#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:435
+#: cps/render_template.py:56 cps/templates/index.xml:32 cps/web.py:438
 msgid "Top Rated Books"
 msgstr ""
 
@@ -903,7 +899,7 @@ msgid "Show Top Rated Books"
 msgstr ""
 
 #: cps/render_template.py:59 cps/templates/index.xml:54
-#: cps/templates/index.xml:58 cps/web.py:681
+#: cps/templates/index.xml:58 cps/web.py:684
 msgid "Read Books"
 msgstr ""
 
@@ -912,7 +908,7 @@ msgid "Show read and unread"
 msgstr ""
 
 #: cps/render_template.py:63 cps/templates/index.xml:61
-#: cps/templates/index.xml:65 cps/web.py:684
+#: cps/templates/index.xml:65 cps/web.py:687
 msgid "Unread Books"
 msgstr ""
 
@@ -930,7 +926,7 @@ msgid "Show Random Books"
 msgstr ""
 
 #: cps/render_template.py:69 cps/templates/book_table.html:67
-#: cps/templates/index.xml:83 cps/web.py:1055
+#: cps/templates/index.xml:83 cps/web.py:1050
 msgid "Categories"
 msgstr ""
 
@@ -940,7 +936,7 @@ msgstr ""
 
 #: cps/render_template.py:72 cps/templates/book_edit.html:90
 #: cps/templates/book_table.html:68 cps/templates/index.xml:90
-#: cps/templates/search_form.html:69 cps/web.py:954 cps/web.py:965
+#: cps/templates/search_form.html:69 cps/web.py:957 cps/web.py:968
 msgid "Series"
 msgstr ""
 
@@ -958,7 +954,7 @@ msgid "Show author selection"
 msgstr ""
 
 #: cps/render_template.py:79 cps/templates/book_table.html:72
-#: cps/templates/index.xml:76 cps/web.py:931
+#: cps/templates/index.xml:76 cps/web.py:934
 msgid "Publishers"
 msgstr ""
 
@@ -968,7 +964,7 @@ msgstr ""
 
 #: cps/render_template.py:82 cps/templates/book_table.html:70
 #: cps/templates/index.xml:97 cps/templates/search_form.html:107
-#: cps/web.py:1032
+#: cps/web.py:1027
 msgid "Languages"
 msgstr ""
 
@@ -992,7 +988,7 @@ msgstr ""
 msgid "Show file formats selection"
 msgstr ""
 
-#: cps/render_template.py:93 cps/web.py:708
+#: cps/render_template.py:93 cps/web.py:711
 msgid "Archived Books"
 msgstr ""
 
@@ -1000,7 +996,7 @@ msgstr ""
 msgid "Show archived books"
 msgstr ""
 
-#: cps/render_template.py:97 cps/web.py:785
+#: cps/render_template.py:97 cps/web.py:788
 msgid "Books List"
 msgstr ""
 
@@ -1141,179 +1137,179 @@ msgstr ""
 msgid "No release information available"
 msgstr ""
 
-#: cps/templates/index.html:5 cps/web.py:445
+#: cps/templates/index.html:5 cps/web.py:448
 msgid "Discover (Random Books)"
 msgstr ""
 
-#: cps/web.py:476
+#: cps/web.py:479
 msgid "Hot Books (Most Downloaded)"
 msgstr ""
 
-#: cps/web.py:512
+#: cps/web.py:515
 #, python-format
 msgid "Downloaded books by %(user)s"
 msgstr ""
 
-#: cps/web.py:544
+#: cps/web.py:547
 #, python-format
 msgid "Author: %(name)s"
 msgstr ""
 
-#: cps/web.py:559
+#: cps/web.py:562
 #, python-format
 msgid "Publisher: %(name)s"
 msgstr ""
 
-#: cps/web.py:574
+#: cps/web.py:577
 #, python-format
 msgid "Series: %(serie)s"
 msgstr ""
 
-#: cps/web.py:587
+#: cps/web.py:590
 #, python-format
 msgid "Rating: %(rating)s stars"
 msgstr ""
 
-#: cps/web.py:602
+#: cps/web.py:605
 #, python-format
 msgid "File format: %(format)s"
 msgstr ""
 
-#: cps/web.py:620
+#: cps/web.py:623
 #, python-format
 msgid "Category: %(name)s"
 msgstr ""
 
-#: cps/web.py:636
+#: cps/web.py:639
 #, python-format
 msgid "Language: %(name)s"
 msgstr ""
 
-#: cps/templates/layout.html:56 cps/web.py:742 cps/web.py:1384
+#: cps/templates/layout.html:56 cps/web.py:745 cps/web.py:1379
 msgid "Advanced Search"
 msgstr ""
 
 #: cps/templates/book_edit.html:235 cps/templates/feed.xml:33
 #: cps/templates/index.xml:11 cps/templates/layout.html:45
 #: cps/templates/layout.html:48 cps/templates/search_form.html:226
-#: cps/web.py:755 cps/web.py:1090
+#: cps/web.py:758 cps/web.py:1085
 msgid "Search"
 msgstr ""
 
-#: cps/templates/admin.html:16 cps/web.py:909
+#: cps/templates/admin.html:16 cps/web.py:912
 msgid "Downloads"
 msgstr ""
 
-#: cps/web.py:986
+#: cps/web.py:989
 msgid "Ratings list"
 msgstr ""
 
-#: cps/web.py:1007
+#: cps/web.py:1010
 msgid "File formats list"
 msgstr ""
 
-#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1069
+#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1064
 msgid "Tasks"
 msgstr ""
 
-#: cps/web.py:1228
+#: cps/web.py:1223
 msgid "Published after "
 msgstr ""
 
-#: cps/web.py:1235
+#: cps/web.py:1230
 msgid "Published before "
 msgstr ""
 
-#: cps/web.py:1257
+#: cps/web.py:1252
 #, python-format
 msgid "Rating <= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1259
+#: cps/web.py:1254
 #, python-format
 msgid "Rating >= %(rating)s"
 msgstr ""
 
-#: cps/web.py:1261
+#: cps/web.py:1256
 #, python-format
 msgid "Read Status = %(status)s"
 msgstr ""
 
-#: cps/web.py:1366
+#: cps/web.py:1361
 msgid "Error on search for custom columns, please restart Calibre-Web"
 msgstr ""
 
-#: cps/web.py:1462
+#: cps/web.py:1457
 #, python-format
 msgid "Book successfully queued for sending to %(kindlemail)s"
 msgstr ""
 
-#: cps/web.py:1466
+#: cps/web.py:1461
 #, python-format
 msgid "Oops! There was an error sending this book: %(res)s"
 msgstr ""
 
-#: cps/web.py:1468
+#: cps/web.py:1463
 msgid "Please update your profile with a valid Send to Kindle E-mail Address."
 msgstr ""
 
-#: cps/web.py:1485
+#: cps/web.py:1480
 msgid "E-Mail server is not configured, please contact your administrator!"
 msgstr ""
 
-#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1486
-#: cps/web.py:1493 cps/web.py:1499 cps/web.py:1518 cps/web.py:1522
-#: cps/web.py:1528
+#: cps/templates/layout.html:85 cps/templates/register.html:17 cps/web.py:1481
+#: cps/web.py:1488 cps/web.py:1494 cps/web.py:1513 cps/web.py:1517
+#: cps/web.py:1523
 msgid "Register"
 msgstr ""
 
-#: cps/web.py:1520
+#: cps/web.py:1515
 msgid "Your e-mail is not allowed to register"
 msgstr ""
 
-#: cps/web.py:1523
+#: cps/web.py:1518
 msgid "Confirmation e-mail was send to your e-mail account."
 msgstr ""
 
-#: cps/web.py:1540
+#: cps/web.py:1535
 msgid "Cannot activate LDAP authentication"
 msgstr ""
 
-#: cps/web.py:1559
+#: cps/web.py:1554
 #, python-format
 msgid ""
 "Fallback Login as: '%(nickname)s', LDAP Server not reachable, or user not"
 " known"
 msgstr ""
 
-#: cps/web.py:1565
+#: cps/web.py:1560
 #, python-format
 msgid "Could not login: %(message)s"
 msgstr ""
 
-#: cps/web.py:1569 cps/web.py:1594
+#: cps/web.py:1564 cps/web.py:1589
 msgid "Wrong Username or Password"
 msgstr ""
 
-#: cps/web.py:1576
+#: cps/web.py:1571
 msgid "New Password was send to your email address"
 msgstr ""
 
-#: cps/web.py:1582
+#: cps/web.py:1577
 msgid "Please enter valid username to reset password"
 msgstr ""
 
-#: cps/web.py:1589
+#: cps/web.py:1584
 #, python-format
 msgid "You are now logged in as: '%(nickname)s'"
 msgstr ""
 
-#: cps/web.py:1655 cps/web.py:1704
+#: cps/web.py:1650 cps/web.py:1699
 #, python-format
 msgid "%(name)s's profile"
 msgstr ""
 
-#: cps/web.py:1671
+#: cps/web.py:1666
 msgid "Profile updated"
 msgstr ""
 
@@ -1717,9 +1713,7 @@ msgid "Rating"
 msgstr ""
 
 #: cps/templates/book_edit.html:103
-msgid ""
-"Fetch Cover from URL (JPEG - Image will be downloaded and stored in "
-"database)"
+msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)"
 msgstr ""
 
 #: cps/templates/book_edit.html:107