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

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

Browse source
This commit is contained in:
Vanessa 2023-04-28 17:00:25 +08:00
commit 76c67daaf4
8 changed files with 44 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -97,7 +97,7 @@
"riffCard": "Flashcard",
"compare": "Compare",
"switchTab": "Switcher",
"recentDocs": "Recently opened documents",
"recentDocs": "Recent documents",
"autoLaunch": "Automatic launch at boot",
"autoLaunchTip": "After enabling, the application will be automatically launched after logging into the operating system",
"sortByContent": "Original content order",

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

@ -97,7 +97,7 @@
"riffCard": "Tarjeta Flash",
"comparar": "Comparar",
"switchTab": "Conmutador",
"recentDocs": "Documentos abiertos recientemente",
"recentDocs": "Documentos recientes",
"autoLaunch": "Inicio automático al arrancar",
"autoLaunchTip": "Después de habilitar, la aplicación se iniciará automáticamente después de iniciar sesión en el sistema operativo",
"sortByContent": "Orden de contenido original",

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

@ -97,7 +97,7 @@
"riffCard": "Carte flash",
"comparer": "Comparer",
"switchTab": "Commutateur",
"recentDocs": "Documents récemment ouverts",
"recentDocs": "Documents récents",
"autoLaunch": "Lancement automatique au démarrage",
"autoLaunchTip": "Après l'activation, l'application sera automatiquement lancée après la connexion au système d'exploitation",
"sortByContent": "Ordre du contenu original",

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

@ -97,7 +97,7 @@
"riffCard": "閃卡",
"compare": "比較",
"switchTab": "頁籤切換",
"recentDocs": "最近打開的文檔",
"recentDocs": "最近的文檔",
"autoLaunch": "開機自動啟動",
"autoLaunchTip": "啟用後會在登錄操作系統後自動啟動應用",
"sortByContent": "按原文內容順序",

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

@ -97,7 +97,7 @@
"riffCard": "闪卡",
"compare": "比较",
"switchTab": "页签切换",
"recentDocs": "最近打开的文档",
"recentDocs": "最近的文档",
"autoLaunch": "开机自动启动",
"autoLaunchTip": "启用后会在登录操作系统后自动启动应用",
"sortByContent": "按原文内容顺序",

26
app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p.sy
View file

@ -8,7 +8,7 @@
"title": "Please Start Here",
"title-img": "background-color:#556;background-image: linear-gradient(30deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(150deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(30deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(150deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(60deg, #99a 25%, transparent 25.5%, transparent 75%, #99a 75%, #99a),linear-gradient(60deg, #99a 25%, transparent 25.5%, transparent 75%, #99a 75%, #99a);background-size:80px 140px;background-position: 0 0, 0 0, 40px 70px, 40px 70px, 0 0, 40px 70px;",
"type": "doc",
"updated": "20210428231747"
"updated": "20230428165320"
},
"Children": [
{
@ -83,7 +83,7 @@
"Type": "NodeSuperBlock",
"Properties": {
"id": "20210528120135-bznvpp6",
"updated": "20210528120213"
"updated": "20230428165320"
},
"Children": [
{
@ -98,8 +98,7 @@
"Type": "NodeSuperBlock",
"Properties": {
"id": "20210528120142-hprb4ja",
"style": "width: 62%; flex: 0 0 auto;",
"updated": "20210502233931"
"updated": "20230428165320"
},
"Children": [
{
@ -130,7 +129,7 @@
"ListData": {},
"Properties": {
"id": "20201225220954-dlgzk1o",
"updated": "20210502233931"
"updated": "20230428165320"
},
"Children": [
{
@ -168,7 +167,7 @@
},
"Properties": {
"id": "20201225220954-ygz217h",
"updated": "20211205193627"
"updated": "20230428165320"
},
"Children": [
{
@ -176,7 +175,7 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20210131161940-eo0riwq",
"updated": "20211205193627"
"updated": "20230428165320"
},
"Children": [
{
@ -190,7 +189,15 @@
},
{
"Type": "NodeText",
"Data": " in the editor to trigger the function menu"
"Data": "​​ in the "
},
{
"Type": "NodeText",
"Data": "editor"
},
{
"Type": "NodeText",
"Data": " to trigger the function menu"
}
]
}
@ -391,7 +398,7 @@
"Type": "NodeSuperBlock",
"Properties": {
"id": "20210528120236-zyh2t7d",
"updated": "20210428231747"
"updated": "20210528120311"
},
"Children": [
{
@ -406,7 +413,6 @@
"Type": "NodeSuperBlock",
"Properties": {
"id": "20210528120311-ys4nmlw",
"style": "width: 62%; flex: 0 0 auto;",
"updated": "20210428231747"
},
"Children": [

24
app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa.sy
View file

@ -8,7 +8,7 @@
"title": "请从这里开始",
"title-img": "background-color:#556;background-image: linear-gradient(30deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(150deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(30deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(150deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(60deg, #99a 25%, transparent 25.5%, transparent 75%, #99a 75%, #99a),linear-gradient(60deg, #99a 25%, transparent 25.5%, transparent 75%, #99a 75%, #99a);background-size:80px 140px;background-position: 0 0, 0 0, 40px 70px, 40px 70px, 0 0, 40px 70px;",
"type": "doc",
"updated": "20230428162620"
"updated": "20230428165309"
},
"Children": [
{
@ -83,7 +83,7 @@
"Type": "NodeSuperBlock",
"Properties": {
"id": "20210528115012-vst5lwt",
"updated": "20210528115021"
"updated": "20230428165309"
},
"Children": [
{
@ -98,8 +98,7 @@
"Type": "NodeSuperBlock",
"Properties": {
"id": "20210528115021-oj6gzg7",
"style": "width: 50%; flex: 0 0 auto;",
"updated": "20210502233951"
"updated": "20230428165309"
},
"Children": [
{
@ -130,7 +129,7 @@
"ListData": {},
"Properties": {
"id": "20201225220955-l154bn4",
"updated": "20210502233951"
"updated": "20230428165309"
},
"Children": [
{
@ -169,7 +168,7 @@
},
"Properties": {
"id": "20201225220955-uwhqnug",
"updated": "20211205193639"
"updated": "20230428165309"
},
"Children": [
{
@ -177,20 +176,12 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20210131155408-btnfw88",
"updated": "20211205193639"
"updated": "20230428165309"
},
"Children": [
{
"Type": "NodeText",
"Data": "在"
},
{
"Type": "NodeText",
"Data": "编辑器"
},
{
"Type": "NodeText",
"Data": "中输入 "
"Data": "在编辑器中输入 "
},
{
"Type": "NodeTextMark",
@ -415,7 +406,6 @@
"Type": "NodeSuperBlock",
"Properties": {
"id": "20210528115306-kftajae",
"style": "width: 50%; flex: 0 0 auto;",
"updated": "20210601234211"
},
"Children": [

26
app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq.sy
View file

@ -7,7 +7,7 @@
"id": "20211226115423-d5z1joq",
"title": "請從這裡開始",
"title-img": "background-color:#556;background-image: linear-gradient(30deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(150deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(30deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(150deg, #445 12%, transparent 12.5%, transparent 87%, #445 87.5%, #445),linear-gradient(60deg, #99a 25%, transparent 25.5%, transparent 75%, #99a 75%, #99a),linear-gradient(60deg, #99a 25%, transparent 25.5%, transparent 75%, #99a 75%, #99a);background-size:80px 140px;background-position: 0 0, 0 0, 40px 70px, 40px 70px, 0 0, 40px 70px;",
"updated": "20230428162727"
"updated": "20230428165314"
},
"Children": [
{
@ -82,7 +82,7 @@
"Type": "NodeSuperBlock",
"Properties": {
"id": "20211226115745-rorv31l",
"updated": "20211226115745"
"updated": "20230428165314"
},
"Children": [
{
@ -97,8 +97,7 @@
"Type": "NodeSuperBlock",
"Properties": {
"id": "20211226115745-mwd9by9",
"style": "width: 70%; flex: 0 0 auto;",
"updated": "20211228143127"
"updated": "20230428165314"
},
"Children": [
{
@ -129,7 +128,7 @@
"ListData": {},
"Properties": {
"id": "20211226115745-f8vrixq",
"updated": "20211228143127"
"updated": "20230428165314"
},
"Children": [
{
@ -169,7 +168,7 @@
},
"Properties": {
"id": "20211226115745-uxdpk9r",
"updated": "20211225212507"
"updated": "20230428165314"
},
"Children": [
{
@ -177,12 +176,20 @@
"Type": "NodeParagraph",
"Properties": {
"id": "20211226115745-dsexy7c",
"updated": "20211225212507"
"updated": "20230428165314"
},
"Children": [
{
"Type": "NodeText",
"Data": "在編輯器中輸入 "
"Data": "在"
},
{
"Type": "NodeText",
"Data": "編輯器"
},
{
"Type": "NodeText",
"Data": "中輸入 "
},
{
"Type": "NodeTextMark",
@ -191,7 +198,7 @@
},
{
"Type": "NodeText",
"Data": " 觸發功能菜單"
"Data": "​​ 觸發功能菜單"
}
]
}
@ -408,7 +415,6 @@
"Type": "NodeSuperBlock",
"Properties": {
"id": "20211226115745-7bnqf8y",
"style": "width: 70%; flex: 0 0 auto;",
"updated": "20211226115745"
},
"Children": [