Merge pull request #828 from Hi-Windom/v0.35

V0.35

.github/CONTRIBUTING.md

@@ -14,10 +14,10 @@ Install pnpm: `npm install -g pnpm@9.1.1`
 
 Set the Electron mirror environment variable and install Electron:
 
-* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@28.3.3 -D`
+* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@31.0.1 -D`
 * Windows:
     * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
-    * `pnpm install electron@28.3.3 -D`
+    * `pnpm install electron@31.0.1 -D`
 
 NPM mirror:
 
@@ -28,7 +28,7 @@ NPM mirror:
 
 On the desktop, go to the app folder to run:
 
-* `pnpm install electron@28.3.3 -D`
+* `pnpm install electron@31.0.1 -D`
 * `pnpm run dev`
 * `pnpm run start`
 

.github/CONTRIBUTING_zh_CN.md

@@ -16,11 +16,11 @@
 
 * macOS/Linux: 
  ```
- ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@28.3.3 -D
+ ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@31.0.1 -D
  ```
 * Windows:
     * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
-    * `pnpm install electron@28.3.3 -D`
+    * `pnpm install electron@31.0.1 -D`
 
 NPM 镜像：
 
@@ -30,7 +30,7 @@ NPM 镜像：
 
 桌面端进入 app 文件夹运行：
 
-* `pnpm install electron@28.3.3 -D`
+* `pnpm install electron@31.0.1 -D`
 * `pnpm run dev`
 * `pnpm run start`
 

.vscode/extensions/Sillot/package.json

@@ -2,7 +2,7 @@
   "name": "sillot",
   "displayName": "汐洛 Sillot",
   "description": "汐洛彖夲肜矩阵（Sillot T☳Converbenk Matrix）为智慧新彖务服务。此插件为汐洛官方插件，提供多功能一体化集成。",
-  "version": "0.35.24061701",
+  "version": "0.35.24062101",
   "preview": true,
   "repository": "https://github.com/Hi-Windom/Sillot",
   "publisher": "Hi-Windom",

app/appearance/langs/en_US.json

@@ -703,7 +703,7 @@
   "closeNotebook": "Closed notebooks",
   "widget": "Widget",
   "customEmoji": "Add custom emoji",
-  "customEmojiTip": "Open <a href=\"javascript:void(0)\" id=\"appearanceOpenEmoji\">Emoji folder</a>, put the picture in and click the refresh button",
+  "customEmojiTip": "Put the images into the emojis folder, and use folders to classify them",
   "recentEmoji": "Common Emoticons",
   "changeIcon": "Change icon",
   "addIcon": "Add icon",
@@ -1141,6 +1141,7 @@
   "about10": "After enabling, it will automatically upload error information and diagnostic data through the <a href=\"https://sentry.io\" target=\"_blank\">Sentry</a> SDK, which does not involve personal privacy data so that developers can fix bugs. The application will be closed automatically after modification, please restart manually",
   "about11": "Network serving",
   "about12": "After enabling, other devices in the same LAN will be allowed to access. The application will be closed automatically after modification, please restart manually",
+  "about12Android": "After enabling, other devices in the same LAN will be allowed to access. In the Android application, in order to restart the kernel, other activities of Sillot will be killed. Please confirm that there is no unsaved content in other Sillot activities before restarting. ",
   "about13": "API token",
   "about14": "The token needs to be authenticated when calling the API<br>HTTP request header <code class=\"fn__code\">Authorization: token ${token}</code>",
   "about17": "Do not enable proxy when set to <code class='fn__code'>Direct connection</code>",
@@ -1380,7 +1381,7 @@
     "88": "Finished parsing [%d] data files, remaining to be processed [%d]",
     "89": "[%d/%d] Created [%d] of data indexes of block-level elements [%s]",
     "90": "[%d/%d] Created [%d] of search indexes of block-level elements [%s]",
-    "91": "Reading block tree data...",
+    "91": "TODO",
     "92": "Parsing document tree [%s]",
     "93": "[%d/%d] Cleaned up the index related to document [%s]",
     "94": "Upload failed: %s",

app/appearance/langs/es_ES.json

@@ -703,7 +703,7 @@
   "closeNotebook": "Cuadernos de notas cerrados",
   "widget": "Widget",
   "customEmoji": "Añadir un emoji personalizado",
-  "customEmojiTip": "Abrir <a href=\"javascript:void(0)\" id=\"appearanceOpenEmoji\">carpeta de emojis</a>, poner la imagen y hacer clic en el botón de actualización",
+  "customEmojiTip": "Coloca las imágenes en la carpeta de emojis y usa carpetas para clasificarlas",
   "recentEmoji": "Emoticonos comunes",
   "changeIcon": "Cambiar el icono",
   "addIcon": "Agregar icono",
@@ -1147,7 +1147,7 @@
   "about18": "Cuando se utiliza una dirección sin bucle invertido (<code class=\"fn__code\">127.0.0.1</code>/<code class=\"fn__code\">[::1]</code> ) Primero configure el Código de autorización de acceso",
   "checkUpdate": "Comprobar actualización",
   "currentVer": "Versión actual",
-  "downloadLatestVer": "<a href=\"https://b3log.org/siyuan/download.html\", target=\"_blank\">Descargar la última versión</a>",
+  "downloadLatestVer": "<a href=\"https://github.com/Hi-Windom/Sillot/releases\", target=\"_blank\">Descargar la última versión</a>",
   "themeLight": "Claro",
   "themeDark": "Oscuro",
   "themeOS": "Sigue el sistema",
@@ -1379,7 +1379,7 @@
     "88": "Se ha terminado de analizar [%d] archivos de datos, quedan por procesar [%d]",
     "89": "[%d/%d] Creado [%d] de índices de datos de elementos a nivel de bloque [%s]",
     "90": "[%d/%d] Creado [%d] de índices de búsqueda de elementos a nivel de bloque [%s]",
-    "91": "Leyendo datos del árbol de bloques...",
+    "91": "TODO",
     "92": "Analizando el árbol del documento [%s]",
     "93": "[%d/%d] ha limpiado el índice relacionado con el documento [%s]",
     "94": "Carga fallida: %s",

app/appearance/langs/fr_FR.json

@@ -703,7 +703,7 @@
   "closeNotebook": "Carnets fermés",
   "widget": "Widget",
   "customEmoji": "Ajouter un emoji personnalisé",
-  "customEmojiTip": "Ouvrir <a href=\"javascript:void(0)\" id=\"appearanceOpenEmoji\">Emoji folder</a>, insérez l'image et cliquez sur le bouton d'actualisation",
+  "customEmojiTip": "Mettez les images dans le dossier emojis et utilisez des dossiers pour les classer",
   "recentEmoji": "Emoticônes courantes",
   "changeIcon": "Changer l'icône",
   "addIcon": "Ajouter une icône",
@@ -1379,7 +1379,7 @@
     "88": "Fin de l'analyse des fichiers de données [%d], restant à traiter [%d]",
     "89": "[%d/%d] Créé [%d] d'index de données d'éléments de niveau bloc [%s]",
     "90": "[%d/%d] Création de [%d] index de recherche d'éléments de niveau bloc [%s]",
-    "91": "Lecture des données de l'arborescence des blocs...",
+    "91": "TODO",
     "92": "Analyse de l'arborescence du document [%s]",
     "93": "[%d/%d] a nettoyé l'index lié au document [%s]",
     "94": "Échec du téléchargement : %s",

app/appearance/langs/ja_JP.json

@@ -703,7 +703,7 @@
   "closeNotebook": "閉じたノートブック",
   "widget": "ウィジェット",
   "customEmoji": "絵文字を追加",
-  "customEmojiTip": "<a href=\"javascript:void(0)\" id=\"appearanceOpenEmoji\">絵文字フォルダ</a>に画像を入れて更新ボタンをクリックしてください",
+  "customEmojiTip": "画像を絵文字フォルダに入れて、フォルダを使用して分類します",
   "recentEmoji": "よく使う絵文字",
   "changeIcon": "アイコンを変更",
   "addIcon": "アイコンを追加",
@@ -1377,7 +1377,7 @@
     "88": "[%d] 個のデータファイルの解析が完了し、処理待ちのデータファイルが [%d] 個残っています",
     "89": "[%d/%d] ブロックレベル要素 [%s] のデータインデックスを [%d] 個作成しました",
     "90": "[%d/%d] ブロックレベル要素 [%s] の検索インデックスを [%d] 個作成しました",
-    "91": "ブロックツリーデータを読み込んでいます...",
+    "91": "TODO",
     "92": "ドキュメントツリーを解析しています [%s]",
     "93": "[%d/%d] ドキュメント [%s] に関連するインデックスをクリーンアップしました",
     "94": "アップロードに失敗しました: %s",

app/appearance/langs/zh_CHT.json

@@ -703,7 +703,7 @@
   "closeNotebook": "已關閉的筆記本",
   "widget": "小工具",
   "customEmoji": "新增自訂表情",
-  "customEmojiTip": "打開 <a href=\"javascript:void(0)\" id=\"appearanceOpenEmoji\">Emoji 資料夾</a> 放入圖片後並點擊重新整理按鈕",
+  "customEmojiTip": "將圖片放入 emojis 資料夾中，可使用資料夾進行分類",
   "recentEmoji": "常用表情",
   "changeIcon": "修改圖示",
   "addIcon": "新增圖示",
@@ -1147,7 +1147,7 @@
   "about18": "使用非環回地址（<code class=\"fn__code\">127.0.0.1</code>/<code class=\"fn__code\">[::1]</code>）時請先設置訪問授權碼",
   "checkUpdate": "檢查更新",
   "currentVer": "當前版本",
-  "downloadLatestVer": "<a href=\"https://b3log.org/siyuan/download.html\", target=\"_blank\">下載最新版</a>",
+  "downloadLatestVer": "<a href=\"https://github.com/Hi-Windom/Sillot/releases\", target=\"_blank\">下載最新版</a>",
   "themeLight": "淺色",
   "themeDark": "深色",
   "themeOS": "跟隨系統",
@@ -1379,7 +1379,7 @@
     "88": "已完成解析 [%d] 個資料文件，剩餘待處理 [%d]",
     "89": "[%d/%d] 已經創建 [%d] 個塊級元素的資料索引 [%s]",
     "90": "[%d/%d] 已經創建 [%d] 個塊級元素的搜索索引 [%s]",
-    "91": "正在讀取塊樹資料...",
+    "91": "TODO",
     "92": "正在解析文檔樹 [%s]",
     "93": "[%d/%d] 已經清理文檔 [%s] 相關的索引",
     "94": "上傳失敗：%s",

app/appearance/langs/zh_CN.json

@@ -704,7 +704,7 @@
   "closeNotebook": "已关闭的笔记本",
   "widget": "挂件",
   "customEmoji": "添加自定义表情",
-  "customEmojiTip": "打开 <a href=\"javascript:void(0)\" id=\"appearanceOpenEmoji\">Emoji 文件夹</a> 放入图片后并点击刷新按钮",
+  "customEmojiTip": "将图片放入 emojis 文件夹中，可使用文件夹进行分类",
   "recentEmoji": "常用表情",
   "changeIcon": "修改图标",
   "addIcon": "添加图标",
@@ -1142,13 +1142,14 @@
   "about10": "启用后会通过 <a href=\"https://sentry.io\" target=\"_blank\">Sentry</a> SDK 自动上传报错信息和诊断数据等不涉及个人隐私的数据，以便开发者修复缺陷。修改后会自动关闭应用，请手动重启",
   "about11": "网络伺服",
   "about12": "启用后将允许同一局域网内的其他设备进行访问。修改后不会自动关闭应用，请手动重启",
+  "about12Android": "启用后将允许同一局域网内的其他设备进行访问。安卓应用内为了重启内核，汐洛其他活动会被杀死，请确认重启前其他汐洛活动不存在未保存内容。",
   "about13": "API token",
   "about14": "调用 API 时需要通过该 token 进行鉴权<br>HTTP 请求标头 <code class=\"fn__code\">Authorization: token ${token}</code>",
   "about17": "设置为 <code class='fn__code'>直接连接</code> 时不启用代理",
   "about18": "未设置访问授权码时仅可通过环回地址（<code class=\"fn__code\">127.0.0.1</code>/<code class=\"fn__code\">[::1]</code>）访问",
   "checkUpdate": "检查更新",
   "currentVer": "当前版本",
-  "downloadLatestVer": "<a href=\"https://b3log.org/siyuan/download.html\", target=\"_blank\">下载最新版</a>",
+  "downloadLatestVer": "<a href=\"https://github.com/Hi-Windom/Sillot/releases\", target=\"_blank\">下载最新版</a>",
   "baseSY": "基于思源",
   "themeLight": "明亮",
   "themeDark": "暗黑",
@@ -1381,7 +1382,7 @@
     "88": "已完成解析 [%d] 个数据文件，剩余待处理 [%d]",
     "89": "[%d/%d] 已经创建 [%d] 个块级元素的数据索引 [%s]",
     "90": "[%d/%d] 已经创建 [%d] 个块级元素的搜索索引 [%s]",
-    "91": "正在读取块树数据...",
+    "91": "TODO",
     "92": "正在解析文档树 [%s]",
     "93": "[%d/%d] 已经清理文档 [%s] 相关的索引",
     "94": "上传失败：%s",