4 files changed, 26 insertions, 10 deletions
diff --git a/src/Signing/sign.bat b/src/Signing/sign.bat
index 1165be22..7205849d 100644
--- a/src/Signing/sign.bat
+++ b/src/Signing/sign.bat
@@ -1,58 +1,74 @@
-PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip
+PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip;C:\Program Files (x86)\Windows Kits\10\bin\10.0.19041.0\x86
 
-set VC_VERSION=1.26.4
-set VC_VERSION_NBRE=1.26.4
+set VC_VERSION=1.26.15
+set VC_VERSION_NBRE=1.26.15
 set SIGNINGPATH=%~dp0
 cd %SIGNINGPATH%
 
 call "..\..\doc\chm\create_chm.bat"
 
 cd %SIGNINGPATH%
 
 rem sign using SHA-256
 signtool sign /v /sha1 88c1ff4b7469ea3915bd8e7635a7567d34f43202 /ac GlobalSign_SHA256_EV_CodeSigning_CA.cer /fd sha256 /tr http://timestamp.digicert.com /td SHA256 "..\Release\Setup Files\VeraCrypt.exe" "..\Release\Setup Files\VeraCrypt Format.exe" "..\Release\Setup Files\VeraCryptExpander.exe" "..\Release\Setup Files\VeraCrypt-x64.exe" "..\Release\Setup Files\VeraCrypt Format-x64.exe" "..\Release\Setup Files\VeraCryptExpander-x64.exe" "..\Release\Setup Files\VeraCrypt-arm64.exe" "..\Release\Setup Files\VeraCrypt Format-arm64.exe" "..\Release\Setup Files\VeraCryptExpander-arm64.exe" "..\Release\Setup Files\VeraCryptSetup.dll" 
 
 rem create setup and MSI
 cd "..\Release\Setup Files\"
 copy ..\..\LICENSE .
 copy ..\..\License.txt .
 copy ..\..\NOTICE .
 copy ..\..\Resources\Texts\License.rtf .
 copy ..\..\Common\VeraCrypt.ico .
 copy ..\..\Setup\VeraCrypt_setup_background.bmp .
 copy ..\..\Setup\VeraCrypt_setup.bmp .
 copy ..\..\Setup\Setup.ico .
 del *.xml
 rmdir /S /Q Languages
 mkdir Languages
-copy /V /Y ..\..\..\Translations\*.xml Languages\.
+
+@echo off
+setlocal
+
+rem Define the source and target directories
+set "SOURCE_DIR=..\..\..\Translations"
+set "TARGET_DIR=Languages"
+
+rem Copy files matching Language.xx.xml where xx is any two characters
+copy /V /Y "%SOURCE_DIR%\Language.??.xml" "%TARGET_DIR%\."
+
+rem Copy files matching Language.xx-yy.xml where xx and yy are any two characters
+copy /V /Y "%SOURCE_DIR%\Language.??-??.xml" "%TARGET_DIR%\."
+
+endlocal
+@echo on
+
 del Languages.zip
 7z a -y Languages.zip Languages
 rmdir /S /Q docs
 mkdir docs\html\en
 mkdir docs\EFI-DCS
 xcopy /E /V /Y ..\..\..\doc\html\* docs\html\en\.
 copy "..\..\..\doc\chm\VeraCrypt User Guide.chm" docs\.
 copy "..\..\..\doc\EFI-DCS\*.pdf" docs\EFI-DCS\.
 del docs.zip
 7z a -y docs.zip docs
 "VeraCrypt Setup.exe" /p
 "VeraCrypt Portable.exe" /p
 VeraCryptCOMRegBase.exe /p
 
 cd %SIGNINGPATH%
 signtool sign /v /sha1 88c1ff4b7469ea3915bd8e7635a7567d34f43202 /ac GlobalSign_SHA256_EV_CodeSigning_CA.cer /fd sha256 /tr http://timestamp.digicert.com /td SHA256 "..\Release\Setup Files\VeraCrypt COMReg.exe"
 
 cd "..\Release\Setup Files\"
 call build_msi_x64.bat %VC_VERSION_NBRE%
 del LICENSE
 del License.txt
 del NOTICE
 del License.rtf
 del VeraCrypt.ico
 del VeraCrypt_setup_background.bmp
 del VeraCrypt_setup.bmp
 del Setup.ico
 del "VeraCrypt User Guide.chm"
 del Languages.zip
 del docs.zip
diff --git a/src/Signing/sign_TESTSIGNING.bat b/src/Signing/sign_TESTSIGNING.bat
index 858fa442..ac8d8390 100644
--- a/src/Signing/sign_TESTSIGNING.bat
+++ b/src/Signing/sign_TESTSIGNING.bat
@@ -1,34 +1,34 @@
 PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip
 
-set VC_VERSION=1.26-TESTSIGNING
-set VC_VERSION_NBRE=1.26.0
+set VC_VERSION=1.26.15
+set VC_VERSION_NBRE=1.26.15
 set SIGNINGPATH=%~dp0
 cd %SIGNINGPATH%
 
 rem sign using SHA-256
 signtool sign /v /sha1 88c1ff4b7469ea3915bd8e7635a7567d34f43202 /ac GlobalSign_SHA256_EV_CodeSigning_CA.cer /fd sha256 /tr http://timestamp.digicert.com /td SHA256 "..\Release\Setup Files\veracrypt.sys" "..\Release\Setup Files\veracrypt-x64.sys"
 
 signtool sign /v /sha1 88c1ff4b7469ea3915bd8e7635a7567d34f43202 /ac GlobalSign_SHA256_EV_CodeSigning_CA.cer /fd sha256 /tr http://timestamp.digicert.com /td SHA256 "..\Release\Setup Files\VeraCrypt.exe" "..\Release\Setup Files\VeraCrypt Format.exe" "..\Release\Setup Files\VeraCryptExpander.exe" "..\Release\Setup Files\VeraCrypt-x64.exe" "..\Release\Setup Files\VeraCrypt Format-x64.exe" "..\Release\Setup Files\VeraCryptExpander-x64.exe" "..\Release\Setup Files\VeraCrypt-arm64.exe" "..\Release\Setup Files\VeraCrypt Format-arm64.exe" "..\Release\Setup Files\VeraCryptExpander-arm64.exe" "..\Release\Setup Files\VeraCrypt COMReg.exe" "..\Release\Setup Files\VeraCryptSetup.dll"
 
 rem create setup and MSI
 cd "..\Release\Setup Files\"
 copy ..\..\LICENSE .
 copy ..\..\License.txt .
 copy ..\..\NOTICE .
 copy ..\..\Resources\Texts\License.rtf .
 copy ..\..\Common\VeraCrypt.ico .
 copy ..\..\Setup\VeraCrypt_setup_background.bmp .
 copy ..\..\Setup\VeraCrypt_setup.bmp .
 copy ..\..\Setup\Setup.ico .
 del *.xml
 rmdir /S /Q Languages
 mkdir Languages
 copy /V /Y ..\..\..\Translations\*.xml Languages\.
 del Languages.zip
 7z a -y Languages.zip Languages
 rmdir /S /Q docs
 mkdir docs\html\en
 mkdir docs\EFI-DCS
 copy /V /Y ..\..\..\doc\html\* docs\html\en\.
 copy "..\..\..\doc\chm\VeraCrypt User Guide.chm" docs\.
 copy "..\..\..\doc\EFI-DCS\*.pdf" docs\EFI-DCS\.
diff --git a/src/Signing/sign_test.bat b/src/Signing/sign_test.bat
index 8fbc2fa6..c3e89a9f 100644
--- a/src/Signing/sign_test.bat
+++ b/src/Signing/sign_test.bat
@@ -1,33 +1,33 @@
 PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip
-set VC_VERSION=1.26.4
-set VC_VERSION_NBRE=1.26.4
+set VC_VERSION=1.26.15
+set VC_VERSION_NBRE=1.26.15
 set PFXNAME=TestCertificate\idrix_codeSign.pfx
 set PFXPASSWORD=idrix
 set PFXCA=TestCertificate\idrix_TestRootCA.crt
 set SHA256PFXNAME=TestCertificate\idrix_Sha256CodeSign.pfx
 set SHA256PFXPASSWORD=idrix
 set SHA256PFXCA=TestCertificate\idrix_SHA256TestRootCA.crt
 
 set SIGNINGPATH=%~dp0
 cd %SIGNINGPATH%
 
 call "..\..\doc\chm\create_chm.bat"
 
 cd %SIGNINGPATH%
 
 rem sign using SHA-1
 signtool sign /v /a /f %PFXNAME% /p %PFXPASSWORD% /ac %PFXCA% /fd sha1 /t http://timestamp.digicert.com "..\Release\Setup Files\veracrypt.sys" "..\Release\Setup Files\veracrypt-x64.sys" "..\Release\Setup Files\VeraCrypt.exe" "..\Release\Setup Files\VeraCrypt Format.exe" "..\Release\Setup Files\VeraCryptExpander.exe" "..\Release\Setup Files\VeraCrypt-x64.exe" "..\Release\Setup Files\VeraCrypt Format-x64.exe" "..\Release\Setup Files\VeraCryptExpander-x64.exe" "..\Release\Setup Files\VeraCrypt COMReg.exe"
 
 timeout /t 10
 
 rem sign using SHA-256
 signtool sign /v /a /f %SHA256PFXNAME% /p %SHA256PFXPASSWORD% /ac %SHA256PFXCA% /as /fd sha256 /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "..\Release\Setup Files\veracrypt.sys" "..\Release\Setup Files\veracrypt-x64.sys" "..\Release\Setup Files\veracrypt-arm64.sys" "..\Release\Setup Files\VeraCrypt.exe" "..\Release\Setup Files\VeraCrypt Format.exe" "..\Release\Setup Files\VeraCryptExpander.exe" "..\Release\Setup Files\VeraCrypt-x64.exe" "..\Release\Setup Files\VeraCrypt Format-x64.exe" "..\Release\Setup Files\VeraCryptExpander-x64.exe" "..\Release\Setup Files\VeraCrypt-arm64.exe" "..\Release\Setup Files\VeraCrypt Format-arm64.exe" "..\Release\Setup Files\VeraCryptExpander-arm64.exe" "..\Release\Setup Files\VeraCrypt COMReg.exe"
 
 rem create setup and MSI
 cd "..\Release\Setup Files\"
 copy ..\..\LICENSE .
 copy ..\..\License.txt .
 copy ..\..\NOTICE .
 copy ..\..\Resources\Texts\License.rtf .
 copy ..\..\Common\VeraCrypt.ico .
 copy ..\..\Setup\VeraCrypt_setup_background.bmp .
diff --git a/src/Signing/sign_test_debug.bat b/src/Signing/sign_test_debug.bat
index 6fe07866..fa701681 100644
--- a/src/Signing/sign_test_debug.bat
+++ b/src/Signing/sign_test_debug.bat
@@ -1,33 +1,33 @@
 PATH=%PATH%;%WSDK81%\bin\x86;C:\Program Files\7-Zip;C:\Program Files (x86)\7-Zip
-set VC_VERSION=1.26
-set VC_VERSION_NBRE=1.26.0
+set VC_VERSION=1.26.15
+set VC_VERSION_NBRE=1.26.15
 set PFXNAME=TestCertificate\idrix_codeSign.pfx
 set PFXPASSWORD=idrix
 set PFXCA=TestCertificate\idrix_TestRootCA.crt
 set SHA256PFXNAME=TestCertificate\idrix_Sha256CodeSign.pfx
 set SHA256PFXPASSWORD=idrix
 set SHA256PFXCA=TestCertificate\idrix_SHA256TestRootCA.crt
 
 set SIGNINGPATH=%~dp0
 cd %SIGNINGPATH%
 
 call "..\..\doc\chm\create_chm.bat"
 
 cd %SIGNINGPATH%
 
 
 rem sign using SHA-256
 signtool sign /v /a /f %SHA256PFXNAME% /p %SHA256PFXPASSWORD% /ac %SHA256PFXCA% /fd sha256 /tr http://rfc3161timestamp.globalsign.com/advanced /td SHA256 "..\Debug\Setup Files\veracrypt.sys" "..\Debug\Setup Files\veracrypt-x64.sys" "..\Debug\Setup Files\veracrypt-arm64.sys" "..\Debug\Setup Files\VeraCrypt.exe" "..\Debug\Setup Files\VeraCrypt Format.exe" "..\Debug\Setup Files\VeraCryptExpander.exe" "..\Debug\Setup Files\VeraCrypt-x64.exe" "..\Debug\Setup Files\VeraCrypt Format-x64.exe" "..\Debug\Setup Files\VeraCryptExpander-x64.exe" "..\Debug\Setup Files\VeraCrypt-arm64.exe" "..\Debug\Setup Files\VeraCrypt Format-arm64.exe" "..\Debug\Setup Files\VeraCryptExpander-arm64.exe" "..\Debug\Setup Files\VeraCrypt COMReg.exe"
 
 rem create setup and MSI
 cd "..\Debug\Setup Files\"
 copy ..\..\LICENSE .
 copy ..\..\License.txt .
 copy ..\..\NOTICE .
 copy ..\..\Resources\Texts\License.rtf .
 copy ..\..\Common\VeraCrypt.ico .
 copy ..\..\Setup\VeraCrypt_setup_background.bmp .
 copy ..\..\Setup\VeraCrypt_setup.bmp .
 copy ..\..\Setup\Setup.ico .
 del *.xml
 rmdir /S /Q Languages