- translation fixes for issue #342. (I hope)

This commit is contained in:
Fledge68 2023-03-16 17:45:51 -05:00
parent 3ac8ecdc5c
commit d5f0ca6e01
6 changed files with 11 additions and 8 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.4 MiB

After

Width:  |  Height:  |  Size: 4.4 MiB

View File

@ -970,6 +970,7 @@ private:
void _getSFlowBgTex(); void _getSFlowBgTex();
// misc functions // misc functions
void listThemes(const char * path, vector<string> &themes);
void _resetGCSettings(const string &id); void _resetGCSettings(const string &id);
void RemoveCover(const char *id); void RemoveCover(const char *id);
void _setPartition(s8 direction = 0, u8 partition = 0, u8 coverflow = 0); void _setPartition(s8 direction = 0, u8 partition = 0, u8 coverflow = 0);

View File

@ -39,7 +39,7 @@ void CMenu::_showBoot()
if(cur_ios > 0) if(cur_ios > 0)
m_btnMgr.setText(m_configLbl2Val, wfmt(L"%i", cur_ios)); m_btnMgr.setText(m_configLbl2Val, wfmt(L"%i", cur_ios));
else else
m_btnMgr.setText(m_configLbl2Val, _t("GC_Auto", L"AUTO"));// cIOS 249 unless the user changed it via the meta.xml m_btnMgr.setText(m_configLbl2Val, _t("GC_Auto", L"Auto"));// cIOS 249 unless the user changed it via the meta.xml
m_btnMgr.setText(m_configBtn3, wfmt(L"%i", set_port)); m_btnMgr.setText(m_configBtn3, wfmt(L"%i", set_port));
m_btnMgr.setText(m_configBtn4, m_cfg.getBool("GENERAL", "sd_only") ? _t("yes", L"Yes") : _t("no", L"No")); m_btnMgr.setText(m_configBtn4, m_cfg.getBool("GENERAL", "sd_only") ? _t("yes", L"Yes") : _t("no", L"No"));

View File

@ -106,7 +106,7 @@ const CMenu::SOption CMenu::_vidModePatch[4] = {
}; };
const CMenu::SOption CMenu::_hooktype[8] = { const CMenu::SOption CMenu::_hooktype[8] = {
{ "hook_auto", L"AUTO" }, { "GC_Auto", L"Auto" },
{ "hooktype1", L"VBI" }, { "hooktype1", L"VBI" },
{ "hooktype2", L"KPAD read" }, { "hooktype2", L"KPAD read" },
{ "hooktype3", L"Joypad" }, { "hooktype3", L"Joypad" },
@ -257,7 +257,7 @@ void CMenu::_showConfigGame()
if(i > 0) if(i > 0)
m_btnMgr.setText(m_configLbl2Val, wfmt(L"%i", i)); m_btnMgr.setText(m_configLbl2Val, wfmt(L"%i", i));
else else
m_btnMgr.setText(m_configLbl2Val, L"AUTO"); m_btnMgr.setText(m_configLbl2Val, _t("GC_Auto", L"Auto"));
i = min(m_gcfg2.getUInt(id, "language", 0), ARRAY_SIZE(CMenu::_languages) - 1u); i = min(m_gcfg2.getUInt(id, "language", 0), ARRAY_SIZE(CMenu::_languages) - 1u);
m_btnMgr.setText(m_configLbl3Val, _t(CMenu::_languages[i].id, CMenu::_languages[i].text)); m_btnMgr.setText(m_configLbl3Val, _t(CMenu::_languages[i].id, CMenu::_languages[i].text));
@ -604,7 +604,7 @@ void CMenu::_configGame(const dir_discHdr *hdr, bool disc)
if(i > 0) if(i > 0)
m_btnMgr.setText(m_configLbl2Val, wfmt(L"%i", i)); m_btnMgr.setText(m_configLbl2Val, wfmt(L"%i", i));
else else
m_btnMgr.setText(m_configLbl2Val, L"AUTO"); m_btnMgr.setText(m_configLbl2Val, _t("GC_Auto", L"Auto"));
} }
} }
else if(m_btnMgr.selected(m_configBtn3P) || m_btnMgr.selected(m_configBtn3M)) else if(m_btnMgr.selected(m_configBtn3P) || m_btnMgr.selected(m_configBtn3M))

View File

@ -21,7 +21,7 @@ void AddLanguage(char *Path)
languages_available.push_back(lng); languages_available.push_back(lng);
} }
void listThemes(const char * path, vector<string> &themes) void CMenu::listThemes(const char * path, vector<string> &themes)
{ {
DIR *d; DIR *d;
struct dirent *dir; struct dirent *dir;
@ -43,7 +43,7 @@ void listThemes(const char * path, vector<string> &themes)
closedir(d); closedir(d);
} }
if(!def) if(!def)
themes.push_back("Default"); themes.push_back(_t("def", L"Default").toUTF8());
sort(themes.begin(), themes.end()); sort(themes.begin(), themes.end());
} }

View File

@ -331,10 +331,12 @@ int CMenu::_NandEmuCfg(void)
m_btnMgr.setText(m_nandfinLblDialog, wfmt(_fmt("cfgne14", L"Extracted: %d saves / %d files / %d folders"), m_nandexentry, m_filesdone, m_foldersdone)); m_btnMgr.setText(m_nandfinLblDialog, wfmt(_fmt("cfgne14", L"Extracted: %d saves / %d files / %d folders"), m_nandexentry, m_filesdone, m_foldersdone));
else else
m_btnMgr.setText(m_nandfinLblDialog, wfmt(_fmt("cfgne15", L"Extracted: %d files / %d folders"), m_filesdone, m_foldersdone)); m_btnMgr.setText(m_nandfinLblDialog, wfmt(_fmt("cfgne15", L"Extracted: %d files / %d folders"), m_filesdone, m_foldersdone));
wstringEx total_size;
if(m_dumpsize/0x400 > 0x270f) if(m_dumpsize/0x400 > 0x270f)
m_btnMgr.setText(m_nandemuLblDialog, wfmt(_fmt("cfgne16", L"Total size: %uMB (%d blocks)"), (m_dumpsize/0x100000), (m_dumpsize/0x8000)>>2)); total_size = wfmt(_fmt("cfgne16", L"Total size: %uMB (%d blocks)"), (m_dumpsize/0x100000), (m_dumpsize/0x8000)>>2);
else else
m_btnMgr.setText(m_nandemuLblDialog, wfmt(_fmt("cfgne17", L"Total size: %uKB (%d blocks)"), (m_dumpsize/0x400), (m_dumpsize/0x8000)>>2)); total_size = wfmt(_fmt("cfgne17", L"Total size: %uKB (%d blocks)"), (m_dumpsize/0x400), (m_dumpsize/0x8000)>>2);
m_btnMgr.setText(m_nandemuLblDialog, total_size);
m_btnMgr.show(m_nandemuBtnBack); m_btnMgr.show(m_nandemuBtnBack);
m_btnMgr.show(m_nandfinLblDialog); m_btnMgr.show(m_nandfinLblDialog);
while(!m_exit) while(!m_exit)