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

app/appearance/langs/en_US.json

@@ -422,7 +422,6 @@
   "default": "Default",
   "titleBg": "Cover",
   "random": "Random",
-  "noOpenFile": "No file is open",
   "cloudBackup": "Cloud backup",
   "total": "Total",
   "cdn": "Assets",
@@ -718,7 +717,6 @@
   "export22": "<code class='fn__code'>%page</code> is the current page number, <code class='fn__code'>%pages</code> is the total page number, and supports Sprig template functions",
   "export23": "Export Markdown wit YFM",
   "export24": "After enabling, add some general metadata information at the beginning of the exported Markdown file",
-  "blockRef": "Ref Block",
   "theme11": "Use theme in light mode",
   "theme12": "Use theme in dark mode",
   "theme2": "Select the icons used in the user interface",

app/appearance/langs/es_ES.json

@@ -422,7 +422,6 @@
   "default": "Por defecto",
   "titleBg": "Cobertura",
   "random": "Aleatorio",
-  "noOpenFile": "No hay ningún archivo abierto",
   "cloudBackup": "Copia de seguridad en la nube",
   "total": "Total",
   "cdn": "Activos",
@@ -718,7 +717,6 @@
   "export22": "<code class='fn__code'>%page</code> es el número de página actual, <code class='fn__code'>%pages</code> es el número de página total y es compatible con las funciones de plantilla de Sprig ",
   "export23": "Exportar descuento con YFM",
   "export24": "Después de habilitar, agregue información general de metadatos al comienzo del archivo Markdown exportado",
-  "blockRef": "Bloque de referencia",
   "theme11": "Usar tema en modo claro",
   "theme12": "Usar tema en modo oscuro",
   "theme2": "Selecciona los iconos utilizados en la interfaz de usuario",

app/appearance/langs/fr_FR.json

@@ -422,7 +422,6 @@
   "default": "Default",
   "titleBg": "Couverture",
   "random": "Random",
-  "noOpenFile": "Aucun fichier n'est ouvert",
   "cloudBackup": "Sauvegarde en Cloud",
   "total": "Total",
   "cdn": "Assets",
@@ -718,7 +717,6 @@
   "export22": "<code class='fn__code'>%page</code> est le numéro de page actuel, <code class='fn__code'>%pages</code> est le numéro de page total et prend en charge les fonctions de modèle Sprig ",
   "export23": "Exporter Markdown avec YFM",
   "export24": "Après l'activation, ajoutez des informations générales sur les métadonnées au début du fichier Markdown exporté",
-  "blockRef": "Bloc Réf",
   "theme11": "Utiliser le thème en mode Clair",
   "theme12": "Utiliser le thème en mode sombre",
   "theme2": "Sélectionnez les icônes utilisées dans l'interface utilisateur",

app/appearance/langs/zh_CHT.json

@@ -422,7 +422,6 @@
   "default": "預設",
   "titleBg": "封面圖",
   "random": "隨機",
-  "noOpenFile": "沒有打開的文檔",
   "cloudBackup": "雲端備份",
   "total": "總計",
   "cdn": "圖庫",
@@ -718,7 +717,6 @@
   "export22": "<code class='fn__code'>%page</code> 為當前頁碼，<code class='fn__code'>%pages</code> 為總頁碼，支持 Sprig 模板函數",
   "export23": "導出 Markdown 添加 YFM",
   "export24": "啟用後在導出的 Markdown 文件開頭處添加一些較為通用的元數據信息",
-  "blockRef": "引用塊",
   "theme11": "淺色模式下使用主題",
   "theme12": "深色模式下使用主題",
   "theme2": "選擇外觀使用的圖示",

app/appearance/langs/zh_CN.json

@@ -422,7 +422,6 @@
   "default": "默认",
   "titleBg": "题头图",
   "random": "随机",
-  "noOpenFile": "没有打开的文档",
   "cloudBackup": "云端备份",
   "total": "总计",
   "cdn": "图床",
@@ -718,7 +717,6 @@
   "export22": "<code class='fn__code'>%page</code> 为当前页码，<code class='fn__code'>%pages</code> 为总页码，支持 Sprig 模板函数",
   "export23": "导出 Markdown 添加 YFM",
   "export24": "启用后在导出的 Markdown 文件开头处添加一些较为通用的元数据信息",
-  "blockRef": "引用块",
   "theme11": "明亮模式下使用主题",
   "theme12": "暗黑模式下使用主题",
   "theme2": "选择外观使用的图标",

app/src/config/exportConfig.ts

@@ -37,7 +37,7 @@ export const exportConfig = {
 </label>
 <label class="fn__flex b3-label config__item">
     <div class="fn__flex-1">
-        ${window.siyuan.languages.blockRef}
+        ${window.siyuan.languages.ref}
         <div class="b3-label__text">${window.siyuan.languages.export11}</div>
     </div>
     <span class="fn__space"></span>

app/src/layout/dock/Files.ts

@@ -972,7 +972,7 @@ export class Files extends Model {
     private genFileHTML = (item: IFile) => {
         let countHTML = "";
         if (item.count && item.count > 0) {
-            countHTML = `<span class="popover__block counter b3-tooltips b3-tooltips__nw" aria-label="${window.siyuan.languages.blockRef}">${item.count}</span>`;
+            countHTML = `<span class="popover__block counter b3-tooltips b3-tooltips__nw" aria-label="${window.siyuan.languages.ref}">${item.count}</span>`;
         }
         return `<li title="${getDisplayName(item.name, true, true)} ${item.hSize}${item.bookmark ? "\n" + window.siyuan.languages.bookmark + " " + item.bookmark : ""}${item.name1 ? "\n" + window.siyuan.languages.name + " " + item.name1 : ""}${item.alias ? "\n" + window.siyuan.languages.alias + " " + item.alias : ""}${item.memo ? "\n" + window.siyuan.languages.memo + " " + item.memo : ""}${item.subFileCount !== 0 ? window.siyuan.languages.includeSubFile.replace("x", item.subFileCount) : ""}\n${window.siyuan.languages.modifiedAt} ${item.hMtime}\n${window.siyuan.languages.createdAt} ${item.hCtime}" 
 data-node-id="${item.id}" data-name="${Lute.EscapeHTMLStr(item.name)}" draggable="true" data-count="${item.subFileCount}" 

app/src/layout/util.ts

@@ -6,7 +6,6 @@ import {Model} from "./Model";
 import {Graph} from "./dock/Graph";
 import {Editor} from "../editor";
 import {Files} from "./dock/Files";
-import {setPadding} from "../protyle/ui/initUI";
 import {newFile} from "../util/newFile";
 import {Outline} from "./dock/Outline";
 import {Bookmark} from "./dock/Bookmark";
@@ -36,7 +35,7 @@ import {getIdZoomInByPath} from "../util/pathName";
 import {openHistory} from "../history/history";
 import {Custom} from "./dock/Custom";
 import {newCardModel} from "../card/newCardTab";
-import { openRecentDocs } from "../business/openRecentDocs";
+import {openRecentDocs} from "../business/openRecentDocs";
 
 export const setPanelFocus = (element: Element) => {
     if (element.classList.contains("layout__tab--active") || element.classList.contains("layout__wnd--active")) {
@@ -800,8 +799,6 @@ export const newCenterEmptyTab = () => {
         </div>
         <div class="b3-label__text">${window.siyuan.languages.slogan}</div>
     </div>
-    <h1>${window.siyuan.languages.noOpenFile}</h1>
-    <div class="fn__hr"></div>
     <div class="fn__hr"></div>
     <div class="b3-list-item" id="editorEmptySearch">
         <svg class="b3-list-item__graphic"><use xlink:href="#iconSearch"></use></svg>

app/src/menus/protyle.ts

@@ -820,7 +820,7 @@ export const linkMenu = (protyle: IProtyle, linkElement: HTMLElement, focusText
     }
     if (linkAddress?.startsWith("siyuan://blocks/")) {
         window.siyuan.menus.menu.append(new MenuItem({
-            label: `${window.siyuan.languages.turnInto} <b>${window.siyuan.languages.blockRef}</b>`,
+            label: `${window.siyuan.languages.turnInto} <b>${window.siyuan.languages.ref}</b>`,
             icon: "iconRef",
             click() {
                 linkElement.setAttribute("data-subtype", "s");

app/src/mobile/util/setEmpty.ts

@@ -14,8 +14,7 @@ export const setEmpty = () => {
     if (emptyElement.innerHTML !== "") {
         return;
     }
-    emptyElement.innerHTML = `<h1 style="width: 200px">${window.siyuan.languages.noOpenFile}</h1>
-<div class="fn__hr--b"></div>
+    emptyElement.innerHTML = `
 <div id="emptySearch" class="b3-list-item">
     <svg class="b3-list-item__graphic"><use xlink:href="#iconSearch"></use></svg><span class="b3-list-item__text">${window.siyuan.languages.search}</span>
 </div>

app/src/protyle/hint/extend.ts

@@ -36,7 +36,7 @@ export const hintSlash = (key: string, protyle: IProtyle) => {
     }, {
         filter: ["引用块", "yinyong", "yy", "block reference"],
         value: "((",
-        html: `<div class="b3-list-item__first"><svg class="b3-list-item__graphic"><use xlink:href="#iconRef"></use></svg><span class="b3-list-item__text">${window.siyuan.languages.blockRef}</span><span class="b3-list-item__meta">((</span></div>`,
+        html: `<div class="b3-list-item__first"><svg class="b3-list-item__graphic"><use xlink:href="#iconRef"></use></svg><span class="b3-list-item__text">${window.siyuan.languages.ref}</span><span class="b3-list-item__meta">((</span></div>`,
     }, {
         filter: ["嵌入块", "qianrukuai", "qrk", "embed block"],
         value: "{{",

app/src/util/pathName.ts

@@ -465,7 +465,7 @@ const getLeaf = (liElement: HTMLElement, flashcard:boolean) => {
         response.data.files.forEach((item: IFile) => {
             let countHTML = "";
             if (item.count && item.count > 0) {
-                countHTML = `<span class="popover__block counter b3-tooltips b3-tooltips__nw" aria-label="${window.siyuan.languages.blockRef}">${item.count}</span>`;
+                countHTML = `<span class="popover__block counter b3-tooltips b3-tooltips__nw" aria-label="${window.siyuan.languages.ref}">${item.count}</span>`;
             }
             fileHTML += `<li title="${getDisplayName(item.name, true, true)} ${item.hSize}${item.bookmark ? "\n" + window.siyuan.languages.bookmark + " " + item.bookmark : ""}${item.name1 ? "\n" + window.siyuan.languages.name + " " + item.name1 : ""}${item.alias ? "\n" + window.siyuan.languages.alias + " " + item.alias : ""}${item.memo ? "\n" + window.siyuan.languages.memo + " " + item.memo : ""}${item.subFileCount !== 0 ? window.siyuan.languages.includeSubFile.replace("x", item.subFileCount) : ""}\n${window.siyuan.languages.modifiedAt} ${item.hMtime}\n${window.siyuan.languages.createdAt} ${item.hCtime}" 
 data-box="${notebookId}" class="b3-list-item" data-path="${item.path}">