The-Homebrew-Cloud/usbloadergx
2
0
Fork 0
mirror of https://github.com/wiidev/usbloadergx.git synced 2024-11-25 20:56:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

- add check for the covers of the currently inserted disc to the cover downloader (is checked with the other games in the list)

Browse Source 
- fix booting wii discs when starting without a HDD (channel mode)
- add parental control option to block priiloader override on return to system menu
- add prompt asking for downloading new language files when trying to update and no language files exist yet
- reduced amount of checks for inserted disc (now every 100ms)
- fixed booting gamecube games (datatype bug for mount method)
- fix winnertag for gamecube games
- add per game nand emu path setting
This commit is contained in:
strtoul 2011-12-20 21:41:00 +00:00
parent 5cbb7e69fd
commit 616b1bdf4c
40 changed files with 530 additions and 219 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HBC/META.XML
View File

@ -2,8 +2,8 @@
<app version="1"> <app version="1">
<name> USB Loader GX</name> <name> USB Loader GX</name>
<coder>USB Loader GX Team</coder> <coder>USB Loader GX Team</coder>
<version>2.3 r1133</version> <version>2.3 r1134</version>
<release_date>201111181802</release_date> <release_date>201111201046</release_date>
<!-- // remove this line to enable arguments <!-- // remove this line to enable arguments
<arguments> <arguments>
<arg>--ios=250</arg> <arg>--ios=250</arg>

17
Languages/czech.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-11-20 10:55+0100\n" "POT-Creation-Date: 2011-12-20 21:54+0100\n"
"PO-Revision-Date: 2009-10-01 01:00+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" "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" "Language-Team: r1056 - last version on http://djelinek.sweb.cz/_USBLoderGX/czech.lang \n"
@ -253,6 +253,9 @@ msgstr "Zablokovat nastavení spouštění"
msgid "Block Parental Settings" msgid "Block Parental Settings"
msgstr "Zablokovat rodičovskou kontrolu" msgstr "Zablokovat rodičovskou kontrolu"
msgid "Block Priiloader Override"
msgstr ""
msgid "Block Reset Settings" msgid "Block Reset Settings"
msgstr "Zablokovat původní nastavení" msgstr "Zablokovat původní nastavení"
@ -499,6 +502,9 @@ msgstr "Cesta k potiskum DVD"
msgid "Disc Default" msgid "Disc Default"
msgstr "Puvodní nastavení disku" msgstr "Puvodní nastavení disku"
msgid "Disc Insert Detected"
msgstr ""
msgid "DiskFlip" msgid "DiskFlip"
msgstr "" msgstr ""
@ -1102,9 +1108,6 @@ msgstr "Žádný"
msgid "Network is not initiated." msgid "Network is not initiated."
msgstr "Sít není inicializována" msgstr "Sít není inicializována"
msgid "New Disc Detected"
msgstr "Detekován nový disk"
msgid "Next" msgid "Next"
msgstr "Další" msgstr "Další"
@ -1144,6 +1147,9 @@ msgstr "Oblíbené nejsou oznaceny"
msgid "No file missing!" msgid "No file missing!"
msgstr "Nechybí žádný soubor!" msgstr "Nechybí žádný soubor!"
msgid "No language files to update on your devices! Do you want to download new language files?"
msgstr ""
msgid "No new updates." msgid "No new updates."
msgstr "Není dostupná žádná aktualizace." msgstr "Není dostupná žádná aktualizace."
@ -1797,6 +1803,9 @@ msgstr "z "
msgid "seconds left" msgid "seconds left"
msgstr "sekund zbývá" msgstr "sekund zbývá"
#~ msgid "New Disc Detected"
#~ msgstr "Detekován nový disk"
#~ msgid "USB Device not found" #~ msgid "USB Device not found"
#~ msgstr "USB zarízení nenalezeno" #~ msgstr "USB zarízení nenalezeno"

17
Languages/danish.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-11-20 10:55+0100\n" "POT-Creation-Date: 2011-12-20 21:54+0100\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: Fox888[dk]\n" "Last-Translator: Fox888[dk]\n"
"Language-Team: [dk]\n" "Language-Team: [dk]\n"
@ -253,6 +253,9 @@ msgstr "Bloker loader indstillinger"
msgid "Block Parental Settings" msgid "Block Parental Settings"
msgstr "Bloker forældre indstillinger" msgstr "Bloker forældre indstillinger"
msgid "Block Priiloader Override"
msgstr ""
msgid "Block Reset Settings" msgid "Block Reset Settings"
msgstr "Bloker nulstils indstillinger" msgstr "Bloker nulstils indstillinger"
@ -499,6 +502,9 @@ msgstr "Sti til DVD-billeder"
msgid "Disc Default" msgid "Disc Default"
msgstr "Spillets standard" msgstr "Spillets standard"
msgid "Disc Insert Detected"
msgstr ""
msgid "DiskFlip" msgid "DiskFlip"
msgstr "" msgstr ""
@ -1102,9 +1108,6 @@ msgstr "Ingen"
msgid "Network is not initiated." msgid "Network is not initiated."
msgstr "Netværk er ikke initialiseret." msgstr "Netværk er ikke initialiseret."
msgid "New Disc Detected"
msgstr "Har opdaget ny DVD"
msgid "Next" msgid "Next"
msgstr "Næste" msgstr "Næste"
@ -1144,6 +1147,9 @@ msgstr "Ingen favoritter er valgt."
msgid "No file missing!" msgid "No file missing!"
msgstr "Ingen filer mangler!" msgstr "Ingen filer mangler!"
msgid "No language files to update on your devices! Do you want to download new language files?"
msgstr ""
msgid "No new updates." msgid "No new updates."
msgstr "Ingen nye opdateringer." msgstr "Ingen nye opdateringer."
@ -1797,6 +1803,9 @@ msgstr "af"
msgid "seconds left" msgid "seconds left"
msgstr "sekunder tilbage" msgstr "sekunder tilbage"
#~ msgid "New Disc Detected"
#~ msgstr "Har opdaget ny DVD"
#~ msgid "USB Device not found" #~ msgid "USB Device not found"
#~ msgstr "USB-enhed ikke fundet" #~ msgstr "USB-enhed ikke fundet"

17
Languages/dutch.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-11-20 10:55+0100\n" "POT-Creation-Date: 2011-12-20 21:54+0100\n"
"PO-Revision-Date: 2011-06-30 14:22+0100\n" "PO-Revision-Date: 2011-06-30 14:22+0100\n"
"Last-Translator: glowy\n" "Last-Translator: glowy\n"
"Language-Team: tj_cool, glowy\n" "Language-Team: tj_cool, glowy\n"
@ -253,6 +253,9 @@ msgstr "Blokkeer Loader Instellingen"
msgid "Block Parental Settings" msgid "Block Parental Settings"
msgstr "Blokkeer Ouderlijk toezicht" msgstr "Blokkeer Ouderlijk toezicht"
msgid "Block Priiloader Override"
msgstr ""
msgid "Block Reset Settings" msgid "Block Reset Settings"
msgstr "Blokkeer Reset Instellingen" msgstr "Blokkeer Reset Instellingen"
@ -499,6 +502,9 @@ msgstr "Locatie disk labels"
msgid "Disc Default" msgid "Disc Default"
msgstr "Disk standaard" msgstr "Disk standaard"
msgid "Disc Insert Detected"
msgstr ""
msgid "DiskFlip" msgid "DiskFlip"
msgstr "" msgstr ""
@ -1102,9 +1108,6 @@ msgstr "Geen"
msgid "Network is not initiated." msgid "Network is not initiated."
msgstr "Netwerk is niet gestart." msgstr "Netwerk is niet gestart."
msgid "New Disc Detected"
msgstr "Nieuwe disk gevonden"
msgid "Next" msgid "Next"
msgstr "Volgende" msgstr "Volgende"
@ -1144,6 +1147,9 @@ msgstr "Geen favorieten geselecteerd."
msgid "No file missing!" msgid "No file missing!"
msgstr "Geen missende bestanden!" msgstr "Geen missende bestanden!"
msgid "No language files to update on your devices! Do you want to download new language files?"
msgstr ""
msgid "No new updates." msgid "No new updates."
msgstr "Geen nieuwe updates." msgstr "Geen nieuwe updates."
@ -1797,6 +1803,9 @@ msgstr "van"
msgid "seconds left" msgid "seconds left"
msgstr "seconden over" msgstr "seconden over"
#~ msgid "New Disc Detected"
#~ msgstr "Nieuwe disk gevonden"
#~ msgid "USB Device not found" #~ msgid "USB Device not found"
#~ msgstr "USB Apparaat niet gevonden" #~ msgstr "USB Apparaat niet gevonden"

14
Languages/english.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-11-20 10:55+0100\n" "POT-Creation-Date: 2011-12-20 21:54+0100\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
@ -253,6 +253,9 @@ msgstr ""
msgid "Block Parental Settings" msgid "Block Parental Settings"
msgstr "" msgstr ""
msgid "Block Priiloader Override"
msgstr ""
msgid "Block Reset Settings" msgid "Block Reset Settings"
msgstr "" msgstr ""
@ -499,6 +502,9 @@ msgstr ""
msgid "Disc Default" msgid "Disc Default"
msgstr "" msgstr ""
msgid "Disc Insert Detected"
msgstr ""
msgid "DiskFlip" msgid "DiskFlip"
msgstr "" msgstr ""
@ -1102,9 +1108,6 @@ msgstr ""
msgid "Network is not initiated." msgid "Network is not initiated."
msgstr "" msgstr ""
msgid "New Disc Detected"
msgstr ""
msgid "Next" msgid "Next"
msgstr "" msgstr ""
@ -1144,6 +1147,9 @@ msgstr ""
msgid "No file missing!" msgid "No file missing!"
msgstr "" msgstr ""
msgid "No language files to update on your devices! Do you want to download new language files?"
msgstr ""
msgid "No new updates." msgid "No new updates."
msgstr "" msgstr ""

14
Languages/finnish.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-11-20 10:55+0100\n" "POT-Creation-Date: 2011-12-20 21:54+0100\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: c64rmx\n" "Last-Translator: c64rmx\n"
"Language-Team: \n" "Language-Team: \n"
@ -253,6 +253,9 @@ msgstr ""
msgid "Block Parental Settings" msgid "Block Parental Settings"
msgstr "" msgstr ""
msgid "Block Priiloader Override"
msgstr ""
msgid "Block Reset Settings" msgid "Block Reset Settings"
msgstr "" msgstr ""
@ -499,6 +502,9 @@ msgstr "Levykuvien polku"
msgid "Disc Default" msgid "Disc Default"
msgstr "Pelin oletus" msgstr "Pelin oletus"
msgid "Disc Insert Detected"
msgstr ""
msgid "DiskFlip" msgid "DiskFlip"
msgstr "Levynvaihto" msgstr "Levynvaihto"
@ -1102,9 +1108,6 @@ msgstr "Ei kumpikaan"
msgid "Network is not initiated." msgid "Network is not initiated."
msgstr "" msgstr ""
msgid "New Disc Detected"
msgstr ""
msgid "Next" msgid "Next"
msgstr "Seuraava" msgstr "Seuraava"
@ -1144,6 +1147,9 @@ msgstr ""
msgid "No file missing!" msgid "No file missing!"
msgstr "Ei tiedostoja kadoksissa!" msgstr "Ei tiedostoja kadoksissa!"
msgid "No language files to update on your devices! Do you want to download new language files?"
msgstr ""
msgid "No new updates." msgid "No new updates."
msgstr "Ei uusia päivityksiä" msgstr "Ei uusia päivityksiä"

17
Languages/french.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-11-20 10:55+0100\n" "POT-Creation-Date: 2011-12-20 21:54+0100\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: Cyan\n" "Last-Translator: Cyan\n"
"Language-Team: Badablek, Amour, ikya, Cyan & Kin8\n" "Language-Team: Badablek, Amour, ikya, Cyan & Kin8\n"
@ -253,6 +253,9 @@ msgstr "Bloquer Param. du Loader"
msgid "Block Parental Settings" msgid "Block Parental Settings"
msgstr "Bloquer Contrôle parental" msgstr "Bloquer Contrôle parental"
msgid "Block Priiloader Override"
msgstr ""
msgid "Block Reset Settings" msgid "Block Reset Settings"
msgstr "Bloquer Réinit. paramètres" msgstr "Bloquer Réinit. paramètres"
@ -499,6 +502,9 @@ msgstr "Dossier labels DVD"
msgid "Disc Default" msgid "Disc Default"
msgstr "Disque par défaut" msgstr "Disque par défaut"
msgid "Disc Insert Detected"
msgstr ""
msgid "DiskFlip" msgid "DiskFlip"
msgstr "Inversion disque" msgstr "Inversion disque"
@ -1102,9 +1108,6 @@ msgstr "Aucun"
msgid "Network is not initiated." msgid "Network is not initiated."
msgstr "Réseau non initialisé" msgstr "Réseau non initialisé"
msgid "New Disc Detected"
msgstr "Nouveau DVD détecté"
msgid "Next" msgid "Next"
msgstr "Suivant" msgstr "Suivant"
@ -1144,6 +1147,9 @@ msgstr "Pas de favoris sélectionnés"
msgid "No file missing!" msgid "No file missing!"
msgstr "Aucun fichier manquant !" msgstr "Aucun fichier manquant !"
msgid "No language files to update on your devices! Do you want to download new language files?"
msgstr ""
msgid "No new updates." msgid "No new updates."
msgstr "Pas de nouvelle mise à jour." msgstr "Pas de nouvelle mise à jour."
@ -1797,6 +1803,9 @@ msgstr "sur"
msgid "seconds left" msgid "seconds left"
msgstr "secondes restantes" msgstr "secondes restantes"
#~ msgid "New Disc Detected"
#~ msgstr "Nouveau DVD détecté"
#~ msgid "USB Device not found" #~ msgid "USB Device not found"
#~ msgstr "Périphérique USB introuvable" #~ msgstr "Périphérique USB introuvable"

17
Languages/german.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-11-20 10:55+0100\n" "POT-Creation-Date: 2011-12-20 21:54+0100\n"
"PO-Revision-Date: 2010-07-03 17:35-0800\n" "PO-Revision-Date: 2010-07-03 17:35-0800\n"
"Last-Translator: TheRealVisitor\n" "Last-Translator: TheRealVisitor\n"
"Language-Team: Bertilax, Snoozer, wishmasterf, ZEN.13, TheRealVisitor\n" "Language-Team: Bertilax, Snoozer, wishmasterf, ZEN.13, TheRealVisitor\n"
@ -253,6 +253,9 @@ msgstr "Blocke Loaderoptionen"
msgid "Block Parental Settings" msgid "Block Parental Settings"
msgstr "Blocke Altersoptionen" msgstr "Blocke Altersoptionen"
msgid "Block Priiloader Override"
msgstr ""
msgid "Block Reset Settings" msgid "Block Reset Settings"
msgstr "Blocke Resetoptionen" msgstr "Blocke Resetoptionen"
@ -499,6 +502,9 @@ msgstr "Disk Cover"
msgid "Disc Default" msgid "Disc Default"
msgstr "Diskstandard" msgstr "Diskstandard"
msgid "Disc Insert Detected"
msgstr ""
msgid "DiskFlip" msgid "DiskFlip"
msgstr "DiskFlip" msgstr "DiskFlip"
@ -1102,9 +1108,6 @@ msgstr "Keine"
msgid "Network is not initiated." msgid "Network is not initiated."
msgstr "Netzwerk wurde nicht initialisiert." msgstr "Netzwerk wurde nicht initialisiert."
msgid "New Disc Detected"
msgstr "Neue Disk im Laufwerk festgestellt"
msgid "Next" msgid "Next"
msgstr "Weiter" msgstr "Weiter"
@ -1144,6 +1147,9 @@ msgstr "Keine Favoriten ausgewählt"
msgid "No file missing!" msgid "No file missing!"
msgstr "Keine Datei fehlt!" msgstr "Keine Datei fehlt!"
msgid "No language files to update on your devices! Do you want to download new language files?"
msgstr ""
msgid "No new updates." msgid "No new updates."
msgstr "Keine Updates verfügbar." msgstr "Keine Updates verfügbar."
@ -1797,6 +1803,9 @@ msgstr "von"
msgid "seconds left" msgid "seconds left"
msgstr "Sekunden verbleiben" msgstr "Sekunden verbleiben"
#~ msgid "New Disc Detected"
#~ msgstr "Neue Disk im Laufwerk festgestellt"
#~ msgid "USB Device not found" #~ msgid "USB Device not found"
#~ msgstr "USB Gerät nicht gefunden." #~ msgstr "USB Gerät nicht gefunden."

17
Languages/hungarian.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-11-20 10:55+0100\n" "POT-Creation-Date: 2011-12-20 21:54+0100\n"
"PO-Revision-Date: 2009-12-29 11:05+0100\n" "PO-Revision-Date: 2009-12-29 11:05+0100\n"
"Last-Translator: Springdale\n" "Last-Translator: Springdale\n"
"Language-Team: Tusk, Springdale\n" "Language-Team: Tusk, Springdale\n"
@ -253,6 +253,9 @@ msgstr ""
msgid "Block Parental Settings" msgid "Block Parental Settings"
msgstr "" msgstr ""
msgid "Block Priiloader Override"
msgstr ""
msgid "Block Reset Settings" msgid "Block Reset Settings"
msgstr "" msgstr ""
@ -499,6 +502,9 @@ msgstr "Lemezképek Útvonala"
msgid "Disc Default" msgid "Disc Default"
msgstr "Lemez Alapértelmezettje" msgstr "Lemez Alapértelmezettje"
msgid "Disc Insert Detected"
msgstr ""
msgid "DiskFlip" msgid "DiskFlip"
msgstr "Lemezforgatás" msgstr "Lemezforgatás"
@ -1102,9 +1108,6 @@ msgstr "Egyik sem"
msgid "Network is not initiated." msgid "Network is not initiated."
msgstr "" msgstr ""
msgid "New Disc Detected"
msgstr "Új lemez észlelve"
msgid "Next" msgid "Next"
msgstr "Következõ" msgstr "Következõ"
@ -1144,6 +1147,9 @@ msgstr ""
msgid "No file missing!" msgid "No file missing!"
msgstr "Egy fájl sem hiányzik!" msgstr "Egy fájl sem hiányzik!"
msgid "No language files to update on your devices! Do you want to download new language files?"
msgstr ""
msgid "No new updates." msgid "No new updates."
msgstr "Nincs elérhetõ frissítés." msgstr "Nincs elérhetõ frissítés."
@ -1797,6 +1803,9 @@ msgstr "./"
msgid "seconds left" msgid "seconds left"
msgstr "hátralévõ másodperc" msgstr "hátralévõ másodperc"
#~ msgid "New Disc Detected"
#~ msgstr "Új lemez észlelve"
#~ msgid "USB Device not found" #~ msgid "USB Device not found"
#~ msgstr "USB Meghajtó nem található" #~ msgstr "USB Meghajtó nem található"

17
Languages/italian.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-11-20 10:55+0100\n" "POT-Creation-Date: 2011-12-20 21:54+0100\n"
"PO-Revision-Date: 2011-09-11 12:19+0100\n" "PO-Revision-Date: 2011-09-11 12:19+0100\n"
"Last-Translator: xFede\n" "Last-Translator: xFede\n"
"Language-Team: Cambo\n" "Language-Team: Cambo\n"
@ -253,6 +253,9 @@ msgstr "Blocca Impost. Loader"
msgid "Block Parental Settings" msgid "Block Parental Settings"
msgstr "Blocca Contr. Genitori" msgstr "Blocca Contr. Genitori"
msgid "Block Priiloader Override"
msgstr ""
msgid "Block Reset Settings" msgid "Block Reset Settings"
msgstr "Blocca Impost. Predef." msgstr "Blocca Impost. Predef."
@ -499,6 +502,9 @@ msgstr "Percorso Imm. Disco"
msgid "Disc Default" msgid "Disc Default"
msgstr "Da Disco" msgstr "Da Disco"
msgid "Disc Insert Detected"
msgstr ""
msgid "DiskFlip" msgid "DiskFlip"
msgstr "Gira i dischi" msgstr "Gira i dischi"
@ -1102,9 +1108,6 @@ msgstr "Neanche"
msgid "Network is not initiated." msgid "Network is not initiated."
msgstr "La rete non è inizializzata." msgstr "La rete non è inizializzata."
msgid "New Disc Detected"
msgstr "Rilevato un nuovo disco"
msgid "Next" msgid "Next"
msgstr "Succ." msgstr "Succ."
@ -1144,6 +1147,9 @@ msgstr "Nessun preferito selezionato."
msgid "No file missing!" msgid "No file missing!"
msgstr "Nessun file mancante!" msgstr "Nessun file mancante!"
msgid "No language files to update on your devices! Do you want to download new language files?"
msgstr ""
msgid "No new updates." msgid "No new updates."
msgstr "Nessun aggiornamento." msgstr "Nessun aggiornamento."
@ -1797,6 +1803,9 @@ msgstr "di"
msgid "seconds left" msgid "seconds left"
msgstr "secondi rimanenti" msgstr "secondi rimanenti"
#~ msgid "New Disc Detected"
#~ msgstr "Rilevato un nuovo disco"
#~ msgid "USB Device not found" #~ msgid "USB Device not found"
#~ msgstr "Periferica USB non trovata" #~ msgstr "Periferica USB non trovata"

17
Languages/japanese.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-11-20 10:55+0100\n" "POT-Creation-Date: 2011-12-20 21:54+0100\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: hosigumayuugi\n" "Last-Translator: hosigumayuugi\n"
"Language-Team: hosigumayuugi\n" "Language-Team: hosigumayuugi\n"
@ -253,6 +253,9 @@ msgstr "ローダーの設定を制限"
msgid "Block Parental Settings" msgid "Block Parental Settings"
msgstr "使用制限設定を制限" msgstr "使用制限設定を制限"
msgid "Block Priiloader Override"
msgstr ""
msgid "Block Reset Settings" msgid "Block Reset Settings"
msgstr "設定の初期化を制限" msgstr "設定の初期化を制限"
@ -499,6 +502,9 @@ msgstr "ディスク画像"
msgid "Disc Default" msgid "Disc Default"
msgstr "ディスクの初期値" msgstr "ディスクの初期値"
msgid "Disc Insert Detected"
msgstr ""
msgid "DiskFlip" msgid "DiskFlip"
msgstr "ディスクの回転風" msgstr "ディスクの回転風"
@ -1102,9 +1108,6 @@ msgstr "非表示"
msgid "Network is not initiated." msgid "Network is not initiated."
msgstr "ネットワークに接続されていません" msgstr "ネットワークに接続されていません"
msgid "New Disc Detected"
msgstr "新しいディスクが検出されました"
msgid "Next" msgid "Next"
msgstr "右" msgstr "右"
@ -1144,6 +1147,9 @@ msgstr "お気に入りはありません"
msgid "No file missing!" msgid "No file missing!"
msgstr "必要ありません" msgstr "必要ありません"
msgid "No language files to update on your devices! Do you want to download new language files?"
msgstr ""
msgid "No new updates." msgid "No new updates."
msgstr "更新はありません" msgstr "更新はありません"
@ -1797,6 +1803,9 @@ msgstr "中"
msgid "seconds left" msgid "seconds left"
msgstr "秒で完了" msgstr "秒で完了"
#~ msgid "New Disc Detected"
#~ msgstr "新しいディスクが検出されました"
#~ msgid "USB Device not found" #~ msgid "USB Device not found"
#~ msgstr "USB機器が見つかりません" #~ msgstr "USB機器が見つかりません"

14
Languages/korean.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-11-20 10:55+0100\n" "POT-Creation-Date: 2011-12-20 21:54+0100\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: nextos@korea.com\n" "Last-Translator: nextos@korea.com\n"
"Language-Team: \n" "Language-Team: \n"
@ -253,6 +253,9 @@ msgstr ""
msgid "Block Parental Settings" msgid "Block Parental Settings"
msgstr "" msgstr ""
msgid "Block Priiloader Override"
msgstr ""
msgid "Block Reset Settings" msgid "Block Reset Settings"
msgstr "" msgstr ""
@ -499,6 +502,9 @@ msgstr "디스크 이미지 경로"
msgid "Disc Default" msgid "Disc Default"
msgstr "디스크 기본값" msgstr "디스크 기본값"
msgid "Disc Insert Detected"
msgstr ""
msgid "DiskFlip" msgid "DiskFlip"
msgstr "디스크 플립" msgstr "디스크 플립"
@ -1102,9 +1108,6 @@ msgstr "표시 없음"
msgid "Network is not initiated." msgid "Network is not initiated."
msgstr "" msgstr ""
msgid "New Disc Detected"
msgstr ""
msgid "Next" msgid "Next"
msgstr "다음" msgstr "다음"
@ -1144,6 +1147,9 @@ msgstr ""
msgid "No file missing!" msgid "No file missing!"
msgstr "누락 파일 없음!" msgstr "누락 파일 없음!"
msgid "No language files to update on your devices! Do you want to download new language files?"
msgstr ""
msgid "No new updates." msgid "No new updates."
msgstr "새로운 업데이트 없음." msgstr "새로운 업데이트 없음."

17
Languages/norwegian.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-11-20 10:55+0100\n" "POT-Creation-Date: 2011-12-20 21:54+0100\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: raschi\n" "Last-Translator: raschi\n"
"Language-Team: raschi\n" "Language-Team: raschi\n"
@ -253,6 +253,9 @@ msgstr "Blokkér loader innstillinger"
msgid "Block Parental Settings" msgid "Block Parental Settings"
msgstr "Blokkér foreldrekontroll" msgstr "Blokkér foreldrekontroll"
msgid "Block Priiloader Override"
msgstr ""
msgid "Block Reset Settings" msgid "Block Reset Settings"
msgstr "Blokkér reset innstillinger" msgstr "Blokkér reset innstillinger"
@ -499,6 +502,9 @@ msgstr "Platebilde sti"
msgid "Disc Default" msgid "Disc Default"
msgstr "Spill Standard" msgstr "Spill Standard"
msgid "Disc Insert Detected"
msgstr ""
msgid "DiskFlip" msgid "DiskFlip"
msgstr "Snu plate" msgstr "Snu plate"
@ -1102,9 +1108,6 @@ msgstr "Ingen"
msgid "Network is not initiated." msgid "Network is not initiated."
msgstr "Nettverk er ikke initialisert." msgstr "Nettverk er ikke initialisert."
msgid "New Disc Detected"
msgstr "Ny plate oppdaget"
msgid "Next" msgid "Next"
msgstr "Neste" msgstr "Neste"
@ -1144,6 +1147,9 @@ msgstr "Ingen favoritter valgt."
msgid "No file missing!" msgid "No file missing!"
msgstr "Ingen filer mangler!" msgstr "Ingen filer mangler!"
msgid "No language files to update on your devices! Do you want to download new language files?"
msgstr ""
msgid "No new updates." msgid "No new updates."
msgstr "Ingen nye oppdateringer." msgstr "Ingen nye oppdateringer."
@ -1797,6 +1803,9 @@ msgstr "av"
msgid "seconds left" msgid "seconds left"
msgstr "sekunder gjenstår" msgstr "sekunder gjenstår"
#~ msgid "New Disc Detected"
#~ msgstr "Ny plate oppdaget"
#~ msgid "USB Device not found" #~ msgid "USB Device not found"
#~ msgstr "USB enhet ikke funnet" #~ msgstr "USB enhet ikke funnet"

17
Languages/polish.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-11-20 10:55+0100\n" "POT-Creation-Date: 2011-12-20 21:54+0100\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: ziom666 (zadania_prog@vp.pl)\n" "Last-Translator: ziom666 (zadania_prog@vp.pl)\n"
"Language-Team: \n" "Language-Team: \n"
@ -253,6 +253,9 @@ msgstr ""
msgid "Block Parental Settings" msgid "Block Parental Settings"
msgstr "" msgstr ""
msgid "Block Priiloader Override"
msgstr ""
msgid "Block Reset Settings" msgid "Block Reset Settings"
msgstr "" msgstr ""
@ -499,6 +502,9 @@ msgstr "Sciezka do obrazkow plyt"
msgid "Disc Default" msgid "Disc Default"
msgstr "Domyslny dysk" msgstr "Domyslny dysk"
msgid "Disc Insert Detected"
msgstr ""
msgid "DiskFlip" msgid "DiskFlip"
msgstr "Obrot plytami" msgstr "Obrot plytami"
@ -1102,9 +1108,6 @@ msgstr "zadne"
msgid "Network is not initiated." msgid "Network is not initiated."
msgstr "" msgstr ""
msgid "New Disc Detected"
msgstr "Wykryto nowy dysk"
msgid "Next" msgid "Next"
msgstr "nastepny" msgstr "nastepny"
@ -1144,6 +1147,9 @@ msgstr ""
msgid "No file missing!" msgid "No file missing!"
msgstr "Brak plikow do pobrania" msgstr "Brak plikow do pobrania"
msgid "No language files to update on your devices! Do you want to download new language files?"
msgstr ""
msgid "No new updates." msgid "No new updates."
msgstr "Posiadasz aktualna wersje" msgstr "Posiadasz aktualna wersje"
@ -1797,6 +1803,9 @@ msgstr "z"
msgid "seconds left" msgid "seconds left"
msgstr "sekund pozostalo" msgstr "sekund pozostalo"
#~ msgid "New Disc Detected"
#~ msgstr "Wykryto nowy dysk"
#~ msgid "USB Device not found" #~ msgid "USB Device not found"
#~ msgstr "Nie znaleziono urzadzenia USB" #~ msgstr "Nie znaleziono urzadzenia USB"

17
Languages/portuguese_br.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-11-20 10:55+0100\n" "POT-Creation-Date: 2011-12-20 21:54+0100\n"
"PO-Revision-Date: 2009-10-23 18:52+0200\n" "PO-Revision-Date: 2009-10-23 18:52+0200\n"
"Last-Translator: aniemotion\n" "Last-Translator: aniemotion\n"
"Language-Team: boto12, aniemotion\n" "Language-Team: boto12, aniemotion\n"
@ -253,6 +253,9 @@ msgstr "Bloquear configuração do carregador"
msgid "Block Parental Settings" msgid "Block Parental Settings"
msgstr "Bloquear configuração dos país" msgstr "Bloquear configuração dos país"
msgid "Block Priiloader Override"
msgstr ""
msgid "Block Reset Settings" msgid "Block Reset Settings"
msgstr "Bloquear configuração da reinicialização" msgstr "Bloquear configuração da reinicialização"
@ -499,6 +502,9 @@ msgstr "Pasta Imagens Disco"
msgid "Disc Default" msgid "Disc Default"
msgstr "Disco Padrão" msgstr "Disco Padrão"
msgid "Disc Insert Detected"
msgstr ""
msgid "DiskFlip" msgid "DiskFlip"
msgstr "Voltar Disco" msgstr "Voltar Disco"
@ -1102,9 +1108,6 @@ msgstr "Nenhum"
msgid "Network is not initiated." msgid "Network is not initiated."
msgstr "" msgstr ""
msgid "New Disc Detected"
msgstr "Detectado Novo Disco"
msgid "Next" msgid "Next"
msgstr "Próximo" msgstr "Próximo"
@ -1144,6 +1147,9 @@ msgstr ""
msgid "No file missing!" msgid "No file missing!"
msgstr "Faltando nenhum arquivo" msgstr "Faltando nenhum arquivo"
msgid "No language files to update on your devices! Do you want to download new language files?"
msgstr ""
msgid "No new updates." msgid "No new updates."
msgstr "Não existem novas atualizações." msgstr "Não existem novas atualizações."
@ -1797,6 +1803,9 @@ msgstr "de"
msgid "seconds left" msgid "seconds left"
msgstr "segundos restantes" msgstr "segundos restantes"
#~ msgid "New Disc Detected"
#~ msgstr "Detectado Novo Disco"
#~ msgid "USB Device not found" #~ msgid "USB Device not found"
#~ msgstr "Dispositivo USB não encontrado" #~ msgstr "Dispositivo USB não encontrado"

17
Languages/portuguese_pt.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-11-20 10:55+0100\n" "POT-Creation-Date: 2011-12-20 21:54+0100\n"
"PO-Revision-Date: 2011-11-03 11:00+0000\n" "PO-Revision-Date: 2011-11-03 11:00+0000\n"
"Last-Translator: pplucky <pplucky@gmail.com>\n" "Last-Translator: pplucky <pplucky@gmail.com>\n"
"Language-Team: Sky8000, pplucky\n" "Language-Team: Sky8000, pplucky\n"
@ -253,6 +253,9 @@ msgstr "Bloquear Def. Loader"
msgid "Block Parental Settings" msgid "Block Parental Settings"
msgstr "Bloquear Def. Parental" msgstr "Bloquear Def. Parental"
msgid "Block Priiloader Override"
msgstr ""
msgid "Block Reset Settings" msgid "Block Reset Settings"
msgstr "Bloquear Reinicialização Def." msgstr "Bloquear Reinicialização Def."
@ -499,6 +502,9 @@ msgstr "Cam. Imagens Disco"
msgid "Disc Default" msgid "Disc Default"
msgstr "Predefinição Disco" msgstr "Predefinição Disco"
msgid "Disc Insert Detected"
msgstr ""
msgid "DiskFlip" msgid "DiskFlip"
msgstr "Voltar Disco" msgstr "Voltar Disco"
@ -1102,9 +1108,6 @@ msgstr "Nenhum"
msgid "Network is not initiated." msgid "Network is not initiated."
msgstr "Rede não inicializada." msgstr "Rede não inicializada."
msgid "New Disc Detected"
msgstr "Novo Disco Detectado"
msgid "Next" msgid "Next"
msgstr "Próximo" msgstr "Próximo"
@ -1144,6 +1147,9 @@ msgstr "Nenhum favorito seleccionado"
msgid "No file missing!" msgid "No file missing!"
msgstr "Nenhum ficheiro em falta!" msgstr "Nenhum ficheiro em falta!"
msgid "No language files to update on your devices! Do you want to download new language files?"
msgstr ""
msgid "No new updates." msgid "No new updates."
msgstr "Não existem novas actualizações." msgstr "Não existem novas actualizações."
@ -1797,6 +1803,9 @@ msgstr "de"
msgid "seconds left" msgid "seconds left"
msgstr "segundos restantes" msgstr "segundos restantes"
#~ msgid "New Disc Detected"
#~ msgstr "Novo Disco Detectado"
#~ msgid "USB Device not found" #~ msgid "USB Device not found"
#~ msgstr "Dispositivo USB não encontrado" #~ msgstr "Dispositivo USB não encontrado"

17
Languages/russian.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-11-20 10:55+0100\n" "POT-Creation-Date: 2011-12-20 21:54+0100\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: nikolai_ca\n" "Last-Translator: nikolai_ca\n"
"Language-Team: Kir, alendit, nikolai_ca\n" "Language-Team: Kir, alendit, nikolai_ca\n"
@ -253,6 +253,9 @@ msgstr ""
msgid "Block Parental Settings" msgid "Block Parental Settings"
msgstr "" msgstr ""
msgid "Block Priiloader Override"
msgstr ""
msgid "Block Reset Settings" msgid "Block Reset Settings"
msgstr "" msgstr ""
@ -499,6 +502,9 @@ msgstr "Путь к изображениям дисков"
msgid "Disc Default" msgid "Disc Default"
msgstr "По умолчанию (диск)" msgstr "По умолчанию (диск)"
msgid "Disc Insert Detected"
msgstr ""
msgid "DiskFlip" msgid "DiskFlip"
msgstr "ДискФлип" msgstr "ДискФлип"
@ -1102,9 +1108,6 @@ msgstr "Ни то, ни другое"
msgid "Network is not initiated." msgid "Network is not initiated."
msgstr "" msgstr ""
msgid "New Disc Detected"
msgstr "Обнаружен новый диск"
msgid "Next" msgid "Next"
msgstr "Следующий" msgstr "Следующий"
@ -1144,6 +1147,9 @@ msgstr ""
msgid "No file missing!" msgid "No file missing!"
msgstr "Файл не найден!" msgstr "Файл не найден!"
msgid "No language files to update on your devices! Do you want to download new language files?"
msgstr ""
msgid "No new updates." msgid "No new updates."
msgstr "Нет обновлений" msgstr "Нет обновлений"
@ -1797,6 +1803,9 @@ msgstr "из"
msgid "seconds left" msgid "seconds left"
msgstr "секунд осталось" msgstr "секунд осталось"
#~ msgid "New Disc Detected"
#~ msgstr "Обнаружен новый диск"
#~ msgid "USB Device not found" #~ msgid "USB Device not found"
#~ msgstr "USB устройство не найдено" #~ msgstr "USB устройство не найдено"

17
Languages/schinese.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-11-20 10:55+0100\n" "POT-Creation-Date: 2011-12-20 21:54+0100\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: knife.hu kavid emul8ion\n" "Last-Translator: knife.hu kavid emul8ion\n"
"Language-Team: kavid\n" "Language-Team: kavid\n"
@ -253,6 +253,9 @@ msgstr "Loader设置"
msgid "Block Parental Settings" msgid "Block Parental Settings"
msgstr "家长控制设置" msgstr "家长控制设置"
msgid "Block Priiloader Override"
msgstr ""
msgid "Block Reset Settings" msgid "Block Reset Settings"
msgstr "重置设置" msgstr "重置设置"
@ -499,6 +502,9 @@ msgstr "光盘图片路径"
msgid "Disc Default" msgid "Disc Default"
msgstr "游戏默认" msgstr "游戏默认"
msgid "Disc Insert Detected"
msgstr ""
msgid "DiskFlip" msgid "DiskFlip"
msgstr "光盘滑动" msgstr "光盘滑动"
@ -1102,9 +1108,6 @@ msgstr "全不"
msgid "Network is not initiated." msgid "Network is not initiated."
msgstr "网络还未初始化" msgstr "网络还未初始化"
msgid "New Disc Detected"
msgstr "新光盘已检测"
msgid "Next" msgid "Next"
msgstr "往后" msgstr "往后"
@ -1144,6 +1147,9 @@ msgstr "未选择收藏."
msgid "No file missing!" msgid "No file missing!"
msgstr "没有文件缺少!" msgstr "没有文件缺少!"
msgid "No language files to update on your devices! Do you want to download new language files?"
msgstr ""
msgid "No new updates." msgid "No new updates."
msgstr "没有可用更新." msgstr "没有可用更新."
@ -1797,6 +1803,9 @@ msgstr "的"
msgid "seconds left" msgid "seconds left"
msgstr "剩余秒数" msgstr "剩余秒数"
#~ msgid "New Disc Detected"
#~ msgstr "新光盘已检测"
#~ msgid "USB Device not found" #~ msgid "USB Device not found"
#~ msgstr "找不到 USB 设备" #~ msgstr "找不到 USB 设备"

17
Languages/spanish.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-11-20 10:55+0100\n" "POT-Creation-Date: 2011-12-20 21:54+0100\n"
"PO-Revision-Date: 2011-07-25 16:40+0200\n" "PO-Revision-Date: 2011-07-25 16:40+0200\n"
"Last-Translator: Galen/xFede\n" "Last-Translator: Galen/xFede\n"
"Language-Team: Penn, SirPalax, hvy109\n" "Language-Team: Penn, SirPalax, hvy109\n"
@ -253,6 +253,9 @@ msgstr "Bloq. Config. Cargador"
msgid "Block Parental Settings" msgid "Block Parental Settings"
msgstr "Bloq. Config. Parental" msgstr "Bloq. Config. Parental"
msgid "Block Priiloader Override"
msgstr ""
msgid "Block Reset Settings" msgid "Block Reset Settings"
msgstr "Bloq. Resetear Config." msgstr "Bloq. Resetear Config."
@ -499,6 +502,9 @@ msgstr "Ruta Imagen Discos"
msgid "Disc Default" msgid "Disc Default"
msgstr "Pred. Disco" msgstr "Pred. Disco"
msgid "Disc Insert Detected"
msgstr ""
msgid "DiskFlip" msgid "DiskFlip"
msgstr "GiraDiscos" msgstr "GiraDiscos"
@ -1102,9 +1108,6 @@ msgstr "Ninguno"
msgid "Network is not initiated." msgid "Network is not initiated."
msgstr "No se inició la red." msgstr "No se inició la red."
msgid "New Disc Detected"
msgstr "Nuevo Disco Detectado"
msgid "Next" msgid "Next"
msgstr "Siguiente" msgstr "Siguiente"
@ -1144,6 +1147,9 @@ msgstr "Ningún favorito seleccionado."
msgid "No file missing!" msgid "No file missing!"
msgstr "¡No faltan archivos!" msgstr "¡No faltan archivos!"
msgid "No language files to update on your devices! Do you want to download new language files?"
msgstr ""
msgid "No new updates." msgid "No new updates."
msgstr "No hay nuevas actualizaciones." msgstr "No hay nuevas actualizaciones."
@ -1797,6 +1803,9 @@ msgstr "de"
msgid "seconds left" msgid "seconds left"
msgstr "segundos restantes" msgstr "segundos restantes"
#~ msgid "New Disc Detected"
#~ msgstr "Nuevo Disco Detectado"
#~ msgid "USB Device not found" #~ msgid "USB Device not found"
#~ msgstr "USB no encontrado" #~ msgstr "USB no encontrado"

17
Languages/swedish.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-11-20 10:55+0100\n" "POT-Creation-Date: 2011-12-20 21:54+0100\n"
"PO-Revision-Date: 2010-01-19 17:39+0200\n" "PO-Revision-Date: 2010-01-19 17:39+0200\n"
"Last-Translator: Katsurou\n" "Last-Translator: Katsurou\n"
"Language-Team: Katsurou, pirateX\n" "Language-Team: Katsurou, pirateX\n"
@ -253,6 +253,9 @@ msgstr ""
msgid "Block Parental Settings" msgid "Block Parental Settings"
msgstr "" msgstr ""
msgid "Block Priiloader Override"
msgstr ""
msgid "Block Reset Settings" msgid "Block Reset Settings"
msgstr "" msgstr ""
@ -499,6 +502,9 @@ msgstr "Skivbildsmapp"
msgid "Disc Default" msgid "Disc Default"
msgstr "Skivans standard" msgstr "Skivans standard"
msgid "Disc Insert Detected"
msgstr ""
msgid "DiskFlip" msgid "DiskFlip"
msgstr "Vänd Skiva" msgstr "Vänd Skiva"
@ -1102,9 +1108,6 @@ msgstr "Inget"
msgid "Network is not initiated." msgid "Network is not initiated."
msgstr "" msgstr ""
msgid "New Disc Detected"
msgstr "Ny skiva upptäckt"
msgid "Next" msgid "Next"
msgstr "Nästa" msgstr "Nästa"
@ -1144,6 +1147,9 @@ msgstr ""
msgid "No file missing!" msgid "No file missing!"
msgstr "Inga filer saknas!" msgstr "Inga filer saknas!"
msgid "No language files to update on your devices! Do you want to download new language files?"
msgstr ""
msgid "No new updates." msgid "No new updates."
msgstr "Inga nya uppdateringar" msgstr "Inga nya uppdateringar"
@ -1797,6 +1803,9 @@ msgstr "av"
msgid "seconds left" msgid "seconds left"
msgstr "sekunder kvar" msgstr "sekunder kvar"
#~ msgid "New Disc Detected"
#~ msgstr "Ny skiva upptäckt"
#~ msgid "USB Device not found" #~ msgid "USB Device not found"
#~ msgstr "USB-enhet ej hittad" #~ msgstr "USB-enhet ej hittad"

17
Languages/tchinese.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-11-20 10:55+0100\n" "POT-Creation-Date: 2011-12-20 21:54+0100\n"
"PO-Revision-Date: 2010-02-15 21:00+0800\n" "PO-Revision-Date: 2010-02-15 21:00+0800\n"
"Last-Translator: Jane.H\n" "Last-Translator: Jane.H\n"
"Language-Team: kyogc, Miller, Mika Li, Jane.H\n" "Language-Team: kyogc, Miller, Mika Li, Jane.H\n"
@ -253,6 +253,9 @@ msgstr "封鎖 Loader 設定"
msgid "Block Parental Settings" msgid "Block Parental Settings"
msgstr "封鎖親子設定" msgstr "封鎖親子設定"
msgid "Block Priiloader Override"
msgstr ""
msgid "Block Reset Settings" msgid "Block Reset Settings"
msgstr "封鎖重置設定" msgstr "封鎖重置設定"
@ -499,6 +502,9 @@ msgstr "光碟圖片路徑"
msgid "Disc Default" msgid "Disc Default"
msgstr "光碟預設" msgstr "光碟預設"
msgid "Disc Insert Detected"
msgstr ""
msgid "DiskFlip" msgid "DiskFlip"
msgstr "光碟滑動" msgstr "光碟滑動"
@ -1102,9 +1108,6 @@ msgstr "皆不顯示"
msgid "Network is not initiated." msgid "Network is not initiated."
msgstr "網路無法啟動。" msgstr "網路無法啟動。"
msgid "New Disc Detected"
msgstr "新光碟已檢查"
msgid "Next" msgid "Next"
msgstr "往後" msgstr "往後"
@ -1144,6 +1147,9 @@ msgstr "沒有選取最愛。"
msgid "No file missing!" msgid "No file missing!"
msgstr "沒有檔案缺少！" msgstr "沒有檔案缺少！"
msgid "No language files to update on your devices! Do you want to download new language files?"
msgstr ""
msgid "No new updates." msgid "No new updates."
msgstr "沒有可用更新。" msgstr "沒有可用更新。"
@ -1797,6 +1803,9 @@ msgstr "的"
msgid "seconds left" msgid "seconds left"
msgstr "剩餘秒數" msgstr "剩餘秒數"
#~ msgid "New Disc Detected"
#~ msgstr "新光碟已檢查"
#~ msgid "USB Device not found" #~ msgid "USB Device not found"
#~ msgstr "找不到 USB 設備" #~ msgstr "找不到 USB 設備"

17
Languages/thai.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-11-20 10:55+0100\n" "POT-Creation-Date: 2011-12-20 21:54+0100\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: Nitro_subzero \n" "Last-Translator: Nitro_subzero \n"
"Language-Team: Nitro_subzero\n" "Language-Team: Nitro_subzero\n"
@ -253,6 +253,9 @@ msgstr ""
msgid "Block Parental Settings" msgid "Block Parental Settings"
msgstr "" msgstr ""
msgid "Block Priiloader Override"
msgstr ""
msgid "Block Reset Settings" msgid "Block Reset Settings"
msgstr "" msgstr ""
@ -499,6 +502,9 @@ msgstr "ที่เก็บ ภาพแผ่น"
msgid "Disc Default" msgid "Disc Default"
msgstr "ค่าตั้งต้นแผ่น" msgstr "ค่าตั้งต้นแผ่น"
msgid "Disc Insert Detected"
msgstr ""
msgid "DiskFlip" msgid "DiskFlip"
msgstr "สลับด้านแผ่น" msgstr "สลับด้านแผ่น"
@ -1102,9 +1108,6 @@ msgstr "ไม่ทั้งสอง"
msgid "Network is not initiated." msgid "Network is not initiated."
msgstr "" msgstr ""
msgid "New Disc Detected"
msgstr "พบแผ่นเกมส์ใหม่"
msgid "Next" msgid "Next"
msgstr "ต่อไป" msgstr "ต่อไป"
@ -1144,6 +1147,9 @@ msgstr ""
msgid "No file missing!" msgid "No file missing!"
msgstr "ไม่มีไฟล์ที่หายไป" msgstr "ไม่มีไฟล์ที่หายไป"
msgid "No language files to update on your devices! Do you want to download new language files?"
msgstr ""
msgid "No new updates." msgid "No new updates."
msgstr "ไม่มีไฟล์ Update ตัวใหม่" msgstr "ไม่มีไฟล์ Update ตัวใหม่"
@ -1797,6 +1803,9 @@ msgstr "จาก"
msgid "seconds left" msgid "seconds left"
msgstr "วินาทีที่เหลือ" msgstr "วินาทีที่เหลือ"
#~ msgid "New Disc Detected"
#~ msgstr "พบแผ่นเกมส์ใหม่"
#~ msgid "USB Device not found" #~ msgid "USB Device not found"
#~ msgstr "ไม่พบอุปกรณ์ USB" #~ msgstr "ไม่พบอุปกรณ์ USB"

17
Languages/turkish.lang
View File

@ -5,7 +5,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: USB Loader GX\n" "Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-11-20 10:55+0100\n" "POT-Creation-Date: 2011-12-20 21:54+0100\n"
"PO-Revision-Date: 2009-10-01 01:00+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n"
"Last-Translator: omercigingelini\n" "Last-Translator: omercigingelini\n"
"Language-Team: omercigingelini\n" "Language-Team: omercigingelini\n"
@ -253,6 +253,9 @@ msgstr ""
msgid "Block Parental Settings" msgid "Block Parental Settings"
msgstr "" msgstr ""
msgid "Block Priiloader Override"
msgstr ""
msgid "Block Reset Settings" msgid "Block Reset Settings"
msgstr "" msgstr ""
@ -499,6 +502,9 @@ msgstr "Disk Görsel Yolu"
msgid "Disc Default" msgid "Disc Default"
msgstr "Disk Varsayılanı" msgstr "Disk Varsayılanı"
msgid "Disc Insert Detected"
msgstr ""
msgid "DiskFlip" msgid "DiskFlip"
msgstr "DiskÇevir" msgstr "DiskÇevir"
@ -1102,9 +1108,6 @@ msgstr "Hiçbiri"
msgid "Network is not initiated." msgid "Network is not initiated."
msgstr "" msgstr ""
msgid "New Disc Detected"
msgstr "Yeni Disk Bulundu"
msgid "Next" msgid "Next"
msgstr "Ileri" msgstr "Ileri"
@ -1144,6 +1147,9 @@ msgstr ""
msgid "No file missing!" msgid "No file missing!"
msgstr "Kayıp dosya yok!" msgstr "Kayıp dosya yok!"
msgid "No language files to update on your devices! Do you want to download new language files?"
msgstr ""
msgid "No new updates." msgid "No new updates."
msgstr "Güncelleme yok" msgstr "Güncelleme yok"
@ -1797,6 +1803,9 @@ msgstr "./"
msgid "seconds left" msgid "seconds left"
msgstr "saniye kaldı" msgstr "saniye kaldı"
#~ msgid "New Disc Detected"
#~ msgstr "Yeni Disk Bulundu"
#~ msgid "USB Device not found" #~ msgid "USB Device not found"
#~ msgstr "USB Aygıtı bulunamadı" #~ msgstr "USB Aygıtı bulunamadı"

5
source/GUI/gui_diskcover.cpp
View File

@ -42,11 +42,6 @@ bool GuiDiskCover::GetBetaRotateEffect()
return eff_step != 0; return eff_step != 0;
} }
void GuiDiskCover::SetSpin(bool Up)
{
spin_up = Up;
}
void GuiDiskCover::SetState(int s, int c) void GuiDiskCover::SetState(int s, int c)
{ {
if(state == STATE_DEFAULT && s == STATE_DISABLED) if(state == STATE_DEFAULT && s == STATE_DISABLED)

2
source/GUI/gui_diskcover.h
View File

@ -13,7 +13,7 @@ class GuiDiskCover: public GuiImage
void SetBetaRotateEffect(f32 beta, u16 Step); void SetBetaRotateEffect(f32 beta, u16 Step);
bool GetBetaRotateEffect(); bool GetBetaRotateEffect();
void SetSpin(bool Up); void SetSpin(bool Up) { spin_up = Up; }
void SetState(int s, int c = -1); void SetState(int s, int c = -1);
void Draw(); void Draw();
private: private:

9
source/language/UpdateLanguage.cpp
View File

@ -15,6 +15,7 @@
#include "network/networkops.h" #include "network/networkops.h"
#include "network/http.h" #include "network/http.h"
#include "network/URL_List.h" #include "network/URL_List.h"
#include "prompts/PromptWindows.h"
#include "prompts/ProgressWindow.h" #include "prompts/ProgressWindow.h"
#include "utils/ShowError.h" #include "utils/ShowError.h"
#include "gecko.h" #include "gecko.h"
@ -99,7 +100,13 @@ int UpdateLanguageFiles()
DirList Dir(Settings.languagefiles_path, ".lang"); DirList Dir(Settings.languagefiles_path, ".lang");
//give up now if we didn't find any //give up now if we didn't find any
if (Dir.GetFilecount() == 0) return -2; if (Dir.GetFilecount() == 0)
{
if(WindowPrompt(tr("Error:"), tr("No language files to update on your devices! Do you want to download new language files?"), tr("Yes"), tr("No")))
return DownloadAllLanguageFiles();
return -2;
}
char savepath[150]; char savepath[150];
char codeurl[200]; char codeurl[200];

2
source/menu.cpp
View File

@ -48,7 +48,7 @@ GuiSound *btnSoundClick = NULL;
GuiSound *btnSoundClick2 = NULL; GuiSound *btnSoundClick2 = NULL;
GuiSound *btnSoundOver = NULL; GuiSound *btnSoundOver = NULL;
int currentMenu = 0; static int currentMenu = 0;
u8 mountMethod = 0; u8 mountMethod = 0;
static lwp_t guithread = LWP_THREAD_NULL; static lwp_t guithread = LWP_THREAD_NULL;

11
source/menu/GameBrowseMenu.cpp
View File

@ -496,7 +496,7 @@ int GameBrowseMenu::Execute()
while(retMenu == MENU_NONE) while(retMenu == MENU_NONE)
{ {
usleep(100); usleep(1000);
if (shutdown) if (shutdown)
Sys_Shutdown(); Sys_Shutdown();
@ -1144,13 +1144,18 @@ int GameBrowseMenu::MainLoop()
void GameBrowseMenu::CheckDiscSlotUpdate() void GameBrowseMenu::CheckDiscSlotUpdate()
{ {
// No need to update every 1 ms
static u32 delayCounter = 0;
if(++delayCounter < 100)
return;
delayCounter = 0;
u32 DiscDriveCover = 0; u32 DiscDriveCover = 0;
WDVD_GetCoverStatus(&DiscDriveCover);//for detecting if i disc has been inserted WDVD_GetCoverStatus(&DiscDriveCover);//for detecting if i disc has been inserted
if ((DiscDriveCover & 0x02) && (DiscDriveCover != DiscDriveCoverOld)) if ((DiscDriveCover & 0x02) && (DiscDriveCover != DiscDriveCoverOld))
{ {
gprintf("\tNew Disc Detected\n"); int choice = WindowPrompt(tr( "Disc Insert Detected" ), 0, tr( "Install" ), tr( "Mount DVD drive" ), tr( "Cancel" ));
int choice = WindowPrompt(tr( "New Disc Detected" ), 0, tr( "Install" ), tr( "Mount DVD drive" ), tr( "Cancel" ));
if (choice == 1) if (choice == 1)
{ {
if(!Settings.godmode && (Settings.ParentalBlocks & BLOCK_GAME_INSTALL)) if(!Settings.godmode && (Settings.ParentalBlocks & BLOCK_GAME_INSTALL))

26
source/prompts/GameWindow.cpp
View File

@ -21,7 +21,7 @@
#define IN 3 #define IN 3
#define OUT 4 #define OUT 4
extern int mountMethod; extern u8 mountMethod;
extern struct discHdr *dvdheader; extern struct discHdr *dvdheader;
GameWindow::GameWindow(int Selected) GameWindow::GameWindow(int Selected)
@ -69,10 +69,10 @@ GameWindow::GameWindow(int Selected)
nameBtn->SetPosition(0, -122); nameBtn->SetPosition(0, -122);
nameBtn->SetSoundOver(btnSoundOver); nameBtn->SetSoundOver(btnSoundOver);
nameBtn->SetSoundClick(btnSoundClick2); nameBtn->SetSoundClick(btnSoundClick2);
if (!mountMethod) nameBtn->SetToolTip(nameBtnTT, 24, -30, ALIGN_LEFT);
if (Settings.godmode == 1 && !mountMethod) if (Settings.godmode == 1 && !mountMethod)
{ {
nameBtn->SetToolTip(nameBtnTT, 24, -30, ALIGN_LEFT);
nameBtn->SetTrigger(trigA); nameBtn->SetTrigger(trigA);
nameBtn->SetEffectGrow(); nameBtn->SetEffectGrow();
} }
@ -171,10 +171,9 @@ GameWindow::GameWindow(int Selected)
if (Settings.ShowPlayCount) Append(playcntTxt); if (Settings.ShowPlayCount) Append(playcntTxt);
Append(backBtn); Append(backBtn);
Append(detailsBtn); Append(detailsBtn);
Append(nameBtn);
if (!mountMethod)//stuff we don't show if it is a DVD mounted if (!mountMethod)//stuff we don't show if it is a DVD mounted
{ {
Append(nameBtn);
if(Settings.LoaderMode != LOAD_CHANNELS)
Append(sizeTxt); Append(sizeTxt);
Append(btnLeft); Append(btnLeft);
Append(btnRight); Append(btnRight);
@ -451,7 +450,12 @@ int GameWindow::Show()
while(choice == -1) while(choice == -1)
{ {
VIDEO_WaitVSync(); usleep(1000);
if (shutdown) //for power button
Sys_Shutdown();
else if (reset) //for reset button
Sys_Reboot();
choice = MainLoop(); choice = MainLoop();
} }
@ -464,17 +468,7 @@ int GameWindow::MainLoop()
diskImg->SetSpin(gameBtn->GetState() == STATE_SELECTED); diskImg->SetSpin(gameBtn->GetState() == STATE_SELECTED);
diskImg2->SetSpin(gameBtn->GetState() == STATE_SELECTED); diskImg2->SetSpin(gameBtn->GetState() == STATE_SELECTED);
if (shutdown) //for power button if (gameBtn->GetState() == STATE_CLICKED)
{
wiilight(0);
Sys_Shutdown();
}
else if (reset == 1) //for reset button
{
wiilight(0);
Sys_Reboot();
}
else if (gameBtn->GetState() == STATE_CLICKED)
{ {
returnVal = 1; returnVal = 1;
} }

2
source/prompts/gameinfo.cpp
View File

@ -25,7 +25,7 @@
#include "utils/ShowError.h" #include "utils/ShowError.h"
#include "BoxCover/BoxCover.hpp" #include "BoxCover/BoxCover.hpp"
extern int mountMethod; extern u8 mountMethod;
extern struct discHdr *dvdheader; extern struct discHdr *dvdheader;
/**************************************************************************** /****************************************************************************

112
source/settings/CGameSettings.cpp
View File

@ -37,6 +37,7 @@ CGameSettings GameSettings;
CGameSettings::CGameSettings() CGameSettings::CGameSettings()
{ {
SetDefault(DefaultConfig);
} }
CGameSettings::~CGameSettings() CGameSettings::~CGameSettings()
@ -46,20 +47,20 @@ CGameSettings::~CGameSettings()
GameCFG * CGameSettings::GetGameCFG(const char * id) GameCFG * CGameSettings::GetGameCFG(const char * id)
{ {
if(!id) if(!id)
return GetDefault(); {
DefaultConfig.id[0] = '\0';
return &DefaultConfig;
}
for(u32 i = 0; i < GameList.size(); ++i) for(u32 i = 0; i < GameList.size(); ++i)
{ {
if(strncasecmp(id, GameList[i].id, 6) == 0) if(strncasecmp(id, GameList[i].id, 6) == 0)
{
return &GameList[i]; return &GameList[i];
} }
}
GameCFG *defaultCFG = GetDefault(); memcpy(DefaultConfig.id, id, 6);
memcpy(defaultCFG->id, id, 6);
return defaultCFG; return &DefaultConfig;
} }
bool CGameSettings::AddGame(const GameCFG & NewGame) bool CGameSettings::AddGame(const GameCFG & NewGame)
@ -68,7 +69,7 @@ bool CGameSettings::AddGame(const GameCFG & NewGame)
{ {
if(strncasecmp(NewGame.id, GameList[i].id, 6) == 0) if(strncasecmp(NewGame.id, GameList[i].id, 6) == 0)
{ {
memcpy(&GameList[i], &NewGame, sizeof(GameCFG)); GameList[i] = NewGame;
return true; return true;
} }
} }
@ -105,7 +106,6 @@ bool CGameSettings::Remove(const char * id)
bool CGameSettings::Load(const char * path) bool CGameSettings::Load(const char * path)
{ {
char line[1024];
char filepath[300]; char filepath[300];
snprintf(filepath, sizeof(filepath), "%sGXGameSettings.cfg", path); snprintf(filepath, sizeof(filepath), "%sGXGameSettings.cfg", path);
@ -120,13 +120,24 @@ bool CGameSettings::Load(const char * path)
return false; return false;
} }
while (fgets(line, sizeof(line), file)) const int lineSize = 20*1024;
char *line = new (std::nothrow) char[lineSize];
if(!line) {
fclose(file);
return false;
}
while (fgets(line, lineSize, file))
{ {
if (line[0] == '#') if (line[0] == '#')
continue; continue;
this->ParseLine(line); this->ParseLine(line);
} }
delete [] line;
fclose(file); fclose(file);
return true; return true;
@ -186,10 +197,11 @@ bool CGameSettings::Save()
fprintf(f, "patchcountrystrings:%d; ", GameList[i].patchcountrystrings); fprintf(f, "patchcountrystrings:%d; ", GameList[i].patchcountrystrings);
fprintf(f, "loadalternatedol:%d; ", GameList[i].loadalternatedol); fprintf(f, "loadalternatedol:%d; ", GameList[i].loadalternatedol);
fprintf(f, "alternatedolstart:%d; ", GameList[i].alternatedolstart); fprintf(f, "alternatedolstart:%d; ", GameList[i].alternatedolstart);
fprintf(f, "alternatedolname:%s; ", GameList[i].alternatedolname); fprintf(f, "alternatedolname:%s; ", GameList[i].alternatedolname.c_str());
fprintf(f, "returnTo:%d; ", GameList[i].returnTo); fprintf(f, "returnTo:%d; ", GameList[i].returnTo);
fprintf(f, "sneekVideoPatch:%d; ", GameList[i].sneekVideoPatch); fprintf(f, "sneekVideoPatch:%d; ", GameList[i].sneekVideoPatch);
fprintf(f, "NandEmuMode:%d; ", GameList[i].NandEmuMode); fprintf(f, "NandEmuMode:%d; ", GameList[i].NandEmuMode);
fprintf(f, "NandEmuPath:%s; ", GameList[i].NandEmuPath.c_str());
fprintf(f, "Hooktype:%d; ", GameList[i].Hooktype); fprintf(f, "Hooktype:%d; ", GameList[i].Hooktype);
fprintf(f, "WiirdDebugger:%d; ", GameList[i].WiirdDebugger); fprintf(f, "WiirdDebugger:%d; ", GameList[i].WiirdDebugger);
fprintf(f, "Locked:%d;\n", GameList[i].Locked); fprintf(f, "Locked:%d;\n", GameList[i].Locked);
@ -200,7 +212,7 @@ bool CGameSettings::Save()
return true; return true;
} }
bool CGameSettings::SetSetting(GameCFG & game, char *name, char *value) bool CGameSettings::SetSetting(GameCFG & game, const char *name, const char *value)
{ {
int i = 0; int i = 0;
@ -294,7 +306,7 @@ bool CGameSettings::SetSetting(GameCFG & game, char *name, char *value)
} }
else if(strcmp(name, "alternatedolname") == 0) else if(strcmp(name, "alternatedolname") == 0)
{ {
snprintf(game.alternatedolname, sizeof(game.alternatedolname), value); game.alternatedolname = value;
return true; return true;
} }
else if(strcmp(name, "returnTo") == 0) else if(strcmp(name, "returnTo") == 0)
@ -321,6 +333,11 @@ bool CGameSettings::SetSetting(GameCFG & game, char *name, char *value)
} }
return true; return true;
} }
else if(strcmp(name, "NandEmuPath") == 0)
{
game.NandEmuPath = value;
return true;
}
else if(strcmp(name, "Hooktype") == 0) else if(strcmp(name, "Hooktype") == 0)
{ {
if (sscanf(value, "%d", &i) == 1) if (sscanf(value, "%d", &i) == 1)
@ -377,7 +394,6 @@ bool CGameSettings::ReadGameID(const char * src, char * GameID, int size)
void CGameSettings::ParseLine(char *line) void CGameSettings::ParseLine(char *line)
{ {
char name[1024], value[1024];
char GameID[8]; char GameID[8];
if(!ReadGameID(line, GameID, 6)) if(!ReadGameID(line, GameID, 6))
@ -387,7 +403,7 @@ void CGameSettings::ParseLine(char *line)
return; return;
GameCFG NewCFG; GameCFG NewCFG;
memcpy(&NewCFG, GetDefault(), sizeof(GameCFG)); SetDefault(NewCFG);
strcpy(NewCFG.id, GameID); strcpy(NewCFG.id, GameID);
@ -401,10 +417,12 @@ void CGameSettings::ParseLine(char *line)
if (!eq) break; if (!eq) break;
this->TrimLine(name, LinePtr, sizeof(name)); std::string name, value;
this->TrimLine(value, eq + 1, sizeof(value));
SetSetting(NewCFG, name, value); this->TrimLine(name, LinePtr, ':');
this->TrimLine(value, eq + 1, ';');
SetSetting(NewCFG, name.c_str(), value.c_str());
LinePtr = strchr(LinePtr, ';'); LinePtr = strchr(LinePtr, ';');
} }
@ -412,23 +430,22 @@ void CGameSettings::ParseLine(char *line)
AddGame(NewCFG); AddGame(NewCFG);
} }
void CGameSettings::TrimLine(char *dest, const char *src, int size) void CGameSettings::TrimLine(std::string &dest, const char *src, char stopChar)
{ {
if(!src)
return;
while (*src == ' ') while (*src == ' ')
src++; src++;
int i = 0; while(*src != 0)
for(i = 0; i < size; i++, src++)
{ {
if(*src == ':' || *src == ';' || *src == '\n' || if(*src == stopChar || *src == '\n' || *src == '\r')
*src == '\r' || *src == '\0')
break; break;
dest[i] = *src; dest.push_back(*src);
src++;
} }
dest[i] = '\0';
} }
int CGameSettings::GetPartenalPEGI(int parental) int CGameSettings::GetPartenalPEGI(int parental)
@ -443,27 +460,26 @@ int CGameSettings::GetPartenalPEGI(int parental)
} }
} }
GameCFG * CGameSettings::GetDefault() void CGameSettings::SetDefault(GameCFG &game)
{ {
memset(DefaultConfig.id, 0, sizeof(DefaultConfig.id)); memset(game.id, 0, sizeof(game.id));
DefaultConfig.video = INHERIT; game.video = INHERIT;
DefaultConfig.language = INHERIT; game.language = INHERIT;
DefaultConfig.ocarina = INHERIT; game.ocarina = INHERIT;
DefaultConfig.vipatch = INHERIT; game.vipatch = INHERIT;
DefaultConfig.ios = INHERIT; game.ios = INHERIT;
DefaultConfig.parentalcontrol = PARENTAL_LVL_EVERYONE; game.parentalcontrol = PARENTAL_LVL_EVERYONE;
DefaultConfig.errorfix002 = INHERIT; game.errorfix002 = INHERIT;
DefaultConfig.patchcountrystrings = INHERIT; game.patchcountrystrings = INHERIT;
DefaultConfig.loadalternatedol = ALT_DOL_DEFAULT; game.loadalternatedol = ALT_DOL_DEFAULT;
DefaultConfig.alternatedolstart = 0; game.alternatedolstart = 0;
DefaultConfig.iosreloadblock = INHERIT; game.iosreloadblock = INHERIT;
DefaultConfig.alternatedolname[0] = '\0'; game.alternatedolname.clear();
DefaultConfig.returnTo = 1; game.returnTo = 1;
DefaultConfig.sneekVideoPatch = INHERIT; game.sneekVideoPatch = INHERIT;
DefaultConfig.NandEmuMode = INHERIT; game.NandEmuMode = INHERIT;
DefaultConfig.Hooktype = INHERIT; game.NandEmuPath.clear();
DefaultConfig.WiirdDebugger = INHERIT; game.Hooktype = INHERIT;
DefaultConfig.Locked = OFF; game.WiirdDebugger = INHERIT;
game.Locked = OFF;
return &DefaultConfig;
} }

35
source/settings/CGameSettings.h
View File

@ -21,13 +21,38 @@ typedef struct _GameCFG
short loadalternatedol; short loadalternatedol;
u32 alternatedolstart; u32 alternatedolstart;
short patchcountrystrings; short patchcountrystrings;
char alternatedolname[40]; std::string alternatedolname;
short returnTo; short returnTo;
short sneekVideoPatch; short sneekVideoPatch;
short NandEmuMode; short NandEmuMode;
std::string NandEmuPath;
short Hooktype; short Hooktype;
short WiirdDebugger; short WiirdDebugger;
short Locked; short Locked;
void operator=(const struct _GameCFG &game)
{
memcpy(this->id, game.id, sizeof(game.id));
this->video = game.video;
this->language = game.language;
this->ocarina = game.ocarina;
this->vipatch = game.vipatch;
this->ios = game.ios;
this->parentalcontrol = game.parentalcontrol;
this->errorfix002 = game.errorfix002;
this->iosreloadblock = game.iosreloadblock;
this->loadalternatedol = game.loadalternatedol;
this->alternatedolstart = game.alternatedolstart;
this->patchcountrystrings = game.patchcountrystrings;
this->alternatedolname = game.alternatedolname;
this->returnTo = game.returnTo;
this->sneekVideoPatch = game.sneekVideoPatch;
this->NandEmuMode = game.NandEmuMode;
this->NandEmuPath = game.NandEmuPath;
this->Hooktype = game.Hooktype;
this->WiirdDebugger = game.WiirdDebugger;
this->Locked = game.Locked;
}
} GameCFG; } GameCFG;
class CGameSettings class CGameSettings
@ -57,17 +82,17 @@ class CGameSettings
GameCFG * GetGameCFG(const struct discHdr * game) { if(!game) return NULL; else return GetGameCFG(game->id); }; GameCFG * GetGameCFG(const struct discHdr * game) { if(!game) return NULL; else return GetGameCFG(game->id); };
//!Quick settings to PEGI conversion //!Quick settings to PEGI conversion
static int GetPartenalPEGI(int parentalsetting); static int GetPartenalPEGI(int parentalsetting);
//!Get the default configuration block //!Set the default configuration block
GameCFG * GetDefault(); void SetDefault(GameCFG &game);
protected: protected:
bool ReadGameID(const char * src, char * GameID, int size); bool ReadGameID(const char * src, char * GameID, int size);
bool SetSetting(GameCFG & game, char *name, char *value); bool SetSetting(GameCFG & game, const char *name, const char *value);
bool ValidVersion(FILE * file); bool ValidVersion(FILE * file);
//!Find the config file in the default paths //!Find the config file in the default paths
bool FindConfig(); bool FindConfig();
void ParseLine(char *line); void ParseLine(char *line);
void TrimLine(char *dest, const char *src, int size); void TrimLine(std::string &dest, const char *src, char stopChar);
std::string ConfigPath; std::string ConfigPath;
std::vector<GameCFG> GameList; std::vector<GameCFG> GameList;
GameCFG DefaultConfig; GameCFG DefaultConfig;

1
source/settings/SettingsEnums.h
View File

@ -180,6 +180,7 @@ enum
BLOCK_HARD_DRIVE_SETTINGS = 0x040000, BLOCK_HARD_DRIVE_SETTINGS = 0x040000,
BLOCK_CATEGORIES_MENU = 0x080000, BLOCK_CATEGORIES_MENU = 0x080000,
BLOCK_SD_RELOAD_BUTTON = 0x100000, BLOCK_SD_RELOAD_BUTTON = 0x100000,
BLOCK_PRIILOADER_OVERRIDE = 0x200000,
BLOCK_ALL = 0xFFFFFFFF, BLOCK_ALL = 0xFFFFFFFF,
}; };

58
source/settings/menus/GameLoadSM.cpp
View File

@ -27,6 +27,7 @@
#include "themes/CTheme.h" #include "themes/CTheme.h"
#include "prompts/PromptWindows.h" #include "prompts/PromptWindows.h"
#include "prompts/DiscBrowser.h" #include "prompts/DiscBrowser.h"
#include "prompts/filebrowser.h"
#include "usbloader/AlternateDOLOffsets.h" #include "usbloader/AlternateDOLOffsets.h"
#include "language/gettext.h" #include "language/gettext.h"
#include "wad/nandtitle.h" #include "wad/nandtitle.h"
@ -114,7 +115,7 @@ static const char * HooktypeText[] =
GameLoadSM::GameLoadSM(const char * GameID) GameLoadSM::GameLoadSM(const char * GameID)
: SettingsMenu(tr("Game Load"), &GuiOptions, MENU_NONE) : SettingsMenu(tr("Game Load"), &GuiOptions, MENU_NONE)
{ {
memcpy(&GameConfig, GameSettings.GetGameCFG(GameID), sizeof(GameCFG)); GameConfig = *GameSettings.GetGameCFG(GameID);
if(!btnOutline) if(!btnOutline)
btnOutline = Resources::GetImageData("button_dialogue_box.png"); btnOutline = Resources::GetImageData("button_dialogue_box.png");
@ -153,7 +154,7 @@ void GameLoadSM::SetDefaultConfig()
{ {
char id[7]; char id[7];
snprintf(id, sizeof(id), GameConfig.id); snprintf(id, sizeof(id), GameConfig.id);
memcpy(&GameConfig, GameSettings.GetDefault(), sizeof(GameCFG)); GameSettings.SetDefault(GameConfig);
snprintf(GameConfig.id, sizeof(GameConfig.id), id); snprintf(GameConfig.id, sizeof(GameConfig.id), id);
} }
@ -175,6 +176,7 @@ void GameLoadSM::SetOptionNames()
Options->SetName(Idx++, "%s", tr( "Select DOL Offset" )); Options->SetName(Idx++, "%s", tr( "Select DOL Offset" ));
Options->SetName(Idx++, "%s", tr( "Block IOS Reload" )); Options->SetName(Idx++, "%s", tr( "Block IOS Reload" ));
Options->SetName(Idx++, "%s", tr( "Nand Emulation" )); Options->SetName(Idx++, "%s", tr( "Nand Emulation" ));
Options->SetName(Idx++, "%s", tr( "Nand Emu Path" ));
Options->SetName(Idx++, "%s", tr( "Hooktype" )); Options->SetName(Idx++, "%s", tr( "Hooktype" ));
Options->SetName(Idx++, "%s", tr( "Wiird Debugger" )); Options->SetName(Idx++, "%s", tr( "Wiird Debugger" ));
Options->SetName(Idx++, "%s", tr( "Game Lock" )); Options->SetName(Idx++, "%s", tr( "Game Lock" ));
@ -258,8 +260,8 @@ void GameLoadSM::SetOptionValues()
Options->SetValue(Idx++, tr("Not required")); Options->SetValue(Idx++, tr("Not required"));
else else
{ {
if(strcmp(GameConfig.alternatedolname, "") != 0) if(GameConfig.alternatedolname.size() != 0)
Options->SetValue(Idx++, "%i <%s>", GameConfig.alternatedolstart, GameConfig.alternatedolname); Options->SetValue(Idx++, "%i <%s>", GameConfig.alternatedolstart, GameConfig.alternatedolname.c_str());
else else
Options->SetValue(Idx++, "%i", GameConfig.alternatedolstart); Options->SetValue(Idx++, "%i", GameConfig.alternatedolstart);
} }
@ -276,6 +278,12 @@ void GameLoadSM::SetOptionValues()
else else
Options->SetValue(Idx++, "%s", tr( NandEmuText[GameConfig.NandEmuMode] )); Options->SetValue(Idx++, "%s", tr( NandEmuText[GameConfig.NandEmuMode] ));
//! Settings: Nand Emu Path
if(GameConfig.NandEmuPath.size() == 0)
Options->SetValue(Idx++, tr("Use global"));
else
Options->SetValue(Idx++, "%s", GameConfig.NandEmuPath.c_str());
//! Settings: Hooktype //! Settings: Hooktype
if(GameConfig.Hooktype == INHERIT) if(GameConfig.Hooktype == INHERIT)
Options->SetValue(Idx++, tr("Use global")); Options->SetValue(Idx++, tr("Use global"));
@ -408,20 +416,23 @@ int GameLoadSM::GetMenuInternal()
return MENU_NONE; //Cancel Button pressed return MENU_NONE; //Cancel Button pressed
} }
char tmp[170];
if (autodol > 0) if (autodol > 0)
{ {
GameConfig.alternatedolstart = autodol; GameConfig.alternatedolstart = autodol;
snprintf(GameConfig.alternatedolname, sizeof(GameConfig.alternatedolname), "%s <%i>", tr( "AUTO" ), autodol); snprintf(tmp, sizeof(tmp), "%s <%i>", tr( "AUTO" ), autodol);
GameConfig.alternatedolname = tmp;
SetOptionValues(); SetOptionValues();
if(parentWindow) parentWindow->SetState(STATE_DEFAULT); if(parentWindow) parentWindow->SetState(STATE_DEFAULT);
return MENU_NONE; return MENU_NONE;
} }
int res = DiscBrowse(GameConfig.id, GameConfig.alternatedolname, sizeof(GameConfig.alternatedolname)); int res = DiscBrowse(GameConfig.id, tmp, sizeof(tmp));
if (res >= 0) if (res >= 0)
{ {
GameConfig.alternatedolname = tmp;
GameConfig.alternatedolstart = res; GameConfig.alternatedolstart = res;
char tmp[170];
snprintf(tmp, sizeof(tmp), "%s %.6s - %i", tr( "It seems that you have some information that will be helpful to us. Please pass this information along to the DEV team." ), (char *) GameConfig.id, GameConfig.alternatedolstart); snprintf(tmp, sizeof(tmp), "%s %.6s - %i", tr( "It seems that you have some information that will be helpful to us. Please pass this information along to the DEV team." ), (char *) GameConfig.id, GameConfig.alternatedolstart);
WindowPrompt(0, tmp, tr( "OK" )); WindowPrompt(0, tmp, tr( "OK" ));
} }
@ -445,6 +456,39 @@ int GameLoadSM::GetMenuInternal()
else if (++GameConfig.NandEmuMode >= 3) GameConfig.NandEmuMode = INHERIT; else if (++GameConfig.NandEmuMode >= 3) GameConfig.NandEmuMode = INHERIT;
} }
//! Settings: Nand Emu Path
else if (ret == ++Idx)
{
if(!IosLoader::IsD2X())
WindowPrompt(tr("Error:"), tr("Nand Emulation is only available on D2X cIOS!"), tr("OK"));
else
{
char entered[300];
snprintf(entered, sizeof(entered), GameConfig.NandEmuPath.c_str());
HaltGui();
GuiWindow * parent = (GuiWindow *) parentElement;
if(parent) parent->SetState(STATE_DISABLED);
this->SetState(STATE_DEFAULT);
this->Remove(optionBrowser);
ResumeGui();
int result = BrowseDevice(entered, sizeof(entered), FB_DEFAULT, noFILES);
if(parent) parent->SetState(STATE_DEFAULT);
this->Append(optionBrowser);
if (result == 1)
{
if (entered[strlen(entered)-1] != '/')
strcat(entered, "/");
GameConfig.NandEmuPath = entered;
WindowPrompt(tr( "Path Changed" ), 0, tr( "OK" ));
}
}
}
//! Settings: Hooktype //! Settings: Hooktype
else if (ret == ++Idx) else if (ret == ++Idx)
{ {

10
source/settings/menus/ParentalControlSM.cpp
View File

@ -78,6 +78,7 @@ ParentalControlSM::ParentalControlSM()
Options->SetName(Idx++, "%s", tr( "Block Categories Menu" )); Options->SetName(Idx++, "%s", tr( "Block Categories Menu" ));
Options->SetName(Idx++, "%s", tr( "Block Categories Modify" )); Options->SetName(Idx++, "%s", tr( "Block Categories Modify" ));
Options->SetName(Idx++, "%s", tr( "Block SD Reload Button" )); Options->SetName(Idx++, "%s", tr( "Block SD Reload Button" ));
Options->SetName(Idx++, "%s", tr( "Block Priiloader Override" ));
SetOptionValues(); SetOptionValues();
} }
@ -171,6 +172,9 @@ void ParentalControlSM::SetOptionValues()
//! Settings: Block SD Reload Button //! Settings: Block SD Reload Button
Options->SetValue(Idx++, "%s", tr(OnOffText[((Settings.ParentalBlocks & BLOCK_SD_RELOAD_BUTTON) != 0)])); Options->SetValue(Idx++, "%s", tr(OnOffText[((Settings.ParentalBlocks & BLOCK_SD_RELOAD_BUTTON) != 0)]));
//! Settings: Block Priiloader Override
Options->SetValue(Idx++, "%s", tr(OnOffText[((Settings.ParentalBlocks & BLOCK_PRIILOADER_OVERRIDE) != 0)]));
} }
int ParentalControlSM::GetMenuInternal() int ParentalControlSM::GetMenuInternal()
@ -370,6 +374,12 @@ int ParentalControlSM::GetMenuInternal()
Settings.ParentalBlocks ^= BLOCK_SD_RELOAD_BUTTON; Settings.ParentalBlocks ^= BLOCK_SD_RELOAD_BUTTON;
} }
//! Settings: Block Priiloader Override
else if (ret == ++Idx)
{
Settings.ParentalBlocks ^= BLOCK_PRIILOADER_OVERRIDE;
}
SetOptionValues(); SetOptionValues();
return MENU_NONE; return MENU_NONE;

2
source/settings/menus/UninstallSM.cpp
View File

@ -34,7 +34,7 @@
#include "usbloader/GameList.h" #include "usbloader/GameList.h"
#include "wstring.hpp" #include "wstring.hpp"
extern int mountMethod; extern u8 mountMethod;
UninstallSM::UninstallSM(struct discHdr * header) UninstallSM::UninstallSM(struct discHdr * header)
: SettingsMenu(tr("Uninstall Menu"), &GuiOptions, MENU_NONE) : SettingsMenu(tr("Uninstall Menu"), &GuiOptions, MENU_NONE)

6
source/sys.cpp
View File

@ -78,6 +78,7 @@ void AppCleanUp(void)
ExitGUIThreads(); ExitGUIThreads();
StopGX(); StopGX();
wiilight(0);
delete btnSoundClick; delete btnSoundClick;
delete btnSoundOver; delete btnSoundOver;
@ -169,9 +170,12 @@ void Sys_LoadMenu(void)
{ {
ExitApp(); ExitApp();
// Preloader shutup // Priiloader shutup
if (Settings.godmode || !(Settings.ParentalBlocks & BLOCK_PRIILOADER_OVERRIDE))
{
*(u32 *)0x8132fffb = 0x50756e65; *(u32 *)0x8132fffb = 0x50756e65;
DCFlushRange((u32 *)0x8132fffb, 4); DCFlushRange((u32 *)0x8132fffb, 4);
}
/* Return to the Wii system menu */ /* Return to the Wii system menu */
SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0); SYS_ResetSystem(SYS_RETURNTOMENU, 0, 0);

25
source/usbloader/GameBooter.cpp
View File

@ -52,7 +52,7 @@
u32 AppEntrypoint = 0; u32 AppEntrypoint = 0;
struct discHdr *dvdheader = NULL; struct discHdr *dvdheader = NULL;
extern int mountMethod; extern u8 mountMethod;
int GameBooter::BootGCMode() int GameBooter::BootGCMode()
{ {
@ -218,12 +218,12 @@ int GameBooter::BootGame(const char * gameID)
if(!gameID || strlen(gameID) < 3) if(!gameID || strlen(gameID) < 3)
return -1; return -1;
if (mountMethod == 2)
return BootGCMode();
if(Settings.Wiinnertag) if(Settings.Wiinnertag)
Wiinnertag::TagGame(gameID); Wiinnertag::TagGame(gameID);
if(mountMethod == 2)
return BootGCMode();
AppCleanUp(); AppCleanUp();
gprintf("\tSettings.partition: %d\n", Settings.partition); gprintf("\tSettings.partition: %d\n", Settings.partition);
@ -235,6 +235,10 @@ int GameBooter::BootGame(const char * gameID)
if(ret < 0) if(ret < 0)
return ret; return ret;
//! Set game mode if loading a disc
if(mountMethod)
Settings.LoaderMode = LOAD_GAMES;
//! Remember game's USB port //! Remember game's USB port
int partition = gameList.GetPartitionNumber(gameHeader.id); int partition = gameList.GetPartitionNumber(gameHeader.id);
int usbport = DeviceHandler::PartitionToUSBPort(partition); int usbport = DeviceHandler::PartitionToUSBPort(partition);
@ -252,10 +256,16 @@ int GameBooter::BootGame(const char * gameID)
u8 alternatedol = game_cfg->loadalternatedol; u8 alternatedol = game_cfg->loadalternatedol;
u32 alternatedoloffset = game_cfg->alternatedolstart; u32 alternatedoloffset = game_cfg->alternatedolstart;
u8 reloadblock = game_cfg->iosreloadblock == INHERIT ? Settings.BlockIOSReload : game_cfg->iosreloadblock; u8 reloadblock = game_cfg->iosreloadblock == INHERIT ? Settings.BlockIOSReload : game_cfg->iosreloadblock;
u8 NandEmuMode = game_cfg->NandEmuMode == INHERIT ? Settings.NandEmuMode : game_cfg->NandEmuMode;
u8 Hooktype = game_cfg->Hooktype == INHERIT ? Settings.Hooktype : game_cfg->Hooktype; u8 Hooktype = game_cfg->Hooktype == INHERIT ? Settings.Hooktype : game_cfg->Hooktype;
u8 WiirdDebugger = game_cfg->WiirdDebugger == INHERIT ? Settings.WiirdDebugger : game_cfg->WiirdDebugger; u8 WiirdDebugger = game_cfg->WiirdDebugger == INHERIT ? Settings.WiirdDebugger : game_cfg->WiirdDebugger;
u64 returnToChoice = game_cfg->returnTo ? NandTitles.FindU32(Settings.returnTo) : 0; u64 returnToChoice = game_cfg->returnTo ? NandTitles.FindU32(Settings.returnTo) : 0;
u8 NandEmuMode = game_cfg->NandEmuMode == INHERIT ? Settings.NandEmuMode : game_cfg->NandEmuMode;
const char *NandEmuPath = game_cfg->NandEmuPath.size() == 0 ? Settings.NandEmuPath : game_cfg->NandEmuPath.c_str();
if(Settings.LoaderMode == LOAD_CHANNELS)
{
NandEmuMode = game_cfg->NandEmuMode == INHERIT ? Settings.NandEmuChanMode : game_cfg->NandEmuMode;
NandEmuPath = game_cfg->NandEmuPath.size() == 0 ? Settings.NandEmuChanPath : game_cfg->NandEmuPath.c_str();
}
if(ocarinaChoice && Hooktype == OFF) if(ocarinaChoice && Hooktype == OFF)
Hooktype = 1; Hooktype = 1;
@ -277,10 +287,7 @@ int GameBooter::BootGame(const char * gameID)
Playlog_Update((char *) gameHeader.id, BNRInstance::Instance()->GetIMETTitle(CONF_GetLanguage())); Playlog_Update((char *) gameHeader.id, BNRInstance::Instance()->GetIMETTitle(CONF_GetLanguage()));
//! Setup NAND emulation //! Setup NAND emulation
if(Settings.LoaderMode != LOAD_CHANNELS) SetupNandEmu(NandEmuMode, NandEmuPath, gameHeader);
SetupNandEmu(NandEmuMode, Settings.NandEmuPath, gameHeader);
else
SetupNandEmu(Settings.NandEmuChanMode, Settings.NandEmuChanPath, gameHeader);
// Load wip codes // Load wip codes
load_wip_code(gameHeader.id); load_wip_code(gameHeader.id);

13
source/usbloader/GetMissingGameFiles.cpp
View File

@ -6,6 +6,8 @@
#include "wstring.hpp" #include "wstring.hpp"
#include "gecko.h" #include "gecko.h"
extern struct discHdr *dvdheader;
/************************************************************************************** /**************************************************************************************
* FindMissingFiles * FindMissingFiles
* Inputs: * Inputs:
@ -51,6 +53,17 @@ int GetMissingGameFiles(const char * path, const char * fileext, std::vector<std
MissingFilesList.push_back(std::string(gameID)); MissingFilesList.push_back(std::string(gameID));
} }
if(dvdheader)
{
snprintf(gameID, sizeof(gameID), "%s", (char *) dvdheader->id);
snprintf(filepath, sizeof(filepath), "%s/%s%s", path, gameID, fileext);
if (!CheckFile(filepath)) {
//! Not found, add missing dvd header to list
MissingFilesList.push_back(std::string(gameID));
}
}
//! Bring game list to the old state //! Bring game list to the old state
gameList.FilterList(oldFilter.c_str()); gameList.FilterList(oldFilter.c_str());

11
source/usbloader/disc.c
View File

@ -65,9 +65,10 @@ void Disc_SelectVMode(u8 videoselected)
/* Get video mode configuration */ /* Get video mode configuration */
bool progressive = (CONF_GetProgressiveScan() > 0) && VIDEO_HaveComponentCable(); bool progressive = (CONF_GetProgressiveScan() > 0) && VIDEO_HaveComponentCable();
u32 tvmode = CONF_GetVideo();
/* Select video mode register */ /* Select video mode register */
switch (CONF_GetVideo()) switch (tvmode)
{ {
case CONF_VIDEO_PAL: case CONF_VIDEO_PAL:
if (CONF_GetEuRGB60() > 0) if (CONF_GetEuRGB60() > 0)
@ -101,7 +102,7 @@ void Disc_SelectVMode(u8 videoselected)
case 'P': case 'P':
case 'X': case 'X':
case 'Y': case 'Y':
if (CONF_GetVideo() != CONF_VIDEO_PAL) if (tvmode != CONF_VIDEO_PAL)
{ {
vmode_reg = VI_PAL; vmode_reg = VI_PAL;
vmode = progressive ? &TVNtsc480Prog : &TVNtsc480IntDf; vmode = progressive ? &TVNtsc480Prog : &TVNtsc480IntDf;
@ -111,7 +112,7 @@ void Disc_SelectVMode(u8 videoselected)
case 'E': case 'E':
case 'J': case 'J':
default: default:
if (CONF_GetVideo() != CONF_VIDEO_NTSC) if (tvmode != CONF_VIDEO_NTSC)
{ {
vmode_reg = VI_NTSC; vmode_reg = VI_NTSC;
vmode = progressive ? &TVNtsc480Prog : &TVEurgb60Hz480IntDf; vmode = progressive ? &TVNtsc480Prog : &TVEurgb60Hz480IntDf;
@ -132,12 +133,12 @@ void Disc_SelectVMode(u8 videoselected)
vmode_reg = vmode->viTVMode >> 2; vmode_reg = vmode->viTVMode >> 2;
break; break;
case VIDEO_MODE_PAL480P: case VIDEO_MODE_PAL480P:
vmode_reg = TVEurgb60Hz480Prog.viTVMode >> 2;
vmode = &TVNtsc480Prog; vmode = &TVNtsc480Prog;
vmode_reg = TVEurgb60Hz480Prog.viTVMode >> 2;
break; break;
case VIDEO_MODE_NTSC480P: case VIDEO_MODE_NTSC480P:
vmode_reg = VI_NTSC;
vmode = &TVNtsc480Prog; vmode = &TVNtsc480Prog;
vmode_reg = vmode->viTVMode >> 2;
break; break;
case VIDEO_MODE_SYSDEFAULT: // AUTO PATCH TO SYSTEM case VIDEO_MODE_SYSDEFAULT: // AUTO PATCH TO SYSTEM
break; break;