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 2022-09-09 10:10:50 +08:00
commit 348d1f7d82
7 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -836,7 +836,7 @@
"58": "After the index is rebuilt, the interface will be automatically refreshed later...",
"59": "Failed to set sync ignore list",
"60": "Failed to get the update package: %s",
"61": "⬆️ The new version installation package is ready, do you want to exit now and start installing the new version?",
"61": "⬆️ The new version installation package is ready, do you want to install the new version now?",
"62": "⬆️ The new version installation package is ready. When exiting, you will be asked whether to install the new version",
"63": "Recovering, please wait...",
"64": "There are [%d] files in total, it will take some time to index, please wait...",

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

@ -836,7 +836,7 @@
"58": "Después de reconstruir el índice, la interfaz se actualizará automáticamente más tarde...",
"59": " Falló la configuración de sincronización de la lista de ignorados",
"60": "Fallo al obtener el paquete de actualización: %s",
"61": "⬆️ El paquete de instalación de la nueva versión está listo, ¿quieres salir ahora y comenzar a instalar la nueva versión?",
"61": "⬆️ El paquete de instalación de la nueva versión está listo, ¿quieres instalar la nueva versión ahora?",
"62": "⬆️ El paquete de instalación de la nueva versión está listo. Al salir, se le preguntará si desea instalar la nueva versión",
"63": "Recuperando, por favor espere...",
"64": "Hay [%d] archivos en total, tardará un tiempo en indexarse, por favor espere...",

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

@ -836,7 +836,7 @@
"58": "Une fois l'index reconstruit, l'interface sera automatiquement rafraîchie ultérieurement...",
"59": "Échec de la définition de la liste des ignores de synchronisation",
"60": "Échec de la récupération du paquet de mise à jour : %s",
"61": "⬆️ Le package d'installation de la nouvelle version est prêt, voulez-vous quitter maintenant et commencer l'installation de la nouvelle version ?",
"61": "⬆️ Le package d'installation de la nouvelle version est prêt, voulez-vous installer la nouvelle version maintenant ?",
"62": "⬆️ Le package d'installation de la nouvelle version est prêt. En quittant, il vous sera demandé si vous souhaitez installer la nouvelle version",
"63": "Récupération, veuillez patienter...",
"64": "Il y a [%d] fichiers au total, l'indexation prendra un certain temps, veuillez patienter...",

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

@ -836,7 +836,7 @@
"58": "重建索引完畢，稍後將自動重新整理介面...",
"59": "設置同步忽略列表失敗",
"60": "獲取更新包失敗：%s",
"61": "⬆️ 新版本安裝包已經準備就緒，是否現在退出並開始安裝新版本？",
"61": "⬆️ 新版本安裝包已經準備就緒，是否現在安裝新版本？",
"62": "⬆️ 新版本安裝包已經準備就緒，退出時將詢問是否安裝新版本",
"63": "正在恢復，請稍等...",
"64": "共有檔 [%d] 個，需要一些時間進行索引，請稍等...",

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

@ -837,7 +837,7 @@
"58": "重建索引完毕，稍后将自动刷新界面...",
"59": "设置同步忽略列表失败",
"60": "获取更新包失败：%s",
"61": "⬆️ 新版本安装包已经准备就绪，是否现在退出并开始安装新版本？",
"61": "⬆️ 新版本安装包已经准备就绪，是否现在安装新版本？",
"62": "⬆️ 新版本安装包已经准备就绪，退出时将询问是否安装新版本",
"63": "正在恢复，请稍等...",
"64": "共有文件 [%d] 个，需要一些时间进行索引，请稍等...",

18
app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-h361q1i/20200924093441-ft2rhps.sy
View file

@ -6,7 +6,7 @@
"title": "Formatting elements",
"title-img": "background-color:#269;background-image: linear-gradient(white 2px, transparent 2px),linear-gradient(90deg, white 2px, transparent 2px),linear-gradient(rgba(255,255,255,.3) 1px, transparent 1px),linear-gradient(90deg, rgba(255,255,255,.3) 1px, transparent 1px);background-size: 100px 100px, 100px 100px, 20px 20px, 20px 20px;background-position:-2px -2px, -2px -2px, -1px -1px, -1px -1px;",
"type": "doc",
"updated": "20220828102624"
"updated": "20220909095340"
},
"Children": [
{
@ -2946,12 +2946,12 @@
]
},
{
"ID": "20210604230356-arowh1n",
"ID": "20220909095329-0tocxte",
"Type": "NodeIFrame",
"Data": "\u003ciframe src=\"https://player.bilibili.com/player.html?bvid=BV1kA411M7sJ\u0026amp;page=1\u0026amp;high_quality=1\u0026amp;as_wide=1\u0026amp;allowfullscreen=true\" data-src=\"\" scrolling=\"no\" border=\"0\" frameborder=\"no\" framespacing=\"0\" allowfullscreen=\"true\" sandbox=\"allow-top-navigation-by-user-activation allow-same-origin allow-forms allow-scripts allow-popups\" style=\"height: 360px; width: 640px;\"\u003e\u003c/iframe\u003e",
"Data": "\u003ciframe src=\"https://player.bilibili.com/player.html?aid=247401039\u0026amp;bvid=BV1ov41187qM\u0026amp;cid=319662466\u0026amp;page=1\" data-src=\"//player.bilibili.com/player.html?aid=247401039\u0026amp;bvid=BV1ov41187qM\u0026amp;cid=319662466\u0026amp;page=1\" scrolling=\"no\" border=\"0\" frameborder=\"no\" framespacing=\"0\" allowfullscreen=\"true\" style=\"width: 981px; height: 440px;\"\u003e\u003c/iframe\u003e",
"Properties": {
"id": "20210604230356-arowh1n",
"updated": "20210604230418"
"id": "20220909095329-0tocxte",
"updated": "20220909095329"
}
},
{
@ -2970,12 +2970,12 @@
]
},
{
"ID": "20210608121411-kozcesg",
"ID": "20220909095340-rr23xv7",
"Type": "NodeVideo",
"Data": "\u003cvideo controls=\"controls\" src=\"assets/formatting_elements-20210607225733-o1keasx.mp4\" data-src=\"assets/formatting_elements-20210607225733-o1keasx-20210608121411-e5qfbf8.mp4\" style=\"width: 260px; height: 187px;\"\u003e\u003c/video\u003e",
"Data": "\u003cvideo controls=\"controls\" src=\"assets/formatting_elements-20210607225733-o1keasx.mp4\" data-src=\"assets/formatting_elements-20210607213508-y2r3y55-20210608113914-q11ou4j.mp4\" style=\"width: 640px; height: 327px;\"\u003e\u003c/video\u003e",
"Properties": {
"id": "20210608121411-kozcesg",
"updated": "20210608121411"
"id": "20220909095340-rr23xv7",
"updated": "20220909095340"
}
},
{

18
app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226120854-dr1jfx2/20211226121319-emrk2yy.sy
View file

@ -5,7 +5,7 @@
"id": "20211226121319-emrk2yy",
"title": "排版元素",
"title-img": "background-color: hsl(2, 57%, 40%);background-image: repeating-linear-gradient(transparent, transparent 50px, rgba(0,0,0,.4) 50px, rgba(0,0,0,.4) 53px, transparent 53px, transparent 63px, rgba(0,0,0,.4) 63px, rgba(0,0,0,.4) 66px, transparent 66px, transparent 116px, rgba(0,0,0,.5) 116px, rgba(0,0,0,.5) 166px, rgba(255,255,255,.2) 166px, rgba(255,255,255,.2) 169px, rgba(0,0,0,.5) 169px, rgba(0,0,0,.5) 179px, rgba(255,255,255,.2) 179px, rgba(255,255,255,.2) 182px, rgba(0,0,0,.5) 182px, rgba(0,0,0,.5) 232px, transparent 232px),repeating-linear-gradient(270deg, transparent, transparent 50px, rgba(0,0,0,.4) 50px, rgba(0,0,0,.4) 53px, transparent 53px, transparent 63px, rgba(0,0,0,.4) 63px, rgba(0,0,0,.4) 66px, transparent 66px, transparent 116px, rgba(0,0,0,.5) 116px, rgba(0,0,0,.5) 166px, rgba(255,255,255,.2) 166px, rgba(255,255,255,.2) 169px, rgba(0,0,0,.5) 169px, rgba(0,0,0,.5) 179px, rgba(255,255,255,.2) 179px, rgba(255,255,255,.2) 182px, rgba(0,0,0,.5) 182px, rgba(0,0,0,.5) 232px, transparent 232px),repeating-linear-gradient(125deg, transparent, transparent 2px, rgba(0,0,0,.2) 2px, rgba(0,0,0,.2) 3px, transparent 3px, transparent 5px, rgba(0,0,0,.2) 5px);",
"updated": "20220828102621"
"updated": "20220909095422"
},
"Children": [
{
@ -2919,12 +2919,12 @@
]
},
{
"ID": "20211226122008-3ga1cqf",
"ID": "20220909095422-c32trma",
"Type": "NodeIFrame",
"Data": "\u003ciframe src=\"https://player.bilibili.com/player.html?bvid=BV1kA411M7sJ\u0026amp;page=1\u0026amp;high_quality=1\u0026amp;as_wide=1\u0026amp;allowfullscreen=true\" data-src=\"\" scrolling=\"no\" border=\"0\" frameborder=\"no\" framespacing=\"0\" allowfullscreen=\"true\" sandbox=\"allow-top-navigation-by-user-activation allow-same-origin allow-forms allow-scripts allow-popups\" style=\"height: 360px; width: 640px;\"\u003e\u003c/iframe\u003e",
"Data": "\u003ciframe src=\"https://player.bilibili.com/player.html?aid=247401039\u0026amp;bvid=BV1ov41187qM\u0026amp;cid=319662466\u0026amp;page=1\" data-src=\"//player.bilibili.com/player.html?aid=247401039\u0026amp;bvid=BV1ov41187qM\u0026amp;cid=319662466\u0026amp;page=1\" scrolling=\"no\" border=\"0\" frameborder=\"no\" framespacing=\"0\" allowfullscreen=\"true\" style=\"width: 981px; height: 440px;\"\u003e\u003c/iframe\u003e",
"Properties": {
"id": "20211226122008-3ga1cqf",
"updated": "20210604223359"
"id": "20220909095422-c32trma",
"updated": "20220909095422"
}
},
{
@ -2943,12 +2943,12 @@
]
},
{
"ID": "20211226122008-lt5e2r4",
"ID": "20220909095406-zjh29cs",
"Type": "NodeVideo",
"Data": "\u003cvideo controls=\"controls\" src=\"assets/formatting_elements-20210607225733-o1keasx.mp4\" data-src=\"assets/formatting_elements-20210607213508-y2r3y55-20210608113914-q11ou4j.mp4\" style=\"width: 360px; height: 267px;\"\u003e\u003c/video\u003e",
"Data": "\u003cvideo controls=\"controls\" src=\"assets/formatting_elements-20210607225733-o1keasx.mp4\" data-src=\"assets/formatting_elements-20210607213508-y2r3y55-20210608113914-q11ou4j.mp4\" style=\"width: 640px; height: 327px;\"\u003e\u003c/video\u003e",
"Properties": {
"id": "20211226122008-lt5e2r4",
"updated": "20211226122008"
"id": "20220909095406-zjh29cs",
"updated": "20220909095406"
}
},
{