diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw b/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw index 67de76dd9db..19229d6c69a 100644 --- a/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw +++ b/src/core/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw @@ -302,8 +302,8 @@ Move newly created windows to their last known zone - - Zone behaviour + + Zone Behavior Zone highlight color (default: #0078D7) @@ -416,8 +416,8 @@ How long to press the Windows key before showing the Shortcut Guide - - Appearance & behaviour + + Appearance & Behavior Enable Shortcut Guide diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml index 49ba3bc6726..5db9ab55257 100644 --- a/src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml +++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/FancyZonesPage.xaml @@ -55,7 +55,7 @@ IsOn="{ Binding Mode=TwoWay, Path=IsEnabled}" Margin="{StaticResource SmallTopMargin}" /> - diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml index dbed7e95c33..89764468ee6 100644 --- a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml +++ b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml @@ -119,8 +119,8 @@ - singleKeyReMap; std::mutex singleKeyReMap_mutex; - // Stores keys which need to be changed from toggle behaviour to modifier behaviour. Eg. Caps Lock + // Stores keys which need to be changed from toggle behavior to modifier behavior. Eg. Caps Lock std::unordered_map singleKeyToggleToMod; std::mutex singleKeyToggleToMod_mutex; diff --git a/src/modules/keyboardmanager/dll/dllmain.cpp b/src/modules/keyboardmanager/dll/dllmain.cpp index 94db720c6cd..fddb5dd38de 100644 --- a/src/modules/keyboardmanager/dll/dllmain.cpp +++ b/src/modules/keyboardmanager/dll/dllmain.cpp @@ -451,7 +451,7 @@ class KeyboardManager : public PowertoyModuleIface return 0; } - // Function to a change a key's behaviour from toggle to modifier + // Function to a change a key's behavior from toggle to modifier intptr_t HandleSingleKeyToggleToModEvent(LowlevelKeyboardEvent* data) noexcept { // Check if the key event was generated by KeyboardManager to avoid remapping events generated by us. diff --git a/src/modules/launcher/Plugins/Wox.Plugin.Shell/Main.cs b/src/modules/launcher/Plugins/Wox.Plugin.Shell/Main.cs index 5f72492c25e..3af8fe85b1a 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.Shell/Main.cs +++ b/src/modules/launcher/Plugins/Wox.Plugin.Shell/Main.cs @@ -293,7 +293,7 @@ bool API_GlobalKeyboardEvent(int keyevent, int vkcode, SpecialKeyState state) { // not overriding Win+R // crutkas we need to earn the right for Win+R override - + /* if (_settings.ReplaceWinR) { if (keyevent == (int)KeyEvent.WM_KEYDOWN && vkcode == (int)Keys.R && state.WinPressed) @@ -309,6 +309,7 @@ bool API_GlobalKeyboardEvent(int keyevent, int vkcode, SpecialKeyState state) return false; } } + */ return true; } @@ -357,7 +358,7 @@ public List LoadContextMenus(Result selectedResult) public void UpdateSettings(PowerLauncherSettings settings) { - _settings.ReplaceWinR = settings.properties.override_win_r_key; + //_settings.ReplaceWinR = settings.properties.override_win_r_key; } } } diff --git a/src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Components/Window.cs b/src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Components/Window.cs index 8916026b97a..16098534d2c 100644 --- a/src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Components/Window.cs +++ b/src/modules/launcher/Plugins/Wox.Plugin.WindowWalker/Components/Window.cs @@ -307,7 +307,7 @@ public void HighlightWindow() public void SwitchToWindow() { // The following block is necessary because - // 1) There is a weird flashing behaviour when trying + // 1) There is a weird flashing behavior when trying // to use ShowWindow for switching tabs in IE // 2) SetForegroundWindow fails on minimized windows if (ProcessName.ToLower().Equals("iexplore.exe") || !Minimized) diff --git a/src/modules/windowwalker/app/Window Walker/Components/Window.cs b/src/modules/windowwalker/app/Window Walker/Components/Window.cs index a767145ecba..4530e4465e9 100644 --- a/src/modules/windowwalker/app/Window Walker/Components/Window.cs +++ b/src/modules/windowwalker/app/Window Walker/Components/Window.cs @@ -307,7 +307,7 @@ public void HighlightWindow() public void SwitchToWindow() { // The following block is necessary because - // 1) There is a weird flashing behaviour when trying + // 1) There is a weird flashing behavior when trying // to use ShowWindow for switching tabs in IE // 2) SetForegroundWindow fails on minimized windows if (ProcessName.ToLower().Equals("iexplore.exe") || !Minimized)