diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml index 9438beaa..55adc1fc 100644 --- a/.github/workflows/ci-linux.yml +++ b/.github/workflows/ci-linux.yml @@ -10,7 +10,7 @@ on: workflow_dispatch: env: - VNOTE_VER: 3.0.1 + VNOTE_VER: 3.1.0 jobs: build-linux: diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml index 84cb43a0..a7a6219b 100644 --- a/.github/workflows/ci-macos.yml +++ b/.github/workflows/ci-macos.yml @@ -10,7 +10,7 @@ on: workflow_dispatch: env: - VNOTE_VER: 3.0.1 + VNOTE_VER: 3.1.0 jobs: build-linux: diff --git a/.github/workflows/ci-win.yml b/.github/workflows/ci-win.yml index 70734878..4f3d36ba 100644 --- a/.github/workflows/ci-win.yml +++ b/.github/workflows/ci-win.yml @@ -10,7 +10,7 @@ on: workflow_dispatch: env: - VNOTE_VER: 3.0.1 + VNOTE_VER: 3.1.0 jobs: build: diff --git a/changes.md b/changes.md index d0b68621..1068c626 100644 --- a/changes.md +++ b/changes.md @@ -1,4 +1,14 @@ # Changes +## v3.1.0 +* Support Japanese translation (Thanks @miurahr) +* MarkdownEditor: guess image suffix when fetching to local +* Refine read mode styles (Thanks @heartnn) +* Support recovering edit session on start +* Support recovering notebook explorer session on start +* Support Flash Page +* Support Quick Access +* Allow to keep docks (like Outline) when expanding content area + ## v3.0.1 * Support spell check via Hunspell * `Ctrl+Alt+F` to trigger full-text search diff --git a/src/data/core/translations/vnote_zh_CN.qm b/src/data/core/translations/vnote_zh_CN.qm index a5f50859..e19ba826 100644 Binary files a/src/data/core/translations/vnote_zh_CN.qm and b/src/data/core/translations/vnote_zh_CN.qm differ diff --git a/src/data/core/translations/vnote_zh_CN.ts b/src/data/core/translations/vnote_zh_CN.ts index de481b6a..723bd2fe 100644 --- a/src/data/core/translations/vnote_zh_CN.ts +++ b/src/data/core/translations/vnote_zh_CN.ts @@ -92,27 +92,32 @@ vnotex::AppearancePage - + System title bar 系统标题栏 - + Use system title bar 使用系统标题栏 - + Icon size of the main window tool bar 主窗口工具栏图标大小 - + Main tool bar icon size: 主工具栏图标大小: - + + Keep dock widgets when expanding content area: + 扩展内容区时保留停靠部件: + + + Appearance 外观 @@ -278,146 +283,145 @@ vnotex::ExportDialog - - + + Export 导出 - + Source 源 - + Current Buffer (%1) 当前缓冲区 (%1) - + Current Note (%1) 当前笔记 (%1) - + Current Folder (%1) 当前文件夹 (%1) - + Current Notebook (%1) 当前笔记本 (%1) - + Source: 源: - + vnote_exports vnote导出 - + Target 目标 - + Markdown Markdown - + HTML HTML网页 - + PDF PDF - + Custom 自定义 - + Format: 格式: - + Use transparent background 使用透明背景 - + Rendering style: 渲染样式: - + Syntax highlighting style: 语法高亮样式: - - + Browse 浏览 - + Select Export Output Directory 选择导出输出目录 - + Output directory: 输出目录: - + Advanced 高级 - + Process sub-folders 处理子文件夹 - + Export attachments 导出附件 - + Open Directory 打开目录 - + Copy Content 复制内容 - + Copy exported file content 复制已导出文件的内容 - + %n file(s) exported 已导出 %n 个文件 - + Cancelling the export 正在取消导出 @@ -426,87 +430,87 @@ 正在取消导出。 - + Please specify a valid wkhtmltopdf executable file (%1) 请指定一个有效的 wkhtmltopdf 可执行文件 (%1) - + Embed styles 嵌入样式 - + Embed images 嵌入图片 - + Complete page 完整页面 - + Export the whole page along with images which may change the links structure 导出包括图像的完整页面，可能改变链接结构 - + Mime HTML format Mime HTML 格式 - + Add outline panel 添加大纲面板 - + Settings 设置 - + Page layout: 页面布局: - + Add Table-Of-Contents 添加内容导航表格 - + Use wkhtmltopdf 使用 wkhtmltopdf - + Download 下载 - + Select wkhtmltopdf Executable 选择 wkhtmltopdf 可执行文件 - + Wkhtmltopdf path: Wkhtmltopdf 路径: - + Wkhtmltopdf arguments: Wkhtmltopdf 参数: - + Portrait 纵向 - + Landscape 横向 @@ -836,7 +840,17 @@ 关闭时最小化到系统托盘 - + + Recover last session on start + 启动时恢复上次会话 + + + + Recover last session (like buffers) on start of VNote + 启动 VNote 时恢复上次会话（如缓冲区） + + + General 通用 @@ -1036,6 +1050,14 @@ 地址(&U): + + vnotex::LocationInputWithBrowseButton + + + Browse + 浏览 + + vnotex::LocationList @@ -1069,48 +1091,47 @@ vnotex::MainWindow - + Navigation 导航 - + Outline 大纲 - + Search 搜索 - + Location List 位置列表 - Notebooks - 笔记本 + 笔记本 - + 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 全局 @@ -1121,182 +1142,219 @@ - + Quit 退出 - + File 文件 - + Notebook 笔记本 - + New Notebook 新建笔记本 - + New Notebook From Folder 从文件夹新建笔记本 - + Import Notebook 导入笔记本 - + Import Legacy Notebook Of VNote 2.0 导入 VNote 2.0 的遗留笔记本 - - + + New Note 新建笔记 - + New Folder 新建文件夹 - - + + Open File 打开文件 - + Import And Export 导入导出 - + Import File 导入文件 - + Import Folder 导入文件夹 - + Export 导出 - + + + Quick Access 快速访问 - - - + + Flash Page + 灵犀页 + + + + Please set the Flash Page location in the Settings dialog first. + 请先在设置对话框中设置灵犀页位置。 + + + + Flash Page is a temporary page for a flash of inspiration. + 灵犀页是一个用于记录一闪而过的灵感的临时页面。 + + + + Please pin files to Quick Access first. + 请先将文件固定到快速访问。 + + + + Files could be pinned to Quick Access via context menu. + 文件可以通过上下文菜单固定到快速访问。 + + + + Quick Access could be managed in the Settings dialog. + 可以在设置对话框中管理快速访问。 + + + + Quick Access Not Set + 快速访问未设置 + + + + + Settings 设置 - + Expand Content Area 扩展内容区 - + Press %1 To Exit Full Screen 按 %1 退出全屏 - + Stay On Top 置顶 - + Windows 窗口 - + Open User Configuration Folder 打开用户配置文件夹 - + Open Default Configuration Folder 打开默认配置文件夹 - + Edit User Configuration 编辑用户配置 - + Open Default Configuration 打开默认配置 - + Reset Main Window Layout 重置主窗口布局 - + Restart 重启 - + Help 帮助 - + What's This? 这是什么？ - + Enter WhatsThis mode and click somewhere to show help information 进入 WhatsThis 模式，点击某处以显示帮助信息 - + Shortcuts Help 快捷键帮助 - + Markdown Guide Markdown 指南 - + View Logs 查看日志 - + Feedback And Discussions 反馈和讨论 - - + + About 关于 - + <h3>%1</h3> <span>%2</span> @@ -1305,7 +1363,7 @@ - + About Qt 关于 Qt @@ -1429,129 +1487,129 @@ Use the "Close" button if you just want to remove it from %2. vnotex::MarkdownEditor - - + + Insert Link 插入链接 - + Insert Image 插入图片 - + Insert Table 插入表格 - + For advanced paste, try the "Rich Paste" and "Parse To Markdown And Paste" on the editor's context menu 更多高级粘贴，请尝试编辑器上下文菜单中的“多功能粘贴”和“解析为 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 Image From Clipboard 从剪切板插入图片 - + Insert Image From URL 从URL插入图片 - + &Read 阅读(&R) - + Rich Paste 多功能粘贴 - + Parse To Markdown And Paste 解析为 Markodwn 并粘贴 - + Fetching images to local... 正在获取图片到本地... - + Abort 终止 - + Fetch Images To Local 获取图片到本地 - + Fetching image (%1) 正在获取图片 (%1) @@ -2008,111 +2066,111 @@ Use the "Close" button if you just want to remove it from %2. vnotex::NotebookExplorer - + Select one of all the notebooks as current notebook.<br/>Move mouse on one item to check its details. 从全部笔记本中选择一个作为当前笔记本。<br/>移动鼠标到某个项目上查看详情。 - + Notebook 笔记本 - + This title bar contains buttons and menu to manage notebooks and notes. 该标题栏包含管理笔记本和笔记的按钮和菜单。 - + View 查看 - + Toggle Recycle Bin Node 显示/隐藏回收站节点 - + &Manage Notebooks 管理笔记本(&M) - + External Files 外部文件 - + Show External Files 显示外部文件 - + Import External Files When Activated 激活时自动导入外部文件 - - + + Could not create folder within Recycle Bin. 无法在回收站内创建文件夹。 - - + + Could not create note within Recycle Bin. 无法在回收站内创建笔记。 - + Please first create a notebook to hold your data. 请先创建一个笔记本来保存数据。 - + Select Files To Import 选择文件导入 - + Failed to add file (%1) as node (%2). 无法添加文件 (%1) 为节点 (%2)。 - + View By Configuration 按配置查看 - + View By Name 按名字查看 - + View By Name (Reversed) 按名字倒序查看 - + View By Created Time 按创建时间查看 - + View By Created Time (Reversed) 按创建时间倒序查看 - + View By Modified Time 按修改时间查看 - + View By Modified Time (Reversed) 按修改时间倒序查看 @@ -2276,12 +2334,12 @@ Use the "Close" button if you just want to remove it from %2. [外部] %1 - + New N&ote 新建笔记(&O) - + New &Folder 新建文件夹(&F) @@ -2290,67 +2348,67 @@ Use the "Close" button if you just want to remove it from %2. 属性(&P) - + Open &Location 打开路径(&L) - + Cop&y Path 复制路径(&Y) - + Copied path: %1 已复制路径: %1 - + &Copy 复制(&C) - + C&ut 剪切(&U) - + &Paste 粘贴(&P) - + &Empty 清空(&E) - + Empty the recycle bin of this notebook? 清空该笔记本的回收站？ - + All files in recycle bin will be deleted permanently. 回收站中的全部文件都会被永久删除。 - + Location of recycle bin: %1 回收站路径: %1 - + Failed to empty recycle bin (%1) (%2). 无法清空回收站 (%1) (%2)。 - + &Sort 排序(&S) - + Re&load 重新加载(&L) @@ -2359,72 +2417,72 @@ Use the "Close" button if you just want to remove it from %2. 从磁盘重新加载索引(&L) - + &Import To Index 导入到索引（&I） - + &Open 打开(&O) - + &Expand All * 逐层展开(&E) * - + Failed to copy source (%1) to destination (%2) (%3). 无法复制源 (%1) 至 目标 (%2) (%3)。 - + Sort Folders 排序文件夹 - + Sort Notes 排序笔记 - + Sort nodes under %1 (%2) in the configuration file. 在配置文件中对%1 (%2) 下的节点进行排序。 - + notebook 笔记本 - + folder 文件夹 - + Name 名字 - + Created Time 创建时间 - + Modified Time 修改时间 - + Invalid node (%1). 无效的节点 (%1)。 - + Please check if the node exists on the disk. 请检查该节点在磁盘上是否存在。 @@ -2433,103 +2491,108 @@ Use the "Close" button if you just want to remove it from %2. 无法删除或移除项目 %1 (%2) (%3)。 - + &Properties (Rename) 属性(重命名)(&P) - + &Delete 删除(&D) - + &Delete From Recycle Bin 从回收站中删除(&D) - + &Remove From Index 从索引中移除(&R) - + Relo&ad Index From Disk 从磁盘重新加载索引(&A) + + + Pin To &Quick Access + 固定到快速访问(&Q) + - + Copied %n item(s) 已复制 %n 项 - + Invalid clipboard data to paste. 无效的剪切板数据用于粘贴。 - + Destination is detected in sources (%1). Operation is cancelled. 目标包含在源 (%1) 中。操作取消。 - + Pasted %n item(s) 已粘贴 %n 项 - + Delete these folders and notes permanently? 永久删除这些文件夹和笔记？ - + Files will be deleted permanently and could not be found even in operating system's recycle bin. 文件将会被永久删除，即使在操作系统的回收站中也无法找回。 - + Delete these folders and notes? 删除这些文件夹和笔记？ - + Deleted files could be found in the recycle bin of notebook. 被删除的文件可以在笔记本回收站中找回。 - + Confirm Deletion 确认删除 - + Failed to delete/remove item (%1) (%2) (%3). 无法删除或移除项目 (%1) (%2) (%3)。 - + Deleted/Removed %n item(s) 删除或移除 %n 项 - + Confirm Removal 确认移除 - + Remove these folders and notes from index? 从索引中移除这些文件夹和笔记？ - + Files are not touched but just removed from notebook index. 文件不会被改动，仅仅是从笔记本索引中移除。 @@ -2580,6 +2643,40 @@ Description: %3 扩展层级: %1 + + vnotex::QuickAccessPage + + + + Quick Access + 快速访问 + + + + Flash Page + 灵犀页 + + + + Flash Page location (user could copy the path of one note and paste it here) + 灵犀页位置（用户可以复制笔记的路径并粘贴在此） + + + + Flash Page: + 灵犀页: + + + + Edit the files pinned to Quick Access (one file per line) + 编辑固定到快速访问的文件（一行一个文件） + + + + Quick Access: + 快速访问: + + vnotex::SearchPanel @@ -2859,12 +2956,12 @@ Description: %3 vnotex::SettingsDialog - + Settings 设置 - + Search 查找 @@ -3185,107 +3282,107 @@ Description: %3 vnotex::ViewSplit - + Windows List 窗口列表 - + Workspaces and Splits 工作空间和拆分 - + No window to show here 没有窗口可以展示 - + Workspaces 工作空间 - + Workspace %1 工作空间 %1 - + New Workspace 新建工作空间 - + Remove Workspace 移除工作空间 - + Split 拆分 - + Vertical Split 竖直拆分 - + Horizontal Split 水平拆分 - + Maximize Split 最大化拆分 - + Distribute Splits 平均分配拆分 - + Remove Split 移除拆分 - + Remove Split And Workspace 移除拆分和工作空间 - + Close Tab 关闭标签页 - + Close Other Tabs 关闭其他标签页 - + Close Tabs To The Right 关闭右侧标签页 - + Copy Path 复制路径 - + Copied path: %1 已复制路径: %1 - + Open Location 打开路径 - + Locate Node 定位节点 @@ -3300,39 +3397,39 @@ Description: %3 - - + + [No Buffer] [无缓冲区] - + Save changes before closing note (%1)? 关闭笔记 (%1) 前是否保存更改？ - - + + Note path (%1). 笔记路径 (%1)。 - + Discard changes to note (%1)? 放弃对笔记 (%1) 的更改？ - + Found backup file (%1) of file (%2). Do you want to recover from backup file? 发现文件 (%2) 的备份文件 (%1)。是否要从备份文件中恢复？ - + 'Yes' to recover from backup file, 'No' to discard it, and 'Cancel' to exit. “是” 以从备份文件中恢复，“否” 以放弃该备份文件，“取消” 以退出。 - + It may be caused by crash while editing this file before. File last modified time: %1 @@ -3343,32 +3440,32 @@ Backup file last modified time: %2 备份文件最后修改时间: %2 - + Drag And Drop Files To Attach 拖拽文件以添加为附件 - + File is missing on disk (%1). 文件在磁盘中丢失 (%1)。 - + Do you want to force to save the buffer to the file? 是否强制保存缓冲区内容到文件？ - + The file may be deleted from outside. Please choose to save the buffer to a new file or just discard it. 该文件可能已经被删除。请选择将缓冲区的内容保存为新文件或者放弃缓冲区。 - + File is changed from outside (%1). 文件被更改 (%1)。 - + Do you want to save the buffer to the file to override, or discard the buffer? 是否保存缓冲区覆盖到文件，或者放弃缓冲区？ @@ -3377,58 +3474,58 @@ Backup file last modified time: %2 是否用缓冲区的内容覆盖该文件？ - + The file is changed from outside. Please choose to save the buffer to the file or just discard the buffer and reload the file. 该文件已经被更改。请选择保存缓冲区到该文件或者放弃缓冲区并重新加载文件。 - + This is a read-only note (%1), on which modification is not allowed. 这是一个只读笔记 (%1)，不支持修改。 - + Please save your changes to another note. 请保存更改到另一个笔记。 - + Failed to save note (%1). 无法保存笔记 (%1)。 - + Please check the file (%1) and try it again. 请检查文件 (%1) 并重试。 - + Maybe the file is occupied by another service temporarily. 可能该文件正在被第三方应用临时占用。 - + Zoomed: %1% 缩放: %1% - + Zoomed: %1%2 缩放: %1%2 - - + + Pattern not found: %1 无法找到模式: %1 - + Match found: %1/%2 找到匹配: %1/%2 - + Replaced %n match(es) 替换 %n 处匹配 diff --git a/src/data/core/vnotex.json b/src/data/core/vnotex.json index cf345d4b..e3f7e9bb 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.0.1" + "version" : "3.1.0" }, "core" : { "theme" : "pure",