10 files changed, 45 insertions, 44 deletions
diff --git a/src/Main/CommandLineInterface.cpp b/src/Main/CommandLineInterface.cpp
index 06815ca9..2d38a5bd 100644
--- a/src/Main/CommandLineInterface.cpp
+++ b/src/Main/CommandLineInterface.cpp
@@ -58,3 +58,4 @@ namespace VeraCrypt
 		parser.AddSwitch (L"",	L"delete-token-keyfiles", _("Delete security token keyfiles"));
-		parser.AddSwitch (L"d", L"dismount",			_("Dismount volume"));
+		parser.AddSwitch (L"d", L"dismount",			_("Unmount volume (deprecated: use 'unmount')"));
+		parser.AddSwitch (L"u", L"unmount",				_("Unmount volume"));
 		parser.AddSwitch (L"",	L"display-password",	_("Display password while typing"));
@@ -64,3 +65,3 @@ namespace VeraCrypt
 		parser.AddOption (L"",	L"filesystem",			_("Filesystem type"));
-		parser.AddSwitch (L"f", L"force",				_("Force mount/dismount/overwrite"));
+		parser.AddSwitch (L"f", L"force",				_("Force mount/unmount/overwrite"));
 #if !defined(TC_WINDOWS) && !defined(TC_MACOSX)
@@ -224,3 +225,3 @@ namespace VeraCrypt
 
-		if (parser.Found (L"dismount"))
+		if (parser.Found (L"unmount") || parser.Found (L"dismount"))
 		{
@@ -381,3 +382,3 @@ namespace VeraCrypt
 		ArgDisableFileSizeCheck = parser.Found (L"no-size-check");
-		ArgUseLegacyPassword = parser.Found (L"legacy-password-maxlength");		
+		ArgUseLegacyPassword = parser.Found (L"legacy-password-maxlength");
 #if defined(TC_LINUX ) || defined (TC_FREEBSD)
diff --git a/src/Main/Forms/Forms.cpp b/src/Main/Forms/Forms.cpp
index 9ffad555..6e1432a3 100644
--- a/src/Main/Forms/Forms.cpp
+++ b/src/Main/Forms/Forms.cpp
@@ -1823,11 +1823,11 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
 
-	AutoDismountSizer = new wxStaticBoxSizer( new wxStaticBox( SecurityPage, wxID_ANY, _("IDT_AUTO_DISMOUNT") ), wxVERTICAL );
+	AutoDismountSizer = new wxStaticBoxSizer( new wxStaticBox( SecurityPage, wxID_ANY, _("IDT_AUTO_UNMOUNT") ), wxVERTICAL );
 
 	wxStaticBoxSizer* sbSizer13;
-	sbSizer13 = new wxStaticBoxSizer( new wxStaticBox( AutoDismountSizer->GetStaticBox(), wxID_ANY, _("LINUX_DISMOUNT_ALL_WHEN") ), wxVERTICAL );
+	sbSizer13 = new wxStaticBoxSizer( new wxStaticBox( AutoDismountSizer->GetStaticBox(), wxID_ANY, _("LINUX_UNMOUNT_ALL_WHEN") ), wxVERTICAL );
 
-	DismountOnLogOffCheckBox = new wxCheckBox( sbSizer13->GetStaticBox(), wxID_ANY, _("IDC_PREF_DISMOUNT_LOGOFF"), wxDefaultPosition, wxDefaultSize, 0 );
+	DismountOnLogOffCheckBox = new wxCheckBox( sbSizer13->GetStaticBox(), wxID_ANY, _("IDC_PREF_UNMOUNT_LOGOFF"), wxDefaultPosition, wxDefaultSize, 0 );
 	sbSizer13->Add( DismountOnLogOffCheckBox, 0, wxALL, 5 );
 
-	DismountOnScreenSaverCheckBox = new wxCheckBox( sbSizer13->GetStaticBox(), wxID_ANY, _("IDC_PREF_DISMOUNT_SCREENSAVER"), wxDefaultPosition, wxDefaultSize, 0 );
+	DismountOnScreenSaverCheckBox = new wxCheckBox( sbSizer13->GetStaticBox(), wxID_ANY, _("IDC_PREF_UNMOUNT_SCREENSAVER"), wxDefaultPosition, wxDefaultSize, 0 );
 	sbSizer13->Add( DismountOnScreenSaverCheckBox, 0, wxALL, 5 );
@@ -1843,3 +1843,3 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
 
-	DismountOnInactivityCheckBox = new wxCheckBox( AutoDismountSizer->GetStaticBox(), wxID_ANY, _("IDC_PREF_DISMOUNT_INACTIVE"), wxDefaultPosition, wxDefaultSize, 0 );
+	DismountOnInactivityCheckBox = new wxCheckBox( AutoDismountSizer->GetStaticBox(), wxID_ANY, _("IDC_PREF_UNMOUNT_INACTIVE"), wxDefaultPosition, wxDefaultSize, 0 );
 	bSizer34->Add( DismountOnInactivityCheckBox, 0, wxTOP|wxBOTTOM|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 );
@@ -1859,3 +1859,3 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
 
-	ForceAutoDismountCheckBox = new wxCheckBox( AutoDismountSizer->GetStaticBox(), wxID_ANY, _("IDC_PREF_FORCE_AUTO_DISMOUNT"), wxDefaultPosition, wxDefaultSize, 0 );
+	ForceAutoDismountCheckBox = new wxCheckBox( AutoDismountSizer->GetStaticBox(), wxID_ANY, _("IDC_PREF_FORCE_AUTO_UNMOUNT"), wxDefaultPosition, wxDefaultSize, 0 );
 	AutoDismountSizer->Add( ForceAutoDismountCheckBox, 0, wxALL, 5 );
@@ -1879,3 +1879,3 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
 
-	WipeCacheOnAutoDismountCheckBox = new wxCheckBox( sbSizer14->GetStaticBox(), wxID_ANY, _("IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT"), wxDefaultPosition, wxDefaultSize, 0 );
+	WipeCacheOnAutoDismountCheckBox = new wxCheckBox( sbSizer14->GetStaticBox(), wxID_ANY, _("IDC_PREF_WIPE_CACHE_ON_AUTOUNMOUNT"), wxDefaultPosition, wxDefaultSize, 0 );
 	sbSizer14->Add( WipeCacheOnAutoDismountCheckBox, 0, wxALL, 5 );
@@ -1985,3 +1985,3 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
 
-	BackgroundTaskMenuDismountItemsEnabledCheckBox = new wxCheckBox( sbSizer26->GetStaticBox(), wxID_ANY, _("TASKICON_PREF_DISMOUNT_VOL"), wxDefaultPosition, wxDefaultSize, 0 );
+	BackgroundTaskMenuDismountItemsEnabledCheckBox = new wxCheckBox( sbSizer26->GetStaticBox(), wxID_ANY, _("TASKICON_PREF_UNMOUNT_VOL"), wxDefaultPosition, wxDefaultSize, 0 );
 	sbSizer26->Add( BackgroundTaskMenuDismountItemsEnabledCheckBox, 0, wxALL, 5 );
@@ -2028,3 +2028,3 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
 
-	CloseExplorerWindowsOnDismountCheckBox = new wxCheckBox( ExplorerSizer->GetStaticBox(), wxID_ANY, _("LINUX_CLOSE_EXPL_ON_DISMOUNT"), wxDefaultPosition, wxDefaultSize, 0 );
+	CloseExplorerWindowsOnDismountCheckBox = new wxCheckBox( ExplorerSizer->GetStaticBox(), wxID_ANY, _("LINUX_CLOSE_EXPL_ON_UNMOUNT"), wxDefaultPosition, wxDefaultSize, 0 );
 	ExplorerSizer->Add( CloseExplorerWindowsOnDismountCheckBox, 0, wxALL, 5 );
@@ -2240,3 +2240,3 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
 
-	DisplayMessageAfterHotkeyDismountCheckBox = new wxCheckBox( sbSizer24->GetStaticBox(), wxID_ANY, _("LINUX_CONFIRM_AFTER_DISMOUNT"), wxDefaultPosition, wxDefaultSize, 0 );
+	DisplayMessageAfterHotkeyDismountCheckBox = new wxCheckBox( sbSizer24->GetStaticBox(), wxID_ANY, _("LINUX_CONFIRM_AFTER_UNMOUNT"), wxDefaultPosition, wxDefaultSize, 0 );
 	sbSizer24->Add( DisplayMessageAfterHotkeyDismountCheckBox, 0, wxALL, 5 );
diff --git a/src/Main/Forms/MainFrame.cpp b/src/Main/Forms/MainFrame.cpp
index b31f765f..59329e09 100644
--- a/src/Main/Forms/MainFrame.cpp
+++ b/src/Main/Forms/MainFrame.cpp
@@ -527,3 +527,3 @@ namespace VeraCrypt
 				Gui->AppendToMenu (*popup, LangString["IDM_MOUNT_FAVORITE_VOLUMES"], this, wxCommandEventHandler (TaskBarIcon::OnMountAllFavoritesMenuItemSelected))->Enable (!Busy);
-				Gui->AppendToMenu (*popup, LangString["HK_DISMOUNT_ALL"], this, wxCommandEventHandler (TaskBarIcon::OnDismountAllMenuItemSelected))->Enable (!Busy);
+				Gui->AppendToMenu (*popup, LangString["HK_UNMOUNT_ALL"], this, wxCommandEventHandler (TaskBarIcon::OnDismountAllMenuItemSelected))->Enable (!Busy);
 
@@ -567,3 +567,3 @@ namespace VeraCrypt
 						{
-							wxString label = LangString["DISMOUNT"] + L" ";
+							wxString label = LangString["UNMOUNT"] + L" ";
 
@@ -1010,3 +1010,3 @@ namespace VeraCrypt
 					if (newMountedCount == 0 && GetPreferences().DisplayMessageAfterHotkeyDismount)
-						Gui->ShowInfo ("MOUNTED_VOLUMES_DISMOUNTED");
+						Gui->ShowInfo ("MOUNTED_VOLUMES_UNMOUNTED");
 					else if (GetPreferences().BeepAfterHotkeyMountDismount)
@@ -1026,3 +1026,3 @@ namespace VeraCrypt
 				if (mounted && GetPreferences().DisplayMessageAfterHotkeyDismount)
-					Gui->ShowInfo ("VOLUMES_DISMOUNTED_CACHE_WIPED");
+					Gui->ShowInfo ("VOLUMES_UNMOUNTED_CACHE_WIPED");
 				else if (mounted && GetPreferences().BeepAfterHotkeyMountDismount)
@@ -1151,3 +1151,3 @@ namespace VeraCrypt
 		{
-			Gui->AppendToMenu (popup, LangString["DISMOUNT"], this, wxCommandEventHandler (MainFrame::OnDismountVolumeMenuItemSelected));
+			Gui->AppendToMenu (popup, LangString["UNMOUNT"], this, wxCommandEventHandler (MainFrame::OnDismountVolumeMenuItemSelected));
 			Gui->AppendToMenu (popup, LangString["OPEN"], this, wxCommandEventHandler (MainFrame::OnOpenVolumeMenuItemSelected));
@@ -1623,3 +1623,3 @@ namespace VeraCrypt
 
-				indicator_item_dismountall = gtk_menu_item_new_with_label (LangString["HK_DISMOUNT_ALL"]);
+				indicator_item_dismountall = gtk_menu_item_new_with_label (LangString["HK_UNMOUNT_ALL"]);
 				gtk_menu_shell_append (GTK_MENU_SHELL (menu), indicator_item_dismountall);
diff --git a/src/Main/Forms/PreferencesDialog.cpp b/src/Main/Forms/PreferencesDialog.cpp
index 7ac8b583..4a6eaec0 100644
--- a/src/Main/Forms/PreferencesDialog.cpp
+++ b/src/Main/Forms/PreferencesDialog.cpp
@@ -423,3 +423,3 @@ namespace VeraCrypt
 		if (event.IsChecked() && !ForceAutoDismountCheckBox->IsChecked())
-			Gui->ShowWarning ("WARN_PREF_AUTO_DISMOUNT");
+			Gui->ShowWarning ("WARN_PREF_AUTO_UNMOUNT");
 	}
@@ -429,3 +429,3 @@ namespace VeraCrypt
 		if (event.IsChecked() && !ForceAutoDismountCheckBox->IsChecked())
-			Gui->ShowWarning ("WARN_PREF_AUTO_DISMOUNT");
+			Gui->ShowWarning ("WARN_PREF_AUTO_UNMOUNT");
 	}
@@ -435,3 +435,3 @@ namespace VeraCrypt
 		if (!event.IsChecked())
-			ForceAutoDismountCheckBox->SetValue (!Gui->AskYesNo (LangString["CONFIRM_NO_FORCED_AUTODISMOUNT"], false, true));
+			ForceAutoDismountCheckBox->SetValue (!Gui->AskYesNo (LangString["CONFIRM_NO_FORCED_AUTOUNMOUNT"], false, true));
 	}
diff --git a/src/Main/Forms/TrueCrypt.fbp b/src/Main/Forms/TrueCrypt.fbp
index 0b40a99e..3c911652 100644
--- a/src/Main/Forms/TrueCrypt.fbp
+++ b/src/Main/Forms/TrueCrypt.fbp
@@ -10956,3 +10956,3 @@
                                                             <property name="id">wxID_ANY</property>
-                                                            <property name="label">IDT_AUTO_DISMOUNT</property>
+                                                            <property name="label">IDT_AUTO_UNMOUNT</property>
                                                             <property name="minimum_size"></property>
@@ -10968,3 +10968,3 @@
                                                                     <property name="id">wxID_ANY</property>
-                                                                    <property name="label">LINUX_DISMOUNT_ALL_WHEN</property>
+                                                                    <property name="label">LINUX_UNMOUNT_ALL_WHEN</property>
                                                                     <property name="minimum_size"></property>
@@ -11007,3 +11007,3 @@
                                                                             <property name="id">wxID_ANY</property>
-                                                                            <property name="label">IDC_PREF_DISMOUNT_LOGOFF</property>
+                                                                            <property name="label">IDC_PREF_UNMOUNT_LOGOFF</property>
                                                                             <property name="max_size"></property>
@@ -11071,3 +11071,3 @@
                                                                             <property name="id">wxID_ANY</property>
-                                                                            <property name="label">IDC_PREF_DISMOUNT_SCREENSAVER</property>
+                                                                            <property name="label">IDC_PREF_UNMOUNT_SCREENSAVER</property>
                                                                             <property name="max_size"></property>
@@ -11212,3 +11212,3 @@
                                                                             <property name="id">wxID_ANY</property>
-                                                                            <property name="label">IDC_PREF_DISMOUNT_INACTIVE</property>
+                                                                            <property name="label">IDC_PREF_UNMOUNT_INACTIVE</property>
                                                                             <property name="max_size"></property>
@@ -11401,3 +11401,3 @@
                                                                     <property name="id">wxID_ANY</property>
-                                                                    <property name="label">IDC_PREF_FORCE_AUTO_DISMOUNT</property>
+                                                                    <property name="label">IDC_PREF_FORCE_AUTO_UNMOUNT</property>
                                                                     <property name="max_size"></property>
@@ -11623,3 +11623,3 @@
                                                                     <property name="id">wxID_ANY</property>
-                                                                    <property name="label">IDC_PREF_WIPE_CACHE_ON_AUTODISMOUNT</property>
+                                                                    <property name="label">IDC_PREF_WIPE_CACHE_ON_AUTOUNMOUNT</property>
                                                                     <property name="max_size"></property>
@@ -12617,3 +12617,3 @@
                                                                             <property name="id">wxID_ANY</property>
-                                                                            <property name="label">TASKICON_PREF_DISMOUNT_VOL</property>
+                                                                            <property name="label">TASKICON_PREF_UNMOUNT_VOL</property>
                                                                             <property name="max_size"></property>
@@ -13041,3 +13041,3 @@
                                                                     <property name="id">wxID_ANY</property>
-                                                                    <property name="label">LINUX_CLOSE_EXPL_ON_DISMOUNT</property>
+                                                                    <property name="label">LINUX_CLOSE_EXPL_ON_UNMOUNT</property>
                                                                     <property name="max_size"></property>
@@ -14849,3 +14849,3 @@
                                                                             <property name="id">wxID_ANY</property>
-                                                                            <property name="label">LINUX_CONFIRM_AFTER_DISMOUNT</property>
+                                                                            <property name="label">LINUX_CONFIRM_AFTER_UNMOUNT</property>
                                                                             <property name="max_size"></property>
diff --git a/src/Main/Forms/VolumeCreationWizard.cpp b/src/Main/Forms/VolumeCreationWizard.cpp
index fd1f9c2d..bbf9fe0d 100644
--- a/src/Main/Forms/VolumeCreationWizard.cpp
+++ b/src/Main/Forms/VolumeCreationWizard.cpp
@@ -624,3 +624,3 @@ namespace VeraCrypt
 					{
-						Gui->ShowInfo ("DISMOUNT_FIRST");
+						Gui->ShowInfo ("UNMOUNT_FIRST");
 						return GetCurrentStep();
diff --git a/src/Main/GraphicUserInterface.cpp b/src/Main/GraphicUserInterface.cpp
index 84daa1aa..75b326e5 100644
--- a/src/Main/GraphicUserInterface.cpp
+++ b/src/Main/GraphicUserInterface.cpp
@@ -159,3 +159,3 @@ namespace VeraCrypt
 		{
-			ShowInfo ("DISMOUNT_FIRST");
+			ShowInfo ("UNMOUNT_FIRST");
 			return;
@@ -1158,3 +1158,3 @@ namespace VeraCrypt
 			if (Core->GetMountedVolumes().size() < volumeCount)
-				ShowInfoTopMost (LangString["MOUNTED_VOLUMES_AUTO_DISMOUNTED"]);
+				ShowInfoTopMost (LangString["MOUNTED_VOLUMES_AUTO_UNMOUNTED"]);
 		}
@@ -1420,3 +1420,3 @@ namespace VeraCrypt
 		{
-			ShowInfo ("DISMOUNT_FIRST");
+			ShowInfo ("UNMOUNT_FIRST");
 			return;
diff --git a/src/Main/Hotkey.cpp b/src/Main/Hotkey.cpp
index 231528e1..ed6a2aff 100644
--- a/src/Main/Hotkey.cpp
+++ b/src/Main/Hotkey.cpp
@@ -29,6 +29,6 @@ namespace VeraCrypt
 		TC_HOTKEY (CloseAllSecurityTokenSessions, "IDM_CLOSE_ALL_TOKEN_SESSIONS");
-		TC_HOTKEY (DismountAll, "HK_DISMOUNT_ALL");
-		TC_HOTKEY (DismountAllWipeCache, "HK_DISMOUNT_ALL_AND_WIPE");
-		TC_HOTKEY (ForceDismountAllWipeCache, "HK_FORCE_DISMOUNT_ALL_AND_WIPE");
-		TC_HOTKEY (ForceDismountAllWipeCacheExit, "HK_FORCE_DISMOUNT_ALL_AND_WIPE_AND_EXIT");
+		TC_HOTKEY (DismountAll, "HK_UNMOUNT_ALL");
+		TC_HOTKEY (DismountAllWipeCache, "HK_UNMOUNT_ALL_AND_WIPE");
+		TC_HOTKEY (ForceDismountAllWipeCache, "HK_FORCE_UNMOUNT_ALL_AND_WIPE");
+		TC_HOTKEY (ForceDismountAllWipeCacheExit, "HK_FORCE_UNMOUNT_ALL_AND_WIPE_AND_EXIT");
 		TC_HOTKEY (MountAllDevices, "HK_AUTOMOUNT_DEVICES");
diff --git a/src/Main/TextUserInterface.cpp b/src/Main/TextUserInterface.cpp
index 1f1b4b49..5217199d 100644
--- a/src/Main/TextUserInterface.cpp
+++ b/src/Main/TextUserInterface.cpp
@@ -292,3 +292,3 @@ namespace VeraCrypt
 		if (Core->IsVolumeMounted (*volumePath))
-			throw_err (LangString["DISMOUNT_FIRST"]);
+			throw_err (LangString["UNMOUNT_FIRST"]);
 #endif
@@ -1539,3 +1539,3 @@ namespace VeraCrypt
 		if (Core->IsVolumeMounted (*volumePath))
-			throw_err (LangString["DISMOUNT_FIRST"]);
+			throw_err (LangString["UNMOUNT_FIRST"]);
 #endif
diff --git a/src/Main/UserInterface.cpp b/src/Main/UserInterface.cpp
index 5f82db49..9b5d1108 100644
--- a/src/Main/UserInterface.cpp
+++ b/src/Main/UserInterface.cpp
@@ -224,3 +224,3 @@ namespace VeraCrypt
 						message += L'\n';
-					message += StringFormatter (LangString["LINUX_VOL_DISMOUNTED"], wstring (volume->Path));
+					message += StringFormatter (LangString["LINUX_VOL_UNMOUNTED"], wstring (volume->Path));
 				}