diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index ef9e13f7b..0cc9848b6 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1096,7 +1096,7 @@ "126": "Bookmark cannot be empty", "127": "There are [%d] days left before the subscription expires, after which the cloud data will be completely deleted. To renew, please visit here", "128": "The subscription has expired. After the expiration, the cloud data will be completely deleted. The reminder will no longer pop up two days after the subscription expires. To renew, please visit here", - "129": "Cloud data has been corrupted, please refer to here to resolve the issue", + "129": "Cloud data has been corrupted, please reset the local data repo and cloud sync dir to resolve the issue", "130": "Starting new version installer...", "131": "This operation is not supported, please go to the cloud storage provider management console to operate", "132": "The current search method does not support the replace operation, please use the [Keyword] or [Regex] search method", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 02c3160f0..7e8535eae 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1096,7 +1096,7 @@ "126": "El marcador no puede estar vacío", "127": "There are [%d] days left before the subscription expires, after which the cloud data will be completely deleted. Please visit Aquí para la renovación", "128": "La suscripción caducó. Después de la caducidad, los datos de la nube se eliminarán por completo. El recordatorio ya no aparecerá dos días después de que caduque la suscripción. Para renovar, visite aquí", - "129": "Los datos de la nube se han dañado, consulte aquí para resolver el problema", + "129": "Los datos de la nube se han dañado, reinicie el repositorio de datos local y el directorio de sincronización en la nube para resolver el problema", "130": "Iniciando instalador de nueva versión...", "131": "Esta solicitud no es compatible, vaya a la consola de administración del proveedor de almacenamiento en la nube para operar", "132": "El método de búsqueda actual no admite la operación de reemplazo, utilice el método de búsqueda [Palabra clave] o [Regex]", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 9bef71094..5d6c14ffa 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1096,7 +1096,7 @@ "126": "Les signets ne peuvent pas être vides", "127": "Il reste [%d] jours avant l'expiration de l'abonnement, après quoi les données cloud seront complètement supprimées. Veuillez visiter ici pour le renouvellement", "128": "L'abonnement a expiré. Après l'expiration, les données cloud seront complètement supprimées. Le rappel ne s'affichera plus deux jours après l'expiration de l'abonnement. Pour renouveler, veuillez visiter ici", - "129": "Les données cloud ont été corrompues, veuillez vous référer à ici pour résoudre le problème", + "129": "Les données cloud ont été corrompues, veuillez réinitialiser le dépôt de données local et le répertoire de synchronisation cloud pour résoudre le problème", "130": "Démarrage du programme d'installation de la nouvelle version...", "131": "Cette opération n'est pas prise en charge, veuillez vous rendre sur la console de gestion du fournisseur de stockage cloud pour opérer", "132": "La méthode de recherche actuelle ne prend pas en charge l'opération de remplacement, veuillez utiliser la méthode de recherche [Mot-clé] ou [Regex]", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 37321733d..2d79a0b97 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1096,7 +1096,7 @@ "126": "書籤不能為空", "127": "訂閱距過期還剩 [%d] 天，過期後雲端數據會被徹底刪除。續訂請訪問這裡", "128": "訂閱已經過期，過期後雲端數據會被徹底刪除，訂閱過期兩天后不再彈出該提醒，續訂請訪問這裡", - "129": "雲端數據已經損壞，請參考這裡解決該問題", + "129": "雲端數據已經損壞，請參考這裡解決該問題", "130": "正在啟動新版本安裝程式...", "131": "不支持該操作，請到雲端存儲提供商管理控制台進行操作", "132": "當前搜索方式下不支持替換操作，請使用 [關鍵字] 或 [正則表達式] 搜索方式", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 63cae5b1c..b3718ef95 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1098,7 +1098,7 @@ "126": "书签不能为空", "127": "订阅距过期还剩 [%d] 天，过期后云端数据会被彻底删除。续订请访问这里", "128": "订阅已经过期，过期后云端数据会被彻底删除，订阅过期两天后不再弹出该提醒，续订请访问这里", - "129": "云端数据已经损坏，请参考这里解决该问题", + "129": "云端数据已经损坏，请参考这里解决该问题", "130": "正在启动新版本安装程序...", "131": "不支持该操作，请到云端存储提供商管理控制台进行操作", "132": "当前搜索方式下不支持替换操作，请使用 [关键字] 或 [正则表达式] 搜索方式", diff --git a/app/electron/main.js b/app/electron/main.js index 5a61ece4b..18b7b7653 100644 --- a/app/electron/main.js +++ b/app/electron/main.js @@ -135,8 +135,8 @@ const showErrorWindow = (title, content) => { errorHTMLPath = path.join(appDir, "electron", "error.html"); } const errWindow = new BrowserWindow({ - width: Math.floor(screen.getPrimaryDisplay().size.width / 2), - height: Math.floor(screen.getPrimaryDisplay().workAreaSize.height / 2), + width: Math.floor(screen.getPrimaryDisplay().size.width * 0.5), + height: Math.floor(screen.getPrimaryDisplay().workAreaSize.height * 0.8), frame: false, icon: path.join(appDir, "stage", "icon-large.png"), webPreferences: { @@ -488,7 +488,7 @@ const initKernel = (workspace, port, lang) => { errorWindowId = showErrorWindow("⚠️ 初始化工作空间失败 Failed to create workspace directory", "
初始化工作空间失败。
Failed to init workspace.
"); break; case 26: - errorWindowId = showErrorWindow("⚠️ 文件系统读写错误 File system access error", "
1. 请检查文件系统权限，并确保没有其他程序正在读写文件
2. 请勿使用第三方同步盘进行数据同步，否则数据会被损坏（iCloud/OneDrive/Dropbox/Google Drive/坚果云/百度网盘/腾讯微云等）

解决方案：请将工作空间移动到其他路径后再打开
1. Please check file system permissions and make sure no other programs are reading or writing to the file
2. Do not use a third-party sync disk for data sync, otherwise the data will be damaged (OneDrive/Dropbox/Google Drive/Nutstore/Baidu Netdisk/Tencent Weiyun, etc.)

Solution: Please move the workspace to another path before opening it
"); + errorWindowId = showErrorWindow("🚒 已成功避免潜在的数据损坏
Successfully avoid potential data corruption", "
工作空间下的文件正在被第三方软件（比如同步盘 iCloud/OneDrive/Dropbox/Google Drive/坚果云/百度网盘/腾讯微云等）扫描读取占用，继续使用会导致数据损坏，思源内核已经安全退出。

请将工作空间移动到其他路径后再打开，停止同步盘同步工作空间。如果以上步骤无法解决问题，请参考这里或者发帖寻求帮助。
The files in the workspace are being scanned and read by third-party software (such as sync disk iCloud/OneDrive/Dropbox/Google Drive/Nutstore/Baidu Netdisk/Tencent Weiyun, etc.), continuing to use it will cause data corruption, and the SiYuan kernel is already safe shutdown.

Move the workspace to another path and open it again, stop the sync disk to sync the workspace. If the above steps do not resolve the issue, please look for help or report bugs here.
"); break; case 0: break; diff --git a/kernel/util/runtime.go b/kernel/util/runtime.go index f3c8a8bf4..f7f8493f7 100644 --- a/kernel/util/runtime.go +++ b/kernel/util/runtime.go @@ -165,6 +165,8 @@ func CheckFileSysStatus() { } for { + time.Sleep(10 * time.Second) + ReportFileSysFatalError(fmt.Errorf("test error")) <-thirdPartySyncCheckTicker.C checkFileSysStatus() }