diff --git a/README.md b/README.md index debb48898..96fcacf24 100644 --- a/README.md +++ b/README.md @@ -41,7 +41,7 @@ Welcome to [SiYuan English Discussion Forum](https://liuyun.io) to learn more. ### Free -All local features are free, even for commercial use. +Most features are free, even for commercial use. * Content block * Block-level reference and two-way links @@ -274,7 +274,7 @@ The first sub-block under the list item is the block icon omitted. You can move ### Do I need to pay for it? -All local features are free, even for commercial use. +Most features are free, even for commercial use. [Cloud Service](https://b3log.org/siyuan/en/pricing.html) require a paid subscription to use. diff --git a/README_zh_CN.md b/README_zh_CN.md index d03372a78..83e510021 100644 --- a/README_zh_CN.md +++ b/README_zh_CN.md @@ -42,7 +42,7 @@ ### 免费 -所有本地功能都是免费的，即使是在商业环境下使用。 +大部分功能是免费的，即使是在商业环境下使用。 * 内容块 * 块级引用和双向链接 @@ -279,7 +279,7 @@ ### 使用需要付费吗？ -所有本地功能都是免费的，即使是在商业环境下使用。 +大部分功能是免费的，即使是在商业环境下使用。 [云端服务](https://b3log.org/siyuan/pricing.html)需要年付订阅。 diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 63fcde474..45b0ada4a 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1,4 +1,5 @@ { + "inboxTip": "Open the user guide to search the inbox to view the instructions", "builtIn": "Built-in", "endDate": "End date", "needLogin": "This function needs to be logged in to use", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index adb676cb8..739937205 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1,4 +1,5 @@ { + "inboxTip": "Abra la guía del usuario para buscar en la bandeja de entrada y ver las instrucciones", "builtIn": "Incorporado", "endDate": "Fecha de finalización", "needLogin": "Esta función requiere iniciar sesión en la cuenta antes de poder usarla", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index b58378864..4ef4adc00 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1,4 +1,5 @@ { + "inboxTip": "Ouvrez le guide de l'utilisateur pour rechercher la boîte de réception afin d'afficher les instructions", "builtIn": "Intégré", "endDate": "Date de fin", "needLogin": "La fonctionnalité nécessite un numéro de compte de connexion avant de pouvoir être utilisée", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index d13e3670f..ea42daf66 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1,4 +1,5 @@ { + "inboxTip": "打開用戶指南搜索 收集箱 查看使用說明", "builtIn": "內置", "endDate": "結束日期", "needLogin": "該功能需要登錄賬號後才能使用", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index bc7f9e016..05eaa4298 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1,4 +1,5 @@ { + "inboxTip": "打开用户指南搜索 收集箱 查看使用说明", "builtIn": "内置", "endDate": "结束时间", "needLogin": "该功能需要登录账号后才能使用", diff --git a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0.sy b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0.sy index 8b8ce3d64..389d3f9a3 100644 --- a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0.sy +++ b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0.sy @@ -6,7 +6,7 @@ "icon": "1f308", "id": "20210808180303-v9awwp0", "title": "Cloud Services", - "updated": "20230627215230" + "updated": "20230802131124" }, "Children": [ { @@ -29,7 +29,7 @@ "ListData": {}, "Properties": { "id": "20230627215141-57hf66s", - "updated": "20230627215143" + "updated": "20230802131124" }, "Children": [ { @@ -93,6 +93,37 @@ } ] }, + { + "ID": "20230802131114-4anamcv", + "Type": "NodeListItem", + "ListData": { + "BulletChar": 42, + "Marker": "Kg==" + }, + "Properties": { + "id": "20230802131114-4anamcv", + "updated": "20230802131124" + }, + "Children": [ + { + "ID": "20230802131114-4qdgspb", + "Type": "NodeParagraph", + "Properties": { + "id": "20230802131114-4qdgspb", + "updated": "20230802131124" + }, + "Children": [ + { + "Type": "NodeTextMark", + "TextMarkType": "block-ref", + "TextMarkBlockRefID": "20230802114825-2jkkct7", + "TextMarkBlockRefSubtype": "s", + "TextMarkTextContent": "Inbox" + } + ] + } + ] + }, { "ID": "20230627215154-orvtmhs", "Type": "NodeListItem", diff --git a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20220105101227-n5zpr1a.sy b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20220105101227-n5zpr1a.sy index c0d894e6c..620e714f3 100644 --- a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20220105101227-n5zpr1a.sy +++ b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-v9awwp0/20220105101227-n5zpr1a.sy @@ -5,7 +5,7 @@ "Properties": { "id": "20220105101227-n5zpr1a", "title": "Limitations", - "updated": "20230526091133" + "updated": "20230526091044" }, "Children": [ { @@ -14,7 +14,7 @@ "ListData": {}, "Properties": { "id": "20220105101254-dhwb8a1", - "updated": "20230526091133" + "updated": "20230526091044" }, "Children": [ { @@ -139,7 +139,7 @@ }, "Properties": { "id": "20220105101254-fvel6pz", - "updated": "20230526091133" + "updated": "20230526091044" }, "Children": [ { @@ -178,7 +178,7 @@ "ListData": {}, "Properties": { "id": "20230526091044-hit1355", - "updated": "20230526091133" + "updated": "20230526091044" }, "Children": [ { @@ -209,34 +209,6 @@ } ] }, - { - "ID": "20230526091044-aw31eq1", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20230526091044-aw31eq1", - "updated": "20230526091044" - }, - "Children": [ - { - "ID": "20230526091044-czi0jwq", - "Type": "NodeParagraph", - "Properties": { - "id": "20230526091044-czi0jwq", - "updated": "20230526091044" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "2 days before the expiration date, a SMS reminder will be sent to the mobile phone bound to the account" - } - ] - } - ] - }, { "ID": "20230526091044-711agmy", "Type": "NodeListItem", diff --git a/app/guide/20210808180117-6v0mkxr/20200923234731-h3zkwm2.sy b/app/guide/20210808180117-6v0mkxr/20200923234731-h3zkwm2.sy index adba60b39..a2def240f 100644 --- a/app/guide/20210808180117-6v0mkxr/20200923234731-h3zkwm2.sy +++ b/app/guide/20210808180117-6v0mkxr/20200923234731-h3zkwm2.sy @@ -7,7 +7,7 @@ "id": "20200923234731-h3zkwm2", "title": "FAQ", "type": "doc", - "updated": "20230627215826" + "updated": "20230802130902" }, "Children": [ { @@ -1852,12 +1852,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20230406111519-ro0o3iv", - "updated": "20230406111521" + "updated": "20230802130902" }, "Children": [ { "Type": "NodeText", - "Data": "All local features are free, even for commercial use." + "Data": "Most features are free, even for commercial use." } ] }, diff --git a/app/guide/20210808180117-czj9bvb/20200813093015-u6bopdt.sy b/app/guide/20210808180117-czj9bvb/20200813093015-u6bopdt.sy index ea382a577..a67abb71f 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": "20230627214807" + "updated": "20230802131007" }, "Children": [ { @@ -1848,12 +1848,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20201224120447-xj9cd10", - "updated": "20230406111412" + "updated": "20230802131007" }, "Children": [ { "Type": "NodeText", - "Data": "所有本地功能都是免费的，即使是在商业环境下使用。" + "Data": "大部分功能是免费的，即使是在商业环境下使用。" } ] }, diff --git a/app/guide/20211226090932-5lcq56f/20211226115227-r1rty9v.sy b/app/guide/20211226090932-5lcq56f/20211226115227-r1rty9v.sy index 59ad8bc14..bf21e8646 100644 --- a/app/guide/20211226090932-5lcq56f/20211226115227-r1rty9v.sy +++ b/app/guide/20211226090932-5lcq56f/20211226115227-r1rty9v.sy @@ -6,7 +6,7 @@ "icon": "2753", "id": "20211226115227-r1rty9v", "title": "常見問題", - "updated": "20230630143055" + "updated": "20230802131043" }, "Children": [ { @@ -1845,12 +1845,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20230406111448-cuahrpa", - "updated": "20230406111448" + "updated": "20230802131043" }, "Children": [ { "Type": "NodeText", - "Data": "所有本地功能都是免費的，即使是在商業環境下使用。" + "Data": "大部分功能是免費的，即使是在商業環境下使用。" } ] }, diff --git a/app/src/layout/dock/Inbox.ts b/app/src/layout/dock/Inbox.ts index 98e8c5d32..b21c3ff09 100644 --- a/app/src/layout/dock/Inbox.ts +++ b/app/src/layout/dock/Inbox.ts @@ -301,7 +301,7 @@ ${(Lute.New()).MarkdownStr("", data.shorthandContent)} if (needSubscribe("")) { this.element.lastElementChild.innerHTML = `