7 files changed, 26 insertions, 22 deletions
diff --git a/src/Format/Format.rc b/src/Format/Format.rc
index 0f908e2c..057fd837 100644
--- a/src/Format/Format.rc
+++ b/src/Format/Format.rc
@@ -30,4 +30,4 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,26,17,2
- PRODUCTVERSION 1,26,17,2
+ FILEVERSION 1,26,20,0
+ PRODUCTVERSION 1,26,20,0
  FILEFLAGSMASK 0x17L
@@ -48,3 +48,3 @@ BEGIN
             VALUE "FileDescription", "VeraCrypt Format"
-            VALUE "FileVersion", "1.26.17"
+            VALUE "FileVersion", "1.26.20"
             VALUE "LegalTrademarks", "VeraCrypt"
@@ -52,3 +52,3 @@ BEGIN
             VALUE "ProductName", "VeraCrypt"
-            VALUE "ProductVersion", "1.26.17"
+            VALUE "ProductVersion", "1.26.20"
         END
diff --git a/src/Format/FormatCom.cpp b/src/Format/FormatCom.cpp
index 90333f23..904128c3 100644
--- a/src/Format/FormatCom.cpp
+++ b/src/Format/FormatCom.cpp
@@ -6,3 +6,3 @@
  Modifications and additions to the original source code (contained in this file) 
- and all other portions of this file are Copyright (c) 2013-2017 IDRIX
+ and all other portions of this file are Copyright (c) 2013-2025 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
diff --git a/src/Format/FormatCom.h b/src/Format/FormatCom.h
index e474608d..17eff52e 100644
--- a/src/Format/FormatCom.h
+++ b/src/Format/FormatCom.h
@@ -6,3 +6,3 @@
  Modifications and additions to the original source code (contained in this file)
- and all other portions of this file are Copyright (c) 2013-2017 IDRIX
+ and all other portions of this file are Copyright (c) 2013-2025 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
diff --git a/src/Format/InPlace.c b/src/Format/InPlace.c
index 873ae067..0c35ccce 100644
--- a/src/Format/InPlace.c
+++ b/src/Format/InPlace.c
@@ -6,3 +6,3 @@
  Modifications and additions to the original source code (contained in this file)
- and all other portions of this file are Copyright (c) 2013-2017 IDRIX
+ and all other portions of this file are Copyright (c) 2013-2025 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
@@ -1363,3 +1363,3 @@ int DecryptPartitionInPlace (volatile FORMAT_VOL_PARAMETERS *volParams, volatile
 			handleWin32Error (hwndDlg, SRC_POS);
-			AbortProcess ("CANT_DISMOUNT_VOLUME");
+			AbortProcess ("CANT_UNMOUNT_VOLUME");
 		}
@@ -2023,3 +2023,3 @@ static int DismountFileSystem (HWND hwndDlg, HANDLE dev,
 			if (!bSilent)
-				ShowInPlaceEncErrMsgWAltSteps (hwndDlg, "INPLACE_ENC_CANT_LOCK_OR_DISMOUNT_FILESYS", TRUE);
+				ShowInPlaceEncErrMsgWAltSteps (hwndDlg, "INPLACE_ENC_CANT_LOCK_OR_UNMOUNT_FILESYS", TRUE);
 
@@ -2030,3 +2030,3 @@ static int DismountFileSystem (HWND hwndDlg, HANDLE dev,
 			&& !bSilent
-			&& AskWarnYesNo ("VOL_LOCK_FAILED_OFFER_FORCED_DISMOUNT", hwndDlg) == IDNO)
+			&& AskWarnYesNo ("VOL_LOCK_FAILED_OFFER_FORCED_UNMOUNT", hwndDlg) == IDNO)
 		{
@@ -2050,3 +2050,3 @@ static int DismountFileSystem (HWND hwndDlg, HANDLE dev,
 		if (!bSilent)
-			ShowInPlaceEncErrMsgWAltSteps (hwndDlg, "INPLACE_ENC_CANT_LOCK_OR_DISMOUNT_FILESYS", TRUE);
+			ShowInPlaceEncErrMsgWAltSteps (hwndDlg, "INPLACE_ENC_CANT_LOCK_OR_UNMOUNT_FILESYS", TRUE);
 
diff --git a/src/Format/InPlace.h b/src/Format/InPlace.h
index 717a8ed3..30c59b7e 100644
--- a/src/Format/InPlace.h
+++ b/src/Format/InPlace.h
@@ -6,3 +6,3 @@
  Modifications and additions to the original source code (contained in this file)
- and all other portions of this file are Copyright (c) 2013-2017 IDRIX
+ and all other portions of this file are Copyright (c) 2013-2025 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
diff --git a/src/Format/Tcformat.c b/src/Format/Tcformat.c
index dd7ff18b..d26564fc 100644
--- a/src/Format/Tcformat.c
+++ b/src/Format/Tcformat.c
@@ -8,3 +8,3 @@
  Modifications and additions to the original source code (contained in this file)
- and all other portions of this file are Copyright (c) 2013-2017 IDRIX
+ and all other portions of this file are Copyright (c) 2013-2025 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
@@ -7856,3 +7856,3 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 						{
-							if (MessageBoxW (hwndDlg, GetString ("CANT_DISMOUNT_OUTER_VOL"), lpszTitle, MB_RETRYCANCEL) != IDRETRY)
+							if (MessageBoxW (hwndDlg, GetString ("CANT_UNMOUNT_OUTER_VOL"), lpszTitle, MB_RETRYCANCEL) != IDRETRY)
 							{
@@ -7934,3 +7934,3 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 									{
-										if (MessageBoxW (hwndDlg, GetString ("CANT_DISMOUNT_OUTER_VOL"), lpszTitle, MB_RETRYCANCEL) != IDRETRY)
+										if (MessageBoxW (hwndDlg, GetString ("CANT_UNMOUNT_OUTER_VOL"), lpszTitle, MB_RETRYCANCEL) != IDRETRY)
 										{
@@ -8025,3 +8025,3 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 							handleWin32Error (MainDlg, SRC_POS);
-							AbortProcess ("CANT_DISMOUNT_VOLUME");
+							AbortProcess ("CANT_UNMOUNT_VOLUME");
 						}
@@ -8080,3 +8080,3 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 						handleWin32Error (MainDlg, SRC_POS);
-						AbortProcess ("CANT_DISMOUNT_VOLUME");
+						AbortProcess ("CANT_UNMOUNT_VOLUME");
 					}
@@ -8094,3 +8094,3 @@ BOOL CALLBACK MainDialogProc (HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPa
 						handleWin32Error (MainDlg, SRC_POS);
-						AbortProcess ("CANT_DISMOUNT_VOLUME");
+						AbortProcess ("CANT_UNMOUNT_VOLUME");
 					}
@@ -8717,3 +8717,3 @@ retryCDDriveCheck:
 						{
-							if (MessageBoxW (hwndDlg, GetString ("CANT_DISMOUNT_OUTER_VOL"), lpszTitle, MB_RETRYCANCEL | MB_ICONERROR | MB_SETFOREGROUND) != IDRETRY)
+							if (MessageBoxW (hwndDlg, GetString ("CANT_UNMOUNT_OUTER_VOL"), lpszTitle, MB_RETRYCANCEL | MB_ICONERROR | MB_SETFOREGROUND) != IDRETRY)
 							{
@@ -8786,3 +8786,3 @@ retryCDDriveCheck:
 									{
-										if (MessageBoxW (hwndDlg, GetString ("CANT_DISMOUNT_OUTER_VOL"), lpszTitle, MB_RETRYCANCEL) != IDRETRY)
+										if (MessageBoxW (hwndDlg, GetString ("CANT_UNMOUNT_OUTER_VOL"), lpszTitle, MB_RETRYCANCEL) != IDRETRY)
 										{
@@ -10590,3 +10590,7 @@ int WINAPI wWinMain (HINSTANCE hInstance, HINSTANCE hPrevInstance, wchar_t *lpsz
 
-	DetectX86Features ();
+#ifndef _M_ARM64
+	DetectX86Features();
+#else
+	DetectArmFeatures();
+#endif
 
diff --git a/src/Format/Tcformat.h b/src/Format/Tcformat.h
index f9328afd..dd8bf793 100644
--- a/src/Format/Tcformat.h
+++ b/src/Format/Tcformat.h
@@ -8,3 +8,3 @@
  Modifications and additions to the original source code (contained in this file)
- and all other portions of this file are Copyright (c) 2013-2017 IDRIX
+ and all other portions of this file are Copyright (c) 2013-2025 IDRIX
  and are governed by the Apache License 2.0 the full text of which is