diff --git a/.gitignore b/.gitignore
index 8a1eece0da1..6f27bcc0e31 100644
--- a/.gitignore
+++ b/.gitignore
@@ -122,3 +122,7 @@ Testing/Data/Symlink/Dir2/ss12_diff_s12.txt
 Testing/Data/Symlink/Dir2/ss12_diff_s21.txt
 Testing/Data/Symlink/Dir2/ss12_same_s00.txt
 Testing/Data/Symlink/Dir2/ss12_same_s11.txt
+Src/MergeAppLib_i.c
+Src/MergeAppLib_p.c
+Src/dlldata.c
+/Testing/PluginTests/result
diff --git a/ALL.vs2017.sln b/ALL.vs2017.sln
index 51f20bc5e6e..41cc5e5eea9 100644
--- a/ALL.vs2017.sln
+++ b/ALL.vs2017.sln
@@ -37,7 +37,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Root", "Root", "{DC3B258E-4
 		BuildManual.cmd = BuildManual.cmd
 		CreateRelease.cmd = CreateRelease.cmd
 		DownloadDeps.cmd = DownloadDeps.cmd
-		ExpandEnvironmenStrings.vbs = ExpandEnvironmenStrings.vbs
+		ExpandEnvironmenStrings.js = ExpandEnvironmenStrings.js
 		LICENSE.md = LICENSE.md
 		README.md = README.md
 		runastyle.bat = runastyle.bat
@@ -165,9 +165,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Batch Files", "Batch Files"
 		Externals\winimerge\SetVersion.cmd = Externals\winimerge\SetVersion.cmd
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VBS Scripts", "VBS Scripts", "{0AB212AD-1F11-4BAB-BAD5-8BFC4435F453}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{0AB212AD-1F11-4BAB-BAD5-8BFC4435F453}"
 	ProjectSection(SolutionItems) = preProject
-		Externals\winimerge\ExpandEnvironmenStrings.vbs = Externals\winimerge\ExpandEnvironmenStrings.vbs
+		Externals\winimerge\ExpandEnvironmenStrings.js = Externals\winimerge\ExpandEnvironmenStrings.js
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleStatic", "Externals\crystaledit\Sample\SampleStatic.vcxproj", "{C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}"
@@ -308,10 +308,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{4407E7D0
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{88571237-56AD-421A-8F88-26983BDD8D6C}"
 	ProjectSection(SolutionItems) = preProject
-		Tools\Scripts\CheckMenuResources.vbs = Tools\Scripts\CheckMenuResources.vbs
+		Tools\Scripts\CheckMenuResources.js = Tools\Scripts\CheckMenuResources.js
 		Tools\Scripts\CheckTranslationStrings.cmd = Tools\Scripts\CheckTranslationStrings.cmd
 		Tools\Scripts\CheckTranslationStrings.ps1 = Tools\Scripts\CheckTranslationStrings.ps1
-		Tools\Scripts\CheckUnusedResources.vbs = Tools\Scripts\CheckUnusedResources.vbs
+		Tools\Scripts\CheckUnusedResources.js = Tools\Scripts\CheckUnusedResources.js
 		Tools\Scripts\README.md = Tools\Scripts\README.md
 		Tools\Scripts\UpdateTranslations.bat = Tools\Scripts\UpdateTranslations.bat
 	EndProjectSection
@@ -353,7 +353,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "q", "q", "{E4EF583F-653D-44
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PluginTests", "PluginTests", "{9738877F-0B01-4C37-855E-7465C5AB7B56}"
 	ProjectSection(SolutionItems) = preProject
-		Testing\PluginTests\PluginTests.vbs = Testing\PluginTests\PluginTests.vbs
+		Testing\PluginTests\PluginTests.js = Testing\PluginTests\PluginTests.js
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "yq", "yq", "{9914C8A9-0DEA-4922-9065-57034EE5263D}"
diff --git a/ALL.vs2019.sln b/ALL.vs2019.sln
index a65ebf04f74..fafbae08bb6 100644
--- a/ALL.vs2019.sln
+++ b/ALL.vs2019.sln
@@ -37,7 +37,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Root", "Root", "{DC3B258E-4
 		BuildManual.cmd = BuildManual.cmd
 		CreateRelease.cmd = CreateRelease.cmd
 		DownloadDeps.cmd = DownloadDeps.cmd
-		ExpandEnvironmenStrings.vbs = ExpandEnvironmenStrings.vbs
+		ExpandEnvironmenStrings.js = ExpandEnvironmenStrings.js
 		LICENSE.md = LICENSE.md
 		README.md = README.md
 		runastyle.bat = runastyle.bat
@@ -165,9 +165,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Batch Files", "Batch Files"
 		Externals\winimerge\SetVersion.cmd = Externals\winimerge\SetVersion.cmd
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VBS Scripts", "VBS Scripts", "{0AB212AD-1F11-4BAB-BAD5-8BFC4435F453}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{0AB212AD-1F11-4BAB-BAD5-8BFC4435F453}"
 	ProjectSection(SolutionItems) = preProject
-		Externals\winimerge\ExpandEnvironmenStrings.vbs = Externals\winimerge\ExpandEnvironmenStrings.vbs
+		Externals\winimerge\ExpandEnvironmenStrings.js = Externals\winimerge\ExpandEnvironmenStrings.s
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleStatic", "Externals\crystaledit\Sample\SampleStatic.vcxproj", "{C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}"
@@ -308,10 +308,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{4407E7D0
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{88571237-56AD-421A-8F88-26983BDD8D6C}"
 	ProjectSection(SolutionItems) = preProject
-		Tools\Scripts\CheckMenuResources.vbs = Tools\Scripts\CheckMenuResources.vbs
+		Tools\Scripts\CheckMenuResources.js = Tools\Scripts\CheckMenuResources.js
 		Tools\Scripts\CheckTranslationStrings.cmd = Tools\Scripts\CheckTranslationStrings.cmd
 		Tools\Scripts\CheckTranslationStrings.ps1 = Tools\Scripts\CheckTranslationStrings.ps1
-		Tools\Scripts\CheckUnusedResources.vbs = Tools\Scripts\CheckUnusedResources.vbs
+		Tools\Scripts\CheckUnusedResources.js = Tools\Scripts\CheckUnusedResources.js
 		Tools\Scripts\README.md = Tools\Scripts\README.md
 		Tools\Scripts\UpdateTranslations.bat = Tools\Scripts\UpdateTranslations.bat
 	EndProjectSection
@@ -353,7 +353,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "q", "q", "{E4EF583F-653D-44
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PluginTests", "PluginTests", "{9738877F-0B01-4C37-855E-7465C5AB7B56}"
 	ProjectSection(SolutionItems) = preProject
-		Testing\PluginTests\PluginTests.vbs = Testing\PluginTests\PluginTests.vbs
+		Testing\PluginTests\PluginTests.js = Testing\PluginTests\PluginTests.js
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "yq", "yq", "{9914C8A9-0DEA-4922-9065-57034EE5263D}"
diff --git a/ALL.vs2022.sln b/ALL.vs2022.sln
index 001a1b9ab81..20e421620ae 100644
--- a/ALL.vs2022.sln
+++ b/ALL.vs2022.sln
@@ -37,7 +37,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Root", "Root", "{DC3B258E-4
 		BuildManual.cmd = BuildManual.cmd
 		CreateRelease.cmd = CreateRelease.cmd
 		DownloadDeps.cmd = DownloadDeps.cmd
-		ExpandEnvironmenStrings.vbs = ExpandEnvironmenStrings.vbs
+		ExpandEnvironmenStrings.js = ExpandEnvironmenStrings.js
 		LICENSE.md = LICENSE.md
 		README.md = README.md
 		runastyle.bat = runastyle.bat
@@ -165,9 +165,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Batch Files", "Batch Files"
 		Externals\winimerge\SetVersion.cmd = Externals\winimerge\SetVersion.cmd
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VBS Scripts", "VBS Scripts", "{0AB212AD-1F11-4BAB-BAD5-8BFC4435F453}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{0AB212AD-1F11-4BAB-BAD5-8BFC4435F453}"
 	ProjectSection(SolutionItems) = preProject
-		Externals\winimerge\ExpandEnvironmenStrings.vbs = Externals\winimerge\ExpandEnvironmenStrings.vbs
+		Externals\winimerge\ExpandEnvironmenStrings.js = Externals\winimerge\ExpandEnvironmenStrings.js
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SampleStatic", "Externals\crystaledit\Sample\SampleStatic.vcxproj", "{C347D6AE-7A2B-4ED0-97AD-2595E1C5D7DD}"
@@ -308,10 +308,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{4407E7D0
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{88571237-56AD-421A-8F88-26983BDD8D6C}"
 	ProjectSection(SolutionItems) = preProject
-		Tools\Scripts\CheckMenuResources.vbs = Tools\Scripts\CheckMenuResources.vbs
+		Tools\Scripts\CheckMenuResources.js = Tools\Scripts\CheckMenuResources.js
 		Tools\Scripts\CheckTranslationStrings.cmd = Tools\Scripts\CheckTranslationStrings.cmd
 		Tools\Scripts\CheckTranslationStrings.ps1 = Tools\Scripts\CheckTranslationStrings.ps1
-		Tools\Scripts\CheckUnusedResources.vbs = Tools\Scripts\CheckUnusedResources.vbs
+		Tools\Scripts\CheckUnusedResources.js = Tools\Scripts\CheckUnusedResources.js
 		Tools\Scripts\README.md = Tools\Scripts\README.md
 		Tools\Scripts\UpdateTranslations.bat = Tools\Scripts\UpdateTranslations.bat
 	EndProjectSection
@@ -353,7 +353,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "q", "q", "{E4EF583F-653D-44
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "PluginTests", "PluginTests", "{9738877F-0B01-4C37-855E-7465C5AB7B56}"
 	ProjectSection(SolutionItems) = preProject
-		Testing\PluginTests\PluginTests.vbs = Testing\PluginTests\PluginTests.vbs
+		Testing\PluginTests\PluginTests.js = Testing\PluginTests\PluginTests.js
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "yq", "yq", "{9914C8A9-0DEA-4922-9065-57034EE5263D}"
diff --git a/BuildArc.cmd b/BuildArc.cmd
index 684ca9c53a7..8f53ed741f2 100644
--- a/BuildArc.cmd
+++ b/BuildArc.cmd
@@ -25,7 +25,7 @@ if "%1" == "" (
 
 del "%DISTDIR%\winmerge-%SAFEAPPVER%-full-src.7z" 2> NUL
 
-7z.exe a -t7z -xr!*.gcno -xr!*.gcda -xr!*.gcov -xr!*.orig -xr!*.o -xr!*.a -xr!.dep -xr!*.asm -xr!*.out -xr!debug_static* -xr!debug_shared* -xr!release_static* -xr!release_shared* -xr!*.bak -xr!*.lang -xr!*.db -xr!*.ncb  -xr!*.sdf -xr!*.bsc -xr!*.opt -xr!*.plg -xr!*.suo -xr!*.obj -xr!*.ilk -xr!*.pdb -xr!*.pch -xr!*.res -xr!*.exe -xr!*.sbr -xr!.vs -xr!*.VC.db-* -xr!*.zip -xr!WinMergeSplash.psd -xr!*.lib -xr!*.exp -xr!*.idb -xr!*.%COMPUTERNAME%.%USERNAME%.user -xr!BuildLog.htm -xr!ipch -xr!*.tlb -xr!*.tlog -xr!*.*~ -xr!CVS -xr!.svn -xr!.hg -xr!*.log -xr!*.lastbuildstate -xr!FreeImage*.dll -xr!WinIMergeLib.dll -xr!WinIMerge.exe -xr!WinWebDiff.dll -xr!WinWebDiff.exe -xr!BuildTmp -xr!Docs\Manual\Tools "%DISTDIR%\winmerge-%SAFEAPPVER%-full-src.7z" ArchiveSupport ColorSchemes Docs Externals Filters Installer Plugins ShellExtension Src Testing Tools Translations Web readme.txt Version.h Version.in *.cmd *.bat *.inf *.sln *.vbs
+7z.exe a -t7z -xr!*.gcno -xr!*.gcda -xr!*.gcov -xr!*.orig -xr!*.o -xr!*.a -xr!.dep -xr!*.asm -xr!*.out -xr!debug_static* -xr!debug_shared* -xr!release_static* -xr!release_shared* -xr!*.bak -xr!*.lang -xr!*.db -xr!*.ncb  -xr!*.sdf -xr!*.bsc -xr!*.opt -xr!*.plg -xr!*.suo -xr!*.obj -xr!*.ilk -xr!*.pdb -xr!*.pch -xr!*.res -xr!*.exe -xr!*.sbr -xr!.vs -xr!*.VC.db-* -xr!*.zip -xr!WinMergeSplash.psd -xr!*.lib -xr!*.exp -xr!*.idb -xr!*.%COMPUTERNAME%.%USERNAME%.user -xr!BuildLog.htm -xr!ipch -xr!*.tlb -xr!*.tlog -xr!*.*~ -xr!CVS -xr!.svn -xr!.hg -xr!*.log -xr!*.lastbuildstate -xr!FreeImage*.dll -xr!WinIMergeLib.dll -xr!WinIMerge.exe -xr!WinWebDiff.dll -xr!WinWebDiff.exe -xr!BuildTmp -xr!Docs\Manual\Tools "%DISTDIR%\winmerge-%SAFEAPPVER%-full-src.7z" ArchiveSupport ColorSchemes Docs Externals Filters Installer Plugins ShellExtension Src Testing Tools Translations Web readme.txt Version.h Version.in *.cmd *.bat *.inf *.sln *.js
 
 (
 echo "%DISTDIR%\WinMerge-%SAFEAPPVER%-Setup.exe"
diff --git a/BuildBin.vs2017.cmd b/BuildBin.vs2017.cmd
index 2b0aa68c444..eee26f99503 100644
--- a/BuildBin.vs2017.cmd
+++ b/BuildBin.vs2017.cmd
@@ -1,7 +1,7 @@
 cd /d "%~dp0"
 
 call SetVersion.cmd
-cscript /nologo ExpandEnvironmenStrings.vbs Version.in > Version.h
+cscript /nologo ExpandEnvironmenStrings.js Version.in > Version.h
 
 setlocal
 for /f "usebackq tokens=*" %%i in (`"%programfiles(x86)%\microsoft visual studio\installer\vswhere.exe" -version [15.0^,16.0^) -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do (
diff --git a/BuildBin.vs2019.cmd b/BuildBin.vs2019.cmd
index 95e99777169..cef25beada9 100644
--- a/BuildBin.vs2019.cmd
+++ b/BuildBin.vs2019.cmd
@@ -1,7 +1,7 @@
 cd /d "%~dp0"
 
 call SetVersion.cmd
-cscript /nologo ExpandEnvironmenStrings.vbs Version.in > Version.h
+cscript /nologo ExpandEnvironmenStrings.js Version.in > Version.h
 
 setlocal
 for /f "usebackq tokens=*" %%i in (`"%programfiles(x86)%\microsoft visual studio\installer\vswhere.exe" -version [16.0^,17.0^) -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do (
diff --git a/BuildBin.vs2022.cmd b/BuildBin.vs2022.cmd
index 06b5ff8bdb7..3414b309793 100644
--- a/BuildBin.vs2022.cmd
+++ b/BuildBin.vs2022.cmd
@@ -1,7 +1,7 @@
 cd /d "%~dp0"
 
 call SetVersion.cmd
-cscript /nologo ExpandEnvironmenStrings.vbs Version.in > Version.h
+cscript /nologo ExpandEnvironmenStrings.js Version.in > Version.h
 
 setlocal
 for /f "usebackq tokens=*" %%i in (`"%programfiles(x86)%\microsoft visual studio\installer\vswhere.exe" -version [17.0^,18.0^) -products * -requires Microsoft.VisualStudio.Component.VC.Tools.x86.x64 -property installationPath`) do (
diff --git a/ExpandEnvironmenStrings.js b/ExpandEnvironmenStrings.js
new file mode 100644
index 00000000000..a25d5ddd7fb
--- /dev/null
+++ b/ExpandEnvironmenStrings.js
@@ -0,0 +1,10 @@
+var fso = new ActiveXObject("Scripting.FileSystemObject");
+var sh = new ActiveXObject("WScript.Shell");
+var otf = fso.OpenTextFile(WScript.Arguments.Unnamed(0), 1);
+
+while (!otf.AtEndOfStream) {
+	WScript.Echo(sh.ExpandEnvironmentStrings(otf.ReadLine()));
+}
+
+otf.Close();
+
diff --git a/ExpandEnvironmenStrings.vbs b/ExpandEnvironmenStrings.vbs
deleted file mode 100644
index 91a722fdb1f..00000000000
--- a/ExpandEnvironmenStrings.vbs
+++ /dev/null
@@ -1,10 +0,0 @@
-Dim fso: Set fso = CreateObject("Scripting.FileSystemObject")
-Dim sh: Set sh = CreateObject("WScript.Shell")
-Dim otf: Set otf = fso.OpenTextFile(WScript.Arguments.Unnamed(0), 1)
-
-Do Until otf.AtEndOfStream = True
-	WScript.Echo sh.ExpandEnvironmentStrings(otf.ReadLine)
-Loop
-
-otf.Close
-
diff --git a/Externals/frhed b/Externals/frhed
index cdc0455feb4..b846962f49d 160000
--- a/Externals/frhed
+++ b/Externals/frhed
@@ -1 +1 @@
-Subproject commit cdc0455feb492bc826931bc70480f8b50ca05abb
+Subproject commit b846962f49ddd1d793d3de58acead9b01fcac27e
diff --git a/Externals/winimerge b/Externals/winimerge
index f7fc9d5ddf0..21f69f358cc 160000
--- a/Externals/winimerge
+++ b/Externals/winimerge
@@ -1 +1 @@
-Subproject commit f7fc9d5ddf05785eb7046008fde657cfcea6ef2e
+Subproject commit 21f69f358cc71e5881b7d77304961a1b76cad0b9
diff --git a/Plugins/Plugins.xml b/Plugins/Plugins.xml
index 8e822245735..9b893d55622 100644
--- a/Plugins/Plugins.xml
+++ b/Plugins/Plugins.xml
@@ -216,24 +216,24 @@
     </unpack-file>
   </plugin>
   <!--
-  <plugin name="VBScript-test">
+  <plugin name="JScript-test">
     <event value="FILE_PACK_UNPACK" />
-    <description value="VBScript test" />
+    <description value="JScript test" />
     <file-filters value="\.nomatch$" />
     <is-automatic value="false" />
     <unpacked-file-extension value=".txt" />
     <unpack-file>
       <command>cmd /c cscript //nologo "${SCRIPT_FILE}" "${SRC_FILE}" > "${DST_FILE}"</command>
-      <script fileExtension=".vbs">
-WScript.StdOut.WriteLine "Hello World!"
-WScript.StdOut.WriteLine WScript.Arguments(0)
+      <script fileExtension=".js">
+WScript.StdOut.WriteLine("Hello World!");
+WScript.StdOut.WriteLine(WScript.Arguments.Item(0));
       </script>
     </unpack-file>
     <pack-file>
       <command>cmd /c cscript //nologo "${SCRIPT_FILE}" "${SRC_FILE}" > "${DST_FILE}"</command>
-      <script fileExtension=".vbs">
-WScript.StdOut.WriteLine "!dlroW olleH"
-WScript.StdOut.WriteLine WScript.Arguments(0)
+      <script fileExtension=".js">
+WScript.StdOut.WriteLine("!dlroW olleH");
+WScript.StdOut.WriteLine(WScript.Arguments.Item(0));
       </script>
     </pack-file>
   </plugin>
diff --git a/Plugins/README.md b/Plugins/README.md
index 67b3e4f762c..79a33d4c217 100644
--- a/Plugins/README.md
+++ b/Plugins/README.md
@@ -12,7 +12,7 @@ Examples are available in :
 
  * C++ COM component
  * VB ActiveX dll
- * Scriptlets (VBS, JS)
+ * Scriptlets (VBScript, JScript)
  * Delphi
 
 Limitation : Scriptlets only work for `EDITOR_SCRIPT` plugins.
@@ -94,45 +94,52 @@ This parameter is mandatory for the function's syntax. But you don't have to set
 
 #### `PluginEvent`
 
-| Language | Syntax                                                       |
-|:--------:|:-------------------------------------------------------------|
-| C++      | `STDMETHODIMP CWinMergeScript::get_PluginEvent(BSTR * pVal)` |
-| VB       | `Public Property Get PluginEvent() As String`                |
-| VBS      | `Function get_PluginEvent()`                                 |
+| Language | Syntax                                                              |
+|:--------:|:--------------------------------------------------------------------|
+| C++      | `STDMETHODIMP CWinMergeScript::get_PluginEvent(BSTR * pVal)`        |
+| VB       | `Public Property Get PluginEvent() As String`                       |
+| VBScript | `Function get_PluginEvent()`                                        |
+| JScript  | `function get_PluginEvent()`                                        |
 
 #### `PluginDescription`
 
-| Language | Syntax                                                             |
-|:--------:|:-------------------------------------------------------------------|
-| C++      | `STDMETHODIMP CWinMergeScript::get_PluginDescription(BSTR * pVal)` |
-| VB       | `Public Property Get PluginDescription() As String`                |
-| VBS      | `Function get_PluginDescription()`                                 |
+| Language | Syntax                                                              |
+|:--------:|:--------------------------------------------------------------------|
+| C++      | `STDMETHODIMP CWinMergeScript::get_PluginDescription(BSTR * pVal)`  |
+| VB       | `Public Property Get PluginDescription() As String`                 |
+| VBScript | `Function get_PluginDescription()                                   |
+| JScript  | `function get_PluginDescription()`                                  |
 
 #### `PluginFileFilters`
 
 String formed of fileFilters, separated with `;`
 
-| Language | Syntax                                                             |
-|:--------:|:-------------------------------------------------------------------|
-| C++      | `STDMETHODIMP CWinMergeScript::get_PluginFileFilters(BSTR * pVal)` |
-| VB       | `Public Property Get PluginFileFilters() As String`                |
+| Language | Syntax                                                              |
+|:--------:|:--------------------------------------------------------------------|
+| C++      | `STDMETHODIMP CWinMergeScript::get_PluginFileFilters(BSTR * pVal)`  |
+| VB       | `Public Property Get PluginFileFilters() As String`                 |
+| VBScript | `Function get_PluginFileFilters()                                   |
+| JScript  | `function get_PluginFileFilters()`                                  |
 
 #### `PluginIsAutomatic`
 
-| Language | Syntax                                                                     |
-|:--------:|:---------------------------------------------------------------------------|
-| C++      | `STDMETHODIMP CWinMergeScript::get_PluginIsAutomatic(VARIANT_BOOL * pVal)` |
-| VB       | `Public Property Get PluginIsAutomatic() As Boolean`                       |
+| Language | Syntax                                                                        |
+|:--------:|:------------------------------------------------------------------------------|
+| C++      | `STDMETHODIMP CWinMergeScript::get_PluginIsAutomatic(VARIANT_BOOL * pVal)`    |
+| VB       | `Public Property Get PluginIsAutomatic() As Boolean`                          |
+| VBScript | `Function get_PluginIsAutomatic()`                                            |
+| JScript  | `function get_PluginIsAutomatic()`                                            |
 
 ### Methods syntax
 
 #### `EDITOR_SCRIPT`
 
-| Language | Functions parameters (function names are free)                                  |
-|:--------:|:--------------------------------------------------------------------------------|
-| C++      | `STDMETHOD(MakeUpperVB)([in] BSTR inputText, [out, retval] BSTR * outputText);` |
-| VB       | `Public Function MakeUpperVB(text As String)`                                   |
-| VBS      | `Function MakeUpperVBS(Text)`                                                   |
+| Language | Functions parameters (function names are free)                                |
+|:--------:|:------------------------------------------------------------------------------|
+| C++      | `STDMETHOD(MakeUpper)([in] BSTR inputText, [out, retval] BSTR * outputText);` |
+| VB       | `Public Function MakeUpper(text As String)`                                   |
+| VBScript | `Function MakeUpper(Text)`                                                    |
+| JScript  | `function MakeUpper(Text)`                                                    |
 
 #### `FILE_PREDIFF`
 
@@ -140,6 +147,8 @@ String formed of fileFilters, separated with `;`
 |:--------:|:------------------------------|:---------------------------------------------------------------------------------------------------------------------------|
 | VC++     | `STDMETHOD(PrediffFile)`      | `([in] BSTR fileSrc, [in] BSTR fileDst, VARIANT_BOOL * pbChanged, INT * pSubcode, [out, retval] VARIANT_BOOL * pbSuccess)` |
 | VB       | `Public Function PrediffFile` | `(BSTR fileSrc, BSTR fileDst, ByRef bChanged As Boolean, ByRef subcode As Long) As Boolean`                                |
+| VBScript | `Function PrediffFile`        | `(fileSrc, fileDst, bChanged, subcode)`                                                                                    |
+| JScript  | `function PrediffFile`        | `(fileSrc, fileDst, bChanged, subcode) { ...; var r = new ActiveXObject("Scripting.Dictionary"); r.Add(0, retval); r.Add(1, bChanged); r.Add(2, subcode); return r.Items(); }` |
 
 #### `BUFFER_PREDIFF`
 
@@ -147,6 +156,8 @@ String formed of fileFilters, separated with `;`
 |:--------:|:---------------------------------|:----------------------------------------------------------------------------------------------------------------|
 | C++      | `STDMETHOD(PrediffBufferW)`      | `([in] BSTR * pText, [in] INT * pSize, [in] VARIANT_BOOL * pbChanged, [out, retval] VARIANT_BOOL * pbHandled);` |
 | VB       | `Public Function PrediffBufferW` | `(ByRef text As String, ByRef size As Long, ByRef bChanged As Boolean) As Boolean`                              |
+| VBScript | `Function PrediffBufferW`        | `(text, size, bChanged)`                                                                                    |
+| JScript  | `function PrediffBufferW`        | `(text, size, bChanged) { ...; var r = new ActiveXObject("Scripting.Dictionary"); r.Add(0, retval); r.Add(1, text); r.Add(2, size); r.Add(3, bChanged); return r.Items(); }` |
 
 #### `FILE_PACK_UNPACK`
 
@@ -156,6 +167,10 @@ String formed of fileFilters, separated with `;`
 | VC++     | `STDMETHOD(PackFile)`        | `([in] BSTR fileSrc, [in] BSTR fileDst, VARIANT_BOOL * pbChanged, INT pSubcode, [out, retval] VARIANT_BOOL * pbSuccess)`   |
 | VB       | `Public Function UnpackFile` | `(BSTR fileSrc, BSTR fileDst, ByRef bChanged As Boolean, ByRef subcode As Long) As Boolean`                                |
 | VB       | `Public Function PackFile`   | `(BSTR fileSrc, BSTR fileDst, ByRef bChanged As Boolean, subcode As Long) As Boolean`                                      |
+| VBScript | `Function UnpackFile`        | `(fileSrc, fileDst, bChanged, subcode)`                                                                                    |
+| VBScript | `Function PackFile`          | `(fileSrc, fileDst, bChanged, subcode)`                                                                                    |
+| JScript  | `function UnpackFile`        | `(fileSrc, fileDst, bChanged, subcode) { ...; var r = new ActiveXObject("Scripting.Dictionary"); r.Add(0, retval); r.Add(1, bChanged); r.Add(2, subcode); return r.Items(); }` |
+| JScript  | `function PackFile`          | `(fileSrc, fileDst, bChanged, subcode) { ...; var r = new ActiveXObject("Scripting.Dictionary"); r.Add(0, retval); r.Add(1, bChanged); return r.Items(); }` |
 
 #### `BUFFER_PACK_UNPACK`
 
diff --git a/Plugins/dlls/ApplyPatch.sct b/Plugins/dlls/ApplyPatch.sct
index edbecff5d1d..1fd6ef0599c 100644
--- a/Plugins/dlls/ApplyPatch.sct
+++ b/Plugins/dlls/ApplyPatch.sct
@@ -1,537 +1,466 @@
 <scriptlet>
 <implements type="Automation" id="dispatcher">
-	<property name="PluginEvent">
-		<get/>
-	</property>
-	<property name="PluginDescription">
-		<get/>
-	</property>
-	<property name="PluginFileFilters">
-		<get/>
-	</property>
-	<property name="PluginIsAutomatic">
-		<get/>
-	</property>
-	<property name="PluginExtendedProperties">
-		<get/>
-	</property>
-	<method name="PluginOnEvent"/>
-	<method name="UnpackFile"/>
-	<method name="PackFile"/>
-	<method name="IsFolder"/>
-	<method name="UnpackFolder"/>
-	<method name="PackFolder"/>
-	<method name="ShowSettingsDialog"/>
+  <property name="PluginEvent">
+    <get/>
+  </property>
+  <property name="PluginDescription">
+    <get/>
+  </property>
+  <property name="PluginFileFilters">
+    <get/>
+  </property>
+  <property name="PluginIsAutomatic">
+    <get/>
+  </property>
+  <property name="PluginExtendedProperties">
+    <get/>
+  </property>
+  <method name="PluginOnEvent"/>
+  <method name="UnpackFile"/>
+  <method name="PackFile"/>
+  <method name="IsFolder"/>
+  <method name="UnpackFolder"/>
+  <method name="PackFolder"/>
+  <method name="ShowSettingsDialog"/>
 </implements>
 
-<script language="VBS">
-
-'/////////////////////////////////////////////////////////////////////////////
-'    This is a plugin for WinMerge.
-'    It will apply selected patch to specified file or folder using GNU patch.
-'    Copyright (C) 2015-2023 Takashi Sawanaka
-'
-'    This program is free software; you can redistribute it and/or modify
-'    it under the terms of the GNU General Public License as published by
-'    the Free Software Foundation; either version 2 of the License, or
-'    (at your option) any later version.
-'
-'    This program is distributed in the hope that it will be useful,
-'    but WITHOUT ANY WARRANTY; without even the implied warranty of
-'    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-'    GNU General Public License for more details.
-'
-'    You should have received a copy of the GNU General Public License
-'    along with this program; if not, write to the Free Software
-'    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-'
-
-Option Explicit
-
-Const REGKEY_PATH = "HKEY_CURRENT_USER\Software\Thingamahoochie\WinMerge"
-Const PLUGIN_NAME = "ApplyPatch.sct WinMerge Plugin"
-
-Dim fso: Set fso = CreateObject("Scripting.FileSystemObject")
-Dim wsh: Set wsh = CreateObject("WScript.Shell")
-Dim PrevFileName: PrevFileName = ""
-Dim mergeApp
-
-Function regRead(Key, DefaultValue)
-	regRead = DefaultValue
-	On Error Resume Next
-	If IsEmpty(mergeApp) Then
-		regRead = wsh.RegRead("HKCU\Software\Thingamahoochie\WinMerge\" & Replace(Key, "/", "\"))
-	Else
-		regRead = mergeApp.GetOption(Key, DefaultValue)
-	End If
-End Function
-
-Sub regWrite(Key, Value, TypeNm)
-	Dim tmp
-	On Error Resume Next
-	If IsEmpty(mergeApp) Then
-		wsh.RegWrite "HKCU\Software\Thingamahoochie\WinMerge\" &  Replace(Key, "/", "\"), Value, TypeNm
-	Else
-		If TypeNm = "REG_DWORD" Then
-			tmp = CLng(Value)
-		Else
-			tmp = CStr(Value)
-		End If
-		mergeApp.SaveOption Key, tmp
-	End If
-End Sub
-
-Function Fmt(formatString, args)
-    Dim i
-    For i = 0 To UBound(args)
-        formatString = Replace(formatString, "%" & (i + 1), args(i))
-    Next
-    Fmt = formatString
-End Function
-
-Function get_PluginEvent()
-    get_PluginEvent = "FILE_FOLDER_PACK_UNPACK"
-End Function
-
-Function get_PluginDescription()
-    get_PluginDescription = "Apply patch using GNU patch"
-End Function
-
-Function get_PluginFileFilters()
-    get_PluginFileFilters = "\.diff$;\.patch$"
-End Function
-
-Function get_PluginIsAutomatic()
-    get_PluginIsAutomatic = False
-End Function
-
-Function get_PluginExtendedProperties()
-    get_PluginExtendedProperties = "MenuCaption=Apply Patch..."
-End Function
-
-Sub PluginOnEvent(eventType, obj)
-    Set mergeApp = obj
-End Sub
-
-Function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode)
-    Dim filePatched, cmdLine, msg
-
-    UnpackFile = False
-
-    If Not IsPatchFile(fileSrc) Then
-        ' FIXME:
-        PrevFileName = fileSrc
-        fso.CopyFile fileSrc, fileDst
-        pbChanged = True
-        pSubcode = 1
-        UnpackFile = True
-        Exit Function
-    End If
-
-    If PrevFileName <> "" Then
-        filePatched = PrevFileName
-    Else
-        filePatched = regRead("Files\Left/Item_0", "")
-    End If
-    If IsPatchFile(filePatched) Then
-        filePatched = regRead("Files\Right/Item_0", "")
-    End If
-
-    msg = Fmt(Translate("${Enter the name of the file to which the patch '%1' will be applied}"), Array(fso.GetFileName(fileSrc)))
-    Do While True
-        filePatched = InputBox(msg, PLUGIN_NAME, filePatched)
-        If filePatched = "" Then
-            Exit Function
-        End If
-        If fso.FileExists(filePatched) Then Exit Do
-        MsgBox Fmt(Translate("${File '%1' does not exist}"), Array(filePatched)), vbExclamation
-    Loop
-
-    cmdLine = "type """ & fileSrc & """ | patch --binary $FILE"
-    msg = Translate("${Enter the command line arguments for patch command}")
-    cmdLine = InputBox(msg, PLUGIN_NAME, cmdLine)
-    If cmdLine = "" Then Exit Function
-    cmdLine = Replace(cmdLine, "$FILE", fileDst)
-        
-    fso.CopyFile filePatched, fileDst
-
-    Run wsh, "cmd.exe /s /c ""set PATH=" & GetPatchExeFolder() & ";%PATH% & " & cmdLine & " & pause"""
-
-    pbChanged = True
-    pSubcode = 0
-    UnpackFile = True
-End Function
-
-Function PackFile(fileSrc, fileDst, pbChanged, pSubcode)
-    If pSubcode <> 0 Then
-        ' FIXME:
-        fso.CopyFile fileSrc, fileDst
-        pbChanged = True
-        PackFile = True
-        Exit Function
-    End If
-    PackFile = False
-End Function
-
-Function IsFolder(file)
-    IsFolder = IsPatchFile(file)
-End Function
-
-Function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode)
-    Dim dirPatched, cmdLine, msg, files, stripCount
-
-    UnpackFolder = False
-
-    If Not fso.FolderExists(folderDst) Then fso.CreateFolder folderDst
-
-    dirPatched = regRead("Files\Left/Item_0", "")
-    If Not fso.FolderExists(dirPatched) Then
-        dirPatched = regRead("Files\Right/Item_0", "")
-    End If
-
-    msg = Fmt(Translate("${Enter the name of the folder to which the patch '%1' will be applied}"), Array(fso.GetFileName(fileSrc)))
-    Do While True
-        dirPatched = InputBox(msg, PLUGIN_NAME, dirPatched)
-        If dirPatched = "" Then
-            fso.CopyFile fileSrc, fso.BuildPath(folderDst, fso.GetFileName(fileSrc)) & ".txt"
-            Exit Function
-        End If
-        If fso.FolderExists(dirPatched) Then Exit Do
-        MsgBox Fmt(Translate("${Folder '%1' does not exist}"), dirPatched), vbExclamation
-    Loop
-
-    files = GetFileNamesInPatch(fileSrc)
-    stripCount = GuessStripCount(files, dirPatched)
-
-    cmdLine = "type """ & fileSrc & """ | patch --binary -p" & stripCount
-    msg = Translate("${Enter the command line arguments for patch command}")
-    cmdLine = InputBox(msg, PLUGIN_NAME, cmdLine)
-    If cmdLine = "" Then
-        fso.CopyFile fileSrc, fso.BuildPath(folderDst, fso.GetFileName(fileSrc)) & ".txt"
-        Exit Function
-    End If
-        
-    stripCount = GetStripCountFromCmdLine(cmdLine)
-    If stripCount = 0 Then
-        If HasAbsolutePathInList(files) Then
-            msg = Translate("${Should not specify the '-p0' command line option for the patch file which includes absolute paths}")
-            MsgBox msg, vbExclamation
-            Exit Function
-        End If
-    End If
-
-    CopyOriginalFiles dirPatched, folderDst, files, stripCount
-
-    Run wsh, "cmd.exe /s /c ""set PATH=" & GetPatchExeFolder() & ";%PATH% & cd /d " & folderDst & " & " & cmdLine & " & pause"""
-
-    pbChanged = True
-    pSubcode = 0
-    UnpackFolder = True
-End Function
-
-Function PackFolder(fileSrc, folderDst, pbChanged, pSubcode)
-    PackFolder = False
-End Function
-
-Function Translate(text)
-	Dim re: Set re = CreateObject("VBScript.RegExp")
-	re.Pattern = "\${([^}]+)}"
-	re.Global = True
-	Translate = text
-	Dim match
-	Dim matches:Set matches = re.Execute(text)
-	if IsEmpty(mergeApp) Then
-		For Each match in matches
-			Translate = Replace(Translate, match.Value, match.Submatches(0))
-		Next
-	Else
-		For Each match in matches
-			Translate = Replace(Translate, match.Value, mergeApp.Translate(match.Submatches(0)))
-		Next
-	End If
-End Function
-
-Function ShowSettingsDialog()
-	Dim tname: tname = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() & ".hta")
-	Dim xmlfile: xmlfile = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() & ".xml")
-	Dim tfile: Set tfile = fso.CreateTextFile(tname, True, True)
-	Dim mshta
-	tfile.Write Translate(getResource("dialog1"))
-	tfile.Close
-	exportSettingsToXMLFile xmlfile
-	mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\System32\mshta.exe")
-	If Not fso.FileExists(mshta) Then
-		mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\SysWOW64\mshta.exe")
-	End If
-	Run wsh, """" & mshta & """ """ & tname & """  """ & xmlfile  & """"
-	importSettingsFromXMLFile xmlfile
-	fso.DeleteFile tname
-	fso.DeleteFile xmlfile
-End Function
-
-Sub Run(sh, cmd)
-    sh.Run cmd, 1, True
-End Sub
-
-Function GetPatchExeFolder()
-    Dim winMergeExePath
-    On Error Resume Next
-    winMergeExePath = "C:\Program Files\WinMerge\WinMergeU.exe"
-    winMergeExePath = wsh.RegRead(REGKEY_PATH & "\Executable")
-    GetPatchExeFolder = fso.BuildPath(fso.GetParentFolderName(winMergeExePath), "Commands\msys2\usr\bin")
-End Function
-
-Function SafeUBound(ary)
-    On Error Resume Next
-    SafeUBound = -1
-    SafeUBound = UBound(ary)
-End Function
-
-Function IIf(cond, t, f)
-    If cond Then IIf = t Else IIf = f
-End Function
-
-Function IsPatchFile(path)
-    Dim patterns, pattern, re
-    patterns = Split(get_PluginFileFilters(), ";")
-    For Each pattern In patterns
-        Set re = CreateObject("VBScript.RegExp")
-        re.Pattern = pattern
-        re.IgnoreCase = True
-        If re.Test(path) Then
-            IsPatchFile = True
-            Exit Function
-        End If
-    Next
-    IsPatchFile = False
-End Function
-
-Function IsWindowsTextFormat(path)
-    IsWindowsTextFormat = (InStr(ReadAllText(path), vbCrLf) > 0)
-End Function
-
-Function IsAbsolutePath(path)
-    IsAbsolutePath = (Mid(path, 2, 1) = ":" Or Left(path, 1) = "/" Or Left(path, 1) = "\")
-End Function
-
-Function HasAbsolutePathInList(files)
-    Dim i
-    For i = 0 To SafeUBound(files)
-        If IsAbsolutePath(files(i)(0)) Then
-            HasAbsolutePathInList = True
-            Exit Function
-        End If
-    Next
-    HasAbsolutePathInList = False
-End Function
-
-Function IsNullDevice(path)
-    IsNullDevice = (path = "/dev/null" Or UCase(path) = "NUL")
-End Function
-
-Function StripDir(fileName, stripCount)
-    Dim i, pos, posNext1, posNext2
-    If stripCount = -1 Then
-        StripDir = fso.GetFileName(fileName)
-        Exit Function
-    ElseIf stripCount = 0 Then
-        StripDir = fileName
-        Exit Function
-    End If
-    pos = 1
-    For i = 0 To stripCount - 1
-        posNext1 = InStr(pos, fileName, "/")
-        posNext2 = InStr(pos, fileName, "\")
-        If posNext1 > 0 And (posNext1 < posNext2 Or posNext2 = 0) Then
-            pos = posNext1 + 1
-        ElseIf posNext2 > 0 And (posNext2 < posNext1 Or posNext1 = 0) Then
-            pos = posNext2 + 1
-        Else
-            pos = 0
-            Exit For
-        End If
-    Next
-    If pos = 0 Then
-        StripDir = ""
-    Else
-        StripDir = Mid(fileName, pos)
-    End If
-End Function
-
-Function MakePatchedFileName(destDir, fileName, stripCount)
-    Dim strippedFileName
-    If Not IsNullDevice(fileName) Then
-        strippedFileName = StripDir(fileName, stripCount)
-        If strippedFileName = "" Then
-            MakePatchedFileName = ""
-        Else
-            If Not IsAbsolutePath(strippedFileName) Then
-                MakePatchedFileName = fso.BuildPath(destDir, strippedFileName)
-            Else
-                MakePatchedFileName = strippedFileName
-            End If
-        End If
-    Else
-        MakePatchedFileName = fileName
-    End If
-End Function
-
-Function GuessStripCount(fileNamesInPatch, destDir)
-    Dim i, j, fileName, stripCount
-    Dim matchCount, maxMatchCount
-    GuessStripCount = 0
-    stripCount = 0
-    maxMatchCount = 0
-    If SafeUBound(fileNamesInPatch) < 0 Then Exit Function
-    Do While True
-        matchCount = 0
-        For i = 0 To SafeUBound(fileNamesInPatch)
-            For j = 0 To 1
-                If Not IsNullDevice(fileNamesInPatch(i)(j)) Then
-                    fileName = MakePatchedFileName(destDir, fileNamesInPatch(i)(j), stripCount)
-                    If fso.FileExists(fileName) Then
-                        matchCount = matchCount + 1
-                    End If
-                End If
-            Next
-        Next
-        If matchCount > maxMatchCount Then
-            GuessStripCount = stripCount
-        End If
-        stripCount = stripCount + 1
-        If stripCount > 64 Then Exit Do
-    Loop
-End Function
-
-Sub CreateFolderEx(ByVal dirName)
-    Dim parent
-    parent = fso.GetParentFolderName(dirName)
-    If fso.FolderExists(parent) Then
-        If Not fso.FolderExists(dirName) Then
-            fso.CreateFolder dirName
-        End If
-    Else
-        CreateFolderEx parent
-        fso.CreateFolder dirName
-    End If
-End Sub
-
-Sub CopyOriginalFiles(srcDir, destDir, fileNamesInPatch, stripCount)
-    Dim i
-    Dim fileNameSrc, fileNameDest
-    For i = 0 To SafeUBound(fileNamesInPatch)
-        If Not IsNullDevice(fileNamesInPatch(i)(0)) Then
-            fileNameSrc = MakePatchedFileName(srcDir, fileNamesInPatch(i)(0), stripCount)
-            fileNameDest = MakePatchedFileName(destDir, fileNamesInPatch(i)(0), stripCount)
-            If fso.FileExists(fileNameSrc) Then
-                If Not fso.FolderExists(fso.GetParentFolderName(fileNameDest)) Then
-                    CreateFolderEx fso.GetParentFolderName(fileNameDest)
-                End If
-                fso.CopyFile fileNameSrc, fileNameDest
-            End If
-        End If
-    Next
-End Sub
-
-Function ReadAllText(fileName)
-    Dim stream
-    Set stream = CreateObject("ADODB.Stream")
-    stream.Open
-    stream.Charset = "_autodetect_all"
-    stream.LoadFromFile fileName
-    ReadAllText = stream.ReadText
-    stream.Close
-End Function
-
-Function GetFileNamesInPatch(fileName)
-    Dim i, n, count, line, lines, text
-    Dim re, ml, mr
-    Dim ary()
-
-    Set re = CreateObject("VBScript.RegExp")
-    re.Pattern = "^(---|\+\+\+|\*\*\*) ([^\t\r\n]+)"
-
-    text = ReadAllText(fileName)
-
-    lines = Split(text, vbLf)
-    Do While i <= UBound(lines)
-        line = lines(i)
-        Set ml = re.Execute(line)
-        If ml.count > 0 Then
-            i = i + 1
-            If i <= UBound(lines) Then
-                line = lines(i)
-                Set mr = re.Execute(line)
-                If mr.count > 0 Then
-                    ReDim Preserve ary(n)
-                    ary(n) = Array(ml(0).SubMatches(1), mr(0).SubMatches(1))
-                    n = n + 1
-                End If
-            End If
-        End If
-        i = i + 1
-    Loop
-    GetFileNamesInPatch = ary
-End Function
-
-Function GetStripCountFromCmdLine(cmdLine)
-    Dim re, m
-    Set re = CreateObject("VBScript.RegExp")
-    re.Pattern = "( -p(\d+)| --strip=(\d+))"
-    Set m = re.Execute(cmdLine)
-    If m.count > 0 Then
-        If Not IsEmpty(m(0).SubMatches(1)) Then
-            GetStripCountFromCmdLine = CLng(m(0).SubMatches(1))
-        Else
-            GetStripCountFromCmdLine = CLng(m(0).SubMatches(2))
-        End If
-    Else
-        GetStripCountFromCmdLine = -1
-    End If
-End Function
+<script language="JScript">
 
-</script>
+/*
+    This is a plugin for WinMerge.
+    It will apply selected patch to specified file or folder using GNU patch.
+    Copyright (C) 2015-2024 Takashi Sawanaka
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
 
-<script language="JScript">
 
 var REGKEY_PATH = "Plugins\\ApplyPatch.sct/";
+var PLUGIN_NAME = "ApplyPatch.sct WinMerge Plugin";
+
+var fso = new ActiveXObject("Scripting.FileSystemObject");
+var wsh = new ActiveXObject("WScript.Shell");
+var PrevFileName = "";
+var mergeApp;
+
+function regRead(Key, DefaultValue) {
+  return mergeApp.GetOption(Key, DefaultValue);
+}
+
+function regWrite(Key, Value, TypeNm) {
+  mergeApp.SaveOption(Key, (TypeNm === "REG_DWORD") ? parseInt(Value) : String(Value));
+}
+
+function fmt(formatString, args) {
+  for (var i = 0; i < args.length; i++) {
+    formatString = formatString.replace("%" + (i + 1), args[i]);
+  }
+  return formatString;
+}
+
+function get_PluginEvent() {
+  return "FILE_FOLDER_PACK_UNPACK";
+}
+
+function get_PluginDescription() {
+  return "Apply patch using GNU patch";
+}
+
+function get_PluginFileFilters() {
+  return "\\.diff$;\\.patch$";
+}
+
+function get_PluginIsAutomatic() {
+  return false;
+}
+
+function get_PluginExtendedProperties() {
+  return "MenuCaption=Apply Patch...";
+}
+
+function PluginOnEvent(eventType, obj) {
+  mergeApp = obj;
+}
+
+function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
+  if (!isPatchFile(fileSrc)) {
+    // FIXME:
+    PrevFileName = fileSrc;
+    fso.CopyFile(fileSrc, fileDst);
+    pbChanged = true;
+    pSubcode = 1;
+
+    var result = new ActiveXObject("Scripting.Dictionary");
+    result.Add(0, true);
+    result.Add(1, pbChanged);
+    result.Add(2, pSubcode);
+    return result.Items();
+  }
+
+  var filePatched = (PrevFileName !== "") ? PrevFileName : regRead("Files\\Left/Item_0", "");
+  if (isPatchFile(filePatched)) {
+    filePatched = regRead("Files\\Right/Item_0", "");
+  }
+
+  var msg = fmt(translate("${Enter the name of the file to which the patch '%1' will be applied}"), [ fso.GetFileName(fileSrc) ]);
+  while (true) {
+    filePatched = mergeApp.InputBox(msg, PLUGIN_NAME, filePatched);
+    if (filePatched === "") {
+      return false;
+    }
+    if (fso.FileExists(filePatched)) { break; }
+    mergeApp.MsgBox(fmt(translate("${File '%1' does not exist}"), [ filePatched ]), 48/*vbExclamation*/);
+  }
+
+  var cmdLine = "type \"" + fileSrc + "\" | patch --binary $FILE";
+  msg = translate("${Enter the command line arguments for patch command}");
+  cmdLine = mergeApp.InputBox(msg, PLUGIN_NAME, cmdLine);
+  if (cmdLine === "") { return false; }
+  cmdLine = cmdLine.replace("$FILE", fileDst);
+      
+  fso.CopyFile(filePatched, fileDst);
+
+  run(wsh, "cmd.exe /s /c \"set PATH=" + getPatchExeFolder() + ";%PATH% & " + cmdLine + " & pause\"");
+
+  pbChanged = true;
+  pSubcode = 0;
+
+  var result = new ActiveXObject("Scripting.Dictionary");
+  result.Add(0, true);
+  result.Add(1, pbChanged);
+  result.Add(2, pSubcode);
+  return result.Items();
+}
+
+function PackFile(fileSrc, fileDst, pbChanged, pSubcode) {
+  if (pSubcode !== 0) {
+    // FIXME:
+    fso.CopyFile(fileSrc, fileDst);
+    var result = new ActiveXObject("Scripting.Dictionary");
+    result.Add(0, true);
+    result.Add(1, pbChanged);
+    result.Add(2, pSubcode);
+    return result.Items();
+  }
+  return false;
+}
+
+function IsFolder(file) {
+  return isPatchFile(file);
+}
+
+function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
+  if (!fso.FolderExists(folderDst)) { fso.CreateFolder(folderDst); }
+
+  var dirPatched = regRead("Files\\Left/Item_0", "");
+  if (!fso.FolderExists(dirPatched)) {
+    dirPatched = regRead("Files\\Right/Item_0", "");
+  }
+
+  var msg = fmt(translate("${Enter the name of the folder to which the patch '%1' will be applied}"), [ fso.GetFileName(fileSrc) ]);
+  while (true) {
+    dirPatched = mergeApp.InputBox(msg, PLUGIN_NAME, dirPatched);
+    if (dirPatched === "") {
+      fso.CopyFile(fileSrc, fso.BuildPath(folderDst, fso.GetFileName(fileSrc)) + ".txt");
+      return false;
+    }
+    if (fso.FolderExists(dirPatched)) { break; }
+    mergeApp.MsgBox(fmt(translate("${Folder '%1' does not exist}"), dirPatched), 48/*vbExclamation*/);
+  }
+
+  var files = getFileNamesInPatch(fileSrc);
+  var stripCount = guessStripCount(files, dirPatched);
+
+  var cmdLine = "type \"" + fileSrc + "\" | patch --binary -p" + stripCount;
+  msg = translate("${Enter the command line arguments for patch command}");
+  cmdLine = mergeApp.InputBox(msg, PLUGIN_NAME, cmdLine);
+  if (cmdLine === "") {
+    fso.CopyFile(fileSrc, fso.BuildPath(folderDst, fso.GetFileName(fileSrc)) + ".txt");
+    return false;
+  }
+      
+  stripCount = getStripCountFromCmdLine(cmdLine);
+  if (stripCount === 0) {
+    if (hasAbsolutePathInList(files)) {
+      msg = translate("${Should not specify the '-p0' command line option for the patch file which includes absolute paths}");
+      mergeApp.MsgBox(msg, 48/*vbExclamation*/);
+      return false;
+    }
+  }
+
+  copyOriginalFiles(dirPatched, folderDst, files, stripCount);
+
+  run(wsh, "cmd.exe /s /c \"set PATH=" + getPatchExeFolder() + ";%PATH% & cd /d " + folderDst + " & " + cmdLine + " & pause\"");
+
+  pbChanged = true;
+  pSubcode = 0;
+
+  var result = new ActiveXObject("Scripting.Dictionary");
+  result.Add(0, true);
+  result.Add(1, pbChanged);
+  result.Add(2, pSubcode);
+  return result.Items();
+}
+
+function PackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
+  return false;
+}
+
+function translate(text) {
+  var re = /\${([^}]+)}/g;
+  var matches;
+  while ((matches = re.exec(text)) != null) {
+    text = text.replace(matches[0], mergeApp.Translate(matches[1]));
+  }
+  return text;
+}
+
+function ShowSettingsDialog() {
+  var tname = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() + ".hta");
+  var xmlfile = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() + ".xml");
+  var tfile = fso.CreateTextFile(tname, true, true);
+  tfile.Write(translate(getResource("dialog1")));
+  tfile.Close();
+  exportSettingsToXMLFile(xmlfile);
+  var mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\\System32\\mshta.exe");
+  if (!fso.FileExists(mshta)) {
+    mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\\SysWOW64\\mshta.exe");
+  }
+  run(wsh, "\"" + mshta + "\" \"" + tname + "\"  \"" + xmlfile + "\"");
+  importSettingsFromXMLFile(xmlfile);
+  fso.DeleteFile(tname);
+  fso.DeleteFile(xmlfile);
+}
+
+function run(sh, cmd) {
+  sh.Run(cmd, 1, true);
+}
+
+function getPatchExeFolder() {
+  var winMergeExePath = "C:\\Program Files\\WinMerge\\WinMergeU.exe";
+  try {
+    winMergeExePath = wsh.RegRead("Executable");
+  } catch (e) {}
+  return fso.BuildPath(fso.GetParentFolderName(winMergeExePath), "Commands\\msys2\\usr\\bin");
+}
+
+function isPatchFile(path) {
+  var patterns = get_PluginFileFilters().split(";");
+  for (var i = 0; i < patterns.length; i++) {
+    var re = new RegExp(patterns[i], "gi");
+    if (re.test(path)) {
+      return true;
+    }
+  }
+  return false;
+}
+
+function isWindowsTextFormat(path) {
+  return (readAllText(path).indexOf("\r\n") >= 0);
+}
+
+function isAbsolutePath(path) {
+  return (path.length > 1) && (path.charAt(1) === ":" || path.charAt(0) === "/" || path.charAt(0) === "\\");
+}
+
+function hasAbsolutePathInList(files) {
+  for (var i = 0; i < files.length; i++) {
+    if (isAbsolutePath(files[i][0])) {
+      return true;
+    }
+  }
+  return false;
+}
+
+function isNullDevice(path) {
+  return (path === "/dev/null" || path.toUpperCase() === "NUL");
+}
+
+function stripDir(fileName, stripCount) {
+  if (stripCount === -1) {
+    return fso.GetFileName(fileName);
+  } else if (stripCount === 0) {
+    return fileName;
+  }
+  var pos = 0;
+  for (var i = 0; i < stripCount; i++) {
+    var posNext1 = fileName.indexOf("/", pos);
+    var posNext2 = fileName.indexOf("\\", pos);
+    if (posNext1 >= 0 && (posNext1 < posNext2 || posNext2 === -1)) {
+      pos = posNext1 + 1;
+    } else if (posNext2 >= 0 && (posNext2 < posNext1 || posNext1 === -1)) {
+      pos = posNext2 + 1;
+    } else {
+      pos = -1;
+      break;
+    }
+  }
+  if (pos === -1) {
+    return "";
+  }
+  return fileName.substring(pos);
+}
+
+function makePatchedFileName(destDir, fileName, stripCount) {
+  if (!isNullDevice(fileName)) {
+    var strippedFileName = stripDir(fileName, stripCount);
+    if (strippedFileName === "") {
+      return "";
+    }
+    if (!isAbsolutePath(strippedFileName)) {
+      return fso.BuildPath(destDir, strippedFileName);
+    }
+    return strippedFileName;
+  }
+  return fileName;
+}
+
+function guessStripCount(fileNamesInPatch, destDir) {
+  var guessedStripCount = 0;
+  var stripCount = 0;
+  var maxMatchCount = 0;
+  if (fileNamesInPatch.length === 0) { return guessedStripCount; }
+  while (true) {
+    var matchCount = 0;
+    for (var i = 0; i < fileNamesInPatch.length; i++) {
+      for (var j = 0; j < 2; j++) {
+        if (!isNullDevice(fileNamesInPatch[i][j])) {
+          var fileName = makePatchedFileName(destDir, fileNamesInPatch[i][j], stripCount);
+          if (fso.FileExists(fileName)) {
+            matchCount++;
+          }
+        }
+      }
+    }
+    if (matchCount > maxMatchCount) {
+      guessedStripCount = stripCount;
+    }
+    stripCount++;
+    if (stripCount > 64) { break; }
+  }
+  return guessedStripCount;
+}
+
+function createFolderEx(dirName) {
+  var parent = fso.GetParentFolderName(dirName);
+  if (fso.FolderExists(parent)) {
+    if (!fso.FolderExists(dirName)) {
+      fso.CreateFolder(dirName);
+    }
+  } else {
+    createFolderEx(parent);
+    fso.CreateFolder(dirName);
+  }
+}
+
+function copyOriginalFiles(srcDir, destDir, fileNamesInPatch, stripCount) {
+  for (var i = 0; i < fileNamesInPatch.length; i++) {
+    if (!isNullDevice(fileNamesInPatch[i][0])) {
+      var fileNameSrc = makePatchedFileName(srcDir, fileNamesInPatch[i][0], stripCount);
+      var fileNameDest = makePatchedFileName(destDir, fileNamesInPatch[i][0], stripCount);
+      if (fso.FileExists(fileNameSrc)) {
+        if (!fso.FolderExists(fso.GetParentFolderName(fileNameDest))) {
+          createFolderEx(fso.GetParentFolderName(fileNameDest));
+        }
+        fso.CopyFile(fileNameSrc, fileNameDest);
+      }
+    }
+  }
+}
+
+function readAllText(fileName) {
+  var stream = new ActiveXObject("ADODB.Stream");
+  stream.Open();
+  stream.Charset = "_autodetect_all";
+  stream.LoadFromFile(fileName);
+  var result = stream.ReadText();
+  stream.Close();
+  return result;
+}
+
+function getFileNamesInPatch(fileName) {
+  var ary = new Array();
+  var re = new RegExp("^(---|\\+\\+\\+|\\*\\*\\*) ([^\\t\\r\\n]+)");
+  var text = readAllText(fileName);
+  var i = 0;
+  var eol = text.match(/\r\n|\n|\r/);
+  var lines = text.split(eol);
+  while (i < lines.length) {
+    var line = lines[i];
+    var ml = re.exec(line);
+    if (ml) {
+      i++;
+      if (i < lines.length) {
+        line = lines[i];
+        var mr = re.exec(line);
+        if (mr) {
+          ary.push([ml[2], mr[2]]);
+        }
+      }
+    }
+    i++;
+  }
+  return ary;
+}
+
+function getStripCountFromCmdLine(cmdLine) {
+  var re = new RegExp("( -p(\\d+)| --strip=(\\d+))");
+  var m = re.exec(cmdLine);
+  if (m) {
+    if (m[2]) {
+      return parseInt(m[2]);
+    }
+    return parseInt(m[3]);
+  }
+  return -1;
+}
+
+function exportSettingsToXMLFile(filepath) {
+  var key_defvalues = {
+    "Dummy" : true
+  };
+  var doc = new ActiveXObject("MSXML2.DOMDocument");
+  var fso = new ActiveXObject("Scripting.FileSystemObject");
+  var ts = fso.OpenTextFile(filepath, 2, true, -1);
+  var root = doc.createElement("properties");
+  for (var key in key_defvalues) {
+    var el = doc.createElement("property");
+    var val = regRead(REGKEY_PATH + key, key_defvalues[key]);
+    var cdata = doc.createCDATASection(val);
+    el.appendChild(cdata);
+    el.setAttribute("name", REGKEY_PATH + key);
+    el.setAttribute("type", typeof val);
+    root.appendChild(el);
+  }
+  doc.appendChild(root);
+  ts.Write(doc.xml);
+  ts.Close();
+}
 
-function exportSettingsToXMLFile(filepath)
-{
-	var key_defvalues = {
-		"Dummy" : true
-	};
-	var doc = new ActiveXObject("MSXML2.DOMDocument");
-	var fso = new ActiveXObject("Scripting.FileSystemObject");
-	var ts = fso.OpenTextFile(filepath, 2, true, -1);
-	var root = doc.createElement("properties");
-	for (var key in key_defvalues) {
-		var el = doc.createElement("property");
-		var val = regRead(REGKEY_PATH + key, key_defvalues[key]);
-		var cdata = doc.createCDATASection(val);
-		el.appendChild(cdata);
-		el.setAttribute("name", REGKEY_PATH + key);
-		el.setAttribute("type", typeof val);
-		root.appendChild(el);
-	}
-	doc.appendChild(root);
-	ts.Write(doc.xml);
-	ts.Close();
-}
-
-function importSettingsFromXMLFile(filepath)
-{
-	var fso = new ActiveXObject("Scripting.FileSystemObject");
-	var ts = fso.OpenTextFile(filepath, 1, true, -1);
-	var xml = ts.ReadAll();
-	var doc = new ActiveXObject("MSXML2.DOMDocument");
-	doc.async = false
-	doc.loadXML(xml);
-	ts.Close();
-	var nodes = doc.documentElement.childNodes;
-	for (var i = 0; i < nodes.length; i++) {
-		regWrite(nodes[i].getAttribute("name"), nodes[i].text, (nodes[i].getAttribute("type") === "string") ? "REG_SZ" : "REG_DWORD");
-	}
+function importSettingsFromXMLFile(filepath) {
+  var fso = new ActiveXObject("Scripting.FileSystemObject");
+  var ts = fso.OpenTextFile(filepath, 1, true, -1);
+  var xml = ts.ReadAll();
+  var doc = new ActiveXObject("MSXML2.DOMDocument");
+  doc.async = false;
+  doc.loadXML(xml);
+  ts.Close();
+  var nodes = doc.documentElement.childNodes;
+  for (var i = 0; i < nodes.length; i++) {
+    regWrite(nodes[i].getAttribute("name"), nodes[i].text, (nodes[i].getAttribute("type") === "string") ? "REG_SZ" : "REG_DWORD");
+  }
 }
 
 </script>
@@ -574,7 +503,7 @@ function importSettingsFromXMLFile(filepath)
         var ts = fso.OpenTextFile(filepath, 1, true, -1);
         var xml = ts.ReadAll();
         var doc = new ActiveXObject("MSXML2.DOMDocument");
-        doc.async = false
+        doc.async = false;
         doc.loadXML(xml);
         ts.Close();
         var nodes = doc.documentElement.childNodes;
diff --git a/Plugins/dlls/CompareMSExcelFiles.sct b/Plugins/dlls/CompareMSExcelFiles.sct
index 5956c068f7a..e5888023a99 100644
--- a/Plugins/dlls/CompareMSExcelFiles.sct
+++ b/Plugins/dlls/CompareMSExcelFiles.sct
@@ -1,739 +1,765 @@
 <scriptlet>
 <implements type="Automation" id="dispatcher">
-	<property name="PluginEvent">
-		<get/>
-	</property>
-	<property name="PluginDescription">
-		<get/>
-	</property>
-	<property name="PluginFileFilters">
-		<get/>
-	</property>
-	<property name="PluginIsAutomatic">
-		<get/>
-	</property>
-	<property name="PluginUnpackedFileExtension">
-		<get/>
-	</property>
-	<property name="PluginExtendedProperties">
-		<get/>
-	</property>
-	<method name="PluginOnEvent"/>
-	<method name="UnpackFile"/>
-	<method name="PackFile"/>
-	<method name="IsFolder"/>
-	<method name="UnpackFolder"/>
-	<method name="PackFolder"/>
-	<method name="ShowSettingsDialog"/>
+  <property name="PluginEvent">
+    <get/>
+  </property>
+  <property name="PluginDescription">
+    <get/>
+  </property>
+  <property name="PluginFileFilters">
+    <get/>
+  </property>
+  <property name="PluginIsAutomatic">
+    <get/>
+  </property>
+  <property name="PluginUnpackedFileExtension">
+    <get/>
+  </property>
+  <property name="PluginExtendedProperties">
+    <get/>
+  </property>
+  <method name="PluginOnEvent"/>
+  <method name="UnpackFile"/>
+  <method name="PackFile"/>
+  <method name="IsFolder"/>
+  <method name="UnpackFolder"/>
+  <method name="PackFolder"/>
+  <method name="ShowSettingsDialog"/>
 </implements>
 
-<script language="VBS">
-
-'/////////////////////////////////////////////////////////////////////////////
-'    This is a plugin for WinMerge.
-'    It will display the text content of MS Excel files.
-'    Copyright (C) 2005-2023 Takashi Sawanaka
-'
-'    This program is free software; you can redistribute it and/or modify
-'    it under the terms of the GNU General Public License as published by
-'    the Free Software Foundation; either version 2 of the License, or
-'    (at your option) any later version.
-'
-'    This program is distributed in the hope that it will be useful,
-'    but WITHOUT ANY WARRANTY; without even the implied warranty of
-'    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-'    GNU General Public License for more details.
-'
-'    You should have received a copy of the GNU General Public License
-'    along with this program; if not, write to the Free Software
-'    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-'
-
-Option Explicit
-
-Const RegKeyPath = "Plugins\CompareMSExcelFiles.sct/"
-Const pbGroup = 6
-Dim MsgCannotGetMacros
-MsgCannotGetMacros = "${Cannot get Macros." & vbCrLf & _
-	"   To allow WinMerge to compare macros, use MS Office to alter the settings in the Macro Security for the current application." & vbCrLf & _
-	"   The Trust access to Visual Basic Project feature should be turned on to use this feature in WinMerge." & vbCrLf & "}"
-
-Dim fso: Set fso = CreateObject("Scripting.FileSystemObject")
-Dim wsh: Set wsh = CreateObject("WScript.Shell")
-Dim mergeApp
-
-Function isAccessibleVBAProject(wbk)
-	Dim count
-	count = -1
-	On Error Resume Next
-	count = wbk.VBProject.VBComponents.Count
-	isAccessibleVBAProject = (count > 0)
-End Function
-
-Function regRead(Key, DefaultValue)
-	regRead = DefaultValue
-	On Error Resume Next
-	If IsEmpty(mergeApp) Then
-		regRead = wsh.RegRead("HKCU\Software\Thingamahoochie\WinMerge\" & Replace(Key, "/", "\"))
-	Else
-		regRead = mergeApp.GetOption(Key, DefaultValue)
-	End If
-End Function
-
-Sub regWrite(Key, Value, TypeNm)
-	Dim tmp
-	On Error Resume Next
-	If IsEmpty(mergeApp) Then
-		wsh.RegWrite "HKCU\Software\Thingamahoochie\WinMerge\" &  Replace(Key, "/", "\"), Value, TypeNm
-	Else
-		If TypeNm = "REG_DWORD" Then
-			tmp = CLng(Value)
-		Else
-			tmp = CStr(Value)
-		End If
-		mergeApp.SaveOption Key, tmp
-	End If
-End Sub
-
-Function writeObjectProperties(fo, items)
-	On Error Resume Next
-	Dim o
-	For Each o In items
-		fo.WriteLine o.Name & ": " & o.Value
-	Next
-End Function
-
-Function QuoteIfNeeded(str)
-	Dim fQuote
-	If InStr(str, vbTab) > 0 Then
-		fQuote = True
-	ElseIf InStr(str, """") > 0 Then
-		fQuote = True
-	ElseIf InStr(str, vbLf) > 0 Then
-		fQuote = True
-	End If
-	If fQuote Then
-		QuoteIfNeeded = """" & Replace(str, """", """""") & """"
-	Else
-		QuoteIfNeeded = str
-	End If
-End Function
-
-Function writeCellValues(fo, sht)
-	Dim varCells, row, col, ary()
-	varCells = sht.UsedRange.Value
-	If TypeName(varCells) = "String" Then
-		fo.WriteLine QuoteIfNeeded(varCells)
-	ElseIf Not IsEmpty(varCells) Then
-		ReDim ary(UBound(varCells, 2))
-		On Error Resume Next
-		For row = 1 To UBound(varCells, 1)
-			For col = 1 To UBound(varCells, 2)
-				ary(col - 1) = QuoteIfNeeded(CStr(varCells(row, col)))
-				If Err.Number <> 0 Then
-					ary(col - 1) = "Error" & Err.Number
-					Err.Clear
-				End If
-			Next
-			fo.WriteLine Join(ary, vbTab)
-		Next
-	End If
-End Function
-
-Function GetAddr(row, col)
-    Dim c
-    c = col - 1
-    Do
-        GetAddr = Chr(65 + (c Mod 26)) & GetAddr
-        c = (c \ 26) - 1
-    Loop While c >= 0
-    GetAddr = GetAddr & row
-End Function
-
-Function writeFormulas(fo, sht)
-	Dim row, col, rowOffset, colOffset, varCells, formula
-	rowOffset = sht.UsedRange.Row
-	colOffset = sht.UsedRange.Column
-	varCells = sht.UsedRange.Formula
-	If TypeName(varCells) = "String" Then
-		fo.WriteLine GetAddr(rowOffset - 1, colOffset - 1) & ": " & varCells
-	Else
-		For row = 1 To UBound(varCells, 1)
-			For col = 1 To UBound(varCells, 2)
-				formula = varCells(row, col)
-				If Left(formula, 1) = "=" Then 
-					fo.WriteLine GetAddr(row + rowOffset - 1, col + colOffset - 1) & ": " & formula
-				End If
-			Next
-		Next
-	End If
-End Function
-
-Function getUsedRangeIncludingShapes(sht)
-	Dim shp, rng
-	Dim col_max, row_max
-	col_max = 0
-	row_max = 0
-	For Each shp In sht.Shapes
-		Set rng = shp.BottomRightCell
-		If row_max < rng.Row + rng.Rows.Count - 1 Then row_max = rng.Row + rng.Rows.Count - 1
-		If col_max < rng.Column + rng.Columns.Count - 1 Then col_max = rng.Column + rng.Columns.Count - 1
-	Next
-	Set rng = sht.UsedRange
-	If row_max < rng.Row + rng.Rows.Count - 1 Then row_max = rng.Row + rng.Rows.Count - 1
-	If col_max < rng.Column + rng.Columns.Count - 1 Then col_max = rng.Column + rng.Columns.Count - 1
-	Set getUsedRangeIncludingShapes = sht.Range("A1", sht.Cells(row_max, col_max))
-End Function
-
-Sub ungroupShapes(sht)
-    On Error Resume Next
-    Dim cnt, shp
-    Do
-        cnt = sht.Shapes.Count
-        For Each shp In sht.Shapes
-            If shp.Type = pbGroup Then shp.ungroup
-        Next
-    Loop While cnt <> sht.Shapes.Count
-End Sub
-
-Function writeTextsInShapes(fo, sht)
-	Dim shp
-	On Error Resume Next
-	For Each shp In sht.Shapes
-		fo.WriteLine shp.Name & ": " & shp.TextFrame.Characters.Text
-	Next
-	On Error GoTo 0
-End Function
-
-Function writeHeadersAndFooters(fo, sht)
-	On Error Resume Next
-	fo.WriteLine "LeftHeader: " & sht.PageSetup.LeftHeader
-	fo.WriteLine "CenterHeader: " & sht.PageSetup.CenterHeader
-	fo.WriteLine "RightHeader: " & sht.PageSetup.RightHeader
-	fo.WriteLine "LeftFooter: " & sht.PageSetup.LeftFooter
-	fo.WriteLine "CenterFooter: " & sht.PageSetup.CenterFooter
-	fo.WriteLine "RightFooter: " & sht.PageSetup.RightFooter
-	On Error GoTo 0
-End Function
-
-Function getModuleExtension(cmp)
-	Select Case cmp.Type
-	Case 2
-		getModuleExtension = ".cls"
-	Case 3
-		getModuleExtension = ".frm"
-	Case Else
-		getModuleExtension = ".bas"
-	End Select
-End Function
-
-Sub Sleep(sec)
-	if sec = 0 Then Exit Sub
-	wsh.Run "ping.exe localhost -n " & sec, 0, True
-End Sub
-
-Function saveRangeAsImage(sht, rng, filename)
-	Dim obj
-	Dim shtNew
-	Dim wbkNew
-	Dim oldSheetsInNewWorkbook
-	Dim i
-
-	saveRangeAsImage = True
-
-	On Error Resume Next
-	Err.Clear
-
-	sht.Activate
-	With sht.Parent.Windows(1)
-		.DisplayGridlines = False
-		.View = 1
-	End With
-
-	oldSheetsInNewWorkbook = sht.Application.SheetsInNewWorkbook
-	sht.Application.SheetsInNewWorkbook = 1
-	set wbkNew = sht.Application.Workbooks.Add
-	sht.Application.SheetsInNewWorkbook = oldSheetsInNewWorkbook
-	Set shtNew = wbkNew.Sheets(1)
-	Set obj = wbkNew.Charts.Add
-	Set obj = obj.Location(2, shtNew.Name) ' xlLocationAsObject=2
-
-	If sht.Application.Version <= 11 Then
-		obj.Parent.Width = rng.Width + 8
-		obj.Parent.Height = rng.Height + 8
-	Else
-		obj.Parent.Width = rng.Width
-		obj.Parent.Height = rng.Height
-	End If
-
-	For i = 0 to 1
-		If sht.Application.Version < 14 Then
-			rng.CopyPicture 1, 2 ' xlScreen=1, xlBitmap=2
-			If Err.Number = 0 Then
-				Sleep i
-				obj.Paste
-				obj.Export filename, "PNG"
-			ElseIf i = 0 Then
-				Sleep 1
-			End If
-		Else
-			rng.Copy
-			If Err.Number = 0 Then
-				Sleep i
-				shtNew.Pictures.Paste
-				obj.Export filename, "PNG"
-			ElseIf i = 0 Then
-				Sleep 1
-			End If
-		End If
-
-		If Err.Number = 0 Then Exit For
-		If i = 0 Then Err.Clear
-	Next
-
-	wbkNew.Close False
-
-	saveRangeAsImage = (Err.Number = 0)
-
-End Function
-
-Function getTimeStamp()
-    Dim dt, tm, ms
-    tm = Timer
-    ms = Fix((tm - Fix(tm)) * 1000)
-    tm = Fix(tm)
-    getTimeStamp = (tm \ (60 * 60)) & ":" & ((tm \ 60) Mod 60) & ":" & (tm Mod 60) & "." & ms
-End Function
-
-Function findRowByPosition(sht, ByVal rowBegin, ByVal rowEnd, ByVal pos)
-    Dim height, rowPrev, row, rowBeginOrg
-    row = rowEnd
-    rowBeginOrg = rowBegin
-    rowPrev = row
-    Do
-        height = sht.Range("A" & rowBeginOrg & ":A" & row).height
-        If height < pos Then
-            rowBegin = row
-        Else
-            rowEnd = row
-        End If
-        row = (rowEnd - rowBegin) \ 2 + rowBegin
-        If row = rowPrev Then
-            findRowByPosition = row
-            Exit Function
-        End If
-        rowPrev = row
-    Loop
-End Function
-
-Function findColumnByPosition(sht, ByVal columnBegin, ByVal columnEnd, ByVal pos)
-    Dim width, columnPrev, column, columnBeginOrg
-    column = columnEnd
-    columnBeginOrg = columnBegin
-    columnPrev = column
-    Do
-        width = sht.Range(sht.Cells(1, columnBeginOrg), sht.Cells(1, column)).width
-        If width < pos Then
-            columnBegin = column
-        Else
-            columnEnd = column
-        End If
-        column = (columnEnd - columnBegin) \ 2 + columnBegin
-        If column = columnPrev Then
-            findColumnByPosition = column
-            Exit Function
-        End If
-        columnPrev = column
-    Loop
-End Function
-
-Function saveSheetAsImage(sht, basefilename)
-	Dim rngUsed, rngImage, row, rowEnd, column, columnEnd, filename, numX, numY, imageWidth, imageHeight
-	imageWidth = regRead(RegKeyPath & "ImageWidth", 1000)
-	imageHeight = regRead(RegKeyPath & "ImageHeight", 3000)
-	Set rngUsed = getUsedRangeIncludingShapes(sht)
-	numX = 1
-	column = rngUsed.Column
-	Do 
-		columnEnd = findColumnByPosition(sht, column, rngUsed.Column + rngUsed.Columns.Count - 1, imageWidth)
-		numY = 1
-		row = rngUsed.Row
-		Do 
-			rowEnd = findRowByPosition(sht, row, rngUsed.Row + rngUsed.Rows.Count - 1, imageHeight)
-			Set rngImage = sht.Range(sht.Cells(row, column), sht.Cells(rowEnd, columnEnd))
-			filename = basefilename & "(" & numX & "-" & numY & ").png"
-			If Not saveRangeAsImage(sht, rngImage, filename) Then
-				Dim shtNew
-				Set shtNew = sht.Parent.Sheets.Add
-				shtNew.Range("A1") = getTimeStamp() & ": Error" & Err.Number & ": " & Err.Description
-				shtNew.Columns.AutoFit
-				saveRangeAsImage shtNew, shtNew.Range("A1"), filename
-				shtNew.Delete
-			End If
-			row = rowEnd + 1
-			numY = numY + 1
-		Loop While row < rngUsed.row + rngUsed.Rows.Count - 1 
-		column = columnEnd + 1
-		numX = numX + 1
-	Loop While column < rngUsed.column + rngUsed.Columns.Count - 1 
-End Function
-
-Function saveSheetAsHTML(sht, filename)
-    Dim pobj
-    Set pobj = sht.Parent.PublishObjects.Add(1, filename, sht.Name, "", 0, "CompareMSExcelFilesPlugin", "") ' 1 = xlSourceSheet, 0 = xlHtmlStatic
-    pobj.Publish True
-    pobj.AutoRepublish = False
-End Function
-
-Function escape(sheetName)
-    escape = Replace(sheetName, "%", "%25")
-    escape = Replace(escape, "<", "%3C")
-    escape = Replace(escape, ">", "%3E")
-    escape = Replace(escape, "|", "%7C")
-    Select Case Left(UCase(escape), 3)
-    Case "CON", "AUX", "NUL"
-        If Len(escape) = 3 Then
-            escape = "%" & escape
-        End If
-    Case "COM", "LPT"
-        If Len(escape) = 4 And IsNumeric(Mid(escape, 4, 1)) Then
-            escape = "%" & escape
-        End If
-    End Select
-End Function
-
-Function get_PluginEvent()
-	get_PluginEvent = "FILE_FOLDER_PACK_UNPACK"
-End Function
-
-Function get_PluginDescription()
-	get_PluginDescription = "Display the text content of MS Excel files"
-End Function
-
-Function get_PluginFileFilters()
-	get_PluginFileFilters = "\.xls(\..*)?$;\.xlsx(\..*)?$;\.xlsm(\..*)?$;\.xlsb(\..*)?;\.xla(\..*)?$;\.xlax(\..*)?$;\.xltx(\..*)?$;\.xltm(\..*)?$"
-End Function
-
-Function get_PluginIsAutomatic()
-	get_PluginIsAutomatic = True
-End Function
-
-Function get_PluginUnpackedFileExtension()
-	get_PluginUnpackedFileExtension = ".tsv"
-End Function
-
-Function get_PluginExtendedProperties()
-	get_PluginExtendedProperties = "ProcessType=Content Extraction;FileType=MS-Excel;MenuCaption=MS-Excel"
-End Function
-
-Sub PluginOnEvent(eventType, obj)
-	Set mergeApp = obj
-End Sub
-
-Function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode)
-	Dim fo
-	Dim xl
-	Dim wbk
-	Dim sht
-	Dim cmp
-	Dim fileSrc2
-
-	Set fo = fso.CreateTextFile(fileDst, True, True)
-
-	Set xl = CreateObject("Excel.Application")
-	xl.EnableEvents = False
-	xl.DisplayAlerts = False
-
-	fileSrc2 = fileSrc
-	If fso.GetExtensionName(fileSrc2) = "lnk" Then
-		fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath
-		If Not fso.FileExists(fileSrc2) Then
-			Err.Raise 30001, "CompareMSExcelFiles.sct", fileSrc & ": Target file '" & fileSrc2 & "' not found"
-		End If 
-	End If
-	Set wbk = xl.Workbooks.Open(fileSrc2, regRead(RegKeyPath & "UpdateLinks", 0),,,,,,,,,,,,True)
-
-	On Error Resume Next
-
-	If regRead(RegKeyPath & "CompareDocumentProperties", False) Then
-		fo.WriteLine "[Document Properties]"
-		writeObjectProperties fo, wbk.BuiltinDocumentProperties
-		fo.WriteLine ""
-	End If
-
-	If regRead(RegKeyPath & "CompareNames", True) Then
-		fo.WriteLine "[Names]"
-		writeObjectProperties fo, wbk.Names
-		fo.WriteLine ""
-	End If
-
-	For Each sht In wbk.Worksheets
-		If regRead(RegKeyPath & "CompareCellValues", True) Then
-			fo.WriteLine "[" & sht.Name & "]"
-			writeCellValues fo, sht
-			fo.WriteLine ""
-		End If
-		If regRead(RegKeyPath & "CompareFormulas", False) Then
-			fo.WriteLine "[" & sht.Name & ".Formulas]"
-			writeFormulas fo, sht
-			fo.WriteLine ""
-		End If
-		If regRead(RegKeyPath & "CompareTextsInShapes", True) Then
-			fo.WriteLine "[" & sht.Name & ".Shapes]"
-			ungroupShapes sht
-			writeTextsInShapes fo, sht
-			fo.WriteLine ""
-		End If
-		If regRead(RegKeyPath & "CompareHeadersAndFooters", True) Then
-			fo.WriteLine "[" & sht.Name & ".HeadersAndFooters]"
-			writeHeadersAndFooters fo, sht
-			fo.WriteLine ""
-		End If
-	Next
-
-	If regRead(RegKeyPath & "CompareVBAMacros", True) Then
-		If Not isAccessibleVBAProject(wbk) Then
-			fo.WriteLine Translate(MsgCannotGetMacros)
-		End If
-		For Each cmp In wbk.VBProject.VBComponents
-			fo.WriteLine "[CodeModule." & cmp.Name & "]"
-			If cmp.CodeModule.CountOfLines > 0 Then
-				fo.WriteLine cmp.CodeModule.Lines(1, cmp.CodeModule.CountOfLines)
-			End If
-			fo.WriteLine ""
-		Next
-	End If
-
-	Set sht = Nothing
-	wbk.Close
-	Set wbk = Nothing
-	xl.Quit
-	Set xl = Nothing
-	fo.Close
-	Set fo = Nothing
-
-	pbChanged = True
-	pSubcode = 0
-	UnpackFile = True
-
-End Function
-
-Function PackFile(fileSrc, fileDst, pbChanged, pSubcode)
-	PackFile = False
-End Function
-
-Function IsFolder(file)
-	IsFolder = regRead(RegKeyPath & "UnpackToFolder", False)
-End Function
-
-Function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode)
-	Dim fo
-	Dim xl
-	Dim wbk
-	Dim sht
-	Dim cmp
-	Dim digit
-	Dim zf
-	Dim No
-	Dim fileSrc2
-
-	If Not fso.FolderExists(folderDst) Then fso.CreateFolder folderDst
-
-	Set xl = CreateObject("Excel.Application")
-	xl.EnableEvents = False
-	xl.DisplayAlerts = False
-
-	Dim backgroundChecking
-	backgroundChecking = xl.ErrorCheckingOptions.BackgroundChecking
-	xl.ErrorCheckingOptions.BackgroundChecking = False
-
-	fileSrc2 = fileSrc
-	If fso.GetExtensionName(fileSrc2) = "lnk" Then
-		fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath
-		If Not fso.FileExists(fileSrc2) Then
-			Err.Raise 30001, "CompareMSExcelFiles.sct", fileSrc & ": Target file '" & fileSrc2 & "' not found"
-		End If 
-	End If
-	Set wbk = xl.Workbooks.Open(fileSrc2, regRead(RegKeyPath & "UpdateLinks", 0),,,,,,,,,,,,True)
-
-	On Error Resume Next
-
-	digit = Len(CStr(wbk.Worksheets.Count))
-	If digit <= 0 Then digit = 1
-	zf = String(digit, "0")
-
-	If regRead(RegKeyPath & "CompareDocumentProperties", False) Then
-		Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" & zf & ")DocumentProperties.txt"), True, True)
-		writeObjectProperties fo, wbk.BuiltinDocumentProperties
-		fo.Close
-	End If
-
-	If regRead(RegKeyPath & "CompareNames", True) Then
-		Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" & zf & ")Names.txt"), True, True)
-		writeObjectProperties fo, wbk.Names
-		fo.Close
-	End If
-
-	No = 1
-	For Each sht In wbk.Worksheets
-		No = Right(zf & CInt(No), digit)
-		If regRead(RegKeyPath & "CompareCellValues", True) Then
-			Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" & No & ")" & escape(sht.Name) & ".tsv"), True, True)
-			writeCellValues fo, sht
-			fo.Close
-		End If
-
-		If regRead(RegKeyPath & "CompareFormulas", False) Then
-			Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" & No & ")" & escape(sht.Name) & "_Formulas.txt"), True, True)
-			writeFormulas fo, sht
-			fo.Close
-		End If
-
-		If regRead(RegKeyPath & "CompareTextsInShapes", True) Then
-			Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" & No & ")" & escape(sht.Name) & "_Shapes.txt"), True, True)
-			ungroupShapes sht
-			writeTextsInShapes fo, sht
-			fo.Close
-		End If
-
-		If regRead(RegKeyPath & "CompareHeadersAndFooters", True) Then
-			Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" & No & ")" & escape(sht.Name) & "_HeadersAndFooters.txt"), True, True)
-			writeHeadersAndFooters fo, sht
-			fo.Close
-		End If
-
-		If regRead(RegKeyPath & "CompareWorksheetsAsImage", True) Then
-			saveSheetAsImage sht, fso.BuildPath(folderDst, "(" & No & ")" & escape(sht.Name))
-		End If
-
-		If regRead(RegKeyPath & "CompareWorksheetsAsHTML", False) Then
-			saveSheetAsHTML sht, fso.BuildPath(folderDst, "(" & No & ")" & escape(sht.Name) & ".html")
-		End If
-		No = CInt(No) + 1
-	Next
-	If regRead(RegKeyPath & "CompareVBAMacros", True) Then
-		If Not isAccessibleVBAProject(wbk) Then
-			Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, "CannotGetMacros.bas"), True, True)
-			fo.WriteLine Translate(MsgCannotGetMacros)
-			fo.Close
-		End If
-
-		For Each cmp In wbk.VBProject.VBComponents
-			cmp.Export fso.BuildPath(folderDst, cmp.Name & getModuleExtension(cmp))
-		Next
-	End If
-
-	Set sht = Nothing
-	wbk.Close
-	Set wbk = Nothing
-	xl.ErrorCheckingOptions.BackgroundChecking = backgroundChecking
-	xl.Quit
-	Set xl = Nothing
-	Set fo = Nothing
-
-	pbChanged = True
-	pSubcode = 0
-	UnpackFolder = True
-End Function
-
-Function PackFolder(fileSrc, folderDst, pbChanged, pSubcode)
-	PackFolder = False
-End Function
-
-Function Translate(text)
-	Dim re: Set re = CreateObject("VBScript.RegExp")
-	re.Pattern = "\${([^}]+)}"
-	re.Global = True
-	Translate = text
-	Dim match
-	Dim matches:Set matches = re.Execute(text)
-	if IsEmpty(mergeApp) Then
-		For Each match in matches
-			Translate = Replace(Translate, match.Value, match.Submatches(0))
-		Next
-	Else
-		For Each match in matches
-			Translate = Replace(Translate, match.Value, mergeApp.Translate(match.Submatches(0)))
-		Next
-	End If
-End Function
-
-Function ShowSettingsDialog()
-	Dim tname: tname = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() & ".hta")
-	Dim xmlfile: xmlfile = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() & ".xml")
-	Dim tfile: Set tfile = fso.CreateTextFile(tname, True, True)
-	Dim mshta
-	tfile.Write Translate(getResource("dialog1"))
-	tfile.Close
-	exportSettingsToXMLFile xmlfile
-	mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\System32\mshta.exe")
-	If Not fso.FileExists(mshta) Then
-		mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\SysWOW64\mshta.exe")
-	End If
-	Run wsh, """" & mshta & """ """ & tname & """  """ & xmlfile  & """"
-	importSettingsFromXMLFile xmlfile
-	fso.DeleteFile tname
-	fso.DeleteFile xmlfile
-End Function
-
-Sub Run(sh, cmd)
-	sh.Run cmd, 1, True
-End Sub
+<script language="JScript">
 
-</script>
+/*
+    This is a plugin for WinMerge.
+    It will display the text content of MS Excel files.
+    Copyright (C) 2005-2024 Takashi Sawanaka
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
 
-<script language="JScript">
 
 var REGKEY_PATH = "Plugins\\CompareMSExcelFiles.sct/";
+var MsgCannotGetMacros = "${Cannot get Macros.\r\n" + 
+  "   To allow WinMerge to compare macros, use MS Office to alter the settings in the Macro Security for the current application.\r\n" + 
+  "   The Trust access to Visual Basic Project feature should be turned on to use this feature in WinMerge.\r\n}";
+var pbGroup = 6;
+
+var fso = new ActiveXObject("Scripting.FileSystemObject");
+var wsh = new ActiveXObject("WScript.Shell");
+var mergeApp;
+
+function isAccessibleVBAProject(wbk) {
+  try {
+    return (wbk.VBProject.VBComponents.Count >= 0);
+  } catch (e) {
+    return false;
+  }
+}
+
+function regRead(Key, DefaultValue) {
+  return mergeApp.GetOption(Key, DefaultValue);
+}
+
+function regWrite(Key, Value, TypeNm) {
+  mergeApp.SaveOption(Key, (TypeNm === "REG_DWORD") ? parseInt(Value) : String(Value));
+}
+
+function toString(val) {
+  switch (typeof val) {
+  case "string":
+    return val;
+  case "number":
+    return val.toString();
+  case "date":
+    var d = new Date(val);
+    if (d.getHours() == 0 && d.getMinutes() == 0 && d.getSeconds() == 0 && d.getMilliseconds() == 0) {
+        return d.toLocaleDateString();
+    }
+    return d.toLocaleString();
+  case "undefined":
+    return "";
+  default:
+    return String(val);
+  }
+}
+
+function writeObjectProperties(fo, items) {
+  try {
+    for (var it = new Enumerator(items); !it.atEnd(); it.moveNext()) {
+      try {
+        var o = it.item();
+        fo.WriteLine(o.Name + ": " + toString(o.Value));
+      } catch (e) {}
+    }
+  } catch (e) {}
+}
+
+function quoteIfNeeded(str) {
+  var fQuote;
+  if (str.indexOf("\t") >= 0) {
+    fQuote = true;
+  } else if (str.indexOf("\"") >= 0) {
+    fQuote = true;
+  } else if (str.indexOf("\n") >= 0) {
+    fQuote = true;
+  }
+  if (fQuote) {
+    return "\"" + str.replace(/\"/g, "\"\"") + "\"";
+  } else {
+    return str;
+  }
+}
+
+function writeCellValues(fo, sht) {
+  var varCells = sht.UsedRange.Value;
+  try {
+    if (typeof(varCells) === "string" || typeof(varCells) === "number" || typeof(varCells) === "date") {
+      fo.WriteLine(quoteIfNeeded(String(varCells)));
+    } else if (varCells !== undefined) {
+      for (var row = 1; row <= varCells.ubound(1); row++) {
+        var ary = new Array(varCells.ubound(2));
+        for (var col = 1; col <= varCells.ubound(2); col++) {
+          try {
+            var val = varCells.getItem(row, col);
+            ary[col - 1] = quoteIfNeeded(toString(val));
+          } catch (e) {
+            ary[col - 1] = "Error" + e.number;
+          }
+        }
+        for (var i = ary.length - 1; i >= 0; i--) {
+            if (ary[i] !== "") {
+               if (i < ary.length - 1) {
+                 ary = ary.splice(0, i + 1);
+               }
+               break;
+            }
+        }
+        fo.WriteLine(ary.join("\t"));
+      }
+    }
+  } catch (e) {
+    fo.WriteLine("Error" + e.number + ": " + e.message);
+  }
+}
+
+function getAddr(row, col) {
+  var addr = "";
+  var c = col - 1;
+  do {
+    addr = String.fromCharCode(65 + (c % 26)) + addr;
+    c = Math.floor(c / 26) - 1;
+  } while (c >= 0);
+  return addr + row;
+}
+
+function writeFormulas(fo, sht) {
+  var row, col, formula;
+  var rowOffset = sht.UsedRange.Row;
+  var colOffset = sht.UsedRange.Column;
+  try {
+    var varCells = sht.UsedRange.Formula;
+    if (typeof(varCells) === "string" || typeof(varCells) === "number" || typeof(varCells) === "date") {
+      fo.WriteLine(getAddr(1 + rowOffset - 1, 1 + colOffset - 1) + ": " + varCells);
+    } else {
+      try {
+        for (var row = 1; row <= varCells.ubound(1); row++) {
+          for (var col = 1; col <= varCells.ubound(2); col++) {
+            try {
+              var formula = varCells.getItem(row, col);
+              if (typeof(formula) === "string" && formula.charAt(0) === "=") { 
+                fo.WriteLine(getAddr(row + rowOffset - 1, col + colOffset - 1) + ": " + formula);
+              }
+            } catch (e) {
+              fo.WriteLine(getAddr(row + rowOffset - 1, col + colOffset - 1) + ": " + "Error" + e.number);
+            }
+          }
+        }
+      } catch (e) {
+        fo.WriteLine(getAddr(rowOffset - 1, colOffset - 1) + ": " + "Error" + e.number);
+      }
+    }
+  } catch (e) {
+    fo.WriteLine("Error" + e.number + ": " + e.message);
+  }
+}
+
+function getUsedRangeIncludingShapes(sht) {
+  var col_max = 0;
+  var row_max = 0;
+  for (var it = new Enumerator(sht.Shapes); !it.atEnd(); it.moveNext()) {
+    var shp = it.item();
+    rng = shp.BottomRightCell;
+    if (row_max < rng.Row + rng.Rows.Count - 1) { row_max = rng.Row + rng.Rows.Count - 1 }
+    if (col_max < rng.Column + rng.Columns.Count - 1) { col_max = rng.Column + rng.Columns.Count - 1 }
+  }
+  var rng = sht.UsedRange;
+  if (row_max < rng.Row + rng.Rows.Count - 1) { row_max = rng.Row + rng.Rows.Count - 1; }
+  if (col_max < rng.Column + rng.Columns.Count - 1) { col_max = rng.Column + rng.Columns.Count - 1; }
+  return sht.Range("A1", sht.Cells(row_max, col_max));
+}
+
+function ungroupShapes(sht) {
+  try {
+    var cnt;
+    do {
+      cnt = sht.Shapes.Count;
+      for (var it = new Enumerator(sht.Shapes); !it.atEnd(); it.moveNext()) {
+        try {
+          var shp = it.item();
+          if (shp.Type === pbGroup) {
+            shp.Ungroup();
+          }
+        } catch (e) {}
+      }
+    } while (cnt !== sht.Shapes.Count);
+  } catch (e) {}
+}
+
+function writeTextsInShapes(fo, sht) {
+  try {
+    for (var it = new Enumerator(sht.Shapes); !it.atEnd(); it.moveNext()) {
+      try {
+        var shp = it.item();
+        fo.WriteLine(shp.Name + ": " + shp.TextFrame.Characters().Text);
+      } catch (e) {}
+    }
+  } catch (e) {}
+}
+
+function writeHeadersAndFooters(fo, sht) {
+  try {
+    fo.WriteLine("LeftHeader: " + sht.PageSetup.LeftHeader);
+    fo.WriteLine("CenterHeader: " + sht.PageSetup.CenterHeader);
+    fo.WriteLine("RightHeader: " + sht.PageSetup.RightHeader);
+    fo.WriteLine("LeftFooter: " + sht.PageSetup.LeftFooter);
+    fo.WriteLine("CenterFooter: " + sht.PageSetup.CenterFooter);
+    fo.WriteLine("RightFooter: " + sht.PageSetup.RightFooter);
+  } catch (e) {}
+}
+
+function getModuleExtension(cmp) {
+  switch (cmp.Type) {
+  case 2:
+    return ".cls";
+  case 3:
+    return ".frm";
+  default:
+    return ".bas";
+  }
+}
+
+function sleep(sec) {
+  if (sec == 0)
+    return;
+  wsh.run("ping.exe localhost -n " + sec, 0, true);
+}
+
+function saveRangeAsImage(sht, rng, filename) {
+  var result = true;
+  try {
+    sht.Activate();
+    var win = sht.Parent.Windows(1);
+    win.DisplayGridlines = false;
+    win.View = 1;
+
+    var oldSheetsInNewWorkbook = sht.Application.SheetsInNewWorkbook;
+    sht.Application.SheetsInNewWorkbook = 1;
+    var wbkNew = sht.Application.Workbooks.Add();
+    sht.Application.SheetsInNewWorkbook = oldSheetsInNewWorkbook;
+    var shtNew = wbkNew.Sheets(1);
+    var obj = wbkNew.Charts.Add();
+    obj = obj.Location(2, shtNew.Name); // xlLocationAsObject=2
+ 
+    if (sht.Application.Version <= 11) {
+      obj.Parent.Width = rng.Width + 8;
+      obj.Parent.Height = rng.Height + 8;
+    } else {
+      obj.Parent.Width = rng.Width;
+      obj.Parent.Height = rng.Height;
+    }
+ 
+    for (var i = 0; i <= 1; i++) {
+      if (sht.Application.Version < 14) {
+        try {
+          rng.CopyPicture(1, 2); // xlScreen=1, xlBitmap=2
+          sleep(i);
+          obj.Paste();
+          obj.Export(filename, "PNG");
+          result = true;
+          break;
+        } catch (e) {
+          result = false;
+          if (i == 0) {
+            sleep(1);
+          }
+        }
+      } else {
+        try {
+          rng.Copy();
+          sleep(i);
+          shtNew.Pictures.Paste();
+          obj.Export(filename, "PNG");
+          result = true;
+          break;
+        } catch (e) {
+          result = false;
+          if (i == 0) {
+            sleep(1);
+          }
+        }
+      }
+    }
+  } catch (e) {
+    result = false;
+  }
+  wbkNew.Close(false);
+  return result;
+}
 
-function exportSettingsToXMLFile(filepath)
-{
-	var key_defvalues = {
-		"UnpackToFolder" : false,
-		"UpdateLinks" : false,
-		"CompareDocumentProperties" : false,
-		"CompareNames" : true,
-		"CompareCellValues" : true,
-		"CompareWorksheetsAsImage" : true,
-		"CompareWorksheetsAsHTML" : false,
-		"ImageWidth" : 1000,
-		"ImageHeight" : 3000,
-		"CompareFormulas" : false,
-		"CompareTextsInShapes" : true,
-		"CompareHeadersAndFooters" : true,
-		"CompareVBAMacros" : true
-	};
-	var doc = new ActiveXObject("MSXML2.DOMDocument");
-	var fso = new ActiveXObject("Scripting.FileSystemObject");
-	var ts = fso.OpenTextFile(filepath, 2, true, -1);
-	var root = doc.createElement("properties");
-	for (var key in key_defvalues) {
-		var el = doc.createElement("property");
-		var val = regRead(REGKEY_PATH + key, key_defvalues[key]);
-		var cdata = doc.createCDATASection(val);
-		el.appendChild(cdata);
-		el.setAttribute("name", REGKEY_PATH + key);
-		el.setAttribute("type", typeof val);
-		root.appendChild(el);
-	}
-	doc.appendChild(root);
-	ts.Write(doc.xml);
-	ts.Close();
-}
-
-function importSettingsFromXMLFile(filepath)
-{
-	var fso = new ActiveXObject("Scripting.FileSystemObject");
-	var ts = fso.OpenTextFile(filepath, 1, true, -1);
-	var xml = ts.ReadAll();
-	var doc = new ActiveXObject("MSXML2.DOMDocument");
-	doc.async = false
-	doc.loadXML(xml);
-	ts.Close();
-	var nodes = doc.documentElement.childNodes;
-	for (var i = 0; i < nodes.length; i++) {
-		regWrite(nodes[i].getAttribute("name"), nodes[i].text, (nodes[i].getAttribute("type") === "string") ? "REG_SZ" : "REG_DWORD");
-	}
+function getTimeStamp() {
+  var dt = new Date();
+  return dt.toLocaleString().split(" ")[1] + "." + ("000" + dt.getMilliseconds()).slice(-3);
+}
+
+function findRowByPosition(sht, rowBegin, rowEnd, pos) {
+  var rowPrev, row, rowBeginOrg;
+  row = rowEnd;
+  rowBeginOrg = rowBegin;
+  rowPrev = row;
+  do {
+    var height = sht.Range("A" + rowBeginOrg + ":A" + row).height;
+    if (height < pos) {
+      rowBegin = row;
+    } else {
+      rowEnd = row;
+    }
+    row = Math.floor((rowEnd - rowBegin) / 2) + rowBegin;
+    if (row == rowPrev) {
+      return row;
+    }
+    rowPrev = row;
+  } while (true);
+}
+
+function findColumnByPosition(sht, columnBegin, columnEnd, pos) {
+  var column = columnEnd;
+  var columnBeginOrg = columnBegin;
+  var columnPrev = column;
+  do {
+    var width = sht.Range(sht.Cells(1, columnBeginOrg), sht.Cells(1, column)).width;
+    if (width < pos) {
+      columnBegin = column;
+    } else {
+      columnEnd = column;
+    }
+    column = Math.floor((columnEnd - columnBegin) / 2) + columnBegin;
+    if (column == columnPrev) {
+      return column;
+    }
+    columnPrev = column;
+  } while (true);
+}
+
+
+function saveSheetAsImage(sht, basefilename) {
+  var imageWidth = regRead(REGKEY_PATH + "ImageWidth", 1000);
+  var imageHeight = regRead(REGKEY_PATH + "ImageHeight", 3000);
+  var rngUsed = getUsedRangeIncludingShapes(sht);
+  var numX = 1;
+  var column = rngUsed.Column;
+  do {
+    var columnEnd = findColumnByPosition(sht, column, rngUsed.Column + rngUsed.Columns.Count - 1, imageWidth);
+    var numY = 1;
+    var row = rngUsed.Row;
+    do {
+      var rowEnd = findRowByPosition(sht, row, rngUsed.Row + rngUsed.Rows.Count - 1, imageHeight);
+      var rngImage = sht.Range(sht.Cells(row, column), sht.Cells(rowEnd, columnEnd));
+      var filename = basefilename + "(" + numX + "-" + numY + ").png";
+      if (!saveRangeAsImage(sht, rngImage, filename)) {
+        var shtNew = sht.Parent.Sheets.Add();
+        shtNew.Range("A1") = getTimeStamp() + ": Error" + Err.Number + ": " + Err.Description;
+        shtNew.Columns.AutoFit();
+        saveRangeAsImage(shtNew, shtNew.Range("A1"), filename);
+        shtNew.Delete();
+      }
+      row = rowEnd + 1;
+      numY = numY + 1;
+    } while (row < rngUsed.row + rngUsed.Rows.Count - 1);
+    column = columnEnd + 1;
+    numX = numX + 1;
+  } while (column < rngUsed.column + rngUsed.Columns.Count - 1);
+}
+
+function saveSheetAsHTML(sht, filename) {
+  try {
+    var pobj = sht.Parent.PublishObjects.Add(1, filename, sht.Name, "", 0, "CompareMSExcelFilesPlugin", ""); // 1 = xlSourceSheet, 0 = xlHtmlStatic
+    pobj.Publish(true);
+    pobj.AutoRepublish = false;
+  } catch (e) {
+    var fo = fso.CreateTextFile(filename, true, true);
+    fo.Write(e.message);
+    fo.Close();
+    fo = null;
+  }
+}
+
+function escape(sheetName) {
+  var escape = sheetName.replace(/%/g, "%25").replace(/</g, "%3C").replace(/>/, "%3E").replace(/\|/, "%7C");
+  switch (escape.toLowerCase().substr(0, 3)) {
+  case "CON", "AUX", "NUL":
+    if (escape.length == 3) {
+      escape = "%" + escape;
+    }
+    break;
+  case "COM", "LPT":
+    if (escape.length == 4 && !isNaN(escape.substr(3, 1))) {
+      escape = "%" + escape;
+    }
+    break;
+  }
+  return escape;
+}
+
+function get_PluginEvent() {
+  return "FILE_FOLDER_PACK_UNPACK";
+}
+
+function get_PluginDescription() {
+  return "Display the text content of MS Excel files";
+}
+
+function get_PluginFileFilters() {
+  return "\\.xls(\\..*)?$;\\.xlsx(\\..*)?$;\\.xlsm(\\..*)?$;\\.xlsb(\\..*)?;\\.xla(\\..*)?$;\\.xlax(\\..*)?$;\\.xltx(\\..*)?$;\\.xltm(\\..*)?$";
+}
+
+function get_PluginIsAutomatic() {
+  return true;
+}
+
+function get_PluginUnpackedFileExtension() {
+  return ".tsv";
+}
+
+function get_PluginExtendedProperties() {
+  return "ProcessType=Content Extraction;FileType=MS-Excel;MenuCaption=MS-Excel";
+}
+
+function PluginOnEvent(eventType, obj) {
+  mergeApp = obj;
+}
+
+function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
+  var fo = fso.CreateTextFile(fileDst, true, true);
+  var xl;
+  try {
+    xl = new ActiveXObject("Excel.Application");
+  } catch (e) {}
+  if (!xl) {
+    throw new Error(30001, translate("${%1 is not installed.}").replace("%1", "Excel"));
+  }
+  xl.EnableEvents = false;
+  xl.DisplayAlerts = false;
+
+  var fileSrc2 = fileSrc;
+  if (fso.GetExtensionName(fileSrc2) == "lnk") {
+    fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath;
+    if (!fso.FileExists(fileSrc2)) {
+      throw new Error(30001, "CompareMSExcelFiles.sct: " + fileSrc + ": Target file '" + fileSrc2 + "' not found");
+    }
+  }
+  var wbk = xl.Workbooks.Open(fileSrc2, regRead(REGKEY_PATH + "UpdateLinks", 0), null, null, null, null, null, null, null, null, null, null,null, -1);
+  if (regRead(REGKEY_PATH + "CompareDocumentProperties", false)) {
+    fo.WriteLine("[Document Properties]");
+    writeObjectProperties(fo, wbk.BuiltinDocumentProperties);
+    fo.WriteLine("");
+  }
+ 
+  if (regRead(REGKEY_PATH + "CompareNames", true)) {
+    fo.WriteLine("[Names]");
+    writeObjectProperties(fo, wbk.Names);
+    fo.WriteLine("");
+  }
+ 
+  for (var it = new Enumerator(wbk.Worksheets); !it.atEnd(); it.moveNext()) {
+    var sht = it.item();
+    if (regRead(REGKEY_PATH + "CompareCellValues", true)) {
+      fo.WriteLine("[" + sht.Name + "]");
+      writeCellValues(fo, sht);
+      fo.WriteLine("");
+    }
+    if (regRead(REGKEY_PATH + "CompareFormulas", false)) {
+      fo.WriteLine("[" + sht.Name + ".Formulas]");
+      writeFormulas(fo, sht);
+      fo.WriteLine("");
+    }
+    if (regRead(REGKEY_PATH + "CompareTextsInShapes", true)) {
+      fo.WriteLine("[" + sht.Name + ".Shapes]");
+      ungroupShapes(sht);
+      writeTextsInShapes(fo, sht);
+      fo.WriteLine("");
+    }
+    if (regRead(REGKEY_PATH + "CompareHeadersAndFooters", true)) {
+      fo.WriteLine("[" + sht.Name + ".HeadersAndFooters]");
+      writeHeadersAndFooters(fo, sht);
+      fo.WriteLine("");
+    }
+  }
+ 
+  if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
+    if (!isAccessibleVBAProject(wbk)) {
+      fo.WriteLine(translate(MsgCannotGetMacros));
+    } else {
+      for (var it = new Enumerator(wbk.VBProject.VBComponents); !it.atEnd(); it.moveNext()) {
+        var cmp = it.item();
+        fo.WriteLine("[CodeModule." + cmp.Name + "]");
+        if (cmp.CodeModule.CountOfLines > 0) {
+          fo.WriteLine(cmp.CodeModule.Lines(1, cmp.CodeModule.CountOfLines));
+        }
+        fo.WriteLine("");
+      }
+    }
+  }
+  sht = null;
+
+  wbk.Saved = true;
+  wbk.Close();
+  wbk = null;
+  xl.Quit();
+  xl = null;
+  fo.Close();
+  fo = null;
+
+  pbChanged = true;
+  pSubcode = 0;
+  
+  CollectGarbage();
+
+  var result = new ActiveXObject("Scripting.Dictionary");
+  result.Add(0, true);
+  result.Add(1, pbChanged);
+  result.Add(2, pSubcode);
+  return result.Items();
+}
+
+function PackFile(fileSrc, fileDst, pbChanged, pSubcode) {
+  return false;
+}
+
+function IsFolder(file) {
+  return regRead(REGKEY_PATH + "UnpackToFolder", false);
+}
+
+function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
+  if (!fso.FolderExists(folderDst)) { fso.CreateFolder(folderDst); }
+  var xl;
+  try {
+    xl = new ActiveXObject("Excel.Application");
+  } catch (e) {}
+  if (!xl) {
+    throw new Error(30001, translate("${%1 is not installed.}").replace("%1", "Excel"));
+  }
+  xl.EnableEvents = false;
+  xl.DisplayAlerts = false;
+
+  var backgroundChecking = xl.ErrorCheckingOptions.BackgroundChecking;
+  xl.ErrorCheckingOptions.BackgroundChecking = false;
+
+  var fileSrc2 = fileSrc;
+  if (fso.GetExtensionName(fileSrc2) === "lnk") {
+    fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath;
+    if (!fso.FileExists(fileSrc2)) {
+      throw new Error(30001, "CompareMSExcelFiles.sct: " + fileSrc + ": Target file '" + fileSrc2 + "' not found");
+    }
+  }
+  var wbk = xl.Workbooks.Open(fileSrc2, regRead(REGKEY_PATH + "UpdateLinks", 0), null, null, null, null, null, null, null, null, null, null, null, -1);
+
+  digit = String(wbk.Worksheets.Count).length;
+  if (digit <= 0) { digit = 1; }
+  var zf = Array(digit + 1).join("0");
+ 
+  if (regRead(REGKEY_PATH + "CompareDocumentProperties", false)) {
+    var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + zf + ")DocumentProperties.txt"), true, true);
+    writeObjectProperties(fo, wbk.BuiltinDocumentProperties);
+    fo.Close();
+    fo = null;
+  }
+ 
+  if (regRead(REGKEY_PATH + "CompareNames", true)) {
+    var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + zf + ")Names.txt"), true, true);
+    writeObjectProperties(fo, wbk.Names);
+    fo.Close();
+    fo = null;
+  }
+ 
+  var No = 1;
+  for (var it = new Enumerator(wbk.Worksheets); !it.atEnd(); it.moveNext()) {
+    var sht = it.item();
+    No = zf + No;
+    No = No.substr(No.length - digit, digit);
+    if (regRead(REGKEY_PATH + "CompareCellValues", true)) {
+      var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + ".tsv"), true, true);
+      writeCellValues(fo, sht);
+      fo.Close();
+      fo = null;
+    }
+ 
+    if (regRead(REGKEY_PATH + "CompareFormulas", false)) {
+      var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + "_Formulas.txt"), true, true);
+      writeFormulas(fo, sht);
+      fo.Close();
+      fo = null;
+    }
+ 
+    if (regRead(REGKEY_PATH + "CompareTextsInShapes", true)) {
+      var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + "_Shapes.txt"), true, true);
+      ungroupShapes(sht);
+      writeTextsInShapes(fo, sht);
+      fo.Close();
+      fo = null;
+    }
+ 
+    if (regRead(REGKEY_PATH + "CompareHeadersAndFooters", true)) {
+      var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + "_HeadersAndFooters.txt"), true, true);
+      writeHeadersAndFooters(fo, sht);
+      fo.Close();
+      fo = null;
+    }
+ 
+    if (regRead(REGKEY_PATH + "CompareWorksheetsAsImage", true)) {
+      saveSheetAsImage(sht, fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name)));
+    }
+ 
+    if (regRead(REGKEY_PATH + "CompareWorksheetsAsHTML", false)) {
+      saveSheetAsHTML(sht, fso.BuildPath(folderDst, "(" + No + ")" + escape(sht.Name) + ".html"));
+    }
+    No = parseInt(No) + 1;
+    sht = null;
+  }
+  if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
+    if (!isAccessibleVBAProject(wbk)) {
+      var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "CannotGetMacros.bas"), true, true);
+      fo.WriteLine(translate(MsgCannotGetMacros));
+      fo.Close();
+      fo = null;
+    } else {
+      for (var it = new Enumerator(wbk.VBProject.VBComponents); !it.atEnd(); it.moveNext()) {
+        var cmp = it.item();
+        cmp.Export(fso.BuildPath(folderDst, cmp.Name + getModuleExtension(cmp)));
+      }
+    }
+  }
+
+  wbk.Saved = true;
+  wbk.Close();
+  wbk = null;
+  xl.ErrorCheckingOptions.BackgroundChecking = backgroundChecking;
+  xl.Quit();
+  xl = null;
+
+  pbChanged = true;
+  pSubcode = 0;
+  
+  CollectGarbage();
+
+  var result = new ActiveXObject("Scripting.Dictionary");
+  result.Add(0, true);
+  result.Add(1, pbChanged);
+  result.Add(2, pSubcode);
+  return result.Items();
+}
+
+function PackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
+  return false;
+}
+
+function translate(text) {
+  var re = /\${([^}]+)}/g;
+  var matches;
+  while ((matches = re.exec(text)) != null) {
+    text = text.replace(matches[0], mergeApp.Translate(matches[1]));
+  }
+  return text;
+}
+
+function ShowSettingsDialog() {
+  var tname = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() + ".hta");
+  var xmlfile = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() + ".xml");
+  var tfile = fso.CreateTextFile(tname, true, true);
+  tfile.Write(translate(getResource("dialog1")));
+  tfile.Close();
+  exportSettingsToXMLFile(xmlfile);
+  var mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\\System32\\mshta.exe");
+  if (!fso.FileExists(mshta)) {
+    mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\\SysWOW64\\mshta.exe");
+  }
+  run(wsh, "\"" + mshta + "\" \"" + tname + "\"  \"" + xmlfile + "\"");
+  importSettingsFromXMLFile(xmlfile);
+  fso.DeleteFile(tname);
+  fso.DeleteFile(xmlfile);
+}
+
+function run(sh, cmd) {
+  sh.Run(cmd, 1, true);
+}
+
+function exportSettingsToXMLFile(filepath) {
+  var key_defvalues = {
+    "UnpackToFolder" : false,
+    "UpdateLinks" : false,
+    "CompareDocumentProperties" : false,
+    "CompareNames" : true,
+    "CompareCellValues" : true,
+    "CompareWorksheetsAsImage" : true,
+    "CompareWorksheetsAsHTML" : false,
+    "ImageWidth" : 1000,
+    "ImageHeight" : 3000,
+    "CompareFormulas" : false,
+    "CompareTextsInShapes" : true,
+    "CompareHeadersAndFooters" : true,
+    "CompareVBAMacros" : true
+  };
+  var doc = new ActiveXObject("MSXML2.DOMDocument");
+  var fso = new ActiveXObject("Scripting.FileSystemObject");
+  var ts = fso.OpenTextFile(filepath, 2, true, -1);
+  var root = doc.createElement("properties");
+  for (var key in key_defvalues) {
+    var el = doc.createElement("property");
+    var val = regRead(REGKEY_PATH + key, key_defvalues[key]);
+    var cdata = doc.createCDATASection(val);
+    el.appendChild(cdata);
+    el.setAttribute("name", REGKEY_PATH + key);
+    el.setAttribute("type", typeof val);
+    root.appendChild(el);
+  }
+  doc.appendChild(root);
+  ts.Write(doc.xml);
+  ts.Close();
+}
+
+function importSettingsFromXMLFile(filepath) {
+  var fso = new ActiveXObject("Scripting.FileSystemObject");
+  var ts = fso.OpenTextFile(filepath, 1, true, -1);
+  var xml = ts.ReadAll();
+  var doc = new ActiveXObject("MSXML2.DOMDocument");
+  doc.async = false;
+  doc.loadXML(xml);
+  ts.Close();
+  var nodes = doc.documentElement.childNodes;
+  for (var i = 0; i < nodes.length; i++) {
+    regWrite(nodes[i].getAttribute("name"), nodes[i].text, (nodes[i].getAttribute("type") === "string") ? "REG_SZ" : "REG_DWORD");
+  }
 }
 
 </script>
@@ -776,7 +802,7 @@ function importSettingsFromXMLFile(filepath)
         var ts = fso.OpenTextFile(filepath, 1, true, -1);
         var xml = ts.ReadAll();
         var doc = new ActiveXObject("MSXML2.DOMDocument");
-        doc.async = false
+        doc.async = false;
         doc.loadXML(xml);
         ts.Close();
         var nodes = doc.documentElement.childNodes;
@@ -888,33 +914,35 @@ function importSettingsFromXMLFile(filepath)
       }
 
       function onlyNumeric() {
-        var k = event.keyCode;
+        var ev = event;
+        var k = ev.keyCode;
 
-        if (event.shiftKey) {
+        if (ev.shiftKey) {
           if (k == 37 || k == 39) {
             return true;
           }
-        } else if (event.altKey) {
+        } else if (ev.altKey) {
           return true;
-        } else if (event.ctrlKey) {
+        } else if (ev.ctrlKey) {
           return true;
         } else if (k == 8 || k == 9 || k == 37 || k == 39 || k == 46 /* || k == 144 */
             || (48 <= k && k <= 57) || (96 <= k && k <= 105)) {
           return true;
         }
 
-        event.returnValue = false;
+        ev.returnValue = false;
         return false;
       }
 
       function onPaste() {
-        var paste = (event.clipboardData || window.clipboardData).getData("text");
+        var ev = event;
+        var paste = (ev.clipboardData || window.clipboardData).getData("text");
         if (!paste.match(/^[0-9]{0,4}$/)) {
           paste = "";
-          if (event.preventDefault) {
-              event.preventDefault();
+          if (ev.preventDefault) {
+              ev.preventDefault();
           }
-          event.returnValue = false;
+          ev.returnValue = false;
           return false;
         } else {
           return true;
@@ -923,66 +951,66 @@ function importSettingsFromXMLFile(filepath)
     </script>
   </head>
   <body onload="onload();">
-		<div class="container">
-			<ul>
-				<li>
-					<input id="chkUnpackToFolder" type="checkbox" onclick="chkUnpackToFolder_onclick();"/>
-					<label for="chkUnpackToFolder">${Extract workbook data to multiple files}</label>
-				</li>
-				<li>
-					<input id="chkUpdateLinks" type="checkbox" />
-					<label for="chkUpdateLinks">${Update external references(links)}</label>
-				</li>
-				<li>
-					<input id="chkCompareDocumentProperties" type="checkbox" />
-					<label for="chkCompareDocumentProperties">${Compare document properties}</label>
-				</li>
-				<li>
-					<input id="chkCompareNames" type="checkbox" />
-					<label for="chkCompareNames">${Compare names}</label>
-				</li>
-				<li>
-					<input id="chkCompareCellValues" type="checkbox" />
-					<label for="chkCompareCellValues">${Compare cell values}</label>
-				</li>
-				<li>
-					<input id="chkCompareWorksheetsAsImage" type="checkbox" onclick="chkCompareWorksheetsAsImage_onclick();"/>
-					<label for="chkCompareWorksheetsAsImage">${Compare worksheets as image (very slow)}</label>
-					<ul>
-						<li>
-							<label>${ - Image split size: }</label>
-							<input id="txtImageWidth"  type="text" size="5" maxlength="4" onkeyDown="return onlyNumeric();" onpaste="return onPaste();" />
-							<span> x </span>
-							<input id="txtImageHeight" type="text" size="5" maxlength="4" onkeyDown="return onlyNumeric();" onpaste="return onPaste();" />
-						</li>
-					</ul>
-				</li>
-				<li>
-					<input id="chkCompareWorksheetsAsHTML" type="checkbox" onclick="chkCompareWorksheetsAsHTML_onclick();"/>
-					<label for="chkCompareWorksheetsAsHTML">${Compare worksheets as HTML}</label>
-				</li>
-				<li>
-					<input id="chkCompareFormulas" type="checkbox" />
-					<label for="chkCompareFormulas">${Compare formulas}</label>
-				</li>
-				<li>
-					<input id="chkCompareTextsInShapes" type="checkbox" />
-					<label for="chkCompareTextsInShapes">${Compare texts in shapes}</label>
-				</li>
-				<li>
-					<input id="chkCompareHeadersAndFooters" type="checkbox" />
-					<label for="chkCompareHeadersAndFooters">${Compare headers and footers}</label>
-				</li>
-				<li>
-					<input id="chkCompareVBAMacros" type="checkbox" />
-					<label for="chkCompareVBAMacros">${Compare VBA macros}</label>
-				</li>
-			</ul>
-			<div class="btn-container">
-				<input type="button" class="btn-ok" onclick="btnOk_onclick();" value="${OK}" />
-				<input type="button" class="btn-cancel" onclick="btnCancel_onclick();" value="${Cancel}" />
-			</div>
-		</div>
+    <div class="container">
+      <ul>
+        <li>
+          <input id="chkUnpackToFolder" type="checkbox" onclick="chkUnpackToFolder_onclick();"/>
+          <label for="chkUnpackToFolder">${Extract workbook data to multiple files}</label>
+        </li>
+        <li>
+          <input id="chkUpdateLinks" type="checkbox" />
+          <label for="chkUpdateLinks">${Update external references(links)}</label>
+        </li>
+        <li>
+          <input id="chkCompareDocumentProperties" type="checkbox" />
+          <label for="chkCompareDocumentProperties">${Compare document properties}</label>
+        </li>
+        <li>
+          <input id="chkCompareNames" type="checkbox" />
+          <label for="chkCompareNames">${Compare names}</label>
+        </li>
+        <li>
+          <input id="chkCompareCellValues" type="checkbox" />
+          <label for="chkCompareCellValues">${Compare cell values}</label>
+        </li>
+        <li>
+          <input id="chkCompareWorksheetsAsImage" type="checkbox" onclick="chkCompareWorksheetsAsImage_onclick();"/>
+          <label for="chkCompareWorksheetsAsImage">${Compare worksheets as image (very slow)}</label>
+          <ul>
+            <li>
+              <label>${ - Image split size: }</label>
+              <input id="txtImageWidth"  type="text" size="5" maxlength="4" onkeyDown="return onlyNumeric();" onpaste="return onPaste();" />
+              <span> x </span>
+              <input id="txtImageHeight" type="text" size="5" maxlength="4" onkeyDown="return onlyNumeric();" onpaste="return onPaste();" />
+            </li>
+          </ul>
+        </li>
+        <li>
+          <input id="chkCompareWorksheetsAsHTML" type="checkbox" onclick="chkCompareWorksheetsAsHTML_onclick();"/>
+          <label for="chkCompareWorksheetsAsHTML">${Compare worksheets as HTML}</label>
+        </li>
+        <li>
+          <input id="chkCompareFormulas" type="checkbox" />
+          <label for="chkCompareFormulas">${Compare formulas}</label>
+        </li>
+        <li>
+          <input id="chkCompareTextsInShapes" type="checkbox" />
+          <label for="chkCompareTextsInShapes">${Compare texts in shapes}</label>
+        </li>
+        <li>
+          <input id="chkCompareHeadersAndFooters" type="checkbox" />
+          <label for="chkCompareHeadersAndFooters">${Compare headers and footers}</label>
+        </li>
+        <li>
+          <input id="chkCompareVBAMacros" type="checkbox" />
+          <label for="chkCompareVBAMacros">${Compare VBA macros}</label>
+        </li>
+      </ul>
+      <div class="btn-container">
+        <input type="button" class="btn-ok" onclick="btnOk_onclick();" value="${OK}" />
+        <input type="button" class="btn-cancel" onclick="btnCancel_onclick();" value="${Cancel}" />
+      </div>
+    </div>
   </body>
 </html>
 ]]>
diff --git a/Plugins/dlls/CompareMSPowerPointFiles.sct b/Plugins/dlls/CompareMSPowerPointFiles.sct
index b2009d16191..4a13d171255 100644
--- a/Plugins/dlls/CompareMSPowerPointFiles.sct
+++ b/Plugins/dlls/CompareMSPowerPointFiles.sct
@@ -1,418 +1,423 @@
 <scriptlet>
 <implements type="Automation" id="dispatcher">
-	<property name="PluginEvent">
-		<get/>
-	</property>
-	<property name="PluginDescription">
-		<get/>
-	</property>
-	<property name="PluginFileFilters">
-		<get/>
-	</property>
-	<property name="PluginIsAutomatic">
-		<get/>
-	</property>
-	<property name="PluginExtendedProperties">
-		<get/>
-	</property>
-	<method name="PluginOnEvent"/>
-	<method name="UnpackFile"/>
-	<method name="PackFile"/>
-	<method name="IsFolder"/>
-	<method name="UnpackFolder"/>
-	<method name="PackFolder"/>
-	<method name="ShowSettingsDialog"/>
+  <property name="PluginEvent">
+    <get/>
+  </property>
+  <property name="PluginDescription">
+    <get/>
+  </property>
+  <property name="PluginFileFilters">
+    <get/>
+  </property>
+  <property name="PluginIsAutomatic">
+    <get/>
+  </property>
+  <property name="PluginExtendedProperties">
+    <get/>
+  </property>
+  <method name="PluginOnEvent"/>
+  <method name="UnpackFile"/>
+  <method name="PackFile"/>
+  <method name="IsFolder"/>
+  <method name="UnpackFolder"/>
+  <method name="PackFolder"/>
+  <method name="ShowSettingsDialog"/>
 </implements>
 
-<script language="VBS">
-
-'/////////////////////////////////////////////////////////////////////////////
-'    This is a plugin for WinMerge.
-'    It will display the text content of MS PowerPoint files.
-'    Copyright (C) 2016-2023 Takashi Sawanaka
-'
-'    This program is free software; you can redistribute it and/or modify
-'    it under the terms of the GNU General Public License as published by
-'    the Free Software Foundation; either version 2 of the License, or
-'    (at your option) any later version.
-'
-'    This program is distributed in the hope that it will be useful,
-'    but WITHOUT ANY WARRANTY; without even the implied warranty of
-'    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-'    GNU General Public License for more details.
-'
-'    You should have received a copy of the GNU General Public License
-'    along with this program; if not, write to the Free Software
-'    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-'
-
-Option Explicit
-
-Const RegKeyPath = "Plugins\CompareMSPowerPointFiles.sct/"
-Dim MsgCannotGetMacros
-MsgCannotGetMacros = "${Cannot get Macros." & vbCrLf & _
-	"   To allow WinMerge to compare macros, use MS Office to alter the settings in the Macro Security for the current application." & vbCrLf & _
-	"   The Trust access to Visual Basic Project feature should be turned on to use this feature in WinMerge." & vbCrLf & "}"
-
-Dim fso: Set fso = CreateObject("Scripting.FileSystemObject")
-Dim wsh: Set wsh = CreateObject("WScript.Shell")
-Dim mergeApp
-
-Function isAccessibleVBAProject(prs)
-	Dim count
-	count = -1
-	On Error Resume Next
-	count = prs.VBProject.VBComponents.Count
-	isAccessibleVBAProject = (count > 0)
-End Function
-
-Function regRead(Key, DefaultValue)
-	regRead = DefaultValue
-	On Error Resume Next
-	If IsEmpty(mergeApp) Then
-		regRead = wsh.RegRead("HKCU\Software\Thingamahoochie\WinMerge\" & Replace(Key, "/", "\"))
-	Else
-		regRead = mergeApp.GetOption(Key, DefaultValue)
-	End If
-End Function
-
-Sub regWrite(Key, Value, TypeNm)
-	Dim tmp
-	On Error Resume Next
-	If IsEmpty(mergeApp) Then
-		wsh.RegWrite "HKCU\Software\Thingamahoochie\WinMerge\" &  Replace(Key, "/", "\"), Value, TypeNm
-	Else
-		If TypeNm = "REG_DWORD" Then
-			tmp = CLng(Value)
-		Else
-			tmp = CStr(Value)
-		End If
-		mergeApp.SaveOption Key, tmp
-	End If
-End Sub
-
-Function writeObjectProperties(fo, items)
-	On Error Resume Next
-	Dim o
-	For Each o In items
-		fo.WriteLine o.Name & ": " & o.Value
-	Next
-End Function
-
-Function writeShape(fo, shp)
-	Dim shp2, shpType, r, c
-	On Error Resume Next
-	shpType = -1
-	shpType = shp.Type
-	fo.Write shp.Name & ": "
-	If shp.HasTable Then
-		For r = 1 To shp.Table.Rows.Count
-			For c = 1 To shp.Table.Columns.Count
-				fo.Write "(" & r & ", " & c & "): "
-				writeShape fo, shp.Table.Cell(r, c).Shape
-			Next
-		Next
-	ElseIf shpType = 6 Then 'msoGroup = 6
-		For Each shp2 In shp.GroupItems
-		    writeShape fo, shp2
-		Next
-	ElseIf shp.HasTextFrame Then
-		fo.WriteLine shp.TextFrame.TextRange.Characters.Text
-	Else
-		fo.WriteLine ""
-	End If
-End Function
-
-Function writeTextsInShapes(fo, shps)
-	Dim shp
-	On Error Resume Next
-	For Each shp In shps
-		writeShape fo, shp
-	Next
-	On Error GoTo 0
-End Function
-
-Function getModuleExtension(cmp)
-	Select Case cmp.Type
-	Case 2
-		getModuleExtension = ".cls"
-	Case 3
-		getModuleExtension = ".frm"
-	Case Else
-		getModuleExtension = ".bas"
-	End Select
-End Function
-
-Function saveSlideAsImage(sld, filename)
-        sld.Export filename, "PNG"
-End Function
-
-Function get_PluginEvent()
-	get_PluginEvent = "FILE_FOLDER_PACK_UNPACK"
-End Function
-
-Function get_PluginDescription()
-	get_PluginDescription = "Display the text content of MS PowerPoint files"
-End Function
-
-Function get_PluginFileFilters()
-	get_PluginFileFilters = "\.ppt(\..*)?$;\.pptx(\..*)?$;\.pptm(\..*)?$;\.ppa(\..*)?$;\.ppam(\..*)?$;\.potx(\..*)?$;\.potm(\..*)?$"
-End Function
-
-Function get_PluginIsAutomatic()
-	get_PluginIsAutomatic = True
-End Function
-
-Function get_PluginExtendedProperties()
-	get_PluginExtendedProperties = "ProcessType=Content Extraction;FileType=MS-PowerPoint;MenuCaption=MS-PowerPoint"
-End Function
-
-Sub PluginOnEvent(eventType, obj)
-	Set mergeApp = obj
-End Sub
-
-Function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode)
-	Dim fo
-	Dim pp
-	Dim prs
-	Dim sld
-	Dim cmp
-	Dim fileSrc2
-
-	Set fo = fso.CreateTextFile(fileDst, True, True)
-
-	Set pp = CreateObject("PowerPoint.Application")
-	pp.Visible = True
-	pp.DisplayAlerts = False
-
-	fileSrc2 = fileSrc
-	If fso.GetExtensionName(fileSrc2) = "lnk" Then
-		fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath
-		If Not fso.FileExists(fileSrc2) Then
-			Err.Raise 30001, "CompareMSPowerPointFiles.sct", fileSrc & ": Target file '" & fileSrc2 & "' not found"
-		End If 
-	End If
-	Set prs = pp.Presentations.Open(fileSrc2)
-
-	On Error Resume Next
-
-	If regRead(RegKeyPath & "CompareDocumentProperties", False) Then
-		fo.WriteLine "[Document Properties]"
-		writeObjectProperties fo, prs.BuiltinDocumentProperties
-		fo.WriteLine ""
-	End If
-
-	For Each sld In prs.Slides
-		If regRead(RegKeyPath & "CompareTextsInShapes", True) Then
-			fo.WriteLine "[" & sld.Name & "]"
-			writeTextsInShapes fo, sld.Shapes
-			fo.WriteLine ""
-		End If
-		If regRead(RegKeyPath & "CompareTextsInNotesPage", True) Then
-			fo.WriteLine "[" & sld.Name & ".NotesPage]"
-			writeTextsInShapes fo, sld.NotesPage.Shapes
-			fo.WriteLine ""
-		End If
-	Next
-
-	If regRead(RegKeyPath & "CompareVBAMacros", True) Then
-		If Not isAccessibleVBAProject(prs) Then
-			fo.WriteLine Translate(MsgCannotGetMacros)
-		End If
-		For Each cmp In prs.VBProject.VBComponents
-			fo.WriteLine "[CodeModule." & cmp.Name & "]"
-			If cmp.CodeModule.CountOfLines > 0 Then
-				fo.WriteLine cmp.CodeModule.Lines(1, cmp.CodeModule.CountOfLines)
-			End If
-			fo.WriteLine ""
-		Next
-	End If
-
-	Set sld = Nothing
-	prs.Close
-	Set prs = Nothing
-	pp.Quit
-	Set pp = Nothing
-	fo.Close
-	Set fo = Nothing
-
-	pbChanged = True
-	pSubcode = 0
-	UnpackFile = True
-
-End Function
-
-Function PackFile(fileSrc, fileDst, pbChanged, pSubcode)
-	PackFile = False
-End Function
-
-Function IsFolder(file)
-	IsFolder = regRead(RegKeyPath & "UnpackToFolder", False)
-End Function
-
-Function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode)
-	Dim fo
-	Dim pp
-	Dim prs
-	Dim sld
-	Dim cmp
-	Dim fileSrc2
-
-	If Not fso.FolderExists(folderDst) Then fso.CreateFolder folderDst
-
-	Set pp = CreateObject("PowerPoint.Application")
-	pp.Visible = True
-	pp.DisplayAlerts = False
-
-	fileSrc2 = fileSrc
-	If fso.GetExtensionName(fileSrc2) = "lnk" Then
-		fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath
-		If Not fso.FileExists(fileSrc2) Then
-			Err.Raise 30001, "CompareMSPowerPointFiles.sct", fileSrc & ": Target file '" & fileSrc2 & "' not found"
-		End If 
-	End If
-	Set prs = pp.Presentations.Open(fileSrc2)
-
-	On Error Resume Next
-
-	If regRead(RegKeyPath & "CompareDocumentProperties", False) Then
-		Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(0)DocumentProperties.txt"), True, True)
-		writeObjectProperties fo, prs.BuiltinDocumentProperties
-		fo.Close
-	End If
-
-	For Each sld In prs.Slides
-		If regRead(RegKeyPath & "CompareTextsInShapes", True) Then
-			Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, sld.Name & ".txt"), True, True)
-			writeTextsInShapes fo, sld.Shapes
-			fo.Close
-		End If
-
-		If regRead(RegKeyPath & "CompareTextsInNotesPage", True) Then
-			Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, sld.Name & "_NotesPage.txt"), True, True)
-			writeTextsInShapes fo, sld.NotesPage.Shapes
-			fo.Close
-		End If
-
-		If regRead(RegKeyPath & "CompareSlideAsImage", True) Then
-			saveSlideAsImage sld, fso.BuildPath(folderDst, sld.Name & ".png")
-		End If
-	Next
-	If regRead(RegKeyPath & "CompareVBAMacros", True) Then
-		If Not isAccessibleVBAProject(prs) Then
-			Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, "CannotGetMacros.bas"), True, True)
-			fo.WriteLine Translate(MsgCannotGetMacros)
-			fo.Close
-		End If
-		
-		For Each cmp In prs.VBProject.VBComponents
-			cmp.Export fso.BuildPath(folderDst, cmp.Name & getModuleExtension(cmp))
-		Next
-	End If
-
-	Set sld = Nothing
-	prs.Close
-	Set prs = Nothing
-	pp.Quit
-	Set pp = Nothing
-	Set fo = Nothing
-
-	pbChanged = True
-	pSubcode = 0
-	UnpackFolder = True
-End Function
-
-Function PackFolder(fileSrc, folderDst, pbChanged, pSubcode)
-	PackFolder = False
-End Function
-
-Function Translate(text)
-	Dim re: Set re = CreateObject("VBScript.RegExp")
-	re.Pattern = "\${([^}]+)}"
-	re.Global = True
-	Translate = text
-	Dim match
-	Dim matches:Set matches = re.Execute(text)
-	if IsEmpty(mergeApp) Then
-		For Each match in matches
-			Translate = Replace(Translate, match.Value, match.Submatches(0))
-		Next
-	Else
-		For Each match in matches
-			Translate = Replace(Translate, match.Value, mergeApp.Translate(match.Submatches(0)))
-		Next
-	End If
-End Function
-
-Function ShowSettingsDialog()
-	Dim tname: tname = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() & ".hta")
-	Dim xmlfile: xmlfile = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() & ".xml")
-	Dim tfile: Set tfile = fso.CreateTextFile(tname, True, True)
-	Dim mshta
-	tfile.Write Translate(getResource("dialog1"))
-	tfile.Close
-	exportSettingsToXMLFile xmlfile
-	mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\System32\mshta.exe")
-	If Not fso.FileExists(mshta) Then
-		mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\SysWOW64\mshta.exe")
-	End If
-	Run wsh, """" & mshta & """ """ & tname & """  """ & xmlfile  & """"
-	importSettingsFromXMLFile xmlfile
-	fso.DeleteFile tname
-	fso.DeleteFile xmlfile
-End Function
-
-Sub Run(sh, cmd)
-	sh.Run cmd, 1, True
-End Sub
+<script language="JScript">
 
-</script>
+/*
+    This is a plugin for WinMerge.
+    It will display the text content of MS PowerPoint files.
+    Copyright (C) 2016-2024 Takashi Sawanaka
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
 
-<script language="JScript">
 
 var REGKEY_PATH = "Plugins\\CompareMSPowerPointFiles.sct/";
+var MsgCannotGetMacros = "${Cannot get Macros.\r\n" +
+  "   To allow WinMerge to compare macros, use MS Office to alter the settings in the Macro Security for the current application.\r\n" +
+  "   The Trust access to Visual Basic Project feature should be turned on to use this feature in WinMerge.\r\n}";
+
+var fso = new ActiveXObject("Scripting.FileSystemObject");
+var wsh = new ActiveXObject("WScript.Shell");
+var mergeApp;
+
+function isAccessibleVBAProject(prs) {
+  try {
+    return (prs.VBProject.VBComponents.Count >= 0);
+  } catch (e) {
+    return false;
+  }
+}
+
+function regRead(Key, DefaultValue) {
+  return mergeApp.GetOption(Key, DefaultValue);
+}
+
+function regWrite(Key, Value, TypeNm) {
+  mergeApp.SaveOption(Key, (TypeNm === "REG_DWORD") ? parseInt(Value) : String(Value));
+}
+
+function toString(val) {
+  switch (typeof val) {
+  case "string":
+    return val;
+  case "number":
+    return val.toString();
+  case "date":
+    var d = new Date(val);
+    if (d.getHours() == 0 && d.getMinutes() == 0 && d.getSeconds() == 0 && d.getMilliseconds() == 0) {
+        return d.toLocaleDateString();
+    }
+    return d.toLocaleString();
+  case "undefined":
+    return "";
+  default:
+    return String(val);
+  }
+}
+
+function writeObjectProperties(fo, items) {
+  try {
+    for (var it = new Enumerator(items); !it.atEnd(); it.moveNext()) {
+      try {
+        var o = it.item();
+        fo.WriteLine(o.Name + ": " + toString(o.Value));
+      } catch (e) {}
+    }
+  } catch (e) {}
+}
+
+function writeShape(fo, shp) {
+  var shpType = -1;
+  try {
+    shpType = shp.Type;
+    fo.Write(shp.Name + ": ");
+    if (shp.HasTable) {
+      for (var r = 1; r <= shp.Table.Rows.Count; r++) {
+        for (var c = 1; c <= shp.Table.Columns.Count; c++) {
+          fo.Write("(" + r + ", " + c + "): ");
+          writeShape(fo, shp.Table.Cell(r, c).Shape);
+        }
+      }
+    } else if (shpType === 6) { //msoGroup = 6
+      for (var it = new Enumerator(shp.GroupItems); !it.atEnd(); it.moveNext()) {
+        var shp2 = it.item();
+        writeShape(fo, shp2);
+      }
+    } else if (shp.HasTextFrame) {
+      fo.WriteLine(shp.TextFrame.TextRange.Characters().Text);
+    } else {
+      fo.WriteLine("");
+    }
+  } catch (e) {}
+}
+
+function writeTextsInShapes(fo, p) {
+  try {
+    for (var it = new Enumerator(p.Shapes); !it.atEnd(); it.moveNext()) {
+      var shp = it.item();
+      writeShape(fo, shp);
+      shp = null;
+    }
+  } catch (e) {}
+}
+
+function getModuleExtension(cmp) {
+  switch (cmp.Type) {
+  case 2:
+    return ".cls";
+  case 3:
+    return ".frm";
+  default:
+    return ".bas";
+  }
+}
+
+function saveSlideAsImage(sld, filename) {
+  sld.Export(filename, "PNG");
+}
+
+function get_PluginEvent() {
+  return "FILE_FOLDER_PACK_UNPACK";
+}
+
+function get_PluginDescription() {
+  return "Display the text content of MS PowerPoint files";
+}
+
+function get_PluginFileFilters() {
+  return "\\.ppt(\\..*)?$;\\.pptx(\\..*)?$;\\.pptm(\\..*)?$;\\.ppa(\\..*)?$;\\.ppam(\\..*)?$;\\.potx(\\..*)?$;\\.potm(\\..*)?$";
+}
+
+function get_PluginIsAutomatic() {
+  return true;
+}
+
+function get_PluginExtendedProperties() {
+  return "ProcessType=Content Extraction;FileType=MS-PowerPoint;MenuCaption=MS-PowerPoint";
+}
+
+function PluginOnEvent(eventType, obj) {
+  mergeApp = obj;
+}
+
+function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
+  var fo = fso.CreateTextFile(fileDst, true, true);
+  var pp;
+  try {
+    pp = new ActiveXObject("PowerPoint.Application");
+  } catch (e) {}
+  if (!pp) {
+    throw new Error(30001, translate("${%1 is not installed.}").replace("%1", "PowerPoint"));
+  }
+  pp.Visible = true;
+  pp.DisplayAlerts = false;
+
+  var fileSrc2 = fileSrc;
+  if (fso.GetExtensionName(fileSrc2) === "lnk") {
+    fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath;
+    if (!fso.FileExists(fileSrc2)) {
+      throw new Error(30001, "CompareMSPowerPointFiles.sct: " + fileSrc + ": Target file '" + fileSrc2 + "' not found");
+    } 
+  }
+
+  var prs = pp.Presentations.Open(fileSrc2, -1);
+
+  if (regRead(REGKEY_PATH + "CompareDocumentProperties", false)) {
+    fo.WriteLine("[Document Properties]");
+    writeObjectProperties(fo, prs.BuiltinDocumentProperties);
+    fo.WriteLine("");
+  }
+ 
+  for (var it = new Enumerator(prs.Slides); !it.atEnd(); it.moveNext()) {
+      var sld = it.item();
+    if (regRead(REGKEY_PATH + "CompareTextsInShapes", true)) {
+      fo.WriteLine("[" + sld.Name + "]");
+      writeTextsInShapes(fo, sld);
+      fo.WriteLine("");
+    }
+    if (regRead(REGKEY_PATH + "CompareTextsInNotesPage", true)) {
+      fo.WriteLine("[" + sld.Name + ".NotesPage]");
+      writeTextsInShapes(fo, sld.NotesPage);
+      fo.WriteLine("");
+    }
+    sld = null;
+  }
+ 
+  if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
+    if (!isAccessibleVBAProject(prs)) {
+      fo.WriteLine(translate(MsgCannotGetMacros));
+    } else {
+      for (var it = new Enumerator(prs.VBProject.VBComponents); !it.atEnd(); it.moveNext()) {
+        var cmp = it.item();
+        fo.WriteLine("[CodeModule." + cmp.Name + "]");
+        if (cmp.CodeModule.CountOfLines > 0) {
+          fo.WriteLine(cmp.CodeModule.Lines(1, cmp.CodeModule.CountOfLines));
+        }
+        fo.WriteLine("");
+        cmp = null;
+      }
+    }
+  }
+
+  prs.Saved = true;
+  prs.Close();
+  prs = null;
+  pp.Quit();
+  pp = null;
+  fo.Close();
+  fo = null;
+
+  pbChanged = true;
+  pSubcode = 0;
+
+  CollectGarbage();
+
+  var result = new ActiveXObject("Scripting.Dictionary");
+  result.Add(0, true);
+  result.Add(1, pbChanged);
+  result.Add(2, pSubcode);
+  return result.Items();
+}
 
-function exportSettingsToXMLFile(filepath)
-{
-	var key_defvalues = {
-		"UnpackToFolder" : false,
-		"CompareDocumentProperties" : false,
-		"CompareSlideAsImage" : true,
-		"CompareTextsInShapes" : true,
-		"CompareTextsInNotesPage" : true,
-		"CompareVBAMacros" : true
-	};
-	var doc = new ActiveXObject("MSXML2.DOMDocument");
-	var fso = new ActiveXObject("Scripting.FileSystemObject");
-	var ts = fso.OpenTextFile(filepath, 2, true, -1);
-	var root = doc.createElement("properties");
-	for (var key in key_defvalues) {
-		var el = doc.createElement("property");
-		var val = regRead(REGKEY_PATH + key, key_defvalues[key]);
-		var cdata = doc.createCDATASection(val);
-		el.appendChild(cdata);
-		el.setAttribute("name", REGKEY_PATH + key);
-		el.setAttribute("type", typeof val);
-		root.appendChild(el);
-	}
-	doc.appendChild(root);
-	ts.Write(doc.xml);
-	ts.Close();
+function PackFile(fileSrc, fileDst, pbChanged, pSubcode) {
+  return false;
 }
 
-function importSettingsFromXMLFile(filepath)
-{
-	var fso = new ActiveXObject("Scripting.FileSystemObject");
-	var ts = fso.OpenTextFile(filepath, 1, true, -1);
-	var xml = ts.ReadAll();
-	var doc = new ActiveXObject("MSXML2.DOMDocument");
-	doc.async = false
-	doc.loadXML(xml);
-	ts.Close();
-	var nodes = doc.documentElement.childNodes;
-	for (var i = 0; i < nodes.length; i++) {
-		regWrite(nodes[i].getAttribute("name"), nodes[i].text, (nodes[i].getAttribute("type") === "string") ? "REG_SZ" : "REG_DWORD");
-	}
+function IsFolder(file) {
+  return regRead(REGKEY_PATH + "UnpackToFolder", false);
+}
+
+function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
+  if (!fso.FolderExists(folderDst)) { fso.CreateFolder(folderDst); }
+  var pp;
+  try {
+    pp = new ActiveXObject("PowerPoint.Application");
+  } catch (e) {}
+  if (!pp) {
+    throw new Error(30001, translate("${%1 is not installed.}").replace("%1", "PowerPoint"));
+  }
+  pp.Visible = true;
+  pp.DisplayAlerts = false;
+
+  var fileSrc2 = fileSrc;
+  if (fso.GetExtensionName(fileSrc2) === "lnk") {
+    fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath;
+    if (!fso.FileExists(fileSrc2)) {
+      throw new Error(30001, "CompareMSPowerPointFiles.sct: " + fileSrc + ": Target file '" + fileSrc2 + "' not found");
+    } 
+  }
+  var prs = pp.Presentations.Open(fileSrc2, -1);
+
+  if (regRead(REGKEY_PATH + "CompareDocumentProperties", false)) {
+    var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(0)DocumentProperties.txt"), true, true);
+    writeObjectProperties(fo, prs.BuiltinDocumentProperties);
+    fo.Close();
+    fo = null;
+  }
+ 
+  for (var it = new Enumerator(prs.Slides); !it.atEnd(); it.moveNext()) {
+    var sld = it.item();
+    if (regRead(REGKEY_PATH + "CompareTextsInShapes", true)) {
+      var fo = fso.CreateTextFile(fso.BuildPath(folderDst, sld.Name + ".txt"), true, true);
+      writeTextsInShapes(fo, sld);
+      fo.Close();
+      fo = null;
+    }
+ 
+    if (regRead(REGKEY_PATH + "CompareTextsInNotesPage", true)) {
+      var fo = fso.CreateTextFile(fso.BuildPath(folderDst, sld.Name + "_NotesPage.txt"), true, true);
+      writeTextsInShapes(fo, sld.NotesPage);
+      fo.Close();
+      fo = null;
+    }
+ 
+    if (regRead(REGKEY_PATH + "CompareSlideAsImage", true)) {
+      saveSlideAsImage(sld, fso.BuildPath(folderDst, sld.Name + ".png"));
+    }
+    sld = null;
+  }
+  if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
+    if (!isAccessibleVBAProject(prs)) {
+      var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "CannotGetMacros.bas"), true, true);
+      fo.WriteLine(translate(MsgCannotGetMacros));
+      fo.Close();
+      fo = null;
+    } else {
+      for (var it = new Enumerator(prs.VBProject.VBComponents); !it.atEnd(); it.moveNext()) {
+        var cmp = it.item();
+        cmp.Export(fso.BuildPath(folderDst, cmp.Name + getModuleExtension(cmp)));
+        cmp = nul;
+      }
+    }
+  }
+
+  prs.Saved = true;
+  prs.Close();
+  prs = null;
+  pp.Quit();
+  pp = null;
+
+  pbChanged = true;
+  pSubcode = 0;
+
+  CollectGarbage();
+
+  var result = new ActiveXObject("Scripting.Dictionary");
+  result.Add(0, true);
+  result.Add(1, pbChanged);
+  result.Add(2, pSubcode);
+  return result.Items();
+}
+
+function PackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
+  return false;
+}
+
+function translate(text) {
+  var re = /\${([^}]+)}/g;
+  var matches;
+  while ((matches = re.exec(text)) != null) {
+    text = text.replace(matches[0], mergeApp.Translate(matches[1]));
+  }
+  return text;
+}
+
+function ShowSettingsDialog() {
+  var tname = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() + ".hta");
+  var xmlfile = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() + ".xml");
+  var tfile = fso.CreateTextFile(tname, true, true);
+  tfile.Write(translate(getResource("dialog1")));
+  tfile.Close();
+  exportSettingsToXMLFile(xmlfile);
+  var mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\\System32\\mshta.exe");
+  if (!fso.FileExists(mshta)) {
+    mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\\SysWOW64\\mshta.exe");
+  }
+  run(wsh, "\"" + mshta + "\" \"" + tname + "\"  \"" + xmlfile + "\"");
+  importSettingsFromXMLFile(xmlfile);
+  fso.DeleteFile(tname);
+  fso.DeleteFile(xmlfile);
+}
+
+function run(sh, cmd) {
+  sh.Run(cmd, 1, true);
+}
+
+function exportSettingsToXMLFile(filepath) {
+  var key_defvalues = {
+    "UnpackToFolder" : false,
+    "CompareDocumentProperties" : false,
+    "CompareSlideAsImage" : true,
+    "CompareTextsInShapes" : true,
+    "CompareTextsInNotesPage" : true,
+    "CompareVBAMacros" : true
+  };
+  var doc = new ActiveXObject("MSXML2.DOMDocument");
+  var fso = new ActiveXObject("Scripting.FileSystemObject");
+  var ts = fso.OpenTextFile(filepath, 2, true, -1);
+  var root = doc.createElement("properties");
+  for (var key in key_defvalues) {
+    var el = doc.createElement("property");
+    var val = regRead(REGKEY_PATH + key, key_defvalues[key]);
+    var cdata = doc.createCDATASection(val);
+    el.appendChild(cdata);
+    el.setAttribute("name", REGKEY_PATH + key);
+    el.setAttribute("type", typeof val);
+    root.appendChild(el);
+  }
+  doc.appendChild(root);
+  ts.Write(doc.xml);
+  ts.Close();
+}
+
+function importSettingsFromXMLFile(filepath) {
+  var fso = new ActiveXObject("Scripting.FileSystemObject");
+  var ts = fso.OpenTextFile(filepath, 1, true, -1);
+  var xml = ts.ReadAll();
+  var doc = new ActiveXObject("MSXML2.DOMDocument");
+  doc.async = false;
+  doc.loadXML(xml);
+  ts.Close();
+  var nodes = doc.documentElement.childNodes;
+  for (var i = 0; i < nodes.length; i++) {
+    regWrite(nodes[i].getAttribute("name"), nodes[i].text, (nodes[i].getAttribute("type") === "string") ? "REG_SZ" : "REG_DWORD");
+  }
 }
 
 </script>
@@ -455,7 +460,7 @@ function importSettingsFromXMLFile(filepath)
         var ts = fso.OpenTextFile(filepath, 1, true, -1);
         var xml = ts.ReadAll();
         var doc = new ActiveXObject("MSXML2.DOMDocument");
-        doc.async = false
+        doc.async = false;
         doc.loadXML(xml);
         ts.Close();
         var nodes = doc.documentElement.childNodes;
@@ -515,7 +520,6 @@ function importSettingsFromXMLFile(filepath)
         }
       }
 
-
       function chkUnpackToFolder_onclick() {
         if (!chkUnpackToFolder.checked)
           chkCompareSlideAsImage.checked = false;
diff --git a/Plugins/dlls/CompareMSVisioFiles.sct b/Plugins/dlls/CompareMSVisioFiles.sct
index 9afcceaf0bb..31446c91344 100644
--- a/Plugins/dlls/CompareMSVisioFiles.sct
+++ b/Plugins/dlls/CompareMSVisioFiles.sct
@@ -1,374 +1,389 @@
 <scriptlet>
 <implements type="Automation" id="dispatcher">
-	<property name="PluginEvent">
-		<get/>
-	</property>
-	<property name="PluginDescription">
-		<get/>
-	</property>
-	<property name="PluginFileFilters">
-		<get/>
-	</property>
-	<property name="PluginIsAutomatic">
-		<get/>
-	</property>
-	<property name="PluginExtendedProperties">
-		<get/>
-	</property>
-	<method name="PluginOnEvent"/>
-	<method name="UnpackFile"/>
-	<method name="PackFile"/>
-	<method name="IsFolder"/>
-	<method name="UnpackFolder"/>
-	<method name="PackFolder"/>
-	<method name="ShowSettingsDialog"/>
+  <property name="PluginEvent">
+    <get/>
+  </property>
+  <property name="PluginDescription">
+    <get/>
+  </property>
+  <property name="PluginFileFilters">
+    <get/>
+  </property>
+  <property name="PluginIsAutomatic">
+    <get/>
+  </property>
+  <property name="PluginExtendedProperties">
+    <get/>
+  </property>
+  <method name="PluginOnEvent"/>
+  <method name="UnpackFile"/>
+  <method name="PackFile"/>
+  <method name="IsFolder"/>
+  <method name="UnpackFolder"/>
+  <method name="PackFolder"/>
+  <method name="ShowSettingsDialog"/>
 </implements>
 
-<script language="VBS">
-
-'/////////////////////////////////////////////////////////////////////////////
-'    This is a plugin for WinMerge.
-'    It will display the text content of MS Visio files.
-'    Copyright (C) 2020 dedicatus
-'
-'    This program is free software; you can redistribute it and/or modify
-'    it under the terms of the GNU General Public License as published by
-'    the Free Software Foundation; either version 2 of the License, or
-'    (at your option) any later version.
-'
-'    This program is distributed in the hope that it will be useful,
-'    but WITHOUT ANY WARRANTY; without even the implied warranty of
-'    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-'    GNU General Public License for more details.
-'
-'    You should have received a copy of the GNU General Public License
-'    along with this program; if not, write to the Free Software
-'    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-'
-
-Option Explicit
-
-Const RegKeyPath = "Plugins\CompareMSVisioFiles.sct/"
-Dim MsgCannotGetMacros
-MsgCannotGetMacros = "${Cannot get Macros." & vbCrLf & _
-	"   To allow WinMerge to compare macros, use MS Office to alter the settings in the Macro Security for the current application." & vbCrLf & _
-	"   The Trust access to Visual Basic Project feature should be turned on to use this feature in WinMerge." & vbCrLf & "}"
-
-Dim fso: Set fso = CreateObject("Scripting.FileSystemObject")
-Dim wsh: Set wsh = CreateObject("WScript.Shell")
-Dim mergeApp
-
-Function isAccessibleVBAProject(doc)
-	Dim count
-	count = -1
-	On Error Resume Next
-	count = doc.VBProject.VBComponents.Count
-	isAccessibleVBAProject = (count > 0)
-End Function
-
-Function regRead(Key, DefaultValue)
-	regRead = DefaultValue
-	On Error Resume Next
-	If IsEmpty(mergeApp) Then
-		regRead = wsh.RegRead("HKCU\Software\Thingamahoochie\WinMerge\" & Replace(Key, "/", "\"))
-	Else
-		regRead = mergeApp.GetOption(Key, DefaultValue)
-	End If
-End Function
-
-Sub regWrite(Key, Value, TypeNm)
-	Dim tmp
-	On Error Resume Next
-	If IsEmpty(mergeApp) Then
-		wsh.RegWrite "HKCU\Software\Thingamahoochie\WinMerge\" &  Replace(Key, "/", "\"), Value, TypeNm
-	Else
-		If TypeNm = "REG_DWORD" Then
-			tmp = CLng(Value)
-		Else
-			tmp = CStr(Value)
-		End If
-		mergeApp.SaveOption Key, tmp
-	End If
-End Sub
-
-Sub ungroupShapes(pge)
-    On Error Resume Next
-    Dim cnt, shp
-    Do
-        cnt = pge.Shapes.Count
-        For Each shp In pge.Shapes
-            shp.ungroup
-        Next
-    Loop While cnt <> pge.Shapes.Count
-End Sub
-
-Function writeTextsInShapes(fo, pge)
-	Dim shp
-	On Error Resume Next
-	For Each shp In pge.Shapes
-		fo.WriteLine shp.Name & ": " & shp.Text
-	Next
-End Function
-
-Function getModuleExtension(cmp)
-	Select Case cmp.Type
-	Case 2
-		getModuleExtension = ".cls"
-	Case 3
-		getModuleExtension = ".frm"
-	Case Else
-		getModuleExtension = ".bas"
-	End Select
-End Function
-
-Function saveSlideAsImage(pge, filename)
-        pge.Export filename
-End Function
-
-Function get_PluginEvent()
-	get_PluginEvent = "FILE_FOLDER_PACK_UNPACK"
-End Function
-
-Function get_PluginDescription()
-	get_PluginDescription = "Display the text content of MS Visio files"
-End Function
-
-Function get_PluginFileFilters()
-	get_PluginFileFilters = "\.vsd(\..*)?$;\.vsdx(\..*)?$;\.vsdm(\..*)?$;\.vss(\..*)?$;\.vssx(\..*)?$;\.vssm(\..*)?$;\.vst(\..*)?$;\.vstx(\..*)?$;\.vstm(\..*)?$"
-End Function
-
-Function get_PluginIsAutomatic()
-	get_PluginIsAutomatic = True
-End Function
-
-Function get_PluginExtendedProperties()
-	get_PluginExtendedProperties = "ProcessType=Content Extraction;FileType=MS-Visio;MenuCaption=MS-Visio"
-End Function
-
-Sub PluginOnEvent(eventType, obj)
-	Set mergeApp = obj
-End Sub
-
-Function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode)
-	Dim fo
-	Dim vs
-	Dim doc
-	Dim pge
-	Dim cmp
-	Dim fileSrc2
-
-	Set fo = fso.CreateTextFile(fileDst, True, True)
-
-	Set vs = CreateObject("Visio.Application")
-	vs.Visible = False
-	vs.AlertResponse = vbNo
-
-	fileSrc2 = fileSrc
-	If fso.GetExtensionName(fileSrc2) = "lnk" Then
-		fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath
-		If Not fso.FileExists(fileSrc2) Then
-			Err.Raise 30001, "CompareMSVisioFiles.sct", fileSrc & ": Target file '" & fileSrc2 & "' not found"
-		End If 
-	End If
-	Set doc = vs.Documents.OpenEx(fileSrc2, &H80)
-
-	On Error Resume Next
-
-	For Each pge In doc.Pages
-		If regRead(RegKeyPath & "CompareTextsInShapes", True) Then
-			fo.WriteLine "[" & pge.Name & "]"
-			ungroupShapes pge
-			writeTextsInShapes fo, pge
-			fo.WriteLine ""
-		End If
-	Next
-
-	If regRead(RegKeyPath & "CompareVBAMacros", True) Then
-		If Not isAccessibleVBAProject(doc) Then
-			fo.WriteLine Translate(MsgCannotGetMacros)
-		End If
-		For Each cmp In doc.VBProject.VBComponents
-			fo.WriteLine "[CodeModule." & cmp.Name & "]"
-			If cmp.CodeModule.CountOfLines > 0 Then
-				fo.WriteLine cmp.CodeModule.Lines(1, cmp.CodeModule.CountOfLines)
-			End If
-			fo.WriteLine ""
-		Next
-	End If
-
-	Set doc = Nothing
-	pge.Close
-	Set pge = Nothing
-	vs.Quit
-	Set vs = Nothing
-	fo.Close
-	Set fo = Nothing
-
-	pbChanged = True
-	pSubcode = 0
-	UnpackFile = True
-
-End Function
-
-Function PackFile(fileSrc, fileDst, pbChanged, pSubcode)
-	PackFile = False
-End Function
-
-Function IsFolder(file)
-	IsFolder = regRead(RegKeyPath & "UnpackToFolder", False)
-End Function
-
-Function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode)
-	Dim fo
-	Dim vs
-	Dim doc
-	Dim pge
-	Dim cmp
-	Dim fileSrc2
-
-	If Not fso.FolderExists(folderDst) Then fso.CreateFolder folderDst
-
-	Set vs = CreateObject("Visio.Application")
-	vs.Visible = False
-	vs.AlertResponse = vbNo
-
-	fileSrc2 = fileSrc
-	If fso.GetExtensionName(fileSrc2) = "lnk" Then
-		fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath
-		If Not fso.FileExists(fileSrc2) Then
-			Err.Raise 30001, "CompareMSVisioFiles.sct", fileSrc & ": Target file '" & fileSrc2 & "' not found"
-		End If 
-	End If
-	Set doc = vs.Documents.OpenEx(fileSrc2, &H80)
-
-	On Error Resume Next
-
-	For Each pge In doc.Pages
-		If regRead(RegKeyPath & "CompareTextsInShapes", True) Then
-			Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, pge.Name & ".txt"), True, True)
-			ungroupShapes pge
-			writeTextsInShapes fo, pge
-			fo.Close
-		End If
-
-
-		If regRead(RegKeyPath & "ComparePageAsImage", True) Then
-			saveSlideAsImage pge, fso.BuildPath(folderDst, pge.Name & ".png")
-		End If
-	Next
-	If regRead(RegKeyPath & "CompareVBAMacros", True) Then
-		If Not isAccessibleVBAProject(doc) Then
-			Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, "CannotGetMacros.bas"), True, True)
-			fo.WriteLine Translate(MsgCannotGetMacros)
-			fo.Close
-		End If
-		
-		For Each cmp In doc.VBProject.VBComponents
-			cmp.Export fso.BuildPath(folderDst, cmp.Name & getModuleExtension(cmp))
-		Next
-	End If
-
-	Set pge = Nothing
-	doc.Close
-	Set doc = Nothing
-	vs.Quit
-	Set vs = Nothing
-	Set fo = Nothing
-
-	pbChanged = True
-	pSubcode = 0
-	UnpackFolder = True
-End Function
-
-Function PackFolder(fileSrc, folderDst, pbChanged, pSubcode)
-	PackFolder = False
-End Function
-
-Function Translate(text)
-	Dim re: Set re = CreateObject("VBScript.RegExp")
-	re.Pattern = "\${([^}]+)}"
-	re.Global = True
-	Translate = text
-	Dim match
-	Dim matches:Set matches = re.Execute(text)
-	if IsEmpty(mergeApp) Then
-		For Each match in matches
-			Translate = Replace(Translate, match.Value, match.Submatches(0))
-		Next
-	Else
-		For Each match in matches
-			Translate = Replace(Translate, match.Value, mergeApp.Translate(match.Submatches(0)))
-		Next
-	End If
-End Function
-
-Function ShowSettingsDialog()
-	Dim tname: tname = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() & ".hta")
-	Dim xmlfile: xmlfile = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() & ".xml")
-	Dim tfile: Set tfile = fso.CreateTextFile(tname, True, True)
-	Dim mshta
-	tfile.Write Translate(getResource("dialog1"))
-	tfile.Close
-	exportSettingsToXMLFile xmlfile
-	mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\System32\mshta.exe")
-	If Not fso.FileExists(mshta) Then
-		mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\SysWOW64\mshta.exe")
-	End If
-	Run wsh, """" & mshta & """ """ & tname & """  """ & xmlfile  & """"
-	importSettingsFromXMLFile xmlfile
-	fso.DeleteFile tname
-	fso.DeleteFile xmlfile
-End Function
-
-Sub Run(sh, cmd)
-	sh.Run cmd, 1, True
-End Sub
+<script language="JScript">
 
-</script>
+/*
+    This is a plugin for WinMerge.
+    It will display the text content of MS Visio files.
+    Copyright (C) 2020 dedicatus
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
 
-<script language="JScript">
 
 var REGKEY_PATH = "Plugins\\CompareMSVisioFiles.sct/";
+var MsgCannotGetMacros = "${Cannot get Macros.\r\n" + 
+  "   To allow WinMerge to compare macros, use MS Office to alter the settings in the Macro Security for the current application.\r\n" + 
+  "   The Trust access to Visual Basic Project feature should be turned on to use this feature in WinMerge.\r\n}";
+var vbNo = 7;
+
+var fso = new ActiveXObject("Scripting.FileSystemObject");
+var wsh = new ActiveXObject("WScript.Shell");
+var mergeApp;
+
+function isAccessibleVBAProject(doc) {
+  try {
+    return (doc.VBProject.VBComponents.Count >= 0);
+  } catch (e) {
+    return false;
+  }
+}
+
+function regRead(Key, DefaultValue) {
+  return mergeApp.GetOption(Key, DefaultValue);
+}
+
+function regWrite(Key, Value, TypeNm) {
+  mergeApp.SaveOption(Key, (TypeNm === "REG_DWORD") ? parseInt(Value) : String(Value));
+}
+
+function toString(val) {
+  switch (typeof val) {
+  case "string":
+    return val;
+  case "number":
+    return val.toString();
+  case "date":
+    var d = new Date(val);
+    if (d.getHours() == 0 && d.getMinutes() == 0 && d.getSeconds() == 0 && d.getMilliseconds() == 0) {
+        return d.toLocaleDateString();
+    }
+    return d.toLocaleString();
+  case "undefined":
+    return "";
+  default:
+    return String(val);
+  }
+}
+
+function writeObjectProperties(fo, items) {
+  try {
+    for (var it = new Enumerator(items); !it.atEnd(); it.moveNext()) {
+      try {
+        var o = it.item();
+        fo.WriteLine(o.Name + ": " + toString(o.Value));
+      } catch (e) {}
+    }
+  } catch (e) {}
+}
+
+function ungroupShapes(pge) {
+  try {
+    var cnt;
+    do {
+      cnt = pge.Shapes.Count;
+      for (var it = new Enumerator(pge.Shapes); !it.atEnd(); it.moveNext()) {
+        try {
+          var shp = it.item();
+          shp.Ungroup();
+          shp = null;
+        } catch (e) {}
+      }
+    } while (cnt !== pge.Shapes.Count);
+  } catch (e) {}
+}
+
+function writeTextsInShapes(fo, pge) {
+  try {
+    for (var it = new Enumerator(pge.Shapes); !it.atEnd(); it.moveNext()) {
+      try {
+        var shp = it.item();
+        fo.WriteLine(shp.Name + ": " + shp.Text);
+        shp = null;
+      } catch (e) {}
+    }
+  } catch (e) {}
+}
+
+function getModuleExtension(cmp) {
+  switch (cmp.Type) {
+  case 2:
+    return ".cls";
+  case 3:
+    return ".frm";
+  default:
+    return ".bas";
+  }
+}
+
+function saveSlideAsImage(pge, filename) {
+  pge.Export(filename);
+}
+
+function get_PluginEvent() {
+  return "FILE_FOLDER_PACK_UNPACK";
+}
+
+function get_PluginDescription() {
+  return "Display the text content of MS Visio files";
+}
+
+function get_PluginFileFilters() {
+  return "\\.vsd(\\..*)?$;\\.vsdx(\\..*)?$;\\.vsdm(\\..*)?$;\\.vss(\\..*)?$;\\.vssx(\\..*)?$;\\.vssm(\\..*)?$;\\.vst(\\..*)?$;\\.vstx(\\..*)?$;\\.vstm(\\..*)?$";
+}
+
+function get_PluginIsAutomatic() {
+  return true;
+}
+
+function get_PluginExtendedProperties() {
+  return "ProcessType=Content Extraction;FileType=MS-Visio;MenuCaption=MS-Visio";
+}
+
+function PluginOnEvent(eventType, obj) {
+  mergeApp = obj;
+}
+
+function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
+  var fo = fso.CreateTextFile(fileDst, true, true);
+  var vs;
+  try {
+    vs = new ActiveXObject("Visio.Application");
+  } catch (e) {}
+  if (!vs) {
+    throw new Error(30001, translate("${%1 is not installed.}").replace("%1", "Visio"));
+  }
+  vs.Visible = false;
+  vs.AlertResponse = vbNo;
+
+  var fileSrc2 = fileSrc;
+  if (fso.GetExtensionName(fileSrc2) === "lnk") {
+    fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath;
+    if (!fso.FileExists(fileSrc2)) {
+      throw new Error(30001, "CompareMSVisioFiles.sct: " + fileSrc + ": Target file '" + fileSrc2 + "' not found");
+    } 
+  }
+  var doc = vs.Documents.OpenEx(fileSrc2, 0x80);
+
+  for (var it = new Enumerator(doc.Pages); !it.atEnd(); it.moveNext()) {
+    var pge = it.item();
+    if (regRead(REGKEY_PATH + "CompareTextsInShapes", true)) {
+      fo.WriteLine("[" + pge.Name + "]");
+      ungroupShapes(pge);
+      writeTextsInShapes(fo, pge);
+      fo.WriteLine("");
+    }
+    pge = null;
+  }
+
+  if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
+    if (!isAccessibleVBAProject(doc)) {
+      fo.WriteLine(translate(MsgCannotGetMacros));
+    } else {
+      for (var it = new Enumerator(doc.VBProject.VBComponents); !it.atEnd(); it.moveNext()) {
+        var cmp = it.item();
+        fo.WriteLine("[CodeModule." + cmp.Name + "]");
+        if (cmp.CodeModule.CountOfLines > 0) {
+          fo.WriteLine(cmp.CodeModule.Lines(1, cmp.CodeModule.CountOfLines));
+        }
+        fo.WriteLine("");
+        cmp = null;
+      }
+    }
+  }
+
+  doc.Close();
+  doc = null;
+  vs.Quit();
+  vs = null;
+  fo.Close();
+  fo = null;
+
+  pbChanged = true;
+  pSubcode = 0;
+
+  CollectGarbage();
+
+  var result = new ActiveXObject("Scripting.Dictionary");
+  result.Add(0, true);
+  result.Add(1, pbChanged);
+  result.Add(2, pSubcode);
+  return result.Items();
+}
+
+function PackFile(fileSrc, fileDst, pbChanged, pSubcode) {
+  return false;
+}
+
+function IsFolder(file) {
+  return regRead(REGKEY_PATH + "UnpackToFolder", false);
+}
+
+function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
+  if (!fso.FolderExists(folderDst)) { fso.CreateFolder(folderDst); }
+  var vs;
+  try {
+    vs = new ActiveXObject("Visio.Application");
+  } catch (e) {}
+  if (!vs) {
+    throw new Error(30001, translate("${%1 is not installed.}").replace("%1", "Visio"));
+  }
+  vs.Visible = false;
+  vs.AlertResponse = vbNo;
+
+  var fileSrc2 = fileSrc;
+  if (fso.GetExtensionName(fileSrc2) === "lnk") {
+    fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath;
+    if (!fso.FileExists(fileSrc2)) {
+      throw new Error(30001, "CompareMSVisioFiles.sct: " + fileSrc + ": Target file '" + fileSrc2 + "' not found");
+    } 
+  }
+  var doc = vs.Documents.OpenEx(fileSrc2, 0x80);
+
+  for (var it = new Enumerator(doc.Pages); !it.atEnd(); it.moveNext()) {
+    var pge = it.item();
+    if (regRead(REGKEY_PATH + "CompareTextsInShapes", true)) {
+      var fo = fso.CreateTextFile(fso.BuildPath(folderDst, pge.Name + ".txt"), true, true);
+      ungroupShapes(pge);
+      writeTextsInShapes(fo, pge);
+      fo.Close();
+      fo = null;
+    }
+
+    if (regRead(REGKEY_PATH + "ComparePageAsImage", true)) {
+      saveSlideAsImage(pge, fso.BuildPath(folderDst, pge.Name + ".png"));
+    }
+    pge = null;
+  }
+  if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
+    if (!isAccessibleVBAProject(doc)) {
+      var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "CannotGetMacros.bas"), true, true);
+      fo.WriteLine(translate(MsgCannotGetMacros));
+      fo.Close();
+      fo = null;
+    } else {
+      for (var it = new Enumerator(doc.VBProject.VBComponents); !it.atEnd(); it.moveNext()) {
+        var cmp = it.item();
+        cmp.Export(fso.BuildPath(folderDst, cmp.Name + getModuleExtension(cmp)));
+        cmp = nul;
+      }
+    }
+  }
+
+  doc.Close();
+  doc = null;
+  vs.Quit();
+  vs = null;
+
+  pbChanged = true;
+  pSubcode = 0;
+
+  CollectGarbage();
+
+  var result = new ActiveXObject("Scripting.Dictionary");
+  result.Add(0, true);
+  result.Add(1, pbChanged);
+  result.Add(2, pSubcode);
+  return result.Items();
+}
+
+function PackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
+  return false;
+}
+
+function translate(text) {
+  var re = /\${([^}]+)}/g;
+  var matches;
+  while ((matches = re.exec(text)) != null) {
+    text = text.replace(matches[0], mergeApp.Translate(matches[1]));
+  }
+  return text;
+}
+
+function ShowSettingsDialog() {
+  var tname = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() + ".hta");
+  var xmlfile = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() + ".xml");
+  var tfile = fso.CreateTextFile(tname, true, true);
+  tfile.Write(translate(getResource("dialog1")));
+  tfile.Close();
+  exportSettingsToXMLFile(xmlfile);
+  var mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\\System32\\mshta.exe");
+  if (!fso.FileExists(mshta)) {
+    mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\\SysWOW64\\mshta.exe");
+  }
+  run(wsh, "\"" + mshta + "\" \"" + tname + "\"  \"" + xmlfile + "\"");
+  importSettingsFromXMLFile(xmlfile);
+  fso.DeleteFile(tname);
+  fso.DeleteFile(xmlfile);
+}
+
+function run(sh, cmd) {
+  sh.Run(cmd, 1, true);
+}
 
-function exportSettingsToXMLFile(filepath)
-{
-	var key_defvalues = {
-		"UnpackToFolder" : false,
-		"ComparePageAsImage" : true,
-		"CompareTextsInShapes" : true,
-		"CompareVBAMacros" : true
-	};
-	var doc = new ActiveXObject("MSXML2.DOMDocument");
-	var fso = new ActiveXObject("Scripting.FileSystemObject");
-	var ts = fso.OpenTextFile(filepath, 2, true, -1);
-	var root = doc.createElement("properties");
-	for (var key in key_defvalues) {
-		var el = doc.createElement("property");
-		var val = regRead(REGKEY_PATH + key, key_defvalues[key]);
-		var cdata = doc.createCDATASection(val);
-		el.appendChild(cdata);
-		el.setAttribute("name", REGKEY_PATH + key);
-		el.setAttribute("type", typeof val);
-		root.appendChild(el);
-	}
-	doc.appendChild(root);
-	ts.Write(doc.xml);
-	ts.Close();
+function exportSettingsToXMLFile(filepath) {
+  var key_defvalues = {
+    "UnpackToFolder" : false,
+    "ComparePageAsImage" : true,
+    "CompareTextsInShapes" : true,
+    "CompareVBAMacros" : true
+  };
+  var doc = new ActiveXObject("MSXML2.DOMDocument");
+  var fso = new ActiveXObject("Scripting.FileSystemObject");
+  var ts = fso.OpenTextFile(filepath, 2, true, -1);
+  var root = doc.createElement("properties");
+  for (var key in key_defvalues) {
+    var el = doc.createElement("property");
+    var val = regRead(REGKEY_PATH + key, key_defvalues[key]);
+    var cdata = doc.createCDATASection(val);
+    el.appendChild(cdata);
+    el.setAttribute("name", REGKEY_PATH + key);
+    el.setAttribute("type", typeof val);
+    root.appendChild(el);
+  }
+  doc.appendChild(root);
+  ts.Write(doc.xml);
+  ts.Close();
 }
 
-function importSettingsFromXMLFile(filepath)
-{
-	var fso = new ActiveXObject("Scripting.FileSystemObject");
-	var ts = fso.OpenTextFile(filepath, 1, true, -1);
-	var xml = ts.ReadAll();
-	var doc = new ActiveXObject("MSXML2.DOMDocument");
-	doc.async = false
-	doc.loadXML(xml);
-	ts.Close();
-	var nodes = doc.documentElement.childNodes;
-	for (var i = 0; i < nodes.length; i++) {
-		regWrite(nodes[i].getAttribute("name"), nodes[i].text, (nodes[i].getAttribute("type") === "string") ? "REG_SZ" : "REG_DWORD");
-	}
+function importSettingsFromXMLFile(filepath) {
+  var fso = new ActiveXObject("Scripting.FileSystemObject");
+  var ts = fso.OpenTextFile(filepath, 1, true, -1);
+  var xml = ts.ReadAll();
+  var doc = new ActiveXObject("MSXML2.DOMDocument");
+  doc.async = false;
+  doc.loadXML(xml);
+  ts.Close();
+  var nodes = doc.documentElement.childNodes;
+  for (var i = 0; i < nodes.length; i++) {
+    regWrite(nodes[i].getAttribute("name"), nodes[i].text, (nodes[i].getAttribute("type") === "string") ? "REG_SZ" : "REG_DWORD");
+  }
 }
 
 </script>
@@ -411,7 +426,7 @@ function importSettingsFromXMLFile(filepath)
         var ts = fso.OpenTextFile(filepath, 1, true, -1);
         var xml = ts.ReadAll();
         var doc = new ActiveXObject("MSXML2.DOMDocument");
-        doc.async = false
+        doc.async = false;
         doc.loadXML(xml);
         ts.Close();
         var nodes = doc.documentElement.childNodes;
diff --git a/Plugins/dlls/CompareMSWordFiles.sct b/Plugins/dlls/CompareMSWordFiles.sct
index c48ed02ad06..c789568501a 100644
--- a/Plugins/dlls/CompareMSWordFiles.sct
+++ b/Plugins/dlls/CompareMSWordFiles.sct
@@ -1,416 +1,429 @@
 <scriptlet>
 <implements type="Automation" id="dispatcher">
-	<property name="PluginEvent">
-		<get/>
-	</property>
-	<property name="PluginDescription">
-		<get/>
-	</property>
-	<property name="PluginFileFilters">
-		<get/>
-	</property>
-	<property name="PluginIsAutomatic">
-		<get/>
-	</property>
-	<property name="PluginExtendedProperties">
-		<get/>
-	</property>
-	<method name="PluginOnEvent"/>
-	<method name="UnpackFile"/>
-	<method name="PackFile"/>
-	<method name="IsFolder"/>
-	<method name="UnpackFolder"/>
-	<method name="PackFolder"/>
-	<method name="ShowSettingsDialog"/>
+  <property name="PluginEvent">
+    <get/>
+  </property>
+  <property name="PluginDescription">
+    <get/>
+  </property>
+  <property name="PluginFileFilters">
+    <get/>
+  </property>
+  <property name="PluginIsAutomatic">
+    <get/>
+  </property>
+  <property name="PluginExtendedProperties">
+    <get/>
+  </property>
+  <method name="PluginOnEvent"/>
+  <method name="UnpackFile"/>
+  <method name="PackFile"/>
+  <method name="IsFolder"/>
+  <method name="UnpackFolder"/>
+  <method name="PackFolder"/>
+  <method name="ShowSettingsDialog"/>
 </implements>
 
-<script language="VBS">
-
-'/////////////////////////////////////////////////////////////////////////////
-'    This is a plugin for WinMerge.
-'    It will display the text content of MS Word files.
-'    Copyright (C) 2008-2023 Takashi Sawanaka
-'
-'    This program is free software; you can redistribute it and/or modify
-'    it under the terms of the GNU General Public License as published by
-'    the Free Software Foundation; either version 2 of the License, or
-'    (at your option) any later version.
-'
-'    This program is distributed in the hope that it will be useful,
-'    but WITHOUT ANY WARRANTY; without even the implied warranty of
-'    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-'    GNU General Public License for more details.
-'
-'    You should have received a copy of the GNU General Public License
-'    along with this program; if not, write to the Free Software
-'    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-'
-
-Option Explicit
-
-Const RegKeyPath = "Plugins\CompareMSWordFiles.sct/"
-Dim MsgCannotGetMacros
-MsgCannotGetMacros = "${Cannot get Macros." & vbCrLf & _
-	"   To allow WinMerge to compare macros, use MS Office to alter the settings in the Macro Security for the current application." & vbCrLf & _
-	"   The Trust access to Visual Basic Project feature should be turned on to use this feature in WinMerge." & vbCrLf & "}"
-
-Dim fso: Set fso = CreateObject("Scripting.FileSystemObject")
-Dim wsh: Set wsh = CreateObject("WScript.Shell")
-Dim mergeApp
-
-Function isAccessibleVBAProject(doc)
-	Dim count
-	count = -1
-	On Error Resume Next
-	count = doc.VBProject.VBComponents.Count
-	isAccessibleVBAProject = (count > 0)
-End Function
-
-Function regRead(Key, DefaultValue)
-	regRead = DefaultValue
-	On Error Resume Next
-	If IsEmpty(mergeApp) Then
-		regRead = wsh.RegRead("HKCU\Software\Thingamahoochie\WinMerge\" & Replace(Key, "/", "\"))
-	Else
-		regRead = mergeApp.GetOption(Key, DefaultValue)
-	End If
-End Function
-
-Sub regWrite(Key, Value, TypeNm)
-	Dim tmp
-	On Error Resume Next
-	If IsEmpty(mergeApp) Then
-		wsh.RegWrite "HKCU\Software\Thingamahoochie\WinMerge\" &  Replace(Key, "/", "\"), Value, TypeNm
-	Else
-		If TypeNm = "REG_DWORD" Then
-			tmp = CLng(Value)
-		Else
-			tmp = CStr(Value)
-		End If
-		mergeApp.SaveOption Key, tmp
-	End If
-End Sub
-
-Function writeObjectProperties(fo, items)
-	On Error Resume Next
-	Dim o
-	For Each o In items
-		fo.WriteLine o.Name & ": " & o.Value
-	Next
-End Function
-
-Function writeBookmarks(fo, items)
-	On Error Resume Next
-	Dim o
-	For Each o In items
-		fo.WriteLine o.Name & ": " & o.Start
-	Next
-End Function
-
-Sub ungroupShapes(doc)
-    On Error Resume Next
-    Dim cnt, shp
-    Do
-        cnt = doc.Shapes.Count
-        For Each shp In doc.Shapes
-            shp.ungroup
-        Next
-    Loop While cnt <> doc.Shapes.Count
-End Sub
-
-Function writeTextsInShapes(fo, doc)
-	Dim shp
-	On Error Resume Next
-	For Each shp In doc.Shapes
-		fo.WriteLine shp.Name & ": " & shp.TextFrame.TextRange.Text
-	Next
-End Function
-
-Function getModuleExtension(cmp)
-	Select Case cmp.Type
-	Case 2
-		getModuleExtension = ".cls"
-	Case 3
-		getModuleExtension = ".frm"
-	Case Else
-		getModuleExtension = ".bas"
-	End Select
-End Function
-
-Function get_PluginEvent()
-	get_PluginEvent = "FILE_FOLDER_PACK_UNPACK"
-End Function
-
-Function get_PluginDescription()
-	get_PluginDescription = "Display the text content of MS Word files"
-End Function
-
-Function get_PluginFileFilters()
-	get_PluginFileFilters = "\.doc(\..*)?$;\.dot(\..*)?$;\.docx(\..*)?$;\.docm(\..*)?$;\.dotx(\..*)?$;\.dotm(\..*)?$"
-End Function
-
-Function get_PluginIsAutomatic()
-	get_PluginIsAutomatic = True
-End Function
-
-Function get_PluginExtendedProperties()
-	get_PluginExtendedProperties = "ProcessType=Content Extraction;FileType=MS-Word;MenuCaption=MS-Word"
-End Function
-
-Sub PluginOnEvent(eventType, obj)
-	Set mergeApp = obj
-End Sub
-
-Function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode)
-	Dim fo
-	Dim wd 
-	Dim doc
-	Dim cmp
-	Dim fileSrc2
-
-	Set fo = fso.CreateTextFile(fileDst, True, True)
-
-	Set wd = CreateObject("Word.Application")
-	wd.DisplayAlerts = False
-
-	fileSrc2 = fileSrc
-	If fso.GetExtensionName(fileSrc2) = "lnk" Then
-		fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath
-		If Not fso.FileExists(fileSrc2) Then
-			Err.Raise 30001, "CompareMSWordFiles.sct", fileSrc & ": Target file '" & fileSrc2 & "' not found"
-		End If 
-	End If
-	Set doc = wd.Documents.Open(fileSrc2)
-
-	On Error Resume Next
-
-	If regRead(RegKeyPath & "CompareDocumentProperties", False) Then
-		fo.WriteLine "[Document Properties]"
-		writeObjectProperties fo, doc.BuiltinDocumentProperties
-		fo.WriteLine ""
-	End If
-
-	If regRead(RegKeyPath & "CompareBookmarks", True) Then
-		fo.WriteLine "[Bookmarks]"
-		writeBookmarks fo, doc.Bookmarks
-		fo.WriteLine ""
-	End If
-
-	If regRead(RegKeyPath & "CompareTextContents", True) Then
-		fo.WriteLine "[Text Contents]"
-		fo.Write doc.Content.Text
-		fo.WriteLine ""
-	End If
-
-	If regRead(RegKeyPath & "CompareTextsInShapes", True) Then
-		fo.WriteLine "[Shapes]"
-		ungroupShapes doc
-		writeTextsInShapes fo, doc
-		fo.WriteLine ""
-	End If
-
-	If regRead(RegKeyPath & "CompareVBAMacros", True) Then
-		If Not isAccessibleVBAProject(doc) Then
-			fo.WriteLine Translate(MsgCannotGetMacros)
-		End If
-		For Each cmp In doc.VBProject.VBComponents
-			fo.WriteLine "[CodeModule." & cmp.Name & "]"
-			If cmp.CodeModule.CountOfLines > 0 Then
-				fo.WriteLine cmp.CodeModule.Lines(1, cmp.CodeModule.CountOfLines)
-			End If
-			fo.WriteLine ""
-		Next
-	End If
-
-	doc.Saved = True
-	doc.Close
-	Set doc = Nothing
-	wd.Quit
-	Set wd = Nothing
-
-	fo.Close
-	Set fo = Nothing
-
-	pbChanged = True
-	pSubcode = 0
-	UnpackFile = True
-
-End Function
-
-Function PackFile(fileSrc, fileDst, pbChanged, pSubcode)
-	PackFile = False
-End Function
-
-Function IsFolder(file)
-	IsFolder = regRead(RegKeyPath & "UnpackToFolder", False)
-End Function
-
-Function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode)
-	Dim fo
-	Dim wd
-	Dim doc
-	Dim cmp
-	Dim fileSrc2
-
-	If Not fso.FolderExists(folderDst) Then fso.CreateFolder folderDst
-
-	Set wd = CreateObject("Word.Application")
-	wd.DisplayAlerts = False
-
-	fileSrc2 = fileSrc
-	If fso.GetExtensionName(fileSrc2) = "lnk" Then
-		fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath
-		If Not fso.FileExists(fileSrc2) Then
-			Err.Raise 30001, "CompareMSWordFiles.sct", fileSrc & ": Target file '" & fileSrc2 & "' not found"
-		End If 
-	End If
-	Set doc = wd.Documents.Open(fileSrc2)
-
-	On Error Resume Next
-
-	If regRead(RegKeyPath & "CompareDocumentProperties", False) Then
-		Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(0)DocumentProperties.txt"), True, True)
-		writeObjectProperties fo, doc.BuiltinDocumentProperties
-		fo.Close
-	End If
-
-	If regRead(RegKeyPath & "CompareBookmarks", True) Then
-		Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(0)Bookmarks.txt"), True, True)
-		writeBookmarks fo, doc.Bookmarks
-		fo.Close
-	End If
-
-	If regRead(RegKeyPath & "CompareTextContents", True) Then
-		Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, "Document.txt"), True, True)
-		fo.Write doc.Content.Text
-		fo.Close
-	End If
-
-	If regRead(RegKeyPath & "CompareTextsInShapes", True) Then
-		Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, "Shapes.txt"), True, True)
-		ungroupShapes doc
-		writeTextsInShapes fo, doc
-		fo.Close
-	End If
-
-	If regRead(RegKeyPath & "CompareDocumentsAsHTML", True) Then
-		doc.SaveAs fso.BuildPath(folderDst, "Document.htm"), 10 ' wdFormatFilteredHTML
-	End If
-	If regRead(RegKeyPath & "CompareVBAMacros", True) Then
-		If Not isAccessibleVBAProject(doc) Then
-			Set fo = fso.CreateTextFile(fso.BuildPath(folderDst, "CannotGetMacros.bas"), True, True)
-			fo.WriteLine Translate(MsgCannotGetMacros)
-			fo.Close
-		End If
-		
-		For Each cmp In doc.VBProject.VBComponents
-			cmp.Export fso.BuildPath(folderDst, cmp.Name & getModuleExtension(cmp))
-		Next
-	End If
-
-	doc.Close
-	Set doc = Nothing
-	wd.Quit
-	Set wd = Nothing
-	Set fo = Nothing
-
-	pbChanged = True
-	pSubcode = 0
-	UnpackFolder = True
-End Function
-
-Function PackFolder(fileSrc, folderDst, pbChanged, pSubcode)
-	PackFolder = False
-End Function
-
-Function Translate(text)
-	Dim re: Set re = CreateObject("VBScript.RegExp")
-	re.Pattern = "\${([^}]+)}"
-	re.Global = True
-	Translate = text
-	Dim match
-	Dim matches:Set matches = re.Execute(text)
-	if IsEmpty(mergeApp) Then
-		For Each match in matches
-			Translate = Replace(Translate, match.Value, match.Submatches(0))
-		Next
-	Else
-		For Each match in matches
-			Translate = Replace(Translate, match.Value, mergeApp.Translate(match.Submatches(0)))
-		Next
-	End If
-End Function
-
-Function ShowSettingsDialog()
-	Dim tname: tname = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() & ".hta")
-	Dim xmlfile: xmlfile = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() & ".xml")
-	Dim tfile: Set tfile = fso.CreateTextFile(tname, True, True)
-	Dim mshta
-	tfile.Write Translate(getResource("dialog1"))
-	tfile.Close
-	exportSettingsToXMLFile xmlfile
-	mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\System32\mshta.exe")
-	If Not fso.FileExists(mshta) Then
-		mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\SysWOW64\mshta.exe")
-	End If
-	Run wsh, """" & mshta & """ """ & tname & """  """ & xmlfile  & """"
-	importSettingsFromXMLFile xmlfile
-	fso.DeleteFile tname
-	fso.DeleteFile xmlfile
-End Function
-
-Sub Run(sh, cmd)
-	sh.Run cmd, 1, True
-End Sub
+<script language="JScript">
 
-</script>
+/*
+    This is a plugin for WinMerge.
+    It will display the text content of MS Word files.
+    Copyright (C) 2008-2024 Takashi Sawanaka
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
 
-<script language="JScript">
 
 var REGKEY_PATH = "Plugins\\CompareMSWordFiles.sct/";
+var MsgCannotGetMacros = "${Cannot get Macros.\r\n" + 
+  "   To allow WinMerge to compare macros, use MS Office to alter the settings in the Macro Security for the current application.\r\n" + 
+  "   The Trust access to Visual Basic Project feature should be turned on to use this feature in WinMerge.\r\n}";
+var wdFormatFilteredHTML = 10;
+var pbGroup = 6;
+
+var fso = new ActiveXObject("Scripting.FileSystemObject");
+var wsh = new ActiveXObject("WScript.Shell");
+var mergeApp;
+
+function isAccessibleVBAProject(doc) {
+  try {
+    return (doc.VBProject.VBComponents.Count >= 0);
+  } catch (e) {
+    return false;
+  }
+}
+
+function regRead(Key, DefaultValue) {
+  return mergeApp.GetOption(Key, DefaultValue);
+}
+
+function regWrite(Key, Value, TypeNm) {
+  mergeApp.SaveOption(Key, (TypeNm === "REG_DWORD") ? parseInt(Value) : String(Value));
+}
+
+function toString(val) {
+  switch (typeof val) {
+  case "string":
+    return val;
+  case "number":
+    return val.toString();
+  case "date":
+    var d = new Date(val);
+    if (d.getHours() == 0 && d.getMinutes() == 0 && d.getSeconds() == 0 && d.getMilliseconds() == 0) {
+        return d.toLocaleDateString();
+    }
+    return d.toLocaleString();
+  case "undefined":
+    return "";
+  default:
+    return String(val);
+  }
+}
+
+function writeObjectProperties(fo, items) {
+  try {
+    for (var it = new Enumerator(items); !it.atEnd(); it.moveNext()) {
+      try {
+      var o = it.item();
+        fo.WriteLine(o.Name + ": " + toString(o.Value));
+      } catch (e) {}
+    }
+  } catch (e) {}
+}
+
+function writeBookmarks(fo, items) {
+  try {
+    for (var it = new Enumerator(items); !it.atEnd(); it.moveNext()) {
+      var o = it.item();
+      fo.WriteLine(o.Name + ": " + o.Start);
+    }
+  } catch (e) {}
+}
+
+function ungroupShapes(doc) {
+  try {
+    var cnt;
+    do {
+      cnt = doc.Shapes.Count;
+      for (var it = new Enumerator(doc.Shapes); !it.atEnd(); it.moveNext()) {
+        try {
+          var shp = it.item();
+          if (shp.Type === pbGroup) {
+            shp.Ungroup();
+          }
+        } catch (e) {}
+      }
+    } while (cnt !== doc.Shapes.Count);
+  } catch (e) {}
+}
+
+function writeTextsInShapes(fo, doc) {
+  try {
+    for (var it = new Enumerator(doc.Shapes); !it.atEnd(); it.moveNext()) {
+      try {
+        var shp = it.item();
+        fo.WriteLine(shp.Name + ": " + shp.TextFrame.TextRange.Text);
+      } catch (e) {}
+    }
+  } catch (e) {}
+}
+
+function getModuleExtension(cmp) {
+  switch (cmp.Type) {
+  case 2:
+    return ".cls";
+  case 3:
+    return ".frm";
+  default:
+    return ".bas";
+  }
+}
+
+function get_PluginEvent() {
+  return "FILE_FOLDER_PACK_UNPACK";
+}
+
+function get_PluginDescription() {
+  return "Display the text content of MS Word files";
+}
+
+function get_PluginFileFilters() {
+  return  "\\.doc(\\..*)?$;\\.dot(\\..*)?$;\\.docx(\\..*)?$;\\.docm(\\..*)?$;\\.dotx(\\..*)?$;\\.dotm(\\..*)?$";
+}
+
+function get_PluginIsAutomatic() {
+  return true;
+}
+
+function get_PluginExtendedProperties() {
+  return "ProcessType=Content Extraction;FileType=MS-Word;MenuCaption=MS-Word";
+}
+
+function PluginOnEvent(eventType, obj) {
+  mergeApp = obj;
+}
+
+function UnpackFile(fileSrc, fileDst, pbChanged, pSubcode) {
+  var fo = fso.CreateTextFile(fileDst, true, true);
+  var wd;
+  try {
+    wd = new ActiveXObject("Word.Application");
+  } catch (e) {}
+  if (!wd) {
+    throw new Error(30001, translate("${%1 is not installed.}").replace("%1", "Word"));
+  }
+  wd.DisplayAlerts = false;
+
+  var fileSrc2 = fileSrc;
+  if (fso.GetExtensionName(fileSrc2) === "lnk") {
+    fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath;
+    if (!fso.FileExists(fileSrc2)) {
+      throw new Error(30001, "CompareMSWordFiles.sct: " + fileSrc + ": Target file '" + fileSrc2 + "' not found");
+    } 
+  }
+  var doc = wd.Documents.Open(fileSrc2, -1, -1);
+
+  if (regRead(REGKEY_PATH + "CompareDocumentProperties", false)) {
+    fo.WriteLine("[Document Properties]");
+    writeObjectProperties(fo, doc.BuiltinDocumentProperties);
+    fo.WriteLine("");
+  }
+
+  if (regRead(REGKEY_PATH + "CompareBookmarks", true)) {
+    fo.WriteLine("[Bookmarks]");
+    writeBookmarks(fo, doc.Bookmarks);
+    fo.WriteLine("");
+  }
+
+  if (regRead(REGKEY_PATH + "CompareTextContents", true)) {
+    fo.WriteLine("[Text Contents]");
+    fo.Write(doc.Content.Text);
+    fo.WriteLine("");
+  }
+
+  if (regRead(REGKEY_PATH + "CompareTextsInShapes", true)) {
+    fo.WriteLine("[Shapes]");
+    ungroupShapes(doc);
+    writeTextsInShapes(fo, doc);
+    fo.WriteLine("");
+  }
+
+  if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
+    if (!isAccessibleVBAProject(doc)) {
+      fo.WriteLine(translate(MsgCannotGetMacros));
+    } else {
+      for (var it = new Enumerator(doc.VBProject.VBComponents); !it.atEnd(); it.moveNext()) {
+        var cmp = it.item();
+        fo.WriteLine("[CodeModule." + cmp.Name + "]");
+        if (cmp.CodeModule.CountOfLines > 0) {
+          fo.WriteLine(cmp.CodeModule.Lines(1, cmp.CodeModule.CountOfLines));
+        }
+        fo.WriteLine("");
+      }
+    }
+  }
+
+  doc.Saved = true;
+  doc.Close();
+  doc = null;
+  wd.Quit();
+  wd = null;
+
+  fo.Close();
+  fo = null;
+
+  pbChanged = true;
+  pSubcode = 0;
+  
+  CollectGarbage();
+
+  var result = new ActiveXObject("Scripting.Dictionary");
+  result.Add(0, true);
+  result.Add(1, pbChanged);
+  result.Add(2, pSubcode);
+  return result.Items();
+}
+
+function PackFile(fileSrc, fileDst, pbChanged, pSubcode) {
+  return false;
+}
+
+function IsFolder(file) {
+  return regRead(REGKEY_PATH + "UnpackToFolder", false);
+}
+
+function UnpackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
+  if (!fso.FolderExists(folderDst)) { fso.CreateFolder(folderDst); }
+  var wd;
+  try {
+    wd = new ActiveXObject("Word.Application");
+  } catch (e) {}
+  if (!wd) {
+    throw new Error(30001, translate("${%1 is not installed.}").replace("%1", "Word"));
+  }
+  wd.DisplayAlerts = false;
+
+  var fileSrc2 = fileSrc;
+  if (fso.GetExtensionName(fileSrc2) === "lnk") {
+    fileSrc2 = wsh.CreateShortcut(fileSrc2).TargetPath;
+    if (!fso.FileExists(fileSrc2)) {
+      throw new Error(30001, "CompareMSWordFiles.sct: " + fileSrc + ": Target file '" + fileSrc2 + "' not found");
+    } 
+  }
+  var doc = wd.Documents.Open(fileSrc2, -1, -1);
+
+  if (regRead(REGKEY_PATH + "CompareDocumentProperties", false)) {
+    var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(0)DocumentProperties.txt"), true, true);
+    writeObjectProperties(fo, doc.BuiltinDocumentProperties);
+    fo.Close();
+    fo = null;
+  }
+
+  if (regRead(REGKEY_PATH + "CompareBookmarks", true)) {
+    var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "(0)Bookmarks.txt"), true, true);
+    writeBookmarks(fo, doc.Bookmarks);
+    fo.Close();
+    fo = null;
+  }
+
+  if (regRead(REGKEY_PATH + "CompareTextContents", true)) {
+    var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "Document.txt"), true, true);
+    fo.Write(doc.Content.Text);
+    fo.Close();
+    fo = null;
+  }
+
+  if (regRead(REGKEY_PATH + "CompareTextsInShapes", true)) {
+    var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "Shapes.txt"), true, true);
+    ungroupShapes(doc);
+    writeTextsInShapes(fo, doc);
+    fo.Close();
+    fo = null;
+  }
+
+  if (regRead(REGKEY_PATH + "CompareDocumentsAsHTML", true)) {
+    doc.SaveAs(fso.BuildPath(folderDst, "Document.htm"), wdFormatFilteredHTML);
+  }
+  if (regRead(REGKEY_PATH + "CompareVBAMacros", true)) {
+    if (!isAccessibleVBAProject(doc)) {
+      var fo = fso.CreateTextFile(fso.BuildPath(folderDst, "CannotGetMacros.bas"), true, true);
+      fo.WriteLine(translate(MsgCannotGetMacros));
+      fo.Close();
+      fo = null;
+    } else {
+      for (var it = new Enumerator(doc.VBProject.VBComponents); !it.atEnd(); it.moveNext()) {
+        var cmp = it.item();
+        cmp.Export(fso.BuildPath(folderDst, cmp.Name + getModuleExtension(cmp)));
+        cmp = null;
+      }
+    }
+  }
+
+  doc.Saved = true;
+  doc.Close();
+  doc = null;
+  wd.Quit();
+  wd = null;
+
+  pbChanged = true;
+  pSubcode = 0;
+
+  CollectGarbage();
+
+  var result = new ActiveXObject("Scripting.Dictionary");
+  result.Add(0, true);
+  result.Add(1, pbChanged);
+  result.Add(2, pSubcode);
+  return result.Items();
+}
+
+function PackFolder(fileSrc, folderDst, pbChanged, pSubcode) {
+  return false;
+}
+
+function translate(text) {
+  var re = /\${([^}]+)}/g;
+  var matches;
+  while ((matches = re.exec(text)) != null) {
+    text = text.replace(matches[0], mergeApp.Translate(matches[1]));
+  }
+  return text;
+}
+
+function ShowSettingsDialog() {
+  var tname = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() + ".hta");
+  var xmlfile = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() + ".xml");
+  var tfile = fso.CreateTextFile(tname, true, true);
+  tfile.Write(translate(getResource("dialog1")));
+  tfile.Close();
+  exportSettingsToXMLFile(xmlfile);
+  var mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\\System32\\mshta.exe");
+  if (!fso.FileExists(mshta)) {
+    mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\\SysWOW64\\mshta.exe");
+  }
+  run(wsh, "\"" + mshta + "\" \"" + tname + "\"  \"" + xmlfile + "\"");
+  importSettingsFromXMLFile(xmlfile);
+  fso.DeleteFile(tname);
+  fso.DeleteFile(xmlfile);
+}
+
+function run(sh, cmd) {
+  sh.Run(cmd, 1, true);
+}
 
-function exportSettingsToXMLFile(filepath)
-{
-	var key_defvalues = {
-		"UnpackToFolder" : false,
-		"CompareDocumentProperties" : false,
-		"CompareBookmarks" : true,
-		"CompareTextContents" : true,
-		"CompareDocumentsAsHTML" : true,
-		"CompareTextsInShapes" : true,
-		"CompareVBAMacros" : true
-	};
-	var doc = new ActiveXObject("MSXML2.DOMDocument");
-	var fso = new ActiveXObject("Scripting.FileSystemObject");
-	var ts = fso.OpenTextFile(filepath, 2, true, -1);
-	var root = doc.createElement("properties");
-	for (var key in key_defvalues) {
-		var el = doc.createElement("property");
-		var val = regRead(REGKEY_PATH + key, key_defvalues[key]);
-		var cdata = doc.createCDATASection(val);
-		el.appendChild(cdata);
-		el.setAttribute("name", REGKEY_PATH + key);
-		el.setAttribute("type", typeof val);
-		root.appendChild(el);
-	}
-	doc.appendChild(root);
-	ts.Write(doc.xml);
-	ts.Close();
+function exportSettingsToXMLFile(filepath) {
+  var key_defvalues = {
+    "UnpackToFolder" : false,
+    "CompareDocumentProperties" : false,
+    "CompareBookmarks" : true,
+    "CompareTextContents" : true,
+    "CompareDocumentsAsHTML" : true,
+    "CompareTextsInShapes" : true,
+    "CompareVBAMacros" : true
+  };
+  var doc = new ActiveXObject("MSXML2.DOMDocument");
+  var fso = new ActiveXObject("Scripting.FileSystemObject");
+  var ts = fso.OpenTextFile(filepath, 2, true, -1);
+  var root = doc.createElement("properties");
+  for (var key in key_defvalues) {
+    var el = doc.createElement("property");
+    var val = regRead(REGKEY_PATH + key, key_defvalues[key]);
+    var cdata = doc.createCDATASection(val);
+    el.appendChild(cdata);
+    el.setAttribute("name", REGKEY_PATH + key);
+    el.setAttribute("type", typeof val);
+    root.appendChild(el);
+  }
+  doc.appendChild(root);
+  ts.Write(doc.xml);
+  ts.Close();
 }
 
-function importSettingsFromXMLFile(filepath)
-{
-	var fso = new ActiveXObject("Scripting.FileSystemObject");
-	var ts = fso.OpenTextFile(filepath, 1, true, -1);
-	var xml = ts.ReadAll();
-	var doc = new ActiveXObject("MSXML2.DOMDocument");
-	doc.async = false
-	doc.loadXML(xml);
-	ts.Close();
-	var nodes = doc.documentElement.childNodes;
-	for (var i = 0; i < nodes.length; i++) {
-		regWrite(nodes[i].getAttribute("name"), nodes[i].text, (nodes[i].getAttribute("type") === "string") ? "REG_SZ" : "REG_DWORD");
-	}
+function importSettingsFromXMLFile(filepath) {
+  var fso = new ActiveXObject("Scripting.FileSystemObject");
+  var ts = fso.OpenTextFile(filepath, 1, true, -1);
+  var xml = ts.ReadAll();
+  var doc = new ActiveXObject("MSXML2.DOMDocument");
+  doc.async = false;
+  doc.loadXML(xml);
+  ts.Close();
+  var nodes = doc.documentElement.childNodes;
+  for (var i = 0; i < nodes.length; i++) {
+    regWrite(nodes[i].getAttribute("name"), nodes[i].text, (nodes[i].getAttribute("type") === "string") ? "REG_SZ" : "REG_DWORD");
+  }
 }
 
 </script>
@@ -453,12 +466,12 @@ function importSettingsFromXMLFile(filepath)
         var ts = fso.OpenTextFile(filepath, 1, true, -1);
         var xml = ts.ReadAll();
         var doc = new ActiveXObject("MSXML2.DOMDocument");
-        doc.async = false
+        doc.async = false;
         doc.loadXML(xml);
         ts.Close();
         var nodes = doc.documentElement.childNodes;
         for (var i = 0; i < nodes.length; i++) {
-        	regWrite(nodes[i].getAttribute("name"), nodes[i].text, (nodes[i].getAttribute("type") === "string") ? "REG_SZ" : "REG_DWORD");
+          regWrite(nodes[i].getAttribute("name"), nodes[i].text, (nodes[i].getAttribute("type") === "string") ? "REG_SZ" : "REG_DWORD");
         }
         return settings;
       }
diff --git a/Plugins/dlls/IgnoreLeadingLineNumbers.sct b/Plugins/dlls/IgnoreLeadingLineNumbers.sct
index 1de507d270e..7c6889970c7 100644
--- a/Plugins/dlls/IgnoreLeadingLineNumbers.sct
+++ b/Plugins/dlls/IgnoreLeadingLineNumbers.sct
@@ -19,107 +19,81 @@
   <method name="ShowSettingsDialog"/>
 </implements>
 
-<script language="VBS">
+<script language="JScript">
 
-'+----------------------------------------------------------------------+
-'| This is a plugin for WinMerge <www.winmerge.org>.                    |
-'| It will ignores leading line numbers in text files.                  |
-'| Copyright (C) 2007 by Tim Gerundt                                    |
-'+----------------------------------------------------------------------+
-'| This program is free software; you can redistribute it and/or modify |
-'| it under the terms of the GNU General Public License as published by |
-'| the Free Software Foundation; either version 2 of the License, or    |
-'| (at your option) any later version.                                  |
-'|                                                                      |
-'| This program is distributed in the hope that it will be useful,      |
-'| but WITHOUT ANY WARRANTY; without even the implied warranty of       |
-'| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        |
-'| GNU General Public License for more details.                         |
-'|                                                                      |
-'| You should have received a copy of the GNU General Public License    |
-'| along with this program; if not, write to the Free Software          |
-'| Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.            |
-'+----------------------------------------------------------------------+
-Option Explicit
+/*
++----------------------------------------------------------------------+
+| This is a plugin for WinMerge <www.winmerge.org>.                    |
+| It will ignores leading line numbers in text files.                  |
+| Copyright (C) 2007 by Tim Gerundt                                    |
++----------------------------------------------------------------------+
+| This program is free software; you can redistribute it and/or modify |
+| it under the terms of the GNU General Public License as published by |
+| the Free Software Foundation; either version 2 of the License, or    |
+| (at your option) any later version.                                  |
+|                                                                      |
+| This program is distributed in the hope that it will be useful,      |
+| but WITHOUT ANY WARRANTY; without even the implied warranty of       |
+| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the        |
+| GNU General Public License for more details.                         |
+|                                                                      |
+| You should have received a copy of the GNU General Public License    |
+| along with this program; if not, write to the Free Software          |
+| Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.            |
++----------------------------------------------------------------------+
+*/
 
-Function get_PluginEvent()
-  get_PluginEvent = "BUFFER_PREDIFF"
-End Function
+function get_PluginEvent() {
+  return "BUFFER_PREDIFF";
+}
 
-Function get_PluginDescription()
-  get_PluginDescription = "This plugin ignores the leading line numbers in text files (e.g. NC and BASIC files)."
-End Function
+function get_PluginDescription() {
+  return "This plugin ignores the leading line numbers in text files (e.g. NC and BASIC files).";
+}
 
-Function get_PluginFileFilters()
-  get_PluginFileFilters = "\.nc$"
-End Function
+function get_PluginFileFilters() {
+  return "\\.nc$";
+}
 
-Function get_PluginIsAutomatic()
-  get_PluginIsAutomatic = True
-End Function
+function get_PluginIsAutomatic() {
+  return true;
+}
 
-Function get_PluginExtendedProperties()
-  get_PluginExtendedProperties = "MenuCaption=Ignore Leading Line Numbers"
-End Function
+function get_PluginExtendedProperties() {
+  return "MenuCaption=Ignore Leading Line Numbers";
+}
 
-Function SafeUBound(ary)
-  On Error Resume Next
-  SafeUBound = -1
-  SafeUBound = UBound(ary)
-End Function
-
-Function SplitLines(text, eol)
-	Dim re, matches
-	Set re = New RegExp
-	re.Global = False
-	re.IgnoreCase = False
-	re.Pattern = "\r\n|\n|\r"
-	Set matches = re.Execute(text)
-	If matches.Count > 0 Then
-		eol = matches(0).Value
-	End If
-	SplitLines = Split(text, eol)
-End Function
-
-Function PrediffBufferW(text, size, bChanged)
-  Dim sTemp, bLineHasStarted
-  Dim i, l, sChar, lines, eol, line
+function PrediffBufferW(text, size, bChanged) {
   
-  bChanged = False
+  bChanged = false;
 
-  lines = SplitLines(text, eol)
-  For l = 0 To SafeUBound(lines)
-    bLineHasStarted = True
-    sTemp = ""
-    line = lines(l)
-    For i = 0 To Len(line) - 1 'For all chars...
-      sChar = Mid(line, i + 1, 1)
-      Select Case sChar
-        Case "N", "n", "1", "2", "3", "4", "5", "6", "7", "8", "9", "0" 'N or number...
-          If (bLineHasStarted = True) Then 'If line has started...
-            sChar = ""
-            bChanged = True
-          End If
-        Case Else
-          bLineHasStarted = False
-      End Select
-      sTemp = sTemp & sChar
-    Next
-    lines(l) = sTemp
-  Next
+  var matches = text.match(/\r\n|\n|\r/);
+  var eol = (matches != null) ? matches[0] : "\r\n";
+  var lines = text.split(eol);
+  for (var l = 0; l < lines.length; l++) {
+    var line = lines[l].replace(/^[Nn0123456789]+/, '');
+    if (line !== lines[l]) {
+      lines[l] = line;
+      bChanged = true;
+    }
+  }
   
-  If (bChanged = True) Then 'If text has changed...
-    text = Join(lines, eol)
-    size = Len(text)
-  End If
-  PrediffBufferW = True
-End Function
+  if (bChanged) { // if text has changed...
+    text = lines.join(eol);
+    size = text.length;
+  }
 
-Function ShowSettingsDialog()
-    ShowSettingsDialog = False
-    Err.Raise 30001, , "Not Implemented"
-End Function
+  var result = new ActiveXObject("Scripting.Dictionary");
+  result.Add(0, true);
+  result.Add(1, text);
+  result.Add(2, size);
+  result.Add(3, bChanged);
+  return result.Items();
+}
 
+function ShowSettingsDialog() {
+  throw new Error(30001, "Not Implemented");
+}
 
 </script>
 </scriptlet>
diff --git a/Plugins/dlls/PrediffLineFilter.sct b/Plugins/dlls/PrediffLineFilter.sct
index 75cd77fe777..03532c7bc1f 100644
--- a/Plugins/dlls/PrediffLineFilter.sct
+++ b/Plugins/dlls/PrediffLineFilter.sct
@@ -20,221 +20,188 @@
   <method name="ShowSettingsDialog"/>
 </implements>
 
-<script language="VBS">
-
-'/////////////////////////////////////////////////////////////////////////////
-'    This is a plugin for WinMerge.
-'    It does almost the same thing as Substitution filters.
-'    Copyright (C) 2018-2023 Takashi Sawanaka
-'
-'    This program is free software; you can redistribute it and/or modify
-'    it under the terms of the GNU General Public License as published by
-'    the Free Software Foundation; either version 2 of the License, or
-'    (at your option) any later version.
-'
-'    This program is distributed in the hope that it will be useful,
-'    but WITHOUT ANY WARRANTY; without even the implied warranty of
-'    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-'    GNU General Public License for more details.
-'
-'    You should have received a copy of the GNU General Public License
-'    along with this program; if not, write to the Free Software
-'    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-'
-
-Option Explicit
-
-Const RegKeyPath = "Plugins\PrediffLineFilter.sct/"
-Dim fso: Set fso = CreateObject("Scripting.FileSystemObject")
-Dim wsh: Set wsh = CreateObject("WScript.Shell")
-Dim mergeApp
-
-Function regRead(Key, DefaultValue)
-	regRead = DefaultValue
-	On Error Resume Next
-	If IsEmpty(mergeApp) Then
-		regRead = wsh.RegRead("HKCU\Software\Thingamahoochie\WinMerge\" & Replace(Key, "/", "\"))
-	Else
-		regRead = mergeApp.GetOption(Key, DefaultValue)
-	End If
-End Function
-
-Sub regWrite(Key, Value, TypeNm)
-	Dim tmp
-	On Error Resume Next
-	If IsEmpty(mergeApp) Then
-		wsh.RegWrite "HKCU\Software\Thingamahoochie\WinMerge\" &  Replace(Key, "/", "\"), Value, TypeNm
-	Else
-		If TypeNm = "REG_DWORD" Then
-			tmp = CLng(Value)
-		Else
-			tmp = CStr(Value)
-		End If
-		mergeApp.SaveOption Key, tmp
-	End If
-End Sub
-
-Function get_PluginEvent()
-  get_PluginEvent = "BUFFER_PREDIFF"
-End Function
-
-Function get_PluginDescription()
-  get_PluginDescription = "Prediff Line Filter"
-End Function
-
-Function get_PluginFileFilters()
-  get_PluginFileFilters = "\.nomatch(\..*)?$"
-End Function
-
-Function get_PluginIsAutomatic()
-  get_PluginIsAutomatic = True
-End Function
-
-Function get_PluginExtendedProperties()
-  get_PluginExtendedProperties = "MenuCaption=Apply Prediff Substitution Filters"
-End Function
-
-Sub PluginOnEvent(eventType, obj)
-  Set mergeApp = obj
-End Sub
-
-Function SafeUBound(ary)
-  On Error Resume Next
-  SafeUBound = -1
-  SafeUBound = UBound(ary)
-End Function
-
-Function PrediffBufferW(pText, pSize, pbChanged)
-  On Error Resume Next
-  Dim re, pattern, replaceText, ignoreCase
-  Dim count, i, j
-  Dim lines
-  Set re = New RegExp
-  If pText = "" Then
-    pbChanged = False
-    PrediffBufferW = True
-    Exit Function
-  End If
-  lines = Split(pText, vbLf)
-  count = regRead(RegKeyPath & "Count", 0)
-  For i = 1 To count
-    If regRead(RegKeyPath & "Enabled" & i, True) Then
-      If regRead(RegKeyPath & "UseRegExp" & i, True) Then
-        re.Global = True
-        re.Pattern = regRead(RegKeyPath & "Pattern" & i, "")
-        re.IgnoreCase = regRead(RegKeyPath & "IgnoreCase" & i, False)
-        replaceText = regRead(RegKeyPath & "ReplaceText" & i, "")
-        For j = 0 To SafeUBound(lines)
-          lines(j) = re.Replace(lines(j), replaceText)
-        Next
-      Else
-        pattern = regRead(RegKeyPath & "Pattern" & i, "")
-        replaceText = regRead(RegKeyPath & "ReplaceText" & i, "")
-        ignoreCase = regRead(RegKeyPath & "IgnoreCase" & i, False)
-        For j = 0 To SafeUBound(lines)
-          If ignoreCase Then
-            lines(j) = Replace(lines(j), pattern, replaceText, 1, -1, vbTextCompare)
-          Else
-            lines(j) = Replace(lines(j), pattern, replaceText, 1, -1, vbBinaryCompare)
-          End If
-        Next
-      End If
-    End If
-  Next
-  pText = Join(lines, vbLf)
-  pSize = Len(pText)
-  pbChanged = True
-  PrediffBufferW = True
-End Function
-
-Function Translate(text)
-  Dim re: Set re = CreateObject("VBScript.RegExp")
-  re.Pattern = "\${([^}]+)}"
-  re.Global = True
-  Translate = text
-  Dim match
-  Dim matches:Set matches = re.Execute(text)
-  if IsEmpty(mergeApp) Then
-    For Each match in matches
-      Translate = Replace(Translate, match.Value, match.Submatches(0))
-    Next
-  Else
-    For Each match in matches
-      Translate = Replace(Translate, match.Value, mergeApp.Translate(match.Submatches(0)))
-    Next
-  End If
-End Function
-
-Function ShowSettingsDialog()
-  Dim tname: tname = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() & ".hta")
-  Dim xmlfile: xmlfile = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() & ".xml")
-  Dim tfile: Set tfile = fso.CreateTextFile(tname, True, True)
-  Dim mshta
-  tfile.Write Translate(getResource("dialog1"))
-  tfile.Close
-  exportSettingsToXMLFile xmlfile
-  mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\System32\mshta.exe")
-  If Not fso.FileExists(mshta) Then
-    mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\SysWOW64\mshta.exe")
-  End If
-  Run wsh, """" & mshta & """ """ & tname & """  """ & xmlfile  & """"
-  importSettingsFromXMLFile xmlfile
-  fso.DeleteFile tname
-  fso.DeleteFile xmlfile
-End Function
-
-Sub Run(sh, cmd)
-  sh.Run cmd, 1, True
-End Sub
+<script language="JScript">
 
-</script>
+/*
+    This is a plugin for WinMerge.
+    It does almost the same thing as Substitution filters.
+    Copyright (C) 2018-2024 Takashi Sawanaka
 
-<script language="JScript">
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
 
 var REGKEY_PATH = "Plugins\\PrediffLineFilter.sct/";
+var fso = new ActiveXObject("Scripting.FileSystemObject");
+var wsh = new ActiveXObject("WScript.Shell");
+var mergeApp;
+
+function regRead(Key, DefaultValue) {
+  return mergeApp.GetOption(Key, DefaultValue);
+}
+
+function regWrite(Key, Value, TypeNm) {
+  mergeApp.SaveOption(Key, (TypeNm === "REG_DWORD") ? parseInt(Value) : String(Value));
+}
+
+function get_PluginEvent() {
+  return "BUFFER_PREDIFF";
+}
+
+function get_PluginDescription() {
+  return "Prediff Line Filter";
+}
+
+function get_PluginFileFilters() {
+  return "\\.nomatch(\\..*)?$";
+}
+
+function get_PluginIsAutomatic() {
+  return true;
+}
+
+function get_PluginExtendedProperties() {
+  return "MenuCaption=Apply Prediff Substitution Filters";
+}
+
+function PluginOnEvent(eventType, obj) {
+  mergeApp = obj;
+}
+
+function PrediffBufferW(pText, pSize, pbChanged) {
+  if (pText == "") {
+    var result = new ActiveXObject("Scripting.Dictionary");
+    result.Add(0, true);
+    result.Add(1, "");
+    result.Add(2, 0);
+    result.Add(3, false);
+    return result.Items();
+  }
+  var pattern, replaceText, ignoreCase;
+  var lines = pText.split("\n");
+  var count = regRead(REGKEY_PATH + "Count", 0);
+  for (var i = 1; i <= count; i++) {
+    if (regRead(REGKEY_PATH + "Enabled" + i, true)) {
+      pattern = regRead(REGKEY_PATH + "Pattern" + i, "");
+      ignoreCase = regRead(REGKEY_PATH + "IgnoreCase" + i, false);
+      replaceText = regRead(REGKEY_PATH + "ReplaceText" + i, "");
+      if (regRead(REGKEY_PATH + "UseRegExp" + i, true)) {
+        var re = new RegExp(pattern, ignoreCase ? "gi" : "g");
+        for (var j = 0; j < lines.length; j++) {
+          lines[j] = lines[j].replace(re, replaceText);
+        }
+      } else {
+        for (var j = 0; j < lines.length; j++) {
+          lines[j] = replacei(lines[j], pattern, replaceText, ignoreCase);
+        }
+      }
+    }
+  }
+  pbChanged = true;
+  var result = new ActiveXObject("Scripting.Dictionary");
+  pText = lines.join("\n");
+  pSize = pText.length;
+  result.Add(0, true);
+  result.Add(1, pText);
+  result.Add(2, pSize);
+  result.Add(3, pbChanged);
+  return result.Items();
+}
+
+function replacei(text, find, replace, ignorecase) {
+  if (!ignorecase)
+    return text.split(find).join(replace);
+  var textLower = text.toLowerCase();
+  var findLower = find.toLowerCase();
+  var pos = textLower.length;
+  while (pos >= 0 && (pos = textLower.lastIndexOf(findLower, pos)) >= 0) {
+    text = text.substr(0, pos) + replace + text.substr(pos + findLower.length);
+    pos--;
+  }
+  return text;
+}
+
+function translate(text) {
+  var re = /\${([^}]+)}/g;
+  var matches;
+  while ((matches = re.exec(text)) != null) {
+    text = text.replace(matches[0], mergeApp.Translate(matches[1]));
+  }
+  return text;
+}
+
+function ShowSettingsDialog() {
+  var tname = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() + ".hta");
+  var xmlfile = fso.BuildPath(fso.GetSpecialFolder(2), fso.GetTempName() + ".xml");
+  var tfile = fso.CreateTextFile(tname, true, true);
+  tfile.Write(translate(getResource("dialog1")));
+  tfile.Close();
+  exportSettingsToXMLFile(xmlfile);
+  var mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\\System32\\mshta.exe");
+  if (!fso.FileExists(mshta)) {
+    mshta = wsh.ExpandEnvironmentStrings("%SystemRoot%\\SysWOW64\\mshta.exe");
+  }
+  run(wsh, "\"" + mshta + "\" \"" + tname + "\"  \"" + xmlfile + "\"");
+  importSettingsFromXMLFile(xmlfile);
+  fso.DeleteFile(tname);
+  fso.DeleteFile(xmlfile);
+}
+
+function run(sh, cmd) {
+  sh.Run(cmd, 1, true);
+}
 
-function exportSettingsToXMLFile(filepath)
-{
-	var key_defvalues = {"Count" : 0};
-	var count = regRead(REGKEY_PATH + "Count", 0);
-	for (var i = 1; i < count + 1; i++) {
-		key_defvalues["Enabled" + i] = true;
-		key_defvalues["IgnoreCase" + i] = false;
-		key_defvalues["UseRegExp" + i] = false;
-		key_defvalues["Pattern" + i] = "";
-		key_defvalues["ReplaceText" + i] = "";
-	}
-	var doc = new ActiveXObject("MSXML2.DOMDocument");
-	var fso = new ActiveXObject("Scripting.FileSystemObject");
-	var ts = fso.OpenTextFile(filepath, 2, true, -1);
-	var root = doc.createElement("properties");
-	for (var key in key_defvalues) {
-		var el = doc.createElement("property");
-		var val = regRead(REGKEY_PATH + key, key_defvalues[key]);
-		var cdata = doc.createCDATASection(val);
-		el.appendChild(cdata);
-		el.setAttribute("name", REGKEY_PATH + key);
-		el.setAttribute("type", typeof val);
-		root.appendChild(el);
-	}
-	doc.appendChild(root);
-	ts.Write(doc.xml);
-	ts.Close();
+function exportSettingsToXMLFile(filepath) {
+  var key_defvalues = {"Count" : 0};
+  var count = regRead(REGKEY_PATH + "Count", 0);
+  for (var i = 1; i < count + 1; i++) {
+    key_defvalues["Enabled" + i] = true;
+    key_defvalues["IgnoreCase" + i] = false;
+    key_defvalues["UseRegExp" + i] = false;
+    key_defvalues["Pattern" + i] = "";
+    key_defvalues["ReplaceText" + i] = "";
+  }
+  var doc = new ActiveXObject("MSXML2.DOMDocument");
+  var fso = new ActiveXObject("Scripting.FileSystemObject");
+  var ts = fso.OpenTextFile(filepath, 2, true, -1);
+  var root = doc.createElement("properties");
+  for (var key in key_defvalues) {
+    var el = doc.createElement("property");
+    var val = regRead(REGKEY_PATH + key, key_defvalues[key]);
+    var cdata = doc.createCDATASection(val);
+    el.appendChild(cdata);
+    el.setAttribute("name", REGKEY_PATH + key);
+    el.setAttribute("type", typeof val);
+    root.appendChild(el);
+  }
+  doc.appendChild(root);
+  ts.Write(doc.xml);
+  ts.Close();
 }
 
-function importSettingsFromXMLFile(filepath)
-{
-	var fso = new ActiveXObject("Scripting.FileSystemObject");
-	var ts = fso.OpenTextFile(filepath, 1, true, -1);
-	var xml = ts.ReadAll();
-	var doc = new ActiveXObject("MSXML2.DOMDocument");
-	doc.async = false
-	doc.loadXML(xml);
-	ts.Close();
-	var nodes = doc.documentElement.childNodes;
-	for (var i = 0; i < nodes.length; i++) {
-		regWrite(nodes[i].getAttribute("name"), nodes[i].text, (nodes[i].getAttribute("type") === "string") ? "REG_SZ" : "REG_DWORD");
-	}
+function importSettingsFromXMLFile(filepath) {
+  var fso = new ActiveXObject("Scripting.FileSystemObject");
+  var ts = fso.OpenTextFile(filepath, 1, true, -1);
+  var xml = ts.ReadAll();
+  var doc = new ActiveXObject("MSXML2.DOMDocument");
+  doc.async = false;
+  doc.loadXML(xml);
+  ts.Close();
+  var nodes = doc.documentElement.childNodes;
+  for (var i = 0; i < nodes.length; i++) {
+    regWrite(nodes[i].getAttribute("name"), nodes[i].text, (nodes[i].getAttribute("type") === "string") ? "REG_SZ" : "REG_DWORD");
+  }
 }
 
 </script>
@@ -281,12 +248,12 @@ function importSettingsFromXMLFile(filepath)
         var ts = fso.OpenTextFile(filepath, 1, true, -1);
         var xml = ts.ReadAll();
         var doc = new ActiveXObject("MSXML2.DOMDocument");
-        doc.async = false
+        doc.async = false;
         doc.loadXML(xml);
         ts.Close();
         var nodes = doc.documentElement.childNodes;
         for (var i = 0; i < nodes.length; i++) {
-        	regWrite(nodes[i].getAttribute("name"), nodes[i].text, (nodes[i].getAttribute("type") === "string") ? "REG_SZ" : "REG_DWORD");
+          regWrite(nodes[i].getAttribute("name"), nodes[i].text, (nodes[i].getAttribute("type") === "string") ? "REG_SZ" : "REG_DWORD");
         }
         return settings;
       }
diff --git a/Plugins/dlls/editor addin.sct b/Plugins/dlls/editor addin.sct
index 239aa04ef42..6bd475fddab 100644
--- a/Plugins/dlls/editor addin.sct	
+++ b/Plugins/dlls/editor addin.sct	
@@ -1,801 +1,724 @@
 <scriptlet>
 <implements type="Automation" id="dispatcher">
-	<property name="PluginEvent">
-		<get/>
-	</property>
-	<property name="PluginDescription">
-		<get/>
-	</property>
-	<property name="PluginExtendedProperties">
-		<get/>
-	</property>
-	<property name="PluginFileFilters">
-		<get/>
-	</property>
-	<property name="PluginArguments">
-		<get/>
-		<put/>
-	</property>
-	<property name="PluginVariables">
-		<get/>
-		<put/>
-	</property>
-	<method name="PluginOnEvent"/>
-	<method name="ExecFilterCommand"/>
-	<method name="MakeUpper"/>
-	<method name="MakeLower"/>
-	<method name="RemoveDuplicates"/>
-	<method name="CountDuplicates"/>
-	<method name="SortAscending"/>
-	<method name="SortDescending"/>
-	<method name="ReverseColumns"/>
-	<method name="ReverseLines"/>
-	<method name="SelectColumns"/>
-	<method name="SelectLines"/>
-	<method name="Replace" internalName="ReplaceText"/>
-	<method name="Tokenize"/>
-	<method name="Trim"/>
+  <property name="PluginEvent">
+    <get/>
+  </property>
+  <property name="PluginDescription">
+    <get/>
+  </property>
+  <property name="PluginExtendedProperties">
+    <get/>
+  </property>
+  <property name="PluginFileFilters">
+    <get/>
+  </property>
+  <property name="PluginArguments">
+    <get/>
+    <put/>
+  </property>
+  <property name="PluginVariables">
+    <get/>
+    <put/>
+  </property>
+  <method name="PluginOnEvent"/>
+  <method name="ExecFilterCommand"/>
+  <method name="MakeUpper"/>
+  <method name="MakeLower"/>
+  <method name="RemoveDuplicates"/>
+  <method name="CountDuplicates"/>
+  <method name="SortAscending"/>
+  <method name="SortDescending"/>
+  <method name="ReverseColumns"/>
+  <method name="ReverseLines"/>
+  <method name="SelectColumns"/>
+  <method name="SelectLines"/>
+  <method name="Replace" internalName="ReplaceText"/>
+  <method name="Tokenize"/>
+  <method name="Trim"/>
 </implements>
 
-<script language="VBS">
-Option Explicit
-
-Const PluginRegKeyPath = "Plugins\editor addin.sct/"
-
-Dim wsh: Set wsh = CreateObject("WScript.Shell")
-Dim arguments: arguments = ""
-Dim variables: variables = Array()
-Dim mergeApp
-
-Function get_PluginEvent()
-	get_PluginEvent = "EDITOR_SCRIPT"
-End Function
-
-Function get_PluginDescription()
-	get_PluginDescription = "Basic text functions for the context menu"
-End Function
-
-Function get_PluginFileFilters()
-	get_PluginFileFilters= ".*"
-End Function
-
-Function get_PluginExtendedProperties()
-	get_PluginExtendedProperties = _
-	"GenerateUnpacker;" & _
-	"MakeUpper.MenuCaption=Make Uppercase;" & _
-	"MakeUpper.Description=Make characters uppercase;" & _
-	"MakeLower.MenuCaption=Make Lowercase;" & _
-	"MakeLower.Description=Make characters lowercase;" & _
-	"RemoveDuplicates.MenuCaption=Remove Duplicate Lines;" & _
-	"RemoveDuplicates.Description=Remove duplicate lines;" & _
-	"CountDuplicates.MenuCaption=Count Duplicate Lines;" & _
-	"CountDuplicates.Description=Count duplicate lines;" & _
-	"SortAscending.MenuCaption=Sort Lines Ascending;" & _
-	"SortAscending.Description=Sort lines ascending;" & _
-	"SortDescending.MenuCaption=Sort Lines Descending;" & _
-	"SortDescending.Description=Sort lines descending;" & _
-	"ExecFilterCommand.MenuCaption=Apply Filter Command...;" & _
-	"ExecFilterCommand.Description=Apply filter command. " & vbCrLf & _
-		"Usage: ExecFilterCommand COMMAND" & vbCrLf & _
-		"  COMMAND - command to execute. %1 in the command is replaced with the filename.;" & _
-	"ExecFilterCommand.ArgumentsRequired;" & _
-	"Tokenize.MenuCaption=Tokenize...;" & _
-	"Tokenize.Description=Tokenize selection. " & vbCrLf & _
-		"Usage: Tokenize PATTERNS" & vbCrLf & _
-		"  PATTERNS - regular expression for tokenizing. (e.g. [^\w]+);" & _
-	"Tokenize.ArgumentsRequired;" & _
-	"Tokenize.Arguments=[^\w]+;" & _
-	"Trim.MenuCaption=Trim Spaces;" & _
-	"Trim.Description=Trim spaces;" & _
-	"SelectColumns.MenuCaption=Select Columns...;" & _
-	"SelectColumns.Description=Select some columns." & vbCrLf & _
-		"Usage: SelectColumns RANGES" & vbCrLf & _
-		"   or: SelectColumns [-v] [-i] [-g] -e PATTERNS" & vbCrLf & _
-		"  RANGES   - list of column ranges to select. (e.g. -3,5-10,30-)" & vbCrLf & _
-		"  PATTERNS - regular expression" & vbCrLf & _
-		"  -v - select non-matching columns" & vbCrLf & _
-		"  -i - ignore case" & vbCrLf & _
-		"  -g - enable global flag" & vbCrLf & _
-		"  -e - use PATTERNS for matching;" & _
-	"SelectColumns.ArgumentsRequired;" & _
-	"SelectLines.MenuCaption=Select Lines...;" & _
-	"SelectLines.Description=Select some lines." & vbCrLf & _
-		"Usage: SelectLines RANGES" & vbCrLf & _
-		"   or: SelectLines [-v] [-i] -e PATTERNS" & vbCrLf & _
-		"  RANGES   - list of line ranges to select. (e.g. -3,5-10,30-)" & vbCrLf & _
-		"  PATTERNS - regular expression" & vbCrLf & _
-		"  -v - select non-matching lines" & vbCrLf & _
-		"  -i - ignore case" & vbCrLf & _
-		"  -e - use PATTERNS for matching;" & _
-	"SelectLines.ArgumentsRequired;" & _
-	"ReverseColumns.MenuCaption=Reverse Columns;" & _
-	"ReverseColumns.Description=Reverse columns;" & _
-	"ReverseLines.MenuCaption=Reverse Lines;" & _
-	"ReverseLines.Description=Reverse lines;" & _
-	"Replace.MenuCaption=Replace...;" & _
-	"Replace.Description=Replace text with another text." & vbCrLf & _
-		"Usage: Replace [-i] [-e] FIND REPLACE" & vbCrLf & _
-		"  FIND    - text to find" & vbCrLf & _
-		"  REPLACE - text to replace" & vbCrLf & _
-		"  -i - ignore case (only for -e)" & vbCrLf & _
-		"  -e - treat the specified text as a regular expression;" & _
-	"Replace.ArgumentsRequired;"
-End Function
-
-Function get_PluginArguments()
-	get_PluginArguments = arguments
-End Function
-
-Sub put_PluginArguments(NewValue)
-	arguments = NewValue
-End Sub
-
-Function get_PluginVariables()
-	get_PluginVariables = Join(variables, Chr(0))
-End Function
-
-Sub put_PluginVariables(NewValue)
-	variables = Split(NewValue, Chr(0))
-End Sub
-
-Function regRead(Key, DefaultValue)
-	regRead = DefaultValue
-	On Error Resume Next
-	If IsEmpty(mergeApp) Then
-		regRead = wsh.RegRead("HKCU\Software\Thingamahoochie\WinMerge\" & Replace(Key, "/", "\"))
-	Else
-		regRead = mergeApp.GetOption(Key, DefaultValue)
-	End If
-End Function
-
-Sub regWrite(Key, Value, TypeNm)
-	Dim tmp
-	On Error Resume Next
-	If IsEmpty(mergeApp) Then
-		wsh.RegWrite "HKCU\Software\Thingamahoochie\WinMerge\" &  Replace(Key, "/", "\"), Value, TypeNm
-	Else
-		If TypeNm = "REG_DWORD" Then
-			tmp = CLng(Value)
-		Else
-			tmp = CStr(Value)
-		End If
-		mergeApp.SaveOption Key, tmp
-	End If
-End Sub
-
-Function ReplaceVariables(str)
-	Dim newstr
-	Dim pos
-	Dim foundpos
-	Dim ch
-	pos = 1
-	Do While True
-		foundpos = InStr(pos, str, "%")
-		If foundpos > 0 Then
-			ch = Mid(str, foundpos + 1, 1)
-			If ch = "%" Then
-				newstr = newstr & "%"
-				pos = foundpos + 2
-			ElseIf IsNumeric(ch) Then
-				newstr = newstr & Mid(str, pos, foundpos - pos)
-				If CLng(ch) <= SafeUBound(variables) Then
-					newstr = newstr & variables(CLng(ch))
-				End If
-				pos = foundpos + 2
-			Else
-				newstr = newstr & Mid(str, pos, foundpos - pos + 1)
-				pos = foundpos + 1
-			End If
-		Else
-			newstr = newstr & Mid(str, pos)
-			Exit Do
-		End If
-	Loop
-	ReplaceVariables = newstr
-End Function
-
-Function IsFirstArgumentEmpty()
-	IsFirstArgumentEmpty = (Trim(arguments) = "")
-End Function
-
-Function SafeUBound(ary)
-	SafeUBound = -1
-	On Error Resume Next
-	SafeUBound = UBound(ary)
-End Function
-
-Function ParseArguments(args)
-	Dim ary()
-	Dim ch
-	Dim inQuotes
-	Dim token
-	Dim argsLen
-	Dim i, j
-	argsLen = Len(args)
-	For i = 1 To argsLen
-		ch = Mid(args, i, 1)
-		If Not inQuotes Then
-			If ch = " " Or ch = vbTab Then
-				If len(token) > 0 Then
-					ReDim Preserve ary(j)
-					ary(j) = token
-					j = j + 1
-					token = ""
-				End If
-			ElseIf ch = """" Then
-				inQuotes = True
-			Else
-				token = token & ch
-			End If
-		Else
-			If ch = """" Then
-				If i + 1 <= argsLen Then
-					If Mid(args, i + 1, 1) = """" Then
-						token = token & ch
-					End if
-				End If
-				inQuotes = False 
-			Else
-				token = token & ch
-			End If
-		End If
-	Next
-	If Len(token) > 0 Then
-		ReDim Preserve ary(j)
-		ary(j) = token
-		j = j + 1
-		token = ""
-	End If
-	ParseArguments = ary 
-End Function
-
-Function ParseRanges(rangeText)
-	Dim i, j
-	Dim ary, ary2, aryRanges()
-	Dim rangeFrom, rangeTo
-	ary = Split(rangeText, ",")
-	j = 0
-	For i = 0 To SafeUBound(ary)
-		ary2 = Split(ary(i), "-")
-		rangeFrom = ""
-		If SafeUBound(ary2) >= 0 Then
-			rangeFrom = Trim(ary2(0))
-		End If
-		rangeTo = rangeFrom
-		If SafeUBound(ary2) > 0 Then
-			rangeTo = Trim(ary2(1))
-		End If
-		If IsNumeric(rangeFrom) Or IsNumeric(rangeTo) Then
-			If Not IsNumeric(rangeFrom) Then rangeFrom = 1
-			If Not IsNumeric(rangeTo)   Then rangeTo   = 1000000000
-			If CDbl(rangeFrom) < 1 Or CDbl(rangeFrom) > 1000000000 Then rangeFrom = 1
-			If CDbl(rangeTo)   < 1 Or CDbl(rangeTo)   > 1000000000 Then rangeTo   = 1
-			If CDbl(rangeFrom) > CDbl(rangeTo) Then rangeTo = rangeFrom
-			Redim preserve aryRanges(j)
-			aryRanges(j) = Array(CLng(rangeFrom), CLng(rangeTo))
-			j = j + 1
-		End If
-	Next
-	ParseRanges = aryRanges
-End Function
-
-Function ParseSelectColumnsLinesArguments(args, invert)
-	Dim rangesOrRegExps()
-	Dim argAry
-	Dim i, j
-	Dim re
-	Dim isOption
-	Set re = Nothing
-	argAry = ParseArguments(args)
-	invert = False
-	For i = 0 To SafeUBound(argAry)
-		isOption = False
-		If Len(argAry(i)) >= 2 Then
-			Select Case Left(argAry(i), 1)
-			Case "-", "/"
-				Select Case Mid(argAry(i), 2, 1)
-				Case "e", "i", "g"
-					isOption = True
-					If re Is Nothing Then
-						Set re = New RegExp
-						Redim Preserve rangesOrRegExps(j)
-						Set rangesOrRegExps(j) = re
-						j = j + 1
-					End If
-					If InStr(argAry(i), "i") > 0 Then
-						re.IgnoreCase = True
-					End If
-					If InStr(argAry(i), "g") > 0 Then
-						re.Global  = True
-					End If
-				Case "v"
-					isOption = True
-					invert = True
-				End Select
-			End Select
-		End If
-		If Not isOption Then
-			If Not (re Is Nothing) Then
-				re.Pattern = argAry(i)
-				Set re = Nothing
-			Else
-				Redim Preserve rangesOrRegExps(j)
-				rangesOrRegExps(j) = ParseRanges(argAry(i))
-				If SafeUBound(rangesOrRegExps(j)) < 0 Then
-					Set rangesOrRegExps(j) = New RegExp
-					rangesOrRegExps(j).Pattern = argAry(i)
-				End If
-				j = j + 1
-			End If
-		End If
-	Next
-	ParseSelectColumnsLinesArguments = rangesOrRegExps
-End Function
-
-Function ParseReplaceArguments(args, regex, ignoreCase)
-	Dim patterns()
-	Dim argAry
-	Dim i, j
-	Dim re
-	Dim isOption
-	Set re = Nothing
-	argAry = ParseArguments(args)
-	regex = False
-	ignoreCase = False
-	For i = 0 To SafeUBound(argAry)
-		isOption = False
-		If Len(argAry(i)) >= 2 Then
-			Select Case Left(argAry(i), 1)
-			Case "-", "/"
-				Select Case Mid(argAry(i), 2, 1)
-				Case "e", "i"
-					isOption = True
-					regex = True
-					If InStr(argAry(i), "i") > 0 Then
-						ignoreCase = True
-					End If
-				End Select
-			End Select
-		End If
-		If Not isOption Then
-			Redim Preserve patterns(j)
-			patterns(j) = argAry(i)
-			j = j + 1
-		End If
-	Next
-	ParseReplaceArguments = patterns
-End Function
-
-Function Unescape(text)
-	Dim textLen
-	Dim i
-	Dim ch
-
-	textLen = Len(text)
-	i = 1
-	Do While i <= textLen
-		ch = Mid(text, i, 1)
-		Select Case ch
-		Case "\"
-			If i <= textLen - 1 Then
-				i = i + 1
-				ch = Mid(text, i, 1)
-				Select Case ch
-				Case "a"
-					Unescape = Unescape & Chr(&H07)
-				Case "b"
-					Unescape = Unescape & Chr(&H08)
-				Case "t"
-					Unescape = Unescape & Chr(&H09)
-				Case "n"
-					Unescape = Unescape & Chr(&H0A)
-				Case "v"
-					Unescape = Unescape & Chr(&H0B)
-				Case "f"
-					Unescape = Unescape & Chr(&H0C)
-				Case "r"
-					Unescape = Unescape & Chr(&H0D)
-				Case "\"
-					Unescape = Unescape & "\"
-				Case Else
-					Unescape = Unescape & "\" & ch
-				End Select
-			Else
-				Unescape = Unescape & ch
-			End If
-		Case Else
-			Unescape = Unescape & ch
-		End Select
-		i = i + 1
-	Loop
-End Function
-
-Function SplitLines(text, eol)
-	Dim re, matches
-	Set re = New RegExp
-	re.Global = False
-	re.IgnoreCase = False
-	re.Pattern = "\r\n|\n|\r"
-	Set matches = re.Execute(text)
-	If matches.Count > 0 Then
-		eol = matches(0).Value
-	End If
-	SplitLines = Split(text, eol)
-End Function
-
-Sub PluginOnEvent(eventType, obj)
-	Set mergeApp = obj
-End Sub
-
-' transformation functions
-Function MakeUpper(Text)
-	MakeUpper = UCase(Text)
-End Function
-
-Function MakeLower(Text)
-	MakeLower = LCase(Text)
-End Function
-
-Function ExecFilterCommand(Text)
-	Dim cmd
-	If IsFirstArgumentEmpty() Then
-		cmd = regRead(PluginRegKeyPath & "ExecFilterCommand", "")
-		cmd = InputBox("Enter filter command", "ExecFilterCommand", cmd)
-		If cmd <> "" Then
-			regWrite PluginRegKeyPath & "ExecFilterCommand", cmd, "REG_SZ"
-		End If
-		cmd = ReplaceVariables(cmd)
-	Else
-		cmd = arguments
-	End If
-	If cmd = "" Then
-		Err.Raise 30001, , "Canceled"
-		Exit Function
-	End If
-
-	On Error Resume Next
-
-	Dim path
-	path = wsh.ExpandEnvironmentStrings("%TEMP%\_winmerge_addin_temp_.txt")
-
-	Dim fso
-	Dim ts
-	Set fso = CreateObject("Scripting.FileSystemObject")
-	Set ts = fso.CreateTextFile(path)
-	If ts Is Nothing Then
-		Exit Function
-	End If
-	ts.Write Text
-	ts.Close
-
-	Dim exe
-	Set exe = wsh.Exec("cmd /c type """ & path & """ | " & cmd & " 2>&1")
-	If exe Is Nothing Then
-		MsgBox "Failed to execute the command '" & cmd & "':" & Err.Description 
-		fso.DeleteFile path
-		Exit Function
-	End If
-
-	ExecFilterCommand = ""
-	Do Until exe.StdOut.AtEndOfStream
-		ExecFilterCommand = ExecFilterCommand & exe.StdOut.ReadLine & vbCrLf
-	Loop
-
-	fso.DeleteFile path
-
-End Function
-
-Function SelectColumns(Text)
-	Dim args, ranges, regexpStr
-	Dim matches, m
-	Dim lines, eol, line
-	Dim i, j, k
-	Dim rangesOrRegExps
-	Dim invert
-	If IsFirstArgumentEmpty() Then
-		args = regRead(PluginRegKeyPath & "SelectColumns", "")
-		args = InputBox("Enter the list of column ranges to select (e.g. -3,5-10,30-)" & vbCrLf & "or regular expression:", "SelectColumns", args)
-		If args <> "" Then
-			regWrite PluginRegKeyPath & "SelectColumns", args, "REG_SZ"
-		End If
-	Else
-		args = arguments
-	End If
-	If args = "" Then
-		Err.Raise 30001, , "Canceled"
-		Exit Function
-	End If
-	lines = SplitLines(Text, eol)
-	rangesOrRegExps = ParseSelectColumnsLinesArguments(args, invert)
-	For i = 0 To SafeUBound(lines)
-		line = ""
-		For j = 0 To SafeUBound(rangesOrRegExps)
-			If IsArray(rangesOrRegExps(j)) Then
-				For k = 0 To SafeUBound(rangesOrRegExps(j))
-					If rangesOrRegExps(j)(k)(0) <= Len(lines(i)) Then
-						line = line & Mid(lines(i), rangesOrRegExps(j)(k)(0), rangesOrRegExps(j)(k)(1) - rangesOrRegExps(j)(k)(0) + 1)
-					End If
-				Next
-			Else
-				If Not invert Then
-					Set matches = rangesOrRegExps(j).Execute(lines(i))
-					For Each m In matches
-						line = line & m.Value
-					Next
-				Else
-					line = line & rangesOrRegExps(j).Replace(lines(i), "")
-				End If
-			End If
-		Next
-		lines(i) = line
-	Next
-	SelectColumns = Join(lines, eol)
-End Function
-
-Function SelectLines(Text)
-	Dim args, ranges
-	Dim matches, rangesOrRegExps
-	Dim lines, newlines(), eol
-	Dim i, j, k, l
-	Dim max
-	Dim matched
-	Dim invert
-	If IsFirstArgumentEmpty() Then
-		args = regRead(PluginRegKeyPath & "SelectLines", "")
-		args = InputBox("Enter the list of line ranges to select (e.g. -3,5-10,30-)" & vbCrLf & "or regular expression:", "SelectLines", args)
-		If args <> "" Then
-			regWrite PluginRegKeyPath & "SelectLines", args, "REG_SZ"
-		End If
-	Else
-		args = arguments
-	End If
-	If args = "" Then
-		Err.Raise 30001, , "Canceled"
-		Exit Function
-	End If
-	lines = SplitLines(Text, eol)
-	l = 0
-	rangesOrRegExps = ParseSelectColumnsLinesArguments(args, invert)
-	For i = 0 To SafeUBound(rangesOrRegExps)
-		If IsArray(rangesOrRegExps(i)) Then
-			For j = 0 To SafeUBound(rangesOrRegExps(i))
-				max =rangesOrRegExps(i)(j)(1) - 1 
-				If max > SafeUBound(lines) Then max = SafeUBound(lines)
-				For k = rangesOrRegExps(i)(j)(0) - 1 To max
-					If k <= SafeUBound(lines) Then
-						ReDim Preserve newlines(l)
-						newlines(l) = lines(k)
-						l = l + 1
-					End If
-				Next
-			Next
-		Else
-			For j = 0 To SafeUBound(lines)
-				matched = rangesOrRegExps(i).Test(lines(j))
-				If invert Then matched = Not matched
-				If matched Then
-					ReDim Preserve newlines(l)
-					newlines(l) = lines(j)
-					l = l + 1
-				End If
-			Next
-		End If
-	Next
-	If SafeUBound(lines) >= 0 Then
-		If lines(UBound(lines)) = "" Then
-			If SafeUBound(newlines) >= 0 Then
-				If newlines(UBound(newlines)) <> "" Then
-					ReDim Preserve newlines(l)
-					newlines(l) = ""
-					l = l + 1
-				End If
-			End If
-		End If
-	End If
-	SelectLines = Join(newlines, eol)
-End Function
-
-Function ReplaceText(Text)
-	Dim args, patterns
-	Dim i
-	Dim re, regex
-	Dim ignoreCase
-	ReplaceText = Text
-	If IsFirstArgumentEmpty() Then
-		args = regRead(PluginRegKeyPath & "Replace", "")
-		args = InputBox("Enter the search text and replacement text:", "Replace", args)
-		If args <> "" Then
-			regWrite PluginRegKeyPath & "Replace", args, "REG_SZ"
-		End If
-	Else
-		args = arguments
-	End If
-	If args = "" Then
-		Err.Raise 30001, , "Canceled"
-		Exit Function
-	End If
-	patterns = ParseReplaceArguments(args, regex, ignoreCase)
-	If regex Then
-		For i = 0 To SafeUBound(patterns) Step 2
-			Set re = New RegExp
-			re.IgnoreCase = ignoreCase
-			re.Global = True
-			re.Multiline = True
-			re.Pattern = patterns(i)
-			If i + 1 <= UBound(patterns) Then
-				ReplaceText = re.Replace(ReplaceText, Unescape(patterns(i + 1)))
-			Else
-				ReplaceText = re.Replace(ReplaceText, "")
-			End If
-		Next
-	Else
-		For i = 0 To SafeUBound(patterns) Step 2
-			If i + 1 <= UBound(patterns) Then
-				ReplaceText = Replace(ReplaceText, patterns(i), patterns(i + 1))
-			Else
-				ReplaceText = Replace(ReplaceText, patterns(i), "")
-			End If
-		Next
-	End If
-End Function
-
-' port from WinMerge2011
-Function Tokenize(Text)
-	Dim pattern
-	If IsFirstArgumentEmpty() Then
-		pattern = regRead(PluginRegKeyPath & "Tokenize", "")
-		pattern = InputBox("Enter regex to tokenize (e.g. [^\w]+):", "Tokenize", pattern)
-		If pattern <> "" Then
-			regWrite PluginRegKeyPath & "Tokenize", pattern, "REG_SZ"
-		End If
-	Else
-		pattern = arguments
-	End If
-	If pattern = "" Then
-		Err.Raise 30001, , "Canceled"
-		Exit Function
-	End If
-	Dim re
-	Set re = New RegExp
-	re.Global = True
-	re.IgnoreCase = True
-	re.Pattern = pattern
-	Tokenize = re.Replace(Text, vbCrLf)
-End Function
+<script language="JScript">
 
-</script>
+var REGKEY_PATH = "Plugins\\editor addin.sct/";
 
-<script language="JScript">
+var wsh = new ActiveXObject("WScript.Shell");
+var pluginArguments = "";
+var variables = new Array();
+var mergeApp;
+
+function get_PluginEvent() {
+  return "EDITOR_SCRIPT";
+}
+
+function get_PluginDescription() {
+  return "Basic text functions for the context menu";
+}
+
+function get_PluginFileFilters() {
+  return ".*";
+}
+
+function get_PluginExtendedProperties() {
+  return "GenerateUnpacker;" + 
+  "MakeUpper.MenuCaption=Make Uppercase;" + 
+  "MakeUpper.Description=Make characters uppercase;" + 
+  "MakeLower.MenuCaption=Make Lowercase;" + 
+  "MakeLower.Description=Make characters lowercase;" + 
+  "RemoveDuplicates.MenuCaption=Remove Duplicate Lines;" + 
+  "RemoveDuplicates.Description=Remove duplicate lines;" + 
+  "CountDuplicates.MenuCaption=Count Duplicate Lines;" + 
+  "CountDuplicates.Description=Count duplicate lines;" + 
+  "SortAscending.MenuCaption=Sort Lines Ascending;" + 
+  "SortAscending.Description=Sort lines ascending;" + 
+  "SortDescending.MenuCaption=Sort Lines Descending;" + 
+  "SortDescending.Description=Sort lines descending;" + 
+  "ExecFilterCommand.MenuCaption=Apply Filter Command...;" + 
+  "ExecFilterCommand.Description=Apply filter command. \r\n" + 
+    "Usage: ExecFilterCommand COMMAND\r\n"+ 
+    "  COMMAND - command to execute. %1 in the command is replaced with the filename.;" + 
+  "ExecFilterCommand.ArgumentsRequired;" + 
+  "Tokenize.MenuCaption=Tokenize...;" + 
+  "Tokenize.Description=Tokenize selection. \r\n" + 
+    "Usage: Tokenize PATTERNS\r\n" + 
+    "  PATTERNS - regular expression for tokenizing. (e.g. [^\\w]+);" + 
+  "Tokenize.ArgumentsRequired;" + 
+  "Tokenize.Arguments=[^\\w]+;" + 
+  "Trim.MenuCaption=Trim Spaces;" + 
+  "Trim.Description=Trim spaces;" + 
+  "SelectColumns.MenuCaption=Select Columns...;" + 
+  "SelectColumns.Description=Select some columns.\r\n" + 
+    "Usage: SelectColumns RANGES\r\n" + 
+    "   or: SelectColumns [-v] [-i] [-g] -e PATTERNS\r\n" + 
+    "  RANGES   - list of column ranges to select. (e.g. -3,5-10,30-)\r\n" + 
+    "  PATTERNS - regular expression\r\n" +  
+    "  -v - select non-matching columns\r\n" +  
+    "  -i - ignore case\r\n" +  
+    "  -g - enable global flag\r\n" +  
+    "  -e - use PATTERNS for matching;" + 
+  "SelectColumns.ArgumentsRequired;" + 
+  "SelectLines.MenuCaption=Select Lines...;" + 
+  "SelectLines.Description=Select some lines.\r\n" +  
+    "Usage: SelectLines RANGES\r\n" +  
+    "   or: SelectLines [-v] [-i] -e PATTERNS\r\n" +  
+    "  RANGES   - list of line ranges to select. (e.g. -3,5-10,30-)\r\n" +  
+    "  PATTERNS - regular expression\r\n" +  
+    "  -v - select non-matching lines\r\n" +  
+    "  -i - ignore case\r\n" +  
+    "  -e - use PATTERNS for matching;" + 
+  "SelectLines.ArgumentsRequired;" + 
+  "ReverseColumns.MenuCaption=Reverse Columns;" + 
+  "ReverseColumns.Description=Reverse columns;" + 
+  "ReverseLines.MenuCaption=Reverse Lines;" + 
+  "ReverseLines.Description=Reverse lines;" + 
+  "Replace.MenuCaption=Replace...;" + 
+  "Replace.Description=Replace text with another text.\r\n" +  
+    "Usage: Replace [-i] [-e] FIND REPLACE\r\n" +  
+    "  FIND    - text to find\r\n" +  
+    "  REPLACE - text to replace\r\n" +  
+    "  -i - ignore case (only for -e)\r\n" +  
+    "  -e - treat the specified text as a regular expression;" + 
+  "Replace.ArgumentsRequired;";
+}
+
+function get_PluginArguments() {
+  return pluginArguments;
+}
+
+function put_PluginArguments(NewValue) {
+  pluginArguments = NewValue;
+}
+
+function get_PluginVariables() {
+  return variables.join("\0");
+}
+
+function put_PluginVariables(NewValue) {
+  variables = NewValue.split("\0");
+}
+
+function regRead(Key, DefaultValue) {
+  return mergeApp.GetOption(Key, DefaultValue);
+}
+
+function regWrite(Key, Value, TypeNm) {
+  mergeApp.SaveOption(Key, (TypeNm === "REG_DWORD") ? parseInt(Value) : String(Value));
+}
+
+function ReplaceVariables(str) {
+  var newstr = "";
+  var pos = 0;
+  while (true) {
+    var foundpos = str.indexOf("%", pos);
+    if (foundpos > 0) {
+      var ch = str.charAt(foundpos + 1);
+      if (ch === "%") {
+        newstr = newstr + "%";
+        pos = foundpos + 2;
+      } else if (!isNaN(ch)) {
+        newstr = newstr + str.substr(pos, foundpos - pos);
+        if (parseInt(ch) < variables.length) {
+          newstr = newstr + variables(parseInt(ch));
+        }
+        pos = foundpos + 2;
+      } else {
+        newstr = newstr + str.substr(pos, foundpos - pos + 1);
+        pos = foundpos + 1;
+      }
+  } else {
+      newstr = newstr + str.substr(pos);
+      break;
+    }
+  }
+  return newstr;
+}
+
+function IsFirstArgumentEmpty() {
+  return (pluginArguments.match(/^\s*$/) !== null);
+}
+
+function ParseArguments(args) {
+  var ary = new Array();
+  var token = "";
+  var argsLen = args.length;
+  var inQuotes = false;
+  for (var i = 0; i < argsLen; i++) {
+    var ch = args.charAt(i);
+    if (!inQuotes) {
+      if (ch === " " || ch === "\t") {
+        if (token.length > 0) {
+          ary.push(token);
+          token = "";
+        }
+      } else if (ch === "\"") {
+        inQuotes = true;
+      } else {
+        token += ch;
+      }
+    } else {
+      if (ch === "\"") {
+        if (i + 1 < argsLen) {
+          if (args.charAt(i) === "\"") {
+            token += ch;
+          }
+        }
+        inQuotes = false;
+      } else {
+        token += ch;
+      }
+    }
+  }
+  if (token.length > 0) {
+    ary.push(token);
+    token = "";
+  }
+  return ary; 
+}
+
+function ParseRanges(rangeText) {
+  var aryRanges = new Array();
+  var ary = rangeText.split(",");
+  for (var i = 0, j = 0; i < ary.length; i++) {
+    var ary2 = ary[i].split("-");
+    var rangeFrom = "";
+    if (ary2.length > 0) {
+      rangeFrom = ary2[0].replace(/^\s+|\s+$/g, "");
+    }
+    var rangeTo = rangeFrom;
+    if (ary2.length > 1) {
+      rangeTo = ary2[1].replace(/^\s+|\s+$/g, "");
+    }
+    if ((rangeFrom !== "" && !isNaN(rangeFrom)) || (rangeTo !== "" && !isNaN(rangeTo))) {
+      if (rangeFrom === "" || isNaN(rangeFrom)) { rangeFrom = 1; }
+      if (rangeTo === "" || isNaN(rangeTo)) { rangeTo = 1000000000; }
+      if (parseFloat(rangeFrom) < 1 || parseFloat(rangeFrom) > 1000000000) { rangeFrom = 1; }
+      if (parseFloat(rangeTo) < 1 || parseFloat(rangeTo) > 1000000000) { rangeTo = 1; }
+      if (parseFloat(rangeFrom) > parseFloat(rangeTo)) { rangeTo = rangeFrom; }
+      aryRanges.push([parseInt(rangeFrom), parseInt(rangeTo)]);
+    }
+    }
+  return aryRanges;
+}
+
+function ParseSelectColumnsLinesArguments(args) {
+  var rangesOrRegExps = new Array();
+  var argAry = ParseArguments(args);
+  var invert = false;
+  var flags = "";
+  var isRegExp = false;
+  for (var i = 0; i < argAry.length; i++) {
+    var isOption = false;
+    if (argAry[i].length >= 2) {
+      switch (argAry[i].charAt(0)) {
+      case "-":
+      case "/":
+        switch (argAry[i].charAt(1)) {
+        case "e":
+        case "i":
+        case "g":
+          isRegExp = true;
+          isOption = true;
+          if (argAry[i].indexOf("g") >= 0) {
+            flags += "g";
+          }
+          if (argAry[i].indexOf("i") >= 0) {
+            flags += "i";
+          }
+          break;
+        case "v":
+          isOption = true;
+          invert = true;
+          break;
+        }
+        break;
+      }
+    }
+    if (!isOption) {
+      if (isRegExp) {
+        rangesOrRegExps.push(new RegExp(argAry[i], flags));
+        isRegExp = false;
+      } else {
+        rangesOrRegExps.push(ParseRanges(argAry[i]));
+      }
+    }
+  }
+  return { "rangesOrRegExps": rangesOrRegExps, "invert": invert };
+}
+
+function ParseReplaceArguments(args) {
+  var patterns = new Array();
+  var isOption = false;
+  var argAry = ParseArguments(args);
+  var regex = false;
+  var ignoreCase = false;
+  for (var i = 0; i < argAry.length; i++) {
+    isOption = false;
+    if (argAry[i].length >= 2) {
+      switch (argAry[i].charAt(0)) {
+      case "-":
+      case "/":
+        switch (argAry[i].charAt(1)) {
+        case "e":
+        case "i":
+          isOption = true;
+          regex = true;
+          if (argAry[i].indexOf("i") >= 0) {
+            ignoreCase = true;
+          }
+          break;
+        }
+        break;
+      }
+    }
+    if (!isOption) {
+      patterns.push(argAry[i]);
+    }
+  }
+  return { "patterns": patterns, "regex": regex, "ignoreCase": ignoreCase };
+}
+
+function Unescape(text) {
+  var result = "";
+  var textLen = text.length;
+  var i = 0;
+  while (i < textLen) {
+    var ch = text.charAt(i);
+    switch (ch) {
+    case "\\":
+      if (i < textLen - 1) {
+        i++;
+        ch = text.charAt(i);
+        switch (ch) {
+        case "a":
+          result += String.fromCharCode(0x07);
+          break;
+        case "b":
+          result += "\b";
+          break;
+        case "t":
+          result += "\t";
+          break;
+        case "n":
+          result += "\n";
+          break;
+        case "v":
+          result += String.fromCharCode(0x0b);
+          break;
+        case "f":
+          result += "\f";
+          break;
+        case "r":
+          result += "\r";
+          break;
+        case "\\":
+          result += "\\";
+          break;
+        default:
+          result += "\\" + ch;
+          break;
+        }
+      } else {
+        result += ch;
+      }
+      break;
+    default:
+      result += ch;
+      break;
+    }
+    i++;
+  }
+  return result;
+}
+
+function PluginOnEvent(eventType, obj) {
+  mergeApp = obj;
+}
+
+// transformation functions
+function MakeUpper(Text) {
+  return Text.toUpperCase();
+}
+
+function MakeLower(Text) {
+  return Text.toLowerCase();
+}
+
+function ExecFilterCommand(Text) {
+  var cmd;
+  if (IsFirstArgumentEmpty()) {
+    cmd = regRead(REGKEY_PATH + "ExecFilterCommand", "");
+    cmd = mergeApp.InputBox("Enter filter command", "ExecFilterCommand", cmd);
+    if (cmd !== "") {
+      regWrite(REGKEY_PATH + "ExecFilterCommand", cmd, "REG_SZ");
+    }
+    cmd = ReplaceVariables(cmd);
+  } else {
+    cmd = pluginArguments;
+  }
+  if (cmd === "") {
+    throw new Error(30001, "Canceled");
+  }
+
+  var path = wsh.ExpandEnvironmentStrings("%TEMP%\\_winmerge_addin_temp_.txt");
+  var fso = new ActiveXObject("Scripting.FileSystemObject");
+  try {
+    var ts = fso.CreateTextFile(path, true, true);
+    ts.Write(Text);
+    ts.Close();
+  } catch (e) {
+    throw new Error(30001, "Failed to create the file '" + path + "':" + e.message);
+  }
+  var result = "";
+  try {
+    var exe = wsh.Exec("cmd /c type \"" + path + "\" | " + cmd + " 2>&1");
+    while (!exe.StdOut.AtEndOfStream) {
+      result += exe.StdOut.ReadLine() + "\r\n";
+    }
+  } catch (e) {
+    throw new Error(30001, "Failed to execute the command '" + cmd + "':" + e.message);
+  } finally {
+    fso.DeleteFile(path);
+  }
+  return result;
+}
+
+function SelectColumns(Text) {
+  var args;
+  if (IsFirstArgumentEmpty()) {
+    args = regRead(REGKEY_PATH + "SelectColumns", "");
+    args = mergeApp.InputBox("Enter the list of column ranges to select (e.g. -3,5-10,30-)\r\nor regular expression:", "SelectColumns", args);
+    if (args !== "") {
+      regWrite(REGKEY_PATH + "SelectColumns", args, "REG_SZ");
+    }
+  } else {
+    args = pluginArguments;
+  }
+  if (args === "") {
+    throw new Error(30001, "Canceled");
+  }
+  var eol = Text.match(/\r\n|\n|\r/);
+  var lines = Text.split(eol);
+  var parseResult = ParseSelectColumnsLinesArguments(args);
+  var rangesOrRegExps = parseResult.rangesOrRegExps;
+  var invert = parseResult.invert;
+  for (var i = 0; i < lines.length; i++) {
+    var line = "";
+    for (var j = 0; j < rangesOrRegExps.length; j++) {
+      if (rangesOrRegExps[j] instanceof Array) {
+        for (var k = 0; k < rangesOrRegExps[j].length; k++) {
+          if (rangesOrRegExps[j][k][0] - 1 < lines[i].length) {
+            line += lines[i].substring(rangesOrRegExps[j][k][0] - 1, rangesOrRegExps[j][k][1]);
+          }
+        }
+      } else {
+        if (!invert) {
+          var matches = lines[i].match(rangesOrRegExps[j]);
+          if (matches) {
+            for (var k = 0; k < matches.length; k++) {
+              line += matches[k];
+            }
+          }
+        } else {
+          line += lines[i].replace(rangesOrRegExps[j], "");
+        }
+      }
+    }
+    lines[i] = line;
+  }
+  return lines.join(eol);
+}
+
+function SelectLines(Text) {
+  var args;
+  var newlines = new Array();
+  if (IsFirstArgumentEmpty()) {
+    args = regRead(REGKEY_PATH + "SelectLines", "");
+    args = mergeApp.InputBox("Enter the list of line ranges to select (e.g. -3,5-10,30-)\r\nor regular expression:", "SelectLines", args);
+    if (args !== "") {
+      regWrite(REGKEY_PATH + "SelectLines", args, "REG_SZ");
+    }
+  } else {
+    args = pluginArguments;
+  }
+  if (args === "") {
+    throw new Error(30001, "Canceled");
+  }
+  var eol = Text.match(/\r\n|\n|\r/);
+  var lines = Text.split(eol);
+  var parseResult = ParseSelectColumnsLinesArguments(args);
+  var invert = parseResult.invert;
+  var rangesOrRegExps = parseResult.rangesOrRegExps;
+  for (var i = 0; i < rangesOrRegExps.length; i++) {
+    if (rangesOrRegExps[i] instanceof Array) {
+      for (var j = 0; j < rangesOrRegExps[i].length; j++) {
+        var max = rangesOrRegExps[i][j][1];
+        if (max > lines.length) { max = lines.length; }
+        for (var k = rangesOrRegExps[i][j][0] - 1; k < max; k++) {
+          if (k < lines.length) {
+            newlines.push(lines[k]);
+          }
+        }
+      }
+    } else {
+      for (var j = 0; j < lines.length; j++) {
+        var matched = (lines[j].match(rangesOrRegExps[i]) !== null);
+        if (invert) { matched = !matched; }
+        if (matched) {
+          newlines.push(lines[j]);
+        }
+      }
+    }
+  }
+  if (lines.length > 0) {
+    if (lines[lines.length - 1] === "") {
+      if (newlines.length > 0) {
+        if (newlines[newlines.length - 1] !== "") {
+          newlines.push("");
+        }
+      }
+    }
+  }
+  return newlines.join(eol);
+}
+
+function replacei(text, find, replace, ignorecase) {
+  if (!ignorecase)
+    return text.split(find).join(replace);
+  var textLower = text.toLowerCase();
+  var findLower = find.toLowerCase();
+  var pos = textLower.length;
+  while (pos >= 0 && (pos = textLower.lastIndexOf(findLower, pos)) >= 0) {
+    text = text.substr(0, pos) + replace + text.substr(pos + findLower.length);
+    pos--;
+  }
+  return text;
+}
+
+function ReplaceText(Text) {
+  var args;
+  var result = Text;
+  if (IsFirstArgumentEmpty()) {
+    args = regRead(REGKEY_PATH + "Replace", "");
+    args = mergeApp.InputBox("Enter the search text and replacement text:", "Replace", args);
+    if (args !== "") {
+      regWrite(REGKEY_PATH + "Replace", args, "REG_SZ");
+    }
+  } else {
+    args = pluginArguments;
+  }
+  if (args === "") {
+    throw new Error(30001, "Canceled");
+  }
+  var parseResult = ParseReplaceArguments(args);
+  var patterns = parseResult.patterns;
+  var regex = parseResult.regex;
+  var ignoreCase = parseResult.ignoreCase;
+  if (regex) {
+    for (var i = 0; i < patterns.length; i += 2) {
+      var re = new RegExp(patterns[i], ignoreCase ? "gmi" : "gm");
+      if (i + 1 < patterns.length) {
+        result = result.replace(re, Unescape(patterns[i + 1]));
+      } else {
+        result = result.replace(re, result, "");
+      }
+    }
+  } else {
+    for (var i = 0; i < patterns.length; i += 2) {
+      if (i + 1 < patterns.length) {
+        result = replacei(result, patterns[i], patterns[i + 1]);
+      } else {
+        result = replacei(result, patterns[i], "");
+      }
+    }
+  }
+  return result;
+}
+
+// port from WinMerge2011
+function Tokenize(Text) {
+  var pattern;
+  if (IsFirstArgumentEmpty()) {
+    pattern = regRead(REGKEY_PATH + "Tokenize", "");
+    pattern = mergeApp.InputBox("Enter regex to tokenize (e.g. [^\\w]+):", "Tokenize", pattern);
+    if (pattern !== "") {
+      regWrite(REGKEY_PATH + "Tokenize", pattern, "REG_SZ");
+    }
+  } else {
+    pattern = pluginArguments;
+  }
+  if (pattern === "") {
+    throw new Error(30001, "Canceled");
+  }
+  var re = new RegExp(pattern, "gi");
+  return Text.replace(re, "\r\n");
+}
 
 function RemoveDuplicates(Text) {
-	var eol = Text.match(/\r\n|\n|\r/);
-	var lines = Text.split(eol);
-	var newlines = new Array();
-	var dic = {};
-	var lasteol = false;
-
-	if (!lines[lines.length - 1]) {
-		lines.pop();
-		lasteol = true;
-	}
-	for (var i = 0, j = 0; i < lines.length; i++) {
-		var line = lines[i];
-		if (typeof dic[line] === 'undefined') {
-			dic[line] = 1;
-			newlines[j] = line;
-			j++;
-		}
-	}
-	if (lasteol)
-		newlines.push("");
-	return newlines.join(eol);
+  var eol = Text.match(/\r\n|\n|\r/);
+  var lines = Text.split(eol);
+  var newlines = new Array();
+  var dic = {};
+  var lasteol = false;
+
+  if (!lines[lines.length - 1]) {
+    lines.pop();
+    lasteol = true;
+  }
+  for (var i = 0, j = 0; i < lines.length; i++) {
+    var line = lines[i];
+    if (typeof dic[line] === 'undefined') {
+      dic[line] = 1;
+      newlines.push(line);
+    }
+  }
+  if (lasteol)
+    newlines.push("");
+  return newlines.join(eol);
 }
 
 function CountDuplicates(Text) {
-	var eol = Text.match(/\r\n|\n|\r/);
-	var lines = Text.split(eol);
-	var newlines = new Array();
-	var dic = {};
-
-	if (!lines[lines.length - 1]) {
-		lines.pop();
-	}
-	
-	for (var i = 0; i < lines.length; i++) {
-		var line = lines[i];
-		if (typeof dic[line] === 'undefined') {
-			dic[line] = 1;
-			newlines[j] = line;
-			j++;
-		} else {
-			dic[line]++;
-		}
-	}
-	var j = 0;
-	for (var line in dic) {
-		newlines[j] = line + '\t' + dic[line];
-		j++;
-	}
-	if (eol)
-		newlines[j] = "";
-	return newlines.join(eol);
+  var eol = Text.match(/\r\n|\n|\r/);
+  var lines = Text.split(eol);
+  var newlines = new Array();
+  var dic = {};
+
+  if (!lines[lines.length - 1]) {
+    lines.pop();
+  }
+  
+  for (var i = 0; i < lines.length; i++) {
+    var line = lines[i];
+    if (typeof dic[line] === 'undefined') {
+      dic[line] = 1;
+      newlines.push(line);
+    } else {
+      dic[line]++;
+    }
+  }
+  var j = 0;
+  for (var line in dic) {
+    newlines[j] = line + '\t' + dic[line];
+    j++;
+  }
+  if (eol)
+    newlines[j] = "";
+  return newlines.join(eol);
 }
 
 function ReverseColumns(Text) {
-	var eol = Text.match(/\r\n|\n|\r/);
-	var lines = Text.split(eol);
-	var lasteol = false;
-	if (!lines[lines.length - 1]) {
-		lines.pop();
-		lasteol = true;
-	}
-	for (var i = 0; i < lines.length; i++) {
-		var line = lines[i];
-		var newline = "";
-		for (var j = 0; j < line.length; j++)
-			newline += line.substr(line.length - j - 1, 1);
-		lines[i] = newline;
-	}
-	if (lasteol)
-		lines.push("");
-	return lines.join(eol);
+  var eol = Text.match(/\r\n|\n|\r/);
+  var lines = Text.split(eol);
+  var lasteol = false;
+  if (!lines[lines.length - 1]) {
+    lines.pop();
+    lasteol = true;
+  }
+  for (var i = 0; i < lines.length; i++) {
+    var line = lines[i];
+    var newline = "";
+    for (var j = 0; j < line.length; j++)
+      newline += line.substr(line.length - j - 1, 1);
+    lines[i] = newline;
+  }
+  if (lasteol)
+    lines.push("");
+  return lines.join(eol);
 }
 
 function ReverseLines(Text) {
-	var eol = Text.match(/\r\n|\n|\r/);
-	var lines = Text.split(eol);
-	var lasteol = false;
-	if (!lines[lines.length - 1]) {
-		lines.pop();
-		lasteol = true;
-	}
-	var m = parseInt(lines.length / 2);
-	for (var i = 0; i < m; i++) {
-		var line = lines[i];
-		lines[i] = lines[lines.length - i - 1]
-		lines[lines.length - i - 1] = line;
-	}
-	if (lasteol)
-		lines.push("");
-	return lines.join(eol);
+  var eol = Text.match(/\r\n|\n|\r/);
+  var lines = Text.split(eol);
+  var lasteol = false;
+  if (!lines[lines.length - 1]) {
+    lines.pop();
+    lasteol = true;
+  }
+  var m = parseInt(lines.length / 2);
+  for (var i = 0; i < m; i++) {
+    var line = lines[i];
+    lines[i] = lines[lines.length - i - 1];
+    lines[lines.length - i - 1] = line;
+  }
+  if (lasteol)
+    lines.push("");
+  return lines.join(eol);
 }
 
 function SortAscending(Text) {
-	var eol = Text.match(/\r\n|\n|\r/);
-	var lines = Text.split(eol);
-
-	if (lines.length == 1) {
-		return Text;
-	} else if (lines[lines.length - 1] == "") {
-		lines.pop();
-		return lines.sort().join(eol) + eol;
-	} else {
-		return lines.sort().join(eol);
-	}
+  var eol = Text.match(/\r\n|\n|\r/);
+  var lines = Text.split(eol);
+
+  if (lines.length == 1) {
+    return Text;
+  } else if (lines[lines.length - 1] == "") {
+    lines.pop();
+    return lines.sort().join(eol) + eol;
+  } else {
+    return lines.sort().join(eol);
+  }
 }
 
 function SortDescending(Text) {
-	var eol = Text.match(/\r\n|\n|\r/);
-	var lines = Text.split(eol);
-
-	if (lines.length == 1) {
-		return Text;
-	} else if (lines[lines.length - 1] == "") {
-		lines.pop();
-		lines.sort(function(a, b) { return a < b ? 1 : -1; });
-		return lines.join(eol) + eol;
-	} else {
-		return lines.sort(function(a, b) { return a < b ? 1 : -1; }).join(eol);
-	}
+  var eol = Text.match(/\r\n|\n|\r/);
+  var lines = Text.split(eol);
+
+  if (lines.length == 1) {
+    return Text;
+  } else if (lines[lines.length - 1] == "") {
+    lines.pop();
+    lines.sort(function(a, b) { return a < b ? 1 : -1; });
+    return lines.join(eol) + eol;
+  } else {
+    return lines.sort(function(a, b) { return a < b ? 1 : -1; }).join(eol);
+  }
 }
 
 function Trim(Text) {
-	var eol = Text.match(/\r\n|\n|\r/);
-	var lines = Text.split(eol);
-	for (var i = 0; i < lines.length; i++) {
-		lines[i] = lines[i].replace(/^\s+|\s+$/g, "");
-	}
-	return lines.join(eol);
+  var eol = Text.match(/\r\n|\n|\r/);
+  var lines = Text.split(eol);
+  for (var i = 0; i < lines.length; i++) {
+    lines[i] = lines[i].replace(/^\s+|\s+$/g, "");
+  }
+  return lines.join(eol);
 }
 
 </script>
diff --git a/Plugins/dlls/insert datetime.sct b/Plugins/dlls/insert datetime.sct
index ea14b73ee96..0fa8ec66415 100644
--- a/Plugins/dlls/insert datetime.sct	
+++ b/Plugins/dlls/insert datetime.sct	
@@ -17,33 +17,33 @@
 	<method name="InsertTime"/>
 </implements>
 
-<script language="VBS">
-Option Explicit
+<script language="JScript">
 
-Function get_PluginEvent()
-	get_PluginEvent = "EDITOR_SCRIPT"
-End Function
+function get_PluginEvent() {
+	return "EDITOR_SCRIPT";
+}
 
-Function get_PluginDescription()
-	get_PluginDescription = "Basic text functions for the context menu"
-End Function
+function get_PluginDescription() {
+	return "Basic text functions for the context menu";
+}
 
-Function get_PluginFileFilters()
-	get_PluginFileFilters= ".*"
-End Function
+function get_PluginFileFilters() {
+	return ".*";
+}
 
-Function get_PluginExtendedProperties()
-	get_PluginExtendedProperties = "InsertDate.MenuCaption=Insert Date;InsertTime.MenuCaption=Insert Time"
-End Function
+function get_PluginExtendedProperties() {
+	return "InsertDate.MenuCaption=Insert Date;InsertTime.MenuCaption=Insert Time";
+}
 
-' transformation functions
-Function InsertDate(Text)
-	InsertDate = Text + FormatDateTime(Date, 1)
-End Function
+// transformation functions
+function InsertDate(Text) {
+	return Text + (new Date()).toLocaleString().split(/[ ,]/)[0];
+}
 
-Function InsertTime(Text)
-	InsertTime = Text + FormatDateTime(Time, 4)
-End Function
+function InsertTime(Text) {
+	var ary = (new Date()).toLocaleString().split(/[ ,]/);
+	return Text + ary[ary.length - 1];
+}
 
 </script>
 </scriptlet>
diff --git a/ShellExtension/Register.bat b/ShellExtension/Register.bat
index 6984a08d390..b52ca7bd6ee 100644
--- a/ShellExtension/Register.bat
+++ b/ShellExtension/Register.bat
@@ -50,9 +50,9 @@ IF NOT ERRORLEVEL 1 (
   %1 %2 %3 %4
 ) Else (
   rem Windows Vista, Server 200x, Server 201x, Windows 8, Windows 10
-  Echo args="": For Each a in WScript.Arguments: If InStr^(a, " "^) ^> 0 Then args = args ^& """" ^& a ^& """ " Else args = args ^& a ^& " " End If: Next: CreateObject^("Shell.Application"^).ShellExecute "%~1", args, "", "runas" > "%TEMP%\Elevated.vbs"
-  Wscript //nologo "%TEMP%\Elevated.vbs" %2 %3 %4
-  Del "%TEMP%\Elevated.vbs" 2> NUL
+  Echo var args=""; for ^(var i = 1; i ^< WScript.Arguments.Count^(^); i++^) { var a = WScript.Arguments.Item^(i^); if ^(a.indexOf^(" "^) ^>= 0^) { args += "\"" + a + "\" " } else { args += a + " "; } } ^(new ActiveXObject^("Shell.Application"^)^).ShellExecute^(WScript.Arguments.Item^(0^), args, "", "runas"^) > "%TEMP%\Elevated.js"
+  Wscript //nologo "%TEMP%\Elevated.js" %1 %2 %3 %4
+  Del "%TEMP%\Elevated.js" 2> NUL
 )
 Goto :EOF
 
diff --git a/Src/Common/lwdisp.c b/Src/Common/lwdisp.c
index 3830cc70ff8..ca0b5dd294d 100644
--- a/Src/Common/lwdisp.c
+++ b/Src/Common/lwdisp.c
@@ -350,6 +350,93 @@ LPDISPATCH NTAPI CreateDispatchBySource(LPCTSTR source, LPCWSTR progid)
 	return (LPDISPATCH)pv;
 }
 
+static BOOL NeedsConversion(LPDISPATCH pi, DISPID id, VARIANT *argv, int cArgs)
+{
+	BOOL bParamByRef = FALSE;
+	BOOL bNeedToConv = FALSE;
+	int i;
+
+	for (i = 0; i < cArgs; i++)
+	{
+		if (V_ISBYREF(&argv[i]))
+		{
+			bParamByRef = TRUE;
+			break;
+		}
+	}
+	if (bParamByRef)
+	{
+		ITypeInfo* pTypeInfo;
+		HRESULT hr;
+
+		hr = pi->lpVtbl->GetTypeInfo(pi, 0, 0, &pTypeInfo);
+		if (SUCCEEDED(hr))
+		{
+			FUNCDESC* pFuncDesc = NULL;
+			ITypeInfo2* pTypeInfo2 = NULL;
+			pTypeInfo->lpVtbl->QueryInterface(pTypeInfo, &IID_ITypeInfo2, &pTypeInfo2);
+			if (pTypeInfo2 != NULL)
+			{
+				UINT nIndex;
+				hr = pTypeInfo2->lpVtbl->GetFuncIndexOfMemId(pTypeInfo2, id, INVOKE_FUNC, &nIndex);
+				if (SUCCEEDED(hr))
+				{
+					hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, nIndex, &pFuncDesc);
+					if (SUCCEEDED(hr))
+					{
+						if (pFuncDesc->oVft == 0)
+							bNeedToConv = TRUE;
+						pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
+					}
+				}
+				pTypeInfo2->lpVtbl->Release(pTypeInfo2);
+			}
+			pTypeInfo->lpVtbl->Release(pTypeInfo);
+		}
+	}
+	return bNeedToConv;
+}
+
+static void MoveVariantValue(VARIANT* dst, VARIANT* src)
+{
+	if ((V_VT(dst) & ~VT_BYREF) == VT_BSTR && V_VT(src) == VT_BSTR)
+	{
+		SysFreeString(*V_BSTRREF(dst));
+		*V_BSTRREF(dst) = V_BSTR(src);
+		V_VT(src) = VT_EMPTY;
+		return;
+	}
+	VARIANT varTemp;
+	VariantInit(&varTemp);
+	VariantChangeType(&varTemp, src, 0, (unsigned short)(V_VT(dst) & ~VT_BYREF));
+	switch (V_VT(dst) & ~VT_BYREF) {
+	case VT_BOOL:
+		*V_BOOLREF(dst) = V_BOOL(&varTemp);
+		break;
+	case VT_I1:
+		*V_I2REF(dst) = V_I1(&varTemp);
+		break;
+	case VT_I2:
+		*V_I2REF(dst) = V_I2(&varTemp);
+		break;
+	case VT_I4:
+		*V_I4REF(dst) = V_I4(&varTemp);
+		break;
+	case VT_R4:
+		*V_R4REF(dst) = V_R4(&varTemp);
+		break;
+	case VT_R8:
+		*V_R8REF(dst) = V_R8(&varTemp);
+		break;
+	case VT_BSTR:
+		SysFreeString(*V_BSTRREF(dst));
+		*V_BSTRREF(dst) = V_BSTR(&varTemp);
+		V_VT(&varTemp) = VT_EMPTY;
+		break;
+	}
+	VariantClear(&varTemp);
+}
+
 STDAPI invokeV(LPDISPATCH pi, VARIANT *ret, DISPID id, LPCCH op, VARIANT *argv)
 {
 	HRESULT sc = E_FAIL;
@@ -368,51 +455,10 @@ STDAPI invokeV(LPDISPATCH pi, VARIANT *ret, DISPID id, LPCCH op, VARIANT *argv)
 	}
 	if (pi != NULL)
 	{
-		BOOL bParamByRef = FALSE;
-		BOOL bNeedToConv = FALSE;
 		VARIANT varParams[12] = { 0 };
 		VARIANT varData[12] = { 0 };
+		BOOL bNeedToConv = NeedsConversion(pi, id, argv, dispparams.cArgs);
 		int i;
-
-		for (i = 0; i < (int)dispparams.cArgs; i++)
-		{
-			if (V_ISBYREF(&argv[i]))
-			{
-				bParamByRef = TRUE;
-				break;
-			}
-		}
-		if (bParamByRef)
-		{
-			ITypeInfo *pTypeInfo;
-			HRESULT hr;
-
-			hr = pi->lpVtbl->GetTypeInfo(pi, 0, 0, &pTypeInfo);
-			if (SUCCEEDED(hr))
-			{
-				FUNCDESC* pFuncDesc = NULL;
-				ITypeInfo2 *pTypeInfo2 = NULL;
-				pTypeInfo->lpVtbl->QueryInterface(pTypeInfo, &IID_ITypeInfo2, &pTypeInfo2);
-				if (pTypeInfo2 != NULL)
-				{
-					UINT nIndex;
-					hr = pTypeInfo2->lpVtbl->GetFuncIndexOfMemId(pTypeInfo2, id, INVOKE_FUNC, &nIndex);
-					if (SUCCEEDED(hr))
-					{
-						hr = pTypeInfo->lpVtbl->GetFuncDesc(pTypeInfo, nIndex, &pFuncDesc);
-						if (SUCCEEDED(hr))
-						{
-							if (pFuncDesc->oVft == 0)
-								bNeedToConv = TRUE;
-							pTypeInfo->lpVtbl->ReleaseFuncDesc(pTypeInfo, pFuncDesc);
-						}
-					}
-					pTypeInfo2->lpVtbl->Release(pTypeInfo2);
-				}
-				pTypeInfo->lpVtbl->Release(pTypeInfo);
-			}
-		}
-
 		if (bNeedToConv)
 		{
 			for (i = 0; i < (int)dispparams.cArgs; i++)
@@ -453,27 +499,33 @@ STDAPI invokeV(LPDISPATCH pi, VARIANT *ret, DISPID id, LPCCH op, VARIANT *argv)
 		{
 			if (bNeedToConv)
 			{
-				for (i = 0; i < (int)dispparams.cArgs; i++)
+				if (V_VT(ret) == (VT_ARRAY | VT_VARIANT))
 				{
-					if (V_ISBYREF(&argv[i]))
+					long ubound = 0;
+					SafeArrayGetUBound(V_ARRAY(ret), 1, &ubound);
+					VARIANT* p = NULL;
+					int j = ubound;
+					SafeArrayAccessData(V_ARRAY(ret), (void**)(&p));
+					for (i = 0; i < (int)dispparams.cArgs; i++)
 					{
-						VARIANT varTemp;
-						VariantInit(&varTemp);
-						VariantChangeType(&varTemp, &varData[i], 0, (unsigned short)(V_VT(&argv[i]) & ~VT_BYREF));
-						switch(V_VT(&varTemp)) {
-						case VT_BOOL: *V_BOOLREF(&argv[i]) = V_BOOL(&varTemp); break;
-						case VT_I1: *V_I2REF(&argv[i]) = V_I1(&varTemp); break;
-						case VT_I2: *V_I2REF(&argv[i]) = V_I2(&varTemp); break;
-						case VT_I4: *V_I4REF(&argv[i]) = V_I4(&varTemp); break;
-						case VT_R4: *V_R4REF(&argv[i]) = V_R4(&varTemp); break;
-						case VT_R8: *V_R8REF(&argv[i]) = V_R8(&varTemp); break;
-						case VT_BSTR: 
-							SysFreeString(*V_BSTRREF(&argv[i]));
-							*V_BSTRREF(&argv[i]) = V_BSTR(&varTemp);
-							break;
-						}
+						if (V_ISBYREF(&argv[i]) && j > 0)
+							MoveVariantValue(&argv[i], &p[j--]);
+						VariantClear(&varParams[i]);
+						VariantClear(&varData[i]);
+					}
+					VARIANT_BOOL bResult = V_BOOL(&p[0]);
+					VariantClear(ret);
+					V_BOOL(ret) = bResult;
+					V_VT(ret) = VT_BOOL;
+				}
+				else
+				{
+					for (i = 0; i < (int)dispparams.cArgs; i++)
+					{
+						if (V_ISBYREF(&argv[i]))
+							MoveVariantValue(&argv[i], &varData[i]);
+						VariantClear(&varParams[i]);
 					}
-					VariantClear(&varParams[i]);
 				}
 			}
 		}
diff --git a/Src/HexMergeView.cpp b/Src/HexMergeView.cpp
index c4e74b11b29..deb4607068e 100644
--- a/Src/HexMergeView.cpp
+++ b/Src/HexMergeView.cpp
@@ -129,7 +129,7 @@ bool CHexMergeView::IsLoadable()
 BOOL CHexMergeView::PreCreateWindow(CREATESTRUCT& cs)
 {
 	if (!IsLoadable())
-		LangMessageBox(IDS_FRHED_NOTINSTALLED, MB_OK);
+		AfxMessageBox(strutils::format_string1(_("%1 is not installed."), _T("Frhed")).c_str(), MB_OK);
 	cs.lpszClass = _T("heksedit");
 	cs.style |= WS_HSCROLL | WS_VSCROLL;
 	return TRUE;
diff --git a/Src/Merge.rc b/Src/Merge.rc
index 6ea7f109bdc..f2ca6cc0a37 100644
--- a/Src/Merge.rc
+++ b/Src/Merge.rc
@@ -2343,6 +2343,17 @@ BEGIN
     CONTROL         "",IDC_LIST_FILE,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_NOCOLUMNHEADER | WS_BORDER | WS_TABSTOP,0,0,309,176
 END
 
+IDD_INPUTBOX DIALOGEX 0, 0, 234, 68
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Dialog"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    LTEXT           "",IDC_INPUTBOX_PROMPT,6,6,162,40
+    EDITTEXT        IDC_INPUTBOX_EDIT,6,50,224,12,ES_AUTOHSCROLL
+    DEFPUSHBUTTON   "OK",IDOK,170,6,60,14
+    PUSHBUTTON      "Cancel",IDCANCEL,170,22,60,14
+END
+
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -2480,9 +2491,8 @@ BEGIN
     BEGIN
     END
 
-    IDD_WEBPAGEDIFF_BAR, DIALOG
+    IDD_INPUTBOX, DIALOG
     BEGIN
-        RIGHTMARGIN, 237
     END
 END
 #endif    // APSTUDIO_INVOKED
@@ -3050,6 +3060,11 @@ BEGIN
     100, 100, 0, 0
 END
 
+IDD_INPUTBOX AFX_DIALOG_LAYOUT
+BEGIN
+    0
+END
+
 
 /////////////////////////////////////////////////////////////////////////////
 //
@@ -3512,7 +3527,7 @@ BEGIN
     IDS_CONFIRM_MOVE_CAPTION "Confirm Move"
     IDS_CONFIRM_CLOSE_WINDOW_COMPARING 
                             "You are about to close the window that is comparing folders. Are you sure you want to close the window?"
-    IDS_CONFIRM_CLOSE_WINDOW_LONG_COMPARISON
+    IDS_CONFIRM_CLOSE_WINDOW_LONG_COMPARISON 
                             "You are about to close the folder comparison window that took a significant amount of time. Are you sure you want to close the window?"
     IDS_ERROR_INVALID_DIR_FILE_NAME
                             "The file or folder name is invalid."
@@ -4061,7 +4076,7 @@ END
 
 STRINGTABLE
 BEGIN
-    IDS_FRHED_NOTINSTALLED  "Frhed is not installed."
+    IDS_NOTINSTALLED  "%1 is not installed."
 END
 
 STRINGTABLE
diff --git a/Src/Merge.vcxproj b/Src/Merge.vcxproj
index fdfa472f1ea..81d9c2f44c6 100644
--- a/Src/Merge.vcxproj
+++ b/Src/Merge.vcxproj
@@ -1684,7 +1684,9 @@
     <None Include="..\Docs\Users\ChangeLog.md" />
   </ItemGroup>
   <ItemGroup>
-    <ResourceCompile Include="Merge.rc" />
+    <ResourceCompile Include="Merge.rc">
+      <AdditionalIncludeDirectories>$(INTDIR);%(AdditionalIncludeDirectories);$(_ZVcpkgCurrentInstalledDir)include</AdditionalIncludeDirectories>
+    </ResourceCompile>
     <ResourceCompile Include="Merge2.rc">
       <ExcludedFromBuild>true</ExcludedFromBuild>
     </ResourceCompile>
@@ -1808,6 +1810,12 @@
   <ItemGroup>
     <Xml Include="res\WinMergeU.VisualElementsManifest.xml" />
   </ItemGroup>
+  <ItemGroup>
+    <Midl Include="MergeAppLib.idl">
+      <MkTypLibCompatible>false</MkTypLibCompatible>
+      <TypeLibraryName>$(IntDir)$(ProjectName).tlb</TypeLibraryName>
+    </Midl>
+  </ItemGroup>
   <Target Name="CopyVisualElements" AfterTargets="Build">
     <ItemGroup>
       <VisualElementsManifest Include="res\WinMergeU.VisualElementsManifest.xml" />
diff --git a/Src/Merge.vcxproj.filters b/Src/Merge.vcxproj.filters
index 527b1cfb21b..8b423d23a4f 100644
--- a/Src/Merge.vcxproj.filters
+++ b/Src/Merge.vcxproj.filters
@@ -1817,4 +1817,9 @@
       <Filter>Resource Files</Filter>
     </Xml>
   </ItemGroup>
+  <ItemGroup>
+    <Midl Include="MergeAppLib.idl">
+      <Filter>Source Files</Filter>
+    </Midl>
+  </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Src/Merge2.rc b/Src/Merge2.rc
index 47c8ece4696..4341f171801 100644
--- a/Src/Merge2.rc
+++ b/Src/Merge2.rc
@@ -207,6 +207,12 @@ IDB_FILE_NEW3_WEBPAGE   BITMAP                  "res\\new3_webpage.bmp"
 
 IDR_MARGIN_CURSOR       CURSOR                  "res\\mg_cur.cur"
 
+/////////////////////////////////////////////////////////////////////////////
+//
+// TypeLib
+//
+1 TYPELIB "Merge.tlb"
+
 #ifndef _MAC
 /////////////////////////////////////////////////////////////////////////////
 //
diff --git a/Src/MergeApp.cpp b/Src/MergeApp.cpp
index dcd74bb5e23..56e8c410e97 100644
--- a/Src/MergeApp.cpp
+++ b/Src/MergeApp.cpp
@@ -97,6 +97,11 @@ void AppErrorMessageBox(const String& msg)
 	AppMsgBox::error(msg);
 }
 
+void* AppGetMainHWND()
+{
+	return AfxGetMainWnd()->GetSafeHwnd();
+}
+
 namespace AppMsgBox
 {
 
diff --git a/Src/MergeApp.h b/Src/MergeApp.h
index 96c05afc63b..d0a2a6fe455 100644
--- a/Src/MergeApp.h
+++ b/Src/MergeApp.h
@@ -25,6 +25,7 @@ COptionsMgr * GetOptionsMgr();
 void LogErrorString(const String& sz);
 void LogErrorStringUTF8(const std::string& sz);
 void AppErrorMessageBox(const String& msg);
+void* AppGetMainHWND();
 
 namespace AppMsgBox
 {
diff --git a/Src/MergeAppCOMClass.cpp b/Src/MergeAppCOMClass.cpp
index 6568016c2c1..28a0691192b 100644
--- a/Src/MergeAppCOMClass.cpp
+++ b/Src/MergeAppCOMClass.cpp
@@ -3,24 +3,10 @@
 #include "MergeAppCOMClass.h"
 #include "OptionsMgr.h"
 #include "MergeApp.h"
-
-static PARAMDATA paramData_Translate[] =
-{ { L"text", VT_BSTR, }, };
-static PARAMDATA paramData_GetOption[] =
-{ { L"name", VT_BSTR }, { L"defaultValue", VT_VARIANT|VT_BYREF }, };
-static PARAMDATA paramData_SaveOption[] =
-{ { L"name", VT_BSTR }, { L"value", VT_VARIANT|VT_BYREF }, };
-static METHODDATA methodData_MergeApp[] =
-{
-	{ L"Translate",  paramData_Translate,  DISPID_Translate,  3, CC_STDCALL, 1, DISPATCH_METHOD, VT_BSTR },
-	{ L"GetOption",  paramData_GetOption,  DISPID_GetOption,  4, CC_STDCALL, 2, DISPATCH_METHOD, VT_VARIANT },
-	{ L"SaveOption", paramData_SaveOption, DISPID_SaveOption, 5, CC_STDCALL, 2, DISPATCH_METHOD, VT_NULL },
-};
-
-static INTERFACEDATA idata_MergeApp = { methodData_MergeApp, static_cast<UINT>(std::size(methodData_MergeApp)) }; 
+#include "resource.h"
 
 MergeAppCOMClass::MergeAppCOMClass()
-	: MyDispatch(&idata_MergeApp, static_cast<IMergeApp*>(this))
+	: MyDispatch(static_cast<IMergeApp*>(this))
 {
 }
 
@@ -28,12 +14,13 @@ MergeAppCOMClass::~MergeAppCOMClass()
 {
 }
 
-BSTR STDMETHODCALLTYPE MergeAppCOMClass::Translate(BSTR text)
+HRESULT STDMETHODCALLTYPE MergeAppCOMClass::Translate(BSTR text, BSTR* pRet)
 {
-	return SysAllocString(tr(text).c_str());
+	*pRet = SysAllocString(tr(text).c_str());
+	return S_OK;
 }
 
-VARIANT STDMETHODCALLTYPE MergeAppCOMClass::GetOption(BSTR name, const VARIANT& varDefault)
+HRESULT STDMETHODCALLTYPE MergeAppCOMClass::GetOption(BSTR name, VARIANT varDefault, VARIANT* pRet)
 {
 	VARIANT varResult;
 	VariantInit(&varResult);
@@ -56,7 +43,8 @@ VARIANT STDMETHODCALLTYPE MergeAppCOMClass::GetOption(BSTR name, const VARIANT&
 			GetOptionsMgr()->InitOption(name, pvar->bstrVal);
 			break;
 		default:
-			return varResult;
+			*pRet = varResult;
+			return S_OK;;
 		}
 		value = GetOptionsMgr()->Get(name);
 	}
@@ -81,10 +69,11 @@ VARIANT STDMETHODCALLTYPE MergeAppCOMClass::GetOption(BSTR name, const VARIANT&
 		varResult.vt = VT_EMPTY;
 		break;
 	}
-	return varResult;
+	*pRet = varResult;
+	return S_OK;;
 }
 
-void STDMETHODCALLTYPE MergeAppCOMClass::SaveOption(BSTR name, const VARIANT& varValue)
+HRESULT STDMETHODCALLTYPE MergeAppCOMClass::SaveOption(BSTR name, VARIANT varValue)
 {
 	auto value = GetOptionsMgr()->Get(name);
 	const VARIANT* pvar = ((varValue.vt & VT_BYREF) != 0) ? varValue.pvarVal : &varValue;
@@ -105,7 +94,7 @@ void STDMETHODCALLTYPE MergeAppCOMClass::SaveOption(BSTR name, const VARIANT& va
 			GetOptionsMgr()->InitOption(name, pvar->bstrVal);
 			break;
 		default:
-			return;
+			return S_OK;
 		}
 		value = GetOptionsMgr()->Get(name);
 	}
@@ -114,26 +103,111 @@ void STDMETHODCALLTYPE MergeAppCOMClass::SaveOption(BSTR name, const VARIANT& va
 	case varprop::VT_BOOL:
 		if (pvar->vt == VT_BOOL)
 			GetOptionsMgr()->SaveOption(name, pvar->boolVal);
-		return;
+		return S_OK;
 	case varprop::VT_INT:
 		if (pvar->vt == VT_I2)
-		{
 			GetOptionsMgr()->SaveOption(name, pvar->iVal);
-			return;
-		}
-		if (pvar->vt == VT_I4)
-		{
+		else if (pvar->vt == VT_I4)
 			GetOptionsMgr()->SaveOption(name, pvar->intVal);
-			return;
-		}
-		return;
+		return S_OK;
 	case varprop::VT_STRING:
 		if (pvar->vt == VT_BSTR)
-		{
 			GetOptionsMgr()->SaveOption(name, pvar->bstrVal);
-			return;
+		return S_OK;
+	}
+	return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE MergeAppCOMClass::MsgBox(BSTR prompt, VARIANT varButtons, VARIANT varTitle, int* pRet)
+{
+	VARIANT varButtons2, varTitle2;
+	VariantInit(&varButtons2);
+	VariantInit(&varTitle2);
+	if (FAILED(VariantChangeType(&varButtons2, &varButtons, 0, VT_I4)))
+	{
+		varButtons2.vt = VT_I4;
+		varButtons2.intVal = 0;
+	}
+	if (FAILED(VariantChangeType(&varTitle2, &varTitle, 0, VT_BSTR)))
+	{
+		varTitle2.vt = VT_BSTR;
+		varTitle2.bstrVal = SysAllocString(L"");
+	}
+	int ans = MessageBox(reinterpret_cast<HWND>(AppGetMainHWND()), prompt, varTitle2.bstrVal, varButtons2.intVal);
+	VariantClear(&varButtons2);
+	VariantClear(&varTitle2);
+	*pRet = ans;
+	return S_OK;
+}
+
+INT_PTR CALLBACK MergeAppCOMClass::InputBoxProc(HWND hWnd, UINT uiMsg, WPARAM wParam, LPARAM lParam)
+{
+	switch (uiMsg)
+	{
+	case WM_INITDIALOG:
+	{
+		SetWindowLongPtr(hWnd, GWLP_USERDATA, lParam);
+		auto* pThis = reinterpret_cast<MergeAppCOMClass*>(lParam);
+		SetWindowText(hWnd, pThis->m_inputBoxTitle.c_str());
+		SetDlgItemText(hWnd, IDC_INPUTBOX_PROMPT, pThis->m_inputBoxPrompt.c_str());
+		SetDlgItemText(hWnd, IDC_INPUTBOX_EDIT, pThis->m_inputBoxText.c_str());
+		return TRUE;
+	}
+	case WM_COMMAND:
+		if (LOWORD(wParam) == IDOK)
+		{
+			TCHAR value[2048]{};
+			auto* pThis = reinterpret_cast<MergeAppCOMClass*>(GetWindowLongPtr(hWnd, GWLP_USERDATA));
+			GetDlgItemText(hWnd, IDC_INPUTBOX_EDIT, value, sizeof(value) / sizeof(value[0]));
+			pThis->m_inputBoxText = value;
+			EndDialog(hWnd, IDOK);
+		}
+		else if (LOWORD(wParam) == IDCANCEL)
+		{
+			EndDialog(hWnd, IDCANCEL);
 		}
-		return;
+		return TRUE;
+		break;
+
+	default:
+		break;
 	}
-	return;
+	return FALSE;
 }
+
+HRESULT STDMETHODCALLTYPE MergeAppCOMClass::InputBox(BSTR prompt, VARIANT varTitle, VARIANT varDefault, BSTR* pRet)
+{
+	VARIANT varTitle2, varDefault2;
+	VariantInit(&varTitle2);
+	VariantInit(&varDefault2);
+	if (FAILED(VariantChangeType(&varTitle2, &varTitle, 0, VT_BSTR)))
+	{
+		varTitle2.vt = VT_BSTR;
+		varTitle2.bstrVal = SysAllocString(L"");
+	}
+	if (FAILED(VariantChangeType(&varDefault2, &varDefault, 0, VT_BSTR)))
+	{
+		varDefault2.vt = VT_BSTR;
+		varDefault2.bstrVal = SysAllocString(L"");
+	}
+	m_inputBoxPrompt = prompt;
+	m_inputBoxTitle = varTitle2.bstrVal;
+	m_inputBoxText = varDefault2.bstrVal;
+	VariantClear(&varTitle2);
+	VariantClear(&varDefault2);
+	INT_PTR ans = DialogBoxParam(nullptr, MAKEINTRESOURCE(IDD_INPUTBOX), reinterpret_cast<HWND>(AppGetMainHWND()), InputBoxProc, reinterpret_cast<LPARAM>(this));
+	if (ans == IDOK)
+	{
+		*pRet = SysAllocString(m_inputBoxText.c_str());
+		return S_OK;
+	}
+	*pRet = SysAllocString(L"");
+	return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE MergeAppCOMClass::LogError(BSTR text)
+{
+	LogErrorString(text);
+	return S_OK;
+}
+
diff --git a/Src/MergeAppCOMClass.h b/Src/MergeAppCOMClass.h
index 56351e4b280..accccfb9c4a 100644
--- a/Src/MergeAppCOMClass.h
+++ b/Src/MergeAppCOMClass.h
@@ -1,25 +1,35 @@
 #pragma once
 
 #include <oleauto.h>
+#include "MergeAppLib.h"
 
 enum
 {
 	DISPID_Translate = 1,
 	DISPID_GetOption = 2,
 	DISPID_SaveOption = 3,
+	DISPID_MsgBox = 4,
+	DISPID_InputBox = 5,
+	DISPID_LogError = 6,
 };
 
 
 template<class T>
-class MyDispatch : public T, public IDispatch
+class MyDispatch : public T
 {
 public:
-	MyDispatch(INTERFACEDATA* idata, void* pThis)
+	MyDispatch(void* pThis)
 		: m_cRef(0), m_pTypeInfo(nullptr)
 	{
+		tchar_t path[MAX_PATH];
+		ITypeLib* pTypeLib = nullptr;
 		ITypeInfo* pTypeInfo = nullptr;
-		if (SUCCEEDED(CreateDispTypeInfo(idata, LOCALE_SYSTEM_DEFAULT, &pTypeInfo)))
-			m_pTypeInfo = pTypeInfo;
+		GetModuleFileName(nullptr, path, sizeof(path) / sizeof(path[0]));
+		if (SUCCEEDED(LoadTypeLib(path, &pTypeLib)))
+		{
+			pTypeLib->GetTypeInfoOfGuid(__uuidof(T), &m_pTypeInfo);
+			pTypeLib->Release();
+		}
 	}
 
 	virtual ~MyDispatch()
@@ -33,7 +43,14 @@ class MyDispatch : public T, public IDispatch
 
 	HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, void** ppvObject) override
 	{
-		return E_NOTIMPL;
+		if (riid == IID_IUnknown || riid == IID_IDispatch)
+		{
+			*ppvObject = static_cast<IDispatch*>(this);
+			AddRef();
+			return S_OK;
+		}
+		*ppvObject = nullptr;
+		return E_NOINTERFACE;
 	}
 
 	ULONG STDMETHODCALLTYPE AddRef(void) override
@@ -69,20 +86,13 @@ class MyDispatch : public T, public IDispatch
 
 	HRESULT STDMETHODCALLTYPE Invoke(DISPID dispIdMember, REFIID riid, LCID lcid, WORD wFlags, DISPPARAMS* pDispParams, VARIANT* pVarResult, EXCEPINFO* pExcepInfo, UINT* puArgErr) override
 	{
-		return m_pTypeInfo->Invoke(this, dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
+		return m_pTypeInfo->Invoke(static_cast<T*>(this), dispIdMember, wFlags, pDispParams, pVarResult, pExcepInfo, puArgErr);
 	}
 protected:
 	ULONG m_cRef;
 	ITypeInfo* m_pTypeInfo;
 };
 
-struct IMergeApp : public IUnknown
-{
-	virtual BSTR STDMETHODCALLTYPE Translate(BSTR text) = 0;
-	virtual VARIANT STDMETHODCALLTYPE GetOption(BSTR name, const VARIANT& varDefault) = 0;
-	virtual void STDMETHODCALLTYPE SaveOption(BSTR name, const VARIANT& varValue) = 0;
-};
-
 class MergeAppCOMClass : public MyDispatch<IMergeApp>
 {
 public:
@@ -91,8 +101,16 @@ class MergeAppCOMClass : public MyDispatch<IMergeApp>
 	virtual ~MergeAppCOMClass();
 	MergeAppCOMClass& operator=(const MergeAppCOMClass&) = delete;
 
-	BSTR STDMETHODCALLTYPE Translate(BSTR text) override;
-	VARIANT STDMETHODCALLTYPE GetOption(BSTR name, const VARIANT& varDefault) override;
-	void STDMETHODCALLTYPE SaveOption(BSTR name, const VARIANT& varValue) override;
+	HRESULT STDMETHODCALLTYPE Translate(BSTR text, BSTR* pRet) override;
+	HRESULT STDMETHODCALLTYPE GetOption(BSTR name, VARIANT varDefault, VARIANT* pRet) override;
+	HRESULT STDMETHODCALLTYPE SaveOption(BSTR name, VARIANT varValue) override;
+	HRESULT STDMETHODCALLTYPE MsgBox(BSTR prompt, VARIANT varButtons, VARIANT varTitle, int* pRet) override;
+	HRESULT STDMETHODCALLTYPE InputBox(BSTR prompt, VARIANT varTitle, VARIANT varDefault, BSTR* pRet) override;
+	HRESULT STDMETHODCALLTYPE LogError(BSTR text) override;
+private:
+	static INT_PTR CALLBACK InputBoxProc(HWND hWnd, UINT uiMsg, WPARAM wParam, LPARAM lParam);
+	std::wstring m_inputBoxTitle;
+	std::wstring m_inputBoxPrompt;
+	std::wstring m_inputBoxText;
 };
 
diff --git a/Src/MergeAppLib.h b/Src/MergeAppLib.h
new file mode 100644
index 00000000000..56ce5e5c3cd
--- /dev/null
+++ b/Src/MergeAppLib.h
@@ -0,0 +1,333 @@
+
+
+/* this ALWAYS GENERATED file contains the definitions for the interfaces */
+
+
+ /* File created by MIDL compiler version 8.01.0628 */
+/* at Tue Jan 19 12:14:07 2038
+ */
+/* Compiler settings for MergeAppLib.idl:
+    Oicf, W1, Zp8, env=Win64 (32b run), target_arch=AMD64 8.01.0628 
+    protocol : all , ms_ext, c_ext, robust
+    error checks: allocation ref bounds_check enum stub_data 
+    VC __declspec() decoration level: 
+         __declspec(uuid()), __declspec(selectany), __declspec(novtable)
+         DECLSPEC_UUID(), MIDL_INTERFACE()
+*/
+/* @@MIDL_FILE_HEADING(  ) */
+
+
+
+/* verify that the <rpcndr.h> version is high enough to compile this file*/
+#ifndef __REQUIRED_RPCNDR_H_VERSION__
+#define __REQUIRED_RPCNDR_H_VERSION__ 500
+#endif
+
+#include "rpc.h"
+#include "rpcndr.h"
+
+#ifndef __RPCNDR_H_VERSION__
+#error this stub requires an updated version of <rpcndr.h>
+#endif /* __RPCNDR_H_VERSION__ */
+
+#ifndef COM_NO_WINDOWS_H
+#include "windows.h"
+#include "ole2.h"
+#endif /*COM_NO_WINDOWS_H*/
+
+#ifndef __MergeAppLib_h__
+#define __MergeAppLib_h__
+
+#if defined(_MSC_VER) && (_MSC_VER >= 1020)
+#pragma once
+#endif
+
+#ifndef DECLSPEC_XFGVIRT
+#if defined(_CONTROL_FLOW_GUARD_XFG)
+#define DECLSPEC_XFGVIRT(base, func) __declspec(xfg_virtual(base, func))
+#else
+#define DECLSPEC_XFGVIRT(base, func)
+#endif
+#endif
+
+/* Forward Declarations */ 
+
+#ifndef __IMergeApp_FWD_DEFINED__
+#define __IMergeApp_FWD_DEFINED__
+typedef interface IMergeApp IMergeApp;
+
+#endif 	/* __IMergeApp_FWD_DEFINED__ */
+
+
+#ifndef __IMergeApp_FWD_DEFINED__
+#define __IMergeApp_FWD_DEFINED__
+typedef interface IMergeApp IMergeApp;
+
+#endif 	/* __IMergeApp_FWD_DEFINED__ */
+
+
+/* header files for imported files */
+#include "oaidl.h"
+#include "ocidl.h"
+
+#ifdef __cplusplus
+extern "C"{
+#endif 
+
+
+#ifndef __IMergeApp_INTERFACE_DEFINED__
+#define __IMergeApp_INTERFACE_DEFINED__
+
+/* interface IMergeApp */
+/* [unique][helpstring][uuid][object] */ 
+
+
+EXTERN_C const IID IID_IMergeApp;
+
+#if defined(__cplusplus) && !defined(CINTERFACE)
+    
+    MIDL_INTERFACE("a719a330-c39a-4d8b-bf5a-8e52f4dd8da3")
+    IMergeApp : public IDispatch
+    {
+    public:
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE Translate( 
+            /* [in] */ BSTR text,
+            /* [retval][out] */ BSTR *pRet) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE GetOption( 
+            /* [in] */ BSTR name,
+            /* [in] */ VARIANT varDefault,
+            /* [retval][out] */ VARIANT *pRet) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE SaveOption( 
+            /* [in] */ BSTR name,
+            /* [in] */ VARIANT varValue) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE MsgBox( 
+            /* [in] */ BSTR prompt,
+            /* [optional][in] */ VARIANT varButtons,
+            /* [optional][in] */ VARIANT varTitle,
+            /* [retval][out] */ int *pRet) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE InputBox( 
+            /* [in] */ BSTR prompt,
+            /* [optional][in] */ VARIANT varTitle,
+            /* [optional][in] */ VARIANT varDefault,
+            /* [retval][out] */ BSTR *pRet) = 0;
+        
+        virtual /* [helpstring][id] */ HRESULT STDMETHODCALLTYPE LogError( 
+            /* [in] */ BSTR text) = 0;
+        
+    };
+    
+    
+#else 	/* C style interface */
+
+    typedef struct IMergeAppVtbl
+    {
+        BEGIN_INTERFACE
+        
+        DECLSPEC_XFGVIRT(IUnknown, QueryInterface)
+        HRESULT ( STDMETHODCALLTYPE *QueryInterface )( 
+            IMergeApp * This,
+            /* [in] */ REFIID riid,
+            /* [annotation][iid_is][out] */ 
+            _COM_Outptr_  void **ppvObject);
+        
+        DECLSPEC_XFGVIRT(IUnknown, AddRef)
+        ULONG ( STDMETHODCALLTYPE *AddRef )( 
+            IMergeApp * This);
+        
+        DECLSPEC_XFGVIRT(IUnknown, Release)
+        ULONG ( STDMETHODCALLTYPE *Release )( 
+            IMergeApp * This);
+        
+        DECLSPEC_XFGVIRT(IDispatch, GetTypeInfoCount)
+        HRESULT ( STDMETHODCALLTYPE *GetTypeInfoCount )( 
+            IMergeApp * This,
+            /* [out] */ UINT *pctinfo);
+        
+        DECLSPEC_XFGVIRT(IDispatch, GetTypeInfo)
+        HRESULT ( STDMETHODCALLTYPE *GetTypeInfo )( 
+            IMergeApp * This,
+            /* [in] */ UINT iTInfo,
+            /* [in] */ LCID lcid,
+            /* [out] */ ITypeInfo **ppTInfo);
+        
+        DECLSPEC_XFGVIRT(IDispatch, GetIDsOfNames)
+        HRESULT ( STDMETHODCALLTYPE *GetIDsOfNames )( 
+            IMergeApp * This,
+            /* [in] */ REFIID riid,
+            /* [size_is][in] */ LPOLESTR *rgszNames,
+            /* [range][in] */ UINT cNames,
+            /* [in] */ LCID lcid,
+            /* [size_is][out] */ DISPID *rgDispId);
+        
+        DECLSPEC_XFGVIRT(IDispatch, Invoke)
+        /* [local] */ HRESULT ( STDMETHODCALLTYPE *Invoke )( 
+            IMergeApp * This,
+            /* [annotation][in] */ 
+            _In_  DISPID dispIdMember,
+            /* [annotation][in] */ 
+            _In_  REFIID riid,
+            /* [annotation][in] */ 
+            _In_  LCID lcid,
+            /* [annotation][in] */ 
+            _In_  WORD wFlags,
+            /* [annotation][out][in] */ 
+            _In_  DISPPARAMS *pDispParams,
+            /* [annotation][out] */ 
+            _Out_opt_  VARIANT *pVarResult,
+            /* [annotation][out] */ 
+            _Out_opt_  EXCEPINFO *pExcepInfo,
+            /* [annotation][out] */ 
+            _Out_opt_  UINT *puArgErr);
+        
+        DECLSPEC_XFGVIRT(IMergeApp, Translate)
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *Translate )( 
+            IMergeApp * This,
+            /* [in] */ BSTR text,
+            /* [retval][out] */ BSTR *pRet);
+        
+        DECLSPEC_XFGVIRT(IMergeApp, GetOption)
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *GetOption )( 
+            IMergeApp * This,
+            /* [in] */ BSTR name,
+            /* [in] */ VARIANT varDefault,
+            /* [retval][out] */ VARIANT *pRet);
+        
+        DECLSPEC_XFGVIRT(IMergeApp, SaveOption)
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *SaveOption )( 
+            IMergeApp * This,
+            /* [in] */ BSTR name,
+            /* [in] */ VARIANT varValue);
+        
+        DECLSPEC_XFGVIRT(IMergeApp, MsgBox)
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *MsgBox )( 
+            IMergeApp * This,
+            /* [in] */ BSTR prompt,
+            /* [optional][in] */ VARIANT varButtons,
+            /* [optional][in] */ VARIANT varTitle,
+            /* [retval][out] */ int *pRet);
+        
+        DECLSPEC_XFGVIRT(IMergeApp, InputBox)
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *InputBox )( 
+            IMergeApp * This,
+            /* [in] */ BSTR prompt,
+            /* [optional][in] */ VARIANT varTitle,
+            /* [optional][in] */ VARIANT varDefault,
+            /* [retval][out] */ BSTR *pRet);
+        
+        DECLSPEC_XFGVIRT(IMergeApp, LogError)
+        /* [helpstring][id] */ HRESULT ( STDMETHODCALLTYPE *LogError )( 
+            IMergeApp * This,
+            /* [in] */ BSTR text);
+        
+        END_INTERFACE
+    } IMergeAppVtbl;
+
+    interface IMergeApp
+    {
+        CONST_VTBL struct IMergeAppVtbl *lpVtbl;
+    };
+
+    
+
+#ifdef COBJMACROS
+
+
+#define IMergeApp_QueryInterface(This,riid,ppvObject)	\
+    ( (This)->lpVtbl -> QueryInterface(This,riid,ppvObject) ) 
+
+#define IMergeApp_AddRef(This)	\
+    ( (This)->lpVtbl -> AddRef(This) ) 
+
+#define IMergeApp_Release(This)	\
+    ( (This)->lpVtbl -> Release(This) ) 
+
+
+#define IMergeApp_GetTypeInfoCount(This,pctinfo)	\
+    ( (This)->lpVtbl -> GetTypeInfoCount(This,pctinfo) ) 
+
+#define IMergeApp_GetTypeInfo(This,iTInfo,lcid,ppTInfo)	\
+    ( (This)->lpVtbl -> GetTypeInfo(This,iTInfo,lcid,ppTInfo) ) 
+
+#define IMergeApp_GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId)	\
+    ( (This)->lpVtbl -> GetIDsOfNames(This,riid,rgszNames,cNames,lcid,rgDispId) ) 
+
+#define IMergeApp_Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr)	\
+    ( (This)->lpVtbl -> Invoke(This,dispIdMember,riid,lcid,wFlags,pDispParams,pVarResult,pExcepInfo,puArgErr) ) 
+
+
+#define IMergeApp_Translate(This,text,pRet)	\
+    ( (This)->lpVtbl -> Translate(This,text,pRet) ) 
+
+#define IMergeApp_GetOption(This,name,varDefault,pRet)	\
+    ( (This)->lpVtbl -> GetOption(This,name,varDefault,pRet) ) 
+
+#define IMergeApp_SaveOption(This,name,varValue)	\
+    ( (This)->lpVtbl -> SaveOption(This,name,varValue) ) 
+
+#define IMergeApp_MsgBox(This,prompt,varButtons,varTitle,pRet)	\
+    ( (This)->lpVtbl -> MsgBox(This,prompt,varButtons,varTitle,pRet) ) 
+
+#define IMergeApp_InputBox(This,prompt,varTitle,varDefault,pRet)	\
+    ( (This)->lpVtbl -> InputBox(This,prompt,varTitle,varDefault,pRet) ) 
+
+#define IMergeApp_LogError(This,text)	\
+    ( (This)->lpVtbl -> LogError(This,text) ) 
+
+#endif /* COBJMACROS */
+
+
+#endif 	/* C style interface */
+
+
+
+
+#endif 	/* __IMergeApp_INTERFACE_DEFINED__ */
+
+
+
+#ifndef __MergeAppLib_LIBRARY_DEFINED__
+#define __MergeAppLib_LIBRARY_DEFINED__
+
+/* library MergeAppLib */
+/* [helpstring][version][uuid] */ 
+
+
+
+EXTERN_C const IID LIBID_MergeAppLib;
+#endif /* __MergeAppLib_LIBRARY_DEFINED__ */
+
+/* Additional Prototypes for ALL interfaces */
+
+unsigned long             __RPC_USER  BSTR_UserSize(     unsigned long *, unsigned long            , BSTR * ); 
+unsigned char * __RPC_USER  BSTR_UserMarshal(  unsigned long *, unsigned char *, BSTR * ); 
+unsigned char * __RPC_USER  BSTR_UserUnmarshal(unsigned long *, unsigned char *, BSTR * ); 
+void                      __RPC_USER  BSTR_UserFree(     unsigned long *, BSTR * ); 
+
+unsigned long             __RPC_USER  VARIANT_UserSize(     unsigned long *, unsigned long            , VARIANT * ); 
+unsigned char * __RPC_USER  VARIANT_UserMarshal(  unsigned long *, unsigned char *, VARIANT * ); 
+unsigned char * __RPC_USER  VARIANT_UserUnmarshal(unsigned long *, unsigned char *, VARIANT * ); 
+void                      __RPC_USER  VARIANT_UserFree(     unsigned long *, VARIANT * ); 
+
+unsigned long             __RPC_USER  BSTR_UserSize64(     unsigned long *, unsigned long            , BSTR * ); 
+unsigned char * __RPC_USER  BSTR_UserMarshal64(  unsigned long *, unsigned char *, BSTR * ); 
+unsigned char * __RPC_USER  BSTR_UserUnmarshal64(unsigned long *, unsigned char *, BSTR * ); 
+void                      __RPC_USER  BSTR_UserFree64(     unsigned long *, BSTR * ); 
+
+unsigned long             __RPC_USER  VARIANT_UserSize64(     unsigned long *, unsigned long            , VARIANT * ); 
+unsigned char * __RPC_USER  VARIANT_UserMarshal64(  unsigned long *, unsigned char *, VARIANT * ); 
+unsigned char * __RPC_USER  VARIANT_UserUnmarshal64(unsigned long *, unsigned char *, VARIANT * ); 
+void                      __RPC_USER  VARIANT_UserFree64(     unsigned long *, VARIANT * ); 
+
+/* end of Additional Prototypes */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
+
diff --git a/Src/MergeAppLib.idl b/Src/MergeAppLib.idl
new file mode 100644
index 00000000000..d5438b8aa7d
--- /dev/null
+++ b/Src/MergeAppLib.idl
@@ -0,0 +1,34 @@
+// This file will be processed by the MIDL tool to
+// produce the type library (MergeAppLib.tlb) and marshalling code.
+
+import "oaidl.idl";
+import "ocidl.idl";
+
+[
+	object,
+	uuid(a719a330-c39a-4d8b-bf5a-8e52f4dd8da3),
+	helpstring("IMergeApp Interface"),
+	pointer_default(unique)
+]
+interface IMergeApp : IDispatch
+{
+	[id(1), helpstring("method Translate")] HRESULT Translate([in] BSTR text, [out, retval] BSTR* pRet);
+	[id(2), helpstring("method GetOption")] HRESULT GetOption([in] BSTR name, [in] VARIANT varDefault, [out, retval] VARIANT* pRet);
+	[id(3), helpstring("method SaveOption")] HRESULT SaveOption([in] BSTR name, [in] VARIANT varValue);
+	[id(4), helpstring("method MsgBox")] HRESULT MsgBox([in] BSTR prompt, [in, optional] VARIANT varButtons, [in, optional] VARIANT varTitle, [out, retval] int* pRet);
+	[id(5), helpstring("method InputBox")] HRESULT InputBox([in] BSTR prompt, [in, optional] VARIANT varTitle, [in, optional] VARIANT varDefault, [out, retval] BSTR* pRet);
+	[id(6), helpstring("method LogError")] HRESULT LogError([in] BSTR text);
+};
+
+[
+	uuid(3bc1ff50-9fb8-4796-a0c3-966eda88ab15),
+	version(1.0),
+	helpstring("MergeApp Type Library")
+]
+library MergeAppLib
+{
+	importlib("stdole32.tlb");
+	importlib("stdole2.tlb");
+
+	interface IMergeApp;
+};
diff --git a/Src/MergeLang.vcxproj b/Src/MergeLang.vcxproj
index abd07fe5d9a..3754d67bed4 100644
--- a/Src/MergeLang.vcxproj
+++ b/Src/MergeLang.vcxproj
@@ -183,7 +183,7 @@ date /t &gt; MergeLang.lastbuild
 attrib -a English.pot
 del English.pot.prev English.pot.flt English.pot.prev.flt 2&gt; NUL
 move English.pot English.pot.prev 2&gt; NUL
-cscript CreateMasterPotFile.vbs
+cscript CreateMasterPotFile.js
 attrib -a English.pot
 findstr /v POT-Creation-Date English.pot &gt; English.pot.flt
 findstr /v POT-Creation-Date English.pot.prev &gt; English.pot.prev.flt
@@ -219,7 +219,7 @@ popd
     <None Include="..\Translations\ShellExtension\ChineseSimplified.po" />
     <None Include="..\Translations\ShellExtension\ChineseTraditional.po" />
     <None Include="..\Translations\ShellExtension\Corsican.po" />
-    <None Include="..\Translations\ShellExtension\CreateMasterPotFile.vbs" />
+    <None Include="..\Translations\ShellExtension\CreateMasterPotFile.js" />
     <None Include="..\Translations\ShellExtension\Croatian.po" />
     <None Include="..\Translations\ShellExtension\Czech.po" />
     <None Include="..\Translations\ShellExtension\Danish.po" />
@@ -259,7 +259,7 @@ popd
     <None Include="..\Translations\WinMerge\ChineseSimplified.po" />
     <None Include="..\Translations\WinMerge\ChineseTraditional.po" />
     <None Include="..\Translations\WinMerge\Corsican.po" />
-    <None Include="..\Translations\WinMerge\CreateMasterPotFile.vbs" />
+    <None Include="..\Translations\WinMerge\CreateMasterPotFile.js" />
     <None Include="..\Translations\WinMerge\Croatian.po" />
     <None Include="..\Translations\WinMerge\Czech.po" />
     <None Include="..\Translations\WinMerge\Danish.po" />
@@ -301,7 +301,7 @@ date /t &gt; MergeLang.lastbuild
 attrib -a English.pot
 del English.pot.prev English.pot.flt English.pot.prev.flt 2&gt; NUL
 move English.pot English.pot.prev 2&gt; NUL
-cscript CreateMasterPotFile.vbs
+cscript CreateMasterPotFile.js
 attrib -a English.pot
 findstr /v POT-Creation-Date English.pot &gt; English.pot.flt
 findstr /v POT-Creation-Date English.pot.prev &gt; English.pot.prev.flt
diff --git a/Src/MergeLang.vcxproj.filters b/Src/MergeLang.vcxproj.filters
index da7c80790ea..95278e865bd 100644
--- a/Src/MergeLang.vcxproj.filters
+++ b/Src/MergeLang.vcxproj.filters
@@ -115,13 +115,13 @@
     <None Include="..\Translations\WinMerge\UpdatePoFilesFromPotFile.ps1">
       <Filter>Scripts\WinMerge</Filter>
     </None>
-    <None Include="..\Translations\WinMerge\CreateMasterPotFile.vbs">
+    <None Include="..\Translations\WinMerge\CreateMasterPotFile.js">
       <Filter>Scripts\WinMerge</Filter>
     </None>
     <None Include="..\Translations\ShellExtension\UpdatePoFilesFromPotFile.ps1">
       <Filter>Scripts\ShellExtension</Filter>
     </None>
-    <None Include="..\Translations\ShellExtension\CreateMasterPotFile.vbs">
+    <None Include="..\Translations\ShellExtension\CreateMasterPotFile.js">
       <Filter>Scripts\ShellExtension</Filter>
     </None>
     <None Include="..\Translations\ShellExtension\Arabic.po">
diff --git a/Src/PropCompareBinary.cpp b/Src/PropCompareBinary.cpp
index 6ffd3944a93..74c2773bbef 100644
--- a/Src/PropCompareBinary.cpp
+++ b/Src/PropCompareBinary.cpp
@@ -26,7 +26,7 @@ class Heksedit
 			pv = LoadLibrary(_T("Frhed\\hekseditU.dll"));
 		if (pv == nullptr)
 		{
-			LangMessageBox(IDS_FRHED_NOTINSTALLED, MB_OK);
+			AfxMessageBox(strutils::format_string1(_("%1 is not installed."), _T("Frhed")).c_str(), MB_OK);
 			return;
 		}
 		wnd.Create(_T("heksedit"), nullptr, 0, CRect(), pwndParent, 1);
diff --git a/Src/resource.h b/Src/resource.h
index de1349c814f..c7dfa0fa7ae 100644
--- a/Src/resource.h
+++ b/Src/resource.h
@@ -80,6 +80,7 @@
 #define IDD_EDIT_FIND                   282
 #define IDD_EDIT_MARKER                 283
 #define IDD_EDIT_REPLACE                284
+#define IDD_INPUTBOX                    285
 #define IDI_ROTATE2                     302
 #define IDR_LOGO                        307
 #define IDR_SPLASH                      308
@@ -282,7 +283,7 @@
 #define IDC_PLUGIN_ADDPIPE              1095
 #define IDC_PLUGIN_OPEN_IN_SAME_FRAME_TYPE 1096
 #define IDC_UNPACKER_COMBO              1097
-#define IDC_PREDIFFER_COMBO              1098
+#define IDC_PREDIFFER_COMBO             1098
 #define IDC_SELECT_UNPACKER             1099
 #define IDC_SELECT_PREDIFFER            1100
 #define IDC_EXT_EDITOR_BROWSE           1101
@@ -603,7 +604,7 @@
 #define IDC_PATH0_READONLY              1606
 #define IDC_PATH1_READONLY              1607
 #define IDC_PATH2_READONLY              1608
-#define IDC_AUTO_RELOAD_MODIFIED_FILES            1609
+#define IDC_AUTO_RELOAD_MODIFIED_FILES  1609
 #define IDC_MARKER0_COLOR_LABEL         1611
 #define IDC_MARKER1_COLOR_LABEL         1612
 #define IDC_MARKER2_COLOR_LABEL         1613
@@ -617,6 +618,8 @@
 #define IDC_PROPS_DEL                   1621
 #define IDC_PROPS_DELALL                1622
 #define IDC_PROPS_LISTVIEW              1623
+#define IDC_INPUTBOX_PROMPT             1633
+#define IDC_INPUTBOX_EDIT               1634
 #define IDC_EDIT_WHOLE_WORD             8603
 #define IDC_EDIT_MATCH_CASE             8604
 #define IDC_EDIT_FINDTEXT               8605
@@ -1489,7 +1492,7 @@
 #define IDS_AUTOCOMPLETE_DISABLED       43142
 #define IDS_AUTOCOMPLETE_FILE_SYS       43143
 #define IDS_AUTOCOMPLETE_MRU            43144
-#define IDS_FRHED_NOTINSTALLED          43229
+#define IDS_NOTINSTALLED                43229
 #define IDS_AUTO_MERGE                  43241
 #define IDS_CODEPAGE_MERGED             43244
 #define IDS_CODEPAGE_CONFLICT           43245
@@ -1655,15 +1658,14 @@
 #define IDS_WEBPAGE_COMPARING           44539
 #define IDS_WEBPAGE_ZOOM                44540
 
-
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_3D_CONTROLS                     1
-#define _APS_NEXT_RESOURCE_VALUE        258
+#define _APS_NEXT_RESOURCE_VALUE        287
 #define _APS_NEXT_COMMAND_VALUE         34194
-#define _APS_NEXT_CONTROL_VALUE         1632
+#define _APS_NEXT_CONTROL_VALUE         1635
 #define _APS_NEXT_SYMED_VALUE           118
 #endif
 #endif
diff --git a/Testing/Data/Office/excel.xls b/Testing/Data/Office/excel.xls
index 7b9ce65907a..666784be6ae 100644
Binary files a/Testing/Data/Office/excel.xls and b/Testing/Data/Office/excel.xls differ
diff --git a/Testing/Data/Office/powerpnt.ppt b/Testing/Data/Office/powerpnt.ppt
index 9b80b90f433..64de7d2514b 100644
Binary files a/Testing/Data/Office/powerpnt.ppt and b/Testing/Data/Office/powerpnt.ppt differ
diff --git a/Testing/Data/Office/word.doc b/Testing/Data/Office/word.doc
index 07ff23c4a35..519a3f6dfc4 100644
Binary files a/Testing/Data/Office/word.doc and b/Testing/Data/Office/word.doc differ
diff --git a/Testing/Data/Patch/dir1/file1.txt b/Testing/Data/Patch/dir1/file1.txt
new file mode 100644
index 00000000000..5286e53fa53
--- /dev/null
+++ b/Testing/Data/Patch/dir1/file1.txt
@@ -0,0 +1,7 @@
+b
+c
+d
+e
+f
+file1
+dir1
diff --git a/Testing/Data/Patch/dir1/file2.txt b/Testing/Data/Patch/dir1/file2.txt
new file mode 100644
index 00000000000..a76267def57
--- /dev/null
+++ b/Testing/Data/Patch/dir1/file2.txt
@@ -0,0 +1,7 @@
+a
+b
+c
+e
+f
+file2
+dir1
diff --git a/Testing/Data/Patch/dir1/subdir/sfile1.txt b/Testing/Data/Patch/dir1/subdir/sfile1.txt
new file mode 100644
index 00000000000..400b261e498
--- /dev/null
+++ b/Testing/Data/Patch/dir1/subdir/sfile1.txt
@@ -0,0 +1,7 @@
+b
+c
+d
+e
+f
+sfile1
+dir1
diff --git a/Testing/Data/Patch/dir1/subdir/sfile2.txt b/Testing/Data/Patch/dir1/subdir/sfile2.txt
new file mode 100644
index 00000000000..1e842421a26
--- /dev/null
+++ b/Testing/Data/Patch/dir1/subdir/sfile2.txt
@@ -0,0 +1,7 @@
+a
+b
+c
+e
+f
+sfile2
+dir1
diff --git a/Testing/Data/Patch/dir1/subdir/subsubdir/ssfile1.txt b/Testing/Data/Patch/dir1/subdir/subsubdir/ssfile1.txt
new file mode 100644
index 00000000000..1002482c257
--- /dev/null
+++ b/Testing/Data/Patch/dir1/subdir/subsubdir/ssfile1.txt
@@ -0,0 +1,7 @@
+b
+c
+d
+e
+f
+ssfile1
+dir1
diff --git a/Testing/Data/Patch/dir1/subdir/subsubdir/ssfile2.txt b/Testing/Data/Patch/dir1/subdir/subsubdir/ssfile2.txt
new file mode 100644
index 00000000000..087a4420f40
--- /dev/null
+++ b/Testing/Data/Patch/dir1/subdir/subsubdir/ssfile2.txt
@@ -0,0 +1,7 @@
+a
+b
+c
+e
+f
+ssfile2
+dir1
diff --git a/Testing/Data/Patch/dir2/file1.txt b/Testing/Data/Patch/dir2/file1.txt
new file mode 100644
index 00000000000..5243dffe7fa
--- /dev/null
+++ b/Testing/Data/Patch/dir2/file1.txt
@@ -0,0 +1,7 @@
+b
+c
+d
+e
+f
+file1
+dir2
diff --git a/Testing/Data/Patch/dir2/file2.txt b/Testing/Data/Patch/dir2/file2.txt
new file mode 100644
index 00000000000..24e4ab165b7
--- /dev/null
+++ b/Testing/Data/Patch/dir2/file2.txt
@@ -0,0 +1,7 @@
+a
+b
+c
+e
+f
+file2
+dir2
diff --git a/Testing/Data/Patch/dir2/subdir/sfile1.txt b/Testing/Data/Patch/dir2/subdir/sfile1.txt
new file mode 100644
index 00000000000..111b0d8deb1
--- /dev/null
+++ b/Testing/Data/Patch/dir2/subdir/sfile1.txt
@@ -0,0 +1,7 @@
+b
+c
+d
+e
+f
+sfile1
+dir2
diff --git a/Testing/Data/Patch/dir2/subdir/sfile2.txt b/Testing/Data/Patch/dir2/subdir/sfile2.txt
new file mode 100644
index 00000000000..1b7d8a64495
--- /dev/null
+++ b/Testing/Data/Patch/dir2/subdir/sfile2.txt
@@ -0,0 +1,7 @@
+a
+b
+c
+e
+f
+sfile2
+dir2
diff --git a/Testing/Data/Patch/dir2/subdir/subsubdir/ssfile1.txt b/Testing/Data/Patch/dir2/subdir/subsubdir/ssfile1.txt
new file mode 100644
index 00000000000..f0bac615d42
--- /dev/null
+++ b/Testing/Data/Patch/dir2/subdir/subsubdir/ssfile1.txt
@@ -0,0 +1,7 @@
+b
+c
+d
+e
+f
+ssfile1
+dir2
diff --git a/Testing/Data/Patch/dir2/subdir/subsubdir/ssfile2.txt b/Testing/Data/Patch/dir2/subdir/subsubdir/ssfile2.txt
new file mode 100644
index 00000000000..29070556855
--- /dev/null
+++ b/Testing/Data/Patch/dir2/subdir/subsubdir/ssfile2.txt
@@ -0,0 +1,7 @@
+a
+b
+c
+e
+f
+ssfile2
+dir2
diff --git a/Testing/Data/Patch/file1.txt b/Testing/Data/Patch/file1.txt
new file mode 100644
index 00000000000..06f0917976f
--- /dev/null
+++ b/Testing/Data/Patch/file1.txt
@@ -0,0 +1,6 @@
+b
+c
+d
+e
+f
+file1
diff --git a/Testing/Data/Patch/file2.txt b/Testing/Data/Patch/file2.txt
new file mode 100644
index 00000000000..8bf7561ebe8
--- /dev/null
+++ b/Testing/Data/Patch/file2.txt
@@ -0,0 +1,6 @@
+a
+b
+c
+e
+f
+file2
diff --git a/Testing/Data/Patch/patch.diff b/Testing/Data/Patch/patch.diff
new file mode 100644
index 00000000000..ae3d30a6a96
--- /dev/null
+++ b/Testing/Data/Patch/patch.diff
@@ -0,0 +1,11 @@
+--- C:/dev/winmerge/Testing/Data/Patch/file1.txt	Sat Feb 10 11:48:34 2024
++++ C:/dev/winmerge/Testing/Data/Patch/file2.txt	Sat Feb 10 11:48:34 2024
+@@ -1,6 +1,6 @@
++a
+ b
+ c
+-d
+ e
+ f
+-file1
++file2
diff --git a/Testing/Data/Patch/patch2.diff b/Testing/Data/Patch/patch2.diff
new file mode 100644
index 00000000000..2c080dadf0a
--- /dev/null
+++ b/Testing/Data/Patch/patch2.diff
@@ -0,0 +1,16 @@
+--- file1.txt	Sat Feb 10 15:29:00 2024
++++ file1.txt	Sat Feb 10 15:29:00 2024
+@@ -4,4 +4,4 @@
+ e
+ f
+ file1
+-dir1
++dir2
+--- file2.txt	Sat Feb 10 15:48:11 2024
++++ file2.txt	Sat Feb 10 15:48:11 2024
+@@ -4,4 +4,4 @@
+ e
+ f
+ file2
+-dir1
++dir2
diff --git a/Testing/Data/Patch/patch3.diff b/Testing/Data/Patch/patch3.diff
new file mode 100644
index 00000000000..30a98dd566f
--- /dev/null
+++ b/Testing/Data/Patch/patch3.diff
@@ -0,0 +1,16 @@
+--- subdir/subsubdir/ssfile1.txt	Sat Feb 10 17:05:19 2024
++++ subdir/subsubdir/ssfile1.txt	Sat Feb 10 17:05:19 2024
+@@ -4,4 +4,4 @@
+ e
+ f
+ ssfile1
+-dir1
++dir2
+--- subdir/subsubdir/ssfile2.txt	Sat Feb 10 17:05:31 2024
++++ subdir/subsubdir/ssfile2.txt	Sat Feb 10 17:05:31 2024
+@@ -4,4 +4,4 @@
+ e
+ f
+ ssfile2
+-dir1
++dir2
diff --git a/Testing/FolderCompare/misc.cpp b/Testing/FolderCompare/misc.cpp
index c7cdf3dc0c1..8e2672c124d 100644
--- a/Testing/FolderCompare/misc.cpp
+++ b/Testing/FolderCompare/misc.cpp
@@ -70,3 +70,9 @@ String tr(const std::wstring& str)
 void NTAPI LangTranslateDialog(HWND h)
 {
 }
+
+void* AppGetMainHWND()
+{
+	return nullptr;
+}
+
diff --git a/Testing/PluginTests/PluginTests.js b/Testing/PluginTests/PluginTests.js
new file mode 100644
index 00000000000..796aaff22e1
--- /dev/null
+++ b/Testing/PluginTests/PluginTests.js
@@ -0,0 +1,598 @@
+var g_cnt;
+var g_testname;
+
+var FileSys = new ActiveXObject("Scripting.FileSystemObject");
+var ScriptFolder = FileSys.GetParentFolderName(WScript.ScriptFullName);
+var WShell = new ActiveXObject("Wscript.Shell");
+
+try {
+  FileSys.CreateFolder(ScriptFolder + "\\result");
+  FileSys.CreateFolder(ScriptFolder + "\\result\\excel");
+  FileSys.CreateFolder(ScriptFolder + "\\result\\word");
+  FileSys.CreateFolder(ScriptFolder + "\\result\\powerpnt");
+  FileSys.CreateFolder(ScriptFolder + "\\result\\patch");
+  FileSys.CreateFolder(ScriptFolder + "\\result\\patch\\result1");
+  FileSys.CreateFolder(ScriptFolder + "\\result\\patch\\result2");
+  FileSys.CreateFolder(ScriptFolder + "\\result\\patch\\result3");
+} catch (e) { }
+
+var PluginSettings = {
+  "Files": {
+    "Left": {
+      "Item_0": ""
+    },
+    "Right": {
+      "Item_0": ""
+    }
+  },
+  "Plugins": {
+    "CompareMSExcelFiles.sct": {
+      "UnpackToFolder": 1,
+      "UpdateLinks": 3,
+      "CompareDocumentProperties": 1,
+      "CompareNames": 1,
+      "CompareCellValues": 1,
+      "CompareWorksheetsAsImage": 1,
+      "CompareWorksheetsAsHTML": 1,
+      "ImageWidth": 1000,
+      "ImageHeight": 3000,
+      "CompareFormulas": 1,
+      "CompareTextsInShapes": 1,
+      "CompareHeadersAndFooters": 1,
+      "CompareVBAMacros": 1
+    },
+    "CompareMSPowerPointFiles.sct": {
+      "UnpackToFolder": 1,
+      "CompareDocumentProperties": 1,
+      "CompareSlideAsImage": 1,
+      "CompareTextsInShapes": 1,
+      "CompareTextsInNotesPage": 1,
+      "CompareVBAMacros": 1
+    },
+    "CompareMSVisioFiles.sct": {
+      "UnpackToFolder": 1,
+      "ComparePageAsImage": 1,
+      "CompareTextsInShapes": 1,
+      "CompareVBAMacros": 1
+    },
+    "CompareMSWordFiles.sct": {
+      "UnpackToFolder": 1,
+      "CompareDocumentProperties": 1,
+      "CompareBookmarks": 1,
+      "CompareTextContents": 1,
+      "CompareDocumentsAsHTML": 1,
+      "CompareTextsInShapes": 1,
+      "CompareVBAMacros": 1
+    },
+    "PrediffLineFilter.sct": {
+      "Count": 5,
+      "Enabled1": 1,
+      "IgnoreCase1": 0,
+      "UseRegExp1": 0,
+      "Pattern1": "abc",
+      "ReplaceText1": "def",
+      "Enabled2": 1,
+      "IgnoreCase2": 1,
+      "UseRegExp2": 0,
+      "Pattern2": "Ghi",
+      "ReplaceText2": "Jkl",
+      "Enabled3": 1,
+      "IgnoreCase3": 0,
+      "UseRegExp3": 1,
+      "Pattern3": "\\d+\\.\\d+",
+      "ReplaceText3": "x.x",
+      "Enabled4": 1,
+      "IgnoreCase4": 1,
+      "UseRegExp4": 1,
+      "Pattern4": "Mno.*Z",
+      "ReplaceText4": "XxxX",
+      "Enabled5": 0,
+      "IgnoreCase5": 0,
+      "UseRegExp5": 0,
+      "Pattern5": "disabled",
+      "ReplaceText5": ""
+    }
+  }
+};
+
+var MergeApp = {
+  "GetOption": function (key, defvalue) {
+    var ary1 = key.split("/");
+    var ary2 = ary1[0].split("\\");
+    if (ary2.length > 1) {
+      return PluginSettings[ary2[0]][ary2[1]][ary1[1]];
+    }
+    return PluginSettings[ary2[0]][ary1[1]];
+  },
+  "SaveOption": function (key, value) {
+    var t = typeof value === "string" ? "REG_SZ" : "REG_DWORD";
+  },
+  "Translate": function (text) {
+    return text;
+  },
+  "Log": function (level, text) {
+    WScript.Echo(text);
+  },
+  "MsgBox": function (prompt, buttons, title) {
+    WScript.Echo("title: " + title);
+    WScript.Echo("prompt: " + prompt);
+    WScript.Echo("buttons: " + buttons);
+  },
+  "InputBox": function (prompt, title, defaultValue) {
+    WScript.Echo("title: " + title);
+    WScript.Echo("prompt: " + prompt);
+    WScript.Echo("default: " + defaultValue);
+    return defaultValue;
+  }
+};
+function setTestName(testname) {
+  g_cnt = 0;
+  g_testname = testname;
+}
+
+function getCurrentTestName() {
+  return g_testname + g_cnt;
+}
+
+function assertTrue(value) {
+  g_cnt++;
+  if (!value) {
+    throw new Error(30001, getCurrentTestName());
+  }
+}
+
+function assertEquals(expected, actual) {
+  g_cnt++;
+  if (expected !== actual) {
+    var msg = getCurrentTestName() + "\r\nexpected: \"" + expected + "\"\r\nactual: \"" + actual + "\"";
+    WScript.Echo(msg);
+    throw new Error(30001, msg);
+  }
+}
+
+function printPluginInfo(p) {
+  WScript.Echo("PluginDescription: " + p.PluginDescription);
+  WScript.Echo("PluginEvent      : " + p.PluginEvent);
+  WScript.Echo("PluginFileFilters: " + p.PluginFileFilters);
+  WScript.Echo("PluginIsAutomatic: " + p.PluginIsAutomatic);
+  try { WScript.Echo("PluginUnpackedFileExtension: " + p.PluginUnpackedFileExtension); } catch (e) {}
+  try { WScript.Echo("PluginExtendedProperties: " + p.PluginExtendedProperties); } catch (e) {}
+  WScript.Echo("");
+}
+
+function EditorAddinTest() {
+  var asciiChars = "";
+  var p = GetObject("script: " + ScriptFolder + "\\..\\..\\Plugins\\dlls\\editor addin.sct");
+  printPluginInfo(p);
+
+  for (var i = 0; i < 128; i++) {
+    asciiChars += String.fromCharCode(i);
+  }
+
+  p.PluginOnEvent(0, MergeApp);
+
+  // MakeUpper
+  setTestName("MakeUpper");
+  assertEquals("", p.MakeUpper(""));
+  assertEquals(" ~0129ABCZABCZ", p.MakeUpper(" ~0129abczABCZ"));
+  var expected = asciiChars.replace("abcdefghijklmnopqrstuvwxyz", "ABCDEFGHIJKLMNOPQRSTUVWXYZ");
+  assertEquals(expected, p.MakeUpper(asciiChars));
+
+  // MakeLower
+  setTestName("MakeLower");
+  assertEquals("", p.MakeLower(""));
+  assertEquals(" ~0129abczabcz", p.MakeLower(" ~0129abczABCZ"));
+  expected = asciiChars.replace("ABCDEFGHIJKLMNOPQRSTUVWXYZ", "abcdefghijklmnopqrstuvwxyz");
+  assertEquals(expected, p.MakeLower(asciiChars));
+
+  // ExecFilterCommand
+  setTestName("ExecFilterCommand");
+  p.PluginArguments = "sort";
+  assertEquals("1\r\n2\r\n", p.ExecFilterCommand("2\r\n1\r\n"));
+  p.PluginArguments = "echo a";
+  assertEquals("a \r\n", p.ExecFilterCommand(""));
+  p.PluginVariables = ScriptFolder;
+  p.PluginArguments = "dir %1";
+  p.ExecFilterCommand("");
+
+  // SelectColumns
+  setTestName("SelectColumns");
+  p.PluginArguments = "1";
+  assertEquals("a", p.SelectColumns("abc"));
+  assertEquals("a\r\nd", p.SelectColumns("abc\r\ndef"));
+  assertEquals("a\r\nd\r\n", p.SelectColumns("abc\r\ndef\r\n"));
+  p.PluginArguments = "3";
+  assertEquals("c\r\nf", p.SelectColumns("abc\r\ndef"));
+  p.PluginArguments = "1,3";
+  assertEquals("ac\r\nd", p.SelectColumns("abc\r\nde"));
+  p.PluginArguments = "1-3";
+  assertEquals("abc\r\ndef", p.SelectColumns("abc\r\ndef"));
+  p.PluginArguments = "-3";
+  assertEquals("abc\r\ndef", p.SelectColumns("abc\r\ndef"));
+  p.PluginArguments = "1-";
+  assertEquals("abc\r\ndef", p.SelectColumns("abc\r\ndef"));
+  p.PluginArguments = "2-";
+  assertEquals("bc\r\nef", p.SelectColumns("abc\r\ndef"));
+  p.PluginArguments = "3-";
+  assertEquals("c\r\nf", p.SelectColumns("abc\r\ndef"));
+  p.PluginArguments = "4-";
+  assertEquals("\r\n", p.SelectColumns("abc\r\ndef"));
+
+  p.PluginArguments = "-e ab";
+  assertEquals("", p.SelectColumns(""));
+  assertEquals("ab\r\n", p.SelectColumns("abc\r\ndef"));
+  p.PluginArguments = "-e \"ab|de\"";
+  assertEquals("ab\r\nde", p.SelectColumns("abc\r\ndef"));
+  p.PluginArguments = "-e ^.";
+  assertEquals("a\r\nd", p.SelectColumns("abc\r\ndef"));
+  p.PluginArguments = "-e .*";
+  assertEquals("abc\r\ndef", p.SelectColumns("abc\r\ndef"));
+  p.PluginArguments = "-e -i \"Ab|dE\"";
+  assertEquals("ab\r\nde", p.SelectColumns("abc\r\ndef"));
+  p.PluginArguments = "-e -i -g ab";
+  assertEquals("abAB\r\n", p.SelectColumns("abcABC\r\ndef"));
+  p.PluginArguments = "-v -e \"ab|de\"";
+  assertEquals("c\r\nf", p.SelectColumns("abc\r\ndef"));
+
+  p.PluginArguments = "1-3 -e ab 2-3";
+  assertEquals("abcabbc\r\ndefef", p.SelectColumns("abc\r\ndef"));
+
+  // SelectLines
+  setTestName("SelectLines");
+  p.PluginArguments = "1";
+  assertEquals("", p.SelectLines(""));
+  assertEquals("aaa", p.SelectLines("aaa"));
+  p.PluginArguments = "2";
+  assertEquals("bbb", p.SelectLines("aaa\r\nbbb"));
+  p.PluginArguments = "1,2";
+  assertEquals("aaa\r\nbbb", p.SelectLines("aaa\r\nbbb"));
+  p.PluginArguments = "1-2";
+  assertEquals("aaa\r\nbbb", p.SelectLines("aaa\r\nbbb"));
+  assertEquals("aaa\r\nbbb\r\n", p.SelectLines("aaa\r\nbbb\r\n"));
+  p.PluginArguments = "1-";
+  assertEquals("aaa\r\nbbb", p.SelectLines("aaa\r\nbbb"));
+  assertEquals("aaa\r\nbbb\r\n", p.SelectLines("aaa\r\nbbb\r\n"));
+  assertEquals("aaa\r\n\r\n\r\n", p.SelectLines("aaa\r\n\r\n\r\n"));
+  p.PluginArguments = "-2";
+  assertEquals("aaa\r\nbbb", p.SelectLines("aaa\r\nbbb"));
+  assertEquals("aaa\r\nbbb\r\n", p.SelectLines("aaa\r\nbbb\r\n"));
+  p.PluginArguments = "4-5";
+  assertEquals("", p.SelectLines("aaa\r\nbbb"));
+  assertEquals("", p.SelectLines("aaa\r\nbbb\r\n"));
+
+  p.PluginArguments = "-e aa";
+  assertEquals("", p.SelectLines(""));
+  assertEquals("aaa", p.SelectLines("aaa\r\nbbb"));
+  assertEquals("aaa\r\n", p.SelectLines("aaa\r\nbbb\r\n"));
+  p.PluginArguments = "-e -i AA";
+  assertEquals("aaa", p.SelectLines("aaa\r\nbbb"));
+  assertEquals("aaa\r\n", p.SelectLines("aaa\r\nbbb\r\n"));
+  p.PluginArguments = "-e .*";
+  assertEquals("aaa\r\nbbb", p.SelectLines("aaa\r\nbbb"));
+  assertEquals("aaa\r\nbbb\r\n", p.SelectLines("aaa\r\nbbb\r\n"));
+  p.PluginArguments = "-e ^a";
+  assertEquals("aaa", p.SelectLines("aaa\r\nbbb"));
+  assertEquals("aaa\r\n", p.SelectLines("aaa\r\nbbb\r\n"));
+  p.PluginArguments = "-e a$";
+  assertEquals("aaa", p.SelectLines("aaa\r\nbbb"));
+  assertEquals("aaa\r\n", p.SelectLines("aaa\r\nbbb\r\n"));
+  p.PluginArguments = "-v -e a$";
+  assertEquals("bbb", p.SelectLines("aaa\r\nbbb"));
+  assertEquals("bbb\r\n", p.SelectLines("aaa\r\nbbb\r\n"));
+
+  p.PluginArguments = "1 -e c$";
+  assertEquals("aaa\r\nccc", p.SelectLines("aaa\r\nbbb\r\nccc"));
+
+  // Replace
+  setTestName("Replace");
+  p.PluginArguments = "abc def";
+  assertEquals("", p.Replace(""));
+  assertEquals("def def def def", p.Replace("abc def abc def"));
+  p.PluginArguments = "-e a.c XXX";
+  assertEquals("", p.Replace(""));
+  assertEquals("XXX def XXX def", p.Replace("abc def abc def"));
+  p.PluginArguments = "-e -i A.C XXX";
+  assertEquals("XXX def XXX def", p.Replace("abc def abc def"));
+  p.PluginArguments = "-e ^\\d+ XXX";
+  assertEquals("XXX abc\r\nXXX def", p.Replace("1000 abc\r\n1001 def"));
+  p.PluginArguments = "-e (.{3}) $1\\r\\n";
+  assertEquals("012\r\n345\r\n678\r\n9", p.Replace("0123456789"));
+  p.PluginArguments = "-e (\\d+) \\a\\b\\t\\n\\v\\f\\r\\\\$1\\1\\0";
+  assertEquals(String.fromCharCode(0x07) + String.fromCharCode(0x08) + String.fromCharCode(0x09) + String.fromCharCode(0x0A) + String.fromCharCode(0x0B) + String.fromCharCode(0x0C) + String.fromCharCode(0x0D) + "\\0123456789\\1\\0", p.Replace("0123456789"));
+
+  // ReverseColumns
+  setTestName("ReverseColumns");
+  assertEquals("", p.ReverseColumns(""));
+  assertEquals("a", p.ReverseColumns("a"));
+  assertEquals("a\r\nb", p.ReverseColumns("a\r\nb"));
+  assertEquals("ba", p.ReverseColumns("ab"));
+  assertEquals("ba\r\ndc", p.ReverseColumns("ab\r\ncd"));
+  assertEquals("cba", p.ReverseColumns("abc"));
+  assertEquals("cba\r\nfed", p.ReverseColumns("abc\r\ndef"));
+  assertEquals("dcba", p.ReverseColumns("abcd"));
+  assertEquals("dcba\r\nhgfe", p.ReverseColumns("abcd\r\nefgh"));
+
+  // ReverseLines
+  setTestName("ReverseLines");
+  assertEquals("", p.ReverseLines(""));
+  assertEquals("a", p.ReverseLines("a"));
+  assertEquals("a\r\n", p.ReverseLines("a\r\n"));
+  assertEquals("b\r\na", p.ReverseLines("a\r\nb"));
+  assertEquals("b\r\na\r\n", p.ReverseLines("a\r\nb\r\n"));
+  assertEquals("c\r\nb\r\na", p.ReverseLines("a\r\nb\r\nc"));
+  assertEquals("c\r\nb\r\na\r\n", p.ReverseLines("a\r\nb\r\nc\r\n"));
+  assertEquals("d\r\nc\r\nb\r\na", p.ReverseLines("a\r\nb\r\nc\r\nd"));
+
+  // Tokenize
+  setTestName("Tokenize");
+  p.PluginArguments = "[^\\w]+";
+  assertEquals("", p.Tokenize(""));
+  assertEquals("aaa", p.Tokenize("aaa"));
+  assertEquals("aaa\r\nabcd", p.Tokenize("aaa abcd"));
+
+  // RemoveDuplicates
+  setTestName("RemoveDuplicates");
+  assertEquals("", p.RemoveDuplicates(""));
+  assertEquals("aaa", p.RemoveDuplicates("aaa"));
+  assertEquals("aaa", p.RemoveDuplicates("aaa\r\naaa"));
+  assertEquals("aaa\r\n", p.RemoveDuplicates("aaa\r\naaa\r\n"));
+  assertEquals("aaa\r\nbbb", p.RemoveDuplicates("aaa\r\nbbb"));
+  assertEquals("aaa\r\nbbb\r\n", p.RemoveDuplicates("aaa\r\nbbb\r\n"));
+
+  // CountDuplicates
+  setTestName("CountDuplicates");
+  assertEquals("", p.CountDuplicates(""));
+  assertEquals("aaa\t1", p.CountDuplicates("aaa"));
+  assertEquals("aaa\t2\r\n", p.CountDuplicates("aaa\r\naaa"));
+  assertEquals("aaa\t2\r\n", p.CountDuplicates("aaa\r\naaa\r\n"));
+  assertEquals("aaa\t1\r\nbbb\t1\r\n", p.CountDuplicates("aaa\r\nbbb"));
+  assertEquals("aaa\t1\r\nbbb\t1\r\n", p.CountDuplicates("aaa\r\nbbb\r\n"));
+
+  // Trim
+  setTestName("Trim");
+  assertEquals("", p.Trim(""));
+  assertEquals("", p.Trim(" "));
+  assertEquals("aaa", p.Trim("aaa"));
+  assertEquals("aaa", p.Trim(" aaa"));
+  assertEquals("aaa", p.Trim("aaa  "));
+  assertEquals("aaa", p.Trim("  aaa  "));
+  assertEquals("aaa", p.Trim("\t  aaa  \t"));
+  assertEquals("aaa\r\nbbb", p.Trim(" aaa  \r\n  bbb "));
+  assertEquals("aaa\r\nbbb\r\n", p.Trim(" aaa  \r\n  bbb \r\n"));
+
+  p.PluginOnEvent(1, MergeApp);
+}
+
+function InsertDateTimeTest() {
+  var changed = false;
+  var text = "";
+  var size;
+  var p = GetObject("script: " + ScriptFolder + "\\..\\..\\Plugins\\dlls\\insert datetime.sct");
+  printPluginInfo(p);
+
+  WScript.Echo(p.InsertDate("date="));
+  WScript.Echo(p.InsertTime("time="));
+  WScript.Echo();
+
+}
+
+function IgnoreLeadingLineNumbersTest() {
+  var changed = false;
+  var text = "";
+  var size;
+  var p = GetObject("script: " + ScriptFolder + "\\..\\..\\Plugins\\dlls\\IgnoreLeadingLineNumbers.sct");
+  printPluginInfo(p);
+
+  //
+  text = "";
+  size = text.length;
+  changed = false;
+  var result = p.PrediffBufferW(text, size, changed);
+  if (typeof result !== "string") { text = result.getItem(1); size = result.getItem(2); changed = result.getItem(3); }
+  setTestName("IgnoreLeadingLineNumbers1");
+  assertEquals("", text);
+  assertEquals(0, size);
+  assertEquals(false, changed);
+
+  //
+  text = "n1 aaa\r\nN2 bbb\r\n";
+  size = text.length;
+  changed = false;
+  var result = p.PrediffBufferW(text, size, changed);
+  if (typeof result !== "string") { text = result.getItem(1); size = result.getItem(2); changed = result.getItem(3); }
+  setTestName("IgnoreLeadingLineNumbers2");
+  assertEquals(" aaa\r\n bbb\r\n", text);
+  assertEquals(text.length, size);
+  assertEquals(true, changed);
+
+  //
+  text = "1 aaa\nbbb\n";
+  size = text.length;
+  changed = false;
+  var result = p.PrediffBufferW(text, size, changed);
+  if (typeof result !== "string") { text = result.getItem(1); size = result.getItem(2); changed = result.getItem(3); }
+  setTestName("IgnoreLeadingLineNumbers3");
+  assertEquals(" aaa\nbbb\n", text);
+  assertEquals(text.length, size);
+  assertEquals(true, changed);
+
+  //
+  text = "aaa\r2 bbb\r";
+  size = text.length;
+  changed = false;
+  var result = p.PrediffBufferW(text, size, changed);
+  if (typeof result !== "string") { text = result.getItem(1); size = result.getItem(2); changed = result.getItem(3); }
+  setTestName("IgnoreLeadingLineNumbers4");
+  assertEquals("aaa\r bbb\r", text);
+  assertEquals(text.length, size);
+  assertEquals(true, changed);
+
+}
+
+function PrediffLineFilterTest() {
+  var changed = false;
+  var text = "";
+  var size;
+  var p = GetObject("script: " + ScriptFolder + "\\..\\..\\Plugins\\dlls\\PrediffLineFilter.sct");
+  printPluginInfo(p);
+
+  p.PluginOnEvent(0, MergeApp);
+
+  //
+  setTestName("PrediffLineFilter");
+  text = "";
+  size = text.length;
+  changed = false;
+  var result = p.PrediffBufferW(text, size, changed);
+  if (typeof result !== "string") { text = result.getItem(1); size = result.getItem(2); changed = result.getItem(3); }
+  assertEquals("", text);
+  assertEquals(0, size);
+  assertEquals(false, changed);
+
+  //
+  text = "abc def abc";
+  size = text.length;
+  changed = false;
+  var result = p.PrediffBufferW(text, size, changed);
+  if (typeof result !== "string") { text = result.getItem(1); size = result.getItem(2); changed = result.getItem(3); }
+  assertEquals("def def def", text);
+  assertEquals(text.length, size);
+  assertEquals(true, changed);
+
+  //
+  text = "gHI def Ghi";
+  size = text.length;
+  changed = false;
+  var result = p.PrediffBufferW(text, size, changed);
+  if (typeof result !== "string") { text = result.getItem(1); size = result.getItem(2); changed = result.getItem(3); }
+  assertEquals("Jkl def Jkl", text);
+  assertEquals(text.length, size);
+  assertEquals(true, changed);
+
+  //
+  text = "1.2 def 3.4";
+  size = text.length;
+  changed = false;
+  var result = p.PrediffBufferW(text, size, changed);
+  if (typeof result !== "string") { text = result.getItem(1); size = result.getItem(2); changed = result.getItem(3); }
+  assertEquals("x.x def x.x", text);
+  assertEquals(text.length, size);
+  assertEquals(true, changed);
+
+  //
+  text = "mnopqrstuvwxyz";
+  size = text.length;
+  changed = false;
+  var result = p.PrediffBufferW(text, size, changed);
+  if (typeof result !== "string") { text = result.getItem(1); size = result.getItem(2); changed = result.getItem(3); }
+  assertEquals("XxxX", text);
+  assertEquals(4, size);
+  assertEquals(true, changed);
+
+  //
+  text = "disabled";
+  size = text.length;
+  changed = false;
+  var result = p.PrediffBufferW(text, size, changed);
+  if (typeof result !== "string") { text = result.getItem(1); size = result.getItem(2); changed = result.getItem(3); }
+  assertEquals("disabled", text);
+  assertEquals(text.length, size);
+  assertEquals(true, changed);
+
+  //
+  text = "abc def abc\r\n";
+  text += "gHI def GHI\r\n";
+  text += "1.2 def 3.4\r\n";
+  text += "mnopqrstuvwxyz\r\n";
+  text += "disabled";
+  size = text.length;
+  changed = false;
+  var result = p.PrediffBufferW(text, size, changed);
+  if (typeof result !== "string") { text = result.getItem(1); size = result.getItem(2); changed = result.getItem(3); }
+  var expected =
+    "def def def\r\n" +
+    "Jkl def Jkl\r\n" +
+    "x.x def x.x\r\n" +
+    "XxxX\r\n" +
+    "disabled";
+  assertEquals(expected, text);
+  assertEquals(expected.length, size);
+  assertEquals(true, changed);
+
+  p.PluginOnEvent(1, MergeApp);
+}
+
+function ApplyPatchTest() {
+  var p = GetObject("script: " + ScriptFolder + "\\..\\..\\Plugins\\dlls\\ApplyPatch.sct");
+  printPluginInfo(p);
+  var changed = false;
+  var subcode = 0;
+  p.PluginOnEvent(0, MergeApp);
+  PluginSettings.Files.Left.Item_0 = ScriptFolder + "\\..\\Data\\Patch\\file1.txt";
+  PluginSettings.Files.Right.Item_0 = ScriptFolder + "\\..\\Data\\Patch\\patch.diff";
+  p.UnpackFile(ScriptFolder + "\\..\\Data\\Patch\\patch.diff", ScriptFolder + "\\result\\patch\\result1.txt", changed, subcode);
+  PluginSettings.Files.Left.Item_0 = ScriptFolder + "\\..\\Data\\Patch\\patch.diff";
+  PluginSettings.Files.Right.Item_0 = ScriptFolder + "\\..\\Data\\Patch\\file1.txt";
+  p.UnpackFile(ScriptFolder + "\\..\\Data\\Patch\\patch.diff", ScriptFolder + "\\result\\patch\\result2.txt", changed, subcode);
+  PluginSettings.Files.Left.Item_0 = ScriptFolder + "\\..\\Data\\Patch\\dir1\\";
+  PluginSettings.Files.Right.Item_0 = ScriptFolder + "\\..\\Data\\Patch\\patch2.diff";
+  p.UnpackFolder(ScriptFolder + "\\..\\Data\\Patch\\patch2.diff", ScriptFolder + "\\result\\patch\\result1\\", changed, subcode);
+  PluginSettings.Files.Left.Item_0 = ScriptFolder + "\\..\\Data\\Patch\\dir1\\";
+  PluginSettings.Files.Right.Item_0 = ScriptFolder + "\\..\\Data\\Patch\\patch3.diff";
+  p.UnpackFolder(ScriptFolder + "\\..\\Data\\Patch\\patch3.diff", ScriptFolder + "\\result\\patch\\result2\\", changed, subcode);
+  PluginSettings.Files.Left.Item_0 = ScriptFolder + "\\..\\Data\\Patch\\patch3.diff";
+  PluginSettings.Files.Right.Item_0 = ScriptFolder + "\\..\\Data\\Patch\\dir1\\subdir\\";
+  p.UnpackFolder(ScriptFolder + "\\..\\Data\\Patch\\patch3.diff", ScriptFolder + "\\result\\patch\\result3\\", changed, subcode);
+  p.PluginOnEvent(1, MergeApp);
+}
+
+function CompareMSExcelFilesTest() {
+  var p = GetObject("script: " + ScriptFolder + "\\..\\..\\Plugins\\dlls\\CompareMSExcelFiles.sct");
+  printPluginInfo(p);
+  var changed = false;
+  var subcode = 0;
+  p.PluginOnEvent(0, MergeApp);
+  p.UnpackFile(ScriptFolder + "\\..\\Data\\Office\\excel.xls", ScriptFolder + "\\result\\excel.xls.tsv", changed, subcode);
+  CollectGarbage();
+  p.UnpackFolder(ScriptFolder + "\\..\\Data\\Office\\excel.xls", ScriptFolder + "\\result\\excel\\", changed, subcode);
+  CollectGarbage();
+  p.PluginOnEvent(1, MergeApp);
+}
+
+function CompareMSWordFilesTest() {
+  var p = GetObject("script: " + ScriptFolder + "\\..\\..\\Plugins\\dlls\\CompareMSWordFiles.sct");
+  printPluginInfo(p);
+  var changed = false;
+  var subcode = 0;
+  p.PluginOnEvent(0, MergeApp);
+  p.UnpackFile(ScriptFolder + "\\..\\Data\\Office\\word.doc", ScriptFolder + "\\result\\word.doc.txt", changed, subcode);
+  CollectGarbage();
+  p.UnpackFolder(ScriptFolder + "\\..\\Data\\Office\\word.doc", ScriptFolder + "\\result\\word\\", changed, subcode);
+  CollectGarbage();
+  p.PluginOnEvent(1, MergeApp);
+}
+
+function CompareMSPowerPointFilesTest() {
+  var p = GetObject("script: " + ScriptFolder + "\\..\\..\\Plugins\\dlls\\CompareMSPowerPointFiles.sct");
+  printPluginInfo(p);
+  var changed = false;
+  var subcode = 0;
+  p.PluginOnEvent(0, MergeApp);
+  p.UnpackFile(ScriptFolder + "\\..\\Data\\Office\\powerpnt.ppt", ScriptFolder + "\\result\\powerpnt.ppt.txt", changed, subcode);
+  CollectGarbage();
+  p.UnpackFolder(ScriptFolder + "\\..\\Data\\Office\\powerpnt.ppt", ScriptFolder + "\\result\\powerpnt\\", changed, subcode);
+  CollectGarbage();
+  p.PluginOnEvent(1, MergeApp);
+}
+
+EditorAddinTest();
+InsertDateTimeTest();
+IgnoreLeadingLineNumbersTest();
+PrediffLineFilterTest();
+ApplyPatchTest();
+/*
+CompareMSExcelFilesTest();
+CompareMSWordFilesTest();
+CompareMSPowerPointFilesTest();
+*/
+
diff --git a/Testing/PluginTests/PluginTests.vbs b/Testing/PluginTests/PluginTests.vbs
deleted file mode 100644
index d63e1877ca2..00000000000
--- a/Testing/PluginTests/PluginTests.vbs
+++ /dev/null
@@ -1,250 +0,0 @@
-Option Explicit
-
-Dim FileSys
-Dim ScriptFolder
-Dim g_cnt
-Dim g_testname
-
-Set FileSys = CreateObject("Scripting.FileSystemObject")
-ScriptFolder = FileSys.getParentFolderName(WScript.ScriptFullName)
-
-Sub SetTestName(testname)
-    g_cnt = 0
-    g_testname = testname
-End Sub
-
-Function GetCurrentTestName()
-    GetCurrentTestName = g_testname & g_cnt
-End Function
-
-Sub AssertTrue(value)
-    g_cnt = g_cnt + 1
-    If Not value Then
-        Err.Raise 30001, , GetCurrentTestName()
-    End If
-End Sub
-
-Sub AssertEquals(expected, actual)
-    g_cnt = g_cnt + 1
-    If expected <> actual Then
-	    Err.Raise 30001, , GetCurrentTestName() & vbCrLf & "expected: """ & expected & """" & vbCrLf & "actual: """ & actual & """"
-    End If
-End Sub
-
-Sub CompareMSExcelFilesTest
-    Dim p, changed, subcode
-    Set p = GetObject("script: " & ScriptFolder & "\..\..\Plugins\dlls\CompareMSExcelFiles.sct")
-    WScript.Echo "PluginDescription: " & p.PluginDescription
-    WScript.Echo "PluginEvent      : " & p.PluginEvent      
-    WScript.Echo "PluginFileFilters: " & p.PluginFileFilters
-    WScript.Echo "PluginIsAutomatic: " & p.PluginIsAutomatic
-    On Error Resume Next
-    WScript.Echo "PluginUnpackedFileExtension: " & p.PluginUnpackedFileExtension
-    On Error GoTo 0
-
-    changed = false
-    subcode = 0
-    p.UnpackFile ScriptFolder & "\..\Data\Office\excel.xls", ScriptFolder & "\result.txt", changed, subcode
-    
-End Sub
-
-Sub EditorAddinTest
-    Dim p
-    Dim i
-    Dim asciiChars
-    Dim chars
-    Set p = GetObject("script: " & ScriptFolder & "\..\..\Plugins\dlls\editor addin.sct")
-
-    For i = 0 To 127
-        asciiChars = asciiChars & Chr(i)
-    Next
-
-    ' MakeUpper
-    SetTestName "MakeUpper"
-    AssertEquals "", p.MakeUpper("")
-    AssertEquals " ~0129ABCZABCZ", p.MakeUpper(" ~0129abczABCZ")
-    AssertEquals Replace(asciiChars, "abcdefghijklmnopqrstuvwxyz", "ABCDEFGHIJKLMNOPQRSTUVWXYZ"), p.MakeUpper(asciiChars)
-
-    ' MakeLower
-    SetTestName "MakeLower"
-    AssertEquals "", p.MakeLower("")
-    AssertEquals " ~0129abczabcz", p.MakeLower(" ~0129abczABCZ")
-    AssertEquals Replace(asciiChars, "ABCDEFGHIJKLMNOPQRSTUVWXYZ", "abcdefghijklmnopqrstuvwxyz"), p.MakeLower(asciiChars)
-
-    ' ExecFilterCommand
-    SetTestName "ExecFilterCommand"
-    p.PluginArguments = "sort"
-    AssertEquals "1" & vbCrLf & "2" & vbCrLf, p.ExecFilterCommand("2" & vbCrLf & "1" & vbCrLf)
-    p.PluginArguments = "echo a"
-    AssertEquals "a " & vbCrLf, p.ExecFilterCommand("")
-
-    ' SelectColumns
-    SetTestName "SelectColumns"
-    p.PluginArguments = "1"
-    AssertEquals "a", p.SelectColumns("abc")
-    AssertEquals "a" & vbCrLf & "d", p.SelectColumns("abc" & vbCrLf & "def")
-    AssertEquals "a" & vbCrLf & "d" & vbCrLf, p.SelectColumns("abc" & vbCrLf & "def" & vbCrLf)
-    p.PluginArguments = "3"
-    AssertEquals "c" & vbCrLf & "f", p.SelectColumns("abc" & vbCrLf & "def")
-    p.PluginArguments = "1,3"
-    AssertEquals "ac" & vbCrLf & "d", p.SelectColumns("abc" & vbCrLf & "de")
-    p.PluginArguments = "1-3"
-    AssertEquals "abc" & vbCrLf & "def", p.SelectColumns("abc" & vbCrLf & "def")
-    p.PluginArguments = "-3"
-    AssertEquals "abc" & vbCrLf & "def", p.SelectColumns("abc" & vbCrLf & "def")
-    p.PluginArguments = "1-"
-    AssertEquals "abc" & vbCrLf & "def", p.SelectColumns("abc" & vbCrLf & "def")
-    p.PluginArguments = "2-"
-    AssertEquals "bc" & vbCrLf & "ef", p.SelectColumns("abc" & vbCrLf & "def")
-    p.PluginArguments = "3-"
-    AssertEquals "c" & vbCrLf & "f", p.SelectColumns("abc" & vbCrLf & "def")
-    p.PluginArguments = "4-"
-    AssertEquals "" & vbCrLf & "", p.SelectColumns("abc" & vbCrLf & "def")
-
-    p.PluginArguments = "-e ab"
-    AssertEquals "", p.SelectColumns("")
-    AssertEquals "ab" & vbCrLf & "", p.SelectColumns("abc" & vbCrLf & "def")
-    p.PluginArguments = "-e ""ab|de"""
-    AssertEquals "ab" & vbCrLf & "de", p.SelectColumns("abc" & vbCrLf & "def")
-    p.PluginArguments = "-e ^."
-    AssertEquals "a" & vbCrLf & "d", p.SelectColumns("abc" & vbCrLf & "def")
-    p.PluginArguments = "-e .*"
-    AssertEquals "abc" & vbCrLf & "def", p.SelectColumns("abc" & vbCrLf & "def")
-    p.PluginArguments = "-e -i ""Ab|dE"""
-    AssertEquals "ab" & vbCrLf & "de", p.SelectColumns("abc" & vbCrLf & "def")
-    p.PluginArguments = "-e -i -g ab"
-    AssertEquals "abAB" & vbCrLf & "", p.SelectColumns("abcABC" & vbCrLf & "def")
-    p.PluginArguments = "-v -e ""ab|de"""
-    AssertEquals "c" & vbCrLf & "f", p.SelectColumns("abc" & vbCrLf & "def")
-
-    p.PluginArguments = "1-3 -e ab 2-3"
-    AssertEquals "abcabbc" & vbCrLf & "defef", p.SelectColumns("abc" & vbCrLf & "def")
-
-    ' SelectLines
-    SetTestName "SelectLines"
-    p.PluginArguments = "1"
-    AssertEquals "", p.SelectLines("")
-    AssertEquals "aaa", p.SelectLines("aaa")
-    p.PluginArguments = "2"
-    AssertEquals "bbb", p.SelectLines("aaa" & vbCrLf & "bbb")
-    p.PluginArguments = "1,2"
-    AssertEquals "aaa" & vbCrLf & "bbb", p.SelectLines("aaa" & vbCrLf & "bbb")
-    p.PluginArguments = "1-2"
-    AssertEquals "aaa" & vbCrLf & "bbb", p.SelectLines("aaa" & vbCrLf & "bbb")
-    AssertEquals "aaa" & vbCrLf & "bbb" & vbCrLf, p.SelectLines("aaa" & vbCrLf & "bbb" & vbCrLf)
-    p.PluginArguments = "1-"
-    AssertEquals "aaa" & vbCrLf & "bbb", p.SelectLines("aaa" & vbCrLf & "bbb")
-    AssertEquals "aaa" & vbCrLf & "bbb" & vbCrLf, p.SelectLines("aaa" & vbCrLf & "bbb" & vbCrLf)
-    AssertEquals "aaa" & vbCrLf & vbCrLf & vbCrLf, p.SelectLines("aaa" & vbCrLf & vbCrLf & vbCrLf)
-    p.PluginArguments = "-2"
-    AssertEquals "aaa" & vbCrLf & "bbb", p.SelectLines("aaa" & vbCrLf & "bbb")
-    AssertEquals "aaa" & vbCrLf & "bbb" & vbCrLf, p.SelectLines("aaa" & vbCrLf & "bbb" & vbCrLf)
-    p.PluginArguments = "4-5"
-    AssertEquals "", p.SelectLines("aaa" & vbCrLf & "bbb")
-    AssertEquals "", p.SelectLines("aaa" & vbCrLf & "bbb" & vbCrLf)
-
-    p.PluginArguments = "-e aa"
-    AssertEquals "", p.SelectLines("")
-    AssertEquals "aaa", p.SelectLines("aaa" & vbCrLf & "bbb")
-    AssertEquals "aaa" & vbCrLf, p.SelectLines("aaa" & vbCrLf & "bbb" & vbCrLf)
-    p.PluginArguments = "-e -i AA"
-    AssertEquals "aaa", p.SelectLines("aaa" & vbCrLf & "bbb")
-    AssertEquals "aaa" & vbCrLf, p.SelectLines("aaa" & vbCrLf & "bbb" & vbCrLf)
-    p.PluginArguments = "-e .*"
-    AssertEquals "aaa" & vbCrLf & "bbb", p.SelectLines("aaa" & vbCrLf & "bbb")
-    AssertEquals "aaa" & vbCrLf & "bbb" & vbCrLf, p.SelectLines("aaa" & vbCrLf & "bbb" & vbCrLf)
-    p.PluginArguments = "^a"
-    AssertEquals "aaa", p.SelectLines("aaa" & vbCrLf & "bbb")
-    AssertEquals "aaa" & vbCrLf, p.SelectLines("aaa" & vbCrLf & "bbb" & vbCrLf)
-    p.PluginArguments = "a$"
-    AssertEquals "aaa", p.SelectLines("aaa" & vbCrLf & "bbb")
-    AssertEquals "aaa" & vbCrLf, p.SelectLines("aaa" & vbCrLf & "bbb" & vbCrLf)
-    p.PluginArguments = "-v a$"
-    AssertEquals "bbb", p.SelectLines("aaa" & vbCrLf & "bbb")
-    AssertEquals "bbb" & vbCrLf, p.SelectLines("aaa" & vbCrLf & "bbb" & vbCrLf)
-
-    p.PluginArguments = "1 -e c$"
-    AssertEquals "aaa" & vbCrLf & "ccc", p.SelectLines("aaa" & vbCrLf & "bbb" & vbCrLf & "ccc")
-
-    ' Replace
-    SetTestName "Replace"
-    p.PluginArguments = "abc def"
-    AssertEquals "", p.Replace("")
-    AssertEquals "def def def def", p.Replace("abc def abc def")
-    p.PluginArguments = "-e a.c XXX"
-    AssertEquals "", p.Replace("")
-    AssertEquals "XXX def XXX def", p.Replace("abc def abc def")
-    p.PluginArguments = "-e -i A.C XXX"
-    AssertEquals "XXX def XXX def", p.Replace("abc def abc def")
-    p.PluginArguments = "-e ^\d+ XXX"
-    AssertEquals "XXX abc" & vbCrLf & "XXX def", p.Replace("1000 abc" & vbCrLf & "1001 def")
-    p.PluginArguments = "-e (.{3}) $1\r\n"
-    AssertEquals "012" & vbCrLf & "345" & vbCrLf & "678" & vbCrLf & "9", p.Replace("0123456789")
-    p.PluginArguments = "-e (\d+) \a\b\t\n\v\f\r\\$1\1\0"
-    AssertEquals Chr(&H07) & Chr(&H08) & Chr(&H09) & Chr(&H0A) & Chr(&H0B) & Chr(&H0C) & Chr(&H0D) & "\0123456789\1\0", p.Replace("0123456789")
-
-    ' ReverseColumns
-    SetTestName "ReverseColumns"
-    AssertEquals "", p.ReverseColumns("")
-    AssertEquals "a", p.ReverseColumns("a")
-    AssertEquals "a" & vbCrLf & "b", p.ReverseColumns("a" & vbCrLf & "b")
-    AssertEquals "ba", p.ReverseColumns("ab")
-    AssertEquals "ba" & vbCrLf & "dc", p.ReverseColumns("ab" & vbCrLf & "cd")
-    AssertEquals "cba", p.ReverseColumns("abc")
-    AssertEquals "cba" & vbCrLf & "fed", p.ReverseColumns("abc" & vbCrLf & "def")
-    AssertEquals "dcba", p.ReverseColumns("abcd")
-    AssertEquals "dcba" & vbCrLf & "hgfe", p.ReverseColumns("abcd" & vbCrLf & "efgh")
-
-    ' ReverseLines
-    SetTestName "ReverseLines"
-    AssertEquals "", p.ReverseLines("")
-    AssertEquals "a", p.ReverseLines("a")
-    AssertEquals "a" & vbCrLf, p.ReverseLines("a" & vbCrLf)
-    AssertEquals "b" & vbCrLf & "a", p.ReverseLines("a" & vbCrLf & "b")
-    AssertEquals "b" & vbCrLf & "a" & vbCrLf, p.ReverseLines("a" & vbCrLf & "b" & vbCrLf)
-    AssertEquals "c" & vbCrLf & "b" & vbCrLf & "a", p.ReverseLines("a" & vbCrLf & "b" & vbCrLf & "c")
-    AssertEquals "c" & vbCrLf & "b" & vbCrLf & "a" & vbCrLf, p.ReverseLines("a" & vbCrLf & "b" & vbCrLf & "c" & vbCrLf)
-    AssertEquals "d" & vbCrLf & "c" & vbCrLf & "b" & vbCrLf & "a", p.ReverseLines("a" & vbCrLf & "b" & vbCrLf & "c" & vbCrLf & "d")
-
-    ' Tokenize
-    SetTestName "Tokenize"
-    p.PluginArguments = "[^\w]+"
-    AssertEquals "", p.Tokenize("")
-    AssertEquals "aaa", p.Tokenize("aaa")
-    AssertEquals "aaa" & vbCrLf & "abcd", p.Tokenize("aaa abcd")
-
-    ' RemoveDuplicates
-    SetTestName "RemoveDuplicates"
-    AssertEquals "", p.RemoveDuplicates("")
-    AssertEquals "aaa", p.RemoveDuplicates("aaa")
-    AssertEquals "aaa", p.RemoveDuplicates("aaa" & vbCrLf & "aaa")
-    AssertEquals "aaa" & vbCrLf, p.RemoveDuplicates("aaa" & vbCrLf & "aaa" & vbCrLf)
-    AssertEquals "aaa" & vbCrLf & "bbb", p.RemoveDuplicates("aaa" & vbCrLf & "bbb")
-    AssertEquals "aaa" & vbCrLf & "bbb" & vbCrLf, p.RemoveDuplicates("aaa" & vbCrLf & "bbb" & vbCrLf)
-
-    ' CountDuplicates
-    SetTestName "CountDuplicates"
-    AssertEquals "", p.CountDuplicates("")
-    AssertEquals "aaa" & vbTab & "1", p.CountDuplicates("aaa")
-    AssertEquals "aaa" & vbTab & "2" & vbCrLf, p.CountDuplicates("aaa" & vbCrLf & "aaa")
-    AssertEquals "aaa" & vbTab & "2" & vbCrLf, p.CountDuplicates("aaa" & vbCrLf & "aaa" & vbCrLf)
-    AssertEquals "aaa" & vbTab & "1" & vbCrLf & "bbb" & vbTab & "1" & vbCrLf, p.CountDuplicates("aaa" & vbCrLf & "bbb")
-    AssertEquals "aaa" & vbTab & "1" & vbCrLf & "bbb" & vbTab & "1" & vbCrLf, p.CountDuplicates("aaa" & vbCrLf & "bbb" & vbCrLf)
-
-    ' Trim
-    SetTestName "Trim"
-    AssertEquals "", p.Trim("")
-    AssertEquals "", p.Trim(" ")
-    AssertEquals "aaa", p.Trim("aaa")
-    AssertEquals "aaa", p.Trim(" aaa")
-    AssertEquals "aaa", p.Trim("aaa  ")
-    AssertEquals "aaa", p.Trim("  aaa  ")
-    AssertEquals "aaa", p.Trim(vbTab & "  aaa  " & vbTab)
-    AssertEquals "aaa" & vbCrLf & "bbb", p.Trim(" aaa  " & vbCrLf & "  bbb ")
-    AssertEquals "aaa" & vbCrLf & "bbb" & vbCrLf, p.Trim(" aaa  " & vbCrLf & "  bbb " & vbCrLf)
-
-End Sub
-
-EditorAddinTest
-'CompareMSExcelFilesTest
-
diff --git a/Tools/Scripts/CheckMenuResources.js b/Tools/Scripts/CheckMenuResources.js
new file mode 100644
index 00000000000..6f8b5e23c3b
--- /dev/null
+++ b/Tools/Scripts/CheckMenuResources.js
@@ -0,0 +1,167 @@
+////
+// This script checks the menu resources.
+//
+// Copyright (C) 2008 by Tim Gerundt
+// Released under the "GNU General Public License"
+
+var ForReading = 1;
+
+var NO_BLOCK = 0;
+var MENU_BLOCK = 1;
+var DIALOGEX_BLOCK = 2;
+var STRINGTABLE_BLOCK = 3;
+var VERSIONINFO_BLOCK = 4;
+var ACCELERATORS_BLOCK = 5;
+
+
+var oFSO = new ActiveXObject("Scripting.FileSystemObject");
+
+var bRunFromCmd = false;
+if (oFSO.GetFileName(WScript.FullName).toLowerCase() === "cscript.exe") {
+  bRunFromCmd = true;
+}
+
+Main();
+
+////
+// ...
+function Main() {
+  var StartTime = new Date().getTime();
+  
+  InfoBox("Checking menu resources....", 3);
+  
+  var oMenuItems = GetMenuItemsFromRcFile("..\\..\\Src\\Merge.rc");
+  var oIds = GetIdsFromRcFile("..\\..\\Src\\Merge.rc");
+  
+  var oTxtFile = oFSO.CreateTextFile("MenuResources.txt", true);
+  
+  oTxtFile.WriteLine("----------------------------------------");
+  oTxtFile.WriteLine("NO MNEMONIC CHAR");
+  oTxtFile.WriteLine("----------------------------------------");
+  for (var sKey in oMenuItems) { //For all menu items...
+    var oMenuItem = oMenuItems[sKey];
+    if (oMenuItem.Str.indexOf("&") === -1) { //If WITHOUT mnemonic...
+      oTxtFile.WriteLine(oMenuItem.Str + "   (" + oMenuItem.Menu + " -> " + oMenuItem.Id + ")");
+    }
+  }
+  
+  oTxtFile.WriteLine("");
+  oTxtFile.WriteLine("----------------------------------------");
+  oTxtFile.WriteLine("NO DESCRIPTION TEXT");
+  oTxtFile.WriteLine("----------------------------------------");
+  for (var sKey in oMenuItems) { //For all menu items...
+    var oMenuItem = oMenuItems[sKey];
+    if (oMenuItem.Id !== "") { //If NOT empty...
+      if (!(oMenuItem.Id in oIds)) { //If WITHOUT description...
+        oTxtFile.WriteLine(oMenuItem.Str + "   (" + oMenuItem.Menu + " -> " + oMenuItem.Id + ")");
+      }
+    }
+  }
+  
+  oTxtFile.Close();
+  
+  var EndTime = new Date().getTime();
+  var Seconds = (EndTime - StartTime) / 1000.0;
+  
+  InfoBox("File \"MenuResources.txt\" created, after " + Seconds + " second(s).", 10);
+}
+
+////
+// ...
+function GetMenuItemsFromRcFile(sRcFilePath) {
+  var oMenuItems = {};
+  if (oFSO.FileExists(sRcFilePath)) { //If the RC file exists...
+    var iCount = 0;
+    var iBlockType = NO_BLOCK;
+    var sMenu = "";
+    var oRcFile = oFSO.OpenTextFile(sRcFilePath, ForReading);
+    while (!oRcFile.AtEndOfStream) { //For all lines...
+      var sLine = oRcFile.ReadLine().replace(/^\s+|\s+$/g, "");
+      var sString = "";
+      var sId = "";
+      var oMatch = /(IDR_\w+) MENU/.exec(sLine);
+      if (oMatch) { //MENU...
+        iBlockType = MENU_BLOCK;
+        sMenu = oMatch[1];
+      } else if (sLine.indexOf(" DIALOGEX") >= 0) { //DIALOGEX...
+        iBlockType = DIALOGEX_BLOCK;
+      } else if (sLine === "STRINGTABLE") { //STRINGTABLE...
+        iBlockType = STRINGTABLE_BLOCK;
+      } else if (sLine.indexOf(" VERSIONINFO") >= 0) { //VERSIONINFO...
+        iBlockType = VERSIONINFO_BLOCK;
+      } else if (sLine.indexOf(" ACCELERATORS") >= 0) { //ACCELERATORS...
+        iBlockType = ACCELERATORS_BLOCK;
+      } else if (sLine === "BEGIN") { //BEGIN...
+        //IGNORE FOR SPEEDUP!
+      } else if (sLine === "END") { //END...
+        if (iBlockType === STRINGTABLE_BLOCK) { //If inside stringtable...
+          iBlockType = NO_BLOCK;
+        }
+      } else if (sLine.substring(0, 2) === "//") { //If comment line...
+        sLine = "";
+        //IGNORE FOR SPEEDUP!
+      } else if (sLine !== "") { //If NOT empty line...
+        if (iBlockType === MENU_BLOCK) {
+          if (sLine.indexOf("\"") >= 0) { //If quote found (for speedup)...
+            var oMatch = /"(.*)"/.exec(sLine);
+            if (oMatch && sLine.indexOf("_POPUP_") === -1) { //If "string"...
+              sString = oMatch[1];
+              oMatch = /(ID_\w+)/.exec(sLine);
+              if (sString !== "") { //If NOT empty...
+                if (oMatch) { //If ID...
+                  sId = oMatch[1];
+                }
+                iCount++;
+              }
+            }
+          }
+        }
+      }
+      
+      if (sString !== "") {
+        var oMenuItem = { "Menu": "", "Str": "", "Id": "" };
+        oMenuItem.Menu = sMenu;
+        oMenuItem.Str = sString;
+        oMenuItem.Id = sId;
+        oMenuItems[iCount] = oMenuItem;
+      }
+    }
+    oRcFile.Close();
+  }
+  return oMenuItems;
+}
+
+////
+// ...
+function GetIdsFromRcFile(sRcPath) {
+  var oIds = {};
+  var reId = /(ID_\w+)\s+\"(.*)\"/;
+  if (oFSO.FileExists(sRcPath)) { //If the RC file exists...
+    var oTextFile = oFSO.OpenTextFile(sRcPath, ForReading);
+    while (!oTextFile.AtEndOfStream) { //For all lines...
+      var sLine = oTextFile.ReadLine().replace(/^\s+|\s+$/g, "");
+      var oMatch = reId.exec(sLine); //If ID...
+      if (oMatch) {
+        var sId = oMatch[1];
+        var sString = oMatch[2];
+        if (!(sId in oIds)) { //If the key is NOT already used...
+          oIds[sId] = sString;
+        }
+      }
+    }
+    oTextFile.Close();
+  }
+  return oIds;
+}
+
+////
+// ...
+function InfoBox(sText, iSecondsToWait) {
+  if (!bRunFromCmd) { //If run from command line...
+    var oShell = WScript.CreateObject("WScript.Shell");
+    return oShell.Popup(sText, iSecondsToWait, WScript.ScriptName, 64);
+  } else { //If NOT run from command line...
+    WScript.Echo(sText);
+  }
+}
+
diff --git a/Tools/Scripts/CheckMenuResources.vbs b/Tools/Scripts/CheckMenuResources.vbs
deleted file mode 100644
index cae3fe64f1f..00000000000
--- a/Tools/Scripts/CheckMenuResources.vbs
+++ /dev/null
@@ -1,211 +0,0 @@
-Option Explicit
-''
-' This script checks the menu resources.
-'
-' Copyright (C) 2008 by Tim Gerundt
-' Released under the "GNU General Public License"
-
-Const ForReading = 1
-
-Const NO_BLOCK = 0
-Const MENU_BLOCK = 1
-Const DIALOGEX_BLOCK = 2
-Const STRINGTABLE_BLOCK = 3
-Const VERSIONINFO_BLOCK = 4
-Const ACCELERATORS_BLOCK = 5
-
-Dim oFSO, bRunFromCmd
-
-Set oFSO = CreateObject("Scripting.FileSystemObject")
-
-bRunFromCmd = False
-If LCase(oFSO.GetFileName(Wscript.FullName)) = "cscript.exe" Then
-  bRunFromCmd = True
-End If
-
-Call Main
-
-''
-' ...
-Sub Main
-  Dim oMenuItems, oMenuItem, oIds, sKey, oTxtFile
-  Dim StartTime, EndTime, Seconds
-  
-  StartTime = Time
-  
-  InfoBox "Checking menu resources....", 3
-  
-  Set oMenuItems = GetMenuItemsFromRcFile("..\..\Src\Merge.rc")
-  Set oIds = GetIdsFromRcFile("..\..\Src\Merge.rc")
-  
-  Set oTxtFile = oFSO.CreateTextFile("MenuResources.txt", True)
-  
-  oTxtFile.WriteLine "----------------------------------------"
-  oTxtFile.WriteLine "NO MNEMONIC CHAR"
-  oTxtFile.WriteLine "----------------------------------------"
-  For Each sKey In oMenuItems.Keys 'For all menu items...
-    Set oMenuItem = oMenuItems(sKey)
-    If (InStr(oMenuItem.Str, "&") = 0) Then 'If WITHOUT mnemonic...
-      oTxtFile.WriteLine oMenuItem.Str + "   (" + oMenuItem.Menu + " -> " + oMenuItem.Id + ")"
-    End If
-  Next
-  
-  oTxtFile.WriteLine ""
-  oTxtFile.WriteLine "----------------------------------------"
-  oTxtFile.WriteLine "NO DESCRIPTION TEXT"
-  oTxtFile.WriteLine "----------------------------------------"
-  For Each sKey In oMenuItems.Keys 'For all menu items...
-    Set oMenuItem = oMenuItems(sKey)
-    If (oMenuItem.Id <> "") Then 'If NOT empty...
-      If (oIds.Exists(oMenuItem.Id) = False) Then 'If WITHOUT description...
-        oTxtFile.WriteLine oMenuItem.Str + "   (" + oMenuItem.Menu + " -> " + oMenuItem.Id + ")"
-      End If
-    End If
-  Next
-  
-  oTxtFile.Close
-  
-  EndTime = Time
-  Seconds = DateDiff("s", StartTime, EndTime)
-  
-  InfoBox "File ""MenuResources.txt"" created, after " & Seconds & " second(s).", 10
-End Sub
-
-''
-' ...
-Class CMenuItem
-  Dim Menu, Str, Id
-End Class
-
-''
-' ...
-Function GetMenuItemsFromRcFile(ByVal sRcFilePath)
-  Dim oMenuItems, oMenuItem, oRcFile, sLine, iCount
-  Dim iBlockType, sMenu, sString, sId, oMatch
-  
-  Set oMenuItems = CreateObject("Scripting.Dictionary")
-  
-  If (oFSO.FileExists(sRcFilePath) = True) Then 'If the RC file exists...
-    iCount = 0
-    iBlockType = NO_BLOCK
-    sMenu = ""
-    Set oRcFile = oFSO.OpenTextFile(sRcFilePath, ForReading)
-    Do Until oRcFile.AtEndOfStream = True 'For all lines...
-      sLine = Trim(oRcFile.ReadLine)
-      
-      sString = ""
-      sId = ""
-      
-      If (FoundRegExpMatch(sLine, "(IDR_\w+) MENU", oMatch) = True) Then 'MENU...
-        iBlockType = MENU_BLOCK
-        sMenu = oMatch.SubMatches(0)
-      ElseIf (InStr(sLine, " DIALOGEX") > 0) Then 'DIALOGEX...
-        iBlockType = DIALOGEX_BLOCK
-      ElseIf (sLine = "STRINGTABLE") Then 'STRINGTABLE...
-        iBlockType = STRINGTABLE_BLOCK
-      ElseIf (InStr(sLine, " VERSIONINFO") > 0) Then 'VERSIONINFO...
-        iBlockType = VERSIONINFO_BLOCK
-      ElseIf (InStr(sLine, " ACCELERATORS") > 0) Then 'ACCELERATORS...
-        iBlockType = ACCELERATORS_BLOCK
-      ElseIf (sLine = "BEGIN") Then 'BEGIN...
-        'IGNORE FOR SPEEDUP!
-      ElseIf (sLine = "END") Then 'END...
-        If (iBlockType = STRINGTABLE_BLOCK) Then 'If inside stringtable...
-          iBlockType = NO_BLOCK
-        End If
-      ElseIf (Left(sLine, 2) = "//") Then 'If comment line...
-        sLine = ""
-        'IGNORE FOR SPEEDUP!
-      ElseIf (sLine <> "") Then 'If NOT empty line...
-        If (iBlockType = MENU_BLOCK) Then
-          If (InStr(sLine, """") > 0) Then 'If quote found (for speedup)...
-            If (FoundRegExpMatch(sLine, """(.*)""", oMatch) = True) And (InStr(sLine, "_POPUP_") = 0) Then 'If "string"...
-              sString = oMatch.SubMatches(0)
-              If (sString <> "") Then 'If NOT empty...
-                If (FoundRegExpMatch(sLine, "(ID_\w+)", oMatch) = True) Then 'If ID...
-                  sId = oMatch.SubMatches(0)
-                End If
-                iCount = iCount + 1
-              End If
-            End If
-          End If
-        End If
-      End If
-      
-      If (sString <> "") Then
-        Set oMenuItem = New CMenuItem
-        oMenuItem.Menu = sMenu
-        oMenuItem.Str = sString
-        oMenuItem.Id = sId
-        oMenuItems.Add iCount, oMenuItem
-      End If
-    Loop
-    oRcFile.Close
-  End If
-  Set GetMenuItemsFromRcFile = oMenuItems
-End Function
-
-''
-' ...
-Function GetIdsFromRcFile(ByVal sRcPath)
-  Dim oIds, oTextFile, sLine
-  Dim reId, oMatch, sId, sString
-  
-  Set oIds = CreateObject("Scripting.Dictionary")
-  
-  Set reId = New RegExp
-  reId.Pattern = "(ID_\w+)\s+""(.*)"""
-  reId.IgnoreCase = False
-  
-  If (oFSO.FileExists(sRcPath) = True) Then 'If the RC file exists...
-    Set oTextFile = oFSO.OpenTextFile(sRcPath, ForReading)
-    Do Until oTextFile.AtEndOfStream = True 'For all lines...
-      sLine = Trim(oTextFile.ReadLine)
-      
-      sId = ""
-      sString = ""
-      If reId.Test(sLine) Then 'If ID...
-        Set oMatch = reId.Execute(sLine)(0)
-        sId = oMatch.SubMatches(0)
-        sString = oMatch.SubMatches(1)
-        
-        If (oIds.Exists(sId) = False) Then 'If the key is NOT already used...
-          oIds.Add sId, sString
-        End If
-      End If
-    Loop
-    oTextFile.Close
-  End If
-  Set GetIdsFromRcFile = oIds
-End Function
-
-''
-' ...
-Function FoundRegExpMatch(ByVal sString, ByVal sPattern, ByRef oMatchReturn)
-  Dim oRegExp, oMatches
-  
-  Set oRegExp = New RegExp
-  oRegExp.Pattern = sPattern
-  oRegExp.IgnoreCase = True
-  
-  oMatchReturn = Null
-  FoundRegExpMatch = False
-  If (oRegExp.Test(sString) = True) Then
-    Set oMatches = oRegExp.Execute(sString)
-    Set oMatchReturn = oMatches(0)
-    FoundRegExpMatch = True
-  End If
-End Function
-
-''
-' ...
-Function InfoBox(ByVal sText, ByVal iSecondsToWait)
-  Dim oShell
-  
-  If (bRunFromCmd = False) Then 'If run from command line...
-    Set oShell = Wscript.CreateObject("WScript.Shell")
-    InfoBox = oShell.Popup(sText, iSecondsToWait, Wscript.ScriptName, 64)
-  Else 'If NOT run from command line...
-    Wscript.Echo sText
-  End If
-End Function
diff --git a/Tools/Scripts/CheckUnusedResources.js b/Tools/Scripts/CheckUnusedResources.js
new file mode 100644
index 00000000000..5c519a03def
--- /dev/null
+++ b/Tools/Scripts/CheckUnusedResources.js
@@ -0,0 +1,197 @@
+////
+// This script creates a list of (hopefully) unused resource IDs.
+//
+// Copyright (C) 2008 by Tim Gerundt
+// Released under the "GNU General Public License"
+
+var ForReading = 1;
+
+var NO_BLOCK = 0;
+var MENU_BLOCK = 1;
+var DIALOGEX_BLOCK = 2;
+var STRINGTABLE_BLOCK = 3;
+var VERSIONINFO_BLOCK = 4;
+var ACCELERATORS_BLOCK = 5;
+
+
+var oFSO = new ActiveXObject("Scripting.FileSystemObject");
+
+var bRunFromCmd = false;
+if (oFSO.GetFileName(WScript.FullName).toLowerCase() === "cscript.exe") {
+  bRunFromCmd = true;
+}
+
+Main();
+
+////
+// ...
+function Main() {
+  var StartTime = new Date().getTime();
+  
+  InfoBox("Creating list of unused resource IDs...", 3);
+  
+  var oHIds = GetIdsFromHeaderFile("..\\..\\Src\\resource.h");
+  var oRcIds = GetIdsFromResourceFile("..\\..\\Src\\Merge.rc");
+  var oRc2Ids = GetIdsFromResourceFile("..\\..\\Src\\Merge2.rc");
+  
+  var oCppIds = {};
+  oCppIds = GetIdsFromCppFiles("..\\..\\Src\\", oCppIds);
+  oCppIds = GetIdsFromCppFiles("..\\..\\Externals\\crystaledit\\editlib\\", oCppIds);
+  
+  var oTxtFile = oFSO.CreateTextFile("UnusedResources.txt", true);
+  
+  oTxtFile.WriteLine("----------------------------------------");
+  oTxtFile.WriteLine("ONLY IN RESOURCE.H FILE");
+  oTxtFile.WriteLine("----------------------------------------");
+  for (var sKey in oHIds) { //For all header IDs...
+    if (!(sKey in oRcIds) && !(sKey in oRc2Ids) && !(sKey in oCppIds)) { //If header ID is NOT used...
+      oTxtFile.WriteLine(sKey);
+    }
+  }
+  
+  oTxtFile.WriteLine("");
+  oTxtFile.WriteLine("----------------------------------------");
+  oTxtFile.WriteLine("NOT USED IN *.CPP/*.H FILES");
+  oTxtFile.WriteLine("----------------------------------------");
+  for (var sKey in oRcIds) { //For all RC IDs...
+    if (!(sKey in oCppIds)) { //If RC ID is NOT used...
+      oTxtFile.WriteLine(sKey);
+    }
+  }
+  for (var sKey in oRc2Ids) { //For all RC2 IDs...
+    if (!(sKey in oCppIds)) { //If RC2 ID is NOT used...
+      oTxtFile.WriteLine(sKey);
+    }
+  }
+  
+  oTxtFile.Close();
+  
+  var EndTime = new Date().getTime();
+  var Seconds = (EndTime - StartTime) / 1000.0;
+  
+  InfoBox("File \"UnusedResources.txt\" created, after " + Seconds + " second(s).", 10);
+}
+
+////
+// ...
+function GetIdsFromHeaderFile(sHPath) {
+  var oIds = {};
+  var reDefineId = /^#define (ID\w+)\s+(\d+)$/;
+  if (oFSO.FileExists(sHPath)) { //If the Header file exists...
+    var oTextFile = oFSO.OpenTextFile(sHPath, ForReading);
+    while (!oTextFile.AtEndOfStream) { //For all lines...
+      var sLine = oTextFile.ReadLine().replace(/^\s+|\s+$/g, "");
+      var oMatch = reDefineId.exec(sLine); //If ID...
+      if (oMatch) {
+        var sId = oMatch[1];
+        var sResource = oMatch[2];
+        oIds[sId] = sResource;
+      }
+    }
+    oTextFile.Close();
+  }
+  return oIds;
+}
+
+////
+// ...
+function GetIdsFromResourceFile(sRcPath) {
+  var reId = /(AFX_ID[A-Z]?_\w+|ID[A-Z]?_\w+)/g;
+  var oIds = {};
+  if (oFSO.FileExists(sRcPath)) { //If the RC file exists...
+    var iLine = 0;
+    var iBlockType = NO_BLOCK;
+    var oTextFile = oFSO.OpenTextFile(sRcPath, ForReading);
+    while (!oTextFile.AtEndOfStream) { //For all lines...
+      var sLine = oTextFile.ReadLine().replace(/^\s+|\s+$/g, "");
+      iLine++;
+      if (sLine.indexOf(" MENU") >= 0) { //MENU...
+        iBlockType = MENU_BLOCK;
+      } else if (sLine.indexOf(" DIALOGEX") >= 0) { //DIALOGEX...
+        iBlockType = DIALOGEX_BLOCK;
+      } else if (sLine === "STRINGTABLE") { //STRINGTABLE...
+        iBlockType = STRINGTABLE_BLOCK;
+      } else if (sLine.indexOf(" VERSIONINFO") >= 0) { //VERSIONINFO...
+        iBlockType = VERSIONINFO_BLOCK;
+      } else if (sLine.indexOf(" ACCELERATORS") >= 0) { //ACCELERATORS...
+        iBlockType = ACCELERATORS_BLOCK;
+      } else if (sLine === "BEGIN") { //BEGIN...
+        //IGNORE FOR SPEEDUP!
+      } else if (sLine === "END") { //END...
+        if (iBlockType === STRINGTABLE_BLOCK) { //If inside stringtable...
+          iBlockType = NO_BLOCK;
+        }
+      } else if (sLine.substring(0, 2) === "//") { //If comment line...
+        sLine = "";
+        //IGNORE FOR SPEEDUP!
+      } else if (sLine !== "") { //If NOT empty line...
+        //if (iBlockType === MENU_BLOCK || iBlockType === DIALOGEX_BLOCK) {
+        //  sLine = "";
+        //}
+      }
+      
+      var oMatch;
+      while (oMatch = reId.exec(sLine)) { //If ID...
+        var sId = oMatch[1];
+        if (sId in oIds) { //If the key is already used...
+          oIds[sId] = oIds[sId] + "\t" + iLine;
+        } else { //If the key is NOT already used...
+          oIds[sId] = iLine;
+        }
+      }
+    }
+    oTextFile.Close();
+  }
+  return oIds;
+}
+
+////
+// ...
+function GetIdsFromCppFiles(sFolderPath, oIds) {
+  var reId = /(AFX_ID[A-Z]?_\w+|ID[A-Z]?_\w+)/g;
+  if (oFSO.FolderExists(sFolderPath)) { //If the folder exists...
+    var oFolder = oFSO.GetFolder(sFolderPath);
+    for (var it = new Enumerator(oFolder.Files); !it.atEnd(); it.moveNext()) { //For all files...
+      var oFile = it.item();
+      var sExtension = oFSO.GetExtensionName(oFile.Name).toLowerCase();
+      if (sExtension === "cpp" || (sExtension == "h" && oFile.Name !== "resource.h")) { //If a CPP/H file...
+        var iLine = 0;
+        var oTextFile = oFSO.OpenTextFile(oFile.Path, ForReading);
+        while (!oTextFile.AtEndOfStream) { //For all lines...
+          var sLine = oTextFile.ReadLine().replace(/^\s+|\s+$/g, "");
+          iLine++;
+          var oMatch;
+          while (oMatch = reId.exec(sLine)) { //For all results...
+            var sId = oMatch[1];
+            if (sId in oIds) { //If the key is already used...
+              oIds[sId] = oIds[sId] + "\t" + oFile.Name + ":" + iLine;
+            } else { //If the key is NOT already used...
+              oIds[sId] = oFile.Name + ":" + iLine;
+            }
+          }
+        }
+        oTextFile.Close();
+      }
+    }
+    
+    for (var it = new Enumerator(oFolder.SubFolders); !it.atEnd(); it.moveNext()) { //For all folders...
+      var oSubFolder = it.item();
+      if (oSubFolder.Name !== ".svn" && oSubFolder.Name !== ".hg" && oSubFolder.Name !== ".git") { //If NOT a SVN folder...
+        oIds = GetIdsFromCppFiles(oSubFolder.Path, oIds);
+      }
+    }
+  }
+  return oIds;
+}
+
+////
+// ...
+function InfoBox(sText, iSecondsToWait) {
+  if (!bRunFromCmd) { //If run from command line...
+    var oShell = WScript.CreateObject("WScript.Shell");
+    return oShell.Popup(sText, iSecondsToWait, WScript.ScriptName, 64);
+  } else { //If NOT run from command line...
+    WScript.Echo(sText);
+  }
+}
+
diff --git a/Tools/Scripts/CheckUnusedResources.vbs b/Tools/Scripts/CheckUnusedResources.vbs
deleted file mode 100644
index 048257d7f74..00000000000
--- a/Tools/Scripts/CheckUnusedResources.vbs
+++ /dev/null
@@ -1,236 +0,0 @@
-Option Explicit
-''
-' This script creates a list of (hopefully) unused resource IDs.
-'
-' Copyright (C) 2008 by Tim Gerundt
-' Released under the "GNU General Public License"
-
-Const ForReading = 1
-
-Const NO_BLOCK = 0
-Const MENU_BLOCK = 1
-Const DIALOGEX_BLOCK = 2
-Const STRINGTABLE_BLOCK = 3
-Const VERSIONINFO_BLOCK = 4
-Const ACCELERATORS_BLOCK = 5
-
-Dim oFSO, bRunFromCmd
-
-Set oFSO = CreateObject("Scripting.FileSystemObject")
-
-bRunFromCmd = False
-If LCase(oFSO.GetFileName(Wscript.FullName)) = "cscript.exe" Then
-  bRunFromCmd = True
-End If
-
-Call Main
-
-''
-' ...
-Sub Main
-  Dim oHIds, oRcIds, oRc2Ids, oCppIds, sKey, oTxtFile
-  Dim StartTime, EndTime, Seconds
-  
-  StartTime = Time
-  
-  InfoBox "Creating list of unused resource IDs...", 3
-  
-  Set oHIds = GetIdsFromHeaderFile("..\..\Src\resource.h")
-  Set oRcIds = GetIdsFromResourceFile("..\..\Src\Merge.rc")
-  Set oRc2Ids = GetIdsFromResourceFile("..\..\Src\Merge2.rc")
-  
-  Set oCppIds = CreateObject("Scripting.Dictionary")
-  GetIdsFromCppFiles "..\..\Src\", oCppIds
-  GetIdsFromCppFiles "..\..\Externals\crystaledit\editlib\", oCppIds
-  
-  Set oTxtFile = oFSO.CreateTextFile("UnusedResources.txt", True)
-  
-  oTxtFile.WriteLine "----------------------------------------"
-  oTxtFile.WriteLine "ONLY IN RESOURCE.H FILE"
-  oTxtFile.WriteLine "----------------------------------------"
-  For Each sKey In oHIds.Keys 'For all header IDs...
-    If (oRcIds.Exists(sKey) = False) And (oRc2Ids.Exists(sKey) = False) And (oCppIds.Exists(sKey) = False) Then 'If header ID is NOT used...
-      oTxtFile.WriteLine sKey
-    End If
-  Next
-  
-  oTxtFile.WriteLine ""
-  oTxtFile.WriteLine "----------------------------------------"
-  oTxtFile.WriteLine "NOT USED IN *.CPP/*.H FILES"
-  oTxtFile.WriteLine "----------------------------------------"
-  For Each sKey In oRcIds.Keys 'For all RC IDs...
-    If (oCppIds.Exists(sKey) = False) Then 'If RC ID is NOT used...
-      oTxtFile.WriteLine sKey
-    End If
-  Next
-  For Each sKey In oRc2Ids.Keys 'For all RC2 IDs...
-    If (oCppIds.Exists(sKey) = False) Then 'If RC2 ID is NOT used...
-      oTxtFile.WriteLine sKey
-    End If
-  Next
-  
-  oTxtFile.Close
-  
-  EndTime = Time
-  Seconds = DateDiff("s", StartTime, EndTime)
-  
-  InfoBox "File ""UnusedResources.txt"" created, after " & Seconds & " second(s).", 10
-End Sub
-
-''
-' ...
-Function GetIdsFromHeaderFile(ByVal sHPath)
-  Dim oIds, oTextFile, sLine
-  Dim reDefineId, oMatch, sId, sResource
-  
-  Set oIds = CreateObject("Scripting.Dictionary")
-  
-  Set reDefineId = New RegExp
-  reDefineId.Pattern = "^#define (ID\w+)\s+(\d+)$"
-  reDefineId.IgnoreCase = False
-  
-  If (oFSO.FileExists(sHPath) = True) Then 'If the Header file exists...
-    Set oTextFile = oFSO.OpenTextFile(sHPath, ForReading)
-    Do Until oTextFile.AtEndOfStream = True 'For all lines...
-      sLine = Trim(oTextFile.ReadLine)
-      
-      sId = ""
-      sResource = ""
-      If reDefineId.Test(sLine) Then 'If ID...
-        Set oMatch = reDefineId.Execute(sLine)(0)
-        sId = oMatch.SubMatches(0)
-        sResource = oMatch.SubMatches(1)
-        
-        oIds.Add sId, sResource
-      End If
-    Loop
-    oTextFile.Close
-  End If
-  Set GetIdsFromHeaderFile = oIds
-End Function
-
-''
-' ...
-Function GetIdsFromResourceFile(ByVal sRcPath)
-  Dim oIds, oTextFile, sLine, iLine, iBlockType
-  Dim reId, oMatch, sId
-  
-  Set oIds = CreateObject("Scripting.Dictionary")
-  
-  Set reId = New RegExp
-  reId.Pattern = "(AFX_ID[A-Z]?_\w+|ID[A-Z]?_\w+)"
-  reId.IgnoreCase = False
-  
-  If (oFSO.FileExists(sRcPath) = True) Then 'If the RC file exists...
-    iLine = 0
-    iBlockType = NO_BLOCK
-    Set oTextFile = oFSO.OpenTextFile(sRcPath, ForReading)
-    Do Until oTextFile.AtEndOfStream = True 'For all lines...
-      sLine = Trim(oTextFile.ReadLine)
-      iLine = iLine + 1
-      
-      If (InStr(sLine, " MENU") > 0) Then 'MENU...
-        iBlockType = MENU_BLOCK
-      ElseIf (InStr(sLine, " DIALOGEX") > 0) Then 'DIALOGEX...
-        iBlockType = DIALOGEX_BLOCK
-      ElseIf (sLine = "STRINGTABLE") Then 'STRINGTABLE...
-        iBlockType = STRINGTABLE_BLOCK
-      ElseIf (InStr(sLine, " VERSIONINFO") > 0) Then 'VERSIONINFO...
-        iBlockType = VERSIONINFO_BLOCK
-      ElseIf (InStr(sLine, " ACCELERATORS") > 0) Then 'ACCELERATORS...
-        iBlockType = ACCELERATORS_BLOCK
-      ElseIf (sLine = "BEGIN") Then 'BEGIN...
-        'IGNORE FOR SPEEDUP!
-      ElseIf (sLine = "END") Then 'END...
-        If (iBlockType = STRINGTABLE_BLOCK) Then 'If inside stringtable...
-          iBlockType = NO_BLOCK
-        End If
-      ElseIf (Left(sLine, 2) = "//") Then 'If comment line...
-        sLine = ""
-        'IGNORE FOR SPEEDUP!
-      ElseIf (sLine <> "") Then 'If NOT empty line...
-        'If (iBlockType = MENU_BLOCK) Or (iBlockType = DIALOGEX_BLOCK) Then
-        '  sLine = ""
-        'End If
-      End If
-      
-      sId = ""
-      
-      If reId.Test(sLine) Then 'If ID...
-        Set oMatch = reId.Execute(sLine)(0)
-        sId = oMatch.SubMatches(0)
-        
-        If (oIds.Exists(sId) = True) Then 'If the key is already used...
-          oIds(sId) = oIds(sId) & vbTab & iLine
-        Else 'If the key is NOT already used...
-          oIds.Add sId, iLine
-        End If
-      End If
-    Loop
-    oTextFile.Close
-  End If
-  Set GetIdsFromResourceFile = oIds
-End Function
-
-''
-' ...
-Function GetIdsFromCppFiles(ByVal sFolderPath, ByRef oIds)
-  Dim oFolder, oFile, oSubFolder, sExtension
-  Dim oTextFile, sLine, iLine
-  Dim reId, oMatches, oMatch, sId
-  
-  Set reId = New RegExp
-  reId.Pattern = "(AFX_ID[A-Z]?_\w+|ID[A-Z]?_\w+)"
-  reId.IgnoreCase = False
-  reId.Global = True
-  
-  If (oFSO.FolderExists(sFolderPath) = True) Then 'If the folder exists...
-    Set oFolder = oFSO.GetFolder(sFolderPath)
-    
-    For Each oFile In oFolder.Files 'For all files...
-      sExtension = LCase(oFSO.GetExtensionName(oFile.Name))
-      If (sExtension = "cpp") Or (sExtension = "h") And (oFile.Name <> "resource.h") Then 'If a CPP/H file...
-        iLine = 0
-        Set oTextFile = oFSO.OpenTextFile(oFile.Path, ForReading)
-        Do Until oTextFile.AtEndOfStream = True 'For all lines...
-          sLine = Trim(oTextFile.ReadLine)
-          iLine = iLine + 1
-          
-          sId = ""
-          If reId.Test(sLine) Then 'If ID...
-            Set oMatches = reId.Execute(sLine)
-            For Each oMatch In oMatches 'For all results...
-              sId = oMatch.SubMatches(0)
-              
-              If (oIds.Exists(sId) = True) Then 'If the key is already used...
-                oIds(sId) = oIds(sId) & vbTab & oFile.Name & ":" & iLine
-              Else 'If the key is NOT already used...
-                oIds.Add sId, oFile.Name & ":" & iLine
-              End If
-            Next
-          End If
-        Loop
-        oTextFile.Close
-      End If
-    Next
-    
-    For Each oSubFolder In oFolder.SubFolders 'For all folders...
-      If (oSubFolder.Name <> ".svn") And (oSubFolder.Name <> ".hg") And (oSubFolder.Name <> ".git") Then 'If NOT a SVN folder...
-        GetIdsFromCppFiles oSubFolder.Path, oIds
-      End If
-    Next
-  End If
-End Function
-
-''
-' ...
-Function InfoBox(ByVal sText, ByVal iSecondsToWait)
-  Dim oShell
-  
-  If (bRunFromCmd = False) Then 'If run from command line...
-    Set oShell = Wscript.CreateObject("WScript.Shell")
-    InfoBox = oShell.Popup(sText, iSecondsToWait, Wscript.ScriptName, 64)
-  Else 'If NOT run from command line...
-    Wscript.Echo sText
-  End If
-End Function
diff --git a/Tools/Scripts/README.md b/Tools/Scripts/README.md
index 15524916b5e..7cd5519bead 100644
--- a/Tools/Scripts/README.md
+++ b/Tools/Scripts/README.md
@@ -1,12 +1,12 @@
 Some useful scripts:
 
 
-CheckMenuResources.vbs
+CheckMenuResources.js
 ----------------------
 Script that checking the menu resources for missing mnemonic chars and description texts.
 
 
-CheckUnusedResources.vbs
+CheckUnusedResources.js
 ------------------------
 Script for creating a list of (hopefully) unused resource IDs.
 
diff --git a/Tools/Scripts/UpdateTranslations.bat b/Tools/Scripts/UpdateTranslations.bat
index c993706cca1..47cf9c725d8 100644
--- a/Tools/Scripts/UpdateTranslations.bat
+++ b/Tools/Scripts/UpdateTranslations.bat
@@ -2,7 +2,7 @@
 rem This batch file calls the script to creates the master POT file.
 
 pushd "../../Translations/WinMerge/"
-cscript //nologo CreateMasterPotFile.vbs
+cscript //nologo CreateMasterPotFile.js
 echo.
 powershell -executionpolicy remotesigned -file UpdatePoFilesFromPotFile.ps1
 popd
diff --git a/Translations/ShellExtension/Arabic.po b/Translations/ShellExtension/Arabic.po
index 2ee91550b69..90b77c27846 100644
--- a/Translations/ShellExtension/Arabic.po
+++ b/Translations/ShellExtension/Arabic.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_ARA"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_ARABIC, SUBLANG_ARABIC_SAUDI_ARABIA"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Basque.po b/Translations/ShellExtension/Basque.po
index 4341b16c33c..633c8b25155 100644
--- a/Translations/ShellExtension/Basque.po
+++ b/Translations/ShellExtension/Basque.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_EUQ"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_BASQUE, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Brazilian.po b/Translations/ShellExtension/Brazilian.po
index 88042308319..d5f5fd92219 100644
--- a/Translations/ShellExtension/Brazilian.po
+++ b/Translations/ShellExtension/Brazilian.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_PTB"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_PORTUGUESE, SUBLANG_PORTUGUESE_BRAZILIAN"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Bulgarian.po b/Translations/ShellExtension/Bulgarian.po
index 5a20dcd50c8..caeb7e38c45 100644
--- a/Translations/ShellExtension/Bulgarian.po
+++ b/Translations/ShellExtension/Bulgarian.po
@@ -28,12 +28,6 @@ msgstr "AFX_TARG_BGR"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_BULGARIAN, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Catalan.po b/Translations/ShellExtension/Catalan.po
index ae2d48ba229..4ae617e5225 100644
--- a/Translations/ShellExtension/Catalan.po
+++ b/Translations/ShellExtension/Catalan.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_CAT"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_CATALAN, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/ChineseSimplified.po b/Translations/ShellExtension/ChineseSimplified.po
index ae0c42b8a9b..8085d960d80 100644
--- a/Translations/ShellExtension/ChineseSimplified.po
+++ b/Translations/ShellExtension/ChineseSimplified.po
@@ -30,12 +30,6 @@ msgstr "AFX_TARG_CHS"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/ChineseTraditional.po b/Translations/ShellExtension/ChineseTraditional.po
index c7c0fee1bc7..29b05272a1e 100644
--- a/Translations/ShellExtension/ChineseTraditional.po
+++ b/Translations/ShellExtension/ChineseTraditional.po
@@ -30,12 +30,6 @@ msgstr "AFX_TARG_CHT"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_CHINESE, SUBLANG_CHINESE_TRADITIONAL"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Corsican.po b/Translations/ShellExtension/Corsican.po
index 674b2ca6807..fceaaa25b30 100644
--- a/Translations/ShellExtension/Corsican.po
+++ b/Translations/ShellExtension/Corsican.po
@@ -36,12 +36,6 @@ msgstr "AFX_TARG_COS"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_CORSICAN, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/CreateMasterPotFile.js b/Translations/ShellExtension/CreateMasterPotFile.js
new file mode 100644
index 00000000000..1b85dd71f9d
--- /dev/null
+++ b/Translations/ShellExtension/CreateMasterPotFile.js
@@ -0,0 +1,254 @@
+////
+// This script creates the master POT file (English.pot) for the shell extension.
+//
+// Copyright (C) 2007-2009 by Tim Gerundt
+// Released under the "GNU General Public License"
+
+var ForReading = 1;
+
+var NO_BLOCK = 0;
+var STRINGTABLE_BLOCK = 1;
+
+var PATH_ENGLISH_POT = "English.pot";
+var PATH_SHELLEXTTEMPLATE_RC = "../../ShellExtension/ShellExtension/ShellExtension.rc";
+
+var oFSO = new ActiveXObject("Scripting.FileSystemObject");
+
+var bRunFromCmd = false;
+if (oFSO.GetFileName(WScript.FullName).toLowerCase() === "cscript.exe") {
+  bRunFromCmd = true;
+}
+
+Main();
+
+////
+// ...
+function Main() {
+  var StartTime = new Date().getTime();
+  
+  InfoBox("Creating POT file from ShellExtension.rc...", 3);
+  
+  var bNecessary = true;
+  if (oFSO.FileExists(PATH_ENGLISH_POT) && oFSO.FileExists(PATH_SHELLEXTTEMPLATE_RC)) { //If the POT and RC file exists...
+    bNecessary = GetArchiveBit(PATH_SHELLEXTTEMPLATE_RC) || GetArchiveBit(PATH_ENGLISH_POT); //RCs or POT file changed?
+  }
+  
+  if (bNecessary) { //If update necessary...
+    var oStrings = GetStringsFromRcFile(PATH_SHELLEXTTEMPLATE_RC);
+    CreateMasterPotFile(PATH_ENGLISH_POT, oStrings);
+    SetArchiveBit(PATH_SHELLEXTTEMPLATE_RC, false);
+    SetArchiveBit(PATH_ENGLISH_POT, false);
+    for (var it = new Enumerator(oFSO.GetFolder(".").Files); !it.atEnd(); it.moveNext()) { //For all files in the current folder...
+      var oFile = it.item();
+      if (oFSO.GetExtensionName(oFile.Name).toLowerCase() === "po") { //If a PO file...
+        SetArchiveBit(oFile.Path, true);
+      }
+    }
+    
+    var EndTime = new Date().getTime();
+    var Seconds = (EndTime - StartTime) / 1000.0;
+    
+    InfoBox("POT file created, after " + Seconds + " second(s).", 10);
+  } else { //If update NOT necessary...
+    InfoBox("POT file already up-to-date.", 10);
+  }
+}
+
+////
+// ...
+function GetStringsFromRcFile(sRcFilePath) {
+  var oStrings = {};
+  if (oFSO.FileExists(sRcFilePath)) { //If the RC file exists...
+    var sRcFileName = oFSO.GetFileName(sRcFilePath);
+    var iLine = 0;
+    var iBlockType = NO_BLOCK;
+    var oRcFile = oFSO.OpenTextFile(sRcFilePath, ForReading);
+    while (!oRcFile.AtEndOfStream) { //For all lines...
+      var sLine = oRcFile.ReadLine().replace(/^\s+|\s+$/g, "");
+      iLine++;
+      
+      var sReference = sRcFileName + ":" + iLine;
+      var sString = "";
+      var sComment = "";
+      var sContext = "";
+      
+      if (sLine === "STRINGTABLE") { //STRINGTABLE...
+        iBlockType = STRINGTABLE_BLOCK
+      } else if (sLine === "BEGIN") { //BEGIN...
+        //IGNORE FOR SPEEDUP!
+      } else if (sLine === "END") { //END...
+        if (iBlockType === STRINGTABLE_BLOCK) { //If inside stringtable...
+          iBlockType = NO_BLOCK;
+        }
+      } else if (sLine.substring(0, 2) === "//") { //If comment line...
+        sLine = "";
+        //IGNORE FOR SPEEDUP!
+      } else if (sLine !== "") { //If NOT empty line...
+        switch (iBlockType) {
+          case NO_BLOCK:
+            var oMatch0 = /defined\((AFX_TARG_\w*)\)/.exec(sLine);
+            var oMatch1 = /LANGUAGE (LANG_\w*, SUBLANG_\w*)/.exec(sLine);
+            if (oMatch0) { //AFX_TARG_*...
+              sString = oMatch0[1];
+              sComment = "AFX_TARG_*";
+            } else if (oMatch1) { //LANGUAGE...
+              sString = oMatch1[1];
+              sComment = "LANGUAGE, SUBLANGUAGE";
+            }
+            break;
+
+          case STRINGTABLE_BLOCK:
+            if (sLine.indexOf("\"") >= 0) { //If quote found (for speedup)...
+              //--------------------------------------------------------------------------------
+              // Replace 1st string literal only - 2nd string literal specifies control class!
+              //--------------------------------------------------------------------------------
+              var oMatch2 = /"((?:""|[^"])*)"/.exec(sLine);
+              if (oMatch2) { //String...
+                var sTemp = oMatch2[1];
+                if (sTemp !== "") { //If NOT empty...
+                  sString = sTemp.replace(/\"\"/g, "\\\"");
+                  var oMatch3 = /\/\/#\. (.*?)$/.exec(sLine);
+                  var oMatch4 = /\/\/msgctxt (.*?)$/.exec(sLine);
+                  if (oMatch3) { //If found a comment for the translators...
+                    sComment = oMatch3[1].replace(/^\s+|\s+$/g, "");
+                  } else if (oMatch4) { //If found a context for the translation...
+                    sContext = oMatch4[1].replace(/^\s+|\s+$/g, "");
+                    sComment = sContext
+                  }
+                }
+              }
+            }
+            break;
+        }
+      }
+      
+      if (sString !== "") {
+        var sKey = sContext + sString;
+        var oString = { "Comment": "", "References": "", "Context": "", "Id": "", "Str": "" };
+        if (sKey in oStrings) { //If the key is already used...
+          oString = oStrings[sKey];
+        }
+        if (sComment !== "") {
+          oString.Comment = sComment;
+        }
+        if (oString.References !== "") {
+          oString.References = oString.References + "\t" + sReference;
+        } else {
+          oString.References = sReference;
+        }
+        oString.Context = sContext;
+        oString.Id = sString;
+        oString.Str = "";
+        
+        if (sKey in oStrings) { //If the key is already used...
+          oStrings[sKey] = oString;
+        } else { //If the key is NOT already used...
+          oStrings[sContext + sString] = oString;
+        }
+      }
+    }
+    oRcFile.Close();
+  }
+  return oStrings;
+}
+
+////
+// ...
+function CreateMasterPotFile(sPotPath, oStrings) {
+  var oPotFile = oFSO.CreateTextFile(sPotPath, true);
+  
+  oPotFile.WriteLine("# This file is part from WinMerge <https://winmerge.org/>");
+  oPotFile.WriteLine("# Released under the \"GNU General Public License\"");
+  oPotFile.WriteLine("#");
+  oPotFile.WriteLine("msgid \"\"");
+  oPotFile.WriteLine("msgstr \"\"");
+  oPotFile.WriteLine("\"Project-Id-Version: WinMerge Shell Extension\\n\"");
+  oPotFile.WriteLine("\"Report-Msgid-Bugs-To: https://bugs.winmerge.org/\\n\"");
+  oPotFile.WriteLine("\"POT-Creation-Date: " + GetPotCreationDate() + "\\n\"");
+  oPotFile.WriteLine("\"PO-Revision-Date: \\n\"");
+  oPotFile.WriteLine("\"Last-Translator: \\n\"");
+  oPotFile.WriteLine("\"Language-Team: English <winmerge-translate@lists.sourceforge.net>\\n\"");
+  oPotFile.WriteLine("\"MIME-Version: 1.0\\n\"");
+  oPotFile.WriteLine("\"Content-Type: text/plain; charset=UTF-8\\n\"");
+  oPotFile.WriteLine("\"Content-Transfer-Encoding: 8bit\\n\"");
+  oPotFile.WriteLine("\"X-Poedit-Language: English\\n\"");
+  oPotFile.WriteLine("\"X-Poedit-SourceCharset: UTF-8\\n\"");
+  oPotFile.WriteLine("\"X-Poedit-Basepath: ../../ShellExtension/Languages/\\n\"");
+  //oPotFile.WriteLine("\"X-Generator: CreateMasterPotFile.js\\n\"");
+  oPotFile.WriteLine("");
+  for (var sKey in oStrings) { //For all strings...
+    var oString = oStrings[sKey];
+    if (oString.Comment !== "") { //If comment exists...
+      oPotFile.WriteLine("#. " + oString.Comment);
+    }
+    var aReferences = oString.References.split("\t");
+    for (var i = 0; i < aReferences.length; i++) { //For all references...
+      oPotFile.WriteLine("#: " + aReferences[i]);
+    }
+    oPotFile.WriteLine("#, c-format");
+    if (oString.Context !== "") { //If context exists...
+      oPotFile.WriteLine("msgctxt \"" + oString.Context + "\"");
+    }
+    oPotFile.WriteLine("msgid \"" + oString.Id + "\"");
+    oPotFile.WriteLine("msgstr \"\"");
+    oPotFile.WriteLine("");
+  }
+  oPotFile.Close();
+}
+
+////
+// ...
+function GetPotCreationDate() {
+  var oNow = new Date();
+  var sYear = oNow.getFullYear();
+  var sMonth = oNow.getMonth() + 1;
+  if (sMonth < 10) { sMonth = "0" + sMonth; }
+  var sDay = oNow.getDate();
+  if (sDay < 10) { sDay = "0" + sDay; }
+  var sHour = oNow.getHours();
+  if (sHour < 10) { sHour = "0" + sHour; }
+  var sMinute = oNow.getMinutes();
+  if (sMinute < 10) { sMinute = "0" + sMinute; }
+  
+  return sYear + "-" + sMonth + "-" + sDay + " " + sHour + ":" + sMinute + "+0000";
+}
+
+////
+// ...
+function InfoBox(sText, iSecondsToWait) {
+  if (!bRunFromCmd) { //If run from command line...
+    var oShell = WScript.CreateObject("WScript.Shell");
+    return oShell.Popup(sText, iSecondsToWait, WScript.ScriptName, 64);
+  } else { //If NOT run from command line...
+    WScript.Echo(sText);
+  }
+}
+
+////
+// ...
+function GetArchiveBit(sFilePath) {
+  if (oFSO.FileExists(sFilePath)) { //If the file exists...
+    var oFile = oFSO.GetFile(sFilePath);
+    if (oFile.Attributes & 32) { //If archive bit set...
+      return true;
+    }
+  }
+  return false;
+}
+
+////
+// ...
+function SetArchiveBit(sFilePath, bValue) {
+  if (oFSO.FileExists(sFilePath)) { //If the file exists...
+    var oFile = oFSO.GetFile(sFilePath);
+    if (oFile.Attributes & 32) { //If archive bit set...
+      if (!bValue) {
+        oFile.Attributes -= 32;
+      }
+    } else { //If archive bit NOT set...
+      if (bValue) {
+        oFile.Attributes += 32;
+      }
+    }
+  }
+}
diff --git a/Translations/ShellExtension/CreateMasterPotFile.vbs b/Translations/ShellExtension/CreateMasterPotFile.vbs
deleted file mode 100644
index 6a46926756a..00000000000
--- a/Translations/ShellExtension/CreateMasterPotFile.vbs
+++ /dev/null
@@ -1,308 +0,0 @@
-Option Explicit
-''
-' This script creates the master POT file (English.pot) for the shell extension.
-'
-' Copyright (C) 2007-2009 by Tim Gerundt
-' Released under the "GNU General Public License"
-
-Const ForReading = 1
-
-Const NO_BLOCK = 0
-Const STRINGTABLE_BLOCK = 1
-
-Const PATH_ENGLISH_POT = "English.pot"
-Const PATH_SHELLEXTTEMPLATE_RC = "../../ShellExtension/ShellExtension/ShellExtension.rc"
-
-Dim oFSO, bRunFromCmd
-
-Set oFSO = CreateObject("Scripting.FileSystemObject")
-
-bRunFromCmd = False
-If LCase(oFSO.GetFileName(Wscript.FullName)) = "cscript.exe" Then
-  bRunFromCmd = True
-End If
-
-Call Main
-
-''
-' ...
-Sub Main
-  Dim oStrings, sCodePage
-  Dim StartTime, EndTime, Seconds
-  Dim bNecessary, oFile
-  
-  StartTime = Time
-  
-  InfoBox "Creating POT file from ShellExtension.rc...", 3
-  
-  bNecessary = True
-  If (oFSO.FileExists(PATH_ENGLISH_POT) = True) And (oFSO.FileExists(PATH_SHELLEXTTEMPLATE_RC) = True) Then 'If the POT and RC file exists...
-    bNecessary = GetArchiveBit(PATH_SHELLEXTTEMPLATE_RC) Or GetArchiveBit(PATH_ENGLISH_POT) 'RCs or POT file changed?
-  End If
-  
-  If (bNecessary = True) Then 'If update necessary...
-    Set oStrings = GetStringsFromRcFile(PATH_SHELLEXTTEMPLATE_RC, sCodePage)
-    CreateMasterPotFile PATH_ENGLISH_POT, oStrings, sCodePage
-    SetArchiveBit PATH_SHELLEXTTEMPLATE_RC, False
-    SetArchiveBit PATH_ENGLISH_POT, False
-    For Each oFile In oFSO.GetFolder(".").Files 'For all files in the current folder...
-      If (LCase(oFSO.GetExtensionName(oFile.Name)) = "po") Then 'If a PO file...
-        SetArchiveBit oFile.Path, True
-      End If
-    Next
-    
-    EndTime = Time
-    Seconds = DateDiff("s", StartTime, EndTime)
-    
-    InfoBox "POT file created, after " & Seconds & " second(s).", 10
-  Else 'If update NOT necessary...
-    InfoBox "POT file already up-to-date.", 10
-  End If
-End Sub
-
-''
-' ...
-Class CString
-  Dim Comment, References, Context, Id, Str
-End Class
-
-''
-' ...
-Function GetStringsFromRcFile(ByVal sRcFilePath, ByRef sCodePage)
-  Dim oStrings, oString, oRcFile, sLine, iLine
-  Dim sRcFileName, iBlockType, sReference, sString, sComment, sContext, oMatch, sTemp, sKey
-  
-  Set oStrings = CreateObject("Scripting.Dictionary")
-  
-  If (oFSO.FileExists(sRcFilePath) = True) Then 'If the RC file exists...
-    sRcFileName = oFSO.GetFileName(sRcFilePath)
-    iLine = 0
-    iBlockType = NO_BLOCK
-    sCodePage = ""
-    Set oRcFile = oFSO.OpenTextFile(sRcFilePath, ForReading)
-    Do Until oRcFile.AtEndOfStream = True 'For all lines...
-      sLine = Trim(oRcFile.ReadLine)
-      iLine = iLine + 1
-      
-      sReference = sRcFileName & ":" & iLine
-      sString = ""
-      sComment = ""
-      sContext = ""
-      
-      If (sLine = "STRINGTABLE") Then 'STRINGTABLE...
-        iBlockType = STRINGTABLE_BLOCK
-      ElseIf (sLine = "BEGIN") Then 'BEGIN...
-        'IGNORE FOR SPEEDUP!
-      ElseIf (sLine = "END") Then 'END...
-        If (iBlockType = STRINGTABLE_BLOCK) Then 'If inside stringtable...
-          iBlockType = NO_BLOCK
-        End If
-      ElseIf (Left(sLine, 2) = "//") Then 'If comment line...
-        sLine = ""
-        'IGNORE FOR SPEEDUP!
-      ElseIf (sLine <> "") Then 'If NOT empty line...
-        Select Case iBlockType
-          Case NO_BLOCK:
-            If (FoundRegExpMatch(sLine, "defined\((AFX_TARG_\w*)\)", oMatch) = True) Then 'AFX_TARG_*...
-              sString = oMatch.SubMatches(0)
-              sComment = "AFX_TARG_*"
-            ElseIf (FoundRegExpMatch(sLine, "LANGUAGE (LANG_\w*, SUBLANG_\w*)", oMatch) = True) Then 'LANGUAGE...
-              sString = oMatch.SubMatches(0)
-              sComment = "LANGUAGE, SUBLANGUAGE"
-            ElseIf (FoundRegExpMatch(sLine, "code_page\(([\d]+)\)", oMatch) = True) Then 'code_page...
-              sString = oMatch.SubMatches(0)
-              sComment = "Codepage"
-              sCodePage = oMatch.SubMatches(0)
-            End If
-            
-          Case STRINGTABLE_BLOCK:
-            If (InStr(sLine, """") > 0) Then 'If quote found (for speedup)...
-              '--------------------------------------------------------------------------------
-              ' Replace 1st string literal only - 2nd string literal specifies control class!
-              '--------------------------------------------------------------------------------
-              If FoundRegExpMatch(sLine, """((?:""""|[^""])*)""", oMatch) Then 'String...
-                sTemp = oMatch.SubMatches(0)
-                If (sTemp <> "") Then 'If NOT empty...
-                  sString = Replace(sTemp, """""", "\""")
-                  If (FoundRegExpMatch(sLine, "//#\. (.*?)$", oMatch) = True) Then 'If found a comment for the translators...
-                    sComment = Trim(oMatch.SubMatches(0))
-                  ElseIf (FoundRegExpMatch(sLine, "//msgctxt (.*?)$", oMatch) = True) Then 'If found a context for the translation...
-                    sContext = Trim(oMatch.SubMatches(0))
-                    sComment = sContext
-                  End If
-                End If
-              End If
-            End If
-            
-        End Select
-      End If
-      
-      If (sString <> "") Then
-        sKey = sContext & sString
-        Set oString = New CString
-        If (oStrings.Exists(sKey) = True) Then 'If the key is already used...
-          Set oString = oStrings(sKey)
-        End If
-        If (sComment <> "") Then
-          oString.Comment = sComment
-        End If
-        If (oString.References <> "") Then
-          oString.References = oString.References & vbTab & sReference
-        Else
-          oString.References = sReference
-        End If
-        oString.Context = sContext
-        oString.Id = sString
-        oString.Str = ""
-        
-        If (oStrings.Exists(sKey) = True) Then 'If the key is already used...
-          Set oStrings(sKey) = oString
-        Else 'If the key is NOT already used...
-          oStrings.Add sContext & sString, oString
-        End If
-      End If
-    Loop
-    oRcFile.Close
-  End If
-  Set GetStringsFromRcFile = oStrings
-End Function
-
-''
-' ...
-Sub CreateMasterPotFile(ByVal sPotPath, ByVal oStrings, ByVal sCodePage)
-  Dim oPotFile, sKey, oString, aReferences, i
-  
-  Set oPotFile = oFSO.CreateTextFile(sPotPath, True)
-  
-  oPotFile.WriteLine "# This file is part from WinMerge <https://winmerge.org/>"
-  oPotFile.WriteLine "# Released under the ""GNU General Public License"""
-  oPotFile.WriteLine "#"
-  oPotFile.WriteLine "msgid """""
-  oPotFile.WriteLine "msgstr """""
-  oPotFile.WriteLine """Project-Id-Version: WinMerge Shell Extension\n"""
-  oPotFile.WriteLine """Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n"""
-  oPotFile.WriteLine """POT-Creation-Date: " & GetPotCreationDate() & "\n"""
-  oPotFile.WriteLine """PO-Revision-Date: \n"""
-  oPotFile.WriteLine """Last-Translator: \n"""
-  oPotFile.WriteLine """Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"""
-  oPotFile.WriteLine """MIME-Version: 1.0\n"""
-  oPotFile.WriteLine """Content-Type: text/plain; charset=CP" & sCodePage & "\n"""
-  oPotFile.WriteLine """Content-Transfer-Encoding: 8bit\n"""
-  oPotFile.WriteLine """X-Poedit-Language: English\n"""
-  oPotFile.WriteLine """X-Poedit-SourceCharset: CP" & sCodePage & "\n"""
-  oPotFile.WriteLine """X-Poedit-Basepath: ../../ShellExtension/Languages/\n"""
-  'oPotFile.WriteLine """X-Generator: CreateMasterPotFile.vbs\n"""
-  oPotFile.WriteLine
-  For Each sKey In oStrings.Keys 'For all strings...
-    Set oString = oStrings(sKey)
-    If (oString.Comment <> "") Then 'If comment exists...
-      oPotFile.WriteLine "#. " & oString.Comment
-    End If
-    aReferences = SplitByTab(oString.References)
-    For i = LBound(aReferences) To UBound(aReferences) 'For all references...
-      oPotFile.WriteLine "#: " & aReferences(i)
-    Next
-    oPotFile.WriteLine "#, c-format"
-    If (oString.Context <> "") Then 'If context exists...
-      oPotFile.WriteLine "msgctxt """ & oString.Context & """"
-    End If
-    oPotFile.WriteLine "msgid """ & oString.Id & """"
-    oPotFile.WriteLine "msgstr """""
-    oPotFile.WriteLine
-  Next
-  oPotFile.Close
-End Sub
-
-''
-' ...
-Function FoundRegExpMatch(ByVal sString, ByVal sPattern, ByRef oMatchReturn)
-  Dim oRegExp, oMatches
-  
-  Set oRegExp = New RegExp
-  oRegExp.Pattern = sPattern
-  oRegExp.IgnoreCase = True
-  
-  oMatchReturn = Null
-  FoundRegExpMatch = False
-  If (oRegExp.Test(sString) = True) Then
-    Set oMatches = oRegExp.Execute(sString)
-    Set oMatchReturn = oMatches(0)
-    FoundRegExpMatch = True
-  End If
-End Function
-
-''
-' ...
-Function SplitByTab(ByVal sString)
-  SplitByTab = Array()
-  If (InStr(sString, vbTab) > 0) Then
-    SplitByTab = Split(sString, vbTab, -1)
-  Else
-    SplitByTab = Array(sString)
-  End If
-End Function
-
-''
-' ...
-Function GetPotCreationDate()
-  Dim oNow, sYear, sMonth, sDay, sHour, sMinute
-  
-  oNow = Now()
-  sYear = Year(oNow)
-  sMonth = Month(oNow)
-  If (sMonth < 10) Then sMonth = "0" & sMonth
-  sDay = Day(oNow)
-  If (sDay < 10) Then sDay = "0" & sDay
-  sHour = Hour(oNow)
-  If (sHour < 10) Then sHour = "0" & sHour
-  sMinute = Minute(oNow)
-  If (sMinute < 10) Then sMinute = "0" & sMinute
-  
-  GetPotCreationDate = sYear & "-" & sMonth & "-" & sDay & " " & sHour & ":" & sMinute & "+0000"
-End Function
-
-''
-' ...
-Function InfoBox(ByVal sText, ByVal iSecondsToWait)
-  Dim oShell
-  
-  If (bRunFromCmd = False) Then 'If run from command line...
-    Set oShell = Wscript.CreateObject("WScript.Shell")
-    InfoBox = oShell.Popup(sText, iSecondsToWait, Wscript.ScriptName, 64)
-  Else 'If NOT run from command line...
-    Wscript.Echo sText
-  End If
-End Function
-
-''
-' ...
-Function GetArchiveBit(ByVal sFilePath)
-  Dim oFile
-  
-  GetArchiveBit = False
-  If (oFSO.FileExists(sFilePath) = True) Then 'If the file exists...
-    Set oFile = oFSO.GetFile(sFilePath)
-    If (oFile.Attributes AND 32) Then 'If archive bit set...
-      GetArchiveBit = True
-    End If
-  End If
-End Function
-
-''
-' ...
-Sub SetArchiveBit(ByVal sFilePath, ByVal bValue)
-  Dim oFile
-  
-  If (oFSO.FileExists(sFilePath) = True) Then 'If the file exists...
-    Set oFile = oFSO.GetFile(sFilePath)
-    If (oFile.Attributes AND 32) Then 'If archive bit set...
-      If (bValue = False) Then
-        oFile.Attributes = oFile.Attributes - 32
-      End If
-    Else 'If archive bit NOT set...
-      If (bValue = True) Then
-        oFile.Attributes = oFile.Attributes + 32
-      End If
-    End If
-  End If
-End Sub
diff --git a/Translations/ShellExtension/Croatian.po b/Translations/ShellExtension/Croatian.po
index 1d60fdcedab..d949acd12f4 100644
--- a/Translations/ShellExtension/Croatian.po
+++ b/Translations/ShellExtension/Croatian.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_HRV"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_CROATIAN, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Czech.po b/Translations/ShellExtension/Czech.po
index 2d832188e6c..8e70ca0ebc9 100644
--- a/Translations/ShellExtension/Czech.po
+++ b/Translations/ShellExtension/Czech.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_CSY"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_CZECH, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Danish.po b/Translations/ShellExtension/Danish.po
index 41b7e5d0e56..9861021e2bb 100644
--- a/Translations/ShellExtension/Danish.po
+++ b/Translations/ShellExtension/Danish.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_DAN"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_DANISH, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Dutch.po b/Translations/ShellExtension/Dutch.po
index 36c66ba004e..fb4825e5bfc 100644
--- a/Translations/ShellExtension/Dutch.po
+++ b/Translations/ShellExtension/Dutch.po
@@ -32,12 +32,6 @@ msgstr "AFX_TARG_NLB"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_DUTCH, SUBLANG_DUTCH"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "1252"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/English.pot b/Translations/ShellExtension/English.pot
index 0a08583dd6b..503538f3843 100644
--- a/Translations/ShellExtension/English.pot
+++ b/Translations/ShellExtension/English.pot
@@ -5,15 +5,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WinMerge Shell Extension\n"
 "Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2023-02-19 00:07+0000\n"
+"POT-Creation-Date: 2024-02-12 16:24+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CP1252\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Poedit-Language: English\n"
-"X-Poedit-SourceCharset: CP1252\n"
+"X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-Basepath: ../../ShellExtension/Languages/\n"
 
 #. AFX_TARG_*
@@ -28,12 +28,6 @@ msgstr ""
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr ""
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr ""
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Finnish.po b/Translations/ShellExtension/Finnish.po
index ff0620a95b3..2195c98398b 100644
--- a/Translations/ShellExtension/Finnish.po
+++ b/Translations/ShellExtension/Finnish.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_FIN"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_FINNISH, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/French.po b/Translations/ShellExtension/French.po
index 225ccb2470a..e8bcb21e1ce 100644
--- a/Translations/ShellExtension/French.po
+++ b/Translations/ShellExtension/French.po
@@ -36,12 +36,6 @@ msgstr "AFX_TARG_FRA"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_FRENCH, SUBLANG_FRENCH"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Galician.po b/Translations/ShellExtension/Galician.po
index 20d17e4ffb7..f101ff626ba 100644
--- a/Translations/ShellExtension/Galician.po
+++ b/Translations/ShellExtension/Galician.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_ESN"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_GALICIAN, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/German.po b/Translations/ShellExtension/German.po
index 6d4c442774c..0940552ac97 100644
--- a/Translations/ShellExtension/German.po
+++ b/Translations/ShellExtension/German.po
@@ -32,12 +32,6 @@ msgstr "AFX_TARG_DEU"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_GERMAN, SUBLANG_GERMAN"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Greek.po b/Translations/ShellExtension/Greek.po
index 48ac7b7f360..a7ed34551c3 100644
--- a/Translations/ShellExtension/Greek.po
+++ b/Translations/ShellExtension/Greek.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_ELL"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_GREEK, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Hungarian.po b/Translations/ShellExtension/Hungarian.po
index a1b6bb69e96..116e3060dd9 100644
--- a/Translations/ShellExtension/Hungarian.po
+++ b/Translations/ShellExtension/Hungarian.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_HUN"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_HUNGARIAN, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Italian.po b/Translations/ShellExtension/Italian.po
index 98ec1bbea60..245601d4c40 100644
--- a/Translations/ShellExtension/Italian.po
+++ b/Translations/ShellExtension/Italian.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_ITA"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_ITALIAN, SUBLANG_ITALIAN"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Japanese.po b/Translations/ShellExtension/Japanese.po
index 70b0ac21b7a..ab7f7eba0e1 100644
--- a/Translations/ShellExtension/Japanese.po
+++ b/Translations/ShellExtension/Japanese.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_JPN"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_JAPANESE, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Korean.po b/Translations/ShellExtension/Korean.po
index ad968df49fd..1c8c9f8fcf6 100644
--- a/Translations/ShellExtension/Korean.po
+++ b/Translations/ShellExtension/Korean.po
@@ -30,12 +30,6 @@ msgstr "AFX_TARG_KOR"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_KOREAN, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Lithuanian.po b/Translations/ShellExtension/Lithuanian.po
index 779c8ff49e2..85033c90dee 100644
--- a/Translations/ShellExtension/Lithuanian.po
+++ b/Translations/ShellExtension/Lithuanian.po
@@ -32,12 +32,6 @@ msgstr "AFX_TARG_LIT"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_LITHUANIAN, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Norwegian.po b/Translations/ShellExtension/Norwegian.po
index 8a6f5e32e0c..cd1623e32e6 100644
--- a/Translations/ShellExtension/Norwegian.po
+++ b/Translations/ShellExtension/Norwegian.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_NOR"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_NORWEGIAN, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Persian.po b/Translations/ShellExtension/Persian.po
index 95c36a3bd3e..02d6a751a12 100644
--- a/Translations/ShellExtension/Persian.po
+++ b/Translations/ShellExtension/Persian.po
@@ -32,12 +32,6 @@ msgstr "AFX_TARG_FAR"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_FARSI, SUBLANG_NEUTRAL"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Polish.po b/Translations/ShellExtension/Polish.po
index 0755da65d03..0253bcf7376 100644
--- a/Translations/ShellExtension/Polish.po
+++ b/Translations/ShellExtension/Polish.po
@@ -31,12 +31,6 @@ msgstr "AFX_TARG_PLK"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_POLISH, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Portuguese.po b/Translations/ShellExtension/Portuguese.po
index 070f0444131..9d42426ec95 100644
--- a/Translations/ShellExtension/Portuguese.po
+++ b/Translations/ShellExtension/Portuguese.po
@@ -33,12 +33,6 @@ msgstr "AFX_TARG_PTG"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_PORTUGUESE, SUBLANG_PORTUGUESE"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Romanian.po b/Translations/ShellExtension/Romanian.po
index 067efe93e05..8188ed4521e 100644
--- a/Translations/ShellExtension/Romanian.po
+++ b/Translations/ShellExtension/Romanian.po
@@ -32,12 +32,6 @@ msgstr "AFX_TARG_ROM"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_ROMANIAN, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Russian.po b/Translations/ShellExtension/Russian.po
index b62e0efc937..a2314fdeb7e 100644
--- a/Translations/ShellExtension/Russian.po
+++ b/Translations/ShellExtension/Russian.po
@@ -30,12 +30,6 @@ msgstr "AFX_TARG_RUS"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_RUSSIAN, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "1252"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Serbian.po b/Translations/ShellExtension/Serbian.po
index da7ea8a179c..deb3d4017e4 100644
--- a/Translations/ShellExtension/Serbian.po
+++ b/Translations/ShellExtension/Serbian.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_SER"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_SERBIAN, SUBLANG_SERBIAN_CYRILLIC"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Sinhala.po b/Translations/ShellExtension/Sinhala.po
index 50f8d3bedda..125fc1cefb3 100644
--- a/Translations/ShellExtension/Sinhala.po
+++ b/Translations/ShellExtension/Sinhala.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_LKA"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_SINHALESE, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Slovak.po b/Translations/ShellExtension/Slovak.po
index 1e0e00f7027..c18f2f205d0 100644
--- a/Translations/ShellExtension/Slovak.po
+++ b/Translations/ShellExtension/Slovak.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_SKY"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_SLOVAK, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Slovenian.po b/Translations/ShellExtension/Slovenian.po
index bb1c3d9f66a..e37d6e3a26e 100644
--- a/Translations/ShellExtension/Slovenian.po
+++ b/Translations/ShellExtension/Slovenian.po
@@ -33,12 +33,6 @@ msgstr "AFX_TARG_SLV"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_SLOVENIAN, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Spanish.po b/Translations/ShellExtension/Spanish.po
index fb0ffe7e85d..bfa53353cdf 100644
--- a/Translations/ShellExtension/Spanish.po
+++ b/Translations/ShellExtension/Spanish.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_ESN"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_SPANISH, SUBLANG_SPANISH_MODERN"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Swedish.po b/Translations/ShellExtension/Swedish.po
index 9ce761b5f0f..7cff5ce9c50 100644
--- a/Translations/ShellExtension/Swedish.po
+++ b/Translations/ShellExtension/Swedish.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_SVE"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_SWEDISH, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Tamil.po b/Translations/ShellExtension/Tamil.po
index 5c25bf38b92..3e2609ff18a 100644
--- a/Translations/ShellExtension/Tamil.po
+++ b/Translations/ShellExtension/Tamil.po
@@ -35,12 +35,6 @@ msgstr "AFX_TARG_TAM"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_TAMIL, SUBLANG_TAMIL"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Turkish.po b/Translations/ShellExtension/Turkish.po
index 91a8bc6de46..03bdae0ea02 100644
--- a/Translations/ShellExtension/Turkish.po
+++ b/Translations/ShellExtension/Turkish.po
@@ -32,12 +32,6 @@ msgstr "AFX_TARG_TRK"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_TURKISH, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/ShellExtension/Ukrainian.po b/Translations/ShellExtension/Ukrainian.po
index dedb59c3f29..5d4c527be08 100644
--- a/Translations/ShellExtension/Ukrainian.po
+++ b/Translations/ShellExtension/Ukrainian.po
@@ -29,12 +29,6 @@ msgstr "AFX_TARG_UKR"
 msgid "LANG_ENGLISH, SUBLANG_ENGLISH_US"
 msgstr "LANG_UKRAINIAN, SUBLANG_DEFAULT"
 
-#. Codepage
-#: ShellExtension.rc:21
-#, c-format
-msgid "1252"
-msgstr "65001"
-
 #: ShellExtension.rc:111
 #, c-format
 msgid "ShellExtension"
diff --git a/Translations/WinMerge/Arabic.po b/Translations/WinMerge/Arabic.po
index 51e2497757f..34fee8f6399 100644
--- a/Translations/WinMerge/Arabic.po
+++ b/Translations/WinMerge/Arabic.po
@@ -3763,8 +3763,8 @@ msgstr ""
 msgid "W&rap Text"
 msgstr ""
 
-msgid "Frhed is not installed."
-msgstr "المحرر Frhed غير مثبت."
+msgid "%1 is not installed."
+msgstr "المحرر %1 غير مثبت."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Basque.po b/Translations/WinMerge/Basque.po
index 2c1e5144af5..80f582d5421 100644
--- a/Translations/WinMerge/Basque.po
+++ b/Translations/WinMerge/Basque.po
@@ -4371,7 +4371,7 @@ msgstr ""
 msgid "W&rap Text"
 msgstr ""
 
-msgid "Frhed is not installed."
+msgid "%1 is not installed."
 msgstr ""
 
 #, c-format
diff --git a/Translations/WinMerge/Brazilian.po b/Translations/WinMerge/Brazilian.po
index d8ea5230c0b..747fb6dea10 100644
--- a/Translations/WinMerge/Brazilian.po
+++ b/Translations/WinMerge/Brazilian.po
@@ -3451,8 +3451,8 @@ msgstr "Página Web"
 msgid "W&rap Text"
 msgstr "O&rganizar Texto"
 
-msgid "Frhed is not installed."
-msgstr "O Frhed não está instalado."
+msgid "%1 is not installed."
+msgstr "O %1 não está instalado."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Bulgarian.po b/Translations/WinMerge/Bulgarian.po
index 246b5bb7d96..c51acf42c3c 100644
--- a/Translations/WinMerge/Bulgarian.po
+++ b/Translations/WinMerge/Bulgarian.po
@@ -3822,8 +3822,8 @@ msgstr "Страница от &интернет"
 msgid "W&rap Text"
 msgstr "П&ренасяне на текста"
 
-msgid "Frhed is not installed."
-msgstr "Frhed не е инсталиран."
+msgid "%1 is not installed."
+msgstr "%1 не е инсталиран."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Catalan.po b/Translations/WinMerge/Catalan.po
index 5dd9bc02492..89eaf865d93 100644
--- a/Translations/WinMerge/Catalan.po
+++ b/Translations/WinMerge/Catalan.po
@@ -4520,8 +4520,8 @@ msgstr ""
 msgid "W&rap Text"
 msgstr ""
 
-msgid "Frhed is not installed."
-msgstr "L'aplicació Frhed no està instal·lada."
+msgid "%1 is not installed."
+msgstr "L'aplicació %1 no està instal·lada."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/ChineseSimplified.po b/Translations/WinMerge/ChineseSimplified.po
index 38889b7acaa..21f4b413f93 100644
--- a/Translations/WinMerge/ChineseSimplified.po
+++ b/Translations/WinMerge/ChineseSimplified.po
@@ -3870,8 +3870,8 @@ msgstr "网页(&B)"
 msgid "W&rap Text"
 msgstr "自动换行(&R)"
 
-msgid "Frhed is not installed."
-msgstr "Frhed 未安装。"
+msgid "%1 is not installed."
+msgstr "%1 未安装。"
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/ChineseTraditional.po b/Translations/WinMerge/ChineseTraditional.po
index 42b30c3386c..385a1082cc3 100644
--- a/Translations/WinMerge/ChineseTraditional.po
+++ b/Translations/WinMerge/ChineseTraditional.po
@@ -4520,8 +4520,8 @@ msgstr "網頁(&B)"
 msgid "W&rap Text"
 msgstr "自動換行(&W)"
 
-msgid "Frhed is not installed."
-msgstr "Frhed 未安裝。"
+msgid "%1 is not installed."
+msgstr "Frhed %1。"
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Corsican.po b/Translations/WinMerge/Corsican.po
index 126615fb00e..23360adef75 100644
--- a/Translations/WinMerge/Corsican.po
+++ b/Translations/WinMerge/Corsican.po
@@ -3838,8 +3838,8 @@ msgstr "Pagina we&b"
 msgid "W&rap Text"
 msgstr "&Ritornu autumaticu à a linea"
 
-msgid "Frhed is not installed."
-msgstr "Frhed ùn hè micca installatu."
+msgid "%1 is not installed."
+msgstr "%1 ùn hè micca installatu."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/CreateMasterPotFile.js b/Translations/WinMerge/CreateMasterPotFile.js
new file mode 100644
index 00000000000..60841767fcf
--- /dev/null
+++ b/Translations/WinMerge/CreateMasterPotFile.js
@@ -0,0 +1,341 @@
+////
+// This script creates the master POT file (English.pot).
+//
+// Copyright (C) 2007-2009 by Tim Gerundt
+// Released under the "GNU General Public License"
+
+var ForReading = 1;
+
+var NO_BLOCK = 0;
+var MENU_BLOCK = 1;
+var DIALOGEX_BLOCK = 2;
+var STRINGTABLE_BLOCK = 3;
+var VERSIONINFO_BLOCK = 4;
+var ACCELERATORS_BLOCK = 5;
+
+var PATH_ENGLISH_POT = "English.pot";
+var PATH_MERGE_RC = "../../Src/Merge.rc";
+var PATH_PLUGIN_STRINGS_RC = "../../Plugins/Strings.rc";
+
+var oFSO = new ActiveXObject("Scripting.FileSystemObject");
+
+var bRunFromCmd = false;
+if (oFSO.GetFileName(WScript.FullName).toLowerCase() === "cscript.exe") {
+  bRunFromCmd = true;
+}
+var bInsertLineNumbers = false;
+if (WScript.Arguments.Named.Exists("InsertLineNumbers")) {
+  bInsertLineNumbers = CBool(WScript.Arguments.Named("InsertLineNumbers"));
+}
+
+Main();
+
+////
+// ...
+function Main() {
+  var StartTime = new Date().getTime();
+  
+  InfoBox("Creating POT file from Merge.rc...", 3);
+  
+  var bNecessary = true;
+  if (oFSO.FileExists(PATH_ENGLISH_POT)) { //If the POT file exists...
+    bNecessary = GetArchiveBit(PATH_MERGE_RC) || GetArchiveBit(PATH_ENGLISH_POT); //RCs or POT file changed?
+  }
+  
+  if (bNecessary) { //If update necessary...
+    var oStrings = MergeDictionaries(
+      GetStringsFromRcFile(PATH_MERGE_RC),
+      GetStringsFromRcFile(PATH_PLUGIN_STRINGS_RC));
+    CreateMasterPotFile(PATH_ENGLISH_POT, oStrings);
+    SetArchiveBit(PATH_MERGE_RC, false);
+    SetArchiveBit(PATH_PLUGIN_STRINGS_RC, false);
+    SetArchiveBit(PATH_ENGLISH_POT, false);
+    for (var it = new Enumerator(oFSO.GetFolder(".").Files); !it.atEnd(); it.moveNext()) { //For all files in the current folder...
+      var oFile = it.item();
+      if (oFSO.GetExtensionName(oFile.Name).toLowerCase() === "po") { //If a PO file...
+        SetArchiveBit(oFile.Path, true);
+      }
+    }
+    
+    var EndTime = new Date().getTime();
+    var Seconds = (EndTime - StartTime) / 1000.0;
+    
+    InfoBox("POT file created, after " + Seconds + " second(s).", 10);
+  } else { //If update NOT necessary...
+    InfoBox("POT file already up-to-date.", 10);
+  }
+}
+
+////
+// ...
+function MergeDictionaries(dict1, dict2) {
+  var mergedDict = {};
+  for (var key in dict1) {
+    mergedDict[key] = dict1[key];
+  }
+
+  for (var key in dict2) {
+    if (!(key in mergedDict)) {
+      mergedDict[key] = dict2[key];
+    }
+  }
+  return mergedDict;
+}
+
+////
+// ...
+function GetStringsFromRcFile(sRcFilePath) {
+  var fContinuation = false;
+  var oBlacklist = GetStringBlacklist("StringBlacklist.txt");
+  var oStrings = {};
+  if (oFSO.FileExists(sRcFilePath)) { //If the RC file exists...
+    var sRcFileName = oFSO.GetFileName(sRcFilePath);
+    var iLine = 0;
+    var iBlockType = NO_BLOCK;
+    var oRcFile = oFSO.OpenTextFile(sRcFilePath, ForReading);
+    while (!oRcFile.AtEndOfStream) { //For all lines...
+      var sLine = oRcFile.ReadLine().replace(/^\s+|\s+$/g, "");
+      iLine++;
+      
+      var sReference = sRcFileName + ":" + iLine;
+      var sString = "";
+      var sComment = "";
+      var sContext = "";
+      
+      if (fContinuation) {
+        // Nothing to do
+      } else if (sLine.indexOf(" MENU") >= 0 && sLine.indexOf("IDR_") >= 0) { //MENU...
+        iBlockType = MENU_BLOCK;
+      } else if (sLine.indexOf(" DIALOGEX") >= 0) { //DIALOGEX...
+        iBlockType = DIALOGEX_BLOCK;
+      } else if (sLine === "STRINGTABLE") { //STRINGTABLE...
+        iBlockType = STRINGTABLE_BLOCK;
+      } else if (sLine.indexOf(" VERSIONINFO") >= 0) { //VERSIONINFO...
+        iBlockType = VERSIONINFO_BLOCK;
+      } else if (sLine.indexOf(" ACCELERATORS") >= 0) { //ACCELERATORS...
+        iBlockType = ACCELERATORS_BLOCK;
+      } else if (sLine === "BEGIN") { //BEGIN...
+        //IGNORE FOR SPEEDUP!
+      } else if (sLine === "END") { //END...
+        if (iBlockType === STRINGTABLE_BLOCK) { //If inside stringtable...
+          iBlockType = NO_BLOCK;
+        }
+      } else if (sLine.substring(0, 2) === "//") { //If comment line...
+        sLine = "";
+        //IGNORE FOR SPEEDUP!
+      } else if (sLine !== "") { //If NOT empty line...
+        switch (iBlockType) {
+          case NO_BLOCK:
+            var oMatch0 = /LANGUAGE (LANG_\w*, SUBLANG_\w*)/.exec(sLine);
+            if (oMatch0) { //LANGUAGE...
+              sString = oMatch0[1];
+              sComment = "LANGUAGE, SUBLANGUAGE";
+            }
+            break;
+
+          case MENU_BLOCK:
+          case DIALOGEX_BLOCK:
+          case STRINGTABLE_BLOCK:
+            if (sLine.indexOf("\"") >= 0) { //If quote found (for speedup)...
+              //--------------------------------------------------------------------------------
+              // Replace 1st string literal only - 2nd string literal specifies control class!
+              //--------------------------------------------------------------------------------
+              var oMatch1 = /NC_\s*\("([^"]*)"\s*,\s*"([^"]*)"\s*\)/.exec(sLine);
+              var oMatch2 = /"((?:""|[^"])*)"/.exec(sLine);
+              var sTemp;
+              if (oMatch1) { //String...
+                sContext = oMatch1[1].replace(/^\s+|\s+$/g, "");
+                sTemp = oMatch1[2];
+              } else if (oMatch2) { //String...
+                sTemp = oMatch2[1];
+              } else {
+                sTemp = "";
+              }
+              if (sTemp !== "" && !(sTemp in oBlacklist)) { //If NOT blacklisted...
+                sString = sTemp.replace(/\"\"/g, "\\\"");
+                var oMatch3 = /\/\/#\. (.*?)$/.exec(sLine);
+                var oMatch4 = /\/\/msgctxt (.*?)$/.exec(sLine);
+                if (oMatch3) { //If found a comment for the translators...
+                  sComment = oMatch3[1].replace(/^\s+|\s+$/g, "");
+                } else if (oMatch4) { //If found a context for the translation...
+                  sContext = oMatch4[1].replace(/^\s+|\s+$/g, "");
+                  sComment = sContext;
+                }
+              }
+            }
+            break;
+
+          case VERSIONINFO_BLOCK:
+            var oMatch5 = /BLOCK "([0-9A-F]+)"/.exec(sLine);
+            var oMatch6 = /VALUE "Comments", "(.*?)\\?0?"/.exec(sLine);
+            var oMatch7 = /VALUE "Translation", (.*?)$/.exec(sLine);
+            if (oMatch5) { //StringFileInfo.Block...
+              sString = oMatch5[1];
+              sComment = "StringFileInfo.Block";
+            } else if (oMatch6) { //StringFileInfo.Comments...
+              sString = oMatch6[1];
+              sComment = "You should use a string like \"Translated by \" followed by the translator names for this string. It is ONLY VISIBLE in the StringFileInfo.Comments property from the final resource file!";
+            } else if (oMatch7) { //VarFileInfo.Translation...
+              sString = oMatch7[1];
+              sComment = "VarFileInfo.Translation";
+            }
+            break;
+        }
+      }
+      
+      if (sString !== "") {
+        var sKey = sContext + sString;
+        var oString = { "Comment": "", "References": "", "Context": "", "Id": "", "Str": "" };
+        if (sKey in oStrings) { //If the key is already used...
+          oString = oStrings[sKey];
+        }
+        if (sComment !== "") {
+          oString.Comment = sComment;
+        }
+        if (bInsertLineNumbers) {
+          if (oString.References !== "") {
+            oString.References = oString.References + "\t" + sReference;
+          } else {
+            oString.References = sReference;
+          }
+        }
+        oString.Context = sContext;
+        oString.Id = sString;
+        oString.Str = "";
+        
+        if (sKey in oStrings) { //If the key is already used...
+          oStrings[sKey] = oString;
+        } else { //If the key is NOT already used...
+          oStrings[sContext + sString] = oString;
+        }
+      }
+      fContinuation = (sLine !== "") && ",|".indexOf(sLine.substring(sLine.length - 1)) >= 0;
+    }
+    oRcFile.Close();
+  }
+  return oStrings;
+}
+
+////
+// ...
+function GetStringBlacklist(sTxtFilePath) {
+  var oBlacklist = {};
+  if (oFSO.FileExists(sTxtFilePath)) { //If the blacklist file exists...
+    var oTxtFile = oFSO.OpenTextFile(sTxtFilePath, ForReading);
+    while (!oTxtFile.AtEndOfStream) { //For all lines...
+      var sLine = oTxtFile.ReadLine().replace(/^\s+|\s+$/g, "");
+      if (sLine !== "") {
+        if (!(sLine in oBlacklist)) { //If the key is NOT already used...
+          oBlacklist[sLine] = true;
+        }
+      }
+    }
+    oTxtFile.Close();
+  }
+  return oBlacklist;
+}
+
+////
+// ...
+function CreateMasterPotFile(sPotPath, oStrings) {
+  var oPotFile = oFSO.CreateTextFile(sPotPath, true);
+  
+  oPotFile.Write("# This file is part from WinMerge <https://winmerge.org/>\n");
+  oPotFile.Write("# Released under the \"GNU General Public License\"\n");
+  oPotFile.Write("#\n");
+  oPotFile.Write("msgid \"\"\n");
+  oPotFile.Write("msgstr \"\"\n");
+  oPotFile.Write("\"Project-Id-Version: WinMerge\\n\"\n");
+  oPotFile.Write("\"Report-Msgid-Bugs-To: https://bugs.winmerge.org/\\n\"\n");
+  oPotFile.Write("\"POT-Creation-Date: " + GetPotCreationDate() + "\\n\"\n");
+  oPotFile.Write("\"PO-Revision-Date: \\n\"\n");
+  oPotFile.Write("\"Last-Translator: \\n\"\n");
+  oPotFile.Write("\"Language-Team: English <winmerge-translate@lists.sourceforge.net>\\n\"\n");
+  oPotFile.Write("\"MIME-Version: 1.0\\n\"\n");
+  oPotFile.Write("\"Content-Type: text/plain; charset=UTF-8\\n\"\n");
+  oPotFile.Write("\"Content-Transfer-Encoding: 8bit\\n\"\n");
+  oPotFile.Write("\"X-Poedit-Language: English\\n\"\n");
+  oPotFile.Write("\"X-Poedit-SourceCharset: UTF-8\\n\"\n");
+  oPotFile.Write("\"X-Poedit-Basepath: ../../Src/\\n\"\n");
+  //oPotFile.Write("\"X-Generator: CreateMasterPotFile.js\\n\"\n");
+  oPotFile.Write("\n");
+  for (var sKey in oStrings) { //For all strings...
+    var oString = oStrings[sKey];
+    if (oString.Comment !== "") { //If comment exists...
+      oPotFile.Write("#. " + oString.Comment + "\n");
+    }
+    if (bInsertLineNumbers) {
+      var aReferences = oString.References.split("\t");
+      for (var i = 0; i < aReferences.length; i++) { //For all references...
+        oPotFile.Write("#: " + aReferences[i] + "\n");
+      }
+    }
+    if (oString.Id.indexOf("%") >= 0) { //If c-format...
+      oPotFile.Write("#, c-format\n");
+    }
+    if (oString.Context !== "") { //If context exists...
+      oPotFile.Write("msgctxt \"" + oString.Context + "\"\n");
+    }
+    oPotFile.Write("msgid \"" + oString.Id + "\"\n");
+    oPotFile.Write("msgstr \"\"\n");
+    oPotFile.Write("\n");
+  }
+  oPotFile.Close();
+}
+
+////
+// ...
+function GetPotCreationDate() {
+  var oNow = new Date();
+  var sYear = oNow.getFullYear();
+  var sMonth = oNow.getMonth() + 1;
+  if (sMonth < 10) { sMonth = "0" + sMonth; }
+  var sDay = oNow.getDate();
+  if (sDay < 10) { sDay = "0" + sDay; }
+  var sHour = oNow.getHours();
+  if (sHour < 10) { sHour = "0" + sHour; }
+  var sMinute = oNow.getMinutes();
+  if (sMinute < 10) { sMinute = "0" + sMinute; }
+  
+  return sYear + "-" + sMonth + "-" + sDay + " " + sHour + ":" + sMinute + "+0000";
+}
+
+////
+// ...
+function InfoBox(sText, iSecondsToWait) {
+  if (!bRunFromCmd) { //If run from command line...
+    var oShell = WScript.CreateObject("WScript.Shell");
+    return oShell.Popup(sText, iSecondsToWait, WScript.ScriptName, 64);
+  } else { //If NOT run from command line...
+    WScript.Echo(sText);
+  }
+}
+
+////
+// ...
+function GetArchiveBit(sFilePath) {
+  if (oFSO.FileExists(sFilePath)) { //If the file exists...
+    var oFile = oFSO.GetFile(sFilePath);
+    if (oFile.Attributes & 32) { //If archive bit set...
+      return true;
+    }
+  }
+  return false;
+}
+
+////
+// ...
+function SetArchiveBit(sFilePath, bValue) {
+  if (oFSO.FileExists(sFilePath)) { //If the file exists...
+    var oFile = oFSO.GetFile(sFilePath);
+    if (oFile.Attributes & 32) { //If archive bit set...
+      if (!bValue) {
+        oFile.Attributes -= 32;
+      }
+    } else { //If archive bit NOT set...
+      if (bValue) {
+        oFile.Attributes += 32;
+      }
+    }
+  }
+}
diff --git a/Translations/WinMerge/CreateMasterPotFile.vbs b/Translations/WinMerge/CreateMasterPotFile.vbs
deleted file mode 100644
index 7840e2a0be3..00000000000
--- a/Translations/WinMerge/CreateMasterPotFile.vbs
+++ /dev/null
@@ -1,393 +0,0 @@
-Option Explicit
-''
-' This script creates the master POT file (English.pot).
-'
-' Copyright (C) 2007-2009 by Tim Gerundt
-' Released under the "GNU General Public License"
-
-Const ForReading = 1
-
-Const NO_BLOCK = 0
-Const MENU_BLOCK = 1
-Const DIALOGEX_BLOCK = 2
-Const STRINGTABLE_BLOCK = 3
-Const VERSIONINFO_BLOCK = 4
-Const ACCELERATORS_BLOCK = 5
-
-Const PATH_ENGLISH_POT = "English.pot"
-Const PATH_MERGE_RC = "../../Src/Merge.rc"
-Const PATH_PLUGIN_STRINGS_RC = "../../Plugins/Strings.rc"
-
-Dim oFSO, bRunFromCmd, bInsertLineNumbers
-
-Set oFSO = CreateObject("Scripting.FileSystemObject")
-
-bRunFromCmd = False
-If LCase(oFSO.GetFileName(Wscript.FullName)) = "cscript.exe" Then
-  bRunFromCmd = True
-End If
-bInsertLineNumbers = False
-If WScript.Arguments.Named.Exists("InsertLineNumbers") Then
-  bInsertLineNumbers = CBool(WScript.Arguments.Named("InsertLineNumbers"))
-End If
-
-Call Main
-
-''
-' ...
-Sub Main
-  Dim oStrings
-  Dim StartTime, EndTime, Seconds
-  Dim bNecessary, oFile
-  
-  StartTime = Time
-  
-  InfoBox "Creating POT file from Merge.rc...", 3
-  
-  bNecessary = True
-  If (oFSO.FileExists(PATH_ENGLISH_POT) = True) Then 'If the POT file exists...
-    bNecessary = GetArchiveBit(PATH_MERGE_RC) Or GetArchiveBit(PATH_ENGLISH_POT) 'RCs or POT file changed?
-  End If
-  
-  If (bNecessary = True) Then 'If update necessary...
-    Set oStrings = MergeDictionaries( _
-      GetStringsFromRcFile(PATH_MERGE_RC), _
-      GetStringsFromRcFile(PATH_PLUGIN_STRINGS_RC))
-    CreateMasterPotFile PATH_ENGLISH_POT, oStrings
-    SetArchiveBit PATH_MERGE_RC, False
-    SetArchiveBit PATH_PLUGIN_STRINGS_RC, False
-    SetArchiveBit PATH_ENGLISH_POT, False
-    For Each oFile In oFSO.GetFolder(".").Files 'For all files in the current folder...
-      If (LCase(oFSO.GetExtensionName(oFile.Name)) = "po") Then 'If a PO file...
-        SetArchiveBit oFile.Path, True
-      End If
-    Next
-    
-    EndTime = Time
-    Seconds = DateDiff("s", StartTime, EndTime)
-    
-    InfoBox "POT file created, after " & Seconds & " second(s).", 10
-  Else 'If update NOT necessary...
-    InfoBox "POT file already up-to-date.", 10
-  End If
-End Sub
-
-''
-' ...
-Class CString
-  Dim Comment, References, Context, Id, Str
-End Class
-
-
-''
-' ...
-Function MergeDictionaries(dict1, dict2)
-    Dim mergedDict
-    Set mergedDict = CreateObject("Scripting.Dictionary")
-    
-    Dim key
-    For Each key In dict1.Keys
-        mergedDict.Add key, dict1.Item(key)
-    Next
-    
-    For Each key In dict2.Keys
-        If Not mergedDict.Exists(key) Then
-            mergedDict.Add key, dict2.Item(key)
-        End If
-    Next
-    
-    Set MergeDictionaries = mergedDict
-End Function
-
-''
-' ...
-Function GetStringsFromRcFile(ByVal sRcFilePath)
-  Dim oBlacklist, oStrings, oString, oRcFile, sLine, iLine
-  Dim sRcFileName, iBlockType, sReference, sString, sComment, sContext, oMatch, sTemp, sKey
-  Dim fContinuation
-
-  Set oBlacklist = GetStringBlacklist("StringBlacklist.txt")
-  
-  Set oStrings = CreateObject("Scripting.Dictionary")
-  
-  If (oFSO.FileExists(sRcFilePath) = True) Then 'If the RC file exists...
-    sRcFileName = oFSO.GetFileName(sRcFilePath)
-    iLine = 0
-    iBlockType = NO_BLOCK
-    Set oRcFile = oFSO.OpenTextFile(sRcFilePath, ForReading)
-    Do Until oRcFile.AtEndOfStream = True 'For all lines...
-      sLine = Trim(oRcFile.ReadLine)
-      iLine = iLine + 1
-      
-      sReference = sRcFileName & ":" & iLine
-      sString = ""
-      sComment = ""
-      sContext = ""
-      
-      If fContinuation Then
-        ' Nothing to do
-      ElseIf (InStr(sLine, " MENU") > 0) And (InStr(sLine, "IDR_") > 0) Then 'MENU...
-        iBlockType = MENU_BLOCK
-      ElseIf (InStr(sLine, " DIALOGEX") > 0) Then 'DIALOGEX...
-        iBlockType = DIALOGEX_BLOCK
-      ElseIf (sLine = "STRINGTABLE") Then 'STRINGTABLE...
-        iBlockType = STRINGTABLE_BLOCK
-      ElseIf (InStr(sLine, " VERSIONINFO") > 0) Then 'VERSIONINFO...
-        iBlockType = VERSIONINFO_BLOCK
-      ElseIf (InStr(sLine, " ACCELERATORS") > 0) Then 'ACCELERATORS...
-        iBlockType = ACCELERATORS_BLOCK
-      ElseIf (sLine = "BEGIN") Then 'BEGIN...
-        'IGNORE FOR SPEEDUP!
-      ElseIf (sLine = "END") Then 'END...
-        If (iBlockType = STRINGTABLE_BLOCK) Then 'If inside stringtable...
-          iBlockType = NO_BLOCK
-        End If
-      ElseIf (Left(sLine, 2) = "//") Then 'If comment line...
-        sLine = ""
-        'IGNORE FOR SPEEDUP!
-      ElseIf (sLine <> "") Then 'If NOT empty line...
-        Select Case iBlockType
-          Case NO_BLOCK:
-            If (FoundRegExpMatch(sLine, "LANGUAGE (LANG_\w*, SUBLANG_\w*)", oMatch) = True) Then 'LANGUAGE...
-              sString = oMatch.SubMatches(0)
-              sComment = "LANGUAGE, SUBLANGUAGE"
-            End If
-            
-          Case MENU_BLOCK, DIALOGEX_BLOCK, STRINGTABLE_BLOCK:
-            If (InStr(sLine, """") > 0) Then 'If quote found (for speedup)...
-              '--------------------------------------------------------------------------------
-              ' Replace 1st string literal only - 2nd string literal specifies control class!
-              '--------------------------------------------------------------------------------
-              If FoundRegExpMatch(sLine, "NC_\s*\(""([^""]*)""\s*,\s*""([^""]*)""\s*\)", oMatch) Then 'String...
-                sContext = Trim(oMatch.SubMatches(0))
-                sTemp = oMatch.SubMatches(1)
-              ElseIf FoundRegExpMatch(sLine, """((?:""""|[^""])*)""", oMatch) Then 'String...
-                sTemp = oMatch.SubMatches(0)
-              Else
-                sTemp = ""
-              End If 
-              If (sTemp <> "") And (oBlacklist.Exists(sTemp) = False) Then 'If NOT blacklisted...
-                sString = Replace(sTemp, """""", "\""")
-                If (FoundRegExpMatch(sLine, "//#\. (.*?)$", oMatch) = True) Then 'If found a comment for the translators...
-                  sComment = Trim(oMatch.SubMatches(0))
-                ElseIf (FoundRegExpMatch(sLine, "//msgctxt (.*?)$", oMatch) = True) Then 'If found a context for the translation...
-                  sContext = Trim(oMatch.SubMatches(0))
-                  sComment = sContext
-                End If
-              End If
-            End If
-            
-          Case VERSIONINFO_BLOCK:
-            If (FoundRegExpMatch(sLine, "BLOCK ""([0-9A-F]+)""", oMatch) = True) Then 'StringFileInfo.Block...
-              sString = oMatch.SubMatches(0)
-              sComment = "StringFileInfo.Block"
-            ElseIf (FoundRegExpMatch(sLine, "VALUE ""Comments"", ""(.*?)\\?0?""", oMatch) = True) Then 'StringFileInfo.Comments...
-              sString = oMatch.SubMatches(0)
-              sComment = "You should use a string like ""Translated by "" followed by the translator names for this string. It is ONLY VISIBLE in the StringFileInfo.Comments property from the final resource file!"
-            ElseIf (FoundRegExpMatch(sLine, "VALUE ""Translation"", (.*?)$", oMatch) = True) Then 'VarFileInfo.Translation...
-              sString = oMatch.SubMatches(0)
-              sComment = "VarFileInfo.Translation"
-            End If
-            
-        End Select
-      End If
-      
-      If (sString <> "") Then
-        sKey = sContext & sString
-        Set oString = New CString
-        If (oStrings.Exists(sKey) = True) Then 'If the key is already used...
-          Set oString = oStrings(sKey)
-        End If
-        If (sComment <> "") Then
-          oString.Comment = sComment
-        End If
-        If bInsertLineNumbers Then
-          If (oString.References <> "") Then
-            oString.References = oString.References & vbTab & sReference
-          Else
-            oString.References = sReference
-          End If
-        End If
-        oString.Context = sContext
-        oString.Id = sString
-        oString.Str = ""
-        
-        If (oStrings.Exists(sKey) = True) Then 'If the key is already used...
-          Set oStrings(sKey) = oString
-        Else 'If the key is NOT already used...
-          oStrings.Add sContext & sString, oString
-        End If
-      End If
-      fContinuation = sLine <> "" And InStr(",|", Right(sLine, 1)) <> 0
-    Loop
-    oRcFile.Close
-  End If
-  Set GetStringsFromRcFile = oStrings
-End Function
-
-''
-' ...
-Function GetStringBlacklist(ByVal sTxtFilePath)
-  Dim oBlacklist, oTxtFile, sLine
-  
-  Set oBlacklist = CreateObject("Scripting.Dictionary")
-  
-  If (oFSO.FileExists(sTxtFilePath) = True) Then 'If the blacklist file exists...
-    Set oTxtFile = oFSO.OpenTextFile(sTxtFilePath, ForReading)
-    Do Until oTxtFile.AtEndOfStream = True 'For all lines...
-      sLine = Trim(oTxtFile.ReadLine)
-      
-      If (sLine <> "") Then
-        If (oBlacklist.Exists(sLine) = False) Then 'If the key is NOT already used...
-          oBlacklist.Add sLine, True
-        End If
-      End If
-    Loop
-    oTxtFile.Close
-  End If
-  Set GetStringBlacklist = oBlacklist
-End Function
-
-''
-' ...
-Sub CreateMasterPotFile(ByVal sPotPath, ByVal oStrings)
-  Dim oPotFile, sKey, oString, aReferences, i
-  
-  Set oPotFile = oFSO.CreateTextFile(sPotPath, True)
-  
-  oPotFile.Write "# This file is part from WinMerge <https://winmerge.org/>" & vbLf
-  oPotFile.Write "# Released under the ""GNU General Public License""" & vbLf
-  oPotFile.Write "#" & vbLf
-  oPotFile.Write "msgid """"" & vbLf
-  oPotFile.Write "msgstr """"" & vbLf
-  oPotFile.Write """Project-Id-Version: WinMerge\n""" & vbLf
-  oPotFile.Write """Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n""" & vbLf
-  oPotFile.Write """POT-Creation-Date: " & GetPotCreationDate() & "\n""" & vbLf
-  oPotFile.Write """PO-Revision-Date: \n""" & vbLf
-  oPotFile.Write """Last-Translator: \n""" & vbLf
-  oPotFile.Write """Language-Team: English <winmerge-translate@lists.sourceforge.net>\n""" & vbLf
-  oPotFile.Write """MIME-Version: 1.0\n""" & vbLf
-  oPotFile.Write """Content-Type: text/plain; charset=UTF-8\n""" & vbLf
-  oPotFile.Write """Content-Transfer-Encoding: 8bit\n""" & vbLf
-  oPotFile.Write """X-Poedit-Language: English\n""" & vbLf
-  oPotFile.Write """X-Poedit-SourceCharset: UTF-8\n""" & vbLf
-  oPotFile.Write """X-Poedit-Basepath: ../../Src/\n""" & vbLf
-  'oPotFile.Write """X-Generator: CreateMasterPotFile.vbs\n""" & vbLf
-  oPotFile.Write vbLf
-  For Each sKey In oStrings.Keys 'For all strings...
-    Set oString = oStrings(sKey)
-    If (oString.Comment <> "") Then 'If comment exists...
-      oPotFile.Write "#. " & oString.Comment & vbLf
-    End If
-    If bInsertLineNumbers Then
-      aReferences = SplitByTab(oString.References)
-      For i = LBound(aReferences) To UBound(aReferences) 'For all references...
-        oPotFile.Write "#: " & aReferences(i) & vbLf
-      Next
-    End If
-    If (InStr(oString.Id, "%") > 0) Then 'If c-format...
-      oPotFile.Write "#, c-format" & vbLf
-    End If
-    If (oString.Context <> "") Then 'If context exists...
-      oPotFile.Write "msgctxt """ & oString.Context & """" & vbLf
-    End If
-    oPotFile.Write "msgid """ & oString.Id & """" & vbLf
-    oPotFile.Write "msgstr """"" & vbLf
-    oPotFile.Write vbLf
-  Next
-  oPotFile.Close
-End Sub
-
-''
-' ...
-Function FoundRegExpMatch(ByVal sString, ByVal sPattern, ByRef oMatchReturn)
-  Dim oRegExp, oMatches
-  
-  Set oRegExp = New RegExp
-  oRegExp.Pattern = sPattern
-  oRegExp.IgnoreCase = True
-  
-  oMatchReturn = Null
-  FoundRegExpMatch = False
-  If (oRegExp.Test(sString) = True) Then
-    Set oMatches = oRegExp.Execute(sString)
-    Set oMatchReturn = oMatches(0)
-    FoundRegExpMatch = True
-  End If
-End Function
-
-''
-' ...
-Function SplitByTab(ByVal sString)
-  SplitByTab = Array()
-  If (InStr(sString, vbTab) > 0) Then
-    SplitByTab = Split(sString, vbTab, -1)
-  Else
-    SplitByTab = Array(sString)
-  End If
-End Function
-
-''
-' ...
-Function GetPotCreationDate()
-  Dim oNow, sYear, sMonth, sDay, sHour, sMinute
-  
-  oNow = Now()
-  sYear = Year(oNow)
-  sMonth = Month(oNow)
-  If (sMonth < 10) Then sMonth = "0" & sMonth
-  sDay = Day(oNow)
-  If (sDay < 10) Then sDay = "0" & sDay
-  sHour = Hour(oNow)
-  If (sHour < 10) Then sHour = "0" & sHour
-  sMinute = Minute(oNow)
-  If (sMinute < 10) Then sMinute = "0" & sMinute
-  
-  GetPotCreationDate = sYear & "-" & sMonth & "-" & sDay & " " & sHour & ":" & sMinute & "+0000"
-End Function
-
-''
-' ...
-Function InfoBox(ByVal sText, ByVal iSecondsToWait)
-  Dim oShell
-  
-  If (bRunFromCmd = False) Then 'If run from command line...
-    Set oShell = Wscript.CreateObject("WScript.Shell")
-    InfoBox = oShell.Popup(sText, iSecondsToWait, Wscript.ScriptName, 64)
-  Else 'If NOT run from command line...
-    Wscript.Echo sText
-  End If
-End Function
-
-''
-' ...
-Function GetArchiveBit(ByVal sFilePath)
-  Dim oFile
-  
-  GetArchiveBit = False
-  If (oFSO.FileExists(sFilePath) = True) Then 'If the file exists...
-    Set oFile = oFSO.GetFile(sFilePath)
-    If (oFile.Attributes AND 32) Then 'If archive bit set...
-      GetArchiveBit = True
-    End If
-  End If
-End Function
-
-''
-' ...
-Sub SetArchiveBit(ByVal sFilePath, ByVal bValue)
-  Dim oFile
-  
-  If (oFSO.FileExists(sFilePath) = True) Then 'If the file exists...
-    Set oFile = oFSO.GetFile(sFilePath)
-    If (oFile.Attributes AND 32) Then 'If archive bit set...
-      If (bValue = False) Then
-        oFile.Attributes = oFile.Attributes - 32
-      End If
-    Else 'If archive bit NOT set...
-      If (bValue = True) Then
-        oFile.Attributes = oFile.Attributes + 32
-      End If
-    End If
-  End If
-End Sub
diff --git a/Translations/WinMerge/Croatian.po b/Translations/WinMerge/Croatian.po
index 75e11fa40cb..488a7c81b63 100644
--- a/Translations/WinMerge/Croatian.po
+++ b/Translations/WinMerge/Croatian.po
@@ -4370,7 +4370,7 @@ msgstr ""
 msgid "W&rap Text"
 msgstr ""
 
-msgid "Frhed is not installed."
+msgid "%1 is not installed."
 msgstr ""
 
 #, c-format
diff --git a/Translations/WinMerge/Czech.po b/Translations/WinMerge/Czech.po
index 33d959714c6..e146df2316d 100644
--- a/Translations/WinMerge/Czech.po
+++ b/Translations/WinMerge/Czech.po
@@ -4303,7 +4303,7 @@ msgstr ""
 msgid "W&rap Text"
 msgstr ""
 
-msgid "Frhed is not installed."
+msgid "%1 is not installed."
 msgstr ""
 
 #, c-format
diff --git a/Translations/WinMerge/Danish.po b/Translations/WinMerge/Danish.po
index 5ec6e811342..0997438ebb2 100644
--- a/Translations/WinMerge/Danish.po
+++ b/Translations/WinMerge/Danish.po
@@ -4408,7 +4408,7 @@ msgstr ""
 msgid "W&rap Text"
 msgstr ""
 
-msgid "Frhed is not installed."
+msgid "%1 is not installed."
 msgstr ""
 
 #, c-format
diff --git a/Translations/WinMerge/Dutch.po b/Translations/WinMerge/Dutch.po
index e5df665be47..1b6d70731d5 100644
--- a/Translations/WinMerge/Dutch.po
+++ b/Translations/WinMerge/Dutch.po
@@ -3824,8 +3824,8 @@ msgstr "Webpagina"
 msgid "W&rap Text"
 msgstr "Tekstterugloop"
 
-msgid "Frhed is not installed."
-msgstr "Fhred is niet geïnstalleerd."
+msgid "%1 is not installed."
+msgstr "%1 is niet geïnstalleerd."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/English.pot b/Translations/WinMerge/English.pot
index e0b9aacd8db..434f4eb1cb8 100644
--- a/Translations/WinMerge/English.pot
+++ b/Translations/WinMerge/English.pot
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: WinMerge\n"
 "Report-Msgid-Bugs-To: https://bugs.winmerge.org/\n"
-"POT-Creation-Date: 2023-12-30 17:35+0000\n"
+"POT-Creation-Date: 2024-02-18 21:54+0000\n"
 "PO-Revision-Date: \n"
 "Last-Translator: \n"
 "Language-Team: English <winmerge-translate@lists.sourceforge.net>\n"
@@ -3445,7 +3445,8 @@ msgstr ""
 msgid "W&rap Text"
 msgstr ""
 
-msgid "Frhed is not installed."
+#, c-format
+msgid "%1 is not installed."
 msgstr ""
 
 #, c-format
diff --git a/Translations/WinMerge/Finnish.po b/Translations/WinMerge/Finnish.po
index 30a14424d0b..9ee415dcf6f 100644
--- a/Translations/WinMerge/Finnish.po
+++ b/Translations/WinMerge/Finnish.po
@@ -3856,8 +3856,8 @@ msgstr "Ver&kkosivu"
 msgid "W&rap Text"
 msgstr ""
 
-msgid "Frhed is not installed."
-msgstr "Frhed ei ole asennettu."
+msgid "%1 is not installed."
+msgstr "%1 ei ole asennettu."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/French.po b/Translations/WinMerge/French.po
index bb6c8b9e29c..941dfd8df2f 100644
--- a/Translations/WinMerge/French.po
+++ b/Translations/WinMerge/French.po
@@ -4550,8 +4550,8 @@ msgstr "Page &Web"
 msgid "W&rap Text"
 msgstr "Habillage de texte"
 
-msgid "Frhed is not installed."
-msgstr "Frhed n'est pas installé."
+msgid "%1 is not installed."
+msgstr "%1 n'est pas installé."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Galician.po b/Translations/WinMerge/Galician.po
index 4a2df9f9fe9..08d78b65a26 100644
--- a/Translations/WinMerge/Galician.po
+++ b/Translations/WinMerge/Galician.po
@@ -3828,8 +3828,8 @@ msgstr "Páxina We&b"
 msgid "W&rap Text"
 msgstr "Axusta&r texto"
 
-msgid "Frhed is not installed."
-msgstr "Non está instalado Frhed."
+msgid "%1 is not installed."
+msgstr "Non está instalado %1."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/German.po b/Translations/WinMerge/German.po
index 9f12f2f0d71..f999a030dbe 100644
--- a/Translations/WinMerge/German.po
+++ b/Translations/WinMerge/German.po
@@ -4166,8 +4166,8 @@ msgstr "We&bseite"
 msgid "W&rap Text"
 msgstr "Text umbrechen"
 
-msgid "Frhed is not installed."
-msgstr "Frhed ist nicht installiert."
+msgid "%1 is not installed."
+msgstr "%1 ist nicht installiert."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Greek.po b/Translations/WinMerge/Greek.po
index 0a8f4c0ab16..5b85aee5a6c 100644
--- a/Translations/WinMerge/Greek.po
+++ b/Translations/WinMerge/Greek.po
@@ -4348,7 +4348,7 @@ msgstr ""
 msgid "W&rap Text"
 msgstr ""
 
-msgid "Frhed is not installed."
+msgid "%1 is not installed."
 msgstr ""
 
 #, c-format
diff --git a/Translations/WinMerge/Hungarian.po b/Translations/WinMerge/Hungarian.po
index 4b13391b26b..be1ce72226a 100644
--- a/Translations/WinMerge/Hungarian.po
+++ b/Translations/WinMerge/Hungarian.po
@@ -4504,8 +4504,8 @@ msgstr "Weboldal"
 msgid "W&rap Text"
 msgstr "Szöveg tördelése"
 
-msgid "Frhed is not installed."
-msgstr "Az Frhed hexa szerkesztő nincs telepítve."
+msgid "%1 is not installed."
+msgstr "Az %1 hexa szerkesztő nincs telepítve."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Italian.po b/Translations/WinMerge/Italian.po
index feebc848c68..babd4081989 100644
--- a/Translations/WinMerge/Italian.po
+++ b/Translations/WinMerge/Italian.po
@@ -3802,8 +3802,8 @@ msgstr "Pagina we&b"
 msgid "W&rap Text"
 msgstr ""
 
-msgid "Frhed is not installed."
-msgstr "Frhed non è installato."
+msgid "%1 is not installed."
+msgstr "%1 non è installato."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Japanese.po b/Translations/WinMerge/Japanese.po
index f76a5cdf307..449be2fe820 100644
--- a/Translations/WinMerge/Japanese.po
+++ b/Translations/WinMerge/Japanese.po
@@ -3829,8 +3829,8 @@ msgstr "Webページ(&B)"
 msgid "W&rap Text"
 msgstr "折り返して全体を表示(&R)"
 
-msgid "Frhed is not installed."
-msgstr "Frhed がインストールされていません。"
+msgid "%1 is not installed."
+msgstr "%1 がインストールされていません。"
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Korean.po b/Translations/WinMerge/Korean.po
index 7f37080741e..0847387e952 100644
--- a/Translations/WinMerge/Korean.po
+++ b/Translations/WinMerge/Korean.po
@@ -4545,8 +4545,8 @@ msgstr "웹페이지(&B)"
 msgid "W&rap Text"
 msgstr "텍스트 줄 바꿈(&R)"
 
-msgid "Frhed is not installed."
-msgstr "Frhed가 설치되지 않았습니다."
+msgid "%1 is not installed."
+msgstr "%1가 설치되지 않았습니다."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Lithuanian.po b/Translations/WinMerge/Lithuanian.po
index 3c15e879f4a..415388afa7f 100644
--- a/Translations/WinMerge/Lithuanian.po
+++ b/Translations/WinMerge/Lithuanian.po
@@ -3451,8 +3451,8 @@ msgstr "Ti&nklapiai"
 msgid "W&rap Text"
 msgstr "S&kaidyti tekstą"
 
-msgid "Frhed is not installed."
-msgstr "„Frhed“ neįdiegtas."
+msgid "%1 is not installed."
+msgstr "„%1“ neįdiegtas."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Norwegian.po b/Translations/WinMerge/Norwegian.po
index 48280721bec..9db7ae450cd 100644
--- a/Translations/WinMerge/Norwegian.po
+++ b/Translations/WinMerge/Norwegian.po
@@ -3835,7 +3835,7 @@ msgstr ""
 msgid "W&rap Text"
 msgstr ""
 
-msgid "Frhed is not installed."
+msgid "%1 is not installed."
 msgstr ""
 
 #, c-format
diff --git a/Translations/WinMerge/Persian.po b/Translations/WinMerge/Persian.po
index 9d7aca24a62..aef71e8f24e 100644
--- a/Translations/WinMerge/Persian.po
+++ b/Translations/WinMerge/Persian.po
@@ -4417,7 +4417,7 @@ msgstr ""
 msgid "W&rap Text"
 msgstr ""
 
-msgid "Frhed is not installed."
+msgid "%1 is not installed."
 msgstr ""
 
 #, c-format
diff --git a/Translations/WinMerge/Polish.po b/Translations/WinMerge/Polish.po
index 6dba1f8722d..920ebaed457 100644
--- a/Translations/WinMerge/Polish.po
+++ b/Translations/WinMerge/Polish.po
@@ -3452,8 +3452,8 @@ msgstr "Strona internetowa"
 msgid "W&rap Text"
 msgstr "Zawijaj tekst"
 
-msgid "Frhed is not installed."
-msgstr "Free Hex Editor nie został zainstalowany."
+msgid "%1 is not installed."
+msgstr "%1 nie został zainstalowany."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Portuguese.po b/Translations/WinMerge/Portuguese.po
index e51619769ff..799e748004c 100644
--- a/Translations/WinMerge/Portuguese.po
+++ b/Translations/WinMerge/Portuguese.po
@@ -3836,8 +3836,8 @@ msgstr "&Página web"
 msgid "W&rap Text"
 msgstr "M&udança de linha"
 
-msgid "Frhed is not installed."
-msgstr "O Frhed não está instalado."
+msgid "%1 is not installed."
+msgstr "O %1 não está instalado."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Romanian.po b/Translations/WinMerge/Romanian.po
index c05ac0d7404..b94ef0fd879 100644
--- a/Translations/WinMerge/Romanian.po
+++ b/Translations/WinMerge/Romanian.po
@@ -3911,8 +3911,8 @@ msgstr "Pagină &web"
 msgid "W&rap Text"
 msgstr "Înfășoa&ră textul"
 
-msgid "Frhed is not installed."
-msgstr "Frhed nu este instalat."
+msgid "%1 is not installed."
+msgstr "%1 nu este instalat."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Russian.po b/Translations/WinMerge/Russian.po
index b89c4273d76..4384f528713 100644
--- a/Translations/WinMerge/Russian.po
+++ b/Translations/WinMerge/Russian.po
@@ -3453,8 +3453,8 @@ msgstr "Веб-страница"
 msgid "W&rap Text"
 msgstr "&Перенос строк"
 
-msgid "Frhed is not installed."
-msgstr "Frhed не установлен."
+msgid "%1 is not installed."
+msgstr "%1 не установлен."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Serbian.po b/Translations/WinMerge/Serbian.po
index bb8584e3cbe..a2a8afb8526 100644
--- a/Translations/WinMerge/Serbian.po
+++ b/Translations/WinMerge/Serbian.po
@@ -4342,7 +4342,7 @@ msgstr ""
 msgid "W&rap Text"
 msgstr ""
 
-msgid "Frhed is not installed."
+msgid "%1 is not installed."
 msgstr ""
 
 #, c-format
diff --git a/Translations/WinMerge/Sinhala.po b/Translations/WinMerge/Sinhala.po
index ae2d73f9888..7844def20ec 100644
--- a/Translations/WinMerge/Sinhala.po
+++ b/Translations/WinMerge/Sinhala.po
@@ -4371,7 +4371,7 @@ msgstr ""
 msgid "W&rap Text"
 msgstr ""
 
-msgid "Frhed is not installed."
+msgid "%1 is not installed."
 msgstr ""
 
 #, c-format
diff --git a/Translations/WinMerge/Slovak.po b/Translations/WinMerge/Slovak.po
index c191ace9aa5..a98e5bfdf62 100644
--- a/Translations/WinMerge/Slovak.po
+++ b/Translations/WinMerge/Slovak.po
@@ -3803,8 +3803,8 @@ msgstr ""
 msgid "W&rap Text"
 msgstr ""
 
-msgid "Frhed is not installed."
-msgstr "Frhed nie je nainštalovaný."
+msgid "%1 is not installed."
+msgstr "%1 nie je nainštalovaný."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Slovenian.po b/Translations/WinMerge/Slovenian.po
index 839323934a9..383a6582b0a 100644
--- a/Translations/WinMerge/Slovenian.po
+++ b/Translations/WinMerge/Slovenian.po
@@ -3826,8 +3826,8 @@ msgstr "&Spletna stran"
 msgid "W&rap Text"
 msgstr "Pre&lom besedila"
 
-msgid "Frhed is not installed."
-msgstr "Frhed ni nameščen."
+msgid "%1 is not installed."
+msgstr "%1 ni nameščen."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Spanish.po b/Translations/WinMerge/Spanish.po
index dc1b47c5c14..3363b176c8f 100644
--- a/Translations/WinMerge/Spanish.po
+++ b/Translations/WinMerge/Spanish.po
@@ -3830,8 +3830,8 @@ msgstr "Página We&b"
 msgid "W&rap Text"
 msgstr "Ajusta&r texto"
 
-msgid "Frhed is not installed."
-msgstr "No está instalado Frhed."
+msgid "%1 is not installed."
+msgstr "No está instalado %1."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Swedish.po b/Translations/WinMerge/Swedish.po
index b8bac13b5af..6630f691c58 100644
--- a/Translations/WinMerge/Swedish.po
+++ b/Translations/WinMerge/Swedish.po
@@ -3905,8 +3905,8 @@ msgstr "Websida"
 msgid "W&rap Text"
 msgstr ""
 
-msgid "Frhed is not installed."
-msgstr "Frhed är inte installerad."
+msgid "%1 is not installed."
+msgstr "%1 är inte installerad."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Tamil.po b/Translations/WinMerge/Tamil.po
index 9a46f0fb4f5..d4dcb21cdb1 100644
--- a/Translations/WinMerge/Tamil.po
+++ b/Translations/WinMerge/Tamil.po
@@ -3825,8 +3825,8 @@ msgstr "வலைப்பக்கம்"
 msgid "W&rap Text"
 msgstr ""
 
-msgid "Frhed is not installed."
-msgstr "Frhed நிறுவப்படவில்லை."
+msgid "%1 is not installed."
+msgstr "%1 நிறுவப்படவில்லை."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Turkish.po b/Translations/WinMerge/Turkish.po
index ca207298a97..f22b29c0eda 100644
--- a/Translations/WinMerge/Turkish.po
+++ b/Translations/WinMerge/Turkish.po
@@ -3450,8 +3450,8 @@ msgstr "İnternet &sayfası"
 msgid "W&rap Text"
 msgstr "&Metin kaydırılsın"
 
-msgid "Frhed is not installed."
-msgstr "Frhed kurulmamış."
+msgid "%1 is not installed."
+msgstr "%1 kurulmamış."
 
 #, c-format
 msgid "%1 does not exist. Do you want to create it?"
diff --git a/Translations/WinMerge/Ukrainian.po b/Translations/WinMerge/Ukrainian.po
index ecc0c639fb3..06f3da8992e 100644
--- a/Translations/WinMerge/Ukrainian.po
+++ b/Translations/WinMerge/Ukrainian.po
@@ -4357,7 +4357,7 @@ msgstr ""
 msgid "W&rap Text"
 msgstr ""
 
-msgid "Frhed is not installed."
+msgid "%1 is not installed."
 msgstr ""
 
 #, c-format
diff --git a/Translations/WinMerge/UpdatePoFilesFromPotFile.vbs b/Translations/WinMerge/UpdatePoFilesFromPotFile.js
similarity index 100%
rename from Translations/WinMerge/UpdatePoFilesFromPotFile.vbs
rename to Translations/WinMerge/UpdatePoFilesFromPotFile.js
diff --git a/WinMerge.vs2017.sln b/WinMerge.vs2017.sln
index bb6b3ca7134..56ceb72ddc4 100644
--- a/WinMerge.vs2017.sln
+++ b/WinMerge.vs2017.sln
@@ -37,9 +37,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Batch Files", "Batch Files"
 		UploadToVirusTotal.cmd = UploadToVirusTotal.cmd
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VBS Scripts", "VBS Scripts", "{8B625EC8-5063-4336-84F9-AA7FD5348525}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{8B625EC8-5063-4336-84F9-AA7FD5348525}"
 	ProjectSection(SolutionItems) = preProject
-		ExpandEnvironmenStrings.vbs = ExpandEnvironmenStrings.vbs
+		ExpandEnvironmenStrings.js = ExpandEnvironmenStrings.js
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GUITests", "Testing\GoogleTest\GUITests\GUITests.vcxproj", "{0A3727B1-51E7-4702-AD0C-8AEE317EA510}"
diff --git a/WinMerge.vs2019.sln b/WinMerge.vs2019.sln
index f90ee061cb6..33e49f5e67a 100644
--- a/WinMerge.vs2019.sln
+++ b/WinMerge.vs2019.sln
@@ -37,9 +37,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Batch Files", "Batch Files"
 		UploadToVirusTotal.cmd = UploadToVirusTotal.cmd
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VBS Scripts", "VBS Scripts", "{8B625EC8-5063-4336-84F9-AA7FD5348525}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{8B625EC8-5063-4336-84F9-AA7FD5348525}"
 	ProjectSection(SolutionItems) = preProject
-		ExpandEnvironmenStrings.vbs = ExpandEnvironmenStrings.vbs
+		ExpandEnvironmenStrings.js = ExpandEnvironmenStrings.js
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GUITests", "Testing\GoogleTest\GUITests\GUITests.vcxproj", "{0A3727B1-51E7-4702-AD0C-8AEE317EA510}"
diff --git a/WinMerge.vs2022.sln b/WinMerge.vs2022.sln
index 267b414bc92..408153712e7 100644
--- a/WinMerge.vs2022.sln
+++ b/WinMerge.vs2022.sln
@@ -37,9 +37,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Batch Files", "Batch Files"
 		UploadToVirusTotal.cmd = UploadToVirusTotal.cmd
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VBS Scripts", "VBS Scripts", "{8B625EC8-5063-4336-84F9-AA7FD5348525}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{8B625EC8-5063-4336-84F9-AA7FD5348525}"
 	ProjectSection(SolutionItems) = preProject
-		ExpandEnvironmenStrings.vbs = ExpandEnvironmenStrings.vbs
+		ExpandEnvironmenStrings.js = ExpandEnvironmenStrings.js
 	EndProjectSection
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GUITests", "Testing\GoogleTest\GUITests\GUITests.vcxproj", "{0A3727B1-51E7-4702-AD0C-8AEE317EA510}"