Merge branch 'master' into Develop

4 years ago · 9aa01ee8cf
parent 6b993ad329 1f4564da76
commit 9aa01ee8cf
34 changed files with 45 additions and 45 deletions
--- a/cps/admin.py
+++ b/cps/admin.py
@ -604,7 +604,7 @@ def _configuration_ldap_helper(to_save, gdriveError):
        return reboot_required, _configuration_result(_('LDAP User Object Filter Has Unmatched Parenthesis'),
                                     gdriveError)
-    if config.config_ldap_cert_path and not os.path.isdir(config.config_ldap_cert_path):
+    if config.config_ldap_cert_path and not os.path.isfile(config.config_ldap_cert_path):
        return reboot_required, _configuration_result(_('LDAP Certificate Location is not Valid, Please Enter Correct Path'),
                                     gdriveError)
    return reboot_required, None
--- a/cps/translations/cs/LC_MESSAGES/messages.mo
+++ b/cps/translations/cs/LC_MESSAGES/messages.mo
--- a/cps/translations/cs/LC_MESSAGES/messages.po
+++ b/cps/translations/cs/LC_MESSAGES/messages.po
@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2020-09-26 16:18+0200\n"
+"POT-Creation-Date: 2020-10-06 21:47+0200\n"
 "PO-Revision-Date: 2020-06-09 21:11+0100\n"
 "Last-Translator: Lukas Heroudek <lukas.heroudek@gmail.com>\n"
 "Language: cs_CZ\n"
--- a/cps/translations/de/LC_MESSAGES/messages.mo
+++ b/cps/translations/de/LC_MESSAGES/messages.mo
--- a/cps/translations/de/LC_MESSAGES/messages.po
+++ b/cps/translations/de/LC_MESSAGES/messages.po
@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2020-09-26 16:18+0200\n"
+"POT-Creation-Date: 2020-10-06 21:47+0200\n"
 "PO-Revision-Date: 2020-09-26 16:18+0200\n"
 "Last-Translator: Ozzie Isaacs\n"
 "Language: de\n"
--- a/cps/translations/es/LC_MESSAGES/messages.mo
+++ b/cps/translations/es/LC_MESSAGES/messages.mo
--- a/cps/translations/es/LC_MESSAGES/messages.po
+++ b/cps/translations/es/LC_MESSAGES/messages.po
@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2020-09-26 16:18+0200\n"
+"POT-Creation-Date: 2020-10-06 21:47+0200\n"
 "PO-Revision-Date: 2020-05-25 17:22+0200\n"
 "Last-Translator: minakmostoles <xxx@xxx.com>\n"
 "Language: es\n"
@ -128,7 +128,7 @@ msgstr "La ruta de Certfile no es válida, por favor, introduzca la ruta correct
 #: cps/shelf.py:100 cps/shelf.py:161 cps/shelf.py:202 cps/shelf.py:260
 #: cps/shelf.py:309 cps/shelf.py:338 cps/shelf.py:368 cps/shelf.py:392
 msgid "Settings DB is not Writeable"
-msgstr ""
+msgstr "La base de datos de configuración no es modificable"
 #: cps/admin.py:712
 msgid "DB Location is not Valid, Please Enter Correct Path"
@ -136,7 +136,7 @@ msgstr "La ruta de la base de datos no es válida. Por favor, introduzca la ruta
 #: cps/admin.py:714
 msgid "DB is not Writeable"
-msgstr ""
+msgstr "La base de datos no es modificable"
 #: cps/admin.py:747
 msgid "Basic Configuration"
@ -300,7 +300,7 @@ msgstr "no configurado"
 #: cps/converter.py:34
 msgid "Execution permissions missing"
-msgstr ""
+msgstr "Faltan permisos de ejecución"
 #: cps/editbooks.py:245
 msgid "Book Format Successfully Deleted"
@ -346,7 +346,7 @@ msgstr "Fallo al guardar el archivo %(file)s."
 #: cps/editbooks.py:516 cps/editbooks.py:887
 #, python-format
 msgid "Database error: %(error)s."
-msgstr ""
+msgstr "Error en la base de datos: %(error)s."
 #: cps/editbooks.py:520
 #, python-format
@ -475,7 +475,7 @@ msgstr "El archivo solicitado no puede ser leído. ¿Quizás existen problemas c
 #: cps/helper.py:325
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
-msgstr ""
+msgstr "Fallo al intentar borrar la carpeta del libro %(id)s, la ruta tiene subcarpetas: %(path)s"
 #: cps/helper.py:331
 #, python-format
@ -514,11 +514,11 @@ msgstr "La ruta %(path)s del libro no fue encontrada en Google Drive"
 #: cps/helper.py:576
 msgid "Error Downloading Cover"
-msgstr ""
+msgstr "Error al descargar la cubierta"
 #: cps/helper.py:579
 msgid "Cover Format Error"
-msgstr ""
+msgstr "Error en el formato de la cubierta"
 #: cps/helper.py:594
 msgid "Failed to create path for cover"
@ -636,7 +636,7 @@ msgstr "Error al desenlazar %(oauth)s"
 #: cps/oauth_bb.py:290
 #, python-format
 msgid "Not Linked to %(oauth)s"
-msgstr ""
+msgstr "No vinculado con %(oauth)s"
 #: cps/oauth_bb.py:318
 msgid "GitHub Oauth error, please retry later."
@ -1185,7 +1185,7 @@ msgstr "Borrar"
 #: cps/templates/admin.html:23
 msgid "Public Shelf"
-msgstr ""
+msgstr "Estantería pública"
 #: cps/templates/admin.html:44
 msgid "Add New User"
@ -1237,7 +1237,7 @@ msgstr "Puerto"
 #: cps/templates/admin.html:93
 msgid "External Port"
-msgstr ""
+msgstr "Puerto externo"
 #: cps/templates/admin.html:100 cps/templates/config_view_edit.html:27
 msgid "Books per Page"
@ -1641,7 +1641,7 @@ msgstr "Permitir subidas"
 #: cps/templates/config_edit.html:169
 msgid "Allowed Upload Fileformats"
-msgstr ""
+msgstr "Formatos de archivo permitidos para subida"
 #: cps/templates/config_edit.html:175
 msgid "Enable Anonymous Browsing"
@ -1653,7 +1653,7 @@ msgstr "Permitir registro público"
 #: cps/templates/config_edit.html:184
 msgid "Use E-Mail as Username"
-msgstr ""
+msgstr "Utilizar eMail como nombre de usuario"
 #: cps/templates/config_edit.html:189
 msgid "Enable Magic Link Remote Login"
@ -1669,7 +1669,7 @@ msgstr "Peticiones proxy a la tienda Kobo desconocidas"
 #: cps/templates/config_edit.html:202
 msgid "Server External Port (for port forwarded API calls)"
-msgstr ""
+msgstr "Puerto externo del servidor (para peticiones API)"
 #: cps/templates/config_edit.html:210
 msgid "Use Goodreads"
@ -1813,15 +1813,15 @@ msgstr "Binarios externos"
 #: cps/templates/config_edit.html:352
 msgid "Path to Calibre E-Book Converter"
-msgstr ""
+msgstr "Ruta para Calibre E-Book Converter"
 #: cps/templates/config_edit.html:360
 msgid "Calibre E-Book Converter Settings"
-msgstr ""
+msgstr "Configuración de Calibre E-Book Converter"
 #: cps/templates/config_edit.html:363
 msgid "Path to Kepubify E-Book Converter"
-msgstr ""
+msgstr "Ruta para Kepubify E-Book Converter"
 #: cps/templates/config_edit.html:371
 msgid "Location of Unrar binary"
--- a/cps/translations/fi/LC_MESSAGES/messages.mo
+++ b/cps/translations/fi/LC_MESSAGES/messages.mo
--- a/cps/translations/fi/LC_MESSAGES/messages.po
+++ b/cps/translations/fi/LC_MESSAGES/messages.po
@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2020-09-26 16:18+0200\n"
+"POT-Creation-Date: 2020-10-06 21:47+0200\n"
 "PO-Revision-Date: 2020-01-12 13:56+0100\n"
 "Last-Translator: Samuli Valavuo <svalavuo@gmail.com>\n"
 "Language: fi\n"
--- a/cps/translations/fr/LC_MESSAGES/messages.mo
+++ b/cps/translations/fr/LC_MESSAGES/messages.mo
--- a/cps/translations/fr/LC_MESSAGES/messages.po
+++ b/cps/translations/fr/LC_MESSAGES/messages.po
@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-09-26 16:18+0200\n"
+"POT-Creation-Date: 2020-10-06 21:47+0200\n"
 "PO-Revision-Date: 2020-06-07 06:47+0200\n"
 "Last-Translator: Dekani <dekani1500@gmail.com>\n"
 "Language: fr\n"
--- a/cps/translations/hu/LC_MESSAGES/messages.mo
+++ b/cps/translations/hu/LC_MESSAGES/messages.mo
--- a/cps/translations/hu/LC_MESSAGES/messages.po
+++ b/cps/translations/hu/LC_MESSAGES/messages.po
@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-09-26 16:18+0200\n"
+"POT-Creation-Date: 2020-10-06 21:47+0200\n"
 "PO-Revision-Date: 2019-04-06 23:36+0200\n"
 "Last-Translator: \n"
 "Language: hu\n"
--- a/cps/translations/it/LC_MESSAGES/messages.mo
+++ b/cps/translations/it/LC_MESSAGES/messages.mo
--- a/cps/translations/it/LC_MESSAGES/messages.po
+++ b/cps/translations/it/LC_MESSAGES/messages.po
@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2020-09-26 16:18+0200\n"
+"POT-Creation-Date: 2020-10-06 21:47+0200\n"
 "PO-Revision-Date: 2017-04-04 15:09+0200\n"
 "Last-Translator: ElQuimm <quimm@webtaste.com>\n"
 "Language: it\n"
--- a/cps/translations/ja/LC_MESSAGES/messages.mo
+++ b/cps/translations/ja/LC_MESSAGES/messages.mo
--- a/cps/translations/ja/LC_MESSAGES/messages.po
+++ b/cps/translations/ja/LC_MESSAGES/messages.po
@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2020-09-26 16:18+0200\n"
+"POT-Creation-Date: 2020-10-06 21:47+0200\n"
 "PO-Revision-Date: 2018-02-07 02:20-0500\n"
 "Last-Translator: white <space_white@yahoo.com>\n"
 "Language: ja\n"
--- a/cps/translations/km/LC_MESSAGES/messages.mo
+++ b/cps/translations/km/LC_MESSAGES/messages.mo
--- a/cps/translations/km/LC_MESSAGES/messages.po
+++ b/cps/translations/km/LC_MESSAGES/messages.po
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2020-09-26 16:18+0200\n"
+"POT-Creation-Date: 2020-10-06 21:47+0200\n"
 "PO-Revision-Date: 2018-08-27 17:06+0700\n"
 "Last-Translator: \n"
 "Language: km_KH\n"
--- a/cps/translations/nl/LC_MESSAGES/messages.mo
+++ b/cps/translations/nl/LC_MESSAGES/messages.mo
--- a/cps/translations/nl/LC_MESSAGES/messages.po
+++ b/cps/translations/nl/LC_MESSAGES/messages.po
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Calibre-Web (GPLV3)\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2020-09-26 16:18+0200\n"
+"POT-Creation-Date: 2020-10-06 21:47+0200\n"
 "PO-Revision-Date: 2020-05-10 21:00+0200\n"
 "Last-Translator: Marcel Maas <marcel.maas@outlook.com>\n"
 "Language: nl\n"
--- a/cps/translations/pl/LC_MESSAGES/messages.mo
+++ b/cps/translations/pl/LC_MESSAGES/messages.mo
--- a/cps/translations/pl/LC_MESSAGES/messages.po
+++ b/cps/translations/pl/LC_MESSAGES/messages.po
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Calibre Web - polski (POT: 2019-08-06 18:35)\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-09-26 16:18+0200\n"
+"POT-Creation-Date: 2020-10-06 21:47+0200\n"
 "PO-Revision-Date: 2020-08-30 21:05+0200\n"
 "Last-Translator: Jerzy Piątek <jerzy.piatek@gmail.com>\n"
 "Language: pl\n"
--- a/cps/translations/ru/LC_MESSAGES/messages.mo
+++ b/cps/translations/ru/LC_MESSAGES/messages.mo
--- a/cps/translations/ru/LC_MESSAGES/messages.po
+++ b/cps/translations/ru/LC_MESSAGES/messages.po
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2020-09-26 16:18+0200\n"
+"POT-Creation-Date: 2020-10-06 21:47+0200\n"
 "PO-Revision-Date: 2020-04-29 01:20+0400\n"
 "Last-Translator: ZIZA\n"
 "Language: ru\n"
--- a/cps/translations/sv/LC_MESSAGES/messages.mo
+++ b/cps/translations/sv/LC_MESSAGES/messages.mo
--- a/cps/translations/sv/LC_MESSAGES/messages.po
+++ b/cps/translations/sv/LC_MESSAGES/messages.po
@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/Calibre-Web\n"
-"POT-Creation-Date: 2020-09-26 16:18+0200\n"
+"POT-Creation-Date: 2020-10-06 21:47+0200\n"
 "PO-Revision-Date: 2020-03-14 09:30+0100\n"
 "Last-Translator: Jonatan Nyberg <jonatan.nyberg.karl@gmail.com>\n"
 "Language: sv\n"
--- a/cps/translations/tr/LC_MESSAGES/messages.mo
+++ b/cps/translations/tr/LC_MESSAGES/messages.mo
--- a/cps/translations/tr/LC_MESSAGES/messages.po
+++ b/cps/translations/tr/LC_MESSAGES/messages.po
@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-09-26 16:18+0200\n"
+"POT-Creation-Date: 2020-10-06 21:47+0200\n"
 "PO-Revision-Date: 2020-04-23 22:47+0300\n"
 "Last-Translator: iz <iz7iz7iz@protonmail.ch>\n"
 "Language: tr\n"
--- a/cps/translations/uk/LC_MESSAGES/messages.mo
+++ b/cps/translations/uk/LC_MESSAGES/messages.mo
--- a/cps/translations/uk/LC_MESSAGES/messages.po
+++ b/cps/translations/uk/LC_MESSAGES/messages.po
@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
-"POT-Creation-Date: 2020-09-26 16:18+0200\n"
+"POT-Creation-Date: 2020-10-06 21:47+0200\n"
 "PO-Revision-Date: 2017-04-30 00:47+0300\n"
 "Last-Translator: ABIS Team <biblio.if.abis@gmail.com>\n"
 "Language: uk\n"
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
--- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
+++ b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-Web\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-09-26 16:18+0200\n"
+"POT-Creation-Date: 2020-10-06 21:47+0200\n"
-"PO-Revision-Date: 2020-06-20 19:06+0800\n"
+"PO-Revision-Date: 2020-09-27 22:18+0800\n"
 "Last-Translator: dalin <dalin.lin@gmail.com>\n"
 "Language: zh_CN\n"
 "Language-Team: zh_Hans_CN <LL@li.org>\n"
@ -59,7 +59,7 @@ msgstr "管理页"
 #: cps/admin.py:158
 msgid "UI Configuration"
-msgstr "UI配置"
+msgstr "界面配置"
 #: cps/admin.py:190 cps/admin.py:717
 msgid "Calibre-Web configuration updated"
@ -125,7 +125,7 @@ msgstr "证书文件路径无效，请输入正确的路径"
 #: cps/shelf.py:100 cps/shelf.py:161 cps/shelf.py:202 cps/shelf.py:260
 #: cps/shelf.py:309 cps/shelf.py:338 cps/shelf.py:368 cps/shelf.py:392
 msgid "Settings DB is not Writeable"
-msgstr ""
+msgstr "设置数据库不可写入"
 #: cps/admin.py:712
 msgid "DB Location is not Valid, Please Enter Correct Path"
@ -352,7 +352,7 @@ msgstr "已添加 %(ext)s 格式到 %(book)s"
 #: cps/editbooks.py:636
 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier"
-msgstr ""
+msgstr "标识符不区分大小写，覆盖旧标识符"
 #: cps/editbooks.py:673
 msgid "Metadata successfully updated"
@ -472,7 +472,7 @@ msgstr "无法读取请求的文件。可能有错误的权限设置？"
 #: cps/helper.py:325
 #, python-format
 msgid "Deleting bookfolder for book %(id)s failed, path has subfolders: %(path)s"
-msgstr ""
+msgstr "删除书的文件夹%(id)s失败，路径有子文件夹：%(path)s"
 #: cps/helper.py:331
 #, python-format
@ -633,7 +633,7 @@ msgstr "取消链接到%(oauth)s失败"
 #: cps/oauth_bb.py:290
 #, python-format
 msgid "Not Linked to %(oauth)s"
-msgstr ""
+msgstr "为连接到%(oauth)s"
 #: cps/oauth_bb.py:318
 msgid "GitHub Oauth error, please retry later."
@ -1154,7 +1154,7 @@ msgstr "管理权限"
 #: cps/templates/admin.html:17 cps/templates/login.html:12
 #: cps/templates/login.html:13 cps/templates/user_edit.html:22
 msgid "Password"
-msgstr "有无密码"
+msgstr "密码"
 #: cps/templates/admin.html:18 cps/templates/layout.html:66
 msgid "Upload"
@ -1234,7 +1234,7 @@ msgstr "端口"
 #: cps/templates/admin.html:93
 msgid "External Port"
-msgstr ""
+msgstr "扩展端口"
 #: cps/templates/admin.html:100 cps/templates/config_view_edit.html:27
 msgid "Books per Page"
@ -1666,7 +1666,7 @@ msgstr "代理未知请求到Kobo商店"
 #: cps/templates/config_edit.html:202
 msgid "Server External Port (for port forwarded API calls)"
-msgstr ""
+msgstr "服务器扩展端口(用于转发的API调用的端口)"
 #: cps/templates/config_edit.html:210
 msgid "Use Goodreads"
@ -1797,12 +1797,12 @@ msgstr "获取 %(provider)s OAuth凭证"
 #: cps/templates/config_edit.html:326
 #, python-format
 msgid "%(provider)s OAuth Client Id"
-msgstr "%(provider)s OAuth Client Secret"
+msgstr "%(provider)s OAuth 客户端 Secret"
 #: cps/templates/config_edit.html:330
 #, python-format
 msgid "%(provider)s OAuth Client Secret"
-msgstr "%(provider)s OAuth Client Secret"
+msgstr "%(provider)s OAuth 客户端 Secret"
 #: cps/templates/config_edit.html:346
 msgid "External binaries"
--- a/messages.pot
+++ b/messages.pot
@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-09-26 16:18+0200\n"
+"POT-Creation-Date: 2020-10-06 21:47+0200\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"