Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/master'
Browse files Browse the repository at this point in the history
  • Loading branch information
Zuoqiu-Yingyi committed Mar 26, 2024
2 parents a0a81f3 + 925102e commit 666a9e3
Show file tree
Hide file tree
Showing 124 changed files with 4,192 additions and 1,090 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/dockerimage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@ jobs:

- name: Build the Docker image
run: |
docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8 -t b3log/siyuan:latest -t b3log/siyuan:v3.0.4 .
docker buildx build --push --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v8 -t b3log/siyuan:latest -t b3log/siyuan:v3.0.5 .
31 changes: 20 additions & 11 deletions app/appearance/langs/en_US.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
{
"removeCol": "Are you sure you want to delete the ${x} column in the database?",
"video": "Video",
"audio": "Audio",
"updateAll": "Update all",
"confirmUpdateAll": "Are you sure you want to update all?",
"confirmUpdate": "Are you sure you want to update?",
"insertRowBefore": "Insert rows ${x} above",
"insertRowAfter": "Insert rows ${x} below",
"setDueTime": "Set expiration time",
"showCardDay": "After how many days do you want to show the card?",
"forgetCount": "Forget to count",
Expand Down Expand Up @@ -295,6 +303,10 @@
"apiModelTip": "The <code class='fn__code'>model</code> parameter passed in when requesting the API is used to control the generated text style (the Deployment ID needs to be filled in when using the Azure OpenAI service)",
"apiMaxTokens": "Maximum number of Tokens",
"apiMaxTokensTip": "The <code class='fn__code'>max_tokens</code> parameter passed in when requesting the API is used to control the length of the generated text",
"apiTemperature": "Temperature",
"apiTemperatureTip": "The <code class='fn__code'>temperature</code> parameter passed in when requesting the API is used to control the randomness of the generated text",
"apiMaxContexts": "Maximum number of contexts",
"apiMaxContextsTip": "The maximum number of contexts passed in when requesting the API",
"apiBaseURL": "API Base URL",
"apiBaseURLTip": "The base address of the request, such as <code class='fn__code'>https://api.openai.com/v1</code>",
"apiUserAgentTip": "The user agent that initiated the request, that is, the HTTP header <code class='fn__code'>User-Agent</code>",
Expand All @@ -309,14 +321,6 @@
"aiContinueWrite": "Continue writing",
"aiTranslate": "Translate",
"aiExtractSummary": "Extract summary",
"aiTranslate_zh_Hans": "Simplified Chinese",
"aiTranslate_zh_Hant": "Traditional Chinese",
"aiTranslate_ja_JP": "Japanese",
"aiTranslate_ko_KR": "Korean",
"aiTranslate_en_US": "English",
"aiTranslate_es_ES": "Spanish",
"aiTranslate_fr_FR": "French",
"aiTranslate_de_DE": "German",
"aiBrainStorm": "Brainstorm",
"aiFixGrammarSpell": "Fix grammar, spelling and typos",
"aiCustomAction": "Custom action...",
Expand Down Expand Up @@ -1205,7 +1209,8 @@
},
"_attrView": {
"table": "Table",
"key": "Primary Key"
"key": "Primary Key",
"select": "Select"
},
"_kernel": {
"0": "Query notebook failed",
Expand Down Expand Up @@ -1313,7 +1318,7 @@
"102": "Processing completed",
"103": "The update installation package has been automatically downloaded in the background. When exiting, you will be asked whether to install the new version",
"104": "The update installation package failed to download, please check the network connection",
"105": "TODO",
"105": "Untitled",
"106": "Maximum length is limited to 512 characters",
"107": "Moved document [%s]",
"108": "Data sync found conflicts, you can view the generated conflict content in [Data History]",
Expand Down Expand Up @@ -1442,6 +1447,10 @@
"231": "Deleting unreferenced data objects in cloud storage...",
"232": "The cloud data storage has been purged. [%d] snapshots and [%d] data objects have been deleted, and a total of [%s] disk space has been released",
"233": "Closing user guide...",
"234": "[%d/%d] Updated [%d] of readable paths of doc [%s]"
"234": "[%d/%d] Updated [%d] of readable paths of doc [%s]",
"235": "[%d/%d] is updating the marketplace package...",
"236": "[%d/%d] is updating the marketplace package [%s]...",
"237": "[%d] marketplace packages have all been updated successfully",
"238": "Marketplace package [%s] update failed, please try again later"
}
}
37 changes: 23 additions & 14 deletions app/appearance/langs/es_ES.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
{
"removeCol": "¿Está seguro de que desea eliminar la columna ${x} en la base de datos?",
"vídeo": "Vídeo",
"audio": "Audio",
"updateAll": "Actualizar todo",
"confirmUpdateAll": "¿Estás seguro de que deseas actualizar todo?",
"confirmUpdate": "¿Estás seguro de que deseas actualizar?",
"insertRowBefore": "Insertar filas ${x} arriba",
"insertRowAfter": "Insertar filas ${x} debajo",
"setDueTime": "Establecer tiempo de vencimiento",
"showCardDay": "¿Después de cuántos días deseas mostrar la tarjeta?",
"forgetCount": "Olvídate de contar",
Expand Down Expand Up @@ -295,6 +303,10 @@
"apiModelTip": "El parámetro <code class='fn__code'>model</code> pasado al solicitar la API se usa para controlar el estilo del texto generado (el ID de implementación debe completarse cuando se usa el servicio Azure OpenAI)",
"apiMaxTokens": "Número máximo de tokens",
"apiMaxTokensTip": "El parámetro <code class='fn__code'>max_tokens</code> que se pasa al solicitar la API se usa para controlar la longitud del texto generado",
"apiTemperature": "Temperatura",
"apiTemperatureTip": "El parámetro <code class='fn__code'>temperature</code> pasado al solicitar la API se utiliza para controlar la aleatoriedad del texto generado",
"apiMaxContexts": "Número máximo de contextos",
"apiMaxContextsTip": "El número máximo de contextos pasados ​​al solicitar la API",
"apiBaseURL": "URL base de la API",
"apiBaseURLTip": "La dirección base de la solicitud, como <code class='fn__code'>https://api.openai.com/v1</code>",
"apiUserAgentTip": "El agente de usuario que inició la solicitud, es decir, el encabezado HTTP <code class='fn__code'>User-Agent</code>",
Expand All @@ -304,19 +316,11 @@
"apiProviderTip": "Utilice el proveedor de API seleccionado para implementar funciones relacionadas con la IA",
"skip": "barco",
"nextRound": "Siguiente ronda",
"save": "Ahorrar",
"save": "Guardar",
"ai": "Inteligencia Artificial",
"aiContinueWrite": "Continuar escribiendo",
"aiTranslate": "Traducir",
"aiExtractSummary": "Extraer resumen",
"aiTranslate_zh_Hans": "Chino simplificado",
"aiTranslate_zh_Hant": "Chino tradicional",
"aiTranslate_ja_JP": "Japonés",
"aiTranslate_ko_KR": "Coreano",
"aiTranslate_en_US": "Inglés",
"aiTranslate_es_ES": "Español",
"aiTranslate_fr_FR": "Francés",
"aiTranslate_de_DE": "Alemán",
"aiBrainStorm": "Lluvia de ideas",
"aiFixGrammarSpell": "Corregir gramática, ortografía y errores tipográficos.",
"aiCustomAction": "Acción personalizada...",
Expand All @@ -325,12 +329,12 @@
"spaceRepetition": "Repetición Espaciada",
"space": "Espacio",
"pdfIsLoading": "El PDF se está cargando, inténtalo de nuevo más tarde",
"cardShowAnswer": "Afficher la réponse",
"cardShowAnswer": "Mostrar la respuesta",
"cardRatingAgain": "Otra vez",
"cardRatingHard": "Difícil",
"cardRatingGood": "Bueno",
"cardRatingEasy": "Fácil",
"addToDeck": "Agregar a la plataforma...",
"addToDeck": "Agregar al mazo...",
"quickMakeCard": "Tarjeta de creación rápida",
"allAttrs": "Todos los nombres de atributos y valores de atributos",
"chooseSyncDirection": "Elegir dirección de sincronización",
Expand Down Expand Up @@ -1205,7 +1209,8 @@
},
"_attrView": {
"tabla": "Tabla",
"clave": "Clave principal"
"key": "Clave principal",
"select": "Selección"
},
"_kernel": {
"0": "Consulta al cuaderno de notas fallido",
Expand Down Expand Up @@ -1313,7 +1318,7 @@
"102": "Procesamiento completado",
"103": "El paquete de instalación de la actualización se ha descargado automáticamente en segundo plano. Al salir, se le preguntará si desea instalar la nueva versión",
"104": "El paquete de instalación de la actualización no se pudo descargar, verifique la conexión de red",
"105": "TODO",
"105": "Sin título",
"106": "La longitud máxima está limitada a 512 caracteres",
"107": "Documento movido [%s]",
"108": "La sincronizaci\u00f3n de datos encontr\u00f3 en conflictos, puede ver el contenido del conflicto generado en [Historial de datos]",
Expand Down Expand Up @@ -1442,6 +1447,10 @@
"231": "Eliminar objetos de datos no referenciados en el almacenamiento en la nube...",
"232": "Se ha eliminado el almacenamiento de datos en la nube. Se han eliminado [%d] instantáneas y [%d] objetos de datos, y se ha liberado un total de [%s] espacio en disco",
"233": "Cerrando la guía del usuario...",
"234": "[%d/%d] Actualizado [%d] de rutas legibles del documento [%s]"
"234": "[%d/%d] Actualizado [%d] de rutas legibles del documento [%s]",
"235": "[%d/%d] está actualizando el paquete del mercado...",
"236": "[%d/%d] está actualizando el paquete del mercado [%s]...",
"237": "[%d] todos los paquetes del mercado se han actualizado correctamente",
"238": "Error en la actualización del paquete Marketplace [%s], inténtalo de nuevo más tarde"
}
}
31 changes: 20 additions & 11 deletions app/appearance/langs/fr_FR.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
{
"removeCol": "Êtes-vous sûr de vouloir supprimer la colonne ${x} de la base de données ?",
"video": "Vidéo",
"audio": "Audio",
"updateAll": "Tout mettre à jour",
"confirmUpdateAll": "Etes-vous sûr de vouloir tout mettre à jour ?",
"confirmUpdate": "Êtes-vous sûr de vouloir mettre à jour ?",
"insertRowBefore": "Insérer les lignes ${x} ci-dessus",
"insertRowAfter": "Insérer les lignes ${x} ci-dessous",
"setDueTime": "Définir le délai d'expiration",
"showCardDay": "Après combien de jours souhaitez-vous montrer la carte ?",
"forgetCount": "Oublier de compter",
Expand Down Expand Up @@ -295,6 +303,10 @@
"apiModelTip": "Le paramètre <code class='fn__code'>model</code> transmis lors de la demande de l'API est utilisé pour contrôler le style de texte généré (l'ID de déploiement doit être renseigné lors de l'utilisation du service Azure OpenAI)",
"apiMaxTokens": "Nombre maximum de jetons",
"apiMaxTokensTip": "Le paramètre <code class='fn__code'>max_tokens</code> transmis lors de la demande de l'API est utilisé pour contrôler la longueur du texte généré",
"apiTemperature": "Température",
"apiTemperatureTip": "Le paramètre <code class='fn__code'>temperature</code> transmis lors de la requête à l'API est utilisé pour contrôler le caractère aléatoire du texte généré",
"apiMaxContexts": "Nombre maximum de contextes",
"apiMaxContextsTip": "Le nombre maximum de contextes transmis lors de la requête de l'API",
"apiBaseURL": "URL de base de l'API",
"apiBaseURLTip": "L'adresse de base de la requête, telle que <code class='fn__code'>https://api.openai.com/v1</code>",
"apiUserAgentTip": "L'agent utilisateur qui a initié la requête, c'est-à-dire l'en-tête HTTP <code class='fn__code'>User-Agent</code>",
Expand All @@ -309,14 +321,6 @@
"aiContinueWrite": "Continuer à écrire",
"aiTranslate": "Traduire",
"aiExtractSummary": "Résumé de l'extrait",
"aiTranslate_zh_Hans": "Chinois simplifié",
"aiTranslate_zh_Hant": "chinois traditionnel",
"aiTranslate_ja_JP": "Japonais",
"aiTranslate_ko_KR": "Coréen",
"aiTranslate_en_US": "Anglais",
"aiTranslate_es_ES": "Espagnol",
"aiTranslate_fr_FR": "Français",
"aiTranslate_de_DE": "Allemand",
"aiBrainStorm": "Remue-méninges",
"aiFixGrammarSpell": "Correction de la grammaire, de l'orthographe et des fautes de frappe",
"aiCustomAction": "Action personnalisée...",
Expand Down Expand Up @@ -1205,7 +1209,8 @@
},
"_attrView": {
"table": "Tableau",
"key": "Clé primaire"
"key": "Clé primaire",
"select": "Sélectionner"
},
"_kernel": {
"0": "Échec du cahier de requêtes",
Expand Down Expand Up @@ -1313,7 +1318,7 @@
"102": "Traitement terminé",
"103": "Le package d'installation de la mise à jour a été automatiquement téléchargé en arrière-plan. En quittant, il vous sera demandé si vous souhaitez installer la nouvelle version",
"104": "Le package d'installation de la mise à jour n'a pas pu être téléchargé, veuillez vérifier la connexion réseau",
"105": "TODO",
"105": "Sans titre",
"106": "La longueur maximale est limitée à 512 caractères",
"107": "Document déplacé [%s]",
"108": "La synchronisation des données a trouvé des conflits, vous pouvez afficher le contenu du conflit généré dans [Historique des données]",
Expand Down Expand Up @@ -1442,6 +1447,10 @@
"231": "Suppression des objets de données non référencés dans le stockage cloud...",
"232": "Le stockage de données cloud a été purgé. [%d] instantanés et [%d] objets de données ont été supprimés, et un total de [%s] espace disque a été libéré",
"233": "Fermeture du guide de l'utilisateur...",
"234": "[%d/%d] Mise à jour de [%d] des chemins lisibles du document [%s]"
"234": "[%d/%d] Mise à jour de [%d] des chemins lisibles du document [%s]",
"235": "[%d/%d] met à jour le package Marketplace...",
"236": "[%d/%d] met à jour le package Marketplace [%s]...",
"237": "[%d] packages Marketplace ont tous été mis à jour avec succès",
"238": "La mise à jour du package Marketplace [%s] a échoué, veuillez réessayer plus tard"
}
}
33 changes: 21 additions & 12 deletions app/appearance/langs/zh_CHT.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
{
"removeCol": "確定刪除資料庫中的 ${x} 欄位?",
"video": "影片",
"audio": "音訊",
"updateAll": "全部更新",
"confirmUpdateAll": "確定全部更新嗎?",
"confirmUpdate": "確定更新嗎?",
"insertRowBefore": "在上方插入${x}行",
"insertRowAfter": "在下方插入${x}行",
"setDueTime": "設定到期時間",
"showCardDay": "要在幾天後顯示卡片?",
"forgetCount": "遺忘次數",
Expand Down Expand Up @@ -295,6 +303,10 @@
"apiModelTip": "請求 API 時傳入的 <code class='fn__code'>model</code> 參數,用於控制產生的文字風格(使用 Azure OpenAI 服務時需填入 Deployment ID)",
"apiMaxTokens": "最大 Token 數",
"apiMaxTokensTip": "請求 API 時傳入的 <code class='fn__code'>max_tokens</code> 參數,用於控制生成的文字長度",
"apiTemperature": "溫度",
"apiTemperatureTip": "請求 API 時傳入的 <code class='fn__code'>temperature</code> 參數,用來控制產生的文字隨機性",
"apiMaxContexts": "最大上下文數",
"apiMaxContextsTip": "請求 API 時傳入的最大上下文數",
"apiBaseURL": "API 基礎地址",
"apiBaseURLTip": "發起請求的基礎地址,如 <code class='fn__code'>https://api.openai.com/v1</code>",
"apiUserAgentTip": "發起請求的使用者代理,即 HTTP 標頭 <code class='fn__code'>User-Agent</code>",
Expand All @@ -309,14 +321,6 @@
"aiContinueWrite": "續寫",
"aiTranslate": "翻譯",
"aiExtractSummary": "提取摘要",
"aiTranslate_zh_Hans": "簡體中文",
"aiTranslate_zh_Hant": "繁體中文",
"aiTranslate_ja_JP": "日文",
"aiTranslate_ko_KR": "韓文",
"aiTranslate_en_US": "英文",
"aiTranslate_es_ES": "西班牙文",
"aiTranslate_fr_FR": "法文",
"aiTranslate_de_DE": "德文",
"aiBrainStorm": "頭腦風暴",
"aiFixGrammarSpell": "修正語法、拼寫和錯別字",
"aiCustomAction": "自定義操作...",
Expand Down Expand Up @@ -645,7 +649,7 @@
"changeIcon": "修改圖示",
"randomIcon": "隨機圖標",
"includeSubFile": "\n包含 x 個子文檔",
"untitled": "新文檔",
"untitled": "未命名",
"lockScreen": "鎖定畫面",
"cloudIntro1": "端到端加密資料同步",
"cloudIntro2": "加密和解密過程完全在本地設備上進行",
Expand Down Expand Up @@ -1205,7 +1209,8 @@
},
"_attrView": {
"table": "表格",
"key": "主鍵"
"key": "主鍵",
"select": "單選"
},
"_kernel": {
"0": "查詢筆記本失敗",
Expand Down Expand Up @@ -1313,7 +1318,7 @@
"102": "處理完畢",
"103": "已經在後台開始自動下載更新安裝檔,退出時將詢問是否安裝新版本",
"104": "更新安裝檔下載失敗,請檢查網絡連接",
"105": "TODO",
"105": "未命名",
"106": "最大長度限制為 512 字元",
"107": "已經移動文檔 [%s]",
"108": "資料同步發現衝突,可在 [資料歷史] 中查看生成的衝突內容",
Expand Down Expand Up @@ -1442,6 +1447,10 @@
"231": "正在刪除雲端儲存未引用資料物件...",
"232": "雲端資料儲存清理完畢,已刪除 [%d] 個快照和 [%d] 個資料對象,共釋放 [%s] 磁碟空間",
"233": "正在關閉用戶指南...",
"234": "[%d/%d] 已經更新 [%d] 個文件的可讀路徑 [%s]"
"234": "[%d/%d] 已經更新 [%d] 個文件的可讀路徑 [%s]",
"235": "[%d/%d] 正在更新市集包...",
"236": "[%d/%d] 正在更新市集包 [%s]...",
"237": "[%d] 個市集包已經全部更新成功",
"238": "市集包 [%s] 更新失敗,請稍後再試"
}
}
33 changes: 21 additions & 12 deletions app/appearance/langs/zh_CN.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,12 @@
{
"removeCol": "确定删除数据库中的 ${x} 列?",
"video": "视频",
"audio": "音频",
"updateAll": "全部更新",
"confirmUpdateAll": "确定全部更新吗?",
"confirmUpdate": "确定更新吗?",
"insertRowBefore": "在上方插入${x}行",
"insertRowAfter": "在下方插入${x}行",
"setDueTime": "设置到期时间",
"showCardDay": "要在多少天后显示卡片?",
"forgetCount": "遗忘次数",
Expand Down Expand Up @@ -295,6 +303,10 @@
"apiModelTip": "请求 API 时传入的 <code class='fn__code'>model</code> 参数,用于控制生成的文本风格(使用 Azure OpenAI 服务时需填入 Deployment ID)",
"apiMaxTokens": "最大 Token 数",
"apiMaxTokensTip": "请求 API 时传入的 <code class='fn__code'>max_tokens</code> 参数,用于控制生成的文本长度",
"apiTemperature": "温度",
"apiTemperatureTip": "请求 API 时传入的 <code class='fn__code'>temperature</code> 参数,用于控制生成的文本随机性",
"apiMaxContexts": "最大上下文数",
"apiMaxContextsTip": "请求 API 时传入的最大上下文数",
"apiBaseURL": "API 基础地址",
"apiBaseURLTip": "发起请求的基础地址,如 <code class='fn__code'>https://api.openai.com/v1</code>",
"apiVersion": "API 版本",
Expand All @@ -309,14 +321,6 @@
"aiContinueWrite": "续写",
"aiTranslate": "翻译",
"aiExtractSummary": "提取摘要",
"aiTranslate_zh_Hans": "简体中文",
"aiTranslate_zh_Hant": "繁体中文",
"aiTranslate_ja_JP": "日文",
"aiTranslate_ko_KR": "韩文",
"aiTranslate_en_US": "英文",
"aiTranslate_es_ES": "西班牙文",
"aiTranslate_fr_FR": "法文",
"aiTranslate_de_DE": "德文",
"aiBrainStorm": "头脑风暴",
"aiFixGrammarSpell": "修正语法、拼写和错别字",
"aiCustomAction": "自定义操作...",
Expand Down Expand Up @@ -645,7 +649,7 @@
"changeIcon": "修改图标",
"randomIcon": "随机图标",
"includeSubFile": "\n包含 x 个子文档",
"untitled": "新文档",
"untitled": "未命名",
"lockScreen": "锁屏",
"cloudIntro1": "端到端加密数据同步",
"cloudIntro2": "加密和解密过程完全在本地设备上进行",
Expand Down Expand Up @@ -1205,7 +1209,8 @@
},
"_attrView": {
"table": "表格",
"key": "主键"
"key": "主键",
"select": "单选"
},
"_kernel": {
"0": "查询笔记本失败",
Expand Down Expand Up @@ -1313,7 +1318,7 @@
"102": "处理完毕",
"103": "已经在后台开始自动下载更新安装包,退出时将询问是否安装新版本",
"104": "更新安装包下载失败,请检查网络连接",
"105": "TODO",
"105": "未命名",
"106": "最大长度限制为 512 字符",
"107": "已经移动文档 [%s]",
"108": "数据同步发现冲突,可在 [数据历史] 中查看生成的冲突内容",
Expand Down Expand Up @@ -1442,6 +1447,10 @@
"231": "正在删除云端存储未引用数据对象...",
"232": "云端数据存储清理完毕,已删除 [%d] 个快照和 [%d] 个数据对象,共释放 [%s] 磁盘空间",
"233": "正在关闭用户指南...",
"234": "[%d/%d] 已经更新 [%d] 个文档的可读路径 [%s]"
"234": "[%d/%d] 已经更新 [%d] 个文档的可读路径 [%s]",
"235": "[%d/%d] 正在更新集市包...",
"236": "[%d/%d] 正在更新集市包 [%s]...",
"237": "[%d] 个集市包已经全部更新成功",
"238": "集市包 [%s] 更新失败,请稍后再试"
}
}
Loading

0 comments on commit 666a9e3

Please sign in to comment.