From e2954249f87fc9486da14003fcd643f8aff00a64 Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 27 Sep 2020 19:22:41 +0200
Subject: [PATCH 1/4] Update chinese translation

---
 .../zh_Hans_CN/LC_MESSAGES/messages.mo        | Bin 39718 -> 40312 bytes
 .../zh_Hans_CN/LC_MESSAGES/messages.po        |  24 +++++++++---------
 messages.pot                                  |   2 +-
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.mo
index 6a1d309d1287059dee888893a02ed126e9741d3b..dc4ad94cbe9930403462149003af90f348bb8357 100644
GIT binary patch
delta 10372
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
F`F}44=Q#iX

delta 9842
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

diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po
index 8a23b413..32bdfdc8 100644
--- 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"
-"PO-Revision-Date: 2020-06-20 19:06+0800\n"
+"POT-Creation-Date: 2020-09-27 19:21+0200\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"
diff --git a/messages.pot b/messages.pot
index 2b93c12b..0a17c75c 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2020-09-26 16:18+0200\n"
+"POT-Creation-Date: 2020-09-27 19:21+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"

From 1cb640e51e52bb6a02e2cecaf6cb3e9bd2b1349e Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Tue, 29 Sep 2020 18:19:00 +0200
Subject: [PATCH 2/4] Update minimum required version of SQLAlchemy (Fix #1641)

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index e7735041..70359568 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ iso-639>=0.4.5,<0.5.0
 PyPDF2==1.26.0,<1.27.0
 pytz>=2016.10
 requests>=2.11.1,<2.24.0
-SQLAlchemy>=1.1.0,<1.4.0
+SQLAlchemy>=1.3.0,<1.4.0
 tornado>=4.1,<6.1
 Wand>=0.4.4,<0.6.0
 unidecode>=0.04.19,<1.2.0

From 95d540630ea6383c9d354d869944db8c87f3d48c Mon Sep 17 00:00:00 2001
From: Ozzieisaacs <ozzie.fernandez.isaacs@googlemail.com>
Date: Sun, 4 Oct 2020 06:15:35 +0200
Subject: [PATCH 3/4] Change ldap_certpath to file

---
 cps/admin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cps/admin.py b/cps/admin.py
index cd37ad80..ebe2fdff 100644
--- 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

From edc293f96a43872884fad7ad326e5b743f85adfc Mon Sep 17 00:00:00 2001
From: Nacho Soler <escribame@nachosoler.es>
Date: Tue, 6 Oct 2020 16:43:00 +0200
Subject: [PATCH 4/4] Update

Add some missings translations
---
 cps/translations/es/LC_MESSAGES/messages.po | 32 ++++++++++-----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/cps/translations/es/LC_MESSAGES/messages.po b/cps/translations/es/LC_MESSAGES/messages.po
index c51cd74e..64cb1f62 100644
--- a/cps/translations/es/LC_MESSAGES/messages.po
+++ b/cps/translations/es/LC_MESSAGES/messages.po
@@ -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"