0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vanessa 2024-11-29 07:46:07 +08:00
commit 363bd008cc
8 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -602,7 +602,7 @@
"querySyntax": "Syntaxe de la requête",
"rollback": "Rollback",
"custom": "Personnalisé",
"feedback": "Commentaires",
"feedback": "Retour d'information",
"inbox": "Boîte de réception",
"turnToStatic": "Texte d'ancrage statique",
"turnToDynamic": "Texte d'ancrage dynamique",

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

@ -603,7 +603,7 @@
"querySyntax": "查詢語法",
"rollback": "回復",
"custom": "自定義",
"feedback": "反饋",
"feedback": "問題反饋",
"inbox": "收件箱",
"turnToStatic": "靜態錨文字",
"turnToDynamic": "動態錨文字",

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

@ -603,7 +603,7 @@
"querySyntax": "查询语法",
"rollback": "回滚",
"custom": "自定义",
"feedback": "反馈",
"feedback": "问题反馈",
"inbox": "收集箱",
"turnToStatic": "静态锚文本",
"turnToDynamic": "动态锚文本",

2
app/src/config/about.ts
View file

@ -216,7 +216,7 @@ ${checkUpdateHTML}
<span style="color:var(--b3-theme-background);font-family: cursive;">会泽百家&nbsp;至公天下</span>
</div>
<div class='fn__hr'></div>
${window.siyuan.languages.about1}
${window.siyuan.languages.about1} ${"harmony" === window.siyuan.config.system.container? " • " + window.siyuan.languages.feedback + " 845765@qq.com" : ""}
</div>`;
},
bindEvent: () => {

2
app/src/mobile/settings/about.ts
View file

@ -169,7 +169,7 @@ export const initAbout = () => {
</div>
</div>
<div style="color:var(--b3-theme-surface);font-family: cursive;">会泽百家&nbsp;至公天下</div>
${window.siyuan.languages.about1}
${window.siyuan.languages.about1} ${"harmony" === window.siyuan.config.system.container? " • " + window.siyuan.languages.feedback + " 845765@qq.com" : ""}
</div>
</div>`,
bindEvent(modelMainElement: HTMLElement) {

4
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

@ -10,7 +10,7 @@ require (
github.com/88250/epub v0.0.0-20230830085737-c19055cd1f48
github.com/88250/go-humanize v0.0.0-20240424102817-4f78fac47ea7
github.com/88250/gulu v1.2.3-0.20241127120230-1ae6a9868a2d
github.com/88250/lute v1.7.7-0.20241127031345-f772b0ee2be8
github.com/88250/lute v1.7.7-0.20241128155138-47c361d8b543
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1
github.com/ClarkThan/ahocorasick v0.0.0-20231011042242-30d1ef1347f4
github.com/ConradIrwin/font v0.0.0-20240627033111-8567075b2bfe

4
kernel/go.sum
View file

@ -14,8 +14,8 @@ github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950 h1:Pa5hMiBceT
github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/88250/gulu v1.2.3-0.20241127120230-1ae6a9868a2d h1:dexFyk3UkR4c2xpyrC4Zk4L28xFbfLYAeowIW/7QYEA=
github.com/88250/gulu v1.2.3-0.20241127120230-1ae6a9868a2d/go.mod h1:MUfzyfmbPrRDZLqxc7aPrVYveatTHRfoUa5TynPS0i8=
github.com/88250/lute v1.7.7-0.20241127031345-f772b0ee2be8 h1:1gWOQT9m2o3E6X//wvI+bexbXgdHheN6YUZcABHMm4k=
github.com/88250/lute v1.7.7-0.20241127031345-f772b0ee2be8/go.mod h1:VDAzL8b+oCh+e3NAlmwwLzC53ten0rZlS8NboB7ljtk=
github.com/88250/lute v1.7.7-0.20241128155138-47c361d8b543 h1:5SfFNVikY3HeOzqJktgUWGbyJWAkbsJNr/K/wFs8wiY=
github.com/88250/lute v1.7.7-0.20241128155138-47c361d8b543/go.mod h1:VDAzL8b+oCh+e3NAlmwwLzC53ten0rZlS8NboB7ljtk=
github.com/88250/pdfcpu v0.3.14-0.20241128123312-a688ff960d4f h1:oUW8FPgQ/RQzDG3nll1Qe3FfmBvelxjDkNNipF1ntck=
github.com/88250/pdfcpu v0.3.14-0.20241128123312-a688ff960d4f/go.mod h1:fVfOloBzs2+W2VJCCbq60XIxc3yJHAZ0Gahv1oO0gyI=
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 h1:48T899JQDwyyRu9yXHePYlPdHtpJfrJEUGBMH3SMBWY=