diff --git a/HBC/META.XML b/HBC/META.XML
index c63ffc06..94994a36 100644
--- a/HBC/META.XML
+++ b/HBC/META.XML
@@ -2,8 +2,8 @@
 	<app version="1">
 		<name> USB Loader GX</name>
 		<coder>USB Loader GX Team</coder>
-		<version>2.3 r1153</version>
-		<release_date>201202132048</release_date>
+		<version>2.3 r1155</version>
+		<release_date>201202291948</release_date>
 		<!--   // remove this line to enable arguments
 		<arguments>
 				<arg>--ios=250</arg>
diff --git a/Languages/czech.lang b/Languages/czech.lang
index f3a39231..e257b879 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: 2012-02-09 22:23+0100\n"
+"POT-Creation-Date: 2012-02-29 20:42+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"
@@ -763,6 +763,9 @@ msgstr "Vynutit PAL50"
 msgid "Force PAL60"
 msgstr "Vynutit PAL60"
 
+msgid "Force Titles from Disc"
+msgstr ""
+
 msgid "Format"
 msgstr "Formát"
 
diff --git a/Languages/danish.lang b/Languages/danish.lang
index b4628a99..67aa1289 100644
--- a/Languages/danish.lang
+++ b/Languages/danish.lang
@@ -1,11 +1,11 @@
 # USB Loader GX language source file.
-# danish.lang - r1102
+# danish.lang - r1148
 # don't delete/change this line (é).
 msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-09 22:23+0100\n"
+"POT-Creation-Date: 2012-02-29 20:42+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: Fox888[dk]\n"
 "Language-Team: [dk]\n"
@@ -80,7 +80,7 @@ msgid "AXNextFrame"
 msgstr ""
 
 msgid "Add category"
-msgstr "Tilføje kategori  "
+msgstr "Tilføje kategori"
 
 msgid "Adjust Overscan X"
 msgstr ""
@@ -95,7 +95,7 @@ msgid "All Partitions"
 msgstr "Alle Partitioner"
 
 msgid "All files extracted."
-msgstr ""
+msgstr "Alle filer er udpakket."
 
 msgid "All images downloaded successfully."
 msgstr "Lykkedes at downloade alle billeder."
@@ -125,7 +125,7 @@ msgid "Are you sure you want to delete this category?"
 msgstr "Er du sikker på at du ville slette denne kategori?"
 
 msgid "Are you sure you want to import game categories from GameTDB?"
-msgstr ""
+msgstr "Er du sikker på at du ville hente Spil kategorier fra GameTDB?"
 
 msgid "Are you sure you want to lock USB Loader GX?"
 msgstr "Er du sikker på at du vil låse USB Loader GX?"
@@ -137,7 +137,7 @@ msgid "Are you sure?"
 msgstr "Er du sikker?"
 
 msgid "Aspect Ratio"
-msgstr ""
+msgstr "Formatforhold"
 
 msgid "Aug"
 msgstr ""
@@ -164,7 +164,7 @@ msgid "Backgroundmusic"
 msgstr "Baggrundsmusik"
 
 msgid "Beginning"
-msgstr ""
+msgstr "Begyndelse"
 
 msgid "Big thanks to:"
 msgstr "En stor tak til:"
@@ -209,7 +209,7 @@ msgid "Block IOS Reload"
 msgstr "Blokér IOS-reload"
 
 msgid "Block Loader Mode Button"
-msgstr ""
+msgstr "Bloker Loader mode knap"
 
 msgid "Block Loader Settings"
 msgstr "Bloker loader indstillinger"
@@ -218,7 +218,7 @@ msgid "Block Parental Settings"
 msgstr "Bloker forældre indstillinger"
 
 msgid "Block Priiloader Override"
-msgstr ""
+msgstr " Bloker Priiloader override"
 
 msgid "Block Reset Settings"
 msgstr "Bloker nulstils indstillinger"
@@ -242,7 +242,7 @@ msgid "Block Updates"
 msgstr "Bloker opdateringer"
 
 msgid "Boot Content"
-msgstr ""
+msgstr "indlæs indhold"
 
 msgid "Boot/Standard"
 msgstr ""
@@ -267,7 +267,7 @@ msgstr "Kan ikke lave ny mappe"
 
 #, c-format
 msgid "Can't create file: %s"
-msgstr ""
+msgstr "Kan ikke lave fil: %s"
 
 #, c-format
 msgid "Can't create path: %s"
@@ -281,11 +281,11 @@ msgstr ""
 
 #, c-format
 msgid "Can't open file: %s"
-msgstr ""
+msgstr "Kan ikke åbne fil: %s"
 
 #, c-format
 msgid "Can't read file: %s"
-msgstr ""
+msgstr "Kan ikke læse fil: %s"
 
 msgid "Cancel"
 msgstr "Annullér"
@@ -303,10 +303,10 @@ msgid "Change Play Path"
 msgstr "Ændre sti til musik"
 
 msgid "Channel Launcher"
-msgstr ""
+msgstr "Kanal Launcher"
 
 msgid "Channels"
-msgstr ""
+msgstr "Kanaler"
 
 msgid "Cheatfile is blank"
 msgstr "Cheatfilen er tom"
@@ -358,16 +358,16 @@ msgid "Console should be unlocked to modify it."
 msgstr "Konsollen skal være låst op for ændre dette."
 
 msgid "Content"
-msgstr ""
+msgstr "Indhold"
 
 msgid "Continue"
-msgstr ""
+msgstr "Fortsæt"
 
 msgid "Continue to install game?"
 msgstr "Fortsæt med at installere spillet?"
 
 msgid "Continue?"
-msgstr ""
+msgstr "Fortsæt?"
 
 msgid "Controllevel"
 msgstr "Kontrolniveau"
@@ -386,7 +386,7 @@ msgid "Could not create path: %s"
 msgstr "Kunne ikke lave sti: %s"
 
 msgid "Could not extract files for:"
-msgstr ""
+msgstr "Kunne ikke udpakker filer for:"
 
 msgid "Could not find info for this game in the wiitdb.xml."
 msgstr "Kunne ikke finde information for dette spil i wiitdb.xml"
@@ -410,7 +410,7 @@ msgid "Could not save."
 msgstr "Kunne ikke gemme."
 
 msgid "Could not write file."
-msgstr ""
+msgstr "Kunne ikke skrive fil"
 
 msgid "Could not write to:"
 msgstr "Kunne ikke skrive til:"
@@ -491,7 +491,7 @@ msgid "Disc Default"
 msgstr "Spillets standard"
 
 msgid "Disc Insert Detected"
-msgstr ""
+msgstr "Ny Disc opdaget"
 
 msgid "DiskFlip"
 msgstr ""
@@ -524,10 +524,10 @@ msgid "Do you want to download this theme?"
 msgstr "Skal dette tema downloades?"
 
 msgid "Do you want to extract all the save games?"
-msgstr ""
+msgstr "Vil du udpakke alle save games?"
 
 msgid "Do you want to extract the save game?"
-msgstr ""
+msgstr "Vil du udpakke dette save game?"
 
 msgid "Do you want to format:"
 msgstr "Vil du formatere:"
@@ -536,7 +536,7 @@ msgid "Do you want to load the default theme?"
 msgstr "Vil du indlæse standard tema?"
 
 msgid "Do you want to re-init network?"
-msgstr ""
+msgstr "Vil du genetablere netværket?"
 
 msgid "Do you want to sync free space info sector on all FAT32 partitions?"
 msgstr "Vil du synkronisere fri plads info sector på alle FAT32 Partitioner?"
@@ -581,7 +581,7 @@ msgid "Downloading pagelist:"
 msgstr "Downloader pagelist:"
 
 msgid "Dump NAND to EmuNand"
-msgstr ""
+msgstr "Kopier Wii NAND til EmuNand"
 
 msgid "Dutch"
 msgstr "Hollandsk"
@@ -596,16 +596,16 @@ msgid "ERROR: Can't set up theme."
 msgstr "FEJL: Temaet kan ikke bruges."
 
 msgid "EmuNand Channels"
-msgstr ""
+msgstr "EmuNand kanaler"
 
 msgid "Emulated Nand"
-msgstr ""
+msgstr "Emuleret Nand"
 
 msgid "English"
 msgstr "Engelsk"
 
 msgid "Enter Path"
-msgstr ""
+msgstr "Skriv sti"
 
 msgid "Error"
 msgstr "Fejl"
@@ -649,10 +649,10 @@ msgid "Error:"
 msgstr "Fejl:"
 
 msgid "Errors occured."
-msgstr ""
+msgstr "Fejl opstået"
 
 msgid "Everything"
-msgstr ""
+msgstr "Alt"
 
 msgid "Exit"
 msgstr "Forlad"
@@ -661,22 +661,22 @@ msgid "Exit to where?"
 msgstr "Hvorhen?"
 
 msgid "Export All Saves to EmuNand"
-msgstr ""
+msgstr "Kopier alle saves til EmuNand"
 
 msgid "Extract Save to EmuNand"
-msgstr ""
+msgstr "Kopier Save til EmuNand"
 
 msgid "Extracting file:"
-msgstr ""
+msgstr "Udpakker Fil:"
 
 msgid "Extracting files..."
 msgstr "Pakker filer ud..."
 
 msgid "Extracting files:"
-msgstr ""
+msgstr "Udpakker Filer:"
 
 msgid "Extracting nand files:"
-msgstr ""
+msgstr "Udpakker nand filer:"
 
 msgid "Failed"
 msgstr "Fejlede"
@@ -685,25 +685,25 @@ msgid "Failed formating"
 msgstr "Formateringen mislykkedes"
 
 msgid "Failed to extract all files. Savegame might not exist."
-msgstr ""
+msgstr "Fejlede at udpakke alle filer. Savegame eksistere muligvis ikke."
 
 msgid "Failed to extract."
 msgstr "Udpakningen mislykkedes."
 
 msgid "Failed to initialize the USB storage device."
-msgstr ""
+msgstr "Fejlede at initialisere USB enheden."
 
 msgid "Failed to open partition"
 msgstr "Kunne ikke åbne partition"
 
 msgid "Failed to read ticket."
-msgstr ""
+msgstr "Kunne ikke læse ticket."
 
 msgid "Failed to read tmd file."
-msgstr ""
+msgstr "Kunne ikke læse tmd fil."
 
 msgid "Failed to read wad header."
-msgstr ""
+msgstr "Kunne ikke læse wad header."
 
 msgid "Failed updating"
 msgstr "Opdatering fejlede"
@@ -721,10 +721,10 @@ msgid "File not found."
 msgstr "Fil ikke fundet."
 
 msgid "File read/write error."
-msgstr ""
+msgstr "Fil læse/skrive fejl."
 
 msgid "Files extracted successfully."
-msgstr ""
+msgstr "Lykkes at udpakke filer."
 
 #, c-format
 msgid "Filesize is %i Byte."
@@ -743,10 +743,10 @@ msgid "Font Scale Factor"
 msgstr ""
 
 msgid "Force 16:9"
-msgstr ""
+msgstr "Tving 16:9"
 
 msgid "Force 4:3"
-msgstr ""
+msgstr "Tving 4:3"
 
 msgid "Force NTSC"
 msgstr "Tving NTSC"
@@ -763,6 +763,9 @@ msgstr "Tving PAL50"
 msgid "Force PAL60"
 msgstr "Tving PAL60"
 
+msgid "Force Titles from Disc"
+msgstr ""
+
 msgid "Format"
 msgstr "Formater"
 
@@ -857,7 +860,7 @@ msgid "Game/Install Partition"
 msgstr "Spil/Installation partition"
 
 msgid "GameTDB Path"
-msgstr ""
+msgstr "Sti til GameTDB"
 
 msgid "Gamename [GAMEID]"
 msgstr ""
@@ -934,7 +937,7 @@ msgid "Install"
 msgstr "Installér"
 
 msgid "Install Canceled"
-msgstr ""
+msgstr "installering annulleret"
 
 msgid "Install Directories"
 msgstr "Installer mappe"
@@ -946,16 +949,16 @@ msgid "Install Partitions"
 msgstr "Installer partitioner"
 
 msgid "Install WAD to EmuNand"
-msgstr ""
+msgstr "Installer WAD til EmuNand"
 
 msgid "Install a game"
 msgstr "Installér nyt spil"
 
 msgid "Install finished"
-msgstr ""
+msgstr "Installering færdig"
 
 msgid "Installing content"
-msgstr ""
+msgstr "Installerer indhold"
 
 msgid "Installing game:"
 msgstr "Installerer spillet:"
@@ -964,7 +967,7 @@ msgid "Installing title..."
 msgstr ""
 
 msgid "Invalid wad file."
-msgstr ""
+msgstr "Ugyldig wad fil."
 
 msgid "Issue manager /"
 msgstr "Problem manager /"
@@ -1000,7 +1003,7 @@ msgid "Korean"
 msgstr "Koreansk"
 
 msgid "Language Files"
-msgstr ""
+msgstr "Sprog filer"
 
 msgid "Language change:"
 msgstr "Skift sprog:"
@@ -1012,7 +1015,7 @@ msgid "Languagepath changed."
 msgstr "Sti til sprogfiler ændret."
 
 msgid "Launching emulated nand channels only works on d2x cIOS! Change game IOS to a d2x cIOS first."
-msgstr ""
+msgstr "Indlæsning af Emu nand kanaler virker kun med d2x cIOS! Ændre spil IOS til en d2x cIOS først."
 
 msgid "Left"
 msgstr "Venstre"
@@ -1100,16 +1103,16 @@ msgid "Music Volume"
 msgstr "Lydstyrke"
 
 msgid "Nand Chan. Emulation"
-msgstr ""
+msgstr "Nand Kanal emulation"
 
 msgid "Nand Channels"
-msgstr ""
+msgstr "Nand Kanaler"
 
 msgid "Nand Emu Channel Path"
-msgstr ""
+msgstr "Sti til Nand Emu kanal"
 
 msgid "Nand Emu Path"
-msgstr "Sti til Nand Emu."
+msgstr "Sti til Emu Nand."
 
 msgid "Nand Emulation"
 msgstr "Nand emulering"
@@ -1142,7 +1145,7 @@ msgid "No DOL file found on disc."
 msgstr "Der blev ikke fundet nogle DOL-filer på DVDen."
 
 msgid "No Splitting"
-msgstr "Ingen Splitting"
+msgstr "Ingen"
 
 msgid "No URL or Path specified."
 msgstr "Ingen URL eller sti er angivet."
@@ -1160,7 +1163,7 @@ msgid "No data could be read."
 msgstr "Data kunne ikke læses."
 
 msgid "No disc inserted."
-msgstr ""
+msgstr "Ingen Disc indsat"
 
 msgid "No favorites selected."
 msgstr "Ingen favoritter er valgt."
@@ -1169,7 +1172,7 @@ msgid "No file missing!"
 msgstr "Ingen filer mangler!"
 
 msgid "No language files to update on your devices! Do you want to download new language files?"
-msgstr ""
+msgstr "Ingen sprog filer at opdatere på din enhed! Vil du hente nye sprog filer?"
 
 msgid "No new updates."
 msgstr "Ingen nye opdateringer."
@@ -1187,7 +1190,7 @@ msgid "Normal"
 msgstr "Normal"
 
 msgid "Not Initialized"
-msgstr ""
+msgstr "Ikke initialiseret"
 
 msgid "Not a Wii Disc"
 msgstr "Ikke en Wii-DVD"
@@ -1310,7 +1313,7 @@ msgid "Prev"
 msgstr "Forrige"
 
 msgid "Process finished."
-msgstr ""
+msgstr "Proces færdig."
 
 msgid "Prompts Buttons"
 msgstr "Knaptekster"
@@ -1325,7 +1328,7 @@ msgid "Random Directory Music"
 msgstr "Musik fra tilfældig mappe"
 
 msgid "Real Nand"
-msgstr ""
+msgstr "Ægte Nand"
 
 msgid "Receiving file from:"
 msgstr "Henter fil fra:"
@@ -1340,10 +1343,10 @@ msgid "Reload SD"
 msgstr "Genindlæs SD"
 
 msgid "Reloading game list now, please wait..."
-msgstr ""
+msgstr "Genindlæser Spil liste, Vent venligst..."
 
 msgid "Remember Unlock"
-msgstr ""
+msgstr "Husk at låse op"
 
 msgid "Remove update"
 msgstr "Fjern opdatering"
@@ -1406,7 +1409,7 @@ msgid "Saved"
 msgstr "Gemt"
 
 msgid "Savegame might not exist for this game."
-msgstr ""
+msgstr "Savegame eksistere muligvis ikke for dette spil."
 
 msgid "Screensaver"
 msgstr "Pauseskærm"
@@ -1430,10 +1433,10 @@ msgid "Select game categories"
 msgstr "Vælg spille Kategorier"
 
 msgid "Select loader mode"
-msgstr ""
+msgstr "Vælg Loader måde"
 
 msgid "Select titles sources."
-msgstr ""
+msgstr "Vælg title kilde."
 
 msgid "Sept"
 msgstr ""
@@ -1451,7 +1454,7 @@ msgid "Show Free Space"
 msgstr "Vis fri plads"
 
 msgid "Show Play Count"
-msgstr ""
+msgstr "Vis spil tæller"
 
 msgid "Shutdown System"
 msgstr "Sluk (rødt lys)"
@@ -1508,7 +1511,7 @@ msgid "Success"
 msgstr "Succes"
 
 msgid "Success."
-msgstr ""
+msgstr "Succes."
 
 msgid "Success:"
 msgstr "Succes:"
@@ -1532,7 +1535,7 @@ msgid "Successfully installed:"
 msgstr "Installationen lykkedes:"
 
 msgid "Switching to channel list mode."
-msgstr ""
+msgstr "Skift til Kanal list måde."
 
 msgid "Sync FAT32 FS Info"
 msgstr "Synkronisere FAT32 FS Info"
@@ -1556,13 +1559,13 @@ msgid "The entered directory does not exist. Would you like to create it?"
 msgstr "Den angivne mappe eksisterer ikke. Skal den oprettes?"
 
 msgid "The files will be extracted to your emu nand path. Attention: All existing files will be overwritten."
-msgstr ""
+msgstr "Filerne vil bliver udpakket til din Emu Nand sti. Advarsel : alle eksisterene filer vil bliver overskrevet."
 
 msgid "The save game will be extracted to your emu nand path."
-msgstr ""
+msgstr "Dette save game vil bliver udpakket til din Emu Nand sti."
 
 msgid "The save games will be extracted to your emu nand path. Attention: All existing saves will be overwritten."
-msgstr ""
+msgstr "Alle Save games vil bliver udpakket til din Emu Nand sti. Advarsel: Alle eksisterene save games vil bliver overskrevet."
 
 msgid "The wad file was installed"
 msgstr "Wad fil var installeret"
@@ -1581,7 +1584,7 @@ msgid "Theme Path"
 msgstr "Sti til temaer"
 
 msgid "Theme Title:"
-msgstr "Tematitel:"
+msgstr "Tema titel:"
 
 msgid "Themes by www.spiffy360.com"
 msgstr "Temaer af www.spiffy360.com"
@@ -1599,7 +1602,7 @@ msgid "Title Launcher"
 msgstr "Titel-starter"
 
 msgid "Titles from GameTDB"
-msgstr ""
+msgstr "Titler fra GameTDB"
 
 msgid "Tooltips"
 msgstr "Værktøjstips"
@@ -1608,7 +1611,7 @@ msgid "Transfer failed"
 msgstr "Overførelse fejlede"
 
 msgid "USB Device not found."
-msgstr ""
+msgstr "USB enhed blev ikke fundet."
 
 msgid "USB Loader GX is protected"
 msgstr "USB Loader GX er beskyttet"
@@ -1620,7 +1623,7 @@ msgid "USB Port changing is only supported on Hermes cIOS."
 msgstr "Skift af USB port er kun muligt med Hermes cIOS."
 
 msgid "Uninstall"
-msgstr ""
+msgstr "Afinstaller"
 
 msgid "Uninstall Game"
 msgstr "Afinstallér spil"
@@ -1680,7 +1683,7 @@ msgid "Use global"
 msgstr "Brug global"
 
 msgid "VBI (Default)"
-msgstr ""
+msgstr "VBI (standard)"
 
 msgid "VIDTV Patch"
 msgstr "VIDTV-patch"
@@ -1696,10 +1699,10 @@ msgid "Video Mode"
 msgstr "Video-mode"
 
 msgid "Virtual Pointer Speed"
-msgstr ""
+msgstr "Virtual pointer hastighed"
 
 msgid "WAD Installation"
-msgstr ""
+msgstr " WAD installation"
 
 msgid "WDM Files Path"
 msgstr "Sti til WDM filer"
@@ -1717,7 +1720,7 @@ msgid "Warning:"
 msgstr "Advarsel:"
 
 msgid "What do you want to do?"
-msgstr ""
+msgstr "Hvad ønsker du at gøre?"
 
 msgid "What do you want to update?"
 msgstr "Hvad skal opdateres?"
@@ -1726,7 +1729,7 @@ msgid "What should be deleted for this game title:"
 msgstr "Hvad skal der slettes for dette spil:"
 
 msgid "What to extract from NAND?"
-msgstr ""
+msgstr "Hvad skal der udpakkes fra NAND?"
 
 msgid "WiFi Features"
 msgstr "WiFi-indstillinger"
@@ -1738,7 +1741,7 @@ msgid "Widescreen Fix"
 msgstr "Bredformat-fix"
 
 msgid "Wii Games"
-msgstr ""
+msgstr "Wii Spil"
 
 msgid "Wii Menu"
 msgstr ""
@@ -1750,7 +1753,7 @@ msgid "WiiTDB.xml"
 msgstr ""
 
 msgid "WiiTDB.xml is up to date."
-msgstr ""
+msgstr "WiiTDB.xml er opdateret."
 
 msgid "Wiilight"
 msgstr ""
@@ -1769,7 +1772,7 @@ msgstr ""
 
 #, c-format
 msgid "Write error on file: %s"
-msgstr ""
+msgstr "Fejl skrivening til fil: %s"
 
 msgid "Writing GXGameCategories.xml"
 msgstr "Skriver GXGameCategories.xml"
@@ -1784,7 +1787,7 @@ msgid "You are trying to select a FAT32/NTFS/EXT partition with cIOS 249 Rev < 1
 msgstr "Du prøver at vælge en FAT32/NTFS/EXT partition med cIOS 249 Rev < 18. Dette er ikke understøttet. Fortsætte er på egen risiko"
 
 msgid "You can select or format a partition or use the channel loader mode."
-msgstr ""
+msgstr "Du kan vælge eller formatter en partition eller kanal loader måde."
 
 msgid "You cannot delete this category."
 msgstr "Du kan ikke slette denne kategori."
@@ -1808,7 +1811,7 @@ msgid "for FAT/NTFS support"
 msgstr "for FAT/NTFS understøttelse"
 
 msgid "for GameTDB and hosting covers / disc images"
-msgstr ""
+msgstr "for GameTDB og for at hoste covers/DVD-billeder"
 
 msgid "for Ocarina"
 msgstr ""
@@ -1843,89 +1846,8 @@ msgstr "af"
 msgid "seconds left"
 msgstr "sekunder tilbage"
 
-#~ msgid ">> Deleting tickets..."
-#~ msgstr ">> Sletter tickets..."
-
-#~ msgid ">> Deleting tickets...ERROR! "
-#~ msgstr ">> Sletter tickets...FEJL!"
-
-#~ msgid ">> Deleting tickets...Ok! "
-#~ msgstr ">> Sletter tickets...Ok!"
-
-#~ msgid ">> Deleting title ...ERROR! "
-#~ msgstr ">> Sletter titel...FEJL!"
-
-#~ msgid ">> Deleting title ...Ok!"
-#~ msgstr ">> Sletter titel...Ok!"
-
-#~ msgid ">> Deleting title contents..."
-#~ msgstr ">> Sletter titelindhold..."
-
-#~ msgid ">> Deleting title contents...ERROR! "
-#~ msgstr ">> Sletter titelindhold...FEJL!"
-
-#~ msgid ">> Deleting title contents...Ok!"
-#~ msgstr ">> Sletter titelindhold...Ok!"
-
-#~ msgid ">> Deleting title..."
-#~ msgstr ">> Sletter titel..."
-
-#~ msgid ">> Finishing installation..."
-#~ msgstr ">> Færdiggør installationen..."
-
-#~ msgid ">> Installing content #"
-#~ msgstr ">> Installerer content #"
-
-#~ msgid ">> Installing ticket..."
-#~ msgstr ">> Installerer ticket..."
-
-#~ msgid ">> Installing title..."
-#~ msgstr ">> Installerer titel..."
-
-#~ msgid ">> Reading WAD data..."
-#~ msgstr ">> Læser WAD-data"
-
-#~ msgid ">> Reading WAD data...ERROR! "
-#~ msgstr ">> Læser WAD-data...FEJL!"
-
-#~ msgid ">> Reading WAD data...Ok!"
-#~ msgstr ">> Læser WAD-data...Ok!"
-
-#~ msgid "Done!"
-#~ msgstr "Færdig!"
-
-#~ msgid "Error..."
-#~ msgstr "Fejl..."
-
-#~ msgid "Finishing installation... Ok!"
-#~ msgstr "Afslutter installationen... Ok!"
-
-#~ msgid "Installing content... Ok!"
-#~ msgstr "Installerer indhold... Ok!"
-
-#~ msgid "Installing ticket... Ok!"
-#~ msgstr "Installerer ticket... Ok!"
-
-#~ msgid "Installing title... Ok!"
-#~ msgstr "Installerer titel... Ok!"
-
-#~ msgid "Installing wad"
-#~ msgstr "Installerer WAD"
-
-#~ msgid "Reading WAD data... Ok!"
-#~ msgstr "Læser WAD-data... Ok!"
-
-#~ msgid "Uninstalling wad"
-#~ msgstr "Afinstallerer WAD"
-
-#~ msgid "The game installation is disabled under this IOS because of instability in usb write."
-#~ msgstr "Spil installering er ikke aktiveret med denne IOS, på grund af ustabil skrivning til usb enheder."
-
-#~ msgid "You are currently using IOS"
-#~ msgstr "Du brug i øjeblikket IOS"
-
-#~ msgid "New Disc Detected"
-#~ msgstr "Har opdaget ny DVD"
+#~ msgid "Installing title"
+#~ msgstr "Installerer titel"
 
 #~ msgid "USB Device not found"
 #~ msgstr "USB-enhed ikke fundet"
diff --git a/Languages/dutch.lang b/Languages/dutch.lang
index 10767655..3b389559 100644
--- a/Languages/dutch.lang
+++ b/Languages/dutch.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-09 22:23+0100\n"
+"POT-Creation-Date: 2012-02-29 20:42+0100\n"
 "PO-Revision-Date: 2011-12-17 14:22+0100\n"
 "Last-Translator: Arthur117\n"
 "Language-Team: tj_cool, glowy, Arthur117\n"
@@ -763,6 +763,9 @@ msgstr "Forceer PAL50"
 msgid "Force PAL60"
 msgstr "Forceer PAL60"
 
+msgid "Force Titles from Disc"
+msgstr ""
+
 msgid "Format"
 msgstr "Formatteer"
 
diff --git a/Languages/english.lang b/Languages/english.lang
index 5d72ed49..b60dbf22 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: 2012-02-09 22:23+0100\n"
+"POT-Creation-Date: 2012-02-29 20:42+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -763,6 +763,9 @@ msgstr ""
 msgid "Force PAL60"
 msgstr ""
 
+msgid "Force Titles from Disc"
+msgstr ""
+
 msgid "Format"
 msgstr ""
 
diff --git a/Languages/finnish.lang b/Languages/finnish.lang
index 1a7dea08..564307af 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: 2012-02-09 22:23+0100\n"
+"POT-Creation-Date: 2012-02-29 20:42+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: c64rmx\n"
 "Language-Team: \n"
@@ -763,6 +763,9 @@ msgstr ""
 msgid "Force PAL60"
 msgstr ""
 
+msgid "Force Titles from Disc"
+msgstr ""
+
 msgid "Format"
 msgstr "Formatoi"
 
diff --git a/Languages/french.lang b/Languages/french.lang
index f953011a..b60f0f9a 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: 2012-02-09 22:23+0100\n"
+"POT-Creation-Date: 2012-02-29 20:42+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: Cyan\n"
 "Language-Team: Badablek, Amour, ikya, Cyan & Kin8\n"
@@ -242,7 +242,7 @@ msgid "Block Updates"
 msgstr "Bloquer Mise à jour"
 
 msgid "Boot Content"
-msgstr ""
+msgstr "Lancement normal"
 
 msgid "Boot/Standard"
 msgstr "IOS par défaut"
@@ -303,7 +303,7 @@ msgid "Change Play Path"
 msgstr "Changer dossier"
 
 msgid "Channel Launcher"
-msgstr ""
+msgstr "Lancement des Chaînes"
 
 msgid "Channels"
 msgstr "Chaînes"
@@ -494,7 +494,7 @@ msgid "Disc Insert Detected"
 msgstr "Insertion de disque détecté"
 
 msgid "DiskFlip"
-msgstr "Inversion disque"
+msgstr "Disque uniquement"
 
 msgid "Display"
 msgstr "Affichage"
@@ -599,7 +599,7 @@ msgid "EmuNand Channels"
 msgstr "Chaînes sur Émulation Nand des chaînes"
 
 msgid "Emulated Nand"
-msgstr "Nand émulé"
+msgstr "Nand émulée"
 
 msgid "English"
 msgstr "Anglais"
@@ -737,10 +737,10 @@ msgid "Flat Covers"
 msgstr "Jaquettes 2D"
 
 msgid "Flip-X"
-msgstr "Inversion-X"
+msgstr "Anim. jeu suivant"
 
 msgid "Font Scale Factor"
-msgstr "Échelle police"
+msgstr "Échelle de la police"
 
 msgid "Force 16:9"
 msgstr "Forcer 16:9"
@@ -763,6 +763,9 @@ msgstr "Forcer PAL50"
 msgid "Force PAL60"
 msgstr "Forcer PAL60"
 
+msgid "Force Titles from Disc"
+msgstr ""
+
 msgid "Format"
 msgstr "Formater"
 
@@ -1067,7 +1070,7 @@ msgid "Loop Sound"
 msgstr "Intro en boucle"
 
 msgid "Main DOL"
-msgstr ""
+msgstr "Lancer main.dol"
 
 msgid "Main tester:"
 msgstr "Testeur:"
@@ -1100,10 +1103,10 @@ msgid "Music Volume"
 msgstr "Volume musique"
 
 msgid "Nand Chan. Emulation"
-msgstr ""
+msgstr "Émulation Nand Chaînes"
 
 msgid "Nand Channels"
-msgstr "Chaînes sur Nand réel"
+msgstr "Chaînes sur Nand réelle"
 
 msgid "Nand Emu Channel Path"
 msgstr "Dossier ÉmuNand Chaînes"
@@ -1184,7 +1187,7 @@ msgid "None"
 msgstr "Aucun"
 
 msgid "Normal"
-msgstr "4:3"
+msgstr "Normale"
 
 msgid "Not Initialized"
 msgstr "Disque non initialisé"
@@ -1313,7 +1316,7 @@ msgid "Process finished."
 msgstr "Opération terminée."
 
 msgid "Prompts Buttons"
-msgstr "Interface"
+msgstr "Largeur de l'interface"
 
 msgid "Published by"
 msgstr "Publié par"
@@ -1325,7 +1328,7 @@ msgid "Random Directory Music"
 msgstr "Aléatoire"
 
 msgid "Real Nand"
-msgstr "Nand réel"
+msgstr "Nand réelle"
 
 msgid "Receiving file from:"
 msgstr "Réception du fichier de:"
@@ -1732,10 +1735,10 @@ msgid "WiFi Features"
 msgstr "Connexion WiFi"
 
 msgid "Widescreen Factor"
-msgstr "Échelle interface 16:9"
+msgstr "Échelle de l'interface"
 
 msgid "Widescreen Fix"
-msgstr "16:9"
+msgstr "Utiliser un taux d'échelle"
 
 msgid "Wii Games"
 msgstr "Jeux Wii"
diff --git a/Languages/german.lang b/Languages/german.lang
index d253382d..1ac43835 100644
--- a/Languages/german.lang
+++ b/Languages/german.lang
@@ -1,11 +1,11 @@
 # USB Loader GX
-# german.lang - r1144
+# german.lang - r1154
 # don't delete/change this line (é).
 msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-09 22:23+0100\n"
+"POT-Creation-Date: 2012-02-29 20:42+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"
@@ -83,10 +83,10 @@ msgid "Add category"
 msgstr "Kategorie hinzuf."
 
 msgid "Adjust Overscan X"
-msgstr ""
+msgstr "Übersteuerung X anpassen"
 
 msgid "Adjust Overscan Y"
-msgstr ""
+msgstr "Übersteuerung Y anpassen"
 
 msgid "All"
 msgstr "Alle"
@@ -242,7 +242,7 @@ msgid "Block Updates"
 msgstr "Blocke Updates"
 
 msgid "Boot Content"
-msgstr ""
+msgstr "Boote Inhalt"
 
 msgid "Boot/Standard"
 msgstr "Bootstandard (cIOS)"
@@ -277,7 +277,7 @@ msgid "Can't delete:"
 msgstr "Löschen fehlgeschlagen:"
 
 msgid "Can't mount or unknown disc format."
-msgstr ""
+msgstr "Kann nicht gemountet werden oder unbekanntes Discformat"
 
 #, c-format
 msgid "Can't open file: %s"
@@ -303,7 +303,7 @@ msgid "Change Play Path"
 msgstr "Pfad ändern"
 
 msgid "Channel Launcher"
-msgstr ""
+msgstr "Kanal Starter"
 
 msgid "Channels"
 msgstr "Kanäle"
@@ -763,6 +763,9 @@ msgstr "PAL50 erzw."
 msgid "Force PAL60"
 msgstr "PAL60 erzw."
 
+msgid "Force Titles from Disc"
+msgstr ""
+
 msgid "Format"
 msgstr "Formatieren"
 
@@ -800,7 +803,7 @@ msgid "GAMEID_Gamename"
 msgstr "SPIELID_Spielname"
 
 msgid "GC Games"
-msgstr ""
+msgstr "GC Spiele"
 
 msgid "GCT Cheatcodes Path"
 msgstr "GCT Cheatdateien"
@@ -1067,7 +1070,7 @@ msgid "Loop Sound"
 msgstr "Wiederholung"
 
 msgid "Main DOL"
-msgstr ""
+msgstr "Haupt-DOL"
 
 msgid "Main tester:"
 msgstr "Haupttester:"
@@ -1100,7 +1103,7 @@ msgid "Music Volume"
 msgstr "Musik Lautstärke"
 
 msgid "Nand Chan. Emulation"
-msgstr ""
+msgstr "Nand Kan. Emulation"
 
 msgid "Nand Channels"
 msgstr "Nand Kanäle"
diff --git a/Languages/hungarian.lang b/Languages/hungarian.lang
index 5681556c..ce2a95ce 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: 2012-02-09 22:23+0100\n"
+"POT-Creation-Date: 2012-02-29 20:42+0100\n"
 "PO-Revision-Date: 2009-12-29 11:05+0100\n"
 "Last-Translator: Springdale\n"
 "Language-Team: Tusk, Springdale\n"
@@ -763,6 +763,9 @@ msgstr ""
 msgid "Force PAL60"
 msgstr ""
 
+msgid "Force Titles from Disc"
+msgstr ""
+
 msgid "Format"
 msgstr "Formázás"
 
diff --git a/Languages/italian.lang b/Languages/italian.lang
index 231abfbc..cbcfff64 100644
--- a/Languages/italian.lang
+++ b/Languages/italian.lang
@@ -1,14 +1,14 @@
 # USB Loader GX language source file.
-# italian.lang - r1146
+# italian.lang - r1148
 # don't delete/change this line (é).
 msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-09 22:23+0100\n"
+"POT-Creation-Date: 2012-02-29 20:42+0100\n"
 "PO-Revision-Date: 2011-09-11 12:19+0100\n"
 "Last-Translator: xFede\n"
-"Language-Team: Cambo\n"
+"Language-Team: Cambo, xFede\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -18,7 +18,7 @@ msgid " could not be downloaded."
 msgstr " non può essere scaricato."
 
 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 " è stato salvato. Parte del codice potrebbe non funzionare correttamente. In caso di problemi, aprire il file di testo con un editor per ottenere ulteriori informazioni."
+msgstr ""
 
 msgid " is not on the server."
 msgstr " non disponibile sul server."
@@ -35,7 +35,7 @@ msgid "0 (Everyone)"
 msgstr "0 (Tutti)"
 
 msgid "1 (Child 7+)"
-msgstr "1 (Bambini 7+)"
+msgstr "1 (Bimbi 7+)"
 
 msgid "1 hour"
 msgstr "1 ora"
@@ -44,7 +44,7 @@ msgid "10 min"
 msgstr "10 minuti"
 
 msgid "2 (Teen 12+)"
-msgstr "2 (Ragazzini 12+)"
+msgstr "2 (Ragazzi 12+)"
 
 msgid "20 min"
 msgstr "20 minuti"
@@ -68,7 +68,7 @@ msgid "3D Covers"
 msgstr "Copertine 3D"
 
 msgid "4 (Adults Only 18+)"
-msgstr "4 (Solo Maggiorenni 18+)"
+msgstr "4 (Maggiorenni 18+)"
 
 msgid "5 min"
 msgstr "5 minuti"
@@ -242,7 +242,7 @@ msgid "Block Updates"
 msgstr "Blocca Aggiornamenti"
 
 msgid "Boot Content"
-msgstr ""
+msgstr "Avvio Normale"
 
 msgid "Boot/Standard"
 msgstr "cIOS Predefinito"
@@ -303,7 +303,7 @@ msgid "Change Play Path"
 msgstr "Cambia Percorso Musica"
 
 msgid "Channel Launcher"
-msgstr ""
+msgstr "Modalità Avvio Canali"
 
 msgid "Channels"
 msgstr "Canali"
@@ -763,6 +763,9 @@ msgstr "Forza PAL50"
 msgid "Force PAL60"
 msgstr "Forza PAL60"
 
+msgid "Force Titles from Disc"
+msgstr ""
+
 msgid "Format"
 msgstr "Formatta"
 
@@ -887,7 +890,7 @@ msgid "Homebrew Apps Path"
 msgstr "Percorso Applic. Homebrew"
 
 msgid "Homebrew Channel"
-msgstr ""
+msgstr "Canale Homebrew"
 
 msgid "Homebrew Launcher"
 msgstr "Applicazioni Homebrew"
@@ -955,13 +958,13 @@ msgid "Install finished"
 msgstr "Installazione completata"
 
 msgid "Installing content"
-msgstr "Intallando contenuto"
+msgstr "Installando contenuto"
 
 msgid "Installing game:"
-msgstr "Intallando gioco:"
+msgstr "Installando gioco:"
 
 msgid "Installing title..."
-msgstr "Intallando titolo..."
+msgstr "Installando titolo..."
 
 msgid "Invalid wad file."
 msgstr "File WAD invalido."
@@ -1067,7 +1070,7 @@ msgid "Loop Sound"
 msgstr "Suono Ripetuto"
 
 msgid "Main DOL"
-msgstr ""
+msgstr "Avvio main.dol"
 
 msgid "Main tester:"
 msgstr "Tester principale:"
@@ -1100,7 +1103,7 @@ msgid "Music Volume"
 msgstr "Volume Musica"
 
 msgid "Nand Chan. Emulation"
-msgstr ""
+msgstr "Emulazione Canali NAND"
 
 msgid "Nand Channels"
 msgstr "Canali NAND"
@@ -1247,7 +1250,7 @@ msgid "Only Game Partition"
 msgstr "Solo Partizione Gioco"
 
 msgid "Only for Install"
-msgstr "Solo per Intallare"
+msgstr "Solo per Installare"
 
 msgid "Original Discarts"
 msgstr "Imm. Disco originali"
@@ -1799,7 +1802,7 @@ msgid "does not exist!"
 msgstr "non esiste!"
 
 msgid "does not exist!  Loading game without cheats."
-msgstr "non esiste! Caricando il gioco senza i trucchi."
+msgstr ""
 
 msgid "files left"
 msgstr "file mancanti"
@@ -1841,4 +1844,10 @@ msgid "of"
 msgstr "di"
 
 msgid "seconds left"
-msgstr "secondi rimanenti"
+msgstr "secondi rimasti"
+
+#~ 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 " è stato salvato. Parte del codice potrebbe non funzionare correttamente. In caso di problemi, aprire il file di testo con un editor per ottenere ulteriori informazioni."
+
+#~ msgid "does not exist! Loading game without cheats."
+#~ msgstr "non esiste! Caricando il gioco senza i trucchi."
diff --git a/Languages/japanese.lang b/Languages/japanese.lang
index 0796efe7..a076966d 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: 2012-02-09 22:23+0100\n"
+"POT-Creation-Date: 2012-02-29 20:42+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: hosigumayuugi\n"
 "Language-Team: hosigumayuugi\n"
@@ -83,10 +83,10 @@ msgid "Add category"
 msgstr "カテゴリを追加"
 
 msgid "Adjust Overscan X"
-msgstr ""
+msgstr "ｵｰﾊﾞｰｽｷｬﾝ調整 X"
 
 msgid "Adjust Overscan Y"
-msgstr ""
+msgstr "ｵｰﾊﾞｰｽｷｬﾝ調整 Y"
 
 msgid "All"
 msgstr "全て"
@@ -242,7 +242,7 @@ msgid "Block Updates"
 msgstr "更新を制限"
 
 msgid "Boot Content"
-msgstr ""
+msgstr "起動コンテンツ"
 
 msgid "Boot/Standard"
 msgstr "使用するcIOS"
@@ -267,7 +267,7 @@ msgstr "フォルダを作れません"
 
 #, c-format
 msgid "Can't create file: %s"
-msgstr ""
+msgstr "ファイルを作成できません: %s"
 
 #, c-format
 msgid "Can't create path: %s"
@@ -277,15 +277,15 @@ msgid "Can't delete:"
 msgstr "削除できません:"
 
 msgid "Can't mount or unknown disc format."
-msgstr ""
+msgstr "マウントできないか不明なディスク形式です"
 
 #, c-format
 msgid "Can't open file: %s"
-msgstr ""
+msgstr "ファイルを開けません: %s"
 
 #, c-format
 msgid "Can't read file: %s"
-msgstr ""
+msgstr "ファイルを読み込めません: %s"
 
 msgid "Cancel"
 msgstr "やめる"
@@ -303,7 +303,7 @@ msgid "Change Play Path"
 msgstr "パスの変更"
 
 msgid "Channel Launcher"
-msgstr ""
+msgstr "チャンネルランチャー"
 
 msgid "Channels"
 msgstr "チャンネル"
@@ -361,7 +361,7 @@ msgid "Content"
 msgstr "含む"
 
 msgid "Continue"
-msgstr ""
+msgstr "続行"
 
 msgid "Continue to install game?"
 msgstr "このｹﾞｰﾑをｲﾝｽﾄｰﾙしますか？"
@@ -697,13 +697,13 @@ msgid "Failed to open partition"
 msgstr "領域を開けませんでした"
 
 msgid "Failed to read ticket."
-msgstr ""
+msgstr "チケットを読み込めません"
 
 msgid "Failed to read tmd file."
-msgstr ""
+msgstr "TMDファイルを読み込めません"
 
 msgid "Failed to read wad header."
-msgstr ""
+msgstr "WADヘッダを読み込めません"
 
 msgid "Failed updating"
 msgstr "更新に失敗しました"
@@ -721,7 +721,7 @@ msgid "File not found."
 msgstr "ファイルが見つかりません"
 
 msgid "File read/write error."
-msgstr ""
+msgstr "ファイルの読み書きエラー"
 
 msgid "Files extracted successfully."
 msgstr "ファイルを書き出しました"
@@ -763,6 +763,9 @@ msgstr "PAL50に強制"
 msgid "Force PAL60"
 msgstr "PAL60に強制"
 
+msgid "Force Titles from Disc"
+msgstr ""
+
 msgid "Format"
 msgstr "初期化"
 
@@ -800,7 +803,7 @@ msgid "GAMEID_Gamename"
 msgstr "ゲームID_ゲーム名"
 
 msgid "GC Games"
-msgstr ""
+msgstr "GCゲーム"
 
 msgid "GCT Cheatcodes Path"
 msgstr "GCTチート"
@@ -946,7 +949,7 @@ msgid "Install Partitions"
 msgstr "インストール領域"
 
 msgid "Install WAD to EmuNand"
-msgstr ""
+msgstr "WADをエミュNANDへインストール"
 
 msgid "Install a game"
 msgstr "ゲームをインストール"
@@ -955,16 +958,16 @@ msgid "Install finished"
 msgstr "インストールが終了しました"
 
 msgid "Installing content"
-msgstr ""
+msgstr "ｺﾝﾃﾝﾂをｲﾝｽﾄｰﾙ中"
 
 msgid "Installing game:"
 msgstr "ｹﾞｰﾑをｲﾝｽﾄｰﾙ中:"
 
 msgid "Installing title..."
-msgstr ""
+msgstr "ﾀｲﾄﾙをｲﾝｽﾄｰﾙ中..."
 
 msgid "Invalid wad file."
-msgstr ""
+msgstr "不正なWADファイルです"
 
 msgid "Issue manager /"
 msgstr "問題管理者 /"
@@ -1067,7 +1070,7 @@ msgid "Loop Sound"
 msgstr "ループさせる"
 
 msgid "Main DOL"
-msgstr ""
+msgstr "main.dol"
 
 msgid "Main tester:"
 msgstr "メインテスター:"
@@ -1100,7 +1103,7 @@ msgid "Music Volume"
 msgstr "BGMの音量"
 
 msgid "Nand Chan. Emulation"
-msgstr ""
+msgstr "NANDチャンネルエミュ"
 
 msgid "Nand Channels"
 msgstr "Wii本体NANDチャンネル"
@@ -1620,7 +1623,7 @@ msgid "USB Port changing is only supported on Hermes cIOS."
 msgstr "USBﾎﾟｰﾄの切替機能は、Hermes cIOS使用時のみ有効です。"
 
 msgid "Uninstall"
-msgstr ""
+msgstr "アンインストール"
 
 msgid "Uninstall Game"
 msgstr "ゲームをｱﾝｲﾝｽﾄｰﾙ"
@@ -1699,7 +1702,7 @@ msgid "Virtual Pointer Speed"
 msgstr "ポインタの速度"
 
 msgid "WAD Installation"
-msgstr ""
+msgstr "WADインストール"
 
 msgid "WDM Files Path"
 msgstr "WDMファイル"
@@ -1717,7 +1720,7 @@ msgid "Warning:"
 msgstr "警告:"
 
 msgid "What do you want to do?"
-msgstr ""
+msgstr "何をしますか?"
 
 msgid "What do you want to update?"
 msgstr "更新の選択"
@@ -1769,7 +1772,7 @@ msgstr "WiiRDデバッガ"
 
 #, c-format
 msgid "Write error on file: %s"
-msgstr ""
+msgstr "書き込みエラー: %s"
 
 msgid "Writing GXGameCategories.xml"
 msgstr "GXGameCategories.xmlを書き込み中です"
diff --git a/Languages/korean.lang b/Languages/korean.lang
index 9b8dc379..e2d415a0 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: 2012-02-09 22:23+0100\n"
+"POT-Creation-Date: 2012-02-29 20:42+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: nextos@korea.com\n"
 "Language-Team: \n"
@@ -763,6 +763,9 @@ msgstr ""
 msgid "Force PAL60"
 msgstr ""
 
+msgid "Force Titles from Disc"
+msgstr ""
+
 msgid "Format"
 msgstr "포맷"
 
diff --git a/Languages/norwegian.lang b/Languages/norwegian.lang
index 71592880..a6434dc8 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: 2012-02-09 22:23+0100\n"
+"POT-Creation-Date: 2012-02-29 20:42+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: raschi\n"
 "Language-Team: raschi\n"
@@ -763,6 +763,9 @@ msgstr "Tving PAL50"
 msgid "Force PAL60"
 msgstr "Tving PAL60"
 
+msgid "Force Titles from Disc"
+msgstr ""
+
 msgid "Format"
 msgstr "Formatér"
 
diff --git a/Languages/polish.lang b/Languages/polish.lang
index e50dd694..30b5bbe5 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: 2012-02-09 22:23+0100\n"
+"POT-Creation-Date: 2012-02-29 20:42+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: ziom666 (zadania_prog@vp.pl)\n"
 "Language-Team: \n"
@@ -763,6 +763,9 @@ msgstr ""
 msgid "Force PAL60"
 msgstr ""
 
+msgid "Force Titles from Disc"
+msgstr ""
+
 msgid "Format"
 msgstr "Sformatuj"
 
diff --git a/Languages/portuguese_br.lang b/Languages/portuguese_br.lang
index fa2e5152..553f66f7 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: 2012-02-09 22:23+0100\n"
+"POT-Creation-Date: 2012-02-29 20:42+0100\n"
 "PO-Revision-Date: 2009-10-23 18:52+0200\n"
 "Last-Translator: aniemotion\n"
 "Language-Team: boto12, aniemotion\n"
@@ -763,6 +763,9 @@ msgstr ""
 msgid "Force PAL60"
 msgstr ""
 
+msgid "Force Titles from Disc"
+msgstr ""
+
 msgid "Format"
 msgstr "Formatar"
 
diff --git a/Languages/portuguese_pt.lang b/Languages/portuguese_pt.lang
index feaba4b6..1e776efe 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: 2012-02-09 22:23+0100\n"
+"POT-Creation-Date: 2012-02-29 20:42+0100\n"
 "PO-Revision-Date: 2011-11-03 11:00+0000\n"
 "Last-Translator: pplucky <pplucky@gmail.com>\n"
 "Language-Team: Sky8000, pplucky\n"
@@ -763,6 +763,9 @@ msgstr "Forçar PAL50"
 msgid "Force PAL60"
 msgstr "Forçar PAL60"
 
+msgid "Force Titles from Disc"
+msgstr ""
+
 msgid "Format"
 msgstr "Formatar"
 
diff --git a/Languages/russian.lang b/Languages/russian.lang
index dc263949..e8dbf008 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: 2012-02-09 22:23+0100\n"
+"POT-Creation-Date: 2012-02-29 20:42+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: nikolai_ca\n"
 "Language-Team: Kir, alendit, nikolai_ca\n"
@@ -763,6 +763,9 @@ msgstr ""
 msgid "Force PAL60"
 msgstr ""
 
+msgid "Force Titles from Disc"
+msgstr ""
+
 msgid "Format"
 msgstr "Форматировать"
 
diff --git a/Languages/schinese.lang b/Languages/schinese.lang
index 6aa1bf4e..bc9cd17c 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: 2012-02-09 22:23+0100\n"
+"POT-Creation-Date: 2012-02-29 20:42+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: knife.hu kavid emul8ion\n"
 "Language-Team: kavid\n"
@@ -763,6 +763,9 @@ msgstr "强制 PAL50"
 msgid "Force PAL60"
 msgstr "强制 PAL60"
 
+msgid "Force Titles from Disc"
+msgstr ""
+
 msgid "Format"
 msgstr "格式化"
 
diff --git a/Languages/spanish.lang b/Languages/spanish.lang
index 115a2b27..85931073 100644
--- a/Languages/spanish.lang
+++ b/Languages/spanish.lang
@@ -1,18 +1,18 @@
 # USB Loader GX language source file.
-# spanish.lang - r1123
+# spanish.lang - r1148
 # don't delete/change this line (é).
 msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-09 22:23+0100\n"
+"POT-Creation-Date: 2012-02-29 20:42+0100\n"
 "PO-Revision-Date: 2011-07-25 16:40+0200\n"
 "Last-Translator: Galen/xFede\n"
 "Language-Team: Penn, SirPalax, hvy109\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
+"Language: Español\n"
 
 msgid " could not be downloaded."
 msgstr " no se han podido descargar."
@@ -89,7 +89,7 @@ msgid "Adjust Overscan Y"
 msgstr ""
 
 msgid "All"
-msgstr "Todas"
+msgstr "Todos"
 
 msgid "All Partitions"
 msgstr "Todas las particiones"
@@ -110,7 +110,7 @@ msgid "An example file was created here:"
 msgstr "Un archivo de ejemplo fue creado aquí:"
 
 msgid "Anti"
-msgstr ""
+msgstr "Anti"
 
 msgid "App Language"
 msgstr "Idioma Aplicación"
@@ -125,7 +125,7 @@ msgid "Are you sure you want to delete this category?"
 msgstr "¿Estás seguro de eliminar esta categoría?"
 
 msgid "Are you sure you want to import game categories from GameTDB?"
-msgstr "Estas seguro que quieres importar las categorias de juegos de GameTDB"
+msgstr "Estas seguro que quieres importar las categorías de juegos de GameTDB"
 
 msgid "Are you sure you want to lock USB Loader GX?"
 msgstr "¿Estás seguro de bloquear USB Loader GX?"
@@ -149,7 +149,7 @@ msgid "Auto"
 msgstr ""
 
 msgid "AutoInit Network"
-msgstr "AutoIniciar la Red"
+msgstr "Auto Iniciar la Red"
 
 msgid "BCA Codes Path"
 msgstr "Ruta Códigos BCA"
@@ -164,7 +164,7 @@ msgid "Backgroundmusic"
 msgstr "Música de fondo"
 
 msgid "Beginning"
-msgstr ""
+msgstr "Basico"
 
 msgid "Big thanks to:"
 msgstr "Gracias a:"
@@ -209,7 +209,7 @@ msgid "Block IOS Reload"
 msgstr "Impedir recarga IOS"
 
 msgid "Block Loader Mode Button"
-msgstr ""
+msgstr "Bloq. Carga por Boton"
 
 msgid "Block Loader Settings"
 msgstr "Bloq. Config. Cargador"
@@ -218,7 +218,7 @@ msgid "Block Parental Settings"
 msgstr "Bloq. Config. Parental"
 
 msgid "Block Priiloader Override"
-msgstr ""
+msgstr "Bloq. Parche Priiloader"
 
 msgid "Block Reset Settings"
 msgstr "Bloq. Resetear Config."
@@ -242,7 +242,7 @@ msgid "Block Updates"
 msgstr "Bloq. Actualizaciones"
 
 msgid "Boot Content"
-msgstr ""
+msgstr "Iniciar contenido"
 
 msgid "Boot/Standard"
 msgstr "Inicio/Estándar"
@@ -267,7 +267,7 @@ msgstr "No se creó la carpeta"
 
 #, c-format
 msgid "Can't create file: %s"
-msgstr ""
+msgstr "No se creó el archivo"
 
 #, c-format
 msgid "Can't create path: %s"
@@ -281,11 +281,11 @@ msgstr ""
 
 #, c-format
 msgid "Can't open file: %s"
-msgstr ""
+msgstr "No se abrió el archivo"
 
 #, c-format
 msgid "Can't read file: %s"
-msgstr ""
+msgstr "No se pudo leer el archivo"
 
 msgid "Cancel"
 msgstr "Cancelar"
@@ -303,10 +303,10 @@ msgid "Change Play Path"
 msgstr "Cambiar Ruta"
 
 msgid "Channel Launcher"
-msgstr ""
+msgstr "Cargar Canales"
 
 msgid "Channels"
-msgstr ""
+msgstr "Canales"
 
 msgid "Cheatfile is blank"
 msgstr "El archivo de Trucos está vacio"
@@ -358,10 +358,10 @@ msgid "Console should be unlocked to modify it."
 msgstr "Debes desbloquear la consola para modificarlo."
 
 msgid "Content"
-msgstr ""
+msgstr "Contenido"
 
 msgid "Continue"
-msgstr ""
+msgstr "Continuar"
 
 msgid "Continue to install game?"
 msgstr "¿Continuar instalando juego?"
@@ -437,7 +437,7 @@ msgid "DOL Path"
 msgstr "Ruta del DOL"
 
 msgid "Debugger Paused Start"
-msgstr ""
+msgstr "Iniciar Wiird pausado"
 
 msgid "Dec"
 msgstr "Dic"
@@ -446,7 +446,7 @@ msgid "Default"
 msgstr "Predeterminado"
 
 msgid "Default Gamesettings"
-msgstr "Conf. Pred. de Juegos"
+msgstr "Configuracion Predeterminada del Juego"
 
 msgid "Default Settings"
 msgstr "Configuración Predeterminada"
@@ -461,13 +461,13 @@ msgid "Delete Cheat TXT"
 msgstr "Borrar Trucos TXT"
 
 msgid "Delete Cover Artwork"
-msgstr "Borrar Carátula"
+msgstr "Borrar Carátulas"
 
 msgid "Delete Disc Artwork"
-msgstr "Borrar Imagen Disco"
+msgstr "Borrar Imagen de Disco"
 
 msgid "Delete category"
-msgstr "Borrar Categoría"
+msgstr "Borrar categoría"
 
 msgid "Design:"
 msgstr "Diseño:"
@@ -482,16 +482,16 @@ msgid "Directory does not exist!"
 msgstr "¡La carpeta no existe!"
 
 msgid "Disc Artwork Download"
-msgstr "Descarga Imagen Discos"
+msgstr "Imagenes de Discos"
 
 msgid "Disc Artwork Path"
-msgstr "Ruta Imagen Discos"
+msgstr "Ruta Imagenes Discos"
 
 msgid "Disc Default"
 msgstr "Pred. Disco"
 
 msgid "Disc Insert Detected"
-msgstr ""
+msgstr "Detectado Disco Insertado"
 
 msgid "DiskFlip"
 msgstr "GiraDiscos"
@@ -500,13 +500,13 @@ msgid "Display"
 msgstr "Mostrar"
 
 msgid "Display as a carousel"
-msgstr "Mostrar como carrusel"
+msgstr "Mostrar en carrusel"
 
 msgid "Display as a grid"
-msgstr "Mostrar como rejilla"
+msgstr "Mostrar en rejilla"
 
 msgid "Display as a list"
-msgstr "Mostrar como lista"
+msgstr "Mostrar en lista"
 
 msgid "Display favorites only"
 msgstr "Mostrar solo favoritos"
@@ -524,10 +524,10 @@ msgid "Do you want to download this theme?"
 msgstr "¿Quieres descargar este Tema?"
 
 msgid "Do you want to extract all the save games?"
-msgstr "Quieres extraer todas las partidas guardadas?"
+msgstr "¿Quieres extraer las partidas?"
 
 msgid "Do you want to extract the save game?"
-msgstr "Quieres extraer la partida guardada?"
+msgstr "¿Quieres extraer la partida?"
 
 msgid "Do you want to format:"
 msgstr "Quieres formatear:"
@@ -536,7 +536,7 @@ msgid "Do you want to load the default theme?"
 msgstr "¿Quieres cargar el tema por defecto?"
 
 msgid "Do you want to re-init network?"
-msgstr "Quieres reiniciar la red?"
+msgstr "¿Quieres reiniciar la red?"
 
 msgid "Do you want to sync free space info sector on all FAT32 partitions?"
 msgstr "¿Quieres sincronizar el sector de información de espacio libre en todas las particiones FAT32?"
@@ -581,7 +581,7 @@ msgid "Downloading pagelist:"
 msgstr "Descargando lista de páginas:"
 
 msgid "Dump NAND to EmuNand"
-msgstr "Volcando NAND a NAND emulada"
+msgstr "Volcar Nand a Nand emul."
 
 msgid "Dutch"
 msgstr "Holandés"
@@ -596,10 +596,10 @@ msgid "ERROR: Can't set up theme."
 msgstr "ERROR: No se puede configurar el tema."
 
 msgid "EmuNand Channels"
-msgstr ""
+msgstr "Canales en Nand Emulada"
 
 msgid "Emulated Nand"
-msgstr ""
+msgstr "Nand Emulada"
 
 msgid "English"
 msgstr "Inglés"
@@ -661,10 +661,10 @@ msgid "Exit to where?"
 msgstr "¿Salir a dónde?"
 
 msgid "Export All Saves to EmuNand"
-msgstr "Exportar todas las partidas guardadas a NAND emulada"
+msgstr "Extraer partidas a Nand emul."
 
 msgid "Extract Save to EmuNand"
-msgstr "Extraer partida guardada a NAND emulada"
+msgstr "Extraer partida a Nand emulada"
 
 msgid "Extracting file:"
 msgstr "Extrayendo archivo:"
@@ -676,7 +676,7 @@ msgid "Extracting files:"
 msgstr "Extrayendo archivos:"
 
 msgid "Extracting nand files:"
-msgstr "Extrayendo archivos de NAND"
+msgstr ""
 
 msgid "Failed"
 msgstr "Fallo"
@@ -691,19 +691,19 @@ msgid "Failed to extract."
 msgstr "No se ha podido extraer."
 
 msgid "Failed to initialize the USB storage device."
-msgstr ""
+msgstr "Fallo al iniciar el dispositivo USB"
 
 msgid "Failed to open partition"
 msgstr "No se ha podido abrir la partición"
 
 msgid "Failed to read ticket."
-msgstr ""
+msgstr "Fallo al leer ticket"
 
 msgid "Failed to read tmd file."
-msgstr ""
+msgstr "Fallo al leer archivo tmd"
 
 msgid "Failed to read wad header."
-msgstr ""
+msgstr "Fallo al leer cabecera wad "
 
 msgid "Failed updating"
 msgstr "No se ha podido actualizar"
@@ -721,7 +721,7 @@ msgid "File not found."
 msgstr "Archivo no encontrado."
 
 msgid "File read/write error."
-msgstr ""
+msgstr "Error de lectura/escritura en archivo"
 
 msgid "Files extracted successfully."
 msgstr "Archivos extraidos correctamente"
@@ -737,16 +737,16 @@ msgid "Flat Covers"
 msgstr "Carátulas 2D"
 
 msgid "Flip-X"
-msgstr "Desplazamiento X"
+msgstr "Animación Menú Disco"
 
 msgid "Font Scale Factor"
-msgstr "Escalado de la Fuente"
+msgstr "Escalado de Fuente"
 
 msgid "Force 16:9"
-msgstr ""
+msgstr "Forzar 16:9"
 
 msgid "Force 4:3"
-msgstr ""
+msgstr "Forzar 4:3"
 
 msgid "Force NTSC"
 msgstr "Forzar NTSC"
@@ -763,6 +763,9 @@ msgstr "Forzar PAL50"
 msgid "Force PAL60"
 msgstr "Forzar PAL60"
 
+msgid "Force Titles from Disc"
+msgstr ""
+
 msgid "Format"
 msgstr "Formateo"
 
@@ -791,7 +794,7 @@ msgid "Full LQ Covers"
 msgstr "Carátulas LQ Comp."
 
 msgid "Full Menu"
-msgstr "Menú completo"
+msgstr "Completo"
 
 msgid "Full shutdown"
 msgstr "Apagado completo"
@@ -809,7 +812,7 @@ msgid "GCT File created"
 msgstr "Archivo GCT creado"
 
 msgid "GUI Settings"
-msgstr "Configuración de la GUI"
+msgstr "Configuración de GUI"
 
 msgid "GXDraw"
 msgstr ""
@@ -827,7 +830,7 @@ msgid "Game Language"
 msgstr "Idioma"
 
 msgid "Game Load"
-msgstr "Configuración de los Juegos"
+msgstr "Configuración del Juego"
 
 msgid "Game Lock"
 msgstr "Bloqueo del Juego"
@@ -854,7 +857,7 @@ msgid "Game is already installed:"
 msgstr "El juego ya estaba instalado:"
 
 msgid "Game/Install Partition"
-msgstr "Partición de los Juegos"
+msgstr "Partición de Juegos"
 
 msgid "GameTDB Path"
 msgstr "Ruta GameDTB"
@@ -934,10 +937,10 @@ msgid "Install"
 msgstr "Instalar"
 
 msgid "Install Canceled"
-msgstr ""
+msgstr "Instalación cancelada"
 
 msgid "Install Directories"
-msgstr "Instalar Directorios"
+msgstr "Instalar en carpeta"
 
 msgid "Install Error!"
 msgstr "¡Error de Instalación!"
@@ -946,7 +949,7 @@ msgid "Install Partitions"
 msgstr "Instalar Particiones"
 
 msgid "Install WAD to EmuNand"
-msgstr ""
+msgstr "Instalar WAD en Nand Emul."
 
 msgid "Install a game"
 msgstr "Instalar un juego"
@@ -955,16 +958,16 @@ msgid "Install finished"
 msgstr "Instalación terminada"
 
 msgid "Installing content"
-msgstr ""
+msgstr "Instalando Contenido"
 
 msgid "Installing game:"
 msgstr "Instalando juego:"
 
 msgid "Installing title..."
-msgstr ""
+msgstr "Instalando Título"
 
 msgid "Invalid wad file."
-msgstr ""
+msgstr "Archivo WAD no valido"
 
 msgid "Issue manager /"
 msgstr ""
@@ -1012,7 +1015,7 @@ msgid "Languagepath changed."
 msgstr "Ruta de idioma cambiada."
 
 msgid "Launching emulated nand channels only works on d2x cIOS! Change game IOS to a d2x cIOS first."
-msgstr ""
+msgstr "La carga de canales de Nand emulada solo funciona con cIOS d2x, cambia el IOS del juego a d2x primero"
 
 msgid "Left"
 msgstr "Izquierda"
@@ -1037,7 +1040,7 @@ msgid "Load this DOL as alternate DOL?"
 msgstr "¿Cargar este DOL como DOL Alternativo?"
 
 msgid "Loader Mode"
-msgstr ""
+msgstr "Modo de Carga"
 
 msgid "Loader Settings"
 msgstr "Configuración del Cargador"
@@ -1067,7 +1070,7 @@ msgid "Loop Sound"
 msgstr "Bucle de sonido"
 
 msgid "Main DOL"
-msgstr ""
+msgstr "DOL Principal"
 
 msgid "Main tester:"
 msgstr "Probador principal:"
@@ -1100,13 +1103,13 @@ msgid "Music Volume"
 msgstr "Volumen de la Música"
 
 msgid "Nand Chan. Emulation"
-msgstr ""
+msgstr "Emul. canales Nand"
 
 msgid "Nand Channels"
-msgstr ""
+msgstr "Canales en Nand"
 
 msgid "Nand Emu Channel Path"
-msgstr ""
+msgstr "Ruta emul. canales Nand"
 
 msgid "Nand Emu Path"
 msgstr "Ruta Emul. Nand"
@@ -1121,7 +1124,7 @@ msgid "Nand Emulation only works on FAT/FAT32 partitions!"
 msgstr "¡La emulación Nand solo funciona en particiones FAT/FAT32!"
 
 msgid "Nand Saves Emulation"
-msgstr ""
+msgstr "Emul. partidas Nand"
 
 msgid "Neither"
 msgstr "Ninguno"
@@ -1169,7 +1172,7 @@ msgid "No file missing!"
 msgstr "¡No faltan archivos!"
 
 msgid "No language files to update on your devices! Do you want to download new language files?"
-msgstr ""
+msgstr "No hay archivos de idioma en tus dispositivos, ¿quieres descargar nuevos archivos de idioma?"
 
 msgid "No new updates."
 msgstr "No hay nuevas actualizaciones."
@@ -1187,7 +1190,7 @@ msgid "Normal"
 msgstr ""
 
 msgid "Not Initialized"
-msgstr ""
+msgstr "No Iniciado"
 
 msgid "Not a Wii Disc"
 msgstr "No es un Disco Wii"
@@ -1220,13 +1223,13 @@ msgid "Nov"
 msgstr ""
 
 msgid "OFF"
-msgstr "Apagado"
+msgstr "Desactivado"
 
 msgid "OK"
 msgstr "Aceptar"
 
 msgid "ON"
-msgstr "Encendido"
+msgstr "Activado"
 
 msgid "OSSleepThread"
 msgstr ""
@@ -1325,7 +1328,7 @@ msgid "Random Directory Music"
 msgstr "Aleatorio de la carpeta musical"
 
 msgid "Real Nand"
-msgstr ""
+msgstr "Nand Real"
 
 msgid "Receiving file from:"
 msgstr "Recibir archivo desde:"
@@ -1412,7 +1415,7 @@ msgid "Screensaver"
 msgstr "Salvapantallas"
 
 msgid "Search Mode"
-msgstr ""
+msgstr "Modo de Busqueda"
 
 msgid "Select"
 msgstr "Seleccionar"
@@ -1430,10 +1433,10 @@ msgid "Select game categories"
 msgstr "Seleccionar categorías de juegos"
 
 msgid "Select loader mode"
-msgstr ""
+msgstr "Seleccionar cargador"
 
 msgid "Select titles sources."
-msgstr ""
+msgstr "Selecciona fuente de títulos"
 
 msgid "Sept"
 msgstr ""
@@ -1451,7 +1454,7 @@ msgid "Show Free Space"
 msgstr "Mostrar Espacio Libre"
 
 msgid "Show Play Count"
-msgstr "Mostrar número jugados"
+msgstr "Mostrar núm. jugados"
 
 msgid "Shutdown System"
 msgstr "Apagar Sistema"
@@ -1475,7 +1478,7 @@ msgid "Sort by rank"
 msgstr "Ordenar por clasificación"
 
 msgid "Sort order by most played"
-msgstr "Ordenar por los más jugados"
+msgstr "Ordenar por más jugados"
 
 msgid "Sound"
 msgstr "Sonido"
@@ -1532,16 +1535,16 @@ msgid "Successfully installed:"
 msgstr "Instalado correctamente:"
 
 msgid "Switching to channel list mode."
-msgstr ""
+msgstr "Cambiando a modo de lista de canales"
 
 msgid "Sync FAT32 FS Info"
-msgstr "Sinc. Esp. Libre (FAT32)"
+msgstr "Sinc. Esp. Libre FAT32"
 
 msgid "Synchronizing..."
 msgstr "Sincronizando..."
 
 msgid "System Default"
-msgstr "Pred. Sistema"
+msgstr "Sistema"
 
 msgid "TChinese"
 msgstr "Chino T."
@@ -1556,13 +1559,13 @@ msgid "The entered directory does not exist. Would you like to create it?"
 msgstr "La carpeta especificada no existe. ¿Quieres crearla?"
 
 msgid "The files will be extracted to your emu nand path. Attention: All existing files will be overwritten."
-msgstr "Los archivos se extraeran en la ruta de tu NAND emulada. ATENCION: los archivos existentes seran sobreescritos"
+msgstr "Los archivos se extraeran en la ruta de tu Nand emulada. ATENCION: los archivos existentes seran sobreescritos"
 
 msgid "The save game will be extracted to your emu nand path."
-msgstr "Las partidas guardadas se extraeran en la ruta de tu NAND emulada"
+msgstr "La partida guardada se extraerá en la ruta de tu Nand emulada"
 
 msgid "The save games will be extracted to your emu nand path. Attention: All existing saves will be overwritten."
-msgstr "Las partidas guardadas se extraeran en la ruta de tu NAND emulada. ATENCION: las partidas existentes seran sobreescritas"
+msgstr "Las partidas guardadas se extraeran en la ruta de tu Nand emulada. ATENCION: las partidas existentes seran sobreescritas"
 
 msgid "The wad file was installed"
 msgstr "Se instaló el archivo wad"
@@ -1602,13 +1605,13 @@ msgid "Titles from GameTDB"
 msgstr "Titulos de GameTDB"
 
 msgid "Tooltips"
-msgstr "InfoBurbujas"
+msgstr "Descripción"
 
 msgid "Transfer failed"
 msgstr "Transferencia fallida"
 
 msgid "USB Device not found."
-msgstr ""
+msgstr "Dispositivo USB no encontrado"
 
 msgid "USB Loader GX is protected"
 msgstr "USB Loader GX está protegido"
@@ -1620,7 +1623,7 @@ msgid "USB Port changing is only supported on Hermes cIOS."
 msgstr "El cambio de Puerto USB sólo funciona con el cIOS de Hermes."
 
 msgid "Uninstall"
-msgstr ""
+msgstr "Desinstalar"
 
 msgid "Uninstall Game"
 msgstr "Desinstalar Juego"
@@ -1674,7 +1677,7 @@ msgid "Uploaded ZIP file installed to homebrew directory."
 msgstr "Enviado archivo ZIP instalado en la carpeta homebrew."
 
 msgid "Use System Font"
-msgstr "Usar Fuente del Sistema"
+msgstr "Fuente del Sistema"
 
 msgid "Use global"
 msgstr "Usar global"
@@ -1696,10 +1699,10 @@ msgid "Video Mode"
 msgstr "Modo Vídeo"
 
 msgid "Virtual Pointer Speed"
-msgstr ""
+msgstr "Vel. Puntero Virtual"
 
 msgid "WAD Installation"
-msgstr ""
+msgstr "Instalacion WAD"
 
 msgid "WDM Files Path"
 msgstr "Rutas Archivos WDM"
@@ -1717,7 +1720,7 @@ msgid "Warning:"
 msgstr "Advertencia:"
 
 msgid "What do you want to do?"
-msgstr ""
+msgstr "¿Que quieres hacer?"
 
 msgid "What do you want to update?"
 msgstr "¿Qué quieres actualizar?"
@@ -1726,7 +1729,7 @@ msgid "What should be deleted for this game title:"
 msgstr "Qué se debería borrar para este juego:"
 
 msgid "What to extract from NAND?"
-msgstr "Extraer NAND de?"
+msgstr "¿Que Extraer de la Nand?"
 
 msgid "WiFi Features"
 msgstr "Características WiFi"
@@ -1735,10 +1738,10 @@ msgid "Widescreen Factor"
 msgstr "Factor Panorámico"
 
 msgid "Widescreen Fix"
-msgstr "Ajuste panorámico"
+msgstr "Panorámico"
 
 msgid "Wii Games"
-msgstr ""
+msgstr "Juegos Wii"
 
 msgid "Wii Menu"
 msgstr "Menú de Wii"
@@ -1747,10 +1750,10 @@ msgid "Wii Settings"
 msgstr "Opciones de Wii"
 
 msgid "WiiTDB.xml"
-msgstr ""
+msgstr "WiiTDB"
 
 msgid "WiiTDB.xml is up to date."
-msgstr ""
+msgstr "WiiTDB.xml está actualizado."
 
 msgid "Wiilight"
 msgstr "Iluminar lector"
@@ -1765,11 +1768,11 @@ msgid "Wiinnertag requires you to enable automatic network connect on applicatio
 msgstr "Wiinnertag requiere habilitar la conexión automática a la red al iniciar la aplicación. ¿Quieres habilitarla ahora?"
 
 msgid "Wiird Debugger"
-msgstr ""
+msgstr "Depurador Wiird"
 
 #, c-format
 msgid "Write error on file: %s"
-msgstr ""
+msgstr "Error de escritura en archivo"
 
 msgid "Writing GXGameCategories.xml"
 msgstr "Escribiendo GXGameCategories.xml"
@@ -1784,7 +1787,7 @@ msgid "You are trying to select a FAT32/NTFS/EXT partition with cIOS 249 Rev < 1
 msgstr "Estás intentando seleccionar una partición FAT32/NTFS/EXT con cIOS 249 Rev < 18. Esto no es soportado. Continúa bajo tu propio riesgo."
 
 msgid "You can select or format a partition or use the channel loader mode."
-msgstr ""
+msgstr "Puedes seleccionar o formatear una particón o usar el modo de carga de canales"
 
 msgid "You cannot delete this category."
 msgstr "No puedes borrar esta categoría."
@@ -1843,6 +1846,9 @@ msgstr "de"
 msgid "seconds left"
 msgstr "segundos restantes"
 
+#~ msgid "Extracting Nand files:"
+#~ msgstr "Extrayendo archivos de Nand"
+
 #~ msgid ">> Deleting tickets..."
 #~ msgstr ">> Borrando tickets..."
 
@@ -1907,13 +1913,13 @@ msgstr "segundos restantes"
 #~ msgstr "Instalando título... ¡Correcto!"
 
 #~ msgid "Installing wad"
-#~ msgstr "Instalando el WAD"
+#~ msgstr "Instalando WAD"
 
 #~ msgid "Reading WAD data... Ok!"
 #~ msgstr "Leyendo datos del WAD... ¡Correcto!"
 
 #~ msgid "Uninstalling wad"
-#~ msgstr "Desinstalando el WAD"
+#~ msgstr "Desinstalando WAD"
 
 #~ msgid "The game installation is disabled under this IOS because of instability in usb write."
 #~ msgstr "La instalación de juegos está desabilitada bajo este IOS porque la escritura USB es inestable."
@@ -1940,7 +1946,7 @@ msgstr "segundos restantes"
 #~ msgstr "Títulos WiiTDB"
 
 #~ msgid "WiiTDB Files"
-#~ msgstr "WiiTDB"
+#~ msgstr "Archivos WiiTDB"
 
 #~ msgid "WiiTDB Path"
 #~ msgstr "Ruta WiiTDB"
diff --git a/Languages/swedish.lang b/Languages/swedish.lang
index f0a274c5..fcd7715f 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: 2012-02-09 22:23+0100\n"
+"POT-Creation-Date: 2012-02-29 20:42+0100\n"
 "PO-Revision-Date: 2010-01-19 17:39+0200\n"
 "Last-Translator: Katsurou\n"
 "Language-Team: Katsurou, pirateX\n"
@@ -763,6 +763,9 @@ msgstr ""
 msgid "Force PAL60"
 msgstr ""
 
+msgid "Force Titles from Disc"
+msgstr ""
+
 msgid "Format"
 msgstr "Formatera"
 
diff --git a/Languages/tchinese.lang b/Languages/tchinese.lang
index 1ddbedbe..d8e506c8 100644
--- a/Languages/tchinese.lang
+++ b/Languages/tchinese.lang
@@ -1,11 +1,11 @@
 # USB Loader GX language source file.
-# tchinese.lang - r1120
+# tchinese.lang - r1145
 # don't delete/change this line (é).
 msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-09 22:23+0100\n"
+"POT-Creation-Date: 2012-02-29 20:42+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"
@@ -125,7 +125,7 @@ msgid "Are you sure you want to delete this category?"
 msgstr "確定要刪除此類別嗎？"
 
 msgid "Are you sure you want to import game categories from GameTDB?"
-msgstr ""
+msgstr "確定要從GameTDB匯入遊戲類別嗎？"
 
 msgid "Are you sure you want to lock USB Loader GX?"
 msgstr "確定要鎖上 USB Loader GX嗎？"
@@ -137,7 +137,7 @@ msgid "Are you sure?"
 msgstr "確定？"
 
 msgid "Aspect Ratio"
-msgstr ""
+msgstr "圖像縱橫比"
 
 msgid "Aug"
 msgstr "八月"
@@ -164,7 +164,7 @@ msgid "Backgroundmusic"
 msgstr "背景音樂"
 
 msgid "Beginning"
-msgstr ""
+msgstr "開始"
 
 msgid "Big thanks to:"
 msgstr "非常感謝:"
@@ -209,7 +209,7 @@ msgid "Block IOS Reload"
 msgstr "封鎖 IOS 重新載入"
 
 msgid "Block Loader Mode Button"
-msgstr ""
+msgstr "封鎖 Loader 模式按鈕"
 
 msgid "Block Loader Settings"
 msgstr "封鎖 Loader 設定"
@@ -218,7 +218,7 @@ msgid "Block Parental Settings"
 msgstr "封鎖親子設定"
 
 msgid "Block Priiloader Override"
-msgstr ""
+msgstr "封鎖 使Priiloader無效"
 
 msgid "Block Reset Settings"
 msgstr "封鎖重置設定"
@@ -267,7 +267,7 @@ msgstr "無法建立目錄"
 
 #, c-format
 msgid "Can't create file: %s"
-msgstr ""
+msgstr "無法建立檔案: %s"
 
 #, c-format
 msgid "Can't create path: %s"
@@ -281,11 +281,11 @@ msgstr ""
 
 #, c-format
 msgid "Can't open file: %s"
-msgstr ""
+msgstr "無法開啟檔案: %s"
 
 #, c-format
 msgid "Can't read file: %s"
-msgstr ""
+msgstr "無法讀取檔案: %s"
 
 msgid "Cancel"
 msgstr "取消"
@@ -306,7 +306,7 @@ msgid "Channel Launcher"
 msgstr ""
 
 msgid "Channels"
-msgstr ""
+msgstr "頻道"
 
 msgid "Cheatfile is blank"
 msgstr "金手指檔是空的"
@@ -358,10 +358,10 @@ msgid "Console should be unlocked to modify it."
 msgstr "控制台須解鎖才可變更設定。"
 
 msgid "Content"
-msgstr ""
+msgstr "內容"
 
 msgid "Continue"
-msgstr ""
+msgstr "繼續"
 
 msgid "Continue to install game?"
 msgstr "繼續安裝遊戲？"
@@ -491,7 +491,7 @@ msgid "Disc Default"
 msgstr "光碟預設"
 
 msgid "Disc Insert Detected"
-msgstr ""
+msgstr "光碟插入檢查"
 
 msgid "DiskFlip"
 msgstr "光碟滑動"
@@ -536,7 +536,7 @@ msgid "Do you want to load the default theme?"
 msgstr "是否要載入預設佈景主題嗎？"
 
 msgid "Do you want to re-init network?"
-msgstr ""
+msgstr "是否要重新初始化網路？"
 
 msgid "Do you want to sync free space info sector on all FAT32 partitions?"
 msgstr "是否要同步所有FAT32磁區可用空間資訊？"
@@ -581,7 +581,7 @@ msgid "Downloading pagelist:"
 msgstr "下載頁面清單："
 
 msgid "Dump NAND to EmuNand"
-msgstr ""
+msgstr "轉儲 NAND 到 模擬Nand"
 
 msgid "Dutch"
 msgstr "荷蘭文"
@@ -596,16 +596,16 @@ msgid "ERROR: Can't set up theme."
 msgstr "錯誤：無法設定佈景主題。"
 
 msgid "EmuNand Channels"
-msgstr ""
+msgstr "模擬Nand 頻道"
 
 msgid "Emulated Nand"
-msgstr ""
+msgstr "啟動模擬 Nand"
 
 msgid "English"
 msgstr "英文"
 
 msgid "Enter Path"
-msgstr ""
+msgstr "輸入路徑"
 
 msgid "Error"
 msgstr "錯誤"
@@ -652,7 +652,7 @@ msgid "Errors occured."
 msgstr "發生錯誤。"
 
 msgid "Everything"
-msgstr ""
+msgstr "所有"
 
 msgid "Exit"
 msgstr "退出"
@@ -676,7 +676,7 @@ msgid "Extracting files:"
 msgstr "提取檔案："
 
 msgid "Extracting nand files:"
-msgstr ""
+msgstr "提取 nand 檔案:"
 
 msgid "Failed"
 msgstr "失敗"
@@ -691,19 +691,19 @@ msgid "Failed to extract."
 msgstr "提取失敗。"
 
 msgid "Failed to initialize the USB storage device."
-msgstr ""
+msgstr "USB儲存裝置初始化失敗。"
 
 msgid "Failed to open partition"
 msgstr "開啟磁區失敗"
 
 msgid "Failed to read ticket."
-msgstr ""
+msgstr "讀取 ticket 失敗。"
 
 msgid "Failed to read tmd file."
-msgstr ""
+msgstr "讀取 tmd 檔失敗。"
 
 msgid "Failed to read wad header."
-msgstr ""
+msgstr "讀取 wad 檔資訊失敗。"
 
 msgid "Failed updating"
 msgstr "更新失敗"
@@ -721,7 +721,7 @@ msgid "File not found."
 msgstr "找不到該檔案。"
 
 msgid "File read/write error."
-msgstr ""
+msgstr "檔案讀取/寫入錯誤。"
 
 msgid "Files extracted successfully."
 msgstr "檔案提取成功。"
@@ -743,10 +743,10 @@ msgid "Font Scale Factor"
 msgstr "字型比例倍數"
 
 msgid "Force 16:9"
-msgstr ""
+msgstr "強制 16:9"
 
 msgid "Force 4:3"
-msgstr ""
+msgstr "強制 4:3"
 
 msgid "Force NTSC"
 msgstr "強制 NTSC"
@@ -763,6 +763,9 @@ msgstr "強制 PAL50"
 msgid "Force PAL60"
 msgstr "強制 PAL60"
 
+msgid "Force Titles from Disc"
+msgstr ""
+
 msgid "Format"
 msgstr "格式化"
 
@@ -857,7 +860,7 @@ msgid "Game/Install Partition"
 msgstr "遊戲/安裝磁區"
 
 msgid "GameTDB Path"
-msgstr ""
+msgstr "GameTDB 路徑"
 
 msgid "Gamename [GAMEID]"
 msgstr "遊戲名稱 [GAMEID]"
@@ -934,7 +937,7 @@ msgid "Install"
 msgstr "安裝"
 
 msgid "Install Canceled"
-msgstr ""
+msgstr "安裝已取消"
 
 msgid "Install Directories"
 msgstr "安裝目錄"
@@ -946,7 +949,7 @@ msgid "Install Partitions"
 msgstr "安裝磁區"
 
 msgid "Install WAD to EmuNand"
-msgstr ""
+msgstr "安裝 WAD 到模擬Nand"
 
 msgid "Install a game"
 msgstr "安裝遊戲"
@@ -955,16 +958,16 @@ msgid "Install finished"
 msgstr "已安裝完成"
 
 msgid "Installing content"
-msgstr ""
+msgstr "正在安裝程式主體"
 
 msgid "Installing game:"
 msgstr "正在安裝遊戲："
 
 msgid "Installing title..."
-msgstr ""
+msgstr "正在安裝 title..."
 
 msgid "Invalid wad file."
-msgstr ""
+msgstr "無效的 wad 檔。"
 
 msgid "Issue manager /"
 msgstr "問題管理者 /"
@@ -1000,7 +1003,7 @@ msgid "Korean"
 msgstr "韓文"
 
 msgid "Language Files"
-msgstr ""
+msgstr "語言檔"
 
 msgid "Language change:"
 msgstr "變更語言為："
@@ -1012,7 +1015,7 @@ msgid "Languagepath changed."
 msgstr "語言路徑已變更"
 
 msgid "Launching emulated nand channels only works on d2x cIOS! Change game IOS to a d2x cIOS first."
-msgstr ""
+msgstr "啟動模擬 nand 頻道僅能以d2x cIOS執行!首先變更遊戲IOS為d2x cIOS。 "
 
 msgid "Left"
 msgstr "左"
@@ -1037,7 +1040,7 @@ msgid "Load this DOL as alternate DOL?"
 msgstr "載入這個 DOL 作為替代 DOL？"
 
 msgid "Loader Mode"
-msgstr ""
+msgstr "Loader 模式"
 
 msgid "Loader Settings"
 msgstr "Loader設定"
@@ -1103,10 +1106,10 @@ msgid "Nand Chan. Emulation"
 msgstr ""
 
 msgid "Nand Channels"
-msgstr ""
+msgstr "Nand 頻道"
 
 msgid "Nand Emu Channel Path"
-msgstr ""
+msgstr "Nand 模擬器頻道路徑"
 
 msgid "Nand Emu Path"
 msgstr "Nand 模擬器路徑"
@@ -1121,7 +1124,7 @@ msgid "Nand Emulation only works on FAT/FAT32 partitions!"
 msgstr "Nand 模擬器僅能在 FAT/FAT32 格式磁區執行!"
 
 msgid "Nand Saves Emulation"
-msgstr ""
+msgstr "Nand 儲存模擬器"
 
 msgid "Neither"
 msgstr "皆不顯示"
@@ -1169,7 +1172,7 @@ msgid "No file missing!"
 msgstr "沒有檔案缺少！"
 
 msgid "No language files to update on your devices! Do you want to download new language files?"
-msgstr ""
+msgstr "你的儲存裝置沒有語言檔可供更新！是否要下載新的語言檔？"
 
 msgid "No new updates."
 msgstr "沒有可用更新。"
@@ -1187,7 +1190,7 @@ msgid "Normal"
 msgstr "一般"
 
 msgid "Not Initialized"
-msgstr ""
+msgstr "尚未初始化"
 
 msgid "Not a Wii Disc"
 msgstr "不是 Wii 的光碟"
@@ -1325,7 +1328,7 @@ msgid "Random Directory Music"
 msgstr "隨機選取音樂"
 
 msgid "Real Nand"
-msgstr ""
+msgstr "真實的Nand"
 
 msgid "Receiving file from:"
 msgstr "正在接收檔案來源:"
@@ -1412,7 +1415,7 @@ msgid "Screensaver"
 msgstr "螢幕保護"
 
 msgid "Search Mode"
-msgstr ""
+msgstr "搜尋模式"
 
 msgid "Select"
 msgstr "選取"
@@ -1430,10 +1433,10 @@ msgid "Select game categories"
 msgstr "選擇遊戲類別"
 
 msgid "Select loader mode"
-msgstr ""
+msgstr "選擇 loader 模式"
 
 msgid "Select titles sources."
-msgstr ""
+msgstr "選擇 titles 的來源。"
 
 msgid "Sept"
 msgstr "九月"
@@ -1532,7 +1535,7 @@ msgid "Successfully installed:"
 msgstr "成功安裝："
 
 msgid "Switching to channel list mode."
-msgstr ""
+msgstr "正在切換頻道清單模式。"
 
 msgid "Sync FAT32 FS Info"
 msgstr "同步FAT32檔案系統資訊"
@@ -1556,13 +1559,13 @@ msgid "The entered directory does not exist. Would you like to create it?"
 msgstr "所輸入的目錄不存在。是否要建立一個目錄嗎？"
 
 msgid "The files will be extracted to your emu nand path. Attention: All existing files will be overwritten."
-msgstr ""
+msgstr "檔案將被提取到模擬 nand 路徑內。請注意：所有存在的檔案將被覆蓋。"
 
 msgid "The save game will be extracted to your emu nand path."
-msgstr "遊戲存檔將被提取到你的模擬 nand 路徑。"
+msgstr "遊戲存檔將被提取到模擬 nand 路徑內。"
 
 msgid "The save games will be extracted to your emu nand path. Attention: All existing saves will be overwritten."
-msgstr "遊戲存檔將被提取到你的模擬 nand 路徑。注意：所有存在的存檔將被覆蓋。"
+msgstr "遊戲存檔將被提取到模擬 nand 路徑內。請注意：所有存在的存檔將被覆蓋。"
 
 msgid "The wad file was installed"
 msgstr "wad檔已安裝"
@@ -1599,7 +1602,7 @@ msgid "Title Launcher"
 msgstr "系統頻道"
 
 msgid "Titles from GameTDB"
-msgstr ""
+msgstr "從GameTDB顯示遊戲名稱"
 
 msgid "Tooltips"
 msgstr "提示信息"
@@ -1608,7 +1611,7 @@ msgid "Transfer failed"
 msgstr "傳輸失敗"
 
 msgid "USB Device not found."
-msgstr ""
+msgstr "找不到 USB 裝置"
 
 msgid "USB Loader GX is protected"
 msgstr "USB Loader GX 被上鎖保護"
@@ -1620,7 +1623,7 @@ msgid "USB Port changing is only supported on Hermes cIOS."
 msgstr "USB連接埠變更僅Hermes cIOS支援。"
 
 msgid "Uninstall"
-msgstr ""
+msgstr "移除"
 
 msgid "Uninstall Game"
 msgstr "移除遊戲"
@@ -1677,7 +1680,7 @@ msgid "Use System Font"
 msgstr "使用系統字型"
 
 msgid "Use global"
-msgstr "使用整體設定"
+msgstr "預設"
 
 msgid "VBI (Default)"
 msgstr "VBI (預設)"
@@ -1696,10 +1699,10 @@ msgid "Video Mode"
 msgstr "視訊格式"
 
 msgid "Virtual Pointer Speed"
-msgstr ""
+msgstr "虛擬指針的速度"
 
 msgid "WAD Installation"
-msgstr ""
+msgstr "WAD 安裝"
 
 msgid "WDM Files Path"
 msgstr "WDM檔案路徑"
@@ -1717,16 +1720,16 @@ msgid "Warning:"
 msgstr "警告："
 
 msgid "What do you want to do?"
-msgstr ""
+msgstr "要做什麼？"
 
 msgid "What do you want to update?"
-msgstr "更新何者？"
+msgstr "要更新什麼？"
 
 msgid "What should be deleted for this game title:"
 msgstr "這遊戲title應刪除什麼："
 
 msgid "What to extract from NAND?"
-msgstr ""
+msgstr "從 NAND 提取什麼？"
 
 msgid "WiFi Features"
 msgstr "WiFi功能設定"
@@ -1738,7 +1741,7 @@ msgid "Widescreen Fix"
 msgstr "寬螢幕校正"
 
 msgid "Wii Games"
-msgstr ""
+msgstr "Wii 遊戲"
 
 msgid "Wii Menu"
 msgstr "Wii系統選單"
@@ -1747,10 +1750,10 @@ msgid "Wii Settings"
 msgstr "Wii主機設定"
 
 msgid "WiiTDB.xml"
-msgstr ""
+msgstr "WiiTDB.xml"
 
 msgid "WiiTDB.xml is up to date."
-msgstr ""
+msgstr "WiiTDB.xml保持最新。"
 
 msgid "Wiilight"
 msgstr "光碟機藍光"
@@ -1769,7 +1772,7 @@ msgstr "Wiird 偵錯器"
 
 #, c-format
 msgid "Write error on file: %s"
-msgstr ""
+msgstr "檔案寫入失敗: %s"
 
 msgid "Writing GXGameCategories.xml"
 msgstr "正在寫入 GXGameCategories.xml"
@@ -1784,7 +1787,7 @@ msgid "You are trying to select a FAT32/NTFS/EXT partition with cIOS 249 Rev < 1
 msgstr "你嘗試用高於 cIOS 249 版本18去選取 FAT32/NTFS/EXT 磁區。這格式不支援。繼續請自行承擔風險。"
 
 msgid "You can select or format a partition or use the channel loader mode."
-msgstr ""
+msgstr "你可選擇或格式化磁區或使用頻道 loader 模式。"
 
 msgid "You cannot delete this category."
 msgstr "無法刪除此類別。"
@@ -1808,7 +1811,7 @@ msgid "for FAT/NTFS support"
 msgstr "FAT/NTFS 格式支援"
 
 msgid "for GameTDB and hosting covers / disc images"
-msgstr ""
+msgstr "設置 GameTDB 與封面 / 光碟圖片檔案存放空間"
 
 msgid "for Ocarina"
 msgstr "的 金手指"
diff --git a/Languages/thai.lang b/Languages/thai.lang
index 2bb66e2a..627cc90f 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: 2012-02-09 22:23+0100\n"
+"POT-Creation-Date: 2012-02-29 20:42+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: Nitro_subzero \n"
 "Language-Team: Nitro_subzero\n"
@@ -763,6 +763,9 @@ msgstr ""
 msgid "Force PAL60"
 msgstr ""
 
+msgid "Force Titles from Disc"
+msgstr ""
+
 msgid "Format"
 msgstr "ฟอร์แมต"
 
diff --git a/Languages/turkish.lang b/Languages/turkish.lang
index 79e20af1..f34b05a7 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: 2012-02-09 22:23+0100\n"
+"POT-Creation-Date: 2012-02-29 20:42+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: omercigingelini\n"
 "Language-Team: omercigingelini\n"
@@ -763,6 +763,9 @@ msgstr ""
 msgid "Force PAL60"
 msgstr ""
 
+msgid "Force Titles from Disc"
+msgstr ""
+
 msgid "Format"
 msgstr "Biçimlendir"
 
diff --git a/Makefile b/Makefile
index c0563369..ac9f539e 100644
--- a/Makefile
+++ b/Makefile
@@ -75,8 +75,8 @@ endif
 #---------------------------------------------------------------------------------
 # any extra libraries we wish to link with the project
 #---------------------------------------------------------------------------------
-LIBS :=  -lpngu -lpng -lgd -lm -lz -lwiiuse -lbte -lasnd -logc -lfreetype -lvorbisidec \
-		-lmad -ljpeg -lzip -lcustomfat -lcustomntfs -lcustomext2fs
+LIBS := -lcustomfat -lcustomntfs -lcustomext2fs -lvorbisidec -lmad -lfreetype \
+		-lgd -ljpeg -lpng -lzip -lm -lz -lwiiuse -lbte -lasnd -logc 
 #---------------------------------------------------------------------------------
 # list of directories containing libraries, this must be the top level containing
 # include and lib
diff --git a/gui.pnproj b/gui.pnproj
index 9e54f5c7..6d0bb62a 100644
--- a/gui.pnproj
+++ b/gui.pnproj
@@ -1 +1 @@
-<Project name="gui"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="source" path="source\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="banner" path="banner\"><File path="OpeningBNR.cpp"></File><File path="OpeningBNR.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="BoxCover" path="BoxCover\"><File path="BoxCover.cpp"></File><File path="BoxCover.hpp"></File><File path="BoxMesh.cpp"></File><File path="BoxMesh.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="Channels" path="Channels\"><File path="channels.cpp"></File><File path="channels.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="cheats" path="cheats\"><File path="cheatmenu.cpp"></File><File path="cheatmenu.h"></File><File path="gct.cpp"></File><File path="gct.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="Controls" path="Controls\"><File path="DeviceHandler.cpp"></File><File path="DeviceHandler.hpp"></File><File path="PartitionHandle.cpp"></File><File path="PartitionHandle.h"></File><File path="WiiPointer.cpp"></File><File path="WiiPointer.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="FileOperations" path="FileOperations\"><File path="DirList.cpp"></File><File path="DirList.h"></File><File path="File.cpp"></File><File path="File.hpp"></File><File path="fileops.cpp"></File><File path="fileops.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="GameCube" path="GameCube\"><File path="GCGames.cpp"></File><File path="GCGames.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="GUI" path="GUI\"><File path="gui.h"></File><File path="gui_box.cpp"></File><File path="gui_box.hpp"></File><File path="gui_button.cpp"></File><File path="gui_checkbox.cpp"></File><File path="gui_checkbox.hpp"></File><File path="gui_checkboxbrowser.cpp"></File><File path="gui_checkboxbrowser.hpp"></File><File path="gui_checksign.cpp"></File><File path="gui_checksign.hpp"></File><File path="gui_circle.cpp"></File><File path="gui_circle.hpp"></File><File path="gui_cross.cpp"></File><File path="gui_cross.hpp"></File><File path="gui_diskcover.cpp"></File><File path="gui_diskcover.h"></File><File path="gui_element.cpp"></File><File path="gui_filebrowser.cpp"></File><File path="gui_filebrowser.h"></File><File path="gui_gamebrowser.h"></File><File path="gui_gamecarousel.cpp"></File><File path="gui_gamecarousel.h"></File><File path="gui_gamegrid.cpp"></File><File path="gui_gamegrid.h"></File><File path="gui_gamelist.cpp"></File><File path="gui_gamelist.h"></File><File path="gui_image.cpp"></File><File path="gui_imagedata.cpp"></File><File path="gui_imagedata.h"></File><File path="gui_image_async.cpp"></File><File path="gui_image_async.h"></File><File path="gui_keyboard.cpp"></File><File path="gui_numpad.cpp"></File><File path="gui_optionbrowser.cpp"></File><File path="gui_optionbrowser.h"></File><File path="gui_scrollbar.cpp"></File><File path="gui_scrollbar.hpp"></File><File path="gui_searchbar.cpp"></File><File path="gui_searchbar.h"></File><File path="gui_text.cpp"></File><File path="gui_tooltip.cpp"></File><File path="gui_trigger.cpp"></File><File path="gui_window.cpp"></File><File path="LoadCoverImage.cpp"></File><File path="LoadCoverImage.h"></File><File path="OptionList.cpp"></File><File path="OptionList.hpp"></File><File path="sigslot.h"></File><File path="Text.cpp"></File><File path="Text.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="homebrewboot" path="homebrewboot\"><File path="BootHomebrew.cpp"></File><File path="BootHomebrew.h"></File><File path="HomebrewBrowser.cpp"></File><File path="HomebrewBrowser.hpp"></File><File path="HomebrewXML.cpp"></File><File path="HomebrewXML.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="ImageOperations" path="ImageOperations\"><File path="TextureConverter.c"></File><File path="TextureConverter.h"></File><File path="TplImage.cpp"></File><File path="TplImage.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="language" path="language\"><File path="gettext.c"></File><File path="gettext.h"></File><File path="UpdateLanguage.cpp"></File><File path="UpdateLanguage.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libs" path="libs\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libext2fs" path="libext2fs\"><File path="ext2_frag.h"></File><File path="libcustomext2fs.a"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libfat" path="libfat\"><File path="fatfile_frag.h"></File><File path="libcustomfat.a"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libntfs" path="libntfs\"><File path="libcustomntfs.a"></File><File path="ntfsfile_frag.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libwbfs" path="libwbfs\"><File path="libwbfs.c"></File><File path="libwbfs.h"></File><File path="libwbfs_os.h"></File><File path="rijndael.c"></File><File path="wiidisc.c"></File><File path="wiidisc.h"></File></MagicFolder></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="memory" path="memory\"><File path="mem2.cpp"></File><File path="mem2.h"></File><File path="mem2alloc.cpp"></File><File path="mem2alloc.hpp"></File><File path="memory.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="menu" path="menu\"><File path="GameBrowseMenu.cpp"></File><File path="GameBrowseMenu.hpp"></File><File path="menus.h"></File><File path="menu_install.cpp"></File><File path="menu_partition_selection.cpp"></File><File path="WDMMenu.cpp"></File><File path="WDMMenu.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="mload" path="mload\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="modules" path="modules\"><File path="dip_plugin_249.c"></File><File path="dip_plugin_249.h"></File><File path="ehcmodule_5.c"></File><File path="ehcmodule_5.h"></File><File path="odip_frag.c"></File><File path="odip_frag.h"></File></MagicFolder><File path="mload.c"></File><File path="mload.h"></File><File path="mload_modules.c"></File><File path="mload_modules.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="network" path="network\"><File path="dns.c"></File><File path="dns.h"></File><File path="FileDownloader.cpp"></File><File path="FileDownloader.h"></File><File path="HTML_Stream.cpp"></File><File path="HTML_Stream.h"></File><File path="http.c"></File><File path="http.h"></File><File path="ImageDownloader.cpp"></File><File path="ImageDownloader.h"></File><File path="networkops.cpp"></File><File path="networkops.h"></File><File path="update.cpp"></File><File path="update.h"></File><File path="URL_List.cpp"></File><File path="URL_List.h"></File><File path="Wiinnertag.cpp"></File><File path="Wiinnertag.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="patches" path="patches\"><File path="bca.c"></File><File path="bca.h"></File><File path="codehandler.c"></File><File path="codehandler.h"></File><File path="codehandleronly.h"></File><File path="codehandlerslota.c"></File><File path="codehandlerslota.h"></File><File path="defaultgameconfig.h"></File><File path="dolpatcher.c"></File><File path="dolpatcher.h"></File><File path="dvd_broadway.c"></File><File path="dvd_broadway.h"></File><File path="fwrite_patch.h"></File><File path="gamepatches.c"></File><File path="gamepatches.h"></File><File path="geckomenu.h"></File><File path="kenobiwii.h"></File><File path="multidol.c"></File><File path="multidol.h"></File><File path="patchcode.c"></File><File path="patchcode.h"></File><File path="patchhook.S"></File><File path="ppc.h"></File><File path="wip.cpp"></File><File path="wip.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="prompts" path="prompts\"><File path="CategoryPrompt.cpp"></File><File path="CategoryPrompt.hpp"></File><File path="CategorySelectPrompt.cpp"></File><File path="CategorySelectPrompt.hpp"></File><File path="CategorySwitchPrompt.cpp"></File><File path="CategorySwitchPrompt.hpp"></File><File path="CheckboxPrompt.cpp"></File><File path="CheckboxPrompt.hpp"></File><File path="DiscBrowser.cpp"></File><File path="DiscBrowser.h"></File><File path="filebrowser.cpp"></File><File path="filebrowser.h"></File><File path="gameinfo.cpp"></File><File path="gameinfo.h"></File><File path="GameWindow.cpp"></File><File path="GameWindow.hpp"></File><File path="HomebrewPrompt.cpp"></File><File path="HomebrewPrompt.hpp"></File><File path="ProgressWindow.cpp"></File><File path="ProgressWindow.h"></File><File path="PromptWindow.cpp"></File><File path="PromptWindow.hpp"></File><File path="PromptWindows.cpp"></File><File path="PromptWindows.h"></File><File path="TitleBrowser.cpp"></File><File path="TitleBrowser.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="settings" path="settings\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="menus" path="menus\"><File path="CustomPathsSM.cpp"></File><File path="CustomPathsSM.hpp"></File><File path="FeatureSettingsMenu.cpp"></File><File path="FeatureSettingsMenu.hpp"></File><File path="FlyingButtonsMenu.cpp"></File><File path="FlyingButtonsMenu.hpp"></File><File path="GameLoadSM.cpp"></File><File path="GameLoadSM.hpp"></File><File path="GameSettingsMenu.cpp"></File><File path="GameSettingsMenu.hpp"></File><File path="GlobalSettings.cpp"></File><File path="GlobalSettings.hpp"></File><File path="GUISettingsMenu.cpp"></File><File path="GUISettingsMenu.hpp"></File><File path="HardDriveSM.cpp"></File><File path="HardDriveSM.hpp"></File><File path="LoaderSettings.cpp"></File><File path="LoaderSettings.hpp"></File><File path="ParentalControlSM.cpp"></File><File path="ParentalControlSM.hpp"></File><File path="SettingsMenu.cpp"></File><File path="SettingsMenu.hpp"></File><File path="SoundSettingsMenu.cpp"></File><File path="SoundSettingsMenu.hpp"></File><File path="UninstallSM.cpp"></File><File path="UninstallSM.hpp"></File></MagicFolder><File path="CCategoryList.cpp"></File><File path="CCategoryList.hpp"></File><File path="CGameCategories.cpp"></File><File path="CGameCategories.hpp"></File><File path="CGameSettings.cpp"></File><File path="CGameSettings.h"></File><File path="CGameStatistics.cpp"></File><File path="CGameStatistics.h"></File><File path="CSettings.cpp"></File><File path="CSettings.h"></File><File path="GameTitles.cpp"></File><File path="GameTitles.h"></File><File path="newtitles.cpp"></File><File path="newtitles.h"></File><File path="SettingsEnums.h"></File><File path="SettingsPrompts.cpp"></File><File path="SettingsPrompts.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="SoundOperations" path="SoundOperations\"><File path="AifDecoder.cpp"></File><File path="AifDecoder.hpp"></File><File path="BNSDecoder.cpp"></File><File path="BNSDecoder.hpp"></File><File path="BufferCircle.cpp"></File><File path="BufferCircle.hpp"></File><File path="gui_bgm.cpp"></File><File path="gui_bgm.h"></File><File path="gui_sound.cpp"></File><File path="gui_sound.h"></File><File path="Mp3Decoder.cpp"></File><File path="Mp3Decoder.hpp"></File><File path="OggDecoder.cpp"></File><File path="OggDecoder.hpp"></File><File path="SoundDecoder.cpp"></File><File path="SoundDecoder.hpp"></File><File path="SoundHandler.cpp"></File><File path="SoundHandler.hpp"></File><File path="WavDecoder.cpp"></File><File path="WavDecoder.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="system" path="system\"><File path="IosLoader.cpp"></File><File path="IosLoader.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="themes" path="themes\"><File path="CTheme.cpp"></File><File path="CTheme.h"></File><File path="filelist.h"></File><File path="gettheme.c"></File><File path="gettheme.h"></File><File path="Resources.cpp"></File><File path="Resources.h"></File><File path="ThemeDownloader.cpp"></File><File path="ThemeDownloader.h"></File><File path="ThemeMenu.cpp"></File><File path="ThemeMenu.h"></File><File path="Theme_List.cpp"></File><File path="Theme_List.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="usbloader" path="usbloader\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="wbfs" path="wbfs\"><File path="wbfs_base.cpp"></File><File path="wbfs_base.h"></File><File path="wbfs_ext.h"></File><File path="wbfs_fat.cpp"></File><File path="wbfs_fat.h"></File><File path="wbfs_ntfs.h"></File><File path="wbfs_rw.c"></File><File path="wbfs_rw.h"></File><File path="wbfs_wbfs.cpp"></File><File path="wbfs_wbfs.h"></File></MagicFolder><File path="alternatedol.c"></File><File path="alternatedol.h"></File><File path="AlternateDOLOffsets.cpp"></File><File path="AlternateDOLOffsets.h"></File><File path="apploader.c"></File><File path="apploader.h"></File><File path="disc.c"></File><File path="disc.h"></File><File path="frag.c"></File><File path="frag.h"></File><File path="fstfile.c"></File><File path="fstfile.h"></File><File path="GameBooter.cpp"></File><File path="GameBooter.hpp"></File><File path="GameList.cpp"></File><File path="GameList.h"></File><File path="GetMissingGameFiles.cpp"></File><File path="GetMissingGameFiles.hpp"></File><File path="MountGamePartition.cpp"></File><File path="MountGamePartition.h"></File><File path="NandEmu.cpp"></File><File path="NandEmu.h"></File><File path="playlog.c"></File><File path="playlog.h"></File><File path="SavePath.cpp"></File><File path="SavePath.h"></File><File path="sdhc.c"></File><File path="sdhc.h"></File><File path="splits.c"></File><File path="splits.h"></File><File path="usbstorage2.c"></File><File path="usbstorage2.h"></File><File path="wbfs.cpp"></File><File path="wbfs.h"></File><File path="WDMFile.cpp"></File><File path="WDMFile.hpp"></File><File path="wdvd.c"></File><File path="wdvd.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="utils" path="utils\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="minizip" path="minizip\"><File path="miniunz.c"></File><File path="miniunz.h"></File></MagicFolder><File path="Callback.hpp"></File><File path="encrypt.c"></File><File path="encrypt.h"></File><File path="lz77.c"></File><File path="lz77.h"></File><File path="MD5.c"></File><File path="MD5.h"></File><File path="PasswordCheck.cpp"></File><File path="PasswordCheck.h"></File><File path="ResourceManager.cpp"></File><File path="ResourceManager.h"></File><File path="rockout.cpp"></File><File path="rockout.h"></File><File path="ShowError.cpp"></File><File path="ShowError.h"></File><File path="StringTools.c"></File><File path="StringTools.h"></File><File path="ThreadedTask.cpp"></File><File path="ThreadedTask.hpp"></File><File path="timer.c"></File><File path="timer.h"></File><File path="tools.h"></File><File path="uncompress.c"></File><File path="uncompress.h"></File><File path="wifi_gecko.c"></File><File path="wifi_gecko.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="wad" path="wad\"><File path="nandtitle.cpp"></File><File path="nandtitle.h"></File><File path="wad.cpp"></File><File path="wad.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="xml" path="xml\"><File path="GameTDB.cpp"></File><File path="GameTDB.hpp"></File><File path="tinyxml.cpp"></File><File path="tinyxml.h"></File><File path="tinyxmlerror.cpp"></File><File path="tinyxmlparser.cpp"></File></MagicFolder><File path="audio.cpp"></File><File path="audio.h"></File><File path="FreeTypeGX.cpp"></File><File path="FreeTypeGX.h"></File><File path="gecko.c"></File><File path="gecko.h"></File><File path="input.cpp"></File><File path="input.h"></File><File path="lstub.cpp"></File><File path="lstub.h"></File><File path="main.cpp"></File><File path="main.h"></File><File path="menu.cpp"></File><File path="menu.h"></File><File path="StartUpProcess.cpp"></File><File path="StartUpProcess.h"></File><File path="svnrev.c"></File><File path="svnrev.h"></File><File path="sys.cpp"></File><File path="sys.h"></File><File path="video.cpp"></File><File path="video.h"></File><File path="wpad.c"></File><File path="wpad.h"></File><File path="wstring.cpp"></File><File path="wstring.hpp"></File><File path="ZipFile.cpp"></File><File path="ZipFile.h"></File></MagicFolder><File path="Makefile"></File></Project>
\ No newline at end of file
+<Project name="gui"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="source" path="source\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="banner" path="banner\"><File path="OpeningBNR.cpp"></File><File path="OpeningBNR.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="BoxCover" path="BoxCover\"><File path="BoxCover.cpp"></File><File path="BoxCover.hpp"></File><File path="BoxMesh.cpp"></File><File path="BoxMesh.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="Channels" path="Channels\"><File path="channels.cpp"></File><File path="channels.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="cheats" path="cheats\"><File path="cheatmenu.cpp"></File><File path="cheatmenu.h"></File><File path="gct.cpp"></File><File path="gct.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="Controls" path="Controls\"><File path="DeviceHandler.cpp"></File><File path="DeviceHandler.hpp"></File><File path="PartitionHandle.cpp"></File><File path="PartitionHandle.h"></File><File path="WiiPointer.cpp"></File><File path="WiiPointer.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="FileOperations" path="FileOperations\"><File path="DirList.cpp"></File><File path="DirList.h"></File><File path="File.cpp"></File><File path="File.hpp"></File><File path="fileops.cpp"></File><File path="fileops.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="GameCube" path="GameCube\"><File path="GCGames.cpp"></File><File path="GCGames.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="GUI" path="GUI\"><File path="gui.h"></File><File path="gui_box.cpp"></File><File path="gui_box.hpp"></File><File path="gui_button.cpp"></File><File path="gui_checkbox.cpp"></File><File path="gui_checkbox.hpp"></File><File path="gui_checkboxbrowser.cpp"></File><File path="gui_checkboxbrowser.hpp"></File><File path="gui_checksign.cpp"></File><File path="gui_checksign.hpp"></File><File path="gui_circle.cpp"></File><File path="gui_circle.hpp"></File><File path="gui_cross.cpp"></File><File path="gui_cross.hpp"></File><File path="gui_diskcover.cpp"></File><File path="gui_diskcover.h"></File><File path="gui_element.cpp"></File><File path="gui_filebrowser.cpp"></File><File path="gui_filebrowser.h"></File><File path="gui_gamebrowser.h"></File><File path="gui_gamecarousel.cpp"></File><File path="gui_gamecarousel.h"></File><File path="gui_gamegrid.cpp"></File><File path="gui_gamegrid.h"></File><File path="gui_gamelist.cpp"></File><File path="gui_gamelist.h"></File><File path="gui_image.cpp"></File><File path="gui_imagedata.cpp"></File><File path="gui_imagedata.h"></File><File path="gui_image_async.cpp"></File><File path="gui_image_async.h"></File><File path="gui_keyboard.cpp"></File><File path="gui_numpad.cpp"></File><File path="gui_optionbrowser.cpp"></File><File path="gui_optionbrowser.h"></File><File path="gui_scrollbar.cpp"></File><File path="gui_scrollbar.hpp"></File><File path="gui_searchbar.cpp"></File><File path="gui_searchbar.h"></File><File path="gui_text.cpp"></File><File path="gui_tooltip.cpp"></File><File path="gui_trigger.cpp"></File><File path="gui_window.cpp"></File><File path="LoadCoverImage.cpp"></File><File path="LoadCoverImage.h"></File><File path="OptionList.cpp"></File><File path="OptionList.hpp"></File><File path="sigslot.h"></File><File path="Text.cpp"></File><File path="Text.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="homebrewboot" path="homebrewboot\"><File path="BootHomebrew.cpp"></File><File path="BootHomebrew.h"></File><File path="HomebrewBrowser.cpp"></File><File path="HomebrewBrowser.hpp"></File><File path="HomebrewXML.cpp"></File><File path="HomebrewXML.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="ImageOperations" path="ImageOperations\"><File path="ImageWrite.c"></File><File path="ImageWrite.h"></File><File path="TextureConverter.c"></File><File path="TextureConverter.h"></File><File path="TplImage.cpp"></File><File path="TplImage.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="language" path="language\"><File path="gettext.c"></File><File path="gettext.h"></File><File path="UpdateLanguage.cpp"></File><File path="UpdateLanguage.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libs" path="libs\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libext2fs" path="libext2fs\"><File path="ext2_frag.h"></File><File path="libcustomext2fs.a"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libfat" path="libfat\"><File path="fatfile_frag.h"></File><File path="libcustomfat.a"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libntfs" path="libntfs\"><File path="libcustomntfs.a"></File><File path="ntfsfile_frag.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="libwbfs" path="libwbfs\"><File path="libwbfs.c"></File><File path="libwbfs.h"></File><File path="libwbfs_os.h"></File><File path="rijndael.c"></File><File path="wiidisc.c"></File><File path="wiidisc.h"></File></MagicFolder></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="memory" path="memory\"><File path="mem2.cpp"></File><File path="mem2.h"></File><File path="mem2alloc.cpp"></File><File path="mem2alloc.hpp"></File><File path="memory.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="menu" path="menu\"><File path="GameBrowseMenu.cpp"></File><File path="GameBrowseMenu.hpp"></File><File path="menus.h"></File><File path="menu_install.cpp"></File><File path="menu_partition_selection.cpp"></File><File path="WDMMenu.cpp"></File><File path="WDMMenu.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="mload" path="mload\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="modules" path="modules\"><File path="dip_plugin_249.c"></File><File path="dip_plugin_249.h"></File><File path="ehcmodule_5.c"></File><File path="ehcmodule_5.h"></File><File path="odip_frag.c"></File><File path="odip_frag.h"></File></MagicFolder><File path="mload.c"></File><File path="mload.h"></File><File path="mload_modules.c"></File><File path="mload_modules.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="network" path="network\"><File path="dns.c"></File><File path="dns.h"></File><File path="FileDownloader.cpp"></File><File path="FileDownloader.h"></File><File path="HTML_Stream.cpp"></File><File path="HTML_Stream.h"></File><File path="http.c"></File><File path="http.h"></File><File path="ImageDownloader.cpp"></File><File path="ImageDownloader.h"></File><File path="networkops.cpp"></File><File path="networkops.h"></File><File path="update.cpp"></File><File path="update.h"></File><File path="URL_List.cpp"></File><File path="URL_List.h"></File><File path="Wiinnertag.cpp"></File><File path="Wiinnertag.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="patches" path="patches\"><File path="bca.c"></File><File path="bca.h"></File><File path="codehandler.c"></File><File path="codehandler.h"></File><File path="codehandleronly.h"></File><File path="codehandlerslota.c"></File><File path="codehandlerslota.h"></File><File path="defaultgameconfig.h"></File><File path="dolpatcher.c"></File><File path="dolpatcher.h"></File><File path="dvd_broadway.c"></File><File path="dvd_broadway.h"></File><File path="fwrite_patch.h"></File><File path="gamepatches.c"></File><File path="gamepatches.h"></File><File path="geckomenu.h"></File><File path="kenobiwii.h"></File><File path="multidol.c"></File><File path="multidol.h"></File><File path="patchcode.c"></File><File path="patchcode.h"></File><File path="patchhook.S"></File><File path="ppc.h"></File><File path="wip.cpp"></File><File path="wip.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="prompts" path="prompts\"><File path="CategoryPrompt.cpp"></File><File path="CategoryPrompt.hpp"></File><File path="CategorySelectPrompt.cpp"></File><File path="CategorySelectPrompt.hpp"></File><File path="CategorySwitchPrompt.cpp"></File><File path="CategorySwitchPrompt.hpp"></File><File path="CheckboxPrompt.cpp"></File><File path="CheckboxPrompt.hpp"></File><File path="DiscBrowser.cpp"></File><File path="DiscBrowser.h"></File><File path="filebrowser.cpp"></File><File path="filebrowser.h"></File><File path="gameinfo.cpp"></File><File path="gameinfo.h"></File><File path="GameWindow.cpp"></File><File path="GameWindow.hpp"></File><File path="HomebrewPrompt.cpp"></File><File path="HomebrewPrompt.hpp"></File><File path="ProgressWindow.cpp"></File><File path="ProgressWindow.h"></File><File path="PromptWindow.cpp"></File><File path="PromptWindow.hpp"></File><File path="PromptWindows.cpp"></File><File path="PromptWindows.h"></File><File path="TitleBrowser.cpp"></File><File path="TitleBrowser.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="settings" path="settings\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="menus" path="menus\"><File path="CustomPathsSM.cpp"></File><File path="CustomPathsSM.hpp"></File><File path="FeatureSettingsMenu.cpp"></File><File path="FeatureSettingsMenu.hpp"></File><File path="FlyingButtonsMenu.cpp"></File><File path="FlyingButtonsMenu.hpp"></File><File path="GameLoadSM.cpp"></File><File path="GameLoadSM.hpp"></File><File path="GameSettingsMenu.cpp"></File><File path="GameSettingsMenu.hpp"></File><File path="GlobalSettings.cpp"></File><File path="GlobalSettings.hpp"></File><File path="GUISettingsMenu.cpp"></File><File path="GUISettingsMenu.hpp"></File><File path="HardDriveSM.cpp"></File><File path="HardDriveSM.hpp"></File><File path="LoaderSettings.cpp"></File><File path="LoaderSettings.hpp"></File><File path="ParentalControlSM.cpp"></File><File path="ParentalControlSM.hpp"></File><File path="SettingsMenu.cpp"></File><File path="SettingsMenu.hpp"></File><File path="SoundSettingsMenu.cpp"></File><File path="SoundSettingsMenu.hpp"></File><File path="UninstallSM.cpp"></File><File path="UninstallSM.hpp"></File></MagicFolder><File path="CCategoryList.cpp"></File><File path="CCategoryList.hpp"></File><File path="CGameCategories.cpp"></File><File path="CGameCategories.hpp"></File><File path="CGameSettings.cpp"></File><File path="CGameSettings.h"></File><File path="CGameStatistics.cpp"></File><File path="CGameStatistics.h"></File><File path="CSettings.cpp"></File><File path="CSettings.h"></File><File path="GameTitles.cpp"></File><File path="GameTitles.h"></File><File path="newtitles.cpp"></File><File path="newtitles.h"></File><File path="SettingsEnums.h"></File><File path="SettingsPrompts.cpp"></File><File path="SettingsPrompts.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="SoundOperations" path="SoundOperations\"><File path="AifDecoder.cpp"></File><File path="AifDecoder.hpp"></File><File path="BNSDecoder.cpp"></File><File path="BNSDecoder.hpp"></File><File path="BufferCircle.cpp"></File><File path="BufferCircle.hpp"></File><File path="gui_bgm.cpp"></File><File path="gui_bgm.h"></File><File path="gui_sound.cpp"></File><File path="gui_sound.h"></File><File path="Mp3Decoder.cpp"></File><File path="Mp3Decoder.hpp"></File><File path="OggDecoder.cpp"></File><File path="OggDecoder.hpp"></File><File path="SoundDecoder.cpp"></File><File path="SoundDecoder.hpp"></File><File path="SoundHandler.cpp"></File><File path="SoundHandler.hpp"></File><File path="WavDecoder.cpp"></File><File path="WavDecoder.hpp"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="system" path="system\"><File path="IosLoader.cpp"></File><File path="IosLoader.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="themes" path="themes\"><File path="CTheme.cpp"></File><File path="CTheme.h"></File><File path="filelist.h"></File><File path="gettheme.c"></File><File path="gettheme.h"></File><File path="Resources.cpp"></File><File path="Resources.h"></File><File path="ThemeDownloader.cpp"></File><File path="ThemeDownloader.h"></File><File path="ThemeMenu.cpp"></File><File path="ThemeMenu.h"></File><File path="Theme_List.cpp"></File><File path="Theme_List.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="usbloader" path="usbloader\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="wbfs" path="wbfs\"><File path="wbfs_base.cpp"></File><File path="wbfs_base.h"></File><File path="wbfs_ext.h"></File><File path="wbfs_fat.cpp"></File><File path="wbfs_fat.h"></File><File path="wbfs_ntfs.h"></File><File path="wbfs_rw.c"></File><File path="wbfs_rw.h"></File><File path="wbfs_wbfs.cpp"></File><File path="wbfs_wbfs.h"></File></MagicFolder><File path="alternatedol.c"></File><File path="alternatedol.h"></File><File path="AlternateDOLOffsets.cpp"></File><File path="AlternateDOLOffsets.h"></File><File path="apploader.c"></File><File path="apploader.h"></File><File path="disc.c"></File><File path="disc.h"></File><File path="frag.c"></File><File path="frag.h"></File><File path="fstfile.c"></File><File path="fstfile.h"></File><File path="GameBooter.cpp"></File><File path="GameBooter.hpp"></File><File path="GameList.cpp"></File><File path="GameList.h"></File><File path="GetMissingGameFiles.cpp"></File><File path="GetMissingGameFiles.hpp"></File><File path="MountGamePartition.cpp"></File><File path="MountGamePartition.h"></File><File path="NandEmu.cpp"></File><File path="NandEmu.h"></File><File path="playlog.c"></File><File path="playlog.h"></File><File path="SavePath.cpp"></File><File path="SavePath.h"></File><File path="sdhc.c"></File><File path="sdhc.h"></File><File path="splits.c"></File><File path="splits.h"></File><File path="usbstorage2.c"></File><File path="usbstorage2.h"></File><File path="wbfs.cpp"></File><File path="wbfs.h"></File><File path="WDMFile.cpp"></File><File path="WDMFile.hpp"></File><File path="wdvd.c"></File><File path="wdvd.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="utils" path="utils\"><MagicFolder excludeFolders="CVS;.svn" filter="*" name="minizip" path="minizip\"><File path="miniunz.c"></File><File path="miniunz.h"></File></MagicFolder><File path="Callback.hpp"></File><File path="encrypt.c"></File><File path="encrypt.h"></File><File path="lz77.c"></File><File path="lz77.h"></File><File path="MD5.c"></File><File path="MD5.h"></File><File path="PasswordCheck.cpp"></File><File path="PasswordCheck.h"></File><File path="ResourceManager.cpp"></File><File path="ResourceManager.h"></File><File path="rockout.cpp"></File><File path="rockout.h"></File><File path="ShowError.cpp"></File><File path="ShowError.h"></File><File path="StringTools.c"></File><File path="StringTools.h"></File><File path="ThreadedTask.cpp"></File><File path="ThreadedTask.hpp"></File><File path="timer.c"></File><File path="timer.h"></File><File path="tools.h"></File><File path="uncompress.c"></File><File path="uncompress.h"></File><File path="wifi_gecko.c"></File><File path="wifi_gecko.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="wad" path="wad\"><File path="nandtitle.cpp"></File><File path="nandtitle.h"></File><File path="wad.cpp"></File><File path="wad.h"></File></MagicFolder><MagicFolder excludeFolders="CVS;.svn" filter="*" name="xml" path="xml\"><File path="GameTDB.cpp"></File><File path="GameTDB.hpp"></File><File path="tinyxml.cpp"></File><File path="tinyxml.h"></File><File path="tinyxmlerror.cpp"></File><File path="tinyxmlparser.cpp"></File></MagicFolder><File path="audio.cpp"></File><File path="audio.h"></File><File path="FreeTypeGX.cpp"></File><File path="FreeTypeGX.h"></File><File path="gecko.c"></File><File path="gecko.h"></File><File path="input.cpp"></File><File path="input.h"></File><File path="lstub.cpp"></File><File path="lstub.h"></File><File path="main.cpp"></File><File path="main.h"></File><File path="menu.cpp"></File><File path="menu.h"></File><File path="StartUpProcess.cpp"></File><File path="StartUpProcess.h"></File><File path="svnrev.c"></File><File path="svnrev.h"></File><File path="sys.cpp"></File><File path="sys.h"></File><File path="video.cpp"></File><File path="video.h"></File><File path="wpad.c"></File><File path="wpad.h"></File><File path="wstring.cpp"></File><File path="wstring.hpp"></File><File path="ZipFile.cpp"></File><File path="ZipFile.h"></File></MagicFolder><File path="Makefile"></File></Project>
\ No newline at end of file
diff --git a/source/FreeTypeGX.cpp b/source/FreeTypeGX.cpp
index cd31251d..cd95a406 100644
--- a/source/FreeTypeGX.cpp
+++ b/source/FreeTypeGX.cpp
@@ -237,48 +237,38 @@ uint16_t FreeTypeGX::cacheGlyphDataComplete(int16_t pixelSize)
 
 void FreeTypeGX::loadGlyphData(FT_Bitmap *bmp, ftgxCharData *charData)
 {
-	uint32_t *glyphData = (uint32_t *) memalign(32, charData->textureWidth * charData->textureHeight * 4);
-	memset(glyphData, 0x00, charData->textureWidth * charData->textureHeight * 4);
+	int glyphSize = (charData->textureWidth * charData->textureHeight) >> 1;
 
-	uint8_t *bmsrc = (uint8_t *)bmp->buffer;
-	uint32_t *dest = glyphData, *ptr = dest;
+	uint8_t *glyphData = (uint8_t *) memalign(32, glyphSize);
+	memset(glyphData, 0x00, glyphSize);
 
-	for (uint16_t imagePosY = 0; imagePosY < bmp->rows; ++imagePosY)
+	uint8_t *src = (uint8_t *)bmp->buffer;
+	uint8_t *dst = glyphData;
+	int32_t pos, x1, y1, x, y;
+
+	for(y1 = 0; y1 < bmp->rows; y1 += 8)
 	{
-		for (uint16_t imagePosX = 0; imagePosX < bmp->width; ++imagePosX)
+		for(x1 = 0; x1 < bmp->width; x1 += 8)
 		{
-			*ptr++ = EXPLODE_UINT8_TO_UINT32(*bmsrc);
-			++bmsrc;
-		}
-		ptr = dest += charData->textureWidth;
-	}
+			for(y = y1; y < (y1 + 8); y++)
+			{
+				for(x = x1; x < (x1 + 8); x += 2, dst++)
+				{
+					if(x >= bmp->width || y >= bmp->rows)
+						continue;
 
-	uint32_t bufferSize = charData->textureWidth * charData->textureHeight;
-	uint32_t* dataBufferIA4 = (uint32_t *)memalign(32, ALIGN32(bufferSize));
-	memset(dataBufferIA4, 0x00, bufferSize);
+					pos = y * bmp->width + x;
+					*dst = (src[pos] & 0xF0);
 
-	uint32_t *src = glyphData;
-	uint8_t* dst = (uint8_t *) dataBufferIA4;
-
-	for(uint16_t y = 0; y < charData->textureHeight; y += 4) {
-		for(uint16_t x = 0; x < charData->textureWidth; x += 8) {
-			for(uint16_t rows = 0; rows < 4; rows++) {
-				*dst++ = RGBA_TO_IA4(src[((y + rows) * charData->textureWidth) + (x + 0)]);
-				*dst++ = RGBA_TO_IA4(src[((y + rows) * charData->textureWidth) + (x + 1)]);
-				*dst++ = RGBA_TO_IA4(src[((y + rows) * charData->textureWidth) + (x + 2)]);
-				*dst++ = RGBA_TO_IA4(src[((y + rows) * charData->textureWidth) + (x + 3)]);
-				*dst++ = RGBA_TO_IA4(src[((y + rows) * charData->textureWidth) + (x + 4)]);
-				*dst++ = RGBA_TO_IA4(src[((y + rows) * charData->textureWidth) + (x + 5)]);
-				*dst++ = RGBA_TO_IA4(src[((y + rows) * charData->textureWidth) + (x + 6)]);
-				*dst++ = RGBA_TO_IA4(src[((y + rows) * charData->textureWidth) + (x + 7)]);
+					if(x+1 < bmp->width)
+						*dst |= (src[pos + 1] >> 4);
+				}
 			}
 		}
 	}
 
-	DCFlushRange(dataBufferIA4, bufferSize);
-	free(glyphData);
-
-	charData->glyphDataTexture = (uint8_t *) dataBufferIA4;
+	DCFlushRange(glyphData, glyphSize);
+	charData->glyphDataTexture = glyphData;
 }
 
 /**
@@ -389,7 +379,7 @@ uint16_t FreeTypeGX::drawText(int16_t x, int16_t y, int16_t z, const wchar_t *te
 				x_pos += pairDelta.x >> 6;
 			}
 
-			GX_InitTexObj(&glyphTexture, glyphData->glyphDataTexture, glyphData->textureWidth, glyphData->textureHeight, GX_TF_IA4, GX_CLAMP, GX_CLAMP, GX_FALSE);
+			GX_InitTexObj(&glyphTexture, glyphData->glyphDataTexture, glyphData->textureWidth, glyphData->textureHeight, GX_TF_I4, GX_CLAMP, GX_CLAMP, GX_FALSE);
 			copyTextureToFramebuffer(&glyphTexture, glyphData->textureWidth, glyphData->textureHeight, x_pos + glyphData->renderOffsetX + x_offset, y - glyphData->renderOffsetY + y_offset, z, color);
 
 			x_pos += glyphData->glyphAdvanceX;
diff --git a/source/GameCube/GCGames.cpp b/source/GameCube/GCGames.cpp
index 13f4ef48..ae058ca1 100644
--- a/source/GameCube/GCGames.cpp
+++ b/source/GameCube/GCGames.cpp
@@ -110,7 +110,7 @@ u32 GCGames::LoadGameList(const string &path)
 		// if we have titles.txt entry use that
 		const char *title = GameTitles.GetTitle(id);
 		// if no titles.txt get title from dir or file name
-		if (strlen(title) == 0 && Settings.titlesOverride && strlen(fname_title) > 0)
+		if (strlen(title) == 0 && !Settings.ForceDiscTitles && strlen(fname_title) > 0)
 			title = fname_title;
 
 		if (*id != 0 && strlen(title) > 0)
diff --git a/source/ImageOperations/ImageWrite.c b/source/ImageOperations/ImageWrite.c
new file mode 100644
index 00000000..c7d15587
--- /dev/null
+++ b/source/ImageOperations/ImageWrite.c
@@ -0,0 +1,56 @@
+/***************************************************************************
+ * Copyright (C) 2010
+ * by Dimok
+ *
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any
+ * damages arising from the use of this software.
+ *
+ * Permission is granted to anyone to use this software for any
+ * purpose, including commercial applications, and to alter it and
+ * redistribute it freely, subject to the following restrictions:
+ *
+ * 1. The origin of this software must not be misrepresented; you
+ * must not claim that you wrote the original software. If you use
+ * this software in a product, an acknowledgment in the product
+ * documentation would be appreciated but is not required.
+ *
+ * 2. Altered source versions must be plainly marked as such, and
+ * must not be misrepresented as being the original software.
+ *
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+ *
+ * for WiiXplorer 2010
+ ***************************************************************************/
+#include <stdio.h>
+#include <gctypes.h>
+#include <gd.h>
+#include "ImageWrite.h"
+
+#define LIMIT(x, min, max) ( (x < min) ? min : (x > max) ? max : x )
+
+bool WriteGDImage(const char * filepath, gdImagePtr gdImg, u8 format, u8 compression)
+{
+	if(gdImg == 0)
+		return false;
+
+	FILE * file = fopen(filepath, "wb");
+	if(!file)
+		return false;
+
+	switch(format)
+	{
+		default:
+		case IMAGE_PNG:
+			gdImagePng(gdImg, file);
+			break;
+		case IMAGE_JPEG:
+			gdImageJpeg(gdImg, file, LIMIT(100-compression, 0, 100));
+			break;
+	}
+
+	fclose(file);
+
+	return true;
+}
diff --git a/source/ImageOperations/ImageWrite.h b/source/ImageOperations/ImageWrite.h
new file mode 100644
index 00000000..c90d69df
--- /dev/null
+++ b/source/ImageOperations/ImageWrite.h
@@ -0,0 +1,48 @@
+/***************************************************************************
+ * Copyright (C) 2010
+ * by Dimok
+ *
+ * This software is provided 'as-is', without any express or implied
+ * warranty. In no event will the authors be held liable for any
+ * damages arising from the use of this software.
+ *
+ * Permission is granted to anyone to use this software for any
+ * purpose, including commercial applications, and to alter it and
+ * redistribute it freely, subject to the following restrictions:
+ *
+ * 1. The origin of this software must not be misrepresented; you
+ * must not claim that you wrote the original software. If you use
+ * this software in a product, an acknowledgment in the product
+ * documentation would be appreciated but is not required.
+ *
+ * 2. Altered source versions must be plainly marked as such, and
+ * must not be misrepresented as being the original software.
+ *
+ * 3. This notice may not be removed or altered from any source
+ * distribution.
+ *
+ * for WiiXplorer 2010
+ ***************************************************************************/
+#ifndef IMAGEWRITE_H_
+#define IMAGEWRITE_H_
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include <gd.h>
+
+/** Supported image write formats **/
+#define IMAGE_PNG		0
+#define IMAGE_JPEG		1
+
+/** compression **/
+//!< JPEG-Format (0-100):   where 0 is best quality and 100 best compression
+
+bool WriteGDImage(const char * filepath, gdImagePtr gdImg, u8 format, u8 compression);
+
+#ifdef __cplusplus
+}
+#endif //__cplusplus
+
+#endif //IMAGEWRITE_H_
diff --git a/source/ImageOperations/TextureConverter.c b/source/ImageOperations/TextureConverter.c
index 87d14f0b..72182be1 100644
--- a/source/ImageOperations/TextureConverter.c
+++ b/source/ImageOperations/TextureConverter.c
@@ -29,12 +29,6 @@
 #include <malloc.h>
 #include "TextureConverter.h"
 
-#define cut_bounds(x, min, max) ( (x < min) ? min : (x > max) ? max : x )
-#define ALIGN(x) (((x) + 3) & ~3)
-#define ALIGN32(x) (((x) + 31) & ~31)
-#define coordsRGBA8(x, y, w) (((((y >> 2) * (w >> 2) + (x >> 2)) << 5) + ((y & 3) << 2) + (x & 3)) << 1)
-#define datasizeRGBA8(w, h) ALIGN32(((w+3)>>2)*((h+3)>>2)*32*2)
-
 #define MAXWIDTH 1024.0f
 #define MAXHEIGHT 768.0f
 
@@ -458,16 +452,16 @@ bool YCbYCrToGD(const u8* buffer, u32 width, u32 height, gdImagePtr * im)
 			g = (int) (- 0.698f * (val[3] - 128) - 0.336f * (val[1] - 128));
 			b = (int) (1.732f * (val[1] - 128));
 
-			r1 = cut_bounds(val[0] + r, 0, 255);
-			g1 = cut_bounds(val[0] + g, 0, 255);
-			b1 = cut_bounds(val[0] + b, 0, 255);
+			r1 = LIMIT(val[0] + r, 0, 255);
+			g1 = LIMIT(val[0] + g, 0, 255);
+			b1 = LIMIT(val[0] + b, 0, 255);
 
 			gdImageSetPixel(*im, x1, y, gdTrueColorAlpha(r1, g1, b1, gdAlphaOpaque));
 			x1++;
 
-			r1 = cut_bounds(val[2] + r, 0, 255);
-			g1 = cut_bounds(val[2] + g, 0, 255);
-			b1 = cut_bounds(val[2] + b, 0, 255);
+			r1 = LIMIT(val[2] + r, 0, 255);
+			g1 = LIMIT(val[2] + g, 0, 255);
+			b1 = LIMIT(val[2] + b, 0, 255);
 			gdImageSetPixel(*im, x1, y, gdTrueColorAlpha(r1, g1, b1, gdAlphaOpaque));
 		}
 	}
diff --git a/source/ImageOperations/TextureConverter.h b/source/ImageOperations/TextureConverter.h
index cfbac302..43cc4f1f 100644
--- a/source/ImageOperations/TextureConverter.h
+++ b/source/ImageOperations/TextureConverter.h
@@ -36,6 +36,10 @@ extern "C"
 
 #include <gccore.h>
 #include <gd.h>
+#include "utils/tools.h"
+
+#define coordsRGBA8(x, y, w) (((((y >> 2) * (w >> 2) + (x >> 2)) << 5) + ((y & 3) << 2) + (x & 3)) << 1)
+#define datasizeRGBA8(w, h) ALIGN32(((w+3)>>2)*((h+3)>>2)*32*2)
 
 bool I4ToGD(const u8 * buffer, u32 width, u32 height, gdImagePtr * im);
 bool IA4ToGD(const u8 * buffer, u32 width, u32 height, gdImagePtr * im);
diff --git a/source/SoundOperations/AifDecoder.cpp b/source/SoundOperations/AifDecoder.cpp
index d7642dc6..8b4046f9 100644
--- a/source/SoundOperations/AifDecoder.cpp
+++ b/source/SoundOperations/AifDecoder.cpp
@@ -148,18 +148,10 @@ void AifDecoder::OpenFile()
 			file_fd->seek(-3, SEEK_CUR);
 	}
 
-	u32 chunk_size = 0;
-	int ret = file_fd->read((u8 *) &chunk_size, sizeof(chunk_size));
-	if(ret <= 0)
-	{
-		CloseFile();
-		return;
-	}
-
-	DataOffset = file_fd->tell()+chunk_size;
+	// seek back to COMM chunk start
+	file_fd->seek(-sizeof(magic), SEEK_CUR);
 
 	SAIFFCommChunk CommHdr;
-	file_fd->seek(file_fd->tell()-sizeof(SWaveChunk), SEEK_SET);
 	file_fd->read((u8 *) &CommHdr, sizeof(SAIFFCommChunk));
 
 	if(CommHdr.fccCOMM != 'COMM')
@@ -168,7 +160,23 @@ void AifDecoder::OpenFile()
 		return;
 	}
 
-	file_fd->seek(DataOffset, SEEK_SET);
+	// Seek to next chunk start
+	file_fd->seek(-sizeof(SAIFFCommChunk) + sizeof(SWaveChunk) + CommHdr.size, SEEK_CUR);
+
+	int ret = -1;
+	SWaveChunk chunkHdr;
+	memset(&chunkHdr, 0, sizeof(SWaveChunk));
+
+	do
+	{
+		// Seek to next chunk start
+		file_fd->seek(chunkHdr.size, SEEK_CUR);
+		ret = file_fd->read((u8 *) &chunkHdr, sizeof(SWaveChunk));
+	}
+	while(ret > 0 && chunkHdr.magicDATA != 'SSND');
+
+	// Seek back to start of SSND chunk
+	file_fd->seek(-sizeof(SWaveChunk), SEEK_CUR);
 
 	SAIFFSSndChunk SSndChunk;
 	file_fd->read((u8 *) &SSndChunk, sizeof(SAIFFSSndChunk));
@@ -179,7 +187,7 @@ void AifDecoder::OpenFile()
 		return;
 	}
 
-	DataOffset += sizeof(SAIFFSSndChunk);
+	DataOffset = file_fd->tell();
 	DataSize = SSndChunk.size-8;
 	SampleRate = (u32) ConvertFromIeeeExtended(CommHdr.freq);
 	Format = VOICE_STEREO_16BIT;
diff --git a/source/SoundOperations/WavDecoder.cpp b/source/SoundOperations/WavDecoder.cpp
index 55718b0b..7d1f55e8 100644
--- a/source/SoundOperations/WavDecoder.cpp
+++ b/source/SoundOperations/WavDecoder.cpp
@@ -88,16 +88,16 @@ void WavDecoder::OpenFile()
 	SWaveChunk DataChunk;
 	file_fd->read((u8 *) &DataChunk, sizeof(SWaveChunk));
 
-	if(DataChunk.magicDATA == 'fact')
+	while(DataChunk.magicDATA != 'data')
 	{
 		DataOffset += 8+le32(DataChunk.size);
 		file_fd->seek(DataOffset, SEEK_SET);
-		file_fd->read((u8 *) &DataChunk, sizeof(SWaveChunk));
-	}
-	if(DataChunk.magicDATA != 'data')
-	{
-		CloseFile();
-		return;
+		int ret = file_fd->read((u8 *) &DataChunk, sizeof(SWaveChunk));
+		if(ret <= 0)
+		{
+			CloseFile();
+			return;
+		}
 	}
 
 	DataOffset += 8;
diff --git a/source/homebrewboot/HomebrewXML.cpp b/source/homebrewboot/HomebrewXML.cpp
index 96acb42f..c94fa39d 100644
--- a/source/homebrewboot/HomebrewXML.cpp
+++ b/source/homebrewboot/HomebrewXML.cpp
@@ -29,6 +29,8 @@ int HomebrewXML::LoadHomebrewXMLData(const char* filename)
 		return false;
 
 	TiXmlElement *appNode =  xmlDoc.FirstChildElement("app");
+	if(!appNode)
+		return false;
 
 	TiXmlElement *node = NULL;
 
diff --git a/source/menu/GameBrowseMenu.cpp b/source/menu/GameBrowseMenu.cpp
index 3df684c2..ee51d209 100644
--- a/source/menu/GameBrowseMenu.cpp
+++ b/source/menu/GameBrowseMenu.cpp
@@ -1446,6 +1446,7 @@ int GameBrowseMenu::OpenClickedGame(struct discHdr *header)
 
 	if (choice == 1)
 	{
+		gameList.FilterList();
 		ReloadBrowser();
 		if(Settings.ShowFreeSpace)
 		{
diff --git a/source/prompts/GameWindow.cpp b/source/prompts/GameWindow.cpp
index 0635cf88..95b8b083 100644
--- a/source/prompts/GameWindow.cpp
+++ b/source/prompts/GameWindow.cpp
@@ -38,6 +38,7 @@ GameWindow::GameWindow(int Selected, struct discHdr *dvd)
 	gameSound = NULL;
 	diskImgData = NULL;
 	diskImgData2 = NULL;
+	hidden = false;
 	reducedVol = false;
 	SetAlignment(ALIGN_CENTRE, ALIGN_MIDDLE);
 	SetPosition(0, -10);
@@ -205,16 +206,19 @@ GameWindow::GameWindow(int Selected, struct discHdr *dvd)
 
 GameWindow::~GameWindow()
 {
-	StopEffect();
-	SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_OUT, 50);
-	ResumeGui();
+	if(!hidden)
+	{
+		StopEffect();
+		SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_OUT, 50);
+		ResumeGui();
 
-	while(parentElement && this->GetEffect() > 0) usleep(100);
+		while(parentElement && this->GetEffect() > 0) usleep(100);
 
-	HaltGui();
+		HaltGui();
 
-	if(parentElement)
-		((GuiWindow * ) parentElement)->Remove(this);
+		if(parentElement)
+			((GuiWindow * ) parentElement)->Remove(this);
+	}
 
 	RemoveAll();
 
@@ -476,6 +480,7 @@ void GameWindow::Hide(void)
 	this->SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_OUT, 50);
 	while(parentWindow && this->GetEffect() > 0) usleep(100);
 	if(parentWindow) parentWindow->Remove(this);
+	hidden = true;
 }
 
 void GameWindow::Show(void)
@@ -487,6 +492,7 @@ void GameWindow::Show(void)
 		parentWindow->SetState(STATE_DISABLED);
 		parentWindow->Append(this);
 	}
+	hidden = false;
 }
 
 int GameWindow::Run()
diff --git a/source/prompts/GameWindow.hpp b/source/prompts/GameWindow.hpp
index ba53cb50..200273ea 100644
--- a/source/prompts/GameWindow.hpp
+++ b/source/prompts/GameWindow.hpp
@@ -27,6 +27,7 @@ class GameWindow : public GuiWindow
 		void Show();
 
 		bool reducedVol;
+		bool hidden;
 		int returnVal;
 		int gameSelected;
 		GameBrowseMenu *browserMenu;
diff --git a/source/settings/CSettings.cpp b/source/settings/CSettings.cpp
index b8a240ec..8f131c11 100644
--- a/source/settings/CSettings.cpp
+++ b/source/settings/CSettings.cpp
@@ -107,11 +107,12 @@ void CSettings::SetDefault()
 	autonetwork = OFF;
 	patchcountrystrings = OFF;
 	titlesOverride = ON;
+	ForceDiscTitles = OFF;
 	screensaver = SCREENSAVER_10_MIN;
 	musicloopmode = ON;
 	marknewtitles = ON;
 	ShowFreeSpace = ON;
-	PlaylogUpdate = ON;
+	PlaylogUpdate = OFF;
 	ParentalBlocks = BLOCK_ALL;
 	InstallToDir = INSTALL_TO_NAME_GAMEID;
 	GameSplit = GAMESPLIT_4GB;
@@ -274,6 +275,7 @@ bool CSettings::Save()
 	fprintf(file, "WipCodepath = %s\n", WipCodepath);
 	fprintf(file, "WDMpath = %s\n ", WDMpath);
 	fprintf(file, "titlesOverride = %d\n", titlesOverride);
+	fprintf(file, "ForceDiscTitles = %d\n", ForceDiscTitles);
 	fprintf(file, "patchcountrystrings = %d\n", patchcountrystrings);
 	fprintf(file, "screensaver = %d\n", screensaver);
 	fprintf(file, "musicloopmode = %d\n", musicloopmode);
@@ -508,6 +510,11 @@ bool CSettings::SetSetting(char *name, char *value)
 		if (sscanf(value, "%d", &i) == 1) titlesOverride = i;
 		return true;
 	}
+	else if (strcmp(name, "ForceDiscTitles") == 0)
+	{
+		if (sscanf(value, "%d", &i) == 1) ForceDiscTitles = i;
+		return true;
+	}
 	else if (strcmp(name, "musicloopmode") == 0)
 	{
 		if (sscanf(value, "%d", &i) == 1) musicloopmode = i;
diff --git a/source/settings/CSettings.h b/source/settings/CSettings.h
index 8ad75a7a..63e11c14 100644
--- a/source/settings/CSettings.h
+++ b/source/settings/CSettings.h
@@ -144,6 +144,7 @@ class CSettings
 		short UseChanLauncher;
 		int AdjustOverscanX;
 		int AdjustOverscanY;
+		short ForceDiscTitles;
 
 		// This variable is not saved to the settings file
 		bool FirstTimeRun;
diff --git a/source/settings/menus/FeatureSettingsMenu.cpp b/source/settings/menus/FeatureSettingsMenu.cpp
index 8715dea3..8ea1ee71 100644
--- a/source/settings/menus/FeatureSettingsMenu.cpp
+++ b/source/settings/menus/FeatureSettingsMenu.cpp
@@ -58,6 +58,7 @@ FeatureSettingsMenu::FeatureSettingsMenu()
 	int Idx = 0;
 	Options->SetName(Idx++, "%s", tr( "Titles from GameTDB" ));
 	Options->SetName(Idx++, "%s", tr( "Cache Titles" ));
+	Options->SetName(Idx++, "%s", tr( "Force Titles from Disc" ));
 	Options->SetName(Idx++, "%s", tr( "Wiilight" ));
 	Options->SetName(Idx++, "%s", tr( "Rumble" ));
 	Options->SetName(Idx++, "%s", tr( "AutoInit Network" ));
@@ -70,6 +71,7 @@ FeatureSettingsMenu::FeatureSettingsMenu()
 
 	OldTitlesOverride = Settings.titlesOverride;
 	OldCacheTitles = Settings.CacheTitles;
+	OldForceDiscTitles = Settings.ForceDiscTitles;
 
 	SetOptionValues();
 }
@@ -77,8 +79,12 @@ FeatureSettingsMenu::FeatureSettingsMenu()
 FeatureSettingsMenu::~FeatureSettingsMenu()
 {
 	if (   Settings.titlesOverride != OldTitlesOverride
-		|| Settings.CacheTitles != OldCacheTitles)
+		|| Settings.CacheTitles != OldCacheTitles
+		|| Settings.ForceDiscTitles != OldForceDiscTitles)
 	{
+		if(Settings.ForceDiscTitles)
+			Settings.titlesOverride = OFF;
+
 		//! Remove cached titles and reload new titles
 		GameTitles.SetDefault();
 		if(Settings.titlesOverride) {
@@ -103,6 +109,9 @@ void FeatureSettingsMenu::SetOptionValues()
 	//! Settings: Cache Titles
 	Options->SetValue(Idx++, "%s", tr( OnOffText[Settings.CacheTitles] ));
 
+	//! Settings: Force Titles from Disc
+	Options->SetValue(Idx++, "%s", tr( OnOffText[Settings.ForceDiscTitles] ));
+
 	//! Settings: Wiilight
 	Options->SetValue(Idx++, "%s", tr( WiilightText[Settings.wiilight] ));
 
@@ -153,6 +162,12 @@ int FeatureSettingsMenu::GetMenuInternal()
 		if (++Settings.CacheTitles >= MAX_ON_OFF) Settings.CacheTitles = 0;
 	}
 
+	//! Settings: Force Titles from Disc
+	else if (ret == ++Idx)
+	{
+		if (++Settings.ForceDiscTitles >= MAX_ON_OFF) Settings.ForceDiscTitles = 0;
+	}
+
 	//! Settings: Wiilight
 	else if (ret == ++Idx)
 	{
diff --git a/source/settings/menus/FeatureSettingsMenu.hpp b/source/settings/menus/FeatureSettingsMenu.hpp
index 9212d2e7..19b70c81 100644
--- a/source/settings/menus/FeatureSettingsMenu.hpp
+++ b/source/settings/menus/FeatureSettingsMenu.hpp
@@ -37,6 +37,7 @@ class FeatureSettingsMenu : public SettingsMenu
 
 		int OldTitlesOverride;
 		int OldCacheTitles;
+		int OldForceDiscTitles;
 
 		OptionList GuiOptions;
 };
diff --git a/source/usbloader/wbfs/wbfs_fat.cpp b/source/usbloader/wbfs/wbfs_fat.cpp
index 30399373..7f0a2a54 100644
--- a/source/usbloader/wbfs/wbfs_fat.cpp
+++ b/source/usbloader/wbfs/wbfs_fat.cpp
@@ -481,7 +481,7 @@ s32 Wbfs_Fat::GetHeadersCount()
 		// if we have titles.txt entry use that
 		title = GameTitles.GetTitle(id);
 		// if no titles.txt get title from dir or file name
-		if (strlen(title) == 0 && Settings.titlesOverride && strlen(fname_title) > 0)
+		if (strlen(title) == 0 && !Settings.ForceDiscTitles && strlen(fname_title) > 0)
 			title = fname_title;
 
 		if (strlen(title) > 0)
diff --git a/source/video.cpp b/source/video.cpp
index 0e41754e..be845d36 100644
--- a/source/video.cpp
+++ b/source/video.cpp
@@ -13,11 +13,12 @@
 #include <string.h>
 #include <unistd.h>
 #include <wiiuse/wpad.h>
-#include <pngu/pngu.h>
 
+#include "GUI/gui.h"
+#include "ImageOperations/TextureConverter.h"
+#include "ImageOperations/ImageWrite.h"
 #include "input.h"
 #include "gecko.h"
-#include "GUI/gui.h"
 
 #define DEFAULT_FIFO_SIZE 256 * 1024
 static unsigned int *xfb[2] = { NULL, NULL }; // Double buffered
@@ -446,9 +447,21 @@ void Menu_DrawTPLImg(f32 xpos, f32 ypos, f32 zpos, f32 width, f32 height, GXTexO
 s32 TakeScreenshot(const char *path)
 {
 	gprintf("\nTakeScreenshot(%s)", path);
-	IMGCTX ctx = PNGU_SelectImageFromDevice(path);
-	s32 ret = PNGU_EncodeFromYCbYCr(ctx, vmode->fbWidth, vmode->efbHeight, xfb[whichfb], 0);
-	PNGU_ReleaseImageContext(ctx);
-	gprintf(":%d", ret);
+	int size = (2 * vmode->fbWidth * vmode->xfbHeight + 31) & ~31;
+
+	u8 * buffer = (u8 *) memalign(32, size);
+	if(!buffer)
+		return -1;
+
+	memcpy(buffer, xfb[whichfb], size);
+
+	gdImagePtr gdImg;
+	if(YCbYCrToGD(buffer, vmode->fbWidth, vmode->xfbHeight, &gdImg))
+	{
+		WriteGDImage(path,gdImg, IMAGE_PNG, 0);
+		gdImageDestroy(gdImg);
+	}
+	free(buffer);
+
 	return 1;
 }