1 files changed, 27 insertions, 25 deletions
diff --git a/src/Mount/Mount.rc b/src/Mount/Mount.rc
index d52a8801..31ce47c8 100644
--- a/src/Mount/Mount.rc
+++ b/src/Mount/Mount.rc
@@ -103,34 +103,35 @@ BEGIN
     CONTROL         "",IDC_VOLUME_PROPERTIES_LIST,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,6,269,154
 END
 
-IDD_PASSWORDCHANGE_DLG DIALOGEX 0, 0, 316, 207
+IDD_PASSWORDCHANGE_DLG DIALOGEX 0, 0, 330, 207
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Change Password or Keyfiles"
 CLASS "CustomDlg"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    EDITTEXT        IDC_OLD_PASSWORD,89,14,147,13,ES_PASSWORD | ES_AUTOHSCROLL
-    CONTROL         "Use keyfiles",IDC_ENABLE_KEYFILES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,53,86,10
-    PUSHBUTTON      "Keyfiles...",IDC_KEYFILES,177,51,59,14
+    EDITTEXT        IDC_OLD_PASSWORD,89,14,162,13,ES_PASSWORD | ES_AUTOHSCROLL
+    CONTROL         "Use keyfiles",IDC_ENABLE_KEYFILES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,53,98,10
+    PUSHBUTTON      "Keyfiles...",IDC_KEYFILES,192,50,59,14
     CONTROL         "Display password",IDC_SHOW_PASSWORD_CHPWD_ORI,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,65,138,10,WS_EX_TRANSPARENT
-    EDITTEXT        IDC_PASSWORD,89,99,147,13,ES_PASSWORD | ES_AUTOHSCROLL
-    EDITTEXT        IDC_VERIFY,89,115,147,13,ES_PASSWORD | ES_AUTOHSCROLL
-    CONTROL         "Use keyfiles",IDC_ENABLE_NEW_KEYFILES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,134,86,11
-    PUSHBUTTON      "Keyfiles...",IDC_NEW_KEYFILES,177,132,59,14
-    CONTROL         "Display password",IDC_SHOW_PASSWORD_CHPWD_NEW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,146,139,11,WS_EX_TRANSPARENT
-    COMBOBOX        IDC_PKCS5_PRF_ID,89,161,91,90,CBS_DROPDOWNLIST | WS_TABSTOP
-    DEFPUSHBUTTON   "OK",IDOK,251,7,59,14
-    PUSHBUTTON      "Cancel",IDCANCEL,251,24,59,14
+    EDITTEXT        IDC_PASSWORD,89,99,162,13,ES_PASSWORD | ES_AUTOHSCROLL
+    EDITTEXT        IDC_VERIFY,89,115,162,13,ES_PASSWORD | ES_AUTOHSCROLL
+    CONTROL         "Use keyfiles",IDC_ENABLE_NEW_KEYFILES,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,134,99,11
+    PUSHBUTTON      "Keyfiles...",IDC_NEW_KEYFILES,192,132,59,14
+    CONTROL         "Display password",IDC_SHOW_PASSWORD_CHPWD_NEW,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,89,146,160,11,WS_EX_TRANSPARENT
+    COMBOBOX        IDC_PKCS5_PRF_ID,89,161,85,90,CBS_DROPDOWNLIST | WS_TABSTOP
+    DEFPUSHBUTTON   "OK",IDOK,264,7,59,14
+    PUSHBUTTON      "Cancel",IDCANCEL,264,24,59,14
     RTEXT           "Password:",IDT_PASSWORD,12,16,72,8
     RTEXT           "Password:",IDT_NEW_PASSWORD,8,102,76,8
     RTEXT           "Confirm Password:",IDT_CONFIRM_PASSWORD,9,118,75,16
     RTEXT           "PKCS-5 PRF:",IDT_NEW_PKCS5_PRF,9,162,74,10,SS_CENTERIMAGE
-    GROUPBOX        "Current",IDT_CURRENT,6,3,238,77
-    GROUPBOX        "New",IDT_NEW,6,87,238,113
-    COMBOBOX        IDC_WIPE_MODE,89,180,125,90,CBS_DROPDOWNLIST | WS_TABSTOP
+    GROUPBOX        "Current",IDT_CURRENT,6,3,252,77
+    GROUPBOX        "New",IDT_NEW,6,87,252,113
+    COMBOBOX        IDC_WIPE_MODE,89,180,106,90,CBS_DROPDOWNLIST | WS_TABSTOP
     RTEXT           "Wipe mode:",IDT_WIPE_MODE,9,182,74,8,0,WS_EX_RIGHT
-    COMBOBOX        IDC_PKCS5_OLD_PRF_ID,89,33,91,90,CBS_DROPDOWNLIST | WS_TABSTOP
+    COMBOBOX        IDC_PKCS5_OLD_PRF_ID,89,33,85,90,CBS_DROPDOWNLIST | WS_TABSTOP
     RTEXT           "PKCS-5 PRF:",IDT_PKCS5_PRF,12,34,74,10,SS_CENTERIMAGE
+    CONTROL         "TrueCrypt Mode",IDC_TRUECRYPT_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,179,35,78,10
 END
 
 IDD_MOUNT_DLG DIALOGEX 0, 0, 375, 271
@@ -163,23 +164,24 @@ BEGIN
     CONTROL         "",IDC_STATIC,"Static",SS_ETCHEDFRAME,2,151,372,119
 END
 
-IDD_PASSWORD_DLG DIALOGEX 0, 0, 305, 91
+IDD_PASSWORD_DLG DIALOGEX 0, 0, 322, 91
 STYLE DS_SETFONT | DS_MODALFRAME | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE | WS_CAPTION
 CAPTION "Enter VeraCrypt Volume Password"
 FONT 8, "MS Shell Dlg", 0, 0, 0x0
 BEGIN
-    EDITTEXT        IDC_PASSWORD,69,8,153,14,ES_PASSWORD | ES_AUTOHSCROLL
+    EDITTEXT        IDC_PASSWORD,69,8,166,14,ES_PASSWORD | ES_AUTOHSCROLL
     CONTROL         "Cache passwords and keyfil&es in memory",IDC_CACHE,
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,70,50,153,10
     CONTROL         "&Display password",IDC_SHOW_PASSWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,70,63,83,10
     CONTROL         "U&se keyfiles",IDC_KEYFILES_ENABLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,70,75,83,11
-    PUSHBUTTON      "&Keyfiles...",IDC_KEY_FILES,158,72,64,14
-    PUSHBUTTON      "Mount Opti&ons...",IDC_MOUNT_OPTIONS,229,72,64,14
-    DEFPUSHBUTTON   "OK",IDOK,229,8,64,14
-    PUSHBUTTON      "Cancel",IDCANCEL,229,25,64,14
+    PUSHBUTTON      "&Keyfiles...",IDC_KEY_FILES,171,72,64,14
+    PUSHBUTTON      "Mount Opti&ons...",IDC_MOUNT_OPTIONS,243,72,64,14
+    DEFPUSHBUTTON   "OK",IDOK,243,8,64,14
+    PUSHBUTTON      "Cancel",IDCANCEL,243,25,64,14
     RTEXT           "Password:",IDT_PASSWORD,0,10,65,13
-    COMBOBOX        IDC_PKCS5_PRF_ID,69,26,91,90,CBS_DROPDOWNLIST | WS_TABSTOP
+    COMBOBOX        IDC_PKCS5_PRF_ID,69,26,86,90,CBS_DROPDOWNLIST | WS_TABSTOP
     RTEXT           "PKCS-5 PRF:",IDT_PKCS5_PRF,0,27,65,13
+    CONTROL         "TrueCrypt Mode",IDC_TRUECRYPT_MODE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,159,28,76,10
 END
 
 IDD_TRAVELER_DLG DIALOGEX 0, 0, 300, 269
@@ -357,7 +359,7 @@ BEGIN
     IDD_PASSWORDCHANGE_DLG, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 309
+        RIGHTMARGIN, 323
         TOPMARGIN, 7
         BOTTOMMARGIN, 200
     END
@@ -370,7 +372,7 @@ BEGIN
 
     IDD_PASSWORD_DLG, DIALOG
     BEGIN
-        RIGHTMARGIN, 296
+        RIGHTMARGIN, 313
         BOTTOMMARGIN, 86
     END