1 files changed, 14 insertions, 14 deletions
diff --git a/src/Mount/Hotkeys.c b/src/Mount/Hotkeys.c
index be37ed35..3ab0bd92 100644
--- a/src/Mount/Hotkeys.c
+++ b/src/Mount/Hotkeys.c
@@ -237,58 +237,58 @@ static void DisplayHotkeyList (HWND hwndDlg)
 	wchar_t ShortcutMod [MAX_KEY_COMB_NAME_LEN];
 	wchar_t ShortcutFinal [MAX_KEY_COMB_NAME_LEN*2];
 	wchar_t Shortcut [MAX_KEY_COMB_NAME_LEN];
 
 	SendMessage (hList, LVM_DELETEALLITEMS,0, (LPARAM)&item);
 
 	for (i = 0; i < NBR_HOTKEYS; i++)
 	{
 		memset (&item,0,sizeof(item));
 		item.mask = LVIF_TEXT;
 		item.iItem = i;
 		item.iSubItem = 0;
 
 		switch (i)
 		{
 
 		case HK_AUTOMOUNT_DEVICES:
 			item.pszText = GetString ("HK_AUTOMOUNT_DEVICES");
 			break;
 
-		case HK_DISMOUNT_ALL:
-			item.pszText = GetString ("HK_DISMOUNT_ALL");
+		case HK_UNMOUNT_ALL:
+			item.pszText = GetString ("HK_UNMOUNT_ALL");
 			break;
 
 		case HK_WIPE_CACHE:
 			item.pszText = GetString ("HK_WIPE_CACHE");
 			break;
 
-		case HK_DISMOUNT_ALL_AND_WIPE:
-			item.pszText = GetString ("HK_DISMOUNT_ALL_AND_WIPE");
+		case HK_UNMOUNT_ALL_AND_WIPE:
+			item.pszText = GetString ("HK_UNMOUNT_ALL_AND_WIPE");
 			break;
 
-		case HK_FORCE_DISMOUNT_ALL_AND_WIPE:
-			item.pszText = GetString ("HK_FORCE_DISMOUNT_ALL_AND_WIPE");
+		case HK_FORCE_UNMOUNT_ALL_AND_WIPE:
+			item.pszText = GetString ("HK_FORCE_UNMOUNT_ALL_AND_WIPE");
 			break;
 
-		case HK_FORCE_DISMOUNT_ALL_AND_WIPE_AND_EXIT:
-			item.pszText = GetString ("HK_FORCE_DISMOUNT_ALL_AND_WIPE_AND_EXIT");
+		case HK_FORCE_UNMOUNT_ALL_AND_WIPE_AND_EXIT:
+			item.pszText = GetString ("HK_FORCE_UNMOUNT_ALL_AND_WIPE_AND_EXIT");
 			break;
 
 		case HK_MOUNT_FAVORITE_VOLUMES:
 			item.pszText = GetString ("HK_MOUNT_FAVORITE_VOLUMES");
 			break;
 
 		case HK_SHOW_HIDE_MAIN_WINDOW:
 			item.pszText = GetString ("HK_SHOW_HIDE_MAIN_WINDOW");
 			break;
 
 		case HK_CLOSE_SECURITY_TOKEN_SESSIONS:
 			item.pszText = GetString ("IDM_CLOSE_ALL_TOKEN_SESSIONS");
 			break;
 
 		default:
 			item.pszText = L"[?]";
 		}
 
 		SendMessageW (hList,LVM_INSERTITEMW,0,(LPARAM)&item);
 
@@ -361,42 +361,42 @@ BOOL CALLBACK HotkeysDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 
 			memset (&col,0,sizeof(col));
 			col.mask = LVCF_TEXT|LVCF_WIDTH|LVCF_SUBITEM|LVCF_FMT;
 			col.pszText = GetString ("ACTION");
 			col.cx = CompensateXDPI (341);
 			col.fmt = LVCFMT_LEFT;
 			SendMessageW (hList,LVM_INSERTCOLUMNW,0,(LPARAM)&col);
 
 			col.pszText = GetString ("SHORTCUT");
 			col.cx = CompensateXDPI (190);
 			col.fmt = LVCFMT_LEFT;
 			SendMessageW (hList,LVM_INSERTCOLUMNW,1,(LPARAM)&col);
 
 			LocalizeDialog (hwndDlg, "IDD_HOTKEYS_DLG");
 
 			SetCheckBox (hwndDlg, IDC_HK_MOD_CTRL, TRUE);
 			SetCheckBox (hwndDlg, IDC_HK_MOD_SHIFT, FALSE);
 			SetCheckBox (hwndDlg, IDC_HK_MOD_ALT, TRUE);
 			SetCheckBox (hwndDlg, IDC_HK_MOD_WIN, FALSE);
 
-			SetCheckBox (hwndDlg, IDC_HK_DISMOUNT_PLAY_SOUND, bPlaySoundOnSuccessfulHkDismount);
-			SetCheckBox (hwndDlg, IDC_HK_DISMOUNT_BALLOON_TOOLTIP, bDisplayBalloonOnSuccessfulHkDismount);
+			SetCheckBox (hwndDlg, IDC_HK_UNMOUNT_PLAY_SOUND, bPlaySoundOnSuccessfulHkDismount);
+			SetCheckBox (hwndDlg, IDC_HK_UNMOUNT_BALLOON_TOOLTIP, bDisplayBalloonOnSuccessfulHkDismount);
 
 			bTPlaySoundOnSuccessfulHkDismount = bPlaySoundOnSuccessfulHkDismount;
 			bTDisplayBalloonOnSuccessfulHkDismount = bDisplayBalloonOnSuccessfulHkDismount;
 
 			EnableWindow (GetDlgItem (hwndDlg, IDC_HOTKEY_ASSIGN), FALSE);
 			EnableWindow (GetDlgItem (hwndDlg, IDC_HOTKEY_REMOVE), FALSE);
 
 			DisplayHotkeyList(hwndDlg);
 
 			if (SetTimer (hwndDlg, 0xfe, 10, NULL) == 0)
 			{
 				Error ("CANNOT_SET_TIMER", MainDlg);
 				EndDialog (hwndDlg, IDCANCEL);
 				return 1;
 			}
 			return 1;
 		}
 
 	case WM_TIMER:
 		{
@@ -544,48 +544,48 @@ BOOL CALLBACK HotkeysDlgProc (HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 		if (lw == IDC_RESET_HOTKEYS)
 		{
 			int i;
 
 			for (i = 0; i < NBR_HOTKEYS; i++)
 			{
 				tmpHotkeys[i].vKeyCode = 0;
 				tmpHotkeys[i].vKeyModifiers = 0;
 			}
 			SetWindowTextW (GetDlgItem (hwndDlg, IDC_HOTKEY_KEY), L"");
 			EnableWindow (GetDlgItem (hwndDlg, IDC_HOTKEY_ASSIGN), FALSE);
 			EnableWindow (GetDlgItem (hwndDlg, IDC_HOTKEY_REMOVE), FALSE);
 			nSelectedHotkeyId = -1;
 			bKeyScanOn = FALSE;
 			currentVKeyCode = 0;
 			memset (vkeysDown, 0, sizeof(vkeysDown));
 			DisplayHotkeyList(hwndDlg);
 			return 1;
 		}
 
-		if (lw == IDC_HK_DISMOUNT_PLAY_SOUND)
+		if (lw == IDC_HK_UNMOUNT_PLAY_SOUND)
 		{
-			bTPlaySoundOnSuccessfulHkDismount = GetCheckBox (hwndDlg, IDC_HK_DISMOUNT_PLAY_SOUND);
+			bTPlaySoundOnSuccessfulHkDismount = GetCheckBox (hwndDlg, IDC_HK_UNMOUNT_PLAY_SOUND);
 		}
 
-		if (lw == IDC_HK_DISMOUNT_BALLOON_TOOLTIP)
+		if (lw == IDC_HK_UNMOUNT_BALLOON_TOOLTIP)
 		{
-			bTDisplayBalloonOnSuccessfulHkDismount = GetCheckBox (hwndDlg, IDC_HK_DISMOUNT_BALLOON_TOOLTIP);
+			bTDisplayBalloonOnSuccessfulHkDismount = GetCheckBox (hwndDlg, IDC_HK_UNMOUNT_BALLOON_TOOLTIP);
 		}
 
 		if (lw == IDCANCEL || lw == IDCLOSE)
 		{
 			KillTimer (hwndDlg, 0xfe);
 			EndDialog (hwndDlg, IDCANCEL);
 			return 1;
 		}
 
 		if (lw == IDOK)
 		{
 			HWND hwndMainDlg = hwndDlg;
 
 			while (GetParent (hwndMainDlg) != NULL)
 			{
 				hwndMainDlg = GetParent (hwndMainDlg);
 			}
 			UnregisterAllHotkeys (hwndMainDlg, Hotkeys);
 			memcpy (Hotkeys, tmpHotkeys, sizeof(Hotkeys));
 			RegisterAllHotkeys (hwndMainDlg, Hotkeys);