From 35a3c55f292680fdc92396652249a079a921e7fc Mon Sep 17 00:00:00 2001 From: Niels Laute Date: Tue, 10 Mar 2026 19:47:38 +0100 Subject: [PATCH] [CmdPal] Minor string tweaks (#46040) ## Summary of the Pull Request Before: image After: image image ## PR Checklist - [x] Closes: #38730 (a lot of the suggestions there were already resolved. - [ ] **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 ## Validation Steps Performed --------- Co-authored-by: Copilot <198982749+Copilot@users.noreply.github.com> Co-authored-by: niels9001 <9866362+niels9001@users.noreply.github.com> --- .../QueryTests.cs | 12 +-- .../Microsoft.CmdPal.UITests/BasicTests.cs | 2 +- .../Properties/Resources.Designer.cs | 4 +- .../Properties/Resources.resx | 4 +- .../Helpers/Commands.cs | 9 -- .../Properties/Resources.Designer.cs | 88 ++----------------- .../Properties/Resources.resx | 44 ++-------- .../Properties/Resources.Designer.cs | 6 +- .../Properties/Resources.resx | 4 +- 9 files changed, 30 insertions(+), 143 deletions(-) diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.System.UnitTests/QueryTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.System.UnitTests/QueryTests.cs index af17ad8ec3..38cb8a4aa6 100644 --- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.System.UnitTests/QueryTests.cs +++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.Ext.System.UnitTests/QueryTests.cs @@ -17,12 +17,12 @@ namespace Microsoft.CmdPal.Ext.System.UnitTests; public class QueryTests : CommandPaletteUnitTestBase { [DataTestMethod] - [DataRow("shutdown", "Shutdown")] - [DataRow("restart", "Restart")] - [DataRow("sign out", "Sign out")] - [DataRow("lock", "Lock")] - [DataRow("sleep", "Sleep")] - [DataRow("hibernate", "Hibernate")] + [DataRow("shutdown", "Shutdown computer")] + [DataRow("restart", "Restart computer")] + [DataRow("sign out", "Sign out of computer")] + [DataRow("lock", "Lock computer")] + [DataRow("sleep", "Put computer to sleep")] + [DataRow("hibernate", "Hibernate computer")] [DataRow("open recycle", "Open Recycle Bin")] [DataRow("empty recycle", "Empty Recycle Bin")] [DataRow("uefi", "UEFI firmware settings")] diff --git a/src/modules/cmdpal/Tests/Microsoft.CmdPal.UITests/BasicTests.cs b/src/modules/cmdpal/Tests/Microsoft.CmdPal.UITests/BasicTests.cs index 172f07562a..ea2f0bac9c 100644 --- a/src/modules/cmdpal/Tests/Microsoft.CmdPal.UITests/BasicTests.cs +++ b/src/modules/cmdpal/Tests/Microsoft.CmdPal.UITests/BasicTests.cs @@ -124,6 +124,6 @@ public class BasicTests : CommandPaletteTestBase SetSearchBox("Sleep"); - Assert.IsNotNull(this.Find("Sleep")); + Assert.IsNotNull(this.Find("Put computer to sleep")); } } diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Properties/Resources.Designer.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Properties/Resources.Designer.cs index edd5871bfd..1dd566e9ef 100644 --- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Properties/Resources.Designer.cs +++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Properties/Resources.Designer.cs @@ -151,7 +151,7 @@ namespace Microsoft.CmdPal.Ext.ClipboardHistory.Properties { } /// - /// Looks up a localized string similar to Clipboard History. + /// Looks up a localized string similar to Clipboard history. /// public static string list_item_title { get { @@ -439,7 +439,7 @@ namespace Microsoft.CmdPal.Ext.ClipboardHistory.Properties { } /// - /// Looks up a localized string similar to Clipboard History. + /// Looks up a localized string similar to Clipboard history. /// public static string provider_display_name { get { diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Properties/Resources.resx b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Properties/Resources.resx index 1c4c83fb33..c37466273c 100644 --- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Properties/Resources.resx +++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.ClipboardHistory/Properties/Resources.resx @@ -130,13 +130,13 @@ Copied to clipboard - Clipboard History + Clipboard history Copy, paste, and search items on the clipboard - Clipboard History + Clipboard history Open diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Helpers/Commands.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Helpers/Commands.cs index fbf086063b..a73e72c00d 100644 --- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Helpers/Commands.cs +++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Helpers/Commands.cs @@ -49,7 +49,6 @@ internal static class Commands }) { Title = Resources.Microsoft_plugin_sys_shutdown_computer, - Subtitle = Resources.Microsoft_plugin_sys_shutdown_computer_description, Icon = Icons.ShutdownIcon, }, new ListItem( @@ -59,7 +58,6 @@ internal static class Commands }) { Title = Resources.Microsoft_plugin_sys_restart_computer, - Subtitle = Resources.Microsoft_plugin_sys_restart_computer_description, Icon = Icons.RestartIcon, }, new ListItem( @@ -69,7 +67,6 @@ internal static class Commands }) { Title = Resources.Microsoft_plugin_sys_sign_out, - Subtitle = Resources.Microsoft_plugin_sys_sign_out_description, Icon = Icons.LogoffIcon, }, new ListItem( @@ -79,7 +76,6 @@ internal static class Commands }) { Title = Resources.Microsoft_plugin_sys_lock, - Subtitle = Resources.Microsoft_plugin_sys_lock_description, Icon = Icons.LockIcon, }, new ListItem( @@ -89,7 +85,6 @@ internal static class Commands }) { Title = Resources.Microsoft_plugin_sys_sleep, - Subtitle = Resources.Microsoft_plugin_sys_sleep_description, Icon = Icons.SleepIcon, }, new ListItem( @@ -99,7 +94,6 @@ internal static class Commands }) { Title = Resources.Microsoft_plugin_sys_hibernate, - Subtitle = Resources.Microsoft_plugin_sys_hibernate_description, Icon = Icons.SleepIcon, // Icon change needed }, }); @@ -115,7 +109,6 @@ internal static class Commands }) { Title = Resources.Microsoft_plugin_sys_RecycleBinOpen, - Subtitle = Resources.Microsoft_plugin_sys_RecycleBin_description, Icon = Icons.RecycleBinIcon, }, new ListItem(new EmptyRecycleBinConfirmation(emptyRBSuccessMessage) @@ -124,7 +117,6 @@ internal static class Commands }) { Title = Resources.Microsoft_plugin_sys_RecycleBinEmptyResult, - Subtitle = Resources.Microsoft_plugin_sys_RecycleBinEmpty_description, Icon = Icons.RecycleBinIcon, }, }); @@ -138,7 +130,6 @@ internal static class Commands }) { Title = Resources.Microsoft_plugin_sys_RecycleBin, - Subtitle = Resources.Microsoft_plugin_sys_RecycleBin_description, Icon = Icons.RecycleBinIcon, }); } diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Properties/Resources.Designer.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Properties/Resources.Designer.cs index 0b1e1fe121..5d219f477f 100644 --- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Properties/Resources.Designer.cs +++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace Microsoft.CmdPal.Ext.System { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class Resources { @@ -187,7 +187,7 @@ namespace Microsoft.CmdPal.Ext.System { } /// - /// Looks up a localized string similar to Open system command. + /// Looks up a localized string similar to Execute system commands. /// public static string Microsoft_plugin_ext_fallback_display_title { get { @@ -313,7 +313,7 @@ namespace Microsoft.CmdPal.Ext.System { } /// - /// Looks up a localized string similar to Hibernate. + /// Looks up a localized string similar to Hibernate computer. /// public static string Microsoft_plugin_sys_hibernate { get { @@ -330,15 +330,6 @@ namespace Microsoft.CmdPal.Ext.System { } } - /// - /// Looks up a localized string similar to Hibernate computer. - /// - public static string Microsoft_plugin_sys_hibernate_description { - get { - return ResourceManager.GetString("Microsoft_plugin_sys_hibernate_description", resourceCulture); - } - } - /// /// Looks up a localized string similar to IPv4 address of {0}. /// @@ -421,7 +412,7 @@ namespace Microsoft.CmdPal.Ext.System { } /// - /// Looks up a localized string similar to Lock. + /// Looks up a localized string similar to Lock computer. /// public static string Microsoft_plugin_sys_lock { get { @@ -438,15 +429,6 @@ namespace Microsoft.CmdPal.Ext.System { } } - /// - /// Looks up a localized string similar to Lock computer. - /// - public static string Microsoft_plugin_sys_lock_description { - get { - return ResourceManager.GetString("Microsoft_plugin_sys_lock_description", resourceCulture); - } - } - /// /// Looks up a localized string similar to Loopback. /// @@ -519,15 +501,6 @@ namespace Microsoft.CmdPal.Ext.System { } } - /// - /// Looks up a localized string similar to Open the Recycle Bin. - /// - public static string Microsoft_plugin_sys_RecycleBin_description { - get { - return ResourceManager.GetString("Microsoft_plugin_sys_RecycleBin_description", resourceCulture); - } - } - /// /// Looks up a localized string similar to Recycle Bin emptied successfully.. /// @@ -591,15 +564,6 @@ namespace Microsoft.CmdPal.Ext.System { } } - /// - /// Looks up a localized string similar to Empty Recycle Bin. - /// - public static string Microsoft_plugin_sys_RecycleBinEmpty_description { - get { - return ResourceManager.GetString("Microsoft_plugin_sys_RecycleBinEmpty_description", resourceCulture); - } - } - /// /// Looks up a localized string similar to Empty Recycle Bin. /// @@ -619,7 +583,7 @@ namespace Microsoft.CmdPal.Ext.System { } /// - /// Looks up a localized string similar to Restart. + /// Looks up a localized string similar to Restart computer. /// public static string Microsoft_plugin_sys_restart_computer { get { @@ -636,15 +600,6 @@ namespace Microsoft.CmdPal.Ext.System { } } - /// - /// Looks up a localized string similar to Restart computer. - /// - public static string Microsoft_plugin_sys_restart_computer_description { - get { - return ResourceManager.GetString("Microsoft_plugin_sys_restart_computer_description", resourceCulture); - } - } - /// /// Looks up a localized string similar to Restart Windows Explorer. /// @@ -691,7 +646,7 @@ namespace Microsoft.CmdPal.Ext.System { } /// - /// Looks up a localized string similar to Shutdown. + /// Looks up a localized string similar to Shutdown computer. /// public static string Microsoft_plugin_sys_shutdown_computer { get { @@ -709,16 +664,7 @@ namespace Microsoft.CmdPal.Ext.System { } /// - /// Looks up a localized string similar to Shutdown computer. - /// - public static string Microsoft_plugin_sys_shutdown_computer_description { - get { - return ResourceManager.GetString("Microsoft_plugin_sys_shutdown_computer_description", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Sign out. + /// Looks up a localized string similar to Sign out of computer. /// public static string Microsoft_plugin_sys_sign_out { get { @@ -736,16 +682,7 @@ namespace Microsoft.CmdPal.Ext.System { } /// - /// Looks up a localized string similar to Sign out of computer. - /// - public static string Microsoft_plugin_sys_sign_out_description { - get { - return ResourceManager.GetString("Microsoft_plugin_sys_sign_out_description", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Sleep. + /// Looks up a localized string similar to Put computer to sleep. /// public static string Microsoft_plugin_sys_sleep { get { @@ -762,15 +699,6 @@ namespace Microsoft.CmdPal.Ext.System { } } - /// - /// Looks up a localized string similar to Put computer to sleep. - /// - public static string Microsoft_plugin_sys_sleep_description { - get { - return ResourceManager.GetString("Microsoft_plugin_sys_sleep_description", resourceCulture); - } - } - /// /// Looks up a localized string similar to Speed. /// diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Properties/Resources.resx b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Properties/Resources.resx index bc8ea5ec38..4a47df7859 100644 --- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Properties/Resources.resx +++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.System/Properties/Resources.resx @@ -199,17 +199,13 @@ Abbreviation of 'Gbits per seconds'. Don't translate the placeholder '{0}' as it is replaced in code. - Hibernate + Hibernate computer This should align to the action in Windows of a hibernating your computer. You are about to put this computer into hibernation, are you sure? This should align to the action in Windows of a hibernating your computer. - - Hibernate computer - This should align to the action in Windows of a hibernating your computer. - IPv4 address @@ -240,17 +236,13 @@ Don't translate the placeholder '{0}' as it is replaced in code. - Lock + Lock computer This should align to the action in Windows of a locking your computer. You are about to lock this computer, are you sure? This should align to the action in Windows of a locking your computer. - - Lock computer - This should align to the action in Windows of a locking your computer. - Loopback @@ -280,10 +272,6 @@ Empty Recycle Bin This should align to the action in Windows of emptying the recycle bin on your computer. - - Empty Recycle Bin - This should align to the action in Windows of emptying the recycle bin on your computer. - Open Recycle Bin Means the recycle bin folder in Explorer. @@ -292,10 +280,6 @@ Empty Recycle Bin (Shift+Delete) This should align to the action in Windows of emptying the recycle bin on your computer. - - Open the Recycle Bin - This should align to the action in Windows of emptying the recycle bin on your computer. - Recycle Bin emptied successfully. Means the recycle bin folder in Explorer. @@ -323,57 +307,41 @@ Means the recycle bin folder in Explorer and "emptying" refers to "Empty Recycle Bin" command. - Restart + Restart computer This should align to the action in Windows of a restarting your computer. You are about to restart this computer. Are you sure? This should align to the action in Windows of a restarting your computer. - - Restart computer - This should align to the action in Windows of a restarting your computer. - ip; mac; address Translate 'ip' as 'ip' and not as 'ip address'. Same for 'mac'.) - Shutdown + Shutdown computer This should align to the action in Windows of a shutting down your computer. You are about to shut down this computer, are you sure? This should align to the action in Windows of a shutting down your computer. - - Shutdown computer - This should align to the action in Windows of a shutting down your computer. - - Sign out + Sign out of computer This should align to the action in windows of a signing out back to the lock screen. You are about to sign out of this computer, are you sure? This should align to the action in windows of a signing out back to the lock screen. - - Sign out of computer - This should align to the action in windows of a signing out back to the lock screen. - - Sleep + Put computer to sleep This should align to the action in Windows of a making your computer go to sleep. You are about to put this computer to sleep, are you sure? This should align to the action in Windows of a making your computer go to sleep. - - Put computer to sleep - This should align to the action in Windows of a making your computer go to sleep. - Speed diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Properties/Resources.Designer.cs b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Properties/Resources.Designer.cs index e4567a30d4..a6bbddbb64 100644 --- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Properties/Resources.Designer.cs +++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Properties/Resources.Designer.cs @@ -19,7 +19,7 @@ namespace Microsoft.CmdPal.Ext.WinGet.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "18.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class Resources { @@ -124,7 +124,7 @@ namespace Microsoft.CmdPal.Ext.WinGet.Properties { } /// - /// Looks up a localized string similar to Add Command Palette extensions from WinGet. + /// Looks up a localized string similar to Find Command Palette extensions from WinGet. /// public static string winget_install_extensions_title { get { @@ -259,7 +259,7 @@ namespace Microsoft.CmdPal.Ext.WinGet.Properties { } /// - /// Looks up a localized string similar to Add Command Palette extensions from the Microsoft Store. + /// Looks up a localized string similar to Find Command Palette extensions from the Microsoft Store. /// public static string winget_search_store_title { get { diff --git a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Properties/Resources.resx b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Properties/Resources.resx index 4a6df0b518..a2e05b29dc 100644 --- a/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Properties/Resources.resx +++ b/src/modules/cmdpal/ext/Microsoft.CmdPal.Ext.WinGet/Properties/Resources.resx @@ -127,11 +127,11 @@ - Add Command Palette extensions from WinGet + Find Command Palette extensions from WinGet - Add Command Palette extensions from the Microsoft Store + Find Command Palette extensions from the Microsoft Store