* Made menu errors translatable (thanks Overjoy)

* Now if you click B on ExitTo menu it will go back to Home menu and not coverflow
* If parental lock is on, ExitTo will just exit and not show ExitTo menu anymore
* Now with home in ExitTo you can exit too
* Added/Deleted some sentences
* Updated english and italian translation

source/defines.h

@@ -1,4 +1,3 @@
-
 #define APP_NAME				"WiiFlow"
 #define APP_VERSION				"Mod 3.1"
 
@@ -46,9 +45,8 @@ ohloh.net, wiifanart.com, wiiflowiki.com, \
 tgames.fr.nf"
 
 #define THANKS_CODE \
-"CFG Loader, uLoader, USB Loader GX, \
-NeoGamma, Wii Banner Player Project, \
-Mighty Channels, WiiXplorer, Triiforce, \
+"CFG Loader, Wii Banner Player Project, USB Loader GX, \
+uLoader, NeoGamma, Mighty Channels, WiiXplorer, Triiforce, \
 postLoader"
 
 

source/main.cpp

@@ -107,9 +107,6 @@ int main(int argc, char **argv)
 		if(DeviceHandler::Instance()->IsInserted(SD))
 			deviceAvailable = true;
 
-		if(!deviceAvailable)
-			Sys_Exit();
-
 		bool dipOK = Disc_Init() >= 0;
 
 		CMenu menu(vid);
@@ -118,12 +115,17 @@ int main(int argc, char **argv)
 		mainMenu = &menu;
 		if (!iosOK)
 		{
-			menu.error(sfmt("d2x cIOS %i rev6 or later is required", mainIOS));
+			menu.terror("errboot1", L"d2x cIOSs rev6 or later are required!\ncIOSs 249 base 56 and 250 base 57 are enough for all your games.\nMore cIOSs could make wiiflow unstable!");
+			break;
+		}
+		else if (!deviceAvailable)
+		{
+			menu.terror("errboot2", L"Could not find a device to save configuration files on!");
 			break;
 		}
 		else if (!dipOK)
 		{
-			menu.error(L"Could not initialize the DIP module!");
+			menu.terror("errboot3", L"Could not initialize the DIP module!");
 			break;
 		}
 		else

source/menu/menu.hpp

@@ -44,6 +44,7 @@ public:
 	~CMenu(void) {cleanup();}
 	void init(void);
 	void error(const wstringEx &msg);
+	void terror(const char *key, const wchar_t *msg) { error(_fmt(key, msg)); }
 	void exitHandler(int ExitTo);
 	int main(void);
 	void cleanup(bool ios_reload = false);

source/menu/menu_about.cpp

@@ -112,7 +112,7 @@ void CMenu::_initAboutMenu(CMenu::SThemeData &theme)
 
 void CMenu::_textAbout(void)
 {
-	m_btnMgr.setText(m_aboutLblTitle, wfmt(_fmt("appname", L"%s (%s-r%s)"), APP_NAME, APP_VERSION, SVN_REV), false);
+	m_btnMgr.setText(m_aboutLblTitle, wfmt( L"%s (%s-r%s)", APP_NAME, APP_VERSION, SVN_REV), false);
 
 	wstringEx help_text;
 	FILE *f = fopen(fmt("%s/%s.txt", m_helpDir.c_str(), m_curLanguage.c_str()), "r");

source/menu/menu_game.cpp

@@ -707,7 +707,7 @@ void CMenu::_directlaunch(const string &id)
 			_launch(&m_gameList[0]); // Launch will exit wiiflow
 		}
 	}
-	error(sfmt("Cannot find the game with ID: %s", id.c_str()));
+	error(sfmt("errgame1", L"Cannot find the game with ID: %s", id.c_str()));
 }
 
 void CMenu::_launch(dir_discHdr *hdr)
@@ -924,7 +924,7 @@ int CMenu::_loadIOS(u8 gameIOS, int userIOS, string id)
 	{
 		if(_installed_cios.size() <= 0)
 		{
-			error(sfmt("No cios found!"));
+			error(sfmt("errgame2", L"No cios found!"));
 			Sys_LoadMenu();
 		}
 		u8 IOS[3];
@@ -950,7 +950,7 @@ int CMenu::_loadIOS(u8 gameIOS, int userIOS, string id)
 		}
 		if(!found)
 		{
-			error(sfmt("Couldn't find a cIOS using base %i, or 56/57", IOS[0]));
+			error(sfmt("errgame3", L"Couldn't find a cIOS using base %i, or 56/57", IOS[0]));
 			return LOAD_IOS_FAILED;
 		}
 	}
@@ -961,7 +961,7 @@ int CMenu::_loadIOS(u8 gameIOS, int userIOS, string id)
 		if(!loadIOS(gameIOS, true))
 		{
 			_reload_wifi_gecko();
-			error(sfmt("Couldn't load IOS %i", gameIOS));
+			error(sfmt("errgame4", L"Couldn't load IOS %i", gameIOS));
 			return LOAD_IOS_FAILED;
 		}
 		return LOAD_IOS_SUCCEEDED;
@@ -1057,7 +1057,7 @@ void CMenu::_launchChannel(dir_discHdr *hdr)
 		if(Nand::Instance()->Enable_Emu() < 0)
 		{
 			Nand::Instance()->Disable_Emu();
-			error(L"Enabling emu failed!");
+			error(_t("errgame5", L"Enabling emu failed!"));
 
 			return;
 		}
@@ -1104,7 +1104,7 @@ void CMenu::_launchChannel(dir_discHdr *hdr)
 			}
 			if(!found)
 			{
-				error(sfmt("Couldn't find a cIOS using base %i, or 56/57", IOS[0]));
+				error(sfmt("errgame3", L"Couldn't find a cIOS using base %i, or 56/57", IOS[0]));
 				return;
 			}
 		}
@@ -1115,7 +1115,7 @@ void CMenu::_launchChannel(dir_discHdr *hdr)
 			if(!loadIOS(gameIOS, false))
 			{
 				_reload_wifi_gecko();
-				error(sfmt("Couldn't reload to cIOS %i", gameIOS));
+				error(sfmt("errgame4", L"Couldn't reload to cIOS %i", gameIOS));
 				return;
 			}
 			if(!emu_disabled)
@@ -1131,7 +1131,7 @@ void CMenu::_launchChannel(dir_discHdr *hdr)
 				if(Nand::Instance()->Enable_Emu() < 0)
 				{
 					Nand::Instance()->Disable_Emu();
-					error(L"Enabling emu after reload failed!");
+					error(_t("errgame6", L"Enabling emu after reload failed!"));
 					Sys_LoadMenu();
 					return;
 				}
@@ -1177,12 +1177,12 @@ void CMenu::_launchGame(dir_discHdr *hdr, bool dvd)
 		Disc_SetUSB(NULL);
 		if (WDVD_GetCoverStatus(&cover) < 0)
 		{
-			error(L"WDVDGetCoverStatus Failed!");
+			error(_t("errgame7", L"WDVDGetCoverStatus Failed!"));
 			if (BTN_B_PRESSED) return;
 		}
 		if (!(cover & 0x2))
 		{
-			error(L"Please insert a game disc.");
+			error(_t("errgame8", L"Please insert a game disc."));
 			do {
 				WDVD_GetCoverStatus(&cover);
 				if (BTN_B_PRESSED) return;
@@ -1191,7 +1191,7 @@ void CMenu::_launchGame(dir_discHdr *hdr, bool dvd)
 		/* Open Disc */
 		if (Disc_Open() < 0) 
 		{
-			error(L"Cannot Read DVD.");
+			error(_t("wbfsoperr2", L"Disc_Open failed"));
 			if (BTN_B_PRESSED) return;
 		}
 
@@ -1200,7 +1200,7 @@ void CMenu::_launchGame(dir_discHdr *hdr, bool dvd)
 		{
 			if (Disc_IsGC() < 0) 
 			{
-				error(L"This is not a Wii or GC disc");
+				error(_t("errgame9", L"This is not a Wii or GC disc"));
 				if (BTN_B_PRESSED) return;
 			}
 			else
@@ -1372,7 +1372,7 @@ void CMenu::_launchGame(dir_discHdr *hdr, bool dvd)
 		if(Nand::Instance()->Enable_Emu() < 0)
 		{
 			Nand::Instance()->Disable_Emu();
-			error(L"Enabling emu after reload failed!");
+			error(_t("errgame6", L"Enabling emu after reload failed!"));
 			if (iosLoaded) Sys_LoadMenu();
 			return;
 		}
@@ -1406,14 +1406,14 @@ void CMenu::_launchGame(dir_discHdr *hdr, bool dvd)
 		if (ret < 0)
 		{
 			gprintf("Set USB failed: %d\n", ret);
-			error(wfmt(L"Set USB failed: %d\n", ret));
+			error(wfmt(_fmt("errgame10", L"Set USB failed: %d"), ret));
 			if (iosLoaded) Sys_LoadMenu();
 			return;
 		}
 
 		if (Disc_Open() < 0)
 		{
-			error(L"Disc_Open failed");
+			error(_t("wbfsoperr2", L"Disc_Open failed"));
 			if (iosLoaded) Sys_LoadMenu();
 			return;
 		}

source/menu/menu_home.cpp

@@ -2,6 +2,8 @@
 #include "menu.hpp"
 #include "svnrev.h"
 
+#define SET_EXIT(X)	exitHandler(X); exit = true; break;
+
 u32 m_homeLblTitle;
 u32 m_exittoLblTitle;
 
@@ -9,7 +11,7 @@ u32 m_homeBtnSettings;
 u32 m_homeBtnReloadCache;
 u32 m_homeBtnUpdate;
 u32 m_homeBtnAbout;
-u32 m_homeBtnExitTo; // Exit To
+u32 m_homeBtnExitTo;
 
 u32 m_homeBtnExitToHBC;
 u32 m_homeBtnExitToMenu;
@@ -74,15 +76,18 @@ bool CMenu::_Home(void)
 			}
 			else if(m_btnMgr.selected(m_homeBtnExitTo))
 			{					
+				if(m_locked)
+				{
+					SET_EXIT(0);
+				}
+				else
 					exit = _ExitTo();
 				break;
 			}
 		}
 		else if(BTN_HOME_PRESSED)
 		{
-		    exitHandler(0);
-			exit = true;
-			break;
+			SET_EXIT(0);
 		}
 		else if(BTN_B_PRESSED)
 		    break;
@@ -108,33 +113,32 @@ bool CMenu::_ExitTo(void)
 		{
 			if(m_btnMgr.selected(m_homeBtnExitToHBC))
 			{
-				
-				exitHandler(1);
-				exit = true;
-				break;
+				SET_EXIT(1);
 			}
 			else if(m_btnMgr.selected(m_homeBtnExitToMenu))
 			{
-				exitHandler(2);
-				exit = true;
-				break;
+				SET_EXIT(2);
 			}
 			else if(m_btnMgr.selected(m_homeBtnExitToPriiloader))
 			{
-				exitHandler(3);
-				exit = true;
-				break;
+				SET_EXIT(3);
 			}
 			else if(m_btnMgr.selected(m_homeBtnExitToBootmii))
 			{
-				exitHandler(4);
-				exit = true;
-				break;
+				SET_EXIT(4);
 			}
 		}
 		else if(BTN_B_PRESSED)
+		{
+		    _hideExitTo();
+		    exit = _Home();
 			break;
 		}
+		else if(BTN_HOME_PRESSED)
+		{
+			SET_EXIT(0);
+		}
+	}
 	
 	_hideExitTo();
 	return exit;
@@ -230,7 +234,7 @@ void CMenu::_initHomeAndExitToMenu(CMenu::SThemeData &theme)
 
 void CMenu::_textHome(void)
 {
-	m_btnMgr.setText(m_homeLblTitle, wfmt(_fmt("appname", L"%s (%s-r%s)"), APP_NAME, APP_VERSION, SVN_REV), false);
+	m_btnMgr.setText(m_homeLblTitle, wfmt( L"%s (%s-r%s)", APP_NAME, APP_VERSION, SVN_REV), false);
 	
 	m_btnMgr.setText(m_homeBtnSettings, _t("home1", L"Settings"));
 	m_btnMgr.setText(m_homeBtnReloadCache, _t("home2", L"Reload Cache"));

source/menu/menu_wbfs.cpp

@@ -452,7 +452,7 @@ bool CMenu::_wbfsOp(CMenu::WBFS_OP op)
 			if (!m_thrdMessage.empty())
 				m_btnMgr.setText(m_wbfsLblDialog, m_thrdMessage);
 			m_btnMgr.setProgress(m_wbfsPBar, m_thrdProgress);
-			m_btnMgr.setText(m_wbfsLblMessage, wfmt(_fmt("wbfsprogress", L"%i%%"), (int)(m_thrdProgress * 100.f)));
+			m_btnMgr.setText(m_wbfsLblMessage, wfmt( L"%i%%", (int)(m_thrdProgress * 100.f)));
 			if (!m_thrdWorking)
 			{
 				if(op == CMenu::WO_ADD_GAME)

wii/wiiflow/Languages/english.ini

@@ -182,6 +182,19 @@ DMLpal=PAL 576i
 DMLpal60=PAL 480i
 DMLprog=NTSC 480p
 DMLprogP=PAL 480p
+errboot1=d2x cIOSs rev6 or later are required!\ncIOSs 249 base 56 and 250 base 57 are enough for all your games.\nMore cIOSs could make wiiflow unstable!
+errboot2=Could not find a device to save configuration files on!
+errboot3=Could not initialize the DIP module!
+errgame1=Cannot find the game with ID: %s
+errgame2=No cios found!
+errgame3=Couldn't find a cIOS using base %i, or 56/57
+errgame4=Couldn't load IOS %i
+errgame5=Enabling emu failed!
+errgame6=Enabling emu after reload failed!
+errgame7=WDVDGetCoverStatus Failed!
+errgame8=Please insert a game disc.
+errgame9=This is not a Wii or GC disc
+errgame10=Set USB failed: %d
 exit_to=Exit To
 gameinfo1=Developer: %s
 gameinfo2=Publisher: %s

wii/wiiflow/Languages/italian.ini

@@ -8,11 +8,9 @@ about7=Sviluppatori precedenti:\n%s
 about8=Pezzi di codice ottenuti da:\n%s
 about9=Siti che supportano il progetto:\n%s
 alphabetically=Alfabeticamente
-appname=%s v%s
 aspect169=Forza 16:9
 aspect43=Forza 4:3
 aspectDef=Predefinito
-bootmii=BootMii
 bycontrollers=Numero telecomandi
 byesrb=Classificazione ESRB/PEGI
 bygameid=ID Gioco
@@ -22,7 +20,7 @@ byplayers=Numero giocatori
 bywifiplayers=Numero giocatori Wifi
 cd1=Indietro
 cd2=Elimina
-cd3=Blocco d'età
+cd3=Blocco età
 cfg1=Impostazioni
 cfg10=Indietro
 cfg11=Emulazione salvataggi USB
@@ -40,7 +38,6 @@ cfga2=Installa gioco
 cfga3=Installa
 cfga6=Lingua
 cfga7=Tema
-cfgb1=Ocarina
 cfgb3=Modalità video
 cfgb4=Lingua giochi
 cfgb5=Modalità video DML
@@ -58,17 +55,15 @@ cfgg1=Impostazioni
 cfgg2=Modalità video
 cfgg3=Lingua
 cfgg4=Patch codice regione
-cfgg5=Ocarina
 cfgg7=Vipatch
 cfgg8=Indietro
-cfgg10=IOS
 cfgg12=Scarica copertine
 cfgg13=Scarica
 cfgg14=Patch modalità video
 cfgg15=Trucchi
 cfgg16=Seleziona
 cfgg17=Seleziona categorie
-cfgg18=Hooktype
+cfgg18=Tipo di hook
 cfgg21=Ritorna al canale
 cfgg22=Debugger
 cfgg23=Scaricando trucchi...
@@ -76,7 +71,6 @@ cfgg24=Emulazione NAND
 cfgg25=Password sbagliata
 cfgg26=Disabilita blocco ricarica IOS
 cfgg27=Formato TV
-cfgg28=NMM
 cfgg29=Patch NO-DVD
 cfgg30=Estrai salvataggi dalla NAND
 cfgg31=Estrai
@@ -177,11 +171,19 @@ dlmsg25=Estrazione fallita! Rinominando il backup in boot.dol
 dlmsg26=Aggiornando cache...
 DMLdef=Predefinita
 DMLdefG=Gioco
-DMLntsc=NTSC 480i
-DMLpal=PAL 576i
-DMLpal60=PAL 480i
-DMLprog=NTSC 480p
-DMLprogG=PAL 480p
+errboot1=Sono necessari i cIOS d2x v6 o superiore!\nI cIOS 249 base 56 e 250 base 57 bastano per tutti i giochi.\nAltri cIOS possono rendere wiiflow instabile!
+errboot2=Impossibile trovare una periferica su cui salvare i file di configurazione!
+errboot3=Impossibile inizializzare il modulo DIP!
+errgame1=Impossibile trovare il gioco con ID: %s
+errgame2=Nessun cIOS trovato!
+errgame3=Impossibile trovare un cIOS con base %i, o 56/57
+errgame4=Impossibile caricare il IOS %i
+errgame5=Abilitazione della NAND fallita!
+errgame6=Abilitazione della NAND dopo ricarica fallita!
+errgame7=Operazione WDVDGetCoverStatus fallita!
+errgame8=Inserisci un disco.
+errgame9=Questo non è un disco per Wii o Gamecube
+errgame10=Errore impostando USB: %d
 exit_to=Esci a
 gameinfo1=Sviluppatore: %s
 gameinfo2=Editore: %s
@@ -199,13 +201,6 @@ home2=Ricarica cache
 home3=Aggiorna
 home4=Crediti
 home5=Esci a
-hooktype1=VBI
-hooktype2=KPAD Read
-hooktype3=Joypad
-hooktype4=GXDraw
-hooktype5=GXFlush
-hooktype6=OSSleepThread
-hooktype7=AXNextFrame
 ios=IOS%i base %s
 lngdef=Predefinita
 lngdut=Olandese
@@ -265,9 +260,6 @@ turbografxcd=TurboGrafx-CD
 unknown=Sconosciuti
 viddef=Predefinita
 vidgame=Gioco
-vidntsc=NTSC
-vidp50=PAL 50Hz
-vidp60=PAL 60Hz
 vidprog=Proggressivo
 vidsys=Sistema
 vmpall=Tutte
@@ -305,9 +297,6 @@ wbfsoperr1=Operazione Disc_Wait fallita
 wbfsoperr2=Operazione Disc_Open fallita
 wbfsoperr3=Questo non è un gioco per Wii!
 wbfsoperr4=Gioco già installato
-wbfsprogress=%i%%
 wbfsremdlg=Per rimuovere definitivamente il gioco: %s, clicca avvia.
 wifiplayers=Giocatori Wifi
-wii=Wii
 wiichannels=Canali Wii ufficiali
-wiiware=WiiWare

wiiflow.pnps

@@ -1 +1 @@
-<pd><ViewState><e p="Wiiflow\portlibs" x="false"></e><e p="Wiiflow\source\cheats" x="true"></e><e p="Wiiflow\docs" x="false"></e><e p="Wiiflow\source\gecko" x="true"></e><e p="Wiiflow\source\homebrew" x="true"></e><e p="Wiiflow\source\loader" x="true"></e><e p="Wiiflow\source\wstringEx" x="false"></e><e p="Wiiflow" x="true"></e><e p="Wiiflow\source\devicemounter\libwbfs" x="true"></e><e p="Wiiflow\source\gc" x="true"></e><e p="Wiiflow\source\list" x="true"></e><e p="Wiiflow\source\music" x="true"></e><e p="Wiiflow\source\config" x="true"></e><e p="Wiiflow\source\memory" x="false"></e><e p="Wiiflow\source" x="true"></e><e p="Wiiflow\source\channel" x="true"></e><e p="Wiiflow\source\menu" x="true"></e><e p="Wiiflow\source\network" x="true"></e><e p="Wiiflow\source\plugin" x="true"></e><e p="Wiiflow\source\unzip" x="true"></e><e p="Wiiflow\wii" x="false"></e><e p="Wiiflow\data" x="false"></e><e p="Wiiflow\resources" x="false"></e><e p="Wiiflow\scripts" x="false"></e><e p="Wiiflow\source\devicemounter" x="true"></e><e p="Wiiflow\source\gui" x="true"></e></ViewState></pd>
+<pd><ViewState><e p="Wiiflow\portlibs" x="false"></e><e p="Wiiflow\source\cheats" x="true"></e><e p="Wiiflow\docs" x="false"></e><e p="Wiiflow\source\gecko" x="true"></e><e p="Wiiflow\source\homebrew" x="true"></e><e p="Wiiflow\source\loader" x="true"></e><e p="Wiiflow\source\wstringEx" x="false"></e><e p="Wiiflow" x="true"></e><e p="Wiiflow\source\devicemounter\libwbfs" x="true"></e><e p="Wiiflow\source\gc" x="true"></e><e p="Wiiflow\source\list" x="true"></e><e p="Wiiflow\source\music" x="true"></e><e p="Wiiflow\source\banner" x="false"></e><e p="Wiiflow\source\config" x="true"></e><e p="Wiiflow\source\memory" x="false"></e><e p="Wiiflow\source" x="true"></e><e p="Wiiflow\source\channel" x="true"></e><e p="Wiiflow\source\menu" x="true"></e><e p="Wiiflow\source\network" x="true"></e><e p="Wiiflow\source\plugin" x="true"></e><e p="Wiiflow\source\unzip" x="true"></e><e p="Wiiflow\wii" x="false"></e><e p="Wiiflow\data" x="false"></e><e p="Wiiflow\resources" x="false"></e><e p="Wiiflow\scripts" x="false"></e><e p="Wiiflow\source\devicemounter" x="true"></e><e p="Wiiflow\source\gui" x="true"></e></ViewState></pd>