diff --git a/Lang/Chinese (Simplified).pj.Lang b/Lang/Chinese (Simplified).pj.Lang index 9eb2acf8e..337a22ac5 100644 --- a/Lang/Chinese (Simplified).pj.Lang +++ b/Lang/Chinese (Simplified).pj.Lang @@ -276,13 +276,16 @@ #527# "使用 TLB" #528# "寄存缓冲器" #529# "延迟 SI 中断信号" -#530# "SP Hack" +#530# "VI 刷新率" #531# "默认" #532# "RSP 音频信号" #533# "固定音频定时" #534# "查询函数方案:" #535# "自定义自我修改方案" #536# "使用音频同步" +#537# "AI 每字节计数" +#538# "32位引擎" +#539# "延迟 DP 中断信号" //Core Styles #540# "注释器" @@ -334,7 +337,7 @@ #684# "目前设置为:" #685# "设置" #686# "移除" -#687# "将重置所存储的快捷键" +#687# "重置所有快捷键" #688# "游戏未运行" #689# "游戏正在运行" #690# "游戏正在运行 (窗口)" @@ -349,6 +352,11 @@ #710# "提高游戏速度" #711# "降低游戏速度" +//Bottom page buttons +#720# "重置此页" +#721# "全部重设" +#722# "应用" + /********************************************************************************* * ROM Information * *********************************************************************************/ diff --git a/Lang/English.pj.Lang b/Lang/English.pj.Lang index 5e872232f..7548be0e4 100644 --- a/Lang/English.pj.Lang +++ b/Lang/English.pj.Lang @@ -275,13 +275,16 @@ #527# "Use TLB" #528# "Register caching" #529# "Delay SI Interrupt" -#530# "SP Hack" +#530# "VI Interrupt Rate" #531# "Default" #532# "RSP Audio Signal" #533# "Fixed Audio Timing" #534# "Function lookup method:" #535# "Custom Self Mod Method" #536# "Sync using Audio" +#537# "AI Count Per Byte" +#538# "32 Bit Engine" +#539# "Delay DP Interrupt" //Core Styles #540# "Interpreter" @@ -348,6 +351,11 @@ #710# "Increase Game Speed" #711# "Decrease Game Speed" +//Bottom Page Buttons +#720# "Reset Page" +#721# "Reset All" +#722# "Apply" + /********************************************************************************* * ROM Information * *********************************************************************************/ diff --git a/Source/Project64/Multilanguage.h b/Source/Project64/Multilanguage.h index 49469f71d..a219f8d07 100644 --- a/Source/Project64/Multilanguage.h +++ b/Source/Project64/Multilanguage.h @@ -304,13 +304,16 @@ enum LanguageStringID{ ROM_USE_TLB = 527, ROM_REG_CACHE = 528, ROM_DELAY_SI = 529, - ROM_SP_HACK = 530, + ROM_VIREFRESH = 530, ROM_DEFAULT = 531, ROM_AUDIO_SIGNAL = 532, ROM_FIXED_AUDIO = 533, ROM_FUNC_FIND = 534, ROM_CUSTOM_SMM = 535, ROM_SYNC_AUDIO = 536, + ROM_COUNTPERBYTE = 537, + ROM_32BIT = 538, + ROM_DELAY_DP = 539, //Core Styles CORE_INTERPTER = 540, @@ -318,18 +321,18 @@ enum LanguageStringID{ CORE_SYNC = 542, //Self Mod Methods - SMCM_NONE = 560, - SMCM_CACHE = 561, - SMCM_PROECTED = 562, - SMCM_CHECK_MEM = 563, - SMCM_CHANGE_MEM = 564, - SMCM_CHECK_ADV = 565, - SMCM_CACHE2 = 566, + SMCM_NONE = 560, + SMCM_CACHE = 561, + SMCM_PROECTED = 562, + SMCM_CHECK_MEM = 563, + SMCM_CHANGE_MEM = 564, + SMCM_CHECK_ADV = 565, + SMCM_CACHE2 = 566, //Function Lookup memthod - FLM_PLOOKUP = 570, - FLM_VLOOKUP = 571, - FLM_CHANGEMEM = 572, + FLM_PLOOKUP = 570, + FLM_VLOOKUP = 571, + FLM_CHANGEMEM = 572, //RDRAM Size RDRAM_4MB = 580, @@ -377,6 +380,11 @@ enum LanguageStringID{ STR_INSREASE_SPEED = 710, STR_DECREASE_SPEED = 711, +//Bottom page buttons + BOTTOM_RESET_PAGE = 720, + BOTTOM_RESET_ALL = 721, + BOTTOM_APPLY = 722, + /********************************************************************************* * ROM Information * *********************************************************************************/ diff --git a/Source/Project64/Multilanguage/Language Class.cpp b/Source/Project64/Multilanguage/Language Class.cpp index 0c07c8d07..750681753 100644 --- a/Source/Project64/Multilanguage/Language Class.cpp +++ b/Source/Project64/Multilanguage/Language Class.cpp @@ -270,13 +270,16 @@ void CLanguage::LoadDefaultStrings (void) 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_SP_HACK, L"SP Hack"); + DEF_STR(ROM_VIREFRESH, L"Vi Refresh Rate: "); 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"); @@ -342,6 +345,11 @@ void CLanguage::LoadDefaultStrings (void) // Increase 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"); /********************************************************************************* * ROM Information * diff --git a/Source/Project64/User Interface/Settings Config.cpp b/Source/Project64/User Interface/Settings Config.cpp index 0a35e0564..fb4bf44e6 100644 --- a/Source/Project64/User Interface/Settings Config.cpp +++ b/Source/Project64/User Interface/Settings Config.cpp @@ -89,8 +89,11 @@ LRESULT CSettingConfig::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /* CConfigSettingSection * SettingsSection; //Set the text for all gui Items + SetDlgItemTextW(m_hWnd, IDC_RESET_PAGE, GS(BOTTOM_RESET_PAGE)); + SetDlgItemTextW(m_hWnd, IDC_RESET_ALL, GS(BOTTOM_RESET_ALL)); SetDlgItemTextW(m_hWnd, IDOK, GS(CHEAT_OK)); SetDlgItemTextW(m_hWnd, IDCANCEL, GS(CHEAT_CANCEL)); + SetDlgItemTextW(m_hWnd, IDAPPLY, GS(BOTTOM_APPLY)); if (m_GameConfig) { diff --git a/Source/Project64/User Interface/Settings/Settings Page - Game - General.cpp b/Source/Project64/User Interface/Settings/Settings Page - Game - General.cpp index feda78a97..169a38d87 100644 --- a/Source/Project64/User Interface/Settings/Settings Page - Game - General.cpp +++ b/Source/Project64/User Interface/Settings/Settings Page - Game - General.cpp @@ -25,9 +25,13 @@ CGameGeneralPage::CGameGeneralPage (HWND hParent, const RECT & rcDispay ) SetDlgItemTextW(m_hWnd, IDC_MEMORY_SIZE_TEXT, GS(ROM_MEM_SIZE)); SetDlgItemTextW(m_hWnd, IDC_SAVE_TYPE_TEXT, GS(ROM_SAVE_TYPE)); SetDlgItemTextW(m_hWnd, IDC_COUNTFACT_TEXT, GS(ROM_COUNTER_FACTOR)); + SetDlgItemTextW(m_hWnd, IDC_VIREFESH_TEXT, GS(ROM_VIREFRESH)); + SetDlgItemTextW(m_hWnd, IDC_COUNTPERBYTE_TEXT, GS(ROM_COUNTPERBYTE)); - SetDlgItemTextW(m_hWnd, IDC_SYNC_AUDIO, GS(ROM_SYNC_AUDIO)); + SetDlgItemTextW(m_hWnd, IDC_ROM_32BIT, GS(ROM_32BIT)); SetDlgItemTextW(m_hWnd, IDC_ROM_FIXEDAUDIO, GS(ROM_FIXED_AUDIO)); + SetDlgItemTextW(m_hWnd, IDC_DELAY_DP, GS(ROM_DELAY_DP)); + SetDlgItemTextW(m_hWnd, IDC_SYNC_AUDIO, GS(ROM_SYNC_AUDIO)); SetDlgItemTextW(m_hWnd, IDC_USE_TLB, GS(ROM_USE_TLB)); SetDlgItemTextW(m_hWnd, IDC_DELAY_SI, GS(ROM_DELAY_SI)); SetDlgItemTextW(m_hWnd, IDC_AUDIO_SIGNAL, GS(ROM_AUDIO_SIGNAL));