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

app/src/protyle/export/util.ts

@@ -33,7 +33,7 @@ declare const html2canvas: (element: Element) => Promise<any>;
 
 export const exportImage = (id: string) => {
     const exportDialog = new Dialog({
-        title: window.siyuan.languages.export,
+        title: window.siyuan.languages.exportAsImage,
         content: `<div class="b3-dialog__content" style="max-height: 70vh;overflow: auto">
     <div style="padding: 48px;
     border: 1px solid var(--b3-border-color);
@@ -41,7 +41,7 @@ export const exportImage = (id: string) => {
     margin: 8px 0 24px;" class="protyle-wysiwyg${window.siyuan.config.editor.displayBookmarkIcon ? " protyle-wysiwyg--attr" : ""}" id="preview">
         <div class="fn__loading" style="left:0"><img height="48px" width="48px" src="stage/loading-pure.svg"></div>
     </div>
-    <div class="ft__smaller ft__on-surface fn__flex"><img style="height: 18px;margin: 0 8px" src="stage/icon.png">由思源笔记导出</div>
+    <div class="ft__smaller ft__on-surface fn__flex"><img style="height: 18px;margin: 0 8px" src="stage/icon.png">${window.siyuan.languages.exportBySiYuan}</div>
     <div class="fn__hr--b"></div>
     <div class="fn__hr--b"></div>
 </div>

app/src/types/index.d.ts

@@ -426,6 +426,8 @@ declare interface IConfig {
         cBlockCount: number
         dataSize: number
         cDataSize: number
+        assetsSize: number
+        cAssetsSize: number
     }
 }
 

app/src/util/assets.ts

@@ -145,6 +145,7 @@ export const addGA = () => {
             cTreeCount: window.siyuan.config.stat.cTreeCount,
             cBlockCount: window.siyuan.config.stat.cBlockCount,
             cDataSize: window.siyuan.config.stat.cDataSize,
+            cAssetsSize: window.siyuan.config.stat.cAssetsSize,
         };
         if (window.siyuan.user) {
             para.isLoggedIn = true;