From 709f8a5694d6fe6732801bbabe757664d57b8baf Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Mon, 7 Nov 2022 10:36:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?:memo:=20=E6=9B=B4=E6=96=B0=20FAQ?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README_zh_CN.md | 2 +- app/guide/20210808180117-czj9bvb/20200813093015-u6bopdt.sy | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README_zh_CN.md b/README_zh_CN.md index 84a11b898..df103f040 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -164,7 +164,7 @@ ### 听说思源笔记会通过用户电脑挖矿？ -详情请看[如何评价思源笔记? - 知乎](https://www.zhihu.com/question/434530733/answer/2644563326)。 +以前没有、现在没有，将来也不会有。详情请看[如何评价思源笔记? - 知乎](https://www.zhihu.com/question/434530733/answer/2644563326)。 ### 思源适合我吗？或者说我应该如何选择笔记软件？ diff --git a/app/guide/20210808180117-czj9bvb/20200813093015-u6bopdt.sy b/app/guide/20210808180117-czj9bvb/20200813093015-u6bopdt.sy index 256665d35..62a5076b2 100644 --- a/app/guide/20210808180117-czj9bvb/20200813093015-u6bopdt.sy +++ b/app/guide/20210808180117-czj9bvb/20200813093015-u6bopdt.sy @@ -7,7 +7,7 @@ "id": "20200813093015-u6bopdt", "title": "常见问题", "type": "doc", - "updated": "20221031001420" + "updated": "20221107103424" }, "Children": [ { @@ -30,12 +30,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20221031001314-v5a3pa8", - "updated": "20221031001420" + "updated": "20221107103424" }, "Children": [ { "Type": "NodeText", - "Data": "详情请看" + "Data": "以前没有、现在没有，将来也不会有。详情请看" }, { "Type": "NodeTextMark", From afa8aed17245bca4f8d0c0089a7a6e5dc8b1698c Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Mon, 7 Nov 2022 10:37:29 +0800 Subject: [PATCH 2/3] =?UTF-8?q?:memo:=20=E6=9B=B4=E6=96=B0=20FAQ?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README_zh_CN.md | 2 +- app/guide/20210808180117-czj9bvb/20200813093015-u6bopdt.sy | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README_zh_CN.md b/README_zh_CN.md index df103f040..29f7db6f0 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -164,7 +164,7 @@ ### 听说思源笔记会通过用户电脑挖矿？ -以前没有、现在没有，将来也不会有。详情请看[如何评价思源笔记? - 知乎](https://www.zhihu.com/question/434530733/answer/2644563326)。 +以前不会、现在不会，将来也不会。详情请看[如何评价思源笔记? - 知乎](https://www.zhihu.com/question/434530733/answer/2644563326)。 ### 思源适合我吗？或者说我应该如何选择笔记软件？ diff --git a/app/guide/20210808180117-czj9bvb/20200813093015-u6bopdt.sy b/app/guide/20210808180117-czj9bvb/20200813093015-u6bopdt.sy index 62a5076b2..099100a4b 100644 --- a/app/guide/20210808180117-czj9bvb/20200813093015-u6bopdt.sy +++ b/app/guide/20210808180117-czj9bvb/20200813093015-u6bopdt.sy @@ -7,7 +7,7 @@ "id": "20200813093015-u6bopdt", "title": "常见问题", "type": "doc", - "updated": "20221107103424" + "updated": "20221107103705" }, "Children": [ { @@ -30,12 +30,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20221031001314-v5a3pa8", - "updated": "20221107103424" + "updated": "20221107103705" }, "Children": [ { "Type": "NodeText", - "Data": "以前没有、现在没有，将来也不会有。详情请看" + "Data": "以前不会、现在不会，将来也不会。详情请看" }, { "Type": "NodeTextMark", From 56c671b0a85258351db192d430e0a6017d5e4a64 Mon Sep 17 00:00:00 2001 From: Liang Ding Date: Mon, 7 Nov 2022 15:16:06 +0800 Subject: [PATCH 3/3] =?UTF-8?q?:bug:=20macOS=20=E7=AB=AF=E6=8A=A5=E9=94=99?= =?UTF-8?q?=20`=E6=95=B0=E6=8D=AE=E5=BA=93=E8=A2=AB=E9=94=81=E5=AE=9A`=20F?= =?UTF-8?q?ix=20https://github.com/siyuan-note/siyuan/issues/6492?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/electron/main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/electron/main.js b/app/electron/main.js index aed57b04f..d7f912c7d 100644 --- a/app/electron/main.js +++ b/app/electron/main.js @@ -560,7 +560,7 @@ const initKernel = (initData) => { switch (code) { case 20: showErrorWindow('⚠️ 数据库被锁定 The database is locked', - `
数据库文件正在被其他程序锁定。如果你使用了第三方同步盘，请在思源运行期间关闭同步。
The database file is being locked by another program. If you use a third-party sync disk, please turn off sync while SiYuan is running.
`) + `
数据库文件正在被其他进程占用，请检查是否同时存在多个内核进程（SiYuan Kernel）。
The database file is being occupied by other processes, please check whether there are multiple kernel processes (SiYuan Kernel) at the same time.
`) break case 21: showErrorWindow('⚠️ 监听端口 ' + kernelPort + ' 失败 Failed to listen to port ' + kernelPort,