1 files changed, 9 insertions, 1 deletions
diff --git a/src/Main/UserPreferences.h b/src/Main/UserPreferences.h
index cff8fabe..25621656 100644
--- a/src/Main/UserPreferences.h
+++ b/src/Main/UserPreferences.h
@@ -3,9 +3,9 @@
  Copyright (c) 2008-2012 TrueCrypt Developers Association and which is governed
  by the TrueCrypt License 3.0.
 
  Modifications and additions to the original source code (contained in this file)
- and all other portions of this file are Copyright (c) 2013-2016 IDRIX
+ and all other portions of this file are Copyright (c) 2013-2017 IDRIX
  and are governed by the Apache License 2.0 the full text of which is
  contained in the file License.txt included in VeraCrypt binary and source
  code distribution packages.
 */
@@ -30,15 +30,17 @@ namespace VeraCrypt
 			BeepAfterHotkeyMountDismount (false),
 			CloseBackgroundTaskOnNoVolumes (true),
 			CloseExplorerWindowsOnDismount (true),
 			CloseSecurityTokenSessionsAfterMount (false),
+			EMVSupportEnabled (false),
 			DisableKernelEncryptionModeWarning (false),
 			DismountOnInactivity (false),
 			DismountOnLogOff (true),
 			DismountOnPowerSaving (false),
 			DismountOnScreenSaver (false),
 			DisplayMessageAfterHotkeyDismount (false),
 			ForceAutoDismount (true),
+			Language (L"system"),
 			LastSelectedSlotNumber (0),
 			MaxVolumeIdleTime (60),
 			MountDevicesOnLogon (false),
 			MountFavoritesOnLogon (false),
@@ -71,15 +73,17 @@ namespace VeraCrypt
 		bool BeepAfterHotkeyMountDismount;
 		bool CloseBackgroundTaskOnNoVolumes;
 		bool CloseExplorerWindowsOnDismount;
 		bool CloseSecurityTokenSessionsAfterMount;
+        bool EMVSupportEnabled;
 		bool DisableKernelEncryptionModeWarning;
 		bool DismountOnInactivity;
 		bool DismountOnLogOff;
 		bool DismountOnPowerSaving;
 		bool DismountOnScreenSaver;
 		bool DisplayMessageAfterHotkeyDismount;
 		bool ForceAutoDismount;
+		wstring Language;
 		uint64 LastSelectedSlotNumber;
 		int32 MaxVolumeIdleTime;
 		bool MountDevicesOnLogon;
 		bool MountFavoritesOnLogon;
@@ -93,8 +97,12 @@ namespace VeraCrypt
 		bool Verbose;
 		bool WipeCacheOnAutoDismount;
 		bool WipeCacheOnClose;
 
+		// A map used to store unknown entries from the configuration file in order to preserve them when saving the configuration.
+		// This helps to preserve unknown entries that may be used by future versions of VeraCrypt or entries used by old versions that were removed from current version.
+		map <wxString, wxString> UnknownConfigMapEntries;
+
 	protected:
 		wxString GetDefaultKeyfilesFileName () const { return L"Default Keyfiles.xml"; }
 #ifdef TC_PROTOTYPE
 		wxString GetPreferencesFileName () const { return L"Configuration_Debug.xml"; }