Merge pull request #7 from microsoft/master

getting caught up

.github/actions/spell-check/advice.md

@@ -0,0 +1,27 @@
+<!-- See https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice --> <!-- markdownlint-disable MD033 MD041 -->
+<details><summary>If you see a bunch of garbage</summary>
+
+If it relates to a ...
+<details><summary>well-formed pattern</summary>
+
+See if there's a [pattern](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns) that would match it.
+
+If not, try writing one and adding it to the `patterns.txt` file.
+
+Patterns are Perl 5 Regular Expressions - you can [test](
+https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your lines.
+
+Note that patterns can't match multiline strings.
+</details>
+<details><summary>binary-ish string</summary>
+
+Please add a file path to the `excludes.txt` file instead of just accepting the garbage.
+
+File paths are Perl 5 Regular Expressions - you can [test](
+https://www.regexplanet.com/advanced/perl/) yours before committing to verify it will match your files.
+
+`^` refers to the file's path from the root of the repository, so `^README\.md$` would exclude [README.md](
+../tree/HEAD/README.md) (on whichever branch you're using).
+</details>
+
+</details>

.github/actions/spell-check/excludes.txt

@@ -21,9 +21,22 @@ ignore$
 \.min\.
 \.mod$
 \.pdf$
-\.png$
 \.PNG$
+\.png$
 \.woff$
 \.zip$
+^src/common/logger/logger\.vcxproj\.filters$
+^src/common/notifications/BackgroundActivatorDLL/BackgroundActivator\.vcxproj\.filters$
+^src/common/notifications/BackgroundActivatorDLL/cpp\.hint$
+^src/modules/colorPicker/ColorPickerUI/Resources/colorPicker\.cur$
+^src/modules/fancyzones/lib/FancyZonesWinHookEventIDs\.h$
+^src/modules/imageresizer/dll/ContextMenuHandler\.rgs$
+^src/modules/imageresizer/dll/ImageResizerExt\.rgs$
+^src/modules/powerrename/testapp/PowerRenameTest\.vcxproj\.filters$
+^src/modules/powerrename/UWPui/pch\.h$
+^src/modules/powerrename/UWPui/PowerRenameUWPUI\.vcxproj\.filters$
+^src/modules/previewpane/PreviewPaneUnitTests/HelperFiles/MarkdownWithHTMLImageTag\.txt$
+^tools/CleanUp_tool/CleanUp_tool\.vcxproj\.filters$
 ^\.github/
 ^\.github/actions/spell-check/
+^\.gitmodules$

.github/actions/spell-check/expect.txt

@@ -1,7 +1,9 @@
+aaaa
 aac
 abcd
 abcdef
 abcdefgh
+ABCDEFGHIJKLMNOPQRSTUVWXYZ
 abgr
 ABlocked
 Abug
@@ -19,6 +21,7 @@ Actioncenter
 actioned
 activatable
 ACTIVATEAPP
+activationaction
 Addavirtualdesktop
 addrum
 ADDUNDORECORD
@@ -113,6 +116,7 @@ aumid
 AUTHN
 AUTOAPPEND
 autocomplete
+autogenerated
 autogenerates
 AUTOHIDE
 AUTOMATIONPROPERTIES
@@ -203,6 +207,8 @@ cdpxwin
 CENTERALIGN
 cfg
 cguid
+changecursor
+Changemove
 charconv
 charset
 chdir
@@ -214,7 +220,7 @@ CHILDWINDOW
 chrdavis
 Chris's
 chrono
-chrzan
+Chrzan
 CHT
 CImage
 cinttypes
@@ -256,6 +262,8 @@ codereview
 Codespaces
 COINIT
 colorconv
+colorhistory
+colorhistorylimit
 colorpicker
 COLORREF
 colorscheme
@@ -289,6 +297,7 @@ CONTROLL
 CONTROLPARENT
 Controlz
 coords
+copiedcolorrepresentation
 cortana
 cotaskmem
 COULDNOT
@@ -334,6 +343,7 @@ CTest
 ctime
 CTLCOLORSTATIC
 ctor
+CTriage
 CTRLALTDEL
 Ctrls
 Ctx
@@ -341,6 +351,7 @@ CUI
 currentculture
 CURSORINFO
 cursorpos
+customaction
 CUSTOMACTIONTEST
 cvd
 cwchar
@@ -396,8 +407,8 @@ deinitialization
 DELA
 deletethis
 Delimarsky
-Delimarsky's
 delims
+dend
 DENORMAL
 depersist
 deprioritized
@@ -442,9 +453,9 @@ DLIMAGES
 dll
 dllexport
 dllhost
-dllimport
 dllmain
 DNLEN
+docsmsft
 doctype
 DONTVALIDATEPATH
 dotnet
@@ -826,6 +837,7 @@ IImage
 Iindex
 IInitialize
 IInspectable
+IIO
 IItem
 IJson
 IKs
@@ -834,6 +846,7 @@ ILogon
 IMAGEHLP
 imageresizer
 IMAGERESIZEREXT
+imageresizersettings
 IMain
 IMarkdown
 ime
@@ -875,6 +888,7 @@ INSTALLLOCATION
 INSTALLLOGATTRIBUTES
 INSTALLLOGMODE
 INSTALLMESSAGE
+installpowertoys
 INSTALLPROPERTY
 INSTALLSTARTMENUSHORTCUT
 INSTALLSTATE
@@ -973,7 +987,9 @@ jpeg
 jpg
 JPN
 json
+JSONOf
 jsonval
+jsoref
 JSX
 junja
 jxr
@@ -1122,7 +1138,7 @@ LVS
 LVSIL
 LWA
 lwin
-LZW
+lzw
 mailto
 MAINICON
 Mainwindow
@@ -1266,7 +1282,7 @@ NCMBUTTONDOWN
 NCMBUTTONUP
 NCMOUSELEAVE
 NCMOUSEMOVE
-NCol
+ncol
 NCPAINT
 NCRBUTTONDBLCLK
 NCRBUTTONDOWN
@@ -1279,6 +1295,7 @@ NESW
 netcore
 netcoreapp
 netframework
+NETFX
 netsh
 netstandard
 Neue
@@ -1345,6 +1362,7 @@ npm
 npos
 NResize
 ntdll
+NTFS
 NTSTATUS
 nuget
 nullopt
@@ -1373,7 +1391,6 @@ oldnewthing
 oldpath
 oldtheme
 oleaut
-OleAut
 OLECHAR
 OLEDB
 OLIVEGREEN
@@ -1400,6 +1417,7 @@ OUTOFMEMORY
 Outptr
 outputtype
 outro
+outsettings
 OVERLAPPEDWINDOW
 overlaywindow
 OWNDC
@@ -1481,6 +1499,7 @@ powershell
 powertoy
 powertoysinterop
 powertoyssetup
+powertoyswiki
 Powrprof
 ppenum
 ppidl
@@ -1640,7 +1659,6 @@ rexit
 rfind
 rgb
 RGBQUAD
-rge
 rgelt
 Rgn
 rgs
@@ -1679,6 +1697,7 @@ runtimeclass
 runtimeconfig
 runtimes
 rv
+RUS
 rvalue
 rvm
 rwin
@@ -1760,6 +1779,7 @@ SHORTCUTSTARTWITHMODIFIER
 Shortcuttool
 shortdate
 SHORTPATH
+showcolorname
 SHOWDEFAULT
 SHOWELEVATIONPROMPT
 SHOWMAXIMIZED
@@ -1794,8 +1814,9 @@ SLGP
 sln
 SMALLICON
 SMTO
-Snd
+snd
 somil
+Soref
 SORTDOWN
 SOURCECLIENTAREAONLY
 SOURCEHEADER
@@ -1890,6 +1911,7 @@ svgpreviewhandler
 Switchbetweenvirtualdesktops
 SWP
 swprintf
+SWRESTORE
 SYMED
 SYMOPT
 SYNCPAINT
@@ -1964,6 +1986,7 @@ TNP
 todo
 toggleswitch
 toolbar
+Toolchain
 toolset
 toolstrip
 tooltip
@@ -2093,11 +2116,13 @@ VIDEOINFOHEADER
 viewbox
 viewmodel
 virtualization
+visiblecolorformats
 Visibletrue
 visualbrush
 visualstudio
 vk
 VKey
+VKTAB
 vm
 vmax
 vmin
@@ -2134,6 +2159,7 @@ wcsncmp
 wcsnicmp
 wdp
 wdupenv
+We'd
 weakme
 webcam
 webclient
@@ -2230,7 +2256,6 @@ wsz
 wtoi
 WTS
 WTSAT
-wu
 Wwan
 www
 wxs
@@ -2239,6 +2264,7 @@ xamarin
 xaml
 XAttribute
 xbf
+XBind
 XBUTTON
 XBUTTONDBLCLK
 XBUTTONDOWN
@@ -2281,7 +2307,6 @@ zh
 ZIndex
 zipfolder
 zm
-zom
 zonable
 ZONECOLOR
 ZONEHIGHLIGHTCOLOR

.github/workflows/spelling.yml

@@ -2,6 +2,7 @@ name: Spell checking
 on:
   pull_request_target:
   push:
+  issue_comment:
 
 jobs:
   build:
@@ -13,12 +14,9 @@ jobs:
       uses: actions/checkout@v2.0.0
       with:
         ref: refs/pull/${{github.event.pull_request.number}}/merge
-        fetch-depth: 5
     - name: checkout
       if: "!contains(github.event_name, 'pull_request')"
       uses: actions/checkout@v2.0.0
-      with:
+    - uses: check-spelling/check-spelling@v0.0.18
-        fetch-depth: 5
-    - uses: check-spelling/check-spelling@0.0.17-alpha
       with:
         config: .github/actions/spell-check

COMMUNITY.md

@@ -9,6 +9,9 @@ Names are in alphabetical order based on first name.
 ### [@davidegiacometti](https://github.com/davidegiacometti) - [Davide Giacometti](https://www.linkedin.com/in/davidegiacometti/)
 Davide has helped fix multiple bugs, added new features, as well as help us with the ARM64 effort by porting applications to .NET Core.
 
+### [@jsoref](https://github.com/jsoref) - Josh Soref
+Helping keep our spelling correct :)
+
 ### [@Niels9001](https://github.com/niels9001/) - [Niels Laute](https://nielslaute.com/)
 
 Niels has helped drive large sums of our update toward a new [consistent and modern UX](https://github.com/microsoft/PowerToys/issues/891). This includes the [launcher work](https://github.com/microsoft/PowerToys/issues/44), color picker UX update and [icon design](https://github.com/microsoft/PowerToys/issues/1118).
@@ -18,7 +21,13 @@ Niels has helped drive large sums of our update toward a new [consistent and mod
 Rafael has helped do the [upgrade from CppWinRT 1.x to 2.0](https://github.com/microsoft/PowerToys/issues/1907).  He directly provided feedback to the CppWinRT team for bugs from this migration as well.
 
 ### [@royvou](https://github.com/royvou)
-Roy has helped out contributing a features to PowerToys Run
+Roy has helped out contributing multiple features to PowerToys Run
+
+### [@TobiasSekan](https://github.com/TobiasSekan) - Tobias Sekan
+Tobias Sekan has helped out contributing features to PowerToys Run such as Settings plugin, Registry plugin
+
+### [@ThiefZero](https://github.com/ThiefZero)
+ThiefZero has helped out contributing a features to PowerToys Run such as the unit converter plugin
 
 ## Open source projects
 
@@ -52,6 +61,10 @@ Image Resizer is from Brice.
 
 PowerRename is from Chris's SmartRename and icon rendering for SVGs in File Explorer
 
+### [@dend](https://github.com/dend/) - Den Delimarsky
+
+PowerToys Espresso is a tool to keep your computer awake
+
 ### [@martinchrzan](https://github.com/martinchrzan/) - Martin Chrzan
 
 Color Picker is from Martin.

PowerToys.sln

@@ -389,9 +389,7 @@ Global
 		{64A80062-4D8B-4229-8A38-DFA1D7497749}.Release|x64.ActiveCfg = Release|x64
 		{64A80062-4D8B-4229-8A38-DFA1D7497749}.Release|x64.Build.0 = Release|x64
 		{0485F45C-EA7A-4BB5-804B-3E8D14699387}.Debug|x64.ActiveCfg = Debug|x64
-		{0485F45C-EA7A-4BB5-804B-3E8D14699387}.Debug|x64.Build.0 = Debug|x64
 		{0485F45C-EA7A-4BB5-804B-3E8D14699387}.Release|x64.ActiveCfg = Release|x64
-		{0485F45C-EA7A-4BB5-804B-3E8D14699387}.Release|x64.Build.0 = Release|x64
 		{89F34AF7-1C34-4A72-AA6E-534BCF972BD9}.Debug|x64.ActiveCfg = Debug|x64
 		{89F34AF7-1C34-4A72-AA6E-534BCF972BD9}.Debug|x64.Build.0 = Debug|x64
 		{89F34AF7-1C34-4A72-AA6E-534BCF972BD9}.Release|x64.ActiveCfg = Release|x64

README.md

@@ -32,7 +32,7 @@ Microsoft PowerToys is a set of utilities for power users to tune and streamline
 
 #### Stable version
 
-Install from the [Microsoft PowerToys GitHub releases page][github-release-link]. Click on `Assets` to show the files available in the release and then click on `PowerToysSetup-0.37.0-x64.exe` to download the PowerToys installer.
+Install from the [Microsoft PowerToys GitHub releases page][github-release-link]. Click on `Assets` to show the files available in the release and then click on `PowerToysSetup-0.37.2-x64.exe` to download the PowerToys installer.
 
 This is our preferred method.
 

doc/devdocs/akaLinks.md

@@ -0,0 +1,44 @@
+# Full list of aka links
+
+| ShortUrl | TargetUrl |
+|----------|----------|
+| installpowertoys | https://github.com/microsoft/PowerToys/releases/latest |
+| powertoys | https://github.com/microsoft/PowerToys |
+| PowerToysAppCompat | https://github.com/microsoft/PowerToys/wiki/Application-Compatibility |
+| powerToysCannotRemapKeys | https://docs.microsoft.com/windows/powertoys/keyboard-manager#keys-that-cannot-be-remapped |
+| powerToysColorPickerImageSmall | https://github.com/microsoft/PowerToys/wiki/images/overview/ColorPicker_small.png |
+| powerToysColorPickerSettingImage | https://raw.githubusercontent.com/microsoft/PowerToys/master/doc/images/overview/ColorPicker_large.png |
+| powertoysDetectedElevatedHelp | https://docs.microsoft.com/windows/powertoys/administrator |
+| powertoys-docs | https://docs.microsoft.com/windows/powertoys/?WT.mc_id=twitter-0000-docsmsft |
+| powerToysFancyZoneImageSmall | https://github.com/microsoft/PowerToys/wiki/images/overview/FancyZones_small.png |
+| powerToysFancyZoneSettingImage | https://raw.githubusercontent.com/microsoft/PowerToys/master/doc/images/overview/FancyZones_large.png |
+| powerToysGiveFeedback | https://github.com/microsoft/PowerToys/issues |
+| powerToysImageResizerImageSmall | https://github.com/microsoft/PowerToys/wiki/images/overview/ImageResizer_small.png |
+| powerToysImageResizerSettingImage | https://raw.githubusercontent.com/microsoft/PowerToys/master/doc/images/overview/ImageResizer_large.png |
+| powerToysKBMImageSmall | https://github.com/microsoft/PowerToys/wiki/images/overview/KBM_small.png |
+| powerToysKBMSettingImage | https://raw.githubusercontent.com/microsoft/PowerToys/master/doc/images/overview/KBM_large.png |
+| PowerToysOverview | https://docs.microsoft.com/windows/powertoys/ |
+| PowerToysOverview_ColorPicker | https://docs.microsoft.com/windows/powertoys/color-picker |
+| PowerToysOverview_FancyZones | https://docs.microsoft.com/windows/powertoys/fancyzones |
+| PowerToysOverview_FileExplorerAddOns | https://docs.microsoft.com/windows/powertoys/file-explorer |
+| PowerToysOverview_ImageResizer | https://docs.microsoft.com/windows/powertoys/image-resizer |
+| PowerToysOverview_KeyboardManager | https://docs.microsoft.com/windows/powertoys/keyboard-manager |
+| PowerToysOverview_PowerRename | https://docs.microsoft.com/windows/powertoys/powerrename |
+| PowerToysOverview_PowerToysRun | https://docs.microsoft.com/windows/powertoys/run |
+| PowerToysOverview_ShortcutGuide | https://docs.microsoft.com/windows/powertoys/shortcut-guide |
+| PowerToysOverview_VideoConference | https://docs.microsoft.com/windows/powertoys/video-conference-mute |
+| powerToysPowerLauncherImageSmall | https://github.com/microsoft/PowerToys/wiki/images/overview/PowerLauncher_small.png |
+| powerToysPowerLauncherSettingImage | https://raw.githubusercontent.com/microsoft/PowerToys/master/doc/images/overview/PowerLauncher_large.png |
+| powerToysPowerPreviewImageSmall | https://github.com/microsoft/PowerToys/wiki/images/overview/PowerPreview_small.png |
+| powerToysPowerPreviewSettingImage | https://raw.githubusercontent.com/microsoft/PowerToys/master/doc/images/overview/PowerPreview_large.png |
+| powerToysPowerRenameImageSmall | https://github.com/microsoft/PowerToys/wiki/images/overview/PowerRename_small.png |
+| powerToysPowerRenameSettingImage | https://raw.githubusercontent.com/microsoft/PowerToys/master/doc/images/overview/PowerRename_large.png |
+| powerToysPTImageSmall | https://github.com/microsoft/PowerToys/wiki/images/overview/PT_small.png |
+| powerToysPTSettingImage | https://raw.githubusercontent.com/microsoft/PowerToys/master/doc/images/overview/PT_large.png |
+| powerToysReportBug | https://github.com/microsoft/PowerToys/issues/new?assignees=&labels=Issue-Bug%2CTriage-Needed&template=bug_report.yml&title= |
+| powerToysRequestFeature | https://github.com/microsoft/PowerToys/issues/new?assignees=&labels=&template=feature_request.md&title= |
+| powerToysShortcutGuideImageSmall | https://github.com/microsoft/PowerToys/wiki/images/overview/ShortcutGuide_small.png |
+| powerToysShortcutGuideSettingImage | https://raw.githubusercontent.com/microsoft/PowerToys/master/doc/images/overview/ShortcutGuide_large.png |
+| powerToysVideoConferenceImageSmall | https://github.com/microsoft/PowerToys/wiki/images/overview/VideoConference_small.png |
+| powerToysVideoConferenceSettingImage | https://github.com/microsoft/PowerToys/wiki/images/overview/VideoConference_large.png |
+| powertoyswiki | https://github.com/microsoft/PowerToys/wiki |

src/modules/fancyzones/editor/FancyZonesEditor/loc/cs/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl

@@ -246,12 +246,12 @@
       </Item>
       <Item ItemId=";Edit_zones" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Edit zone layout]]></Val>
+          <Val><![CDATA[Edit zones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Upravit rozložení zóny]]></Val>
+            <Val><![CDATA[Upravit zóny]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[Edit zones]]></Val>
+            <Val><![CDATA[Edit zone layout]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />

src/modules/fancyzones/editor/FancyZonesEditor/loc/de/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl

@@ -246,12 +246,12 @@
       </Item>
       <Item ItemId=";Edit_zones" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Edit zone layout]]></Val>
+          <Val><![CDATA[Edit zones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zonenlayout bearbeiten]]></Val>
+            <Val><![CDATA[Zonen bearbeiten]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[Edit zones]]></Val>
+            <Val><![CDATA[Edit zone layout]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />

src/modules/fancyzones/editor/FancyZonesEditor/loc/es/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl

@@ -246,12 +246,12 @@
       </Item>
       <Item ItemId=";Edit_zones" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Edit zone layout]]></Val>
+          <Val><![CDATA[Edit zones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Editar diseño de zona]]></Val>
+            <Val><![CDATA[Editar zonas]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[Edit zones]]></Val>
+            <Val><![CDATA[Edit zone layout]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />

src/modules/fancyzones/editor/FancyZonesEditor/loc/fr/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl

@@ -246,12 +246,12 @@
       </Item>
       <Item ItemId=";Edit_zones" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Edit zone layout]]></Val>
+          <Val><![CDATA[Edit zones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Modifier la disposition de zone]]></Val>
+            <Val><![CDATA[Modifier les zones]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[Edit zones]]></Val>
+            <Val><![CDATA[Edit zone layout]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />

src/modules/fancyzones/editor/FancyZonesEditor/loc/hu/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl

@@ -246,12 +246,12 @@
       </Item>
       <Item ItemId=";Edit_zones" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Edit zone layout]]></Val>
+          <Val><![CDATA[Edit zones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Zónaelrendezés szerkesztése]]></Val>
+            <Val><![CDATA[Zónák szerkesztése]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[Edit zones]]></Val>
+            <Val><![CDATA[Edit zone layout]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />

src/modules/fancyzones/editor/FancyZonesEditor/loc/it/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl

@@ -246,12 +246,12 @@
       </Item>
       <Item ItemId=";Edit_zones" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Edit zone layout]]></Val>
+          <Val><![CDATA[Edit zones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Modifica layout zona]]></Val>
+            <Val><![CDATA[Modifica zone]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[Edit zones]]></Val>
+            <Val><![CDATA[Edit zone layout]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />

src/modules/fancyzones/editor/FancyZonesEditor/loc/ja/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl

@@ -246,12 +246,12 @@
       </Item>
       <Item ItemId=";Edit_zones" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Edit zone layout]]></Val>
+          <Val><![CDATA[Edit zones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[ゾーンのレイアウトの編集]]></Val>
+            <Val><![CDATA[ゾーンの編集]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[Edit zones]]></Val>
+            <Val><![CDATA[Edit zone layout]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />

src/modules/fancyzones/editor/FancyZonesEditor/loc/ko/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl

@@ -246,12 +246,12 @@
       </Item>
       <Item ItemId=";Edit_zones" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Edit zone layout]]></Val>
+          <Val><![CDATA[Edit zones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[영역 레이아웃 편집]]></Val>
+            <Val><![CDATA[영역 편집]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[Edit zones]]></Val>
+            <Val><![CDATA[Edit zone layout]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />

src/modules/fancyzones/editor/FancyZonesEditor/loc/nl/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl

@@ -246,12 +246,12 @@
       </Item>
       <Item ItemId=";Edit_zones" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Edit zone layout]]></Val>
+          <Val><![CDATA[Edit zones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Indeling van zones bewerken]]></Val>
+            <Val><![CDATA[Zones bewerken]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[Edit zones]]></Val>
+            <Val><![CDATA[Edit zone layout]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />

src/modules/fancyzones/editor/FancyZonesEditor/loc/pl/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl

@@ -246,12 +246,12 @@
       </Item>
       <Item ItemId=";Edit_zones" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Edit zone layout]]></Val>
+          <Val><![CDATA[Edit zones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Edytuj układ strefy]]></Val>
+            <Val><![CDATA[Edytuj strefy]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[Edit zones]]></Val>
+            <Val><![CDATA[Edit zone layout]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />

src/modules/fancyzones/editor/FancyZonesEditor/loc/pt-BR/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl

@@ -246,12 +246,12 @@
       </Item>
       <Item ItemId=";Edit_zones" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Edit zone layout]]></Val>
+          <Val><![CDATA[Edit zones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Editar o layout da zona]]></Val>
+            <Val><![CDATA[Editar zonas]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[Edit zones]]></Val>
+            <Val><![CDATA[Edit zone layout]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />

src/modules/fancyzones/editor/FancyZonesEditor/loc/pt-PT/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl

@@ -246,12 +246,12 @@
       </Item>
       <Item ItemId=";Edit_zones" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Edit zone layout]]></Val>
+          <Val><![CDATA[Edit zones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Editar esquema de zona]]></Val>
+            <Val><![CDATA[Editar zonas]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[Edit zones]]></Val>
+            <Val><![CDATA[Edit zone layout]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />

src/modules/fancyzones/editor/FancyZonesEditor/loc/ru/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl

@@ -246,12 +246,12 @@
       </Item>
       <Item ItemId=";Edit_zones" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Edit zone layout]]></Val>
+          <Val><![CDATA[Edit zones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Изменить макет зоны]]></Val>
+            <Val><![CDATA[Изменить зоны]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[Edit zones]]></Val>
+            <Val><![CDATA[Edit zone layout]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />

src/modules/fancyzones/editor/FancyZonesEditor/loc/sv/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl

@@ -246,12 +246,12 @@
       </Item>
       <Item ItemId=";Edit_zones" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Edit zone layout]]></Val>
+          <Val><![CDATA[Edit zones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Redigera zonlayout]]></Val>
+            <Val><![CDATA[Redigera zoner]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[Edit zones]]></Val>
+            <Val><![CDATA[Edit zone layout]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />

src/modules/fancyzones/editor/FancyZonesEditor/loc/tr/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl

@@ -246,12 +246,12 @@
       </Item>
       <Item ItemId=";Edit_zones" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Edit zone layout]]></Val>
+          <Val><![CDATA[Edit zones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[Alan düzenini düzenle]]></Val>
+            <Val><![CDATA[Bölgeleri düzenle]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[Edit zones]]></Val>
+            <Val><![CDATA[Edit zone layout]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />

src/modules/fancyzones/editor/FancyZonesEditor/loc/zh-Hans/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl

@@ -246,12 +246,12 @@
       </Item>
       <Item ItemId=";Edit_zones" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Edit zone layout]]></Val>
+          <Val><![CDATA[Edit zones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[编辑区域布局]]></Val>
+            <Val><![CDATA[编辑区域]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[Edit zones]]></Val>
+            <Val><![CDATA[Edit zone layout]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />

src/modules/fancyzones/editor/FancyZonesEditor/loc/zh-Hant/src/modules/fancyzones/editor/FancyZonesEditor/Properties/Resources.resx.lcl

@@ -246,12 +246,12 @@
       </Item>
       <Item ItemId=";Edit_zones" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[Edit zone layout]]></Val>
+          <Val><![CDATA[Edit zones]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[編輯區域配置]]></Val>
+            <Val><![CDATA[編輯區域]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[Edit zones]]></Val>
+            <Val><![CDATA[Edit zone layout]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />

src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManager.cpp

@@ -50,6 +50,7 @@ KeyboardManager::KeyboardManager()
         loadingSettings = false;
     };
 
+    editorIsRunningEvent = CreateEvent(nullptr, true, false, KeyboardManagerConstants::EditorWindowEventName.c_str());
     settingsEventWaiter = EventWaiter(KeyboardManagerConstants::SettingsEventName, changeSettingsCallback);
 }
 
@@ -126,8 +127,7 @@ intptr_t KeyboardManager::HandleKeyboardHookEvent(LowlevelKeyboardEvent* data) n
     }
 
     // Suspend remapping if remap key/shortcut window is opened
-    auto h = CreateEvent(nullptr, true, false, KeyboardManagerConstants::EditorWindowEventName.c_str());
+    if (editorIsRunningEvent != nullptr && WaitForSingleObject(editorIsRunningEvent, 0) == WAIT_OBJECT_0)
-    if (h != nullptr && WaitForSingleObject(h, 0) == WAIT_OBJECT_0)
     {
         return 0;
     }

src/modules/keyboardmanager/KeyboardManagerEngineLibrary/KeyboardManager.h

@@ -9,7 +9,15 @@ class KeyboardManager
 public:
     // Constructor
     KeyboardManager();
-
+    
+    ~KeyboardManager()
+    {
+        if (editorIsRunningEvent)
+        {
+            CloseHandle(editorIsRunningEvent);
+        }
+    }
+    
     void StartLowlevelKeyboardHook();
     void StopLowlevelKeyboardHook();
 
@@ -38,6 +46,8 @@ private:
 
     std::atomic_bool loadingSettings = false;
 
+    HANDLE editorIsRunningEvent = nullptr;
+
     // Hook procedure definition
     static LRESULT CALLBACK HookProc(int nCode, WPARAM wParam, LPARAM lParam);
 

src/modules/launcher/JsonRPC/wox.py

@@ -1,115 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import print_function
-import json
-import sys
-import inspect
-
-class Wox(object):
-    """
-    Wox python plugin base
-    """
-
-    def __init__(self):
-        rpc_request = json.loads(sys.argv[1])
-        # proxy is not working now
-        self.proxy = rpc_request.get("proxy",{})
-        request_method_name = rpc_request.get("method")
-        request_parameters = rpc_request.get("parameters")
-        methods = inspect.getmembers(self, predicate=inspect.ismethod)
-
-        request_method = dict(methods)[request_method_name]
-        results = request_method(*request_parameters)
-
-        if request_method_name == "query" or request_method_name == "context_menu":
-            print(json.dumps({"result": results}))
-
-    def query(self,query):
-        """
-        sub class need to override this method
-        """
-        return []
-
-    def context_menu(self, data):
-        """
-        optional context menu entries for a result
-        """
-        return []
-
-    def debug(self,msg):
-        """
-        alert msg
-        """
-        print("DEBUG:{}".format(msg))
-        sys.exit()
-
-class WoxAPI(object):
-
-    @classmethod
-    def change_query(cls,query,requery = False):
-        """
-        change wox query
-        """
-        print(json.dumps({"method": "Wox.ChangeQuery","parameters":[query,requery]}))
-
-    @classmethod
-    def shell_run(cls,cmd):
-        """
-        run shell commands
-        """
-        print(json.dumps({"method": "Wox.ShellRun","parameters":[cmd]}))
-
-    @classmethod
-    def close_app(cls):
-        """
-        close wox
-        """
-        print(json.dumps({"method": "Wox.CloseApp","parameters":[]}))
-
-    @classmethod
-    def hide_app(cls):
-        """
-        hide wox
-        """
-        print(json.dumps({"method": "Wox.HideApp","parameters":[]}))
-
-    @classmethod
-    def show_app(cls):
-        """
-        show wox
-        """
-        print(json.dumps({"method": "Wox.ShowApp","parameters":[]}))
-
-    @classmethod
-    def show_msg(cls,title,sub_title,ico_path=""):
-        """
-        show messagebox
-        """
-        print(json.dumps({"method": "Wox.ShowMsg","parameters":[title,sub_title,ico_path]}))
-
-    @classmethod
-    def open_setting_dialog(cls):
-        """
-        open setting dialog
-        """
-        print(json.dumps({"method": "Wox.OpenSettingDialog","parameters":[]}))
-
-    @classmethod
-    def start_loadingbar(cls):
-        """
-        start loading animation in wox
-        """
-        print(json.dumps({"method": "Wox.StartLoadingBar","parameters":[]}))
-
-    @classmethod
-    def stop_loadingbar(cls):
-        """
-        stop loading animation in wox
-        """
-        print(json.dumps({"method": "Wox.StopLoadingBar","parameters":[]}))
-
-    @classmethod
-    def reload_plugins(cls):
-        """
-        reload all wox plugins
-        """
-        print(json.dumps({"method": "Wox.ReloadPlugins","parameters":[]}))

src/settings-ui/Microsoft.PowerToys.Settings.UI.Library/SndModuleSettings`1.cs

@@ -7,7 +7,7 @@ using System.Text.Json.Serialization;
 
 namespace Microsoft.PowerToys.Settings.UI.Library
 {
-    // Represents a powertoys module settings setnt to the runner.
+    // Represents a powertoys module settings sent to the runner.
     public class SndModuleSettings<T>
     {
         [JsonPropertyName("powertoys")]

src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw

@@ -1053,7 +1053,7 @@ Take a moment to preview the various utilities listed or view our comprehensive
     <value>release notes</value>
   </data>
   <data name="Oobe_ColorPicker_HowToUse.Text" xml:space="preserve">
-    <value>{Win} + {Ctrl} + {C} to open Color Picker.</value>
+    <value>{Win} + {Shift} + {C} to open Color Picker.</value>
   </data>
   <data name="Oobe_ColorPicker_TipsAndTricks.Text" xml:space="preserve">
     <value>To select a color with more precision, {scroll the mouse wheel} to zoom in.</value>

src/settings-ui/Microsoft.PowerToys.Settings.UI/loc/zh-Hans/src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw.lcl

@@ -1821,12 +1821,12 @@
       </Item>
       <Item ItemId=";Oobe_FancyZones_HowToUse.Text" ItemType="0;.resx" PsrId="211" Leaf="true">
         <Str Cat="Text">
-          <Val><![CDATA[{Shift} + {dragging the window} to snap a window to a zone, and release the window in the desired zone. {Win} + {`} to open the FancyZones editor.]]></Val>
+          <Val><![CDATA[{Shift} + {dragging the window} to snap a window to a zone, and release the window in the desired zone. {Win} + {Shift} + {`} to open the FancyZones editor.]]></Val>
           <Tgt Cat="Text" Stat="Loc" Orig="New">
-            <Val><![CDATA[按住 {Shift} 的同时{dragging the window}，可以将窗口贴靠到区域，然后在所需区域中释放窗口。同时按住 {Win} + {`} 可以打开 FancyZones 编辑器。]]></Val>
+            <Val><![CDATA[按住 {Shift} 的同时 {dragging the window}，可以将窗口贴靠到区域，然后在所需区域中释放窗口。同时按住 {Win} + {Shift} + {`} 可以打开 FancyZones 编辑器。]]></Val>
           </Tgt>
           <Prev Cat="Text">
-            <Val><![CDATA[Shift + drag while dragging the window to snap a window to a zone, and release the window in the desired zone.]D;]A;Win + ` to open the FancyZones editor.]]></Val>
+            <Val><![CDATA[{Shift} + {dragging the window} to snap a window to a zone, and release the window in the desired zone. {Win} + {`} to open the FancyZones editor.]]></Val>
           </Prev>
         </Str>
         <Disp Icon="Str" />