* Added DM(L) version detection and removed user setting.

* Added a setting for DML Japanese Patch
* Hide DML individual game settings if DM(L) is not installed
  or is not the correct version.
* Fixed device selection when using USB with devolution
* Fixed Devolution's launching and game region detection 
  (Fix lag and wrong colors. Thanks to testers)
* Prevent Playcount increasing if the game couldn't launch

HBC/META.XML

@@ -2,8 +2,8 @@
 	<app version="1">
 		<name> USB Loader GX</name>
 		<coder>USB Loader GX Team</coder>
-		<version>3.0 r1201</version>
+		<version>3.0 r1202</version>
-		<release_date>201208051246</release_date>
+		<release_date>201208241621</release_date>
 		<!--   // remove this line to enable arguments
 		<arguments>
 				<arg>--ios=250</arg>

Languages/czech.lang

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-05 14:46+0200\n"
+"POT-Creation-Date: 2012-08-24 18:22+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: David Jelinek (djelinek@hotmail.com) e->e,r->r,u->u, c->c \n"
 "Language-Team: r1056 - last version on http://djelinek.sweb.cz/_USBLoderGX/czech.lang \n"
@@ -506,7 +506,7 @@ msgstr ""
 msgid "DML Force Widescreen"
 msgstr ""
 
-msgid "DML Installed Version"
+msgid "DML Japanese Patch"
 msgstr ""
 
 msgid "DML LED Activity"
@@ -602,6 +602,9 @@ msgstr ""
 msgid "Devolution Loader Path"
 msgstr ""
 
+msgid "Devolution's loader.bin file can't be loaded."
+msgstr ""
+
 msgid "Directory does not exist!"
 msgstr "Adresár neexistuje!"
 
@@ -1859,7 +1862,7 @@ msgstr "Cesta k TXT cheatum"
 msgid "The .them file was not found in the zip."
 msgstr "Soubor .them nebyl nalezen v ZIP."
 
-msgid "The Force Widescreen setting requires DIOS MIOS v2.2 or more. This setting will be ignored."
+msgid "The Force Widescreen setting requires DIOS MIOS v2.1 or more. This setting will be ignored."
 msgstr ""
 
 msgid "The GCT Cheatcodes Path and this game are not on the same partition. Run the game without Ocarina?"
@@ -1874,6 +1877,9 @@ msgstr ""
 msgid "The No Disc setting is not used anymore by DIOS MIOS (Lite). Now you need to place a disc in your drive."
 msgstr ""
 
+msgid "The No Disc+ setting requires DIOS MIOS 2.2 update2 or a newer version. This setting will be ignored."
+msgstr ""
+
 msgid "The SYSCONF file will be extracted to your emu nand path and emu nand channel path. Attention: All existing files will be overwritten."
 msgstr ""
 
@@ -2147,7 +2153,10 @@ msgstr ""
 msgid "You cannot delete this category."
 msgstr ""
 
-msgid "You need to install DIOS MIOS to run GameCube games from USB or DIOS MIOS Lite to run them from SD card"
+msgid "You need to install DIOS MIOS Lite v1.2 or a newer version."
+msgstr ""
+
+msgid "You need to install Devolution or DIOS MIOS (Lite) to launch GameCube games from USB or SD card"
 msgstr ""
 
 msgid "Zoom Duration (Speed)"
@@ -2210,12 +2219,6 @@ msgstr "z "
 msgid "seconds left"
 msgstr "sekund zbývá"
 
-msgid "v1.2 -> v2.1"
-msgstr ""
-
-msgid "v2.2+"
-msgstr ""
-
 #~ msgid "Rename Game on WBFS"
 #~ msgstr "Prejmenovat hru na WBFS"
 

Languages/danish.lang

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-05 14:46+0200\n"
+"POT-Creation-Date: 2012-08-24 18:22+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: Fox888[dk]\n"
 "Language-Team: [dk]\n"
@@ -506,7 +506,7 @@ msgstr ""
 msgid "DML Force Widescreen"
 msgstr ""
 
-msgid "DML Installed Version"
+msgid "DML Japanese Patch"
 msgstr ""
 
 msgid "DML LED Activity"
@@ -602,6 +602,9 @@ msgstr ""
 msgid "Devolution Loader Path"
 msgstr ""
 
+msgid "Devolution's loader.bin file can't be loaded."
+msgstr ""
+
 msgid "Directory does not exist!"
 msgstr "Mappen eksisterer ikke!"
 
@@ -1859,7 +1862,7 @@ msgstr "Sti til TXTCheatcodes"
 msgid "The .them file was not found in the zip."
 msgstr "kunne ikke finde .them fil i zip"
 
-msgid "The Force Widescreen setting requires DIOS MIOS v2.2 or more. This setting will be ignored."
+msgid "The Force Widescreen setting requires DIOS MIOS v2.1 or more. This setting will be ignored."
 msgstr ""
 
 msgid "The GCT Cheatcodes Path and this game are not on the same partition. Run the game without Ocarina?"
@@ -1874,6 +1877,9 @@ msgstr ""
 msgid "The No Disc setting is not used anymore by DIOS MIOS (Lite). Now you need to place a disc in your drive."
 msgstr ""
 
+msgid "The No Disc+ setting requires DIOS MIOS 2.2 update2 or a newer version. This setting will be ignored."
+msgstr ""
+
 msgid "The SYSCONF file will be extracted to your emu nand path and emu nand channel path. Attention: All existing files will be overwritten."
 msgstr ""
 
@@ -2147,7 +2153,10 @@ msgstr "Du kan vælge eller formatter en partition eller kanal loader måde."
 msgid "You cannot delete this category."
 msgstr "Du kan ikke slette denne kategori."
 
-msgid "You need to install DIOS MIOS to run GameCube games from USB or DIOS MIOS Lite to run them from SD card"
+msgid "You need to install DIOS MIOS Lite v1.2 or a newer version."
+msgstr ""
+
+msgid "You need to install Devolution or DIOS MIOS (Lite) to launch GameCube games from USB or SD card"
 msgstr ""
 
 msgid "Zoom Duration (Speed)"
@@ -2210,12 +2219,6 @@ msgstr "af"
 msgid "seconds left"
 msgstr "sekunder tilbage"
 
-msgid "v1.2 -> v2.1"
-msgstr ""
-
-msgid "v2.2+"
-msgstr ""
-
 #~ msgid "Custom Discarts"
 #~ msgstr "Tilpasset DVD billeder"
 

Languages/dutch.lang

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-05 14:46+0200\n"
+"POT-Creation-Date: 2012-08-24 18:22+0200\n"
 "PO-Revision-Date: 2011-12-17 14:22+0100\n"
 "Last-Translator: Arthur117\n"
 "Language-Team: tj_cool, glowy, Arthur117\n"
@@ -506,7 +506,7 @@ msgstr ""
 msgid "DML Force Widescreen"
 msgstr ""
 
-msgid "DML Installed Version"
+msgid "DML Japanese Patch"
 msgstr ""
 
 msgid "DML LED Activity"
@@ -602,6 +602,9 @@ msgstr ""
 msgid "Devolution Loader Path"
 msgstr ""
 
+msgid "Devolution's loader.bin file can't be loaded."
+msgstr ""
+
 msgid "Directory does not exist!"
 msgstr "Map bestaat niet!"
 
@@ -1859,7 +1862,7 @@ msgstr "Locatie TXT cheats"
 msgid "The .them file was not found in the zip."
 msgstr "Het .them bestand is niet gevonden in het zip bestand."
 
-msgid "The Force Widescreen setting requires DIOS MIOS v2.2 or more. This setting will be ignored."
+msgid "The Force Widescreen setting requires DIOS MIOS v2.1 or more. This setting will be ignored."
 msgstr ""
 
 msgid "The GCT Cheatcodes Path and this game are not on the same partition. Run the game without Ocarina?"
@@ -1874,6 +1877,9 @@ msgstr ""
 msgid "The No Disc setting is not used anymore by DIOS MIOS (Lite). Now you need to place a disc in your drive."
 msgstr ""
 
+msgid "The No Disc+ setting requires DIOS MIOS 2.2 update2 or a newer version. This setting will be ignored."
+msgstr ""
+
 msgid "The SYSCONF file will be extracted to your emu nand path and emu nand channel path. Attention: All existing files will be overwritten."
 msgstr ""
 
@@ -2147,7 +2153,10 @@ msgstr ""
 msgid "You cannot delete this category."
 msgstr "Je kunt deze categorie niet verwijderen."
 
-msgid "You need to install DIOS MIOS to run GameCube games from USB or DIOS MIOS Lite to run them from SD card"
+msgid "You need to install DIOS MIOS Lite v1.2 or a newer version."
+msgstr ""
+
+msgid "You need to install Devolution or DIOS MIOS (Lite) to launch GameCube games from USB or SD card"
 msgstr ""
 
 msgid "Zoom Duration (Speed)"
@@ -2210,12 +2219,6 @@ msgstr "van"
 msgid "seconds left"
 msgstr "seconden over"
 
-msgid "v1.2 -> v2.1"
-msgstr ""
-
-msgid "v2.2+"
-msgstr ""
-
 #~ msgid "Custom Discarts"
 #~ msgstr "Aangepaste Disk Labels"
 

Languages/english.lang

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-05 14:46+0200\n"
+"POT-Creation-Date: 2012-08-24 18:22+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -506,7 +506,7 @@ msgstr ""
 msgid "DML Force Widescreen"
 msgstr ""
 
-msgid "DML Installed Version"
+msgid "DML Japanese Patch"
 msgstr ""
 
 msgid "DML LED Activity"
@@ -602,6 +602,9 @@ msgstr ""
 msgid "Devolution Loader Path"
 msgstr ""
 
+msgid "Devolution's loader.bin file can't be loaded."
+msgstr ""
+
 msgid "Directory does not exist!"
 msgstr ""
 
@@ -1859,7 +1862,7 @@ msgstr ""
 msgid "The .them file was not found in the zip."
 msgstr ""
 
-msgid "The Force Widescreen setting requires DIOS MIOS v2.2 or more. This setting will be ignored."
+msgid "The Force Widescreen setting requires DIOS MIOS v2.1 or more. This setting will be ignored."
 msgstr ""
 
 msgid "The GCT Cheatcodes Path and this game are not on the same partition. Run the game without Ocarina?"
@@ -1874,6 +1877,9 @@ msgstr ""
 msgid "The No Disc setting is not used anymore by DIOS MIOS (Lite). Now you need to place a disc in your drive."
 msgstr ""
 
+msgid "The No Disc+ setting requires DIOS MIOS 2.2 update2 or a newer version. This setting will be ignored."
+msgstr ""
+
 msgid "The SYSCONF file will be extracted to your emu nand path and emu nand channel path. Attention: All existing files will be overwritten."
 msgstr ""
 
@@ -2147,7 +2153,10 @@ msgstr ""
 msgid "You cannot delete this category."
 msgstr ""
 
-msgid "You need to install DIOS MIOS to run GameCube games from USB or DIOS MIOS Lite to run them from SD card"
+msgid "You need to install DIOS MIOS Lite v1.2 or a newer version."
+msgstr ""
+
+msgid "You need to install Devolution or DIOS MIOS (Lite) to launch GameCube games from USB or SD card"
 msgstr ""
 
 msgid "Zoom Duration (Speed)"
@@ -2209,9 +2218,3 @@ msgstr ""
 
 msgid "seconds left"
 msgstr ""
-
-msgid "v1.2 -> v2.1"
-msgstr ""
-
-msgid "v2.2+"
-msgstr ""

Languages/finnish.lang

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-05 14:46+0200\n"
+"POT-Creation-Date: 2012-08-24 18:22+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: c64rmx\n"
 "Language-Team: \n"
@@ -506,7 +506,7 @@ msgstr ""
 msgid "DML Force Widescreen"
 msgstr ""
 
-msgid "DML Installed Version"
+msgid "DML Japanese Patch"
 msgstr ""
 
 msgid "DML LED Activity"
@@ -602,6 +602,9 @@ msgstr ""
 msgid "Devolution Loader Path"
 msgstr ""
 
+msgid "Devolution's loader.bin file can't be loaded."
+msgstr ""
+
 msgid "Directory does not exist!"
 msgstr ""
 
@@ -1859,7 +1862,7 @@ msgstr "TXT koodien polku"
 msgid "The .them file was not found in the zip."
 msgstr ""
 
-msgid "The Force Widescreen setting requires DIOS MIOS v2.2 or more. This setting will be ignored."
+msgid "The Force Widescreen setting requires DIOS MIOS v2.1 or more. This setting will be ignored."
 msgstr ""
 
 msgid "The GCT Cheatcodes Path and this game are not on the same partition. Run the game without Ocarina?"
@@ -1874,6 +1877,9 @@ msgstr ""
 msgid "The No Disc setting is not used anymore by DIOS MIOS (Lite). Now you need to place a disc in your drive."
 msgstr ""
 
+msgid "The No Disc+ setting requires DIOS MIOS 2.2 update2 or a newer version. This setting will be ignored."
+msgstr ""
+
 msgid "The SYSCONF file will be extracted to your emu nand path and emu nand channel path. Attention: All existing files will be overwritten."
 msgstr ""
 
@@ -2147,7 +2153,10 @@ msgstr ""
 msgid "You cannot delete this category."
 msgstr ""
 
-msgid "You need to install DIOS MIOS to run GameCube games from USB or DIOS MIOS Lite to run them from SD card"
+msgid "You need to install DIOS MIOS Lite v1.2 or a newer version."
+msgstr ""
+
+msgid "You need to install Devolution or DIOS MIOS (Lite) to launch GameCube games from USB or SD card"
 msgstr ""
 
 msgid "Zoom Duration (Speed)"
@@ -2210,12 +2219,6 @@ msgstr "josta"
 msgid "seconds left"
 msgstr "sekuntia jäljellä"
 
-msgid "v1.2 -> v2.1"
-msgstr ""
-
-msgid "v2.2+"
-msgstr ""
-
 #~ msgid "Rename Game on WBFS"
 #~ msgstr "Uudelleennimeä peli"
 

Languages/french.lang

@@ -1,11 +1,11 @@
 # USB Loader GX language source file.
-# French.lang - r1201
+# French.lang - r1202
 # don't delete/change this line (é).
 msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-05 14:46+0200\n"
+"POT-Creation-Date: 2012-08-24 18:22+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: Cyan\n"
 "Language-Team: Badablek, Amour, ikya, Cyan & Kin8\n"
@@ -506,8 +506,8 @@ msgstr "DML Débug"
 msgid "DML Force Widescreen"
 msgstr "DML Forcer 16:9"
 
-msgid "DML Installed Version"
+msgid "DML Japanese Patch"
-msgstr "DML Version installée"
+msgstr "DML Patch japonais"
 
 msgid "DML LED Activity"
 msgstr "DML LED detect. activité"
@@ -602,6 +602,9 @@ msgstr ""
 msgid "Devolution Loader Path"
 msgstr "Dossier Loader Devolution"
 
+msgid "Devolution's loader.bin file can't be loaded."
+msgstr "Le fichier loader.bin de Devolution n'a pu être chargé."
+
 msgid "Directory does not exist!"
 msgstr "Répertoire inexistant!"
 
@@ -1859,8 +1862,8 @@ msgstr "Dossier TXT de triches"
 msgid "The .them file was not found in the zip."
 msgstr "Fichier .them non trouvé dans le zip."
 
-msgid "The Force Widescreen setting requires DIOS MIOS v2.2 or more. This setting will be ignored."
+msgid "The Force Widescreen setting requires DIOS MIOS v2.1 or more. This setting will be ignored."
-msgstr "Le paramètre DML Forcer 16:9 nécessite DIOS MIOS v2.2 ou supérieure. Ce paramètre sera ignoré."
+msgstr "Le paramètre DML Forcer 16:9 nécessite DIOS MIOS v2.1 ou supérieure. Ce paramètre sera ignoré."
 
 msgid "The GCT Cheatcodes Path and this game are not on the same partition. Run the game without Ocarina?"
 msgstr "The dossier GCT de triche et ce jeu ne sont pas sur la même partition. Lancer le jeu sans Ocarina ?"
@@ -1874,6 +1877,9 @@ msgstr "Les Miis seront extraits vers vos dossiers d'Émulation Nand et d'Émula
 msgid "The No Disc setting is not used anymore by DIOS MIOS (Lite). Now you need to place a disc in your drive."
 msgstr "L'option No Disc n'est plus utilisée par DIOS MIOS (Lite). Vous devez désormais placer un disque dans votre lecteur."
 
+msgid "The No Disc+ setting requires DIOS MIOS 2.2 update2 or a newer version. This setting will be ignored."
+msgstr ""
+
 msgid "The SYSCONF file will be extracted to your emu nand path and emu nand channel path. Attention: All existing files will be overwritten."
 msgstr "Le fichier SYSCONF sera extrait vers vos dossiers d'Émulation Nand et d'Émulation Nand Chaînes. Attention: Le fichier existant sera remplacé."
 
@@ -2147,8 +2153,11 @@ msgstr "Vous pouvez choisir ou formater une partition, ou passer le loader en mo
 msgid "You cannot delete this category."
 msgstr "Vous ne pouvez pas supprimer cette catégorie."
 
-msgid "You need to install DIOS MIOS to run GameCube games from USB or DIOS MIOS Lite to run them from SD card"
+msgid "You need to install DIOS MIOS Lite v1.2 or a newer version."
-msgstr "Vous devez installer DIOS MIOS pour lancer les jeux GameCube sur USB ou DIOS MIOS Lite pour ceux sur carte SD."
+msgstr "Vous devez installer DIOS MIOS Lite v1.2 ou une version plus récente."
+
+msgid "You need to install Devolution or DIOS MIOS (Lite) to launch GameCube games from USB or SD card"
+msgstr "Vous devez installer Devolution ou DIOS MIOS (Lite) pour lancer les jeux GameCube sur USB ou carte SD."
 
 msgid "Zoom Duration (Speed)"
 msgstr "Durée du zoom (Vitesse)"
@@ -2210,11 +2219,14 @@ msgstr "sur"
 msgid "seconds left"
 msgstr "secondes restantes"
 
-msgid "v1.2 -> v2.1"
+#~ msgid "DML Installed Version"
-msgstr ""
+#~ msgstr "DML Version installée"
 
-msgid "v2.2+"
+#~ msgid "The Force Widescreen setting requires DIOS MIOS v2.2 or more. This setting will be ignored."
-msgstr ""
+#~ msgstr "Le paramètre DML Forcer 16:9 nécessite DIOS MIOS v2.2 ou supérieure. Ce paramètre sera ignoré."
+
+#~ msgid "You need to install DIOS MIOS to run GameCube games from USB or DIOS MIOS Lite to run them from SD card"
+#~ msgstr "Vous devez installer DIOS MIOS pour lancer les jeux GameCube sur USB ou DIOS MIOS Lite pour ceux sur carte SD."
 
 #~ msgid "Custom Discarts"
 #~ msgstr "Labels DVD persos"

Languages/german.lang

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-05 14:46+0200\n"
+"POT-Creation-Date: 2012-08-24 18:22+0200\n"
 "PO-Revision-Date: 2010-07-03 17:35-0800\n"
 "Last-Translator: TheRealVisitor\n"
 "Language-Team: Bertilax, Snoozer, wishmasterf, ZEN.13, TheRealVisitor\n"
@@ -506,8 +506,8 @@ msgstr "DML Debug"
 msgid "DML Force Widescreen"
 msgstr "DML Breitbild erzw."
 
-msgid "DML Installed Version"
+msgid "DML Japanese Patch"
-msgstr "Installierte DML Version"
+msgstr ""
 
 msgid "DML LED Activity"
 msgstr "DML LED Aktivität"
@@ -602,6 +602,9 @@ msgstr "Devolution"
 msgid "Devolution Loader Path"
 msgstr "Devolution Loader"
 
+msgid "Devolution's loader.bin file can't be loaded."
+msgstr ""
+
 msgid "Directory does not exist!"
 msgstr "Verzeichnis existiert nicht!"
 
@@ -1859,8 +1862,8 @@ msgstr "TXT Cheatdateien"
 msgid "The .them file was not found in the zip."
 msgstr "Die .them Datei wurde in der zip nicht gefunden."
 
-msgid "The Force Widescreen setting requires DIOS MIOS v2.2 or more. This setting will be ignored."
+msgid "The Force Widescreen setting requires DIOS MIOS v2.1 or more. This setting will be ignored."
-msgstr "Die Einstellung -Breitbild erzw.- erforder DIOS MIOS v2.2 und neuer. Diese Einstellungen wird ignoriert."
+msgstr ""
 
 msgid "The GCT Cheatcodes Path and this game are not on the same partition. Run the game without Ocarina?"
 msgstr "Der GCT Cheatcodes Pfad und dieses Spiel sind nicht auf der selben Partition. Spiel ohne Ocarina starten?"
@@ -1874,6 +1877,9 @@ msgstr "Die Miis werden in den EmuNand Pfad und EmuNand Kanal-Pfad kopiert. Acht
 msgid "The No Disc setting is not used anymore by DIOS MIOS (Lite). Now you need to place a disc in your drive."
 msgstr "Die -keine Disk Einstellung- wird nicht mehr unterstützt von DIOS MIOS (Lite). Jetzt muss eine Disk im Laufwerk sein."
 
+msgid "The No Disc+ setting requires DIOS MIOS 2.2 update2 or a newer version. This setting will be ignored."
+msgstr ""
+
 msgid "The SYSCONF file will be extracted to your emu nand path and emu nand channel path. Attention: All existing files will be overwritten."
 msgstr "Die SYSCONF wird in den EmuNand Pfad und EmuNand Kanal-Pfad kopiert. Achtung: Alle vorhandenen Dateien werden überschrieben."
 
@@ -2147,8 +2153,11 @@ msgstr "Du kannst eine Partition auswählen oder formatieren oder den Kanal-Load
 msgid "You cannot delete this category."
 msgstr "Kategorie kann nicht gelöscht werden."
 
-msgid "You need to install DIOS MIOS to run GameCube games from USB or DIOS MIOS Lite to run them from SD card"
+msgid "You need to install DIOS MIOS Lite v1.2 or a newer version."
-msgstr "Um GameCube Spiele von USB abzuspielen, wird DIOS MIOS wird benötigt. Um sie von der SD-Karte abzuspielen, wird DIOS MIOS Lite benötigt."
+msgstr ""
+
+msgid "You need to install Devolution or DIOS MIOS (Lite) to launch GameCube games from USB or SD card"
+msgstr ""
 
 msgid "Zoom Duration (Speed)"
 msgstr "Zoom Dauer"
@@ -2210,11 +2219,20 @@ msgstr "von"
 msgid "seconds left"
 msgstr "Sekunden verbleiben"
 
-msgid "v1.2 -> v2.1"
+#~ msgid "DML Installed Version"
-msgstr "v1.2 -> v2.1"
+#~ msgstr "Installierte DML Version"
 
-msgid "v2.2+"
+#~ msgid "The Force Widescreen setting requires DIOS MIOS v2.2 or more. This setting will be ignored."
-msgstr "v2.2+"
+#~ msgstr "Die Einstellung -Breitbild erzw.- erforder DIOS MIOS v2.2 und neuer. Diese Einstellungen wird ignoriert."
+
+#~ msgid "You need to install DIOS MIOS to run GameCube games from USB or DIOS MIOS Lite to run them from SD card"
+#~ msgstr "Um GameCube Spiele von USB abzuspielen, wird DIOS MIOS wird benötigt. Um sie von der SD-Karte abzuspielen, wird DIOS MIOS Lite benötigt."
+
+#~ msgid "v1.2 -> v2.1"
+#~ msgstr "v1.2 -> v2.1"
+
+#~ msgid "v2.2+"
+#~ msgstr "v2.2+"
 
 #~ msgid "Custom Discarts"
 #~ msgstr "Eig. Diskbilder"

Languages/hungarian.lang

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-05 14:46+0200\n"
+"POT-Creation-Date: 2012-08-24 18:22+0200\n"
 "PO-Revision-Date: 2009-12-29 11:05+0100\n"
 "Last-Translator: Springdale\n"
 "Language-Team: Tusk, Springdale\n"
@@ -506,7 +506,7 @@ msgstr ""
 msgid "DML Force Widescreen"
 msgstr ""
 
-msgid "DML Installed Version"
+msgid "DML Japanese Patch"
 msgstr ""
 
 msgid "DML LED Activity"
@@ -602,6 +602,9 @@ msgstr ""
 msgid "Devolution Loader Path"
 msgstr ""
 
+msgid "Devolution's loader.bin file can't be loaded."
+msgstr ""
+
 msgid "Directory does not exist!"
 msgstr "A könyvtár nem létezik!"
 
@@ -1859,7 +1862,7 @@ msgstr "TXT Cheatkódok Útvonala"
 msgid "The .them file was not found in the zip."
 msgstr ""
 
-msgid "The Force Widescreen setting requires DIOS MIOS v2.2 or more. This setting will be ignored."
+msgid "The Force Widescreen setting requires DIOS MIOS v2.1 or more. This setting will be ignored."
 msgstr ""
 
 msgid "The GCT Cheatcodes Path and this game are not on the same partition. Run the game without Ocarina?"
@@ -1874,6 +1877,9 @@ msgstr ""
 msgid "The No Disc setting is not used anymore by DIOS MIOS (Lite). Now you need to place a disc in your drive."
 msgstr ""
 
+msgid "The No Disc+ setting requires DIOS MIOS 2.2 update2 or a newer version. This setting will be ignored."
+msgstr ""
+
 msgid "The SYSCONF file will be extracted to your emu nand path and emu nand channel path. Attention: All existing files will be overwritten."
 msgstr ""
 
@@ -2147,7 +2153,10 @@ msgstr ""
 msgid "You cannot delete this category."
 msgstr ""
 
-msgid "You need to install DIOS MIOS to run GameCube games from USB or DIOS MIOS Lite to run them from SD card"
+msgid "You need to install DIOS MIOS Lite v1.2 or a newer version."
+msgstr ""
+
+msgid "You need to install Devolution or DIOS MIOS (Lite) to launch GameCube games from USB or SD card"
 msgstr ""
 
 msgid "Zoom Duration (Speed)"
@@ -2210,12 +2219,6 @@ msgstr "./"
 msgid "seconds left"
 msgstr "hátralévõ másodperc"
 
-msgid "v1.2 -> v2.1"
-msgstr ""
-
-msgid "v2.2+"
-msgstr ""
-
 #~ msgid "Rename Game on WBFS"
 #~ msgstr "WBFS játék átnevezése"
 

Languages/italian.lang

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-05 14:46+0200\n"
+"POT-Creation-Date: 2012-08-24 18:22+0200\n"
 "PO-Revision-Date: 2011-09-11 12:19+0100\n"
 "Last-Translator: xFede\n"
 "Language-Team: xFede (fedeanto11@gmail.com)\n"
@@ -188,7 +188,7 @@ msgid "Banner Animation Settings"
 msgstr "Impostazioni animazione banner"
 
 msgid "Banner On Channels"
-msgstr ""
+msgstr "Banner nei canali"
 
 msgid "Banner grid layout is only available with AHBPROT! Please consider installing new HBC version."
 msgstr "La visualizzazione con i banner è disponibile soltanto con l'AHBPROT! Installa l'ultimo HBC."
@@ -483,13 +483,13 @@ msgid "Credits"
 msgstr "Ringraziamenti"
 
 msgid "Custom Banners"
-msgstr ""
+msgstr "Banner personalizzati"
 
 msgid "Custom Paths"
 msgstr "Percorsi personalizzati"
 
 msgid "Customs"
-msgstr ""
+msgstr "Personalizzati"
 
 msgid "Customs/Original"
 msgstr "Modific./origin."
@@ -506,8 +506,8 @@ msgstr "Debug DML"
 msgid "DML Force Widescreen"
 msgstr "Forza widescreen DML"
 
-msgid "DML Installed Version"
+msgid "DML Japanese Patch"
-msgstr "Versione installata DML"
+msgstr ""
 
 msgid "DML LED Activity"
 msgstr "Led attività DML"
@@ -561,7 +561,7 @@ msgid "Delete"
 msgstr "Elimina"
 
 msgid "Delete Cached Banner"
-msgstr ""
+msgstr "Elimina banner cachato"
 
 msgid "Delete Cheat GCT"
 msgstr "Elimina trucchi GCT"
@@ -602,14 +602,17 @@ msgstr "Devolution"
 msgid "Devolution Loader Path"
 msgstr "Percorso loader devolution"
 
+msgid "Devolution's loader.bin file can't be loaded."
+msgstr ""
+
 msgid "Directory does not exist!"
 msgstr "Il percorso non esiste!"
 
 msgid "Disc Artwork Download"
-msgstr "Scarica imm. disco"
+msgstr "Scarica disco"
 
 msgid "Disc Artwork Path"
-msgstr "Percorso imm. disco"
+msgstr "Percorso dischi"
 
 msgid "Disc Default"
 msgstr "Da disco"
@@ -621,7 +624,7 @@ msgid "Disc read error."
 msgstr "Errore durante la lettura del disco."
 
 msgid "Discarts"
-msgstr ""
+msgstr "Dischi"
 
 msgid "DiskFlip"
 msgstr "Gira i dischi"
@@ -711,7 +714,7 @@ msgid "Downloading 3D Covers"
 msgstr "Scaricando copertine 3D..."
 
 msgid "Downloading Custom Banners"
-msgstr ""
+msgstr "Scaricando banner personalizzati..."
 
 msgid "Downloading Flat Covers"
 msgstr "Scaricando copertine 2D..."
@@ -990,13 +993,13 @@ msgid "Full Cover Path"
 msgstr "Percorso cop. complete"
 
 msgid "Full Covers"
-msgstr ""
+msgstr "Copertine complete"
 
 msgid "Full Menu"
 msgstr "Menu completo"
 
 msgid "Full covers Download"
-msgstr ""
+msgstr "Scarica cop. complete"
 
 msgid "Full shutdown"
 msgstr "Spegnimento completo"
@@ -1122,10 +1125,10 @@ msgid "Hard Drive Settings"
 msgstr "Impostazioni disco rigido"
 
 msgid "High Quality"
-msgstr ""
+msgstr "Alta qualità"
 
 msgid "High/Low"
-msgstr ""
+msgstr "Alta/Bassa"
 
 msgid "Homebrew Apps Path"
 msgstr "Percorso homebrew"
@@ -1314,10 +1317,10 @@ msgid "Loop Sound"
 msgstr "Suono ripetuto"
 
 msgid "Low Quality"
-msgstr ""
+msgstr "Bassa qualità"
 
 msgid "Low/High"
-msgstr ""
+msgstr "Bassa/Alta"
 
 msgid "MIOS (Default & Customs)"
 msgstr "MIOS (Predefinito e personalizzati)"
@@ -1530,7 +1533,7 @@ msgid "Only for Install"
 msgstr "Solo per Installare"
 
 msgid "Original"
-msgstr ""
+msgstr "Originale"
 
 msgid "Original/Customs"
 msgstr "Origin./Modific."
@@ -1859,8 +1862,8 @@ msgstr "Percorso trucchi TXT"
 msgid "The .them file was not found in the zip."
 msgstr "Il file .them non è stato trovato nel zip."
 
-msgid "The Force Widescreen setting requires DIOS MIOS v2.2 or more. This setting will be ignored."
+msgid "The Force Widescreen setting requires DIOS MIOS v2.1 or more. This setting will be ignored."
-msgstr "L'impostazione forza widescreen richiedere DIOS MIOS v2.2 o superiore. L'impostazione verrà ignorata."
+msgstr "L'impostazione forza widescreen richiedere DIOS MIOS v2.1 o superiore. L'impostazione verrà ignorata."
 
 msgid "The GCT Cheatcodes Path and this game are not on the same partition. Run the game without Ocarina?"
 msgstr "Il percorso dei trucchi GCT e qyesto gioco non sono sulla stessa partizione. Avviare il gioco senza i trucchi?"
@@ -1874,6 +1877,9 @@ msgstr "I Mii verranno estratti nei percorsi della NAND emulata e dei canali NAN
 msgid "The No Disc setting is not used anymore by DIOS MIOS (Lite). Now you need to place a disc in your drive."
 msgstr "L'impostazione no-disco non è più utilizzata da DIOS MIOS (Lite). Adesso devi avere un disco nel lettore."
 
+msgid "The No Disc+ setting requires DIOS MIOS 2.2 update2 or a newer version. This setting will be ignored."
+msgstr ""
+
 msgid "The SYSCONF file will be extracted to your emu nand path and emu nand channel path. Attention: All existing files will be overwritten."
 msgstr "Il file SYSCONF verranno estratti nei percorsi della NAND emulata e dei canali NAND emulati. Attenzione: Tutti i file esistenti saranno sovrascritti."
 
@@ -2147,8 +2153,11 @@ msgstr "Puoi selezionare,formattare una partizione o usare la Modalità Canali."
 msgid "You cannot delete this category."
 msgstr "Non puoi eliminare questa categoria."
 
-msgid "You need to install DIOS MIOS to run GameCube games from USB or DIOS MIOS Lite to run them from SD card"
+msgid "You need to install DIOS MIOS Lite v1.2 or a newer version."
-msgstr "Devi aver installato DIOS MIOS per avviare i giochi da USB o DIOS MIOS LITE per avviarli  da SD"
+msgstr ""
+
+msgid "You need to install Devolution or DIOS MIOS (Lite) to launch GameCube games from USB or SD card"
+msgstr ""
 
 msgid "Zoom Duration (Speed)"
 msgstr "Durata dello zoom (Velocità)"
@@ -2210,20 +2219,17 @@ msgstr "di"
 msgid "seconds left"
 msgstr "secondi rimasti"
 
-msgid "v1.2 -> v2.1"
+#~ msgid "DML Installed Version"
-msgstr "v1.2 -> v2.1"
+#~ msgstr "Versione installata DML"
 
-msgid "v2.2+"
+#~ msgid "The Force Widescreen setting requires DIOS MIOS v2.2 or more. This setting will be ignored."
-msgstr "v2.2+"
+#~ msgstr "L'impostazione forza widescreen richiedere DIOS MIOS v2.2 o superiore. L'impostazione verrà ignorata."
 
-#~ msgid "Custom Discarts"
+#~ msgid "You need to install DIOS MIOS to run GameCube games from USB or DIOS MIOS Lite to run them from SD card"
-#~ msgstr "Imm. disco person."
+#~ msgstr "Devi aver installato DIOS MIOS per avviare i giochi da USB o DIOS MIOS LITE per avviarli  da SD"
 
-#~ msgid "Full HQ Covers"
+#~ msgid "v1.2 -> v2.1"
-#~ msgstr "Cop. complete HQ"
+#~ msgstr "v1.2 -> v2.1"
 
-#~ msgid "Full LQ Covers"
+#~ msgid "v2.2+"
-#~ msgstr "Cop. complete LQ"
+#~ msgstr "v2.2+"
-
-#~ msgid "Original Discarts"
-#~ msgstr "Imm. Disco originali"

Languages/japanese.lang

@@ -5,9 +5,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-05 14:46+0200\n"
+"POT-Creation-Date: 2012-08-24 18:22+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
-"Last-Translator: Trickart\n"
+"Last-Translator: hosigumayuugi\n"
 "Language-Team: hosigumayuugi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -364,7 +364,7 @@ msgid "Clock"
 msgstr "時計の表示"
 
 msgid "Clock Scale Factor"
-msgstr "クロックスケーリング"
+msgstr "時計のサイズ"
 
 msgid "Close"
 msgstr "とじる"
@@ -495,19 +495,19 @@ msgid "Customs/Original"
 msgstr "カスタムを優先"
 
 msgid "DEVO MemCard Emulation"
-msgstr "Devoﾒﾓﾘｰｶｰﾄﾞｴﾐｭﾚｰｼｮﾝ"
+msgstr "DEVOメモカエミュ"
 
 msgid "DML Auto"
-msgstr "DML オート"
+msgstr "DML 自動"
 
 msgid "DML Debug"
 msgstr "DML デバッグ"
 
 msgid "DML Force Widescreen"
-msgstr "DML 強制ワイドスクリーン"
+msgstr "DML 強制ワイド化"
 
-msgid "DML Installed Version"
+msgid "DML Japanese Patch"
-msgstr "DMLのバージョン"
+msgstr ""
 
 msgid "DML LED Activity"
 msgstr "DML LED点灯"
@@ -528,10 +528,10 @@ msgid "DML PAD Hook"
 msgstr "DML PADフック"
 
 msgid "DML Progressive Patch"
-msgstr "DML プログレッシブパッチ"
+msgstr "DML ﾌﾟﾛｸﾞﾚｯｼﾌﾞﾊﾟｯﾁ"
 
 msgid "DML Video Mode"
-msgstr "DML ビデオモード"
+msgstr "DML 映像モード"
 
 msgid "DOL Path"
 msgstr "代替DOL"
@@ -602,6 +602,9 @@ msgstr "Devolution"
 msgid "Devolution Loader Path"
 msgstr "Devolutionローダー"
 
+msgid "Devolution's loader.bin file can't be loaded."
+msgstr ""
+
 msgid "Directory does not exist!"
 msgstr "フォルダがありません"
 
@@ -1083,7 +1086,7 @@ msgid "GameCube"
 msgstr "ゲームキューブ"
 
 msgid "GameCube Mode"
-msgstr "ゲームキューブのモード"
+msgstr "GCモード"
 
 msgid "GameTDB Path"
 msgstr "ゲーム名リスト"
@@ -1166,7 +1169,7 @@ msgid "Incoming file %0.2fMB"
 msgstr "ﾌｧｲﾙを受信中 %0.2fMB"
 
 msgid "Individual"
-msgstr "それぞれ"
+msgstr "個別"
 
 msgid "Initializing Network"
 msgstr "接続中･･･"
@@ -1320,7 +1323,7 @@ msgid "Low/High"
 msgstr ""
 
 msgid "MIOS (Default & Customs)"
-msgstr "MIOS (デフォルト & カスタム)"
+msgstr "MIOS(公式&カスタム)"
 
 msgid "Main DOL"
 msgstr "main.dol"
@@ -1860,19 +1863,22 @@ msgid "The .them file was not found in the zip."
 msgstr ".themファイルがzip内にありません"
 
 msgid "The Force Widescreen setting requires DIOS MIOS v2.2 or more. This setting will be ignored."
-msgstr "強制ワイドスクリーン設定にするにはDIOS MIOS v2.2以上が必要です。 それ以下のバージョンでは無視されます。"
+msgstr "強制ワイドスクリーン設定にするにはDIOS MIOS v2.1以上が必要です。 それ以下のバージョンでは無視されます。"
 
 msgid "The GCT Cheatcodes Path and this game are not on the same partition. Run the game without Ocarina?"
-msgstr "このゲームのチートコードはゲームのあるHDDにありません。Ocarinaを使用せずゲームを起動しますか?"
+msgstr "GCTコードとこのゲームは同じ領域にありません。チートなしで起動しますか?"
 
 msgid "The GCT Cheatcodes Path must be on SD card. Run the game without Ocarina?"
-msgstr "このゲームのチートコードはゲームのあるSDにありません。Ocarinaを使用せずゲームを起動しますか?"
+msgstr "GCTコードのパスはSDカードにないといけません。チートなしで起動しますか?"
 
 msgid "The Miis will be extracted to your emu nand path and emu nand channel path. Attention: All existing files will be overwritten."
 msgstr "MiiはエミュNAND(チャンネル)パスに書き出されます。すでに存在するファイルは上書きされます"
 
 msgid "The No Disc setting is not used anymore by DIOS MIOS (Lite). Now you need to place a disc in your drive."
-msgstr "DIOS MIOS(Lite)はディスクなしの設定になっていません。ディスクを入れてください。"
+msgstr "ディスクなし設定はDIOS MIOS(Lite)では使われていません。ドライブにディスクを入れてください"
+
+msgid "The No Disc+ setting requires DIOS MIOS 2.2 update2 or a newer version. This setting will be ignored."
+msgstr ""
 
 msgid "The SYSCONF file will be extracted to your emu nand path and emu nand channel path. Attention: All existing files will be overwritten."
 msgstr "SYSCONFはエミュNAND(チャンネル)パスに書き出されます。すでに存在するファイルは上書きされます"
@@ -1887,7 +1893,7 @@ msgid "The files will be extracted to your emu nand save and channel path. Atten
 msgstr "ファイルはエミュNANDセーブ&チャンネルパスに書き出されます。すでに存在するファイルは上書きされます"
 
 msgid "The game is on SD Card."
-msgstr "ゲームはSDカードにあります。"
+msgstr "ゲームはSDカードにあります"
 
 msgid "The game is on USB."
 msgstr "ゲームはUSBにあります"
@@ -1939,16 +1945,16 @@ msgid "Titles from GameTDB"
 msgstr "ｹﾞｰﾑ名の日本語化"
 
 msgid "To run GameCube games from Disc you need to set the GameCube mode to MIOS in the game settings."
-msgstr "ディスクからゲームキューブのゲームを実行するには、ゲームの設定のMIOSにゲームキューブモードを設定する必要があります。"
+msgstr "GCゲームをディスク起動するには設定でGCモードをMIOSにしてください"
 
 msgid "To run GameCube games with DIOS MIOS you need to place them on an USB FAT32 partition."
-msgstr "DIOS MIOSでゲームキューブを実行するにはゲームをUSBのFAT32パーティションにゲームを配置する必要があります。"
+msgstr "GCゲームをDIOS MIOSで起動するにはUSBをFAt32にしてゲームをおいてください"
 
 msgid "To run GameCube games with DIOS MIOS you need to set your 'Main GameCube Path' to an USB FAT32 partition."
-msgstr "DIOS MIOSでゲームキューブを実行するにはメインゲームキューブパスをUSBのFAT32パーティションに設定する必要があります。"
+msgstr "GCゲームをDIOS MIOSで起動するにはパスの設定でゲームキューブをusb:/にする必要があります"
 
 msgid "To run GameCube games with Devolution you need the loader.bin file in your Devolution Path."
-msgstr "Devotionでゲームキューブを起動するにはloader.binのパスを設定する必要があります。"
+msgstr "GCゲームをDevolutionで起動するにはloader.binがDevolutionのパスにある必要があります"
 
 msgid "Tooltip Delay"
 msgstr "ﾋﾝﾄﾊﾞﾙｰﾝの遅延"
@@ -2147,14 +2153,17 @@ msgstr "領域を選択･初期化したりチャンネルリストモードを
 msgid "You cannot delete this category."
 msgstr "このカテゴリは削除できません"
 
-msgid "You need to install DIOS MIOS to run GameCube games from USB or DIOS MIOS Lite to run them from SD card"
+msgid "You need to install DIOS MIOS Lite v1.2 or a newer version."
-msgstr "USBからゲームキューブを起動したい場合はDIOSMIOSを、SDから起動したい場合はDMLをインストールしてください。"
+msgstr ""
+
+msgid "You need to install Devolution or DIOS MIOS (Lite) to launch GameCube games from USB or SD card"
+msgstr ""
 
 msgid "Zoom Duration (Speed)"
 msgstr "ズームの継続(速度)"
 
 msgid "and translators for language files updates"
-msgstr "/ K-M and Trickart …日本語化"
+msgstr "/ K-M & Trickart…日本語化"
 
 msgid "available"
 msgstr "があります"
@@ -2210,15 +2219,12 @@ msgstr "中"
 msgid "seconds left"
 msgstr "秒で完了"
 
-msgid "v1.2 -> v2.1"
-msgstr "v1.2からv2.1"
-
-msgid "v2.2+"
-msgstr "v2.2以上"
-
 #~ msgid "Custom Discarts"
 #~ msgstr "カスタムレーベル"
 
+#~ msgid "DML Installed Version"
+#~ msgstr "DMLのバージョン"
+
 #~ msgid "Full HQ Covers"
 #~ msgstr "フルカバー(精細)"
 
@@ -2228,6 +2234,27 @@ msgstr "v2.2以上"
 #~ msgid "Original Discarts"
 #~ msgstr "公式レーベル"
 
+#~ msgid "The Force Widescreen setting requires DIOS MIOS v2.2 or more. This setting will be ignored."
+#~ msgstr "強制ワイド化設定はDIOS MIOS v2.2以降が必要です。この設定は無視されます"
+
+#~ msgid "You need to install DIOS MIOS to run GameCube games from USB or DIOS MIOS Lite to run them from SD card"
+#~ msgstr "GCゲームをUSBから起動するにはDIOS MIOSが、SDから起動するにはDMLが必要です"
+
+#~ msgid "v1.2 -> v2.1"
+#~ msgstr "v1.2 ～ v2.1"
+
+#~ msgid "v2.2+"
+#~ msgstr "v2.2以降"
+
+#~ msgid "GC Force Interlace"
+#~ msgstr "GC ｲﾝﾀｰﾚｰｽ強制"
+
+#~ msgid "Rename Game on WBFS"
+#~ msgstr "WBFS内のゲーム名を変更"
+
+#~ msgid "Do you want to discart changes?"
+#~ msgstr "変更を破棄しますか?"
+
 #~ msgid "Successfully Updated thanks to www.techjawa.com"
 #~ msgstr "更新しました www.techjawa.comに感謝!"
 
@@ -2321,8 +2348,6 @@ msgstr "v2.2以上"
 #~ msgid "Finishing installation... Ok!"
 #~ msgstr "ｲﾝｽﾄｰﾙの完了...完了しました"
 
-# msgid "GC Force Interlace"
-# msgstr "GC ｲﾝﾀｰﾚｰｽ強制"
 #~ msgid "Installing content... Ok!"
 #~ msgstr "ｺﾝﾃﾝﾂをｲﾝｽﾄｰﾙ...成功！"
 
@@ -2385,8 +2410,3 @@ msgstr "v2.2以上"
 
 #~ msgid "for WiiTDB and hosting covers / disc images"
 #~ msgstr "WiiTDB…様々な画像を配布"
-
-# msgid "Rename Game on WBFS"
-# msgstr "WBFS内のゲーム名を変更"
-#~ msgid "Do you want to discart changes?"
-#~ msgstr "変更を破棄しますか?"

Languages/korean.lang

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-05 14:46+0200\n"
+"POT-Creation-Date: 2012-08-24 18:22+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: nextos@korea.com\n"
 "Language-Team: \n"
@@ -506,7 +506,7 @@ msgstr ""
 msgid "DML Force Widescreen"
 msgstr ""
 
-msgid "DML Installed Version"
+msgid "DML Japanese Patch"
 msgstr ""
 
 msgid "DML LED Activity"
@@ -602,6 +602,9 @@ msgstr ""
 msgid "Devolution Loader Path"
 msgstr ""
 
+msgid "Devolution's loader.bin file can't be loaded."
+msgstr ""
+
 msgid "Directory does not exist!"
 msgstr ""
 
@@ -1859,7 +1862,7 @@ msgstr "TXT 치트코드 경로"
 msgid "The .them file was not found in the zip."
 msgstr ""
 
-msgid "The Force Widescreen setting requires DIOS MIOS v2.2 or more. This setting will be ignored."
+msgid "The Force Widescreen setting requires DIOS MIOS v2.1 or more. This setting will be ignored."
 msgstr ""
 
 msgid "The GCT Cheatcodes Path and this game are not on the same partition. Run the game without Ocarina?"
@@ -1874,6 +1877,9 @@ msgstr ""
 msgid "The No Disc setting is not used anymore by DIOS MIOS (Lite). Now you need to place a disc in your drive."
 msgstr ""
 
+msgid "The No Disc+ setting requires DIOS MIOS 2.2 update2 or a newer version. This setting will be ignored."
+msgstr ""
+
 msgid "The SYSCONF file will be extracted to your emu nand path and emu nand channel path. Attention: All existing files will be overwritten."
 msgstr ""
 
@@ -2147,7 +2153,10 @@ msgstr ""
 msgid "You cannot delete this category."
 msgstr ""
 
-msgid "You need to install DIOS MIOS to run GameCube games from USB or DIOS MIOS Lite to run them from SD card"
+msgid "You need to install DIOS MIOS Lite v1.2 or a newer version."
+msgstr ""
+
+msgid "You need to install Devolution or DIOS MIOS (Lite) to launch GameCube games from USB or SD card"
 msgstr ""
 
 msgid "Zoom Duration (Speed)"
@@ -2210,12 +2219,6 @@ msgstr "중"
 msgid "seconds left"
 msgstr "초 남았습니다"
 
-msgid "v1.2 -> v2.1"
-msgstr ""
-
-msgid "v2.2+"
-msgstr ""
-
 #~ msgid "Rename Game on WBFS"
 #~ msgstr "WBFS에서 게임 이름 변경"
 

Languages/norwegian.lang

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-05 14:46+0200\n"
+"POT-Creation-Date: 2012-08-24 18:22+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: raschi\n"
 "Language-Team: raschi\n"
@@ -506,7 +506,7 @@ msgstr ""
 msgid "DML Force Widescreen"
 msgstr ""
 
-msgid "DML Installed Version"
+msgid "DML Japanese Patch"
 msgstr ""
 
 msgid "DML LED Activity"
@@ -602,6 +602,9 @@ msgstr ""
 msgid "Devolution Loader Path"
 msgstr ""
 
+msgid "Devolution's loader.bin file can't be loaded."
+msgstr ""
+
 msgid "Directory does not exist!"
 msgstr "Mappe finnes ikke!"
 
@@ -1859,7 +1862,7 @@ msgstr "TXTjuksekode sti"
 msgid "The .them file was not found in the zip."
 msgstr "Filen .them ble ikke funnet i zip."
 
-msgid "The Force Widescreen setting requires DIOS MIOS v2.2 or more. This setting will be ignored."
+msgid "The Force Widescreen setting requires DIOS MIOS v2.1 or more. This setting will be ignored."
 msgstr ""
 
 msgid "The GCT Cheatcodes Path and this game are not on the same partition. Run the game without Ocarina?"
@@ -1874,6 +1877,9 @@ msgstr ""
 msgid "The No Disc setting is not used anymore by DIOS MIOS (Lite). Now you need to place a disc in your drive."
 msgstr ""
 
+msgid "The No Disc+ setting requires DIOS MIOS 2.2 update2 or a newer version. This setting will be ignored."
+msgstr ""
+
 msgid "The SYSCONF file will be extracted to your emu nand path and emu nand channel path. Attention: All existing files will be overwritten."
 msgstr ""
 
@@ -2147,7 +2153,10 @@ msgstr ""
 msgid "You cannot delete this category."
 msgstr "Du kan ikke slette denne kategori."
 
-msgid "You need to install DIOS MIOS to run GameCube games from USB or DIOS MIOS Lite to run them from SD card"
+msgid "You need to install DIOS MIOS Lite v1.2 or a newer version."
+msgstr ""
+
+msgid "You need to install Devolution or DIOS MIOS (Lite) to launch GameCube games from USB or SD card"
 msgstr ""
 
 msgid "Zoom Duration (Speed)"
@@ -2210,12 +2219,6 @@ msgstr "av"
 msgid "seconds left"
 msgstr "sekunder gjenstår"
 
-msgid "v1.2 -> v2.1"
-msgstr ""
-
-msgid "v2.2+"
-msgstr ""
-
 #~ msgid "Custom Discarts"
 #~ msgstr "Cust. platebilde"
 

Languages/polish.lang

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-05 14:46+0200\n"
+"POT-Creation-Date: 2012-08-24 18:22+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: ziom666 (zadania_prog@vp.pl)\n"
 "Language-Team: \n"
@@ -506,7 +506,7 @@ msgstr ""
 msgid "DML Force Widescreen"
 msgstr ""
 
-msgid "DML Installed Version"
+msgid "DML Japanese Patch"
 msgstr ""
 
 msgid "DML LED Activity"
@@ -602,6 +602,9 @@ msgstr ""
 msgid "Devolution Loader Path"
 msgstr ""
 
+msgid "Devolution's loader.bin file can't be loaded."
+msgstr ""
+
 msgid "Directory does not exist!"
 msgstr "Katalog nie istnieje!"
 
@@ -1859,7 +1862,7 @@ msgstr "Sciezka kodow TXT"
 msgid "The .them file was not found in the zip."
 msgstr ""
 
-msgid "The Force Widescreen setting requires DIOS MIOS v2.2 or more. This setting will be ignored."
+msgid "The Force Widescreen setting requires DIOS MIOS v2.1 or more. This setting will be ignored."
 msgstr ""
 
 msgid "The GCT Cheatcodes Path and this game are not on the same partition. Run the game without Ocarina?"
@@ -1874,6 +1877,9 @@ msgstr ""
 msgid "The No Disc setting is not used anymore by DIOS MIOS (Lite). Now you need to place a disc in your drive."
 msgstr ""
 
+msgid "The No Disc+ setting requires DIOS MIOS 2.2 update2 or a newer version. This setting will be ignored."
+msgstr ""
+
 msgid "The SYSCONF file will be extracted to your emu nand path and emu nand channel path. Attention: All existing files will be overwritten."
 msgstr ""
 
@@ -2147,7 +2153,10 @@ msgstr ""
 msgid "You cannot delete this category."
 msgstr ""
 
-msgid "You need to install DIOS MIOS to run GameCube games from USB or DIOS MIOS Lite to run them from SD card"
+msgid "You need to install DIOS MIOS Lite v1.2 or a newer version."
+msgstr ""
+
+msgid "You need to install Devolution or DIOS MIOS (Lite) to launch GameCube games from USB or SD card"
 msgstr ""
 
 msgid "Zoom Duration (Speed)"
@@ -2210,12 +2219,6 @@ msgstr "z"
 msgid "seconds left"
 msgstr "sekund pozostalo"
 
-msgid "v1.2 -> v2.1"
-msgstr ""
-
-msgid "v2.2+"
-msgstr ""
-
 #~ msgid "Rename Game on WBFS"
 #~ msgstr "Zmien tytul gry na WBFS"
 

Languages/portuguese_br.lang

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-05 14:46+0200\n"
+"POT-Creation-Date: 2012-08-24 18:22+0200\n"
 "PO-Revision-Date: 2009-10-23 18:52+0200\n"
 "Last-Translator: aniemotion\n"
 "Language-Team: boto12, aniemotion\n"
@@ -506,7 +506,7 @@ msgstr ""
 msgid "DML Force Widescreen"
 msgstr ""
 
-msgid "DML Installed Version"
+msgid "DML Japanese Patch"
 msgstr ""
 
 msgid "DML LED Activity"
@@ -602,6 +602,9 @@ msgstr ""
 msgid "Devolution Loader Path"
 msgstr ""
 
+msgid "Devolution's loader.bin file can't be loaded."
+msgstr ""
+
 msgid "Directory does not exist!"
 msgstr "Diretorio não existe!"
 
@@ -1859,7 +1862,7 @@ msgstr "Pasta Dicas"
 msgid "The .them file was not found in the zip."
 msgstr ""
 
-msgid "The Force Widescreen setting requires DIOS MIOS v2.2 or more. This setting will be ignored."
+msgid "The Force Widescreen setting requires DIOS MIOS v2.1 or more. This setting will be ignored."
 msgstr ""
 
 msgid "The GCT Cheatcodes Path and this game are not on the same partition. Run the game without Ocarina?"
@@ -1874,6 +1877,9 @@ msgstr ""
 msgid "The No Disc setting is not used anymore by DIOS MIOS (Lite). Now you need to place a disc in your drive."
 msgstr ""
 
+msgid "The No Disc+ setting requires DIOS MIOS 2.2 update2 or a newer version. This setting will be ignored."
+msgstr ""
+
 msgid "The SYSCONF file will be extracted to your emu nand path and emu nand channel path. Attention: All existing files will be overwritten."
 msgstr ""
 
@@ -2147,7 +2153,10 @@ msgstr ""
 msgid "You cannot delete this category."
 msgstr ""
 
-msgid "You need to install DIOS MIOS to run GameCube games from USB or DIOS MIOS Lite to run them from SD card"
+msgid "You need to install DIOS MIOS Lite v1.2 or a newer version."
+msgstr ""
+
+msgid "You need to install Devolution or DIOS MIOS (Lite) to launch GameCube games from USB or SD card"
 msgstr ""
 
 msgid "Zoom Duration (Speed)"
@@ -2210,12 +2219,6 @@ msgstr "de"
 msgid "seconds left"
 msgstr "segundos restantes"
 
-msgid "v1.2 -> v2.1"
-msgstr ""
-
-msgid "v2.2+"
-msgstr ""
-
 #~ msgid "Custom Discarts"
 #~ msgstr "Arte personalizadas"
 

Languages/portuguese_pt.lang

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-05 14:46+0200\n"
+"POT-Creation-Date: 2012-08-24 18:22+0200\n"
 "PO-Revision-Date: 2011-11-03 11:00+0000\n"
 "Last-Translator: pplucky <pplucky@gmail.com>\n"
 "Language-Team: Sky8000, pplucky\n"
@@ -506,7 +506,7 @@ msgstr ""
 msgid "DML Force Widescreen"
 msgstr ""
 
-msgid "DML Installed Version"
+msgid "DML Japanese Patch"
 msgstr ""
 
 msgid "DML LED Activity"
@@ -602,6 +602,9 @@ msgstr ""
 msgid "Devolution Loader Path"
 msgstr ""
 
+msgid "Devolution's loader.bin file can't be loaded."
+msgstr ""
+
 msgid "Directory does not exist!"
 msgstr "Pasta não existe!"
 
@@ -1859,7 +1862,7 @@ msgstr "Cam. Cód. Batotas TXT"
 msgid "The .them file was not found in the zip."
 msgstr "O ficheiro .them não foi encontrado no zip"
 
-msgid "The Force Widescreen setting requires DIOS MIOS v2.2 or more. This setting will be ignored."
+msgid "The Force Widescreen setting requires DIOS MIOS v2.1 or more. This setting will be ignored."
 msgstr ""
 
 msgid "The GCT Cheatcodes Path and this game are not on the same partition. Run the game without Ocarina?"
@@ -1874,6 +1877,9 @@ msgstr ""
 msgid "The No Disc setting is not used anymore by DIOS MIOS (Lite). Now you need to place a disc in your drive."
 msgstr ""
 
+msgid "The No Disc+ setting requires DIOS MIOS 2.2 update2 or a newer version. This setting will be ignored."
+msgstr ""
+
 msgid "The SYSCONF file will be extracted to your emu nand path and emu nand channel path. Attention: All existing files will be overwritten."
 msgstr ""
 
@@ -2147,7 +2153,10 @@ msgstr ""
 msgid "You cannot delete this category."
 msgstr "Não pode apagar esta categoria."
 
-msgid "You need to install DIOS MIOS to run GameCube games from USB or DIOS MIOS Lite to run them from SD card"
+msgid "You need to install DIOS MIOS Lite v1.2 or a newer version."
+msgstr ""
+
+msgid "You need to install Devolution or DIOS MIOS (Lite) to launch GameCube games from USB or SD card"
 msgstr ""
 
 msgid "Zoom Duration (Speed)"
@@ -2210,12 +2219,6 @@ msgstr "de"
 msgid "seconds left"
 msgstr "segundos restantes"
 
-msgid "v1.2 -> v2.1"
-msgstr ""
-
-msgid "v2.2+"
-msgstr ""
-
 #~ msgid "Custom Discarts"
 #~ msgstr "Imagens Disco Personalizadas"
 

Languages/russian.lang

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-05 14:46+0200\n"
+"POT-Creation-Date: 2012-08-24 18:22+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: nikolai_ca\n"
 "Language-Team: Kir, alendit, nikolai_ca\n"
@@ -506,7 +506,7 @@ msgstr ""
 msgid "DML Force Widescreen"
 msgstr ""
 
-msgid "DML Installed Version"
+msgid "DML Japanese Patch"
 msgstr ""
 
 msgid "DML LED Activity"
@@ -602,6 +602,9 @@ msgstr ""
 msgid "Devolution Loader Path"
 msgstr ""
 
+msgid "Devolution's loader.bin file can't be loaded."
+msgstr ""
+
 msgid "Directory does not exist!"
 msgstr "Каталог не существует!"
 
@@ -1859,7 +1862,7 @@ msgstr "Путь к TXT читкодам"
 msgid "The .them file was not found in the zip."
 msgstr ""
 
-msgid "The Force Widescreen setting requires DIOS MIOS v2.2 or more. This setting will be ignored."
+msgid "The Force Widescreen setting requires DIOS MIOS v2.1 or more. This setting will be ignored."
 msgstr ""
 
 msgid "The GCT Cheatcodes Path and this game are not on the same partition. Run the game without Ocarina?"
@@ -1874,6 +1877,9 @@ msgstr ""
 msgid "The No Disc setting is not used anymore by DIOS MIOS (Lite). Now you need to place a disc in your drive."
 msgstr ""
 
+msgid "The No Disc+ setting requires DIOS MIOS 2.2 update2 or a newer version. This setting will be ignored."
+msgstr ""
+
 msgid "The SYSCONF file will be extracted to your emu nand path and emu nand channel path. Attention: All existing files will be overwritten."
 msgstr ""
 
@@ -2147,7 +2153,10 @@ msgstr ""
 msgid "You cannot delete this category."
 msgstr ""
 
-msgid "You need to install DIOS MIOS to run GameCube games from USB or DIOS MIOS Lite to run them from SD card"
+msgid "You need to install DIOS MIOS Lite v1.2 or a newer version."
+msgstr ""
+
+msgid "You need to install Devolution or DIOS MIOS (Lite) to launch GameCube games from USB or SD card"
 msgstr ""
 
 msgid "Zoom Duration (Speed)"
@@ -2210,12 +2219,6 @@ msgstr "из"
 msgid "seconds left"
 msgstr "секунд осталось"
 
-msgid "v1.2 -> v2.1"
-msgstr ""
-
-msgid "v2.2+"
-msgstr ""
-
 #~ msgid "Rename Game on WBFS"
 #~ msgstr "Переименовать игры в WBFS"
 

Languages/schinese.lang

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-05 14:46+0200\n"
+"POT-Creation-Date: 2012-08-24 18:22+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: knife.hu kavid emul8ion\n"
 "Language-Team: kavid\n"
@@ -506,7 +506,7 @@ msgstr ""
 msgid "DML Force Widescreen"
 msgstr ""
 
-msgid "DML Installed Version"
+msgid "DML Japanese Patch"
 msgstr ""
 
 msgid "DML LED Activity"
@@ -602,6 +602,9 @@ msgstr ""
 msgid "Devolution Loader Path"
 msgstr ""
 
+msgid "Devolution's loader.bin file can't be loaded."
+msgstr ""
+
 msgid "Directory does not exist!"
 msgstr "目录不存在"
 
@@ -1859,7 +1862,7 @@ msgstr "TXT作弊码路径"
 msgid "The .them file was not found in the zip."
 msgstr "zip文件中没有找到.them文件"
 
-msgid "The Force Widescreen setting requires DIOS MIOS v2.2 or more. This setting will be ignored."
+msgid "The Force Widescreen setting requires DIOS MIOS v2.1 or more. This setting will be ignored."
 msgstr ""
 
 msgid "The GCT Cheatcodes Path and this game are not on the same partition. Run the game without Ocarina?"
@@ -1874,6 +1877,9 @@ msgstr ""
 msgid "The No Disc setting is not used anymore by DIOS MIOS (Lite). Now you need to place a disc in your drive."
 msgstr ""
 
+msgid "The No Disc+ setting requires DIOS MIOS 2.2 update2 or a newer version. This setting will be ignored."
+msgstr ""
+
 msgid "The SYSCONF file will be extracted to your emu nand path and emu nand channel path. Attention: All existing files will be overwritten."
 msgstr ""
 
@@ -2147,7 +2153,10 @@ msgstr ""
 msgid "You cannot delete this category."
 msgstr ""
 
-msgid "You need to install DIOS MIOS to run GameCube games from USB or DIOS MIOS Lite to run them from SD card"
+msgid "You need to install DIOS MIOS Lite v1.2 or a newer version."
+msgstr ""
+
+msgid "You need to install Devolution or DIOS MIOS (Lite) to launch GameCube games from USB or SD card"
 msgstr ""
 
 msgid "Zoom Duration (Speed)"
@@ -2210,12 +2219,6 @@ msgstr "的"
 msgid "seconds left"
 msgstr "剩余秒数"
 
-msgid "v1.2 -> v2.1"
-msgstr ""
-
-msgid "v2.2+"
-msgstr ""
-
 #~ msgid "Custom Discarts"
 #~ msgstr "自定义光盘图片"
 

Languages/spanish.lang

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-05 14:46+0200\n"
+"POT-Creation-Date: 2012-08-24 18:22+0200\n"
 "PO-Revision-Date: 2011-07-25 16:40+0200\n"
 "Last-Translator: Galen/xFede\n"
 "Language-Team: Penn, SirPalax, hvy109\n"
@@ -506,7 +506,7 @@ msgstr "Depurador DML"
 msgid "DML Force Widescreen"
 msgstr ""
 
-msgid "DML Installed Version"
+msgid "DML Japanese Patch"
 msgstr ""
 
 msgid "DML LED Activity"
@@ -602,6 +602,9 @@ msgstr ""
 msgid "Devolution Loader Path"
 msgstr ""
 
+msgid "Devolution's loader.bin file can't be loaded."
+msgstr ""
+
 msgid "Directory does not exist!"
 msgstr "¡La carpeta no existe!"
 
@@ -1859,7 +1862,7 @@ msgstr "Ruta de Trucos TXT"
 msgid "The .them file was not found in the zip."
 msgstr "El archivo .them no se encontró en el zip."
 
-msgid "The Force Widescreen setting requires DIOS MIOS v2.2 or more. This setting will be ignored."
+msgid "The Force Widescreen setting requires DIOS MIOS v2.1 or more. This setting will be ignored."
 msgstr ""
 
 msgid "The GCT Cheatcodes Path and this game are not on the same partition. Run the game without Ocarina?"
@@ -1874,6 +1877,9 @@ msgstr "Los miis serán extraidos a la ruta de tu EmuNand y Canales de EmuNand.
 msgid "The No Disc setting is not used anymore by DIOS MIOS (Lite). Now you need to place a disc in your drive."
 msgstr ""
 
+msgid "The No Disc+ setting requires DIOS MIOS 2.2 update2 or a newer version. This setting will be ignored."
+msgstr ""
+
 msgid "The SYSCONF file will be extracted to your emu nand path and emu nand channel path. Attention: All existing files will be overwritten."
 msgstr "El archivo SYSCONF será extraido a la ruta de tu EmuNand y Canales de EmuNand. Atención: todos los archivos existentes serán sobreescritos"
 
@@ -2147,7 +2153,10 @@ msgstr "Puedes seleccionar o formatear una particón o usar el modo de carga de
 msgid "You cannot delete this category."
 msgstr "No puedes borrar esta categoría."
 
-msgid "You need to install DIOS MIOS to run GameCube games from USB or DIOS MIOS Lite to run them from SD card"
+msgid "You need to install DIOS MIOS Lite v1.2 or a newer version."
+msgstr ""
+
+msgid "You need to install Devolution or DIOS MIOS (Lite) to launch GameCube games from USB or SD card"
 msgstr ""
 
 msgid "Zoom Duration (Speed)"
@@ -2210,12 +2219,6 @@ msgstr "de"
 msgid "seconds left"
 msgstr "segundos restantes"
 
-msgid "v1.2 -> v2.1"
-msgstr ""
-
-msgid "v2.2+"
-msgstr ""
-
 #~ msgid "Custom Discarts"
 #~ msgstr "Img. Discos Artísticas"
 

Languages/swedish.lang

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-05 14:46+0200\n"
+"POT-Creation-Date: 2012-08-24 18:22+0200\n"
 "PO-Revision-Date: 2010-01-19 17:39+0200\n"
 "Last-Translator: Katsurou\n"
 "Language-Team: Katsurou, pirateX\n"
@@ -506,7 +506,7 @@ msgstr ""
 msgid "DML Force Widescreen"
 msgstr ""
 
-msgid "DML Installed Version"
+msgid "DML Japanese Patch"
 msgstr ""
 
 msgid "DML LED Activity"
@@ -602,6 +602,9 @@ msgstr ""
 msgid "Devolution Loader Path"
 msgstr ""
 
+msgid "Devolution's loader.bin file can't be loaded."
+msgstr ""
+
 msgid "Directory does not exist!"
 msgstr "Katalog existerar inte!"
 
@@ -1859,7 +1862,7 @@ msgstr "Sökväg till txt koder"
 msgid "The .them file was not found in the zip."
 msgstr ""
 
-msgid "The Force Widescreen setting requires DIOS MIOS v2.2 or more. This setting will be ignored."
+msgid "The Force Widescreen setting requires DIOS MIOS v2.1 or more. This setting will be ignored."
 msgstr ""
 
 msgid "The GCT Cheatcodes Path and this game are not on the same partition. Run the game without Ocarina?"
@@ -1874,6 +1877,9 @@ msgstr ""
 msgid "The No Disc setting is not used anymore by DIOS MIOS (Lite). Now you need to place a disc in your drive."
 msgstr ""
 
+msgid "The No Disc+ setting requires DIOS MIOS 2.2 update2 or a newer version. This setting will be ignored."
+msgstr ""
+
 msgid "The SYSCONF file will be extracted to your emu nand path and emu nand channel path. Attention: All existing files will be overwritten."
 msgstr ""
 
@@ -2147,7 +2153,10 @@ msgstr ""
 msgid "You cannot delete this category."
 msgstr ""
 
-msgid "You need to install DIOS MIOS to run GameCube games from USB or DIOS MIOS Lite to run them from SD card"
+msgid "You need to install DIOS MIOS Lite v1.2 or a newer version."
+msgstr ""
+
+msgid "You need to install Devolution or DIOS MIOS (Lite) to launch GameCube games from USB or SD card"
 msgstr ""
 
 msgid "Zoom Duration (Speed)"
@@ -2210,12 +2219,6 @@ msgstr "av"
 msgid "seconds left"
 msgstr "sekunder kvar"
 
-msgid "v1.2 -> v2.1"
-msgstr ""
-
-msgid "v2.2+"
-msgstr ""
-
 #~ msgid "Rename Game on WBFS"
 #~ msgstr "Döp om spel på WBFS"
 

Languages/tchinese.lang

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-05 14:46+0200\n"
+"POT-Creation-Date: 2012-08-24 18:22+0200\n"
 "PO-Revision-Date: 2010-02-15 21:00+0800\n"
 "Last-Translator: Jane.H\n"
 "Language-Team: kyogc, Miller, Mika Li, Jane.H\n"
@@ -506,7 +506,7 @@ msgstr "DML除錯"
 msgid "DML Force Widescreen"
 msgstr ""
 
-msgid "DML Installed Version"
+msgid "DML Japanese Patch"
 msgstr ""
 
 msgid "DML LED Activity"
@@ -602,6 +602,9 @@ msgstr ""
 msgid "Devolution Loader Path"
 msgstr ""
 
+msgid "Devolution's loader.bin file can't be loaded."
+msgstr ""
+
 msgid "Directory does not exist!"
 msgstr "目錄不存在"
 
@@ -1859,7 +1862,7 @@ msgstr "TXT 金手指檔案路徑"
 msgid "The .them file was not found in the zip."
 msgstr "在zip檔中找不到主題檔.them"
 
-msgid "The Force Widescreen setting requires DIOS MIOS v2.2 or more. This setting will be ignored."
+msgid "The Force Widescreen setting requires DIOS MIOS v2.1 or more. This setting will be ignored."
 msgstr ""
 
 msgid "The GCT Cheatcodes Path and this game are not on the same partition. Run the game without Ocarina?"
@@ -1874,6 +1877,9 @@ msgstr "Miis將被提取到模擬nand及頻道的路徑. 注意: 所有存在的
 msgid "The No Disc setting is not used anymore by DIOS MIOS (Lite). Now you need to place a disc in your drive."
 msgstr ""
 
+msgid "The No Disc+ setting requires DIOS MIOS 2.2 update2 or a newer version. This setting will be ignored."
+msgstr ""
+
 msgid "The SYSCONF file will be extracted to your emu nand path and emu nand channel path. Attention: All existing files will be overwritten."
 msgstr "SYSCONF檔將被提取到模擬nand及頻道的路徑. 注意: 所有存在的檔案將被覆寫"
 
@@ -2147,8 +2153,11 @@ msgstr "你可選擇或格式化磁區或使用頻道 loader 模式。"
 msgid "You cannot delete this category."
 msgstr "無法刪除此類別。"
 
-msgid "You need to install DIOS MIOS to run GameCube games from USB or DIOS MIOS Lite to run them from SD card"
+msgid "You need to install DIOS MIOS Lite v1.2 or a newer version."
-msgstr "你需安裝DIOS MIOS從USB裝置執行GameCube遊戲或安裝DIOS MIOS Lite從SD卡執行GameCube遊戲"
+msgstr ""
+
+msgid "You need to install Devolution or DIOS MIOS (Lite) to launch GameCube games from USB or SD card"
+msgstr ""
 
 msgid "Zoom Duration (Speed)"
 msgstr "縮放間隔 (速度) "
@@ -2210,11 +2219,8 @@ msgstr "的"
 msgid "seconds left"
 msgstr "剩餘秒數"
 
-msgid "v1.2 -> v2.1"
+#~ msgid "You need to install DIOS MIOS to run GameCube games from USB or DIOS MIOS Lite to run them from SD card"
-msgstr ""
+#~ msgstr "你需安裝DIOS MIOS從USB裝置執行GameCube遊戲或安裝DIOS MIOS Lite從SD卡執行GameCube遊戲"
-
-msgid "v2.2+"
-msgstr ""
 
 #~ msgid "Custom Discarts"
 #~ msgstr "自製光碟圖片"

Languages/thai.lang

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-05 14:46+0200\n"
+"POT-Creation-Date: 2012-08-24 18:22+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: Nitro_subzero \n"
 "Language-Team: Nitro_subzero\n"
@@ -506,7 +506,7 @@ msgstr ""
 msgid "DML Force Widescreen"
 msgstr ""
 
-msgid "DML Installed Version"
+msgid "DML Japanese Patch"
 msgstr ""
 
 msgid "DML LED Activity"
@@ -602,6 +602,9 @@ msgstr ""
 msgid "Devolution Loader Path"
 msgstr ""
 
+msgid "Devolution's loader.bin file can't be loaded."
+msgstr ""
+
 msgid "Directory does not exist!"
 msgstr "ไม่พบไดเรคทอรี่นี้ !"
 
@@ -1859,7 +1862,7 @@ msgstr "ที่เก็บ TXTCheatcodes"
 msgid "The .them file was not found in the zip."
 msgstr ""
 
-msgid "The Force Widescreen setting requires DIOS MIOS v2.2 or more. This setting will be ignored."
+msgid "The Force Widescreen setting requires DIOS MIOS v2.1 or more. This setting will be ignored."
 msgstr ""
 
 msgid "The GCT Cheatcodes Path and this game are not on the same partition. Run the game without Ocarina?"
@@ -1874,6 +1877,9 @@ msgstr ""
 msgid "The No Disc setting is not used anymore by DIOS MIOS (Lite). Now you need to place a disc in your drive."
 msgstr ""
 
+msgid "The No Disc+ setting requires DIOS MIOS 2.2 update2 or a newer version. This setting will be ignored."
+msgstr ""
+
 msgid "The SYSCONF file will be extracted to your emu nand path and emu nand channel path. Attention: All existing files will be overwritten."
 msgstr ""
 
@@ -2147,7 +2153,10 @@ msgstr ""
 msgid "You cannot delete this category."
 msgstr ""
 
-msgid "You need to install DIOS MIOS to run GameCube games from USB or DIOS MIOS Lite to run them from SD card"
+msgid "You need to install DIOS MIOS Lite v1.2 or a newer version."
+msgstr ""
+
+msgid "You need to install Devolution or DIOS MIOS (Lite) to launch GameCube games from USB or SD card"
 msgstr ""
 
 msgid "Zoom Duration (Speed)"
@@ -2210,12 +2219,6 @@ msgstr "จาก"
 msgid "seconds left"
 msgstr "วินาทีที่เหลือ"
 
-msgid "v1.2 -> v2.1"
-msgstr ""
-
-msgid "v2.2+"
-msgstr ""
-
 #~ msgid "Rename Game on WBFS"
 #~ msgstr "เปลี่ยนชื่อเกมส์บน WBFS"
 

Languages/turkish.lang

@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-05 14:46+0200\n"
+"POT-Creation-Date: 2012-08-24 18:22+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: omercigingelini\n"
 "Language-Team: omercigingelini\n"
@@ -506,7 +506,7 @@ msgstr ""
 msgid "DML Force Widescreen"
 msgstr ""
 
-msgid "DML Installed Version"
+msgid "DML Japanese Patch"
 msgstr ""
 
 msgid "DML LED Activity"
@@ -602,6 +602,9 @@ msgstr ""
 msgid "Devolution Loader Path"
 msgstr ""
 
+msgid "Devolution's loader.bin file can't be loaded."
+msgstr ""
+
 msgid "Directory does not exist!"
 msgstr "Klasör bulunamadı!"
 
@@ -1859,7 +1862,7 @@ msgstr "TXT Hile Yolu"
 msgid "The .them file was not found in the zip."
 msgstr ""
 
-msgid "The Force Widescreen setting requires DIOS MIOS v2.2 or more. This setting will be ignored."
+msgid "The Force Widescreen setting requires DIOS MIOS v2.1 or more. This setting will be ignored."
 msgstr ""
 
 msgid "The GCT Cheatcodes Path and this game are not on the same partition. Run the game without Ocarina?"
@@ -1874,6 +1877,9 @@ msgstr ""
 msgid "The No Disc setting is not used anymore by DIOS MIOS (Lite). Now you need to place a disc in your drive."
 msgstr ""
 
+msgid "The No Disc+ setting requires DIOS MIOS 2.2 update2 or a newer version. This setting will be ignored."
+msgstr ""
+
 msgid "The SYSCONF file will be extracted to your emu nand path and emu nand channel path. Attention: All existing files will be overwritten."
 msgstr ""
 
@@ -2147,7 +2153,10 @@ msgstr ""
 msgid "You cannot delete this category."
 msgstr ""
 
-msgid "You need to install DIOS MIOS to run GameCube games from USB or DIOS MIOS Lite to run them from SD card"
+msgid "You need to install DIOS MIOS Lite v1.2 or a newer version."
+msgstr ""
+
+msgid "You need to install Devolution or DIOS MIOS (Lite) to launch GameCube games from USB or SD card"
 msgstr ""
 
 msgid "Zoom Duration (Speed)"
@@ -2210,12 +2219,6 @@ msgstr "./"
 msgid "seconds left"
 msgstr "saniye kaldı"
 
-msgid "v1.2 -> v2.1"
-msgstr ""
-
-msgid "v2.2+"
-msgstr ""
-
 #~ msgid "Rename Game on WBFS"
 #~ msgstr "WBFS'deki oyunu yeniden isimlendir"
 

source/StartUpProcess.cpp

@@ -194,6 +194,10 @@ int StartUpProcess::Execute()
 	SetTextf("Loading system menu resources\n");
 	SystemMenuResources::Instance()->Init();
 
+	// Check MIOS version
+	SetTextf("Checking installed MIOS... ");
+	IosLoader::GetMIOSInfo();
+
 	// Deinitialize ISFS
 	ISFS_Deinitialize();
 

source/memory/memory.h

@@ -26,6 +26,7 @@ extern "C"
 #define	 CPU_Speed		((vu32*) 0x800000FC)
 #define	 Online_Check	((vu32*) 0x80003180)
 #define	 GameID_Address	((vu32*) 0x80003184)
+#define	 HW_PPCSPEED	((vu32*) 0xCD800018)
 
 #define allocate_memory(size) memalign(32, (size+31)&(~31))
 

source/prompts/GameWindow.cpp

@@ -768,4 +768,8 @@ void GameWindow::BootGame(struct discHdr *header)
 
 	//Just calling that shuts down everything and starts game
 	GameBooter::BootGame(header);
+	
+	//If the launch is canceled, reduce playCount
+	GameStatistics.SetPlayCount(header->id, GameStatistics.GetPlayCount(header->id)-1);
+	GameStatistics.Save();
 }

source/prompts/PromptWindows.cpp

@@ -42,6 +42,26 @@
 #include "gecko.h"
 #include "lstub.h"
 
+static const char * DMLVersions[] =
+{
+	//! sorted by internal release date. see IosLoader.h
+	"",			// Original MIOS
+	"r51-",		// old DML r51-
+	"r52",		// old DML r52
+	"",			// QuadForce 01
+	"v1.2",		// DML 1.2
+	"v1.4",		// DML 1.4
+	"v1.4b",	// DML 1.4b
+	"v1.5",		// DML 1.5
+	"v2.0.x",	// DM  2.0
+	"v2.1",		// DML 2.1
+	"v2.2.x",	// DM  2.2
+	"v2.2.2+",	// DM  2.2 update 2
+	"v2.2",		// DML 2.2
+	"v2.2.1+",	// DML 2.2.1
+};
+
+
 /****************************************************************************
  * OnScreenNumpad
  *
@@ -239,7 +259,7 @@ void WindowCredits()
 
 	txt[i] = new GuiText(tr( "Credits" ), 28, ( GXColor ) {255, 255, 255, 255});
 	txt[i]->SetAlignment(ALIGN_CENTER, ALIGN_TOP);
-	txt[i]->SetPosition(0, 12);
+	txt[i]->SetPosition(0, 8);
 	txt[i]->SetFont(creditsFont, creditsFontSize);
 	i++;
 
@@ -257,15 +277,15 @@ void WindowCredits()
 
 	int currentMIOS = IosLoader::GetMIOSInfo();
 	if(currentMIOS == DIOS_MIOS)
-		snprintf(IosInfo, sizeof(IosInfo), "%s + DIOS-MIOS", IosInfo);
+		snprintf(IosInfo, sizeof(IosInfo), "%s %s DIOS-MIOS %s", IosInfo, info ? "+" : "", DMLVersions[IosLoader::GetDMLVersion()]);
 	else if (currentMIOS == DIOS_MIOS_LITE)
-		snprintf(IosInfo, sizeof(IosInfo), "%s + DIOS-MIOS Lite", IosInfo);
+		snprintf(IosInfo, sizeof(IosInfo), "%s %s DIOS-MIOS Lite %s", IosInfo, info ? "+" : "", DMLVersions[IosLoader::GetDMLVersion()]);
 	else if (currentMIOS == QUADFORCE)
-		snprintf(IosInfo, sizeof(IosInfo), "%s + QuadForce", IosInfo);
+		snprintf(IosInfo, sizeof(IosInfo), "%s %s QuadForce", IosInfo, info ? "+" : "");
 
 	txt[i] = new GuiText(SvnRev, 16, ( GXColor ) {255, 255, 255, 255});
 	txt[i]->SetAlignment(ALIGN_RIGHT, ALIGN_TOP);
-	txt[i]->SetPosition(0, info ? y-10 : y);
+	txt[i]->SetPosition(0, (info || currentMIOS > DEFAULT_MIOS) ? y-10 : y);
 	txt[i]->SetFont(creditsFont, creditsFontSize);
 	i++;
 

source/settings/CGameSettings.cpp

@@ -214,6 +214,7 @@ bool CGameSettings::Save()
 		fprintf(f, "DMLNoDisc:%d; ", GameList[i].DMLNoDisc);
 		fprintf(f, "DMLNoDisc2:%d; ", GameList[i].DMLNoDisc2);
 		fprintf(f, "DMLWidescreen:%d; ", GameList[i].DMLWidescreen);
+		fprintf(f, "DMLJPNPatch:%d; ", GameList[i].DMLJPNPatch);
 		fprintf(f, "DMLDebug:%d; ", GameList[i].DMLDebug);
 		fprintf(f, "DEVOMCEmulation:%d; ", GameList[i].DEVOMCEmulation);
 		fprintf(f, "Locked:%d;\n", GameList[i].Locked);
@@ -371,6 +372,11 @@ bool CGameSettings::SetSetting(GameCFG & game, const char *name, const char *val
 		game.DMLWidescreen = atoi(value);
 		return true;
 	}
+	else if(strcmp(name, "DMLJPNPatch") == 0)
+	{
+		game.DMLJPNPatch = atoi(value);
+		return true;
+	}
 	else if(strcmp(name, "DMLDebug") == 0)
 	{
 		game.DMLDebug = atoi(value);
@@ -510,6 +516,7 @@ void CGameSettings::SetDefault(GameCFG &game)
 	game.DMLNoDisc = INHERIT;
 	game.DMLNoDisc2 = INHERIT;
 	game.DMLWidescreen = INHERIT;
+	game.DMLJPNPatch = INHERIT;
 	game.DMLDebug = INHERIT;
 	game.DEVOMCEmulation = INHERIT;
 	game.Locked = OFF;

source/settings/CGameSettings.h

@@ -38,6 +38,7 @@ typedef struct _GameCFG
 	short DMLNoDisc;
 	short DMLNoDisc2;
 	short DMLWidescreen;
+	short DMLJPNPatch;
 	short DMLDebug;
 	short DEVOMCEmulation;
 	short Locked;
@@ -73,6 +74,7 @@ typedef struct _GameCFG
 		this->DMLNoDisc = game.DMLNoDisc;
 		this->DMLNoDisc2 = game.DMLNoDisc2;
 		this->DMLWidescreen = game.DMLWidescreen;
+		this->DMLJPNPatch = game.DMLJPNPatch;
 		this->DMLDebug = game.DMLDebug;
 		this->DEVOMCEmulation = game.DEVOMCEmulation;
 		this->Locked = game.Locked;

source/settings/CSettings.cpp

@@ -169,7 +169,6 @@ void CSettings::SetDefault()
 	BannerProjectionHeight = (Settings.PAL50 ? 448.0f : (NTSC ? 470.0f : 464.0f));
 	GCBannerScale = 1.5f;
 	GameCubeMode = GC_MODE_MIOS;
-	DMLConfigVersion = DML_VERSION;
 	DMLVideo = DML_VIDEO_AUTO;
 	DMLProgPatch = OFF;
 	DMLNMM = OFF;
@@ -178,6 +177,7 @@ void CSettings::SetDefault()
 	DMLNoDisc = OFF;
 	DMLNoDisc2 = OFF;
 	DMLWidescreen = OFF;
+	DMLJPNPatch = OFF;
 	DMLDebug = OFF;
 	DEVOMCEmulation = OFF;
 	GCInstallCompressed = OFF;
@@ -396,7 +396,6 @@ bool CSettings::Save()
 	fprintf(file, "GameCubePath = %s\n", GameCubePath);
 	fprintf(file, "GameCubeSDPath = %s\n", GameCubeSDPath);
 	fprintf(file, "GameCubeMode = %d\n", GameCubeMode);
-	fprintf(file, "DMLConfigVersion = %d\n", DMLConfigVersion);
 	fprintf(file, "DMLVideo = %d\n", DMLVideo);
 	fprintf(file, "DMLProgPatch = %d\n", DMLProgPatch);
 	fprintf(file, "DMLNMM = %d\n", DMLNMM);
@@ -405,6 +404,7 @@ bool CSettings::Save()
 	fprintf(file, "DMLNoDisc = %d\n", DMLNoDisc);
 	fprintf(file, "DMLNoDisc2 = %d\n", DMLNoDisc2);
 	fprintf(file, "DMLWidescreen = %d\n", DMLWidescreen);
+	fprintf(file, "DMLJPNPatch = %d\n", DMLJPNPatch);
 	fprintf(file, "DMLDebug = %d\n", DMLDebug);
 	fprintf(file, "DEVOMCEmulation = %d\n", DEVOMCEmulation);
 	fprintf(file, "DEVOLoaderPath = %s\n", DEVOLoaderPath);
@@ -802,11 +802,6 @@ bool CSettings::SetSetting(char *name, char *value)
 		GameCubeMode = atoi(value);
 		return true;
 	}
-	else if (strcmp(name, "DMLConfigVersion") == 0)
-	{
-		DMLConfigVersion = atoi(value);
-		return true;
-	}
 	else if (strcmp(name, "DMLVideo") == 0)
 	{
 		DMLVideo = atoi(value);
@@ -847,6 +842,11 @@ bool CSettings::SetSetting(char *name, char *value)
 		DMLWidescreen = atoi(value);
 		return true;
 	}
+	else if (strcmp(name, "DMLJPNPatch") == 0)
+	{
+		DMLJPNPatch = atoi(value);
+		return true;
+	}
 	else if (strcmp(name, "DMLDebug") == 0)
 	{
 		DMLDebug = atoi(value);

source/settings/CSettings.h

@@ -171,7 +171,6 @@ class CSettings
 		float BannerProjectionHeight;
 		float GCBannerScale;
 		short GameCubeMode;
-		short DMLConfigVersion;
 		short DMLVideo;
 		short DMLProgPatch;
 		short DMLNMM;
@@ -180,6 +179,7 @@ class CSettings
 		short DMLNoDisc;
 		short DMLNoDisc2;
 		short DMLWidescreen;
+		short DMLJPNPatch;
 		short DMLDebug;
 		short DEVOMCEmulation;
 		short GCInstallCompressed;

source/settings/menus/GCGameLoadSM.cpp

@@ -159,17 +159,21 @@ void GCGameLoadSM::SetOptionNames()
 	Options->SetName(Idx++, "%s", tr( "Ocarina" ));
 	Options->SetName(Idx++, "%s", tr( "Parental Control" ));
 	Options->SetName(Idx++, "%s", tr( "GameCube Mode" ));
+	if(IosLoader::GetMIOSInfo() >DEFAULT_MIOS)
+	{
 		Options->SetName(Idx++, "%s", tr( "DML Video Mode" ));
 		Options->SetName(Idx++, "%s", tr( "DML Progressive Patch" ));
 		Options->SetName(Idx++, "%s", tr( "DML NMM Mode" ));
 		Options->SetName(Idx++, "%s", tr( "DML LED Activity" ));
 		Options->SetName(Idx++, "%s", tr( "DML PAD Hook" ));
 		Options->SetName(Idx++, "%s", tr( "DML No Disc" ));
-	if(Settings.DMLConfigVersion > 1)
+		if(IosLoader::GetDMLVersion() >= DML_VERSION_DM_2_2_2)
 			Options->SetName(Idx++, "%s", tr( "DML No Disc+" ));
-	if(Settings.DMLConfigVersion > 1)
+		if(IosLoader::GetDMLVersion() > DML_VERSION_DM_2_1)
 			Options->SetName(Idx++, "%s", tr( "DML Force Widescreen" ));
+		Options->SetName(Idx++, "%s", tr( "DML Japanese Patch" ));
 		Options->SetName(Idx++, "%s", tr( "DML Debug" ));
+	}
 	Options->SetName(Idx++, "%s", tr( "DEVO MemCard Emulation" ));
 }
 
@@ -209,6 +213,8 @@ void GCGameLoadSM::SetOptionValues()
 	else
 		Options->SetValue(Idx++, "%s", tr(GCMode[GameConfig.GameCubeMode]));
 	
+	if(IosLoader::GetMIOSInfo() >DEFAULT_MIOS)
+	{
 		//! Settings: DML Video Mode
 		if(GameConfig.DMLVideo == INHERIT)
 			Options->SetValue(Idx++, tr("Use global"));
@@ -246,7 +252,7 @@ void GCGameLoadSM::SetOptionValues()
 			Options->SetValue(Idx++, "%s", tr(OnOffText[GameConfig.DMLNoDisc]));
 
 		//! Settings: DML Extended No Disc
-	if(Settings.DMLConfigVersion > 1)
+		if(IosLoader::GetDMLVersion() >= DML_VERSION_DM_2_2_2)
 		{
 			if(GameConfig.DMLNoDisc2 == INHERIT)
 				Options->SetValue(Idx++, tr("Use global"));
@@ -255,7 +261,7 @@ void GCGameLoadSM::SetOptionValues()
 		}
 
 		//! Settings: DML Force Widescreen
-	if(Settings.DMLConfigVersion > 1)
+		if(IosLoader::GetDMLVersion() > DML_VERSION_DM_2_1)
 		{
 			if(GameConfig.DMLWidescreen == INHERIT)
 				Options->SetValue(Idx++, tr("Use global"));
@@ -263,11 +269,18 @@ void GCGameLoadSM::SetOptionValues()
 				Options->SetValue(Idx++, "%s", tr(OnOffText[GameConfig.DMLWidescreen]));
 		}
 
+		//! Settings: DML Japanese Patch
+		if(GameConfig.DMLJPNPatch == INHERIT)
+			Options->SetValue(Idx++, tr("Use global"));
+		else
+			Options->SetValue(Idx++, "%s", tr(OnOffText[GameConfig.DMLJPNPatch]));
+
 		//! Settings: DML Debug
 		if(GameConfig.DMLDebug == INHERIT)
 			Options->SetValue(Idx++, tr("Use global"));
 		else
 			Options->SetValue(Idx++, "%s", tr(DMLDebug[GameConfig.DMLDebug]));
+	}
 	
 	//! Settings: DEVO Memory Card Emulation
 	if(GameConfig.DEVOMCEmulation == INHERIT)
@@ -344,55 +357,61 @@ int GCGameLoadSM::GetMenuInternal()
 	}
 
 	//! Settings: DML Video Mode
-	else if (ret == ++Idx)
+	else if (IosLoader::GetMIOSInfo() > DEFAULT_MIOS && ret == ++Idx)
 	{
 		if (++GameConfig.DMLVideo >= DML_VIDEO_MAX_CHOICE) GameConfig.DMLVideo = INHERIT;
 	}
 
 	//! Settings: DML Progressive Patch
-	else if (ret == ++Idx)
+	else if (IosLoader::GetMIOSInfo() > DEFAULT_MIOS && ret == ++Idx)
 	{
 		if (++GameConfig.DMLProgPatch >= MAX_ON_OFF) GameConfig.DMLProgPatch = INHERIT;
 	}
 
 	//! Settings: DML NMM Mode
-	else if (ret == ++Idx)
+	else if (IosLoader::GetMIOSInfo() > DEFAULT_MIOS && ret == ++Idx)
 	{
 		if (++GameConfig.DMLNMM >= 3) GameConfig.DMLNMM = INHERIT;
 	}
 
 	//! Settings: DML LED Activity
-	else if (ret == ++Idx)
+	else if (IosLoader::GetMIOSInfo() > DEFAULT_MIOS && ret == ++Idx)
 	{
 		if (++GameConfig.DMLActivityLED >= MAX_ON_OFF) GameConfig.DMLActivityLED = INHERIT;
 	}
 
 	//! Settings: DML PAD Hook
-	else if (ret == ++Idx)
+	else if (IosLoader::GetMIOSInfo() > DEFAULT_MIOS && ret == ++Idx)
 	{
 		if (++GameConfig.DMLPADHOOK >= MAX_ON_OFF) GameConfig.DMLPADHOOK = INHERIT;
 	}
 
 	//! Settings: DML No Disc
-	else if (ret == ++Idx)
+	else if (IosLoader::GetMIOSInfo() > DEFAULT_MIOS && ret == ++Idx)
 	{
 		if (++GameConfig.DMLNoDisc >= MAX_ON_OFF) GameConfig.DMLNoDisc = INHERIT;
 	}
 
 	//! Settings: DML Extended No Disc
-	else if (Settings.DMLConfigVersion > 1 && ret == ++Idx)
+	else if (IosLoader::GetMIOSInfo() > DEFAULT_MIOS && IosLoader::GetDMLVersion() >= DML_VERSION_DM_2_2_2 && ret == ++Idx)
 	{
 		if (++GameConfig.DMLNoDisc2 >= MAX_ON_OFF) GameConfig.DMLNoDisc2 = INHERIT;
 	}
 
 	//! Settings: DML Force Widescreen
-	else if (Settings.DMLConfigVersion > 1 && ret == ++Idx)
+	else if (IosLoader::GetMIOSInfo() > DEFAULT_MIOS && IosLoader::GetDMLVersion() >= DML_VERSION_DM_2_1 && ret == ++Idx)
 	{
 		if (++GameConfig.DMLWidescreen >= MAX_ON_OFF) GameConfig.DMLWidescreen = INHERIT;
 	}
 
+	//! Settings: DML Japanese Patch
+	else if (IosLoader::GetMIOSInfo() > DEFAULT_MIOS && ret == ++Idx)
+	{
+		if (++GameConfig.DMLJPNPatch >= 3) GameConfig.DMLJPNPatch = INHERIT;
+	}
+	
 	//! Settings: DML Debug
-	else if (ret == ++Idx)
+	else if (IosLoader::GetMIOSInfo() > DEFAULT_MIOS && ret == ++Idx)
 	{
 		if (++GameConfig.DMLDebug >= 3) GameConfig.DMLDebug = INHERIT;
 	}

source/settings/menus/LoaderSettings.cpp

@@ -115,13 +115,6 @@ static const char * GCMode[] =
 	trNOOP( "Devolution" ),
 };
 
-static const char * DMLVerText[] =
-{
-	trNOOP( "OFF" ),
-	trNOOP( "v1.2 -> v2.1" ),
-	trNOOP( "v2.2+" ),
-};
-
 static const char * DMLVideoText[] =
 {
 	trNOOP( "DML Auto" ),
@@ -174,7 +167,6 @@ LoaderSettings::LoaderSettings()
 	Options->SetName(Idx++, "%s", tr( "Debugger Paused Start" ));
 	Options->SetName(Idx++, "%s", tr( "Channel Launcher" ));
 	Options->SetName(Idx++, "%s", tr( "GameCube Mode" ));
-	Options->SetName(Idx++, "%s", tr( "DML Installed Version" ));
 	Options->SetName(Idx++, "%s", tr( "DML Video Mode" ));
 	Options->SetName(Idx++, "%s", tr( "DML Progressive Patch" ));
 	Options->SetName(Idx++, "%s", tr( "DML NMM Mode" ));
@@ -183,6 +175,7 @@ LoaderSettings::LoaderSettings()
 	Options->SetName(Idx++, "%s", tr( "DML No Disc" ));
 	Options->SetName(Idx++, "%s", tr( "DML No Disc+" ));
 	Options->SetName(Idx++, "%s", tr( "DML Force Widescreen" ));
+	Options->SetName(Idx++, "%s", tr( "DML Japanese Patch" ));
 	Options->SetName(Idx++, "%s", tr( "DML Debug" ));
 	Options->SetName(Idx++, "%s", tr( "DEVO MemCard Emulation" ));
 
@@ -275,9 +268,6 @@ void LoaderSettings::SetOptionValues()
 	//! Settings: GameCube Mode
 	Options->SetValue(Idx++, "%s", tr(GCMode[Settings.GameCubeMode]));
 
-	//! Settings: DML Config Version
-	Options->SetValue(Idx++, "%s", tr(DMLVerText[Settings.DMLConfigVersion]));
-
 	//! Settings: DML Video Mode
 	Options->SetValue(Idx++, "%s", tr(DMLVideoText[Settings.DMLVideo]));
 
@@ -302,6 +292,9 @@ void LoaderSettings::SetOptionValues()
 	//! Settings: DML Force Widescreen
 	Options->SetValue(Idx++, "%s", tr(OnOffText[Settings.DMLWidescreen]));
 
+	//! Settings: DML Japanese Patch
+	Options->SetValue(Idx++, "%s", tr(OnOffText[Settings.DMLJPNPatch]));
+
 	//! Settings: DML Debug
 	Options->SetValue(Idx++, "%s", tr(DMLDebug[Settings.DMLDebug]));
 
@@ -456,12 +449,6 @@ int LoaderSettings::GetMenuInternal()
 		if (++Settings.GameCubeMode >= CG_MODE_MAX_CHOICE) Settings.GameCubeMode = 0;
 	}
 
-	//! Settings: DML Config Version
-	else if (ret == ++Idx)
-	{
-		if (++Settings.DMLConfigVersion > DML_VERSION) Settings.DMLConfigVersion = 1;
-	}
-
 	//! Settings: DML Video Mode
 	else if (ret == ++Idx)
 	{
@@ -510,6 +497,12 @@ int LoaderSettings::GetMenuInternal()
 		if (++Settings.DMLWidescreen >= MAX_ON_OFF) Settings.DMLWidescreen = 0;
 	}
 
+	//! Settings: DML Japanese Patch
+	else if (ret == ++Idx)
+	{
+		if (++Settings.DMLJPNPatch >= MAX_ON_OFF) Settings.DMLJPNPatch = 0;
+	}
+
 	//! Settings: DML Debug
 	else if (ret == ++Idx)
 	{

source/system/IosLoader.cpp

@@ -29,6 +29,7 @@
 static int currentIOS = -1;
 static iosinfo_t *currentIOSInfo = NULL;
 static int currentMIOS = -1;
+static int currentDMLVersion = -1;
 
 /******************************************************************************
  * Public Methods:
@@ -214,6 +215,8 @@ u8 IosLoader::GetMIOSInfo()
 	u8 *appfile = NULL;
 	u32 filesize = 0;
 
+	// "title/00000001/00000101/content/0000000b.app" contains DM/DML version and built date, but is not always accurate.
+	// so we are looking inside 0000000c.app to find the correct version.
 	NandTitle::LoadFileFromNand("/title/00000001/00000101/content/0000000c.app", &appfile, &filesize);
 
 	if(appfile)
@@ -225,16 +228,22 @@ u8 IosLoader::GetMIOSInfo()
 				if((*(u32*)(appfile+i+10)) == 'Lite')
 				{
 					currentMIOS = DIOS_MIOS_LITE;
+					gprintf("DIOS MIOS Lite ");
+					currentDMLVersion = GetDMLVersion((char*)(appfile+i+31));
 				}
 				else
 				{
 					currentMIOS = DIOS_MIOS;
+					gprintf("DIOS MIOS ");
+					currentDMLVersion = GetDMLVersion((char*)(appfile+i+27));
 				}
 				break;
 			}
 			else if((*(u32*)(appfile+i)) == 'Quad' && (*(u32*)(appfile+i+4)) == 'Forc')
 			{
 				currentMIOS = QUADFORCE;
+				gprintf("QuadForce v0.1");
+				currentDMLVersion = DML_VERSION_QUAD_0_1;
 				break;
 			}
 		}
@@ -244,6 +253,76 @@ u8 IosLoader::GetMIOSInfo()
 	return currentMIOS;
 }
 
+
+u8 IosLoader::GetDMLVersion(char* releaseDate)
+{
+	if(currentDMLVersion > -1)
+		return currentDMLVersion;
+
+	currentDMLVersion = DML_VERSION_MIOS;
+
+	// Older versions - not working with USBloaderGX
+	if(strncmp(releaseDate, "t: ", 3) == 0)
+	{
+		currentMIOS = DEFAULT_MIOS;
+		return currentDMLVersion;
+	}
+
+	struct tm time;
+
+	// Timestamp of DML r52 (Mar 7 2012 19:36:06)
+	const time_t dml_r52_time = 1331148966;
+
+	// Timestamp of DML 1.2 (Apr 24 2012 19:44:08)
+	const time_t dml_1_2_time = 1335289448;
+
+	// Timestamp of DML 1.4b (May  7 2012 21:12:47)
+	const time_t dml_1_4b_time = 1336417967;
+
+	// Timestamp of DML 1.5 (Jun 14 2012 00:05:09)
+	const time_t dml_1_5_time = 1339625109;
+
+	// Timestamp of DM 2.0 (Jun 23 2012 19:43:21)
+	const time_t dm_2_0_time = 1340473401;
+
+	// Timestamp of DM 2.1 (Jul 17 2012 11:25:35)
+	const time_t dm_2_1_time = 1342517135;
+
+	// Timestamp of DM 2.2 initial release (Jul 18 2012 16:57:47)
+	const time_t dm_2_2_time = 1342623467;
+
+	// Timestamp of DM 2.2 update2 (Jul 20 2012 14:49:47)
+	const time_t dm_2_2_2_time = 1342788587;
+
+	// Timestamp of DML 2.2 initial release (Aug  6 2012 15:19:17)
+	const time_t dml_2_2_time = 1344259157;
+
+	// Timestamp of DML 2.2 update1 (Aug 13 2012 00:12:46)
+	const time_t dml_2_2_1_time = 1344809566;
+
+	// releaseDate format: Apr 24 2012 19:44:08
+	gprintf("built on %s\n", releaseDate);
+
+	strptime(releaseDate, "%b %d %Y %H:%M:%S", &time);
+	time_t unixTime = mktime(&time);
+
+	if(difftime(unixTime, dml_2_2_1_time) >= 0) 	currentDMLVersion = DML_VERSION_DML_2_2_1;
+	else if(difftime(unixTime, dml_2_2_time) >= 0) 	currentDMLVersion = DML_VERSION_DML_2_2;
+	else if(difftime(unixTime, dm_2_2_2_time) >= 0) currentDMLVersion = DML_VERSION_DM_2_2_2;
+	else if(difftime(unixTime, dm_2_2_time) >= 0) 	currentDMLVersion = DML_VERSION_DM_2_2;
+	else if(difftime(unixTime, dm_2_1_time) >= 0) 	currentDMLVersion = DML_VERSION_DM_2_1;
+	else if(difftime(unixTime, dm_2_0_time) >= 0) 	currentDMLVersion = DML_VERSION_DM_2_0;
+	else if(difftime(unixTime, dml_1_5_time) >= 0)	currentDMLVersion = DML_VERSION_DML_1_5;
+	else if(difftime(unixTime, dml_1_4b_time) >= 0)	currentDMLVersion = DML_VERSION_DML_1_4b;
+	else if(difftime(unixTime, dml_1_2_time) > 0)	currentDMLVersion = DML_VERSION_DML_1_4;
+	else if(difftime(unixTime, dml_1_2_time) == 0)	currentDMLVersion = DML_VERSION_DML_1_2;
+	else if (difftime(unixTime, dml_r52_time) >= 0) currentDMLVersion = DML_VERSION_R52;
+	else											currentDMLVersion = DML_VERSION_R51;
+
+	return currentDMLVersion;
+
+}
+
 /******************************************************************************
  * Private/Protected Methods:
  ******************************************************************************/

source/system/IosLoader.h

@@ -14,6 +14,38 @@ enum MiosInfo
 	QUADFORCE,
 };
 
+enum DMLVersions
+{
+	DML_VERSION_MIOS = 0,
+	DML_VERSION_R51,
+	DML_VERSION_R52,
+//	DML_VERSION_DML_1_0,
+//	DML_VERSION_DML_1_1,
+	DML_VERSION_QUAD_0_1, 	// Feb 15 2012 13:19:36 wrong built date.
+	DML_VERSION_DML_1_2,	// Apr 24 2012 19:44:08
+//	DML_VERSION_DML_1_3,	// Apr 26 2012 
+	DML_VERSION_DML_1_4,
+	DML_VERSION_DML_1_4b,	// May  7 2012 21:12:47
+//	DML_VERSION_QUAD_0_1	// Jun  9 2012 23:13:16	correct built date.
+	DML_VERSION_DML_1_5,	// Jun 14 2012 00:05:09
+	DML_VERSION_DM_2_0,		// Jun 23 2012 19:43:21
+//	DML_VERSION_DM_2_0_1,
+//	DML_VERSION_DM_2_0_2,
+//	DML_VERSION_DM_2_0_3,
+//	DML_VERSION_DM_2_0_3b,
+//	DML_VERSION_DM_2_0_3c,
+//	DML_VERSION_DM_2_0_3d,
+//	DML_VERSION_DM_2_0_4,
+//	DML_VERSION_DM_2_0_5,
+	DML_VERSION_DM_2_1,		// Jul 17 2012 11:25:35
+	DML_VERSION_DM_2_2,		// Jul 18 2012 16:57:47
+//	DML_VERSION_DM_2_2_1,
+	DML_VERSION_DM_2_2_2,	// Jul 20 2012 14:49:47
+	DML_VERSION_DML_2_2,	// Aug  6 2012 15:19:17
+	DML_VERSION_DML_2_2_1,	// Aug 13 2012 00:12:46
+	DML_VERSION_MAX_VERSION,
+};
+
 typedef struct _iosinfo_t
 {
 	u32 magicword;			  //0x1ee7c105
@@ -36,6 +68,7 @@ class IosLoader
 		static bool IsD2X(s32 ios = IOS_GetVersion());
 		static iosinfo_t *GetIOSInfo(s32 ios);
 		static u8 GetMIOSInfo();
+		static u8 GetDMLVersion(char* releaseDate = NULL);
 	private:
 		static void LoadIOSModules(s32 ios, s32 ios_rev);
 };

source/usbloader/GameBooter.cpp

@@ -55,457 +55,43 @@
 //appentrypoint has to be global because of asm
 u32 AppEntrypoint = 0;
 
-// Devolution config
-u8 *loader_bin = NULL;
-static DEVO_CGF *DEVO_CONFIG = (DEVO_CGF*)0x80000020;
-
-// DIOS MIOS Config
-#define HW_PPCSPEED				((vu32*)0xCD800018)
-
 extern "C"
 {
 	syssram* __SYS_LockSram();
 	u32 __SYS_UnlockSram(u32 write);
 	u32 __SYS_SyncSram(void);
+	extern void __exception_closeall();
 }
 
 int GameBooter::BootGCMode(struct discHdr *gameHdr)
 {
-	const char *RealPath = GCGames::Instance()->GetPath((const char *) gameHdr->id);
-
 	// check the settings
 	GameCFG * game_cfg = GameSettings.GetGameCFG(gameHdr->id);
-	u8 videoChoice = game_cfg->video == INHERIT ? Settings.videomode : game_cfg->video;
-	u8 languageChoice = game_cfg->language == INHERIT ? 6 : game_cfg->language;
-	u8 ocarinaChoice = game_cfg->ocarina == INHERIT ? Settings.ocarina : game_cfg->ocarina;
 	u8 GCMode = game_cfg->GameCubeMode == INHERIT ? Settings.GameCubeMode : game_cfg->GameCubeMode;
-	u32 dmlConfigVersionChoice = Settings.DMLConfigVersion;
-	u8 dmlVideoChoice = game_cfg->DMLVideo == INHERIT ? Settings.DMLVideo : game_cfg->DMLVideo;
-	u8 dmlProgressivePatch = game_cfg->DMLProgPatch == INHERIT ? Settings.DMLProgPatch : game_cfg->DMLProgPatch;
-	u8 dmlNMMChoice = game_cfg->DMLNMM == INHERIT ? Settings.DMLNMM : game_cfg->DMLNMM;
-	u8 dmlActivityLEDChoice = game_cfg->DMLActivityLED == INHERIT ? Settings.DMLActivityLED : game_cfg->DMLActivityLED;
-	u8 dmlPADHookChoice = game_cfg->DMLPADHOOK == INHERIT ? Settings.DMLPADHOOK : game_cfg->DMLPADHOOK;
-	u8 dmlNoDiscChoice = game_cfg->DMLNoDisc == INHERIT ? Settings.DMLNoDisc : game_cfg->DMLNoDisc;
-	u8 dmlNoDisc2Choice = game_cfg->DMLNoDisc2 == INHERIT ? Settings.DMLNoDisc2 : game_cfg->DMLNoDisc2;
-	u8 dmlWidescreenChoice = game_cfg->DMLWidescreen == INHERIT ? Settings.DMLWidescreen : game_cfg->DMLWidescreen;
-	u8 dmlDebugChoice = game_cfg->DMLDebug == INHERIT ? Settings.DMLDebug : game_cfg->DMLDebug;
-	u8 devoMCEmulation = game_cfg->DEVOMCEmulation == INHERIT ? Settings.DEVOMCEmulation : game_cfg->DEVOMCEmulation;
-	
 
+	// Devolution
 	if(GCMode == GC_MODE_DEVOLUTION)
-	{
+		return BootDevolution(gameHdr);
-	
-		if(gameHdr->type == TYPE_GAME_GC_DISC)
-		{
-			WindowPrompt(tr("Error:"), tr("To run GameCube games from Disc you need to set the GameCube mode to MIOS in the game settings."), tr("OK"));
-			return 0;
-		}
-		
-		
-		// Check if Devolution is available
-		char DEVO_loader_path[100];
-		snprintf(DEVO_loader_path, sizeof(DEVO_loader_path), "%sloader.bin", Settings.DEVOLoaderPath);
- 		FILE *f = fopen(DEVO_loader_path, "rb");
- 		if(f)
- 		{
- 			fseek(f, 0, SEEK_END);
- 			u32 size = ftell(f);
- 			rewind(f);
- 			loader_bin = (u8*)MEM2_alloc(size);
- 			fread(loader_bin, 1, size, f);
-			fclose(f);
- 		}
-		else
-		{
-			WindowPrompt(tr("Error:"), tr("To run GameCube games with Devolution you need the loader.bin file in your Devolution Path."), tr("OK"));
-			return 0;
-		}
-
-		// Get the Game's data
-		char game_partition[5];
-		snprintf(game_partition, sizeof(game_partition), DeviceHandler::GetDevicePrefix(RealPath));
-		
-		char disc1[100];
-		//char disc2[100];
-		char DEVO_memCard[100];
-		snprintf(disc1, sizeof(disc1), RealPath);
-		snprintf(DEVO_memCard, sizeof(DEVO_memCard), RealPath); // Set memory card folder to Disc1 folder
-		char *ptr = strrchr(DEVO_memCard, '/');
-		if(ptr) *ptr = 0; 
-
-		// Make sure the directory exists
-		char devoPath[20];
-		snprintf(devoPath, sizeof(devoPath), "%s:/apps/gc_devo", game_partition);
-		CreateSubfolder(devoPath);
-		
-		// Get the starting cluster (and device ID) for the ISO file 1
-		struct stat st1;
-		stat(disc1, &st1);
-		
-		// Get the starting cluster for the ISO file 2
-		//struct stat st2;
-		//stat(disc2, &st2);
-		
-		// setup Devolution
-		memset(DEVO_CONFIG, 0, sizeof(*DEVO_CONFIG));
-		DEVO_CONFIG->signature = DEVO_SIG;
-		DEVO_CONFIG->version = DEVO_CONFIG_VERSION;
-		DEVO_CONFIG->device_signature = st1.st_dev;
-		DEVO_CONFIG->disc1_cluster = st1.st_ino;			// set starting cluster for first disc ISO file
-		//DEVO_CONFIG->disc2_cluster = st2.st_ino;			// set starting cluster for second disc ISO file
-		
-		// use wifi logging if USB gecko is not found in slot B
-		// DEVO_CONFIG->options |= DEVO_WIFILOG;			// removed on Tueidj request
-		
-		// check memory card
-		if(devoMCEmulation == DEVO_MC_OFF)
-		{
-			DEVO_CONFIG->memcard_cluster = 0;
-			snprintf(DEVO_memCard, sizeof(DEVO_memCard), "Original");
-		}
-		else 
-		{
-			if(devoMCEmulation == DEVO_MC_INDIVIDUAL)
-			{
-				snprintf(DEVO_memCard, sizeof(DEVO_memCard), "%s/memcard_%s.bin", DEVO_memCard, (const char *) gameHdr->id);
-			}
-			else // same for all games
-			{
-				snprintf(DEVO_memCard, sizeof(DEVO_memCard), "%s:/apps/gc_devo/memcard.bin", game_partition);
-			}
-			
-			// check if file doesn't exist or is less than 512KB (59 Blocks)
-			struct stat st;
-			if (stat(DEVO_memCard, &st) == -1 || st.st_size < 1<<19)
-			{
-				// need to enlarge or create it
-				FILE *f = fopen(DEVO_memCard, "wb");
-				if(f)
-				{
-					// make it 16MB
-					ShowProgress(tr("Please wait..."), 0, 0);
-					gprintf("Resizing memcard file...\n");
-					fseek(f, (16 << 20) - 1, SEEK_SET);
-					fputc(0, f);
-					fclose(f);
-					if (stat(DEVO_memCard, &st)==-1 || st.st_size < 1<<19)
-					{
-						// it still isn't big enough. Give up.
-						st.st_ino = 0;
-					}
-					ProgressStop();
-				}
-				else
-				{
-					// couldn't open or create the memory card file
-					st.st_ino = 0;
-				}
-			}
-			DEVO_CONFIG->memcard_cluster = st.st_ino;
-		}
-
-		// setup video mode
-		Disc_SelectVMode(videoChoice, false);
-		Disc_SetVMode();
-
-		
-		// read 32 bytes of disc 1 to the start of MEM1
-		FILE *iso_file = fopen(disc1, "rb");
-		u8 *lowmem = (u8*)0x80000000;
-		fread(lowmem, 1, 32, iso_file);
-		fclose(iso_file);
-
-
-		// flush disc ID and Devolution config out to memory
-		DCFlushRange(lowmem, 64);
-		puts((const char*)loader_bin + 4);
-
-		gprintf("DEVO: Loading game: %s\n", disc1);
-		gprintf("DEVO: Memory Card: %s\n", DEVO_memCard);
-		ExitApp();
-		LAUNCH_DEVO();
-	}
 	
+	// DIOS MIOS (Lite) and QuadForce
 	int currentMIOS = IosLoader::GetMIOSInfo();
-	// DIOS MIOS
+	if(currentMIOS == DIOS_MIOS || currentMIOS == DIOS_MIOS_LITE || currentMIOS == QUADFORCE)
-	if(currentMIOS == DIOS_MIOS)
+		return BootDIOSMIOS(gameHdr);
-	{
-		// Check Main GameCube Path location
-		if(strncmp(Settings.GameCubePath, "sd", 2) == 0 || strncmp(DeviceHandler::PathToFSName(Settings.GameCubePath), "FAT", 3) != 0)
-		{
-			WindowPrompt(tr("Error:"), tr("To run GameCube games with DIOS MIOS you need to set your 'Main GameCube Path' to an USB FAT32 partition."), tr("OK"));
-			return 0;
-		}
 	
-		// Check current game location
+	// MIOS or Wiigator cMIOS
-		if(strncmp(RealPath, "sd", 2) == 0)
+	if(gameHdr->type == TYPE_GAME_GC_DISC)
-		{
-			WindowPrompt(tr("The game is on SD Card."), tr("To run GameCube games with DIOS MIOS you need to place them on an USB FAT32 partition."), tr("OK"));
-			// Todo: Add here copySD2USB.
-			return 0;
-		}
-
-		// Check current GCT location
-		if((ocarinaChoice) && strncmp(Settings.GameCubePath, Settings.Cheatcodespath, 4) != 0) // Checking "USBx"
-		{
-			int choice = WindowPrompt(tr("Warning:"), tr("The GCT Cheatcodes Path and this game are not on the same partition. Run the game without Ocarina?"), tr("OK"), tr("Cancel"));
-			if(choice == 0)
-				return false;
-		}
-	}
-
-	// DIOS MIOS Lite
-	else if(currentMIOS == DIOS_MIOS_LITE || currentMIOS == QUADFORCE)
-	{
-		if(((gameHdr->type == TYPE_GAME_GC_IMG) || (gameHdr->type == TYPE_GAME_GC_EXTRACTED)) && strncmp(RealPath, "usb", 3) == 0)
-		{
-			if(!GCGames::Instance()->CopyUSB2SD(gameHdr))
-				return 0;
-
-			RealPath = GCGames::Instance()->GetPath((const char *) gameHdr->id);
-		}
-		
-		// Check current GCT location
-		if((ocarinaChoice) && strncmp(Settings.Cheatcodespath, "SD", 2) != 0)
-		{
-			int choice = WindowPrompt(tr("Warning:"), tr("The GCT Cheatcodes Path must be on SD card. Run the game without Ocarina?"), tr("OK"), tr("Cancel"));
-			if(choice == 0)
-				return false;
-		}
-	}
-
-	// MIOS
-	else if(gameHdr->type == TYPE_GAME_GC_DISC) // Launch disc based games from real MIOS
 	{
 		ExitApp();
 		gprintf("\nLoading BC for GameCube");
 		WII_Initialize();
 		return WII_LaunchTitle(0x0000000100000100ULL);
 	}
-	else
+
-	{
+	WindowPrompt(tr("Error:"), tr("You need to install Devolution or DIOS MIOS (Lite) to launch GameCube games from USB or SD card"), tr("OK"));
-		WindowPrompt(tr("Error:"), tr("You need to install DIOS MIOS to run GameCube games from USB or DIOS MIOS Lite to run them from SD card"), tr("OK"));
+
 	return 0;
 }
 
-	// Check DIOS MIOS config for specific versions
-	if(dmlWidescreenChoice && dmlConfigVersionChoice < 2) // DML Force Widescreen setting : added in DM v2.1+, config v1 but meant to be v2.
-	{
-		WindowPrompt(tr("Warning:"), tr("The Force Widescreen setting requires DIOS MIOS v2.2 or more. This setting will be ignored."), tr("OK"));
-		dmlWidescreenChoice = OFF;
-	}
-	if(dmlNoDiscChoice) // DML NoDisc setting : removed in DM 1.0, config v1. Used as ForceWidescreen in DM v2.1 with cfg v1. Added back in DM 2.2 update2 Config v2
-	{
-		WindowPrompt(tr("Warning:"), tr("The No Disc setting is not used anymore by DIOS MIOS (Lite). Now you need to place a disc in your drive."), tr("OK"));
-	}
-
-	const char *gcPath = strchr(RealPath, '/');
-	if(!gcPath) gcPath = "";
-
-	char gamePath[255];
-	snprintf(gamePath, sizeof(gamePath), "%s", gcPath);
-
-	ExitApp();
-	gprintf("\nLoading BC for GameCube\n");
-
-	// Game ID
-	memcpy((u8 *)Disc_ID, gameHdr->id, 6);
-	DCFlushRange((u8 *)Disc_ID, 6);
-
-	*(vu32*)0xCC003024 |= 7; // DML 1.1- only?
-
-	Disc_SelectVMode(videoChoice, dmlProgressivePatch);
-	Disc_SetVMode();
-
-	DML_CFG *dml_config = (DML_CFG *) DML_CONFIG_ADDRESS;
-	memset(dml_config, 0, sizeof(DML_CFG));
-
-	// Magic and version for DML
-	dml_config->Magicbytes = DML_MAGIC;
-	dml_config->Version = dmlConfigVersionChoice; // Use the version set by the user.
-
-	// Select disc source
-	if((gameHdr->type == TYPE_GAME_GC_IMG) || (gameHdr->type == TYPE_GAME_GC_EXTRACTED))
-	{
-		dml_config->Config |= DML_CFG_GAME_PATH;
-		strncpy(dml_config->GamePath, gamePath, sizeof(dml_config->GamePath));
-		// NoDisc patch
-		if(dmlNoDiscChoice && dmlConfigVersionChoice < 2)
-			dml_config->Config |= DML_CFG_NODISC;	// used by v2.1 as ForceWidescreen setting
-		// Extended NoDisc patch
-		if(dmlNoDisc2Choice && dmlConfigVersionChoice > 1)
-			dml_config->Config |= DML_CFG_NODISC2;	// used by v2.2 update2+ as an Extended NoDisc patching
-
-		gprintf("DML: Loading game %s\n", dml_config->GamePath);
-	}
-	else
-	{
-		dml_config->Config |= DML_CFG_BOOT_DISC;
-	}
-
-	// setup cheat and path
-	if(ocarinaChoice)
-	{
-		dml_config->Config |= DML_CFG_CHEATS | DML_CFG_CHEAT_PATH;
-		const char *CheatPath = strchr(Settings.Cheatcodespath, '/');
-		if(!CheatPath) CheatPath = "";
-		snprintf(dml_config->CheatPath, sizeof(dml_config->CheatPath), "%s%.6s.gct", CheatPath, (char *)gameHdr->id);
-
-		gprintf("DML: Loading cheat %s\n", dml_config->CheatPath);
-	}
-
-	// other DMl configs
-	if(dmlPADHookChoice)
-		dml_config->Config |= DML_CFG_PADHOOK;
-	if(dmlActivityLEDChoice)
-		dml_config->Config |= DML_CFG_ACTIVITY_LED;
-	if(dmlNMMChoice)
-		dml_config->Config |= dmlNMMChoice == ON ? DML_CFG_NMM : DML_CFG_NMM_DEBUG;
-	if(dmlDebugChoice)
-		dml_config->Config |= dmlDebugChoice == ON ? DML_CFG_DEBUGGER : DML_CFG_DEBUGWAIT;
-	if(dmlWidescreenChoice)
-		dml_config->Config |= DML_CFG_FORCE_WIDE;
-
-	// internal DML video mode methods
-	bool PAL60 = CONF_GetEuRGB60() > 0;
-	u32 tvmode = CONF_GetVideo();
-	u8 *diskid = (u8 *) Disc_ID;
-	
-	if(dmlVideoChoice == DML_VIDEO_AUTO)			// Auto select video mode
-		dml_config->VideoMode = DML_VID_DML_AUTO;
-	else if(dmlVideoChoice == DML_VIDEO_FORCE)		// Force user choice
-		dml_config->VideoMode = DML_VID_FORCE;
-	else if(dmlVideoChoice == DML_VIDEO_NONE)		// No video mode change
-		dml_config->VideoMode = DML_VID_NONE;
-	
-	if(dmlVideoChoice == DML_VIDEO_FORCE)
-	{
-		switch(videoChoice)
-		{
-			case VIDEO_MODE_SYSDEFAULT:
-				if(tvmode == CONF_VIDEO_NTSC)
-					dml_config->VideoMode |= DML_VID_FORCE_NTSC;
-				else
-				{
-					if(CONF_GetProgressiveScan() > 0)
-					{
-						dml_config->VideoMode |= DML_VID_FORCE_PROG;
-					}
-					else if(PAL60)
-						dml_config->VideoMode |= DML_VID_FORCE_PAL60;
-					else
-						dml_config->VideoMode |= DML_VID_FORCE_PAL50;
-				}
-				break;
-			case VIDEO_MODE_DISCDEFAULT: // DEFAULT (DISC/GAME)
-				switch (diskid[3])
-				{
-					// PAL
-					case 'D':
-					case 'F':
-					case 'P':
-					case 'X':
-					case 'Y':
-						if(tvmode != CONF_VIDEO_PAL) // Force PAL output (576i) for NTSC consoles.
-							dml_config->VideoMode |= DML_VID_FORCE_PAL50;
-						else
-						{
-							if(CONF_GetProgressiveScan() > 0)
-							{
-								dml_config->VideoMode |= DML_VID_FORCE_PROG;
-							}
-							else if(PAL60)
-								dml_config->VideoMode |= DML_VID_FORCE_PAL60;
-							else
-								dml_config->VideoMode |= DML_VID_FORCE_PAL50;
-						}
-						break;
-					// NTSC
-					case 'E':
-					case 'J':
-						dml_config->VideoMode |= DML_VID_FORCE_NTSC;
-						break;
-					default:
-						dml_config->VideoMode = DML_VID_DML_AUTO;
-						break;
-				}
-				break;
-			case VIDEO_MODE_PAL50:
-				dml_config->VideoMode |= DML_VID_FORCE_PAL50;
-				break;
-			case VIDEO_MODE_PAL60:
-				dml_config->VideoMode |= DML_VID_FORCE_PAL60;
-				break;
-			case VIDEO_MODE_NTSC:
-				dml_config->VideoMode |= DML_VID_FORCE_NTSC;
-				break;
-			case VIDEO_MODE_PAL480P:
-				dml_config->VideoMode |= DML_VID_FORCE_PAL60;
-			case VIDEO_MODE_NTSC480P:
-				dml_config->VideoMode |= DML_VID_FORCE_PROG;
-				break;
-			default:
-				dml_config->VideoMode = DML_VID_DML_AUTO;
-				break;
-		}
-	}	
-	if(dmlProgressivePatch)
-		dml_config->VideoMode |= DML_VID_PROG_PATCH;
-
-
-	DCFlushRange(dml_config, sizeof(DML_CFG));
-	memcpy((u8*)DML_CONFIG_ADDRESS_V1_2, dml_config, sizeof(DML_CFG));
-	DCFlushRange((u8*)DML_CONFIG_ADDRESS_V1_2, sizeof(DML_CFG));
-
-	// print the config set for DML
-	gprintf("DML: setup configuration 0x%X\n", dml_config->Config);
-	gprintf("DML: setup video mode 0x%X\n", dml_config->VideoMode);
-
-	syssram *sram = __SYS_LockSram();
-	if(dmlProgressivePatch) {
-		sram->flags |= 0x80; //set progressive flag
-	}
-	else {
-		sram->flags &= 0x7F; //clear progressive flag
-	}
-	// setup video mode flags
-	if (*Video_Mode == VI_NTSC) {
-		sram->flags &= ~1;	// Clear bit 0 to set the video mode to NTSC
-		sram->ntd &= 0xBF; //clear pal60 flag
-	}
-	else {
-		sram->flags |= 1;	// Set bit 0 to set the video mode to PAL
-		sram->ntd |= 0x40; //set pal60 flag
-	}
-	
-	// Set language flag
-	if(languageChoice <= GC_DUTCH)
-	{
-		sram->lang = languageChoice;
-	}	
-	else // console default
-	{
-		sram->lang = GC_ENGLISH;
-		if(CONF_GetLanguage() >= CONF_LANG_ENGLISH && CONF_GetLanguage() <= CONF_LANG_DUTCH)
-		{
-			sram->lang = CONF_GetLanguage()-1;
-		}
-	}
-	gprintf("DML: setup language 0x%X\n", sram->lang);
-
-	__SYS_UnlockSram(1); // 1 -> write changes
-
-	while(!__SYS_SyncSram())
-		usleep(100);
-	
-	/* NTSC-J Patch */
-	if(diskid[3] == 'J')
-		*HW_PPCSPEED = 0x0002A9E0;
-
-	WII_Initialize();
-	return WII_LaunchTitle(0x0000000100000100ULL);
-}
-
 
 u32 GameBooter::BootPartition(char * dolpath, u8 videoselected, u8 alternatedol, u32 alternatedoloffset)
 {
@@ -528,7 +114,7 @@ u32 GameBooter::BootPartition(char * dolpath, u8 videoselected, u8 alternatedol,
 	Disc_SetLowMem();
 
 	/* Setup video mode */
-	Disc_SelectVMode(videoselected, true);
+	Disc_SelectVMode(videoselected, false, NULL);
 
 	/* Run apploader */
 	ret = Apploader_Run(&p_entry, dolpath, alternatedol, alternatedoloffset);
@@ -788,7 +374,7 @@ int GameBooter::BootGame(struct discHdr *gameHdr)
 		ShutDownDevices(DeviceHandler::PartitionToUSBPort(std::max(atoi(NandEmuPath+3)-1, 0)));
 		gprintf("\tChannel Boot\n");
 		/* Setup video mode */
-		Disc_SelectVMode(videoChoice, true);
+		Disc_SelectVMode(videoChoice, false, NULL);
 		// Load dol
 		AppEntrypoint = Channels::LoadChannel(gameHeader.tid);
 	}
@@ -812,3 +398,402 @@ int GameBooter::BootGame(struct discHdr *gameHdr)
 	gprintf("Jumping to game entrypoint: 0x%08X.\n", AppEntrypoint);
 	return Disc_JumpToEntrypoint(Hooktype, WDMMenu::GetDolParameter());
 }
+
+int GameBooter::BootDIOSMIOS(struct discHdr *gameHdr)
+{
+	const char *RealPath = GCGames::Instance()->GetPath((const char *) gameHdr->id);
+
+	GameCFG * game_cfg = GameSettings.GetGameCFG(gameHdr->id);
+	u8 videoChoice = game_cfg->video == INHERIT ? Settings.videomode : game_cfg->video;
+	u8 languageChoice = game_cfg->language == INHERIT ? 6 : game_cfg->language;
+	u8 ocarinaChoice = game_cfg->ocarina == INHERIT ? Settings.ocarina : game_cfg->ocarina;
+	u8 dmlVideoChoice = game_cfg->DMLVideo == INHERIT ? Settings.DMLVideo : game_cfg->DMLVideo;
+	u8 dmlProgressivePatch = game_cfg->DMLProgPatch == INHERIT ? Settings.DMLProgPatch : game_cfg->DMLProgPatch;
+	u8 dmlNMMChoice = game_cfg->DMLNMM == INHERIT ? Settings.DMLNMM : game_cfg->DMLNMM;
+	u8 dmlActivityLEDChoice = game_cfg->DMLActivityLED == INHERIT ? Settings.DMLActivityLED : game_cfg->DMLActivityLED;
+	u8 dmlPADHookChoice = game_cfg->DMLPADHOOK == INHERIT ? Settings.DMLPADHOOK : game_cfg->DMLPADHOOK;
+	u8 dmlNoDiscChoice = game_cfg->DMLNoDisc == INHERIT ? Settings.DMLNoDisc : game_cfg->DMLNoDisc;
+	u8 dmlNoDisc2Choice = game_cfg->DMLNoDisc2 == INHERIT ? Settings.DMLNoDisc2 : game_cfg->DMLNoDisc2;
+	u8 dmlWidescreenChoice = game_cfg->DMLWidescreen == INHERIT ? Settings.DMLWidescreen : game_cfg->DMLWidescreen;
+	u8 dmlJPNPatchChoice = game_cfg->DMLJPNPatch == INHERIT ? Settings.DMLJPNPatch : game_cfg->DMLJPNPatch;
+	u8 dmlDebugChoice = game_cfg->DMLDebug == INHERIT ? Settings.DMLDebug : game_cfg->DMLDebug;
+	
+	int currentMIOS = IosLoader::GetMIOSInfo();
+	// DIOS MIOS
+	if(currentMIOS == DIOS_MIOS)
+	{
+		// Check Main GameCube Path location
+		if(strncmp(Settings.GameCubePath, "sd", 2) == 0 || strncmp(DeviceHandler::PathToFSName(Settings.GameCubePath), "FAT", 3) != 0)
+		{
+			WindowPrompt(tr("Error:"), tr("To run GameCube games with DIOS MIOS you need to set your 'Main GameCube Path' to an USB FAT32 partition."), tr("OK"));
+			return 0;
+		}
+
+		// Check current game location
+		if(strncmp(RealPath, "sd", 2) == 0)
+		{
+			WindowPrompt(tr("The game is on SD Card."), tr("To run GameCube games with DIOS MIOS you need to place them on an USB FAT32 partition."), tr("OK"));
+			// Todo: Add here copySD2USB.
+			return 0;
+		}
+
+		// Check current GCT location
+		if((ocarinaChoice) && strncmp(Settings.GameCubePath, Settings.Cheatcodespath, 4) != 0) // Checking "USBx"
+		{
+			int choice = WindowPrompt(tr("Warning:"), tr("The GCT Cheatcodes Path and this game are not on the same partition. Run the game without Ocarina?"), tr("OK"), tr("Cancel"));
+			if(choice == 0)
+				return 0;
+			ocarinaChoice = false;
+		}
+	}
+
+	// DIOS MIOS Lite
+	else if(currentMIOS == DIOS_MIOS_LITE || currentMIOS == QUADFORCE)
+	{
+		if(((gameHdr->type == TYPE_GAME_GC_IMG) || (gameHdr->type == TYPE_GAME_GC_EXTRACTED)) && strncmp(RealPath, "usb", 3) == 0)
+		{
+			if(!GCGames::Instance()->CopyUSB2SD(gameHdr))
+				return 0;
+
+			RealPath = GCGames::Instance()->GetPath((const char *) gameHdr->id);
+		}
+		
+		// Check current GCT location
+		if((ocarinaChoice) && strncmp(Settings.Cheatcodespath, "SD", 2) != 0)
+		{
+			int choice = WindowPrompt(tr("Warning:"), tr("The GCT Cheatcodes Path must be on SD card. Run the game without Ocarina?"), tr("OK"), tr("Cancel"));
+			if(choice == 0)
+				return 0;
+			ocarinaChoice = false;
+		}
+	}
+
+
+	// Check DIOS MIOS config for specific versions
+	if(currentMIOS != QUADFORCE)
+	{
+		if(IosLoader::GetDMLVersion() < DML_VERSION_DML_1_2)
+		{
+			WindowPrompt(tr("Error:"), tr("You need to install DIOS MIOS Lite v1.2 or a newer version."), tr("OK"));
+			return 0;
+		}
+		if(dmlWidescreenChoice && IosLoader::GetDMLVersion() < DML_VERSION_DM_2_1) // DML Force Widescreen setting : added in DM v2.1+, config v1.
+		{
+			WindowPrompt(tr("Warning:"), tr("The Force Widescreen setting requires DIOS MIOS v2.1 or more. This setting will be ignored."), tr("OK"));
+			dmlWidescreenChoice = OFF;
+		}
+		if(dmlNoDiscChoice) // DML NoDisc setting : removed in DM 1.0, config v1. Used as ForceWidescreen in DM v2.1 with cfg v1. Added back in DM 2.2 update2 Config v2
+		{
+			WindowPrompt(tr("Warning:"), tr("The No Disc setting is not used anymore by DIOS MIOS (Lite). Now you need to place a disc in your drive."), tr("OK"));
+		}
+		if(dmlNoDisc2Choice && IosLoader::GetDMLVersion() < DML_VERSION_DM_2_2_2) // DML NoDisc+ setting : Added in DM 2.2 upate 2, config v2.
+		{
+			WindowPrompt(tr("Warning:"), tr("The No Disc+ setting requires DIOS MIOS 2.2 update2 or a newer version. This setting will be ignored."), tr("OK"));
+		}
+	}
+	
+	const char *gcPath = strchr(RealPath, '/');
+	if(!gcPath) gcPath = "";
+
+	char gamePath[255];
+	snprintf(gamePath, sizeof(gamePath), "%s", gcPath);
+
+	ExitApp();
+	gprintf("\nLoading BC for GameCube\n");
+
+	// Game ID
+	memcpy((u8 *)Disc_ID, gameHdr->id, 6);
+	DCFlushRange((u8 *)Disc_ID, 6);
+
+	*(vu32*)0xCC003024 |= 7; // DML 1.1- only?
+
+	DML_CFG *dml_config = (DML_CFG *) DML_CONFIG_ADDRESS;
+	memset(dml_config, 0, sizeof(DML_CFG));
+
+	// Magic and version for DML
+	dml_config->Magicbytes = DML_MAGIC;
+	dml_config->Version = IosLoader::GetDMLVersion() >= DML_VERSION_DM_2_2 ? 0x00000002 : 0x00000001;
+
+	// Select disc source
+	if((gameHdr->type == TYPE_GAME_GC_IMG) || (gameHdr->type == TYPE_GAME_GC_EXTRACTED))
+	{
+		dml_config->Config |= DML_CFG_GAME_PATH;
+		strncpy(dml_config->GamePath, gamePath, sizeof(dml_config->GamePath));
+		// Extended NoDisc patch
+		if(dmlNoDisc2Choice && IosLoader::GetDMLVersion() >= DML_VERSION_DM_2_2_2)
+			dml_config->Config |= DML_CFG_NODISC2;	// used by v2.2 update2+ as an Extended NoDisc patching
+
+		gprintf("DML: Loading game %s\n", dml_config->GamePath);
+	}
+	else
+	{
+		dml_config->Config |= DML_CFG_BOOT_DISC;
+	}
+
+	// setup cheat and path
+	if(ocarinaChoice)
+	{
+		dml_config->Config |= DML_CFG_CHEATS | DML_CFG_CHEAT_PATH;
+		const char *CheatPath = strchr(Settings.Cheatcodespath, '/');
+		if(!CheatPath) CheatPath = "";
+		snprintf(dml_config->CheatPath, sizeof(dml_config->CheatPath), "%s%.6s.gct", CheatPath, (char *)gameHdr->id);
+
+		gprintf("DML: Loading cheat %s\n", dml_config->CheatPath);
+	}
+
+	// other DMl configs
+	if(dmlPADHookChoice)
+		dml_config->Config |= DML_CFG_PADHOOK;
+	if(dmlActivityLEDChoice)
+		dml_config->Config |= DML_CFG_ACTIVITY_LED;
+	if(dmlNMMChoice)
+		dml_config->Config |= dmlNMMChoice == ON ? DML_CFG_NMM : DML_CFG_NMM_DEBUG;
+	if(dmlDebugChoice)
+		dml_config->Config |= dmlDebugChoice == ON ? DML_CFG_DEBUGGER : DML_CFG_DEBUGWAIT;
+	if(dmlWidescreenChoice)
+		dml_config->Config |= DML_CFG_FORCE_WIDE;
+
+
+	// Setup Video Mode
+	if(dmlVideoChoice == DML_VIDEO_NONE)				// No video mode
+	{
+		dml_config->VideoMode = DML_VID_NONE;
+	}
+	else
+	{
+		if(dmlVideoChoice == DML_VIDEO_AUTO)			// Auto select video mode
+		{
+			dml_config->VideoMode = DML_VID_DML_AUTO;
+			Disc_SelectVMode(VIDEO_MODE_DISCDEFAULT, false, NULL);
+		}
+		else											// Force user choice
+		{
+			dml_config->VideoMode = DML_VID_FORCE;
+			Disc_SelectVMode(videoChoice, false, &dml_config->VideoMode);
+		}	
+		Disc_SetVMode();
+	}
+	
+	if(dmlProgressivePatch)
+		dml_config->VideoMode |= DML_VID_PROG_PATCH;
+
+
+	DCFlushRange(dml_config, sizeof(DML_CFG));
+	memcpy((u8*)DML_CONFIG_ADDRESS_V1_2, dml_config, sizeof(DML_CFG));
+	DCFlushRange((u8*)DML_CONFIG_ADDRESS_V1_2, sizeof(DML_CFG));
+
+	// print the config set for DML
+	gprintf("DML: setup configuration 0x%X\n", dml_config->Config);
+	gprintf("DML: setup video mode 0x%X\n", dml_config->VideoMode);
+
+	syssram *sram = __SYS_LockSram();
+	if(dml_config->VideoMode & DML_VID_FORCE_PROG || dml_config->VideoMode & DML_VID_PROG_PATCH) {
+		sram->flags |= 0x80; //set progressive flag
+	}
+	else {
+		sram->flags &= 0x7F; //clear progressive flag
+	}
+	// setup video mode flags
+	if (*Video_Mode == VI_NTSC) {
+		sram->flags &= ~1;	// Clear bit 0 to set the video mode to NTSC
+		sram->ntd &= 0xBF; //clear pal60 flag
+	}
+	else {
+		sram->flags |= 1;	// Set bit 0 to set the video mode to PAL
+		sram->ntd |= 0x40; //set pal60 flag
+	}
+	
+	// Set language flag
+	if(languageChoice <= GC_DUTCH)
+	{
+		sram->lang = languageChoice;
+	}	
+	else // console default
+	{
+		sram->lang = GC_ENGLISH;
+		if(CONF_GetLanguage() >= CONF_LANG_ENGLISH && CONF_GetLanguage() <= CONF_LANG_DUTCH)
+		{
+			sram->lang = CONF_GetLanguage()-1;
+		}
+	}
+	gprintf("DML: setup language 0x%X\n", sram->lang);
+
+	__SYS_UnlockSram(1); // 1 -> write changes
+
+	while(!__SYS_SyncSram())
+		usleep(100);
+	
+	/* NTSC-J Patch */	// Thanks to Fix94
+	u8 *diskid = (u8 *) Disc_ID;
+	if(dmlJPNPatchChoice && diskid[3] == 'J')
+		*HW_PPCSPEED = 0x0002A9E0;
+
+	WII_Initialize();
+	return WII_LaunchTitle(0x0000000100000100ULL);
+}
+
+int GameBooter::BootDevolution(struct discHdr *gameHdr)
+{
+
+	// check the settings
+	GameCFG * game_cfg = GameSettings.GetGameCFG(gameHdr->id);
+	u8 videoChoice = game_cfg->video == INHERIT ? Settings.videomode : game_cfg->video;
+	u8 devoMCEmulation = game_cfg->DEVOMCEmulation == INHERIT ? Settings.DEVOMCEmulation : game_cfg->DEVOMCEmulation;
+	
+
+	if(gameHdr->type == TYPE_GAME_GC_DISC)
+	{
+		WindowPrompt(tr("Error:"), tr("To run GameCube games from Disc you need to set the GameCube mode to MIOS in the game settings."), tr("OK"));
+		return 0;
+	}
+	
+	// Check if Devolution is available
+	u8 *loader_bin = NULL;
+	char DEVO_loader_path[100];
+	snprintf(DEVO_loader_path, sizeof(DEVO_loader_path), "%sloader.bin", Settings.DEVOLoaderPath);
+	FILE *f = fopen(DEVO_loader_path, "rb");
+	if(f)
+	{
+		fseek(f, 0, SEEK_END);
+		u32 size = ftell(f);
+		rewind(f);
+		loader_bin = (u8*)MEM2_alloc(size);
+		if(!loader_bin) 
+		{
+			fclose(f);
+			WindowPrompt(tr("Error:"), tr("Devolution's loader.bin file can't be loaded."), tr("OK"));
+			return 0;
+		}
+		fread(loader_bin, 1, size, f);
+		fclose(f);
+	}
+	else
+	{
+		WindowPrompt(tr("Error:"), tr("To run GameCube games with Devolution you need the loader.bin file in your Devolution Path."), tr("OK"));
+		return 0;
+	}
+
+
+	// Devolution config
+	DEVO_CGF *DEVO_CONFIG = (DEVO_CGF*)0x80000020;
+
+
+	// Get the Game's data
+	const char *RealPath = GCGames::Instance()->GetPath((const char *) gameHdr->id);
+	
+	char disc1[100];
+	//char disc2[100];
+	char DEVO_memCard[100];
+	snprintf(disc1, sizeof(disc1), "%s", RealPath);
+	snprintf(DEVO_memCard, sizeof(DEVO_memCard), "%s", RealPath); // Set memory card folder to Disc1 folder
+	char *ptr = strrchr(DEVO_memCard, '/');
+	if(ptr) *ptr = 0; 
+
+	// Make sure the directory exists
+	char devoPath[20];
+	snprintf(devoPath, sizeof(devoPath), "%s:/apps/gc_devo", DeviceHandler::GetDevicePrefix(RealPath));
+	CreateSubfolder(devoPath);
+	
+	// Get the starting cluster (and device ID) for the ISO file 1
+	struct stat st1;
+	stat(disc1, &st1);
+	
+	// Get the starting cluster for the ISO file 2
+	//struct stat st2;
+	//stat(disc2, &st2);
+	
+	// setup Devolution
+	memset(DEVO_CONFIG, 0, sizeof(*DEVO_CONFIG));
+	DEVO_CONFIG->signature = DEVO_SIG;
+	DEVO_CONFIG->version = DEVO_CONFIG_VERSION;
+	// st1.st_dev doesn't work with our current device type. It returns Wii_UMS 'WUMS' instead of Wii_USB 'WUSB'.
+	// Only last two letters are returned by DevkitPro, so we set them manually to Devolution config.
+	DEVO_CONFIG->device_signature = st1.st_dev == 'SD' ? 'SD' : 'SB'; // Set device type.
+	DEVO_CONFIG->disc1_cluster = st1.st_ino;			// set starting cluster for first disc ISO file
+	//DEVO_CONFIG->disc2_cluster = st2.st_ino;			// set starting cluster for second disc ISO file
+	
+	// use wifi logging if USB gecko is not found in slot B
+	// DEVO_CONFIG->options |= DEVO_WIFILOG;			// removed on Tueidj request
+	
+	// check memory card
+	if(devoMCEmulation == DEVO_MC_OFF)
+	{
+		DEVO_CONFIG->memcard_cluster = 0;
+		snprintf(DEVO_memCard, sizeof(DEVO_memCard), "Original");
+	}
+	else 
+	{
+		if(devoMCEmulation == DEVO_MC_INDIVIDUAL)
+		{
+			snprintf(DEVO_memCard, sizeof(DEVO_memCard), "%s/memcard_%.6s.bin", DEVO_memCard, (const char *) gameHdr->id);
+		}
+		else // same for all games
+		{
+			snprintf(DEVO_memCard, sizeof(DEVO_memCard), "%s:/apps/gc_devo/memcard.bin", DeviceHandler::GetDevicePrefix(RealPath));
+		}
+		
+		// check if file doesn't exist or is less than 512KB (59 Blocks)
+		struct stat st;
+		if (stat(DEVO_memCard, &st) == -1 || st.st_size < 1<<19)
+		{
+			// need to enlarge or create it
+			FILE *f = fopen(DEVO_memCard, "wb");
+			if(f)
+			{
+				// make it 16MB
+				ShowProgress(tr("Please wait..."), 0, 0);
+				gprintf("Resizing memcard file...\n");
+				fseek(f, (16 << 20) - 1, SEEK_SET);
+				fputc(0, f);
+				fclose(f);
+				if (stat(DEVO_memCard, &st)==-1 || st.st_size < 1<<19)
+				{
+					// it still isn't big enough. Give up.
+					st.st_ino = 0;
+				}
+				ProgressStop();
+			}
+			else
+			{
+				// couldn't open or create the memory card file
+				st.st_ino = 0;
+			}
+		}
+		DEVO_CONFIG->memcard_cluster = st.st_ino;
+	}
+
+
+	// read 32 bytes of disc 1 to the start of MEM1
+	FILE *iso_file = fopen(disc1, "rb");
+	if(!iso_file) 
+	{
+		WindowPrompt(tr("Error:"), tr("File not found."), tr("OK"));
+		return 0;
+	}
+	u8 *lowmem = (u8*)0x80000000;
+	fread(lowmem, 1, 32, iso_file);
+	fclose(iso_file);
+	
+	// setup video mode
+	Disc_SelectVMode(videoChoice, true, NULL);
+	Disc_SetVMode();
+
+
+	// flush disc ID and Devolution config out to memory
+	DCFlushRange(lowmem, 64);
+	
+	ExitApp();
+	IosLoader::ReloadIosKeepingRights(58); // reload IOS 58 with AHBPROT rights
+	
+	gprintf("DEVO: Loading game: %s\n", disc1);
+	gprintf("DEVO: Memory Card: %s\n\n", DEVO_memCard);
+	gprintf("%.72s", (const char*)loader_bin + 4);
+
+	u32 cpu_isr;
+	SYS_ResetSystem(SYS_SHUTDOWN, 0, 0);
+	_CPU_ISR_Disable( cpu_isr );
+	__exception_closeall();
+	LAUNCH_DEVO();
+	_CPU_ISR_Restore( cpu_isr );
+	return 0;
+}

source/usbloader/GameBooter.hpp

@@ -31,6 +31,8 @@ class GameBooter
 		static int SetupDisc(struct discHdr &gameHeader);
 		static u32 BootPartition(char * dolpath, u8 videoselected, u8 alternatedol, u32 alternatedoloffset);
 		static void ShutDownDevices(int gameUSBPort);
+		static int BootDIOSMIOS(struct discHdr *gameHdr);
+		static int BootDevolution(struct discHdr *gameHdr);
 };
 
 #endif

source/usbloader/disc.c

@@ -15,6 +15,7 @@
 #include "memory/memory.h"
 #include "wbfs.h"
 #include "settings/SettingsEnums.h"
+#include "GameCube/DML_Config.h"
 #include "gecko.h"
 
 // Global app entry point
@@ -55,22 +56,39 @@ void Disc_SetLowMem(void)
 	memcpy((void *) Online_Check, (void *) Disc_ID, 4);
 }
 
-void Disc_SelectVMode(u8 videoselected, u8 force_progressive)
+void Disc_SelectVMode(u8 videoselected, bool devolution, u32 *dml_VideoMode)
 {
 	rmode = VIDEO_GetPreferredMode(0);
 
 	/* Get video mode configuration */
-	bool progressive = (CONF_GetProgressiveScan() > 0) && VIDEO_HaveComponentCable() && force_progressive;
+	bool progressive = (CONF_GetProgressiveScan() > 0) && VIDEO_HaveComponentCable();
 	bool PAL60 = CONF_GetEuRGB60() > 0;
 	u32 tvmode = CONF_GetVideo();
 
-	/* Select video mode register */
+
+	/* Select video mode register: GameCube Devolution only */
+	if(devolution)
+	{
+		if (diskid[3] =='E' || diskid[3] =='J')
+		{
+			rmode_reg = VI_NTSC;
+			rmode = &TVNtsc480IntDf;
+		}
+		else
+		{
+			rmode_reg = VI_PAL;
+			rmode = &TVPal528IntDf;
+		}
+		return;
+	}
+
+	/* Select video mode register:  Wii and GameCube MIOS */
 	switch (tvmode)
 	{
 		case CONF_VIDEO_PAL:
 			rmode_reg = PAL60 ? VI_EURGB60 : VI_PAL;
-			if(PAL60)
+			rmode = progressive ? &TVEurgb60Hz480Prog : (PAL60 ? &TVEurgb60Hz480IntDf : &TVPal528IntDf);
-				rmode = progressive ? &TVNtsc480Prog : &TVEurgb60Hz480IntDf;
+			if(dml_VideoMode) *dml_VideoMode |= progressive ? DML_VID_FORCE_PROG : (PAL60 ? DML_VID_FORCE_PAL60 : DML_VID_FORCE_PAL50);
 			break;
 
 		case CONF_VIDEO_MPAL:
@@ -79,6 +97,7 @@ void Disc_SelectVMode(u8 videoselected, u8 force_progressive)
 
 		case CONF_VIDEO_NTSC:
 			rmode_reg = VI_NTSC;
+			if(dml_VideoMode) *dml_VideoMode |= DML_VID_FORCE_NTSC;
 			break;
 	}
 
@@ -97,36 +116,44 @@ void Disc_SelectVMode(u8 videoselected, u8 force_progressive)
 				case 'Y':
 						rmode_reg = PAL60 ? VI_EURGB60 : VI_PAL;
 						rmode = progressive ? &TVEurgb60Hz480Prog : (PAL60 ? &TVEurgb60Hz480IntDf : &TVPal528IntDf);
+						if(dml_VideoMode) *dml_VideoMode |= progressive ? DML_VID_FORCE_PROG : (PAL60 ? DML_VID_FORCE_PAL60 : DML_VID_FORCE_PAL50);
 					break;
 				// NTSC
 				case 'E':
 				case 'J':
 						rmode_reg = VI_NTSC;
 						rmode = progressive ? &TVNtsc480Prog : &TVNtsc480IntDf;
+						if(dml_VideoMode) *dml_VideoMode |= DML_VID_FORCE_NTSC;
 					break;
 				default:
+						if(dml_VideoMode) *dml_VideoMode = DML_VID_DML_AUTO;
 					break;
 			}
 			break;
 		case VIDEO_MODE_PAL50: // PAL50
 			rmode =  &TVPal528IntDf;
 			rmode_reg = VI_PAL;
+			if(dml_VideoMode) *dml_VideoMode |= DML_VID_FORCE_PAL50;
 			break;
 		case VIDEO_MODE_PAL60: // PAL60
 			rmode = progressive ? &TVEurgb60Hz480Prog : &TVEurgb60Hz480IntDf;
 			rmode_reg = VI_EURGB60;
+			if(dml_VideoMode) *dml_VideoMode |= progressive ? DML_VID_FORCE_PROG : DML_VID_FORCE_PAL60;
 			break;
 		case VIDEO_MODE_NTSC: // NTSC
 			rmode = progressive ? &TVNtsc480Prog : &TVNtsc480IntDf;
 			rmode_reg = VI_NTSC;
+			if(dml_VideoMode) *dml_VideoMode |= progressive ? DML_VID_FORCE_PROG : DML_VID_FORCE_NTSC;
 			break;
 		case VIDEO_MODE_PAL480P:
 			rmode = &TVEurgb60Hz480Prog;
 			rmode_reg = VI_EURGB60;
+			if(dml_VideoMode) *dml_VideoMode |= DML_VID_FORCE_PROG | DML_VID_PROG_PATCH;
 			break;
 		case VIDEO_MODE_NTSC480P:
 			rmode = &TVNtsc480Prog;
 			rmode_reg = VI_NTSC;
+			if(dml_VideoMode) *dml_VideoMode |= DML_VID_FORCE_PROG | DML_VID_PROG_PATCH;
 			break;
 		case VIDEO_MODE_SYSDEFAULT: // AUTO PATCH TO SYSTEM
 			break;

source/usbloader/disc.h

@@ -61,7 +61,7 @@ extern "C"
 	s32 Disc_FindPartition(u64 *outbuf);
 	s32 Disc_Mount(struct discHdr *header);
 	void PatchCountryStrings(void *Address, int Size);
-	void Disc_SelectVMode(u8 videoselected, u8 force_progressive);
+	void Disc_SelectVMode(u8 videoselected, bool devolution, u32 *dml_VideoMode);
 	void Disc_SetVMode(void);
 	s32 Disc_JumpToEntrypoint(s32 hooktype, u32 dolparameter);