From 5f1d7492cc89361704df656fcc568615ce0e81ea Mon Sep 17 00:00:00 2001 From: zeromus Date: Sun, 3 Nov 2013 21:52:18 +0000 Subject: [PATCH] clean up english text for new rom streaming options --- desmume/src/commandline.cpp | 6 +++--- desmume/src/windows/DeSmuME_2005.vcproj | 12 ++++++++++++ desmume/src/windows/resources.rc | 9 +++++---- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/desmume/src/commandline.cpp b/desmume/src/commandline.cpp index aa7acdeaa..d2ba007f0 100644 --- a/desmume/src/commandline.cpp +++ b/desmume/src/commandline.cpp @@ -81,8 +81,8 @@ void CommandLine::loadCommonOptions() //but also see the gtk port for an example of how to combine this with other options //(you may need to use ifdefs to cause options to be entered in the desired order) static const GOptionEntry options[] = { - { "load-type", 0, 0, G_OPTION_ARG_INT, &_load_to_memory, "Load ROM type, 0 - stream from disk, 1 - to RAM (default 1)", "LOAD_TYPE"}, - { "load-slot", 0, 0, G_OPTION_ARG_INT, &load_slot, "Loads savegame from slot NUM", "NUM"}, + { "load-type", 0, 0, G_OPTION_ARG_INT, &_load_to_memory, "ROM loading method, 0 - stream from disk (like an iso), 1 - load entirely to RAM (default 1)", "LOAD_TYPE"}, + { "load-slot", 0, 0, G_OPTION_ARG_INT, &load_slot, "Loads savestate from slot NUM", "NUM"}, { "play-movie", 0, 0, G_OPTION_ARG_FILENAME, &_play_movie_file, "Specifies a dsm format movie to play", "PATH_TO_PLAY_MOVIE"}, { "record-movie", 0, 0, G_OPTION_ARG_FILENAME, &_record_movie_file, "Specifies a path to a new dsm format movie", "PATH_TO_RECORD_MOVIE"}, { "start-paused", 0, 0, G_OPTION_ARG_NONE, &start_paused, "Indicates that emulation should start paused", "START_PAUSED"}, @@ -100,7 +100,7 @@ void CommandLine::loadCommonOptions() { "scanline-filter-d", 0, 0, G_OPTION_ARG_INT, &_scanline_filter_d, "Intensity of fadeout for scanlines filter (bottomright) (default 4)", "SCANLINE_FILTER_D"}, { "rigorous-timing", 0, 0, G_OPTION_ARG_INT, &_rigorous_timing, "Use some rigorous timings instead of unrealistically generous (default 0)", "RIGOROUS_TIMING"}, { "advanced-timing", 0, 0, G_OPTION_ARG_INT, &_advanced_timing, "Use advanced BUS-level timing (default 1)", "ADVANCED_TIMING"}, - { "slot1", 0, 0, G_OPTION_ARG_STRING, &_slot1, "Device to load in slot 1 (default retail)", "SLOT1"}, + { "slot1", 0, 0, G_OPTION_ARG_STRING, &_slot1, "Device to mount in slot 1 (default retail)", "SLOT1"}, { "slot1-fat-dir", 0, 0, G_OPTION_ARG_STRING, &_slot1_fat_dir, "Directory to scan for slot 1", "SLOT1_DIR"}, { "depth-threshold", 0, 0, G_OPTION_ARG_INT, &depth_threshold, "Depth comparison threshold (default 0)", "DEPTHTHRESHOLD"}, { "console-type", 0, 0, G_OPTION_ARG_STRING, &_console_type, "Select console type: {fat,lite,ique,debug,dsi}", "CONSOLETYPE" }, diff --git a/desmume/src/windows/DeSmuME_2005.vcproj b/desmume/src/windows/DeSmuME_2005.vcproj index c849b97b9..d2504e116 100644 --- a/desmume/src/windows/DeSmuME_2005.vcproj +++ b/desmume/src/windows/DeSmuME_2005.vcproj @@ -2528,6 +2528,10 @@ RelativePath="..\FIFO.h" > + + @@ -2536,6 +2540,14 @@ RelativePath="..\firmware.h" > + + + + diff --git a/desmume/src/windows/resources.rc b/desmume/src/windows/resources.rc index 56638ccc6..9dbf39ae8 100644 --- a/desmume/src/windows/resources.rc +++ b/desmume/src/windows/resources.rc @@ -18,6 +18,7 @@ #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) #ifdef _WIN32 LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US +#pragma code_page(1252) #endif //_WIN32 ///////////////////////////////////////////////////////////////////////////// @@ -30,7 +31,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTI CAPTION "NITRO File System" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN - CONTROL "",IDC_FILES_TREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | TVS_INFOTIP | WS_BORDER | WS_HSCROLL | WS_TABSTOP,7,7,359,294 + CONTROL "",IDC_FILES_TREE,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_DISABLEDRAGDROP | TVS_SHOWSELALWAYS | WS_BORDER | WS_HSCROLL | WS_TABSTOP | 0x800,7,7,359,294 PUSHBUTTON "Close",IDCANCEL,316,320,50,14 EDITTEXT IDC_FILE_INFO,8,322,306,12,ES_AUTOHSCROLL | ES_READONLY | NOT WS_BORDER | NOT WS_TABSTOP LTEXT "Static",IDC_FILE_QVIEW,7,303,359,15,NOT WS_GROUP @@ -1659,10 +1660,10 @@ BEGIN MENUITEM "Internal", IDM_AUTODETECTSAVETYPE_INTERNAL MENUITEM "From database", IDM_AUTODETECTSAVETYPE_FROMDATABASE END - POPUP "&Load ROM Type" + POPUP "&ROM Loading" BEGIN - MENUITEM "Load to &RAM (fastest, more RAM)", ID_LOADTORAM - MENUITEM "Stream from &Disk", ID_STREAMFROMDISK + MENUITEM "&Load entirely to RAM (long start-up time, high RAM usage)", ID_LOADTORAM + MENUITEM "&Stream from Disk (like an ISO, instant start-up, no RAM usage)", ID_STREAMFROMDISK END MENUITEM "&Control Config", IDM_CONFIG MENUITEM "&Hotkey Config", IDM_HOTKEY_CONFIG