mirror of
https://github.com/vrtmrz/obsidian-livesync.git
synced 2026-07-25 14:02:58 +00:00
Clarify remote setup and verify manual CouchDB onboarding
This commit is contained in:
@@ -8810,15 +8810,15 @@ export const allMessages: Readonly<Record<string, Readonly<Record<string, string
|
||||
zh: "你正在将此设备加入已有同步配置。",
|
||||
},
|
||||
"Ui.SetupWizard.SelectExisting.ManualOption": {
|
||||
def: "Enter the server information manually",
|
||||
def: "Configure a remote manually",
|
||||
zh: "手动输入服务器信息",
|
||||
},
|
||||
"Ui.SetupWizard.SelectExisting.ManualOptionDesc": {
|
||||
def: "Configure the same server information as your other devices again manually. This is intended only for advanced users.",
|
||||
def: "Configure the same remote as your other devices again manually. This is intended only for advanced users.",
|
||||
zh: "手动重新配置与你其他设备相同的服务器信息。此方式仅适用于高级用户。",
|
||||
},
|
||||
"Ui.SetupWizard.SelectExisting.ProceedManual": {
|
||||
def: "I know my server details, let me enter them",
|
||||
def: "Proceed with manual configuration",
|
||||
zh: "我知道服务器信息,让我手动输入",
|
||||
},
|
||||
"Ui.SetupWizard.SelectExisting.ProceedQr": {
|
||||
@@ -8854,19 +8854,19 @@ export const allMessages: Readonly<Record<string, Readonly<Record<string, string
|
||||
zh: "设备设置方式",
|
||||
},
|
||||
"Ui.SetupWizard.SelectNew.Guidance": {
|
||||
def: "We will now proceed with the server configuration.",
|
||||
def: "We will now configure the synchronisation connection.",
|
||||
zh: "接下来将继续配置服务器连接信息。",
|
||||
},
|
||||
"Ui.SetupWizard.SelectNew.ManualOption": {
|
||||
def: "Enter the server information manually",
|
||||
def: "Configure a remote manually",
|
||||
zh: "手动输入服务器信息",
|
||||
},
|
||||
"Ui.SetupWizard.SelectNew.ManualOptionDesc": {
|
||||
def: "This is an advanced option for users who do not have a Setup URI or who want to configure detailed settings.",
|
||||
def: "This is an advanced option for users who do not have a Setup URI or who want to configure detailed settings. You can also use it for P2P synchronisation instead of CouchDB or S3-compatible Object Storage.",
|
||||
zh: "如果你没有 Setup URI,或希望自行配置更详细的参数,可选择此高级选项。",
|
||||
},
|
||||
"Ui.SetupWizard.SelectNew.ProceedManual": {
|
||||
def: "I know my server details, let me enter them",
|
||||
def: "Proceed with manual configuration",
|
||||
zh: "我知道服务器信息,让我手动输入",
|
||||
},
|
||||
"Ui.SetupWizard.SelectNew.ProceedSetupUri": {
|
||||
@@ -8874,7 +8874,7 @@ export const allMessages: Readonly<Record<string, Readonly<Record<string, string
|
||||
zh: "使用 Setup URI 继续",
|
||||
},
|
||||
"Ui.SetupWizard.SelectNew.Question": {
|
||||
def: "How would you like to configure the connection to your server?",
|
||||
def: "How would you like to configure this synchronisation connection?",
|
||||
zh: "你希望如何配置服务器连接?",
|
||||
},
|
||||
"Ui.SetupWizard.SelectNew.SetupUriOption": {
|
||||
@@ -8882,7 +8882,7 @@ export const allMessages: Readonly<Record<string, Readonly<Record<string, string
|
||||
zh: "使用 Setup URI(推荐)",
|
||||
},
|
||||
"Ui.SetupWizard.SelectNew.SetupUriOptionDesc": {
|
||||
def: "A Setup URI is a single string containing your server address and authentication details. If one was generated by your server installation script, it provides a simple and secure configuration method.",
|
||||
def: "A Setup URI is a single string containing connection and authentication details. When one is available from a setup script, it provides a simple and secure configuration method.",
|
||||
zh: "Setup URI 是一段包含服务器地址和认证信息的文本。如果你的服务器安装脚本已经生成了它,这是最简单且安全的配置方式。",
|
||||
},
|
||||
"Ui.SetupWizard.SelectNew.Title": {
|
||||
@@ -8890,11 +8890,11 @@ export const allMessages: Readonly<Record<string, Readonly<Record<string, string
|
||||
zh: "连接方式",
|
||||
},
|
||||
"Ui.SetupWizard.SetupRemote.BucketOption": {
|
||||
def: "S3/MinIO/R2 Object Storage",
|
||||
def: "S3-compatible Object Storage",
|
||||
zh: "S3/MinIO/R2 对象存储",
|
||||
},
|
||||
"Ui.SetupWizard.SetupRemote.BucketOptionDesc": {
|
||||
def: "Synchronisation using journal files. You must already have an S3/MinIO/R2 compatible object storage service set up.",
|
||||
def: "Synchronisation using journal files. You must already have an S3-compatible Object Storage service set up, such as Amazon S3, MinIO, or Cloudflare R2.",
|
||||
zh: "使用日志文件进行同步。你需要先准备好兼容 S3/MinIO/R2 的对象存储服务。",
|
||||
},
|
||||
"Ui.SetupWizard.SetupRemote.CouchDbOptionDesc": {
|
||||
@@ -8902,11 +8902,11 @@ export const allMessages: Readonly<Record<string, Readonly<Record<string, string
|
||||
zh: "这是当前设计下最适合的同步方式,所有功能都可用。你需要先准备好 CouchDB 实例。",
|
||||
},
|
||||
"Ui.SetupWizard.SetupRemote.Guidance": {
|
||||
def: "Please select the type of server you are connecting to.",
|
||||
def: "Select the remote type for this synchronisation setup.",
|
||||
zh: "请选择你要连接的服务器类型。",
|
||||
},
|
||||
"Ui.SetupWizard.SetupRemote.P2POption": {
|
||||
def: "Peer-to-Peer only",
|
||||
def: "Peer-to-Peer (P2P)",
|
||||
zh: "仅点对点",
|
||||
},
|
||||
"Ui.SetupWizard.SetupRemote.P2POptionDesc": {
|
||||
@@ -8914,7 +8914,7 @@ export const allMessages: Readonly<Record<string, Readonly<Record<string, string
|
||||
zh: "启用设备之间的直接同步。无需服务器,但两台设备必须同时在线,且部分功能可能受限。互联网连接仅用于信令,不用于传输数据。",
|
||||
},
|
||||
"Ui.SetupWizard.SetupRemote.ProceedBucket": {
|
||||
def: "Continue to S3/MinIO/R2 setup",
|
||||
def: "Continue to Object Storage setup",
|
||||
zh: "继续配置 S3/MinIO/R2",
|
||||
},
|
||||
"Ui.SetupWizard.SetupRemote.ProceedCouchDb": {
|
||||
@@ -8922,11 +8922,11 @@ export const allMessages: Readonly<Record<string, Readonly<Record<string, string
|
||||
zh: "继续配置 CouchDB",
|
||||
},
|
||||
"Ui.SetupWizard.SetupRemote.ProceedP2P": {
|
||||
def: "Continue to Peer-to-Peer only setup",
|
||||
def: "Continue to P2P setup",
|
||||
zh: "继续配置仅点对点模式",
|
||||
},
|
||||
"Ui.SetupWizard.SetupRemote.Title": {
|
||||
def: "Enter Server Information",
|
||||
def: "Choose a synchronisation remote",
|
||||
zh: "输入服务器信息",
|
||||
},
|
||||
"Unique name between all synchronized devices. To edit this setting, please disable customization sync once.": {
|
||||
|
||||
@@ -1074,9 +1074,9 @@
|
||||
"Ui.SetupWizard.RebuildEverythingP2P.Proceed": "I Understand, Prepare This Device",
|
||||
"Ui.SetupWizard.RebuildEverythingP2P.Title": "Final Confirmation: Prepare This Device for P2P",
|
||||
"Ui.SetupWizard.SelectExisting.Guidance": "You are adding this device to an existing synchronisation setup.",
|
||||
"Ui.SetupWizard.SelectExisting.ManualOption": "Enter the server information manually",
|
||||
"Ui.SetupWizard.SelectExisting.ManualOptionDesc": "Configure the same server information as your other devices again manually. This is intended only for advanced users.",
|
||||
"Ui.SetupWizard.SelectExisting.ProceedManual": "I know my server details, let me enter them",
|
||||
"Ui.SetupWizard.SelectExisting.ManualOption": "Configure a remote manually",
|
||||
"Ui.SetupWizard.SelectExisting.ManualOptionDesc": "Configure the same remote as your other devices again manually. This is intended only for advanced users.",
|
||||
"Ui.SetupWizard.SelectExisting.ProceedManual": "Proceed with manual configuration",
|
||||
"Ui.SetupWizard.SelectExisting.ProceedQr": "Scan the QR code displayed on an active device using this device's camera.",
|
||||
"Ui.SetupWizard.SelectExisting.ProceedSetupUri": "Proceed with Setup URI",
|
||||
"Ui.SetupWizard.SelectExisting.QrOption": "Scan a QR Code (Recommended for mobile)",
|
||||
@@ -1085,25 +1085,25 @@
|
||||
"Ui.SetupWizard.SelectExisting.SetupUriOption": "Use a Setup URI (Recommended)",
|
||||
"Ui.SetupWizard.SelectExisting.SetupUriOptionDesc": "Paste the Setup URI generated from one of your active devices.",
|
||||
"Ui.SetupWizard.SelectExisting.Title": "Device Setup Method",
|
||||
"Ui.SetupWizard.SelectNew.Guidance": "We will now proceed with the server configuration.",
|
||||
"Ui.SetupWizard.SelectNew.ManualOption": "Enter the server information manually",
|
||||
"Ui.SetupWizard.SelectNew.ManualOptionDesc": "This is an advanced option for users who do not have a Setup URI or who want to configure detailed settings.",
|
||||
"Ui.SetupWizard.SelectNew.ProceedManual": "I know my server details, let me enter them",
|
||||
"Ui.SetupWizard.SelectNew.Guidance": "We will now configure the synchronisation connection.",
|
||||
"Ui.SetupWizard.SelectNew.ManualOption": "Configure a remote manually",
|
||||
"Ui.SetupWizard.SelectNew.ManualOptionDesc": "This is an advanced option for users who do not have a Setup URI or who want to configure detailed settings. You can also use it for P2P synchronisation instead of CouchDB or S3-compatible Object Storage.",
|
||||
"Ui.SetupWizard.SelectNew.ProceedManual": "Proceed with manual configuration",
|
||||
"Ui.SetupWizard.SelectNew.ProceedSetupUri": "Proceed with Setup URI",
|
||||
"Ui.SetupWizard.SelectNew.Question": "How would you like to configure the connection to your server?",
|
||||
"Ui.SetupWizard.SelectNew.Question": "How would you like to configure this synchronisation connection?",
|
||||
"Ui.SetupWizard.SelectNew.SetupUriOption": "Use a Setup URI (Recommended)",
|
||||
"Ui.SetupWizard.SelectNew.SetupUriOptionDesc": "A Setup URI is a single string containing your server address and authentication details. If one was generated by your server installation script, it provides a simple and secure configuration method.",
|
||||
"Ui.SetupWizard.SelectNew.SetupUriOptionDesc": "A Setup URI is a single string containing connection and authentication details. When one is available from a setup script, it provides a simple and secure configuration method.",
|
||||
"Ui.SetupWizard.SelectNew.Title": "Connection Method",
|
||||
"Ui.SetupWizard.SetupRemote.BucketOption": "S3/MinIO/R2 Object Storage",
|
||||
"Ui.SetupWizard.SetupRemote.BucketOptionDesc": "Synchronisation using journal files. You must already have an S3/MinIO/R2 compatible object storage service set up.",
|
||||
"Ui.SetupWizard.SetupRemote.BucketOption": "S3-compatible Object Storage",
|
||||
"Ui.SetupWizard.SetupRemote.BucketOptionDesc": "Synchronisation using journal files. You must already have an S3-compatible Object Storage service set up, such as Amazon S3, MinIO, or Cloudflare R2.",
|
||||
"Ui.SetupWizard.SetupRemote.CouchDbOptionDesc": "This is the most suitable synchronisation method for the current design. All features are available. You must already have a CouchDB instance set up.",
|
||||
"Ui.SetupWizard.SetupRemote.Guidance": "Please select the type of server you are connecting to.",
|
||||
"Ui.SetupWizard.SetupRemote.P2POption": "Peer-to-Peer only",
|
||||
"Ui.SetupWizard.SetupRemote.Guidance": "Select the remote type for this synchronisation setup.",
|
||||
"Ui.SetupWizard.SetupRemote.P2POption": "Peer-to-Peer (P2P)",
|
||||
"Ui.SetupWizard.SetupRemote.P2POptionDesc": "This enables direct synchronisation between devices. No server is required, but both devices must be online at the same time and some features may be limited. Internet connectivity is required only for signalling, not for data transfer.",
|
||||
"Ui.SetupWizard.SetupRemote.ProceedBucket": "Continue to S3/MinIO/R2 setup",
|
||||
"Ui.SetupWizard.SetupRemote.ProceedBucket": "Continue to Object Storage setup",
|
||||
"Ui.SetupWizard.SetupRemote.ProceedCouchDb": "Continue to CouchDB setup",
|
||||
"Ui.SetupWizard.SetupRemote.ProceedP2P": "Continue to Peer-to-Peer only setup",
|
||||
"Ui.SetupWizard.SetupRemote.Title": "Enter Server Information",
|
||||
"Ui.SetupWizard.SetupRemote.ProceedP2P": "Continue to P2P setup",
|
||||
"Ui.SetupWizard.SetupRemote.Title": "Choose a synchronisation remote",
|
||||
"Unique name between all synchronized devices. To edit this setting, please disable customization sync once.": "Unique name between all synchronized devices. To edit this setting, please disable customization sync once.",
|
||||
"Use a custom passphrase": "Use a custom passphrase",
|
||||
"Use a Setup URI (Recommended)": "Use a Setup URI (Recommended)",
|
||||
|
||||
@@ -934,25 +934,25 @@ P2P:
|
||||
NoKnownPeers: No peers has been detected, waiting incoming other peers...
|
||||
Note:
|
||||
description: >2-
|
||||
This replicator allows us to synchronise our vault with other devices
|
||||
using a peer-to-peer connection. We can use this to synchronise our vault
|
||||
with our other devices without using a cloud service.
|
||||
This replicator allows us to synchronise our vault with other devices
|
||||
using a peer-to-peer connection. We can use this to synchronise our vault
|
||||
with our other devices without using a cloud service.
|
||||
|
||||
This replicator is based on Trystero. It also uses a signalling server to
|
||||
establish a connection between devices. The signalling server is used to
|
||||
exchange connection information between devices. It does (or,should) not
|
||||
know or store any of our data.
|
||||
This replicator is based on Trystero. It also uses a signalling server to
|
||||
establish a connection between devices. The signalling server is used to
|
||||
exchange connection information between devices. It does (or,should) not
|
||||
know or store any of our data.
|
||||
|
||||
|
||||
The signalling server can be hosted by anyone. This is just a Nostr relay.
|
||||
For the sake of simplicity and checking the behaviour of the replicator,
|
||||
an instance of the signalling server is hosted by vrtmrz. You can use the
|
||||
experimental server provided by vrtmrz, or you can use any other server.
|
||||
The signalling server can be hosted by anyone. This is just a Nostr relay.
|
||||
For the sake of simplicity and checking the behaviour of the replicator,
|
||||
an instance of the signalling server is hosted by vrtmrz. You can use the
|
||||
experimental server provided by vrtmrz, or you can use any other server.
|
||||
|
||||
|
||||
By the way, even if the signalling server does not store our data, it can
|
||||
see the connection information of some of our devices. Please be aware of
|
||||
this. Also, be cautious when using the server provided by someone else.
|
||||
By the way, even if the signalling server does not store our data, it can
|
||||
see the connection information of some of our devices. Please be aware of
|
||||
this. Also, be cautious when using the server provided by someone else.
|
||||
important_note: Peer-to-Peer Replicator.
|
||||
important_note_sub: This feature is still on the bleeding edge. Please be aware
|
||||
that ensure your data is backed up before using this feature. And, we
|
||||
@@ -1895,9 +1895,9 @@ Ui:
|
||||
Guidance: We will now guide you through a few questions to simplify the synchronisation setup.
|
||||
SelectExisting:
|
||||
Guidance: You are adding this device to an existing synchronisation setup.
|
||||
ManualOption: Enter the server information manually
|
||||
ManualOptionDesc: Configure the same server information as your other devices again manually. This is intended only for advanced users.
|
||||
ProceedManual: I know my server details, let me enter them
|
||||
ManualOption: Configure a remote manually
|
||||
ManualOptionDesc: Configure the same remote as your other devices again manually. This is intended only for advanced users.
|
||||
ProceedManual: Proceed with manual configuration
|
||||
ProceedQr: Scan the QR code displayed on an active device using this device's camera.
|
||||
ProceedSetupUri: Proceed with Setup URI
|
||||
Question: Please select a method to import the settings from another device.
|
||||
@@ -1907,14 +1907,14 @@ Ui:
|
||||
SetupUriOptionDesc: Paste the Setup URI generated from one of your active devices.
|
||||
Title: Device Setup Method
|
||||
SelectNew:
|
||||
Guidance: We will now proceed with the server configuration.
|
||||
ManualOption: Enter the server information manually
|
||||
ManualOptionDesc: This is an advanced option for users who do not have a Setup URI or who want to configure detailed settings.
|
||||
ProceedManual: I know my server details, let me enter them
|
||||
Guidance: We will now configure the synchronisation connection.
|
||||
ManualOption: Configure a remote manually
|
||||
ManualOptionDesc: This is an advanced option for users who do not have a Setup URI or who want to configure detailed settings. You can also use it for P2P synchronisation instead of CouchDB or S3-compatible Object Storage.
|
||||
ProceedManual: Proceed with manual configuration
|
||||
ProceedSetupUri: Proceed with Setup URI
|
||||
Question: How would you like to configure the connection to your server?
|
||||
Question: How would you like to configure this synchronisation connection?
|
||||
SetupUriOption: Use a Setup URI (Recommended)
|
||||
SetupUriOptionDesc: A Setup URI is a single string containing your server address and authentication details. If one was generated by your server installation script, it provides a simple and secure configuration method.
|
||||
SetupUriOptionDesc: A Setup URI is a single string containing connection and authentication details. When one is available from a setup script, it provides a simple and secure configuration method.
|
||||
Title: Connection Method
|
||||
OutroAskUserMode:
|
||||
CompatibleOption: The remote is already set up, and the configuration is compatible (or became compatible through this operation).
|
||||
@@ -1951,13 +1951,13 @@ Ui:
|
||||
Proceed: I Understand, Prepare This Device
|
||||
Title: "Final Confirmation: Prepare This Device for P2P"
|
||||
SetupRemote:
|
||||
BucketOption: S3/MinIO/R2 Object Storage
|
||||
BucketOptionDesc: Synchronisation using journal files. You must already have an S3/MinIO/R2 compatible object storage service set up.
|
||||
BucketOption: S3-compatible Object Storage
|
||||
BucketOptionDesc: Synchronisation using journal files. You must already have an S3-compatible Object Storage service set up, such as Amazon S3, MinIO, or Cloudflare R2.
|
||||
CouchDbOptionDesc: This is the most suitable synchronisation method for the current design. All features are available. You must already have a CouchDB instance set up.
|
||||
Guidance: Please select the type of server you are connecting to.
|
||||
P2POption: Peer-to-Peer only
|
||||
Guidance: Select the remote type for this synchronisation setup.
|
||||
P2POption: Peer-to-Peer (P2P)
|
||||
P2POptionDesc: This enables direct synchronisation between devices. No server is required, but both devices must be online at the same time and some features may be limited. Internet connectivity is required only for signalling, not for data transfer.
|
||||
ProceedBucket: Continue to S3/MinIO/R2 setup
|
||||
ProceedBucket: Continue to Object Storage setup
|
||||
ProceedCouchDb: Continue to CouchDB setup
|
||||
ProceedP2P: Continue to Peer-to-Peer only setup
|
||||
Title: Enter Server Information
|
||||
ProceedP2P: Continue to P2P setup
|
||||
Title: Choose a synchronisation remote
|
||||
|
||||
Reference in New Issue
Block a user