VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Main/UserInterface.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/Main/UserInterface.cpp')
-rw-r--r--src/Main/UserInterface.cpp26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/Main/UserInterface.cpp b/src/Main/UserInterface.cpp
index 5f82db49..b507d9a3 100644
--- a/src/Main/UserInterface.cpp
+++ b/src/Main/UserInterface.cpp
@@ -217,17 +217,17 @@ namespace VeraCrypt
if (volume->HiddenVolumeProtectionTriggered)
ShowWarning (StringFormatter (LangString["DAMAGE_TO_HIDDEN_VOLUME_PREVENTED"], wstring (volume->Path)));
if (Preferences.Verbose)
{
if (!message.IsEmpty())
message += L'\n';
- message += StringFormatter (LangString["LINUX_VOL_DISMOUNTED"], wstring (volume->Path));
+ message += StringFormatter (LangString["LINUX_VOL_UNMOUNTED"], wstring (volume->Path));
}
}
if (twoPassMode && firstPass)
{
volumes = volumesLeft;
if (volumesInUse && interactive)
@@ -1171,31 +1171,31 @@ const FileManager fileManagers[] = {
" Inexperienced users should use the graphical user interface to create a hidden\n"
" volume. When using the text user interface, the following procedure must be\n"
" followed to create a hidden volume:\n"
" 1) Create an outer volume with no filesystem.\n"
" 2) Create a hidden volume within the outer volume.\n"
" 3) Mount the outer volume using hidden volume protection.\n"
" 4) Create a filesystem on the virtual device of the outer volume.\n"
" 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"
"\n"
"--create-keyfile[=FILE_PATH]\n"
" Create a new keyfile containing pseudo-random data.\n"
"\n"
"-C, --change[=VOLUME_PATH]\n"
" Change a password and/or keyfile(s) of a volume. Most options are requested\n"
" from the user if not specified on command line. PKCS-5 PRF HMAC hash\n"
" algorithm can be changed with option --hash. See also options -k,\n"
" --new-keyfiles, --new-password, -p, --random-source.\n"
"\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"
"--delete-token-keyfiles\n"
" Delete keyfiles from security tokens. See also command --list-token-keyfiles.\n"
"\n"
"--export-token-keyfile\n"
" Export a keyfile from a token. See also command --list-token-keyfiles.\n"
"\n"
"--import-token-keyfiles\n"
@@ -1256,17 +1256,17 @@ const FileManager fileManagers[] = {
"\n"
"--filesystem=TYPE\n"
" Filesystem type to mount. The TYPE argument is passed to mount(8) command\n"
" with option -t. Default type is 'auto'. When creating a new volume, this\n"
" option specifies the filesystem to be created on the new volume.\n"
" Filesystem type 'none' disables mounting or creating a filesystem.\n"
"\n"
"--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"
"\n"
"--fs-options=OPTIONS\n"
" Filesystem mount options. The OPTIONS argument is passed to mount(8)\n"
" command with option -o when a filesystem on a VeraCrypt volume is mounted.\n"
" This option is not available on some platforms.\n"
"\n"
"--hash=HASH\n"
@@ -1292,17 +1292,17 @@ const FileManager fileManagers[] = {
"\n"
"-m, --mount-options=OPTION1[,OPTION2,OPTION3,...]\n"
" Specifies comma-separated mount options for a VeraCrypt volume:\n"
" headerbak: Use backup headers when mounting a volume.\n"
" nokernelcrypto: Do not use kernel cryptographic services.\n"
" readonly|ro: Mount volume as read-only.\n"
" system: Mount partition using system encryption.\n"
" 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"
" to mean that this option does not work).\n"
" See also option --fs-options.\n"
"\n"
"--new-keyfiles=KEYFILE1[,KEYFILE2,KEYFILE3,...]\n"
" Add specified keyfiles to a volume. This option can only be used with command\n"
" -C.\n"
"\n"
@@ -1327,17 +1327,17 @@ const FileManager fileManagers[] = {
" Write-protect a hidden volume when mounting an outer volume. Before mounting\n"
" the outer volume, the user will be prompted for a password to open the hidden\n"
" volume. The size and position of the hidden volume is then determined and the\n"
" outer volume is mounted with all sectors belonging to the hidden volume\n"
" protected against write operations. When a write to the protected area is\n"
" prevented, the whole volume is switched to read-only mode. Verbose list\n"
" (-v -l) can be used to query the state of the hidden volume protection.\n"
" Warning message is displayed when a volume switched to read-only is being\n"
- " dismounted.\n"
+ " unmounted.\n"
"\n"
"--protection-keyfiles=KEYFILE1[,KEYFILE2,KEYFILE3,...]\n"
" Use specified keyfiles to open a hidden volume to be protected. This option\n"
" may be used only when mounting an outer volume with hidden volume protected.\n"
" See also options -k and --protect-hidden.\n"
"\n"
"--protection-password=PASSWORD\n"
" Use specified password to open a hidden volume to be protected. This option\n"
@@ -1348,17 +1348,17 @@ const FileManager fileManagers[] = {
" Do not encrypt free space when creating a device-hosted volume. This option\n"
" must not be used when creating an outer volume.\n"
"\n"
"--random-source=FILE\n"
" Use FILE as a source of random data (e.g., when creating a volume) instead\n"
" of requiring the user to type random characters.\n"
"\n"
"--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"
"--size=SIZE[K|KiB|M|MiB|G|GiB|T|TiB] or --size=max\n"
" Use specified size when creating a new volume. If no suffix is indicated,\n"
" then SIZE is interpreted in bytes. Suffixes K, M, G or T can be used to\n"
" indicate a value in KiB, MiB, GiB or TiB respectively.\n"
" If max is specified, the new volume will use all available free disk space.\n"
"\n"
"-t, --text\n"
@@ -1393,21 +1393,21 @@ const FileManager fileManagers[] = {
"veracrypt -m ro -k keyfile1,keyfile2 volume.hc\n"
"\n"
"Mount a volume without mounting its filesystem:\n"
"veracrypt --filesystem=none volume.hc\n"
"\n"
"Mount a volume prompting only for its password:\n"
"veracrypt -t -k \"\" --pim=0 --protect-hidden=no volume.hc /media/veracrypt1\n"
"\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"
);
#ifndef TC_NO_GUI
if (Application::GetUserInterfaceType() == UserInterfaceType::Graphic)
{
wxDialog dialog (nullptr, wxID_ANY, LangString["LINUX_CMD_HELP"], wxDefaultPosition);
wxTextCtrl *textCtrl = new wxTextCtrl (&dialog, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_READONLY);