Update 'Ignore Shortcut' text to 'Ignore Conflict' for clarity (#46318)
## Summary of the Pull Request Updates the checkbox label in the ShortcutConflictWindow (shown in the Settings Dashboard when a hotkey conflict is detected) from "Ignore shortcut" to "Ignore conflict". This change clarifies that checking the box ignores the *conflict*, not the shortcut itself. ## PR Checklist - [ ] **Communication:** I've discussed this with core contributors already. If the work hasn't been agreed, this work might be rejected - [ ] **Tests:** Added/updated and all pass - [ ] **Localization:** All end-user-facing strings can be localized - [ ] **Dev docs:** Added/updated - [ ] **New binaries:** Added on the required places - [ ] [JSON for signing](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ESRPSigning_core.json) for new binaries - [ ] [WXS for installer](https://github.com/microsoft/PowerToys/blob/main/installer/PowerToysSetup/Product.wxs) for new binaries and localization folder - [ ] [YML for CI pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/ci/templates/build-powertoys-steps.yml) for new test projects - [ ] [YML for signed pipeline](https://github.com/microsoft/PowerToys/blob/main/.pipelines/release.yml) - [ ] **Documentation updated:** If checked, please file a pull request on [our docs repo](https://github.com/MicrosoftDocs/windows-uwp/tree/docs/hub/powertoys) and link it here: #xxx ## Detailed Description of the Pull Request / Additional comments **File changed:** `src/settings-ui/Settings.UI/Strings/en-us/Resources.resw` - Updated `ShortcutConflictWindow_IgnoreShortcut.Content` from `"Ignore shortcut"` to `"Ignore conflict"`. The checkbox appears in the ShortcutConflictWindow header row next to the conflicting hotkey. The previous label "Ignore shortcut" was ambiguous — it was unclear whether it meant "ignore the conflict" (allow the shortcut to coexist) or "ignore the shortcut" (disable it). The new label "Ignore conflict" makes the intent unambiguous. ## Validation Steps Performed - Manually verified the resource string change in `Resources.resw`. - Confirmed the `x:Uid="ShortcutConflictWindow_IgnoreShortcut"` binding in `ShortcutConflictWindow.xaml` picks up the updated `.Content` value. <!-- START COPILOT ORIGINAL PROMPT --> <details> <summary>Original prompt</summary> > > ---- > > *This section details on the original issue you should resolve* > > <issue_title>"Ignore Shortcut" is ambiguous; Suggest change to "Ignore Conflict"</issue_title> > <issue_description>### Description of the new feature / enhancement > > When ignoring shortcut conflicts, it is unclear (to me) if the "Ignore shortcut" check box "ignores the conflict" (good) or "ignores the shortcut" ... so it can't be used (bad). A change to the wording to "Ignore Conflict" would clarify the intent. > > ### Scenario when this would be used? > > Renaming avoids ambiguity and avoids (me) wasting time checking the AIs for what the check box actually does. > > ### Supporting information > > Not needed (I think)</issue_description> > > ## Comments on the Issue (you are @copilot in this section) > > <comments> > </comments> > </details> <!-- START COPILOT CODING AGENT SUFFIX --> - Fixes microsoft/PowerToys#46296 <!-- START COPILOT CODING AGENT TIPS --> --- 📱 Kick off Copilot coding agent tasks wherever you are with [GitHub Mobile](https://gh.io/cca-mobile-docs), available on iOS and Android. --------- Co-authored-by: copilot-swe-agent[bot] <[email protected]> Co-authored-by: niels9001 <[email protected]>
C
Copilot committed
33497e59ccd5cba7327c0aeb52239bb5ec406bce
Parent: 3d2f069
Committed by GitHub <[email protected]>
on 3/24/2026, 9:12:05 PM