--- truecrypt/mount/hotkeys.c	2018/04/24 17:03:35	1.1.1.11
+++ truecrypt/mount/hotkeys.c	2018/04/24 17:12:18	1.1.1.15
@@ -1,9 +1,9 @@
 /*
- Copyright (c) 2005 TrueCrypt Foundation. All rights reserved.
+ Copyright (c) 2005 TrueCrypt Developers Association. All rights reserved.
 
- Governed by the TrueCrypt License 2.7 the full text of which is contained
- in the file License.txt included in TrueCrypt binary and source code
- distribution packages.
+ Governed by the TrueCrypt License 3.0 the full text of which is contained in
+ the file License.txt included in TrueCrypt binary and source code distribution
+ packages.
 */
 
 #include <windows.h>
@@ -274,8 +274,8 @@ BOOL CALLBACK HotkeysDlgProc (HWND hwndD
 	WORD lw = LOWORD (wParam);
 	WORD hw = HIWORD (wParam);
 	static BOOL bKeyScanOn;
-	static BOOL bTPlaySoundOnHotkeyMountDismount;
-	static BOOL bTDisplayMsgBoxOnHotkeyDismount;
+	static BOOL bTPlaySoundOnSuccessfulHkDismount;
+	static BOOL bTDisplayBalloonOnSuccessfulHkDismount;
 
 	while (GetParent (hwndMainDlg) != NULL)
 	{
@@ -316,11 +316,11 @@ BOOL CALLBACK HotkeysDlgProc (HWND hwndD
 			SetCheckBox (hwndDlg, IDC_HK_MOD_ALT, TRUE);
 			SetCheckBox (hwndDlg, IDC_HK_MOD_WIN, FALSE);
 
-			SetCheckBox (hwndDlg, IDC_DISMOUNT_CONFIRM_PLAY_SOUND, bPlaySoundOnHotkeyMountDismount);
-			SetCheckBox (hwndDlg, IDC_DISMOUNT_CONFIRM_MSG_BOX, bDisplayMsgBoxOnHotkeyDismount);
+			SetCheckBox (hwndDlg, IDC_HK_DISMOUNT_PLAY_SOUND, bPlaySoundOnSuccessfulHkDismount);
+			SetCheckBox (hwndDlg, IDC_HK_DISMOUNT_BALLOON_TOOLTIP, bDisplayBalloonOnSuccessfulHkDismount);
 
-			bTPlaySoundOnHotkeyMountDismount = bPlaySoundOnHotkeyMountDismount;
-			bTDisplayMsgBoxOnHotkeyDismount = bDisplayMsgBoxOnHotkeyDismount;
+			bTPlaySoundOnSuccessfulHkDismount = bPlaySoundOnSuccessfulHkDismount;
+			bTDisplayBalloonOnSuccessfulHkDismount = bDisplayBalloonOnSuccessfulHkDismount;
 
 			EnableWindow (GetDlgItem (hwndDlg, IDC_HOTKEY_ASSIGN), FALSE);
 			EnableWindow (GetDlgItem (hwndDlg, IDC_HOTKEY_REMOVE), FALSE);
@@ -481,14 +481,14 @@ BOOL CALLBACK HotkeysDlgProc (HWND hwndD
 			return 1;
 		}
 
-		if (lw == IDC_DISMOUNT_CONFIRM_PLAY_SOUND)
+		if (lw == IDC_HK_DISMOUNT_PLAY_SOUND)
 		{
-			bTPlaySoundOnHotkeyMountDismount = GetCheckBox (hwndDlg, IDC_DISMOUNT_CONFIRM_PLAY_SOUND);
+			bTPlaySoundOnSuccessfulHkDismount = GetCheckBox (hwndDlg, IDC_HK_DISMOUNT_PLAY_SOUND);
 		}
 
-		if (lw == IDC_DISMOUNT_CONFIRM_MSG_BOX)
+		if (lw == IDC_HK_DISMOUNT_BALLOON_TOOLTIP)
 		{
-			bTDisplayMsgBoxOnHotkeyDismount = GetCheckBox (hwndDlg, IDC_DISMOUNT_CONFIRM_MSG_BOX);
+			bTDisplayBalloonOnSuccessfulHkDismount = GetCheckBox (hwndDlg, IDC_HK_DISMOUNT_BALLOON_TOOLTIP);
 		}
 
 		if (lw == IDCANCEL || lw == IDCLOSE)
@@ -504,8 +504,8 @@ BOOL CALLBACK HotkeysDlgProc (HWND hwndD
 			memcpy (Hotkeys, tmpHotkeys, sizeof(Hotkeys));
 			RegisterAllHotkeys (hwndMainDlg, Hotkeys);
 			KillTimer (hwndDlg, 0xfe);
-			bPlaySoundOnHotkeyMountDismount = bTPlaySoundOnHotkeyMountDismount;
-			bDisplayMsgBoxOnHotkeyDismount = bTDisplayMsgBoxOnHotkeyDismount;
+			bPlaySoundOnSuccessfulHkDismount = bTPlaySoundOnSuccessfulHkDismount;
+			bDisplayBalloonOnSuccessfulHkDismount = bTDisplayBalloonOnSuccessfulHkDismount;
 
 			SaveSettings (hwndDlg);
 			EndDialog (hwndDlg, IDCANCEL);