microsoft · traies · Mar 16, 2020 · Mar 16, 2020 · Mar 16, 2020 · Mar 16, 2020
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
@@ -302,8 +302,8 @@
   <data name="FancyZones_VirtualDesktopChangeMoveWindows.Content" xml:space="preserve">
     <value>Move newly created windows to their last known zone</value>
   </data>
-  <data name="FancyZones_ZonBehaivior_GroupSettings.Text" xml:space="preserve">
-    <value>Zone behaviour</value>
+  <data name="FancyZones_ZoneBehavior_GroupSettings.Text" xml:space="preserve">
+    <value>Zone Behavior</value>
   </data>
   <data name="FancyZones_ZoneHighlightColor.Text" xml:space="preserve">
     <value>Zone highlight color (default: #0078D7)</value>
@@ -416,8 +416,8 @@
   <data name="ShortcutGuide_PressTime.Header" xml:space="preserve">
     <value>How long to press the Windows key before showing the Shortcut Guide</value>
   </data>
-  <data name="ShortcutGuide_Appearance_Behaiviour.Text" xml:space="preserve">
-    <value>Appearance &amp; behaviour</value>
+  <data name="ShortcutGuide_Appearance_Behavior.Text" xml:space="preserve">
+    <value>Appearance &amp; Behavior</value>
   </data>
   <data name="ShortcutGuide_Enable.Header" xml:space="preserve">
     <value>Enable Shortcut Guide</value>

diff --git 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}" />
 
-            <TextBlock x:Uid="FancyZones_ZonBehaivior_GroupSettings"
+            <TextBlock x:Uid="FancyZones_ZoneBehavior_GroupSettings"
                        Style="{StaticResource SettingsGroupTitleStyle}"
                        />
 

diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/PowerLauncherPage.xaml
@@ -119,8 +119,8 @@
 
             <CheckBox x:Uid="PowerLauncher_OverrideWinRKey" 
                       Margin="{StaticResource SmallTopMargin}"
-                      IsChecked="{x:Bind Mode=TwoWay, Path=ViewModel.OverrideWinRKey}"
-                      IsEnabled="{x:Bind Mode=OneWay, Path=ViewModel.EnablePowerLauncher}"
+                      IsChecked="False"
+                      IsEnabled="False"
                       />
 
             <CheckBox x:Uid="PowerLauncher_OverrideWinSKey"

diff --git a/src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml b/src/core/Microsoft.PowerToys.Settings.UI/Views/ShortcutGuidePage.xaml
@@ -48,7 +48,7 @@
                           IsOn="{ Binding Mode=TwoWay, Path=IsEnabled}"
                           Margin="{StaticResource SmallTopMargin}"/>
 
-            <TextBlock x:Uid="ShortcutGuide_Appearance_Behaiviour" 
+            <TextBlock x:Uid="ShortcutGuide_Appearance_Behavior" 
                        Style="{StaticResource SettingsGroupTitleStyle}"/>
 
             <muxc:NumberBox x:Uid="ShortcutGuide_PressTime"

diff --git a/src/modules/keyboardmanager/common/KeyboardManagerState.h b/src/modules/keyboardmanager/common/KeyboardManagerState.h
@@ -76,7 +76,7 @@ class KeyboardManagerState
     std::unordered_map<DWORD, DWORD> 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<DWORD, bool> singleKeyToggleToMod;
     std::mutex singleKeyToggleToMod_mutex;
 

diff --git 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
@@ -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<ContextMenuResult> 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
@@ -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
@@ -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)