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

# Conflicts:
#	app/appearance/langs/en_US.json
#	app/appearance/langs/es_ES.json
#	app/appearance/langs/fr_FR.json
#	app/appearance/langs/zh_CHT.json
#	app/appearance/langs/zh_CN.json
#	app/src/config/bazaar.ts
This commit is contained in:
Vanessa 2024-01-31 17:59:23 +08:00
commit 611d47563f
6 changed files with 9 additions and 4 deletions

View file

@ -204,7 +204,8 @@
"pinTableHead": "Pin Table Head", "pinTableHead": "Pin Table Head",
"unpinTableHead": "Unpin Table Head", "unpinTableHead": "Unpin Table Head",
"enablePluginTip": "Do you need to enable this plugin now? You can enable, disable or uninstall it later in [Downloaded - Plugin]", "enablePluginTip": "Do you need to enable this plugin now? You can enable, disable or uninstall it later in [Downloaded - Plugin]",
"enablePluginTip2": "All plugin are disabled. You can enable it later in [Downloaded - Plugin]", "enablePluginTip2": "All plugins are currently disabled, please enable them in [Downloaded - Plugin]",
"enablePlugin": "Enable plugin",
"color": "Color", "color": "Color",
"confirmPassword": "I have already remembered the password", "confirmPassword": "I have already remembered the password",
"passwordNoMatch": "The passwords entered twice do not match", "passwordNoMatch": "The passwords entered twice do not match",

View file

@ -204,7 +204,8 @@
"pinTableHead": "Cabeza de la tabla de clavijas", "pinTableHead": "Cabeza de la tabla de clavijas",
"unpinTableHead": "Desanclar el encabezado de la tabla", "unpinTableHead": "Desanclar el encabezado de la tabla",
"enablePluginTip": "¿Necesita habilitar este complemento ahora? Puede habilitarlo, deshabilitarlo o desinstalarlo más tarde en [Descargado - Complemento]", "enablePluginTip": "¿Necesita habilitar este complemento ahora? Puede habilitarlo, deshabilitarlo o desinstalarlo más tarde en [Descargado - Complemento]",
"enablePluginTip2": "Todos los complementos están deshabilitados. Puedes habilitarlos más tarde en [Descargado - Complemento]", "enablePluginTip2": "Todos los complementos están actualmente deshabilitados, habilítelos en [Descargados - Complemento]",
"enablePlugin": "Habilitar complemento",
"color": "Color", "color": "Color",
"confirmPassword": "Ya he recordado la contraseña", "confirmPassword": "Ya he recordado la contraseña",
"passwordNoMatch": "Las contraseñas ingresadas dos veces no coinciden", "passwordNoMatch": "Las contraseñas ingresadas dos veces no coinciden",

View file

@ -204,7 +204,8 @@
"pinTableHead": "Épingler la tête du tableau", "pinTableHead": "Épingler la tête du tableau",
"unpinTableHead": "Désépingler l'en-tête du tableau", "unpinTableHead": "Désépingler l'en-tête du tableau",
"enablePluginTip": "Avez-vous besoin d'activer ce plugin maintenant ? Vous pouvez l'activer, le désactiver ou le désinstaller plus tard dans [Téléchargé - Plugin]", "enablePluginTip": "Avez-vous besoin d'activer ce plugin maintenant ? Vous pouvez l'activer, le désactiver ou le désinstaller plus tard dans [Téléchargé - Plugin]",
"enablePluginTip2": "Tous les plugins sont désactivés. Vous pourrez l'activer plus tard dans [Téléchargé - Plugin]", "enablePluginTip2": "Tous les plugins sont actuellement désactivés, veuillez les activer dans [Téléchargés - Plugin]",
"enablePlugin": "Activer le plugin",
"color": "Couleur", "color": "Couleur",
"confirmPassword": "J'ai déjà retenu le mot de passe", "confirmPassword": "J'ai déjà retenu le mot de passe",
"passwordNoMatch": "Les mots de passe saisis deux fois ne correspondent pas", "passwordNoMatch": "Les mots de passe saisis deux fois ne correspondent pas",

View file

@ -205,6 +205,7 @@
"unpinTableHead": "取消固定表頭", "unpinTableHead": "取消固定表頭",
"enablePluginTip": "現在需要啟用該插件嗎?後續可以在 [已下載 - 插件] 中進行啟用、禁用或者卸載", "enablePluginTip": "現在需要啟用該插件嗎?後續可以在 [已下載 - 插件] 中進行啟用、禁用或者卸載",
"enablePluginTip2": "目前已經停用所有插件,請在 [已下載 - 插件] 中啟用", "enablePluginTip2": "目前已經停用所有插件,請在 [已下載 - 插件] 中啟用",
"enablePlugin": "啟用插件",
"color": "顏色", "color": "顏色",
"confirmPassword": "我已經牢記密碼了", "confirmPassword": "我已經牢記密碼了",
"passwordNoMatch": "兩次輸入的密碼不一致", "passwordNoMatch": "兩次輸入的密碼不一致",

View file

@ -205,6 +205,7 @@
"unpinTableHead": "取消固定表头", "unpinTableHead": "取消固定表头",
"enablePluginTip": "现在需要启用该插件吗?后续可以在 [已下载 - 插件] 中进行启用、禁用或者卸载", "enablePluginTip": "现在需要启用该插件吗?后续可以在 [已下载 - 插件] 中进行启用、禁用或者卸载",
"enablePluginTip2": "目前已经禁用所有插件,请在 [已下载 - 插件] 中启用", "enablePluginTip2": "目前已经禁用所有插件,请在 [已下载 - 插件] 中启用",
"enablePlugin": "启用插件",
"color": "颜色", "color": "颜色",
"confirmPassword": "我已经牢记密码了", "confirmPassword": "我已经牢记密码了",
"passwordNoMatch": "两次输入的密码不一致", "passwordNoMatch": "两次输入的密码不一致",

View file

@ -652,7 +652,7 @@ export const bazaar = {
if (window.siyuan.config.bazaar.petalDisabled) { if (window.siyuan.config.bazaar.petalDisabled) {
confirmDialog(window.siyuan.languages.confirm, window.siyuan.languages.enablePluginTip2); confirmDialog(window.siyuan.languages.confirm, window.siyuan.languages.enablePluginTip2);
} else { } else {
confirmDialog(window.siyuan.languages.confirm, window.siyuan.languages.enablePluginTip, () => { confirmDialog("💡 " + window.siyuan.languages.enablePlugin, window.siyuan.languages.enablePluginTip, () => {
fetchPost("/api/petal/setPetalEnabled", { fetchPost("/api/petal/setPetalEnabled", {
packageName: dataObj.name, packageName: dataObj.name,
enabled: true, enabled: true,