diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml index 3e62e855..ce07c37e 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.0-beta.10 + VNOTE_VER: 3.0.0-beta.11 jobs: build-linux: diff --git a/.github/workflows/ci-macos.yml b/.github/workflows/ci-macos.yml index 0bd908dd..852f0b4a 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.0-beta.10 + VNOTE_VER: 3.0.0-beta.11 jobs: build-linux: diff --git a/.github/workflows/ci-win.yml b/.github/workflows/ci-win.yml index 17599c09..0fd4d001 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.0-beta.10 + VNOTE_VER: 3.0.0-beta.11 jobs: build: diff --git a/changes.md b/changes.md index 9262917a..a1d980a3 100644 --- a/changes.md +++ b/changes.md @@ -1,4 +1,7 @@ # Changes +## v3.0.0-beta.11 +* Full-text search + ## v3.0.0-beta.10 * Show more tips * Add exclude patterns for external nodes diff --git a/src/data/core/translations/vnote_zh_CN.qm b/src/data/core/translations/vnote_zh_CN.qm index 9ae791e1..0863aafc 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 0ccc61b8..b0cd6671 100644 --- a/src/data/core/translations/vnote_zh_CN.ts +++ b/src/data/core/translations/vnote_zh_CN.ts @@ -393,8 +393,12 @@ + Cancelling the export + 正在取消导出 + + Cancelling the export. - 正在取消导出。 + 正在取消导出。 @@ -567,6 +571,14 @@ 属性 + + vnotex::FileSearchEngineWorker + + + Skip binary file (%1) + 跳过二进制文件 (%1) + + vnotex::FileSystemViewer @@ -994,41 +1006,81 @@ 地址(&U): + + vnotex::LocationList + + + Path + 路径 + + + + Line + 行号 + + + + Text + 文本 + + + + Clear + 清空 + + + + %n Item(s) + + %n 项 + + + 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 全局 @@ -1039,7 +1091,7 @@ - + Quit 退出 @@ -1054,167 +1106,167 @@ 笔记本 - + 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 快速访问 - - - + + + 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> @@ -1223,20 +1275,45 @@ - + About Qt 关于 Qt - + %1 failed to start. %1 无法启动。 - + Failed to initialize configuration manager. Please check if all the files are intact or reinstall the application. 无法初始化配置管理器。请检查全部文件的完整性或者重新安装应用。 + + + A pleasant note-taking platform. + 一个舒适的笔记平台。 + + + + Files or folders to open. + 需要打开的目标文件或者文件夹。 + + + + Print more logs. + 输出更多日志信息。 + + + + WebEngine remote debugging port. + WebEngine 远程调试端口。 + + + + WebEngine without sandbox. + 在非沙盒下运行 WebEngine。 + vnotex::ManageNotebooksDialog @@ -1624,28 +1701,28 @@ Use the "Close" button if you just want to remove it from %2. Markdown 查看器 - + Markdown Viewer Markdown 查看器 - + Clear Obsolete Images 清空无用图片 - + These images seems not in use anymore. Please confirm the deletion of them. 这些图片似乎已经不再使用。请确认并删除。 - + Deleted images could be found in the recycle bin of notebook if it is from a bundle notebook. 如果这是一个自包含笔记本，已删除的图片可以在笔记本回收站中找回。 - - + + Replace is not supported in read mode 阅读模式不支持替换 @@ -1666,32 +1743,32 @@ Use the "Close" button if you just want to remove it from %2. vnotex::MarkdownViewerAdapter - + No Background 无背景 - + Evernote 印象笔记 - + OneNote OneNote - + Microsoft Word Microsoft Word - + WeChat Public Account Editor 微信公众号编辑器 - + Raw HTML 原始HTML @@ -1905,101 +1982,101 @@ Use the "Close" button if you just want to remove it from %2. 笔记本 - + 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) 按修改时间倒序查看 @@ -2173,9 +2250,8 @@ Use the "Close" button if you just want to remove it from %2. 新建文件夹(&F) - &Properties - 属性(&P) + 属性(&P) @@ -2320,6 +2396,11 @@ Use the "Close" button if you just want to remove it from %2. Failed to delete/remove item %1 (%2) (%3). 无法删除或移除项目 %1 (%2) (%3)。 + + + &Properties (Rename) + 属性(重命名)(&P) + &Delete @@ -2432,7 +2513,7 @@ Description: %3 vnotex::OutlinePopup - + Outline 大纲 @@ -2448,21 +2529,289 @@ Description: %3 vnotex::OutlineViewer - + Decrease Expansion Level 减小扩展层级 - + Increase Expansion Level 增大扩展层级 - + Expansion level: %1 扩展层级: %1 + + vnotex::SearchPanel + + + Full-text search. + 全文搜索。 + + + + Search in case sensitive. + 大小写敏感搜索。 + + + + Search by regular expression. + 以正则表达式搜索。 + + + + Search whole word only. + 按完整词搜索。 + + + + Do a fuzzy search (not applicable to content search). + 模糊搜索（对内容搜索无效）。 + + + + Do an OR combination of keywords. + 用或来组合关键词。 + + + + Keywords to search. + 搜索的关键词。 + + + + Keyword: + 关键词: + + + + Buffers + 缓冲区 + + + + Current Folder + 当前文件夹 + + + + Current Notebook + 当前笔记本 + + + + All Notebooks + 全部笔记本 + + + + Scope: + 范围: + + + + Wildcard pattern of files to search + 需要搜索的文件的通配符模式 + + + + File pattern: + 文件模式: + + + + Search + 搜索 + + + + Cancel + 取消 + + + + Toggle Location List + 打开或关闭位置列表 + + + + Advanced Settings + 高级设置 + + + + Object: + 对象: + + + + Name + 名字 + + + + Content + 内容 + + + + Outline + 大纲 + + + + Tag + 标签 + + + + Path + 路径 + + + + Target: + 目标: + + + + File + 文件 + + + + Folder + 文件夹 + + + + Notebook + 笔记本 + + + + Option: + 选项: + + + + &Case sensitive + 大小写敏感(&C) + + + + &Plain text + 纯文本(&P) + + + + &Whole word only + 匹配完整词(&W) + + + + &Fuzzy search + 模糊搜索(&F) + + + + Re&gular expression + 正则表达式(&G) + + + + Search finished: %1 + 搜索完成: %1 + + + + Invalid keyword + 无效关键词 + + + + No object specified + 没有指定对象 + + + + No target specified + 没有指定目标 + + + + Fuzzy search is not allowed when searching content + 模糊搜索不可用于搜索内容 + + + + vnotex::SearchTranslate + + + Idle + 空闲 + + + + Busy + 忙 + + + + Finished + 完成 + + + + Failed + 失败 + + + + Stopped + 停止 + + + + vnotex::Searcher + + + Searching %n buffer(s) + + 正在搜索 %n 缓冲区 + + + + + Searching folder (%1) + 正在搜索文件夹 (%1) + + + + Searching notebook (%1) + 正在搜索笔记本 (%1) + + + + Failed to compile tokens (%1) + 无法编译令牌 (%1) + + + + + Searching outline is not supported yet + 搜索大纲暂不支持 + + + + + Searching tag is not supported yet + 搜索标签暂不支持 + + vnotex::SelectDialog @@ -2757,12 +3106,12 @@ Description: %3 vnotex::TitleBar - + Settings 设置 - + Menu 菜单 @@ -2909,39 +3258,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 @@ -2952,32 +3301,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? 是否保存缓冲区覆盖到文件，或者放弃缓冲区？ @@ -2986,58 +3335,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 563d6140..5116fd15 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.0-beta.10" + "version" : "3.0.0-beta.11" }, "core" : { "theme" : "pure",