From 67e37215305e5546441c99b2f582b5cf5d1af030 Mon Sep 17 00:00:00 2001 From: xlivevil Date: Wed, 1 Dec 2021 11:28:03 +0800 Subject: [PATCH 01/16] fix(tinymce Simplified Chinese locale):rename zh_CN to zh_Hans_CN --- cps/static/js/libs/tinymce/langs/zh_Hans_CN.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cps/static/js/libs/tinymce/langs/zh_Hans_CN.js b/cps/static/js/libs/tinymce/langs/zh_Hans_CN.js index 2a784f57..981c9090 100644 --- a/cps/static/js/libs/tinymce/langs/zh_Hans_CN.js +++ b/cps/static/js/libs/tinymce/langs/zh_Hans_CN.js @@ -1,4 +1,4 @@ -tinymce.addI18n('zh_CN',{ +tinymce.addI18n('zh_Hans_CN',{ "Redo": "\u91cd\u505a", "Undo": "\u64a4\u9500", "Cut": "\u526a\u5207", From 8438b2a07b309ab0d2ce22ea2a8cbe1ad0336a1b Mon Sep 17 00:00:00 2001 From: xlivevil Date: Wed, 1 Dec 2021 12:14:57 +0800 Subject: [PATCH 02/16] Update Simplified Chinese translation --- .../zh_Hans_CN/LC_MESSAGES/messages.po | 197 ++++++++------- messages.pot | 232 ++++++++++-------- 2 files changed, 233 insertions(+), 196 deletions(-) diff --git a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po b/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po index da32d2cb..6625279e 100644 --- a/cps/translations/zh_Hans_CN/LC_MESSAGES/messages.po +++ b/cps/translations/zh_Hans_CN/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: 2021-11-23 19:29+0100\n" +"POT-Creation-Date: 2021-12-01 11:37+0800\n" "PO-Revision-Date: 2020-09-27 22:18+0800\n" "Last-Translator: xlivevil \n" "Language: zh_CN\n" @@ -16,7 +16,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.9.0\n" +"Generated-By: Babel 2.9.1\n" #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31 msgid "not installed" @@ -46,9 +46,9 @@ msgstr "重新连接成功" msgid "Unknown command" msgstr "未知命令" -#: cps/admin.py:167 cps/editbooks.py:704 cps/editbooks.py:718 -#: cps/editbooks.py:859 cps/editbooks.py:861 cps/editbooks.py:888 -#: cps/editbooks.py:904 cps/updater.py:584 cps/uploader.py:93 +#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717 +#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891 +#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93 #: cps/uploader.py:103 msgid "Unknown" msgstr "未知" @@ -290,7 +290,6 @@ msgid "Certfile Location is not Valid, Please Enter Correct Path" msgstr "证书文件路径无效，请输入正确的路径" #: cps/admin.py:1316 -#, fuzzy msgid "Database Settings updated" msgstr "邮件服务器设置已更新" @@ -435,13 +434,12 @@ msgid "General error" msgstr "一般错误" #: cps/admin.py:1701 -#, fuzzy msgid "Update file could not be saved in temp dir" msgstr "更新文件无法保存在临时目录中" #: cps/admin.py:1702 msgid "Files could not be replaced during update" -msgstr "" +msgstr "更新期间无法替换文件" #: cps/admin.py:1726 msgid "Failed to extract at least One LDAP User" @@ -481,103 +479,103 @@ msgstr "缺少执行权限" msgid "Custom Column No.%(column)d is not existing in calibre database" msgstr "自定义列号：%(column)d在Calibre数据库中不存在" -#: cps/editbooks.py:306 cps/editbooks.py:308 +#: cps/editbooks.py:305 cps/editbooks.py:307 msgid "Book Format Successfully Deleted" msgstr "书籍格式已成功删除" -#: cps/editbooks.py:315 cps/editbooks.py:317 +#: cps/editbooks.py:314 cps/editbooks.py:316 msgid "Book Successfully Deleted" msgstr "书籍已成功删除" -#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719 +#: 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" msgstr "糟糕！选择书名无法打开。文件不存在或者文件不可访问" -#: cps/editbooks.py:407 +#: cps/editbooks.py:406 msgid "edit metadata" msgstr "编辑元数据" -#: cps/editbooks.py:455 +#: cps/editbooks.py:454 #, python-format msgid "%(seriesindex)s is not a valid number, skipping" msgstr "%(seriesindex)s 不是一个有效的数值，忽略" -#: cps/editbooks.py:491 +#: cps/editbooks.py:490 cps/editbooks.py:954 #, python-format -msgid "%(langname)s is not a valid language" -msgstr "%(langname)s 不是一种有效语言" +msgid "'%(langname)s' is not a valid language" +msgstr "'%(langname)s' 不是一种有效语言" -#: cps/editbooks.py:631 cps/editbooks.py:974 +#: cps/editbooks.py:630 cps/editbooks.py:981 #, python-format msgid "File extension '%(ext)s' is not allowed to be uploaded to this server" msgstr "不能上传文件扩展名为“%(ext)s”的文件到此服务器" -#: cps/editbooks.py:635 cps/editbooks.py:978 +#: cps/editbooks.py:634 cps/editbooks.py:985 msgid "File to be uploaded must have an extension" msgstr "要上传的文件必须具有扩展名" -#: cps/editbooks.py:647 +#: cps/editbooks.py:646 #, python-format msgid "Failed to create path %(path)s (Permission denied)." msgstr "创建路径 %(path)s 失败(权限拒绝)。" -#: cps/editbooks.py:652 +#: cps/editbooks.py:651 #, python-format msgid "Failed to store file %(file)s." msgstr "保存文件 %(file)s 失败。" -#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680 +#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1680 #, python-format msgid "Database error: %(error)s." msgstr "数据库错误：%(error)s。" -#: cps/editbooks.py:675 +#: cps/editbooks.py:674 #, python-format msgid "File format %(ext)s added to %(book)s" msgstr "已添加 %(ext)s 格式到 %(book)s" -#: cps/editbooks.py:811 +#: cps/editbooks.py:810 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier" msgstr "标识符不区分大小写，覆盖旧标识符" -#: cps/editbooks.py:845 +#: cps/editbooks.py:844 msgid "Metadata successfully updated" msgstr "已成功更新元数据" -#: cps/editbooks.py:854 +#: cps/editbooks.py:857 msgid "Error editing book, please check logfile for details" msgstr "编辑书籍出错，请检查日志文件以获取详细信息" -#: cps/editbooks.py:892 +#: cps/editbooks.py:895 msgid "Uploaded book probably exists in the library, consider to change before upload new: " msgstr "上传的书籍可能已经存在，建议修改后重新上传： " -#: cps/editbooks.py:986 +#: cps/editbooks.py:993 #, python-format msgid "File %(filename)s could not saved to temp dir" msgstr "文件 %(filename)s 无法保存到临时目录" -#: cps/editbooks.py:1005 +#: cps/editbooks.py:1012 #, python-format msgid "Failed to Move Cover File %(file)s: %(error)s" msgstr "移动封面文件失败 %(file)s：%(error)s" -#: cps/editbooks.py:1052 +#: cps/editbooks.py:1059 #, python-format msgid "File %(file)s uploaded" msgstr "文件 %(file)s 已上传" -#: cps/editbooks.py:1077 +#: cps/editbooks.py:1084 msgid "Source or destination format for conversion missing" msgstr "转换的源或目的格式缺失" -#: cps/editbooks.py:1085 +#: cps/editbooks.py:1092 #, python-format msgid "Book successfully queued for converting to %(book_format)s" msgstr "书籍已经被成功加入到 %(book_format)s 格式转换队列" -#: cps/editbooks.py:1089 +#: cps/editbooks.py:1096 #, python-format msgid "There was an error converting this book: %(res)s" msgstr "转换此书籍时出现错误： %(res)s" @@ -719,7 +717,7 @@ msgstr "封面文件只支持jpg/jpeg/png/webp/bmp文件" #: cps/helper.py:651 msgid "Invalid cover file content" -msgstr "" +msgstr "封面文件内容无效" #: cps/helper.py:655 msgid "Only jpg/jpeg files are supported as coverfile" @@ -831,7 +829,7 @@ msgstr "Google Oauth 错误: {}" msgid "{} Stars" msgstr "{} 星" -#: cps/remotelogin.py:65 cps/templates/layout.html:86 +#: cps/remotelogin.py:65 cps/templates/layout.html:84 #: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600 msgid "Login" msgstr "登录" @@ -1007,7 +1005,7 @@ msgstr "此书籍已被添加到书架：%(sname)s" #: cps/shelf.py:126 msgid "You are not allowed to add a book to the shelf" -msgstr "" +msgstr "你没有向书架添加书籍的权限" #: cps/shelf.py:144 #, python-format @@ -1031,9 +1029,9 @@ msgstr "此书已从书架 %(sname)s 中删除" #: cps/shelf.py:218 msgid "Sorry you are not allowed to remove a book from this shelf" -msgstr "" +msgstr "抱歉，你没有从这个书架删除书籍的权限" -#: cps/shelf.py:228 cps/templates/layout.html:142 +#: cps/shelf.py:228 cps/templates/layout.html:140 msgid "Create a Shelf" msgstr "创建书架" @@ -1047,7 +1045,7 @@ msgstr "编辑书架" #: cps/shelf.py:249 msgid "Sorry you are not allowed to create a public shelf" -msgstr "" +msgstr "抱歉，你没有创建公开书架的权限" #: cps/shelf.py:261 #, python-format @@ -1168,7 +1166,7 @@ msgstr "语言：%(name)s" msgid "Advanced Search" msgstr "高级搜索" -#: cps/templates/book_edit.html:239 cps/templates/feed.xml:33 +#: 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 @@ -1187,7 +1185,7 @@ msgstr "评分列表" msgid "File formats list" msgstr "文件格式列表" -#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069 +#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1069 msgid "Tasks" msgstr "任务列表" @@ -1236,7 +1234,7 @@ msgstr "请先配置您的kindle邮箱。" msgid "E-Mail server is not configured, please contact your administrator!" msgstr "邮件服务未配置，请联系网站管理员！" -#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486 +#: 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 msgid "Register" @@ -1347,7 +1345,7 @@ msgstr "邮箱地址" msgid "Send to Kindle E-mail Address" msgstr "接收书籍的Kindle邮箱地址" -#: cps/templates/admin.html:17 cps/templates/layout.html:78 +#: cps/templates/admin.html:17 cps/templates/layout.html:76 #: cps/templates/user_table.html:143 msgid "Admin" msgstr "管理权限" @@ -1357,7 +1355,7 @@ msgstr "管理权限" msgid "Password" msgstr "密码" -#: cps/templates/admin.html:20 cps/templates/layout.html:67 +#: cps/templates/admin.html:20 cps/templates/layout.html:66 #: cps/templates/user_table.html:145 msgid "Upload" msgstr "上传书籍" @@ -1548,7 +1546,7 @@ msgid "OK" msgstr "确定" #: cps/templates/admin.html:215 cps/templates/admin.html:229 -#: cps/templates/book_edit.html:217 cps/templates/book_table.html:124 +#: cps/templates/book_edit.html:213 cps/templates/book_table.html:124 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117 @@ -1646,13 +1644,13 @@ msgstr "转换书籍" msgid "Book Title" msgstr "书名" -#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:274 -#: cps/templates/book_edit.html:292 cps/templates/search_form.html:12 +#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270 +#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12 msgid "Author" msgstr "作者" -#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:279 -#: cps/templates/book_edit.html:294 cps/templates/search_form.html:153 +#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275 +#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153 msgid "Description" msgstr "简介" @@ -1660,15 +1658,15 @@ msgstr "简介" msgid "Identifiers" msgstr "书号" -#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:303 +#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299 msgid "Identifier Type" msgstr "书号类型" -#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:304 +#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300 msgid "Identifier Value" msgstr "书号编号" -#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:305 +#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301 #: cps/templates/user_table.html:24 msgid "Remove" msgstr "移除" @@ -1689,90 +1687,89 @@ msgstr "丛书编号" msgid "Rating" msgstr "评分" -#: cps/templates/book_edit.html:104 +#: cps/templates/book_edit.html:103 msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)" msgstr "从URL获取封面（JPEG - 图片将下载并存储在数据库中）" -#: cps/templates/book_edit.html:108 +#: cps/templates/book_edit.html:107 msgid "Upload Cover from Local Disk" msgstr "从本地磁盘上传封面" -#: cps/templates/book_edit.html:114 +#: cps/templates/book_edit.html:112 msgid "Published Date" msgstr "出版日期" -#: cps/templates/book_edit.html:123 cps/templates/book_edit.html:276 -#: cps/templates/book_edit.html:293 cps/templates/detail.html:164 +#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272 +#: cps/templates/book_edit.html:289 cps/templates/detail.html:164 #: cps/templates/search_form.html:16 msgid "Publisher" msgstr "出版社" -#: cps/templates/book_edit.html:127 cps/templates/detail.html:131 +#: cps/templates/book_edit.html:125 cps/templates/detail.html:131 #: cps/templates/user_edit.html:33 msgid "Language" msgstr "语言" -#: cps/templates/book_edit.html:137 cps/templates/search_form.html:45 +#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45 #: cps/templates/search_form.html:164 msgid "Yes" msgstr "确认" -#: cps/templates/book_edit.html:138 cps/templates/search_form.html:46 +#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46 #: cps/templates/search_form.html:165 msgid "No" msgstr "没有" -#: cps/templates/book_edit.html:203 +#: cps/templates/book_edit.html:200 msgid "Upload Format" msgstr "上传格式" -#: cps/templates/book_edit.html:212 +#: cps/templates/book_edit.html:208 msgid "View Book on Save" msgstr "查看保存书籍" -#: cps/templates/book_edit.html:215 cps/templates/book_edit.html:233 +#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229 msgid "Fetch Metadata" msgstr "获取元数据" -#: cps/templates/book_edit.html:216 cps/templates/config_db.html:53 +#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25 #: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139 msgid "Save" msgstr "保存" -#: cps/templates/book_edit.html:236 +#: cps/templates/book_edit.html:232 msgid "Keyword" msgstr "关键字" -#: cps/templates/book_edit.html:237 -#, fuzzy +#: cps/templates/book_edit.html:233 msgid "Search keyword" msgstr " 搜索关键字 " -#: cps/templates/book_edit.html:243 +#: cps/templates/book_edit.html:239 msgid "Click the cover to load metadata to the form" msgstr "单击封面将元数据加载到表单" -#: cps/templates/book_edit.html:250 cps/templates/book_edit.html:289 +#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285 msgid "Loading..." msgstr "加载中..." -#: cps/templates/book_edit.html:254 cps/templates/layout.html:64 -#: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34 +#: cps/templates/book_edit.html:250 cps/templates/layout.html:63 +#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34 #: cps/templates/user_edit.html:160 msgid "Close" msgstr "关闭" -#: cps/templates/book_edit.html:281 cps/templates/book_edit.html:295 +#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291 msgid "Source" msgstr "源" -#: cps/templates/book_edit.html:290 +#: cps/templates/book_edit.html:286 msgid "Search error!" msgstr "搜索错误！" -#: cps/templates/book_edit.html:291 +#: cps/templates/book_edit.html:287 msgid "No Result(s) found! Please try another keyword." msgstr "无搜索结果！请尝试另一个关键字。" @@ -1856,21 +1853,19 @@ msgid "Enter Publishers" msgstr "输入出版社" #: cps/templates/book_table.html:73 -#, fuzzy msgid "Enter comments" -msgstr "输入域名" +msgstr "输入简介" #: cps/templates/book_table.html:73 msgid "Comments" -msgstr "" +msgstr "简介" #: cps/templates/book_table.html:77 cps/templates/book_table.html:79 #: cps/templates/book_table.html:81 cps/templates/book_table.html:83 #: cps/templates/book_table.html:87 cps/templates/book_table.html:89 #: cps/templates/book_table.html:91 cps/templates/book_table.html:93 -#, fuzzy msgid "Enter " -msgstr "书号" +msgstr "输入" #: cps/templates/book_table.html:110 cps/templates/modal_dialogs.html:46 msgid "Are you really sure?" @@ -1946,7 +1941,7 @@ msgstr "夜间版" #: cps/templates/config_edit.html:50 msgid "Trusted Hosts (Comma Separated)" -msgstr "" +msgstr "可信主机（用逗号分隔）" #: cps/templates/config_edit.html:61 msgid "Logfile Configuration" @@ -1970,12 +1965,16 @@ msgstr "功能配置" #: cps/templates/config_edit.html:104 msgid "Convert non-English characters in title and author while saving to disk" -msgstr "" +msgstr "保存到磁盘事转换标题和作者中的非英文字符" #: cps/templates/config_edit.html:108 msgid "Enable Uploads" msgstr "启用上传" +#: cps/templates/config_edit.html:108 +msgid "(Please ensure users having also upload rights)" +msgstr "（请确保用户也有上传权限）" + #: cps/templates/config_edit.html:112 msgid "Allowed Upload Fileformats" msgstr "允许上传的文件格式" @@ -2261,14 +2260,12 @@ msgid "Allow Editing Public Shelves" msgstr "允许编辑公共书架" #: cps/templates/config_view_edit.html:123 -#, fuzzy msgid "Default Language" -msgstr "排除语言" +msgstr "默认语言" #: cps/templates/config_view_edit.html:131 -#, fuzzy msgid "Default Visible Language of Books" -msgstr "按语言显示书籍" +msgstr "默认显示书籍语言" #: cps/templates/config_view_edit.html:147 msgid "Default Visibilities for New Users" @@ -2337,7 +2334,7 @@ msgid "Add to shelf" msgstr "添加到书架" #: cps/templates/detail.html:267 cps/templates/detail.html:284 -#: cps/templates/feed.xml:79 cps/templates/layout.html:139 +#: cps/templates/feed.xml:79 cps/templates/layout.html:137 #: cps/templates/search.html:20 msgid "(Public)" msgstr "(公共)" @@ -2412,7 +2409,7 @@ msgstr "输入域名" msgid "Denied Domains (Blacklist)" msgstr "禁止注册的域名（黑名单）" -#: cps/templates/feed.xml:21 cps/templates/layout.html:172 +#: cps/templates/feed.xml:21 cps/templates/layout.html:170 msgid "Next" msgstr "下一个" @@ -2438,11 +2435,11 @@ msgstr "登出账号" #: cps/templates/index.html:69 msgid "Sort ascending according to download count" -msgstr "" +msgstr "按下载数排序" #: cps/templates/index.html:70 msgid "Sort descending according to download count" -msgstr "" +msgstr "按下载数逆序排序" #: cps/templates/index.html:76 cps/templates/search.html:33 #: cps/templates/shelf.html:21 @@ -2522,7 +2519,7 @@ msgstr "书籍按评分排序" msgid "Books ordered by file formats" msgstr "书籍按文件格式排序" -#: cps/templates/index.xml:119 cps/templates/layout.html:137 +#: cps/templates/index.xml:119 cps/templates/layout.html:135 #: cps/templates/search_form.html:87 msgid "Shelves" msgstr "书架列表" @@ -2543,48 +2540,48 @@ msgstr "切换导航" msgid "Search Library" msgstr "搜索书库" -#: cps/templates/layout.html:64 cps/templates/layout.html:119 +#: cps/templates/layout.html:63 cps/templates/layout.html:117 msgid "Uploading..." msgstr "正在上传..." -#: cps/templates/layout.html:64 +#: cps/templates/layout.html:63 msgid "Error" msgstr "错误" -#: cps/templates/layout.html:64 +#: cps/templates/layout.html:63 msgid "Upload done, processing, please wait..." msgstr "上传完成，正在处理，请稍候..." -#: cps/templates/layout.html:78 cps/templates/read.html:71 +#: cps/templates/layout.html:76 cps/templates/read.html:71 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108 msgid "Settings" msgstr "设置" -#: cps/templates/layout.html:80 +#: cps/templates/layout.html:78 msgid "Account" msgstr "账号" -#: cps/templates/layout.html:82 +#: cps/templates/layout.html:80 msgid "Logout" msgstr "注销" -#: cps/templates/layout.html:120 +#: cps/templates/layout.html:118 msgid "Please do not refresh the page" msgstr "请不要刷新页面" -#: cps/templates/layout.html:130 +#: cps/templates/layout.html:128 msgid "Browse" msgstr "按条件浏览" -#: cps/templates/layout.html:143 cps/templates/stats.html:3 +#: cps/templates/layout.html:141 cps/templates/stats.html:3 msgid "About" msgstr "关于" -#: cps/templates/layout.html:157 +#: cps/templates/layout.html:155 msgid "Previous" msgstr "上一个" -#: cps/templates/layout.html:184 +#: cps/templates/layout.html:182 msgid "Book Details" msgstr "书籍详情" diff --git a/messages.pot b/messages.pot index 48925886..a6267b2c 100644 --- a/messages.pot +++ b/messages.pot @@ -8,14 +8,14 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" -"POT-Creation-Date: 2021-11-23 19:29+0100\n" +"POT-Creation-Date: 2021-12-01 11:37+0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 2.9.0\n" +"Generated-By: Babel 2.9.1\n" #: cps/about.py:34 cps/about.py:49 cps/about.py:65 cps/converter.py:31 msgid "not installed" @@ -45,9 +45,9 @@ msgstr "" msgid "Unknown command" msgstr "" -#: cps/admin.py:167 cps/editbooks.py:704 cps/editbooks.py:718 -#: cps/editbooks.py:859 cps/editbooks.py:861 cps/editbooks.py:888 -#: cps/editbooks.py:904 cps/updater.py:584 cps/uploader.py:93 +#: cps/admin.py:167 cps/editbooks.py:703 cps/editbooks.py:717 +#: cps/editbooks.py:862 cps/editbooks.py:864 cps/editbooks.py:891 +#: cps/editbooks.py:907 cps/updater.py:584 cps/uploader.py:93 #: cps/uploader.py:103 msgid "Unknown" msgstr "" @@ -168,23 +168,33 @@ msgid "Are you sure you want to change locales of selected user(s)?" msgstr "" #: cps/admin.py:582 -msgid "Are you sure you want to change visible book languages for selected user(s)?" +msgid "" +"Are you sure you want to change visible book languages for selected " +"user(s)?" msgstr "" #: cps/admin.py:584 -msgid "Are you sure you want to change the selected role for the selected user(s)?" +msgid "" +"Are you sure you want to change the selected role for the selected " +"user(s)?" msgstr "" #: cps/admin.py:586 -msgid "Are you sure you want to change the selected restrictions for the selected user(s)?" +msgid "" +"Are you sure you want to change the selected restrictions for the " +"selected user(s)?" msgstr "" #: cps/admin.py:588 -msgid "Are you sure you want to change the selected visibility restrictions for the selected user(s)?" +msgid "" +"Are you sure you want to change the selected visibility restrictions for " +"the selected user(s)?" msgstr "" #: cps/admin.py:590 -msgid "Are you sure you want to change shelf sync behavior for the selected user(s)?" +msgid "" +"Are you sure you want to change shelf sync behavior for the selected " +"user(s)?" msgstr "" #: cps/admin.py:592 @@ -263,7 +273,9 @@ msgid "LDAP Member User Filter Has Unmatched Parenthesis" msgstr "" #: cps/admin.py:1134 -msgid "LDAP CACertificate, Certificate or Key Location is not Valid, Please Enter Correct Path" +msgid "" +"LDAP CACertificate, Certificate or Key Location is not Valid, Please " +"Enter Correct Path" msgstr "" #: cps/admin.py:1176 cps/admin.py:1278 cps/admin.py:1375 cps/admin.py:1482 @@ -478,113 +490,121 @@ msgstr "" msgid "Custom Column No.%(column)d is not existing in calibre database" msgstr "" -#: cps/editbooks.py:306 cps/editbooks.py:308 +#: cps/editbooks.py:305 cps/editbooks.py:307 msgid "Book Format Successfully Deleted" msgstr "" -#: cps/editbooks.py:315 cps/editbooks.py:317 +#: cps/editbooks.py:314 cps/editbooks.py:316 msgid "Book Successfully Deleted" msgstr "" -#: cps/editbooks.py:373 cps/editbooks.py:760 cps/web.py:528 cps/web.py:1719 +#: 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" +msgid "" +"Oops! Selected book title is unavailable. File does not exist or is not " +"accessible" msgstr "" -#: cps/editbooks.py:407 +#: cps/editbooks.py:406 msgid "edit metadata" msgstr "" -#: cps/editbooks.py:455 +#: cps/editbooks.py:454 #, python-format msgid "%(seriesindex)s is not a valid number, skipping" msgstr "" -#: cps/editbooks.py:491 +#: cps/editbooks.py:490 cps/editbooks.py:954 #, python-format -msgid "%(langname)s is not a valid language" +msgid "'%(langname)s' is not a valid language" msgstr "" -#: cps/editbooks.py:631 cps/editbooks.py:974 +#: cps/editbooks.py:630 cps/editbooks.py:981 #, python-format msgid "File extension '%(ext)s' is not allowed to be uploaded to this server" msgstr "" -#: cps/editbooks.py:635 cps/editbooks.py:978 +#: cps/editbooks.py:634 cps/editbooks.py:985 msgid "File to be uploaded must have an extension" msgstr "" -#: cps/editbooks.py:647 +#: cps/editbooks.py:646 #, python-format msgid "Failed to create path %(path)s (Permission denied)." msgstr "" -#: cps/editbooks.py:652 +#: cps/editbooks.py:651 #, python-format msgid "Failed to store file %(file)s." msgstr "" -#: cps/editbooks.py:670 cps/editbooks.py:1065 cps/web.py:1680 +#: cps/editbooks.py:669 cps/editbooks.py:1072 cps/web.py:1680 #, python-format msgid "Database error: %(error)s." msgstr "" -#: cps/editbooks.py:675 +#: cps/editbooks.py:674 #, python-format msgid "File format %(ext)s added to %(book)s" msgstr "" -#: cps/editbooks.py:811 +#: cps/editbooks.py:810 msgid "Identifiers are not Case Sensitive, Overwriting Old Identifier" msgstr "" -#: cps/editbooks.py:845 +#: cps/editbooks.py:844 msgid "Metadata successfully updated" msgstr "" -#: cps/editbooks.py:854 +#: cps/editbooks.py:857 msgid "Error editing book, please check logfile for details" msgstr "" -#: cps/editbooks.py:892 -msgid "Uploaded book probably exists in the library, consider to change before upload new: " +#: cps/editbooks.py:895 +msgid "" +"Uploaded book probably exists in the library, consider to change before " +"upload new: " msgstr "" -#: cps/editbooks.py:986 +#: cps/editbooks.py:993 #, python-format msgid "File %(filename)s could not saved to temp dir" msgstr "" -#: cps/editbooks.py:1005 +#: cps/editbooks.py:1012 #, python-format msgid "Failed to Move Cover File %(file)s: %(error)s" msgstr "" -#: cps/editbooks.py:1052 +#: cps/editbooks.py:1059 #, python-format msgid "File %(file)s uploaded" msgstr "" -#: cps/editbooks.py:1077 +#: cps/editbooks.py:1084 msgid "Source or destination format for conversion missing" msgstr "" -#: cps/editbooks.py:1085 +#: cps/editbooks.py:1092 #, python-format msgid "Book successfully queued for converting to %(book_format)s" msgstr "" -#: cps/editbooks.py:1089 +#: cps/editbooks.py:1096 #, python-format msgid "There was an error converting this book: %(res)s" msgstr "" #: cps/gdrive.py:58 -msgid "Google Drive setup not completed, try to deactivate and activate Google Drive again" +msgid "" +"Google Drive setup not completed, try to deactivate and activate Google " +"Drive again" msgstr "" #: cps/gdrive.py:95 -msgid "Callback domain is not verified, please follow steps to verify domain in google developer console" +msgid "" +"Callback domain is not verified, please follow steps to verify domain in " +"google developer console" msgstr "" #: cps/helper.py:80 @@ -659,7 +679,9 @@ msgstr "" #: cps/helper.py:333 #, python-format -msgid "Deleting book %(id)s from database only, book path in database not valid: %(path)s" +msgid "" +"Deleting book %(id)s from database only, book path in database not valid:" +" %(path)s" msgstr "" #: cps/helper.py:388 @@ -751,7 +773,9 @@ msgid "Unknown Status" msgstr "" #: cps/kobo_auth.py:131 -msgid "PLease access calibre-web from non localhost to get valid api_endpoint for kobo device" +msgid "" +"PLease access calibre-web from non localhost to get valid api_endpoint " +"for kobo device" msgstr "" #: cps/kobo_auth.py:134 cps/kobo_auth.py:162 @@ -828,7 +852,7 @@ msgstr "" msgid "{} Stars" msgstr "" -#: cps/remotelogin.py:65 cps/templates/layout.html:86 +#: cps/remotelogin.py:65 cps/templates/layout.html:84 #: cps/templates/login.html:4 cps/templates/login.html:21 cps/web.py:1600 msgid "Login" msgstr "" @@ -1030,7 +1054,7 @@ msgstr "" msgid "Sorry you are not allowed to remove a book from this shelf" msgstr "" -#: cps/shelf.py:228 cps/templates/layout.html:142 +#: cps/shelf.py:228 cps/templates/layout.html:140 msgid "Create a Shelf" msgstr "" @@ -1093,7 +1117,9 @@ msgid "No update available. You already have the latest version installed" msgstr "" #: cps/updater.py:428 -msgid "A new update is available. Click on the button below to update to the latest version." +msgid "" +"A new update is available. Click on the button below to update to the " +"latest version." msgstr "" #: cps/updater.py:446 @@ -1106,7 +1132,9 @@ msgstr "" #: cps/updater.py:465 cps/updater.py:479 cps/updater.py:490 #, python-format -msgid "A new update is available. Click on the button below to update to version: %(version)s" +msgid "" +"A new update is available. Click on the button below to update to " +"version: %(version)s" msgstr "" #: cps/updater.py:507 @@ -1165,7 +1193,7 @@ msgstr "" msgid "Advanced Search" msgstr "" -#: cps/templates/book_edit.html:239 cps/templates/feed.xml:33 +#: 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 @@ -1184,7 +1212,7 @@ msgstr "" msgid "File formats list" msgstr "" -#: cps/templates/layout.html:75 cps/templates/tasks.html:7 cps/web.py:1069 +#: cps/templates/layout.html:73 cps/templates/tasks.html:7 cps/web.py:1069 msgid "Tasks" msgstr "" @@ -1233,7 +1261,7 @@ msgstr "" msgid "E-Mail server is not configured, please contact your administrator!" msgstr "" -#: cps/templates/layout.html:87 cps/templates/register.html:17 cps/web.py:1486 +#: 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 msgid "Register" @@ -1253,7 +1281,9 @@ msgstr "" #: cps/web.py:1559 #, 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:1565 @@ -1344,7 +1374,7 @@ msgstr "" msgid "Send to Kindle E-mail Address" msgstr "" -#: cps/templates/admin.html:17 cps/templates/layout.html:78 +#: cps/templates/admin.html:17 cps/templates/layout.html:76 #: cps/templates/user_table.html:143 msgid "Admin" msgstr "" @@ -1354,7 +1384,7 @@ msgstr "" msgid "Password" msgstr "" -#: cps/templates/admin.html:20 cps/templates/layout.html:67 +#: cps/templates/admin.html:20 cps/templates/layout.html:66 #: cps/templates/user_table.html:145 msgid "Upload" msgstr "" @@ -1545,7 +1575,7 @@ msgid "OK" msgstr "" #: cps/templates/admin.html:215 cps/templates/admin.html:229 -#: cps/templates/book_edit.html:217 cps/templates/book_table.html:124 +#: cps/templates/book_edit.html:213 cps/templates/book_table.html:124 #: cps/templates/config_db.html:54 cps/templates/config_edit.html:359 #: cps/templates/config_view_edit.html:173 cps/templates/modal_dialogs.html:64 #: cps/templates/modal_dialogs.html:99 cps/templates/modal_dialogs.html:117 @@ -1643,13 +1673,13 @@ msgstr "" msgid "Book Title" msgstr "" -#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:274 -#: cps/templates/book_edit.html:292 cps/templates/search_form.html:12 +#: cps/templates/book_edit.html:62 cps/templates/book_edit.html:270 +#: cps/templates/book_edit.html:288 cps/templates/search_form.html:12 msgid "Author" msgstr "" -#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:279 -#: cps/templates/book_edit.html:294 cps/templates/search_form.html:153 +#: cps/templates/book_edit.html:67 cps/templates/book_edit.html:275 +#: cps/templates/book_edit.html:290 cps/templates/search_form.html:153 msgid "Description" msgstr "" @@ -1657,15 +1687,15 @@ msgstr "" msgid "Identifiers" msgstr "" -#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:303 +#: cps/templates/book_edit.html:76 cps/templates/book_edit.html:299 msgid "Identifier Type" msgstr "" -#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:304 +#: cps/templates/book_edit.html:77 cps/templates/book_edit.html:300 msgid "Identifier Value" msgstr "" -#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:305 +#: cps/templates/book_edit.html:78 cps/templates/book_edit.html:301 #: cps/templates/user_table.html:24 msgid "Remove" msgstr "" @@ -1686,89 +1716,91 @@ msgstr "" msgid "Rating" msgstr "" -#: cps/templates/book_edit.html:104 -msgid "Fetch Cover from URL (JPEG - Image will be downloaded and stored in database)" +#: cps/templates/book_edit.html:103 +msgid "" +"Fetch Cover from URL (JPEG - Image will be downloaded and stored in " +"database)" msgstr "" -#: cps/templates/book_edit.html:108 +#: cps/templates/book_edit.html:107 msgid "Upload Cover from Local Disk" msgstr "" -#: cps/templates/book_edit.html:114 +#: cps/templates/book_edit.html:112 msgid "Published Date" msgstr "" -#: cps/templates/book_edit.html:123 cps/templates/book_edit.html:276 -#: cps/templates/book_edit.html:293 cps/templates/detail.html:164 +#: cps/templates/book_edit.html:121 cps/templates/book_edit.html:272 +#: cps/templates/book_edit.html:289 cps/templates/detail.html:164 #: cps/templates/search_form.html:16 msgid "Publisher" msgstr "" -#: cps/templates/book_edit.html:127 cps/templates/detail.html:131 +#: cps/templates/book_edit.html:125 cps/templates/detail.html:131 #: cps/templates/user_edit.html:33 msgid "Language" msgstr "" -#: cps/templates/book_edit.html:137 cps/templates/search_form.html:45 +#: cps/templates/book_edit.html:135 cps/templates/search_form.html:45 #: cps/templates/search_form.html:164 msgid "Yes" msgstr "" -#: cps/templates/book_edit.html:138 cps/templates/search_form.html:46 +#: cps/templates/book_edit.html:136 cps/templates/search_form.html:46 #: cps/templates/search_form.html:165 msgid "No" msgstr "" -#: cps/templates/book_edit.html:203 +#: cps/templates/book_edit.html:200 msgid "Upload Format" msgstr "" -#: cps/templates/book_edit.html:212 +#: cps/templates/book_edit.html:208 msgid "View Book on Save" msgstr "" -#: cps/templates/book_edit.html:215 cps/templates/book_edit.html:233 +#: cps/templates/book_edit.html:211 cps/templates/book_edit.html:229 msgid "Fetch Metadata" msgstr "" -#: cps/templates/book_edit.html:216 cps/templates/config_db.html:53 +#: cps/templates/book_edit.html:212 cps/templates/config_db.html:53 #: cps/templates/config_edit.html:358 cps/templates/config_view_edit.html:172 #: cps/templates/email_edit.html:65 cps/templates/shelf_edit.html:25 #: cps/templates/shelf_order.html:41 cps/templates/user_edit.html:139 msgid "Save" msgstr "" -#: cps/templates/book_edit.html:236 +#: cps/templates/book_edit.html:232 msgid "Keyword" msgstr "" -#: cps/templates/book_edit.html:237 +#: cps/templates/book_edit.html:233 msgid "Search keyword" msgstr "" -#: cps/templates/book_edit.html:243 +#: cps/templates/book_edit.html:239 msgid "Click the cover to load metadata to the form" msgstr "" -#: cps/templates/book_edit.html:250 cps/templates/book_edit.html:289 +#: cps/templates/book_edit.html:246 cps/templates/book_edit.html:285 msgid "Loading..." msgstr "" -#: cps/templates/book_edit.html:254 cps/templates/layout.html:64 -#: cps/templates/layout.html:188 cps/templates/modal_dialogs.html:34 +#: cps/templates/book_edit.html:250 cps/templates/layout.html:63 +#: cps/templates/layout.html:186 cps/templates/modal_dialogs.html:34 #: cps/templates/user_edit.html:160 msgid "Close" msgstr "" -#: cps/templates/book_edit.html:281 cps/templates/book_edit.html:295 +#: cps/templates/book_edit.html:277 cps/templates/book_edit.html:291 msgid "Source" msgstr "" -#: cps/templates/book_edit.html:290 +#: cps/templates/book_edit.html:286 msgid "Search error!" msgstr "" -#: cps/templates/book_edit.html:291 +#: cps/templates/book_edit.html:287 msgid "No Result(s) found! Please try another keyword." msgstr "" @@ -1970,6 +2002,10 @@ msgstr "" msgid "Enable Uploads" msgstr "" +#: cps/templates/config_edit.html:108 +msgid "(Please ensure users having also upload rights)" +msgstr "" + #: cps/templates/config_edit.html:112 msgid "Allowed Upload Fileformats" msgstr "" @@ -2064,7 +2100,9 @@ msgid "SSL" msgstr "" #: cps/templates/config_edit.html:210 -msgid "LDAP CACertificate Path (Only needed for Client Certificate Authentication)" +msgid "" +"LDAP CACertificate Path (Only needed for Client Certificate " +"Authentication)" msgstr "" #: cps/templates/config_edit.html:217 @@ -2329,7 +2367,7 @@ msgid "Add to shelf" msgstr "" #: cps/templates/detail.html:267 cps/templates/detail.html:284 -#: cps/templates/feed.xml:79 cps/templates/layout.html:139 +#: cps/templates/feed.xml:79 cps/templates/layout.html:137 #: cps/templates/search.html:20 msgid "(Public)" msgstr "" @@ -2404,7 +2442,7 @@ msgstr "" msgid "Denied Domains (Blacklist)" msgstr "" -#: cps/templates/feed.xml:21 cps/templates/layout.html:172 +#: cps/templates/feed.xml:21 cps/templates/layout.html:170 msgid "Next" msgstr "" @@ -2514,7 +2552,7 @@ msgstr "" msgid "Books ordered by file formats" msgstr "" -#: cps/templates/index.xml:119 cps/templates/layout.html:137 +#: cps/templates/index.xml:119 cps/templates/layout.html:135 #: cps/templates/search_form.html:87 msgid "Shelves" msgstr "" @@ -2535,48 +2573,48 @@ msgstr "" msgid "Search Library" msgstr "" -#: cps/templates/layout.html:64 cps/templates/layout.html:119 +#: cps/templates/layout.html:63 cps/templates/layout.html:117 msgid "Uploading..." msgstr "" -#: cps/templates/layout.html:64 +#: cps/templates/layout.html:63 msgid "Error" msgstr "" -#: cps/templates/layout.html:64 +#: cps/templates/layout.html:63 msgid "Upload done, processing, please wait..." msgstr "" -#: cps/templates/layout.html:78 cps/templates/read.html:71 +#: cps/templates/layout.html:76 cps/templates/read.html:71 #: cps/templates/readcbr.html:84 cps/templates/readcbr.html:108 msgid "Settings" msgstr "" -#: cps/templates/layout.html:80 +#: cps/templates/layout.html:78 msgid "Account" msgstr "" -#: cps/templates/layout.html:82 +#: cps/templates/layout.html:80 msgid "Logout" msgstr "" -#: cps/templates/layout.html:120 +#: cps/templates/layout.html:118 msgid "Please do not refresh the page" msgstr "" -#: cps/templates/layout.html:130 +#: cps/templates/layout.html:128 msgid "Browse" msgstr "" -#: cps/templates/layout.html:143 cps/templates/stats.html:3 +#: cps/templates/layout.html:141 cps/templates/stats.html:3 msgid "About" msgstr "" -#: cps/templates/layout.html:157 +#: cps/templates/layout.html:155 msgid "Previous" msgstr "" -#: cps/templates/layout.html:184 +#: cps/templates/layout.html:182 msgid "Book Details" msgstr "" @@ -2657,7 +2695,9 @@ msgid "Important Kobo Note: deleted books will remain on any paired Kobo device. msgstr "" #: cps/templates/modal_dialogs.html:57 -msgid "Books must first be archived and the device synced before a book can safely be deleted." +msgid "" +"Books must first be archived and the device synced before a book can " +"safely be deleted." msgstr "" #: cps/templates/modal_dialogs.html:76 From 3f913133037de44942aa08098425986d91ad979f Mon Sep 17 00:00:00 2001 From: Jonathan Fenske <929220+jfenske89@users.noreply.github.com> Date: Tue, 30 Nov 2021 22:24:34 -0600 Subject: [PATCH 03/16] Update epub.js send the CSRF token when adding bookmarks --- cps/static/js/reading/epub.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cps/static/js/reading/epub.js b/cps/static/js/reading/epub.js index edafa82c..7942bfbd 100644 --- a/cps/static/js/reading/epub.js +++ b/cps/static/js/reading/epub.js @@ -61,11 +61,14 @@ var reader; this.removeBookmark(bookmark); }.bind(this)); } + + var csrftoken = $("input[name='csrf_token']").val(); // Save to database $.ajax(calibre.bookmarkUrl, { method: "post", - data: { bookmark: location || "" } + data: { bookmark: location || "" }, + headers: { "X-CSRFToken": csrftoken } }).fail(function (xhr, status, error) { alert(error); }); From 66874f8163ef3199bc33c9888f3857475a524587 Mon Sep 17 00:00:00 2001 From: Jonathan Fenske <929220+jfenske89@users.noreply.github.com> Date: Tue, 30 Nov 2021 22:25:45 -0600 Subject: [PATCH 04/16] Update read.html include the CSR token input --- cps/templates/read.html | 1 + 1 file changed, 1 insertion(+) diff --git a/cps/templates/read.html b/cps/templates/read.html index 3d2566e0..1766eb1b 100644 --- a/cps/templates/read.html +++ b/cps/templates/read.html @@ -17,6 +17,7 @@