diff --git a/src/renderer/src/components/settings/AppearancePane.tsx b/src/renderer/src/components/settings/AppearancePane.tsx index d326b541a71..4b573841e0f 100644 --- a/src/renderer/src/components/settings/AppearancePane.tsx +++ b/src/renderer/src/components/settings/AppearancePane.tsx @@ -582,12 +582,13 @@ export function AppearancePane({ updateSettings({ diff --git a/src/renderer/src/components/settings/SettingsFormControls.tsx b/src/renderer/src/components/settings/SettingsFormControls.tsx index 6af9a0f9511..cb5f99e9ab4 100644 --- a/src/renderer/src/components/settings/SettingsFormControls.tsx +++ b/src/renderer/src/components/settings/SettingsFormControls.tsx @@ -60,6 +60,7 @@ type SettingsRowProps = { label: React.ReactNode description?: React.ReactNode control: React.ReactNode + className?: string /** Optional id applied to the label so the control can reference it via aria-labelledby. */ labelId?: string /** When true, top-align label/description and control. Useful for tall control columns. */ @@ -71,12 +72,17 @@ export function SettingsRow({ label, description, control, + className, labelId, alignTop }: SettingsRowProps): React.JSX.Element { return (
@@ -92,6 +98,7 @@ type SettingsSwitchRowProps = { description?: React.ReactNode checked: boolean onChange: () => void + className?: string ariaLabel?: string } @@ -100,12 +107,14 @@ export function SettingsSwitchRow({ description, checked, onChange, + className, ariaLabel }: SettingsSwitchRowProps): React.JSX.Element { return ( ({ title: translate( 'auto.components.settings.appearance.search.showPinnedWorktreesInGroups.title', - 'Show pinned worktrees in other groups' + 'Also show pinned worktrees in groups' ), description: translate( 'auto.components.settings.appearance.search.showPinnedWorktreesInGroups.description', - 'Pinned worktrees also appear in All, Project, Status, and PR groups.' + 'Keeps pinned worktrees in Pinned and also shows them in All, Project, Status, and PR groups.' ), keywords: [ ...translateSearchKeyword( diff --git a/src/renderer/src/i18n/locales/en.json b/src/renderer/src/i18n/locales/en.json index 0718a524cb2..cace9cd3e13 100644 --- a/src/renderer/src/i18n/locales/en.json +++ b/src/renderer/src/i18n/locales/en.json @@ -4525,8 +4525,8 @@ }, "workspaceCardLayoutGuidance": "Use the workspace sidebar options menu > Card layout > Compact.", "showPinnedWorktreesInGroups": { - "title": "Show pinned worktrees in other groups", - "description": "Pinned worktrees also appear in All, Project, Status, and PR groups." + "title": "Also show pinned worktrees in groups", + "description": "Keeps pinned worktrees in Pinned and also shows them in All, Project, Status, and PR groups." } }, "AutoRenameBranchFromWorkSetting": { @@ -6688,8 +6688,8 @@ "detailed": "detailed" }, "showPinnedWorktreesInGroups": { - "title": "Show pinned worktrees in other groups", - "description": "Pinned worktrees also appear in All, Project, Status, and PR groups." + "title": "Also show pinned worktrees in groups", + "description": "Keeps pinned worktrees in Pinned and also shows them in All, Project, Status, and PR groups." } } }, diff --git a/src/renderer/src/i18n/locales/es.json b/src/renderer/src/i18n/locales/es.json index 9e3ec2e781d..b4684000288 100644 --- a/src/renderer/src/i18n/locales/es.json +++ b/src/renderer/src/i18n/locales/es.json @@ -4525,8 +4525,8 @@ "2edf606c46": "Minimizar a la bandeja al cerrar", "b707773a0d": "Cuando está activado, cerrar la ventana mantiene Orca en ejecución en la bandeja del sistema en lugar de salir.", "showPinnedWorktreesInGroups": { - "title": "Mostrar worktrees fijados en otros grupos", - "description": "Los worktrees fijados también aparecen en los grupos Todos, Proyecto, Estado y PR." + "title": "Mostrar también los worktrees fijados en grupos", + "description": "Mantiene los worktrees fijados en Fijados y también los muestra en los grupos Todos, Proyecto, Estado y PR." } }, "AutoRenameBranchFromWorkSetting": { @@ -6651,8 +6651,8 @@ "9a115966d3": "Minimizar a la bandeja al cerrar", "4d5b9427b5": "Cuando está activado, cerrar la ventana mantiene Orca en ejecución en la bandeja del sistema en lugar de salir.", "showPinnedWorktreesInGroups": { - "title": "Mostrar worktrees fijados en otros grupos", - "description": "Los worktrees fijados también aparecen en los grupos Todos, Proyecto, Estado y PR." + "title": "Mostrar también los worktrees fijados en grupos", + "description": "Mantiene los worktrees fijados en Fijados y también los muestra en los grupos Todos, Proyecto, Estado y PR." } } }, diff --git a/src/renderer/src/i18n/locales/ja.json b/src/renderer/src/i18n/locales/ja.json index 76d0e30da47..094651b2ffc 100644 --- a/src/renderer/src/i18n/locales/ja.json +++ b/src/renderer/src/i18n/locales/ja.json @@ -4510,8 +4510,8 @@ "2edf606c46": "閉じるときにトレイへ最小化", "b707773a0d": "有効にすると、ウィンドウを閉じてもOrcaは終了せず、システムトレイで実行を続けます。", "showPinnedWorktreesInGroups": { - "title": "ピン留めしたワークツリーを他のグループにも表示", - "description": "ピン留めしたワークツリーも、すべて、プロジェクト、ステータス、PR グループに表示されます。" + "title": "ピン留めしたワークツリーをグループにも表示", + "description": "ピン留めしたワークツリーを Pinned に残したまま、すべて、プロジェクト、ステータス、PR グループにも表示します。" } }, "AutoRenameBranchFromWorkSetting": { @@ -6673,8 +6673,8 @@ "9a115966d3": "閉じるときにトレイへ最小化", "4d5b9427b5": "有効にすると、ウィンドウを閉じてもOrcaは終了せず、システムトレイで実行を続けます。", "showPinnedWorktreesInGroups": { - "title": "ピン留めしたワークツリーを他のグループにも表示", - "description": "ピン留めしたワークツリーも、すべて、プロジェクト、ステータス、PR グループに表示されます。" + "title": "ピン留めしたワークツリーをグループにも表示", + "description": "ピン留めしたワークツリーを Pinned に残したまま、すべて、プロジェクト、ステータス、PR グループにも表示します。" } } }, diff --git a/src/renderer/src/i18n/locales/ko.json b/src/renderer/src/i18n/locales/ko.json index 222de9cf3f1..b6dfbe5e187 100644 --- a/src/renderer/src/i18n/locales/ko.json +++ b/src/renderer/src/i18n/locales/ko.json @@ -4510,8 +4510,8 @@ }, "workspaceCardLayoutGuidance": "워크스페이스 사이드바 옵션 메뉴 > 카드 레이아웃 > 컴팩트를 사용하세요.", "showPinnedWorktreesInGroups": { - "title": "고정된 워크트리를 다른 그룹에도 표시", - "description": "고정된 워크트리는 전체, 프로젝트, 상태 및 PR 그룹에도 표시됩니다." + "title": "고정된 워크트리를 그룹에도 표시", + "description": "고정된 워크트리는 Pinned에 유지하면서 전체, 프로젝트, 상태 및 PR 그룹에도 표시합니다." } }, "AutoRenameBranchFromWorkSetting": { @@ -6636,8 +6636,8 @@ "detailed": "상세" }, "showPinnedWorktreesInGroups": { - "title": "고정된 워크트리를 다른 그룹에도 표시", - "description": "고정된 워크트리는 전체, 프로젝트, 상태 및 PR 그룹에도 표시됩니다." + "title": "고정된 워크트리를 그룹에도 표시", + "description": "고정된 워크트리는 Pinned에 유지하면서 전체, 프로젝트, 상태 및 PR 그룹에도 표시합니다." } } }, diff --git a/src/renderer/src/i18n/locales/zh.json b/src/renderer/src/i18n/locales/zh.json index 25b1cf515b7..f0de42d57a8 100644 --- a/src/renderer/src/i18n/locales/zh.json +++ b/src/renderer/src/i18n/locales/zh.json @@ -4510,8 +4510,8 @@ "2edf606c46": "关闭时最小化到托盘", "b707773a0d": "启用后,关闭窗口会让 Orca 继续在系统托盘中运行,而不是退出。", "showPinnedWorktreesInGroups": { - "title": "在其他分组中显示已固定的工作树", - "description": "已固定的工作树也会显示在全部、项目、状态和 PR 分组中。" + "title": "也在分组中显示已固定的工作树", + "description": "将已固定的工作树保留在 Pinned 中,同时也显示在全部、项目、状态和 PR 分组中。" } }, "AutoRenameBranchFromWorkSetting": { @@ -6636,8 +6636,8 @@ "9a115966d3": "关闭时最小化到托盘", "4d5b9427b5": "启用后,关闭窗口会让 Orca 继续在系统托盘中运行,而不是退出。", "showPinnedWorktreesInGroups": { - "title": "在其他分组中显示已固定的工作树", - "description": "已固定的工作树也会显示在全部、项目、状态和 PR 分组中。" + "title": "也在分组中显示已固定的工作树", + "description": "将已固定的工作树保留在 Pinned 中,同时也显示在全部、项目、状态和 PR 分组中。" } } },