Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-21 15:56:10 +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-20 12:26:30 +08:00
commit e3a33c3a21
8 changed files with 19 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -546,9 +546,9 @@
"useDefault": "Open with default program",
"previous": "Previous",
"next": "Next",
"kernelFault0": "Kernel connection interrupted...",
"kernelFault1": "Please check if the network connection and kernel process is normal",
"kernelFault2": "If the problem still occurs after restarting, please report it via <a href=\"https://github.com/siyuan-note/siyuan/issues\" target=\"_blank\">GitHub Issues</a>",
"kernelFault0": "Don't panic...",
"kernelFault1": "Your data should be safe, please check whether the network connection and kernel process are normal, and then restart SiYuan",
"kernelFault2": "If the problem persists, please look for help or report bugs <a href=\"https://github.com/siyuan-note/siyuan/issues\" target=\"_blank\">here</a>",
"fontSize": "Font Size",
"fontSizeTip": "The default font size is 16px, this setting affects the editor and exported PDF/HTML font size display",
"font1": "This setting only affects the font family display in the editor, choose <code class='fn__code'>Default</code> to use the theme&#039;s font family",

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

@ -546,9 +546,9 @@
"useDefault": "Abrir con el programa por defecto",
"previous": "Anterior",
"next": "Siguiente",
"kernelFault0": "Conexión del kernel interrumpida...",
"kernelFault1": "Verifique si la conexión de red y los procesos del kernel son normales",
"kernelFault2": "Si el problema sigue produciéndose después de reiniciar, comuníquelo a través de <a href=\"https://github.com/siyuan-note/siyuan/issues\" target=\"_blank\">Problemas en GitHub</a>",
"kernelFault0": "No entres en pánico...",
"kernelFault1": "Sus datos deben estar seguros, verifique si la conexión de red y el proceso del kernel son normales y luego reinicie SiYuan",
"kernelFault2": "Si el problema persiste, busque ayuda o informe de errores <a href=\"https://github.com/siyuan-note/siyuan/issues\" target=\"_blank\">aquí</a>",
"fontSize": "Tamaño de la fuente",
"fontSizeTip": "El tamaño de fuente predeterminado es 16px, esta configuración afecta el editor y la visualización del tamaño de fuente PDF/HTML exportado",
"font1": "Este ajuste sólo afecta a la visualización de la familia de fuentes en el editor, elija <code class='fn__code'>Por defecto</code> para utilizar la familia de fuentes del tema",

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

@ -545,9 +545,9 @@
"useDefault": "Ouvrir avec le programme par défaut",
"previous": "Précédent",
"next": "Prochain",
"kernelFault0": "Connexion au noyau interrompue...",
"kernelFault1": "Veuillez vérifier si la connexion réseau et les processus du noyau sont normaux",
"kernelFault2": "Si le problème persiste après le redémarrage, veuillez le signaler via <a href=\"https://github.com/siyuan-note/siyuan/issues\" target=\"_blank\">GitHub Issues</a>",
"kernelFault0": "Ne paniquez pas...",
"kernelFault1": "Vos données doivent être en sécurité, veuillez vérifier si la connexion réseau et le processus du noyau sont normaux, puis redémarrez SiYuan",
"kernelFault2": "Si le problème persiste, veuillez rechercher de l'aide ou signaler les bogues <a href=\"https://github.com/siyuan-note/siyuan/issues\" target=\"_blank\">ici</a>",
"fontSize": "Taille de la police",
"fontSizeTip": "La taille de police par défaut est de 16px, ce paramètre affecte l'éditeur et l'affichage de la taille de police PDF/HTML exportée",
"font1": "Ce paramètre n'affecte que l'affichage de la famille de polices dans l'éditeur, choisissez <code class='fn__code'>Default</code> pour utiliser la famille de polices du thème.",

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

@ -546,9 +546,9 @@
"useDefault": "使用預設程式打開",
"previous": "上一個",
"next": "下一個",
"kernelFault0": "kernel連接中斷...",
"kernelFault1": "請檢查網絡連接和內核進程是否正常",
"kernelFault2": "如果重啟後仍然出現該問題，請通過<a href=\"https://ld246.com/article/1649901726096\" target=\"_blank\">這裡回饋</a>",
"kernelFault0": "不要驚慌...",
"kernelFault1": "你的數據應該是安全的，請檢查網絡連接和內核進程是否正常，然後重新啟動思源",
"kernelFault2": "如果仍然出現該問題，請在<a href=\"https://ld246.com/article/1649901726096\" target=\"_blank\">這裡</a>尋求幫助或者報告缺陷",
"fontSize": "字型大小",
"fontSizeTip": "字號默認為 16px，該設置影響編輯器和導出 PDF/HTML 字體大小顯示",
"font1": "該設置僅影響編輯器內字體顯示，選擇 <code class='fn__code'>預設</code> 則使用主題自帶字體",

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

@ -546,9 +546,9 @@
"useDefault": "使用默认程序打开",
"previous": "上一个",
"next": "下一个",
"kernelFault0": "内核连接中断...",
"kernelFault1": "请检查网络连接和内核进程是否正常",
"kernelFault2": "如果重启后仍然出现该问题，请通过<a href=\"https://ld246.com/article/1649901726096\" target=\"_blank\">这里反馈</a>",
"kernelFault0": "不要惊慌...",
"kernelFault1": "你的数据应该是安全的，请检查网络连接和内核进程是否正常，然后重新启动思源",
"kernelFault2": "如果仍然出现该问题，请在<a href=\"https://ld246.com/article/1649901726096\" target=\"_blank\">这里</a>寻求帮助或者报告缺陷",
"fontSize": "字号",
"fontSizeTip": "字号默认为 16px，该设置影响编辑器和导出 PDF/HTML 字体大小显示",
"font1": "该设置仅影响编辑器内字体显示，选择 <code class='fn__code'>默认</code> 则使用主题自带字体",

2
app/stage/protyle/js/lute/lute.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
kernel/go.mod
View file

@ -6,7 +6,7 @@ require (
github.com/88250/clipboard v0.1.5
github.com/88250/css v0.1.2
github.com/88250/gulu v1.2.3-0.20230321113152-38c4a3d73c37
github.com/88250/lute v1.7.6-0.20230410031701-6a4620b2bb83
github.com/88250/lute v1.7.6-0.20230420041521-254a14e6b604
github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1
github.com/ClarkThan/ahocorasick v0.0.0-20230220142845-f237b6348b3e

2
kernel/go.sum
View file

@ -10,6 +10,8 @@ github.com/88250/gulu v1.2.3-0.20230321113152-38c4a3d73c37 h1:7ZMvlXDbH2sqaxowoA
github.com/88250/gulu v1.2.3-0.20230321113152-38c4a3d73c37/go.mod h1:pTWnjt+6qUqNnP9xltswsJxgCBVu3C7eW09u48LWX0k=
github.com/88250/lute v1.7.6-0.20230410031701-6a4620b2bb83 h1:OzqkeGCDjZ+vlgk0tTbMIhh8oVEK3Tt6lqzTsCsOqxM=
github.com/88250/lute v1.7.6-0.20230410031701-6a4620b2bb83/go.mod h1:+wUqx/1kdFDbWtxn9LYJlaCOAeol2pjSO6w+WJTVQsg=
github.com/88250/lute v1.7.6-0.20230420041521-254a14e6b604 h1:exMPD8kyMIcyj2BmVepsScEVokMnBjblLSrNViAFQXY=
github.com/88250/lute v1.7.6-0.20230420041521-254a14e6b604/go.mod h1:+wUqx/1kdFDbWtxn9LYJlaCOAeol2pjSO6w+WJTVQsg=
github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c h1:Dl/8S9iLyPMTElnWIBxmjaLiWrkI5P4a21ivwAn5pU0=
github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c/go.mod h1:S5YT38L/GCjVjmB4PB84PymA1qfopjEhfhTNQilLpv4=
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 h1:48T899JQDwyyRu9yXHePYlPdHtpJfrJEUGBMH3SMBWY=