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
This commit is contained in:
Vanessa 2023-02-08 18:31:49 +08:00
commit 7fab4d0509
6 changed files with 30 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,9 @@
{
"chooseSyncDirection": "Choose sync direction",
"uploadData2Cloud": "\uD83D\uDCE4 Upload data to cloud",
"uploadData2CloudTip": "Overwrite cloud data based on local data",
"downloadDataFromCloud": "\uD83D\uDCE5 Download data from cloud",
"downloadDataFromCloudTip": "Overwrite local data based on cloud data",
"targetBlockID": "Target Block ID",
"transferBlockRefTip": "Transfer all references from this block to the target block",
"transferBlockRef": "Transfer Reference",

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

@ -1,4 +1,9 @@
{
"chooseSyncDirection": "Elegir dirección de sincronización",
"uploadData2Cloud": "\uD83D\uDCE4 Subir datos a la nube",
"uploadData2CloudTip": "Sobrescribir datos en la nube basados ​​en datos locales",
"downloadDataFromCloud": "\uD83D\uDCE5 Descargar datos de la nube",
"downloadDataFromCloudTip": "Sobrescribir datos locales basados ​​en datos de la nube",
"targetBlockID": "Id. de bloque objetivo",
"transferBlockRefTip": "Transferir todas las referencias de este bloque al bloque de destino",
"transferBlockRef": "Transferencia de referencia",

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

@ -1,4 +1,9 @@
{
"chooseSyncDirection": "Choisir la direction de synchronisation",
"uploadData2Cloud": "\uD83D\uDCE4 Télécharger des données dans le cloud",
"uploadData2CloudTip": "Écraser les données cloud basées sur les données locales",
"downloadDataFromCloud": "\uD83D\uDCE5 Télécharger des données depuis le cloud",
"downloadDataFromCloudTip": "Écraser les données locales basées sur les données du cloud",
"targetBlockID": "Identifiant du bloc cible",
"transferBlockRefTip": "Transférer toutes les références de ce bloc vers le bloc cible",
"transferBlockRef": "Référence de transfert",

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

@ -1,4 +1,9 @@
{
"chooseSyncDirection": "選擇同步方向",
"uploadData2Cloud": "\uD83D\uDCE4 將數據上傳到雲端",
"uploadData2CloudTip": "以本地數據為準覆蓋雲端數據",
"downloadDataFromCloud": "\uD83D\uDCE5 從雲端下載數據",
"downloadDataFromCloudTip": "以雲端數據為準覆蓋本地數據",
"targetBlockID": "目標塊 ID",
"transferBlockRefTip": "將該塊的所有引用轉移到目標塊上",
"transferBlockRef": "轉移引用",

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

@ -1,4 +1,9 @@
{
"chooseSyncDirection": "选择同步方向",
"uploadData2Cloud": "\uD83D\uDCE4 将数据上传到云端",
"uploadData2CloudTip": "以本地数据为准覆盖云端数据",
"downloadDataFromCloud": "\uD83D\uDCE5 从云端下载数据",
"downloadDataFromCloudTip": "以云端数据为准覆盖本地数据",
"targetBlockID": "目标块 ID",
"transferBlockRefTip": "将该块的所有引用转移到目标块上",
"transferBlockRef": "转移引用",

10
app/src/sync/syncGuide.ts
View file

@ -142,22 +142,22 @@ export const syncGuide = (element?: Element) => {
return;
}
const manualDialog = new Dialog({
title: window.siyuan.languages.syncMode3,
title: window.siyuan.languages.chooseSyncDirection,
content: `<div class="b3-dialog__content">
<label class="fn__flex b3-label">
<input type="radio" name="upload" value="true">
<span class="fn__space"></span>
<div>
upload
<div class="b3-label__text">xxxx</div>
${window.siyuan.languages.uploadData2Cloud}
<div class="b3-label__text">${window.siyuan.languages.uploadData2CloudTip}</div>
</div>
</label>
<label class="fn__flex b3-label">
<input type="radio" name="upload" value="false">
<span class="fn__space"></span>
<div>
download
<div class="b3-label__text">xxxx</div>
${window.siyuan.languages.downloadDataFromCloud}
<div class="b3-label__text">${window.siyuan.languages.downloadDataFromCloudTip}</div>
</div>
</label>
</div>