From b6c6e192eeb157e15fc28309009104e2ee8d9694 Mon Sep 17 00:00:00 2001
From: zilmar <zilmar@pj64-emu.com>
Date: Sat, 14 Nov 2015 11:16:03 +1100
Subject: [PATCH] [Project64] Cleanup Language Class

---
 .../Multilanguage/Language Class.cpp          | 772 +++++++++---------
 .../Project64/Multilanguage/Language Class.h  |  24 +-
 .../Multilanguage/LanguageSelector.h          |   6 +-
 3 files changed, 401 insertions(+), 401 deletions(-)

diff --git a/Source/Project64/Multilanguage/Language Class.cpp b/Source/Project64/Multilanguage/Language Class.cpp
index e2f3d5855..ea5a79511 100644
--- a/Source/Project64/Multilanguage/Language Class.cpp	
+++ b/Source/Project64/Multilanguage/Language Class.cpp	
@@ -14,499 +14,499 @@
 
 CLanguage * g_Lang = NULL;
 
-void CLanguage::LoadDefaultStrings (void)
+void CLanguage::LoadDefaultStrings(void)
 {
 #define DEF_STR(ID,str) m_DefaultStrings.insert(LANG_STRINGS::value_type(ID,str))
 
-    DEF_STR(EMPTY_STRING,        L""                        );
+    DEF_STR(EMPTY_STRING, L"");
 
     /*********************************************************************************
     * Meta Information                                                               *
     *********************************************************************************/
     //About DLL
-    DEF_STR(LANGUAGE_NAME,		 L""						);
-    DEF_STR(LANGUAGE_AUTHOR,	 L""						);
-    DEF_STR(LANGUAGE_VERSION,	 L""						);
-    DEF_STR(LANGUAGE_DATE,		 L""						);
+    DEF_STR(LANGUAGE_NAME, L"");
+    DEF_STR(LANGUAGE_AUTHOR, L"");
+    DEF_STR(LANGUAGE_VERSION, L"");
+    DEF_STR(LANGUAGE_DATE, L"");
 
     //About DLL Dialog
-    DEF_STR(INI_CURRENT_LANG,    L"Current Language"        );
-    DEF_STR(INI_AUTHOR,          L"Author"                  );
-    DEF_STR(INI_VERSION,         L"Version"                 );
-    DEF_STR(INI_DATE,            L"Date"                    );
-    DEF_STR(INI_HOMEPAGE,        L"Visit Home Page"         );
-    DEF_STR(INI_CURRENT_RDB,     L"ROM Database (.RDB)"     );
-    DEF_STR(INI_CURRENT_CHT,     L"Cheat Code File (.CHT)"  );
-    DEF_STR(INI_CURRENT_RDX,     L"Extended ROM Info (.RDX)");
+    DEF_STR(INI_CURRENT_LANG, L"Current Language");
+    DEF_STR(INI_AUTHOR, L"Author");
+    DEF_STR(INI_VERSION, L"Version");
+    DEF_STR(INI_DATE, L"Date");
+    DEF_STR(INI_HOMEPAGE, L"Visit Home Page");
+    DEF_STR(INI_CURRENT_RDB, L"ROM Database (.RDB)");
+    DEF_STR(INI_CURRENT_CHT, L"Cheat Code File (.CHT)");
+    DEF_STR(INI_CURRENT_RDX, L"Extended ROM Info (.RDX)");
 
     //About INI title
-    DEF_STR(INI_TITLE,           L"About Config Files"         );
+    DEF_STR(INI_TITLE, L"About Config Files");
 
     /*********************************************************************************
     * Numbers                                                                        *
     *********************************************************************************/
-    DEF_STR(NUMBER_0,             L"0"                      );
-    DEF_STR(NUMBER_1,             L"1"                      );
-    DEF_STR(NUMBER_2,             L"2"                      );
-    DEF_STR(NUMBER_3,             L"3"                      );
-    DEF_STR(NUMBER_4,             L"4"                      ),
-        DEF_STR(NUMBER_5,             L"5"                      );
-    DEF_STR(NUMBER_6,             L"6"                      );
-    DEF_STR(NUMBER_7,             L"7"                      );
-    DEF_STR(NUMBER_8,             L"8"                      );
-    DEF_STR(NUMBER_9,             L"9"                      );
+    DEF_STR(NUMBER_0, L"0");
+    DEF_STR(NUMBER_1, L"1");
+    DEF_STR(NUMBER_2, L"2");
+    DEF_STR(NUMBER_3, L"3");
+    DEF_STR(NUMBER_4, L"4"),
+        DEF_STR(NUMBER_5, L"5");
+    DEF_STR(NUMBER_6, L"6");
+    DEF_STR(NUMBER_7, L"7");
+    DEF_STR(NUMBER_8, L"8");
+    DEF_STR(NUMBER_9, L"9");
 
     /*********************************************************************************
     * Menu                                                                           *
     *********************************************************************************/
     //File Menu
-    DEF_STR(MENU_FILE,     L"&File"     );
-    DEF_STR(MENU_OPEN,       L"&Open ROM"               );
-    DEF_STR(MENU_ROM_INFO,   L"ROM &Info...."           );
-    DEF_STR(MENU_START,      L"Start Emulation"         );
-    DEF_STR(MENU_END,        L"&End Emulation"          );
-    DEF_STR(MENU_CHOOSE_ROM, L"Choose ROM Directory..." );
-    DEF_STR(MENU_REFRESH,    L"Refresh ROM List"        );
-    DEF_STR(MENU_RECENT_ROM, L"Recent ROM"              );
-    DEF_STR(MENU_RECENT_DIR, L"Recent ROM Directories"  );
-    DEF_STR(MENU_EXIT,       L"E&xit"                   );
+    DEF_STR(MENU_FILE, L"&File");
+    DEF_STR(MENU_OPEN, L"&Open ROM");
+    DEF_STR(MENU_ROM_INFO, L"ROM &Info....");
+    DEF_STR(MENU_START, L"Start Emulation");
+    DEF_STR(MENU_END, L"&End Emulation");
+    DEF_STR(MENU_CHOOSE_ROM, L"Choose ROM Directory...");
+    DEF_STR(MENU_REFRESH, L"Refresh ROM List");
+    DEF_STR(MENU_RECENT_ROM, L"Recent ROM");
+    DEF_STR(MENU_RECENT_DIR, L"Recent ROM Directories");
+    DEF_STR(MENU_EXIT, L"E&xit");
 
     //System Menu
-    DEF_STR(MENU_SYSTEM,   L"&System"   );
-    DEF_STR(MENU_RESET,       L"&Reset"                 );
-    DEF_STR(MENU_PAUSE,       L"&Pause"                 );
-    DEF_STR(MENU_BITMAP,      L"Generate Bitmap"        );
-    DEF_STR(MENU_LIMIT_FPS,   L"Limit FPS"              );
-    DEF_STR(MENU_SAVE,        L"&Save State"                  );
-    DEF_STR(MENU_SAVE_AS,     L"Save As..."             );
-    DEF_STR(MENU_RESTORE,     L"&Load State"               );
-    DEF_STR(MENU_LOAD,        L"Load..."                );
-    DEF_STR(MENU_CURRENT_SAVE,L"Current Save S&tate"    );
-    DEF_STR(MENU_CHEAT,       L"Cheats..."              );
-    DEF_STR(MENU_GS_BUTTON,   L"GS Button"              );
-    DEF_STR(MENU_RESUME,      L"R&esume"                );
-    DEF_STR(MENU_RESET_SOFT,  L"&Soft Reset"            );
-    DEF_STR(MENU_RESET_HARD,  L"&Hard Reset"            );
+    DEF_STR(MENU_SYSTEM, L"&System");
+    DEF_STR(MENU_RESET, L"&Reset");
+    DEF_STR(MENU_PAUSE, L"&Pause");
+    DEF_STR(MENU_BITMAP, L"Generate Bitmap");
+    DEF_STR(MENU_LIMIT_FPS, L"Limit FPS");
+    DEF_STR(MENU_SAVE, L"&Save State");
+    DEF_STR(MENU_SAVE_AS, L"Save As...");
+    DEF_STR(MENU_RESTORE, L"&Load State");
+    DEF_STR(MENU_LOAD, L"Load...");
+    DEF_STR(MENU_CURRENT_SAVE, L"Current Save S&tate");
+    DEF_STR(MENU_CHEAT, L"Cheats...");
+    DEF_STR(MENU_GS_BUTTON, L"GS Button");
+    DEF_STR(MENU_RESUME, L"R&esume");
+    DEF_STR(MENU_RESET_SOFT, L"&Soft Reset");
+    DEF_STR(MENU_RESET_HARD, L"&Hard Reset");
 
     //Options Menu
-    DEF_STR(MENU_OPTIONS,  L"&Options"  );
-    DEF_STR(MENU_FULL_SCREEN, L"&Full Screen"                   );
-    DEF_STR(MENU_ON_TOP,      L"&Always on &Top"                );
-    DEF_STR(MENU_CONFG_GFX,   L"Configure Graphics Plugin..."   );
-    DEF_STR(MENU_CONFG_AUDIO, L"Configure Audio Plugin..."      );
-    DEF_STR(MENU_CONFG_CTRL,  L"Configure Controller Plugin..." );
-    DEF_STR(MENU_CONFG_RSP,   L"Configure RSP Plugin..."        );
-    DEF_STR(MENU_SHOW_CPU,    L"Show CPU Usage"                 );
-    DEF_STR(MENU_SETTINGS,    L"&Settings..."                   );
+    DEF_STR(MENU_OPTIONS, L"&Options");
+    DEF_STR(MENU_FULL_SCREEN, L"&Full Screen");
+    DEF_STR(MENU_ON_TOP, L"&Always on &Top");
+    DEF_STR(MENU_CONFG_GFX, L"Configure Graphics Plugin...");
+    DEF_STR(MENU_CONFG_AUDIO, L"Configure Audio Plugin...");
+    DEF_STR(MENU_CONFG_CTRL, L"Configure Controller Plugin...");
+    DEF_STR(MENU_CONFG_RSP, L"Configure RSP Plugin...");
+    DEF_STR(MENU_SHOW_CPU, L"Show CPU Usage");
+    DEF_STR(MENU_SETTINGS, L"&Settings...");
 
     //Debugger Menu
-    DEF_STR(MENU_DEBUGGER, L"&Debugger" );
+    DEF_STR(MENU_DEBUGGER, L"&Debugger");
 
     //Language Menu
-    DEF_STR(MENU_LANGUAGE, L"&Language" );
+    DEF_STR(MENU_LANGUAGE, L"&Language");
 
     //Help Menu
-    DEF_STR(MENU_HELP,        L"&Help"     );
-    DEF_STR(MENU_ABOUT_INI,   L"About Conf&ig Files"   );
-    DEF_STR(MENU_ABOUT_PJ64,  L"&About Project64"  );
-    DEF_STR(MENU_FORUM,	      L"Support &Forum"     );
-    DEF_STR(MENU_HOMEPAGE,	  L"&Homepage"          );
+    DEF_STR(MENU_HELP, L"&Help");
+    DEF_STR(MENU_ABOUT_INI, L"About Conf&ig Files");
+    DEF_STR(MENU_ABOUT_PJ64, L"&About Project64");
+    DEF_STR(MENU_FORUM, L"Support &Forum");
+    DEF_STR(MENU_HOMEPAGE, L"&Homepage");
 
     //Current Save Slot menu
-    DEF_STR(MENU_SLOT_DEFAULT,L"Default"            );
-    DEF_STR(MENU_SLOT_1,      L"Slot 1"             );
-    DEF_STR(MENU_SLOT_2,      L"Slot 2"             );
-    DEF_STR(MENU_SLOT_3,      L"Slot 3"             );
-    DEF_STR(MENU_SLOT_4,      L"Slot 4"             );
-    DEF_STR(MENU_SLOT_5,      L"Slot 5"             );
-    DEF_STR(MENU_SLOT_6,      L"Slot 6"             );
-    DEF_STR(MENU_SLOT_7,      L"Slot 7"             );
-    DEF_STR(MENU_SLOT_8,      L"Slot 8"             );
-    DEF_STR(MENU_SLOT_9,      L"Slot 9"             );
-    DEF_STR(MENU_SLOT_10,     L"Slot 10"            );
+    DEF_STR(MENU_SLOT_DEFAULT, L"Default");
+    DEF_STR(MENU_SLOT_1, L"Slot 1");
+    DEF_STR(MENU_SLOT_2, L"Slot 2");
+    DEF_STR(MENU_SLOT_3, L"Slot 3");
+    DEF_STR(MENU_SLOT_4, L"Slot 4");
+    DEF_STR(MENU_SLOT_5, L"Slot 5");
+    DEF_STR(MENU_SLOT_6, L"Slot 6");
+    DEF_STR(MENU_SLOT_7, L"Slot 7");
+    DEF_STR(MENU_SLOT_8, L"Slot 8");
+    DEF_STR(MENU_SLOT_9, L"Slot 9");
+    DEF_STR(MENU_SLOT_10, L"Slot 10");
 
     //Pop up Menu
-    DEF_STR(POPUP_PLAY,      L"Play Game"  );
-    DEF_STR(POPUP_INFO,      L"ROM Information"  );
-    DEF_STR(POPUP_SETTINGS,  L"Edit Game Settings"  );
-    DEF_STR(POPUP_CHEATS,    L"Edit Cheats"  );
-    DEF_STR(POPUP_GFX_PLUGIN,L"Graphics Plugin"  );
+    DEF_STR(POPUP_PLAY, L"Play Game");
+    DEF_STR(POPUP_INFO, L"ROM Information");
+    DEF_STR(POPUP_SETTINGS, L"Edit Game Settings");
+    DEF_STR(POPUP_CHEATS, L"Edit Cheats");
+    DEF_STR(POPUP_GFX_PLUGIN, L"Graphics Plugin");
 
     //Alternate Name to save Slot
-    DEF_STR(SAVE_SLOT_DEFAULT,L"Save Slot - Default"       );
-    DEF_STR(SAVE_SLOT_1,      L"Save Slot - 1"             );
-    DEF_STR(SAVE_SLOT_2,      L"Save Slot - 2"             );
-    DEF_STR(SAVE_SLOT_3,      L"Save Slot - 3"             );
-    DEF_STR(SAVE_SLOT_4,      L"Save Slot - 4"             );
-    DEF_STR(SAVE_SLOT_5,      L"Save Slot - 5"             );
-    DEF_STR(SAVE_SLOT_6,      L"Save Slot - 6"             );
-    DEF_STR(SAVE_SLOT_7,      L"Save Slot - 7"             );
-    DEF_STR(SAVE_SLOT_8,      L"Save Slot - 8"             );
-    DEF_STR(SAVE_SLOT_9,      L"Save Slot - 9"             );
-    DEF_STR(SAVE_SLOT_10,     L"Save Slot - 10"            );
+    DEF_STR(SAVE_SLOT_DEFAULT, L"Save Slot - Default");
+    DEF_STR(SAVE_SLOT_1, L"Save Slot - 1");
+    DEF_STR(SAVE_SLOT_2, L"Save Slot - 2");
+    DEF_STR(SAVE_SLOT_3, L"Save Slot - 3");
+    DEF_STR(SAVE_SLOT_4, L"Save Slot - 4");
+    DEF_STR(SAVE_SLOT_5, L"Save Slot - 5");
+    DEF_STR(SAVE_SLOT_6, L"Save Slot - 6");
+    DEF_STR(SAVE_SLOT_7, L"Save Slot - 7");
+    DEF_STR(SAVE_SLOT_8, L"Save Slot - 8");
+    DEF_STR(SAVE_SLOT_9, L"Save Slot - 9");
+    DEF_STR(SAVE_SLOT_10, L"Save Slot - 10");
 
     /*********************************************************************************
     * ROM Browser                                                                    *
     *********************************************************************************/
     //ROM Browser Fields
-    DEF_STR(RB_FILENAME,     L"File Name" );
-    DEF_STR(RB_INTERNALNAME, L"Internal Name" );
-    DEF_STR(RB_GOODNAME,     L"Good Name" );
-    DEF_STR(RB_STATUS,       L"Status" );
-    DEF_STR(RB_ROMSIZE,      L"ROM Size" );
-    DEF_STR(RB_NOTES_CORE,   L"Notes (core)" );
-    DEF_STR(RB_NOTES_PLUGIN, L"Notes (default plugins)" );
-    DEF_STR(RB_NOTES_USER,   L"Notes (user)" );
-    DEF_STR(RB_CART_ID,      L"Cartridge ID" );
-    DEF_STR(RB_MANUFACTUER,  L"Manufacturer" );
-    DEF_STR(RB_COUNTRY,      L"Country" );
-    DEF_STR(RB_DEVELOPER,    L"Developer" );
-    DEF_STR(RB_CRC1,         L"CRC1" );
-    DEF_STR(RB_CRC2,         L"CRC2" );
-    DEF_STR(RB_CICCHIP,      L"CIC Chip" );
-    DEF_STR(RB_RELEASE_DATE, L"Release Date" );
-    DEF_STR(RB_GENRE,        L"Genre" );
-    DEF_STR(RB_PLAYERS,      L"Players" );
-    DEF_STR(RB_FORCE_FEEDBACK,L"Force Feedback" );
-    DEF_STR(RB_FILE_FORMAT,   L"File Format" );
+    DEF_STR(RB_FILENAME, L"File Name");
+    DEF_STR(RB_INTERNALNAME, L"Internal Name");
+    DEF_STR(RB_GOODNAME, L"Good Name");
+    DEF_STR(RB_STATUS, L"Status");
+    DEF_STR(RB_ROMSIZE, L"ROM Size");
+    DEF_STR(RB_NOTES_CORE, L"Notes (core)");
+    DEF_STR(RB_NOTES_PLUGIN, L"Notes (default plugins)");
+    DEF_STR(RB_NOTES_USER, L"Notes (user)");
+    DEF_STR(RB_CART_ID, L"Cartridge ID");
+    DEF_STR(RB_MANUFACTUER, L"Manufacturer");
+    DEF_STR(RB_COUNTRY, L"Country");
+    DEF_STR(RB_DEVELOPER, L"Developer");
+    DEF_STR(RB_CRC1, L"CRC1");
+    DEF_STR(RB_CRC2, L"CRC2");
+    DEF_STR(RB_CICCHIP, L"CIC Chip");
+    DEF_STR(RB_RELEASE_DATE, L"Release Date");
+    DEF_STR(RB_GENRE, L"Genre");
+    DEF_STR(RB_PLAYERS, L"Players");
+    DEF_STR(RB_FORCE_FEEDBACK, L"Force Feedback");
+    DEF_STR(RB_FILE_FORMAT, L"File Format");
 
     //Select ROM
-    DEF_STR(SELECT_ROM_DIR,  L"Select current ROM directory" );
+    DEF_STR(SELECT_ROM_DIR, L"Select current ROM directory");
 
     //Messages
-    DEF_STR(RB_NOT_GOOD_FILE,L"Bad ROM? Use GoodN64 & check for updated RDB." );
+    DEF_STR(RB_NOT_GOOD_FILE, L"Bad ROM? Use GoodN64 & check for updated RDB.");
 
     /*********************************************************************************
     * Options                                                                        *
     *********************************************************************************/
     //Options Title
-    DEF_STR(OPTIONS_TITLE,L"Settings");
+    DEF_STR(OPTIONS_TITLE, L"Settings");
 
     //Tabs
-    DEF_STR(TAB_PLUGIN,      L"Plugins");
-    DEF_STR(TAB_DIRECTORY,   L"Directories");
-    DEF_STR(TAB_OPTIONS,     L"Options");
-    DEF_STR(TAB_ROMSELECTION,L"ROM Selection");
-    DEF_STR(TAB_ADVANCED,    L"Advanced");
+    DEF_STR(TAB_PLUGIN, L"Plugins");
+    DEF_STR(TAB_DIRECTORY, L"Directories");
+    DEF_STR(TAB_OPTIONS, L"Options");
+    DEF_STR(TAB_ROMSELECTION, L"ROM Selection");
+    DEF_STR(TAB_ADVANCED, L"Advanced");
     DEF_STR(TAB_ROMSETTINGS, L"General Settings");
-    DEF_STR(TAB_SHELLINTERGATION,L"Shell Integration");
-    DEF_STR(TAB_ROMNOTES,    L"Notes");
-    DEF_STR(TAB_SHORTCUTS,    L"Keyboard Shortcuts");
-    DEF_STR(TAB_ROMSTATUS,    L"Status");
-    DEF_STR(TAB_RECOMPILER,   L"Recompiler");
+    DEF_STR(TAB_SHELLINTERGATION, L"Shell Integration");
+    DEF_STR(TAB_ROMNOTES, L"Notes");
+    DEF_STR(TAB_SHORTCUTS, L"Keyboard Shortcuts");
+    DEF_STR(TAB_ROMSTATUS, L"Status");
+    DEF_STR(TAB_RECOMPILER, L"Recompiler");
 
     //Plugin Dialog
-    DEF_STR(PLUG_ABOUT,    L"About");
-    DEF_STR(PLUG_RSP,      L" RSP (Reality Signal Processor) plugin: ");
-    DEF_STR(PLUG_GFX,      L" Video (graphics) plugin: ");
-    DEF_STR(PLUG_AUDIO,    L" Audio (sound) plugin: ");
-    DEF_STR(PLUG_CTRL,     L" Input (controller) plugin: ");
-    DEF_STR(PLUG_HLE_GFX,  L"Graphics HLE");
-    DEF_STR(PLUG_HLE_AUDIO,L"Audio HLE");
-    DEF_STR(PLUG_DEFAULT,  L"** Use System Plugin **");
+    DEF_STR(PLUG_ABOUT, L"About");
+    DEF_STR(PLUG_RSP, L" RSP (Reality Signal Processor) plugin: ");
+    DEF_STR(PLUG_GFX, L" Video (graphics) plugin: ");
+    DEF_STR(PLUG_AUDIO, L" Audio (sound) plugin: ");
+    DEF_STR(PLUG_CTRL, L" Input (controller) plugin: ");
+    DEF_STR(PLUG_HLE_GFX, L"Graphics HLE");
+    DEF_STR(PLUG_HLE_AUDIO, L"Audio HLE");
+    DEF_STR(PLUG_DEFAULT, L"** Use System Plugin **");
 
     //Directory Dialog
-    DEF_STR(DIR_PLUGIN,        L" Plugin directory: ");
-    DEF_STR(DIR_ROM,           L" ROM directory: ");
-    DEF_STR(DIR_AUTO_SAVE,     L" N64 native saves directory: ");
-    DEF_STR(DIR_INSTANT_SAVE,  L" Saved states directory: ");
-    DEF_STR(DIR_SCREEN_SHOT,   L" Screenshot directory: ");
-    DEF_STR(DIR_ROM_DEFAULT,   L"Last folder that a ROM was open from");
+    DEF_STR(DIR_PLUGIN, L" Plugin directory: ");
+    DEF_STR(DIR_ROM, L" ROM directory: ");
+    DEF_STR(DIR_AUTO_SAVE, L" N64 native saves directory: ");
+    DEF_STR(DIR_INSTANT_SAVE, L" Saved states directory: ");
+    DEF_STR(DIR_SCREEN_SHOT, L" Screenshot directory: ");
+    DEF_STR(DIR_ROM_DEFAULT, L"Last folder that a ROM was open from");
     DEF_STR(DIR_SELECT_PLUGIN, L"Select plugin directory");
-    DEF_STR(DIR_SELECT_ROM,    L"Select ROM directory");
-    DEF_STR(DIR_SELECT_AUTO,   L"Select N64 native saves directory");
-    DEF_STR(DIR_SELECT_INSTANT,L"Select saved states directory");
+    DEF_STR(DIR_SELECT_ROM, L"Select ROM directory");
+    DEF_STR(DIR_SELECT_AUTO, L"Select N64 native saves directory");
+    DEF_STR(DIR_SELECT_INSTANT, L"Select saved states directory");
     DEF_STR(DIR_SELECT_SCREEN, L"Select screenshot directory");
-    DEF_STR(DIR_TEXTURE,        L" Texture pack directory: ");
+    DEF_STR(DIR_TEXTURE, L" Texture pack directory: ");
     DEF_STR(DIR_SELECT_TEXTURE, L"Select texture pack directory");
 
     //Options (general) Tab
-    DEF_STR(OPTION_AUTO_SLEEP,      L"Pause emulation when window is not active");
+    DEF_STR(OPTION_AUTO_SLEEP, L"Pause emulation when window is not active");
     DEF_STR(OPTION_AUTO_FULLSCREEN, L"Enter full-screen mode when loading a ROM");
-    DEF_STR(OPTION_BASIC_MODE,      L"Hide advanced settings");
-    DEF_STR(OPTION_REMEMBER_CHEAT,  L"Remember selected cheats");
-    DEF_STR(OPTION_DISABLE_SS,      L"Disable screen saver when running a ROM");
-    DEF_STR(OPTION_DISPLAY_FR,      L"Display speed");
-    DEF_STR(OPTION_CHECK_RUNNING,   L"Check if Project64 is already running");
-    DEF_STR(OPTION_CHANGE_FR,       L"Speed display:");
+    DEF_STR(OPTION_BASIC_MODE, L"Hide advanced settings");
+    DEF_STR(OPTION_REMEMBER_CHEAT, L"Remember selected cheats");
+    DEF_STR(OPTION_DISABLE_SS, L"Disable screen saver when running a ROM");
+    DEF_STR(OPTION_DISPLAY_FR, L"Display speed");
+    DEF_STR(OPTION_CHECK_RUNNING, L"Check if Project64 is already running");
+    DEF_STR(OPTION_CHANGE_FR, L"Speed display:");
 
     //ROM Browser Tab
-    DEF_STR(RB_MAX_ROMS,         L"Max # of ROMs remembered (0-10):");
-    DEF_STR(RB_ROMS,             L"ROMs");
-    DEF_STR(RB_MAX_DIRS,         L"Max # of ROM dirs remembered (0-10):");
-    DEF_STR(RB_DIRS,             L"dirs");
-    DEF_STR(RB_USE,              L"Use ROM browser");
-    DEF_STR(RB_DIR_RECURSION,    L"Use directory recursion");
+    DEF_STR(RB_MAX_ROMS, L"Max # of ROMs remembered (0-10):");
+    DEF_STR(RB_ROMS, L"ROMs");
+    DEF_STR(RB_MAX_DIRS, L"Max # of ROM dirs remembered (0-10):");
+    DEF_STR(RB_DIRS, L"dirs");
+    DEF_STR(RB_USE, L"Use ROM browser");
+    DEF_STR(RB_DIR_RECURSION, L"Use directory recursion");
     DEF_STR(RB_AVALIABLE_FIELDS, L"Available fields:");
-    DEF_STR(RB_SHOW_FIELDS,      L"Order of fields:");
-    DEF_STR(RB_ADD,              L"Add ->");
-    DEF_STR(RB_REMOVE,           L"<- Remove");
-    DEF_STR(RB_UP,               L"Up");
-    DEF_STR(RB_DOWN,             L"Down");
-    DEF_STR(RB_REFRESH,          L"Automatically refresh browser");
+    DEF_STR(RB_SHOW_FIELDS, L"Order of fields:");
+    DEF_STR(RB_ADD, L"Add ->");
+    DEF_STR(RB_REMOVE, L"<- Remove");
+    DEF_STR(RB_UP, L"Up");
+    DEF_STR(RB_DOWN, L"Down");
+    DEF_STR(RB_REFRESH, L"Automatically refresh browser");
 
     //Advanced Options
-    DEF_STR(ADVANCE_INFO,        L"Most of these changes will not take effect until a new ROM is opened or current ROM is reset.");
-    DEF_STR(ADVANCE_DEFAULTS,    L"Core Defaults");
-    DEF_STR(ADVANCE_CPU_STYLE,   L"CPU core style:");
-    DEF_STR(ADVANCE_SMCM,        L"Self-mod methods:");
-    DEF_STR(ADVANCE_MEM_SIZE,    L"Default memory size:");
-    DEF_STR(ADVANCE_ABL,         L"Advanced block linking");
-    DEF_STR(ADVANCE_AUTO_START,  L"Start emulation when ROM is opened");
-    DEF_STR(ADVANCE_OVERWRITE,   L"Always override default settings with ones from RDB");
-    DEF_STR(ADVANCE_COMPRESS,    L"Automatically compress saved states");
-    DEF_STR(ADVANCE_DEBUGGER,    L"Enable debugger");
-    DEF_STR(ADVANCE_SMM_CACHE,   L"Cache");
-    DEF_STR(ADVANCE_SMM_PIDMA,   L"PI DMA");
-    DEF_STR(ADVANCE_SMM_VALIDATE,L"Start changed");
+    DEF_STR(ADVANCE_INFO, L"Most of these changes will not take effect until a new ROM is opened or current ROM is reset.");
+    DEF_STR(ADVANCE_DEFAULTS, L"Core Defaults");
+    DEF_STR(ADVANCE_CPU_STYLE, L"CPU core style:");
+    DEF_STR(ADVANCE_SMCM, L"Self-mod methods:");
+    DEF_STR(ADVANCE_MEM_SIZE, L"Default memory size:");
+    DEF_STR(ADVANCE_ABL, L"Advanced block linking");
+    DEF_STR(ADVANCE_AUTO_START, L"Start emulation when ROM is opened");
+    DEF_STR(ADVANCE_OVERWRITE, L"Always override default settings with ones from RDB");
+    DEF_STR(ADVANCE_COMPRESS, L"Automatically compress saved states");
+    DEF_STR(ADVANCE_DEBUGGER, L"Enable debugger");
+    DEF_STR(ADVANCE_SMM_CACHE, L"Cache");
+    DEF_STR(ADVANCE_SMM_PIDMA, L"PI DMA");
+    DEF_STR(ADVANCE_SMM_VALIDATE, L"Start changed");
     DEF_STR(ADVANCE_SMM_PROTECT, L"Protect memory");
-    DEF_STR(ADVANCE_SMM_TLB,     L"TLB unmapping");
+    DEF_STR(ADVANCE_SMM_TLB, L"TLB unmapping");
 
     //ROM Options
-    DEF_STR(ROM_CPU_STYLE,       L"CPU core style:");
-    DEF_STR(ROM_VIREFRESH,       L"VI refresh rate:");
-    DEF_STR(ROM_MEM_SIZE,        L"Memory size:");
-    DEF_STR(ROM_ABL,             L"Advanced block linking");
-    DEF_STR(ROM_SAVE_TYPE,       L"Default save type:");
-    DEF_STR(ROM_COUNTER_FACTOR,  L"Counter factor:");
-    DEF_STR(ROM_LARGE_BUFFER,    L"Larger compile buffer");
-    DEF_STR(ROM_USE_TLB,         L"Use TLB");
-    DEF_STR(ROM_REG_CACHE,       L"Register caching");
-    DEF_STR(ROM_DELAY_SI,        L"Delay SI interrupt");
-    DEF_STR(ROM_FAST_SP,         L"Fast SP");
-    DEF_STR(ROM_DEFAULT,         L"Default");
-    DEF_STR(ROM_AUDIO_SIGNAL,    L"RSP audio signal");
-    DEF_STR(ROM_FIXED_AUDIO,     L"Fixed audio timing");
-    DEF_STR(ROM_FUNC_FIND,       L"Function lookup method:");
-    DEF_STR(ROM_CUSTOM_SMM,      L"Custom self mod Method");
-    DEF_STR(ROM_SYNC_AUDIO,      L"Sync using audio");
-    DEF_STR(ROM_COUNTPERBYTE,	 L"AI count per byte:");
-    DEF_STR(ROM_32BIT,			 L"32-bit engine:");
-    DEF_STR(ROM_DELAY_DP,		 L"Delay DP interrupt:");
+    DEF_STR(ROM_CPU_STYLE, L"CPU core style:");
+    DEF_STR(ROM_VIREFRESH, L"VI refresh rate:");
+    DEF_STR(ROM_MEM_SIZE, L"Memory size:");
+    DEF_STR(ROM_ABL, L"Advanced block linking");
+    DEF_STR(ROM_SAVE_TYPE, L"Default save type:");
+    DEF_STR(ROM_COUNTER_FACTOR, L"Counter factor:");
+    DEF_STR(ROM_LARGE_BUFFER, L"Larger compile buffer");
+    DEF_STR(ROM_USE_TLB, L"Use TLB");
+    DEF_STR(ROM_REG_CACHE, L"Register caching");
+    DEF_STR(ROM_DELAY_SI, L"Delay SI interrupt");
+    DEF_STR(ROM_FAST_SP, L"Fast SP");
+    DEF_STR(ROM_DEFAULT, L"Default");
+    DEF_STR(ROM_AUDIO_SIGNAL, L"RSP audio signal");
+    DEF_STR(ROM_FIXED_AUDIO, L"Fixed audio timing");
+    DEF_STR(ROM_FUNC_FIND, L"Function lookup method:");
+    DEF_STR(ROM_CUSTOM_SMM, L"Custom self mod Method");
+    DEF_STR(ROM_SYNC_AUDIO, L"Sync using audio");
+    DEF_STR(ROM_COUNTPERBYTE, L"AI count per byte:");
+    DEF_STR(ROM_32BIT, L"32-bit engine:");
+    DEF_STR(ROM_DELAY_DP, L"Delay DP interrupt:");
 
     //Core Styles
-    DEF_STR(CORE_INTERPTER,      L"Interpreter");
-    DEF_STR(CORE_RECOMPILER,     L"Recompiler");
-    DEF_STR(CORE_SYNC,           L"Synchronize cores");
+    DEF_STR(CORE_INTERPTER, L"Interpreter");
+    DEF_STR(CORE_RECOMPILER, L"Recompiler");
+    DEF_STR(CORE_SYNC, L"Synchronize cores");
 
     //Self Mod Methods
-    DEF_STR(SMCM_NONE,           L"None");
-    DEF_STR(SMCM_CACHE,          L"Cache");
-    DEF_STR(SMCM_PROECTED,       L"Protect memory");
-    DEF_STR(SMCM_CHECK_MEM,      L"Check memory & cache");
-    DEF_STR(SMCM_CHANGE_MEM,     L"Change memory & cache");
-    DEF_STR(SMCM_CHECK_ADV,      L"Check memory advance");
-    DEF_STR(SMCM_CACHE2,         L"Clear code on cache");
+    DEF_STR(SMCM_NONE, L"None");
+    DEF_STR(SMCM_CACHE, L"Cache");
+    DEF_STR(SMCM_PROECTED, L"Protect memory");
+    DEF_STR(SMCM_CHECK_MEM, L"Check memory & cache");
+    DEF_STR(SMCM_CHANGE_MEM, L"Change memory & cache");
+    DEF_STR(SMCM_CHECK_ADV, L"Check memory advance");
+    DEF_STR(SMCM_CACHE2, L"Clear code on cache");
 
     //Function Lookup method
-    DEF_STR(FLM_PLOOKUP,         L"Physical lookup table");
-    DEF_STR(FLM_VLOOKUP,         L"Virtual lookup table");
-    DEF_STR(FLM_CHANGEMEM,       L"Change memory");
+    DEF_STR(FLM_PLOOKUP, L"Physical lookup table");
+    DEF_STR(FLM_VLOOKUP, L"Virtual lookup table");
+    DEF_STR(FLM_CHANGEMEM, L"Change memory");
 
     //RDRAM Size
-    DEF_STR(RDRAM_4MB,           L"4 MB");
-    DEF_STR(RDRAM_8MB,           L"8 MB");
+    DEF_STR(RDRAM_4MB, L"4 MB");
+    DEF_STR(RDRAM_8MB, L"8 MB");
 
     //Advanced Block Linking
-    DEF_STR(ABL_ON,              L"On");
-    DEF_STR(ABL_OFF,             L"Off");
+    DEF_STR(ABL_ON, L"On");
+    DEF_STR(ABL_OFF, L"Off");
 
     //Save Type
-    DEF_STR(SAVE_FIRST_USED,     L"Use first-used save type");
-    DEF_STR(SAVE_4K_EEPROM,      L"4-kbit EEPROM");
-    DEF_STR(SAVE_16K_EEPROM,     L"16-kbit EEPROM");
-    DEF_STR(SAVE_SRAM,           L"SRAM");
-    DEF_STR(SAVE_FLASHRAM,       L"Flash RAM");
+    DEF_STR(SAVE_FIRST_USED, L"Use first-used save type");
+    DEF_STR(SAVE_4K_EEPROM, L"4-kbit EEPROM");
+    DEF_STR(SAVE_16K_EEPROM, L"16-kbit EEPROM");
+    DEF_STR(SAVE_SRAM, L"SRAM");
+    DEF_STR(SAVE_FLASHRAM, L"Flash RAM");
 
     //Shell Integration Tab
-    DEF_STR(SHELL_TEXT,          L"File extension association:");
+    DEF_STR(SHELL_TEXT, L"File extension association:");
 
     //ROM Notes
-    DEF_STR(NOTE_STATUS,         L"ROM status:");
-    DEF_STR(NOTE_CORE,           L"Core note:");
-    DEF_STR(NOTE_PLUGIN,         L"Plugin note:");
+    DEF_STR(NOTE_STATUS, L"ROM status:");
+    DEF_STR(NOTE_CORE, L"Core note:");
+    DEF_STR(NOTE_PLUGIN, L"Plugin note:");
 
     // Accelerator Selector
-    DEF_STR(ACCEL_CPUSTATE_TITLE,    L"CPU state:");
-    DEF_STR(ACCEL_MENUITEM_TITLE,    L"Menu item:");
+    DEF_STR(ACCEL_CPUSTATE_TITLE, L"CPU state:");
+    DEF_STR(ACCEL_MENUITEM_TITLE, L"Menu item:");
     DEF_STR(ACCEL_CURRENTKEYS_TITLE, L"Current keys:");
-    DEF_STR(ACCEL_SELKEY_TITLE,      L"Select new shortcut key:");
-    DEF_STR(ACCEL_ASSIGNEDTO_TITLE,  L"Currently assigned to:");
-    DEF_STR(ACCEL_ASSIGN_BTN,        L"Assign");
-    DEF_STR(ACCEL_REMOVE_BTN,        L"Remove");
-    DEF_STR(ACCEL_RESETALL_BTN,      L"Reset all");
-    DEF_STR(ACCEL_CPUSTATE_1,        L"Game not playing");
-    DEF_STR(ACCEL_CPUSTATE_2,        L"Game playing");
-    DEF_STR(ACCEL_CPUSTATE_3,        L"Game playing (windowed)");
-    DEF_STR(ACCEL_CPUSTATE_4,        L"Game playing (full-screen)");
-    DEF_STR(ACCEL_DETECTKEY,         L"Detect Key");
+    DEF_STR(ACCEL_SELKEY_TITLE, L"Select new shortcut key:");
+    DEF_STR(ACCEL_ASSIGNEDTO_TITLE, L"Currently assigned to:");
+    DEF_STR(ACCEL_ASSIGN_BTN, L"Assign");
+    DEF_STR(ACCEL_REMOVE_BTN, L"Remove");
+    DEF_STR(ACCEL_RESETALL_BTN, L"Reset all");
+    DEF_STR(ACCEL_CPUSTATE_1, L"Game not playing");
+    DEF_STR(ACCEL_CPUSTATE_2, L"Game playing");
+    DEF_STR(ACCEL_CPUSTATE_3, L"Game playing (windowed)");
+    DEF_STR(ACCEL_CPUSTATE_4, L"Game playing (full-screen)");
+    DEF_STR(ACCEL_DETECTKEY, L"Detect Key");
 
     // Frame Rate Option
-    DEF_STR(STR_FR_VIS,              L"Vertical interrupts per second");
-    DEF_STR(STR_FR_DLS,              L"Display lists per second");
-    DEF_STR(STR_FR_PERCENT,          L"Percentage of full speed");
+    DEF_STR(STR_FR_VIS, L"Vertical interrupts per second");
+    DEF_STR(STR_FR_DLS, L"Display lists per second");
+    DEF_STR(STR_FR_PERCENT, L"Percentage of full speed");
 
     // Increase speed
-    DEF_STR(STR_INSREASE_SPEED,      L"Increase Game Speed");
-    DEF_STR(STR_DECREASE_SPEED,      L"Decrease Game Speed");
+    DEF_STR(STR_INSREASE_SPEED, L"Increase Game Speed");
+    DEF_STR(STR_DECREASE_SPEED, L"Decrease Game Speed");
 
     //Bottom page buttons
-    DEF_STR(BOTTOM_RESET_PAGE,      L"Reset Page");
-    DEF_STR(BOTTOM_RESET_ALL,       L"Reset All");
-    DEF_STR(BOTTOM_APPLY,			L"Apply");
-    DEF_STR(BOTTOM_CLOSE,			L"Close");
+    DEF_STR(BOTTOM_RESET_PAGE, L"Reset Page");
+    DEF_STR(BOTTOM_RESET_ALL, L"Reset All");
+    DEF_STR(BOTTOM_APPLY, L"Apply");
+    DEF_STR(BOTTOM_CLOSE, L"Close");
 
     /*********************************************************************************
     * ROM Information                                                                *
     *********************************************************************************/
     //ROM Info Title
-    DEF_STR(INFO_TITLE,             L"ROM Information");
+    DEF_STR(INFO_TITLE, L"ROM Information");
 
     //ROM Info Text
-    DEF_STR(INFO_ROM_NAME_TEXT,     L"ROM name:");
-    DEF_STR(INFO_FILE_NAME_TEXT,    L"File name:");
-    DEF_STR(INFO_LOCATION_TEXT,     L"Location:");
-    DEF_STR(INFO_SIZE_TEXT,         L"ROM size:");
-    DEF_STR(INFO_CART_ID_TEXT,      L"Cartridge ID:");
+    DEF_STR(INFO_ROM_NAME_TEXT, L"ROM name:");
+    DEF_STR(INFO_FILE_NAME_TEXT, L"File name:");
+    DEF_STR(INFO_LOCATION_TEXT, L"Location:");
+    DEF_STR(INFO_SIZE_TEXT, L"ROM size:");
+    DEF_STR(INFO_CART_ID_TEXT, L"Cartridge ID:");
     DEF_STR(INFO_MANUFACTURER_TEXT, L"Manufacturer:");
-    DEF_STR(INFO_COUNTRY_TEXT,      L"Country:");
-    DEF_STR(INFO_CRC1_TEXT,         L"CRC1:");
-    DEF_STR(INFO_CRC2_TEXT,         L"CRC2:");
-    DEF_STR(INFO_CIC_CHIP_TEXT,     L"CIC chip:");
-    DEF_STR(INFO_MD5_TEXT,          L"MD5:");
+    DEF_STR(INFO_COUNTRY_TEXT, L"Country:");
+    DEF_STR(INFO_CRC1_TEXT, L"CRC1:");
+    DEF_STR(INFO_CRC2_TEXT, L"CRC2:");
+    DEF_STR(INFO_CIC_CHIP_TEXT, L"CIC chip:");
+    DEF_STR(INFO_MD5_TEXT, L"MD5:");
 
     /*********************************************************************************
     * Cheats                                                                         *
     *********************************************************************************/
     //Cheat List
-    DEF_STR(CHEAT_TITLE,           L"Cheats");
-    DEF_STR(CHEAT_LIST_FRAME,      L"Cheats:");
-    DEF_STR(CHEAT_NOTES_FRAME,     L" Notes: ");
-    DEF_STR(CHEAT_MARK_ALL,        L"Mark All");
-    DEF_STR(CHEAT_MARK_NONE,       L"Unmark All");
+    DEF_STR(CHEAT_TITLE, L"Cheats");
+    DEF_STR(CHEAT_LIST_FRAME, L"Cheats:");
+    DEF_STR(CHEAT_NOTES_FRAME, L" Notes: ");
+    DEF_STR(CHEAT_MARK_ALL, L"Mark All");
+    DEF_STR(CHEAT_MARK_NONE, L"Unmark All");
 
     //Add Cheat
-    DEF_STR(CHEAT_ADDCHEAT_FRAME,  L"Add Cheat");
-    DEF_STR(CHEAT_ADDCHEAT_NAME,   L"Name:");
-    DEF_STR(CHEAT_ADDCHEAT_CODE,   L"Code:");
+    DEF_STR(CHEAT_ADDCHEAT_FRAME, L"Add Cheat");
+    DEF_STR(CHEAT_ADDCHEAT_NAME, L"Name:");
+    DEF_STR(CHEAT_ADDCHEAT_CODE, L"Code:");
     DEF_STR(CHEAT_ADDCHEAT_INSERT, L"Insert");
-    DEF_STR(CHEAT_ADDCHEAT_CLEAR,  L"Clear");
-    DEF_STR(CHEAT_ADDCHEAT_NOTES,  L" Cheat Notes: ");
-    DEF_STR(CHEAT_ADD_TO_DB,       L"Add to DB");
+    DEF_STR(CHEAT_ADDCHEAT_CLEAR, L"Clear");
+    DEF_STR(CHEAT_ADDCHEAT_NOTES, L" Cheat Notes: ");
+    DEF_STR(CHEAT_ADD_TO_DB, L"Add to DB");
 
     //Code extension
-    DEF_STR(CHEAT_CODE_EXT_TITLE,  L"Code Extensions");
-    DEF_STR(CHEAT_CODE_EXT_TXT,    L"Please choose a value to be used for:");
-    DEF_STR(CHEAT_OK,              L"OK");
-    DEF_STR(CHEAT_CANCEL,          L"Cancel");
+    DEF_STR(CHEAT_CODE_EXT_TITLE, L"Code Extensions");
+    DEF_STR(CHEAT_CODE_EXT_TXT, L"Please choose a value to be used for:");
+    DEF_STR(CHEAT_OK, L"OK");
+    DEF_STR(CHEAT_CANCEL, L"Cancel");
 
     //Digital Value
-    DEF_STR(CHEAT_QUANTITY_TITLE,  L"Quantity Digit");
-    DEF_STR(CHEAT_CHOOSE_VALUE,    L"Please choose a value for:");
-    DEF_STR(CHEAT_VALUE,           L"&Value");
-    DEF_STR(CHEAT_FROM,            L"from");
-    DEF_STR(CHEAT_TO,              L"to");
-    DEF_STR(CHEAT_NOTES,           L"&Notes:");
-    DEF_STR(CHEAT_ADDCHEAT_ADD,    L"Add Cheat");
-    DEF_STR(CHEAT_ADDCHEAT_NEW,    L"New Cheat");
-    DEF_STR(CHEAT_ADDCHEAT_CODEDES,L"<address> <value>");
-    DEF_STR(CHEAT_ADDCHEAT_OPT,    L"Options:");
+    DEF_STR(CHEAT_QUANTITY_TITLE, L"Quantity Digit");
+    DEF_STR(CHEAT_CHOOSE_VALUE, L"Please choose a value for:");
+    DEF_STR(CHEAT_VALUE, L"&Value");
+    DEF_STR(CHEAT_FROM, L"from");
+    DEF_STR(CHEAT_TO, L"to");
+    DEF_STR(CHEAT_NOTES, L"&Notes:");
+    DEF_STR(CHEAT_ADDCHEAT_ADD, L"Add Cheat");
+    DEF_STR(CHEAT_ADDCHEAT_NEW, L"New Cheat");
+    DEF_STR(CHEAT_ADDCHEAT_CODEDES, L"<address> <value>");
+    DEF_STR(CHEAT_ADDCHEAT_OPT, L"Options:");
     DEF_STR(CHEAT_ADDCHEAT_OPTDES, L"<value> <label>");
 
     //Edit Cheat
-    DEF_STR(CHEAT_EDITCHEAT_WINDOW,L"Edit Cheat");
-    DEF_STR(CHEAT_EDITCHEAT_UPDATE,L"Update Cheat");
-    DEF_STR(CHEAT_CHANGED_MSG,     L"Cheat has been changed.\n\nDo you want to update?");
-    DEF_STR(CHEAT_CHANGED_TITLE,   L"Cheat updated");
+    DEF_STR(CHEAT_EDITCHEAT_WINDOW, L"Edit Cheat");
+    DEF_STR(CHEAT_EDITCHEAT_UPDATE, L"Update Cheat");
+    DEF_STR(CHEAT_CHANGED_MSG, L"Cheat has been changed.\n\nDo you want to update?");
+    DEF_STR(CHEAT_CHANGED_TITLE, L"Cheat updated");
 
     //Cheat Popup Menu
-    DEF_STR(CHEAT_ADDNEW,          L"Add New Cheat...");
-    DEF_STR(CHEAT_EDIT,            L"Edit");
-    DEF_STR(CHEAT_DELETE,          L"Delete");
+    DEF_STR(CHEAT_ADDNEW, L"Add New Cheat...");
+    DEF_STR(CHEAT_EDIT, L"Edit");
+    DEF_STR(CHEAT_DELETE, L"Delete");
 
     // short-cut editor
     DEF_STR(STR_SHORTCUT_RESET_TITLE, L"Reset short-cuts");
-    DEF_STR(STR_SHORTCUT_RESET_TEXT,  L"Are you sure you want to reset the short-cuts?\n\nThis action cannot be undone.");
-    DEF_STR(STR_SHORTCUT_FILEMENU,    L"File Menu");
-    DEF_STR(STR_SHORTCUT_SYSTEMMENU,  L"System Menu");
-    DEF_STR(STR_SHORTCUT_OPTIONS,     L"Options");
-    DEF_STR(STR_SHORTCUT_SAVESLOT,    L"Save Slots");
+    DEF_STR(STR_SHORTCUT_RESET_TEXT, L"Are you sure you want to reset the short-cuts?\n\nThis action cannot be undone.");
+    DEF_STR(STR_SHORTCUT_FILEMENU, L"File Menu");
+    DEF_STR(STR_SHORTCUT_SYSTEMMENU, L"System Menu");
+    DEF_STR(STR_SHORTCUT_OPTIONS, L"Options");
+    DEF_STR(STR_SHORTCUT_SAVESLOT, L"Save Slots");
 
     /*********************************************************************************
     * Messages                                                                       *
     *********************************************************************************/
-    DEF_STR(MSG_CPU_PAUSED,         L"*** CPU PAUSED ***");
-    DEF_STR(MSG_CPU_RESUMED,        L"CPU resumed");
-    DEF_STR(MSG_PERM_LOOP,          L"In a permanent loop that cannot be exited.\nEmulation will now stop.\n\nVerify ROM and its settings.");
-    DEF_STR(MSG_MEM_ALLOC_ERROR,    L"Failed to allocate memory");
-    DEF_STR(MSG_FAIL_INIT_GFX,      L"The default or selected video plugin is missing or invalid.\n\nYou need to go into Settings and select a video (graphics) plugin.\nCheck that you have at least one compatible plugin file in your plugin folder.");
-    DEF_STR(MSG_FAIL_INIT_AUDIO,    L"The default or selected audio plugin is missing or invalid.\n\nYou need to go into Settings and select a audio (sound) plugin.\nCheck that you have at least one compatible plugin file in your plugin folder.");
-    DEF_STR(MSG_FAIL_INIT_RSP,      L"The default or selected RSP plugin is missing or invalid.\n\nYou need to go into Settings and select a RSP (Reality Signal Processor) plugin.\nCheck that you have at least one compatible plugin file in your plugin folder.");
-    DEF_STR(MSG_FAIL_INIT_CONTROL,  L"The default or selected input plugin is missing or invalid.\n\nYou need to go into Settings and select an input (controller) plugin.\nCheck that you have at least one compatible plugin file in your plugin folder.");
-    DEF_STR(MSG_FAIL_LOAD_PLUGIN,   L"Failed to load plugin:");
-    DEF_STR(MSG_FAIL_LOAD_WORD,     L"Failed to load word.\n\nVerify ROM and its settings.");
-    DEF_STR(MSG_FAIL_OPEN_SAVE,     L"Failed to open save file");
-    DEF_STR(MSG_FAIL_OPEN_EEPROM,   L"Failed to open EEPROM");
-    DEF_STR(MSG_FAIL_OPEN_FLASH,    L"Failed to open flash RAM");
-    DEF_STR(MSG_FAIL_OPEN_MEMPAK,   L"Failed to open mempak");
-    DEF_STR(MSG_FAIL_OPEN_ZIP,      L"Attempt to open zip file failed.\n\nProbably a corrupt zip file - try unzipping ROM manually.");
-    DEF_STR(MSG_FAIL_OPEN_IMAGE,    L"Attempt to open file failed.");
-    DEF_STR(MSG_FAIL_ZIP,           L"Error occurred when trying to open zip file.");
-    DEF_STR(MSG_FAIL_IMAGE,         L"File loaded does not appear to be a valid N64 ROM.\n\nVerify your ROMs with GoodN64.");
-    DEF_STR(MSG_UNKNOWN_COUNTRY,    L"Unknown country");
-    DEF_STR(MSG_UNKNOWN_CIC_CHIP,   L"Unknown CIC chip");
-    DEF_STR(MSG_UNKNOWN_FILE_FORMAT,L"Unknown file format");
+    DEF_STR(MSG_CPU_PAUSED, L"*** CPU PAUSED ***");
+    DEF_STR(MSG_CPU_RESUMED, L"CPU resumed");
+    DEF_STR(MSG_PERM_LOOP, L"In a permanent loop that cannot be exited.\nEmulation will now stop.\n\nVerify ROM and its settings.");
+    DEF_STR(MSG_MEM_ALLOC_ERROR, L"Failed to allocate memory");
+    DEF_STR(MSG_FAIL_INIT_GFX, L"The default or selected video plugin is missing or invalid.\n\nYou need to go into Settings and select a video (graphics) plugin.\nCheck that you have at least one compatible plugin file in your plugin folder.");
+    DEF_STR(MSG_FAIL_INIT_AUDIO, L"The default or selected audio plugin is missing or invalid.\n\nYou need to go into Settings and select a audio (sound) plugin.\nCheck that you have at least one compatible plugin file in your plugin folder.");
+    DEF_STR(MSG_FAIL_INIT_RSP, L"The default or selected RSP plugin is missing or invalid.\n\nYou need to go into Settings and select a RSP (Reality Signal Processor) plugin.\nCheck that you have at least one compatible plugin file in your plugin folder.");
+    DEF_STR(MSG_FAIL_INIT_CONTROL, L"The default or selected input plugin is missing or invalid.\n\nYou need to go into Settings and select an input (controller) plugin.\nCheck that you have at least one compatible plugin file in your plugin folder.");
+    DEF_STR(MSG_FAIL_LOAD_PLUGIN, L"Failed to load plugin:");
+    DEF_STR(MSG_FAIL_LOAD_WORD, L"Failed to load word.\n\nVerify ROM and its settings.");
+    DEF_STR(MSG_FAIL_OPEN_SAVE, L"Failed to open save file");
+    DEF_STR(MSG_FAIL_OPEN_EEPROM, L"Failed to open EEPROM");
+    DEF_STR(MSG_FAIL_OPEN_FLASH, L"Failed to open flash RAM");
+    DEF_STR(MSG_FAIL_OPEN_MEMPAK, L"Failed to open mempak");
+    DEF_STR(MSG_FAIL_OPEN_ZIP, L"Attempt to open zip file failed.\n\nProbably a corrupt zip file - try unzipping ROM manually.");
+    DEF_STR(MSG_FAIL_OPEN_IMAGE, L"Attempt to open file failed.");
+    DEF_STR(MSG_FAIL_ZIP, L"Error occurred when trying to open zip file.");
+    DEF_STR(MSG_FAIL_IMAGE, L"File loaded does not appear to be a valid N64 ROM.\n\nVerify your ROMs with GoodN64.");
+    DEF_STR(MSG_UNKNOWN_COUNTRY, L"Unknown country");
+    DEF_STR(MSG_UNKNOWN_CIC_CHIP, L"Unknown CIC chip");
+    DEF_STR(MSG_UNKNOWN_FILE_FORMAT, L"Unknown file format");
     DEF_STR(MSG_UNKNOWN_MEM_ACTION, L"Unknown memory action\n\nEmulation stopped");
-    DEF_STR(MSG_UNHANDLED_OP,       L"Unhandled R4300i opcode at");
-    DEF_STR(MSG_NONMAPPED_SPACE,    L"Executing from non-mapped space.\n\nVerify ROM and its settings.");
-    DEF_STR(MSG_SAVE_STATE_HEADER,  L"This saved state does not appear to match the running ROM.\n\nStates must be saved & loaded between 100% identical ROMs.\nIn particular, the REGION and VERSION need to be the same.\nLoading this state is likely to cause the game and/or emulator to crash.\n\nAre you sure you want to continue loading?");
-    DEF_STR(MSG_MSGBOX_TITLE,       L"Error");
-    DEF_STR(MSG_PIF2_ERROR,         L"Copyright sequence not found in LUT. Game will no longer function.");
-    DEF_STR(MSG_PIF2_TITLE,         L"Copy Protection Failure");
-    DEF_STR(MSG_PLUGIN_CHANGE,      L"Changing a plugin requires Project64 to reset a running ROM.\nIf you don't want to lose your place, answer No and save the current state first.\n\nChange plugins and reset ROM now?");
-    DEF_STR(MSG_PLUGIN_CHANGE_TITLE,L"Change Plugins");
-    DEF_STR(MSG_EMULATION_ENDED,    L"Emulation ended");
-    DEF_STR(MSG_EMULATION_STARTED,  L"Emulation started");
+    DEF_STR(MSG_UNHANDLED_OP, L"Unhandled R4300i opcode at");
+    DEF_STR(MSG_NONMAPPED_SPACE, L"Executing from non-mapped space.\n\nVerify ROM and its settings.");
+    DEF_STR(MSG_SAVE_STATE_HEADER, L"This saved state does not appear to match the running ROM.\n\nStates must be saved & loaded between 100% identical ROMs.\nIn particular, the REGION and VERSION need to be the same.\nLoading this state is likely to cause the game and/or emulator to crash.\n\nAre you sure you want to continue loading?");
+    DEF_STR(MSG_MSGBOX_TITLE, L"Error");
+    DEF_STR(MSG_PIF2_ERROR, L"Copyright sequence not found in LUT. Game will no longer function.");
+    DEF_STR(MSG_PIF2_TITLE, L"Copy Protection Failure");
+    DEF_STR(MSG_PLUGIN_CHANGE, L"Changing a plugin requires Project64 to reset a running ROM.\nIf you don't want to lose your place, answer No and save the current state first.\n\nChange plugins and reset ROM now?");
+    DEF_STR(MSG_PLUGIN_CHANGE_TITLE, L"Change Plugins");
+    DEF_STR(MSG_EMULATION_ENDED, L"Emulation ended");
+    DEF_STR(MSG_EMULATION_STARTED, L"Emulation started");
     DEF_STR(MSG_UNABLED_LOAD_STATE, L"Unable to load state");
-    DEF_STR(MSG_LOADED_STATE,       L"Loaded state");
-    DEF_STR(MSG_SAVED_STATE,        L"Saved current state to");
-    DEF_STR(MSG_SAVE_SLOT,          L"State slot");
-    DEF_STR(MSG_BYTESWAP,           L"Byte-swapping image");
-    DEF_STR(MSG_CHOOSE_IMAGE,       L"Choosing N64 image");
-    DEF_STR(MSG_LOADED,             L"Loaded");
-    DEF_STR(MSG_LOADING,            L"Loading image");
-    DEF_STR(MSG_PLUGIN_NOT_INIT,    L"Cannot open a ROM because plugins have not successfully initialized.");
-    DEF_STR(MSG_DEL_SURE,           L"Are you sure you really want to delete this?");
-    DEF_STR(MSG_DEL_TITLE,          L"Delete Cheat");
-    DEF_STR(MSG_CHEAT_NAME_IN_USE,  L"Cheat name is already in use.");
-    DEF_STR(MSG_MAX_CHEATS,         L"You have reached the maximum amount of cheats for this ROM.");
-    DEF_STR(MSG_PLUGIN_INIT,		L"Plugin initializing");
-    DEF_STR(MSG_NO_SHORTCUT_SEL,	L"You have not selected a virtual key to assign to the menu item.");
-    DEF_STR(MSG_NO_MENUITEM_SEL,	L"You need to select a menu item to assign this key to.");
-    DEF_STR(MSG_MENUITEM_ASSIGNED,	L"Short-cut has already been assigned to another menu item.");
-    DEF_STR(MSG_NO_SEL_SHORTCUT,	L"No shortcut has been selected to be removed.");
-    DEF_STR(MSG_WAITING_FOR_START,	L"ROM loaded. Waiting for emulation to start.");
-    DEF_STR(MSG_INVALID_EXE,		L"Project64 beta versions are for members only.\n\nIf you have an account at www.pj64-emu.com, you should not be seeing this error!!\nPlease contact us on the site.");
-    DEF_STR(MSG_INVALID_EXE_TITLE,  L"Program Error");
-    DEF_STR(MSG_7Z_FILE_NOT_FOUND,  L"Failed to find filename in 7z file");
-    DEF_STR(MSG_SET_LLE_GFX_TITLE,  L"Graphics Low-Level Emulation");
-    DEF_STR(MSG_SET_LLE_GFX_MSG,    L"Graphics LLE is not for general use!!!\nIt is advisable that you only use this for testing and not for playing games.\n\nChange to graphics LLE?");
-    DEF_STR(MSG_SET_HLE_AUD_TITLE,  L"Audio High-Level Emulation");
-    DEF_STR(MSG_SET_HLE_AUD_MSG,    L"Audio HLE requires a third-party plugin!!!\nIf you do not use a third-party audio plugin that supports HLE, you will hear no sound.\n\nChange to audio HLE?");
+    DEF_STR(MSG_LOADED_STATE, L"Loaded state");
+    DEF_STR(MSG_SAVED_STATE, L"Saved current state to");
+    DEF_STR(MSG_SAVE_SLOT, L"State slot");
+    DEF_STR(MSG_BYTESWAP, L"Byte-swapping image");
+    DEF_STR(MSG_CHOOSE_IMAGE, L"Choosing N64 image");
+    DEF_STR(MSG_LOADED, L"Loaded");
+    DEF_STR(MSG_LOADING, L"Loading image");
+    DEF_STR(MSG_PLUGIN_NOT_INIT, L"Cannot open a ROM because plugins have not successfully initialized.");
+    DEF_STR(MSG_DEL_SURE, L"Are you sure you really want to delete this?");
+    DEF_STR(MSG_DEL_TITLE, L"Delete Cheat");
+    DEF_STR(MSG_CHEAT_NAME_IN_USE, L"Cheat name is already in use.");
+    DEF_STR(MSG_MAX_CHEATS, L"You have reached the maximum amount of cheats for this ROM.");
+    DEF_STR(MSG_PLUGIN_INIT, L"Plugin initializing");
+    DEF_STR(MSG_NO_SHORTCUT_SEL, L"You have not selected a virtual key to assign to the menu item.");
+    DEF_STR(MSG_NO_MENUITEM_SEL, L"You need to select a menu item to assign this key to.");
+    DEF_STR(MSG_MENUITEM_ASSIGNED, L"Short-cut has already been assigned to another menu item.");
+    DEF_STR(MSG_NO_SEL_SHORTCUT, L"No shortcut has been selected to be removed.");
+    DEF_STR(MSG_WAITING_FOR_START, L"ROM loaded. Waiting for emulation to start.");
+    DEF_STR(MSG_INVALID_EXE, L"Project64 beta versions are for members only.\n\nIf you have an account at www.pj64-emu.com, you should not be seeing this error!!\nPlease contact us on the site.");
+    DEF_STR(MSG_INVALID_EXE_TITLE, L"Program Error");
+    DEF_STR(MSG_7Z_FILE_NOT_FOUND, L"Failed to find filename in 7z file");
+    DEF_STR(MSG_SET_LLE_GFX_TITLE, L"Graphics Low-Level Emulation");
+    DEF_STR(MSG_SET_LLE_GFX_MSG, L"Graphics LLE is not for general use!!!\nIt is advisable that you only use this for testing and not for playing games.\n\nChange to graphics LLE?");
+    DEF_STR(MSG_SET_HLE_AUD_TITLE, L"Audio High-Level Emulation");
+    DEF_STR(MSG_SET_HLE_AUD_MSG, L"Audio HLE requires a third-party plugin!!!\nIf you do not use a third-party audio plugin that supports HLE, you will hear no sound.\n\nChange to audio HLE?");
 }
 
 CLanguage::CLanguage() :
-    m_emptyString(L""),
-	m_LanguageLoaded(false)
+m_emptyString(L""),
+m_LanguageLoaded(false)
 {
     LoadDefaultStrings();
-	if (g_Settings)
-	{
-		m_SelectedLanguage = g_Settings->LoadStringVal(Setting_CurrentLanguage).ToUTF16();
-	}
+    if (g_Settings)
+    {
+        m_SelectedLanguage = g_Settings->LoadStringVal(Setting_CurrentLanguage).ToUTF16();
+    }
 }
 
-bool CLanguage::LoadCurrentStrings ( void )
+bool CLanguage::LoadCurrentStrings(void)
 {
     LanguageList LangList = GetLangList();
     stdstr       Filename;
@@ -538,7 +538,7 @@ bool CLanguage::LoadCurrentStrings ( void )
 
     //Search for utf8 file marker
     uint8_t utf_bom[3];
-    if (fread(&utf_bom, sizeof(utf_bom),1,file) != 1 ||
+    if (fread(&utf_bom, sizeof(utf_bom), 1, file) != 1 ||
         utf_bom[0] != 0xEF ||
         utf_bom[1] != 0xBB ||
         utf_bom[2] != 0xBF)
@@ -553,26 +553,26 @@ bool CLanguage::LoadCurrentStrings ( void )
         m_CurrentStrings.insert(GetNextLangString(file));
     }
     fclose(file);
-	m_LanguageLoaded = true;
-	return true;
+    m_LanguageLoaded = true;
+    return true;
 }
 
-LanguageList & CLanguage::GetLangList (void)
+LanguageList & CLanguage::GetLangList(void)
 {
     if (m_LanguageList.size() > 0)
     {
         return m_LanguageList;
     }
 
-    CPath LanguageFiles(g_Settings->LoadStringVal(Setting_LanguageDir),"*.pj.Lang");
+    CPath LanguageFiles(g_Settings->LoadStringVal(Setting_LanguageDir), "*.pj.Lang");
     if (LanguageFiles.FindFirst())
     {
         do
         {
             LanguageFile File; //We temporally store the values in here to added to the list
 
-			File.Filename = (std::string &)LanguageFiles;
-            File.LanguageName = GetLangString(LanguageFiles,LANGUAGE_NAME);
+            File.Filename = (std::string &)LanguageFiles;
+            File.LanguageName = GetLangString(LanguageFiles, LANGUAGE_NAME);
 
             if (File.LanguageName.length() == 0)
             {
@@ -586,7 +586,7 @@ LanguageList & CLanguage::GetLangList (void)
     return m_LanguageList;
 }
 
-const std::wstring & CLanguage::GetString (LanguageStringID StringID)
+const std::wstring & CLanguage::GetString(LanguageStringID StringID)
 {
     LANG_STRINGS::iterator CurrentString = m_CurrentStrings.find(StringID);
     if (CurrentString != m_CurrentStrings.end())
@@ -600,12 +600,12 @@ const std::wstring & CLanguage::GetString (LanguageStringID StringID)
         return DefString->second;
     }
 #ifdef _DEBUG
-    g_Notify->BreakPoint(__FILEW__,__LINE__);
+    g_Notify->BreakPoint(__FILEW__, __LINE__);
 #endif
     return m_emptyString;
 }
 
-std::wstring CLanguage::GetLangString ( const char * FileName, LanguageStringID ID )
+std::wstring CLanguage::GetLangString(const char * FileName, LanguageStringID ID)
 {
     FILE *file = fopen(FileName, "rb");
     if (file == NULL)
@@ -615,7 +615,7 @@ std::wstring CLanguage::GetLangString ( const char * FileName, LanguageStringID
 
     //Search for utf8 file marker
     uint8_t utf_bom[3];
-    if (fread(&utf_bom, sizeof(utf_bom),1,file) != 1 ||
+    if (fread(&utf_bom, sizeof(utf_bom), 1, file) != 1 ||
         utf_bom[0] != 0xEF ||
         utf_bom[1] != 0xBB ||
         utf_bom[2] != 0xBF)
@@ -638,7 +638,7 @@ std::wstring CLanguage::GetLangString ( const char * FileName, LanguageStringID
     return L"";
 }
 
-LANG_STR CLanguage::GetNextLangString (void * OpenFile)
+LANG_STR CLanguage::GetNextLangString(void * OpenFile)
 {
     enum { MAX_STRING_LEN = 400 };
     int  StringID;
@@ -649,46 +649,46 @@ LANG_STR CLanguage::GetNextLangString (void * OpenFile)
     //while(token!='#' && !feof(file)) { fread(&token, 1, 1, file); }
     if (feof(file))
     {
-        return LANG_STR(0,L"");
+        return LANG_STR(0, L"");
     }
 
     //Search for token #
-    char token=0;
-    while (token!='#' && !feof(file))
+    char token = 0;
+    while (token != '#' && !feof(file))
     {
         fread(&token, 1, 1, file);
     }
     if (feof(file))
     {
-        return LANG_STR(0,L"");
+        return LANG_STR(0, L"");
     }
 
     //get StringID after token
     fscanf(file, "%d", &StringID);
 
     //Search for token #
-    while(token!='#' && !feof(file))
+    while (token != '#' && !feof(file))
     {
         fread(&token, 1, 1, file);
     }
     if (feof(file))
     {
-        StringID = EMPTY_STRING; return LANG_STR(0,L"");
+        StringID = EMPTY_STRING; return LANG_STR(0, L"");
     }
 
     //Search for start of string '"'
-    while (token!='"' && !feof(file))
+    while (token != '"' && !feof(file))
     {
         fread(&token, 1, 1, file);
     }
     if (feof(file))
     {
-        StringID = EMPTY_STRING; return LANG_STR(0,L"");
+        StringID = EMPTY_STRING; return LANG_STR(0, L"");
     }
 
     int pos = 0;
     fread(&token, 1, 1, file);
-    while (token!='"' && !feof(file))
+    while (token != '"' && !feof(file))
     {
         szString[pos++] = token;
         fread(&token, 1, 1, file);
@@ -699,26 +699,26 @@ LANG_STR CLanguage::GetNextLangString (void * OpenFile)
     }
     szString[pos++] = 0;
     stdstr text(szString);
-    text.Replace("\\n","\n");
-    return LANG_STR(StringID,text.ToUTF16());
+    text.Replace("\\n", "\n");
+    return LANG_STR(StringID, text.ToUTF16());
 }
 
-void CLanguage::SetLanguage ( const wchar_t * LanguageName )
+void CLanguage::SetLanguage(const wchar_t * LanguageName)
 {
     m_SelectedLanguage = LanguageName;
     if (LoadCurrentStrings())
-	{
-		stdstr Language;
-		Language.FromUTF16(LanguageName);
-		g_Settings->SaveString(Setting_CurrentLanguage,Language);
-	}
+    {
+        stdstr Language;
+        Language.FromUTF16(LanguageName);
+        g_Settings->SaveString(Setting_CurrentLanguage, Language);
+    }
 }
 
-bool CLanguage::IsCurrentLang( LanguageFile & File )
+bool CLanguage::IsCurrentLang(LanguageFile & File)
 {
     if (m_SelectedLanguage == File.LanguageName)
     {
         return true;
     }
     return false;
-}
+}
\ No newline at end of file
diff --git a/Source/Project64/Multilanguage/Language Class.h b/Source/Project64/Multilanguage/Language Class.h
index 19538d67b..bf3960252 100644
--- a/Source/Project64/Multilanguage/Language Class.h	
+++ b/Source/Project64/Multilanguage/Language Class.h	
@@ -29,14 +29,14 @@ typedef std::list<LanguageFile> LanguageList;
 class CLanguage
 {
 public:
-    CLanguage ();
+    CLanguage();
 
-    const std::wstring & GetString ( LanguageStringID StringID );
-    LanguageList & GetLangList ( void );
-    void SetLanguage ( const wchar_t * LanguageName );
-    bool LoadCurrentStrings ( void );
-    bool IsCurrentLang ( LanguageFile & File );
-	bool IsLanguageLoaded ( void ) const { return m_LanguageLoaded; }
+    const std::wstring & GetString(LanguageStringID StringID);
+    LanguageList & GetLangList(void);
+    void SetLanguage(const wchar_t * LanguageName);
+    bool LoadCurrentStrings(void);
+    bool IsCurrentLang(LanguageFile & File);
+    bool IsLanguageLoaded(void) const { return m_LanguageLoaded; }
 
 private:
     CLanguage(const CLanguage&);				// Disable copy constructor
@@ -48,16 +48,16 @@ private:
     LANG_STRINGS m_CurrentStrings, m_DefaultStrings;
     LanguageList m_LanguageList;
 
-    std::wstring GetLangString ( const char * FileName, LanguageStringID ID );
-    LANG_STR GetNextLangString ( void * OpenFile );
-    void LoadDefaultStrings ( void );
+    std::wstring GetLangString(const char * FileName, LanguageStringID ID);
+    LANG_STR GetNextLangString(void * OpenFile);
+    void LoadDefaultStrings(void);
 
-	bool m_LanguageLoaded;
+    bool m_LanguageLoaded;
 };
 
 extern CLanguage * g_Lang;
 
-inline const wchar_t * GS (LanguageStringID StringID)
+inline const wchar_t * GS(LanguageStringID StringID)
 {
     return g_Lang->GetString(StringID).c_str();
 }
diff --git a/Source/Project64/Multilanguage/LanguageSelector.h b/Source/Project64/Multilanguage/LanguageSelector.h
index 5856c22ff..4aecec235 100644
--- a/Source/Project64/Multilanguage/LanguageSelector.h
+++ b/Source/Project64/Multilanguage/LanguageSelector.h
@@ -13,13 +13,13 @@
 class CLanguageSelector
 {
 public:
-    CLanguageSelector ();
+    CLanguageSelector();
 
-	void Select ( void );
+    void Select(void);
 
 private:
     CLanguageSelector(const CLanguageSelector&);				// Disable copy constructor
     CLanguageSelector& operator=(const CLanguageSelector&);		// Disable assignment
 
-	static LRESULT CALLBACK LangSelectProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
+    static LRESULT CALLBACK LangSelectProc(HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 };
\ No newline at end of file