From 6243627dc94bae9f86e0f241a7c8620ac88c3039 Mon Sep 17 00:00:00 2001 From: dimok321 <15055714+dimok789@users.noreply.github.com> Date: Sat, 5 Feb 2011 10:36:55 +0000 Subject: [PATCH] *Fixed bug I introduced with R1062 where games do not start from NTFS/FAT/EXT *Removed option "IOS58 mode" for internal loader use *Updated language files --- HBC/META.XML | 4 +- Languages/czech.lang | 8 +- Languages/danish.lang | 18 +- Languages/dutch.lang | 42 ++-- Languages/english.lang | 5 +- Languages/finnish.lang | 5 +- Languages/french.lang | 8 +- Languages/german.lang | 38 +-- Languages/hungarian.lang | 5 +- Languages/italian.lang | 8 +- Languages/japanese.lang | 8 +- Languages/korean.lang | 5 +- Languages/norwegian.lang | 305 ++++++++++++----------- Languages/polish.lang | 5 +- Languages/portuguese_br.lang | 5 +- Languages/portuguese_pt.lang | 5 +- Languages/russian.lang | 5 +- Languages/schinese.lang | 38 +-- Languages/spanish.lang | 5 +- Languages/swedish.lang | 5 +- Languages/tchinese.lang | 10 +- Languages/thai.lang | 5 +- Languages/turkish.lang | 5 +- Makefile | 2 +- gui.pnproj | 2 +- source/StartUpProcess.cpp | 20 +- source/libs/libwbfs/libwbfs.c | 4 +- source/main.cpp | 3 - source/settings/CSettings.cpp | 7 - source/settings/CSettings.h | 1 - source/settings/menus/LoaderSettings.cpp | 16 -- source/usbloader/MountGamePartition.cpp | 3 +- source/usbloader/frag.c | 32 +-- source/usbloader/frag.h | 5 +- source/usbloader/wbfs.cpp | 2 +- source/usbloader/wbfs/wbfs_base.h | 7 +- source/usbloader/wdvd.c | 64 ----- 37 files changed, 301 insertions(+), 414 deletions(-) diff --git a/HBC/META.XML b/HBC/META.XML index d308d94f..0a09f86d 100644 --- a/HBC/META.XML +++ b/HBC/META.XML @@ -2,8 +2,8 @@ USB Loader GX USB Loader GX Team - 2.0 r1062 - 201102032147 + 2.0 r1063 + 201102041525 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 9cefa622..b99dcbb4 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-02-03 22:46+0100\n" +"POT-Creation-Date: 2011-02-05 11:34+0100\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" @@ -1375,9 +1375,6 @@ msgstr "Aktualizuji jazykové soubory:" msgid "Uploaded ZIP file installed to homebrew directory." msgstr "Odeslaný ZIP soubor nainstalován do adresáre homebrew" -msgid "Use IOS58" -msgstr "Použít IOS58" - msgid "VIDTV Patch" msgstr "VIDTV korekce" @@ -1499,6 +1496,9 @@ msgstr "z " msgid "seconds left" msgstr "sekund zbývá" +#~ msgid "Use IOS58" +#~ msgstr "Použít IOS58" + #~ msgid "Custom Disc Images" #~ msgstr "Vlastní potisky DVD" diff --git a/Languages/danish.lang b/Languages/danish.lang index 93292106..c78020e1 100644 --- a/Languages/danish.lang +++ b/Languages/danish.lang @@ -1,11 +1,11 @@ # USB Loader GX language source file. -# danish.lang - r1048 +# danish.lang - r1056 # don't delete/change this line (é). msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-03 22:46+0100\n" +"POT-Creation-Date: 2011-02-05 11:34+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: Fox888[dk]\n" "Language-Team: [dk]\n" @@ -241,7 +241,7 @@ msgid "Both" msgstr "Begge" msgid "Can't be formatted" -msgstr "Kan ikke formatteres" +msgstr "Kan ikke formateres" msgid "Can't create directory" msgstr "Kan ikke lave ny mappe" @@ -291,7 +291,7 @@ msgid "Coding:" msgstr "Programmering:" msgid "Connection to server timed out." -msgstr "" +msgstr "Forbindelse til server timed out." msgid "Console" msgstr "Konsol" @@ -1237,7 +1237,7 @@ msgid "Successfully Updated thanks to www.techjawa.com" msgstr "Opdateringen lykkedes takket været www.techjawa.com" msgid "Successfully deleted:" -msgstr "Sletningen lykkedes:" +msgstr "Det lykkedes at slette:" msgid "Successfully extracted theme." msgstr "Udpakning af tema lykkedes." @@ -1375,9 +1375,6 @@ msgstr "Opdaterer sprogfiler:" msgid "Uploaded ZIP file installed to homebrew directory." msgstr "Den uploadede ZIP-fil er installeret i homebrew-mappen." -msgid "Use IOS58" -msgstr "Brug IOS58" - msgid "VIDTV Patch" msgstr "VIDTV-patch" @@ -1500,7 +1497,7 @@ msgid "seconds left" msgstr "sekunder tilbage" #~ msgid "Custom Disc Images" -#~ msgstr "Tilpasset DVD billede" +#~ msgstr "Tilpasset DVD billeder" #~ msgid "Download Boxart image?" #~ msgstr "Download boxart-billede?" @@ -1517,6 +1514,9 @@ msgstr "sekunder tilbage" #~ msgid "Original Disc Images" #~ msgstr "Originale DVD billeder" +#~ msgid "Use IOS58" +#~ msgstr "Brug IOS58" + #~ msgid "files not found on the server!" #~ msgstr "filer blev ikke fundet på serveren!" diff --git a/Languages/dutch.lang b/Languages/dutch.lang index 6cbedd43..09485dea 100644 --- a/Languages/dutch.lang +++ b/Languages/dutch.lang @@ -1,12 +1,12 @@ # USB Loader GX language source file. -# dutch.lang - r1046 +# dutch.lang - r1061 # don't delete/change this line (é). msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-03 22:46+0100\n" -"PO-Revision-Date: 2011-01-24 07:20+0100\n" +"POT-Creation-Date: 2011-02-05 11:34+0100\n" +"PO-Revision-Date: 2011-02-04 13:06+0100\n" "Last-Translator: glowy\n" "Language-Team: tj_cool, glowy\n" "MIME-Version: 1.0\n" @@ -27,11 +27,11 @@ msgstr " staat niet op de server." #, c-format msgid "%i files not found on the server!" -msgstr "" +msgstr "%i bestanden niet gevonden op de server!" #, c-format msgid "%i missing files" -msgstr "" +msgstr "%i missende bestanden" msgid "0 (Everyone)" msgstr "0 (Iedereen 3+)" @@ -291,7 +291,7 @@ msgid "Coding:" msgstr "Codering:" msgid "Connection to server timed out." -msgstr "" +msgstr "Connectie naar de server verlopen" msgid "Console" msgstr "" @@ -355,7 +355,7 @@ msgid "Credits" msgstr "" msgid "Custom Discarts" -msgstr "" +msgstr "Aangepaste Disk Labels" msgid "Custom Paths" msgstr "Bestandslocaties" @@ -475,10 +475,10 @@ msgid "Downloading Flat Covers" msgstr "Platte hoesjes aan het downloaden" msgid "Downloading Full HQ Covers" -msgstr "" +msgstr "HQ volledige hoesjes downloaden" msgid "Downloading Full LQ Covers" -msgstr "" +msgstr "LQ volledige hoesjes downloaden " msgid "Downloading custom Discarts" msgstr "Aangepaste disc afbeeldingen downloaden" @@ -613,7 +613,7 @@ msgid "Formatting, please wait..." msgstr "Bezig met formatteren..." msgid "Found missing images." -msgstr "" +msgstr "Missende plaatje gevonden." msgid "Free Space" msgstr "Vrije ruimte" @@ -622,13 +622,13 @@ msgid "French" msgstr "Frans" msgid "Full Cover Path" -msgstr "" +msgstr "Volledige hoesjes pad" msgid "Full HQ Covers" -msgstr "" +msgstr "HQ volledige hoesjes" msgid "Full LQ Covers" -msgstr "" +msgstr "LQ volledige hoesjes" msgid "Full Menu" msgstr "Volledig Menu" @@ -685,7 +685,7 @@ msgid "Game is already installed:" msgstr "Spel is al geïnstalleerd:" msgid "Game/Install Partition" -msgstr "" +msgstr "Spel/Installatie partitie" msgid "Gamename [GAMEID]" msgstr "Spelnaam [SPELID]" @@ -886,7 +886,7 @@ msgid "Mount DVD drive" msgstr "DVD Laden" msgid "Multiple Partitions" -msgstr "" +msgstr "Meerdere partities" msgid "Music Loop Mode" msgstr "Muziek Herhaal Mode" @@ -1009,7 +1009,7 @@ msgid "Only for Install" msgstr "Alleen bij installeren" msgid "Original Discarts" -msgstr "" +msgstr "Originele Disk Labels" msgid "Original/Customs" msgstr "Origineel/Aangepast" @@ -1144,7 +1144,7 @@ msgid "Save Game List to" msgstr "Spellenlijst opslaan in" msgid "Save List" -msgstr "" +msgstr "Save lijst" msgid "Saved" msgstr "Opgeslagen" @@ -1186,7 +1186,7 @@ msgid "Sort alphabetically" msgstr "Alfabetisch sorteren" msgid "Sort by number of players" -msgstr "" +msgstr "Sorteer op aantal spelers" msgid "Sort by rank" msgstr "Sorteren op rang" @@ -1375,9 +1375,6 @@ msgstr "Taalbestanden updaten:" msgid "Uploaded ZIP file installed to homebrew directory." msgstr "Geuploade ZIP is geïnstalleerd in je homebrew locatie." -msgid "Use IOS58" -msgstr "Gebruik IOS58" - msgid "VIDTV Patch" msgstr "VIDTV patchen" @@ -1499,6 +1496,9 @@ msgstr "van" msgid "seconds left" msgstr "seconden over" +#~ msgid "Use IOS58" +#~ msgstr "Gebruik IOS58" + #~ msgid "Custom Disc Images" #~ msgstr "Aangepaste Disk Labels" diff --git a/Languages/english.lang b/Languages/english.lang index 57ac26d2..5357dfe9 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-02-03 22:46+0100\n" +"POT-Creation-Date: 2011-02-05 11:34+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -1375,9 +1375,6 @@ msgstr "" msgid "Uploaded ZIP file installed to homebrew directory." msgstr "" -msgid "Use IOS58" -msgstr "" - msgid "VIDTV Patch" msgstr "" diff --git a/Languages/finnish.lang b/Languages/finnish.lang index 3ac50bf8..04eaff35 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-02-03 22:46+0100\n" +"POT-Creation-Date: 2011-02-05 11:34+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: c64rmx\n" "Language-Team: \n" @@ -1375,9 +1375,6 @@ msgstr "Päivittää kielitiedostoja:" msgid "Uploaded ZIP file installed to homebrew directory." msgstr "" -msgid "Use IOS58" -msgstr "" - msgid "VIDTV Patch" msgstr "VIDTV korjaus" diff --git a/Languages/french.lang b/Languages/french.lang index 0d5e0f51..b8eca517 100644 --- a/Languages/french.lang +++ b/Languages/french.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-03 22:46+0100\n" +"POT-Creation-Date: 2011-02-05 11:34+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: Cyan\n" "Language-Team: Badablek, Amour, ikya & Kin8\n" @@ -1375,9 +1375,6 @@ msgstr "Mise à jour du fichier de langue:" msgid "Uploaded ZIP file installed to homebrew directory." msgstr "Fichier ZIP envoyé et installé dans le répertoire homebrew." -msgid "Use IOS58" -msgstr "Utiliser IOS58" - msgid "VIDTV Patch" msgstr "Patch VIDTV" @@ -1499,6 +1496,9 @@ msgstr "sur" msgid "seconds left" msgstr "secondes restantes" +#~ msgid "Use IOS58" +#~ msgstr "Utiliser IOS58" + #~ msgid "Custom Disc Images" #~ msgstr "Labels DVD persos" diff --git a/Languages/german.lang b/Languages/german.lang index 47c4a75b..2bb27c50 100644 --- a/Languages/german.lang +++ b/Languages/german.lang @@ -1,11 +1,11 @@ # USB Loader GX -# german language source file - r1056 +# german language source file - r1061 # don't delete/change this line (é). msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-03 22:46+0100\n" +"POT-Creation-Date: 2011-02-05 11:34+0100\n" "PO-Revision-Date: 2010-07-03 17:35-0800\n" "Last-Translator: TheRealVisitor\n" "Language-Team: Bertilax, Snoozer, wishmasterf, ZEN.13, TheRealVisitor\n" @@ -27,11 +27,11 @@ msgstr " ist nicht auf dem Server." #, c-format msgid "%i files not found on the server!" -msgstr "" +msgstr "%i Dateien auf dem Server nicht gefunden!" #, c-format msgid "%i missing files" -msgstr "" +msgstr "%i fehlende Dateien" msgid "0 (Everyone)" msgstr "0 (Jeder)" @@ -355,7 +355,7 @@ msgid "Credits" msgstr "Danksagungen" msgid "Custom Discarts" -msgstr "" +msgstr "Eig. Diskbilder" msgid "Custom Paths" msgstr "Pfade anpassen" @@ -475,10 +475,10 @@ msgid "Downloading Flat Covers" msgstr "Lade 2D Cover herunter" msgid "Downloading Full HQ Covers" -msgstr "" +msgstr "Lade Box HQ Cover runter" msgid "Downloading Full LQ Covers" -msgstr "" +msgstr "Lade Box LQ Cover runter" msgid "Downloading custom Discarts" msgstr "Lade Community Diskcovers herunter" @@ -613,7 +613,7 @@ msgid "Formatting, please wait..." msgstr "Formatiere, bitte warten..." msgid "Found missing images." -msgstr "" +msgstr "Fehlende Bilder gefunden." msgid "Free Space" msgstr "Freier Speicher" @@ -622,13 +622,13 @@ msgid "French" msgstr "Französisch" msgid "Full Cover Path" -msgstr "" +msgstr "Box Cover" msgid "Full HQ Covers" -msgstr "" +msgstr "Box HQ Cover" msgid "Full LQ Covers" -msgstr "" +msgstr "Box LQ Cover" msgid "Full Menu" msgstr "Ganzes Menü" @@ -685,7 +685,7 @@ msgid "Game is already installed:" msgstr "Spiel ist bereits installiert:" msgid "Game/Install Partition" -msgstr "" +msgstr "Spiel/Instal. Partition" msgid "Gamename [GAMEID]" msgstr "Spielname [SPIELID]" @@ -886,7 +886,7 @@ msgid "Mount DVD drive" msgstr "Spiel starten" msgid "Multiple Partitions" -msgstr "" +msgstr "Mehrere Partitionen" msgid "Music Loop Mode" msgstr "HGM Wiederholung" @@ -1009,7 +1009,7 @@ msgid "Only for Install" msgstr "Nur beim Installieren" msgid "Original Discarts" -msgstr "" +msgstr "Org. Diskbilder" msgid "Original/Customs" msgstr "Original/Community" @@ -1144,7 +1144,7 @@ msgid "Save Game List to" msgstr "Liste speicheren unter" msgid "Save List" -msgstr "" +msgstr "Speichere Liste" msgid "Saved" msgstr "Gespeichert" @@ -1186,7 +1186,7 @@ msgid "Sort alphabetically" msgstr "Alphabetisch ordnen" msgid "Sort by number of players" -msgstr "" +msgstr "Sortiere nach Spielerzahl" msgid "Sort by rank" msgstr "Nach Bewertungen ordnen" @@ -1375,9 +1375,6 @@ msgstr "Aktualisiere Sprachdateien:" msgid "Uploaded ZIP file installed to homebrew directory." msgstr "Die hochgeladene ZIP Datei wurde ins Homebrew Verzeichnis installiert." -msgid "Use IOS58" -msgstr "Benutze IOS58" - msgid "VIDTV Patch" msgstr "VIDTV Patch" @@ -1499,6 +1496,9 @@ msgstr "von" msgid "seconds left" msgstr "Sekunden verbleiben" +#~ msgid "Use IOS58" +#~ msgstr "Benutze IOS58" + #~ msgid "Custom Disc Images" #~ msgstr "Eigene DVD Bilder" diff --git a/Languages/hungarian.lang b/Languages/hungarian.lang index 4ba9f877..3a8c1fcf 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-02-03 22:46+0100\n" +"POT-Creation-Date: 2011-02-05 11:34+0100\n" "PO-Revision-Date: 2009-12-29 11:05+0100\n" "Last-Translator: Springdale\n" "Language-Team: Tusk, Springdale\n" @@ -1375,9 +1375,6 @@ msgstr "Nyelvi fájlok frissítése:" msgid "Uploaded ZIP file installed to homebrew directory." msgstr "Feltöltött ZIP fájl telepítve a Homebrew mappába." -msgid "Use IOS58" -msgstr "" - msgid "VIDTV Patch" msgstr "" diff --git a/Languages/italian.lang b/Languages/italian.lang index 6b49377f..e85ce45c 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-02-03 22:46+0100\n" +"POT-Creation-Date: 2011-02-05 11:34+0100\n" "PO-Revision-Date: 2011-01-22 20:00+0200\n" "Last-Translator: Cambo \n" "Language-Team: Cambo\n" @@ -1375,9 +1375,6 @@ msgstr "Aggiornamento file delle lingue:" msgid "Uploaded ZIP file installed to homebrew directory." msgstr "File ZIP installato nella cartella Homebrew" -msgid "Use IOS58" -msgstr "Usa IOS58" - msgid "VIDTV Patch" msgstr "Video Forzato" @@ -1499,6 +1496,9 @@ msgstr "di" msgid "seconds left" msgstr "secondi mancanti" +#~ msgid "Use IOS58" +#~ msgstr "Usa IOS58" + #~ msgid "Download Boxart image?" #~ msgstr "Scarico la copertina?" diff --git a/Languages/japanese.lang b/Languages/japanese.lang index ad8d041c..e9cb5c82 100644 --- a/Languages/japanese.lang +++ b/Languages/japanese.lang @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-03 22:46+0100\n" +"POT-Creation-Date: 2011-02-05 11:34+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: ichiroling\n" "Language-Team: hosigumayuugi, papa\n" @@ -1375,9 +1375,6 @@ msgstr "言語ファイルを更新中:" msgid "Uploaded ZIP file installed to homebrew directory." msgstr "ｲﾝｽﾄｰﾙ済みﾃﾞｨﾚｸﾄﾘにZIPを送信しました" -msgid "Use IOS58" -msgstr "IOS58を使う" - msgid "VIDTV Patch" msgstr "映像パッチ" @@ -1499,6 +1496,9 @@ msgstr "中" msgid "seconds left" msgstr "秒で完了" +#~ msgid "Use IOS58" +#~ msgstr "IOS58を使う" + #~ msgid "Custom Disc Images" #~ msgstr "カスタムレーベル" diff --git a/Languages/korean.lang b/Languages/korean.lang index 8136ffb8..e0bff2c4 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-02-03 22:46+0100\n" +"POT-Creation-Date: 2011-02-05 11:34+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: nextos@korea.com\n" "Language-Team: \n" @@ -1375,9 +1375,6 @@ msgstr "언어화일 업데이트중:" msgid "Uploaded ZIP file installed to homebrew directory." msgstr "" -msgid "Use IOS58" -msgstr "" - msgid "VIDTV Patch" msgstr "VIDTV 패치" diff --git a/Languages/norwegian.lang b/Languages/norwegian.lang index 4637416e..4522d3bf 100644 --- a/Languages/norwegian.lang +++ b/Languages/norwegian.lang @@ -1,11 +1,11 @@ # USB Loader GX language source file. -# norwegian.lang - r813 +# norwegian.lang - r1036 # don't delete/change this line (é). msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-02-03 22:46+0100\n" +"POT-Creation-Date: 2011-02-05 11:34+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: raschi\n" "Language-Team: raschi\n" @@ -127,10 +127,10 @@ msgid "AUTO" msgstr "" msgid "All Partitions" -msgstr "" +msgstr "Alle partisjoner" msgid "All images downloaded successfully." -msgstr "" +msgstr "Alle bilder lastet ned ok." msgid "All the features of USB Loader GX are unlocked." msgstr "Alle funksjonene til USB Loader GX er opplåst." @@ -148,10 +148,10 @@ msgid "Apr" msgstr "" msgid "Are you sure you want to lock USB Loader GX?" -msgstr "" +msgstr "Er du sikker på at du vil låse USB Loader GX?" msgid "Are you sure you want to reset?" -msgstr "" +msgstr "Er du sikker på at du vil restarte?" msgid "Are you sure?" msgstr "Er du sikker?" @@ -166,7 +166,7 @@ msgid "AutoInit Network" msgstr "Autostart nettverk" msgid "BCA Codes Path" -msgstr "" +msgstr "BCA kode sti" msgid "Back" msgstr "Tilbake" @@ -248,7 +248,7 @@ msgstr "Kan ikke opprette mappe" #, c-format msgid "Can't create path: %s" -msgstr "" +msgstr "Kan ikke opprette sti: %s" msgid "Can't delete:" msgstr "Kan ikke slette:" @@ -257,16 +257,16 @@ msgid "Cancel" msgstr "Avbryt" msgid "Cannot write to destination." -msgstr "" +msgstr "Kan ikke skrive til mål." msgid "Change Play Path" -msgstr "" +msgstr "Endre spill sti" msgid "Cheatfile is blank" msgstr "Juksefil er blank" msgid "Clear" -msgstr "" +msgstr "Fjern" msgid "Click to Download Covers" msgstr "Klikk for å laste ned cover" @@ -318,17 +318,17 @@ msgid "Correct Password" msgstr "Riktig passord" msgid "Could not connect to the server." -msgstr "" +msgstr "Kan ikke koble til server." msgid "Could not create GCT file" msgstr "Kan ikke opprette GCT fil" #, c-format msgid "Could not create path: %s" -msgstr "" +msgstr "Kan ikke opprette sti: %s" msgid "Could not find info for this game in the wiitdb.xml." -msgstr "" +msgstr "Kan ikke finne info for dette spillet i wiitdb.xml." msgid "Could not initialize DIP module!" msgstr "Kan ikke initialisere DIP modul!" @@ -340,7 +340,7 @@ msgid "Could not open Disc" msgstr "Kan ikke åpne plate" msgid "Could not open wiitdb.xml." -msgstr "" +msgstr "Kan ikke åpne wiitdb.xml." msgid "Could not save." msgstr "Kan ikke lagre." @@ -403,7 +403,7 @@ msgid "Developed by" msgstr "Utviklet av" msgid "Directory does not exist!" -msgstr "Mappestruktur finnes ikke!" +msgstr "Mappe finnes ikke!" msgid "Disc Artwork Download" msgstr "Platebilde nedlasting" @@ -430,10 +430,10 @@ msgid "Display as a list" msgstr "Vis som liste" msgid "Display favorites only" -msgstr "" +msgstr "Vis kun favoritter" msgid "Do you want to apply it now?" -msgstr "" +msgstr "Vil du legge til nå?" msgid "Do you want to change language?" msgstr "Vil du endre språk?" @@ -445,10 +445,10 @@ msgid "Do you want to format:" msgstr "Vil du formatere:" msgid "Do you want to load the default theme?" -msgstr "" +msgstr "Vil du laste standard tema?" msgid "Do you want to load this theme?" -msgstr "" +msgstr "Vil du laste dette tema?" msgid "Do you want to sync free space info sector on all FAT32 partitions?" msgstr "" @@ -481,19 +481,19 @@ msgid "Downloading Full LQ Covers" msgstr "" msgid "Downloading custom Discarts" -msgstr "" +msgstr "Laster ned custom platebilde" msgid "Downloading file..." -msgstr "" +msgstr "Laster ned fil..." msgid "Downloading image:" msgstr "Laster ned bilde:" msgid "Downloading original Discarts" -msgstr "" +msgstr "Laster ned originale platebilde" msgid "Downloading pagelist:" -msgstr "" +msgstr "Laster ned sideliste:" msgid "Dutch" msgstr "Nederlandsk" @@ -505,7 +505,7 @@ msgid "ERROR:" msgstr "FEIL:" msgid "ERROR: Can't set up theme." -msgstr "" +msgstr "FEIL: Kan ikke laste tema." msgid "English" msgstr "Engelsk" @@ -521,32 +521,32 @@ msgstr "Error 002 fiks" #, c-format msgid "Error creating path: %s" -msgstr "" +msgstr "Feil ved oppretting av sti: %s" msgid "Error opening downloaded file" -msgstr "" +msgstr "Feil ved åpning av nedlastet fil" msgid "Error reading Disc" msgstr "Feil ved lesing av plate" #, c-format msgid "Error when downloading file: %i" -msgstr "" +msgstr "Feil ved nedlasting av fil: %i" msgid "Error while downloding file" -msgstr "" +msgstr "Feil ved nedlasting av fil" msgid "Error while opening the zip." -msgstr "" +msgstr "Feil ved åpning av zip." msgid "Error while transfering data." msgstr "Feil ved overføring av data." msgid "Error while updating USB Loader GX." -msgstr "" +msgstr "Feil ved oppdatering av USB Loader GX." msgid "Error writing the data." -msgstr "" +msgstr "Feil ved skriving av data." msgid "Error..." msgstr "Feil..." @@ -555,10 +555,10 @@ msgid "Error:" msgstr "Feil:" msgid "Exit" -msgstr "" +msgstr "Avslutt" msgid "Exit to where?" -msgstr "" +msgstr "Avslutt til?" msgid "Extracting files..." msgstr "Pakker ut filer..." @@ -573,7 +573,7 @@ msgid "Failed to open partition" msgstr "Feil ved åpning av partisjon" msgid "Failed updating" -msgstr "" +msgstr "Feil ved oppdatering" msgid "Feb" msgstr "" @@ -583,28 +583,28 @@ msgstr "Fil ikke funnet." #, c-format msgid "Filesize is %i Byte." -msgstr "" +msgstr "Filstørrelse er %i Byte." msgid "Filesize is 0 Byte." -msgstr "" +msgstr "Filstørrelse er 0 Byte." msgid "Finishing installation... Ok!" msgstr "Sluttfører installasjon... OK!" msgid "Flat Covers" -msgstr "" +msgstr "2D cover" msgid "Flip-X" msgstr "" msgid "Force NTSC" -msgstr "" +msgstr "Tving NTSC" msgid "Force PAL50" -msgstr "" +msgstr "Tving PAL50" msgid "Force PAL60" -msgstr "" +msgstr "Tving PAL60" msgid "Format" msgstr "Formatér" @@ -634,10 +634,10 @@ msgid "Full Menu" msgstr "" msgid "Full shutdown" -msgstr "" +msgstr "Skru helt av" msgid "GAMEID_Gamename" -msgstr "" +msgstr "SPILLID_Spillnavn" msgid "GCT Cheatcodes Path" msgstr "GCT Juksekode sti" @@ -652,7 +652,7 @@ msgid "Game ID" msgstr "Spill ID" msgid "Game IOS" -msgstr "" +msgstr "Spill IOS" msgid "Game Language" msgstr "Språk" @@ -661,7 +661,7 @@ msgid "Game Load" msgstr "Lasting av spill" msgid "Game Lock" -msgstr "" +msgstr "Lås spill" msgid "Game Only" msgstr "" @@ -673,13 +673,13 @@ msgid "Game Size" msgstr "Spill størrelse" msgid "Game Sound Mode" -msgstr "" +msgstr "Spillyd modus" msgid "Game Sound Volume" -msgstr "" +msgstr "Spillyd volum" msgid "Game Split Size" -msgstr "" +msgstr "Spill splittestørrelse" msgid "Game is already installed:" msgstr "Spillet er allerede installert:" @@ -688,19 +688,19 @@ msgid "Game/Install Partition" msgstr "" msgid "Gamename [GAMEID]" -msgstr "" +msgstr "Spillnavn [SPILLID]" msgid "Games" msgstr "Spill" msgid "Genre:" -msgstr "" +msgstr "Sjanger:" msgid "German" msgstr "Tysk" msgid "Global Settings" -msgstr "" +msgstr "Globale innstillinger" msgid "HOME Menu" msgstr "HOME Meny" @@ -709,7 +709,7 @@ msgid "Homebrew Apps Path" msgstr "Homebrew Apps sti" msgid "Homebrew Channel" -msgstr "" +msgstr "HBC" msgid "Homebrew Launcher" msgstr "Homebrew Laster" @@ -750,10 +750,10 @@ msgid "Install a game" msgstr "Installér et spill" msgid "Install directories" -msgstr "" +msgstr "Installasjonsmapper" msgid "Install partitions" -msgstr "" +msgstr "Installasjonspartisjoner" msgid "Installing content... Ok!" msgstr "Installerer innhold... OK!" @@ -771,7 +771,7 @@ msgid "Installing wad" msgstr "Installerer WAD" msgid "Issue manager /" -msgstr "" +msgstr "Problem manager /" msgid "It seems that you have some information that will be helpful to us. Please pass this information along to the DEV team." msgstr "Det ser ut til at du har informasjon som kan være nyttig for oss. Vennligst videresend denne informasjonen til utviklerteamet." @@ -804,10 +804,10 @@ msgid "Language File" msgstr "Språk Fil" msgid "Language change:" -msgstr "Endre språk" +msgstr "Endre språk:" msgid "Languagefiles Path" -msgstr "" +msgstr "Språkfil sti" msgid "Languagepath changed." msgstr "Språksti endret." @@ -835,10 +835,10 @@ msgid "Load this DOL as alternate DOL?" msgstr "Last denne DOL som alternativ DOL?" msgid "Loader Settings" -msgstr "" +msgstr "Loader innstillinger" msgid "Loading default theme." -msgstr "" +msgstr "Laster standard tema." msgid "Loading standard language." msgstr "Laster standard språk." @@ -850,34 +850,34 @@ msgid "Lock Console" msgstr "Lås konsoll" msgid "Lock USB Loader GX" -msgstr "" +msgstr "Lås USB Loader GX" msgid "Locked" msgstr "Låst" msgid "Loop Directory" -msgstr "" +msgstr "Loop mappe" msgid "Loop Music" -msgstr "" +msgstr "Loop musikk" msgid "Loop Sound" -msgstr "" +msgstr "Loop lyd" msgid "Main tester:" -msgstr "" +msgstr "Hovedtester:" msgid "Mar" msgstr "" msgid "Mark new games" -msgstr "" +msgstr "Merk nye spill" msgid "May" msgstr "Mai" msgid "Messageboard Update" -msgstr "" +msgstr "Messageboard oppdatering" msgid "Motion+ Video" msgstr "" @@ -889,7 +889,7 @@ msgid "Multiple Partitions" msgstr "" msgid "Music Loop Mode" -msgstr "" +msgstr "Musikk loop modus" msgid "Music Volume" msgstr "Musikk volum" @@ -898,7 +898,7 @@ msgid "Neither" msgstr "Ingen" msgid "Network is not initiated." -msgstr "" +msgstr "Nettverk er ikke initialisert." msgid "New Disc Detected" msgstr "Ny plate oppdaget" @@ -916,13 +916,13 @@ msgid "No DOL file found on disc." msgstr "Ingen DOL fil funnet på plate." msgid "No Splitting" -msgstr "" +msgstr "Ingen splitt" msgid "No URL or Path specified." -msgstr "" +msgstr "Ingen URL eller sti spesifisert." msgid "No WBFS or FAT/NTFS/EXT partition found" -msgstr "" +msgstr "Ingen WBFS eller FAT/NTFS/EXT partisjon funnet" msgid "No cheats were selected" msgstr "Ingen juksefiler valgt" @@ -931,7 +931,7 @@ msgid "No data could be read." msgstr "Ingen data kan leses." msgid "No favorites selected." -msgstr "" +msgstr "Ingen favoritter valgt." msgid "No file missing!" msgstr "Ingen filer mangler!" @@ -943,25 +943,25 @@ msgid "No themes found on the site." msgstr "Ingen temaer funnet på websiden." msgid "None" -msgstr "" +msgstr "Ingen" msgid "Normal" msgstr "" msgid "Not a WAD file." -msgstr "" +msgstr "Ikke en WAD fil." msgid "Not a Wii Disc" msgstr "Ikke en Wii plate" msgid "Not a valid URL" -msgstr "" +msgstr "Ikke en gyldig URL" msgid "Not a valid URL path" -msgstr "" +msgstr "Ikke en gyldig URL sti" msgid "Not a valid domain" -msgstr "" +msgstr "Ikke et gyldig domene" msgid "Not enough free memory." msgstr "Ikke nok ledig minne." @@ -970,10 +970,10 @@ msgid "Not enough free space!" msgstr "Ikke nok ledig plass!" msgid "Not enough memory." -msgstr "" +msgstr "Ikke nok minne." msgid "Not required" -msgstr "" +msgstr "Ikke nødvendig" msgid "Not supported format!" msgstr "Ikke et støttet format!" @@ -1003,7 +1003,7 @@ msgid "Offset" msgstr "" msgid "Only Game Partition" -msgstr "" +msgstr "Kun spill partisjon" msgid "Only for Install" msgstr "Kun for installering" @@ -1033,7 +1033,7 @@ msgid "Patch Country Strings" msgstr "Patch land strenger" msgid "Path Changed" -msgstr "" +msgstr "Sti endret" msgid "Permission denied." msgstr "" @@ -1045,16 +1045,16 @@ msgid "Play Count" msgstr "Ganger spilt" msgid "Play Next" -msgstr "" +msgstr "Spill neste" msgid "Play Once" -msgstr "" +msgstr "Spill en gang" msgid "Play Previous" -msgstr "" +msgstr "Spill forrige" msgid "Playing Music:" -msgstr "" +msgstr "Spiller musikk:" msgid "Please wait..." msgstr "Vennligst vent..." @@ -1075,7 +1075,7 @@ msgid "Quick Boot" msgstr "Hurtig start" msgid "Random Directory Music" -msgstr "" +msgstr "Tilfeldig musikk fra mappe" msgid "Reading WAD data... Ok!" msgstr "Leser WAD data... OK!" @@ -1093,7 +1093,7 @@ msgid "Reload SD" msgstr "Les SD på nytt" msgid "Remove update" -msgstr "" +msgstr "Fjern oppdatering" msgid "Rename Game on WBFS" msgstr "Gi nytt navn til spill på WBFS" @@ -1102,13 +1102,13 @@ msgid "Reset" msgstr "" msgid "Reset BG Music" -msgstr "" +msgstr "Tilbakestill BG musikk" msgid "Reset Playcounter" msgstr "Nullstill teller" msgid "Reset to default BGM?" -msgstr "" +msgstr "Tilbakestill til standard BGM?" msgid "Restarting..." msgstr "Starter på nytt..." @@ -1117,7 +1117,7 @@ msgid "Return" msgstr "Gå tilbake" msgid "Return To" -msgstr "" +msgstr "Gå tilbake til" msgid "Return to Wii Menu" msgstr "Tilbake til Wii meny" @@ -1138,7 +1138,7 @@ msgid "Save" msgstr "Lagre" msgid "Save Failed. No device inserted?" -msgstr "" +msgstr "Feil ved lagring. Ingen enhet koblet til?" msgid "Save Game List to" msgstr "Lagre spilliste som" @@ -1153,16 +1153,16 @@ msgid "Screensaver" msgstr "Skjermbeskytter" msgid "Select" -msgstr "" +msgstr "Velg" msgid "Select DOL Offset" -msgstr "" +msgstr "Velg DOL offset" msgid "Select a DOL" msgstr "Velg en DOL fil" msgid "Select a DOL from Game" -msgstr "" +msgstr "Velg en DOL fra spill" msgid "Sept" msgstr "Sep" @@ -1174,13 +1174,13 @@ msgid "Settings" msgstr "Innstillinger" msgid "Show Free Space" -msgstr "" +msgstr "Vis ledig plass" msgid "Shutdown System" msgstr "Skru helt av" msgid "Shutdown Wii" -msgstr "" +msgstr "Skru av Wii" msgid "Sort alphabetically" msgstr "Sortér alfabetisk" @@ -1198,13 +1198,13 @@ msgid "Sound" msgstr "Lyd" msgid "Sound Settings" -msgstr "" +msgstr "Lyd innstillinger" msgid "Sound+BGM" -msgstr "" +msgstr "Lyd+BGM" msgid "Sound+Quiet" -msgstr "" +msgstr "Lyd+Stille" msgid "Spanish" msgstr "Spansk" @@ -1213,10 +1213,10 @@ msgid "Special thanks to:" msgstr "Spesielt takk til:" msgid "Split each 2GB" -msgstr "" +msgstr "Splitt ved 2GB" msgid "Split each 4GB" -msgstr "" +msgstr "Splitt ved 4GB" msgid "Standby" msgstr "" @@ -1234,7 +1234,7 @@ msgid "Successfully Updated" msgstr "Vellykket oppdatering" msgid "Successfully Updated thanks to www.techjawa.com" -msgstr "" +msgstr "Vellykket oppdatering takket være www.techjawa.com" msgid "Successfully deleted:" msgstr "Vellykket sletting:" @@ -1261,7 +1261,7 @@ msgid "TXT Cheatcodes Path" msgstr "TXTjuksekode sti" msgid "The .them file was not found in the zip." -msgstr "" +msgstr "Filen .them ble ikke funnet i zip." msgid "The entered directory does not exist. Would you like to create it?" msgstr "Valgt mappe finnes ikke. Vil du opprette den?" @@ -1270,11 +1270,11 @@ msgid "The game installation is disabled under this IOS because of instability i msgstr "" msgid "The wad file was installed" -msgstr "" +msgstr "WAD filen ble installert" #, c-format msgid "The wad installation failed with error %i" -msgstr "" +msgstr "WAD innstallering feilet med feilmelding %i" msgid "Theme Downloader" msgstr "Tema Nedlaster" @@ -1286,16 +1286,16 @@ msgid "Theme Title:" msgstr "Tema tittel:" msgid "Theme path is changed." -msgstr "" +msgstr "Tema sti er endret." msgid "Themes by www.spiffy360.com" -msgstr "" +msgstr "Tema fra www.spiffy360.com" msgid "This IOS is the BootMii ios. If you are sure it is not BootMii and you have something else installed there than ignore this warning." -msgstr "" +msgstr "Dette IOS er vanligvis BootMii IOS. Hvis du er sikker på at dette ikke er BootMii, kan du ignorere denne advarselen." msgid "This IOS was not found on the titles list. If you are sure you have it installed than ignore this warning." -msgstr "" +msgstr "Dette IOS ble ikke funnet i tittel listen. Hvis du er sikker på at du har det installert, kan du ignorere denne advarselen." msgid "Time left:" msgstr "Tid igjen:" @@ -1310,7 +1310,7 @@ msgid "Tooltips" msgstr "Verktøystips" msgid "Transfer failed" -msgstr "" +msgstr "Overføring feilet" msgid "USB Device not found" msgstr "USB enhet ikke funnet" @@ -1334,16 +1334,16 @@ msgid "Uninstalling wad" msgstr "Avinstallerer WAD" msgid "Unknown" -msgstr "" +msgstr "Ukjent" msgid "Unlock USB Loader GX" -msgstr "" +msgstr "Lås opp USB Loader GX" msgid "Unlocked" msgstr "Opplåst" msgid "Unsupported format, try to extract manually TempTheme.zip." -msgstr "" +msgstr "Ikke støttet format. Prøv å pakk ut TempTheme.zip manuelt." msgid "Update" msgstr "Oppdater" @@ -1367,7 +1367,7 @@ msgid "Update failed" msgstr "Mislykket oppdatering" msgid "Update successfull" -msgstr "" +msgstr "Vellykket oppdatering" msgid "Updating Language Files:" msgstr "Oppdaterer språkfiler:" @@ -1375,9 +1375,6 @@ msgstr "Oppdaterer språkfiler:" msgid "Uploaded ZIP file installed to homebrew directory." msgstr "Opplastet ZIP fil installert i homebrew mappen." -msgid "Use IOS58" -msgstr "" - msgid "VIDTV Patch" msgstr "" @@ -1392,13 +1389,13 @@ msgid "WDM Files Path" msgstr "" msgid "WIP Patches Path" -msgstr "" +msgstr "WIP patches sti" msgid "Waiting..." msgstr "Venter..." msgid "Warning:" -msgstr "" +msgstr "Advarsel:" msgid "What do you want to update?" msgstr "Hva vil du oppdatere?" @@ -1425,7 +1422,7 @@ msgid "WiiTDB Path" msgstr "WiiTDB sti" msgid "WiiTDB is up to date." -msgstr "" +msgstr "WiiTDB er oppdatert." msgid "Wiilight" msgstr "Wii DVD lys" @@ -1440,13 +1437,13 @@ msgid "You are currently using IOS" msgstr "" msgid "You are trying to select a FAT32/NTFS/EXT partition with cIOS 249 Rev < 18. This is not supported. Continue on your own risk." -msgstr "" +msgstr "Du prøver å velge en FAT32/NTFS/EXT partisjon med cIOS 249 rev < 18. Dette er ikke støttet. Fortsett på eget ansvar." msgid "You need to select or format a partition" -msgstr "" +msgstr "Du må velge en partisjon" msgid "and translators for language files updates" -msgstr "" +msgstr "og oversettere for språkfiler" msgid "available" msgstr "tilgjengelig" @@ -1461,7 +1458,7 @@ msgid "files left" msgstr "filer gjenstår" msgid "for FAT/NTFS support" -msgstr "" +msgstr "for FAT/NTFS støtte" msgid "for Ocarina" msgstr "" @@ -1499,39 +1496,63 @@ msgstr "av" msgid "seconds left" msgstr "sekunder gjenstår" -#~ msgid "Download Boxart image?" -#~ msgstr "Last ned cover bilde?" +#~ msgid "0 (Locked and Unlocked Games)" +#~ msgstr "0 (Låste og ulåste spill)" -#~ msgid "Download Discart image?" -#~ msgstr "Last ned plate bilde?" +#~ msgid "1 (Unlocked Games Only)" +#~ msgstr "1 (Kun ulåste spill)" -#~ msgid "Downloading file" -#~ msgstr "Laster ned fil" - -#~ msgid "Missing files" -#~ msgstr "Manglende filer" - -#~ msgid "files not found on the server!" -#~ msgstr "filer ikke funnet på serveren!" +#~ msgid "BETA revisions" +#~ msgstr "BETA revisjoner" #~ msgid "Disc Images" #~ msgstr "Plate bilder" -#~ msgid "Only Customs" -#~ msgstr "Kun custom" - -#~ msgid "Only Original" -#~ msgstr "Kun original" - #~ msgid "Do you really want to delete:" #~ msgstr "Er du sikker på at du vil slette:" #~ msgid "Do you want to use the alternate DOL that is known to be correct?" #~ msgstr "Vil du bruke alt DOL filen som er kjent for å være riktig?" +#~ msgid "Download Boxart image?" +#~ msgstr "Last ned cover bilde?" + +#~ msgid "Download Discart image?" +#~ msgstr "Last ned plate bilde?" + +#~ msgid "Downloading covers" +#~ msgstr "Laster ned cover" + +#~ msgid "Downloading file" +#~ msgstr "Laster ned fil" + +#~ msgid "Enabling this option on a FAT partition might slow the startup of the loader." +#~ msgstr "Aktivering av dette valget på en FAT partisjon kan føre til treg oppstart." + +#~ msgid "GamesLevel" +#~ msgstr "SpillNivå" + +#~ msgid "Missing files" +#~ msgstr "Manglende filer" + +#~ msgid "Only Customs" +#~ msgstr "Kun custom" + +#~ msgid "Only Original" +#~ msgstr "Kun original" + +#~ msgid "Trying custom Discarts" +#~ msgstr "Prøver custom platebilder" + +#~ msgid "Trying original Discarts" +#~ msgstr "Prøver originale platebilder" + #~ msgid "Unlock console to use this option." #~ msgstr "Lås opp konsollen for å bruke denne innstillingen." +#~ msgid "files not found on the server!" +#~ msgstr "filer ikke funnet på serveren!" + #~ msgid "Full Shutdown" #~ msgstr "Skru helt av" diff --git a/Languages/polish.lang b/Languages/polish.lang index dbded484..73237bc3 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-02-03 22:46+0100\n" +"POT-Creation-Date: 2011-02-05 11:34+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: ziom666 (zadania_prog@vp.pl)\n" "Language-Team: \n" @@ -1375,9 +1375,6 @@ msgstr "Aktualizacja plikow jezykowych:" msgid "Uploaded ZIP file installed to homebrew directory." msgstr "Wyslany plik ZIP zainstalowano w katalogu homebrew" -msgid "Use IOS58" -msgstr "" - msgid "VIDTV Patch" msgstr "" diff --git a/Languages/portuguese_br.lang b/Languages/portuguese_br.lang index b8f85e24..7c7ae521 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-02-03 22:46+0100\n" +"POT-Creation-Date: 2011-02-05 11:34+0100\n" "PO-Revision-Date: 2009-10-23 18:52+0200\n" "Last-Translator: aniemotion\n" "Language-Team: boto12, aniemotion\n" @@ -1375,9 +1375,6 @@ msgstr "Atualizando arquivos de Idioma:" msgid "Uploaded ZIP file installed to homebrew directory." msgstr "Arquivo ZIP enviado y instalado no diretório homebrew." -msgid "Use IOS58" -msgstr "" - msgid "VIDTV Patch" msgstr "Patch VIDTV" diff --git a/Languages/portuguese_pt.lang b/Languages/portuguese_pt.lang index 9c8c4f77..cc74bdae 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-02-03 22:46+0100\n" +"POT-Creation-Date: 2011-02-05 11:34+0100\n" "PO-Revision-Date: 2010-03-22 10:55-0000\n" "Last-Translator: Sky8000\n" "Language-Team: Sky8000 \n" @@ -1375,9 +1375,6 @@ msgstr "Actualizando ficheiros de Idioma:" msgid "Uploaded ZIP file installed to homebrew directory." msgstr "Ficheiro ZIP instalado na pasta do Homebrew." -msgid "Use IOS58" -msgstr "" - msgid "VIDTV Patch" msgstr "Patch VIDTV" diff --git a/Languages/russian.lang b/Languages/russian.lang index 7a1dfb02..57fa5202 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-02-03 22:46+0100\n" +"POT-Creation-Date: 2011-02-05 11:34+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: nikolai_ca\n" "Language-Team: Kir, alendit, nikolai_ca\n" @@ -1375,9 +1375,6 @@ msgstr "Обновление языковых файлов:" msgid "Uploaded ZIP file installed to homebrew directory." msgstr "Загруженный ZIP-файл установлен в каталог homebrew" -msgid "Use IOS58" -msgstr "" - msgid "VIDTV Patch" msgstr "Патч VIDTV" diff --git a/Languages/schinese.lang b/Languages/schinese.lang index 8053c411..0e01bf6b 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-02-03 22:46+0100\n" +"POT-Creation-Date: 2011-02-05 11:34+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: knife.hu kavid emul8ion\n" "Language-Team: kavid\n" @@ -27,11 +27,11 @@ msgstr "不在服务器上" #, c-format msgid "%i files not found on the server!" -msgstr "" +msgstr "服务器上未找到%i个文件!" #, c-format msgid "%i missing files" -msgstr "" +msgstr "缺少%i个文件" msgid "0 (Everyone)" msgstr "0 (全年龄)" @@ -355,7 +355,7 @@ msgid "Credits" msgstr "作者信息" msgid "Custom Discarts" -msgstr "" +msgstr "自定义光盘图片" msgid "Custom Paths" msgstr "自定义路径" @@ -475,10 +475,10 @@ msgid "Downloading Flat Covers" msgstr "正在下载2D封面" msgid "Downloading Full HQ Covers" -msgstr "" +msgstr "正在下载高清晰完整封面" msgid "Downloading Full LQ Covers" -msgstr "" +msgstr "正在下载低清晰完整封面" msgid "Downloading custom Discarts" msgstr "正在下载自制光盘封面" @@ -613,7 +613,7 @@ msgid "Formatting, please wait..." msgstr "格式化中, 请稍候..." msgid "Found missing images." -msgstr "" +msgstr "找到缺少的图片." msgid "Free Space" msgstr "剩余空间" @@ -622,13 +622,13 @@ msgid "French" msgstr "法文" msgid "Full Cover Path" -msgstr "" +msgstr "完整封面路径" msgid "Full HQ Covers" -msgstr "" +msgstr "完整高清晰封面路径" msgid "Full LQ Covers" -msgstr "" +msgstr "完整低清晰封面路径" msgid "Full Menu" msgstr "完整菜单" @@ -685,7 +685,7 @@ msgid "Game is already installed:" msgstr "已安装的游戏:" msgid "Game/Install Partition" -msgstr "" +msgstr "游戏/安装分区" msgid "Gamename [GAMEID]" msgstr "游戏名[游戏ID]" @@ -886,7 +886,7 @@ msgid "Mount DVD drive" msgstr "挂载DVD光驱" msgid "Multiple Partitions" -msgstr "" +msgstr "多分区" msgid "Music Loop Mode" msgstr "音乐循环模式" @@ -1009,7 +1009,7 @@ msgid "Only for Install" msgstr "仅安装" msgid "Original Discarts" -msgstr "" +msgstr "官方光盘图片" msgid "Original/Customs" msgstr "官方/自制" @@ -1144,7 +1144,7 @@ msgid "Save Game List to" msgstr "保存游戏列表到" msgid "Save List" -msgstr "" +msgstr "保存列表" msgid "Saved" msgstr "已保存" @@ -1186,7 +1186,7 @@ msgid "Sort alphabetically" msgstr "按字母排序" msgid "Sort by number of players" -msgstr "" +msgstr "以玩家数量排序" msgid "Sort by rank" msgstr "以排名排序" @@ -1246,7 +1246,7 @@ msgid "Successfully installed:" msgstr "成功安装:" msgid "Sync FAT32 FS Info" -msgstr "同步FAT32文件系统信息" +msgstr "同步FAT32信息" msgid "Synchronizing..." msgstr "正在同步..." @@ -1375,9 +1375,6 @@ msgstr "正在升级语言文件:" msgid "Uploaded ZIP file installed to homebrew directory." msgstr "上传已安装Zip文件到自制程序目录" -msgid "Use IOS58" -msgstr "使用IOS58" - msgid "VIDTV Patch" msgstr "VIDTV修改" @@ -1499,6 +1496,9 @@ msgstr "的" msgid "seconds left" msgstr "剩余秒数" +#~ msgid "Use IOS58" +#~ msgstr "使用IOS58" + #~ msgid "Custom Disc Images" #~ msgstr "自定义光盘图片" diff --git a/Languages/spanish.lang b/Languages/spanish.lang index 4bcf634c..638f61db 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-02-03 22:46+0100\n" +"POT-Creation-Date: 2011-02-05 11:34+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: SirPalax\n" "Language-Team: Penn, SirPalax\n" @@ -1375,9 +1375,6 @@ msgstr "Actualizando archivos de Idiomas:" msgid "Uploaded ZIP file installed to homebrew directory." msgstr "Enviado archivo ZIP instalado en la carpeta homebrew." -msgid "Use IOS58" -msgstr "" - msgid "VIDTV Patch" msgstr "Parche VIDTV" diff --git a/Languages/swedish.lang b/Languages/swedish.lang index c98a5216..9a15cd1b 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-02-03 22:46+0100\n" +"POT-Creation-Date: 2011-02-05 11:34+0100\n" "PO-Revision-Date: 2010-01-19 17:39+0200\n" "Last-Translator: Katsurou\n" "Language-Team: Katsurou, pirateX\n" @@ -1375,9 +1375,6 @@ msgstr "Uppdatera språk-filer:" msgid "Uploaded ZIP file installed to homebrew directory." msgstr "Uppladdad ZIP fil installerad till homebrew-mappen" -msgid "Use IOS58" -msgstr "" - msgid "VIDTV Patch" msgstr "VIDTV-Patch" diff --git a/Languages/tchinese.lang b/Languages/tchinese.lang index 6c8734ec..b85db23f 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-02-03 22:46+0100\n" +"POT-Creation-Date: 2011-02-05 11:34+0100\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" @@ -291,7 +291,7 @@ msgid "Coding:" msgstr "編譯:" msgid "Connection to server timed out." -msgstr "" +msgstr "連接伺服器超時。" msgid "Console" msgstr "控制台" @@ -1375,9 +1375,6 @@ msgstr "正在更新語言檔案：" msgid "Uploaded ZIP file installed to homebrew directory." msgstr "已更新安裝在Homebrew目錄的ZIP檔案" -msgid "Use IOS58" -msgstr "使用 IOS58" - msgid "VIDTV Patch" msgstr "VIDTV 修改" @@ -1517,6 +1514,9 @@ msgstr "剩餘秒數" #~ msgid "Original Disc Images" #~ msgstr "原始光碟圖片" +#~ msgid "Use IOS58" +#~ msgstr "使用 IOS58" + #~ msgid "files not found on the server!" #~ msgstr "伺服器中無此檔案！" diff --git a/Languages/thai.lang b/Languages/thai.lang index 0db0716b..ae02e4f2 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-02-03 22:46+0100\n" +"POT-Creation-Date: 2011-02-05 11:34+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: Nitro_subzero \n" "Language-Team: Nitro_subzero\n" @@ -1375,9 +1375,6 @@ msgstr "กำลังอัพเดทไฟล์ภาษา:" msgid "Uploaded ZIP file installed to homebrew directory." msgstr "อัพโหลดไฟล์ zip ไปที่ไดเรคทอรี่ homebrew" -msgid "Use IOS58" -msgstr "" - msgid "VIDTV Patch" msgstr "ปรับแก้ VIDTV" diff --git a/Languages/turkish.lang b/Languages/turkish.lang index 8a5fde1f..58b64f0d 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-02-03 22:46+0100\n" +"POT-Creation-Date: 2011-02-05 11:34+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" "Last-Translator: omercigingelini\n" "Language-Team: omercigingelini\n" @@ -1375,9 +1375,6 @@ msgstr "Güncellenen Dil Dosyaları:" msgid "Uploaded ZIP file installed to homebrew directory." msgstr "ZIp dosyası homebrew klasörüne kuruldu" -msgid "Use IOS58" -msgstr "" - msgid "VIDTV Patch" msgstr "VIDTV Yaması" diff --git a/Makefile b/Makefile index a200bf0c..b462509f 100644 --- a/Makefile +++ b/Makefile @@ -64,7 +64,7 @@ LDFLAGS = -g $(MACHDEP) -Wl,-Map,$(notdir $@).map,--section-start,.init=0x80B00 # any extra libraries we wish to link with the project #--------------------------------------------------------------------------------- LIBS := -lpngu -lpng -lgd -lm -lz -lwiiuse -lbte -lasnd -logc -lfreetype -lvorbisidec \ - -lmad -lmxml -ljpeg -lzip -lcustomfat -lcustomntfs -lcustomext2fs -ldi + -lmad -lmxml -ljpeg -lzip -lcustomfat -lcustomntfs -lcustomext2fs #--------------------------------------------------------------------------------- # list of directories containing libraries, this must be the top level containing # include and lib diff --git a/gui.pnproj b/gui.pnproj index a4e0380f..80f6da60 100644 --- a/gui.pnproj +++ b/gui.pnproj @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/source/StartUpProcess.cpp b/source/StartUpProcess.cpp index 4487a86e..ef956b3b 100644 --- a/source/StartUpProcess.cpp +++ b/source/StartUpProcess.cpp @@ -92,6 +92,7 @@ bool StartUpProcess::USBSpinUp() bool started = false; int retries = 400; const DISC_INTERFACE * handle = DeviceHandler::GetUSBInterface(); + // wait 10 sec for the USB to spin up...stupid slow ass HDD do { @@ -103,14 +104,6 @@ bool StartUpProcess::USBSpinUp() messageTxt->SetTextf("Waiting for HDD: %i sec left\n", retries/20); Draw(); } - - if(retries/20 == 18 && IOS_GetVersion() < 200) - { - DeviceHandler::DestroyInstance(); - IosLoader::LoadAppCios(); - DeviceHandler::Instance()->MountSD(); - handle = DeviceHandler::GetUSBInterface(); - } } while(!started && --retries > 0); @@ -126,6 +119,15 @@ bool StartUpProcess::Run() bool StartUpProcess::Execute() { + SetTextf("Start up\n"); + + if(IosLoader::LoadAppCios() < 0) + { + SetTextf("Failed loading any cIOS. USB Loader GX requires at least cIOS 222, 249 or 250. Exiting...\n"); + sleep(5); + Sys_BackToLoader(); + } + SetTextf("Initialize sd card\n"); DeviceHandler::Instance()->MountSD(); @@ -139,7 +141,7 @@ bool StartUpProcess::Execute() gprintf("\tLoading game settings...%s\n", GameSettings.Load(Settings.ConfigPath) ? "done" : "failed"); gprintf("\tLoading game statistics...%s\n", GameStatistics.Load(Settings.ConfigPath) ? "done" : "failed"); - if(!Settings.UseIOS58 && Settings.cios != IOS_GetVersion()) + if(Settings.cios != IOS_GetVersion()) { SetTextf("Loading cIOS %i\n", Settings.cios); diff --git a/source/libs/libwbfs/libwbfs.c b/source/libs/libwbfs/libwbfs.c index 1b799e51..3b98964c 100644 --- a/source/libs/libwbfs/libwbfs.c +++ b/source/libs/libwbfs/libwbfs.c @@ -756,9 +756,9 @@ int wbfs_get_fragments(wbfs_disc_t *d, _frag_append_t append_fragment, void *cal if (!d) return -1; //! Use here real physical HDD sector size - u32 phys_hdd_sec_sz = *(((u32 *) d->p->callback_data)+1); + extern u32 hdd_sector_size; wbfs_t *p = d->p; - int src_wbs_nlb = p->wbfs_sec_sz / phys_hdd_sec_sz; + int src_wbs_nlb = p->wbfs_sec_sz / hdd_sector_size; int i, ret, last = 0; for (i = 0; i < p->n_wbfs_sec_per_disc; i++) { diff --git a/source/main.cpp b/source/main.cpp index bababfd2..1833965d 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -49,9 +49,6 @@ static int QuickGameBoot(const char * gameID) int main(int argc, char *argv[]) { - if(IOS_GetVersion() != 58) - IOS_ReloadIOS(58); - MEM2_init(48); __exception_setreload(20); MagicPatches(1); diff --git a/source/settings/CSettings.cpp b/source/settings/CSettings.cpp index 68e4c959..6f2f412e 100644 --- a/source/settings/CSettings.cpp +++ b/source/settings/CSettings.cpp @@ -107,7 +107,6 @@ void CSettings::SetDefault() marknewtitles = ON; ShowFreeSpace = ON; PlaylogUpdate = ON; - UseIOS58 = OFF; ParentalBlocks = BLOCK_ALL; InstallToDir = INSTALL_TO_NAME_GAMEID; GameSplit = GAMESPLIT_4GB; @@ -252,7 +251,6 @@ bool CSettings::Save() fprintf(file, "GameSplit = %d\n ", GameSplit); fprintf(file, "InstallPartitions = %08X\n ", InstallPartitions); fprintf(file, "PlaylogUpdate = %d\n ", PlaylogUpdate); - fprintf(file, "UseIOS58 = %d\n ", UseIOS58); fprintf(file, "ParentalBlocks = %08X\n ", ParentalBlocks); fprintf(file, "returnTo = %s\n ", returnTo); fprintf(file, "HomeMenu = %d\n ", HomeMenu); @@ -499,11 +497,6 @@ bool CSettings::SetSetting(char *name, char *value) if (sscanf(value, "%d", &i) == 1) PlaylogUpdate = i; return true; } - else if (strcmp(name, "UseIOS58") == 0) - { - if (sscanf(value, "%d", &i) == 1) UseIOS58 = i; - return true; - } else if (strcmp(name, "InstallPartitions") == 0) { InstallPartitions = strtoul(value, 0, 16); diff --git a/source/settings/CSettings.h b/source/settings/CSettings.h index 97bc8b7d..2fba4135 100644 --- a/source/settings/CSettings.h +++ b/source/settings/CSettings.h @@ -109,7 +109,6 @@ class CSettings short GameSplit; short PlaylogUpdate; short ShowFreeSpace; - short UseIOS58; short HomeMenu; short MultiplePartitions; u32 InstallPartitions; diff --git a/source/settings/menus/LoaderSettings.cpp b/source/settings/menus/LoaderSettings.cpp index 72b8dca7..845ea046 100644 --- a/source/settings/menus/LoaderSettings.cpp +++ b/source/settings/menus/LoaderSettings.cpp @@ -113,7 +113,6 @@ LoaderSettings::LoaderSettings() Options->SetName(Idx++, "%s", tr( "Game Language" )); Options->SetName(Idx++, "%s", tr( "Patch Country Strings" )); Options->SetName(Idx++, "%s", tr( "Ocarina" )); - Options->SetName(Idx++, "%s", tr( "Use IOS58" )); Options->SetName(Idx++, "%s", tr( "Boot/Standard" )); Options->SetName(Idx++, "%s", tr( "Game/Install Partition" )); Options->SetName(Idx++, "%s", tr( "Multiple Partitions" )); @@ -169,12 +168,6 @@ void LoaderSettings::SetOptionValues() //! Settings: Ocarina Options->SetValue(Idx++, "%s", tr( OnOffText[Settings.ocarina] )); - //! Settings: Use IOS58 - if (Settings.godmode) - Options->SetValue(Idx++, "%s", tr( OnOffText[Settings.UseIOS58] )); - else - Options->SetValue(Idx++, "********"); - //! Settings: Boot/Standard if (Settings.godmode) Options->SetValue(Idx++, "IOS %i", Settings.cios); @@ -263,15 +256,6 @@ int LoaderSettings::GetMenuInternal() if (++Settings.ocarina >= MAX_ON_OFF) Settings.ocarina = 0; } - //! Settings: Use IOS58 - else if (ret == ++Idx) - { - if(!Settings.godmode) - return MENU_NONE; - - if (++Settings.UseIOS58 >= MAX_ON_OFF) Settings.UseIOS58 = 0; - } - //! Settings: Boot/Standard else if (ret == ++Idx) { diff --git a/source/usbloader/MountGamePartition.cpp b/source/usbloader/MountGamePartition.cpp index 1b4fab7f..3a45eece 100644 --- a/source/usbloader/MountGamePartition.cpp +++ b/source/usbloader/MountGamePartition.cpp @@ -124,7 +124,8 @@ int MountGamePartition(bool ShowGUI) if(Settings.MultiplePartitions) ret = WBFS_OpenAll(); else - WBFS_OpenPart(Settings.partition); + ret = WBFS_OpenPart(Settings.partition); + if(ret < 0) ret = FindGamePartition(); diff --git a/source/usbloader/frag.c b/source/usbloader/frag.c index c4a5096a..5106a931 100644 --- a/source/usbloader/frag.c +++ b/source/usbloader/frag.c @@ -42,8 +42,9 @@ void frag_dump(FragList *ff) } } -int frag_append(FragList *ff, u32 offset, u32 sector, u32 count) +int frag_append(void *f, u32 offset, u32 sector, u32 count) { + FragList *ff = (FragList *) f; int n; if (count) { n = ff->num - 1; @@ -72,11 +73,6 @@ int frag_append(FragList *ff, u32 offset, u32 sector, u32 count) return 0; } -int _frag_append(void *ff, u32 offset, u32 sector, u32 count) -{ - return frag_append(ff, offset, sector, count); -} - int frag_concat(FragList *ff, FragList *src) { int i, ret; @@ -164,9 +160,8 @@ int frag_remap(FragList *ff, FragList *log, FragList *phy) return 0; } -int get_frag_list_for_file(char *fname, u8 *id, u8 wbfs_part_fs, u32 lba_offset) +int get_frag_list_for_file(char *fname, u8 *id, const u8 wbfs_part_fs, const u32 lba_offset) { - char fname1[1024]; struct stat st; FragList *fs = NULL; FragList *fa = NULL; @@ -192,9 +187,8 @@ int get_frag_list_for_file(char *fname, u8 *id, u8 wbfs_part_fs, u32 lba_offset) fname[strlen(fname)-1] = '0' + i; if (stat(fname, &st) == -1) break; } - strcpy(fname1, fname); if (wbfs_part_fs == PART_FS_FAT) { - ret = _FAT_get_fragments(fname, &_frag_append, fs); + ret = _FAT_get_fragments(fname, &frag_append, fs); if (ret) { // don't return failure, let it fallback to old method //ret_val = ret; @@ -202,7 +196,7 @@ int get_frag_list_for_file(char *fname, u8 *id, u8 wbfs_part_fs, u32 lba_offset) goto out; } } else if (wbfs_part_fs == PART_FS_NTFS) { - ret = _NTFS_get_fragments(fname, &_frag_append, fs); + ret = _NTFS_get_fragments(fname, &frag_append, fs); if (ret) { ret_val = ret; goto out; @@ -212,7 +206,7 @@ int get_frag_list_for_file(char *fname, u8 *id, u8 wbfs_part_fs, u32 lba_offset) fs->frag[j].sector += lba_offset; } } else if (wbfs_part_fs == PART_FS_EXT) { - ret = _EXT2_get_fragments(fname, &_frag_append, fs); + ret = _EXT2_get_fragments(fname, &frag_append, fs); if (ret) { ret_val = ret; goto out; @@ -225,21 +219,21 @@ int get_frag_list_for_file(char *fname, u8 *id, u8 wbfs_part_fs, u32 lba_offset) // if wbfs file format, remap. wbfs_disc_t *d = WBFS_OpenDisc(id); if (!d) { ret_val = -4; WBFS_CloseDisc(d); goto out; } - ret = wbfs_get_fragments(d, &_frag_append, fs); + ret = wbfs_get_fragments(d, &frag_append, fs); WBFS_CloseDisc(d); if (ret) { ret_val = -5; goto out; } } frag_concat(fa, fs); } - frag_list = malloc(sizeof(FragList)); + frag_list = memalign(32, (sizeof(FragList)+31)&(~31)); frag_init(frag_list, MAX_FRAG); if (is_wbfs) { // if wbfs file format, remap. wbfs_disc_t *d = WBFS_OpenDisc(id); if (!d) { ret_val = -4; goto out; } frag_init(fw, MAX_FRAG); - ret = wbfs_get_fragments(d, &_frag_append, fw); + ret = wbfs_get_fragments(d, &frag_append, fw); if (ret) { ret_val = -5; goto out; } WBFS_CloseDisc(d); // DEBUG: frag_list->num = MAX_FRAG-10; // stress test @@ -278,16 +272,12 @@ int set_frag_list(u8 *id) // (+1 for header which is same size as fragment) int size = sizeof(Fragment) * (frag_list->num + 1); - u8 * FragListAligned = (u8 *) memalign(32, (size+31)&(~31)); - memcpy(FragListAligned, frag_list, size); + gprintf("Calling WDVD_SetFragList, frag list size %d\n", size); + int ret = WDVD_SetFragList(WBFS_MIN_DEVICE, frag_list, size); free(frag_list); frag_list = NULL; - gprintf("Calling WDVD_SetFragList, frag list size %d\n", size); - int ret = WDVD_SetFragList(WBFS_MIN_DEVICE, FragListAligned, size); - free(FragListAligned); - if (ret) return ret; diff --git a/source/usbloader/frag.h b/source/usbloader/frag.h index 107675a6..f2d60082 100644 --- a/source/usbloader/frag.h +++ b/source/usbloader/frag.h @@ -29,8 +29,7 @@ typedef struct void frag_init(FragList *ff, int maxnum); void frag_dump(FragList *ff); -int frag_append(FragList *ff, u32 offset, u32 sector, u32 count); -int _frag_append(void *ff, u32 offset, u32 sector, u32 count); +int frag_append(void *ff, u32 offset, u32 sector, u32 count); int frag_concat(FragList *ff, FragList *src); // in case a sparse block is requested, @@ -40,7 +39,7 @@ int frag_get(FragList *ff, u32 offset, u32 count, u32 *poffset, u32 *psector, u3 int frag_remap(FragList *ff, FragList *log, FragList *phy); -int get_frag_list_for_file(char *fname, u8 *id, u8 fstype, u32 sec_offset); +int get_frag_list_for_file(char *fname, u8 *id, const u8 wbfs_part_fs, const u32 lba_offset); int get_frag_list(u8 *id); int set_frag_list(u8 *id); diff --git a/source/usbloader/wbfs.cpp b/source/usbloader/wbfs.cpp index 9c2b9466..07d39692 100644 --- a/source/usbloader/wbfs.cpp +++ b/source/usbloader/wbfs.cpp @@ -75,7 +75,7 @@ s32 WBFS_OpenPart(int part_num) if(part_num >= (int) WbfsList.size()) WbfsList.resize(part_num+1); - gprintf("\tWBFS_OpenPart: start sector %u, sector count: %u\n", usbHandle->GetLBAStart(part_num), usbHandle->GetSecCount(part_num)); + gprintf("\tWBFS_OpenPart: filesystem: %s, start sector %u, sector count: %u\n", usbHandle->GetFSName(part_num), usbHandle->GetLBAStart(part_num), usbHandle->GetSecCount(part_num)); if (strncmp(usbHandle->GetFSName(part_num), "FAT", 3) == 0) { diff --git a/source/usbloader/wbfs/wbfs_base.h b/source/usbloader/wbfs/wbfs_base.h index 95ceb52b..a81efcd7 100644 --- a/source/usbloader/wbfs/wbfs_base.h +++ b/source/usbloader/wbfs/wbfs_base.h @@ -11,7 +11,7 @@ class Wbfs { public: - Wbfs(u32, u32, u32); + Wbfs(u32 dev, u32 lba, u32 size); ~Wbfs() { Close(); }; static s32 Init(u32); s32 CheckGame(u8 *); @@ -37,8 +37,9 @@ class Wbfs const wbfs_t *GetHDDHandle(void) const { return hdd; } protected: wbfs_t *hdd; - u32 device, lba, size; - u8 wbfs_part_fs; + const u32 device; + const u32 lba; + const u32 size; }; #endif //_H diff --git a/source/usbloader/wdvd.c b/source/usbloader/wdvd.c index 4120530b..2676ab52 100644 --- a/source/usbloader/wdvd.c +++ b/source/usbloader/wdvd.c @@ -1,6 +1,5 @@ #include #include -#include #include #include #include "gecko.h" @@ -37,15 +36,9 @@ static u32 outbuf[8] ATTRIBUTE_ALIGN(32); static const char di_fs[] ATTRIBUTE_ALIGN(32) = "/dev/di"; static s32 _di_fd = -1; -static s32 currentIOS = -1; - s32 WDVD_Init(void) { - currentIOS = IOS_GetVersion(); - if(currentIOS < 200) - return DI_Init(); - /* Open "/dev/di" */ if (_di_fd < 0) { _di_fd = IOS_Open(di_fs, 0); @@ -58,12 +51,6 @@ s32 WDVD_Init(void) s32 WDVD_Close(void) { - if(currentIOS < 200) - { - DI_Close(); - return 0; - } - /* Close "/dev/di" */ if (_di_fd >= 0) { IOS_Close(_di_fd); @@ -75,18 +62,12 @@ s32 WDVD_Close(void) s32 WDVD_GetHandle(void) { - if(currentIOS < 200) - return -1; - /* Return di handle */ return _di_fd; } s32 WDVD_Reset(void) { - if(currentIOS < 200) - return DI_Reset(); - if (_di_fd < 0) return _di_fd; @@ -108,9 +89,6 @@ s32 WDVD_Reset(void) s32 WDVD_ReadDiskId(void *id) { - if(currentIOS < 200) - return DI_ReadDiscID((u64 *) id); - if (_di_fd < 0) return _di_fd; @@ -135,9 +113,6 @@ s32 WDVD_ReadDiskId(void *id) s32 WDVD_Seek(u64 offset) { - if(currentIOS < 200) - return -1; - if (_di_fd < 0) return _di_fd; @@ -159,9 +134,6 @@ s32 WDVD_Seek(u64 offset) s32 WDVD_Offset(u64 offset) { - if(currentIOS < 200) - return -1; - if (_di_fd < 0) return _di_fd; @@ -185,9 +157,6 @@ s32 WDVD_Offset(u64 offset) s32 WDVD_StopLaser(void) { - if(currentIOS < 200) - return -1; - if (_di_fd < 0) return _di_fd; @@ -207,9 +176,6 @@ s32 WDVD_StopLaser(void) s32 WDVD_StopMotor(void) { - if(currentIOS < 200) - return -1; - if (_di_fd < 0) return _di_fd; @@ -229,9 +195,6 @@ s32 WDVD_StopMotor(void) s32 WDVD_OpenPartition(u64 offset) { - if(currentIOS < 200) - return DI_OpenPartition(offset >> 2); - if (_di_fd < 0) return _di_fd; @@ -266,9 +229,6 @@ s32 WDVD_OpenPartition(u64 offset) s32 WDVD_ClosePartition(void) { - if(currentIOS < 200) - return DI_ClosePartition(); - if (_di_fd < 0) return _di_fd; @@ -288,9 +248,6 @@ s32 WDVD_ClosePartition(void) s32 WDVD_UnencryptedRead(void *buf, u32 len, u64 offset) { - if(currentIOS < 200) - return DI_UnencryptedRead(buf, len, offset >> 2); - if (_di_fd < 0) return _di_fd; @@ -312,9 +269,6 @@ s32 WDVD_UnencryptedRead(void *buf, u32 len, u64 offset) s32 WDVD_Read(void *buf, u32 len, u64 offset) { - if(currentIOS < 200) - return DI_Read(buf, len, offset >> 2); - if (_di_fd < 0) return _di_fd; @@ -336,9 +290,6 @@ s32 WDVD_Read(void *buf, u32 len, u64 offset) s32 WDVD_WaitForDisc(void) { - if(currentIOS < 200) - return -1; - if (_di_fd < 0) return _di_fd; @@ -358,9 +309,6 @@ s32 WDVD_WaitForDisc(void) s32 WDVD_GetCoverStatus(u32 *status) { - if(currentIOS < 200) - return DI_GetCoverRegister(status); - if (_di_fd < 0) return _di_fd; @@ -387,9 +335,6 @@ s32 WDVD_GetCoverStatus(u32 *status) s32 WDVD_SetUSBMode(const u8 *id, s32 partition) { - if(currentIOS < 200) - return 0; - if (_di_fd < 0) return _di_fd; @@ -425,9 +370,6 @@ s32 WDVD_SetUSBMode(const u8 *id, s32 partition) s32 WDVD_Read_Disc_BCA(void *buf) { - if(currentIOS < 200) - return DI_Read_BCA(buf); - if (_di_fd < 0) return _di_fd; @@ -450,9 +392,6 @@ s32 WDVD_Read_Disc_BCA(void *buf) s32 WDVD_SetFragList(int device, void *fraglist, int size) { - if(currentIOS < 200) - return 0; - if (_di_fd < 0) return _di_fd; @@ -478,9 +417,6 @@ s32 WDVD_SetFragList(int device, void *fraglist, int size) s32 WDVD_Eject(void) { - if(currentIOS < 200) - return DI_Eject(); - if (_di_fd < 0) return _di_fd;