diff --git a/README_zh_CN.md b/README_zh_CN.md index 84a11b898..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/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, diff --git a/app/guide/20210808180117-czj9bvb/20200813093015-u6bopdt.sy b/app/guide/20210808180117-czj9bvb/20200813093015-u6bopdt.sy index 256665d35..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": "20221031001420" + "updated": "20221107103705" }, "Children": [ { @@ -30,12 +30,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20221031001314-v5a3pa8", - "updated": "20221031001420" + "updated": "20221107103705" }, "Children": [ { "Type": "NodeText", - "Data": "详情请看" + "Data": "以前不会、现在不会,将来也不会。详情请看" }, { "Type": "NodeTextMark",