diff --git a/Lang/Chinese (Simplified).pj.Lang b/Lang/Chinese (Simplified).pj.Lang index 3ac06bd97..41a77dbcb 100644 --- a/Lang/Chinese (Simplified).pj.Lang +++ b/Lang/Chinese (Simplified).pj.Lang @@ -88,6 +88,7 @@ #198# "插槽 8" #199# "插槽 9" #200# "插槽 10" +#201# "插槽 (%ws) 被选" //Pop up Menu #210# "运行游戏" @@ -224,7 +225,7 @@ #452# " 选择材质包目录" //Options Dialog -#460# "当窗口处于非活动状态时暂停模拟器" +#460# "当模拟器窗口不是处于屏幕最上方,暂停模拟器" #461# "载入ROM后切换为全屏模式" #462# "隐藏高级设置" #463# "记住已选择的金手指" @@ -255,7 +256,7 @@ #503# "自我修改码方案:" #504# "默认存档容量:" #505# "高级模块连接" -#506# "当ROM加载后,开始模拟" +#506# "当读取完ROM后,开始模拟" #507# "总是从 RDB 中覆盖默认设置" #508# "自动压缩即时存档文件" #509# "开启调试器" diff --git a/Lang/English.pj.Lang b/Lang/English.pj.Lang index 07465641d..ea3a5e8ac 100644 --- a/Lang/English.pj.Lang +++ b/Lang/English.pj.Lang @@ -88,6 +88,7 @@ #198# "Slot 8" #199# "Slot 9" #200# "Slot 10" +#201# "Save Slot (%ws) selected" //Pop up Menu #210# "Play Game" diff --git a/Source/Common/std string.h b/Source/Common/std string.h index 8b61aa99b..c7ebd007e 100644 --- a/Source/Common/std string.h +++ b/Source/Common/std string.h @@ -51,5 +51,22 @@ public: } }; +class stdwstr_f : public std::wstring +{ +public: + stdwstr_f(const wchar_t * strFormat, ...) + { + va_list args; + va_start(args, strFormat); + + wchar_t Msg[1000]; + _vsnwprintf(Msg, sizeof(Msg) - 1, strFormat, args); + + va_end(args); + + this->assign(Msg); + } +}; + typedef std::list strlist; typedef strlist::iterator strlist_iter; diff --git a/Source/Project64/Multilanguage.h b/Source/Project64/Multilanguage.h index 559e03930..9b37d1418 100644 --- a/Source/Project64/Multilanguage.h +++ b/Source/Project64/Multilanguage.h @@ -117,6 +117,7 @@ enum LanguageStringID{ MENU_SLOT_8 = 198, MENU_SLOT_9 = 199, MENU_SLOT_10 = 200, + MENU_SLOT_SAVE = 201, //Pop up Menu POPUP_PLAY = 210, diff --git a/Source/Project64/Multilanguage/Language Class.cpp b/Source/Project64/Multilanguage/Language Class.cpp index 632c73570..0321de0fc 100644 --- a/Source/Project64/Multilanguage/Language Class.cpp +++ b/Source/Project64/Multilanguage/Language Class.cpp @@ -124,6 +124,7 @@ void CLanguage::LoadDefaultStrings(void) 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_SAVE, L"Save slot (%ws) selected"); //Pop up Menu DEF_STR(POPUP_PLAY, L"Play Game"); @@ -721,4 +722,4 @@ bool CLanguage::IsCurrentLang(LanguageFile & File) return true; } return false; -} \ No newline at end of file +} diff --git a/Source/Project64/User Interface/Main Menu Class.cpp b/Source/Project64/User Interface/Main Menu Class.cpp index 83c477ac6..a4655b341 100644 --- a/Source/Project64/User Interface/Main Menu Class.cpp +++ b/Source/Project64/User Interface/Main Menu Class.cpp @@ -523,7 +523,7 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI case ID_DEBUGGER_INTERRUPT_PI: g_BaseSystem->ExternalEvent(SysEvent_Interrupt_PI); break; case ID_DEBUGGER_INTERRUPT_DP: g_BaseSystem->ExternalEvent(SysEvent_Interrupt_DP); break; case ID_CURRENT_SAVE_DEFAULT: - g_Notify->DisplayMessage(3, stdstr_f("Save Slot (%s) selected", GetSaveSlotString(MenuID - ID_CURRENT_SAVE_DEFAULT).c_str()).ToUTF16().c_str()); + g_Notify->DisplayMessage(3, stdwstr_f(GS(MENU_SLOT_SAVE), GetSaveSlotString(MenuID - ID_CURRENT_SAVE_DEFAULT).c_str()).c_str()); g_Settings->SaveDword(Game_CurrentSaveState, (DWORD)(MenuID - ID_CURRENT_SAVE_DEFAULT)); break; case ID_CURRENT_SAVE_1: @@ -536,7 +536,7 @@ bool CMainMenu::ProcessMessage(HWND hWnd, DWORD /*FromAccelerator*/, DWORD MenuI case ID_CURRENT_SAVE_8: case ID_CURRENT_SAVE_9: case ID_CURRENT_SAVE_10: - g_Notify->DisplayMessage(3, stdstr_f("Save Slot (%s) selected", GetSaveSlotString((MenuID - ID_CURRENT_SAVE_1) + 1)).ToUTF16().c_str()); + g_Notify->DisplayMessage(3, stdwstr_f(GS(MENU_SLOT_SAVE), GetSaveSlotString((MenuID - ID_CURRENT_SAVE_1) + 1).c_str()).c_str()); g_Settings->SaveDword(Game_CurrentSaveState, (DWORD)((MenuID - ID_CURRENT_SAVE_1) + 1)); break; case ID_HELP_SUPPORTFORUM: ShellExecute(NULL, "open", "http://forum.pj64-emu.com/", NULL, NULL, SW_SHOWMAXIMIZED); break;