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

README.md

@@ -71,6 +71,7 @@ Cloud services require a paid subscription.
 
 * VIP identity
 * End-to-end encrypted data synchronization
+* End-to-end encrypted data backup
 * Cloud assets serving
 * WeChat notification
 * Cloud inbox

README_zh_CN.md

@@ -74,6 +74,7 @@
 
 * 尊贵身份标识
 * 端到端加密数据同步
+* 端到端加密数据备份
 * 云端图床服务
 * 定时微信提醒
 * 云端收集箱

app/appearance/langs/en_US.json

@@ -923,6 +923,7 @@
     "150": "Uploaded/Downloaded files %d/%d\nUploaded/Downloaded chunks %d/%d\nSent/Received bytes %s/%s",
     "151": "Do not include symbols \\ / : * ? " ' < > |",
     "152": "Uploaded files %d, chunks %d, sent bytes %s",
-    "153": "Downloaded files %d, chunks %d, received bytes %s"
+    "153": "Downloaded files %d, chunks %d, received bytes %s",
+    "154": "The cloud can only support backup up to 12 snapshots"
   }
 }

app/appearance/langs/es_ES.json

@@ -923,6 +923,7 @@
     "150": "Archivos cargados/descargados %d/%d\nFragmentos cargados/descargados %d/%d\nBytes enviados/recibidos %s/%s",
     "151": "No incluir símbolos \\ / : * ? " ' < > |",
     "152": "Archivos cargados %d, fragmentos %d, bytes enviados %s",
-    "153": "Archivos descargados %d, fragmentos %d, bytes recibidos %s"
+    "153": "Archivos descargados %d, fragmentos %d, bytes recibidos %s",
+    "154": "La nube solo admite copias de seguridad de hasta 12 instantáneas"
   }
 }

app/appearance/langs/fr_FR.json

@@ -923,6 +923,7 @@
     "150": "Fichiers chargés/téléchargés %d/%d\nMorceaux chargés/téléchargés %d/%d\nOctets envoyés/reçus %s/%s",
     "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"
+    "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"
   }
 }

app/appearance/langs/zh_CHT.json

@@ -922,6 +922,7 @@
     "150": "上傳/下載文件數 %d/%d\n上傳/下載分塊數 %d/%d\n發送/接收字節數 %s/%s",
     "151": "請勿包含符號 \\ / : * ? " ' < > |",
     "152": "上傳文件數 %d 上傳分塊數 %d 發送字節數 %s",
-    "153": "下載文件數 %d 下載分塊數 %d 接收字節數 %s"
+    "153": "下載文件數 %d 下載分塊數 %d 接收字節數 %s",
+    "154": "雲端最多只能支持備份 12 個快照"
   }
 }

app/appearance/langs/zh_CN.json

@@ -924,6 +924,7 @@
     "150": "上传/下载文件数 %d/%d\n上传/下载分块数 %d/%d\n发送/接收字节数 %s/%s",
     "151": "请勿包含符号 \\ / : * ? " ' < > |",
     "152": "上传文件数 %d 上传分块数 %d 发送字节数 %s",
-    "153": "下载文件数 %d 下载分块数 %d 接收字节数 %s"
+    "153": "下载文件数 %d 下载分块数 %d 接收字节数 %s",
+    "154": "云端最多只能支持备份 12 个快照"
   }
 }

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "SiYuan",
-  "version": "2.0.25",
+  "version": "2.0.26-alpha1",
   "description": "A local-first personal knowledge management system, supports fine-grained block-level reference, and Markdown WYSIWYG.",
   "homepage": "https://b3log.org/siyuan",
   "main": "./electron/main.js",

kernel/model/repository.go

@@ -238,6 +238,9 @@ func UploadCloudSnapshot(tag, id string) (err error) {
 	defer util.PushClearProgress()
 	uploadFileCount, uploadChunkCount, uploadBytes, err := repo.UploadTagIndex(tag, id, cloudInfo, map[string]interface{}{CtxPushMsg: CtxPushMsgToStatusBarAndProgress})
 	if nil != err {
+		if errors.Is(err, dejavu.ErrCloudBackupCountExceeded) {
+			err = errors.New(Conf.Language(154))
+		}
 		return
 	}
 	msg := fmt.Sprintf(Conf.Language(152), uploadFileCount, uploadChunkCount, byteCountSI(uploadBytes))

kernel/util/working.go

@@ -40,8 +40,8 @@ import (
 var Mode = "prod"
 
 const (
-	Ver       = "2.0.25"
-	IsInsider = false
+	Ver       = "2.0.26-alpha1"
+	IsInsider = true
 )
 
 var (