0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
# Conflicts:
#	app/appearance/langs/en_US.json
#	app/appearance/langs/es_ES.json
#	app/appearance/langs/fr_FR.json
#	app/appearance/langs/zh_CHT.json
#	app/appearance/langs/zh_CN.json
This commit is contained in:
Vanessa 2023-09-10 15:32:54 +08:00
commit c8055dbeee
6 changed files with 48 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/appearance/langs/en_US.json
View file

@ -1,4 +1,12 @@
{
"defaultMargin": "Default",
"noneMargin": "None",
"minimalMargin": "Minimal",
"customMargin": "Custom",
"marginTop": "Top",
"marginRight": "Right",
"marginBottom": "Bottom",
"marginLeft": "Left",
"lockEdit": "Make doc read-only",
"unlockEdit": "Make doc writable",
"enable": "Enable",

8
app/appearance/langs/es_ES.json
View file

@ -1,6 +1,14 @@
{
"lockEdit": "Hacer que el documento sea de sólo lectura",
"unlockEdit": "Hacer que el documento sea escribible",
"defaultMargin": "Predeterminado",
"noneMargin": "Ninguno",
"minimalMargin": "Mínimo",
"customMargin": "Personalizado",
"marginTop": "Superior",
"marginRight": "Derecho",
"marginBottom": "Inferior",
"marginLeft": "Izquierda",
"enable": "Habilitar",
"disable": "Desactivar",
"removeWorkspacePhysically": "¿Quieres eliminar físicamente los datos en el espacio de trabajo ${x}? (La eliminación física no se puede recuperar)",

8
app/appearance/langs/fr_FR.json
View file

@ -1,6 +1,14 @@
{
"lockEdit": "Rendre le document en lecture seule",
"unlockEdit": "Rendre le document accessible en écriture",
"defaultMargin": "Par défaut",
"noneMargin": "Aucun",
"minimalMargin": "Minimal",
"customMargin": "Personnalisé",
"marginTop": "Haut",
"marginRight": "Droite",
"marginBottom": "Bas",
"marginLeft": "Gauche",
"enable": "Activer",
"disable": "Désactiver",
"removeWorkspacePhysically": "Voulez-vous supprimer physiquement les données de l'espace de travail ${x} ? (La suppression physique ne peut pas être récupérée)",

8
app/appearance/langs/zh_CHT.json
View file

@ -1,6 +1,14 @@
{
"lockEdit": "鎖定編輯",
"unlockEdit": "解除鎖定",
"defaultMargin": "默認",
"noneMargin": "無",
"minimalMargin": "最小",
"customMargin": "自定義",
"marginTop": "上",
"marginRight": "右",
"marginBottom": "下",
"marginLeft": "左",
"enable": "啟用",
"disable": "禁用",
"removeWorkspacePhysically": "是否物理刪除工作空間 ${x} 的數據？（物理刪除無法恢復）",

8
app/appearance/langs/zh_CN.json
View file

@ -1,6 +1,14 @@
{
"lockEdit": "锁定编辑",
"unlockEdit": "解除锁定",
"defaultMargin": "默认",
"noneMargin": "无",
"minimalMargin": "最小",
"customMargin": "自定义",
"marginTop": "上",
"marginRight": "右",
"marginBottom": "下",
"marginLeft": "左",
"enable": "启用",
"disable": "禁用",
"removeWorkspacePhysically": "是否物理删除工作空间 ${x} 的数据？（物理删除无法恢复）",

16
app/src/protyle/export/index.ts
View file

@ -171,23 +171,23 @@ const renderPDF = (id: string) => {
</div>
<span class="fn__hr"></span>
<select class="b3-select" id="marginsType">
<option ${localData.marginType === "default" ? "selected" : ""} value="default">Default</option>
<option ${localData.marginType === "none" ? "selected" : ""} value="none">None</option>
<option ${localData.marginType === "printableArea" ? "selected" : ""} value="printableArea">Minimal</option>
<option ${localData.marginType === "custom" ? "selected" : ""} value="custom">${window.siyuan.languages.custom}</option>
<option ${localData.marginType === "default" ? "selected" : ""} value="default">${window.siyuan.languages.defaultMargin}</option>
<option ${localData.marginType === "none" ? "selected" : ""} value="none">${window.siyuan.languages.noneMargin}</option>
<option ${localData.marginType === "printableArea" ? "selected" : ""} value="printableArea">${window.siyuan.languages.minimalMargin}</option>
<option ${localData.marginType === "custom" ? "selected" : ""} value="custom">${window.siyuan.languages.customMargin}</option>
</select>
<div class="${localData.marginType === "custom" ? "" : "fn__none"}">
<span class="fn__hr"></span>
<div>Top</div>
<div>${window.siyuan.languages.marginTop}</div>
<input id="marginsTop" class="b3-text-field fn__block" value="${localData.marginTop || 0}" type="number" min="0" step="0.01">
<span class="fn__hr"></span>
<div>Right</div>
<div>${window.siyuan.languages.marginRight}</div>
<input id="marginsRight" class="b3-text-field fn__block" value="${localData.marginRight || 0}" type="number" min="0" step="0.01">
<span class="fn__hr"></span>
<div>Bottom</div>
<div>${window.siyuan.languages.marginBottom}</div>
<input id="marginsBottom" class="b3-text-field fn__block" value="${localData.marginBottom || 0}" type="number" min="0" step="0.01">
<span class="fn__hr"></span>
<div>Left</div>
<div>${window.siyuan.languages.marginLeft}</div>
<input id="marginsLeft" class="b3-text-field fn__block" value="${localData.marginLeft || 0}" type="number" min="0" step="0.01">
</div>
</label>