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
@@ -55,15 +55,16 @@ namespace VeraCrypt
 		parser.AddSwitch (L"C", L"change",				_("Change password or keyfiles"));
 		parser.AddSwitch (L"c", L"create",				_("Create new volume"));
 		parser.AddSwitch (L"",	L"create-keyfile",		_("Create new keyfile"));
 		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"));
 		parser.AddOption (L"",	L"encryption",			_("Encryption algorithm"));
 		parser.AddSwitch (L"",	L"explore",				_("Open explorer window for mounted volume"));
 		parser.AddSwitch (L"",	L"export-token-keyfile",_("Export keyfile from token"));
 		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)
 		parser.AddOption (L"",	L"fs-options",			_("Filesystem mount options"));
 #endif
 		parser.AddOption (L"",	L"hash",				_("Hash algorithm"));
@@ -221,9 +222,9 @@ namespace VeraCrypt
 			CheckCommandSingle();
 			ArgCommand = CommandId::DeleteSecurityTokenKeyfiles;
 		}
 
-		if (parser.Found (L"dismount"))
+		if (parser.Found (L"unmount") || parser.Found (L"dismount"))
 		{
 			CheckCommandSingle();
 			ArgCommand = CommandId::DismountVolumes;
 			param1IsMountedVolumeSpec = true;
@@ -378,9 +379,9 @@ namespace VeraCrypt
 
 		ArgForce = parser.Found (L"force");
 
 		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)
 		ArgUseDummySudoPassword = parser.Found (L"use-dummy-sudo-password");
 #endif
 
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
@@ -1820,17 +1820,17 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
 
 	wxBoxSizer* bSizer33;
 	bSizer33 = new wxBoxSizer( wxVERTICAL );
 
-	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 );
 
 	DismountOnPowerSavingCheckBox = new wxCheckBox( sbSizer13->GetStaticBox(), wxID_ANY, _("LINUX_ENTERING_POVERSAWING"), wxDefaultPosition, wxDefaultSize, 0 );
 	sbSizer13->Add( DismountOnPowerSavingCheckBox, 0, wxALL, 5 );
@@ -1840,9 +1840,9 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
 
 	wxBoxSizer* bSizer34;
 	bSizer34 = new wxBoxSizer( wxHORIZONTAL );
 
-	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 );
 
 	DismountOnInactivitySpinCtrl = new wxSpinCtrl( AutoDismountSizer->GetStaticBox(), wxID_ANY, wxT("1"), wxDefaultPosition, wxSize( -1,-1 ), wxSP_ARROW_KEYS, 1, 9999, 1 );
 	DismountOnInactivitySpinCtrl->SetMinSize( wxSize( 60,-1 ) );
@@ -1856,9 +1856,9 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
 
 
 	AutoDismountSizer->Add( bSizer34, 0, wxEXPAND, 5 );
 
-	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 );
 
 
 	bSizer33->Add( AutoDismountSizer, 0, wxEXPAND|wxALL, 5 );
@@ -1876,9 +1876,9 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
 
 	WipeCacheOnCloseCheckBox = new wxCheckBox( sbSizer14->GetStaticBox(), wxID_ANY, _("IDC_PREF_WIPE_CACHE_ON_EXIT"), wxDefaultPosition, wxDefaultSize, 0 );
 	sbSizer14->Add( WipeCacheOnCloseCheckBox, 0, wxALL, 5 );
 
-	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 );
 
 
 	bSizer33->Add( sbSizer14, 0, wxEXPAND|wxALL, 5 );
@@ -1982,9 +1982,9 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
 
 	BackgroundTaskMenuOpenItemsEnabledCheckBox = new wxCheckBox( sbSizer26->GetStaticBox(), wxID_ANY, _("TASKICON_PREF_OPEN_VOL"), wxDefaultPosition, wxDefaultSize, 0 );
 	sbSizer26->Add( BackgroundTaskMenuOpenItemsEnabledCheckBox, 0, wxALL, 5 );
 
-	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 );
 
 
 	sbSizer18->Add( sbSizer26, 1, wxEXPAND|wxALL, 5 );
@@ -2025,9 +2025,9 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
 
 	OpenExplorerWindowAfterMountCheckBox = new wxCheckBox( ExplorerSizer->GetStaticBox(), wxID_ANY, _("IDC_PREF_OPEN_EXPLORER"), wxDefaultPosition, wxDefaultSize, 0 );
 	ExplorerSizer->Add( OpenExplorerWindowAfterMountCheckBox, 0, wxALL, 5 );
 
-	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 );
 
 
 	bSizer37->Add( ExplorerSizer, 0, wxEXPAND|wxALL, 5 );
@@ -2237,9 +2237,9 @@ PreferencesDialogBase::PreferencesDialogBase( wxWindow* parent, wxWindowID id, c
 
 	BeepAfterHotkeyMountDismountCheckBox = new wxCheckBox( sbSizer24->GetStaticBox(), wxID_ANY, _("LINUX_SOUND_NOTIFICATION"), wxDefaultPosition, wxDefaultSize, 0 );
 	sbSizer24->Add( BeepAfterHotkeyMountDismountCheckBox, 0, wxALL, 5 );
 
-	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 );
 
 
 	sbSizer21->Add( sbSizer24, 0, wxEXPAND|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
@@ -524,9 +524,9 @@ namespace VeraCrypt
 				Gui->AppendToMenu (*popup, LangString[Gui->IsInBackgroundMode() ? "SHOW_TC" : "HIDE_TC"], this, wxCommandEventHandler (TaskBarIcon::OnShowHideMenuItemSelected));
 
 				popup->AppendSeparator();
 				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);
 
 				// Favorite volumes
 				if (Gui->GetPreferences().BackgroundTaskMenuMountItemsEnabled && !Frame->FavoriteVolumesMenuMap.empty())
 				{
@@ -564,9 +564,9 @@ namespace VeraCrypt
 						popup->AppendSeparator();
 						DismountMap.clear();
 						foreach (shared_ptr <VolumeInfo> volume, mountedVolumes)
 						{
-							wxString label = LangString["DISMOUNT"] + L" ";
+							wxString label = LangString["UNMOUNT"] + L" ";
 
 							if (!volume->MountPoint.IsEmpty())
 								label += wstring (volume->MountPoint) + L" (" + wstring (volume->Path) + L")";
 							else
@@ -1007,9 +1007,9 @@ namespace VeraCrypt
 
 				if (newMountedCount < mountedCount)
 				{
 					if (newMountedCount == 0 && GetPreferences().DisplayMessageAfterHotkeyDismount)
-						Gui->ShowInfo ("MOUNTED_VOLUMES_DISMOUNTED");
+						Gui->ShowInfo ("MOUNTED_VOLUMES_UNMOUNTED");
 					else if (GetPreferences().BeepAfterHotkeyMountDismount)
 						MessageBeep((UINT) -1);
 				}
 			}
@@ -1023,9 +1023,9 @@ namespace VeraCrypt
 				WipeCache();
 				Gui->DismountAllVolumes (true, true);
 
 				if (mounted && GetPreferences().DisplayMessageAfterHotkeyDismount)
-					Gui->ShowInfo ("VOLUMES_DISMOUNTED_CACHE_WIPED");
+					Gui->ShowInfo ("VOLUMES_UNMOUNTED_CACHE_WIPED");
 				else if (mounted && GetPreferences().BeepAfterHotkeyMountDismount)
 					MessageBeep((UINT) -1);
 
 				if (event.GetId() == Hotkey::Id::ForceDismountAllWipeCacheExit)
@@ -1148,9 +1148,9 @@ namespace VeraCrypt
 
 		wxMenu popup;
 		if (IsMountedSlotSelected())
 		{
-			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));
 			Gui->AppendToMenu (popup, LangString["LINUX_DESELECT"], this, wxCommandEventHandler (MainFrame::OnClearSlotSelectionMenuItemSelected));
 
 			popup.AppendSeparator();
@@ -1620,9 +1620,9 @@ namespace VeraCrypt
 				indicator_item_mountfavorites = gtk_menu_item_new_with_label (LangString["IDM_MOUNT_FAVORITE_VOLUMES"]);
 				gtk_menu_shell_append (GTK_MENU_SHELL (menu), indicator_item_mountfavorites);
 				g_signal_connect (indicator_item_mountfavorites, "activate", G_CALLBACK (IndicatorOnMountAllFavoritesMenuItemSelected), this);
 
-				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);
 				g_signal_connect (indicator_item_dismountall, "activate", G_CALLBACK (IndicatorOnDismountAllMenuItemSelected), this);
 
 				gtk_menu_shell_append (GTK_MENU_SHELL (menu), gtk_separator_menu_item_new());
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
@@ -420,21 +420,21 @@ namespace VeraCrypt
 
 	void PreferencesDialog::OnDismountOnPowerSavingCheckBoxClick (wxCommandEvent& event)
 	{
 		if (event.IsChecked() && !ForceAutoDismountCheckBox->IsChecked())
-			Gui->ShowWarning ("WARN_PREF_AUTO_DISMOUNT");
+			Gui->ShowWarning ("WARN_PREF_AUTO_UNMOUNT");
 	}
 
 	void PreferencesDialog::OnDismountOnScreenSaverCheckBoxClick (wxCommandEvent& event)
 	{
 		if (event.IsChecked() && !ForceAutoDismountCheckBox->IsChecked())
-			Gui->ShowWarning ("WARN_PREF_AUTO_DISMOUNT");
+			Gui->ShowWarning ("WARN_PREF_AUTO_UNMOUNT");
 	}
 
 	void PreferencesDialog::OnForceAutoDismountCheckBoxClick (wxCommandEvent& event)
 	{
 		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));
 	}
 
 	void PreferencesDialog::OnHotkeyListItemDeselected (wxListEvent& event)
 	{
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
@@ -10953,9 +10953,9 @@
                                                         <property name="flag">wxEXPAND|wxALL</property>
                                                         <property name="proportion">0</property>
                                                         <object class="wxStaticBoxSizer" expanded="0">
                                                             <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>
                                                             <property name="name">AutoDismountSizer</property>
                                                             <property name="orient">wxVERTICAL</property>
                                                             <property name="parent">1</property>
@@ -10965,9 +10965,9 @@
                                                                 <property name="flag">wxEXPAND|wxALL</property>
                                                                 <property name="proportion">0</property>
                                                                 <object class="wxStaticBoxSizer" expanded="0">
                                                                     <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>
                                                                     <property name="name">sbSizer13</property>
                                                                     <property name="orient">wxVERTICAL</property>
                                                                     <property name="parent">1</property>
@@ -11004,9 +11004,9 @@
                                                                             <property name="font"></property>
                                                                             <property name="gripper">0</property>
                                                                             <property name="hidden">0</property>
                                                                             <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>
                                                                             <property name="maximize_button">0</property>
                                                                             <property name="maximum_size"></property>
                                                                             <property name="min_size"></property>
@@ -11068,9 +11068,9 @@
                                                                             <property name="font"></property>
                                                                             <property name="gripper">0</property>
                                                                             <property name="hidden">0</property>
                                                                             <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>
                                                                             <property name="maximize_button">0</property>
                                                                             <property name="maximum_size"></property>
                                                                             <property name="min_size"></property>
@@ -11209,9 +11209,9 @@
                                                                             <property name="font"></property>
                                                                             <property name="gripper">0</property>
                                                                             <property name="hidden">0</property>
                                                                             <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>
                                                                             <property name="maximize_button">0</property>
                                                                             <property name="maximum_size"></property>
                                                                             <property name="min_size"></property>
@@ -11398,9 +11398,9 @@
                                                                     <property name="font"></property>
                                                                     <property name="gripper">0</property>
                                                                     <property name="hidden">0</property>
                                                                     <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>
                                                                     <property name="maximize_button">0</property>
                                                                     <property name="maximum_size"></property>
                                                                     <property name="min_size"></property>
@@ -11620,9 +11620,9 @@
                                                                     <property name="font"></property>
                                                                     <property name="gripper">0</property>
                                                                     <property name="hidden">0</property>
                                                                     <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>
                                                                     <property name="maximize_button">0</property>
                                                                     <property name="maximum_size"></property>
                                                                     <property name="min_size"></property>
@@ -12614,9 +12614,9 @@
                                                                             <property name="font"></property>
                                                                             <property name="gripper">0</property>
                                                                             <property name="hidden">0</property>
                                                                             <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>
                                                                             <property name="maximize_button">0</property>
                                                                             <property name="maximum_size"></property>
                                                                             <property name="min_size"></property>
@@ -13038,9 +13038,9 @@
                                                                     <property name="font"></property>
                                                                     <property name="gripper">0</property>
                                                                     <property name="hidden">0</property>
                                                                     <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>
                                                                     <property name="maximize_button">0</property>
                                                                     <property name="maximum_size"></property>
                                                                     <property name="min_size"></property>
@@ -14846,9 +14846,9 @@
                                                                             <property name="font"></property>
                                                                             <property name="gripper">0</property>
                                                                             <property name="hidden">0</property>
                                                                             <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>
                                                                             <property name="maximize_button">0</property>
                                                                             <property name="maximum_size"></property>
                                                                             <property name="min_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
@@ -621,9 +621,9 @@ namespace VeraCrypt
 				if (forward)
 				{
 					if (Core->IsVolumeMounted (SelectedVolumePath))
 					{
-						Gui->ShowInfo ("DISMOUNT_FIRST");
+						Gui->ShowInfo ("UNMOUNT_FIRST");
 						return GetCurrentStep();
 					}
 
 					if (SelectedVolumePath.IsDevice())
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
@@ -156,9 +156,9 @@ namespace VeraCrypt
 
 #ifdef TC_WINDOWS
 		if (Core->IsVolumeMounted (*volumePath))
 		{
-			ShowInfo ("DISMOUNT_FIRST");
+			ShowInfo ("UNMOUNT_FIRST");
 			return;
 		}
 #endif
 
@@ -1155,9 +1155,9 @@ namespace VeraCrypt
 		{
 			OnAutoDismountAllEvent();
 
 			if (Core->GetMountedVolumes().size() < volumeCount)
-				ShowInfoTopMost (LangString["MOUNTED_VOLUMES_AUTO_DISMOUNTED"]);
+				ShowInfoTopMost (LangString["MOUNTED_VOLUMES_AUTO_UNMOUNTED"]);
 		}
 	}
 #endif
 
@@ -1417,9 +1417,9 @@ namespace VeraCrypt
 
 #ifdef TC_WINDOWS
 		if (Core->IsVolumeMounted (*volumePath))
 		{
-			ShowInfo ("DISMOUNT_FIRST");
+			ShowInfo ("UNMOUNT_FIRST");
 			return;
 		}
 #endif
 
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
@@ -26,12 +26,12 @@ namespace VeraCrypt
 
 #define TC_HOTKEY(ID,LANG) hotkeys.push_back (shared_ptr <Hotkey> (new Hotkey (Id::##ID, L###ID, LangString[LANG])))
 
 		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");
 		TC_HOTKEY (MountAllFavorites, "HK_MOUNT_FAVORITE_VOLUMES");
 		TC_HOTKEY (ShowHideApplication, "HK_SHOW_HIDE_MAIN_WINDOW");
 		TC_HOTKEY (WipeCache, "HK_WIPE_CACHE");
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
@@ -289,9 +289,9 @@ namespace VeraCrypt
 			throw UserAbort (SRC_POS);
 
 #ifdef TC_WINDOWS
 		if (Core->IsVolumeMounted (*volumePath))
-			throw_err (LangString["DISMOUNT_FIRST"]);
+			throw_err (LangString["UNMOUNT_FIRST"]);
 #endif
 
 		ShowInfo ("EXTERNAL_VOL_HEADER_BAK_FIRST_INFO");
 
@@ -1536,9 +1536,9 @@ namespace VeraCrypt
 			throw UserAbort (SRC_POS);
 
 #ifdef TC_WINDOWS
 		if (Core->IsVolumeMounted (*volumePath))
-			throw_err (LangString["DISMOUNT_FIRST"]);
+			throw_err (LangString["UNMOUNT_FIRST"]);
 #endif
 
 		// Ask whether to restore internal or external backup
 		bool restoreInternalBackup;
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
@@ -221,9 +221,9 @@ namespace VeraCrypt
 				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)