Merge current main into Simplified Chinese translations

src/common/messagesJson/zh.json

@@ -172,7 +172,9 @@
     "How to display network errors when the sync server is unreachable.": "当同步服务器不可达时，如何显示网络错误。",
     "How would you like to configure the connection to your server?": "你希望如何配置与服务器的连接？",
     "I am adding a device to an existing synchronisation setup": "我要将设备加入现有同步配置",
+    "I am ready, unlock the database": "我已准备好，立即解锁数据库",
     "I am setting this up for the first time": "我是第一次进行设置",
+    "I have made a backup, mark this device as resolved": "我已完成备份，将此设备标记为“已确认”",
     "I know my server details, let me enter them": "我知道服务器详情，让我手动输入",
     "If disabled(toggled), chunks will be split on the UI thread (Previous behaviour).": "如果禁用(切换),chunks 将在 UI 线程上分割(以前的行为)",
     "If enabled per-filed efficient customization sync will be used. We need a small migration when enabling this. And all devices should be updated to v0.23.18. Once we enabled this, we lost a compatibility with old versions.": "如果启用,将使用基于文件的、高效的自定义同步。启用此功能需要进行一次小的迁移。所有设备都应更新到 v0.23.18。一旦启用此功能,我们将失去与旧版本的兼容性",
@@ -769,11 +771,13 @@
     "The maximum number of chunks that can be incubated within the document. Chunks exceeding this number will immediately graduate to independent chunks.": "文档中可以孵化的数据块的最大数量。超过此数量的数据块将立即成为独立数据块 ",
     "The maximum total size of chunks that can be incubated within the document. Chunks exceeding this size will immediately graduate to independent chunks.": "文档中可以孵化的数据块的最大总大小。超过此大小的数据块将立即成为独立数据块 ",
     "The minimum interval for automatic synchronisation on event.": "基于事件自动同步的最小间隔。",
+    "The remote database is locked for synchronisation to prevent vault corruption because this device is not marked as 'resolved'. Please back up your vault, reset the local database, and select 'Mark this device as resolved'. This warning will persist until replication confirms the device is resolved.": "为防止数据仓库损坏，由于此设备尚未标记为“已确认”，远程数据库已被锁定，暂停同步。请先备份你的仓库、重置本地数据库，然后选择“将此设备标记为已确认”。在复制过程确认此设备已完成确认之前，此警告会持续显示。",
     "This feature enables direct synchronisation between devices. No server is required, but both devices must be online at the same time for synchronisation to occur, and some features may be limited. Internet connection is only required to signalling (detecting peers) and not for data transfer.": "此功能可在设备之间直接同步，无需服务器；但同步时两台设备必须同时在线，且部分功能可能受限。互联网连接仅用于信令（发现对端），不用于数据传输。",
     "This is an advanced option for users who do not have a URI or who wish to configure detailed settings.": "这是面向没有 URI 或希望手动配置详细参数的高级选项。",
     "This is the most suitable synchronisation method for the design. All functions are available. You must have set up a CouchDB instance.": "这是最符合当前设计的同步方式，所有功能均可用。你需要事先部署好 CouchDB 实例。",
     "This passphrase will not be copied to another device. It will be set to `Default` until you configure it again.": "此密码不会复制到另一台设备。在您再次配置之前,它将设置为 `Default` ",
     "This will recreate chunks for all files. If there were missing chunks, this may fix the errors.": "这会为所有文件重新生成 chunks。如果之前存在缺失的 chunks，这可能修复相关错误。",
+    "To prevent unwanted vault corruption, the remote database has been locked for synchronisation. (This device is marked as 'resolved'.) When all your devices are marked as 'resolved', unlock the database. This warning will continue to appear until replication confirms the device is resolved.": "为防止意外的数据仓库损坏，远程数据库已被锁定，暂停同步。（此设备已被标记为“已确认”）当你的所有设备都标记为“已确认”后，再解锁数据库。在复制过程确认此设备已完成确认之前，此警告会持续显示。",
     "TweakMismatchResolve.Action.Dismiss": "Dismiss",
     "TweakMismatchResolve.Action.UseConfigured": "Use configured settings",
     "TweakMismatchResolve.Action.UseMine": "Update remote database settings",
@@ -890,10 +894,6 @@
     "Ui.Settings.Maintenance.Scram": "紧急处理",
     "Ui.Settings.Maintenance.SendChunks": "发送数据块",
     "Ui.Settings.Maintenance.Syncing": "同步",
-    "Ui.Settings.Maintenance.WarningLockedReadyAction": "我已准备好，立即解锁数据库",
-    "Ui.Settings.Maintenance.WarningLockedReadyText": "为防止意外的数据仓库损坏，远程数据库已被锁定，暂停同步。（此设备已被标记为“已确认”）当你的所有设备都标记为“已确认”后，再解锁数据库。在复制过程确认此设备已完成确认之前，此警告会持续显示。",
-    "Ui.Settings.Maintenance.WarningLockedResolveAction": "我已完成备份，将此设备标记为“已确认”",
-    "Ui.Settings.Maintenance.WarningLockedResolveText": "为防止数据仓库损坏，由于此设备尚未标记为“已确认”，远程数据库已被锁定，暂停同步。请先备份你的仓库、重置本地数据库，然后选择“将此设备标记为已确认”。在复制过程确认此设备已完成确认之前，此警告会持续显示。",
     "Ui.Settings.Maintenance.WriteRedFlagAndRestart": "标记并重启",
     "Ui.Settings.Patches.CompatibilityConflict": "兼容性（冲突行为）",
     "Ui.Settings.Patches.CompatibilityDatabase": "兼容性（数据库结构）",