From 84d396f6c4ba20bd3fed02345b4bf7da07be79b8 Mon Sep 17 00:00:00 2001 From: Le Tan Date: Wed, 10 Jul 2024 22:15:24 +0800 Subject: [PATCH] release v3.18.1 --- .github/workflows/ci-linux.yml | 2 +- .github/workflows/ci-macos.yml | 2 +- .github/workflows/ci-win.yml | 2 +- CMakeLists.txt | 2 +- changes.md | 5 + src/data/core/Info.plist | 2 +- src/data/core/translations/vnote_ja.ts | 201 ++++++++++++---------- src/data/core/translations/vnote_zh_CN.ts | 201 ++++++++++++---------- src/data/core/vnotex.json | 2 +- 9 files changed, 237 insertions(+), 182 deletions(-) diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml index 02e476b437..f17cc50d01 100644 --- a/.github/workflows/ci-linux.yml +++ b/.github/workflows/ci-linux.yml @@ -16,7 +16,7 @@ on: default: false env: - VNOTE_VER: 3.18.0 + VNOTE_VER: 3.18.1 CMAKE_VER: 3.24.3 jobs: diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml index 1c3f8b967c..ceb9fad06f 100644 --- a/.github/workflows/ci-macos.yml +++ b/.github/workflows/ci-macos.yml @@ -16,7 +16,7 @@ on: default: false env: - VNOTE_VER: 3.18.0 + VNOTE_VER: 3.18.1 CMAKE_VER: 3.24.3 jobs: diff --git a/.github/workflows/ci-win.yml b/.github/workflows/ci-win.yml index d29731bd2c..d3b5b8b9e1 100644 --- a/.github/workflows/ci-win.yml +++ b/.github/workflows/ci-win.yml @@ -16,7 +16,7 @@ on: default: false env: - VNOTE_VER: 3.18.0 + VNOTE_VER: 3.18.1 jobs: build: diff --git a/CMakeLists.txt b/CMakeLists.txt index eb82459226..323b25eaa5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required (VERSION 3.20) set(CMAKE_OSX_DEPLOYMENT_TARGET "12.1" CACHE STRING "Minimum OS X deployment version") project(VNote - VERSION 3.18.0 + VERSION 3.18.1 DESCRIPTION "A pleasant note-taking platform" HOMEPAGE_URL "https://app.vnote.fun" LANGUAGES C CXX) diff --git a/changes.md b/changes.md index 481541907d..8451715d97 100644 --- a/changes.md +++ b/changes.md @@ -1,4 +1,9 @@ # Changes +## v3.18.1 +* Fix crash caused by Qt6 change +* Fix XSS protection exemption +* Check link before open + ## v3.18.0 * Upgrade to Qt6 * Support MacOS universal build diff --git a/src/data/core/Info.plist b/src/data/core/Info.plist index c90f6a3b0d..081f5938ce 100644 --- a/src/data/core/Info.plist +++ b/src/data/core/Info.plist @@ -27,7 +27,7 @@ CFBundleShortVersionString 3.17 CFBundleVersion - 3.18.0 + 3.18.1 NSHumanReadableCopyright Distributed under LGPL-3.0 license. Copyright (c) 2024 app.vnote.fun CFBundleIconFile diff --git a/src/data/core/translations/vnote_ja.ts b/src/data/core/translations/vnote_ja.ts index 4654de081b..d9aad24493 100644 --- a/src/data/core/translations/vnote_ja.ts +++ b/src/data/core/translations/vnote_ja.ts @@ -70,17 +70,17 @@ QWebEnginePage - + &Back 戻る(&B) - + &Forward 進む(&F) - + &Reload 再読み込み(&R) @@ -1101,12 +1101,12 @@ vnotex::FullScreenToggleAction - + F&ull Screen フルスクリーン(&F) - + Exit F&ull Screen フルスクリーン終了(&A) @@ -1802,85 +1802,90 @@ ログをさらに印刷します。 - + + Log to stderr. + + + + WebEngine remote debugging port. WebEngineリモートデバッグポート。 - + port_number - + WebEngine without sandbox. サンドボックスのないWebEngine。 - + WebEngine with GPU disabled. - + %1 failed to start. %1を開始できませんでした。 - + Failed to initialize configuration manager. Please check if all the files are intact or reinstall the application. 設定マネージャの初期化に失敗しました。すべてのファイルが正常かどうかを確認するか、アプリケーションを再インストールしてください。 - + Failed to check for updates (%1) - + Updates available: %1 - + Initializing core components... - + Do you want to minimize %1 to system tray instead of quitting when closed? 終了する代わりに、%1をシステムトレイに最小化しますか? - + You could change the option in Settings later. 設定の選択肢は、後で変更することができます。 - + %1 is still running here. %1はまだ実行中です。 - - + + Global グローバル - + There is one export dialog running. Please close it first. - + Failed to load %n notebook(s). - + These notebooks may be moved or deleted. It is recommended to remove them from configuration and open them with the correct root folder path later. Remove them from the configuration? @@ -2168,6 +2173,16 @@ Remove them from the configuration? About Qt Qtについて + + + Are you sure to open link (%1)? + + + + + Malicious link might do harm to your device. + + vnotex::ManageNotebooksDialog @@ -2232,7 +2247,7 @@ Remove them from the configuration? vnotex::MarkdownEditor - + Insert Link リンクを挿入 @@ -2248,7 +2263,7 @@ Remove them from the configuration? - + Failed to read local image file (%1) (%2). @@ -2268,185 +2283,185 @@ Remove them from the configuration? - - - + + + Insert From Clipboard クリップボードから挿入 - + Insert From URL URLから挿入 - + Insert From Image Data イメージデータから挿入 - - - + + + Insert As Image Link イメージリンクとして挿入 - - - + + + Insert As Image イメージとして挿入 - - + + Insert As Text テキストとして挿入 - + Insert As Relative Image Link 相対イメージリンクとして挿入 - + Insert As Link リンクとして挿入 - + Insert As Relative Link 相対リンクとして挿入 - - + + Attach And Insert Link リンクを添付して挿入 - + Insert File Content ファイルの内容を挿入 - + Insert From Clipboard (%n items) - + Insert Image From Clipboard クリップボードからイメージを挿入 - + Insert Image From URL URLからイメージを挿入 - + &Read 読み取り(&R) - + Rich Paste リッチ貼り付け - + Paste as Plain Text - + Parse to Markdown and Paste - + Insert Snippet - - + + Failed to upload image to image host (%1) as (%2). - + View Image - + Copy Image URL - + Copy Image - + Copy In-Place Preview - + Open Link - + Copy Link - + Fetching images to local... ローカルにイメージを取得しています... - - + + Abort 中止 - + Fetch Images To Local イメージをローカルに取得 - + Fetching image (%1) イメージ (%1) を取得しています - - + + Upload Images To Image Host - + None なし - + Uploading local images... - + Upload image (%1) @@ -2816,66 +2831,76 @@ Remove them from the configuration? vnotex::MarkdownViewWindow - + Markdown Viewer Markdownビューア - - + + Clear Obsolete Images 古いイメージをクリア - + These images seems to be not in use anymore. Please confirm the deletion of them. - + Deleted local images could be found in the recycle bin of notebook if it is from a bundle notebook. - + Clearing obsolete images... - + Abort 中止 - + Clear image (%1) - + Cleared %n obsolete images - + View Mode Not Supported In Read Mode - + Edit Only - + Edit with Preview - - + + Printed to PDF + + + + + Failed to print to PDF + + + + + Replace is not supported in read mode 置換は読み取りモードではサポートされていません @@ -2883,12 +2908,12 @@ Remove them from the configuration? vnotex::MarkdownViewer - + &Edit 編集(&E) - + Cross Copy クロスコピー @@ -3996,7 +4021,7 @@ Description: %3 vnotex::OutlineProvider - + [EMPTY] [空] @@ -5912,12 +5937,12 @@ Backup file last modified time: %2 vnotex::WebViewExporter - + Table of Contents - + Copy output file (%1) to (%2). diff --git a/src/data/core/translations/vnote_zh_CN.ts b/src/data/core/translations/vnote_zh_CN.ts index 481835d20e..6cd590b911 100644 --- a/src/data/core/translations/vnote_zh_CN.ts +++ b/src/data/core/translations/vnote_zh_CN.ts @@ -70,17 +70,17 @@ QWebEnginePage - + &Back - + &Forward - + &Reload @@ -1110,12 +1110,12 @@ vnotex::FullScreenToggleAction - + F&ull Screen 全屏(&U) - + Exit F&ull Screen 退出全屏(&U) @@ -1802,55 +1802,55 @@ vnotex::MainWindow - + Failed to check for updates (%1) 无法检查更新(%1) - + Updates available: %1 有可用更新: %1 - + Initializing core components... 正在初始化核心组件... - + Do you want to minimize %1 to system tray instead of quitting when closed? 关闭时，是否将%1最小化到系统托盘而非退出？ - + You could change the option in Settings later. 稍后可以在设置里面更改。 - + %1 is still running here. %1仍然在此运行。 - - + + Global 全局 - + There is one export dialog running. Please close it first. 已有导出对话框运行。请先将其关闭。 - + Failed to load %n notebook(s). 无法加载 %n 个笔记本。 - + These notebooks may be moved or deleted. It is recommended to remove them from configuration and open them with the correct root folder path later. Remove them from the configuration? 这些笔记本可能已被移动或者删除。推荐将其从配置中移除并稍后使用正确的根文件夹路径重新打开。 @@ -2144,12 +2144,12 @@ Remove them from the configuration? 关于Qt - + %1 failed to start. %1无法启动。 - + Failed to initialize configuration manager. Please check if all the files are intact or reinstall the application. 无法初始化配置管理器。请检查全部文件的完整性或者重新安装应用。 @@ -2169,25 +2169,40 @@ Remove them from the configuration? 输出更多日志信息。 - + + Log to stderr. + 打印日志到错误输出。 + + + WebEngine remote debugging port. WebEngine远程调试端口。 - + port_number 端口 - + WebEngine without sandbox. 在非沙盒下运行WebEngine。 - + WebEngine with GPU disabled. WebEngine中禁用GPU。 + + + Are you sure to open link (%1)? + 确认打开链接 (%1)？ + + + + Malicious link might do harm to your device. + 可疑的链接可能会损坏设备。 + vnotex::ManageNotebooksDialog @@ -2256,7 +2271,7 @@ Remove them from the configuration? vnotex::MarkdownEditor - + Insert Link 插入链接 @@ -2272,7 +2287,7 @@ Remove them from the configuration? - + Failed to read local image file (%1) (%2). 无法读取本地图片文件(%1)(%2)。 @@ -2292,185 +2307,185 @@ Remove them from the configuration? 更多高级粘贴，请尝试编辑器上下文菜单中的“多功能粘贴”和“解析为Markdown并粘贴”功能 - - - + + + Insert From Clipboard 从剪切板插入 - + Insert From URL 从URL插入 - + Insert From Image Data 从图片数据插入 - - - + + + Insert As Image Link 插入为图片链接 - - - + + + Insert As Image 插入为图片 - - + + Insert As Text 插入为文本 - + Insert As Relative Image Link 插入为相对图片链接 - + Insert As Link 插入为链接 - + Insert As Relative Link 插入为相对链接 - - + + Attach And Insert Link 添加为附件并插入链接 - + Insert File Content 插入文件内容 - + Insert From Clipboard (%n items) 从剪切板插入(%n项) - + Insert Image From Clipboard 从剪切板插入图片 - + Insert Image From URL 从URL插入图片 - + &Read 阅读(&R) - + Rich Paste 多功能粘贴 - + Paste as Plain Text 粘贴为纯文本 - + Parse to Markdown and Paste 解析为Markodwn并粘贴 - + Insert Snippet 插入片段 - - + + Failed to upload image to image host (%1) as (%2). 无法上传图片为(%2)到图床(%1）中。 - + View Image 查看图片 - + Copy Image URL 复制图片地址 - + Copy Image 复制图片 - + Copy In-Place Preview 复制原地预览 - + Open Link 打开链接 - + Copy Link 复制链接 - + Fetching images to local... 正在获取图片到本地... - - + + Abort 终止 - + Fetch Images To Local 获取图片到本地 - + Fetching image (%1) 正在获取图片(%1) - - + + Upload Images To Image Host 上传图片到图床 - + None 无 - + Uploading local images... 正在上传本地图片... - + Upload image (%1) 上传图片(%1) @@ -2860,66 +2875,76 @@ Remove them from the configuration? vnotex::MarkdownViewWindow - + Markdown Viewer Markdown查看器 - - + + Clear Obsolete Images 清空无用图片 - + These images seems to be not in use anymore. Please confirm the deletion of them. 这些图片似乎已经不再使用。请确认并删除。 - + Deleted local images could be found in the recycle bin of notebook if it is from a bundle notebook. 如果这是一个自包含笔记本，已删除的本地图片可以在笔记本回收站中找回。 - + Clearing obsolete images... 正在清空无用图片... - + Abort 终止 - + Clear image (%1) 清空图片(%1) - + Cleared %n obsolete images 清空 %n 无用图片 - + View Mode Not Supported In Read Mode 阅读模式不支持查看模式 - + Edit Only 纯编辑 - + Edit with Preview 预览辅助的编辑 - - + + Printed to PDF + 已打印为PDF + + + + Failed to print to PDF + 无法打印为PDF + + + + Replace is not supported in read mode 阅读模式不支持替换 @@ -2927,12 +2952,12 @@ Remove them from the configuration? vnotex::MarkdownViewer - + &Edit 编辑(&E) - + Cross Copy 交叉复制 @@ -4068,7 +4093,7 @@ Description: %3 vnotex::OutlineProvider - + [EMPTY] [空] @@ -6012,12 +6037,12 @@ Backup file last modified time: %2 vnotex::WebViewExporter - + Table of Contents 目录 - + Copy output file (%1) to (%2). 复制输出文件(%1)为(%2)。 diff --git a/src/data/core/vnotex.json b/src/data/core/vnotex.json index 78aec14321..b3d26c4956 100644 --- a/src/data/core/vnotex.json +++ b/src/data/core/vnotex.json @@ -3,7 +3,7 @@ "metadata" : { "//comment": "When releasing new version, please go through the following configs to check if override is needed.", "//Comment": "markdown_editor#override_viewer_resource", - "version" : "3.18.0" + "version" : "3.18.1" }, "core" : { "theme" : "pure",