Merge branch 'valinet:master' into master

.gitmodules

@@ -13,3 +13,6 @@
 [submodule "ep_dwm"]
 	path = ep_dwm
 	url = https://github.com/valinet/ep_dwm
+[submodule "ExplorerPatcher-L10N"]
+	path = ExplorerPatcher-L10N
+	url = https://github.com/valinet/ExplorerPatcher-L10N

CHANGELOG.md

@@ -2,6 +2,36 @@
 
 This document includes the same release notes as in the [Releases](https://github.com/valinet/ExplorerPatcher/releases) section on GitHub.
 
+## 22621.2506.60
+
+Tested on OS builds 22000.2416, 22621.2361, 22621.2506, and 23585.1001.
+
+#### Details
+
+##### 1
+
+* Taskbar10: Partially fixed Windows 11 Start menu and Search positioning on builds 23545+ (Dev). (ac268b1)
+  * Changing the taskbar alignment requires restarting `explorer.exe` in order to take effect.
+* File Explorer: Added option to disable the modern navigation bar of Moment 4. (2dc1340)
+* File Explorer: Restored "Apply Mica" functionality on OS builds 22621+. (f62c532)
+* Localization: Officially added translations for the following languages:
+  * Chinese, Simplified (Thanks @zetaloop!)
+  * Japanese (Thanks @creeper-0910, @reindex-ot, and @Rukoto!)
+* GUI: Decoupled the Properties window into `ep_gui.dll` from the main DLL in order to reduce the main DLL size and to allow scalable localization. (f6f6d89, 639d7aa)
+  * `rundll32 C:\Windows\dxgi.dll,ZZGUI` will continue to work as before.
+
+#### ⚠️ Important notice for translators ⚠️
+
+In this update, most if not all user-facing parts of ExplorerPatcher have been made localizable.
+
+* The English texts have been put together into [here](https://github.com/valinet/ExplorerPatcher/tree/master/ep_gui/resources/lang) and [here](https://github.com/valinet/ExplorerPatcher/tree/master/ep_setup/resources/lang).
+* Non-English texts have been designed to be put into [this separate repository](https://github.com/valinet/ExplorerPatcher-L10N). Feel free to make a PR there if you want to contribute to translations.
+* Some texts have been updated to be more concise and accurate, so for existing translation fork maintainers, please double check the translations before making a PR to the said repository.
+* Also for translation fork maintainers, a large number of conflicts will happen if you decide to continue merging changes from the main repository.
+* Please let us know through Issues if there are still user-facing parts of ExplorerPatcher that are not localizable.
+
+We apologize for the additional work that this change might cause. We hope that this one-time change will make it easier for translators to localize ExplorerPatcher and also easier for both translators and users to keep ExplorerPatcher up to date.
+
 ## 22621.2428.59
 
 Tested on OS builds 22000.2416, 22621.2428, 23555.1000, and 23560.1000.

ExplorerPatcher.sln

@@ -19,6 +19,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ep_setup", "ep_setup\ep_set
 		{314A50C1-F0A0-4D0C-89E1-AD8F3951043E} = {314A50C1-F0A0-4D0C-89E1-AD8F3951043E}
 		{6BF03EEA-200A-4698-9555-057DD52B0C78} = {6BF03EEA-200A-4698-9555-057DD52B0C78}
 		{DB3E4319-2969-42B6-B7E8-BB57AA8C9FA9} = {DB3E4319-2969-42B6-B7E8-BB57AA8C9FA9}
+		{2351A0DF-782C-4D74-85B7-0847D245D6B4} = {2351A0DF-782C-4D74-85B7-0847D245D6B4}
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ep_setup_patch", "ep_setup_patch\ep_setup_patch.vcxproj", "{0C13E5F3-106B-4836-A7C2-8E5808A6ED78}"
@@ -44,6 +45,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ep_extra_valinet.win7alttab
 		{93FA47CC-7753-4F86-B583-69048F51C5AB} = {93FA47CC-7753-4F86-B583-69048F51C5AB}
 	EndProjectSection
 EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ep_gui", "ep_gui\ep_gui.vcxproj", "{2351A0DF-782C-4D74-85B7-0847D245D6B4}"
+	ProjectSection(ProjectDependencies) = postProject
+		{314A50C1-F0A0-4D0C-89E1-AD8F3951043E} = {314A50C1-F0A0-4D0C-89E1-AD8F3951043E}
+		{AF02ABAC-EAEB-471C-9957-73D430B8B4DE} = {AF02ABAC-EAEB-471C-9957-73D430B8B4DE}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|amd64 = Debug|amd64
@@ -120,6 +127,12 @@ Global
 		{A66C5F27-DBF8-45A4-BDF3-BA54D8D82D0F}.Release|amd64.ActiveCfg = Release|x64
 		{A66C5F27-DBF8-45A4-BDF3-BA54D8D82D0F}.Release|amd64.Build.0 = Release|x64
 		{A66C5F27-DBF8-45A4-BDF3-BA54D8D82D0F}.Release|IA-32.ActiveCfg = Release|Win32
+		{2351A0DF-782C-4D74-85B7-0847D245D6B4}.Debug|amd64.ActiveCfg = Debug|x64
+		{2351A0DF-782C-4D74-85B7-0847D245D6B4}.Debug|amd64.Build.0 = Debug|x64
+		{2351A0DF-782C-4D74-85B7-0847D245D6B4}.Debug|IA-32.ActiveCfg = Debug|x64
+		{2351A0DF-782C-4D74-85B7-0847D245D6B4}.Release|amd64.ActiveCfg = Release|x64
+		{2351A0DF-782C-4D74-85B7-0847D245D6B4}.Release|amd64.Build.0 = Release|x64
+		{2351A0DF-782C-4D74-85B7-0847D245D6B4}.Release|IA-32.ActiveCfg = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

ExplorerPatcher/ExplorerPatcher.vcxproj

@@ -254,10 +254,6 @@
     <ClCompile Include="dllmain.c" />
     <ClCompile Include="fmemopen.c" />
     <ClCompile Include="getline.c" />
-    <ClCompile Include="GUI.c">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-    </ClCompile>
     <ClCompile Include="HideExplorerSearchBar.c" />
     <ClCompile Include="ImmersiveFlyouts.c">
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -322,7 +318,6 @@
     <ClInclude Include="dxgi_imp.h" />
     <ClInclude Include="fmemopen.h" />
     <ClInclude Include="getline.h" />
-    <ClInclude Include="GUI.h" />
     <ClInclude Include="HideExplorerSearchBar.h" />
     <ClInclude Include="hooking.h" />
     <ClInclude Include="ep_private.h" />
@@ -344,8 +339,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
-    <None Include="settings.reg" />
-    <None Include="settings10.reg" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

ExplorerPatcher/ExplorerPatcher.vcxproj.filters

@@ -60,9 +60,6 @@
     <ClInclude Include="utility.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="GUI.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="TaskbarCenter.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -166,9 +163,6 @@
     <ClCompile Include="utility.c">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="GUI.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="TaskbarCenter.c">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -219,12 +213,6 @@
     </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="settings.reg">
-      <Filter>Settings</Filter>
-    </None>
-    <None Include="settings10.reg">
-      <Filter>Settings</Filter>
-    </None>
     <None Include="packages.config" />
   </ItemGroup>
 </Project>