@arcblock/did-connect-service 4.1.61 → 4.1.63

package/dist/pages/admin/i18n.js

@@ -140,6 +140,11 @@ const en = {
         mergeAccount: "Merge another account",
         mergeAccountHint: "Sign in as the other account to move its login methods here. DID Space is not copied.",
         mergeChooseMethod: "Prove the other account",
+        mergeStart: "Merge another account…",
+        mergeEmailSwitchMethod: "Try another method",
+        mergeEmailRequestNewCode: "To try again, request a new code.",
+        mergeEmailResend: "Request a new code",
+        mergeEmailResendWait: "Request a new code ({seconds}s)",
         mergeProveWallet: "Prove the other account with DID Wallet",
         mergeProvePasskey: "Prove the other account with a passkey",
         mergeProveOAuth: "Prove the other account with {provider}",
@@ -150,18 +155,49 @@ const en = {
         mergePasskeyUnavailable: "Passkeys are not available in this browser",
         mergePopupClosed: "Sign-in window closed",
         mergeConfirmTitle: "Confirm account merge",
-        mergeConfirmMsg: "Credentials will move to this account. DID Space stays at /user/.archive/{did}/ (not copied).",
+        mergeConfirmMsg: "Credentials move to the kept account. DID Space is not copied.",
+        mergeConfirmChoose: "Which account's DID do you want to keep?",
+        mergeConfirmMatch: "This is the account that shares {email}.",
+        mergeConfirmNotMatch: "This is not the prompted account, but it can still be merged.",
+        mergeConfirmRecommended: "Recommended",
+        mergeConfirmCurrent: "Signed-in account",
+        mergeConfirmCreated: "Created {date}",
+        mergeConfirmReasonLead: "Recommended: keep {did}. {reason}",
+        mergeConfirmReasonHigher: "It has a higher permission.",
+        mergeConfirmReasonHandle: "It has the handle @{handle}.",
+        mergeConfirmReasonWallet: "Its DID comes from your DID Wallet.",
+        mergeConfirmReasonOlder: "It was created earlier.",
+        mergeConfirmReasonSimilar: "The two accounts are similar, so the signed-in account stays.",
+        mergeConfirmAlias: "The other DID becomes an alias. Its original login methods still sign in to the kept account.",
+        mergeConfirmChanges: "After the merge",
+        mergeConfirmMovedMethods: "Login methods moved to the kept account: {methods}",
+        mergeConfirmGlobalRole: "Global role: {before} → {after}",
+        mergeConfirmSpaceRole: "{space}: {before} → {after}",
+        mergeConfirmSpaceRoleUnnamed: "{before} → {after}",
+        mergeConfirmJoinedSpaces: "Newly joined spaces: {spaces}",
+        mergeConfirmJoinedSpace: "{space} ({role})",
+        mergeConfirmJoinedSpaceUnnamed: "{role}",
+        mergeConfirmHandleStays: "The handle @{handle} stays on {did} and will not appear on the kept account.",
+        mergeConfirmNameAvatar: "{did}'s name and avatar are not kept.",
+        mergeConfirmDidSpaceNotCopied: "DID Space: {did}'s data is not copied to the kept account.",
+        mergeConfirmHostMaybe: "If other apps used {did} (for example a published blocklet, or Slack or X authorization), they may need to be linked again.",
+        mergeConfirmSubmitKeep: "Merge accounts",
+        mergeConfirmSubmitSwitch: "Merge and switch to {did}",
+        mergeConfirmLoading: "Updating the change list…",
+        mergeDoneTitle: "Merged",
+        mergeDoneDid: "Your DID is {did}.",
+        mergeDoneMethods: "You can now sign in with {methods}.",
+        mergeDoneFinish: "Finish",
         mergeConfirmSurviving: "After merge you will keep {intoDid}. {fromDid} will be merged in and will no longer work on its own.",
-        mergeConfirmKeepOther: "Want to keep the other account instead? Sign out, sign in as that account, then start merge again.",
         mergeConfirmCredentials: "Login methods that will move",
         mergeConfirmSkipped: "Login methods that will not move",
         mergeConfirmSkippedReason: "This login method exists on both accounts, so it stays on the original account.",
         mergeConfirmRoles: "Permission changes",
         mergeConfirmRoleChange: "{fromRole} on the other account becomes {keptRole} (this account is currently {intoRoleBefore}).",
         mergeConfirmAccessKeysTitle: "Access keys",
-        mergeConfirmAccessKeys: "{count} access key(s) will move to this account.",
+        mergeConfirmAccessKeys: "{count} access key(s) will move to the kept account.",
         mergeConfirmDidSpaceTitle: "DID Space",
-        mergeDidSpace: "DID Space is not copied. After merge it is available read-only at {pointer}.",
+        mergeDidSpace: "DID Space is not copied to the kept account.",
         mergeConfirmHostWarnings: "Other effects",
         mergeHostBlockletOwnerClash: "Published blocklets or domains owned by the other account may conflict after merge.",
         mergeHostExternalTokenRebind: "External authorizations such as Slack or X stay bound to the original account and need to be reconnected.",
@@ -170,10 +206,30 @@ const en = {
         mergeSuccess: "Accounts merged",
         mergeFailed: "Account merge failed",
         mergeCancelled: "Merge cancelled",
-        mergePromptTitle: "Another account shares this email",
-        mergePromptBody: "Another account uses the same verified email. You can merge it into this account — this is the one that will survive.",
-        mergePromptAction: "Merge now",
-        mergePromptDismiss: "Dismiss",
+        mergePromptTitle: "Another account also verified this email",
+        mergePromptBody: "If this is also yours, you can merge it into the current account. You will preview the merge before anything changes.",
+        mergePromptAction: "Merge this account",
+        mergePromptDismiss: "Not now",
+        mergePromptTitleOne: "Your email {email} is also verified on another account",
+        mergePromptTitleMany: "Your email {email} is also verified on {count} other accounts",
+        mergePromptBodyOne: "If this is also yours, you can merge it into the current account. You will preview it first. Nothing changes until you confirm.",
+        mergePromptBodyMany: "If these are also yours, you can merge them into the current account. You will preview each one first. Nothing changes until you confirm.",
+        mergePromptMergeThis: "Merge this account",
+        mergePromptNotMine: "Not mine",
+        mergePromptLater: "Not now",
+        mergePromptCreated: "Created {when}",
+        mergePromptLastLogin: "Last sign-in {when}",
+        mergePromptToday: "today",
+        mergePromptDayAgo: "1 day ago",
+        mergePromptDaysAgo: "{count} days ago",
+        mergePromptMonthAgo: "1 month ago",
+        mergePromptMonthsAgo: "{count} months ago",
+        mergePromptMethodSep: ", ",
+        mergePromptMethodsDisabled: "This account's sign-in methods are turned off on this site and can't be used directly. Contact an administrator.",
+        mergeCandidateProveHint: "Sign in with one of this account's methods to prove it is yours. This does not switch your current login.",
+        mergeProveEmailAddress: "Sign in with {email}",
+        mergePromptMethodsLabel: "Sign-in methods this account uses",
+        mergePromptOtherMethods: "Other methods",
     },
     members: {
         title: "Members",
@@ -855,6 +911,11 @@ const zh = {
         mergeAccount: "\u5408\u5E76\u53E6\u4E00\u4E2A\u8D26\u53F7",
         mergeAccountHint: "\u8BF7\u7528\u53E6\u4E00\u4E2A\u8D26\u53F7\u767B\u5F55\u4EE5\u5C06\u5176\u767B\u5F55\u65B9\u5F0F\u8FC1\u5230\u6B64\u5904\u3002DID Space \u4E0D\u4F1A\u88AB\u590D\u5236\u3002",
         mergeChooseMethod: "\u8BC1\u660E\u53E6\u4E00\u4E2A\u8D26\u53F7",
+        mergeStart: "\u5408\u5E76\u53E6\u4E00\u4E2A\u8D26\u53F7\u2026",
+        mergeEmailSwitchMethod: "\u6362\u4E00\u79CD\u65B9\u5F0F",
+        mergeEmailRequestNewCode: "\u5982\u9700\u91CD\u8BD5\uFF0C\u8BF7\u91CD\u65B0\u83B7\u53D6\u9A8C\u8BC1\u7801\u3002",
+        mergeEmailResend: "\u91CD\u65B0\u83B7\u53D6\u9A8C\u8BC1\u7801",
+        mergeEmailResendWait: "\u91CD\u65B0\u83B7\u53D6\u9A8C\u8BC1\u7801 ({seconds}s)",
         mergeProveWallet: "\u7528 DID Wallet \u8BC1\u660E\u53E6\u4E00\u4E2A\u8D26\u53F7",
         mergeProvePasskey: "\u7528\u901A\u884C\u5BC6\u94A5\u8BC1\u660E\u53E6\u4E00\u4E2A\u8D26\u53F7",
         mergeProveOAuth: "\u7528 {provider} \u8BC1\u660E\u53E6\u4E00\u4E2A\u8D26\u53F7",
@@ -864,31 +925,82 @@ const zh = {
         mergeEmailCodePlaceholder: "00000000",
         mergePasskeyUnavailable: "\u5F53\u524D\u6D4F\u89C8\u5668\u4E0D\u652F\u6301\u901A\u884C\u5BC6\u94A5",
         mergePopupClosed: "\u767B\u5F55\u7A97\u53E3\u5DF2\u5173\u95ED",
-        mergeConfirmTitle: "\u786E\u8BA4\u5408\u5E76\u8D26\u53F7",
-        mergeConfirmMsg: "\u51ED\u8BC1\u4F1A\u8FC1\u5230\u5F53\u524D\u8D26\u53F7\u3002DID Space \u4ECD\u5728 /user/.archive/{did}/\uff08\u4E0D\u590D\u5236\uff09\u3002",
-        mergeConfirmSurviving: "\u5408\u5E76\u540E\u4F60\u5C06\u4FDD\u7559 {intoDid}\u3002{fromDid} \u4F1A\u88AB\u5E76\u5165\u5E76\u505C\u6B62\u72EC\u7ACB\u4F7F\u7528\u3002",
-        mergeConfirmKeepOther: "\u60F3\u4FDD\u7559\u53E6\u4E00\u4E2A\u8D26\u53F7\uFF1F\u8BF7\u5148\u9000\u51FA\uFF0C\u7528\u90A3\u4E2A\u8D26\u53F7\u767B\u5F55\uFF0C\u518D\u53D1\u8D77\u5408\u5E76\u3002",
-        mergeConfirmCredentials: "\u5C06\u8981\u8FC1\u79FB\u7684\u767B\u5F55\u65B9\u5F0F",
-        mergeConfirmSkipped: "\u4E0D\u4F1A\u8FC1\u79FB\u7684\u767B\u5F55\u65B9\u5F0F",
-        mergeConfirmSkippedReason: "\u8FD9\u4E2A\u767B\u5F55\u65B9\u5F0F\u5728\u4E24\u4E2A\u8D26\u53F7\u4E0A\u90FD\u6709\uFF0C\u56E0\u6B64\u4ECD\u4F1A\u7559\u5728\u539F\u8D26\u53F7\u4E0A\u3002",
-        mergeConfirmRoles: "\u6743\u9650\u53D8\u66F4",
-        mergeConfirmRoleChange: "\u53E6\u4E00\u8D26\u53F7\u7684 {fromRole} \u5C06\u53D8\u4E3A {keptRole}\uff08\u5F53\u524D\u8D26\u53F7\u73B0\u4E3A {intoRoleBefore}\uff09\u3002",
-        mergeConfirmAccessKeysTitle: "\u8BBF\u95EE\u5BC6\u94A5",
-        mergeConfirmAccessKeys: "{count} \u4E2A\u8BBF\u95EE\u5BC6\u94A5\u5C06\u8FC1\u5230\u5F53\u524D\u8D26\u53F7\u3002",
+        mergeConfirmTitle: "确认合并账户",
+        mergeConfirmMsg: "凭证会迁到保留的账户。DID Space 不会被复制。",
+        mergeConfirmChoose: "保留哪个账户的 DID？",
+        mergeConfirmMatch: "这就是和你共用 {email} 的账户。",
+        mergeConfirmNotMatch: "这不是提示中的那个账户，但同样可以合并。",
+        mergeConfirmRecommended: "推荐",
+        mergeConfirmCurrent: "当前登录的账户",
+        mergeConfirmCreated: "创建于 {date}",
+        mergeConfirmReasonLead: "推荐保留 {did}：{reason}",
+        mergeConfirmReasonHigher: "它的权限更高。",
+        mergeConfirmReasonHandle: "它有 handle @{handle}。",
+        mergeConfirmReasonWallet: "它的 DID 来自你的 DID Wallet。",
+        mergeConfirmReasonOlder: "它创建得更早。",
+        mergeConfirmReasonSimilar: "两个账户情况相近，默认保留当前登录的账户。",
+        mergeConfirmAlias: "另一个 DID 会变成别名，用它原来的登录方式仍能登录，进入的是保留的账户。",
+        mergeConfirmChanges: "合并后",
+        mergeConfirmMovedMethods: "迁移到保留账户的登录方式：{methods}",
+        mergeConfirmGlobalRole: "全局角色：{before} → {after}",
+        mergeConfirmSpaceRole: "{space}：{before} → {after}",
+        mergeConfirmSpaceRoleUnnamed: "{before} → {after}",
+        mergeConfirmJoinedSpaces: "新加入的空间：{spaces}",
+        mergeConfirmJoinedSpace: "{space}（{role}）",
+        mergeConfirmJoinedSpaceUnnamed: "{role}",
+        mergeConfirmHandleStays: "handle @{handle} 留在 {did} 上，不会出现在保留的账户里。",
+        mergeConfirmNameAvatar: "{did} 的名字和头像不会保留。",
+        mergeConfirmDidSpaceNotCopied: "DID Space：{did} 的数据不会复制到保留的账户。",
+        mergeConfirmHostMaybe: "如果在其他应用里用过 {did}（例如发布的 blocklet、Slack/X 授权），这些可能需要重新绑定。",
+        mergeConfirmSubmitKeep: "合并账户",
+        mergeConfirmSubmitSwitch: "合并并切换到 {did}",
+        mergeConfirmLoading: "正在更新变更列表…",
+        mergeDoneTitle: "已合并",
+        mergeDoneDid: "你的 DID 是 {did}。",
+        mergeDoneMethods: "现在可以用 {methods} 登录。",
+        mergeDoneFinish: "完成",
+        mergeConfirmSurviving: "合并后你将保留 {intoDid}。{fromDid} 会被并入并停止独立使用。",
+        mergeConfirmCredentials: "将要迁移的登录方式",
+        mergeConfirmSkipped: "不会迁移的登录方式",
+        mergeConfirmSkippedReason: "这个登录方式在两个账户上都有，因此仍会留在原账户上。",
+        mergeConfirmRoles: "权限变更",
+        mergeConfirmRoleChange: "另一账户的 {fromRole} 将变为 {keptRole}（当前账户现为 {intoRoleBefore}）。",
+        mergeConfirmAccessKeysTitle: "访问密钥",
+        mergeConfirmAccessKeys: "{count} 个访问密钥将迁到保留的账户。",
         mergeConfirmDidSpaceTitle: "DID Space",
-        mergeDidSpace: "DID Space \u4E0D\u4F1A\u88AB\u590D\u5236\u3002\u5408\u5E76\u540E\u53EA\u8BFB\u53EF\u7528\u4E8E {pointer}\u3002",
-        mergeConfirmHostWarnings: "\u5176\u4ED6\u5F71\u54CD",
-        mergeHostBlockletOwnerClash: "\u53E6\u4E00\u8D26\u53F7\u5DF2\u53D1\u5E03\u7684 blocklet \u6216\u57DF\u540D\u5728\u5408\u5E76\u540E\u53EF\u80FD\u51B2\u7A81\u3002",
-        mergeHostExternalTokenRebind: "Slack\u3001X \u7B49\u5916\u90E8\u6388\u6743\u4ECD\u7ED1\u5728\u539F DID \u4E0A\uFF0C\u9700\u8981\u91CD\u65B0\u6388\u6743\u3002",
-        mergeConfirmIrreversible: "\u6B64\u64CD\u4F5C\u4E0D\u53EF\u64A4\u9500\u3002",
-        mergeConfirmTooLarge: "\u6B64\u6B21\u5408\u5E76\u89C4\u6A21\u8FC7\u5927\uFF0C\u65E0\u6CD5\u81EA\u52A8\u5B8C\u6210\u3002\u8BF7\u62C6\u5206\u8D26\u53F7\u6216\u6539\u4E3A\u624B\u52A8\u5904\u7406\u3002",
+        mergeDidSpace: "DID Space 不会复制到保留的账户。",
+        mergeConfirmHostWarnings: "其他影响",
+        mergeHostBlockletOwnerClash: "另一账户已发布的 blocklet 或域名在合并后可能冲突。",
+        mergeHostExternalTokenRebind: "Slack、X 等外部授权仍绑在原 DID 上，需要重新授权。",
+        mergeConfirmIrreversible: "此操作不可撤销。",
+        mergeConfirmTooLarge: "此次合并规模过大，无法自动完成。请拆分账户或改为手动处理。",
         mergeSuccess: "\u8D26\u53F7\u5DF2\u5408\u5E76",
         mergeFailed: "\u8D26\u53F7\u5408\u5E76\u5931\u8D25",
         mergeCancelled: "\u5DF2\u53D6\u6D88\u5408\u5E76",
-        mergePromptTitle: "\u53E6\u4E00\u4E2A\u8D26\u53F7\u4F7F\u7528\u4E86\u6B64\u90AE\u7BB1",
-        mergePromptBody: "\u53E6\u4E00\u4E2A\u8D26\u53F7\u4E0E\u5F53\u524D\u8D26\u53F7\u5171\u4EAB\u540C\u4E00\u5DF2\u9A8C\u8BC1\u90AE\u7BB1\u3002\u4F60\u53EF\u4EE5\u628A\u5B83\u5408\u5E76\u5230\u5F53\u524D\u8D26\u53F7\u2014\u2014\u5F53\u524D\u767B\u5F55\u7684\u8D26\u53F7\u4F1A\u4FDD\u7559\u3002",
-        mergePromptAction: "\u7ACB\u5373\u5408\u5E76",
-        mergePromptDismiss: "\u6682\u4E0D\u5904\u7406",
+        mergePromptTitle: "\u53E6\u4E00\u4E2A\u8D26\u53F7\u4E5F\u9A8C\u8BC1\u8FC7\u8FD9\u4E2A\u90AE\u7BB1",
+        mergePromptBody: "\u5982\u679C\u8FD9\u4E5F\u662F\u4F60\u7684\uFF0C\u53EF\u4EE5\u628A\u5B83\u5408\u5E76\u5230\u5F53\u524D\u8D26\u6237\u3002\u5408\u5E76\u524D\u4F1A\u5148\u8BA9\u4F60\u9884\u89C8\uFF0C\u786E\u8BA4\u4E4B\u524D\u4E0D\u4F1A\u505A\u4EFB\u4F55\u6539\u52A8\u3002",
+        mergePromptAction: "\u5408\u5E76\u8FD9\u4E2A\u8D26\u6237",
+        mergePromptDismiss: "\u4EE5\u540E\u518D\u8BF4",
+        mergePromptTitleOne: "\u4F60\u7684\u90AE\u7BB1 {email} \u8FD8\u9A8C\u8BC1\u8FC7\u53E6\u4E00\u4E2A\u8D26\u6237",
+        mergePromptTitleMany: "\u4F60\u7684\u90AE\u7BB1 {email} \u8FD8\u9A8C\u8BC1\u8FC7 {count} \u4E2A\u8D26\u6237",
+        mergePromptBodyOne: "\u5982\u679C\u8FD9\u4E5F\u662F\u4F60\u7684\uFF0C\u53EF\u4EE5\u628A\u5B83\u5408\u5E76\u5230\u5F53\u524D\u8D26\u6237\u3002\u5408\u5E76\u524D\u4F1A\u5148\u8BA9\u4F60\u9884\u89C8\uFF0C\u786E\u8BA4\u4E4B\u524D\u4E0D\u4F1A\u505A\u4EFB\u4F55\u6539\u52A8\u3002",
+        mergePromptBodyMany: "\u5982\u679C\u5B83\u4EEC\u4E5F\u662F\u4F60\u7684\uFF0C\u53EF\u4EE5\u5408\u5E76\u5230\u5F53\u524D\u8D26\u6237\u3002\u5408\u5E76\u524D\u4F1A\u5148\u8BA9\u4F60\u9884\u89C8\uFF0C\u786E\u8BA4\u4E4B\u524D\u4E0D\u4F1A\u505A\u4EFB\u4F55\u6539\u52A8\u3002",
+        mergePromptMergeThis: "\u5408\u5E76\u8FD9\u4E2A\u8D26\u6237",
+        mergePromptNotMine: "\u4E0D\u662F\u6211\u7684",
+        mergePromptLater: "\u4EE5\u540E\u518D\u8BF4",
+        mergePromptCreated: "\u521B\u5EFA\u4E8E {when}",
+        mergePromptLastLogin: "\u6700\u8FD1\u767B\u5F55 {when}",
+        mergePromptToday: "\u4ECA\u5929",
+        mergePromptDayAgo: "1 \u5929\u524D",
+        mergePromptDaysAgo: "{count} \u5929\u524D",
+        mergePromptMonthAgo: "1 \u4E2A\u6708\u524D",
+        mergePromptMonthsAgo: "{count} \u4E2A\u6708\u524D",
+        mergePromptMethodSep: "\u3001",
+        mergePromptMethodsDisabled: "\u8FD9\u4E2A\u8D26\u6237\u7684\u767B\u5F55\u65B9\u5F0F\u5728\u672C\u7AD9\u5DF2\u505C\u7528\uFF0C\u65E0\u6CD5\u76F4\u63A5\u8BC1\u660E\u3002\u8BF7\u8054\u7CFB\u7BA1\u7406\u5458\u3002",
+        mergeCandidateProveHint: "\u7528\u8FD9\u4E2A\u8D26\u6237\u7684\u767B\u5F55\u65B9\u5F0F\u767B\u5F55\uFF0C\u8BC1\u660E\u5B83\u662F\u4F60\u7684\u3002\u8FD9\u4E0D\u4F1A\u5207\u6362\u4F60\u5F53\u524D\u7684\u767B\u5F55\u3002",
+        mergeProveEmailAddress: "\u7528 {email} \u767B\u5F55",
+        mergePromptMethodsLabel: "\u8FD9\u4E2A\u8D26\u6237\u4F7F\u7528\u7684\u767B\u5F55\u65B9\u5F0F",
+        mergePromptOtherMethods: "\u5176\u4ED6\u65B9\u5F0F",
     },
     members: {
         title: "\u6210\u5458",
@@ -1573,6 +1685,11 @@ const zhTW = {
         mergeAccount: "合併另一個帳號",
         mergeAccountHint: "請用另一個帳號登入以將其登入方式遷到此處。DID Space 不會被複製。",
         mergeChooseMethod: "證明另一個帳號",
+        mergeStart: "合併另一個帳號…",
+        mergeEmailSwitchMethod: "換一種方式",
+        mergeEmailRequestNewCode: "若要再試一次，請重新取得驗證碼。",
+        mergeEmailResend: "重新取得驗證碼",
+        mergeEmailResendWait: "重新取得驗證碼（{seconds} 秒）",
         mergeProveWallet: "用 DID Wallet 證明另一個帳號",
         mergeProvePasskey: "用Passkey證明另一個帳號",
         mergeProveOAuth: "用 {provider} 證明另一個帳號",
@@ -1583,18 +1700,49 @@ const zhTW = {
         mergePasskeyUnavailable: "當前瀏覽器不支援Passkey",
         mergePopupClosed: "登入視窗已關閉",
         mergeConfirmTitle: "確認合併帳號",
-        mergeConfirmMsg: "憑證會遷到當前帳號。DID Space 仍在 /user/.archive/{did}/（不複製）。",
+        mergeConfirmMsg: "憑證會遷到保留的帳號。DID Space 不會被複製。",
+        mergeConfirmChoose: "要保留哪個帳號的 DID？",
+        mergeConfirmMatch: "這就是和你共用 {email} 的帳號。",
+        mergeConfirmNotMatch: "這不是提示中的那個帳號，但同樣可以合併。",
+        mergeConfirmRecommended: "建議",
+        mergeConfirmCurrent: "目前登入的帳號",
+        mergeConfirmCreated: "建立於 {date}",
+        mergeConfirmReasonLead: "建議保留 {did}：{reason}",
+        mergeConfirmReasonHigher: "它的權限較高。",
+        mergeConfirmReasonHandle: "它有 handle @{handle}。",
+        mergeConfirmReasonWallet: "它的 DID 來自你的 DID Wallet。",
+        mergeConfirmReasonOlder: "它建立得較早。",
+        mergeConfirmReasonSimilar: "兩個帳號情況相近，預設保留目前登入的帳號。",
+        mergeConfirmAlias: "另一個 DID 會變成別名，用它原來的登入方式仍能登入，進入的是保留的帳號。",
+        mergeConfirmChanges: "合併後",
+        mergeConfirmMovedMethods: "遷移到保留帳號的登入方式：{methods}",
+        mergeConfirmGlobalRole: "全域角色：{before} → {after}",
+        mergeConfirmSpaceRole: "{space}：{before} → {after}",
+        mergeConfirmSpaceRoleUnnamed: "{before} → {after}",
+        mergeConfirmJoinedSpaces: "新加入的空間：{spaces}",
+        mergeConfirmJoinedSpace: "{space}（{role}）",
+        mergeConfirmJoinedSpaceUnnamed: "{role}",
+        mergeConfirmHandleStays: "handle @{handle} 留在 {did} 上，不會出現在保留的帳號裡。",
+        mergeConfirmNameAvatar: "{did} 的名稱和頭像不會保留。",
+        mergeConfirmDidSpaceNotCopied: "DID Space：{did} 的資料不會複製到保留的帳號。",
+        mergeConfirmHostMaybe: "如果在其他應用程式用過 {did}（例如發布的 blocklet、Slack/X 授權），這些可能需要重新綁定。",
+        mergeConfirmSubmitKeep: "合併帳號",
+        mergeConfirmSubmitSwitch: "合併並切換到 {did}",
+        mergeConfirmLoading: "正在更新變更清單…",
+        mergeDoneTitle: "已合併",
+        mergeDoneDid: "你的 DID 是 {did}。",
+        mergeDoneMethods: "現在可以用 {methods} 登入。",
+        mergeDoneFinish: "完成",
         mergeConfirmSurviving: "合併後您將保留 {intoDid}。{fromDid} 會被併入並停止獨立使用。",
-        mergeConfirmKeepOther: "想保留另一個帳號？請先登出，用那個帳號登入，再發起合併。",
         mergeConfirmCredentials: "將要遷移的登入方式",
         mergeConfirmSkipped: "不會遷移的登入方式",
         mergeConfirmSkippedReason: "這個登入方式在兩個帳號上都有，因此仍會留在原帳號上。",
         mergeConfirmRoles: "權限變更",
-        mergeConfirmRoleChange: "另一帳號的 {fromRole} 將變為 {keptRole}（當前帳號現為 {intoRoleBefore}）。",
+        mergeConfirmRoleChange: "另一帳號的 {fromRole} 將變為 {keptRole}（保留的帳號目前為 {intoRoleBefore}）。",
         mergeConfirmAccessKeysTitle: "存取金鑰",
-        mergeConfirmAccessKeys: "{count} 個存取金鑰將遷到當前帳號。",
+        mergeConfirmAccessKeys: "{count} 個存取金鑰將遷到保留的帳號。",
         mergeConfirmDidSpaceTitle: "DID Space",
-        mergeDidSpace: "DID Space 不會被複製。合併後只讀可用於 {pointer}。",
+        mergeDidSpace: "DID Space 不會複製到保留的帳號。",
         mergeConfirmHostWarnings: "其他影響",
         mergeHostBlockletOwnerClash: "另一帳號已發布的 blocklet 或域名在合併後可能衝突。",
         mergeHostExternalTokenRebind: "Slack、X 等外部授權仍綁在原 DID 上，需要重新授權。",
@@ -1603,10 +1751,30 @@ const zhTW = {
         mergeSuccess: "帳號已合併",
         mergeFailed: "帳號合併失敗",
         mergeCancelled: "已取消合併",
-        mergePromptTitle: "另一個帳號使用了此電子郵件",
-        mergePromptBody: "另一個帳號與當前帳號共享同一已驗證電子郵件。您可以把它合併到當前帳號——當前登入的帳號會保留。",
-        mergePromptAction: "立即合併",
-        mergePromptDismiss: "暫不處理",
+        mergePromptTitle: "另一個帳號也驗證過這個電子郵件",
+        mergePromptBody: "如果這也是你的，可以把它合併到當前帳號。合併前會先讓你預覽，確認之前不會做任何改動。",
+        mergePromptAction: "合併這個帳號",
+        mergePromptDismiss: "以後再說",
+        mergePromptTitleOne: "你的電子郵件 {email} 也驗證過另一個帳號",
+        mergePromptTitleMany: "你的電子郵件 {email} 也驗證過 {count} 個帳號",
+        mergePromptBodyOne: "如果這也是你的，可以把它合併到當前帳號。合併前會先讓你預覽，確認之前不會做任何改動。",
+        mergePromptBodyMany: "如果它們也是你的，可以合併到當前帳號。合併前會先讓你預覽，確認之前不會做任何改動。",
+        mergePromptMergeThis: "合併這個帳號",
+        mergePromptNotMine: "不是我的",
+        mergePromptLater: "以後再說",
+        mergePromptCreated: "建立於 {when}",
+        mergePromptLastLogin: "最近登入 {when}",
+        mergePromptToday: "今天",
+        mergePromptDayAgo: "1 天前",
+        mergePromptDaysAgo: "{count} 天前",
+        mergePromptMonthAgo: "1 個月前",
+        mergePromptMonthsAgo: "{count} 個月前",
+        mergePromptMethodSep: "、",
+        mergePromptMethodsDisabled: "這個帳號的登入方式在本站已停用，無法直接證明。請聯絡管理員。",
+        mergeCandidateProveHint: "用這個帳號的登入方式登入，證明它是你的。這不會切換你目前的登入。",
+        mergeProveEmailAddress: "用 {email} 登入",
+        mergePromptMethodsLabel: "這個帳號使用的登入方式",
+        mergePromptOtherMethods: "其他方式",
     },
     members: {
         title: "成員",
@@ -2288,6 +2456,11 @@ const ja = {
         mergeAccount: "別のアカウントを統合",
         mergeAccountHint: "もう一方のアカウントでログインし、そのログイン方法をこちらへ移します。DID Space はコピーされません。",
         mergeChooseMethod: "もう一方のアカウントを証明します",
+        mergeStart: "別のアカウントを統合…",
+        mergeEmailSwitchMethod: "別の方法を試す",
+        mergeEmailRequestNewCode: "再試行するには、確認コードを再取得してください。",
+        mergeEmailResend: "確認コードを再取得",
+        mergeEmailResendWait: "確認コードを再取得（{seconds}秒）",
         mergeProveWallet: "DID Wallet でもう一方のアカウントを証明します",
         mergeProvePasskey: "Passkey でもう一方のアカウントを証明します",
         mergeProveOAuth: "{provider} でもう一方のアカウントを証明します",
@@ -2298,18 +2471,49 @@ const ja = {
         mergePasskeyUnavailable: "このブラウザでは Passkey を利用できません",
         mergePopupClosed: "ログインウィンドウが閉じられました",
         mergeConfirmTitle: "アカウント統合の確認",
-        mergeConfirmMsg: "資格情報はこのアカウントへ移ります。DID Space は /user/.archive/{did}/ に残り、コピーされません。",
+        mergeConfirmMsg: "資格情報は残すアカウントへ移ります。DID Space はコピーされません。",
+        mergeConfirmChoose: "どちらのアカウントの DID を残しますか？",
+        mergeConfirmMatch: "これは {email} を共有しているアカウントです。",
+        mergeConfirmNotMatch: "これは案内されたアカウントではありませんが、同じように統合できます。",
+        mergeConfirmRecommended: "推奨",
+        mergeConfirmCurrent: "現在ログイン中のアカウント",
+        mergeConfirmCreated: "作成日 {date}",
+        mergeConfirmReasonLead: "{did} を残すことを推奨します。{reason}",
+        mergeConfirmReasonHigher: "権限がより高いです。",
+        mergeConfirmReasonHandle: "handle @{handle} があります。",
+        mergeConfirmReasonWallet: "DID は DID Wallet のものです。",
+        mergeConfirmReasonOlder: "作成日がより早いです。",
+        mergeConfirmReasonSimilar: "2つのアカウントは近いので、ログイン中のアカウントを残します。",
+        mergeConfirmAlias: "もう一方の DID は別名になります。元のログイン方法でも、残したアカウントにサインインできます。",
+        mergeConfirmChanges: "統合後",
+        mergeConfirmMovedMethods: "残すアカウントへ移るログイン方法：{methods}",
+        mergeConfirmGlobalRole: "グローバルロール：{before} → {after}",
+        mergeConfirmSpaceRole: "{space}：{before} → {after}",
+        mergeConfirmSpaceRoleUnnamed: "{before} → {after}",
+        mergeConfirmJoinedSpaces: "新しく参加するスペース：{spaces}",
+        mergeConfirmJoinedSpace: "{space}（{role}）",
+        mergeConfirmJoinedSpaceUnnamed: "{role}",
+        mergeConfirmHandleStays: "handle @{handle} は {did} に残り、残すアカウントには表示されません。",
+        mergeConfirmNameAvatar: "{did} の名前とアバターは残りません。",
+        mergeConfirmDidSpaceNotCopied: "DID Space：{did} のデータは残すアカウントへコピーされません。",
+        mergeConfirmHostMaybe: "他のアプリで {did} を使っていた場合（公開した blocklet、Slack/X の認可など）、結び直しが必要になることがあります。",
+        mergeConfirmSubmitKeep: "アカウントを統合",
+        mergeConfirmSubmitSwitch: "{did} に統合して切り替える",
+        mergeConfirmLoading: "変更一覧を更新しています…",
+        mergeDoneTitle: "統合しました",
+        mergeDoneDid: "あなたの DID は {did} です。",
+        mergeDoneMethods: "今後は {methods} でサインインできます。",
+        mergeDoneFinish: "完了",
         mergeConfirmSurviving: "統合後は {intoDid} が残ります。{fromDid} は統合され、単独では使えなくなります。",
-        mergeConfirmKeepOther: "もう一方のアカウントを残しますか？一度ログアウトし、そのアカウントでログインしてから、統合をやり直してください。",
         mergeConfirmCredentials: "移動するログイン方法",
         mergeConfirmSkipped: "移動しないログイン方法",
         mergeConfirmSkippedReason: "このログイン方法は両方のアカウントにあるため、元のアカウントに残ります。",
         mergeConfirmRoles: "権限の変更",
-        mergeConfirmRoleChange: "もう一方のアカウントの {fromRole} は {keptRole} になります（このアカウントは現在 {intoRoleBefore} です）。",
+        mergeConfirmRoleChange: "もう一方のアカウントの {fromRole} は {keptRole} になります（残すアカウントは現在 {intoRoleBefore} です）。",
         mergeConfirmAccessKeysTitle: "アクセスキー",
-        mergeConfirmAccessKeys: "{count} 件のアクセスキーがこのアカウントへ移ります。",
+        mergeConfirmAccessKeys: "{count} 件のアクセスキーが残すアカウントへ移ります。",
         mergeConfirmDidSpaceTitle: "DID Space",
-        mergeDidSpace: "DID Space はコピーされません。統合後は {pointer} で読み取り専用になります。",
+        mergeDidSpace: "DID Space は残すアカウントへコピーされません。",
         mergeConfirmHostWarnings: "その他の影響",
         mergeHostBlockletOwnerClash: "もう一方のアカウントが公開した blocklet やドメインは、統合後に競合することがあります。",
         mergeHostExternalTokenRebind: "Slack や X などの外部認可は元のアカウントに紐づいたままなので、再連携が必要です。",
@@ -2318,10 +2522,30 @@ const ja = {
         mergeSuccess: "アカウントを統合しました",
         mergeFailed: "アカウントを統合できませんでした",
         mergeCancelled: "統合をキャンセルしました",
-        mergePromptTitle: "同じメールの別アカウントがあります",
-        mergePromptBody: "別のアカウントが同じ確認済みメールを使っています。このアカウントへ統合できます。残るのは現在のアカウントです。",
-        mergePromptAction: "今すぐ統合",
-        mergePromptDismiss: "後で",
+        mergePromptTitle: "同じメールを確認済みの別アカウントがあります",
+        mergePromptBody: "これもあなたのものなら、現在のアカウントへ統合できます。確認するまで何も変更されません。先にプレビューします。",
+        mergePromptAction: "このアカウントを統合",
+        mergePromptDismiss: "あとで",
+        mergePromptTitleOne: "メール {email} は別のアカウントでも確認済みです",
+        mergePromptTitleMany: "メール {email} は他 {count} 件のアカウントでも確認済みです",
+        mergePromptBodyOne: "これもあなたのものなら、現在のアカウントへ統合できます。確認するまで何も変更されません。先にプレビューします。",
+        mergePromptBodyMany: "これらもあなたのものなら、現在のアカウントへ統合できます。確認するまで何も変更されません。先にプレビューします。",
+        mergePromptMergeThis: "このアカウントを統合",
+        mergePromptNotMine: "自分のではない",
+        mergePromptLater: "あとで",
+        mergePromptCreated: "作成 {when}",
+        mergePromptLastLogin: "最終ログイン {when}",
+        mergePromptToday: "今日",
+        mergePromptDayAgo: "1日前",
+        mergePromptDaysAgo: "{count}日前",
+        mergePromptMonthAgo: "1か月前",
+        mergePromptMonthsAgo: "{count}か月前",
+        mergePromptMethodSep: "、",
+        mergePromptMethodsDisabled: "このアカウントのログイン方法はこのサイトで停止されているため、直接証明できません。管理者に連絡してください。",
+        mergeCandidateProveHint: "このアカウントのログイン方法でサインインして、本人であることを証明します。現在のログインは切り替わりません。",
+        mergeProveEmailAddress: "{email} でログイン",
+        mergePromptMethodsLabel: "このアカウントが使っているログイン方法",
+        mergePromptOtherMethods: "その他の方法",
     },
     members: {
         title: "メンバー",