diff --git a/HBC/META.XML b/HBC/META.XML index 83466734..4cdda8a6 100644 --- a/HBC/META.XML +++ b/HBC/META.XML @@ -2,8 +2,8 @@ USB Loader GX USB Loader GX Team - 2.1 r1087 - 201106041627 + 2.1 r1088 + 201106051007 Loads games from USB-devices USB Loader GX is a libwiigui based USB iso loader with a wii-like GUI. You can install games to your HDDs and boot them with shorter loading times. diff --git a/Languages/czech.lang b/Languages/czech.lang index b856b27e..44c8212d 100644 --- a/Languages/czech.lang +++ b/Languages/czech.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-04 18:25+0200\n" +"POT-Creation-Date: 2011-06-10 14:06+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" @@ -174,6 +174,9 @@ msgstr "Srp" msgid "Author(s):" msgstr "" +msgid "Auto" +msgstr "" + msgid "AutoInit Network" msgstr "Automatický start síte" diff --git a/Languages/danish.lang b/Languages/danish.lang index 165096f2..685cbf5b 100644 --- a/Languages/danish.lang +++ b/Languages/danish.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-04 18:25+0200\n" +"POT-Creation-Date: 2011-06-10 14:06+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: Fox888[dk]\n" "Language-Team: [dk]\n" @@ -174,6 +174,9 @@ msgstr "" msgid "Author(s):" msgstr "Forfatter" +msgid "Auto" +msgstr "" + msgid "AutoInit Network" msgstr "AutoInit netværk" diff --git a/Languages/dutch.lang b/Languages/dutch.lang index 2d00701f..215c3f3e 100644 --- a/Languages/dutch.lang +++ b/Languages/dutch.lang @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-04 18:25+0200\n" -"PO-Revision-Date: 2011-03-16 08:16+0100\n" +"POT-Creation-Date: 2011-06-10 14:09+0200\n" +"PO-Revision-Date: 2011-06-10 08:07+0100\n" "Last-Translator: glowy\n" "Language-Team: tj_cool, glowy\n" "MIME-Version: 1.0\n" @@ -124,10 +124,10 @@ msgid "AUTO" msgstr "" msgid "Add category" -msgstr "" +msgstr "Categorie toevoegen" msgid "All" -msgstr "" +msgstr "Alle" msgid "All Partitions" msgstr "Alle partities" @@ -154,10 +154,10 @@ msgid "Apr" msgstr "" msgid "Are you sure you want to delete this category?" -msgstr "" +msgstr "Weet je zeker dat je deze categorie wilt verwijderen?" msgid "Are you sure you want to import game categories from WiiTDB?" -msgstr "" +msgstr "Weet je zeker dat je spel categorieën wilt importeren van WiiTDB?" msgid "Are you sure you want to lock USB Loader GX?" msgstr "Weet je zeker dat je USB Loader GX wilt vergrendelen" @@ -174,6 +174,9 @@ msgstr "" msgid "Author(s):" msgstr "Auteur(s):" +msgid "Auto" +msgstr "" + msgid "AutoInit Network" msgstr "Netwerk Auto init." @@ -196,7 +199,7 @@ msgid "Big thanks to:" msgstr "Grote dank aan:" msgid "Block Categories Modify" -msgstr "" +msgstr "Blokkeer categorieën wijzigen" msgid "Block Cover Downloads" msgstr "Blokkeer Downloads van Hoesjes" @@ -284,10 +287,10 @@ msgid "Cannot write to destination." msgstr "Kan niet naar bestemming schrijven." msgid "Categories" -msgstr "" +msgstr "Categorieën" msgid "Categories:" -msgstr "" +msgstr "Categorieën:" msgid "Change Play Path" msgstr "Verander afspeel locatie" @@ -336,7 +339,7 @@ msgid "Console must be unlocked for this option." msgstr "Console moet ontgrendeld zijn voor deze optie." msgid "Console must be unlocked to be able to use this." -msgstr "" +msgstr "Console moet worden vrijgegeven om dit te kunnen gebruiken." msgid "Console should be unlocked to modify it." msgstr "Console moet worden vrijgegeven om te wijzigen." @@ -373,7 +376,7 @@ msgid "Could not open Disc" msgstr "Kan disk niet openen" msgid "Could not open the WiiTDB.xml file." -msgstr "" +msgstr "Kan het WiiTDB.xml bestand niet openen." msgid "Could not open wiitdb.xml." msgstr "Kan wiitdb.xml niet openen." @@ -430,7 +433,7 @@ msgid "Delete Disc Artwork" msgstr "Disk labels verwijderen" msgid "Delete category" -msgstr "" +msgstr "Verwijder categorie" msgid "Design:" msgstr "Ontwerp:" @@ -643,10 +646,10 @@ msgid "Force NTSC" msgstr "Forceer NTSC" msgid "Force NTSC480p" -msgstr "" +msgstr "Forceer NTSC480p" msgid "Force PAL480p" -msgstr "" +msgstr "Forceer PAL480p" msgid "Force PAL50" msgstr "Forceer PAL50" @@ -772,13 +775,13 @@ msgid "How to Shutdown?" msgstr "Hoe uitzetten?" msgid "Import categories" -msgstr "" +msgstr "Importeer categorieën" msgid "Import categories from WiiTDB" -msgstr "" +msgstr "Importeer categorieën van WiiTDB" msgid "Import operation successfully completed." -msgstr "" +msgstr "Importeren succesvol afgerond" #, c-format msgid "Incoming file %0.2fKB" @@ -1216,7 +1219,7 @@ msgid "Select a DOL from Game" msgstr "Selecteer een DOL van Spel" msgid "Select game categories" -msgstr "" +msgstr "Selecteer spel categorieën" msgid "Sept" msgstr "Sep" @@ -1228,7 +1231,7 @@ msgid "Settings" msgstr "Instellingen" msgid "Show Categories" -msgstr "" +msgstr "Toon categorieën" msgid "Show Free Space" msgstr "Vrije ruimte weergeven" @@ -1436,7 +1439,7 @@ msgid "Uploaded ZIP file installed to homebrew directory." msgstr "Geuploade ZIP is geïnstalleerd in je homebrew locatie." msgid "Use global" -msgstr "" +msgstr "Gebruik globaal" msgid "VIDTV Patch" msgstr "VIDTV patchen" @@ -1461,7 +1464,7 @@ msgid "Waiting..." msgstr "Wachten..." msgid "Warning" -msgstr "" +msgstr "Waarschuwing" msgid "Warning:" msgstr "Waarschuwing:" @@ -1512,7 +1515,7 @@ msgid "You are trying to select a FAT32/NTFS/EXT partition with cIOS 249 Rev < 1 msgstr "Je probeert een FAT32/NTFS/EXT partitie te selecteren met cIOS 249 Rev < 18. Dit word niet ondersteund. Verder gaan is op eigen risico." msgid "You cannot delete this category." -msgstr "" +msgstr "Je kunt deze categorie niet verwijderen." msgid "You need to select or format a partition" msgstr "Je moet een partitie selecteren of formatteren" diff --git a/Languages/english.lang b/Languages/english.lang index f8c8437b..975ee0d9 100644 --- a/Languages/english.lang +++ b/Languages/english.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-04 18:25+0200\n" +"POT-Creation-Date: 2011-06-10 14:06+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -174,6 +174,9 @@ msgstr "" msgid "Author(s):" msgstr "" +msgid "Auto" +msgstr "" + msgid "AutoInit Network" msgstr "" diff --git a/Languages/finnish.lang b/Languages/finnish.lang index 69e9abb7..e09eaff7 100644 --- a/Languages/finnish.lang +++ b/Languages/finnish.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-04 18:25+0200\n" +"POT-Creation-Date: 2011-06-10 14:06+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: c64rmx\n" "Language-Team: \n" @@ -174,6 +174,9 @@ msgstr "elo" msgid "Author(s):" msgstr "" +msgid "Auto" +msgstr "" + msgid "AutoInit Network" msgstr "Autom. verkon käynnistys" diff --git a/Languages/french.lang b/Languages/french.lang index 3b716051..5552b6ed 100644 --- a/Languages/french.lang +++ b/Languages/french.lang @@ -1,11 +1,11 @@ # USB Loader GX language source file. -# French.lang for r1076 (2.1) +# French.lang for r1087 # don't delete/change this line (é). msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-04 18:25+0200\n" +"POT-Creation-Date: 2011-06-10 14:09+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: Cyan\n" "Language-Team: Badablek, Amour, ikya & Kin8\n" @@ -124,7 +124,7 @@ msgid "AUTO" msgstr "" msgid "Add category" -msgstr "" +msgstr "Nouv. catégorie" msgid "All" msgstr "" @@ -154,10 +154,10 @@ msgid "Apr" msgstr "Avr" msgid "Are you sure you want to delete this category?" -msgstr "" +msgstr "Êtes-vous sûr de vouloir supprimer cette catégorie ?" msgid "Are you sure you want to import game categories from WiiTDB?" -msgstr "" +msgstr "Êtes-vous sûr de vouloir importer les catégories de jeux à partir de WiiTDB ?" msgid "Are you sure you want to lock USB Loader GX?" msgstr "Êtes-vous sûr de vouloir verrouiller USB loader GX ?" @@ -174,6 +174,9 @@ msgstr "Août" msgid "Author(s):" msgstr "Auteur(s):" +msgid "Auto" +msgstr "" + msgid "AutoInit Network" msgstr "AutoInit réseau" @@ -196,7 +199,7 @@ msgid "Big thanks to:" msgstr "Grand merci à:" msgid "Block Categories Modify" -msgstr "" +msgstr "Bloquer modif. catégories" msgid "Block Cover Downloads" msgstr "Bloquer Téléch. jaquettes" @@ -284,10 +287,10 @@ msgid "Cannot write to destination." msgstr "Écriture impossible." msgid "Categories" -msgstr "" +msgstr "Catégories" msgid "Categories:" -msgstr "" +msgstr "Catégories:" msgid "Change Play Path" msgstr "Changer dossier" @@ -336,7 +339,7 @@ msgid "Console must be unlocked for this option." msgstr "La console doit être déverrouillée." msgid "Console must be unlocked to be able to use this." -msgstr "" +msgstr "La console doit être déverrouillée." msgid "Console should be unlocked to modify it." msgstr "La console doit être déverrouillée." @@ -373,7 +376,7 @@ msgid "Could not open Disc" msgstr "Ouverture DVD impossible" msgid "Could not open the WiiTDB.xml file." -msgstr "" +msgstr "Impossible d'ouvrir wiitdb.xml." msgid "Could not open wiitdb.xml." msgstr "Impossible d'ouvrir wiitdb.xml." @@ -430,7 +433,7 @@ msgid "Delete Disc Artwork" msgstr "Supprimer le label DVD" msgid "Delete category" -msgstr "" +msgstr "Sup. catégorie" msgid "Design:" msgstr "Graphisme:" @@ -643,10 +646,10 @@ msgid "Force NTSC" msgstr "Forcer NTSC" msgid "Force NTSC480p" -msgstr "" +msgstr "Forcer NTSC480p" msgid "Force PAL480p" -msgstr "" +msgstr "Forcer PAL480p" msgid "Force PAL50" msgstr "Forcer PAL50" @@ -772,13 +775,13 @@ msgid "How to Shutdown?" msgstr "Arrêt de la Wii ?" msgid "Import categories" -msgstr "" +msgstr "Importer les catégories" msgid "Import categories from WiiTDB" -msgstr "" +msgstr "Importer les catégories" msgid "Import operation successfully completed." -msgstr "" +msgstr "Catégories importées avec succès." #, c-format msgid "Incoming file %0.2fKB" @@ -1216,7 +1219,7 @@ msgid "Select a DOL from Game" msgstr "Sélectionner un DOL à partir du jeu" msgid "Select game categories" -msgstr "" +msgstr "Filtrer par catégories de jeux" msgid "Sept" msgstr "" @@ -1228,10 +1231,10 @@ msgid "Settings" msgstr "Paramètres" msgid "Show Categories" -msgstr "" +msgstr "Afficher les catégories" msgid "Show Free Space" -msgstr "Montrer l'espace libre" +msgstr "Afficher l'espace libre" msgid "Shutdown System" msgstr "Arrêt" @@ -1436,7 +1439,7 @@ msgid "Uploaded ZIP file installed to homebrew directory." msgstr "Fichier ZIP envoyé et installé dans le répertoire homebrew." msgid "Use global" -msgstr "" +msgstr "Paramètre du loader" msgid "VIDTV Patch" msgstr "Patch VIDTV" @@ -1461,7 +1464,7 @@ msgid "Waiting..." msgstr "En attente..." msgid "Warning" -msgstr "" +msgstr "Attention" msgid "Warning:" msgstr "Attention:" @@ -1512,7 +1515,7 @@ msgid "You are trying to select a FAT32/NTFS/EXT partition with cIOS 249 Rev < 1 msgstr "Vous essayez de sélectionner une partition FAT32/NTFS/EXT avec un cIOS 249 Rev < 18 (non supporté). Continuez à vos risques." msgid "You cannot delete this category." -msgstr "" +msgstr "Vous ne pouvez pas supprimer cette catégorie." msgid "You need to select or format a partition" msgstr "Vous devez choisir ou formater une partition" diff --git a/Languages/german.lang b/Languages/german.lang index 6c90b6bf..54c127f2 100644 --- a/Languages/german.lang +++ b/Languages/german.lang @@ -1,11 +1,11 @@ # USB Loader GX -# german language source file - r1075 RC1 +# german language source file - r1087 # don't delete/change this line (é). msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-04 18:25+0200\n" +"POT-Creation-Date: 2011-06-10 14:09+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" @@ -124,10 +124,10 @@ msgid "AUTO" msgstr "AUTO" msgid "Add category" -msgstr "" +msgstr "Ketegorie hinzuf." msgid "All" -msgstr "" +msgstr "Alle" msgid "All Partitions" msgstr "Alle Partitionen" @@ -154,10 +154,10 @@ msgid "Apr" msgstr "April" msgid "Are you sure you want to delete this category?" -msgstr "" +msgstr "Soll diese Kategorie gelöscht werden?" msgid "Are you sure you want to import game categories from WiiTDB?" -msgstr "" +msgstr "Sollen die Spiele-Kategorien aus der WiiTDB importiert werden?" msgid "Are you sure you want to lock USB Loader GX?" msgstr "Bist du sicher, dass du USB Loader GX sperren willst?" @@ -174,6 +174,9 @@ msgstr "August" msgid "Author(s):" msgstr "Autor(en)" +msgid "Auto" +msgstr "" + msgid "AutoInit Network" msgstr "Autoinit. Netzwerk" @@ -196,7 +199,7 @@ msgid "Big thanks to:" msgstr "Großen Dank an:" msgid "Block Categories Modify" -msgstr "" +msgstr "Sperre Kategorieänderung" msgid "Block Cover Downloads" msgstr "Blocke Cover-Downloads" @@ -284,10 +287,10 @@ msgid "Cannot write to destination." msgstr "Ziel kann nicht beschrieben werden." msgid "Categories" -msgstr "" +msgstr "Kategorien" msgid "Categories:" -msgstr "" +msgstr "Kategorien:" msgid "Change Play Path" msgstr "Pfad ändern" @@ -336,7 +339,7 @@ msgid "Console must be unlocked for this option." msgstr "Gerät muss für diese Option entsperrt werden." msgid "Console must be unlocked to be able to use this." -msgstr "" +msgstr "Gerät muss für diese Nutzung entsperrt werden." msgid "Console should be unlocked to modify it." msgstr "Konsole muss zum Bearbeiten entsperrt werden." @@ -373,7 +376,7 @@ msgid "Could not open Disc" msgstr "Disk konnte nicht geöffnet werden." msgid "Could not open the WiiTDB.xml file." -msgstr "" +msgstr "WiiTDB.xml konnte nicht geöffnet werden." msgid "Could not open wiitdb.xml." msgstr "Konnte wiitdb.xml nicht öffnen." @@ -430,7 +433,7 @@ msgid "Delete Disc Artwork" msgstr "Lösche Disc Cover" msgid "Delete category" -msgstr "" +msgstr "Lösche Kategorie" msgid "Design:" msgstr "Design:" @@ -640,19 +643,19 @@ msgid "Font Scale Factor" msgstr "Schriftskalierwert" msgid "Force NTSC" -msgstr "Erzwinge NTSC" +msgstr "NTSC erzw." msgid "Force NTSC480p" -msgstr "" +msgstr "NTSC480p erzw." msgid "Force PAL480p" -msgstr "" +msgstr "PAL480p erzw." msgid "Force PAL50" -msgstr "Erzwinge PAL50" +msgstr "PAL50 erzw." msgid "Force PAL60" -msgstr "Erzwinge PAL60" +msgstr "PAL60 erzw." msgid "Format" msgstr "Formatieren" @@ -772,13 +775,13 @@ msgid "How to Shutdown?" msgstr "Wie soll ausgeschaltet werden?" msgid "Import categories" -msgstr "" +msgstr "Importiere Kategorien" msgid "Import categories from WiiTDB" -msgstr "" +msgstr "Import. Kategorien (WiiTDB)" msgid "Import operation successfully completed." -msgstr "" +msgstr "Import erfolgreich." #, c-format msgid "Incoming file %0.2fKB" @@ -873,7 +876,7 @@ msgid "Like SysMenu" msgstr "System Menü" msgid "List on Gamelaunch" -msgstr "" +msgstr "Auflisten beim Spielstart" msgid "Load" msgstr "Laden" @@ -1216,7 +1219,7 @@ msgid "Select a DOL from Game" msgstr "Wähle eine DOL vom Spiel" msgid "Select game categories" -msgstr "" +msgstr "Wähle Spiele-Kategorien" msgid "Sept" msgstr "September" @@ -1228,7 +1231,7 @@ msgid "Settings" msgstr "Einstellungen" msgid "Show Categories" -msgstr "" +msgstr "Zeige Kategorien" msgid "Show Free Space" msgstr "Zeige frei. Speicher" @@ -1436,7 +1439,7 @@ msgid "Uploaded ZIP file installed to homebrew directory." msgstr "Die hochgeladene ZIP Datei wurde ins Homebrew Verzeichnis installiert." msgid "Use global" -msgstr "" +msgstr "Benutze global" msgid "VIDTV Patch" msgstr "VIDTV Patch" @@ -1461,7 +1464,7 @@ msgid "Waiting..." msgstr "Warte..." msgid "Warning" -msgstr "" +msgstr "Warnung" msgid "Warning:" msgstr "Warnung:" @@ -1512,7 +1515,7 @@ msgid "You are trying to select a FAT32/NTFS/EXT partition with cIOS 249 Rev < 1 msgstr "Es wird versucht eine FAT32/NTFS/EXT Partition mit dem cIOS 249 Rev < 18 auszuwählen. Das wird nicht unterstützt. Weiter auf eigene Gefahr." msgid "You cannot delete this category." -msgstr "" +msgstr "Kategorie kann nicht gelöscht werden." msgid "You need to select or format a partition" msgstr "Du must eine Partition auswählen oder formatieren." diff --git a/Languages/hungarian.lang b/Languages/hungarian.lang index 7dbdde95..93a12bfa 100644 --- a/Languages/hungarian.lang +++ b/Languages/hungarian.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-04 18:25+0200\n" +"POT-Creation-Date: 2011-06-10 14:06+0200\n" "PO-Revision-Date: 2009-12-29 11:05+0100\n" "Last-Translator: Springdale\n" "Language-Team: Tusk, Springdale\n" @@ -174,6 +174,9 @@ msgstr "" msgid "Author(s):" msgstr "" +msgid "Auto" +msgstr "" + msgid "AutoInit Network" msgstr "Hálózat AutoInit" diff --git a/Languages/italian.lang b/Languages/italian.lang index 78c4f152..12a0bfb4 100644 --- a/Languages/italian.lang +++ b/Languages/italian.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-04 18:25+0200\n" +"POT-Creation-Date: 2011-06-10 14:06+0200\n" "PO-Revision-Date: 2011-03-10 21:00+0200\n" "Last-Translator: Cambo \n" "Language-Team: Cambo\n" @@ -174,6 +174,9 @@ msgstr "agosto" msgid "Author(s):" msgstr "Autore/i:" +msgid "Auto" +msgstr "" + msgid "AutoInit Network" msgstr "Inizializz. Rete Automatica" diff --git a/Languages/japanese.lang b/Languages/japanese.lang index 3affba47..a9794fbe 100644 --- a/Languages/japanese.lang +++ b/Languages/japanese.lang @@ -5,9 +5,9 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-04 18:25+0200\n" +"POT-Creation-Date: 2011-06-10 14:06+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" -"Last-Translator: ichiroling\n" +"Last-Translator: hosigumayuugi\n" "Language-Team: hosigumayuugi, papa, ichiroling\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -17,18 +17,18 @@ msgid " could not be downloaded." msgstr "ダウンロードできませんでした" msgid " has been Saved. The text has not been verified. Some of the code may not work right with each other. If you experience trouble, open the text in a real text editor for more information." -msgstr "に保存されました。使用は 自己責任でお願いします。" +msgstr "に保存されました。使用は 自己責任でお願いします" msgid " is not on the server." msgstr "はサーバーにありません" #, c-format msgid "%i files not found on the server!" -msgstr "%i 個のファイルがサーバーにありません。" +msgstr "%i 個のファイルがサーバーにありません" #, c-format msgid "%i missing files" -msgstr "%i 個のファイルが足りません。" +msgstr "%i 個のファイルが不足しています" msgid "0 (Everyone)" msgstr "セットしない" @@ -61,10 +61,10 @@ msgid "30 min" msgstr "30分" msgid "3D Cover Path" -msgstr "3Dカバー" +msgstr "3Dカバー" msgid "3D Covers" -msgstr "3Dカバー" +msgstr "3Dカバー" msgid "4 (Adults Only 18+)" msgstr "CERO Zを制限" @@ -124,10 +124,10 @@ msgid "AUTO" msgstr "自動" msgid "Add category" -msgstr "" +msgstr "カテゴリを追加" msgid "All" -msgstr "" +msgstr "全て" msgid "All Partitions" msgstr "全ての領域" @@ -136,10 +136,10 @@ msgid "All images downloaded successfully." msgstr "全ての画像をダウンロードしました" msgid "All the features of USB Loader GX are unlocked." -msgstr "GXの使用制限が解除されました" +msgstr "使用制限が解除されました" msgid "Alternate DOL" -msgstr "代理DOL起動" +msgstr "代替DOL起動" msgid "Anti" msgstr "アンチ" @@ -154,10 +154,10 @@ msgid "Apr" msgstr "4月" msgid "Are you sure you want to delete this category?" -msgstr "" +msgstr "カテゴリを削除しますか?" msgid "Are you sure you want to import game categories from WiiTDB?" -msgstr "" +msgstr "WiiTDBからカテゴリをインポートしますか?" msgid "Are you sure you want to lock USB Loader GX?" msgstr "USB Loader GXをロックしますか?" @@ -174,14 +174,17 @@ msgstr "8月" msgid "Author(s):" msgstr "制作者:" +msgid "Auto" +msgstr "" + msgid "AutoInit Network" msgstr "自動ネット接続" msgid "Automatic port switching is done on the fly. You need to change all custom paths to SD-Card first for this option or else it could damage a filesystem." -msgstr "ポートの自動切換の利用に際し、ファイルシステムの破損を避けるため、独自のパス設定は全てSDカードにしてください。" +msgstr "ポートの自動切換を使用する場合ファイルシステムの破損を避けるため、独自のパス設定は全てSDカードにしてください" msgid "BCA Codes Path" -msgstr "BCAコード" +msgstr "BCAコード" msgid "Back" msgstr "もどる" @@ -196,7 +199,7 @@ msgid "Big thanks to:" msgstr "協力:" msgid "Block Categories Modify" -msgstr "" +msgstr "カテゴリの編集を制限" msgid "Block Cover Downloads" msgstr "カバーのダウンロードを制限" @@ -214,10 +217,10 @@ msgid "Block GameID Change" msgstr "ゲームIDの変更を制限" msgid "Block Global Settings" -msgstr "基本設定を制限" +msgstr "設定を全て制限" msgid "Block Gui Settings" -msgstr "GUI設定を制限" +msgstr "基本設定を制限" msgid "Block HBC Menu" msgstr "HBCメニューを制限" @@ -284,10 +287,10 @@ msgid "Cannot write to destination." msgstr "出力先に書き込めません" msgid "Categories" -msgstr "" +msgstr "カテゴリ" msgid "Categories:" -msgstr "" +msgstr "カテゴリ:" msgid "Change Play Path" msgstr "パスの変更" @@ -336,7 +339,7 @@ msgid "Console must be unlocked for this option." msgstr "変更にはロックの解除が必要です" msgid "Console must be unlocked to be able to use this." -msgstr "" +msgstr "これを使うにはロックの解除が必要です" msgid "Console should be unlocked to modify it." msgstr "変更にはロックの解除が必要です" @@ -430,7 +433,7 @@ msgid "Delete Disc Artwork" msgstr "ディスク画像を削除" msgid "Delete category" -msgstr "" +msgstr "カテゴリを削除" msgid "Design:" msgstr "デザイン:" @@ -511,7 +514,7 @@ msgid "Downloading 3D Covers" msgstr "両面カバーをダウンロード中" msgid "Downloading Flat Covers" -msgstr "片面カバーをダウンロード中" +msgstr "正面カバーをダウンロード中" msgid "Downloading Full HQ Covers" msgstr "フルカバー(精細)をダウンロード中" @@ -529,7 +532,7 @@ msgid "Downloading image:" msgstr "画像をダウンロード中" msgid "Downloading original Discarts" -msgstr "純正レーベルをダウンロード中" +msgstr "公式レーベルをダウンロード中" msgid "Downloading pagelist:" msgstr "リストをダウンロード中:" @@ -643,10 +646,10 @@ msgid "Force NTSC" msgstr "NTSCに強制" msgid "Force NTSC480p" -msgstr "" +msgstr "NTSC480pに強制" msgid "Force PAL480p" -msgstr "" +msgstr "PAL480pに強制" msgid "Force PAL50" msgstr "PAL50に強制" @@ -679,7 +682,7 @@ msgid "Full LQ Covers" msgstr "フルカバー(普通)" msgid "Full Menu" -msgstr "フルメニュー" +msgstr "完全なメニュー" msgid "Full shutdown" msgstr "シャットダウン" @@ -688,7 +691,7 @@ msgid "GAMEID_Gamename" msgstr "ゲームID_ゲーム名" msgid "GCT Cheatcodes Path" -msgstr "GCTチート" +msgstr "GCTチート" msgid "GCT File created" msgstr "GCTファイルを作成しました" @@ -724,7 +727,7 @@ msgid "Game Sound Mode" msgstr "サウンドモード" msgid "Game Sound Volume" -msgstr "音量" +msgstr "サウンドの音量" msgid "Game Split Size" msgstr "ゲームの分割サイズ" @@ -733,7 +736,7 @@ msgid "Game is already installed:" msgstr "このゲームは既にインストールされています:" msgid "Game/Install Partition" -msgstr "ゲーム/インストール 領域" +msgstr "ゲームのインストール領域" msgid "Gamename [GAMEID]" msgstr "ゲーム名 [ゲームID]" @@ -754,7 +757,7 @@ msgid "HOME Menu" msgstr "HOMEボタンメニュー" msgid "Homebrew Apps Path" -msgstr "Homebrew" +msgstr "Homebrewアプリ" msgid "Homebrew Channel" msgstr "HBCへ" @@ -772,13 +775,13 @@ msgid "How to Shutdown?" msgstr "終了方法の選択" msgid "Import categories" -msgstr "" +msgstr "カテゴリをインポート" msgid "Import categories from WiiTDB" -msgstr "" +msgstr "WiiTDBからカテゴリをインポート" msgid "Import operation successfully completed." -msgstr "" +msgstr "インポートに成功しました" #, c-format msgid "Incoming file %0.2fKB" @@ -807,7 +810,7 @@ msgid "Install a game" msgstr "ゲームをインストール" msgid "Install directories" -msgstr "インストールフォルダ" +msgstr "フォルダの構成" msgid "Install partitions" msgstr "保存する領域" @@ -828,7 +831,7 @@ msgid "Installing wad" msgstr "WADをインストールします" msgid "Issue manager /" -msgstr "課題管理者:" +msgstr "問題管理者 /" msgid "It seems that you have some information that will be helpful to us. Please pass this information along to the DEV team." msgstr "この情報は開発者までお知らせください" @@ -1060,7 +1063,7 @@ msgid "Only for Install" msgstr "インストール中のみ" msgid "Original Discarts" -msgstr "純正レーベル" +msgstr "公式レーベル" msgid "Original/Customs" msgstr "公式を優先" @@ -1207,7 +1210,7 @@ msgid "Select" msgstr "選択" msgid "Select DOL Offset" -msgstr "代理DOLの選択" +msgstr "代替DOLの選択" msgid "Select a DOL" msgstr "DOLを選択" @@ -1216,7 +1219,7 @@ msgid "Select a DOL from Game" msgstr "ゲームからDOLを選択" msgid "Select game categories" -msgstr "" +msgstr "ゲームカテゴリを選択" msgid "Sept" msgstr "9月" @@ -1228,7 +1231,7 @@ msgid "Settings" msgstr "設定" msgid "Show Categories" -msgstr "" +msgstr "カテゴリを表示" msgid "Show Free Space" msgstr "空き容量の表示" @@ -1315,7 +1318,7 @@ msgid "TChinese" msgstr "繁体中国語" msgid "TXT Cheatcodes Path" -msgstr "TXTチート" +msgstr "テキストチート" msgid "The .them file was not found in the zip." msgstr ".themファイルがzip内にありません" @@ -1376,7 +1379,7 @@ msgid "USB Loader GX is protected" msgstr "GXは保護されています" msgid "USB Port" -msgstr "USBポート" +msgstr "USBポート" msgid "USB Port changing is only supported on Hermes cIOS." msgstr "USBポートの切替機能は、Hermes cIOS使用時のみ有効です。" @@ -1433,10 +1436,10 @@ msgid "Updating Language Files:" msgstr "言語ファイルを更新中:" msgid "Uploaded ZIP file installed to homebrew directory." -msgstr "インストール済みディレクトリにZIPを送信しました" +msgstr "インストール済みディレクトリにZIPを転送しました" msgid "Use global" -msgstr "" +msgstr "基本設定を使う" msgid "VIDTV Patch" msgstr "映像パッチ" @@ -1461,7 +1464,7 @@ msgid "Waiting..." msgstr "待機中…" msgid "Warning" -msgstr "" +msgstr "警告" msgid "Warning:" msgstr "警告:" @@ -1512,13 +1515,13 @@ msgid "You are trying to select a FAT32/NTFS/EXT partition with cIOS 249 Rev < 1 msgstr "rev17以前のcIOS249ではFAT32/NTFS/EXTに対応していません" msgid "You cannot delete this category." -msgstr "" +msgstr "このカテゴリは削除できません" msgid "You need to select or format a partition" msgstr "領域を選択するか初期化してください" msgid "and translators for language files updates" -msgstr "/ K-M / ichiroling …多言語化" +msgstr "/ K-M / ichiroling …日本語化" msgid "available" msgstr "があります" diff --git a/Languages/korean.lang b/Languages/korean.lang index 6d201076..635894de 100644 --- a/Languages/korean.lang +++ b/Languages/korean.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-04 18:25+0200\n" +"POT-Creation-Date: 2011-06-10 14:06+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: nextos@korea.com\n" "Language-Team: \n" @@ -174,6 +174,9 @@ msgstr "8월" msgid "Author(s):" msgstr "" +msgid "Auto" +msgstr "" + msgid "AutoInit Network" msgstr "자동네트웍설정" diff --git a/Languages/norwegian.lang b/Languages/norwegian.lang index 3961b826..40b9f889 100644 --- a/Languages/norwegian.lang +++ b/Languages/norwegian.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-04 18:25+0200\n" +"POT-Creation-Date: 2011-06-10 14:06+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: raschi\n" "Language-Team: raschi\n" @@ -174,6 +174,9 @@ msgstr "" msgid "Author(s):" msgstr "" +msgid "Auto" +msgstr "" + msgid "AutoInit Network" msgstr "Autostart nettverk" diff --git a/Languages/polish.lang b/Languages/polish.lang index c1fb40f5..54d4d9c4 100644 --- a/Languages/polish.lang +++ b/Languages/polish.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-04 18:25+0200\n" +"POT-Creation-Date: 2011-06-10 14:06+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: ziom666 (zadania_prog@vp.pl)\n" "Language-Team: \n" @@ -174,6 +174,9 @@ msgstr "Sierpien" msgid "Author(s):" msgstr "" +msgid "Auto" +msgstr "" + msgid "AutoInit Network" msgstr "Autoinicjalizacja sieci" diff --git a/Languages/portuguese_br.lang b/Languages/portuguese_br.lang index 8ec14fe1..f75a8b72 100644 --- a/Languages/portuguese_br.lang +++ b/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: 2011-06-04 18:25+0200\n" +"POT-Creation-Date: 2011-06-10 14:06+0200\n" "PO-Revision-Date: 2009-10-23 18:52+0200\n" "Last-Translator: aniemotion\n" "Language-Team: boto12, aniemotion\n" @@ -174,6 +174,9 @@ msgstr "Ago" msgid "Author(s):" msgstr "" +msgid "Auto" +msgstr "" + msgid "AutoInit Network" msgstr "Auto-iniciar Rede" diff --git a/Languages/portuguese_pt.lang b/Languages/portuguese_pt.lang index d883343d..b21c4315 100644 --- a/Languages/portuguese_pt.lang +++ b/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: 2011-06-04 18:25+0200\n" +"POT-Creation-Date: 2011-06-10 14:06+0200\n" "PO-Revision-Date: 2011-03-11 20:00-0000\n" "Last-Translator: pplucky (Sky8000)\n" "Language-Team: pplucky (Sky8000 )\n" @@ -174,6 +174,9 @@ msgstr "Ago" msgid "Author(s):" msgstr "Autor(es):" +msgid "Auto" +msgstr "" + msgid "AutoInit Network" msgstr "Auto-iniciar Rede" diff --git a/Languages/russian.lang b/Languages/russian.lang index a6957caf..2a44b327 100644 --- a/Languages/russian.lang +++ b/Languages/russian.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-04 18:25+0200\n" +"POT-Creation-Date: 2011-06-10 14:06+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: nikolai_ca\n" "Language-Team: Kir, alendit, nikolai_ca\n" @@ -174,6 +174,9 @@ msgstr "Авг" msgid "Author(s):" msgstr "" +msgid "Auto" +msgstr "" + msgid "AutoInit Network" msgstr "АвтоИнициализация Сети" diff --git a/Languages/schinese.lang b/Languages/schinese.lang index b2f2f42f..d09dd350 100644 --- a/Languages/schinese.lang +++ b/Languages/schinese.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-04 18:25+0200\n" +"POT-Creation-Date: 2011-06-10 14:06+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: knife.hu kavid emul8ion\n" "Language-Team: kavid\n" @@ -174,6 +174,9 @@ msgstr "八月" msgid "Author(s):" msgstr "作者:" +msgid "Auto" +msgstr "" + msgid "AutoInit Network" msgstr "自动检测网络" diff --git a/Languages/spanish.lang b/Languages/spanish.lang index b8c7cd07..a46e2a31 100644 --- a/Languages/spanish.lang +++ b/Languages/spanish.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-04 18:25+0200\n" +"POT-Creation-Date: 2011-06-10 14:06+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: SirPalax\n" "Language-Team: Penn, SirPalax\n" @@ -174,6 +174,9 @@ msgstr "Ago" msgid "Author(s):" msgstr "" +msgid "Auto" +msgstr "" + msgid "AutoInit Network" msgstr "AutoIniciar la Red" diff --git a/Languages/swedish.lang b/Languages/swedish.lang index 5130d81a..78be6334 100644 --- a/Languages/swedish.lang +++ b/Languages/swedish.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-04 18:25+0200\n" +"POT-Creation-Date: 2011-06-10 14:06+0200\n" "PO-Revision-Date: 2010-01-19 17:39+0200\n" "Last-Translator: Katsurou\n" "Language-Team: Katsurou, pirateX\n" @@ -174,6 +174,9 @@ msgstr "" msgid "Author(s):" msgstr "" +msgid "Auto" +msgstr "" + msgid "AutoInit Network" msgstr "Autoinitiera Nätverk" diff --git a/Languages/tchinese.lang b/Languages/tchinese.lang index c9f9c053..18208d4c 100644 --- a/Languages/tchinese.lang +++ b/Languages/tchinese.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-04 18:25+0200\n" +"POT-Creation-Date: 2011-06-10 14:06+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" @@ -17,7 +17,7 @@ msgid " could not be downloaded." msgstr "不能下載。" msgid " has been Saved. The text has not been verified. Some of the code may not work right with each other. If you experience trouble, open the text in a real text editor for more information." -msgstr "已經被儲存。內容尚未驗證。部分代碼可能無法作用。如果你遇到問題,請用文字編輯器打開文本文件以獲得更多的信息。" +msgstr "" msgid " is not on the server." msgstr "不在伺服器上" @@ -174,6 +174,9 @@ msgstr "八月" msgid "Author(s):" msgstr "作者(群)" +msgid "Auto" +msgstr "" + msgid "AutoInit Network" msgstr "自動檢查網路" @@ -643,10 +646,10 @@ msgid "Force NTSC" msgstr "強制 NTSC" msgid "Force NTSC480p" -msgstr "" +msgstr "強制 NTSC480p" msgid "Force PAL480p" -msgstr "" +msgstr "強制 PAL480p" msgid "Force PAL50" msgstr "強制 PAL50" @@ -1436,7 +1439,7 @@ msgid "Uploaded ZIP file installed to homebrew directory." msgstr "已更新安裝在Homebrew目錄的ZIP檔案" msgid "Use global" -msgstr "" +msgstr "使用整體設定" msgid "VIDTV Patch" msgstr "VIDTV 修改" @@ -1527,7 +1530,7 @@ msgid "does not exist!" msgstr "不存在!" msgid "does not exist! Loading game without cheats." -msgstr "不存在!載入遊戲但不啟用金手指" +msgstr "" msgid "files left" msgstr "剩下的檔案" @@ -1571,6 +1574,12 @@ msgstr "的" msgid "seconds left" msgstr "剩餘秒數" +#~ msgid " has been Saved. The text has not been verified. Some of the code may not work right with each other. If you experience trouble, open the text in a real text editor for more information." +#~ msgstr "已經被儲存。內容尚未驗證。部分代碼可能無法作用。如果你遇到問題,請用文字編輯器打開文本文件以獲得更多的信息。" + +#~ msgid "does not exist! Loading game without cheats." +#~ msgstr "不存在!載入遊戲但不啟用金手指" + #~ msgid " Wad Saved as:" #~ msgstr "WAD 儲存為:" diff --git a/Languages/thai.lang b/Languages/thai.lang index d2e76a83..f59ecca6 100644 --- a/Languages/thai.lang +++ b/Languages/thai.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-04 18:25+0200\n" +"POT-Creation-Date: 2011-06-10 14:06+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: Nitro_subzero \n" "Language-Team: Nitro_subzero\n" @@ -174,6 +174,9 @@ msgstr "สค." msgid "Author(s):" msgstr "" +msgid "Auto" +msgstr "" + msgid "AutoInit Network" msgstr "ทำการเชื่อมต่อเครือข่าย" diff --git a/Languages/turkish.lang b/Languages/turkish.lang index 3538605f..46748e7f 100644 --- a/Languages/turkish.lang +++ b/Languages/turkish.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-06-04 18:25+0200\n" +"POT-Creation-Date: 2011-06-10 14:06+0200\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: omercigingelini\n" "Language-Team: omercigingelini\n" @@ -174,6 +174,9 @@ msgstr "Ağu" msgid "Author(s):" msgstr "" +msgid "Auto" +msgstr "" + msgid "AutoInit Network" msgstr "Ağı ototanımla" diff --git a/source/libs/libext2fs/libcustomext2fs.a b/source/libs/libext2fs/libcustomext2fs.a index 14ae3518..b29e073e 100644 Binary files a/source/libs/libext2fs/libcustomext2fs.a and b/source/libs/libext2fs/libcustomext2fs.a differ diff --git a/source/libs/libntfs/libcustomntfs.a b/source/libs/libntfs/libcustomntfs.a index 70c72f71..96e0e341 100644 Binary files a/source/libs/libntfs/libcustomntfs.a and b/source/libs/libntfs/libcustomntfs.a differ diff --git a/source/patches/gamepatches.c b/source/patches/gamepatches.c index d0ab03ec..4cb0ea78 100644 --- a/source/patches/gamepatches.c +++ b/source/patches/gamepatches.c @@ -95,7 +95,7 @@ void gamepatches(u8 videoSelected, u8 languageChoice, u8 patchcountrystring, u8 } if(blockiosreloadselect) - BlockIOSReload(2, gameIOS); + BlockIOSReload(gameIOS); if(es_fd >= 0) IOS_Close(es_fd); @@ -566,16 +566,13 @@ int PatchNewReturnTo(u64 title) return result; } -bool BlockIOSReload(u8 blockiosreloadselect, u8 gameIOS) +bool BlockIOSReload(u8 gameIOS) { - if(blockiosreloadselect == 0) - return false; - static int mode ATTRIBUTE_ALIGN(32); static int ios ATTRIBUTE_ALIGN(32); STACK_ALIGN(ioctlv, vector, 2, 32); - mode = blockiosreloadselect; + mode = 2; vector[0].data = &mode; vector[0].len = 4; diff --git a/source/patches/gamepatches.h b/source/patches/gamepatches.h index f02938db..e37052e8 100644 --- a/source/patches/gamepatches.h +++ b/source/patches/gamepatches.h @@ -16,7 +16,7 @@ bool PoPPatch(); void VideoModePatcher(u8 * dst, int len, u8 videoSelected); bool PatchReturnTo(void *Address, int Size, u32 id); int PatchNewReturnTo(u64 title); -bool BlockIOSReload(u8 blockiosreloadselect, u8 gameIOS); +bool BlockIOSReload(u8 gameIOS); #ifdef __cplusplus } diff --git a/source/prompts/PromptWindows.cpp b/source/prompts/PromptWindows.cpp index 30fefbe1..4421db10 100644 --- a/source/prompts/PromptWindows.cpp +++ b/source/prompts/PromptWindows.cpp @@ -258,8 +258,6 @@ void WindowCredits() txt[i]->SetPosition(0, info ? y-10 : y); i++; - free(info); - txt[i] = new GuiText(IosInfo, 16, ( GXColor ) {255, 255, 255, 255}); txt[i]->SetAlignment(ALIGN_RIGHT, ALIGN_TOP); txt[i]->SetPosition(0, y+6); diff --git a/source/settings/CGameSettings.cpp b/source/settings/CGameSettings.cpp index 75e75e9f..ccce882a 100644 --- a/source/settings/CGameSettings.cpp +++ b/source/settings/CGameSettings.cpp @@ -420,7 +420,7 @@ GameCFG * CGameSettings::GetDefault() DefaultConfig.patchcountrystrings = INHERIT; DefaultConfig.loadalternatedol = ALT_DOL_DEFAULT; DefaultConfig.alternatedolstart = 0; - DefaultConfig.iosreloadblock = OFF; + DefaultConfig.iosreloadblock = INHERIT; DefaultConfig.alternatedolname[0] = '\0'; DefaultConfig.returnTo = 1; DefaultConfig.Locked = OFF; diff --git a/source/settings/CSettings.cpp b/source/settings/CSettings.cpp index 19f5ad49..d5c4bf1c 100644 --- a/source/settings/CSettings.cpp +++ b/source/settings/CSettings.cpp @@ -114,6 +114,7 @@ void CSettings::SetDefault() widescreen = (CONF_GetAspectRatio() == CONF_ASPECT_16_9); HomeMenu = HOME_MENU_DEFAULT; MultiplePartitions = OFF; + BlockIOSReload = AUTO; USBPort = 0; CacheTitles = ON; WSFactor = 0.8f; //actually should be 0.75 for real widescreen @@ -263,6 +264,7 @@ bool CSettings::Save() fprintf(file, "MultiplePartitions = %d\n ", MultiplePartitions); fprintf(file, "USBPort = %d\n ", USBPort); fprintf(file, "CacheTitles = %d\n ", CacheTitles); + fprintf(file, "BlockIOSReload = %d\n ", BlockIOSReload); fprintf(file, "WSFactor = %0.3f\n ", WSFactor); fprintf(file, "FontScaleFactor = %0.3f\n ", FontScaleFactor); fprintf(file, "EnabledCategories = "); @@ -480,6 +482,11 @@ bool CSettings::SetSetting(char *name, char *value) if (sscanf(value, "%d", &i) == 1) MultiplePartitions = i; return true; } + else if (strcmp(name, "BlockIOSReload") == 0) + { + if (sscanf(value, "%d", &i) == 1) BlockIOSReload = i; + return true; + } else if (strcmp(name, "USBPort") == 0) { if (sscanf(value, "%d", &i) == 1) USBPort = i; diff --git a/source/settings/CSettings.h b/source/settings/CSettings.h index 26666619..cc2b261e 100644 --- a/source/settings/CSettings.h +++ b/source/settings/CSettings.h @@ -114,6 +114,7 @@ class CSettings short MultiplePartitions; short USBPort; short CacheTitles; + short BlockIOSReload; u32 InstallPartitions; u32 ParentalBlocks; f32 WSFactor; diff --git a/source/settings/SettingsEnums.h b/source/settings/SettingsEnums.h index cf270c45..c194f5a7 100644 --- a/source/settings/SettingsEnums.h +++ b/source/settings/SettingsEnums.h @@ -6,6 +6,7 @@ enum { INHERIT = -1, + AUTO = 2 }; enum diff --git a/source/settings/menus/GameLoadSM.cpp b/source/settings/menus/GameLoadSM.cpp index d5d78e44..97e9b211 100644 --- a/source/settings/menus/GameLoadSM.cpp +++ b/source/settings/menus/GameLoadSM.cpp @@ -36,7 +36,8 @@ static const char * OnOffText[] = { trNOOP( "OFF" ), - trNOOP( "ON" ) + trNOOP( "ON" ), + trNOOP( "Auto" ) }; static const char * VideoModeText[] = @@ -235,7 +236,10 @@ void GameLoadSM::SetOptionValues() } //! Settings: Block IOS Reload - Options->SetValue(Idx++, "%s", tr( OnOffText[GameConfig.iosreloadblock]) ); + if(GameConfig.iosreloadblock == INHERIT) + Options->SetValue(Idx++, tr("Use global")); + else + Options->SetValue(Idx++, "%s", tr( OnOffText[GameConfig.iosreloadblock]) ); //! Settings: Game Lock Options->SetValue(Idx++, "%s", tr( OnOffText[GameConfig.Locked] )); @@ -377,7 +381,7 @@ int GameLoadSM::GetMenuInternal() //! Settings: Block IOS Reload else if (ret == ++Idx) { - if(++GameConfig.iosreloadblock >= MAX_ON_OFF) GameConfig.iosreloadblock = 0; + if(++GameConfig.iosreloadblock >= 3) GameConfig.iosreloadblock = INHERIT; } //! Settings: Game Lock diff --git a/source/settings/menus/LoaderSettings.cpp b/source/settings/menus/LoaderSettings.cpp index 067a7cde..e4f4a6e3 100644 --- a/source/settings/menus/LoaderSettings.cpp +++ b/source/settings/menus/LoaderSettings.cpp @@ -40,10 +40,11 @@ #include "xml/xml.h" #include "menu.h" -static const char * OnOffText[MAX_ON_OFF] = +static const char * OnOffText[] = { trNOOP( "OFF" ), - trNOOP( "ON" ) + trNOOP( "ON" ), + trNOOP( "Auto" ) }; static const char * VideoModeText[VIDEO_MODE_MAX] = @@ -124,6 +125,7 @@ LoaderSettings::LoaderSettings() Options->SetName(Idx++, "%s", tr( "Game Split Size" )); Options->SetName(Idx++, "%s", tr( "Quick Boot" )); Options->SetName(Idx++, "%s", tr( "Error 002 fix" )); + Options->SetName(Idx++, "%s", tr( "Block IOS Reload" )); Options->SetName(Idx++, "%s", tr( "Install partitions" )); Options->SetName(Idx++, "%s", tr( "Return To" )); Options->SetName(Idx++, "%s", tr( "Messageboard Update" )); @@ -218,6 +220,9 @@ void LoaderSettings::SetOptionValues() //! Settings: Error 002 fix Options->SetValue(Idx++, "%s", tr( Error002Text[Settings.error002] )); + //! Settings: Block IOS Reload + Options->SetValue(Idx++, "%s", tr( OnOffText[Settings.BlockIOSReload] )); + //! Settings: Install partitions if(Settings.InstallPartitions == ONLY_GAME_PARTITION) Options->SetValue(Idx++, "%s", tr("Only Game Partition")); @@ -412,6 +417,12 @@ int LoaderSettings::GetMenuInternal() if (++Settings.error002 >= 3) Settings.error002 = 0; } + //! Settings: Block IOS Reload + else if (ret == ++Idx ) + { + if (++Settings.BlockIOSReload >= 3) Settings.BlockIOSReload = 0; + } + //! Settings: Install partitions else if (ret == ++Idx) { diff --git a/source/system/IosLoader.cpp b/source/system/IosLoader.cpp index c842686b..bd94cfa0 100644 --- a/source/system/IosLoader.cpp +++ b/source/system/IosLoader.cpp @@ -18,6 +18,12 @@ #include "gecko.h" +/* + * Buffer variables for the IOS info to avoid loading it several times + */ +static int currentIOS = -1; +static iosinfo_t *currentIOSInfo = NULL; + /****************************************************************************** * Public Methods: ******************************************************************************/ @@ -51,8 +57,6 @@ bool IosLoader::IsD2X(s32 ios) bool res = (strncasecmp(info->name, "d2x", 3) == 0); - free(info); - return res; } @@ -184,8 +188,6 @@ void IosLoader::LoadIOSModules(s32 ios, s32 ios_rev) mload_module((u8 *) dip_plugin_249, dip_plugin_249_size); mload_close(); } - - if(info) free(info); } } @@ -195,6 +197,16 @@ void IosLoader::LoadIOSModules(s32 ios, s32 ios_rev) */ iosinfo_t *IosLoader::GetIOSInfo(s32 ios) { + if(currentIOS == ios && currentIOSInfo) + return currentIOSInfo; + + if(currentIOSInfo) + { + free(currentIOSInfo); + currentIOSInfo = NULL; + } + + currentIOS = ios; char filepath[ISFS_MAXPATH] ATTRIBUTE_ALIGN(0x20); u64 TicketID = ((((u64) 1) << 32) | ios); u32 TMD_Length; @@ -234,5 +246,11 @@ iosinfo_t *IosLoader::GetIOSInfo(s32 ios) return NULL; } + iosinfo = (iosinfo_t *) realloc(buffer, sizeof(iosinfo_t)); + if(!iosinfo) + iosinfo = (iosinfo_t *) buffer; + + currentIOSInfo = iosinfo; + return iosinfo; } diff --git a/source/usbloader/GameBooter.cpp b/source/usbloader/GameBooter.cpp index 317e5cbd..052c19ea 100644 --- a/source/usbloader/GameBooter.cpp +++ b/source/usbloader/GameBooter.cpp @@ -192,7 +192,7 @@ int GameBooter::BootGame(const char * gameID) u8 countrystrings = game_cfg->patchcountrystrings == INHERIT ? Settings.patchcountrystrings : game_cfg->patchcountrystrings; u8 alternatedol = game_cfg->loadalternatedol; u32 alternatedoloffset = game_cfg->alternatedolstart; - u8 reloadblock = game_cfg->iosreloadblock; + u8 reloadblock = game_cfg->iosreloadblock == INHERIT ? Settings.BlockIOSReload : game_cfg->iosreloadblock; u64 returnToChoice = game_cfg->returnTo ? NandTitles.FindU32(Settings.returnTo) : 0; //! Prepare alternate dol settings @@ -221,15 +221,24 @@ int GameBooter::BootGame(const char * gameID) ret = do_bca_code(gameHeader.id); gprintf("%d\n", ret); - //! Setup IOS reload block - only possible on Hermes cIOS - if (reloadblock && IosLoader::IsHermesIOS()) + //! Setup IOS reload block + if (IosLoader::IsHermesIOS()) { - enable_ES_ioctlv_vector(); - if (gameList.GetGameFS(gameHeader.id) == PART_FS_WBFS) - mload_close(); + if(reloadblock == ON) + { + enable_ES_ioctlv_vector(); + if (gameList.GetGameFS(gameHeader.id) == PART_FS_WBFS) + mload_close(); + } reloadblock = 0; } + else if(reloadblock == AUTO) + { + iosinfo_t * iosinfo = IosLoader::GetIOSInfo(IOS_GetVersion()); + if(!iosinfo || iosinfo->version < 6) + reloadblock = 0; + } //! Now we can free up the memory used by the game list gameList.clear(); diff --git a/source/usbloader/disc.c b/source/usbloader/disc.c index 613d24b8..1fc55b6a 100644 --- a/source/usbloader/disc.c +++ b/source/usbloader/disc.c @@ -3,7 +3,6 @@ #include #include #include -#include #include "patches/fst.h" #include "patches/gamepatches.h" @@ -31,7 +30,7 @@ static u32 vmode_reg = 0; void Disc_SetLowMem(void) { - + /* Setup low memory */ *Sys_Magic = 0x0D15EA5E; // Standard Boot Code *Version = 0x00000001; // Version *Arena_L = 0x00000000; // Arena Low @@ -46,11 +45,9 @@ void Disc_SetLowMem(void) *Simulated_Mem = 0x01800000; // Simulated Memory Size *(vu32 *) 0xCD00643C = 0x00000000; // 32Mhz on Bus - //If the game is sam & max: season 1 put this shit in - if ((strncmp((char*) Disc_ID, "R3XE6U", 6) == 0) || (strncmp((char*) Disc_ID, "R3XP6V", 6) == 0)) - { + int iosVer = IOS_GetVersion(); + if(iosVer != 222 && iosVer != 223 && iosVer != 224 && IOS_GetRevision() >= 18) *GameID_Address = 0x80000000; // Game ID Address - } /* Copy disc ID */ memcpy((void *) Online_Check, (void *) Disc_ID, 4); diff --git a/source/xml/WiiTDB.cpp b/source/xml/WiiTDB.cpp index 88c5913b..be43d8a4 100644 --- a/source/xml/WiiTDB.cpp +++ b/source/xml/WiiTDB.cpp @@ -665,7 +665,7 @@ bool WiiTDB::GetGenreList(const char * id, vector & genre) ++ptr; } - while(genre[genre_num].size() > 0 && genre[genre_num][genre[genre_num].size()-1] == ' ') + while(genre_num > 0 && genre[genre_num].size() > 0 && genre[genre_num][genre[genre_num].size()-1] == ' ') genre[genre_num].erase(genre[genre_num].size()-1); delete [] data;