5a2m57KJ · pull · May 28, 2024 · May 14, 2024 · May 14, 2024 · May 14, 2024
diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -5,8 +5,6 @@
 * `git clone --depth=1 git@github.com:siyuan-note/siyuan.git`
 * switch to dev branch `git checkout dev`
 
-Note: `app/stage/protyle/**` is managed by git lfs, and you don't need to pay attention to it under normal circumstances, related to [#9253](https://github.com/siyuan-note/siyuan/issues/9253).
-
 ## User Interface
 
 Install pnpm: `npm install -g pnpm`

diff --git a/.github/CONTRIBUTING_zh_CN.md b/.github/CONTRIBUTING_zh_CN.md
@@ -5,8 +5,6 @@
 * `git clone --depth=1 git@github.com:siyuan-note/siyuan.git`
 * 切换到 dev 分支 `git checkout dev`
 
-备注：`app/stage/protyle/**` 使用 git lfs 管理，正常情况下无需关注，关联 [#9253](https://github.com/siyuan-note/siyuan/issues/9253)。
-
 ## NPM 依赖
 
 安装 pnpm：`npm install -g pnpm`

diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml
@@ -92,7 +92,7 @@ jobs:
     strategy:
       matrix:
         config:
-          - os: ubuntu-22.04
+          - os: ubuntu-20.04
             name: ubuntu build linux.AppImage
             kernel_path: "../app/kernel-linux/SiYuan-Kernel"
             build_args_prefix: "-s -w -X"
@@ -101,7 +101,7 @@ jobs:
             goos: "linux"
             goarch: "amd64"
             suffix: "linux.AppImage"
-          - os: ubuntu-22.04
+          - os: ubuntu-20.04
             name: ubuntu build linux.tar.gz
             kernel_path: "../app/kernel-linux/SiYuan-Kernel"
             build_args_prefix: "-s -w -X"

diff --git a/README.md b/README.md
@@ -19,6 +19,7 @@
 <a title="Last Commit" target="_blank" href="https://github.com/siyuan-note/siyuan/commits/master"><img src="https://img.shields.io/github/last-commit/siyuan-note/siyuan.svg?style=flat-square&color=FF9900"></a>
 <br><br>
 <a title="Twitter" target="_blank" href="https://twitter.com/b3logos"><img alt="Twitter Follow" src="https://img.shields.io/twitter/follow/b3logos?label=Follow&style=social"></a>
+<a title="Discord" target="_blank" href="https://discord.gg/dmMbCqVX7G"><img alt="Chat on Discord" src="https://img.shields.io/discord/808152298789666826?label=Discord&logo=Discord&style=social"></a>
 <br><br>
 <a href="https://www.producthunt.com/products/siyuan/reviews?utm_source=badge-product_rating&utm_medium=badge&utm_souce=badge-siyuan" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/product_rating.svg?product_id=534576&theme=light" alt="SiYuan - A&#0032;privacy&#0045;first&#0032;personal&#0032;knowledge&#0032;management&#0032;software | Product Hunt" style="width: 242px; height: 108px;" width="242" height="108" /></a>
 </p>
@@ -27,6 +28,36 @@
 <a href="README_zh_CN.md">中文</a>
 </p>
 
+---
+
+## Table of Contents
+
+* [💡 Introduction](#-introduction)
+* [🔮 Features](#-features)
+* [🏗️ Architecture and Ecosystem](#-architecture-and-ecosystem)
+* [🌟 Star History](#-star-history)
+* [🗺️ Roadmap](#️-roadmap)
+* [🚀 Download Setup](#-download-setup)
+  * [App Market](#app-market)
+  * [Installation Package](#installation-package)
+  * [Docker Hosting](#docker-hosting)
+  * [Unraid Hosting](#unraid-hosting)
+  * [Insider Preview](#insider-preview)
+* [🏘️ Community](#️-community)
+* [🛠️ Development Guide](#️-development-guide)
+* [❓ FAQ](#-faq)
+  * [How does SiYuan store data?](#how-does-siyuan-store-data)
+  * [Does it support data synchronization through a third-party sync disk?](#does-it-support-data-synchronization-through-a-third-party-sync-disk)
+  * [Is SiYuan open source?](#is-siyuan-open-source)
+  * [How to upgrade to a new version?](#how-to-upgrade-to-a-new-version)
+  * [What if some blocks (such as paragraph blocks in list items) cannot find the block icon?](#what-if-some-blocks-such-as-paragraph-blocks-in-list-items-cannot-find-the-block-icon)
+  * [What should I do if the data repo key is lost?](#what-should-i-do-if-the-data-repo-key-is-lost)
+  * [Do I need to pay for it?](#do-i-need-to-pay-for-it)
+* [🙏 Acknowledgement](#-acknowledgement)
+  * [Contributors](#contributors)
+
+---
+
 ## 💡 Introduction
 
 SiYuan is a privacy-first personal knowledge management system, support fine-grained block-level reference and Markdown
@@ -76,7 +107,7 @@ Most features are free, even for commercial use.
 
 Some features are only available to paid members, for more details please refer to [Pricing](https://b3log.org/siyuan/en/pricing.html).
 
-## 🏗️ Architecture design and open source ecosystem
+## 🏗️ Architecture and Ecosystem
 
 ![SiYuan Arch](https://b3logfile.com/file/2023/05/SiYuan_Arch-Sgu8vXT.png "SiYuan Arch")
 
@@ -116,6 +147,11 @@ Desktop:
 
 * [Microsoft Store](https://apps.microsoft.com/detail/9p7hpmxp73k4)
 
+### Installation Package
+
+* [B3log](https://b3log.org/siyuan/en/download.html)
+* [GitHub](https://github.com/siyuan-note/siyuan/releases)
+
 ### Docker Hosting
 
 <details>
@@ -202,10 +238,26 @@ Use NGINX reverse proxy to hide port 6806, please note:
 
 </details>
 
-### Installation Package
+### Unraid Hosting
 
-* [B3log](https://b3log.org/siyuan/en/download.html)
-* [GitHub](https://github.com/siyuan-note/siyuan/releases)
+<details>
+<summary>Unraid Deployment</summary>
+
+Note: First run `chown -R 1000:1000 /mnt/user/appdata/siyuan` in the terminal
+
+Template reference:
+
+```
+Web UI: 6806
+Container Port: 6806
+Container Path: /home/siyuan
+Host path: /mnt/user/appdata/siyuan
+PUID: 1000
+PGID: 1000
+Publish parameters: --accessAuthCode=******(Access authorization code)
+```
+
+</details>
 
 ### Insider Preview
 
@@ -267,26 +319,10 @@ For more details, please refer to [Development Guide](https://github.com/siyuan-
 
 You can <kbd>Check update</kbd> in <kbd>Settings</kbd> - <kbd>About</kbd> - <kbd>Current Version</kbd>, or pay attention to [Official Download](https://b3log.org/siyuan/en/download.html) or [GitHub Releases](https://github.com/siyuan-note/siyuan/releases) to get the new version.
 
-### Is there any note for deleting docs?
-
-After deletion, the doc will not appear in the operating system's recycle bin, but will be deleted directly. When deleted, SiYuan will generate data history.
-
-### How can I just wrap and not start a new paragraph?
-
-Please use <kbd>Shift+Enter</kbd>.
-
 ### What if some blocks (such as paragraph blocks in list items) cannot find the block icon?
 
 The first sub-block under the list item is the block icon omitted. You can move the cursor into this block and trigger its block menu with <kbd>Ctrl+/</kbd> .
 
-### How to share notes?
-
-* Share document to Liandi
-* Export and import `.sy.zip` package
-* Via network hosting
-* Export and import Markdown
-* <kbd>Export Preview</kbd> to copy to third-party online services
-
 ### What should I do if the data repo key is lost?
 
 * If the data repo key is correctly initialized on multiple devices before, the key is the same on all devices and can be set in <kbd>Settings</kbd> - <kbd>About</kbd> - <kbd>Data repo key</kbd> - <kbd>Copy key string</kbd> retrieve

diff --git a/README_zh_CN.md b/README_zh_CN.md
@@ -19,6 +19,7 @@
 <a title="Last Commit" target="_blank" href="https://github.com/siyuan-note/siyuan/commits/master"><img src="https://img.shields.io/github/last-commit/siyuan-note/siyuan.svg?style=flat-square&color=FF9900"></a>
 <br><br>
 <a title="Twitter" target="_blank" href="https://twitter.com/b3logos"><img alt="Twitter Follow" src="https://img.shields.io/twitter/follow/b3logos?label=Follow&style=social"></a>
+<a title="Discord" target="_blank" href="https://discord.gg/dmMbCqVX7G"><img alt="Chat on Discord" src="https://img.shields.io/discord/808152298789666826?label=Discord&logo=Discord&style=social"></a>
 <br><br>
 <a href="https://www.producthunt.com/products/siyuan/reviews?utm_source=badge-product_rating&utm_medium=badge&utm_souce=badge-siyuan" target="_blank"><img src="https://api.producthunt.com/widgets/embed-image/v1/product_rating.svg?product_id=534576&theme=light" alt="SiYuan - A&#0032;privacy&#0045;first&#0032;personal&#0032;knowledge&#0032;management&#0032;software | Product Hunt" style="width: 242px; height: 108px;" width="242" height="108" /></a>
 </p>
@@ -27,6 +28,36 @@
 <a href="README.md">English</a>
 </p>
 
+---
+
+## 目录
+
+* [💡 简介](#-简介)
+* [🔮 特性](#-特性)
+* [🏗️ 架构和生态](#️-架构和生态)
+* [🌟 星标历史](#-星标历史)
+* [🗺️ 路线图](#️-路线图)
+* [🚀 下载安装](#-下载安装)
+  * [应用市场](#应用市场)
+  * [安装包](#安装包)
+  * [Docker 部署](#docker-部署)
+  * [Unraid 部署](#unraid-部署)
+  * [内部预览版](#内部预览版)
+* [🏘️ 社区](#️-社区)
+* [🛠️ 开发指南](#️-开发指南)
+* [❓ 常见问题和解答](#-常见问题和解答)
+  * [思源是如何存储数据的？](#思源是如何存储数据的)
+  * [支持通过第三方同步盘进行数据同步吗？](#支持通过第三方同步盘进行数据同步吗)
+  * [思源是开源的吗？](#思源是开源的吗)
+  * [如何升级到新版本？](#如何升级到新版本)
+  * [有的块（比如在列表项中的段落块）找不到块标怎么办？](#有的块比如在列表项中的段落块找不到块标怎么办)
+  * [数据仓库密钥遗失怎么办？](#数据仓库密钥遗失怎么办)
+  * [使用需要付费吗？](#使用需要付费吗)
+* [🙏 鸣谢](#-鸣谢)
+  * [贡献者列表](#贡献者列表)
+
+---
+
 ## 💡 简介
 
 思源笔记是一款隐私优先的个人知识管理系统，支持细粒度块级引用和 Markdown 所见即所得。
@@ -76,7 +107,7 @@
 
 部分功能需要付费会员才能使用，更多细节请参考[定价](https://b3log.org/siyuan/pricing.html)。
 
-## 🏗️ 架构设计和开源生态
+## 🏗️ 架构和生态
 
 ![思源笔记架构设计](https://b3logfile.com/file/2023/05/SiYuan_Arch-Sgu8vXT.png "思源笔记架构设计")
 
@@ -91,7 +122,7 @@
 | [ios](https://github.com/siyuan-note/siyuan-ios)         | iOS App        | ![GitHub forks](https://img.shields.io/github/forks/siyuan-note/siyuan-ios)     | ![GitHub Repo stars](https://img.shields.io/github/stars/siyuan-note/siyuan-ios)     |
 | [riff](https://github.com/siyuan-note/riff)              | 间隔重复           | ![GitHub forks](https://img.shields.io/github/forks/siyuan-note/riff)           | ![GitHub Repo stars](https://img.shields.io/github/stars/siyuan-note/riff)           |
 
-## 🌟 Star History
+## 🌟 星标历史
 
 [![Star History Chart](https://api.star-history.com/svg?repos=siyuan-note/siyuan&type=Date)](https://star-history.com/#siyuan-note/siyuan&Date)
 
@@ -119,6 +150,11 @@
 
 * [Microsoft Store](https://apps.microsoft.com/detail/9p7hpmxp73k4)
 
+### 安装包
+
+* [B3log](https://b3log.org/siyuan/download.html)
+* [GitHub](https://github.com/siyuan-note/siyuan/releases)
+
 ### Docker 部署
 
 <details>
@@ -205,10 +241,26 @@ services:
 
 </details>
 
-### 安装包
+### Unraid 部署
 
-* [B3log](https://b3log.org/siyuan/download.html)
-* [GitHub](https://github.com/siyuan-note/siyuan/releases)
+<details>
+<summary>Unraid 部署文档</summary>
+
+注意：首先终端运行 `chown -R 1000:1000 /mnt/user/appdata/siyuan`
+
+模板参考：
+
+```
+Web UI: 6806
+Container Port: 6806
+Container Path: /home/siyuan
+Host path: /mnt/user/appdata/siyuan
+PUID: 1000
+PGID: 1000
+Publish parameters: --accessAuthCode=******（访问授权码）
+```
+
+</details>
 
 ### 内部预览版
 
@@ -272,26 +324,10 @@ services:
 
 **注意**：切勿将工作空间放置于安装目录下，因为更新版本会清空安装目录下的所有文件
 
-### 删除文档有什么注意事项吗？
-
-文档被删除后不会出现在操作系统回收站中，而是直接删除，删除时思源会生成数据历史。
-
-### 如何才能只换行不新起段落？
-
-请使用 <kbd>Shift+Enter</kbd>。
-
-## 有的块（比如在列表项中的段落块）找不到块标怎么办？
+### 有的块（比如在列表项中的段落块）找不到块标怎么办？
 
 在列表项下的第一个子块是省略块标的。可以将光标移到这个块中，然后通过 <kbd>Ctrl+/</kbd> 触发它的块标菜单。
 
-### 如何分享笔记？
-
-* 分享文档到链滴
-* 导出导入 `.sy.zip` 数据包
-* 通过网络伺服
-* 导出导入 Markdown
-* <kbd>导出预览</kbd> 中复制到第三方在线服务
-
 ### 数据仓库密钥遗失怎么办？
 
 * 如果之前在多个设备上正确初始化过数据仓库密钥的话，那么该密钥在所有设备上都是相同的，可以在 <kbd>设置</kbd> - <kbd>关于</kbd> - <kbd>数据仓库密钥</kbd> - <kbd>复制密钥字符串</kbd> 找回

diff --git a/app/.npmrc b/app/.npmrc
@@ -1 +1,2 @@
 shell-emulator=true
+virtual-store-dir-max-length=80
diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json
@@ -1,4 +1,14 @@
 {
+  "copyMirror": "Copy mirror",
+  "duplicateMirror": "Duplicate mirror",
+  "duplicateCompletely": "Duplicate completely",
+  "isMsStoreVerTip": "The currently used version is the Microsoft Store version, please check for updates in the Microsoft Store",
+  "andSubFile": "Are you sure you want to delete <b>${x}</b> and its ${y} subdocs?",
+  "confirmDeleteTip": "Are you sure to delete <b>${x}</b>?",
+  "rollbackTip": "After deletion, it can be restored in [Data History], retained <code class= 'fn__code'>${x}</code> days according to [Settings - Editor - History Retention Days]",
+  "newView": "Add View",
+  "newCol": "Add column",
+  "newRow": "Add entry",
   "enterKey": "Enter",
   "doubleClick": "Double Click",
   "click": "Click",
@@ -289,7 +299,7 @@
   "continueReview1": "Continue Review",
   "continueReview2": "There are still <code class='fn__code'>${count}</code> cards to review, continue?",
   "whatsNewInSiYuan": "What's New in SiYuan",
-  "returnDesktop": "Press back again to desktop",
+  "returnDesktop": "Press back again to desktop. Use [Exit Application] in the right sidebar panel to normally exit the application",
   "enterNew": "Enter to create",
   "enterNewTip": "No documents found, Enter to create a new document.",
   "searchTip1": "to navigate",
@@ -482,7 +492,7 @@
   "syncConfGuide4": "Sync now?",
   "syncConfGuide5": "If the amount of data is large, the first sync will be slow, please wait patiently<br>Do not switch apps and keep the screen bright while the iOS/iPad is syncing",
   "copyPlainText": "Copy plain text",
-  "findInDoc": "Match ${y} items in ${x} docs",
+  "findInDoc": "Matches ${y} blocks in ${x} documents",
   "jumpToParentNext": "Jump to the next block of the parent block",
   "jumpToParentPrev": "Jump to the previous block of the parent block",
   "jumpToParent": "Jump to parent block",
@@ -599,7 +609,7 @@
   "bootSyncFailed": "Failed to synchronize data at startup",
   "use": "Use",
   "uninstallTip": "Currently in use, please switch it in [Settings - Appearance] before uninstalling",
-  "safeQuit": "Exit the application",
+  "safeQuit": "Exit Application",
   "anchor": "Anchor",
   "showMore": "Show More",
   "refPopover": "Open in popover",
@@ -682,7 +692,6 @@
   "customEmoji": "Add custom emoji",
   "customEmojiTip": "Open <a href=\"javascript:void(0)\" id=\"appearanceOpenEmoji\">Emoji folder</a>, put the picture in and click the refresh button",
   "recentEmoji": "Common Emoticons",
-  "andSubFile": "and its <b>x</b> subdocs",
   "changeIcon": "Change icon",
   "addIcon": "Add icon",
   "includeSubFile": "\nInclude x subdocs",
@@ -1180,6 +1189,15 @@
   "spellcheckTip": "After enabling, the browser's built-in spell check function will be used. Currently, only English spell check is supported",
   "over": "over",
   "preview": "Export Preview",
+  "desktop": "Desktop",
+  "tablet": "Tablet",
+  "mobile": "Mobile",
+  "copyToWechatMP": "Copy to Wechat MP",
+  "copyToZhihu": "Copy to Zhihu",
+  "copyToYuque": "Copy to Yuque",
+  "pasteToWechatMP": "Copied, ready to paste to Wechat MP",
+  "pasteToZhihu": "Copied, ready to paste to Zhihu",
+  "pasteToYuque": "Copied, ready to paste to Yuque",
   "quote": "Blockquote",
   "startRecord": "Start Record",
   "endRecord": "End Record",
@@ -1292,7 +1310,7 @@
     "34": "This operation is not supported in read-only mode",
     "35": "Rebuilding index, please wait...",
     "36": "There is too much content in the historical document, in order not to affect performance, it has been switched to plain text display",
-    "37": "The name of the cloud sync directory (Bucket) should not contain spaces and special symbols, and the maximum length is 63 characters",
+    "37": "The cloud sync directory name (Bucket) cannot be empty, contain spaces or special symbols, and has a maximum length of 63 characters",
     "38": "Too many keywords mentioned [%d], adjust if necessary [Settings - Search - Backlink Mentions - Keyword Limit]",
     "39": "Deleting index %s",
     "40": "Inserting index %s",
@@ -1470,7 +1488,7 @@
     "212": "There are some defects in the current version of cloud data sync, please upgrade to the latest version. Sorry for the inconvenience",
     "213": "Cloud verification failed, please try to upgrade to the latest version and log in again before syncing",
     "214": "This function needs to be signed in and purchasing [PRO Features] or [Subscription] to use",
-    "215": "Save failed: The target file is being used by another program",
+    "215": "Please refer to the desktop user guide",
     "216": "Rebuilding asset content data index, please wait...",
     "217": "[%d/%d] Created asset content data index",
     "218": "Too many snapshots of the data repo have been detected, which slows down program startup and data sync. Please consider executing [Settings - About - Data repo purge]",
@@ -1495,13 +1513,14 @@
     "237": "[%d] marketplace packages have all been updated successfully",
     "238": "Marketplace package [%s] update failed, please try again later",
     "239": "Related operations are being processed, please try again later",
-    "240": "Drag heading under container blocks in the doc is not supported",
+    "240": "The current drag-and-drop heading is located in the container block and the drag-and-drop operation cannot be performed",
     "241": "Drag to its subheading is not supported",
     "242": "The binding block already exists in the current database",
     "243": "Only list the first [%d] tags (including subtags), if you need to adjust, please modify [Settings - Doc Tree - Maximum number to list]",
     "244": "It did not exit normally after the last use. It is recommended to execute [Doc Tree - Rebuild Index]. In the future, please exit the program completely before shutting down the computer",
     "245": "It did not exit normally after the last use. It is recommended to execute [Doc Tree - Rebuild Index]. In the future, please use [Exit Application] in the right panel to exit normally",
     "246": "The document title cannot contain / and has been replaced with _",
-    "247": "File [%s] is larger than the maximum limit [%s], and has been ignored for uploading to the cloud"
+    "247": "File [%s] is larger than the maximum limit [%s], and has been ignored for uploading to the cloud",
+    "248": "The target heading is located in the container block and cannot be used as a drop point"
   }
 }
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		shell-emulator=true
		virtual-store-dir-max-length=80