VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2025-02-02 23:37:36 +0100
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2025-02-02 23:37:36 +0100
commitc69ba240c4273889d3e4638d93d0e7ca70e85089 (patch)
treea0c210ad0e4c3893af73f29db55317e62fb4a03b /src
parentbdbd95a51b8cd294e31643ba9be4ea1f02b5f9aa (diff)
downloadVeraCrypt-c69ba240c4273889d3e4638d93d0e7ca70e85089.tar.gz
VeraCrypt-c69ba240c4273889d3e4638d93d0e7ca70e85089.zip
Complete replacement of Dismount references by Unmount in various files
Diffstat (limited to 'src')
-rw-r--r--src/Common/Cmdline.c2
-rw-r--r--src/Driver/DriveFilter.c4
-rw-r--r--src/Main/UserInterface.cpp24
-rw-r--r--src/Mount/Mount.c4
-rw-r--r--src/Mount/Mount.rc18
-rw-r--r--src/Release/Setup Files/Product64.wxs4
6 files changed, 28 insertions, 28 deletions
diff --git a/src/Common/Cmdline.c b/src/Common/Cmdline.c
index e0e6f356..ff19b76a 100644
--- a/src/Common/Cmdline.c
+++ b/src/Common/Cmdline.c
@@ -68,3 +68,3 @@ BOOL CALLBACK CommandHelpDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM
#if defined(TCMOUNT) && !defined(VCEXPANDER)
- StringCchCatW (tmp, 8192, L"\nExamples:\n\nMount a volume as X:\tveracrypt.exe /q /v volume.hc /l X\nDismount a volume X:\tveracrypt.exe /q /d X");
+ StringCchCatW (tmp, 8192, L"\nExamples:\n\nMount a volume as X:\tveracrypt.exe /q /v volume.hc /l X\nUnmount a volume X:\tveracrypt.exe /q /u X");
#endif
diff --git a/src/Driver/DriveFilter.c b/src/Driver/DriveFilter.c
index de682863..f8f06b37 100644
--- a/src/Driver/DriveFilter.c
+++ b/src/Driver/DriveFilter.c
@@ -289,3 +289,3 @@ static void DismountDrive (DriveFilterExtension *Extension, BOOL stopIoQueue)
{
- Dump ("Dismounting drive\n");
+ Dump ("Unmounting drive\n");
ASSERT (Extension->DriveMounted);
@@ -303,3 +303,3 @@ static void DismountDrive (DriveFilterExtension *Extension, BOOL stopIoQueue)
- Dump ("Drive dismount done!\n");
+ Dump ("Drive unmount done!\n");
}
diff --git a/src/Main/UserInterface.cpp b/src/Main/UserInterface.cpp
index 9b5d1108..b507d9a3 100644
--- a/src/Main/UserInterface.cpp
+++ b/src/Main/UserInterface.cpp
@@ -1178,3 +1178,3 @@ const FileManager fileManagers[] = {
" 5) Mount the new filesystem and fill it with data.\n"
- " 6) Dismount the outer volume.\n"
+ " 6) Unmount the outer volume.\n"
" If at any step the hidden volume protection is triggered, start again from 1).\n"
@@ -1190,5 +1190,5 @@ const FileManager fileManagers[] = {
"\n"
- "-d, --dismount[=MOUNTED_VOLUME]\n"
- " Dismount a mounted volume. If MOUNTED_VOLUME is not specified, all\n"
- " volumes are dismounted. See below for description of MOUNTED_VOLUME.\n"
+ "-u, --unmount[=MOUNTED_VOLUME]\n"
+ " Unmount a mounted volume. If MOUNTED_VOLUME is not specified, all\n"
+ " volumes are unmounted. See below for description of MOUNTED_VOLUME.\n"
"\n"
@@ -1263,3 +1263,3 @@ const FileManager fileManagers[] = {
"--force\n"
- " Force mounting of a volume in use, dismounting of a volume in use, or\n"
+ " Force mounting of a volume in use, unmounting of a volume in use, or\n"
" overwriting a file. Note that this option has no effect on some platforms.\n"
@@ -1299,3 +1299,3 @@ const FileManager fileManagers[] = {
" timestamp|ts: Do not restore host-file modification timestamp when a volume\n"
- " is dismounted (note that the operating system under certain circumstances\n"
+ " is unmounted (note that the operating system under certain circumstances\n"
" does not alter host-file timestamps, which may be mistakenly interpreted\n"
@@ -1334,3 +1334,3 @@ const FileManager fileManagers[] = {
" Warning message is displayed when a volume switched to read-only is being\n"
- " dismounted.\n"
+ " unmounted.\n"
"\n"
@@ -1355,3 +1355,3 @@ const FileManager fileManagers[] = {
"--slot=SLOT\n"
- " Use specified slot number when mounting, dismounting, or listing a volume.\n"
+ " Use specified slot number when mounting, unmounting, or listing a volume.\n"
"\n"
@@ -1400,7 +1400,7 @@ const FileManager fileManagers[] = {
"\n"
- "Dismount a volume:\n"
- "veracrypt -d volume.hc\n"
+ "Unmount a volume:\n"
+ "veracrypt -u volume.hc\n"
"\n"
- "Dismount all mounted volumes:\n"
- "veracrypt -d\n"
+ "Unmount all mounted volumes:\n"
+ "veracrypt -u\n"
);
diff --git a/src/Mount/Mount.c b/src/Mount/Mount.c
index 2c2f7ae7..f6d1bc86 100644
--- a/src/Mount/Mount.c
+++ b/src/Mount/Mount.c
@@ -4992,3 +4992,3 @@ BOOL CALLBACK TravelerDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPa
fwprintf (af, L"shell\\start=%s\nshell\\start\\command=VeraCrypt\\VeraCrypt.exe\n", GetString ("IDC_PREF_LOGON_START"));
- fwprintf (af, L"shell\\dismount=%s\nshell\\dismount\\command=VeraCrypt\\VeraCrypt.exe /q /d\n", GetString ("UNMOUNT_ALL_TC_VOLUMES"));
+ fwprintf (af, L"shell\\unmount=%s\nshell\\unmount\\command=VeraCrypt\\VeraCrypt.exe /q /u\n", GetString ("UNMOUNT_ALL_TC_VOLUMES"));
@@ -10485,3 +10485,3 @@ skipMount:
- SystemFavoritesServiceLogError (wstring (L"The filesystem of the volume mounted as ") + (wchar_t) (drive + L'A') + L": was not cleanly dismounted and needs to be checked for errors.");
+ SystemFavoritesServiceLogError (wstring (L"The filesystem of the volume mounted as ") + (wchar_t) (drive + L'A') + L": was not cleanly unmounted and needs to be checked for errors.");
}
diff --git a/src/Mount/Mount.rc b/src/Mount/Mount.rc
index 4fb49790..a2118659 100644
--- a/src/Mount/Mount.rc
+++ b/src/Mount/Mount.rc
@@ -66,6 +66,6 @@ BEGIN
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,197,115,130,11
- CONTROL "Auto-dismount volume after no data has been read/written to it for",IDC_PREF_UNMOUNT_INACTIVE,
+ CONTROL "Auto-unmount volume after no data has been read/written to it for",IDC_PREF_UNMOUNT_INACTIVE,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,128,246,11
EDITTEXT IDC_PREF_UNMOUNT_INACTIVE_TIME,258,127,27,12,ES_AUTOHSCROLL | ES_NUMBER,WS_EX_RIGHT
- CONTROL "Force auto-dismount even if volume contains open files or directories",IDC_PREF_FORCE_AUTO_UNMOUNT,
+ CONTROL "Force auto-unmount even if volume contains open files or directories",IDC_PREF_FORCE_AUTO_UNMOUNT,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,141,294,10
@@ -85,3 +85,3 @@ BEGIN
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,285,294,11
- CONTROL "Wipe cached passwords on auto-dismount",IDC_PREF_WIPE_CACHE_ON_AUTOUNMOUNT,
+ CONTROL "Wipe cached passwords on auto-unmount",IDC_PREF_WIPE_CACHE_ON_AUTOUNMOUNT,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,299,296,11
@@ -95,5 +95,5 @@ BEGIN
GROUPBOX "VeraCrypt Background Task",IDT_TASKBAR_ICON,4,33,328,26
- GROUPBOX "Auto-Dismount",IDT_AUTO_UNMOUNT,4,94,328,62
+ GROUPBOX "Auto-Unmount",IDT_AUTO_UNMOUNT,4,94,328,62
LTEXT "minutes",IDT_MINUTES,289,129,39,10
- LTEXT "Dismount all when:",IDT_AUTO_UNMOUNT_ON,9,104,71,20
+ LTEXT "Unmount all when:",IDT_AUTO_UNMOUNT_ON,9,104,71,20
GROUPBOX "Password Cache",IDT_PW_CACHE_OPTIONS,4,260,328,68
@@ -258,5 +258,5 @@ BEGIN
PUSHBUTTON "Remove",IDC_HOTKEY_REMOVE,304,158,59,14
- CONTROL "Play system notification sound after successful hot-key dismount",IDC_HK_UNMOUNT_PLAY_SOUND,
+ CONTROL "Play system notification sound after successful hot-key unmount",IDC_HK_UNMOUNT_PLAY_SOUND,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,201,348,10
- CONTROL "Display balloon tooltip after successful hot-key dismount",IDC_HK_UNMOUNT_BALLOON_TOOLTIP,
+ CONTROL "Display balloon tooltip after successful hot-key unmount",IDC_HK_UNMOUNT_BALLOON_TOOLTIP,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,213,351,10,WS_EX_TRANSPARENT
@@ -653,4 +653,4 @@ BEGIN
MENUITEM SEPARATOR
- MENUITEM "Dismount Volume", IDM_UNMOUNT_VOLUME
- MENUITEM "Dismount All Mounted Volumes", IDM_UNMOUNTALL
+ MENUITEM "Unmount Volume", IDM_UNMOUNT_VOLUME
+ MENUITEM "Unmount All Mounted Volumes", IDM_UNMOUNTALL
MENUITEM SEPARATOR
diff --git a/src/Release/Setup Files/Product64.wxs b/src/Release/Setup Files/Product64.wxs
index 390f6723..fdf4c02b 100644
--- a/src/Release/Setup Files/Product64.wxs
+++ b/src/Release/Setup Files/Product64.wxs
@@ -824,3 +824,3 @@
<Component Id="cmp340BBEC25292C3BE778BA8F158DB87B1" Guid="{34107694-BD63-4466-9317-E2745861F0FE}">
- <File Id="filDF64E26B5CFC7EDB198C7CEA46690CA0" KeyPath="yes" Source="$(sys.CURRENTDIR)\docs\html\en\Normal Dismount vs Force Dismount.html" Checksum="yes" DiskId="1" />
+ <File Id="filDF64E26B5CFC7EDB198C7CEA46690CA0" KeyPath="yes" Source="$(sys.CURRENTDIR)\docs\html\en\Normal Unmount vs Force Unmount.html" Checksum="yes" DiskId="1" />
</Component>
@@ -1479,3 +1479,3 @@
<Component Id="cmp4BC713FA989ECC8EC884548781C4F29D" Guid="{191AF27B-1811-4149-9713-2B3913422D32}">
- <File Id="filB4D109A8E9F7C159C41DA988EF4AE5BD" KeyPath="yes" Source="$(sys.CURRENTDIR)\docs\html\en\ru\Normal Dismount vs Force Dismount.html" Checksum="yes" DiskId="1" />
+ <File Id="filB4D109A8E9F7C159C41DA988EF4AE5BD" KeyPath="yes" Source="$(sys.CURRENTDIR)\docs\html\en\ru\Normal Unmount vs Force Unmount.html" Checksum="yes" DiskId="1" />
</Component>