diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 695a7c49d..e665fb31f 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -924,6 +924,7 @@ "151": "Do not include symbols \\ / : * ? " ' < > |", "152": "Uploaded files %d, chunks %d, sent bytes %s", "153": "Downloaded files %d, chunks %d, received bytes %s", - "154": "The cloud can only support backup up to 12 snapshots" + "154": "The cloud can only support backup up to 12 snapshots", + "155": "Cloud sync directory has been reset to [main]" } } diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 285ceec46..d44cb4929 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -924,6 +924,7 @@ "151": "No incluir símbolos \\ / : * ? " ' < > |", "152": "Archivos cargados %d, fragmentos %d, bytes enviados %s", "153": "Archivos descargados %d, fragmentos %d, bytes recibidos %s", - "154": "La nube solo admite copias de seguridad de hasta 12 instantáneas" + "154": "La nube solo admite copias de seguridad de hasta 12 instantáneas", + "155": "El directorio de sincronización de la nube se ha restablecido a [main]" } } diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 655463084..5b293fd77 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -924,6 +924,7 @@ "151": "Ne pas inclure les symboles \\ / : * ? " ' < > |", "152": "Fichiers téléchargés %d, morceaux %d, octets envoyés %s", "153": "Fichiers chargés %d, morceaux %d, octets reçus %s", - "154": "Le cloud ne peut prendre en charge que la sauvegarde jusqu'à 12 instantanés" + "154": "Le cloud ne peut prendre en charge que la sauvegarde jusqu'à 12 instantanés", + "155": "Le répertoire de synchronisation du cloud a été réinitialisé sur [main]" } } diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index efd60c8ad..b2e4bb5ae 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -923,6 +923,7 @@ "151": "請勿包含符號 \\ / : * ? " ' < > |", "152": "上傳文件數 %d 上傳分塊數 %d 發送字節數 %s", "153": "下載文件數 %d 下載分塊數 %d 接收字節數 %s", - "154": "雲端最多只能支持備份 12 個快照" + "154": "雲端最多只能支持備份 12 個快照", + "155": "雲端同步目錄已經重置為 [main]" } } diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 43b886ed1..0f40ca5be 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -925,6 +925,7 @@ "151": "请勿包含符号 \\ / : * ? " ' < > |", "152": "上传文件数 %d 上传分块数 %d 发送字节数 %s", "153": "下载文件数 %d 下载分块数 %d 接收字节数 %s", - "154": "云端最多只能支持备份 12 个快照" + "154": "云端最多只能支持备份 12 个快照", + "155": "云端同步目录已经重置为 [main]" } } diff --git a/kernel/model/sync.go b/kernel/model/sync.go index c324d9027..6d52bc4e7 100644 --- a/kernel/model/sync.go +++ b/kernel/model/sync.go @@ -72,7 +72,7 @@ func SyncData(boot, exit, byHand bool) { } if util.IsMutexLocked(&syncLock) { - util.LogWarnf("sync has been locked") + util.LogWarnf("a cloud sync operation still processing") planSyncAfter(30 * time.Second) return } @@ -1190,8 +1190,9 @@ func RemoveCloudSyncDir(name string) (err error) { } if Conf.Sync.CloudName == name { - Conf.Sync.CloudName = "" + Conf.Sync.CloudName = "main" Conf.Save() + util.PushMsg(Conf.Language(155), 5000) } return }