Skip to content

Beautiful, AI-native markdown IDE and LLM wiki

Remove keyboard shortcut conflict badges from the settings UI (#1652)

Dimitri POSTOLOV67cb2485c2d5
diff --git a/packages/app/src/components/settings/SettingsDialogBody.dom.test.tsx b/packages/app/src/components/settings/SettingsDialogBody.dom.test.tsx
index 39dc1eb6e..f43a3cd01 100644
--- a/packages/app/src/components/settings/SettingsDialogBody.dom.test.tsx
+++ b/packages/app/src/components/settings/SettingsDialogBody.dom.test.tsx
@@ -125,7 +125,7 @@ describe('SettingsDialogBody preferences runtime', () => {
expect(screen.getByTestId('settings-hotkeys-list')).toBeDefined();
expect(screen.getByTestId('settings-hotkey-command-palette')).toBeDefined();
expect(screen.getByText('Command palette')).toBeDefined();
- expect(screen.getByText(/Chrome uses this to search/)).toBeDefined();
+ expect(screen.queryByText(/Chrome uses this to search/)).toBeNull();
});
test('keeps long hotkey rows compact when shortcut chips wrap', () => {
diff --git a/packages/app/src/components/settings/SettingsDialogBody.tsx b/packages/app/src/components/settings/SettingsDialogBody.tsx
index 6bec53873..338ed07ba 100644
--- a/packages/app/src/components/settings/SettingsDialogBody.tsx
+++ b/packages/app/src/components/settings/SettingsDialogBody.tsx
@@ -230,10 +230,6 @@ function HotkeysSection() {
{shortcuts.map((shortcut) => {
const shortcutTitleId = `settings-hotkey-${shortcut.id}-title`;
const shortcutDescriptionId = `settings-hotkey-${shortcut.id}-description`;
- const conflictNoteIds =
- shortcut.conflicts?.map(
- (conflict) => `settings-hotkey-${shortcut.id}-${conflict.source}-note`,
- ) ?? [];
const bindingChipCount = shortcut.bindings.reduce(
(count, binding) => count + formatShortcutBinding(binding).split(' / ').length,
0,
@@ -243,7 +239,7 @@ function HotkeysSection() {
return (
<li
key={shortcut.id}
- aria-describedby={[shortcutDescriptionId, ...conflictNoteIds].join(' ')}
+ aria-describedby={shortcutDescriptionId}
aria-labelledby={shortcutTitleId}
className={cn(
'grid gap-2 border-border border-b px-3 py-3 last:border-b-0',
@@ -264,27 +260,10 @@ function HotkeysSection() {
</span>
{t(shortcut.scope)}
</Badge>
- {shortcut.conflicts?.map((conflict) => (
- <Badge key={`${shortcut.id}-${conflict.source}`} variant="warning">
- <span className="sr-only">
- <Trans>Conflict: </Trans>
- </span>
- {conflict.source}
- </Badge>
- ))}
</div>
<p className="text-muted-foreground text-sm" id={shortcutDescriptionId}>
{t(shortcut.description)}
</p>
- {shortcut.conflicts?.map((conflict) => (
- <p
- key={`${shortcut.id}-${conflict.source}-note`}
- className="text-muted-foreground text-xs"
- id={`settings-hotkey-${shortcut.id}-${conflict.source}-note`}
- >
- {t(conflict.note)}
- </p>
- ))}
</div>
<div
className={cn(
diff --git a/packages/app/src/lib/keyboard-shortcuts.ts b/packages/app/src/lib/keyboard-shortcuts.ts
index 35414a352..18282cfa3 100644
--- a/packages/app/src/lib/keyboard-shortcuts.ts
+++ b/packages/app/src/lib/keyboard-shortcuts.ts
@@ -12,8 +12,6 @@ export type ShortcutCategory =
| 'source'
| 'navigation';
-type ShortcutConflictSource = 'Chrome' | 'TipTap' | 'CodeMirror';
-
interface ShortcutMatchOptions {
mod?: boolean;
anyMod?: boolean;
@@ -48,11 +46,6 @@ export interface ShortcutBinding {
match?: PlatformShortcutMatch;
}
-interface ShortcutConflict {
- source: ShortcutConflictSource;
- note: MessageDescriptor;
-}
-
export interface KeyboardShortcutDefinition {
id: string;
category: ShortcutCategory;
@@ -60,7 +53,6 @@ export interface KeyboardShortcutDefinition {
description: MessageDescriptor;
scope: MessageDescriptor;
bindings: ShortcutBinding[];
- conflicts?: ShortcutConflict[];
}
type ShortcutTargetLike =
@@ -104,12 +96,6 @@ const KEYBOARD_SHORTCUT_DEFINITIONS = [
match: { key: 'k', mod: true, allowExtraModifiers: true },
},
],
- conflicts: [
- {
- source: 'Chrome',
- note: msg`Chrome uses this to search from the page or focus the address bar. Open Knowledge overrides it while the app has focus.`,
- },
- ],
},
{
id: 'settings',
@@ -118,12 +104,6 @@ const KEYBOARD_SHORTCUT_DEFINITIONS = [
description: msg`Open this settings dialog.`,
scope: msg`Global outside text fields`,
bindings: [{ mac: '⌘ ,', windowsLinux: 'Ctrl ,', match: { key: ',', anyMod: true } }],
- conflicts: [
- {
- source: 'Chrome',
- note: msg`On macOS Chrome uses ⌘, for Chrome Settings. In OK Desktop the native app menu captures the shortcut for Open Knowledge settings.`,
- },
- ],
},
{
id: 'new-item',
@@ -143,12 +123,6 @@ const KEYBOARD_SHORTCUT_DEFINITIONS = [
match: { key: 'n', anyMod: true, altKey: true, allowExtraModifiers: true },
},
],
- conflicts: [
- {
- source: 'Chrome',
- note: msg`Chrome uses Ctrl/Cmd+N for new browser windows. OK Desktop captures Ctrl/Cmd+N natively; browser mode can use Ctrl/Cmd+Alt+N outside text fields.`,
- },
- ],
},
{
id: 'toggle-files-sidebar',
@@ -177,12 +151,6 @@ const KEYBOARD_SHORTCUT_DEFINITIONS = [
match: { code: 'KeyB', anyMod: true, altKey: true, allowExtraModifiers: true },
},
],
- conflicts: [
- {
- source: 'Chrome',
- note: msg`On macOS Chrome uses ⌘⌥B for Bookmark Manager. OK Desktop captures this through the native View menu.`,
- },
- ],
},
{
id: 'open-folder',
@@ -191,12 +159,6 @@ const KEYBOARD_SHORTCUT_DEFINITIONS = [
description: msg`Open an existing project folder from disk.`,
scope: msg`OK Desktop`,
bindings: [{ mac: '⌘ O', windowsLinux: 'Ctrl O' }],
- conflicts: [
- {
- source: 'Chrome',
- note: msg`Chrome uses this to open a local file. The shortcut is owned by the OK Desktop native File menu.`,
- },
- ],
},
{
id: 'switch-project',
@@ -213,12 +175,6 @@ const KEYBOARD_SHORTCUT_DEFINITIONS = [
description: msg`Duplicate the focused file-tree item when focus is in the Files sidebar.`,
scope: msg`Files sidebar`,
bindings: [{ mac: '⌘ D', windowsLinux: 'Ctrl D' }],
- conflicts: [
- {
- source: 'Chrome',
- note: msg`Chrome uses this to bookmark the page. Open Knowledge only handles it when the Files sidebar has focus.`,
- },
- ],
},
{
id: 'file-tree-select-all',
@@ -227,12 +183,6 @@ const KEYBOARD_SHORTCUT_DEFINITIONS = [
description: msg`Select every visible file-tree row when focus is in the Files sidebar.`,
scope: msg`Files sidebar`,
bindings: [{ mac: '⌘ A', windowsLinux: 'Ctrl A' }],
- conflicts: [
- {
- source: 'Chrome',
- note: msg`Chrome and the page use this to select text or page content. Open Knowledge only handles it when the Files sidebar has focus.`,
- },
- ],
},
{
id: 'find',
@@ -243,12 +193,6 @@ const KEYBOARD_SHORTCUT_DEFINITIONS = [
bindings: [
{ mac: '⌘ F', windowsLinux: 'Ctrl F', match: { key: 'f', mod: true, allowShiftKey: true } },
],
- conflicts: [
- {
- source: 'Chrome',
- note: msg`Chrome uses this for browser find. Open Knowledge overrides it in visual editor mode.`,
- },
- ],
},
{
id: 'replace',
@@ -266,12 +210,6 @@ const KEYBOARD_SHORTCUT_DEFINITIONS = [
},
},
],
- conflicts: [
- {
- source: 'Chrome',
- note: msg`Chrome uses Ctrl+H for History on Windows/Linux and ⌘⌥F for web search on macOS.`,
- },
- ],
},
{
id: 'find-next',
@@ -283,12 +221,6 @@ const KEYBOARD_SHORTCUT_DEFINITIONS = [
{ mac: '⌘ G', windowsLinux: 'Ctrl G', match: { key: 'g', mod: true } },
{ mac: 'F3', windowsLinux: 'F3', match: { key: 'F3' } },
],
- conflicts: [
- {
- source: 'Chrome',
- note: msg`Chrome uses this for the browser find bar. Open Knowledge handles it when visual-editor find is open.`,
- },
- ],
},
{
id: 'find-previous',
@@ -300,12 +232,6 @@ const KEYBOARD_SHORTCUT_DEFINITIONS = [
{ mac: '⇧⌘ G', windowsLinux: 'Ctrl Shift G', match: { key: 'g', mod: true, shiftKey: true } },
{ mac: 'Shift F3', windowsLinux: 'Shift F3', match: { key: 'F3', shiftKey: true } },
],
- conflicts: [
- {
- source: 'Chrome',
- note: msg`Chrome uses this for the browser find bar. Open Knowledge handles it when visual-editor find is open.`,
- },
- ],
},
{
id: 'find-field-navigation',
@@ -362,12 +288,6 @@ const KEYBOARD_SHORTCUT_DEFINITIONS = [
description: msg`Toggle inline code formatting.`,
scope: msg`Visual editor`,
bindings: [{ mac: '⌘ E', windowsLinux: 'Ctrl E' }],
- conflicts: [
- {
- source: 'Chrome',
- note: msg`Chrome uses ⌘E with its find bar on macOS. The editor binding applies while the visual editor is focused.`,
- },
- ],
},
{
id: 'format-highlight',
@@ -376,12 +296,6 @@ const KEYBOARD_SHORTCUT_DEFINITIONS = [
description: msg`Toggle highlight formatting.`,
scope: msg`Visual editor`,
bindings: [{ mac: '⇧⌘ H', windowsLinux: 'Ctrl Shift H' }],
- conflicts: [
- {
- source: 'Chrome',
- note: msg`On macOS Chrome uses ⌘⇧H to open the home page. The editor binding applies while the visual editor is focused.`,
- },
- ],
},
{
id: 'edit-with-ai',
@@ -396,12 +310,6 @@ const KEYBOARD_SHORTCUT_DEFINITIONS = [
match: { key: 'i', mod: true, shiftKey: true },
},
],
- conflicts: [
- {
- source: 'Chrome',
- note: msg`Chrome uses Cmd/Ctrl+Shift+I for DevTools. Open Knowledge handles it in editor selection contexts.`,
- },
- ],
},
{
id: 'history-undo-redo',
@@ -413,12 +321,6 @@ const KEYBOARD_SHORTCUT_DEFINITIONS = [
{ mac: '⌘ Z', windowsLinux: 'Ctrl Z' },
{ mac: '⇧⌘ Z / ⌘ Y', windowsLinux: 'Ctrl Shift Z / Ctrl Y' },
],
- conflicts: [
- {
- source: 'TipTap',
- note: msg`The collaboration extension owns these bindings so undo and redo operate on the shared Yjs-backed editor history.`,
- },
- ],
},
{
id: 'heading-paragraph',
@@ -478,12 +380,6 @@ const KEYBOARD_SHORTCUT_DEFINITIONS = [
{ mac: 'Shift Enter', windowsLinux: 'Shift Enter' },
{ mac: '⌘ Enter', windowsLinux: 'Ctrl Enter' },
],
- conflicts: [
- {
- source: 'TipTap',
- note: msg`TipTap also has a base Mod+Enter exit-code binding. Open Knowledge registers its hard-break extension before the base keymap, so hard break wins in normal visual editing.`,
- },
- ],
},
{
id: 'move-block',
@@ -506,12 +402,6 @@ const KEYBOARD_SHORTCUT_DEFINITIONS = [
{ mac: 'Tab', windowsLinux: 'Tab' },
{ mac: 'Shift Tab', windowsLinux: 'Shift Tab' },
],
- conflicts: [
- {
- source: 'TipTap',
- note: msg`Tables also use Tab and Shift+Tab for cell navigation. The list shortcut only handles events while the cursor is inside a list item.`,
- },
- ],
},
{
id: 'list-split-item',
@@ -520,12 +410,6 @@ const KEYBOARD_SHORTCUT_DEFINITIONS = [
description: msg`Create a new list item from the current list item.`,
scope: msg`Visual editor list item`,
bindings: [{ mac: 'Enter', windowsLinux: 'Enter' }],
- conflicts: [
- {
- source: 'TipTap',
- note: msg`Open Knowledge's list item extension handles Enter before TipTap's base split-block keymap while the cursor is inside a list item.`,
- },
- ],
},
{
id: 'table-cell-navigation',
@@ -548,12 +432,6 @@ const KEYBOARD_SHORTCUT_DEFINITIONS = [
{ mac: 'Backspace / Delete', windowsLinux: 'Backspace / Delete' },
{ mac: '⌘ Backspace / ⌘ Delete', windowsLinux: 'Ctrl Backspace / Ctrl Delete' },
],
- conflicts: [
- {
- source: 'TipTap',
- note: msg`TipTap's table extension handles these bindings only when the selected cells cover the whole table.`,
- },
- ],
},
{
id: 'delete-atom',
@@ -657,12 +535,6 @@ const KEYBOARD_SHORTCUT_DEFINITIONS = [
description: msg`Select the full source document.`,
scope: msg`Source editor`,
bindings: [{ mac: '⌘ A', windowsLinux: 'Ctrl A' }],
- conflicts: [
- {
- source: 'Chrome',
- note: msg`Chrome and the page use this to select page content. CodeMirror handles it while source editor focus is inside the page.`,
- },
- ],
},
{
id: 'source-multi-cursor',
@@ -682,12 +554,6 @@ const KEYBOARD_SHORTCUT_DEFINITIONS = [
description: msg`Open CodeMirror search in source editor mode.`,
scope: msg`Source editor`,
bindings: [{ mac: '⌘ F', windowsLinux: 'Ctrl F' }],
- conflicts: [
- {
- source: 'Chrome',
- note: msg`Chrome uses this for browser find. CodeMirror handles it while source editor focus is inside the page.`,
- },
- ],
},
{
id: 'source-toggle-comment',
@@ -707,12 +573,6 @@ const KEYBOARD_SHORTCUT_DEFINITIONS = [
description: msg`Add the next matching source selection.`,
scope: msg`Source editor`,
bindings: [{ mac: '⌘ D', windowsLinux: 'Ctrl D' }],
- conflicts: [
- {
- source: 'Chrome',
- note: msg`Chrome uses this to bookmark the page. CodeMirror handles it only while source editor focus is inside the page.`,
- },
- ],
},
{
id: 'source-goto-line',
@@ -733,12 +593,6 @@ const KEYBOARD_SHORTCUT_DEFINITIONS = [
{ mac: 'F3 / Shift F3', windowsLinux: 'F3 / Shift F3' },
{ mac: 'Esc', windowsLinux: 'Esc' },
],
- conflicts: [
- {
- source: 'Chrome',
- note: msg`Chrome uses these for browser find. CodeMirror handles them while source editor search is active.`,
- },
- ],
},
{
id: 'source-folding',
@@ -779,12 +633,6 @@ const KEYBOARD_SHORTCUT_DEFINITIONS = [
description: msg`Open CodeMirror's lint diagnostics panel.`,
scope: msg`Source editor`,
bindings: [{ mac: '⇧⌘ M', windowsLinux: 'Ctrl Shift M' }],
- conflicts: [
- {
- source: 'Chrome',
- note: msg`Chrome uses this for profile or user switching. CodeMirror handles it only while source editor focus is inside the page.`,
- },
- ],
},
{
id: 'source-next-diagnostic',
diff --git a/packages/app/src/locales/en/messages.po b/packages/app/src/locales/en/messages.po
index e2d1caad2..37d32b1a5 100644
--- a/packages/app/src/locales/en/messages.po
+++ b/packages/app/src/locales/en/messages.po
@@ -953,64 +953,64 @@ msgid "Choose whether to commit <0>.ok/</0>, <1>.mcp.json</1> (and per-editor va
msgstr "Choose whether to commit <0>.ok/</0>, <1>.mcp.json</1> (and per-editor variants), project skills, and <2>.claude/launch.json</2> alongside content — or keep them on this machine only via <3>.git/info/exclude</3>."
#: src/lib/keyboard-shortcuts.ts
-msgid "Chrome and the page use this to select page content. CodeMirror handles it while source editor focus is inside the page."
-msgstr "Chrome and the page use this to select page content. CodeMirror handles it while source editor focus is inside the page."
+#~ msgid "Chrome and the page use this to select page content. CodeMirror handles it while source editor focus is inside the page."
+#~ msgstr "Chrome and the page use this to select page content. CodeMirror handles it while source editor focus is inside the page."
#: src/lib/keyboard-shortcuts.ts
-msgid "Chrome and the page use this to select text or page content. Open Knowledge only handles it when the Files sidebar has focus."
-msgstr "Chrome and the page use this to select text or page content. Open Knowledge only handles it when the Files sidebar has focus."
+#~ msgid "Chrome and the page use this to select text or page content. Open Knowledge only handles it when the Files sidebar has focus."
+#~ msgstr "Chrome and the page use this to select text or page content. Open Knowledge only handles it when the Files sidebar has focus."
#: src/lib/keyboard-shortcuts.ts
-msgid "Chrome uses ⌘E with its find bar on macOS. The editor binding applies while the visual editor is focused."
-msgstr "Chrome uses ⌘E with its find bar on macOS. The editor binding applies while the visual editor is focused."
+#~ msgid "Chrome uses ⌘E with its find bar on macOS. The editor binding applies while the visual editor is focused."
+#~ msgstr "Chrome uses ⌘E with its find bar on macOS. The editor binding applies while the visual editor is focused."
#: src/lib/keyboard-shortcuts.ts
-msgid "Chrome uses Cmd/Ctrl+Shift+I for DevTools. Open Knowledge handles it in editor selection contexts."
-msgstr "Chrome uses Cmd/Ctrl+Shift+I for DevTools. Open Knowledge handles it in editor selection contexts."
+#~ msgid "Chrome uses Cmd/Ctrl+Shift+I for DevTools. Open Knowledge handles it in editor selection contexts."
+#~ msgstr "Chrome uses Cmd/Ctrl+Shift+I for DevTools. Open Knowledge handles it in editor selection contexts."
#: src/lib/keyboard-shortcuts.ts
-msgid "Chrome uses Ctrl/Cmd+N for new browser windows. OK Desktop captures Ctrl/Cmd+N natively; browser mode can use Ctrl/Cmd+Alt+N outside text fields."
-msgstr "Chrome uses Ctrl/Cmd+N for new browser windows. OK Desktop captures Ctrl/Cmd+N natively; browser mode can use Ctrl/Cmd+Alt+N outside text fields."
+#~ msgid "Chrome uses Ctrl/Cmd+N for new browser windows. OK Desktop captures Ctrl/Cmd+N natively; browser mode can use Ctrl/Cmd+Alt+N outside text fields."
+#~ msgstr "Chrome uses Ctrl/Cmd+N for new browser windows. OK Desktop captures Ctrl/Cmd+N natively; browser mode can use Ctrl/Cmd+Alt+N outside text fields."
#: src/lib/keyboard-shortcuts.ts
-msgid "Chrome uses Ctrl+H for History on Windows/Linux and ⌘⌥F for web search on macOS."
-msgstr "Chrome uses Ctrl+H for History on Windows/Linux and ⌘⌥F for web search on macOS."
+#~ msgid "Chrome uses Ctrl+H for History on Windows/Linux and ⌘⌥F for web search on macOS."
+#~ msgstr "Chrome uses Ctrl+H for History on Windows/Linux and ⌘⌥F for web search on macOS."
#: src/lib/keyboard-shortcuts.ts
-msgid "Chrome uses these for browser find. CodeMirror handles them while source editor search is active."
-msgstr "Chrome uses these for browser find. CodeMirror handles them while source editor search is active."
+#~ msgid "Chrome uses these for browser find. CodeMirror handles them while source editor search is active."
+#~ msgstr "Chrome uses these for browser find. CodeMirror handles them while source editor search is active."
#: src/lib/keyboard-shortcuts.ts
-msgid "Chrome uses this for browser find. CodeMirror handles it while source editor focus is inside the page."
-msgstr "Chrome uses this for browser find. CodeMirror handles it while source editor focus is inside the page."
+#~ msgid "Chrome uses this for browser find. CodeMirror handles it while source editor focus is inside the page."
+#~ msgstr "Chrome uses this for browser find. CodeMirror handles it while source editor focus is inside the page."
#: src/lib/keyboard-shortcuts.ts
-msgid "Chrome uses this for browser find. Open Knowledge overrides it in visual editor mode."
-msgstr "Chrome uses this for browser find. Open Knowledge overrides it in visual editor mode."
+#~ msgid "Chrome uses this for browser find. Open Knowledge overrides it in visual editor mode."
+#~ msgstr "Chrome uses this for browser find. Open Knowledge overrides it in visual editor mode."
#: src/lib/keyboard-shortcuts.ts
-msgid "Chrome uses this for profile or user switching. CodeMirror handles it only while source editor focus is inside the page."
-msgstr "Chrome uses this for profile or user switching. CodeMirror handles it only while source editor focus is inside the page."
+#~ msgid "Chrome uses this for profile or user switching. CodeMirror handles it only while source editor focus is inside the page."
+#~ msgstr "Chrome uses this for profile or user switching. CodeMirror handles it only while source editor focus is inside the page."
#: src/lib/keyboard-shortcuts.ts
-msgid "Chrome uses this for the browser find bar. Open Knowledge handles it when visual-editor find is open."
-msgstr "Chrome uses this for the browser find bar. Open Knowledge handles it when visual-editor find is open."
+#~ msgid "Chrome uses this for the browser find bar. Open Knowledge handles it when visual-editor find is open."
+#~ msgstr "Chrome uses this for the browser find bar. Open Knowledge handles it when visual-editor find is open."
#: src/lib/keyboard-shortcuts.ts
-msgid "Chrome uses this to bookmark the page. CodeMirror handles it only while source editor focus is inside the page."
-msgstr "Chrome uses this to bookmark the page. CodeMirror handles it only while source editor focus is inside the page."
+#~ msgid "Chrome uses this to bookmark the page. CodeMirror handles it only while source editor focus is inside the page."
+#~ msgstr "Chrome uses this to bookmark the page. CodeMirror handles it only while source editor focus is inside the page."
#: src/lib/keyboard-shortcuts.ts
-msgid "Chrome uses this to bookmark the page. Open Knowledge only handles it when the Files sidebar has focus."
-msgstr "Chrome uses this to bookmark the page. Open Knowledge only handles it when the Files sidebar has focus."
+#~ msgid "Chrome uses this to bookmark the page. Open Knowledge only handles it when the Files sidebar has focus."
+#~ msgstr "Chrome uses this to bookmark the page. Open Knowledge only handles it when the Files sidebar has focus."
#: src/lib/keyboard-shortcuts.ts
-msgid "Chrome uses this to open a local file. The shortcut is owned by the OK Desktop native File menu."
-msgstr "Chrome uses this to open a local file. The shortcut is owned by the OK Desktop native File menu."
+#~ msgid "Chrome uses this to open a local file. The shortcut is owned by the OK Desktop native File menu."
+#~ msgstr "Chrome uses this to open a local file. The shortcut is owned by the OK Desktop native File menu."
#: src/lib/keyboard-shortcuts.ts
-msgid "Chrome uses this to search from the page or focus the address bar. Open Knowledge overrides it while the app has focus."
-msgstr "Chrome uses this to search from the page or focus the address bar. Open Knowledge overrides it while the app has focus."
+#~ msgid "Chrome uses this to search from the page or focus the address bar. Open Knowledge overrides it while the app has focus."
+#~ msgstr "Chrome uses this to search from the page or focus the address bar. Open Knowledge overrides it while the app has focus."
#: src/components/settings/SettingsDialogShell.tsx
msgid "Claude Desktop"
@@ -1266,8 +1266,8 @@ msgid "Conflict"
msgstr "Conflict"
#: src/components/settings/SettingsDialogBody.tsx
-msgid "Conflict: "
-msgstr "Conflict: "
+#~ msgid "Conflict: "
+#~ msgstr "Conflict: "
#: src/components/settings/AccountSection.tsx
msgid "Connect a GitHub account to browse and sync your repositories."
@@ -3708,16 +3708,16 @@ msgid "ok ui responded but server.lock has no port yet"
msgstr "ok ui responded but server.lock has no port yet"
#: src/lib/keyboard-shortcuts.ts
-msgid "On macOS Chrome uses ⌘, for Chrome Settings. In OK Desktop the native app menu captures the shortcut for Open Knowledge settings."
-msgstr "On macOS Chrome uses ⌘, for Chrome Settings. In OK Desktop the native app menu captures the shortcut for Open Knowledge settings."
+#~ msgid "On macOS Chrome uses ⌘, for Chrome Settings. In OK Desktop the native app menu captures the shortcut for Open Knowledge settings."
+#~ msgstr "On macOS Chrome uses ⌘, for Chrome Settings. In OK Desktop the native app menu captures the shortcut for Open Knowledge settings."
#: src/lib/keyboard-shortcuts.ts
-msgid "On macOS Chrome uses ⌘⇧H to open the home page. The editor binding applies while the visual editor is focused."
-msgstr "On macOS Chrome uses ⌘⇧H to open the home page. The editor binding applies while the visual editor is focused."
+#~ msgid "On macOS Chrome uses ⌘⇧H to open the home page. The editor binding applies while the visual editor is focused."
+#~ msgstr "On macOS Chrome uses ⌘⇧H to open the home page. The editor binding applies while the visual editor is focused."
#: src/lib/keyboard-shortcuts.ts
-msgid "On macOS Chrome uses ⌘⌥B for Bookmark Manager. OK Desktop captures this through the native View menu."
-msgstr "On macOS Chrome uses ⌘⌥B for Bookmark Manager. OK Desktop captures this through the native View menu."
+#~ msgid "On macOS Chrome uses ⌘⌥B for Bookmark Manager. OK Desktop captures this through the native View menu."
+#~ msgstr "On macOS Chrome uses ⌘⌥B for Bookmark Manager. OK Desktop captures this through the native View menu."
#: src/lib/keyboard-shortcuts.ts
#~ msgid "On macOS Chrome uses ⌘⌥N for split view in the active tab. The shortcut is safest in OK Desktop."
@@ -3911,8 +3911,8 @@ msgid "Open Knowledge will create commits and push them to your remote automatic
msgstr "Open Knowledge will create commits and push them to your remote automatically. If you do not want automatic commits in your git history, you should not enable auto-sync."
#: src/lib/keyboard-shortcuts.ts
-msgid "Open Knowledge's list item extension handles Enter before TipTap's base split-block keymap while the cursor is inside a list item."
-msgstr "Open Knowledge's list item extension handles Enter before TipTap's base split-block keymap while the cursor is inside a list item."
+#~ msgid "Open Knowledge's list item extension handles Enter before TipTap's base split-block keymap while the cursor is inside a list item."
+#~ msgstr "Open Knowledge's list item extension handles Enter before TipTap's base split-block keymap while the cursor is inside a list item."
#: src/components/GraphPanel.tsx
msgid "Open link"
@@ -5413,8 +5413,8 @@ msgid "Table"
msgstr "Table"
#: src/lib/keyboard-shortcuts.ts
-msgid "Tables also use Tab and Shift+Tab for cell navigation. The list shortcut only handles events while the cursor is inside a list item."
-msgstr "Tables also use Tab and Shift+Tab for cell navigation. The list shortcut only handles events while the cursor is inside a list item."
+#~ msgid "Tables also use Tab and Shift+Tab for cell navigation. The list shortcut only handles events while the cursor is inside a list item."
+#~ msgstr "Tables also use Tab and Shift+Tab for cell navigation. The list shortcut only handles events while the cursor is inside a list item."
#: src/editor/slash-command/component-items.tsx
msgid "Tag"
@@ -5513,8 +5513,8 @@ msgid "The Claude Desktop App didn't open the file. Is it installed? ({msg})"
msgstr "The Claude Desktop App didn't open the file. Is it installed? ({msg})"
#: src/lib/keyboard-shortcuts.ts
-msgid "The collaboration extension owns these bindings so undo and redo operate on the shared Yjs-backed editor history."
-msgstr "The collaboration extension owns these bindings so undo and redo operate on the shared Yjs-backed editor history."
+#~ msgid "The collaboration extension owns these bindings so undo and redo operate on the shared Yjs-backed editor history."
+#~ msgstr "The collaboration extension owns these bindings so undo and redo operate on the shared Yjs-backed editor history."
#: src/components/SyncStatusBadge.tsx
msgid "The default branch is protected — pushes need a pull request."
@@ -5662,12 +5662,12 @@ msgid "Timeline"
msgstr "Timeline"
#: src/lib/keyboard-shortcuts.ts
-msgid "TipTap also has a base Mod+Enter exit-code binding. Open Knowledge registers its hard-break extension before the base keymap, so hard break wins in normal visual editing."
-msgstr "TipTap also has a base Mod+Enter exit-code binding. Open Knowledge registers its hard-break extension before the base keymap, so hard break wins in normal visual editing."
+#~ msgid "TipTap also has a base Mod+Enter exit-code binding. Open Knowledge registers its hard-break extension before the base keymap, so hard break wins in normal visual editing."
+#~ msgstr "TipTap also has a base Mod+Enter exit-code binding. Open Knowledge registers its hard-break extension before the base keymap, so hard break wins in normal visual editing."
#: src/lib/keyboard-shortcuts.ts
-msgid "TipTap's table extension handles these bindings only when the selected cells cover the whole table."
-msgstr "TipTap's table extension handles these bindings only when the selected cells cover the whole table."
+#~ msgid "TipTap's table extension handles these bindings only when the selected cells cover the whole table."
+#~ msgstr "TipTap's table extension handles these bindings only when the selected cells cover the whole table."
#: src/editor/extensions/CodeBlockView.tsx
msgid "Title"
diff --git a/packages/app/src/locales/pseudo/messages.po b/packages/app/src/locales/pseudo/messages.po
index 6b6630474..36d03be32 100644
--- a/packages/app/src/locales/pseudo/messages.po
+++ b/packages/app/src/locales/pseudo/messages.po
@@ -948,64 +948,64 @@ msgid "Choose whether to commit <0>.ok/</0>, <1>.mcp.json</1> (and per-editor va
msgstr ""
#: src/lib/keyboard-shortcuts.ts
-msgid "Chrome and the page use this to select page content. CodeMirror handles it while source editor focus is inside the page."
-msgstr ""
+#~ msgid "Chrome and the page use this to select page content. CodeMirror handles it while source editor focus is inside the page."
+#~ msgstr ""
#: src/lib/keyboard-shortcuts.ts
-msgid "Chrome and the page use this to select text or page content. Open Knowledge only handles it when the Files sidebar has focus."
-msgstr ""
+#~ msgid "Chrome and the page use this to select text or page content. Open Knowledge only handles it when the Files sidebar has focus."
+#~ msgstr ""
#: src/lib/keyboard-shortcuts.ts
-msgid "Chrome uses ⌘E with its find bar on macOS. The editor binding applies while the visual editor is focused."
-msgstr ""
+#~ msgid "Chrome uses ⌘E with its find bar on macOS. The editor binding applies while the visual editor is focused."
+#~ msgstr ""
#: src/lib/keyboard-shortcuts.ts
-msgid "Chrome uses Cmd/Ctrl+Shift+I for DevTools. Open Knowledge handles it in editor selection contexts."
-msgstr ""
+#~ msgid "Chrome uses Cmd/Ctrl+Shift+I for DevTools. Open Knowledge handles it in editor selection contexts."
+#~ msgstr ""
#: src/lib/keyboard-shortcuts.ts
-msgid "Chrome uses Ctrl/Cmd+N for new browser windows. OK Desktop captures Ctrl/Cmd+N natively; browser mode can use Ctrl/Cmd+Alt+N outside text fields."
-msgstr ""
+#~ msgid "Chrome uses Ctrl/Cmd+N for new browser windows. OK Desktop captures Ctrl/Cmd+N natively; browser mode can use Ctrl/Cmd+Alt+N outside text fields."
+#~ msgstr ""
#: src/lib/keyboard-shortcuts.ts
-msgid "Chrome uses Ctrl+H for History on Windows/Linux and ⌘⌥F for web search on macOS."
-msgstr ""
+#~ msgid "Chrome uses Ctrl+H for History on Windows/Linux and ⌘⌥F for web search on macOS."
+#~ msgstr ""
#: src/lib/keyboard-shortcuts.ts
-msgid "Chrome uses these for browser find. CodeMirror handles them while source editor search is active."
-msgstr ""
+#~ msgid "Chrome uses these for browser find. CodeMirror handles them while source editor search is active."
+#~ msgstr ""
#: src/lib/keyboard-shortcuts.ts
-msgid "Chrome uses this for browser find. CodeMirror handles it while source editor focus is inside the page."
-msgstr ""
+#~ msgid "Chrome uses this for browser find. CodeMirror handles it while source editor focus is inside the page."
+#~ msgstr ""
#: src/lib/keyboard-shortcuts.ts
-msgid "Chrome uses this for browser find. Open Knowledge overrides it in visual editor mode."
-msgstr ""
+#~ msgid "Chrome uses this for browser find. Open Knowledge overrides it in visual editor mode."
+#~ msgstr ""
#: src/lib/keyboard-shortcuts.ts
-msgid "Chrome uses this for profile or user switching. CodeMirror handles it only while source editor focus is inside the page."
-msgstr ""
+#~ msgid "Chrome uses this for profile or user switching. CodeMirror handles it only while source editor focus is inside the page."
+#~ msgstr ""
#: src/lib/keyboard-shortcuts.ts
-msgid "Chrome uses this for the browser find bar. Open Knowledge handles it when visual-editor find is open."
-msgstr ""
+#~ msgid "Chrome uses this for the browser find bar. Open Knowledge handles it when visual-editor find is open."
+#~ msgstr ""
#: src/lib/keyboard-shortcuts.ts
-msgid "Chrome uses this to bookmark the page. CodeMirror handles it only while source editor focus is inside the page."
-msgstr ""
+#~ msgid "Chrome uses this to bookmark the page. CodeMirror handles it only while source editor focus is inside the page."
+#~ msgstr ""
#: src/lib/keyboard-shortcuts.ts
-msgid "Chrome uses this to bookmark the page. Open Knowledge only handles it when the Files sidebar has focus."
-msgstr ""
+#~ msgid "Chrome uses this to bookmark the page. Open Knowledge only handles it when the Files sidebar has focus."
+#~ msgstr ""
#: src/lib/keyboard-shortcuts.ts
-msgid "Chrome uses this to open a local file. The shortcut is owned by the OK Desktop native File menu."
-msgstr ""
+#~ msgid "Chrome uses this to open a local file. The shortcut is owned by the OK Desktop native File menu."
+#~ msgstr ""
#: src/lib/keyboard-shortcuts.ts
-msgid "Chrome uses this to search from the page or focus the address bar. Open Knowledge overrides it while the app has focus."
-msgstr ""
+#~ msgid "Chrome uses this to search from the page or focus the address bar. Open Knowledge overrides it while the app has focus."
+#~ msgstr ""
#: src/components/settings/SettingsDialogShell.tsx
msgid "Claude Desktop"
@@ -1261,8 +1261,8 @@ msgid "Conflict"
msgstr ""
#: src/components/settings/SettingsDialogBody.tsx
-msgid "Conflict: "
-msgstr ""
+#~ msgid "Conflict: "
+#~ msgstr ""
#: src/components/settings/AccountSection.tsx
msgid "Connect a GitHub account to browse and sync your repositories."
@@ -3703,16 +3703,16 @@ msgid "ok ui responded but server.lock has no port yet"
msgstr ""
#: src/lib/keyboard-shortcuts.ts
-msgid "On macOS Chrome uses ⌘, for Chrome Settings. In OK Desktop the native app menu captures the shortcut for Open Knowledge settings."
-msgstr ""
+#~ msgid "On macOS Chrome uses ⌘, for Chrome Settings. In OK Desktop the native app menu captures the shortcut for Open Knowledge settings."
+#~ msgstr ""
#: src/lib/keyboard-shortcuts.ts
-msgid "On macOS Chrome uses ⌘⇧H to open the home page. The editor binding applies while the visual editor is focused."
-msgstr ""
+#~ msgid "On macOS Chrome uses ⌘⇧H to open the home page. The editor binding applies while the visual editor is focused."
+#~ msgstr ""
#: src/lib/keyboard-shortcuts.ts
-msgid "On macOS Chrome uses ⌘⌥B for Bookmark Manager. OK Desktop captures this through the native View menu."
-msgstr ""
+#~ msgid "On macOS Chrome uses ⌘⌥B for Bookmark Manager. OK Desktop captures this through the native View menu."
+#~ msgstr ""
#: src/lib/keyboard-shortcuts.ts
#~ msgid "On macOS Chrome uses ⌘⌥N for split view in the active tab. The shortcut is safest in OK Desktop."
@@ -3906,8 +3906,8 @@ msgid "Open Knowledge will create commits and push them to your remote automatic
msgstr ""
#: src/lib/keyboard-shortcuts.ts
-msgid "Open Knowledge's list item extension handles Enter before TipTap's base split-block keymap while the cursor is inside a list item."
-msgstr ""
+#~ msgid "Open Knowledge's list item extension handles Enter before TipTap's base split-block keymap while the cursor is inside a list item."
+#~ msgstr ""
#: src/components/GraphPanel.tsx
msgid "Open link"
@@ -5408,8 +5408,8 @@ msgid "Table"
msgstr ""
#: src/lib/keyboard-shortcuts.ts
-msgid "Tables also use Tab and Shift+Tab for cell navigation. The list shortcut only handles events while the cursor is inside a list item."
-msgstr ""
+#~ msgid "Tables also use Tab and Shift+Tab for cell navigation. The list shortcut only handles events while the cursor is inside a list item."
+#~ msgstr ""
#: src/editor/slash-command/component-items.tsx
msgid "Tag"
@@ -5508,8 +5508,8 @@ msgid "The Claude Desktop App didn't open the file. Is it installed? ({msg})"
msgstr ""
#: src/lib/keyboard-shortcuts.ts
-msgid "The collaboration extension owns these bindings so undo and redo operate on the shared Yjs-backed editor history."
-msgstr ""
+#~ msgid "The collaboration extension owns these bindings so undo and redo operate on the shared Yjs-backed editor history."
+#~ msgstr ""
#: src/components/SyncStatusBadge.tsx
msgid "The default branch is protected — pushes need a pull request."
@@ -5657,12 +5657,12 @@ msgid "Timeline"
msgstr ""
#: src/lib/keyboard-shortcuts.ts
-msgid "TipTap also has a base Mod+Enter exit-code binding. Open Knowledge registers its hard-break extension before the base keymap, so hard break wins in normal visual editing."
-msgstr ""
+#~ msgid "TipTap also has a base Mod+Enter exit-code binding. Open Knowledge registers its hard-break extension before the base keymap, so hard break wins in normal visual editing."
+#~ msgstr ""
#: src/lib/keyboard-shortcuts.ts
-msgid "TipTap's table extension handles these bindings only when the selected cells cover the whole table."
-msgstr ""
+#~ msgid "TipTap's table extension handles these bindings only when the selected cells cover the whole table."
+#~ msgstr ""
#: src/editor/extensions/CodeBlockView.tsx
msgid "Title"