New translations translation.json (Russian)

[ci skip]
New translations translation.json (English)
2026-08-20 19:14:10 +08:00 · 2026-08-17 22:17:25 +01:00 · 2026-08-17 17:24:48 +01:00 · 2026-08-17 12:40:46 +01:00 · 2026-08-12 14:18:50 +01:00 · 2026-08-12 14:18:49 +01:00
36 changed files with 3286 additions and 2617 deletions
@@ -0,0 +1 @@
+shamefully-hoist = true
@@ -1,7 +1,7 @@
-FROM node:26-slim AS base
+FROM node:22-slim AS base
 LABEL org.opencontainers.image.source="https://github.com/docmost/docmost"

-RUN npm install -g pnpm@11.15.1
+RUN npm install -g pnpm@10.4.0

 FROM base AS builder

@@ -34,6 +34,7 @@ COPY --from=builder /app/packages/base-formula/package.json /app/packages/base-f
 # Copy root package files
 COPY --from=builder /app/package.json /app/package.json
 COPY --from=builder /app/pnpm*.yaml /app/
+COPY --from=builder /app/.npmrc /app/.npmrc

 # Copy patches
 COPY --from=builder /app/patches /app/patches
@@ -36,7 +36,7 @@
    "@tanstack/react-table": "8.21.3",
    "@tanstack/react-virtual": "3.14.3",
    "alfaaz": "1.1.0",
-    "axios": "1.18.1",
+    "axios": "1.16.0",
    "blueimp-load-image": "5.16.0",
    "clsx": "2.1.1",
    "file-saver": "2.0.5",
@@ -387,6 +387,8 @@
  "Insert horizontal rule divider": "Horizontale Trennlinie einfügen",
  "Page break": "Seitenumbruch",
  "Insert a page break for printing.": "Einen Seitenumbruch zum Drucken einfügen.",
+  "Footnote": "Fußnote",
+  "Insert a footnote reference.": "Einen Fußnotenverweis einfügen.",
  "Upload any image from your device.": "Laden Sie ein beliebiges Bild von Ihrem Gerät hoch.",
  "Upload any video from your device.": "Laden Sie ein beliebiges Video von Ihrem Gerät hoch.",
  "Upload any audio from your device.": "Laden Sie beliebige Audiodateien von Ihrem Gerät hoch.",
@@ -1289,5 +1291,16 @@
  "{{count}} rows deleted_one": "1 row deleted",
  "{{count}} rows deleted_other": "{{count}} rows deleted",
  "{{count}} selected_one": "1 selected",
-  "{{count}} selected_other": "{{count}} selected"
+  "{{count}} selected_other": "{{count}} selected",
+  "Compare": "Vergleichen",
+  "Compare versions": "Versionen vergleichen",
+  "Select version from {{date}}": "Version vom {{date}} auswählen",
+  "Version actions for {{date}}": "Versionsaktionen für {{date}}",
+  "Comparing {{newer}} and {{older}}": "{{newer}} und {{older}} werden verglichen",
+  "Exit compare": "Vergleich beenden",
+  "Search attachments...": "Search attachments...",
+  "Error loading attachments.": "Error loading attachments.",
+  "No attachments on this page yet.": "No attachments on this page yet.",
+  "Uploaded by {{name}}": "Uploaded by {{name}}",
+  "Download {{name}}": "Download {{name}}"
 }
@@ -47,24 +47,24 @@
  "Are you sure you want to delete this page? This will delete its children and page history. This action is irreversible.": "Are you sure you want to delete this page? This will delete its children and page history. This action is irreversible.",
  "Description": "Description",
  "Details": "Details",
-  "e.g ACME": "e.g ACME",
-  "e.g ACME Inc": "e.g ACME Inc",
-  "e.g Developers": "e.g Developers",
-  "e.g Group for developers": "e.g Group for developers",
-  "e.g product": "e.g product",
-  "e.g Product Team": "e.g Product Team",
-  "e.g Sales": "e.g Sales",
-  "e.g Space for product team": "e.g Space for product team",
-  "e.g Space for sales team to collaborate": "e.g Space for sales team to collaborate",
+  "e.g ACME": "e.g. ACME",
+  "e.g ACME Inc": "e.g. ACME Inc",
+  "e.g Developers": "e.g. Developers",
+  "e.g Group for developers": "e.g. Group for developers",
+  "e.g product": "e.g. product",
+  "e.g Product Team": "e.g. Product Team",
+  "e.g Sales": "e.g. Sales",
+  "e.g Space for product team": "e.g. Space for product team",
+  "e.g Space for sales team to collaborate": "e.g. Space for sales team to collaborate",
  "Edit": "Edit",
  "Read": "Read",
  "Edit group": "Edit group",
  "Email": "Email",
  "Enter a strong password": "Enter a strong password",
  "Enter valid email addresses separated by comma or space max_50": "Enter valid email addresses separated by comma or space [max: 50]",
-  "enter valid emails addresses": "enter valid emails addresses",
+  "enter valid emails addresses": "Enter valid email addresses",
  "Enter your current password": "Enter your current password",
-  "enter your full name": "enter your full name",
+  "enter your full name": "Enter your full name",
  "Enter your new password": "Enter your new password",
  "Enter your new preferred email": "Enter your new preferred email",
  "Enter your password": "Enter your password",
@@ -112,7 +112,7 @@
  "Import pages": "Import pages",
  "Import pages & space settings": "Import pages & space settings",
  "Importing pages": "Importing pages",
-  "invalid invitation link": "invalid invitation link",
+  "invalid invitation link": "Invalid invitation link",
  "Invitation signup": "Invitation signup",
  "Invite by email": "Invite by email",
  "Invite members": "Invite members",
@@ -223,7 +223,7 @@
  "Your password must be a minimum of 8 characters.": "Your password must be a minimum of 8 characters.",
  "Sidebar toggle": "Sidebar toggle",
  "Comments": "Comments",
-  "404 page not found": "404 page not found",
+  "404 page not found": "404! Page not found",
  "Sorry, we can't find the page you are looking for.": "Sorry, we can't find the page you are looking for.",
  "Take me back to homepage": "Take me back to homepage",
  "Forgot password": "Forgot password",
@@ -387,6 +387,8 @@
  "Insert horizontal rule divider": "Insert horizontal rule divider",
  "Page break": "Page break",
  "Insert a page break for printing.": "Insert a page break for printing.",
+  "Footnote": "Footnote",
+  "Insert a footnote reference.": "Insert a footnote reference.",
  "Upload any image from your device.": "Upload any image from your device.",
  "Upload any video from your device.": "Upload any video from your device.",
  "Upload any audio from your device.": "Upload any audio from your device.",
@@ -420,7 +422,7 @@
  "Insert current date": "Insert current date",
  "Time": "Time",
  "Insert current time": "Insert current time",
-  "Draw and sketch excalidraw diagrams": "Draw and sketch excalidraw diagrams",
+  "Draw and sketch excalidraw diagrams": "Draw and sketch Excalidraw diagrams",
  "Multiple": "Multiple",
  "Turn into": "Turn into",
  "Text align": "Text align",
@@ -561,7 +563,7 @@
  "Make sure to save these codes in a secure place. Your old backup codes are no longer valid.": "Make sure to save these codes in a secure place. Your old backup codes are no longer valid.",
  "Your new backup codes": "Your new backup codes",
  "I've saved my backup codes": "I've saved my backup codes",
-  "Failed to setup MFA": "Failed to setup MFA",
+  "Failed to setup MFA": "Failed to set up MFA",
  "Setup & Verify": "Setup & Verify",
  "Add to authenticator": "Add to authenticator",
  "1. Scan this QR code with your authenticator app": "1. Scan this QR code with your authenticator app",
@@ -635,7 +637,7 @@
  "Enterprise": "Enterprise",
  "Download attachment": "Download attachment",
  "Allowed email domains": "Allowed email domains",
-  "Only users with email addresses from these domains can signup via SSO.": "Only users with email addresses from these domains can signup via SSO.",
+  "Only users with email addresses from these domains can signup via SSO.": "Only users with email addresses from these domains can sign up via SSO.",
  "Enter valid domain names separated by comma or space": "Enter valid domain names separated by comma or space",
  "Enforce two-factor authentication": "Enforce two-factor authentication",
  "Once enforced, all members must enable two-factor authentication to access the workspace.": "Once enforced, all members must enable two-factor authentication to access the workspace.",
@@ -824,7 +826,7 @@
  "Choose how this page should stay accurate.": "Choose how this page should stay accurate.",
  "Recurring verification": "Recurring verification",
  "Verifiers re-confirm this page on a schedule.": "Verifiers re-confirm this page on a schedule.",
-  "Re-verify on a schedule (e.g every 30 days )": "Re-verify on a schedule (e.g every 30 days )",
+  "Re-verify on a schedule (e.g every 30 days )": "Re-verify on a schedule (e.g. every 30 days)",
  "Page stays editable at all times": "Page stays editable at all times",
  "Best for runbooks, FAQs, living documentation": "Best for runbooks, FAQs, living documentation",
  "Approval workflow": "Approval workflow",
@@ -900,7 +902,7 @@
  "Publish": "Publish",
  "Security": "Security",
  "Enforce SSO": "Enforce SSO",
-  "Once enforced, members will not be able to login with email and password.": "Once enforced, members will not be able to login with email and password.",
+  "Once enforced, members will not be able to login with email and password.": "Once enforced, members will not be able to log in with email and password.",
  "AI-generated content may not be accurate.": "AI-generated content may not be accurate.",
  "AI Chat": "AI Chat",
  "Analyze for insights": "Analyze for insights",
@@ -1246,7 +1248,7 @@
  "Not started": "Not started",
  "Number": "Number",
  "One month ago": "One month ago",
-  "One month from now": "One month from now",
+  "One month from now": "In one month",
  "One week ago": "One week ago",
  "One week from now": "One week from now",
  "Open as page": "Open as page",
@@ -1289,5 +1291,16 @@
  "{{count}} rows deleted_one": "1 row deleted",
  "{{count}} rows deleted_other": "{{count}} rows deleted",
  "{{count}} selected_one": "1 selected",
-  "{{count}} selected_other": "{{count}} selected"
+  "{{count}} selected_other": "{{count}} selected",
+  "Compare": "Compare",
+  "Compare versions": "Compare versions",
+  "Select version from {{date}}": "Select version from {{date}}",
+  "Version actions for {{date}}": "Version actions for {{date}}",
+  "Comparing {{newer}} and {{older}}": "Comparing {{newer}} and {{older}}",
+  "Exit compare": "Exit compare",
+  "Search attachments...": "Search attachments...",
+  "Error loading attachments.": "Error loading attachments.",
+  "No attachments on this page yet.": "No attachments on this page yet.",
+  "Uploaded by {{name}}": "Uploaded by {{name}}",
+  "Download {{name}}": "Download {{name}}"
 }
@@ -387,6 +387,8 @@
  "Insert horizontal rule divider": "Insertar regla horizontal",
  "Page break": "Salto de página",
  "Insert a page break for printing.": "Inserta un salto de página para imprimir.",
+  "Footnote": "Nota al pie",
+  "Insert a footnote reference.": "Insertar una referencia de nota al pie.",
  "Upload any image from your device.": "Sube cualquier imagen desde tu dispositivo.",
  "Upload any video from your device.": "Sube cualquier video desde tu dispositivo.",
  "Upload any audio from your device.": "Sube cualquier audio desde tu dispositivo.",
@@ -1186,8 +1188,8 @@
  "Default value": "Valor predeterminado",
  "Delete property": "Eliminar propiedad",
  "Delete view": "Eliminar vista",
-  "Delete {{count}} rows?_one": "Delete 1 row?",
-  "Delete {{count}} rows?_other": "Delete {{count}} rows?",
+  "Delete {{count}} rows?_one": "¿Eliminar 1 fila?",
+  "Delete {{count}} rows?_other": "¿Eliminar {{count}} filas?",
  "Descending": "Descendente",
  "Discard": "Descartar",
  "Doesn't contain": "No contiene",
@@ -1286,8 +1288,19 @@
  "Value": "Valor",
  "View updated for everyone": "Vista actualizada para todos",
  "You have unsaved changes. Do you want to discard them?": "Tiene cambios no guardados. ¿Quiere descartarlos?",
-  "{{count}} rows deleted_one": "1 row deleted",
-  "{{count}} rows deleted_other": "{{count}} rows deleted",
-  "{{count}} selected_one": "1 selected",
-  "{{count}} selected_other": "{{count}} selected"
+  "{{count}} rows deleted_one": "1 fila eliminada",
+  "{{count}} rows deleted_other": "{{count}} filas eliminadas",
+  "{{count}} selected_one": "1 seleccionado",
+  "{{count}} selected_other": "{{count}} seleccionadas",
+  "Compare": "Comparar",
+  "Compare versions": "Comparar versiones",
+  "Select version from {{date}}": "Seleccionar la versión del {{date}}",
+  "Version actions for {{date}}": "Acciones de la versión del {{date}}",
+  "Comparing {{newer}} and {{older}}": "Comparando {{newer}} y {{older}}",
+  "Exit compare": "Salir de la comparación",
+  "Search attachments...": "Search attachments...",
+  "Error loading attachments.": "Error loading attachments.",
+  "No attachments on this page yet.": "No attachments on this page yet.",
+  "Uploaded by {{name}}": "Uploaded by {{name}}",
+  "Download {{name}}": "Download {{name}}"
 }
@@ -387,6 +387,8 @@
  "Insert horizontal rule divider": "Insérer un séparateur de règle horizontale",
  "Page break": "Saut de page",
  "Insert a page break for printing.": "Insérer un saut de page pour l’impression.",
+  "Footnote": "Note de bas de page",
+  "Insert a footnote reference.": "Insérer une référence de note de bas de page.",
  "Upload any image from your device.": "Téléchargez n'importe quelle image depuis votre appareil.",
  "Upload any video from your device.": "Téléchargez n'importe quelle vidéo depuis votre appareil.",
  "Upload any audio from your device.": "Téléchargez n'importe quel fichier audio depuis votre appareil.",
@@ -1186,8 +1188,8 @@
  "Default value": "Valeur par défaut",
  "Delete property": "Supprimer la propriété",
  "Delete view": "Supprimer la vue",
-  "Delete {{count}} rows?_one": "Delete 1 row?",
-  "Delete {{count}} rows?_other": "Delete {{count}} rows?",
+  "Delete {{count}} rows?_one": "Supprimer 1 ligne ?",
+  "Delete {{count}} rows?_other": "Supprimer {{count}} lignes ?",
  "Descending": "Décroissant",
  "Discard": "Ignorer",
  "Doesn't contain": "Ne contient pas",
@@ -1286,8 +1288,19 @@
  "Value": "Valeur",
  "View updated for everyone": "Vue mise à jour pour tout le monde",
  "You have unsaved changes. Do you want to discard them?": "Vous avez des modifications non enregistrées. Voulez-vous les ignorer ?",
-  "{{count}} rows deleted_one": "1 row deleted",
-  "{{count}} rows deleted_other": "{{count}} rows deleted",
-  "{{count}} selected_one": "1 selected",
-  "{{count}} selected_other": "{{count}} selected"
+  "{{count}} rows deleted_one": "1 ligne supprimée",
+  "{{count}} rows deleted_other": "{{count}} lignes supprimées",
+  "{{count}} selected_one": "1 sélectionné(e)",
+  "{{count}} selected_other": "{{count}} sélectionné(e)s",
+  "Compare": "Comparer",
+  "Compare versions": "Comparer les versions",
+  "Select version from {{date}}": "Sélectionner la version du {{date}}",
+  "Version actions for {{date}}": "Actions de version pour le {{date}}",
+  "Comparing {{newer}} and {{older}}": "Comparaison de {{newer}} et {{older}}",
+  "Exit compare": "Quitter la comparaison",
+  "Search attachments...": "Search attachments...",
+  "Error loading attachments.": "Error loading attachments.",
+  "No attachments on this page yet.": "No attachments on this page yet.",
+  "Uploaded by {{name}}": "Uploaded by {{name}}",
+  "Download {{name}}": "Download {{name}}"
 }
@@ -205,7 +205,7 @@
  "Templates": "Modelli",
  "Theme": "Tema",
  "To change your email, you have to enter your password and new email.": "Per cambiare la tua email, devi inserire la tua password e la nuova email.",
-  "Toggle full page width": "Attiva/disattiva larghezza completa della pagina",
+  "Toggle full page width": "Attiva/disattiva larghezza intera della pagina",
  "Unable to import pages. Please try again.": "Impossibile importare le pagine. Riprova.",
  "untitled": "senza titolo",
  "Untitled": "Senza titolo",
@@ -387,6 +387,8 @@
  "Insert horizontal rule divider": "Inserisci divisore di regola orizzontale",
  "Page break": "Interruzione di pagina",
  "Insert a page break for printing.": "Inserisci un'interruzione di pagina per la stampa.",
+  "Footnote": "Nota a piè di pagina",
+  "Insert a footnote reference.": "Inserisci un riferimento a una nota a piè di pagina.",
  "Upload any image from your device.": "Carica un'immagine dal tuo dispositivo.",
  "Upload any video from your device.": "Carica qualsiasi video dal tuo dispositivo.",
  "Upload any audio from your device.": "Carica qualsiasi audio dal tuo dispositivo.",
@@ -1186,8 +1188,8 @@
  "Default value": "Valore predefinito",
  "Delete property": "Elimina proprietà",
  "Delete view": "Elimina vista",
-  "Delete {{count}} rows?_one": "Delete 1 row?",
-  "Delete {{count}} rows?_other": "Delete {{count}} rows?",
+  "Delete {{count}} rows?_one": "Eliminare 1 riga?",
+  "Delete {{count}} rows?_other": "Eliminare {{count}} righe?",
  "Descending": "Decrescente",
  "Discard": "Ignora",
  "Doesn't contain": "Non contiene",
@@ -1286,8 +1288,19 @@
  "Value": "Valore",
  "View updated for everyone": "Vista aggiornata per tutti",
  "You have unsaved changes. Do you want to discard them?": "Hai modifiche non salvate. Vuoi ignorarle?",
-  "{{count}} rows deleted_one": "1 row deleted",
-  "{{count}} rows deleted_other": "{{count}} rows deleted",
-  "{{count}} selected_one": "1 selected",
-  "{{count}} selected_other": "{{count}} selected"
+  "{{count}} rows deleted_one": "1 riga eliminata",
+  "{{count}} rows deleted_other": "{{count}} righe eliminate",
+  "{{count}} selected_one": "1 selezionato",
+  "{{count}} selected_other": "{{count}} selezionati",
+  "Compare": "Confronta",
+  "Compare versions": "Confronta versioni",
+  "Select version from {{date}}": "Seleziona la versione del {{date}}",
+  "Version actions for {{date}}": "Azioni della versione del {{date}}",
+  "Comparing {{newer}} and {{older}}": "Confronto tra {{newer}} e {{older}}",
+  "Exit compare": "Esci dal confronto",
+  "Search attachments...": "Search attachments...",
+  "Error loading attachments.": "Error loading attachments.",
+  "No attachments on this page yet.": "No attachments on this page yet.",
+  "Uploaded by {{name}}": "Uploaded by {{name}}",
+  "Download {{name}}": "Download {{name}}"
 }
@@ -387,6 +387,8 @@
  "Insert horizontal rule divider": "区切り線を挿入します",
  "Page break": "改ページ",
  "Insert a page break for printing.": "印刷用に改ページを挿入します。",
+  "Footnote": "脚注",
+  "Insert a footnote reference.": "脚注参照を挿入します。",
  "Upload any image from your device.": "デバイスから画像をアップロードします",
  "Upload any video from your device.": "デバイスから動画をアップロードします",
  "Upload any audio from your device.": "デバイスから音声ファイルをアップロードします。",
@@ -1289,5 +1291,16 @@
  "{{count}} rows deleted_one": "1 row deleted",
  "{{count}} rows deleted_other": "{{count}} rows deleted",
  "{{count}} selected_one": "1 selected",
-  "{{count}} selected_other": "{{count}} selected"
+  "{{count}} selected_other": "{{count}} selected",
+  "Compare": "比較",
+  "Compare versions": "バージョンを比較",
+  "Select version from {{date}}": "{{date}} のバージョンを選択",
+  "Version actions for {{date}}": "{{date}} のバージョンの操作",
+  "Comparing {{newer}} and {{older}}": "{{newer}} と {{older}} を比較中",
+  "Exit compare": "比較を終了",
+  "Search attachments...": "Search attachments...",
+  "Error loading attachments.": "Error loading attachments.",
+  "No attachments on this page yet.": "No attachments on this page yet.",
+  "Uploaded by {{name}}": "Uploaded by {{name}}",
+  "Download {{name}}": "Download {{name}}"
 }
@@ -2,23 +2,23 @@
  "Account": "계정",
  "Active": "활성",
  "Add": "추가",
-  "Add group members": "팀에 사용자 추가",
-  "Add groups": "팀 생성",
+  "Add group members": "그룹에 멤버 추가",
+  "Add groups": "그룹 추가",
  "Add members": "사용자 추가",
-  "Add to groups": "팀에 추가",
+  "Add to groups": "그룹에 추가",
  "Add space members": "Space에 사용자 추가",
  "Add to favorites": "즐겨찾기에 추가",
  "Admin": "관리자",
-  "Are you sure you want to delete this group? Members will lose access to resources this group has access to.": "이 팀을 삭제하시겠습니까? 해당 팀에 속한 사용자들은 이 팀이 가진 모든 권한을 잃게 됩니다.",
+  "Are you sure you want to delete this group? Members will lose access to resources this group has access to.": "이 그룹을 삭제하시겠습니까? 그룹 멤버는 이 그룹이 가진 모든 권한을 잃게 됩니다.",
  "Are you sure you want to delete this page?": "이 페이지를 삭제하시겠습니까?",
-  "Are you sure you want to remove this user from the group? The user will lose access to resources this group has access to.": "이 사용자를 팀에서 제거하시겠습니까? 사용자는 이 팀이 가진 모든 권한을 잃게 됩니다.",
+  "Are you sure you want to remove this user from the group? The user will lose access to resources this group has access to.": "이 사용자를 그룹에서 제거하시겠습니까? 사용자는 이 그룹이 가진 모든 권한을 잃게 됩니다.",
  "Are you sure you want to remove this user from the space? The user will lose all access to this space.": "이 사용자를 Space에서 제거하시겠습니까? 사용자는 이 Space에 대한 모든 접근 권한을 잃게 됩니다.",
  "Are you sure you want to restore this version? Any changes not versioned will be lost.": "이 버전으로 복원하시겠습니까? 저장되지 않은 모든 변경사항이 손실됩니다.",
-  "Can become members of groups and spaces in workspace": "Workspace 내 팀 및 Space의 사용자가 될 수 있습니다.",
+  "Can become members of groups and spaces in workspace": "워크스페이스의 그룹 및 스페이스의 멤버가 될 수 있음",
  "Can create and edit pages in space.": "Space에 페이지를 생성하고 편집할 수 있습니다.",
  "Can edit": "편집할 수 있음",
-  "Can manage workspace": "Workspace를 관리할 수 있음",
-  "Can manage workspace but cannot delete it": "Workspace를 관리할 수 있지만, 삭제는 불가능.",
+  "Can manage workspace": "워크스페이스를 관리할 수 있음",
+  "Can manage workspace but cannot delete it": "워크스페이스를 관리할 수 있지만, 삭제할 수 없음",
  "Can view": "볼 수 있음",
  "Can view pages in space but not edit.": "Space의 페이지를 볼 수 있지만, 편집은 불가능.",
  "Cancel": "취소",
@@ -33,17 +33,17 @@
  "Copy as Markdown": "Markdown으로 복사",
  "Copy link": "링크 복사",
  "Create": "생성",
-  "Create group": "팀 생성",
+  "Create group": "그룹 생성",
  "Create page": "페이지 생성",
  "Create space": "Space 생성",
-  "Create workspace": "Workspace 생성",
+  "Create workspace": "워크스페이스 생성",
  "Current password": "현재 비밀번호",
  "Dark": "어두운",
  "Date": "날짜",
  "Delete": "삭제",
  "Remove from page": "페이지에서 제거",
  "Base options": "베이스 옵션",
-  "Delete group": "팀 삭제",
+  "Delete group": "그룹 삭제",
  "Are you sure you want to delete this page? This will delete its children and page history. This action is irreversible.": "이 페이지를 삭제하시겠습니까? 하위 페이지와 페이지 기록이 모두 삭제됩니다. 이 작업은 되돌릴 수 없습니다.",
  "Description": "설명",
  "Details": "세부사항",
@@ -58,7 +58,7 @@
  "e.g Space for sales team to collaborate": "예: 영업 팀이 협업하는 스페이스",
  "Edit": "편집",
  "Read": "읽기",
-  "Edit group": "팀 편집",
+  "Edit group": "그룹 편집",
  "Email": "이메일",
  "Enter a strong password": "강력한 비밀번호를 입력하세요",
  "Enter valid email addresses separated by comma or space max_50": "유효한 이메일 주소를 쉼표나 공백으로 구분하여 입력하세요 [최대: 50]",
@@ -103,10 +103,10 @@
  "Full page width": "전체 페이지 너비",
  "Full width": "전체 너비",
  "General": "일반",
-  "Group": "팀",
-  "Group description": "팀 설명",
-  "Group name": "팀 이름",
-  "Groups": "팀",
+  "Group": "그룹",
+  "Group description": "그룹 설명",
+  "Group name": "그룹 이름",
+  "Groups": "그룹",
  "Has full access to space settings and pages.": "Space 설정과 페이지에 대한 전체 접근 권한이 있습니다.",
  "Home": "홈",
  "Import pages": "페이지 가져오기",
@@ -119,14 +119,14 @@
  "Invite new members": "새 사용자 초대",
  "Invite People": "사용자 초대",
  "Invited members who are yet to accept their invitation will appear here.": "초대를 아직 수락하지 않은 초대된 사용자가 여기에 표시됩니다.",
-  "Invited members will be granted access to spaces the groups can access": "초대된 사용자는 팀이 접근할 수 있는 Space에 대한 접근 권한을 받게 됩니다",
-  "Join the workspace": "Workspace 참여",
+  "Invited members will be granted access to spaces the groups can access": "초대된 멤버에게는 그룹이 접근할 수 있는 스페이스에 대한 액세스 권한이 부여됩니다",
+  "Join the workspace": "워크스페이스 참여",
  "Language": "언어",
  "Light": "밝은",
  "Link copied": "링크 복사됨",
  "Login": "로그인",
  "Logout": "로그아웃",
-  "Manage Group": "팀 관리",
+  "Manage Group": "그룹 관리",
  "Manage members": "사용자 관리",
  "member": "사용자",
  "Member": "사용자",
@@ -139,7 +139,7 @@
  "New email": "새 이메일",
  "New page": "새 페이지",
  "New password": "새 비밀번호",
-  "No group found": "그룹을 찾을 수 없습니다",
+  "No group found": "그룹을 찾을 수 없음",
  "No page history saved yet.": "아직 저장된 페이지 기록이 없습니다.",
  "No pages yet": "아직 페이지가 없습니다",
  "No shared pages": "공유된 페이지가 없습니다.",
@@ -148,7 +148,7 @@
  "Overview": "개요",
  "Owner": "소유자",
  "page": "페이지",
-  "Page deleted successfully": "페이지 삭제 완료",
+  "Page deleted successfully": "페이지 삭제됨",
  "Page history": "페이지 기록",
  "Select version": "버전 선택",
  "Highlight changes": "변경 사항 강조",
@@ -156,7 +156,7 @@
  "Pages": "페이지",
  "pages": "페이지",
  "Password": "비밀번호",
-  "Password changed successfully": "비밀번호 변경 완료",
+  "Password changed successfully": "비밀번호 변경됨",
  "People": "사용자",
  "Pending": "대기 중",
  "Please confirm your action": "작업을 확인해 주세요",
@@ -166,15 +166,15 @@
  "Recently updated": "최근 업데이트",
  "Remove": "제거",
  "Remove from favorites": "즐겨찾기에서 제거",
-  "Remove group member": "팀에서 사용자 제거",
+  "Remove group member": "그룹 멤버 제거",
  "Remove space member": "Space에서 사용자 제거",
  "Restore": "복원",
  "Role": "역할",
  "Save": "저장",
  "Search": "검색",
-  "Search for groups": "팀 검색",
+  "Search for groups": "그룹 검색",
  "Search for users": "사용자 검색",
-  "Search for users and groups": "사용자 및 팀 검색",
+  "Search for users and groups": "사용자 및 그룹 검색",
  "Search...": "검색...",
  "Select language": "언어 선택",
  "Select role": "역할 선택",
@@ -199,8 +199,8 @@
  "Search for spaces": "스페이스 검색",
  "Start typing to search...": "검색하려면 입력을 시작하세요...",
  "Status": "상태",
-  "Successfully imported": "가져오기에 성공했습니다",
-  "Successfully restored": "복원에 성공했습니다",
+  "Successfully imported": "가져오기 완료",
+  "Successfully restored": "복원 완료",
  "System settings": "시스템 설정",
  "Templates": "템플릿",
  "Theme": "테마",
@@ -209,7 +209,7 @@
  "Unable to import pages. Please try again.": "페이지를 가져올 수 없습니다. 다시 시도해주세요.",
  "untitled": "제목 없음",
  "Untitled": "제목 없음",
-  "Updated successfully": "성공적으로 업데이트되었습니다",
+  "Updated successfully": "업데이트 완료",
  "User": "사용자",
  "Workspace": "워크스페이스",
  "Workspace Name": "워크스페이스 이름",
@@ -245,15 +245,15 @@
  "Are you sure you want to delete this comment?": "이 댓글을 삭제하시겠습니까?",
  "Delete chat": "채팅 삭제",
  "Are you sure you want to delete '{{title}}'? This action cannot be undone.": "'{{title}}'을(를) 삭제하시겠습니까? 이 작업은 되돌릴 수 없습니다.",
-  "Comment created successfully": "댓글 생성 완료",
+  "Comment created successfully": "댓글 생성됨",
  "Error creating comment": "댓글 생성 오류",
-  "Comment updated successfully": "댓글 업데이트 완료",
+  "Comment updated successfully": "댓글 업데이트됨",
  "Failed to update comment": "댓글 업데이트 실패",
-  "Comment deleted successfully": "댓글 삭제 완료",
+  "Comment deleted successfully": "댓글 삭제됨",
  "Failed to delete comment": "댓글 삭제 실패",
-  "Comment resolved successfully": "댓글 처리 완료",
-  "Comment re-opened successfully": "댓글이 성공적으로 다시 열렸습니다",
-  "Comment unresolved successfully": "댓글 해결이 성공적으로 취소되었습니다",
+  "Comment resolved successfully": "댓글이 해결로 표시됨",
+  "Comment re-opened successfully": "댓글이 열린 상태로 표시됨",
+  "Comment unresolved successfully": "댓글이 미해결로 표시됨",
  "Failed to resolve comment": "댓글 처리 실패",
  "Resolve comment": "댓글 해결",
  "Unresolve comment": "댓글 해결 취소",
@@ -263,19 +263,19 @@
  "Are you sure you want to unresolve this comment thread?": "이 댓글 스레드를 미해결로 변경하시겠습니까?",
  "Resolved": "해결됨",
  "No active comments.": "활성 댓글이 없습니다.",
-  "Revoke invitation": "초대 취소",
-  "Revoke": "취소",
+  "Revoke invitation": "초대 폐기",
+  "Revoke": "폐기",
  "Don't": "하지 않음",
-  "Are you sure you want to revoke this invitation? The user will not be able to join the workspace.": "이 초대를 취소하시겠습니까? 사용자가 Workspace에 참여할 수 없게 됩니다.",
+  "Are you sure you want to revoke this invitation? The user will not be able to join the workspace.": "이 초대를 폐기하시겠습니까? 사용자가 워크스페이스에 참여할 수 없게 됩니다.",
  "Resend invitation": "초대 재전송",
-  "Anyone with this link can join this workspace.": "이 링크를 가진 모든 사용자가 이 Workspace에 참여할 수 있습니다.",
+  "Anyone with this link can join this workspace.": "이 링크를 가진 모든 사용자가 이 워크스페이스에 참여할 수 있습니다.",
  "Invite link": "초대 링크",
  "Copy": "복사",
  "Copy to space": "스페이스로 복사",
  "Copied": "복사됨",
  "Duplicate": "복제",
  "Select a user": "사용자 선택",
-  "Select a group": "팀 선택",
+  "Select a group": "그룹 선택",
  "Export all pages and attachments in this space.": "이 Space의 모든 페이지와 첨부파일을 내보냅니다.",
  "Delete space": "Space 삭제",
  "Are you sure you want to delete this space?": "이 Space을 삭제하시겠습니까?",
@@ -290,7 +290,7 @@
  "Export failed:": "내보내기 실패:",
  "export error": "내보내기 오류",
  "Export page": "페이지 내보내기",
-  "Export successful": "내보내기 성공",
+  "Export successful": "내보내기 완료",
  "Export space": "Space 내보내기",
  "Export {{type}}": "{{type}} 내보내기",
  "File exceeds the {{limit}} attachment limit": "첨부 파일 크기 제한 {{limit}}을 초과했습니다",
@@ -387,6 +387,8 @@
  "Insert horizontal rule divider": "가로 구분선 삽입",
  "Page break": "페이지 나누기",
  "Insert a page break for printing.": "인쇄용 페이지 나누기를 삽입합니다.",
+  "Footnote": "각주",
+  "Insert a footnote reference.": "각주 참조를 삽입합니다.",
  "Upload any image from your device.": "기기에서 이미지를 업로드하세요.",
  "Upload any video from your device.": "기기에서 비디오를 업로드하세요.",
  "Upload any audio from your device.": "기기에서 오디오를 업로드하세요.",
@@ -447,12 +449,12 @@
  "Today, {{time}}": "오늘, {{time}}",
  "Yesterday, {{time}}": "어제, {{time}}",
  "now": "지금",
-  "Space created successfully": "스페이스가 성공적으로 생성되었습니다",
-  "Space updated successfully": "스페이스가 성공적으로 업데이트되었습니다",
-  "Space deleted successfully": "스페이스가 성공적으로 삭제되었습니다",
-  "Members added successfully": "멤버가 성공적으로 추가되었습니다",
-  "Member removed successfully": "멤버가 성공적으로 제거되었습니다",
-  "Member role updated successfully": "멤버 역할이 성공적으로 업데이트되었습니다",
+  "Space created successfully": "스페이스 생성됨",
+  "Space updated successfully": "스페이스 업데이트됨",
+  "Space deleted successfully": "스페이스 삭제됨",
+  "Members added successfully": "멤버 추가됨",
+  "Member removed successfully": "멤버 삭제됨",
+  "Member role updated successfully": "멤버 역할 업데이트됨",
  "Created by: <b>{{creatorName}}</b>": "작성자: <b>{{creatorName}}</b>",
  "Created at: {{time}}": "작성 시간: {{time}}",
  "Edited by {{name}} {{time}}": "{{name}}님이 {{time}}에 편집함",
@@ -465,7 +467,7 @@
  "Choose {{format}} file": "{{format}} 파일 선택",
  "Reading": "읽기",
  "Delete member": "멤버 삭제",
-  "Member deleted successfully": "멤버가 성공적으로 삭제되었습니다",
+  "Member deleted successfully": "멤버 삭제됨",
  "Are you sure you want to delete this workspace member? This action is irreversible.": "이 워크스페이스 멤버를 삭제하시겠습니까? 이 작업은 되돌릴 수 없습니다.",
  "Deactivate member": "멤버 비활성화",
  "Activate member": "멤버 활성화",
@@ -498,32 +500,32 @@
  "Delete share": "공유 삭제",
  "Are you sure you want to delete this shared link?": "이 공유 링크를 삭제하시겠습니까?",
  "Publicly shared pages from spaces you are a member of will appear here": "회원으로 속한 스페이스의 공개 공유 페이지가 여기에 표시됩니다",
-  "Share deleted successfully": "공유가 성공적으로 삭제되었습니다",
+  "Share deleted successfully": "공유 삭제됨",
  "Share not found": "공유를 찾을 수 없습니다",
  "Failed to share page": "페이지 공유에 실패했습니다",
-  "Disable public sharing": "공유 비활성화",
-  "Prevent members from sharing pages publicly.": "멤버들이 페이지를 공개적으로 공유하지 못하도록 방지하십시오.",
-  "Toggle public sharing": "공유 전환",
-  "Toggle space public sharing": "공간 공유 전환",
+  "Disable public sharing": "공개 공유 비활성화",
+  "Prevent members from sharing pages publicly.": "멤버가 페이지를 공개적으로 공유하지 못하게 합니다.",
+  "Toggle public sharing": "공개 공유 전환",
+  "Toggle space public sharing": "스페이스 공개 공유 전환",
  "Allow viewers to comment": "뷰어가 댓글을 달 수 있도록 허용",
  "Allow viewers to add comments on pages in this space.": "이 공간 내 페이지에 뷰어가 댓글을 추가할 수 있도록 허용합니다.",
  "Toggle viewer comments": "뷰어 댓글 전환",
-  "Public sharing is disabled at the workspace level": "워크스페이스 수준에서 공유가 비활성화되었습니다.",
-  "Prevent pages in this space from being shared publicly.": "이 공간의 페이지가 공개적으로 공유되지 않도록 방지하십시오.",
+  "Public sharing is disabled at the workspace level": "공개 공유가 워크스페이스 수준에서 비활성화됨",
+  "Prevent pages in this space from being shared publicly.": "이 스페이스의 페이지가 공개 공유되지 않도록 합니다.",
  "Page permissions": "페이지 권한},{",
  "Control who can view and edit individual pages. Available with an enterprise license.": "개별 페이지의 조회 및 편집 권한을 제어합니다. 엔터프라이즈 라이선스에서 이용 가능합니다.",
-  "Enable public sharing": "공유 활성화",
-  "Are you sure you want to enable public sharing? Members will be able to share pages publicly.": "공유를 활성화하시겠습니까? 멤버들이 페이지를 공개적으로 공유할 수 있게 됩니다.",
-  "Are you sure you want to disable public sharing? All existing shared links in this workspace will be deleted.": "정말로 공유를 비활성화하시겠습니까? 이 워크스페이스의 모든 기존 공유 링크가 삭제됩니다.",
-  "Are you sure you want to enable public sharing for this space?": "이 공간의 공유를 활성화하시겠습니까?",
-  "Are you sure you want to disable public sharing? All existing shared links in this space will be deleted.": "정말로 공유를 비활성화하시겠습니까? 이 공간의 모든 기존 공유 링크가 삭제됩니다.",
-  "Public sharing is disabled": "공유가 비활성화되었습니다.",
-  "Public sharing has been disabled at the workspace level.": "워크스페이스 수준에서 공유가 비활성화되었습니다.",
-  "Public sharing has been disabled for this space.": "이 공간의 공유가 비활성화되었습니다.",
+  "Enable public sharing": "공개 공유 활성화",
+  "Are you sure you want to enable public sharing? Members will be able to share pages publicly.": "공개 공유를 활성화하시겠습니까? 멤버가 페이지를 공개적으로 공유할 수 있게 됩니다.",
+  "Are you sure you want to disable public sharing? All existing shared links in this workspace will be deleted.": "공개 공유를 비활성화하시겠습니까? 이 워크스페이스의 기존 공유 링크가 모두 삭제됩니다.",
+  "Are you sure you want to enable public sharing for this space?": "이 스페이스에 대해 공개 공유를 활성화하시겠습니까?",
+  "Are you sure you want to disable public sharing? All existing shared links in this space will be deleted.": "공개 공유를 비활성화하시겠습니까? 이 스페이스의 기존 공유 링크가 모두 삭제됩니다.",
+  "Public sharing is disabled": "공개 공유가 비활성화됨",
+  "Public sharing has been disabled at the workspace level.": "공개 공유가 워크스페이스 수준에서 비활성화되었습니다.",
+  "Public sharing has been disabled for this space.": "이 스페이스의 공개 공유가 비활성화되었습니다.",
  "Copy page": "페이지 복사",
  "Copy page to a different space.": "다른 공간으로 페이지 복사하기.",
-  "Page copied successfully": "페이지가 성공적으로 복사되었습니다",
-  "Page duplicated successfully": "페이지가 성공적으로 복제되었습니다",
+  "Page copied successfully": "페이지 복사됨",
+  "Page duplicated successfully": "페이지 복제됨",
  "Find": "찾기",
  "Not found": "찾을 수 없음",
  "Previous Match (Shift+Enter)": "이전 일치 항목 (Shift+Enter)",
@@ -539,13 +541,13 @@
  "Error": "오류",
  "Failed to disable MFA": "MFA 비활성화에 실패했습니다",
  "Disable two-factor authentication": "2단계 인증 비활성화",
-  "Disabling two-factor authentication will make your account less secure. You'll only need your password to sign in.": "이중 인증을 비활성화하면 계정의 보안이 낮아집니다. 로그인 시 비밀번호만 필요하게 됩니다.",
-  "Please enter your password to disable two-factor authentication:": "이중 인증 비활성화를 위해 비밀번호를 입력하세요:",
-  "Two-factor authentication has been enabled": "2단계 인증이 활성화되었습니다",
-  "Two-factor authentication has been disabled": "2단계 인증이 비활성화되었습니다",
+  "Disabling two-factor authentication will make your account less secure. You'll only need your password to sign in.": "2단계 인증을 비활성화하면 계정의 보안이 낮아집니다. 로그인 시 비밀번호만 필요하게 됩니다.",
+  "Please enter your password to disable two-factor authentication:": "2단계 인증 비활성화를 위해 비밀번호를 입력하세요:",
+  "Two-factor authentication has been enabled": "2단계 인증이 활성화됨",
+  "Two-factor authentication has been disabled": "2단계 인증이 비활성화됨",
  "2-step verification": "2단계 인증",
  "Protect your account with an additional verification layer when signing in.": "로그인 시 추가 인증 단계를 통해 계정을 보호하세요.",
-  "Two-factor authentication is active on your account.": "이중 인증이 계정에 활성화되어 있습니다.",
+  "Two-factor authentication is active on your account.": "2단계 인증이 계정에 활성화되어 있습니다.",
  "Add 2FA method": "2FA 방법 추가",
  "Backup codes": "백업 코드",
  "Disable": "비활성화",
@@ -575,13 +577,13 @@
  "Save your backup codes": "백업 코드를 저장하세요",
  "These codes can be used to access your account if you lose access to your authenticator app. Each code can only be used once.": "인증 앱에 대한 접근 권한을 잃은 경우, 이 코드를 사용하여 귀하의 계정에 접근할 수 있습니다. 각 코드는 한 번만 사용할 수 있습니다.",
  "Print": "인쇄",
-  "Two-factor authentication has been set up. Please log in again.": "이중 인증이 설정되었습니다. 다시 로그인해 주세요.",
-  "Two-Factor authentication required": "2단계 인증이 필요합니다",
+  "Two-factor authentication has been set up. Please log in again.": "2단계 인증이 설정되었습니다. 다시 로그인해 주세요.",
+  "Two-Factor authentication required": "2단계 인증 필요",
  "Your workspace requires two-factor authentication for all users": "이 워크스페이스는 모든 사용자에게 2단계 인증을 요구합니다",
-  "To continue accessing your workspace, you must set up two-factor authentication. This adds an extra layer of security to your account.": "워크스페이스 접근을 계속하려면 이중 인증을 설정해야 합니다. 이는 계정에 추가 보안 계층을 추가합니다.",
+  "To continue accessing your workspace, you must set up two-factor authentication. This adds an extra layer of security to your account.": "워크스페이스에 계속 액세스하려면 2단계 인증을 설정해야 합니다. 이는 계정의 보안을 한층 강화합니다.",
  "Set up two-factor authentication": "2단계 인증 설정",
  "Cancel and logout": "취소하고 로그아웃",
-  "Your workspace requires two-factor authentication. Please set it up to continue.": "워크스페이스에서는 이중 인증이 필요합니다. 계속하려면 설정해 주세요.",
+  "Your workspace requires two-factor authentication. Please set it up to continue.": "워크스페이스에서는 2단계 인증이 필요합니다. 계속하려면 설정해 주세요.",
  "This adds an extra layer of security to your account by requiring a verification code from your authenticator app.": "인증앱에서 얻은 인증 코드를 요구하여 계정의 보안에 추가적인 계층을 추가합니다.",
  "Password is required": "비밀번호는 필수입니다",
  "Password must be at least 8 characters": "비밀번호는 8자 이상이어야 합니다",
@@ -590,10 +592,10 @@
  "Enter the 6-digit code found in your authenticator app": "인증 앱에 표시된 6자리 코드를 입력하세요",
  "Need help authenticating?": "인증에 도움이 필요하십니까?",
  "MFA QR Code": "MFA QR 코드",
-  "Account created successfully. Please log in to set up two-factor authentication.": "계정이 성공적으로 생성되었습니다. 이중 인증을 설정하려면 로그인해 주세요.",
-  "Password reset successful. Please log in with your new password and complete two-factor authentication.": "비밀번호 재설정 성공. 새 비밀번호로 로그인하여 이중 인증을 완료하세요.",
-  "Password reset successful. Please log in with your new password to set up two-factor authentication.": "비밀번호 재설정 성공. 새 비밀번호로 로그인하여 이중 인증을 설정하세요.",
-  "Password reset was successful. Please log in with your new password.": "비밀번호 재설정이 성공적으로 완료되었습니다. 새 비밀번호로 로그인하세요.",
+  "Account created successfully. Please log in to set up two-factor authentication.": "계정 생성됨. 2단계 인증을 설정하려면 로그인해 주세요.",
+  "Password reset successful. Please log in with your new password and complete two-factor authentication.": "비밀번호 재설정됨. 새 비밀번호로 로그인하여 2단계 인증을 완료하세요.",
+  "Password reset successful. Please log in with your new password to set up two-factor authentication.": "비밀번호 재설정됨. 새 비밀번호로 로그인하여 2단계 인증을 설정하세요.",
+  "Password reset was successful. Please log in with your new password.": "비밀번호 재설정됨. 새 비밀번호로 로그인하세요.",
  "Two-factor authentication": "2단계 인증",
  "Use authenticator app instead": "대신 인증 앱 사용",
  "Verify backup code": "백업 코드 확인",
@@ -615,7 +617,7 @@
  "Permanently delete": "영구 삭제",
  "<b>{{name}}</b> moved this page to Trash {{time}}.": "<b>{{name}}</b>님이 {{time}}에 이 페이지를 휴지통으로 이동했습니다.",
  "Page moved to trash": "페이지가 휴지통으로 이동되었습니다",
-  "Page restored successfully": "페이지가 성공적으로 복원되었습니다",
+  "Page restored successfully": "페이지 복원됨",
  "Deleted by": "삭제한 사람",
  "Deleted at": "삭제 시간",
  "Preview": "미리보기",
@@ -638,7 +640,7 @@
  "Only users with email addresses from these domains can signup via SSO.": "이 도메인의 이메일 주소를 가진 사용자만 SSO를 통해 가입할 수 있습니다.",
  "Enter valid domain names separated by comma or space": "쉼표 또는 공백으로 구분된 유효한 도메인 이름을 입력하세요",
  "Enforce two-factor authentication": "2단계 인증 강제",
-  "Once enforced, all members must enable two-factor authentication to access the workspace.": "시행되면 모든 멤버가 작업 공간에 액세스하기 위해 이중 인증을 활성화해야 합니다.",
+  "Once enforced, all members must enable two-factor authentication to access the workspace.": "시행되면 모든 멤버가 워크스페이스에 액세스하기 위해 2단계 인증을 활성화해야 합니다.",
  "Toggle MFA enforcement": "MFA 강제 설정 전환",
  "Display name": "표시 이름",
  "Allow signup": "가입 허용",
@@ -657,7 +659,7 @@
  "Remove image": "이미지 제거",
  "Failed to remove image": "이미지 제거 실패",
  "Image exceeds 10MB limit.": "이미지가 10MB 용량 제한을 초과합니다.",
-  "Image removed successfully": "이미지가 성공적으로 제거되었습니다",
+  "Image removed successfully": "이미지 삭제됨",
  "API key": "API 키",
  "API keys": "API 키",
  "API management": "API 관리",
@@ -669,7 +671,7 @@
  "Last use": "최근 사용",
  "No API keys found": "API 키를 찾을 수 없습니다",
  "No expiration": "유효기간 없음",
-  "Revoked successfully": "성공적으로 취소되었습니다",
+  "Revoked successfully": "폐기 완료",
  "Select expiration date": "만료일 선택",
  "This action cannot be undone. Any applications using this API key will stop working.": "이 작업은 되돌릴 수 없습니다. 이 API 키를 사용하는 모든 응용 프로그램이 작동을 멈출 것입니다.",
  "Update": "업데이트",
@@ -939,8 +941,8 @@
  "Try again": "다시 시도",
  "Untitled chat": "제목 없는 채팅",
  "What can I help you with?": "무엇을 도와드릴까요?",
-  "Are you sure you want to revoke this {{credential}}": "이 {{credential}}을 취소하시겠습니까?",
-  "Automatically provision users and groups from your identity provider via SCIM.": "SCIM을 통해 ID 공급자에서 사용자와 그룹을 자동으로 프로비저닝합니다.",
+  "Are you sure you want to revoke this {{credential}}": "이 {{credential}}을(를) 폐기하시겠습니까?",
+  "Automatically provision users and groups from your identity provider via SCIM.": "SCIM을 통해 ID 공급자로부터 사용자와 그룹을 자동으로 프로비저닝합니다.",
  "Configure your identity provider with this URL to provision users and groups.": "사용자와 그룹을 프로비저닝할 수 있도록 이 URL로 ID 공급자를 구성하세요.",
  "Create {{credential}}": "{{credential}} 만들기",
  "{{credential}} created": "{{credential}} 생성됨",
@@ -953,7 +955,7 @@
  "Important": "중요",
  "Make sure to copy your {{credential}} now. You won't be able to see it again!": "지금 {{credential}}를 복사해 두세요. 다시는 볼 수 없습니다!",
  "Never": "안 함",
-  "Revoke {{credential}}": "{{credential}} 취소",
+  "Revoke {{credential}}": "{{credential}} 폐기",
  "SCIM endpoint URL": "SCIM 엔드포인트 URL",
  "SCIM provisioning": "SCIM 프로비저닝",
  "SCIM takes precedence over SSO group sync while enabled.": "SCIM이 활성화되어 있는 동안에는 SSO 그룹 동기화보다 SCIM이 우선 적용됩니다.",
@@ -1186,8 +1188,8 @@
  "Default value": "기본값",
  "Delete property": "속성 삭제",
  "Delete view": "보기 삭제",
-  "Delete {{count}} rows?_one": "Delete 1 row?",
-  "Delete {{count}} rows?_other": "Delete {{count}} rows?",
+  "Delete {{count}} rows?_one": "1개 행을 삭제하시겠습니까?",
+  "Delete {{count}} rows?_other": "{{count}}개 행을 삭제하시겠습니까?",
  "Descending": "내림차순",
  "Discard": "삭제",
  "Doesn't contain": "포함하지 않음",
@@ -1286,8 +1288,19 @@
  "Value": "값",
  "View updated for everyone": "보기가 모두에게 업데이트되었습니다",
  "You have unsaved changes. Do you want to discard them?": "저장되지 않은 변경 사항이 있습니다. 버리시겠습니까?",
-  "{{count}} rows deleted_one": "1 row deleted",
-  "{{count}} rows deleted_other": "{{count}} rows deleted",
-  "{{count}} selected_one": "1 selected",
-  "{{count}} selected_other": "{{count}} selected"
+  "{{count}} rows deleted_one": "1개 행 삭제 완료",
+  "{{count}} rows deleted_other": "{{count}}개 행 삭제 완료",
+  "{{count}} selected_one": "1개 선택됨",
+  "{{count}} selected_other": "{{count}}개 선택됨",
+  "Compare": "비교",
+  "Compare versions": "버전 비교",
+  "Select version from {{date}}": "{{date}}의 버전 선택",
+  "Version actions for {{date}}": "{{date}} 버전 작업",
+  "Comparing {{newer}} and {{older}}": "{{newer}} 및 {{older}} 비교 중",
+  "Exit compare": "비교 종료",
+  "Search attachments...": "Search attachments...",
+  "Error loading attachments.": "Error loading attachments.",
+  "No attachments on this page yet.": "No attachments on this page yet.",
+  "Uploaded by {{name}}": "Uploaded by {{name}}",
+  "Download {{name}}": "Download {{name}}"
 }
@@ -387,6 +387,8 @@
  "Insert horizontal rule divider": "Horizontale lijn invoegen",
  "Page break": "Pagina-einde",
  "Insert a page break for printing.": "Voeg een pagina-einde in voor het afdrukken.",
+  "Footnote": "Voetnoot",
+  "Insert a footnote reference.": "Voeg een voetnootverwijzing in.",
  "Upload any image from your device.": "Upload een afbeelding vanaf uw apparaat.",
  "Upload any video from your device.": "Upload een video vanaf uw apparaat.",
  "Upload any audio from your device.": "Upload een audio vanaf uw apparaat.",
@@ -1289,5 +1291,16 @@
  "{{count}} rows deleted_one": "1 rij verwijderd",
  "{{count}} rows deleted_other": "{{count}} rijen verwijderd",
  "{{count}} selected_one": "1 geselecteerd",
-  "{{count}} selected_other": "{{count}} geselecteerd"
+  "{{count}} selected_other": "{{count}} geselecteerd",
+  "Compare": "Vergelijken",
+  "Compare versions": "Versies vergelijken",
+  "Select version from {{date}}": "Selecteer versie van {{date}}",
+  "Version actions for {{date}}": "Versieacties voor {{date}}",
+  "Comparing {{newer}} and {{older}}": "{{newer}} en {{older}} vergelijken",
+  "Exit compare": "Vergelijken afsluiten",
+  "Search attachments...": "Search attachments...",
+  "Error loading attachments.": "Error loading attachments.",
+  "No attachments on this page yet.": "No attachments on this page yet.",
+  "Uploaded by {{name}}": "Uploaded by {{name}}",
+  "Download {{name}}": "Download {{name}}"
 }
@@ -387,6 +387,8 @@
  "Insert horizontal rule divider": "Insira um divisor horizontal",
  "Page break": "Quebra de página",
  "Insert a page break for printing.": "Insira uma quebra de página para impressão.",
+  "Footnote": "Nota de rodapé",
+  "Insert a footnote reference.": "Inserir uma referência de nota de rodapé.",
  "Upload any image from your device.": "Envie qualquer imagem do seu dispositivo.",
  "Upload any video from your device.": "Envie qualquer vídeo do seu dispositivo.",
  "Upload any audio from your device.": "Envie qualquer áudio do seu dispositivo.",
@@ -1289,5 +1291,16 @@
  "{{count}} rows deleted_one": "1 row deleted",
  "{{count}} rows deleted_other": "{{count}} rows deleted",
  "{{count}} selected_one": "1 selected",
-  "{{count}} selected_other": "{{count}} selected"
+  "{{count}} selected_other": "{{count}} selected",
+  "Compare": "Comparar",
+  "Compare versions": "Comparar versões",
+  "Select version from {{date}}": "Selecionar versão de {{date}}",
+  "Version actions for {{date}}": "Ações da versão de {{date}}",
+  "Comparing {{newer}} and {{older}}": "Comparando {{newer}} e {{older}}",
+  "Exit compare": "Sair da comparação",
+  "Search attachments...": "Search attachments...",
+  "Error loading attachments.": "Error loading attachments.",
+  "No attachments on this page yet.": "No attachments on this page yet.",
+  "Uploaded by {{name}}": "Uploaded by {{name}}",
+  "Download {{name}}": "Download {{name}}"
 }
@@ -387,6 +387,8 @@
  "Insert horizontal rule divider": "Вставить горизонтальный разделитель",
  "Page break": "Разрыв страницы",
  "Insert a page break for printing.": "Вставить разрыв страницы для печати.",
+  "Footnote": "Сноска",
+  "Insert a footnote reference.": "Вставить ссылку на сноску.",
  "Upload any image from your device.": "Загрузить любое изображение с вашего устройства.",
  "Upload any video from your device.": "Загрузить любое видео с вашего устройства.",
  "Upload any audio from your device.": "Загрузите любой аудиофайл с вашего устройства.",
@@ -1186,8 +1188,8 @@
  "Default value": "Значение по умолчанию",
  "Delete property": "Удалить свойство",
  "Delete view": "Удалить представление",
-  "Delete {{count}} rows?_one": "Delete 1 row?",
-  "Delete {{count}} rows?_other": "Delete {{count}} rows?",
+  "Delete {{count}} rows?_one": "Удалить 1 строку?",
+  "Delete {{count}} rows?_other": "Удалить {{count}} строк?",
  "Descending": "По убыванию",
  "Discard": "Отменить",
  "Doesn't contain": "Не содержит",
@@ -1286,8 +1288,19 @@
  "Value": "Значение",
  "View updated for everyone": "Представление обновлено для всех",
  "You have unsaved changes. Do you want to discard them?": "У вас есть несохранённые изменения. Хотите их отменить?",
-  "{{count}} rows deleted_one": "1 row deleted",
-  "{{count}} rows deleted_other": "{{count}} rows deleted",
-  "{{count}} selected_one": "1 selected",
-  "{{count}} selected_other": "{{count}} selected"
+  "{{count}} rows deleted_one": "1 строка удалена",
+  "{{count}} rows deleted_other": "{{count}} строк удалено",
+  "{{count}} selected_one": "1 выбрано",
+  "{{count}} selected_other": "{{count}} выбрано",
+  "Compare": "Сравнить",
+  "Compare versions": "Сравнить версии",
+  "Select version from {{date}}": "Выбрать версию от {{date}}",
+  "Version actions for {{date}}": "Действия с версией от {{date}}",
+  "Comparing {{newer}} and {{older}}": "Сравнение {{newer}} и {{older}}",
+  "Exit compare": "Выйти из режима сравнения",
+  "Search attachments...": "Поиск вложений...",
+  "Error loading attachments.": "Ошибка при загрузке вложений.",
+  "No attachments on this page yet.": "На этой странице пока нет вложений.",
+  "Uploaded by {{name}}": "Загружено пользователем {{name}}",
+  "Download {{name}}": "Скачать {{name}}"
 }
@@ -387,6 +387,8 @@
  "Insert horizontal rule divider": "Вставити горизонтальний роздільник",
  "Page break": "Розрив сторінки",
  "Insert a page break for printing.": "Вставте розрив сторінки для друку.",
+  "Footnote": "Виноска",
+  "Insert a footnote reference.": "Вставити посилання на виноску.",
  "Upload any image from your device.": "Завантажити будь-яке зображення з вашого пристрою.",
  "Upload any video from your device.": "Завантажити будь-яке відео з вашого пристрою.",
  "Upload any audio from your device.": "Завантажте будь-який аудіофайл зі свого пристрою.",
@@ -1289,5 +1291,16 @@
  "{{count}} rows deleted_one": "1 row deleted",
  "{{count}} rows deleted_other": "{{count}} rows deleted",
  "{{count}} selected_one": "1 selected",
-  "{{count}} selected_other": "{{count}} selected"
+  "{{count}} selected_other": "{{count}} selected",
+  "Compare": "Порівняти",
+  "Compare versions": "Порівняти версії",
+  "Select version from {{date}}": "Виберіть версію від {{date}}",
+  "Version actions for {{date}}": "Дії з версією від {{date}}",
+  "Comparing {{newer}} and {{older}}": "Порівняння {{newer}} і {{older}}",
+  "Exit compare": "Вийти з режиму порівняння",
+  "Search attachments...": "Search attachments...",
+  "Error loading attachments.": "Error loading attachments.",
+  "No attachments on this page yet.": "No attachments on this page yet.",
+  "Uploaded by {{name}}": "Uploaded by {{name}}",
+  "Download {{name}}": "Download {{name}}"
 }
@@ -387,6 +387,8 @@
  "Insert horizontal rule divider": "插入水平分割线",
  "Page break": "分页符",
  "Insert a page break for printing.": "插入一个用于打印的分页符。",
+  "Footnote": "脚注",
+  "Insert a footnote reference.": "插入脚注引用。",
  "Upload any image from your device.": "从设备上传任何图像",
  "Upload any video from your device.": "从设备上传任何视频",
  "Upload any audio from your device.": "从您的设备上传任意音频文件。",
@@ -1289,5 +1291,16 @@
  "{{count}} rows deleted_one": "已删除 1 行",
  "{{count}} rows deleted_other": "已删除 {{count}} 行",
  "{{count}} selected_one": "已选择 1 项",
-  "{{count}} selected_other": "已选择 {{count}} 项"
+  "{{count}} selected_other": "已选择 {{count}} 项",
+  "Compare": "比较",
+  "Compare versions": "比较版本",
+  "Select version from {{date}}": "选择 {{date}} 的版本",
+  "Version actions for {{date}}": "{{date}} 的版本操作",
+  "Comparing {{newer}} and {{older}}": "正在比较 {{newer}} 和 {{older}}",
+  "Exit compare": "退出比较",
+  "Search attachments...": "Search attachments...",
+  "Error loading attachments.": "Error loading attachments.",
+  "No attachments on this page yet.": "No attachments on this page yet.",
+  "Uploaded by {{name}}": "Uploaded by {{name}}",
+  "Download {{name}}": "Download {{name}}"
 }
@@ -1,46 +0,0 @@
-import {
-  HocuspocusProviderWebsocket,
-  WebSocketStatus,
-} from "@hocuspocus/provider";
-import { getCollaborationUrl } from "@/lib/config.ts";
-
-const RELEASE_GRACE_MS = 5000;
-
-let socket: HocuspocusProviderWebsocket | null = null;
-let editorCount = 0;
-let releaseTimer: ReturnType<typeof setTimeout> | null = null;
-
-export function getCollabSocket(): HocuspocusProviderWebsocket {
-  if (!socket) {
-    socket = new HocuspocusProviderWebsocket({
-      url: getCollaborationUrl(),
-      autoConnect: false,
-    });
-  }
-  return socket;
-}
-
-export function acquireCollabSocket(): void {
-  editorCount++;
-  if (releaseTimer) {
-    clearTimeout(releaseTimer);
-    releaseTimer = null;
-  }
-  const collabSocket = getCollabSocket();
-  collabSocket.shouldConnect = true;
-  if (collabSocket.status === WebSocketStatus.Disconnected) {
-    collabSocket.connect();
-  }
-}
-
-export function releaseCollabSocket(): void {
-  editorCount--;
-  if (editorCount > 0) return;
-  if (releaseTimer) clearTimeout(releaseTimer);
-  releaseTimer = setTimeout(() => {
-    releaseTimer = null;
-    if (editorCount === 0) {
-      socket?.disconnect();
-    }
-  }, RELEASE_GRACE_MS);
-}
@@ -6,7 +6,6 @@
  z-index: 99;
  display: flex;
  align-items: center;
-  min-height: 45px;
  background: var(--mantine-color-body);
  border-bottom: 1px solid
    light-dark(var(--mantine-color-gray-2), var(--mantine-color-dark-4));
@@ -31,6 +31,8 @@ export const FixedToolbar: FC<FixedToolbarProps> = ({
  const workspace = useAtomValue(workspaceAtom);
  const isGenerativeAiEnabled = workspace?.settings?.ai?.generative === true;

+  if (!editor || !state) return null;
+
  return (
    <>
      <div
@@ -47,26 +49,22 @@ export const FixedToolbar: FC<FixedToolbarProps> = ({
              <div className={classes.divider} />
            </>
          )} */}
-          {editor && state && (
-            <>
-              <BlockTypeGroup editor={editor} />
-              <div className={classes.divider} />
-              <InlineMarksGroup editor={editor} state={state} />
-              <div className={classes.divider} />
-              <ColorGroup editor={editor} />
-              <div className={classes.divider} />
-              <ListsGroup editor={editor} state={state} />
-              <div className={classes.divider} />
-              <AlignmentGroup editor={editor} />
-              <div className={classes.divider} />
-              <MediaGroup editor={editor} templateMode={templateMode} />
-              <div className={classes.divider} />
-              <QuickInsertsGroup editor={editor} />
-              <MoreInsertsGroup editor={editor} templateMode={templateMode} />
-              <div className={classes.divider} />
-              <HistoryGroup editor={editor} state={state} />
-            </>
-          )}
+          <BlockTypeGroup editor={editor} />
+          <div className={classes.divider} />
+          <InlineMarksGroup editor={editor} state={state} />
+          <div className={classes.divider} />
+          <ColorGroup editor={editor} />
+          <div className={classes.divider} />
+          <ListsGroup editor={editor} state={state} />
+          <div className={classes.divider} />
+          <AlignmentGroup editor={editor} />
+          <div className={classes.divider} />
+          <MediaGroup editor={editor} templateMode={templateMode} />
+          <div className={classes.divider} />
+          <QuickInsertsGroup editor={editor} />
+          <MoreInsertsGroup editor={editor} templateMode={templateMode} />
+          <div className={classes.divider} />
+          <HistoryGroup editor={editor} state={state} />
        </div>
      </div>
      <div className={classes.spacer} aria-hidden />
@@ -3,8 +3,7 @@ import { StarterKit } from "@tiptap/starter-kit";
 import { Code } from "@tiptap/extension-code";
 import { TextAlign } from "@tiptap/extension-text-align";
 import { TaskList, TaskItem } from "@tiptap/extension-list";
-import { CharacterCount, UndoRedo } from "@tiptap/extensions";
-import { Placeholder } from "@/features/editor/extensions/placeholder";
+import { Placeholder, CharacterCount, UndoRedo } from "@tiptap/extensions";
 import { Superscript } from "@tiptap/extension-superscript";
 import SubScript from "@tiptap/extension-subscript";
 import { Typography } from "@tiptap/extension-typography";
@@ -195,18 +194,16 @@ export const mainExtensions = [
        return i18n.t("Toggle title");
      }
      if (node.type.name === "paragraph") {
-        const doc = editor.state.doc;
-        if (pos >= 0 && pos <= doc.content.size) {
-          const parentName = doc.resolve(pos).parent.type.name;
-          if (
-            parentName === "column" ||
-            parentName === "tableCell" ||
-            parentName === "tableHeader" ||
-            parentName === "callout" ||
-            parentName === "blockquote"
-          ) {
-            return i18n.t("Write...");
-          }
+        const $pos = editor.state.doc.resolve(pos);
+        const parentName = $pos.parent.type.name;
+        if (
+          parentName === "column" ||
+          parentName === "tableCell" ||
+          parentName === "tableHeader" ||
+          parentName === "callout" ||
+          parentName === "blockquote"
+        ) {
+          return i18n.t("Write...");
        }
        return i18n.t('Write anything. Enter "/" for commands');
      }
@@ -1,64 +0,0 @@
-import { isNodeEmpty } from "@tiptap/core";
-import { Plugin, PluginKey } from "@tiptap/pm/state";
-import { Decoration, DecorationSet } from "@tiptap/pm/view";
-import { Placeholder as TiptapPlaceholder } from "@tiptap/extensions";
-
-export const Placeholder = TiptapPlaceholder.extend({
-  addProseMirrorPlugins() {
-    const editor = this.editor;
-    const options = this.options;
-    const dataAttribute = `data-${options.dataAttribute || "placeholder"}`;
-
-    return [
-      new Plugin({
-        key: new PluginKey("docmostPlaceholder"),
-        props: {
-          decorations: (state) => {
-            if (options.showOnlyWhenEditable && !editor.isEditable) {
-              return null;
-            }
-
-            const { doc, selection } = state;
-            const { anchor } = selection;
-            const decorations: Decoration[] = [];
-            const isEmptyDoc = editor.isEmpty;
-
-            doc.descendants((node, pos) => {
-              if (!node.type.isTextblock) {
-                return options.includeChildren;
-              }
-
-              const hasAnchor = anchor >= pos && anchor <= pos + node.nodeSize;
-              const isEmpty = !node.isLeaf && isNodeEmpty(node);
-
-              if ((hasAnchor || !options.showOnlyCurrent) && isEmpty) {
-                const emptyNodeClass =
-                  typeof options.emptyNodeClass === "function"
-                    ? options.emptyNodeClass({ editor, node, pos, hasAnchor })
-                    : options.emptyNodeClass;
-                const classes = [emptyNodeClass];
-                if (isEmptyDoc) {
-                  classes.push(options.emptyEditorClass);
-                }
-
-                decorations.push(
-                  Decoration.node(pos, pos + node.nodeSize, {
-                    class: classes.join(" "),
-                    [dataAttribute]:
-                      typeof options.placeholder === "function"
-                        ? options.placeholder({ editor, node, pos, hasAnchor })
-                        : options.placeholder,
-                  }),
-                );
-              }
-
-              return options.includeChildren;
-            });
-
-            return DecorationSet.create(doc, decorations);
-          },
-        },
-      }),
-    ];
-  },
-});
@@ -0,0 +1,7 @@
+import { getCollaborationUrl } from "@/lib/config.ts";
+
+const useCollaborationURL = (): string => {
+  return getCollaborationUrl();
+};
+
+export default useCollaborationURL;
@@ -2,22 +2,20 @@ import "@/features/editor/styles/index.css";
 import React, {
  useCallback,
  useEffect,
-  useLayoutEffect,
  useMemo,
  useRef,
  useState,
 } from "react";
 import { IndexeddbPersistence } from "y-indexeddb";
+import * as Y from "yjs";
 import {
+  HocuspocusProvider,
+  onStatusParameters,
  WebSocketStatus,
+  HocuspocusProviderWebsocket,
+  onSyncedParameters,
  onStatelessParameters,
 } from "@hocuspocus/provider";
-import {
-  HocuspocusProviderWebsocketComponent,
-  HocuspocusRoom,
-  useHocuspocusEvent,
-  useHocuspocusProvider,
-} from "@hocuspocus/provider-react";
 import {
  Editor,
  EditorContent,
@@ -30,6 +28,7 @@ import {
  mainExtensions,
 } from "@/features/editor/extensions/extensions";
 import { useAtom, useAtomValue } from "jotai";
+import useCollaborationUrl from "@/features/editor/hooks/use-collaboration-url";
 import { currentUserAtom } from "@/features/user/atoms/current-user-atom";
 import {
  currentPageEditModeAtom,
@@ -77,11 +76,6 @@ import { EditorLinkMenu } from "@/features/editor/components/link/link-menu";
 import ColumnsMenu from "@/features/editor/components/columns/columns-menu.tsx";
 import { TransclusionLookupProvider } from "@/features/editor/components/transclusion/transclusion-lookup-context";
 import { useTranslation } from "react-i18next";
-import {
-  acquireCollabSocket,
-  getCollabSocket,
-  releaseCollabSocket,
-} from "@/features/editor/collab-socket";

 interface PageEditorProps {
  pageId: string;
@@ -97,80 +91,7 @@ export default function PageEditor({
  canComment,
 }: PageEditorProps) {
  const { t } = useTranslation();
-  const { data: collabQuery, refetch: refetchCollabToken } = useCollabToken();
-  const { pageSlug } = useParams();
-  const slugId = extractPageSlugId(pageSlug);
-  const [socket] = useState(getCollabSocket);
-  const hasCollabToken = !!collabQuery?.token;
-
-  useEffect(() => {
-    if (!hasCollabToken) return;
-    acquireCollabSocket();
-    return () => releaseCollabSocket();
-  }, [hasCollabToken]);
-
-  const handleStateless = ({ payload }: onStatelessParameters) => {
-    try {
-      const message = JSON.parse(payload);
-      if (message?.type !== "page.updated" || !message.updatedAt) return;
-      const pageData = queryClient.getQueryData<IPage>(["pages", slugId]);
-      if (pageData) {
-        queryClient.setQueryData(["pages", slugId], {
-          ...pageData,
-          updatedAt: message.updatedAt,
-          ...(message.lastUpdatedBy && {
-            lastUpdatedBy: message.lastUpdatedBy,
-          }),
-        });
-      }
-    } catch {
-      // ignore unrelated stateless messages
-    }
-  };
-
-  const handleAuthenticationFailed = () => {
-    const payload = jwtDecode(collabQuery?.token);
-    const now = Date.now().valueOf() / 1000;
-    const isTokenExpired = now >= payload.exp;
-    if (isTokenExpired) {
-      refetchCollabToken();
-    }
-  };
-
-  return (
-    <TransclusionLookupProvider>
-      {collabQuery?.token ? (
-        <HocuspocusProviderWebsocketComponent websocketProvider={socket}>
-          <HocuspocusRoom
-            name={`page.${pageId}`}
-            token={collabQuery.token}
-            flushDelay={500}
-            onStateless={handleStateless}
-            onAuthenticationFailed={handleAuthenticationFailed}
-          >
-            <CollabPageEditor
-              pageId={pageId}
-              editable={editable}
-              content={content}
-              canComment={canComment}
-            />
-          </HocuspocusRoom>
-        </HocuspocusProviderWebsocketComponent>
-      ) : (
-        <StaticPageEditor content={content} ariaLabel={t("Page content")} />
-      )}
-    </TransclusionLookupProvider>
-  );
-}
-
-function CollabPageEditor({
-  pageId,
-  editable,
-  content,
-  canComment,
-}: PageEditorProps) {
-  const { t } = useTranslation();
-  const provider = useHocuspocusProvider();
+  const collaborationURL = useCollaborationUrl();
  const isComponentMounted = useRef(false);
  const editorRef = useRef<Editor | null>(null);

@@ -191,6 +112,7 @@ function CollabPageEditor({
  );
  const [, setYjsSynced] = useAtom(yjsSyncedAtom);
  const menuContainerRef = useRef(null);
+  const { data: collabQuery, refetch: refetchCollabToken } = useCollabToken();
  const { isIdle, resetIdle } = useIdle(FIVE_MINUTES, { initialState: false });
  const documentState = useDocumentVisibility();
  const { pageSlug } = useParams();
@@ -201,24 +123,95 @@ function CollabPageEditor({
    [isComponentMounted],
  );
  const { handleScrollTo } = useEditorScroll({ canScroll });
+  // Providers only created once per pageId
+  const providersRef = useRef<{
+    local: IndexeddbPersistence;
+    remote: HocuspocusProvider;
+    socket: HocuspocusProviderWebsocket;
+  } | null>(null);
+  const [providersReady, setProvidersReady] = useState(false);

  useEffect(() => {
-    const local = new IndexeddbPersistence(
-      provider.configuration.name,
-      provider.document,
-    );
-    local.on("synced", () => setIsLocalSynced(true));
-    return () => {
-      local.destroy();
-    };
-  }, [provider]);
+    if (!providersRef.current) {
+      const documentName = `page.${pageId}`;
+      const ydoc = new Y.Doc();
+      const local = new IndexeddbPersistence(documentName, ydoc);
+      const socket = new HocuspocusProviderWebsocket({
+        url: collaborationURL,
+      });
+      const onLocalSyncedHandler = () => {
+        setIsLocalSynced(true);
+      };
+      const onStatusHandler = (event: onStatusParameters) => {
+        setYjsConnectionStatus(event.status);
+      };
+      const onSyncedHandler = (event: onSyncedParameters) => {
+        setIsRemoteSynced(event.state);
+      };
+      const onStatelessHandler = ({ payload }: onStatelessParameters) => {
+        try {
+          const message = JSON.parse(payload);
+          if (message?.type !== "page.updated" || !message.updatedAt) return;
+          const pageData = queryClient.getQueryData<IPage>(["pages", slugId]);
+          if (pageData) {
+            queryClient.setQueryData(["pages", slugId], {
+              ...pageData,
+              updatedAt: message.updatedAt,
+              ...(message.lastUpdatedBy && {
+                lastUpdatedBy: message.lastUpdatedBy,
+              }),
+            });
+          }
+        } catch {
+          // ignore unrelated stateless messages
+        }
+      };
+      const onAuthenticationFailedHandler = () => {
+        const payload = jwtDecode(collabQuery?.token);
+        const now = Date.now().valueOf() / 1000;
+        const isTokenExpired = now >= payload.exp;
+        if (isTokenExpired) {
+          refetchCollabToken().then((result) => {
+            if (result.data?.token) {
+              socket.disconnect();
+              setTimeout(() => {
+                remote.configuration.token = result.data.token;
+                socket.connect();
+              }, 100);
+            }
+          });
+        }
+      };
+      const remote = new HocuspocusProvider({
+        websocketProvider: socket,
+        name: documentName,
+        document: ydoc,
+        token: collabQuery?.token,
+        onAuthenticationFailed: onAuthenticationFailedHandler,
+        onStatus: onStatusHandler,
+        onSynced: onSyncedHandler,
+        onStateless: onStatelessHandler,
+      });

-  useHocuspocusEvent("synced", ({ state }) => setIsRemoteSynced(state));
-  useHocuspocusEvent("status", ({ status }) => setYjsConnectionStatus(status));
+      local.on("synced", onLocalSyncedHandler);
+      providersRef.current = { socket, local, remote };
+      setProvidersReady(true);
+    } else {
+      setProvidersReady(true);
+    }
+    // Only destroy on final unmount
+    return () => {
+      providersRef.current?.socket.destroy();
+      providersRef.current?.remote.destroy();
+      providersRef.current?.local.destroy();
+      providersRef.current = null;
+    };
+  }, [pageId]);

  // Only connect/disconnect on tab/idle, not destroy
  useEffect(() => {
-    const socket = provider.configuration.websocketProvider;
+    if (!providersReady || !providersRef.current) return;
+    const socket = providersRef.current.socket;

    if (
      isIdle &&
@@ -235,15 +228,23 @@ function CollabPageEditor({
      resetIdle();
      socket.connect();
    }
-  }, [isIdle, documentState, provider, resetIdle]);
+  }, [isIdle, documentState, providersReady, resetIdle]);
+
+  // Attach here, to make sure the connection gets properly established
+  providersRef.current?.remote.attach();

  const extensions = useMemo(() => {
-    if (!currentUser?.user) {
+    if (!providersReady || !providersRef.current || !currentUser?.user) {
      return mainExtensions;
    }

-    return [...mainExtensions, ...collabExtensions(provider, currentUser.user)];
-  }, [provider, currentUser?.user]);
+    const remoteProvider = providersRef.current.remote;
+
+    return [
+      ...mainExtensions,
+      ...collabExtensions(remoteProvider, currentUser?.user),
+    ];
+  }, [providersReady, currentUser?.user]);

  const editor = useEditor(
    {
@@ -325,16 +326,6 @@ function CollabPageEditor({
    [pageId, editable, extensions],
  );

-  useLayoutEffect(() => {
-    if (editor && !editor.isDestroyed) {
-      // @ts-ignore
-      setEditor(editor);
-      // @ts-ignore
-      editor.storage.pageId = pageId;
-      editorRef.current = editor;
-    }
-  }, [editor, pageId, setEditor]);
-
  const editorIsEditable = useEditorState({
    editor,
    selector: (ctx) => {
@@ -425,72 +416,65 @@ function CollabPageEditor({
    }
  }, [yjsConnectionStatus, isSynced]);

-  if (showStatic) {
-    return <StaticPageEditor content={content} ariaLabel={t("Page content")} />;
-  }
-
  return (
-    <div className="editor-container" style={{ position: "relative" }}>
-      <div ref={menuContainerRef}>
-        <EditorContent editor={editor} />
+    <TransclusionLookupProvider>
+      {showStatic ? (
+        <EditorProvider
+          editable={false}
+          immediatelyRender={true}
+          extensions={mainExtensions}
+          content={content}
+          editorProps={{
+            attributes: {
+              "aria-label": t("Page content"),
+            },
+          }}
+        />
+      ) : (
+        <div className="editor-container" style={{ position: "relative" }}>
+          <div ref={menuContainerRef}>
+            <EditorContent editor={editor} />

-        {editor && (
-          <SearchAndReplaceDialog editor={editor} editable={editable} />
-        )}
+            {editor && (
+              <SearchAndReplaceDialog editor={editor} editable={editable} />
+            )}

-        {editor && editorIsEditable && (
-          <div>
-            <EditorAiMenu editor={editor} />
-            <EditorLinkMenu editor={editor} />
-            <EditorBubbleMenu editor={editor} />
-            <TableMenu editor={editor} />
-            <TableHandlesLayer editor={editor} />
-            <ImageMenu editor={editor} />
-            <VideoMenu editor={editor} />
-            <PdfMenu editor={editor} />
-            <CalloutMenu editor={editor} />
-            <SubpagesMenu editor={editor} />
-            <ExcalidrawMenu editor={editor} />
-            <DrawioMenu editor={editor} />
-            <ColumnsMenu editor={editor} />
+            {editor && editorIsEditable && (
+              <div>
+                <EditorAiMenu editor={editor} />
+                <EditorLinkMenu editor={editor} />
+                <EditorBubbleMenu editor={editor} />
+                <TableMenu editor={editor} />
+                <TableHandlesLayer editor={editor} />
+                <ImageMenu editor={editor} />
+                <VideoMenu editor={editor} />
+                <PdfMenu editor={editor} />
+                <CalloutMenu editor={editor} />
+                <SubpagesMenu editor={editor} />
+                <ExcalidrawMenu editor={editor} />
+                <DrawioMenu editor={editor} />
+                <ColumnsMenu editor={editor} />
+              </div>
+            )}
+            {editor &&
+              !editorIsEditable &&
+              (editable || canComment) &&
+              providersRef.current && <ReadonlyBubbleMenu editor={editor} />}
+            {showCommentPopup && (
+              <CommentDialog editor={editor} pageId={pageId} />
+            )}
+            {showReadOnlyCommentPopup && (
+              <CommentDialog editor={editor} pageId={pageId} readOnly />
+            )}
          </div>
-        )}
-        {editor && !editorIsEditable && (editable || canComment) && (
-          <ReadonlyBubbleMenu editor={editor} />
-        )}
-        {showCommentPopup && <CommentDialog editor={editor} pageId={pageId} />}
-        {showReadOnlyCommentPopup && (
-          <CommentDialog editor={editor} pageId={pageId} readOnly />
-        )}
-      </div>
-      <div
-        onClick={() => {
-          if (editor && !editor.isDestroyed) editor.commands.focus("end");
-        }}
-        style={{ paddingBottom: "20vh" }}
-      ></div>
-    </div>
-  );
-}
-
-function StaticPageEditor({
-  content,
-  ariaLabel,
-}: {
-  content: any;
-  ariaLabel: string;
-}) {
-  return (
-    <EditorProvider
-      editable={false}
-      immediatelyRender={true}
-      extensions={mainExtensions}
-      content={content}
-      editorProps={{
-        attributes: {
-          "aria-label": ariaLabel,
-        },
-      }}
-    />
+          <div
+            onClick={() => {
+              if (editor && !editor.isDestroyed) editor.commands.focus("end");
+            }}
+            style={{ paddingBottom: "20vh" }}
+          ></div>
+        </div>
+      )}
+    </TransclusionLookupProvider>
  );
 }
@@ -88,6 +88,7 @@
    "kysely-migration-cli": "0.4.2",
    "kysely-postgres-js": "3.0.0",
    "ldapts": "8.1.7",
+    "lib0": "0.2.117",
    "mammoth": "1.12.0",
    "mime-types": "3.0.2",
    "msgpackr": "^1.11.9",
@@ -117,6 +118,7 @@
    "stripe": "^17.7.0",
    "tlds": "1.261.0",
    "tmp-promise": "3.0.3",
+    "tseep": "1.3.1",
    "typesense": "3.0.5",
    "undici": "7.28.0",
    "ws": "8.21.0",
@@ -15,7 +15,6 @@ import {
  RedisSyncExtension,
  SerializedHTTPRequest,
 } from './extensions/redis-sync';
-import { toWebRequest } from './extensions/redis-sync/redis-sync.types';
 import { WsSocketWrapper } from './extensions/redis-sync/ws-socket-wrapper';
 import RedisClient from 'ioredis';
 import { pack, unpack } from 'msgpackr';
@@ -99,36 +98,34 @@ export class CollaborationGateway {
      const serializedHTTPRequest = this.serializeRequest(request);
      const socketId = serializedHTTPRequest.headers['sec-websocket-key'];

+      // Create wrapper socket that only receives events via emit()
+      // This prevents double-handling since Hocuspocus won't listen to raw WebSocket events
      const wrappedSocket = new WsSocketWrapper(client);

      // Route through RedisSync extension (this calls handleConnection internally)
-      this.redisSync.onSocketOpen(wrappedSocket, serializedHTTPRequest);
+      this.redisSync.onSocketOpen(wrappedSocket as any, serializedHTTPRequest);

+      // Forward raw WebSocket messages to the extension
      client.on('message', (data: ArrayBuffer) => {
-        this.redisSync!.onSocketMessage(serializedHTTPRequest, data);
+        this.redisSync!.onSocketMessage(
+          wrappedSocket as any,
+          serializedHTTPRequest,
+          data,
+        );
      });

+      // Forward close events
      client.on('close', (code: number, reason: Buffer) => {
-        this.redisSync!.onSocketClose(
-          socketId,
-          code,
-          new Uint8Array(reason).buffer,
-        );
+        this.redisSync!.onSocketClose(socketId, code, reason.buffer as ArrayBuffer);
+      });
+
+      // Forward pong events for keepalive
+      client.on('pong', (data: Buffer) => {
+        wrappedSocket.emit('pong', data);
      });
    } else {
      // Fallback to direct Hocuspocus connection
-      const clientConnection = this.hocuspocus.handleConnection(
-        client,
-        toWebRequest(this.serializeRequest(request)),
-      );
-
-      client.on('message', (data: Buffer) => {
-        clientConnection.handleMessage(new Uint8Array(data));
-      });
-
-      client.on('close', (code: number, reason: Buffer) => {
-        clientConnection.handleClose({ code, reason: reason.toString() });
-      });
+      this.hocuspocus.handleConnection(client, request);
    }
  }

@@ -181,7 +178,6 @@ export class CollaborationGateway {

        if (this.hocuspocus.getDocumentsCount() === 0) resolve('');
        this.hocuspocus.closeConnections();
-        this.hocuspocus.flushPendingStores();
      } catch (error) {
        console.error(error);
      }
@@ -96,7 +96,7 @@ export class PersistenceExtension implements Extension {
  }

  async onStoreDocument(data: onStoreDocumentPayload) {
-    const { documentName, document, lastContext } = data;
+    const { documentName, document, context } = data;

    const pageId = getPageId(documentName);

@@ -151,7 +151,7 @@ export class PersistenceExtension implements Extension {
            content: tiptapJson,
            textContent: textContent,
            ydoc: ydocState,
-            lastUpdatedById: lastContext.user.id,
+            lastUpdatedById: context.user.id,
            contributorIds: contributorIds,
          },
          pageId,
@@ -169,12 +169,12 @@ export class PersistenceExtension implements Extension {
        JSON.stringify({
          type: 'page.updated',
          updatedAt: new Date().toISOString(),
-          lastUpdatedById: lastContext?.user?.id,
-          lastUpdatedBy: lastContext?.user
+          lastUpdatedById: context?.user?.id,
+          lastUpdatedBy: context?.user
            ? {
-                id: lastContext.user?.id,
-                name: lastContext.user?.name,
-                avatarUrl: lastContext.user?.avatarUrl,
+                id: context.user?.id,
+                name: context.user?.name,
+                avatarUrl: context.user?.avatarUrl,
              }
            : undefined,
        }),
@@ -1,37 +1,61 @@
 import type RedisClient from 'ioredis';
-import type { WebSocketLike } from '@hocuspocus/server';
-import type { Pack, RSAMessageClose, RSAMessageSend } from './redis-sync.types';
+import { EventEmitter } from 'tseep';
+import type {
+  Pack,
+  RSAMessageClose,
+  RSAMessagePing,
+  RSAMessageSend,
+} from './redis-sync.types';

-// Stands in for the client WebSocket on the server that owns the document.
-// Outgoing traffic is relayed over redis to the origin server, which holds the real socket.
-export class CollabProxySocket implements WebSocketLike {
+export class CollabProxySocket extends EventEmitter {
  private readonly replyTo: string;
+  private readonly serverChannel: string;
  private readonly socketId: string;
  private pub: RedisClient;
  private readonly pack: Pack;
  readyState = 1;
-  onClose?: (code?: number, reason?: string) => void;

-  constructor(pub: RedisClient, pack: Pack, replyTo: string, socketId: string) {
+  constructor(
+    pub: RedisClient,
+    pack: Pack,
+    replyTo: string,
+    serverChannel: string,
+    socketId: string,
+  ) {
+    super();
    this.replyTo = replyTo;
    this.socketId = socketId;
+    this.serverChannel = serverChannel;
    this.pub = pub;
    this.pack = pack;
+    this.once('close', () => {
+      this.readyState = 3;
+    });
  }

-  private publish(msg: RSAMessageClose | RSAMessageSend) {
+  private publish(msg: RSAMessageClose | RSAMessagePing | RSAMessageSend) {
    this.pub.publish(this.replyTo, this.pack(msg));
  }

-  // The origin server already closed the real socket; stop relaying without echoing a close back
-  markClosed() {
-    this.readyState = 3;
-  }
-
  close(code?: number, reason?: string) {
    if (this.readyState !== 1) return;
-    this.readyState = 3;
-    this.onClose?.(code, reason);
+    const msg: RSAMessageClose = {
+      type: 'close',
+      code,
+      reason,
+      socketId: this.socketId,
+    };
+    this.publish(msg);
+  }
+
+  ping() {
+    if (this.readyState !== 1) return;
+    const msg: RSAMessagePing = {
+      type: 'ping',
+      socketId: this.socketId,
+      replyTo: this.serverChannel,
+    };
+    this.publish(msg);
  }

  send(message: Uint8Array) {
@@ -3,30 +3,27 @@ import {
  Extension,
  Hocuspocus,
  IncomingMessage,
+  afterUnloadDocumentPayload,
  onConfigurePayload,
  onLoadDocumentPayload,
-  afterUnloadDocumentPayload,
-  WebSocketLike,
 } from '@hocuspocus/server';
-import { ConnectionTimeout, Unauthorized } from '@hocuspocus/common';
 import RedisClient from 'ioredis';
+import { readVarString } from 'lib0/decoding.js';
 import { CollabProxySocket } from './collab-proxy-socket';
 import {
+  BaseWebSocket,
  Configuration,
  CustomEvents,
  Pack,
  RSAMessage,
-  RSAMessageClose,
  RSAMessageCloseProxy,
  RSAMessageCustomEventComplete,
  RSAMessageCustomEventStart,
+  RSAMessagePong,
  RSAMessageProxy,
  RSAMessageUnload,
  SerializedHTTPRequest,
  Unpack,
-  OriginConnection,
-  ProxyConnection,
-  toWebRequest,
 } from './redis-sync.types';

 export type { Pack, SerializedHTTPRequest } from './redis-sync.types';
@@ -41,10 +38,10 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
  private sub: RedisClient;
  private readonly pack: Pack;
  private readonly unpack: Unpack;
-  private originConnections: Record<SocketId, OriginConnection> = {};
+  private originSockets: Record<SocketId, BaseWebSocket> = {};
  private locks: Record<DocumentName, NodeJS.Timeout> = {};
  private lockPromises: Record<DocumentName, Promise<ServerId | null>> = {};
-  private proxyConnections: Record<SocketId, ProxyConnection> = {};
+  private proxySockets: Record<SocketId, CollabProxySocket> = {};
  private readonly prefix: string;
  private readonly lockPrefix: string;
  private readonly msgChannel: string;
@@ -57,9 +54,6 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
  // @ts-ignore
  private pendingReplies: Record<number, PromiseWithResolvers<any>['resolve']> =
    {};
-  private deriveContext: (
-    serializedHTTPRequest: SerializedHTTPRequest,
-  ) => Record<string, any>;

  constructor(configuration: Configuration<TCE>) {
    const {
@@ -71,7 +65,6 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
      prefix,
      customEvents,
      customEventTTL,
-      deriveContext,
    } = configuration;
    this.pub = redis.duplicate();
    this.sub = redis.duplicate();
@@ -84,7 +77,6 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
    this.lockPrefix = `${this.prefix}Lock`;
    this.msgChannel = `${this.prefix}Msg`;
    this.customEvents = (customEvents as any) ?? ({} as any as CustomEvents);
-    this.deriveContext = deriveContext ?? (() => ({}));
    this.sub.subscribe(this.msgChannel, `${this.msgChannel}:${this.serverId}`);
    this.sub.on('messageBuffer', this.handleRedisMessage);
    this.pub.on('error', () => {});
@@ -95,63 +87,44 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
  }

  private closeProxy(socketId: string) {
-    const entry = this.proxyConnections[socketId];
-    if (entry) {
-      delete this.proxyConnections[socketId];
-      const { socket, clientConnection } = entry;
-      // The origin socket is already gone; don't echo a close message back
-      socket.markClosed();
-      clientConnection.handleClose({
-        code: 1000,
-        reason: 'provider_initiated',
-      });
+    const proxySocket = this.proxySockets[socketId];
+    if (proxySocket) {
+      proxySocket.emit(
+        'close',
+        1000,
+        Buffer.from('provider_initiated', 'utf-8'),
+      );
+      delete this.proxySockets[socketId];
    }
  }

+  private pongProxy(socketId: string) {
+    this.proxySockets[socketId]?.emit('pong');
+  }
+
  private handleProxyMessage(
    msg: Pick<RSAMessageProxy, 'replyTo' | 'message' | 'serializedHTTPRequest'>,
  ) {
    const { replyTo, message, serializedHTTPRequest } = msg;
    const { headers } = serializedHTTPRequest;
-    const socketId = headers['sec-websocket-key'];
-    let entry = this.proxyConnections[socketId];
-    if (!entry) {
-      const socket = new CollabProxySocket(
+    const socketId = headers['sec-websocket-key']!;
+    let socket = this.proxySockets[socketId];
+    if (!socket) {
+      socket = new CollabProxySocket(
        this.pub,
        this.pack,
        replyTo,
+        `${this.msgChannel}:${this.serverId}`,
        socketId,
      );
-      // A proxy connection with no live documents (client left the page, auth
-      // failed, or the origin server crashed) is reaped by hocuspocus' message
-      // timeout. Dispose it silently in that case: relaying the timeout close
-      // to the origin would kill the client's real socket, which may be busy
-      // serving other documents. Genuine protocol closes are still relayed.
-      socket.onClose = (code, reason) => {
-        delete this.proxyConnections[socketId];
-        if (code !== ConnectionTimeout.code) {
-          const msg: RSAMessageClose = {
-            type: 'close',
-            code,
-            reason,
-            socketId,
-          };
-          this.pub.publish(replyTo, this.pack(msg));
-        }
-      };
-      const clientConnection = this.instance.handleConnection(
-        socket,
-        toWebRequest(serializedHTTPRequest),
-        this.deriveContext(serializedHTTPRequest),
+      this.proxySockets[socketId] = socket;
+      this.instance.handleConnection(
+        socket as any,
+        serializedHTTPRequest as any,
+        {},
      );
-      entry = { clientConnection, socket };
-      this.proxyConnections[socketId] = entry;
    }
-    entry.clientConnection.handleMessage(message);
-  }
-
-  private getLock(documentName: string) {
-    return this.pub.get(this.getKey(documentName));
+    socket.emit('message', message);
  }

  private getOrClaimLock(documentName: string) {
@@ -193,6 +166,10 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
      this.closeProxy(msg.socketId);
      return;
    }
+    if (type === 'pong') {
+      this.pongProxy(msg.socketId);
+      return;
+    }
    if (type === 'unload') {
      delete this.lockPromises[msg.documentName];
      return;
@@ -221,14 +198,22 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
      return;
    }
    const { socketId } = msg;
-    const entry = this.originConnections[socketId];
-    if (!entry) {
+    const socket = this.originSockets[socketId];
+    if (!socket) {
      // origin socket already cleaned up
      return;
    }
-    const { socket } = entry;
    if (type === 'close') {
      socket.close(msg.code, msg.reason);
+    } else if (type === 'ping') {
+      // Reply instantly to the proxy socket, without forwarding to client
+      // The origin socket handles heartbeat for itself
+      const { replyTo, socketId } = msg;
+      const reply: RSAMessagePong = {
+        type: 'pong',
+        socketId,
+      };
+      this.pub.publish(`${replyTo}`, this.pack(reply));
    } else if (type === 'send') {
      socket.send(msg.message);
    }
@@ -266,8 +251,6 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
    eventName: TName,
    documentName: string,
    payload: any,
-    // if true, don't claim the lock. Useful for targeting pages that are currently open
-    onlyIfOpen = false,
  ) {
    const isDocLoadedOnInstance = this.instance.documents.has(documentName);

@@ -275,14 +258,7 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
      return this.handleEventLocally(eventName, documentName, payload);
    }

-    const proxyTo = await (onlyIfOpen
-      ? this.getLock(documentName)
-      : this.getOrClaimLockThrottled(documentName));
-
-    if (!proxyTo && onlyIfOpen) {
-      return;
-    }
-
+    const proxyTo = await this.getOrClaimLockThrottled(documentName);
    if (proxyTo && proxyTo !== this.serverId) {
      ++this.replyIdCounter; // bug in biome thinks this.replyIdCounter is not used if written on the line below
      const replyId = this.replyIdCounter;
@@ -301,8 +277,7 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
      const { promise, resolve, reject } = Promise.withResolvers();
      this.pendingReplies[replyId] = resolve;
      setTimeout(() => {
-        delete this.pendingReplies[replyId];
-        reject(new Error('TIMEOUT'));
+        reject('TIMEOUT');
      }, this.customEventTTL);
      return promise as Promise<ReturnType<TCE[TName]>>;
    }
@@ -321,59 +296,36 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {

  /* WebSocket Server Hooks */
  onSocketOpen(
-    ws: WebSocketLike,
+    ws: BaseWebSocket,
    serializedHTTPRequest: SerializedHTTPRequest,
+    context = {},
  ) {
-    const socketId = serializedHTTPRequest.headers['sec-websocket-key'];
-    const clientConnection = this.instance.handleConnection(
-      ws,
-      toWebRequest(serializedHTTPRequest),
-      this.deriveContext(serializedHTTPRequest),
+    const socketId = serializedHTTPRequest.headers['sec-websocket-key']!;
+    this.originSockets[socketId] = ws;
+    this.instance.handleConnection(
+      ws as any,
+      serializedHTTPRequest as any,
+      context,
    );
-    this.originConnections[socketId] = { clientConnection, socket: ws };
  }

  async onSocketMessage(
+    ws: BaseWebSocket,
    serializedHTTPRequest: SerializedHTTPRequest,
    detachableMsg: ArrayBuffer,
  ) {
-    const socketId = serializedHTTPRequest.headers['sec-websocket-key'];
-    const entry = this.originConnections[socketId];
-    if (!entry) return;
-    const { clientConnection } = entry;
-
-    let message: Uint8Array;
-    let documentName: string;
-    try {
-      message = new Uint8Array(detachableMsg.slice());
-      const tmpMsg = new IncomingMessage(detachableMsg);
-      const documentNameAndSessionId = tmpMsg.readVarString();
-      // session-aware providers suffix the documentName with \0sessionId
-      const sepIdx = documentNameAndSessionId.indexOf('\0');
-      documentName =
-        sepIdx === -1
-          ? documentNameAndSessionId
-          : documentNameAndSessionId.slice(0, sepIdx);
-    } catch (error) {
-      entry.socket.close(Unauthorized.code, Unauthorized.reason);
-      return;
-    }
+    const message = new Uint8Array(detachableMsg.slice());
+    const tmpMsg = new IncomingMessage(detachableMsg);
+    const documentName = readVarString(tmpMsg.decoder);
    const isDocLoadedOnInstance = this.instance.documents.has(documentName);

    if (isDocLoadedOnInstance) {
-      clientConnection.handleMessage(message);
+      ws.emit('message', message);
      return;
    }

    const proxyTo = await this.getOrClaimLockThrottled(documentName);
    if (proxyTo && proxyTo !== this.serverId) {
-      // Proxied messages bypass handleMessage, so refresh the connection's
-      // liveness fields manually or hocuspocus' message timeout would reap the
-      // real socket every `timeout` ms. connectionEstablishedAt is the
-      // reference while unauthenticated (auth for remote docs is proxied too)
-      // and is private upstream.
-      clientConnection.lastMessageReceivedAt = Date.now();
-      (clientConnection as any).connectionEstablishedAt = Date.now();
      // another server owns the doc
      const proxyMessage: RSAMessageProxy = {
        serializedHTTPRequest: serializedHTTPRequest,
@@ -386,17 +338,16 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
      return;
    }
    // This server owns the document, but hocuspocus hasn't loaded it yet
-    clientConnection.handleMessage(message);
+    ws.emit('message', message);
  }

  onSocketClose(socketId: string, code?: number, reason?: ArrayBuffer) {
-    const entry = this.originConnections[socketId];
-    if (!entry) return;
-    delete this.originConnections[socketId];
-    entry.clientConnection.handleClose({
-      code: code ?? 1000,
-      reason: reason ? Buffer.from(reason).toString() : '',
-    });
+    const socket = this.originSockets[socketId];
+    if (!socket) return;
+    // at this point the socket is considered GC'd and we cannot call close
+    // The origin socket did not set up any connections for the proxy, so none of the hooks will work if we just emit
+    socket?.emit('close', code, reason);
+    delete this.originSockets[socketId];
    const msg: RSAMessageCloseProxy = { type: 'closeProxy', socketId };
    this.pub.publish(this.msgChannel, this.pack(msg)).catch(() => {});
  }
@@ -421,7 +372,6 @@ export class RedisSyncExtension<TCE extends CustomEvents> implements Extension {
  }

  async onDestroy() {
-    this.pendingReplies = {};
    this.pub.disconnect(false);
    this.sub.disconnect(false);
  }
@@ -1,13 +1,12 @@
+import EventEmitter from 'node:events';
 import { IncomingHttpHeaders } from 'node:http2';
 import RedisClient from 'ioredis';
-import { CollabProxySocket } from './collab-proxy-socket';
-import { type Hocuspocus, type WebSocketLike } from '@hocuspocus/server';

 export type SecondParam<T> = T extends (
-  arg1: any,
+  arg1: unknown,
  arg2: infer A,
-  ...args: any[]
-) => any
+  ...args: unknown[]
+) => unknown
  ? A
  : never;

@@ -42,6 +41,17 @@ export type RSAMessageClose = {
  socketId: string;
 };

+export type RSAMessagePing = {
+  type: 'ping';
+  socketId: string;
+  replyTo: string;
+};
+
+export type RSAMessagePong = {
+  type: 'pong';
+  socketId: string;
+};
+
 export type RSAMessageSend = {
  type: 'send';
  // @ts-ignore
@@ -49,7 +59,7 @@ export type RSAMessageSend = {
  socketId: string;
 };

-export type RSAMessageCustomEventStart<TName = string, TPayload = any> = {
+export type RSAMessageCustomEventStart<TName = string, TPayload = unknown> = {
  type: 'customEventStart';
  documentName: string;
  eventName: TName;
@@ -61,7 +71,7 @@ export type RSAMessageCustomEventStart<TName = string, TPayload = any> = {
 export type RSAMessageCustomEventComplete = {
  type: 'customEventComplete';
  replyId: number;
-  payload: any;
+  payload: unknown;
 };

 export type RSAMessage =
@@ -69,6 +79,8 @@ export type RSAMessage =
  | RSAMessageCloseProxy
  | RSAMessageUnload
  | RSAMessageClose
+  | RSAMessagePing
+  | RSAMessagePong
  | RSAMessageSend
  | RSAMessageCustomEventStart
  | RSAMessageCustomEventComplete;
@@ -87,20 +99,9 @@ type CustomEventName = string;

 export type CustomEvents = Record<
  CustomEventName,
-  (documentName: string, payload: any) => Promise<any>
+  (documentName: string, payload: unknown) => Promise<unknown>
 >;

-// Not exported by @hocuspocus/server
-export type ClientConnection = ReturnType<Hocuspocus['handleConnection']>;
-export type OriginConnection = {
-  clientConnection: ClientConnection;
-  socket: WebSocketLike;
-};
-export type ProxyConnection = {
-  clientConnection: ClientConnection;
-  socket: CollabProxySocket;
-};
-
 export interface Configuration<TCE> {
  redis: RedisClient;
  pack: Pack;
@@ -110,29 +111,11 @@ export interface Configuration<TCE> {
  customEventTTL?: number;
  prefix?: string;
  customEvents?: TCE;
-  // Derive the hocuspocus context once per socket instead of re-deriving it in a
-  // per-document hook like onConnect/onAuthenticate. Runs on the origin server when
-  // the socket opens and on the doc owner when the first proxied message arrives.
-  deriveContext?: (
-    serializedHTTPRequest: SerializedHTTPRequest,
-  ) => Record<string, any>;
 }

-// Hocuspocus expects a web-standard Request, so rehydrate one from what crossed the wire
-export const toWebRequest = (serializedHTTPRequest: SerializedHTTPRequest) => {
-  const { method, url, headers } = serializedHTTPRequest;
-  const webHeaders = new Headers();
-  Object.entries(headers).forEach(([name, value]) => {
-    if (Array.isArray(value)) {
-      value.forEach((v) => {
-        webHeaders.append(name, v);
-      });
-    } else if (value !== undefined) {
-      webHeaders.set(name, value);
-    }
-  });
-  return new Request(new URL(url, 'http://localhost'), {
-    method,
-    headers: webHeaders,
-  });
+export type BaseWebSocket = EventEmitter & {
+  readyState: number;
+  close(code?: number, reason?: string): void;
+  ping(): void;
+  send(message: Uint8Array): void;
 };
@@ -1,17 +1,20 @@
+import { EventEmitter } from 'events';
 import type WebSocket from 'ws';
-import type { WebSocketLike } from '@hocuspocus/server';

 /**
- * Wrapper around ws WebSocket that Hocuspocus only writes to.
- * Incoming socket events are forwarded separately by the gateway,
- * which prevents double-handling with RedisSyncExtension.
+ * Wrapper around ws WebSocket that only receives events via emit().
+ * This prevents double-handling when used with RedisSyncExtension.
 */
-export class WsSocketWrapper implements WebSocketLike {
+export class WsSocketWrapper extends EventEmitter {
  private ws: WebSocket;
  readyState = 1;

  constructor(ws: WebSocket) {
+    super();
    this.ws = ws;
+    this.once('close', () => {
+      this.readyState = 3;
+    });
  }

  close(code?: number, reason?: string) {
@@ -24,6 +27,15 @@ export class WsSocketWrapper implements WebSocketLike {
    }
  }

+  ping() {
+    if (this.readyState !== 1) return;
+    try {
+      this.ws.ping();
+    } catch (e) {
+      // Socket already closed
+    }
+  }
+
  send(message: Uint8Array) {
    if (this.readyState !== 1) return;
    try {
@@ -446,9 +446,10 @@ export class PageService {
      }

      if (pageIdsToMove.length > 0) {
+        // Clear page-level permissions - moved pages inherit destination space permissions
+        // (page_permissions cascade deletes via foreign key)
        await trx
-          .updateTable('pageAccess')
-          .set({ spaceId: spaceId })
+          .deleteFrom('pageAccess')
          .where('pageId', 'in', pageIdsToMove)
          .execute();

@@ -15,21 +15,13 @@ import { getMimeType } from '../../../common/helpers';
 import { Upload } from '@aws-sdk/lib-storage';
 import { Logger } from '@nestjs/common';

-const S3_MAX_SOCKETS = parseInt(process.env.AWS_S3_MAX_SOCKETS) || 200;
-
 export class S3Driver implements StorageDriver {
  private readonly s3Client: S3Client;
  private readonly config: S3StorageConfig;

  constructor(config: S3StorageConfig) {
-    this.config = {
-      ...config,
-      requestHandler: {
-        httpAgent: { maxSockets: S3_MAX_SOCKETS },
-        httpsAgent: { maxSockets: S3_MAX_SOCKETS },
-      },
-    };
-    this.s3Client = new S3Client(this.config as any);
+    this.config = config;
+    this.s3Client = new S3Client(config as any);
  }

  async upload(filePath: string, file: Buffer | Readable): Promise<void> {
@@ -23,43 +23,41 @@
    "@casl/ability": "6.8.0",
    "@docmost/editor-ext": "workspace:*",
    "@floating-ui/dom": "1.7.3",
-    "@hocuspocus/common": "4.4.0",
-    "@hocuspocus/provider": "4.4.0",
-    "@hocuspocus/provider-react": "4.4.0",
-    "@hocuspocus/server": "4.4.0",
-    "@hocuspocus/transformer": "4.4.0",
+    "@hocuspocus/provider": "3.4.4",
+    "@hocuspocus/server": "3.4.4",
+    "@hocuspocus/transformer": "3.4.4",
    "@joplin/turndown": "4.0.82",
    "@joplin/turndown-plugin-gfm": "1.0.64",
    "@sindresorhus/slugify": "3.0.0",
-    "@tiptap/core": "3.29.2",
-    "@tiptap/extension-audio": "3.29.2",
-    "@tiptap/extension-code-block": "3.29.2",
-    "@tiptap/extension-collaboration": "3.29.2",
-    "@tiptap/extension-collaboration-caret": "3.29.2",
-    "@tiptap/extension-color": "3.29.2",
-    "@tiptap/extension-document": "3.29.2",
-    "@tiptap/extension-heading": "3.29.2",
-    "@tiptap/extension-highlight": "3.29.2",
-    "@tiptap/extension-history": "3.29.2",
-    "@tiptap/extension-image": "3.29.2",
-    "@tiptap/extension-link": "3.29.2",
-    "@tiptap/extension-list": "3.29.2",
-    "@tiptap/extension-placeholder": "3.29.2",
-    "@tiptap/extension-subscript": "3.29.2",
-    "@tiptap/extension-superscript": "3.29.2",
-    "@tiptap/extension-table": "3.29.2",
-    "@tiptap/extension-text": "3.29.2",
-    "@tiptap/extension-text-align": "3.29.2",
-    "@tiptap/extension-text-style": "3.29.2",
-    "@tiptap/extension-typography": "3.29.2",
-    "@tiptap/extension-unique-id": "3.29.2",
-    "@tiptap/extension-youtube": "3.29.2",
-    "@tiptap/html": "3.29.2",
-    "@tiptap/pm": "3.29.2",
-    "@tiptap/react": "3.29.2",
-    "@tiptap/starter-kit": "3.29.2",
-    "@tiptap/suggestion": "3.29.2",
-    "@tiptap/y-tiptap": "3.0.7",
+    "@tiptap/core": "3.27.1",
+    "@tiptap/extension-audio": "3.27.1",
+    "@tiptap/extension-code-block": "3.27.1",
+    "@tiptap/extension-collaboration": "3.27.1",
+    "@tiptap/extension-collaboration-caret": "3.27.1",
+    "@tiptap/extension-color": "3.27.1",
+    "@tiptap/extension-document": "3.27.1",
+    "@tiptap/extension-heading": "3.27.1",
+    "@tiptap/extension-highlight": "3.27.1",
+    "@tiptap/extension-history": "3.27.1",
+    "@tiptap/extension-image": "3.27.1",
+    "@tiptap/extension-link": "3.27.1",
+    "@tiptap/extension-list": "3.27.1",
+    "@tiptap/extension-placeholder": "3.27.1",
+    "@tiptap/extension-subscript": "3.27.1",
+    "@tiptap/extension-superscript": "3.27.1",
+    "@tiptap/extension-table": "3.27.1",
+    "@tiptap/extension-text": "3.27.1",
+    "@tiptap/extension-text-align": "3.27.1",
+    "@tiptap/extension-text-style": "3.27.1",
+    "@tiptap/extension-typography": "3.27.1",
+    "@tiptap/extension-unique-id": "3.27.1",
+    "@tiptap/extension-youtube": "3.27.1",
+    "@tiptap/html": "3.27.1",
+    "@tiptap/pm": "3.27.1",
+    "@tiptap/react": "3.27.1",
+    "@tiptap/starter-kit": "3.27.1",
+    "@tiptap/suggestion": "3.27.1",
+    "@tiptap/y-tiptap": "3.0.5",
    "bytes": "3.1.2",
    "cross-env": "10.1.0",
    "date-fns": "4.1.0",
@@ -95,5 +93,50 @@
      "packages/*"
    ]
  },
-  "packageManager": "pnpm@11.15.1"
+  "packageManager": "pnpm@10.4.0",
+  "pnpm": {
+    "patchedDependencies": {
+      "scimmy@1.3.5": "patches/scimmy@1.3.5.patch"
+    },
+    "overrides": {
+      "prosemirror-changeset": "2.4.0",
+      "y-prosemirror": "1.3.7",
+      "glob": "13.0.6",
+      "ws": "8.21.0",
+      "dompurify": "3.4.11",
+      "tmp": "0.2.7",
+      "hono": "4.12.25",
+      "mermaid": "11.15.0",
+      "nanoid@^3": "3.3.8",
+      "socket.io-parser": "4.2.6",
+      "serialize-javascript": "7.0.3",
+      "lodash-es": "4.18.1",
+      "lodash": "4.18.1",
+      "@hono/node-server": "1.19.13",
+      "undici": "7.28.0",
+      "ajv@^6": "6.14.0",
+      "ajv@^8": "8.18.0",
+      "underscore": "1.13.8",
+      "immutable": "4.3.8",
+      "express-rate-limit": "8.2.2",
+      "minimatch@^3": "3.1.5",
+      "minimatch@^5": "5.1.8",
+      "flatted": "3.4.2",
+      "picomatch@<2.3.2": "2.3.2",
+      "picomatch@>=4.0.0 <4.0.4": "4.0.4",
+      "fastify": "5.8.5",
+      "yaml@>=1.0.0 <1.10.3": "1.10.3",
+      "yaml@>=2.0.0 <2.8.3": "2.8.3",
+      "path-to-regexp@^8": "8.4.0",
+      "brace-expansion@^5": "5.0.6",
+      "@xmldom/xmldom": "0.8.13",
+      "handlebars": "4.7.9",
+      "axios": "1.16.0",
+      "langsmith": "0.7.0",
+      "follow-redirects": "1.16.0",
+      "protobufjs": "7.5.8",
+      "ip-address": "10.1.1"
+    },
+    "neverBuiltDependencies": []
+  }
 }
@@ -422,8 +422,6 @@ export const SearchAndReplace = Extension.create<
        state: {
          init: () => DecorationSet.empty,
          apply({ doc, docChanged }, oldState) {
-            const storage = editor.storage.searchAndReplace;
-            if (!storage) return oldState;
            const {
              searchTerm,
              lastSearchTerm,
@@ -431,7 +429,7 @@ export const SearchAndReplace = Extension.create<
              lastCaseSensitive,
              resultIndex,
              lastResultIndex,
-            } = storage;
+            } = editor.storage.searchAndReplace;

            if (
              !docChanged &&
@@ -1,65 +1,3 @@
 packages:
  - 'apps/*'
  - 'packages/*'
-patchedDependencies:
-  scimmy@1.3.5: patches/scimmy@1.3.5.patch
-overrides:
-  prosemirror-changeset: 2.4.0
-  y-prosemirror: 1.3.7
-  glob: 13.0.6
-  ws: 8.21.0
-  dompurify: 3.4.11
-  tmp: 0.2.7
-  hono: 4.12.25
-  mermaid: 11.15.0
-  nanoid@^3: 3.3.8
-  socket.io-parser: 4.2.6
-  serialize-javascript: 7.0.3
-  lodash-es: 4.18.1
-  lodash: 4.18.1
-  '@hono/node-server': 1.19.13
-  undici: 7.28.0
-  ajv@^6: 6.14.0
-  ajv@^8: 8.18.0
-  underscore: 1.13.8
-  immutable: 4.3.8
-  express-rate-limit: 8.2.2
-  minimatch@^3: 3.1.5
-  minimatch@^5: 5.1.8
-  flatted: 3.4.2
-  picomatch@<2.3.2: 2.3.2
-  picomatch@>=4.0.0 <4.0.4: 4.0.4
-  fastify: 5.8.5
-  yaml@>=1.0.0 <1.10.3: 1.10.3
-  yaml@>=2.0.0 <2.8.3: 2.8.3
-  path-to-regexp@^8: 8.4.0
-  brace-expansion@^5: 5.0.6
-  '@xmldom/xmldom': 0.8.13
-  handlebars: 4.7.9
-  axios: 1.18.1
-  langsmith: 0.7.0
-  follow-redirects: 1.16.0
-  protobufjs: 7.5.8
-  ip-address: 10.1.1
-  fast-uri: 3.1.3
-  form-data@>=4.0.0 <4.0.6: 4.0.6
-  nanoid@>=4.0.0 <5.0.9: 5.1.16
-  qs: 6.15.3
-  esbuild@>=0.27.3 <0.28.1: 0.28.1
-  '@babel/core@<=7.29.0': 7.29.7
-  '@opentelemetry/core@>=2.0.0 <2.8.0': 2.9.0
-  '@babel/plugin-transform-modules-systemjs@<=7.29.3': 7.29.7
-  brace-expansion@<1.1.13: 1.1.15
-  brace-expansion@>=2.0.0 <2.0.3: 2.0.3
-  js-yaml@>=3.0.0 <3.15.0: 3.15.0
-  js-yaml@>=4.0.0 <=4.1.1: 4.3.0
-shamefullyHoist: true
-minimumReleaseAge: 4320
-allowBuilds:
-  '@swc/core': true
-  bcrypt: true
-  core-js: true
-  esbuild: true
-  msgpackr-extract: true
-  nx: true
-  unrs-resolver: true
Author	SHA1	Message	Date
Philip Okugbe	a12dce74be	New translations translation.json (Russian) [ci skip]	2026-08-17 22:17:25 +01:00
Philip Okugbe	07919754cf	New translations translation.json (English) [ci skip]	2026-08-17 17:24:48 +01:00
Philip Okugbe	0c1afc228f	New translations translation.json (English) [ci skip]	2026-08-17 12:40:46 +01:00
Philip Okugbe	9ef797110b	New translations translation.json (Portuguese, Brazilian) [ci skip]	2026-08-12 14:18:50 +01:00
Philip Okugbe	4f6790bace	New translations translation.json (English) [ci skip]	2026-08-12 14:18:49 +01:00
Philip Okugbe	127a5f0a4b	New translations translation.json (Chinese Simplified) [ci skip]	2026-08-12 14:18:47 +01:00
Philip Okugbe	68a853bad7	New translations translation.json (Ukrainian) [ci skip]	2026-08-12 14:18:46 +01:00
Philip Okugbe	534ed109ed	New translations translation.json (Russian) [ci skip]	2026-08-12 14:18:44 +01:00
Philip Okugbe	4b5a218b99	New translations translation.json (Dutch) [ci skip]	2026-08-12 14:18:42 +01:00
Philip Okugbe	dc7b68f793	New translations translation.json (Japanese) [ci skip]	2026-08-12 14:18:41 +01:00
Philip Okugbe	e007a01ed7	New translations translation.json (Italian) [ci skip]	2026-08-12 14:18:39 +01:00
Philip Okugbe	498bb0f5af	New translations translation.json (German) [ci skip]	2026-08-12 14:18:37 +01:00
Philip Okugbe	db22d920db	New translations translation.json (French) [ci skip]	2026-08-12 14:18:36 +01:00
Philip Okugbe	d771110b8b	New translations translation.json (Spanish) [ci skip]	2026-08-12 14:18:34 +01:00
Philip Okugbe	04794412cb	New translations translation.json (Korean) [ci skip]	2026-08-12 14:18:33 +01:00
Philip Okugbe	3012b8c9af	New translations translation.json (Portuguese, Brazilian) [ci skip]	2026-08-12 12:41:37 +01:00
Philip Okugbe	7b594cb6ea	New translations translation.json (English) [ci skip]	2026-08-12 12:41:35 +01:00
Philip Okugbe	104b77c144	New translations translation.json (Chinese Simplified) [ci skip]	2026-08-12 12:41:34 +01:00
Philip Okugbe	6c002b7963	New translations translation.json (Ukrainian) [ci skip]	2026-08-12 12:41:32 +01:00
Philip Okugbe	5fe3e8d38b	New translations translation.json (Russian) [ci skip]	2026-08-12 12:41:30 +01:00
Philip Okugbe	813c1774e3	New translations translation.json (Dutch) [ci skip]	2026-08-12 12:41:29 +01:00
Philip Okugbe	a766f8947b	New translations translation.json (Japanese) [ci skip]	2026-08-12 12:41:27 +01:00
Philip Okugbe	dd2e1d0a3d	New translations translation.json (Italian) [ci skip]	2026-08-12 12:41:26 +01:00
Philip Okugbe	2e53bb04be	New translations translation.json (German) [ci skip]	2026-08-12 12:41:24 +01:00
Philip Okugbe	c0de27bc16	New translations translation.json (French) [ci skip]	2026-08-12 12:41:23 +01:00
Philip Okugbe	54979fd60a	New translations translation.json (Spanish) [ci skip]	2026-08-12 12:41:21 +01:00
Philip Okugbe	ede0977b16	New translations translation.json (Korean) [ci skip]	2026-08-12 12:41:20 +01:00
Philip Okugbe	e4ad085689	New translations translation.json (Spanish) [ci skip]	2026-08-11 07:36:34 +01:00
Philip Okugbe	1cddefbb0f	New translations translation.json (Korean) [ci skip]	2026-08-10 16:42:05 +01:00
Philip Okugbe	fbef4e285a	New translations translation.json (Korean) [ci skip]	2026-08-10 15:16:40 +01:00
Philip Okugbe	4314541d72	New translations translation.json (Korean) [ci skip]	2026-07-23 15:51:12 +01:00
Philip Okugbe	bafb014001	New translations translation.json (French) [ci skip]	2026-07-23 12:26:55 +01:00
Philip Okugbe	7fefae4025	New translations translation.json (Italian) [ci skip]	2026-07-07 11:03:58 +01:00