The-Homebrew-Cloud/usbloadergx
2
0
Fork 0
mirror of https://github.com/wiidev/usbloadergx.git synced 2024-11-18 09:19:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updated grammar, lack of punctuation, and spelling mistakes.

Browse Source
This commit is contained in:
EDK 2023-07-21 10:03:25 -05:00
parent e25c4e9643
commit b9e4b6065f
8 changed files with 62 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
HBC/icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.8 KiB

After

Width:  |  Height:  |  Size: 87 KiB

BIN
HBC/icon2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 87 KiB

22
source/StartUpProcess.cpp
View File

@ -63,7 +63,7 @@ StartUpProcess::StartUpProcess()
#endif #endif
if (strncmp(Settings.ConfigPath, "sd", 2) == 0) if (strncmp(Settings.ConfigPath, "sd", 2) == 0)
cancelTxt = new GuiText("Press B to cancel or A to enable SD card mode", 22, (GXColor){255, 255, 255, 255}); cancelTxt = new GuiText("Press B to cancel or A to enter SD Card mode.", 22, (GXColor){255, 255, 255, 255});
else else
cancelTxt = new GuiText("Press B to cancel", 22, (GXColor){255, 255, 255, 255}); cancelTxt = new GuiText("Press B to cancel", 22, (GXColor){255, 255, 255, 255});
cancelTxt->SetAlignment(ALIGN_CENTER, ALIGN_MIDDLE); cancelTxt->SetAlignment(ALIGN_CENTER, ALIGN_MIDDLE);
@ -245,7 +245,7 @@ bool StartUpProcess::USBSpinUp()
break; break;
} }
messageTxt->SetTextf("Waiting for HDD: %i sec left\n", 20 - (int)countDown.elapsed()); messageTxt->SetTextf("Waiting for USB drive: %i sec left\n", 20 - (int)countDown.elapsed());
Draw(); Draw();
usleep(50000); usleep(50000);
} while (countDown.elapsed() < 20.f); } while (countDown.elapsed() < 20.f);
@ -289,11 +289,11 @@ void StartUpProcess::LoadIOS(u8 ios, bool boot)
SetTextf("Reloading to IOS%d%s\n", ios, boot ? " requested in meta.xml" : ""); SetTextf("Reloading to IOS%d%s\n", ios, boot ? " requested in meta.xml" : "");
if (IosLoader::LoadAppCios(ios) < 0) if (IosLoader::LoadAppCios(ios) < 0)
{ {
SetTextf("Failed to load an IOS. USB Loader GX requires a cIOS or IOS58 with AHB access. Exiting...\n"); SetTextf("Failed to load an IOS. Wii USB Tool requires a cIOS or IOS58 with AHB access. Exiting...\n");
sleep(5); sleep(5);
Sys_BackToLoader(); Sys_BackToLoader();
} }
SetTextf("Reloaded to IOS%d r%d\n", Settings.LoaderIOS, IOS_GetRevision()); SetTextf("Reloaded to IOS%d r%d\n.", Settings.LoaderIOS, IOS_GetRevision());
} }
int StartUpProcess::Execute(bool quickGameBoot) int StartUpProcess::Execute(bool quickGameBoot)
@ -305,7 +305,7 @@ int StartUpProcess::Execute(bool quickGameBoot)
// Store dx2 cIOS info // Store dx2 cIOS info
IosLoader::GetD2XInfo(); IosLoader::GetD2XInfo();
gprintf("Current IOS: %d - have AHB access: %s\n", Settings.EntryIOS, AHBPROT_DISABLED ? "yes" : "no"); gprintf("Current IOS: %d - have AHB access: %s\n.", Settings.EntryIOS, AHBPROT_DISABLED ? "yes" : "no");
// Reload to a cIOS if we're using both USB ports // Reload to a cIOS if we're using both USB ports
if (Settings.USBPort == 2 && !Settings.SDMode) if (Settings.USBPort == 2 && !Settings.SDMode)
LoadIOS(Settings.LoaderIOS, false); LoadIOS(Settings.LoaderIOS, false);
@ -325,12 +325,12 @@ int StartUpProcess::Execute(bool quickGameBoot)
bool USBSuccess = false; bool USBSuccess = false;
if (Settings.USBAutoMount == ON && !isWiiVC && !Settings.SDMode) if (Settings.USBAutoMount == ON && !isWiiVC && !Settings.SDMode)
{ {
SetTextf("Initializing USB devices\n"); SetTextf("Initializing USB drives\n.");
if (USBSpinUp()) if (USBSpinUp())
{ {
DeviceHandler::Instance()->MountAllUSB(false); DeviceHandler::Instance()->MountAllUSB(false);
USBSuccess = true; USBSuccess = true;
gprintf("Completed initialization of USB devices\n"); gprintf("Completed initialization of USB devices\n!");
} }
} }
@ -366,11 +366,11 @@ int StartUpProcess::Execute(bool quickGameBoot)
// Now load the cIOS that was set in the settings menu // Now load the cIOS that was set in the settings menu
if (IosLoader::LoadAppCios(Settings.LoaderIOS) > -1) if (IosLoader::LoadAppCios(Settings.LoaderIOS) > -1)
{ {
SetTextf("Reloaded to IOS%d r%d\n", Settings.LoaderIOS, IOS_GetRevision()); SetTextf("Reloaded to IOS%d r%d\n.", Settings.LoaderIOS, IOS_GetRevision());
// Re-Mount devices // Re-Mount devices
SetTextf("Reinitializing devices\n"); SetTextf("Reinitializing devices\n!");
} }
gprintf("Current IOS: %d - have AHB access: %s\n", IOS_GetVersion(), AHBPROT_DISABLED ? "yes" : "no"); gprintf("Current IOS: %d - have AHB access: %s\n.", IOS_GetVersion(), AHBPROT_DISABLED ? "yes" : "no");
// Start pads again // Start pads again
SetupPads(); SetupPads();
@ -424,7 +424,7 @@ int StartUpProcess::Execute(bool quickGameBoot)
ISFS_Initialize(); ISFS_Initialize();
// Check MIOS version // Check MIOS version
SetTextf("Checking installed MIOS\n"); SetTextf("Checking installed MIOS\n.");
IosLoader::GetMIOSInfo(); IosLoader::GetMIOSInfo();
SetTextf("Loading resources\n"); SetTextf("Loading resources\n");

1
source/menu.cpp
View File

@ -1,5 +1,6 @@
/**************************************************************************** /****************************************************************************
* USB Loader GX Team * USB Loader GX Team
* Edited as Wii USB Tool by EDK
* *
* libwiigui Template * libwiigui Template
* by Tantric 2009 * by Tantric 2009

52
source/menu/GameBrowseMenu.cpp
View File

@ -915,9 +915,9 @@ int GameBrowseMenu::MainLoop()
gprintf("\tpoweroffBtn clicked\n"); gprintf("\tpoweroffBtn clicked\n");
int choice = 0; int choice = 0;
if(isWiiU()) if(isWiiU())
choice = WindowPrompt(tr( "How to Shutdown?" ), 0, tr( "Full shutdown" ), tr("Cancel")); choice = WindowPrompt(tr( "Shutdown?" ), 0, tr( "Full shutdown" ), tr("Cancel"));
else else
choice = WindowPrompt(tr( "How to Shutdown?" ), 0, tr( "Full shutdown" ), tr( "Standby" ), tr( "Cancel" )); choice = WindowPrompt(tr( "Shutdown?" ), 0, tr( "Full shutdown" ), tr( "Standby" ), tr( "Cancel" ));
if (choice == 2) if (choice == 2)
Sys_ShutdownToIdle(); Sys_ShutdownToIdle();
@ -931,13 +931,13 @@ int GameBrowseMenu::MainLoop()
gprintf("\tgameCntBtn clicked\n"); gprintf("\tgameCntBtn clicked\n");
gamecntBtn->ResetState(); gamecntBtn->ResetState();
int choice = WindowPrompt(0, fmt("%s %sGameList ?", tr( "Save Game List to" ), Settings.ConfigPath), "TXT", "CSV", tr( "Back" )); int choice = WindowPrompt(0, fmt("%s %sGameList ?", tr( "How would you like to save your gamelist?" ), Settings.ConfigPath), "TXT", "CSV", tr( "Back" ));
if (choice) if (choice)
{ {
if (save_gamelist(choice == 2)) if (save_gamelist(choice == 2))
WindowPrompt(0, tr( "Saved" ), tr( "OK" )); WindowPrompt(0, tr( "Saved!" ), tr( "OK" ));
else else
WindowPrompt(tr( "Error" ), tr( "Could not save." ), tr( "OK" )); WindowPrompt(tr( "Error!" ), tr( "Could not save." ), tr( "OK" ));
} }
} }
else if (homeBtn->GetState() == STATE_CLICKED) else if (homeBtn->GetState() == STATE_CLICKED)
@ -951,19 +951,19 @@ int GameBrowseMenu::MainLoop()
{ {
if(!Settings.godmode && (Settings.ParentalBlocks & BLOCK_GAME_INSTALL)) if(!Settings.godmode && (Settings.ParentalBlocks & BLOCK_GAME_INSTALL))
{ {
WindowPrompt(tr( "Permission denied." ), tr( "Console must be unlocked for this option." ), tr( "OK" )); WindowPrompt(tr( "Permission denied." ), tr( "Your console must be unlocked for this option." ), tr( "OK" ));
installBtn->ResetState(); installBtn->ResetState();
return MENU_NONE; return MENU_NONE;
} }
int choice = WindowPrompt(tr( "Install a game" ), 0, tr( "Yes" ), tr( "No" )); int choice = WindowPrompt(tr( "Would you like to install the game currently in your drive?" ), 0, tr( "Yes" ), tr( "No" ));
if (choice == 1) if (choice == 1)
{ {
this->SetState(STATE_DISABLED); this->SetState(STATE_DISABLED);
if (!(Settings.LoaderMode & MODE_WIIGAMES) && (gameList.GameCount() == 0)) if (!(Settings.LoaderMode & MODE_WIIGAMES) && (gameList.GameCount() == 0))
{ {
if (WBFS_ReInit(Settings.SDMode ? WBFS_DEVICE_SDHC : WBFS_DEVICE_USB) < 0) if (WBFS_ReInit(Settings.SDMode ? WBFS_DEVICE_SDHC : WBFS_DEVICE_USB) < 0)
ShowError(tr("Failed to initialize the USB storage device.")); ShowError(tr("Uh oh! We couldn't initialize your USB drive. Make sure it is formatted correctly under the FAT32 Files system."));
else else
{ {
gameList.ReadGameList(); gameList.ReadGameList();
@ -992,7 +992,7 @@ int GameBrowseMenu::MainLoop()
else if (sdcardBtn->GetState() == STATE_CLICKED) else if (sdcardBtn->GetState() == STATE_CLICKED)
{ {
gprintf("\tsdCardBtn Clicked\n"); gprintf("\tsdCardBtn Clicked\n");
if(WindowPrompt(tr("Are you sure you want to remount SD?"), tr("The application might crash if there is currently a read/write access to the SD card!"), tr("Yes"), tr("Cancel"))) if(WindowPrompt(tr("Are you sure you want to remount the SD card?"), tr("USBLoaderGX might crash if it is running from the SD card!"), tr("Yes"), tr("Cancel")))
{ {
HaltGui(); HaltGui();
BannerAsync::HaltThread(); BannerAsync::HaltThread();
@ -1055,7 +1055,7 @@ int GameBrowseMenu::MainLoop()
{ {
if (!Settings.godmode && (Settings.ParentalBlocks & BLOCK_GLOBAL_SETTINGS)) if (!Settings.godmode && (Settings.ParentalBlocks & BLOCK_GLOBAL_SETTINGS))
{ {
WindowPrompt(tr( "Permission denied." ), tr( "Console must be unlocked for this option." ), tr( "OK" )); WindowPrompt(tr( "Permission denied." ), tr( "Your console must be unlocked for this option." ), tr( "OK" ));
settingsBtn->ResetState(); settingsBtn->ResetState();
return MENU_NONE; return MENU_NONE;
} }
@ -1079,7 +1079,7 @@ int GameBrowseMenu::MainLoop()
{ {
Settings.GameSort &= ~SORT_FAVORITE; Settings.GameSort &= ~SORT_FAVORITE;
gameList.FilterList(); gameList.FilterList();
ShowError(tr("No favorites selected.")); ShowError(tr("You don't have any favorites selected!."));
} }
else else
ReloadBrowser(); ReloadBrowser();
@ -1170,7 +1170,7 @@ int GameBrowseMenu::MainLoop()
{ {
if (!Settings.godmode && (Settings.ParentalBlocks & BLOCK_LOADER_LAYOUT_BUTTON)) if (!Settings.godmode && (Settings.ParentalBlocks & BLOCK_LOADER_LAYOUT_BUTTON))
{ {
WindowPrompt(tr( "Permission denied." ), tr( "Console must be unlocked for this option." ), tr( "OK" )); WindowPrompt(tr( "Permission denied." ), tr( "Your console must be unlocked for this option." ), tr( "OK" ));
listBtn->ResetState(); listBtn->ResetState();
return returnMenu; return returnMenu;
} }
@ -1187,7 +1187,7 @@ int GameBrowseMenu::MainLoop()
{ {
if (!Settings.godmode && (Settings.ParentalBlocks & BLOCK_LOADER_LAYOUT_BUTTON)) if (!Settings.godmode && (Settings.ParentalBlocks & BLOCK_LOADER_LAYOUT_BUTTON))
{ {
WindowPrompt(tr( "Permission denied." ), tr( "Console must be unlocked for this option." ), tr( "OK" )); WindowPrompt(tr( "Permission denied." ), tr( "Your console must be unlocked for this option." ), tr( "OK" ));
gridBtn->ResetState(); gridBtn->ResetState();
return returnMenu; return returnMenu;
} }
@ -1204,7 +1204,7 @@ int GameBrowseMenu::MainLoop()
{ {
if (!Settings.godmode && (Settings.ParentalBlocks & BLOCK_LOADER_LAYOUT_BUTTON)) if (!Settings.godmode && (Settings.ParentalBlocks & BLOCK_LOADER_LAYOUT_BUTTON))
{ {
WindowPrompt(tr( "Permission denied." ), tr( "Console must be unlocked for this option." ), tr( "OK" )); WindowPrompt(tr( "Permission denied." ), tr( "Your console must be unlocked for this option." ), tr( "OK" ));
carouselBtn->ResetState(); carouselBtn->ResetState();
return returnMenu; return returnMenu;
} }
@ -1221,13 +1221,13 @@ int GameBrowseMenu::MainLoop()
{ {
if (!Settings.godmode && (Settings.ParentalBlocks & BLOCK_LOADER_LAYOUT_BUTTON)) if (!Settings.godmode && (Settings.ParentalBlocks & BLOCK_LOADER_LAYOUT_BUTTON))
{ {
WindowPrompt(tr( "Permission denied." ), tr( "Console must be unlocked for this option." ), tr( "OK" )); WindowPrompt(tr( "Permission denied." ), tr( "Your console must be unlocked for this option." ), tr( "OK" ));
bannerGridBtn->ResetState(); bannerGridBtn->ResetState();
return returnMenu; return returnMenu;
} }
gprintf("\tbannerGridBtn Clicked\n"); gprintf("\tbannerGridBtn Clicked\n");
if(!SystemMenuResources::Instance()->IsLoaded()) { if(!SystemMenuResources::Instance()->IsLoaded()) {
WindowPrompt(tr( "Error:" ), tr( "Banner grid layout is only available with AHBPROT! Please consider installing new HBC version." ), tr( "OK" )); WindowPrompt(tr( "Error:" ), tr( "The banner grid layout is only available with AHBPROT! Consider updating to the latest version of the Homebrew Channel!" ), tr( "OK" ));
bannerGridBtn->ResetState(); bannerGridBtn->ResetState();
return MENU_NONE; return MENU_NONE;
} }
@ -1267,7 +1267,7 @@ int GameBrowseMenu::MainLoop()
lockBtn->ResetState(); lockBtn->ResetState();
if (Settings.godmode) if (Settings.godmode)
{ {
if(WindowPrompt(tr( "Parental Control" ), tr( "Are you sure you want to lock USB Loader GX?" ), tr( "Yes" ), tr( "No" )) == 1) if(WindowPrompt(tr( "Parental Control" ), tr( "Are you sure you want to lock USBLoaderGX?" ), tr( "Yes" ), tr( "No" )) == 1)
{ {
Settings.godmode = 0; Settings.godmode = 0;
gameList.FilterList(); gameList.FilterList();
@ -1283,13 +1283,13 @@ int GameBrowseMenu::MainLoop()
if (result > 0) if (result > 0)
{ {
if(result == 1) if(result == 1)
WindowPrompt( tr( "Correct Password" ), tr( "All the features of USB Loader GX are unlocked." ), tr( "OK" )); WindowPrompt( tr( "Parental controls have been disabled." ), tr( "Every feature of USBLoaderGX is unlocked." ), tr( "OK" ));
Settings.godmode = 1; Settings.godmode = 1;
gameList.FilterList(); gameList.FilterList();
ReloadBrowser(); ReloadBrowser();
} }
else if(result < 0) else if(result < 0)
WindowPrompt(tr( "Wrong Password" ), tr( "USB Loader GX is protected" ), tr( "OK" )); WindowPrompt(tr( "Incorrect Password!" ), tr( "USBLoaderGX is still locked." ), tr( "OK" ));
} }
} }
@ -1297,7 +1297,7 @@ int GameBrowseMenu::MainLoop()
{ {
if (!Settings.godmode && (Settings.ParentalBlocks & BLOCK_CATEGORIES_MENU)) if (!Settings.godmode && (Settings.ParentalBlocks & BLOCK_CATEGORIES_MENU))
{ {
WindowPrompt(tr( "Permission denied." ), tr( "Console must be unlocked for this option." ), tr( "OK" )); WindowPrompt(tr( "Permission denied." ), tr( "Your console must be unlocked for this option." ), tr( "OK" ));
categBtn->ResetState(); categBtn->ResetState();
return returnMenu; return returnMenu;
} }
@ -1327,12 +1327,12 @@ int GameBrowseMenu::MainLoop()
{ {
if (!Settings.godmode && (Settings.ParentalBlocks & BLOCK_LOADER_MODE_BUTTON)) if (!Settings.godmode && (Settings.ParentalBlocks & BLOCK_LOADER_MODE_BUTTON))
{ {
WindowPrompt(tr( "Permission denied." ), tr( "Console must be unlocked for this option." ), tr( "OK" )); WindowPrompt(tr( "Permission denied." ), tr( "Your console must be unlocked for this option." ), tr( "OK" ));
loaderModeBtn->ResetState(); loaderModeBtn->ResetState();
return returnMenu; return returnMenu;
} }
int choice = CheckboxWindow(tr( "Select titles sources." ), 0, tr( "Wii Games" ), tr( "NAND Channels" ), tr("EmuNAND Channels"), tr("GC Games"), 0, 0, Settings.LoaderMode); int choice = CheckboxWindow(tr( "Which criteria do you want displayed in USBLoaderGX?." ), 0, tr( "Wii Games" ), tr( "NAND Channels" ), tr("EmuNAND Channels"), tr("GC Games"), 0, 0, Settings.LoaderMode);
if(choice != CheckedNone && choice != Settings.LoaderMode) if(choice != CheckedNone && choice != Settings.LoaderMode)
{ {
Settings.LoaderMode = choice; Settings.LoaderMode = choice;
@ -1343,7 +1343,7 @@ int GameBrowseMenu::MainLoop()
if (wbfsinit < 0) if (wbfsinit < 0)
{ {
// This shouldn't ever fail in SD card mode // This shouldn't ever fail in SD card mode
ShowError("%s %s", tr( "USB Device not initialized." ), tr("Switching to channel list mode.")); ShowError("%s %s", tr( "Your USB Device is not initialized." ), tr("Switching to channel list mode."));
Settings.LoaderMode &= ~MODE_WIIGAMES; Settings.LoaderMode &= ~MODE_WIIGAMES;
Settings.LoaderMode |= MODE_NANDCHANNELS; Settings.LoaderMode |= MODE_NANDCHANNELS;
} }
@ -1407,7 +1407,7 @@ void GameBrowseMenu::CheckDiscSlotUpdate()
if ((DiscDriveCover & 0x02) && (DiscDriveCover != DiscDriveCoverOld)) if ((DiscDriveCover & 0x02) && (DiscDriveCover != DiscDriveCoverOld))
{ {
int choice = WindowPrompt(tr( "Disc Insert Detected" ), 0, tr( "Install" ), tr( "Mount DVD drive" ), tr( "Cancel" )); int choice = WindowPrompt(tr( "A disk has been inserted! What would you like to do?" ), 0, tr( "Install Game" ), tr( "Mount Disk" ), tr( "Cancel" ));
if (choice == 1) if (choice == 1)
installBtn->SetState(STATE_CLICKED); installBtn->SetState(STATE_CLICKED);
else if (choice == 2) else if (choice == 2)
@ -1425,13 +1425,13 @@ void GameBrowseMenu::CheckDiscSlotUpdate()
{ {
delete dvdheader; delete dvdheader;
dvdheader = NULL; dvdheader = NULL;
ShowError(tr("Can't mount or unknown disc format.")); ShowError(tr("Can't mount disk or it is using an unknown format."));
} }
else else
OpenClickedGame(dvdheader); OpenClickedGame(dvdheader);
} }
else else
WindowPrompt(tr( "No disc inserted." ), 0, tr( "OK" )); WindowPrompt(tr( "No disk has been inserted." ), 0, tr( "OK" ));
dvdBtn->ResetState(); dvdBtn->ResetState();
} }

6
source/menu/WDMMenu.cpp
View File

@ -183,21 +183,21 @@ void WDMMenu::CheckGameFiles(const struct discHdr * header)
wbfs_disc_t *disc = WBFS_OpenDisc((u8 *) header->id); wbfs_disc_t *disc = WBFS_OpenDisc((u8 *) header->id);
if (!disc) if (!disc)
{ {
WindowPrompt(tr( "ERROR:" ), tr( "Could not open Disc" ), tr( "OK" )); WindowPrompt(tr( "ERROR:" ), tr( "Uh oh! We could'nt read the disk. Please try cleaning and reinserting it." ), tr( "OK" ));
return; return;
} }
wiidisc_t *wdisc = wd_open_disc((s32(*)(void *, u32, u32, void *)) wbfs_disc_read, disc); wiidisc_t *wdisc = wd_open_disc((s32(*)(void *, u32, u32, void *)) wbfs_disc_read, disc);
if (!wdisc) if (!wdisc)
{ {
WindowPrompt(tr( "ERROR:" ), tr( "Could not open Disc" ), tr( "OK" )); WindowPrompt(tr( "ERROR:" ), tr( "Uh oh! We could'nt read the disk. Please try cleaning and reinserting it." ), tr( "OK" ));
return; return;
} }
FST_ENTRY * fstbuffer = (FST_ENTRY *) wd_extract_file(wdisc, ONLY_GAME_PARTITION, (char*) "FST"); FST_ENTRY * fstbuffer = (FST_ENTRY *) wd_extract_file(wdisc, ONLY_GAME_PARTITION, (char*) "FST");
if (!fstbuffer) if (!fstbuffer)
{ {
WindowPrompt(tr( "ERROR:" ), tr( "Not enough free memory." ), tr( "OK" )); WindowPrompt(tr( "ERROR:" ), tr( "Oops! Not enough free storage available. Please make room on your drive or insert a larger one to continue." ), tr( "OK" ));
return; return;
} }

38
source/menu/menu_install.cpp
View File

@ -27,7 +27,7 @@ int MenuGCInstall()
GCDumper gcDumper; GCDumper gcDumper;
if(gcDumper.ReadDiscHeader() < 0) if(gcDumper.ReadDiscHeader() < 0)
{ {
WindowPrompt(tr("Error"), tr("Error reading disc"), tr("OK")); WindowPrompt(tr("Error"), tr("Error reading disc. Check for smudges/scratches."), tr("OK"));
return MENU_DISCLIST; return MENU_DISCLIST;
} }
@ -35,7 +35,7 @@ int MenuGCInstall()
if(gcDumper.GetDiscHeaders().size() == 0) if(gcDumper.GetDiscHeaders().size() == 0)
{ {
WindowPrompt(tr("Error"), tr("No games found on the disc"), tr("OK")); WindowPrompt(tr("Error"), tr("No games were found on this disk. Try cleaning the disk, and make sure to insert it correctly."), tr("OK"));
return MENU_DISCLIST; return MENU_DISCLIST;
} }
else if(gcDumper.GetDiscHeaders().size() > 1) else if(gcDumper.GetDiscHeaders().size() > 1)
@ -62,7 +62,7 @@ int MenuGCInstall()
} }
else else
{ {
if(!WindowPrompt(tr( "Continue to install game?" ), gcDumper.GetDiscHeaders().at(0).title, tr("Yes"), tr( "Cancel" ))) if(!WindowPrompt(tr( "Would you like to install this game?" ), gcDumper.GetDiscHeaders().at(0).title, tr("Yes"), tr( "Cancel" )))
return MENU_DISCLIST; return MENU_DISCLIST;
installGames.push_back(0); installGames.push_back(0);
@ -82,7 +82,7 @@ int MenuGCInstall()
//! Alert the user if he is dumping on SD with DIOS MIOS (USB) installed //! Alert the user if he is dumping on SD with DIOS MIOS (USB) installed
if(destination == 2 && IosLoader::GetMIOSInfo() == DIOS_MIOS) if(destination == 2 && IosLoader::GetMIOSInfo() == DIOS_MIOS)
{ {
if(!WindowPrompt(tr("Are you sure you want to install on SD?"), ("You have DIOS-MIOS installed so the game need to be on a FAT32 USB. You will need to install DIOS-MIOS Lite to run this game from SD."), tr("Yes"), tr( "Cancel" ))) if(!WindowPrompt(tr("Are you sure you want to install on the SD card?"), ("You have DIOS-MIOS installed so the game need to be on a FAT32 USB. You will need to install DIOS-MIOS Lite to run this game from an SD card."), tr("Yes"), tr( "Cancel" )))
return MENU_DISCLIST; return MENU_DISCLIST;
} }
@ -104,7 +104,7 @@ int MenuGCInstall()
//! check if the game is already installed on SD/USB //! check if the game is already installed on SD/USB
if(GCGames::Instance()->IsInstalled((char *)gcDumper.GetDiscHeaders().at(installGames[i]).id, gcDumper.GetDiscHeaders().at(installGames[i]).disc_no)) if(GCGames::Instance()->IsInstalled((char *)gcDumper.GetDiscHeaders().at(installGames[i]).id, gcDumper.GetDiscHeaders().at(installGames[i]).disc_no))
{ {
WindowPrompt(tr("Game is already installed:"), gcDumper.GetDiscHeaders().at(installGames[i]).title, tr("OK")); WindowPrompt(tr("Oops! This game is already installed:"), gcDumper.GetDiscHeaders().at(installGames[i]).title, tr("OK"));
if(i+1 < installGames.size()) { if(i+1 < installGames.size()) {
continue; continue;
} }
@ -118,7 +118,7 @@ int MenuGCInstall()
// Check Disc2 installation format (DML 2.6+ auto-swap feature doesn't work with extracted game format) // Check Disc2 installation format (DML 2.6+ auto-swap feature doesn't work with extracted game format)
if(Settings.GCInstallCompressed && gcDumper.GetDiscHeaders().at(installGames[i]).disc_no == 1) if(Settings.GCInstallCompressed && gcDumper.GetDiscHeaders().at(installGames[i]).disc_no == 1)
{ {
int choice = WindowPrompt(tr(gcDumper.GetDiscHeaders().at(installGames[i]).title), tr("Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?"), tr("Yes"), tr("Cancel")); int choice = WindowPrompt(tr(gcDumper.GetDiscHeaders().at(installGames[i]).title), tr("This disc needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?"), tr("Yes"), tr("Cancel"));
if(choice == 0) if(choice == 0)
{ {
if(i+1 < installGames.size()) { if(i+1 < installGames.size()) {
@ -160,7 +160,7 @@ int MenuGCInstall()
//! Error occured, ask the user what to do if there are more games to install //! Error occured, ask the user what to do if there are more games to install
if(i+1 < installGames.size()) if(i+1 < installGames.size())
{ {
if(!WindowPrompt(tr( "Install Error!" ), tr("Do you want to continue with next game?"), tr("Yes"), tr( "Cancel" ))) if(!WindowPrompt(tr( "There was an error during the installation! This can occur when there is corrupt data on the disk or if it is scratched/smudged." ), tr("Do you want to continue with the next game?"), tr("Yes"), tr( "Cancel" )))
{ {
result = MENU_DISCLIST; result = MENU_DISCLIST;
break; break;
@ -168,7 +168,7 @@ int MenuGCInstall()
} }
else else
{ {
WindowPrompt(tr( "Install Error!" ), 0, tr( "Back" )); WindowPrompt(tr( "There was an error with the installation!" ), 0, tr( "Back" ));
result = MENU_DISCLIST; result = MENU_DISCLIST;
break; break;
} }
@ -212,16 +212,16 @@ int MenuInstall()
int ret, choice = 0; int ret, choice = 0;
ret = DiscWait(tr( "Insert Disk" ), tr( "Waiting..." ), tr( "Cancel" ), 0, 0); ret = DiscWait(tr( "Please insert your game disk." ), tr( "Waiting..." ), tr( "Cancel" ), 0, 0);
if (ret < 0) if (ret < 0)
{ {
WindowPrompt(tr( "Error reading Disc" ), 0, tr( "Back" )); WindowPrompt(tr( "There was an error reading the disc." ), 0, tr( "Back" ));
return MENU_DISCLIST; return MENU_DISCLIST;
} }
ret = Disc_Open(); ret = Disc_Open();
if (ret < 0) if (ret < 0)
{ {
WindowPrompt(tr( "Could not open Disc" ), 0, tr( "Back" )); WindowPrompt(tr( "Could not open disk." ), 0, tr( "Back" ));
return MENU_DISCLIST; return MENU_DISCLIST;
} }
@ -231,7 +231,7 @@ int MenuInstall()
if ((headerdisc.magic != WII_MAGIC) && (headerdisc.gc_magic != GCGames::MAGIC)) if ((headerdisc.magic != WII_MAGIC) && (headerdisc.gc_magic != GCGames::MAGIC))
{ {
choice = WindowPrompt(tr( "Not a Wii or a GameCube Disc" ), tr( "Insert a Wii or a GameCube Disc!" ), tr( "OK" ), tr( "Back" )); choice = WindowPrompt(tr( "This is not a Wii or a Gamecube Disc." ), tr( "Please Insert a Wii or a GameCube Disc!" ), tr( "OK" ), tr( "Back" ));
if (choice == 1) if (choice == 1)
return MenuInstall(); return MenuInstall();
else else
@ -246,7 +246,7 @@ int MenuInstall()
ret = WBFS_CheckGame(headerdisc.id); ret = WBFS_CheckGame(headerdisc.id);
if (ret) if (ret)
{ {
WindowPrompt(tr( "Game is already installed:" ), headerdisc.title, tr( "Back" )); WindowPrompt(tr( "Oops! This game is already installed:" ), headerdisc.title, tr( "Back" ));
return MENU_DISCLIST; return MENU_DISCLIST;
} }
@ -259,17 +259,17 @@ int MenuInstall()
snprintf(gametxt, sizeof(gametxt), "%s : %.2fGB", headerdisc.title, gamesize/GB_SIZE); snprintf(gametxt, sizeof(gametxt), "%s : %.2fGB", headerdisc.title, gamesize/GB_SIZE);
wiilight(1); wiilight(1);
choice = WindowPrompt(tr( "Continue to install game?" ), gametxt, tr( "OK" ), tr( "Cancel" )); choice = WindowPrompt(tr( "Continue to the installation?" ), gametxt, tr( "OK" ), tr( "Cancel" ));
if (choice == 1) if (choice == 1)
{ {
sprintf(gametxt, "%s", tr( "Installing game:" )); sprintf(gametxt, "%s", tr( "Currently installing your game:" ));
if (gamesize/GB_SIZE > freespace) if (gamesize/GB_SIZE > freespace)
{ {
char errortxt[50]; char errortxt[50];
sprintf(errortxt, "%s: %.2fGB, %s: %.2fGB", tr( "Game Size" ), gamesize/GB_SIZE, tr( "Free Space" ), freespace); sprintf(errortxt, "%s: %.2fGB, %s: %.2fGB", tr( "Game Size" ), gamesize/GB_SIZE, tr( "Free Space" ), freespace);
WindowPrompt(tr( "Not enough free space!" ), errortxt, tr( "OK" )); WindowPrompt(tr( "Not enough free space! Either connect a larger USB device or make space!" ), errortxt, tr( "OK" ));
} }
else else
{ {
@ -281,15 +281,15 @@ int MenuInstall()
wiilight(0); wiilight(0);
if (install_abort_signal) if (install_abort_signal)
{ {
WindowPrompt(tr( "Install Canceled" ), 0, tr( "OK" )); WindowPrompt(tr( "Installation was cancelled." ), 0, tr( "OK" ));
} }
else if (ret != 0) else if (ret != 0)
{ {
WindowPrompt(tr( "Install Error!" ), 0, tr( "Back" )); WindowPrompt(tr( "There was an error installing!!" ), 0, tr( "Back" ));
} }
else else
{ {
ShowProgress(tr("Install finished"), headerdisc.title, tr("Reloading game list now, please wait..."), gamesize, gamesize, true, true); ShowProgress(tr("Installation complete!"), headerdisc.title, tr("Reloading game list, please wait..."), gamesize, gamesize, true, true);
gameList.ReadGameList(); //get the entries again gameList.ReadGameList(); //get the entries again
gameList.FilterList(); gameList.FilterList();
isCacheCurrent(); isCacheCurrent();

4
source/menu/menu_partition_selection.cpp
View File

@ -36,7 +36,7 @@ int SelectPartitionMenu()
else else
{ {
options.SetName(counter, "%s %d:", tr( "Partition" ), cnt + 1); options.SetName(counter, "%s %d:", tr( "Partition" ), cnt + 1);
options.SetValue(counter, tr( "Can't be formatted" )); options.SetValue(counter, tr( "This drive could not be formatted." ));
} }
counter++; counter++;
} }
@ -98,7 +98,7 @@ int SelectPartitionMenu()
if (ret >= 0) if (ret >= 0)
{ {
if (strcmp(options.GetValue(ret), tr( "Can't be formatted" )) != 0) if (strcmp(options.GetValue(ret), tr( "We couldn't successfully format the drive." )) != 0)
{ {
choice = ret; choice = ret;
ExitSelect = true; ExitSelect = true;