diff --git a/src/common/messages/combinedMessages.prod.ts b/src/common/messages/combinedMessages.prod.ts
index 65fc8dcb..d5fe8140 100644
--- a/src/common/messages/combinedMessages.prod.ts
+++ b/src/common/messages/combinedMessages.prod.ts
@@ -2737,6 +2737,14 @@ export const allMessages: Readonly<Record<string, Readonly<Record<string, string
         zh: "我要将设备加入现有同步配置",
         "zh-tw": "我要將裝置加入既有同步設定",
     },
+    "I am ready, unlock the database": {
+        def: "I am ready, unlock the database",
+        es: "Estoy listo, desbloquear la base de datos",
+        ko: "준비되었습니다. 데이터베이스 잠금 해제",
+        ru: "Я готов, разблокировать базу",
+        zh: "我已准备好，立即解锁数据库",
+        "zh-tw": "我已準備好，解鎖資料庫",
+    },
     "I am setting this up for the first time": {
         def: "I am setting this up for the first time",
         es: "Estoy configurando esto por primera vez",
@@ -2774,6 +2782,14 @@ export const allMessages: Readonly<Record<string, Readonly<Record<string, string
         ru: "Я сделал резервную копию хранилища.",
         "zh-tw": "我已經備份了我的 Vault。",
     },
+    "I have made a backup, mark this device as resolved": {
+        def: "I have made a backup, mark this device as resolved",
+        es: "He hecho una copia de seguridad, marcar este dispositivo como resuelto",
+        ko: "백업했습니다. 이 기기를 해결됨으로 표시",
+        ru: "Я сделал резервную копию, отметить это устройство как разрешённое",
+        zh: "我已完成备份，将此设备标记为“已确认”",
+        "zh-tw": "我已完成備份，將此裝置標記為已處理",
+    },
     "I know my server details, let me enter them": {
         def: "I know my server details, let me enter them",
         es: "Conozco los datos de mi servidor; déjame introducirlos",
@@ -10273,6 +10289,16 @@ export const allMessages: Readonly<Record<string, Readonly<Record<string, string
         zh: "基于事件自动同步的最小间隔。",
         "zh-tw": "事件觸發自動同步的最小間隔。",
     },
+    "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.":
+        {
+            def: "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.",
+            es: "La base de datos remota está bloqueada para la sincronización a fin de evitar que la bóveda se corrompa, porque este dispositivo no está marcado como «resuelto». Haz una copia de seguridad de tu bóveda, restablece la base de datos local y selecciona «Marcar este dispositivo como resuelto». Este aviso seguirá apareciendo hasta que la replicación confirme que el dispositivo está resuelto.",
+            ko: "이 기기가 '해결됨'으로 표시되어 있지 않아, 보관함 손상을 막기 위해 원격 데이터베이스가 동기화 잠금 상태입니다. 보관함을 백업하고 로컬 데이터베이스를 재설정한 뒤 '이 기기를 해결됨으로 표시'를 선택해 주세요. 이 경고는 복제를 통해 기기가 해결되었음이 확인될 때까지 계속 표시됩니다.",
+            ru: "Удалённая база заблокирована для синхронизации, чтобы хранилище не испортилось: это устройство не помечено как «разрешённое». Сделайте резервную копию хранилища, сбросьте локальную базу и выберите «Отметить это устройство как разрешённое». Предупреждение будет появляться, пока репликация не подтвердит, что устройство разрешено.",
+            zh: "为防止数据仓库损坏，由于此设备尚未标记为“已确认”，远程数据库已被锁定，暂停同步。请先备份你的仓库、重置本地数据库，然后选择“将此设备标记为已确认”。在复制过程确认此设备已完成确认之前，此警告会持续显示。",
+            "zh-tw":
+                "由於此裝置尚未標記為「已處理」，為避免 Vault 損毀，遠端資料庫已鎖定同步。請先備份你的 Vault、重設本機資料庫，然後選擇「將此裝置標記為已處理」。在複寫程序確認此裝置已處理完畢之前，這則警告會持續顯示。",
+        },
     "The remote is already set up, and the configuration is compatible (or got compatible by this operation).": {
         def: "The remote is already set up, and the configuration is compatible (or got compatible by this operation).",
         es: "El remoto ya está configurado y la configuración es compatible (o pasa a serlo con esta operación).",
@@ -10474,6 +10500,16 @@ export const allMessages: Readonly<Record<string, Readonly<Record<string, string
         ru: "Чтобы создавалось меньше новых конфликтов",
         "zh-tw": "為了盡量減少新增衝突",
     },
+    "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.":
+        {
+            def: "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.",
+            es: "Para evitar que la bóveda se corrompa, la base de datos remota se ha bloqueado para la sincronización. (Este dispositivo está marcado como «resuelto».) Cuando todos tus dispositivos estén marcados como «resueltos», desbloquea la base de datos. Este aviso seguirá apareciendo hasta que la replicación confirme que el dispositivo está resuelto.",
+            ko: "의도치 않은 보관함 손상을 막기 위해 원격 데이터베이스가 동기화 잠금 상태입니다. (이 기기는 '해결됨'으로 표시되어 있습니다.) 모든 기기가 '해결됨'으로 표시되면 데이터베이스 잠금을 해제하세요. 이 경고는 복제를 통해 기기가 해결되었음이 확인될 때까지 계속 표시됩니다.",
+            ru: "Чтобы хранилище не испортилось, удалённая база заблокирована для синхронизации. (Это устройство помечено как «разрешённое».) Когда все ваши устройства будут помечены как «разрешённые», разблокируйте базу. Предупреждение будет появляться, пока репликация не подтвердит, что устройство разрешено.",
+            zh: "为防止意外的数据仓库损坏，远程数据库已被锁定，暂停同步。（此设备已被标记为“已确认”）当你的所有设备都标记为“已确认”后，再解锁数据库。在复制过程确认此设备已完成确认之前，此警告会持续显示。",
+            "zh-tw":
+                "為避免 Vault 發生非預期的損毀，遠端資料庫已鎖定同步。（此裝置已標記為「已處理」。）當你所有的裝置都標記為「已處理」後，即可解鎖資料庫。在複寫程序確認此裝置已處理完畢之前，這則警告會持續顯示。",
+        },
     "Transfer Tweak": {
         def: "Transfer Tweak",
         es: "Ajustes de transferencia",
@@ -11555,40 +11591,6 @@ export const allMessages: Readonly<Record<string, Readonly<Record<string, string
         zh: "同步",
         "zh-tw": "同步中",
     },
-    "Ui.Settings.Maintenance.WarningLockedReadyAction": {
-        def: "I am ready, unlock the database",
-        es: "Estoy listo, desbloquear la base de datos",
-        ko: "준비되었습니다. 데이터베이스 잠금 해제",
-        ru: "Я готов, разблокировать базу",
-        zh: "我已准备好，立即解锁数据库",
-        "zh-tw": "我已準備好，解鎖資料庫",
-    },
-    "Ui.Settings.Maintenance.WarningLockedReadyText": {
-        def: "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.",
-        es: "Para evitar que la bóveda se corrompa, la base de datos remota se ha bloqueado para la sincronización. (Este dispositivo está marcado como «resuelto».) Cuando todos tus dispositivos estén marcados como «resueltos», desbloquea la base de datos. Este aviso seguirá apareciendo hasta que la replicación confirme que el dispositivo está resuelto.",
-        ko: "의도치 않은 보관함 손상을 막기 위해 원격 데이터베이스가 동기화 잠금 상태입니다. (이 기기는 '해결됨'으로 표시되어 있습니다.) 모든 기기가 '해결됨'으로 표시되면 데이터베이스 잠금을 해제하세요. 이 경고는 복제를 통해 기기가 해결되었음이 확인될 때까지 계속 표시됩니다.",
-        ru: "Чтобы хранилище не испортилось, удалённая база заблокирована для синхронизации. (Это устройство помечено как «разрешённое».) Когда все ваши устройства будут помечены как «разрешённые», разблокируйте базу. Предупреждение будет появляться, пока репликация не подтвердит, что устройство разрешено.",
-        zh: "为防止意外的数据仓库损坏，远程数据库已被锁定，暂停同步。（此设备已被标记为“已确认”）当你的所有设备都标记为“已确认”后，再解锁数据库。在复制过程确认此设备已完成确认之前，此警告会持续显示。",
-        "zh-tw":
-            "為避免 Vault 發生非預期的損毀，遠端資料庫已鎖定同步。（此裝置已標記為「已處理」。）當你所有的裝置都標記為「已處理」後，即可解鎖資料庫。在複寫程序確認此裝置已處理完畢之前，這則警告會持續顯示。",
-    },
-    "Ui.Settings.Maintenance.WarningLockedResolveAction": {
-        def: "I have made a backup, mark this device as resolved",
-        es: "He hecho una copia de seguridad, marcar este dispositivo como resuelto",
-        ko: "백업했습니다. 이 기기를 해결됨으로 표시",
-        ru: "Я сделал резервную копию, отметить это устройство как разрешённое",
-        zh: "我已完成备份，将此设备标记为“已确认”",
-        "zh-tw": "我已完成備份，將此裝置標記為已處理",
-    },
-    "Ui.Settings.Maintenance.WarningLockedResolveText": {
-        def: "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.",
-        es: "La base de datos remota está bloqueada para la sincronización a fin de evitar que la bóveda se corrompa, porque este dispositivo no está marcado como «resuelto». Haz una copia de seguridad de tu bóveda, restablece la base de datos local y selecciona «Marcar este dispositivo como resuelto». Este aviso seguirá apareciendo hasta que la replicación confirme que el dispositivo está resuelto.",
-        ko: "이 기기가 '해결됨'으로 표시되어 있지 않아, 보관함 손상을 막기 위해 원격 데이터베이스가 동기화 잠금 상태입니다. 보관함을 백업하고 로컬 데이터베이스를 재설정한 뒤 '이 기기를 해결됨으로 표시'를 선택해 주세요. 이 경고는 복제를 통해 기기가 해결되었음이 확인될 때까지 계속 표시됩니다.",
-        ru: "Удалённая база заблокирована для синхронизации, чтобы хранилище не испортилось: это устройство не помечено как «разрешённое». Сделайте резервную копию хранилища, сбросьте локальную базу и выберите «Отметить это устройство как разрешённое». Предупреждение будет появляться, пока репликация не подтвердит, что устройство разрешено.",
-        zh: "为防止数据仓库损坏，由于此设备尚未标记为“已确认”，远程数据库已被锁定，暂停同步。请先备份你的仓库、重置本地数据库，然后选择“将此设备标记为已确认”。在复制过程确认此设备已完成确认之前，此警告会持续显示。",
-        "zh-tw":
-            "由於此裝置尚未標記為「已處理」，為避免 Vault 損毀，遠端資料庫已鎖定同步。請先備份你的 Vault、重設本機資料庫，然後選擇「將此裝置標記為已處理」。在複寫程序確認此裝置已處理完畢之前，這則警告會持續顯示。",
-    },
     "Ui.Settings.Maintenance.WriteRedFlagAndRestart": {
         def: "Flag and restart",
         es: "Marcar y reiniciar",
diff --git a/src/common/messagesJson/en.json b/src/common/messagesJson/en.json
index 104a87ed..c0ae28a6 100644
--- a/src/common/messagesJson/en.json
+++ b/src/common/messagesJson/en.json
@@ -315,11 +315,13 @@
     "How would you like to configure the connection to your server?": "How would you like to configure the connection to your server?",
     "However, This should not be enabled if you want to increase your secrecy more.": "However, This should not be enabled if you want to increase your secrecy more.",
     "I am adding a device to an existing synchronisation setup": "I am adding a device to an existing synchronisation setup",
+    "I am ready, unlock the database": "I am ready, unlock the database",
     "I am setting this up for the first time": "I am setting this up for the first time",
     "I am setting up a new server for the first time / I want to reset my existing server.": "I am setting up a new server for the first time / I want to reset my existing server.",
     "I am unable to create a backup of my Vault.": "I am unable to create a backup of my Vault.",
     "I am unable to create a backup of my Vaults.": "I am unable to create a backup of my Vaults.",
     "I have created a backup of my Vault.": "I have created a backup of my Vault.",
+    "I have made a backup, mark this device as resolved": "I have made a backup, mark this device as resolved",
     "I know my server details, let me enter them": "I know my server details, let me enter them",
     "I understand that all changes made on other smartphones or computers possibly could be lost.": "I understand that all changes made on other smartphones or computers possibly could be lost.",
     "I understand that other devices will no longer be able to synchronise, and will need to be reset the synchronisation information.": "I understand that other devices will no longer be able to synchronise, and will need to be reset the synchronisation information.",
@@ -1087,6 +1089,7 @@
     "The maximum number of chunks that can be incubated within the document. Chunks exceeding this number will immediately graduate to independent chunks.": "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 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 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.": "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.",
     "The remote is already set up, and the configuration is compatible (or got compatible by this operation).": "The remote is already set up, and the configuration is compatible (or got compatible by this operation).",
     "The Setup-URI does not appear to be valid. Please check that you have copied it correctly.": "The Setup-URI does not appear to be valid. Please check that you have copied it correctly.",
     "The Setup-URI is valid and ready to use.": "The Setup-URI is valid and ready to use.",
@@ -1113,6 +1116,7 @@
     "This will rebuild the local database on this device using the most recent data from the server. This action is designed to resolve synchronisation inconsistencies and restore correct functionality.": "This will rebuild the local database on this device using the most recent data from the server. This action is designed to resolve synchronisation inconsistencies and restore correct functionality.",
     "This will recreate chunks for all files. If there were missing chunks, this may fix the errors.": "This will recreate chunks for all files. If there were missing chunks, this may fix the errors.",
     "To minimise the creation of new conflicts": "To minimise the creation of new conflicts",
+    "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.": "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.",
     "Transfer Tweak": "Transfer Tweak",
     "TURN Credential": "TURN Credential",
     "TURN server settings are only necessary if you are behind a strict NAT or firewall that prevents direct P2P connections. In most cases, you can leave these fields blank.": "TURN server settings are only necessary if you are behind a strict NAT or firewall that prevents direct P2P connections. In most cases, you can leave these fields blank.",
@@ -1242,10 +1246,6 @@
     "Ui.Settings.Maintenance.Scram": "Scram!",
     "Ui.Settings.Maintenance.SendChunks": "Send chunks",
     "Ui.Settings.Maintenance.Syncing": "Syncing",
-    "Ui.Settings.Maintenance.WarningLockedReadyAction": "I am ready, unlock the database",
-    "Ui.Settings.Maintenance.WarningLockedReadyText": "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.",
-    "Ui.Settings.Maintenance.WarningLockedResolveAction": "I have made a backup, mark this device as resolved",
-    "Ui.Settings.Maintenance.WarningLockedResolveText": "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.",
     "Ui.Settings.Maintenance.WriteRedFlagAndRestart": "Flag and restart",
     "Ui.Settings.Patches.CompatibilityConflict": "Compatibility (Conflict Behaviour)",
     "Ui.Settings.Patches.CompatibilityDatabase": "Compatibility (Database structure)",
diff --git a/src/common/messagesJson/es.json b/src/common/messagesJson/es.json
index 7880592f..d53a08a3 100644
--- a/src/common/messagesJson/es.json
+++ b/src/common/messagesJson/es.json
@@ -316,11 +316,13 @@
     "How would you like to configure the connection to your server?": "¿Cómo quieres configurar la conexión con tu servidor?",
     "However, This should not be enabled if you want to increase your secrecy more.": "Sin embargo, esto no debería habilitarse si quieres aumentar aún más tu privacidad.",
     "I am adding a device to an existing synchronisation setup": "Estoy agregando un dispositivo a una configuración de sincronización existente",
+    "I am ready, unlock the database": "Estoy listo, desbloquear la base de datos",
     "I am setting this up for the first time": "Estoy configurando esto por primera vez",
     "I am setting up a new server for the first time / I want to reset my existing server.": "Estoy configurando un servidor nuevo por primera vez / quiero restablecer mi servidor actual.",
     "I am unable to create a backup of my Vault.": "No puedo crear una copia de seguridad de mi bóveda.",
     "I am unable to create a backup of my Vaults.": "No puedo crear una copia de seguridad de mis bóvedas.",
     "I have created a backup of my Vault.": "He creado una copia de seguridad de mi bóveda.",
+    "I have made a backup, mark this device as resolved": "He hecho una copia de seguridad, marcar este dispositivo como resuelto",
     "I know my server details, let me enter them": "Conozco los datos de mi servidor; déjame introducirlos",
     "I understand that all changes made on other smartphones or computers possibly could be lost.": "Entiendo que todos los cambios hechos en otros móviles u ordenadores podrían perderse.",
     "I understand that other devices will no longer be able to synchronise, and will need to be reset the synchronisation information.": "Entiendo que los demás dispositivos ya no podrán sincronizar y que habrá que restablecer su información de sincronización.",
@@ -1119,6 +1121,7 @@
     "The maximum number of chunks that can be incubated within the document. Chunks exceeding this number will immediately graduate to independent chunks.": "Número máximo de chunks que pueden incubarse en el documento. Excedentes se independizan",
     "The maximum total size of chunks that can be incubated within the document. Chunks exceeding this size will immediately graduate to independent chunks.": "Tamaño total máximo de chunks incubados. Excedentes se independizan",
     "The minimum interval for automatic synchronisation on event.": "Intervalo mínimo para la sincronización automática al producirse un evento.",
+    "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.": "La base de datos remota está bloqueada para la sincronización a fin de evitar que la bóveda se corrompa, porque este dispositivo no está marcado como «resuelto». Haz una copia de seguridad de tu bóveda, restablece la base de datos local y selecciona «Marcar este dispositivo como resuelto». Este aviso seguirá apareciendo hasta que la replicación confirme que el dispositivo está resuelto.",
     "The remote is already set up, and the configuration is compatible (or got compatible by this operation).": "El remoto ya está configurado y la configuración es compatible (o pasa a serlo con esta operación).",
     "The Setup-URI does not appear to be valid. Please check that you have copied it correctly.": "El Setup-URI no parece válido. Comprueba que lo hayas copiado correctamente.",
     "The Setup-URI is valid and ready to use.": "El Setup-URI es válido y está listo para usarse.",
@@ -1145,6 +1148,7 @@
     "This will rebuild the local database on this device using the most recent data from the server. This action is designed to resolve synchronisation inconsistencies and restore correct functionality.": "Esto reconstruirá la base de datos local de este dispositivo con los datos más recientes del servidor. La acción está pensada para resolver inconsistencias de sincronización y restaurar el funcionamiento correcto.",
     "This will recreate chunks for all files. If there were missing chunks, this may fix the errors.": "Esto recreará los fragmentos de todos los archivos. Si faltaban fragmentos, esto puede corregir los errores.",
     "To minimise the creation of new conflicts": "Para minimizar la creación de nuevos conflictos",
+    "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.": "Para evitar que la bóveda se corrompa, la base de datos remota se ha bloqueado para la sincronización. (Este dispositivo está marcado como «resuelto».) Cuando todos tus dispositivos estén marcados como «resueltos», desbloquea la base de datos. Este aviso seguirá apareciendo hasta que la replicación confirme que el dispositivo está resuelto.",
     "Transfer Tweak": "Ajustes de transferencia",
     "TURN Credential": "Credencial de TURN",
     "TURN server settings are only necessary if you are behind a strict NAT or firewall that prevents direct P2P connections. In most cases, you can leave these fields blank.": "Los ajustes del servidor TURN solo son necesarios si estás detrás de un NAT estricto o de un cortafuegos que impide las conexiones P2P directas. En la mayoría de los casos puedes dejar estos campos vacíos.",
@@ -1272,10 +1276,6 @@
     "Ui.Settings.Maintenance.Scram": "¡Parada de emergencia!",
     "Ui.Settings.Maintenance.SendChunks": "Enviar los chunks",
     "Ui.Settings.Maintenance.Syncing": "Sincronización",
-    "Ui.Settings.Maintenance.WarningLockedReadyAction": "Estoy listo, desbloquear la base de datos",
-    "Ui.Settings.Maintenance.WarningLockedReadyText": "Para evitar que la bóveda se corrompa, la base de datos remota se ha bloqueado para la sincronización. (Este dispositivo está marcado como «resuelto».) Cuando todos tus dispositivos estén marcados como «resueltos», desbloquea la base de datos. Este aviso seguirá apareciendo hasta que la replicación confirme que el dispositivo está resuelto.",
-    "Ui.Settings.Maintenance.WarningLockedResolveAction": "He hecho una copia de seguridad, marcar este dispositivo como resuelto",
-    "Ui.Settings.Maintenance.WarningLockedResolveText": "La base de datos remota está bloqueada para la sincronización a fin de evitar que la bóveda se corrompa, porque este dispositivo no está marcado como «resuelto». Haz una copia de seguridad de tu bóveda, restablece la base de datos local y selecciona «Marcar este dispositivo como resuelto». Este aviso seguirá apareciendo hasta que la replicación confirme que el dispositivo está resuelto.",
     "Ui.Settings.Maintenance.WriteRedFlagAndRestart": "Marcar y reiniciar",
     "Ui.Settings.Patches.CompatibilityConflict": "Compatibilidad (comportamiento ante conflictos)",
     "Ui.Settings.Patches.CompatibilityDatabase": "Compatibilidad (estructura de la base de datos)",
diff --git a/src/common/messagesJson/ko.json b/src/common/messagesJson/ko.json
index 0f4095bd..7efd0411 100644
--- a/src/common/messagesJson/ko.json
+++ b/src/common/messagesJson/ko.json
@@ -309,11 +309,13 @@
     "How would you like to configure the connection to your server?": "서버 연결을 어떻게 구성하시겠습니까?",
     "However, This should not be enabled if you want to increase your secrecy more.": "다만 기밀성을 더 높이고 싶다면 이 옵션은 활성화하지 않는 것이 좋습니다.",
     "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 am setting up a new server for the first time / I want to reset my existing server.": "새 서버를 처음 설정하거나, 기존 서버를 초기화하려고 합니다.",
     "I am unable to create a backup of my Vault.": "보관함을 백업할 수 없습니다.",
     "I am unable to create a backup of my Vaults.": "보관함들을 백업할 수 없습니다.",
     "I have created a backup of my Vault.": "보관함을 백업했습니다.",
+    "I have made a backup, mark this device as resolved": "백업했습니다. 이 기기를 해결됨으로 표시",
     "I know my server details, let me enter them": "서버 정보를 알고 있으니 직접 입력하겠습니다",
     "I understand that all changes made on other smartphones or computers possibly could be lost.": "다른 스마트폰이나 컴퓨터에서 변경한 내용이 모두 사라질 수 있다는 점을 이해합니다.",
     "I understand that other devices will no longer be able to synchronise, and will need to be reset the synchronisation information.": "다른 기기는 더 이상 동기화할 수 없게 되며, 동기화 정보를 초기화해야 한다는 점을 이해합니다.",
@@ -1068,6 +1070,7 @@
     "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.": "이 기기가 '해결됨'으로 표시되어 있지 않아, 보관함 손상을 막기 위해 원격 데이터베이스가 동기화 잠금 상태입니다. 보관함을 백업하고 로컬 데이터베이스를 재설정한 뒤 '이 기기를 해결됨으로 표시'를 선택해 주세요. 이 경고는 복제를 통해 기기가 해결되었음이 확인될 때까지 계속 표시됩니다.",
     "The remote is already set up, and the configuration is compatible (or got compatible by this operation).": "원격은 이미 설정되어 있으며, 구성도 호환됩니다(또는 이번 작업으로 호환되었습니다).",
     "The Setup-URI does not appear to be valid. Please check that you have copied it correctly.": "Setup-URI가 유효하지 않은 것으로 보입니다. 올바르게 복사했는지 확인해 주세요.",
     "The Setup-URI is valid and ready to use.": "Setup-URI가 유효하며 사용할 준비가 되었습니다.",
@@ -1092,6 +1095,7 @@
     "This will rebuild the local database on this device using the most recent data from the server. This action is designed to resolve synchronisation inconsistencies and restore correct functionality.": "서버의 최신 데이터를 사용해 이 기기의 로컬 데이터베이스를 재구축합니다. 이 작업은 동기화 불일치를 해결하고 정상적인 동작을 복구하기 위한 것입니다.",
     "This will recreate chunks for all files. If there were missing chunks, this may fix the errors.": "모든 파일의 청크를 다시 생성합니다. 누락된 청크가 있었다면 이 작업으로 오류가 해결될 수 있습니다.",
     "To minimise the creation of new conflicts": "새로운 충돌 발생을 최소화하기 위해",
+    "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.": "의도치 않은 보관함 손상을 막기 위해 원격 데이터베이스가 동기화 잠금 상태입니다. (이 기기는 '해결됨'으로 표시되어 있습니다.) 모든 기기가 '해결됨'으로 표시되면 데이터베이스 잠금을 해제하세요. 이 경고는 복제를 통해 기기가 해결되었음이 확인될 때까지 계속 표시됩니다.",
     "Transfer Tweak": "전송 조정",
     "TURN Credential": "TURN 자격 증명",
     "TURN server settings are only necessary if you are behind a strict NAT or firewall that prevents direct P2P connections. In most cases, you can leave these fields blank.": "TURN 서버 설정은 직접적인 P2P 연결을 막는 엄격한 NAT나 방화벽 뒤에 있는 경우에만 필요합니다. 대부분의 경우 이 항목들은 비워 두어도 됩니다.",
@@ -1219,10 +1223,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": "호환성 (데이터베이스 구조)",
diff --git a/src/common/messagesJson/ru.json b/src/common/messagesJson/ru.json
index 6c4dd112..b39e9262 100644
--- a/src/common/messagesJson/ru.json
+++ b/src/common/messagesJson/ru.json
@@ -325,11 +325,13 @@
     "How would you like to configure the connection to your server?": "Как вы хотите настроить подключение к серверу?",
     "However, This should not be enabled if you want to increase your secrecy more.": "Но если вам нужна повышенная скрытность, не включайте это.",
     "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 am setting up a new server for the first time / I want to reset my existing server.": "Я настраиваю новый сервер впервые / хочу сбросить существующий сервер.",
     "I am unable to create a backup of my Vault.": "Я не могу сделать резервную копию хранилища.",
     "I am unable to create a backup of my Vaults.": "Я не могу сделать резервные копии хранилищ.",
     "I have created a backup of my Vault.": "Я сделал резервную копию хранилища.",
+    "I have made a backup, mark this device as resolved": "Я сделал резервную копию, отметить это устройство как разрешённое",
     "I know my server details, let me enter them": "Я знаю параметры сервера, позвольте ввести их вручную",
     "I understand that all changes made on other smartphones or computers possibly could be lost.": "Я понимаю, что изменения на других смартфонах и компьютерах могут пропасть.",
     "I understand that other devices will no longer be able to synchronise, and will need to be reset the synchronisation information.": "Я понимаю, что другие устройства перестанут синхронизироваться и на них надо будет сбросить данные синхронизации.",
@@ -1105,6 +1107,7 @@
     "The maximum total size of chunks that can be incubated within the document.": "Максимальный общий размер инкубируемых чанков в документе.",
     "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.": "Удалённая база заблокирована для синхронизации, чтобы хранилище не испортилось: это устройство не помечено как «разрешённое». Сделайте резервную копию хранилища, сбросьте локальную базу и выберите «Отметить это устройство как разрешённое». Предупреждение будет появляться, пока репликация не подтвердит, что устройство разрешено.",
     "The remote is already set up, and the configuration is compatible (or got compatible by this operation).": "Удалённая база уже настроена, и настройки совместимы (или стали совместимы после этой операции).",
     "The Setup-URI does not appear to be valid. Please check that you have copied it correctly.": "Setup-URI выглядит неверным. Проверьте, что скопировали его правильно.",
     "The Setup-URI is valid and ready to use.": "Setup-URI верный и готов к работе.",
@@ -1132,6 +1135,7 @@
     "This will rebuild the local database on this device using the most recent data from the server. This action is designed to resolve synchronisation inconsistencies and restore correct functionality.": "Локальная база на этом устройстве будет пересобрана по самым свежим данным с сервера. Так решаются расхождения синхронизации и восстанавливается правильная работа.",
     "This will recreate chunks for all files. If there were missing chunks, this may fix the errors.": "Это пересоздаст чанки для всех файлов. Если какие-то чанки отсутствовали, это может исправить ошибки.",
     "To minimise the creation of new conflicts": "Чтобы создавалось меньше новых конфликтов",
+    "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.": "Чтобы хранилище не испортилось, удалённая база заблокирована для синхронизации. (Это устройство помечено как «разрешённое».) Когда все ваши устройства будут помечены как «разрешённые», разблокируйте базу. Предупреждение будет появляться, пока репликация не подтвердит, что устройство разрешено.",
     "Transfer Tweak": "Настройки передачи",
     "TURN Credential": "Пароль TURN",
     "TURN server settings are only necessary if you are behind a strict NAT or firewall that prevents direct P2P connections. In most cases, you can leave these fields blank.": "Настройки сервера TURN нужны только за строгим NAT или межсетевым экраном, который не даёт устройствам соединяться напрямую. Обычно эти поля можно оставить пустыми.",
@@ -1261,10 +1265,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": "Совместимость (структура базы)",
diff --git a/src/common/messagesJson/zh-tw.json b/src/common/messagesJson/zh-tw.json
index 3f75a7cf..1239e5f8 100644
--- a/src/common/messagesJson/zh-tw.json
+++ b/src/common/messagesJson/zh-tw.json
@@ -309,11 +309,13 @@
     "How would you like to configure the connection to your server?": "你希望如何設定與伺服器的連線？",
     "However, This should not be enabled if you want to increase your secrecy more.": "不過，如果你想加強保密性，不建議啟用此選項。",
     "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 am setting up a new server for the first time / I want to reset my existing server.": "我是第一次設定新的伺服器／我想要重設現有的伺服器。",
     "I am unable to create a backup of my Vault.": "我無法備份我的 Vault。",
     "I am unable to create a backup of my Vaults.": "我無法備份我的 Vault。",
     "I have created a backup of my Vault.": "我已經備份了我的 Vault。",
+    "I have made a backup, mark this device as resolved": "我已完成備份，將此裝置標記為已處理",
     "I know my server details, let me enter them": "我知道伺服器資訊，讓我手動輸入",
     "I understand that all changes made on other smartphones or computers possibly could be lost.": "我了解其他手機或電腦上的所有變更可能會遺失。",
     "I understand that other devices will no longer be able to synchronise, and will need to be reset the synchronisation information.": "我了解其他裝置將無法再進行同步，且需要重設其同步資訊。",
@@ -1065,6 +1067,7 @@
     "The maximum number of chunks that can be incubated within the document. Chunks exceeding this number will immediately graduate to independent chunks.": "文件中可暫存的 chunks 最大數量。超過此數量的 chunks 會立即成為獨立 chunks。",
     "The maximum total size of chunks that can be incubated within the document. Chunks exceeding this size will immediately graduate to independent chunks.": "文件中可暫存的 chunks 總大小上限。超過此大小的 chunks 會立即成為獨立 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.": "由於此裝置尚未標記為「已處理」，為避免 Vault 損毀，遠端資料庫已鎖定同步。請先備份你的 Vault、重設本機資料庫，然後選擇「將此裝置標記為已處理」。在複寫程序確認此裝置已處理完畢之前，這則警告會持續顯示。",
     "The remote is already set up, and the configuration is compatible (or got compatible by this operation).": "遠端已經設定完成，且設定相容（或透過此操作變得相容）。",
     "The Setup-URI does not appear to be valid. Please check that you have copied it correctly.": "這個 Setup URI 似乎無效，請檢查是否複製正確。",
     "The Setup-URI is valid and ready to use.": "Setup URI 有效，可以使用。",
@@ -1089,6 +1092,7 @@
     "This will rebuild the local database on this device using the most recent data from the server. This action is designed to resolve synchronisation inconsistencies and restore correct functionality.": "這會使用伺服器上最新的資料，重建此裝置上的本機資料庫。此操作旨在解決同步不一致的問題，並恢復正常功能。",
     "This will recreate chunks for all files. If there were missing chunks, this may fix the errors.": "這會為所有檔案重新建立 chunks。若先前有遺失的 chunks，這可能修復相關錯誤。",
     "To minimise the creation of new conflicts": "為了盡量減少新增衝突",
+    "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.": "為避免 Vault 發生非預期的損毀，遠端資料庫已鎖定同步。（此裝置已標記為「已處理」。）當你所有的裝置都標記為「已處理」後，即可解鎖資料庫。在複寫程序確認此裝置已處理完畢之前，這則警告會持續顯示。",
     "Transfer Tweak": "傳輸調校",
     "TURN Credential": "TURN 憑證",
     "TURN server settings are only necessary if you are behind a strict NAT or firewall that prevents direct P2P connections. In most cases, you can leave these fields blank.": "只有在你身處嚴格的 NAT 或防火牆之後、無法建立直接 P2P 連線時，才需要設定 TURN 伺服器。多數情況下這些欄位可以留空。",
@@ -1216,10 +1220,6 @@
     "Ui.Settings.Maintenance.Scram": "緊急處置",
     "Ui.Settings.Maintenance.SendChunks": "傳送 chunks",
     "Ui.Settings.Maintenance.Syncing": "同步中",
-    "Ui.Settings.Maintenance.WarningLockedReadyAction": "我已準備好，解鎖資料庫",
-    "Ui.Settings.Maintenance.WarningLockedReadyText": "為避免 Vault 發生非預期的損毀，遠端資料庫已鎖定同步。（此裝置已標記為「已處理」。）當你所有的裝置都標記為「已處理」後，即可解鎖資料庫。在複寫程序確認此裝置已處理完畢之前，這則警告會持續顯示。",
-    "Ui.Settings.Maintenance.WarningLockedResolveAction": "我已完成備份，將此裝置標記為已處理",
-    "Ui.Settings.Maintenance.WarningLockedResolveText": "由於此裝置尚未標記為「已處理」，為避免 Vault 損毀，遠端資料庫已鎖定同步。請先備份你的 Vault、重設本機資料庫，然後選擇「將此裝置標記為已處理」。在複寫程序確認此裝置已處理完畢之前，這則警告會持續顯示。",
     "Ui.Settings.Maintenance.WriteRedFlagAndRestart": "標記後重新啟動",
     "Ui.Settings.Patches.CompatibilityConflict": "相容性（衝突行為）",
     "Ui.Settings.Patches.CompatibilityDatabase": "相容性（資料庫結構）",
diff --git a/src/common/messagesJson/zh.json b/src/common/messagesJson/zh.json
index 3f613193..b4a913ee 100644
--- a/src/common/messagesJson/zh.json
+++ b/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": "兼容性（数据库结构）",
diff --git a/src/common/messagesYAML/en.yaml b/src/common/messagesYAML/en.yaml
index bbc7d996..4389f12e 100644
--- a/src/common/messagesYAML/en.yaml
+++ b/src/common/messagesYAML/en.yaml
@@ -2235,10 +2235,6 @@ Ui:
             Scram: Scram!
             SendChunks: Send chunks
             Syncing: Syncing
-            WarningLockedReadyAction: I am ready, unlock the database
-            WarningLockedReadyText: 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.
-            WarningLockedResolveAction: I have made a backup, mark this device as resolved
-            WarningLockedResolveText: 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.
             WriteRedFlagAndRestart: Flag and restart
         Patches:
             CompatibilityConflict: Compatibility (Conflict Behaviour)
@@ -2456,3 +2452,7 @@ You should perform this operation only in exceptional circumstances, such as whe
     when the server data is completely corrupted, when changes on all other
     devices are no longer needed, or when the database size has become unusually
     large in comparison to the Vault size.
+"I am ready, unlock the database": "I am ready, unlock the database"
+"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.": "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."
+"I have made a backup, mark this device as resolved": "I have made a backup, mark this device as resolved"
+"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.": "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."
diff --git a/src/common/messagesYAML/es.yaml b/src/common/messagesYAML/es.yaml
index 8fa4b72a..4c1e5041 100644
--- a/src/common/messagesYAML/es.yaml
+++ b/src/common/messagesYAML/es.yaml
@@ -2315,20 +2315,6 @@ Ui:
       Scram: ¡Parada de emergencia!
       SendChunks: Enviar los chunks
       Syncing: Sincronización
-      WarningLockedReadyAction: Estoy listo, desbloquear la base de datos
-      WarningLockedReadyText: Para evitar que la bóveda se corrompa, la base de datos
-        remota se ha bloqueado para la sincronización. (Este dispositivo está
-        marcado como «resuelto».) Cuando todos tus dispositivos estén marcados
-        como «resueltos», desbloquea la base de datos. Este aviso seguirá
-        apareciendo hasta que la replicación confirme que el dispositivo está
-        resuelto.
-      WarningLockedResolveAction: He hecho una copia de seguridad, marcar este dispositivo como resuelto
-      WarningLockedResolveText: La base de datos remota está bloqueada para la
-        sincronización a fin de evitar que la bóveda se corrompa, porque este
-        dispositivo no está marcado como «resuelto». Haz una copia de seguridad
-        de tu bóveda, restablece la base de datos local y selecciona «Marcar este
-        dispositivo como resuelto». Este aviso seguirá apareciendo hasta que la
-        replicación confirme que el dispositivo está resuelto.
       WriteRedFlagAndRestart: Marcar y reiniciar
     Patches:
       CompatibilityConflict: Compatibilidad (comportamiento ante conflictos)
@@ -2695,3 +2681,7 @@ You should perform this operation only in exceptional circumstances, such as whe
   los datos del servidor estén completamente corruptos, cuando ya no necesites
   los cambios de los demás dispositivos o cuando el tamaño de la base de datos
   sea inusualmente grande respecto a la bóveda."
+"I am ready, unlock the database": "Estoy listo, desbloquear la base de datos"
+"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.": "Para evitar que la bóveda se corrompa, la base de datos remota se ha bloqueado para la sincronización. (Este dispositivo está marcado como «resuelto».) Cuando todos tus dispositivos estén marcados como «resueltos», desbloquea la base de datos. Este aviso seguirá apareciendo hasta que la replicación confirme que el dispositivo está resuelto."
+"I have made a backup, mark this device as resolved": "He hecho una copia de seguridad, marcar este dispositivo como resuelto"
+"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.": "La base de datos remota está bloqueada para la sincronización a fin de evitar que la bóveda se corrompa, porque este dispositivo no está marcado como «resuelto». Haz una copia de seguridad de tu bóveda, restablece la base de datos local y selecciona «Marcar este dispositivo como resuelto». Este aviso seguirá apareciendo hasta que la replicación confirme que el dispositivo está resuelto."
diff --git a/src/common/messagesYAML/ko.yaml b/src/common/messagesYAML/ko.yaml
index 80475d20..dcaaadc9 100644
--- a/src/common/messagesYAML/ko.yaml
+++ b/src/common/messagesYAML/ko.yaml
@@ -1609,10 +1609,6 @@ Ui:
       Scram: 긴급 정지
       SendChunks: 청크 보내기
       Syncing: 동기화
-      WarningLockedReadyAction: 준비되었습니다. 데이터베이스 잠금 해제
-      WarningLockedReadyText: 의도치 않은 보관함 손상을 막기 위해 원격 데이터베이스가 동기화 잠금 상태입니다. (이 기기는 '해결됨'으로 표시되어 있습니다.) 모든 기기가 '해결됨'으로 표시되면 데이터베이스 잠금을 해제하세요. 이 경고는 복제를 통해 기기가 해결되었음이 확인될 때까지 계속 표시됩니다.
-      WarningLockedResolveAction: 백업했습니다. 이 기기를 해결됨으로 표시
-      WarningLockedResolveText: 이 기기가 '해결됨'으로 표시되어 있지 않아, 보관함 손상을 막기 위해 원격 데이터베이스가 동기화 잠금 상태입니다. 보관함을 백업하고 로컬 데이터베이스를 재설정한 뒤 '이 기기를 해결됨으로 표시'를 선택해 주세요. 이 경고는 복제를 통해 기기가 해결되었음이 확인될 때까지 계속 표시됩니다.
       WriteRedFlagAndRestart: 표시 후 재시작
     Patches:
       CompatibilityConflict: 호환성 (충돌 동작)
@@ -1840,3 +1836,7 @@ You are adding this device to an existing synchronisation setup.: 이 기기를
 You can configure in the Obsidian Plugin Settings.: Obsidian 플러그인 설정에서 구성할 수 있습니다.
 You should create a new synchronisation destination and rebuild your data there.: 새로운 동기화 대상을 만들고 그곳에서 데이터를 재구축해야 합니다.
 You should perform this operation only in exceptional circumstances, such as when the server data is completely corrupted, when changes on all other devices are no longer needed, or when the database size has become unusually large in comparison to the Vault size.: 이 작업은 서버 데이터가 완전히 손상된 경우, 다른 모든 기기의 변경 사항이 더 이상 필요하지 않은 경우, 또는 데이터베이스 크기가 보관함 크기에 비해 비정상적으로 커진 경우처럼 예외적인 상황에서만 수행해야 합니다.
+"I am ready, unlock the database": "준비되었습니다. 데이터베이스 잠금 해제"
+"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.": "의도치 않은 보관함 손상을 막기 위해 원격 데이터베이스가 동기화 잠금 상태입니다. (이 기기는 '해결됨'으로 표시되어 있습니다.) 모든 기기가 '해결됨'으로 표시되면 데이터베이스 잠금을 해제하세요. 이 경고는 복제를 통해 기기가 해결되었음이 확인될 때까지 계속 표시됩니다."
+"I have made a backup, mark this device as resolved": "백업했습니다. 이 기기를 해결됨으로 표시"
+"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.": "이 기기가 '해결됨'으로 표시되어 있지 않아, 보관함 손상을 막기 위해 원격 데이터베이스가 동기화 잠금 상태입니다. 보관함을 백업하고 로컬 데이터베이스를 재설정한 뒤 '이 기기를 해결됨으로 표시'를 선택해 주세요. 이 경고는 복제를 통해 기기가 해결되었음이 확인될 때까지 계속 표시됩니다."
diff --git a/src/common/messagesYAML/ru.yaml b/src/common/messagesYAML/ru.yaml
index 393fa851..38331d09 100644
--- a/src/common/messagesYAML/ru.yaml
+++ b/src/common/messagesYAML/ru.yaml
@@ -1992,18 +1992,6 @@ Ui:
       Scram: Аварийная остановка!
       SendChunks: Отправить чанки
       Syncing: Синхронизация
-      WarningLockedReadyAction: Я готов, разблокировать базу
-      WarningLockedReadyText: Чтобы хранилище не испортилось, удалённая база
-        заблокирована для синхронизации. (Это устройство помечено как
-        «разрешённое».) Когда все ваши устройства будут помечены как
-        «разрешённые», разблокируйте базу. Предупреждение будет появляться, пока
-        репликация не подтвердит, что устройство разрешено.
-      WarningLockedResolveAction: Я сделал резервную копию, отметить это устройство как разрешённое
-      WarningLockedResolveText: "Удалённая база заблокирована для синхронизации, чтобы
-        хранилище не испортилось: это устройство не помечено как «разрешённое».
-        Сделайте резервную копию хранилища, сбросьте локальную базу и выберите
-        «Отметить это устройство как разрешённое». Предупреждение будет
-        появляться, пока репликация не подтвердит, что устройство разрешено."
       WriteRedFlagAndRestart: Поставить флаг и перезапустить
     Patches:
       CompatibilityConflict: Совместимость (поведение при конфликтах)
@@ -2324,3 +2312,7 @@ You should perform this operation only in exceptional circumstances, such as whe
   испорчены, изменения на всех других устройствах больше не нужны или база стала
   непомерно большой по сравнению с хранилищем."
 you wanted(Thank you)!: которую вы хотели (спасибо!)
+"I am ready, unlock the database": "Я готов, разблокировать базу"
+"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.": "Чтобы хранилище не испортилось, удалённая база заблокирована для синхронизации. (Это устройство помечено как «разрешённое».) Когда все ваши устройства будут помечены как «разрешённые», разблокируйте базу. Предупреждение будет появляться, пока репликация не подтвердит, что устройство разрешено."
+"I have made a backup, mark this device as resolved": "Я сделал резервную копию, отметить это устройство как разрешённое"
+"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.": "Удалённая база заблокирована для синхронизации, чтобы хранилище не испортилось: это устройство не помечено как «разрешённое». Сделайте резервную копию хранилища, сбросьте локальную базу и выберите «Отметить это устройство как разрешённое». Предупреждение будет появляться, пока репликация не подтвердит, что устройство разрешено."
diff --git a/src/common/messagesYAML/zh-tw.yaml b/src/common/messagesYAML/zh-tw.yaml
index 9c22c16f..30f7a7fa 100644
--- a/src/common/messagesYAML/zh-tw.yaml
+++ b/src/common/messagesYAML/zh-tw.yaml
@@ -1383,10 +1383,6 @@ Ui:
       Scram: 緊急處置
       SendChunks: 傳送 chunks
       Syncing: 同步中
-      WarningLockedReadyAction: 我已準備好，解鎖資料庫
-      WarningLockedReadyText: 為避免 Vault 發生非預期的損毀，遠端資料庫已鎖定同步。（此裝置已標記為「已處理」。）當你所有的裝置都標記為「已處理」後，即可解鎖資料庫。在複寫程序確認此裝置已處理完畢之前，這則警告會持續顯示。
-      WarningLockedResolveAction: 我已完成備份，將此裝置標記為已處理
-      WarningLockedResolveText: 由於此裝置尚未標記為「已處理」，為避免 Vault 損毀，遠端資料庫已鎖定同步。請先備份你的 Vault、重設本機資料庫，然後選擇「將此裝置標記為已處理」。在複寫程序確認此裝置已處理完畢之前，這則警告會持續顯示。
       WriteRedFlagAndRestart: 標記後重新啟動
     Patches:
       CompatibilityConflict: 相容性（衝突行為）
@@ -1839,3 +1835,7 @@ Setup:
 "Garbage Collection completed. Deleted chunks: ${deletedChunks} / ${totalChunks}. Time taken: ${seconds} seconds.": |-
   垃圾回收完成。已刪除 chunks：${deletedChunks} / ${totalChunks}。耗時：${seconds} 秒。
 "Failed to start replication after Garbage Collection.": 垃圾回收後無法啟動複寫。
+"I am ready, unlock the database": "我已準備好，解鎖資料庫"
+"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.": "為避免 Vault 發生非預期的損毀，遠端資料庫已鎖定同步。（此裝置已標記為「已處理」。）當你所有的裝置都標記為「已處理」後，即可解鎖資料庫。在複寫程序確認此裝置已處理完畢之前，這則警告會持續顯示。"
+"I have made a backup, mark this device as resolved": "我已完成備份，將此裝置標記為已處理"
+"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.": "由於此裝置尚未標記為「已處理」，為避免 Vault 損毀，遠端資料庫已鎖定同步。請先備份你的 Vault、重設本機資料庫，然後選擇「將此裝置標記為已處理」。在複寫程序確認此裝置已處理完畢之前，這則警告會持續顯示。"
diff --git a/src/common/messagesYAML/zh.yaml b/src/common/messagesYAML/zh.yaml
index cf3566d0..1c695696 100644
--- a/src/common/messagesYAML/zh.yaml
+++ b/src/common/messagesYAML/zh.yaml
@@ -1373,10 +1373,6 @@ Ui:
       Scram: 紧急处理
       SendChunks: 发送数据块
       Syncing: 同步
-      WarningLockedReadyAction: 我已准备好，立即解锁数据库
-      WarningLockedReadyText: 为防止意外的数据仓库损坏，远程数据库已被锁定，暂停同步。（此设备已被标记为“已确认”）当你的所有设备都标记为“已确认”后，再解锁数据库。在复制过程确认此设备已完成确认之前，此警告会持续显示。
-      WarningLockedResolveAction: 我已完成备份，将此设备标记为“已确认”
-      WarningLockedResolveText: 为防止数据仓库损坏，由于此设备尚未标记为“已确认”，远程数据库已被锁定，暂停同步。请先备份你的仓库、重置本地数据库，然后选择“将此设备标记为已确认”。在复制过程确认此设备已完成确认之前，此警告会持续显示。
       WriteRedFlagAndRestart: 标记并重启
     Patches:
       CompatibilityConflict: 兼容性（冲突行为）
@@ -1599,3 +1595,7 @@ xxhash64 (Fastest): xxhash64（最快）
 "Synchronisation utilising journal files. You must have set up an S3/MinIO/R2 compatible object storage.": "通过日志文件进行同步。你需要事先部署好兼容 S3/MinIO/R2 的对象存储服务。"
 "Peer-to-Peer only": "仅 Peer-to-Peer"
 "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.": "此功能可在设备之间直接同步，无需服务器；但同步时两台设备必须同时在线，且部分功能可能受限。互联网连接仅用于信令（发现对端），不用于数据传输。"
+"I am ready, unlock the database": "我已准备好，立即解锁数据库"
+"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.": "为防止意外的数据仓库损坏，远程数据库已被锁定，暂停同步。（此设备已被标记为“已确认”）当你的所有设备都标记为“已确认”后，再解锁数据库。在复制过程确认此设备已完成确认之前，此警告会持续显示。"
+"I have made a backup, mark this device as resolved": "我已完成备份，将此设备标记为“已确认”"
+"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.": "为防止数据仓库损坏，由于此设备尚未标记为“已确认”，远程数据库已被锁定，暂停同步。请先备份你的仓库、重置本地数据库，然后选择“将此设备标记为已确认”。在复制过程确认此设备已完成确认之前，此警告会持续显示。"