Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-06 00:38:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
Vanessa 2023-04-29 10:35:42 +08:00
commit 8a851f69de
10 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -185,7 +185,7 @@ The data is saved in the workspace folder, in the workspace data folder:
* `assets` is used to save all inserted assets
* `emojis` is used to save emoji images
* `snippets` is used to save code snippets
* `storage` is used to save named criteria and flashcards, etc.
* `storage` is used to save query conditions, layouts and flashcards, etc.
* `templates` is used to save template snippets
* `widgets` is used to save widgets
* The rest of the folders are the notebook folders created by the user, files with the suffix of `.sy` in the notebook folder are used to save the document data, and the data format is JSON

2
README_zh_CN.md
View file

@ -196,7 +196,7 @@
* `assets` 用于保存所有插入的资源文件
* `emojis` 用于保存自定义图标表情图片
* `snippets` 用于保存代码片段
* `storage` 用于保存命名查询和闪卡数据等
* `storage` 用于保存查询条件、布局和闪卡数据等
* `templates` 用于保存模板片段
* `widgets` 用于保存挂件
* 其余文件夹就是用户自己创建的笔记本文件夹，笔记本文件夹下 `.sy` 后缀的文件用于保存文档数据，数据格式为 JSON

6
app/appearance/langs/en_US.json
View file

@ -103,9 +103,9 @@
"sortByContent": "Original content order",
"sortByRankDesc": "Relevance DESC",
"sortByRankAsc": "Relevance ASC",
"saveCriterion": "Save named criterion",
"useCriterion": "Use named criterion",
"removeCriterion": "Clear query conditions",
"saveCriterion": "Save query criteria",
"useCriterion": "Use query criteria",
"removeCriterion": "Remove query criteria",
"group": "Group",
"noGroupBy": "No grouping",
"groupByDoc": "Group by document",

6
app/appearance/langs/es_ES.json
View file

@ -103,9 +103,9 @@
"sortByContent": "Orden de contenido original",
"sortByRankDesc": "Relevancia DESC",
"sortByRankAsc": "Relevancia ASC",
"saveCriterion": "Guardar criterio nombrado",
"useCriterion": "Usar criterio con nombre",
"removeCriterion": "Borrar condiciones de consulta",
"saveCriterion": "Guardar criterios de consulta",
"useCriterion": "Usar criterios de consulta",
"removeCriterion": "Eliminar criterios de consulta",
"grupo": "Grupo",
"noGroupBy": "Sin agrupar",
"groupByDoc": "Agrupar por documento",

6
app/appearance/langs/fr_FR.json
View file

@ -103,9 +103,9 @@
"sortByContent": "Ordre du contenu original",
"sortByRankDesc": "DESC de pertinence",
"sortByRankAsc": "ASC de pertinence",
"saveCriterion": "Enregistrer le critère nommé",
"useCriterion": "Utiliser le critère nommé",
"removeCriterion": "Effacer les conditions de requête",
"saveCriterion": "Enregistrer les critères de requête",
"useCriterion": "Utiliser les critères de requête",
"removeCriterion": "Supprimer les critères de requête",
"groupe": "Groupe",
"noGroupBy": "Aucun regroupement",
"groupByDoc": "Regrouper par document",

4
app/appearance/langs/zh_CHT.json
View file

@ -103,8 +103,8 @@
"sortByContent": "按原文內容順序",
"sortByRankDesc": "按相關度降序",
"sortByRankAsc": "按相關度升序",
"saveCriterion": "保存命名查詢",
"useCriterion": "使用命名查詢",
"saveCriterion": "保存查詢條件",
"useCriterion": "使用查詢條件",
"removeCriterion": "清空查詢條件",
"group": "分組",
"noGroupBy": "不分組",

4
app/appearance/langs/zh_CN.json
View file

@ -103,8 +103,8 @@
"sortByContent": "按原文内容顺序",
"sortByRankDesc": "按相关度降序",
"sortByRankAsc": "按相关度升序",
"saveCriterion": "保存命名查询",
"useCriterion": "使用命名查询",
"saveCriterion": "保存查询条件",
"useCriterion": "使用查询条件",
"removeCriterion": "清空查询条件",
"group": "分组",
"noGroupBy": "不分组",

10
app/guide/20210808180117-6v0mkxr/20200923234731-h3zkwm2.sy
View file

@ -7,7 +7,7 @@
"id": "20200923234731-h3zkwm2",
"title": "FAQ",
"type": "doc",
"updated": "20230415112018"
"updated": "20230429085233"
},
"Children": [
{
@ -268,7 +268,7 @@
"ListData": {},
"Properties": {
"id": "20210428222603-moih9fe",
"updated": "20230103223700"
"updated": "20230429085233"
},
"Children": [
{
@ -398,7 +398,7 @@
},
"Properties": {
"id": "20221202214811-2s26txl",
"updated": "20230103223700"
"updated": "20230429085233"
},
"Children": [
{
@ -406,7 +406,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20221202214811-p1eevpi",
"updated": "20230103223700"
"updated": "20230429085233"
},
"Children": [
{
@ -420,7 +420,7 @@
},
{
"Type": "NodeText",
"Data": "​ is used to save named criteria and "
"Data": "​ is used to save query conditions, layouts and "
},
{
"Type": "NodeTextMark",

10
app/guide/20210808180117-czj9bvb/20200813093015-u6bopdt.sy
View file

@ -7,7 +7,7 @@
"id": "20200813093015-u6bopdt",
"title": "常见问题",
"type": "doc",
"updated": "20230415111915"
"updated": "20230429085021"
},
"Children": [
{
@ -365,7 +365,7 @@
"ListData": {},
"Properties": {
"id": "20210428213927-rbcfx2y",
"updated": "20230104134309"
"updated": "20230429085021"
},
"Children": [
{
@ -494,7 +494,7 @@
},
"Properties": {
"id": "20221202214653-s19pmcp",
"updated": "20230104134309"
"updated": "20230429085021"
},
"Children": [
{
@ -502,7 +502,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20221202214653-trmmieq",
"updated": "20230104134309"
"updated": "20230429085021"
},
"Children": [
{
@ -516,7 +516,7 @@
},
{
"Type": "NodeText",
"Data": "​ 用于保存命名查询和"
"Data": "​ 用于保存查询条件、布局和"
},
{
"Type": "NodeTextMark",

10
app/guide/20211226090932-5lcq56f/20211226115227-r1rty9v.sy
View file

@ -6,7 +6,7 @@
"icon": "2753",
"id": "20211226115227-r1rty9v",
"title": "常見問題",
"updated": "20230415112115"
"updated": "20230429085324"
},
"Children": [
{
@ -263,7 +263,7 @@
"ListData": {},
"Properties": {
"id": "20211226115356-i1v42hf",
"updated": "20230103223819"
"updated": "20230429085324"
},
"Children": [
{
@ -391,7 +391,7 @@
},
"Properties": {
"id": "20221202215226-ibnf53j",
"updated": "20230103223819"
"updated": "20230429085324"
},
"Children": [
{
@ -399,7 +399,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20221202215226-n689p7u",
"updated": "20230103223819"
"updated": "20230429085324"
},
"Children": [
{
@ -413,7 +413,7 @@
},
{
"Type": "NodeText",
"Data": "​ 用於保存命名查詢和"
"Data": "​​ 用於保存查詢條件、佈局和"
},
{
"Type": "NodeTextMark",