From 49e0122ac0d7f888b071f2d83d01c491cd650000 Mon Sep 17 00:00:00 2001
From: dimok321 <15055714+dimok789@users.noreply.github.com>
Date: Fri, 21 Oct 2011 18:48:10 +0000
Subject: [PATCH] Release Candidate 1: *Changed everything from WiiTDB to
 GameTDB (using new host and name) *Added quick switch between system font and
 old font (fixed memory leak in font change)

---
 HBC/META.XML                                  |  4 +-
 Languages/czech.lang                          | 67 ++++++++++++-----
 Languages/danish.lang                         | 72 +++++++++++++-----
 Languages/dutch.lang                          | 69 ++++++++++++-----
 Languages/english.lang                        | 48 ++++++++----
 Languages/finnish.lang                        | 64 +++++++++++-----
 Languages/french.lang                         | 72 +++++++++++++-----
 Languages/german.lang                         | 72 +++++++++++++-----
 Languages/hungarian.lang                      | 64 +++++++++++-----
 Languages/italian.lang                        | 71 +++++++++++++-----
 Languages/japanese.lang                       | 72 +++++++++++++-----
 Languages/korean.lang                         | 64 +++++++++++-----
 Languages/norwegian.lang                      | 72 +++++++++++++-----
 Languages/polish.lang                         | 64 +++++++++++-----
 Languages/portuguese_br.lang                  | 69 ++++++++++++-----
 Languages/portuguese_pt.lang                  | 72 +++++++++++++-----
 Languages/russian.lang                        | 64 +++++++++++-----
 Languages/schinese.lang                       | 67 ++++++++++++-----
 Languages/spanish.lang                        | 72 +++++++++++++-----
 Languages/swedish.lang                        | 64 +++++++++++-----
 Languages/tchinese.lang                       | 72 +++++++++++++-----
 Languages/thai.lang                           | 64 +++++++++++-----
 Languages/turkish.lang                        | 64 +++++++++++-----
 source/network/ImageDownloader.cpp            | 14 ++--
 source/network/update.cpp                     | 36 ++++-----
 source/network/update.h                       |  2 +-
 source/prompts/PromptWindows.cpp              |  6 +-
 source/prompts/TitleBrowser.cpp               |  6 +-
 source/prompts/gameinfo.cpp                   | 16 ++--
 source/settings/CGameCategories.cpp           |  6 +-
 source/settings/CGameCategories.hpp           |  2 +-
 source/settings/GameTitles.cpp                | 10 +--
 source/settings/GameTitles.h                  | 10 +--
 source/settings/SettingsPrompts.cpp           |  2 +-
 source/settings/menus/CustomPathsSM.cpp       |  8 +-
 source/settings/menus/FeatureSettingsMenu.cpp | 18 ++---
 source/settings/menus/GUISettingsMenu.cpp     | 12 ++-
 source/settings/menus/HardDriveSM.cpp         |  2 +-
 source/themes/CTheme.cpp                      |  1 +
 source/usbloader/GameList.cpp                 |  2 +-
 source/usbloader/MountGamePartition.cpp       |  8 +-
 source/xml/{WiiTDB.cpp => GameTDB.cpp}        | 74 +++++++++----------
 source/xml/{WiiTDB.hpp => GameTDB.hpp}        | 20 ++---
 43 files changed, 1232 insertions(+), 506 deletions(-)
 rename source/xml/{WiiTDB.cpp => GameTDB.cpp} (90%)
 rename source/xml/{WiiTDB.hpp => GameTDB.hpp} (94%)

diff --git a/HBC/META.XML b/HBC/META.XML
index 024b5257..edcd2b9b 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.2 r1120</version>
-		<release_date>201109250949</release_date>
+		<version>2.2 r1121</version>
+		<release_date>201110211429</release_date>
 		<!--   // remove this line to enable arguments
 		<arguments>
 				<arg>--ios=250</arg>
diff --git a/Languages/czech.lang b/Languages/czech.lang
index 8ba4bfd0..84a387cd 100644
--- a/Languages/czech.lang
+++ b/Languages/czech.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-24 15:12+0200\n"
+"POT-Creation-Date: 2011-10-21 20:31+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: David Jelinek (djelinek@hotmail.com) e->e,r->r,u->u, c->c \n"
 "Language-Team: r1056 - last version on http://djelinek.sweb.cz/_USBLoderGX/czech.lang \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 msgid " could not be downloaded."
 msgstr " nelze stáhnout."
@@ -166,7 +166,7 @@ msgstr "Dub"
 msgid "Are you sure you want to delete this category?"
 msgstr ""
 
-msgid "Are you sure you want to import game categories from WiiTDB?"
+msgid "Are you sure you want to import game categories from GameTDB?"
 msgstr ""
 
 msgid "Are you sure you want to lock USB Loader GX?"
@@ -577,6 +577,9 @@ msgstr "Stahuji originální potisky"
 msgid "Downloading pagelist:"
 msgstr "Stahuji stránku:"
 
+msgid "Dump NAND to EmuNand"
+msgstr ""
+
 msgid "Dutch"
 msgstr "Dánsky"
 
@@ -592,6 +595,9 @@ msgstr "CHYBA: Nelze nastavit téma."
 msgid "English"
 msgstr "Anglicky"
 
+msgid "Enter Path"
+msgstr ""
+
 msgid "Error"
 msgstr "Chyba"
 
@@ -639,6 +645,9 @@ msgstr "Chyba:"
 msgid "Errors occured."
 msgstr ""
 
+msgid "Everything"
+msgstr ""
+
 msgid "Exit"
 msgstr "Ukoncit"
 
@@ -660,6 +669,9 @@ msgstr "Rozbaluji soubory..."
 msgid "Extracting files:"
 msgstr ""
 
+msgid "Extracting nand files:"
+msgstr ""
+
 msgid "Failed"
 msgstr ""
 
@@ -817,6 +829,15 @@ msgstr "Hra je již nainstalována:"
 msgid "Game/Install Partition"
 msgstr ""
 
+msgid "GameTDB Files"
+msgstr ""
+
+msgid "GameTDB Path"
+msgstr ""
+
+msgid "GameTDB is up to date."
+msgstr ""
+
 msgid "Gamename [GAMEID]"
 msgstr "Název hry [IdHry]"
 
@@ -1474,6 +1495,9 @@ msgstr "Soubor .them nebyl nalezen v ZIP."
 msgid "The entered directory does not exist. Would you like to create it?"
 msgstr "Zadaný adresár neexistuje. Chcete ho vytvorit?"
 
+msgid "The files will be extracted to your emu nand path. Attention: All existing files will be overwritten."
+msgstr ""
+
 msgid "The game installation is disabled under this IOS because of instability in usb write."
 msgstr "Instalace her je zakázána s tímto IOS kvuli nestabilite v USB zápisu."
 
@@ -1517,8 +1541,8 @@ msgstr "Zbývá:"
 msgid "Title Launcher"
 msgstr "Spouštec kanálu"
 
-msgid "Titles from WiiTDB"
-msgstr "Názvy z WiiTDB"
+msgid "Titles from GameTDB"
+msgstr ""
 
 msgid "Tooltips"
 msgstr "Popisky"
@@ -1635,6 +1659,9 @@ msgstr "Co si prejete zaktualizovat?"
 msgid "What should be deleted for this game title:"
 msgstr "Co si prejete smazat pro tento titul:"
 
+msgid "What to extract from NAND?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "WiFi možnosti"
 
@@ -1650,15 +1677,6 @@ msgstr "Wii menu"
 msgid "Wii Settings"
 msgstr "Nastavení Wii"
 
-msgid "WiiTDB Files"
-msgstr "WiiTDB Soubory"
-
-msgid "WiiTDB Path"
-msgstr "Cesta k WiiTDB"
-
-msgid "WiiTDB is up to date."
-msgstr "WiiTDB je aktuální"
-
 msgid "Wiilight"
 msgstr "Wii svetlo"
 
@@ -1713,12 +1731,12 @@ msgstr "souboru zbývá"
 msgid "for FAT/NTFS support"
 msgstr "pro FAT/NTFS podporu"
 
+msgid "for GameTDB and hosting covers / disc images"
+msgstr ""
+
 msgid "for Ocarina"
 msgstr "za Ocarina"
 
-msgid "for WiiTDB and hosting covers / disc images"
-msgstr "za WiiTDB a hostování obalu / potisku DVD"
-
 msgid "for diverse patches"
 msgstr "za ruzné opravy"
 
@@ -1749,6 +1767,21 @@ msgstr "z "
 msgid "seconds left"
 msgstr "sekund zbývá"
 
+#~ msgid "Titles from WiiTDB"
+#~ msgstr "Názvy z WiiTDB"
+
+#~ msgid "WiiTDB Files"
+#~ msgstr "WiiTDB Soubory"
+
+#~ msgid "WiiTDB Path"
+#~ msgstr "Cesta k WiiTDB"
+
+#~ msgid "WiiTDB is up to date."
+#~ msgstr "WiiTDB je aktuální"
+
+#~ msgid "for WiiTDB and hosting covers / disc images"
+#~ msgstr "za WiiTDB a hostování obalu / potisku DVD"
+
 #~ msgid "Install directories"
 #~ msgstr "Instalacní adresáre"
 
diff --git a/Languages/danish.lang b/Languages/danish.lang
index 2fc117af..276aa44d 100644
--- a/Languages/danish.lang
+++ b/Languages/danish.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-24 15:12+0200\n"
+"POT-Creation-Date: 2011-10-21 20:31+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: Fox888[dk]\n"
 "Language-Team: [dk]\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 msgid " could not be downloaded."
 msgstr " kunne ikke downloades."
@@ -166,8 +166,8 @@ msgstr ""
 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 WiiTDB?"
-msgstr "Er du sikker på at du ville importere spille kategorier fra WiiTDB?"
+msgid "Are you sure you want to import game categories from GameTDB?"
+msgstr ""
 
 msgid "Are you sure you want to lock USB Loader GX?"
 msgstr "Er du sikker på at du vil låse USB Loader GX?"
@@ -577,6 +577,9 @@ msgstr "Downloader org. DVD billeder"
 msgid "Downloading pagelist:"
 msgstr "Downloader pagelist:"
 
+msgid "Dump NAND to EmuNand"
+msgstr ""
+
 msgid "Dutch"
 msgstr "Hollandsk"
 
@@ -592,6 +595,9 @@ msgstr "FEJL: Temaet kan ikke bruges."
 msgid "English"
 msgstr "Engelsk"
 
+msgid "Enter Path"
+msgstr ""
+
 msgid "Error"
 msgstr "Fejl"
 
@@ -639,6 +645,9 @@ msgstr "Fejl:"
 msgid "Errors occured."
 msgstr ""
 
+msgid "Everything"
+msgstr ""
+
 msgid "Exit"
 msgstr "Forlad"
 
@@ -660,6 +669,9 @@ msgstr "Pakker filer ud..."
 msgid "Extracting files:"
 msgstr ""
 
+msgid "Extracting nand files:"
+msgstr ""
+
 msgid "Failed"
 msgstr "Fejlede"
 
@@ -817,6 +829,15 @@ msgstr "Dette spil er allerede installeret:"
 msgid "Game/Install Partition"
 msgstr "Spil/Installation partition"
 
+msgid "GameTDB Files"
+msgstr ""
+
+msgid "GameTDB Path"
+msgstr ""
+
+msgid "GameTDB is up to date."
+msgstr ""
+
 msgid "Gamename [GAMEID]"
 msgstr ""
 
@@ -1474,6 +1495,9 @@ msgstr "kunne ikke finde .them fil i zip"
 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 ""
+
 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."
 
@@ -1517,8 +1541,8 @@ msgstr "Tid tilbage:"
 msgid "Title Launcher"
 msgstr "Titel-starter"
 
-msgid "Titles from WiiTDB"
-msgstr "Titler fra WiiTDB"
+msgid "Titles from GameTDB"
+msgstr ""
 
 msgid "Tooltips"
 msgstr "Værktøjstips"
@@ -1635,6 +1659,9 @@ msgstr "Hvad skal opdateres?"
 msgid "What should be deleted for this game title:"
 msgstr "Hvad skal der slettes for dette spil:"
 
+msgid "What to extract from NAND?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "WiFi-indstillinger"
 
@@ -1650,15 +1677,6 @@ msgstr ""
 msgid "Wii Settings"
 msgstr "Wii-indstillinger"
 
-msgid "WiiTDB Files"
-msgstr "WiiTDB-filer"
-
-msgid "WiiTDB Path"
-msgstr "Sti til WiiTDB"
-
-msgid "WiiTDB is up to date."
-msgstr "WiiTDB er op til dato."
-
 msgid "Wiilight"
 msgstr ""
 
@@ -1713,11 +1731,11 @@ msgstr "filer tilbage"
 msgid "for FAT/NTFS support"
 msgstr "for FAT/NTFS understøttelse"
 
-msgid "for Ocarina"
+msgid "for GameTDB and hosting covers / disc images"
 msgstr ""
 
-msgid "for WiiTDB and hosting covers / disc images"
-msgstr "for WiiTDB og for at hoste covers/DVD-billeder"
+msgid "for Ocarina"
+msgstr ""
 
 msgid "for diverse patches"
 msgstr "for diverse patches"
@@ -1748,3 +1766,21 @@ msgstr "af"
 
 msgid "seconds left"
 msgstr "sekunder tilbage"
+
+#~ msgid "Are you sure you want to import game categories from WiiTDB?"
+#~ msgstr "Er du sikker på at du ville importere spille kategorier fra WiiTDB?"
+
+#~ msgid "Titles from WiiTDB"
+#~ msgstr "Titler fra WiiTDB"
+
+#~ msgid "WiiTDB Files"
+#~ msgstr "WiiTDB-filer"
+
+#~ msgid "WiiTDB Path"
+#~ msgstr "Sti til WiiTDB"
+
+#~ msgid "WiiTDB is up to date."
+#~ msgstr "WiiTDB er op til dato."
+
+#~ msgid "for WiiTDB and hosting covers / disc images"
+#~ msgstr "for WiiTDB og for at hoste covers/DVD-billeder"
diff --git a/Languages/dutch.lang b/Languages/dutch.lang
index c3e88078..c397af95 100644
--- a/Languages/dutch.lang
+++ b/Languages/dutch.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-24 15:12+0200\n"
+"POT-Creation-Date: 2011-10-21 20:31+0200\n"
 "PO-Revision-Date: 2011-06-30 14:22+0100\n"
 "Last-Translator: glowy\n"
 "Language-Team: tj_cool, glowy\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 msgid " could not be downloaded."
 msgstr " kon niet worden gedownload."
@@ -166,8 +166,8 @@ msgstr ""
 msgid "Are you sure you want to delete this category?"
 msgstr "Weet je zeker dat je deze categorie wilt verwijderen?"
 
-msgid "Are you sure you want to import game categories from WiiTDB?"
-msgstr "Weet je zeker dat je spel categorieën wilt importeren van WiiTDB?"
+msgid "Are you sure you want to import game categories from GameTDB?"
+msgstr ""
 
 msgid "Are you sure you want to lock USB Loader GX?"
 msgstr "Weet je zeker dat je USB Loader GX wilt vergrendelen"
@@ -577,6 +577,9 @@ msgstr "Originele disc afbeeldingen downloaden"
 msgid "Downloading pagelist:"
 msgstr "Paginalijst downloaden:"
 
+msgid "Dump NAND to EmuNand"
+msgstr ""
+
 msgid "Dutch"
 msgstr "Nederlands"
 
@@ -592,6 +595,9 @@ msgstr "FOUT: Kan thema niet instellen"
 msgid "English"
 msgstr "Engels"
 
+msgid "Enter Path"
+msgstr ""
+
 msgid "Error"
 msgstr "Fout"
 
@@ -639,6 +645,9 @@ msgstr "Fout:"
 msgid "Errors occured."
 msgstr ""
 
+msgid "Everything"
+msgstr ""
+
 msgid "Exit"
 msgstr "Stoppen"
 
@@ -660,6 +669,9 @@ msgstr "Bestanden uitpakken..."
 msgid "Extracting files:"
 msgstr ""
 
+msgid "Extracting nand files:"
+msgstr ""
+
 msgid "Failed"
 msgstr "Mislukt"
 
@@ -817,6 +829,15 @@ msgstr "Spel is al geïnstalleerd:"
 msgid "Game/Install Partition"
 msgstr "Spel/Installatie partitie"
 
+msgid "GameTDB Files"
+msgstr ""
+
+msgid "GameTDB Path"
+msgstr ""
+
+msgid "GameTDB is up to date."
+msgstr ""
+
 msgid "Gamename [GAMEID]"
 msgstr "Spelnaam [SPELID]"
 
@@ -1474,6 +1495,9 @@ msgstr "Het .them bestand is niet gevonden in het zip bestand."
 msgid "The entered directory does not exist. Would you like to create it?"
 msgstr "De opgegeven map bestaat niet. Wil je deze aanmaken?"
 
+msgid "The files will be extracted to your emu nand path. Attention: All existing files will be overwritten."
+msgstr ""
+
 msgid "The game installation is disabled under this IOS because of instability in usb write."
 msgstr "Het installeren van spellen is uitgeschakeld met deze IOS door onstabiliteit met usb schrijven"
 
@@ -1517,8 +1541,8 @@ msgstr "Tijd over:"
 msgid "Title Launcher"
 msgstr "Titel starter"
 
-msgid "Titles from WiiTDB"
-msgstr "WiiTDB titels"
+msgid "Titles from GameTDB"
+msgstr ""
 
 msgid "Tooltips"
 msgstr "Knopinfo"
@@ -1635,6 +1659,9 @@ msgstr "Wat wil je updaten?"
 msgid "What should be deleted for this game title:"
 msgstr "Wat er verwijderd moet worden voor deze spel titel:"
 
+msgid "What to extract from NAND?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "WiFi functies"
 
@@ -1650,15 +1677,6 @@ msgstr ""
 msgid "Wii Settings"
 msgstr "Wii instellingen"
 
-msgid "WiiTDB Files"
-msgstr "WiiTDB bestanden"
-
-msgid "WiiTDB Path"
-msgstr "Locatie WiiTDB"
-
-msgid "WiiTDB is up to date."
-msgstr ""
-
 msgid "Wiilight"
 msgstr "Wii verlichting"
 
@@ -1713,12 +1731,12 @@ msgstr "Bestanden resterend"
 msgid "for FAT/NTFS support"
 msgstr "voor FAT/NTFS ondersteuning"
 
+msgid "for GameTDB and hosting covers / disc images"
+msgstr ""
+
 msgid "for Ocarina"
 msgstr "voor Ocarina"
 
-msgid "for WiiTDB and hosting covers / disc images"
-msgstr "voor WiiTDB en upload afbeeldingen"
-
 msgid "for diverse patches"
 msgstr "voor diverse correcties"
 
@@ -1748,3 +1766,18 @@ msgstr "van"
 
 msgid "seconds left"
 msgstr "seconden over"
+
+#~ msgid "Are you sure you want to import game categories from WiiTDB?"
+#~ msgstr "Weet je zeker dat je spel categorieën wilt importeren van WiiTDB?"
+
+#~ msgid "Titles from WiiTDB"
+#~ msgstr "WiiTDB titels"
+
+#~ msgid "WiiTDB Files"
+#~ msgstr "WiiTDB bestanden"
+
+#~ msgid "WiiTDB Path"
+#~ msgstr "Locatie WiiTDB"
+
+#~ msgid "for WiiTDB and hosting covers / disc images"
+#~ msgstr "voor WiiTDB en upload afbeeldingen"
diff --git a/Languages/english.lang b/Languages/english.lang
index 84d7a811..20060fda 100644
--- a/Languages/english.lang
+++ b/Languages/english.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-24 15:12+0200\n"
+"POT-Creation-Date: 2011-10-21 20:31+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 msgid " could not be downloaded."
 msgstr ""
@@ -166,7 +166,7 @@ msgstr ""
 msgid "Are you sure you want to delete this category?"
 msgstr ""
 
-msgid "Are you sure you want to import game categories from WiiTDB?"
+msgid "Are you sure you want to import game categories from GameTDB?"
 msgstr ""
 
 msgid "Are you sure you want to lock USB Loader GX?"
@@ -577,6 +577,9 @@ msgstr ""
 msgid "Downloading pagelist:"
 msgstr ""
 
+msgid "Dump NAND to EmuNand"
+msgstr ""
+
 msgid "Dutch"
 msgstr ""
 
@@ -592,6 +595,9 @@ msgstr ""
 msgid "English"
 msgstr ""
 
+msgid "Enter Path"
+msgstr ""
+
 msgid "Error"
 msgstr ""
 
@@ -639,6 +645,9 @@ msgstr ""
 msgid "Errors occured."
 msgstr ""
 
+msgid "Everything"
+msgstr ""
+
 msgid "Exit"
 msgstr ""
 
@@ -660,6 +669,9 @@ msgstr ""
 msgid "Extracting files:"
 msgstr ""
 
+msgid "Extracting nand files:"
+msgstr ""
+
 msgid "Failed"
 msgstr ""
 
@@ -817,6 +829,15 @@ msgstr ""
 msgid "Game/Install Partition"
 msgstr ""
 
+msgid "GameTDB Files"
+msgstr ""
+
+msgid "GameTDB Path"
+msgstr ""
+
+msgid "GameTDB is up to date."
+msgstr ""
+
 msgid "Gamename [GAMEID]"
 msgstr ""
 
@@ -1474,6 +1495,9 @@ msgstr ""
 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 ""
+
 msgid "The game installation is disabled under this IOS because of instability in usb write."
 msgstr ""
 
@@ -1517,7 +1541,7 @@ msgstr ""
 msgid "Title Launcher"
 msgstr ""
 
-msgid "Titles from WiiTDB"
+msgid "Titles from GameTDB"
 msgstr ""
 
 msgid "Tooltips"
@@ -1635,6 +1659,9 @@ msgstr ""
 msgid "What should be deleted for this game title:"
 msgstr ""
 
+msgid "What to extract from NAND?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr ""
 
@@ -1650,15 +1677,6 @@ msgstr ""
 msgid "Wii Settings"
 msgstr ""
 
-msgid "WiiTDB Files"
-msgstr ""
-
-msgid "WiiTDB Path"
-msgstr ""
-
-msgid "WiiTDB is up to date."
-msgstr ""
-
 msgid "Wiilight"
 msgstr ""
 
@@ -1713,10 +1731,10 @@ msgstr ""
 msgid "for FAT/NTFS support"
 msgstr ""
 
-msgid "for Ocarina"
+msgid "for GameTDB and hosting covers / disc images"
 msgstr ""
 
-msgid "for WiiTDB and hosting covers / disc images"
+msgid "for Ocarina"
 msgstr ""
 
 msgid "for diverse patches"
diff --git a/Languages/finnish.lang b/Languages/finnish.lang
index b7c11255..c02d0254 100644
--- a/Languages/finnish.lang
+++ b/Languages/finnish.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-24 15:12+0200\n"
+"POT-Creation-Date: 2011-10-21 20:31+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: c64rmx\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 msgid " could not be downloaded."
 msgstr "Latausta ei voitu suorittaa"
@@ -166,7 +166,7 @@ msgstr "huhti"
 msgid "Are you sure you want to delete this category?"
 msgstr ""
 
-msgid "Are you sure you want to import game categories from WiiTDB?"
+msgid "Are you sure you want to import game categories from GameTDB?"
 msgstr ""
 
 msgid "Are you sure you want to lock USB Loader GX?"
@@ -577,6 +577,9 @@ msgstr ""
 msgid "Downloading pagelist:"
 msgstr ""
 
+msgid "Dump NAND to EmuNand"
+msgstr ""
+
 msgid "Dutch"
 msgstr "Hollanti"
 
@@ -592,6 +595,9 @@ msgstr ""
 msgid "English"
 msgstr "Englanti"
 
+msgid "Enter Path"
+msgstr ""
+
 msgid "Error"
 msgstr "Virhe"
 
@@ -639,6 +645,9 @@ msgstr "Virhe:"
 msgid "Errors occured."
 msgstr ""
 
+msgid "Everything"
+msgstr ""
+
 msgid "Exit"
 msgstr ""
 
@@ -660,6 +669,9 @@ msgstr ""
 msgid "Extracting files:"
 msgstr ""
 
+msgid "Extracting nand files:"
+msgstr ""
+
 msgid "Failed"
 msgstr ""
 
@@ -817,6 +829,15 @@ msgstr "Peli on jo asennettu:"
 msgid "Game/Install Partition"
 msgstr ""
 
+msgid "GameTDB Files"
+msgstr ""
+
+msgid "GameTDB Path"
+msgstr ""
+
+msgid "GameTDB is up to date."
+msgstr ""
+
 msgid "Gamename [GAMEID]"
 msgstr ""
 
@@ -1474,6 +1495,9 @@ msgstr ""
 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 ""
+
 msgid "The game installation is disabled under this IOS because of instability in usb write."
 msgstr ""
 
@@ -1517,8 +1541,8 @@ msgstr "Aikaa jäljellä:"
 msgid "Title Launcher"
 msgstr "Nimilaukaisin"
 
-msgid "Titles from WiiTDB"
-msgstr "Nimet WiiTDB:stä"
+msgid "Titles from GameTDB"
+msgstr ""
 
 msgid "Tooltips"
 msgstr "Vinkit"
@@ -1635,6 +1659,9 @@ msgstr "Mitä haluat päivittää?"
 msgid "What should be deleted for this game title:"
 msgstr ""
 
+msgid "What to extract from NAND?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "WiFi ominaisuudet"
 
@@ -1650,15 +1677,6 @@ msgstr "Wii Menu"
 msgid "Wii Settings"
 msgstr "Wii asetukset"
 
-msgid "WiiTDB Files"
-msgstr "WiiTDB tiedostot"
-
-msgid "WiiTDB Path"
-msgstr "WiiTDB polku"
-
-msgid "WiiTDB is up to date."
-msgstr ""
-
 msgid "Wiilight"
 msgstr ""
 
@@ -1713,11 +1731,11 @@ msgstr "Tiedostoja jäljellä"
 msgid "for FAT/NTFS support"
 msgstr ""
 
-msgid "for Ocarina"
+msgid "for GameTDB and hosting covers / disc images"
 msgstr ""
 
-msgid "for WiiTDB and hosting covers / disc images"
-msgstr "WiiTDB:stä ja kansien hostauksesta"
+msgid "for Ocarina"
+msgstr ""
 
 msgid "for diverse patches"
 msgstr "Erinäisistä patcheista"
@@ -1749,6 +1767,18 @@ msgstr "josta"
 msgid "seconds left"
 msgstr "sekuntia jäljellä"
 
+#~ msgid "Titles from WiiTDB"
+#~ msgstr "Nimet WiiTDB:stä"
+
+#~ msgid "WiiTDB Files"
+#~ msgstr "WiiTDB tiedostot"
+
+#~ msgid "WiiTDB Path"
+#~ msgstr "WiiTDB polku"
+
+#~ msgid "for WiiTDB and hosting covers / disc images"
+#~ msgstr "WiiTDB:stä ja kansien hostauksesta"
+
 #~ msgid " Wad Saved as:"
 #~ msgstr "Wad Tallennettu nimellä:"
 
diff --git a/Languages/french.lang b/Languages/french.lang
index cdf0291b..1bfa7f36 100644
--- a/Languages/french.lang
+++ b/Languages/french.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-24 15:12+0200\n"
+"POT-Creation-Date: 2011-10-21 20:31+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: Cyan, Kin8\n"
 "Language-Team: Badablek, Amour, ikya, Cyan & Kin8\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 msgid " could not be downloaded."
 msgstr " ne peut pas être téléchargé."
@@ -166,8 +166,8 @@ msgstr "Avr"
 msgid "Are you sure you want to delete this category?"
 msgstr "Voulez-vous vraiment supprimer cette catégorie ?"
 
-msgid "Are you sure you want to import game categories from WiiTDB?"
-msgstr "Voulez-vous vraiment importer les catégories de jeux à partir de WiiTDB ?"
+msgid "Are you sure you want to import game categories from GameTDB?"
+msgstr ""
 
 msgid "Are you sure you want to lock USB Loader GX?"
 msgstr "Voulez-vous vraiment verrouiller USB loader GX ?"
@@ -577,6 +577,9 @@ msgstr "Téléch. des labels DVD originaux"
 msgid "Downloading pagelist:"
 msgstr "Téléch. des prévisualisations :"
 
+msgid "Dump NAND to EmuNand"
+msgstr ""
+
 msgid "Dutch"
 msgstr "Néerlandais"
 
@@ -592,6 +595,9 @@ msgstr "ERREUR: Configuration thème impossible."
 msgid "English"
 msgstr "Anglais"
 
+msgid "Enter Path"
+msgstr ""
+
 msgid "Error"
 msgstr "Erreur"
 
@@ -639,6 +645,9 @@ msgstr "Erreur:"
 msgid "Errors occured."
 msgstr "Des erreurs sont survenues."
 
+msgid "Everything"
+msgstr ""
+
 msgid "Exit"
 msgstr "Quitter"
 
@@ -660,6 +669,9 @@ msgstr "Extraction des fichiers..."
 msgid "Extracting files:"
 msgstr "Extraction des fichiers :"
 
+msgid "Extracting nand files:"
+msgstr ""
+
 msgid "Failed"
 msgstr "Échec"
 
@@ -817,6 +829,15 @@ msgstr "Le jeu est déjà installé:"
 msgid "Game/Install Partition"
 msgstr "Partition jeu/install."
 
+msgid "GameTDB Files"
+msgstr ""
+
+msgid "GameTDB Path"
+msgstr ""
+
+msgid "GameTDB is up to date."
+msgstr ""
+
 msgid "Gamename [GAMEID]"
 msgstr "NomJeu [IDJEU]"
 
@@ -1474,6 +1495,9 @@ msgstr "Fichier .them non trouvé dans le zip."
 msgid "The entered directory does not exist. Would you like to create it?"
 msgstr "Répertoire indiqué inexistant. Souhaitez-vous le créer ?"
 
+msgid "The files will be extracted to your emu nand path. Attention: All existing files will be overwritten."
+msgstr ""
+
 msgid "The game installation is disabled under this IOS because of instability in usb write."
 msgstr "L'installation d'un jeu est désactivée en utilisant cet IOS pour cause d'instabilité en écriture sur l'USB."
 
@@ -1517,8 +1541,8 @@ msgstr "Fini dans:"
 msgid "Title Launcher"
 msgstr "Menu Chaînes"
 
-msgid "Titles from WiiTDB"
-msgstr "Titres de WiiTDB"
+msgid "Titles from GameTDB"
+msgstr ""
 
 msgid "Tooltips"
 msgstr "Info-bulles"
@@ -1635,6 +1659,9 @@ msgstr "Choix de la mise à jour"
 msgid "What should be deleted for this game title:"
 msgstr "Que voulez-vous supprimer pour ce titre?"
 
+msgid "What to extract from NAND?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "Connexion WiFi"
 
@@ -1650,15 +1677,6 @@ msgstr "Menu Wii"
 msgid "Wii Settings"
 msgstr "Paramètres Wii"
 
-msgid "WiiTDB Files"
-msgstr "Fichier WiiTDB"
-
-msgid "WiiTDB Path"
-msgstr "Dossier WiiTDB"
-
-msgid "WiiTDB is up to date."
-msgstr "WiiTDB est à jour."
-
 msgid "Wiilight"
 msgstr "Illumination Wii"
 
@@ -1713,12 +1731,12 @@ msgstr "fichiers restants"
 msgid "for FAT/NTFS support"
 msgstr "pour le support FAT/NTFS"
 
+msgid "for GameTDB and hosting covers / disc images"
+msgstr ""
+
 msgid "for Ocarina"
 msgstr "pour Ocarina"
 
-msgid "for WiiTDB and hosting covers / disc images"
-msgstr "pour WiiTDB et l'hébergement des jaquettes"
-
 msgid "for diverse patches"
 msgstr "pour les divers patchs"
 
@@ -1748,3 +1766,21 @@ msgstr "sur"
 
 msgid "seconds left"
 msgstr "secondes restantes"
+
+#~ msgid "Are you sure you want to import game categories from WiiTDB?"
+#~ msgstr "Voulez-vous vraiment importer les catégories de jeux à partir de WiiTDB ?"
+
+#~ msgid "Titles from WiiTDB"
+#~ msgstr "Titres de WiiTDB"
+
+#~ msgid "WiiTDB Files"
+#~ msgstr "Fichier WiiTDB"
+
+#~ msgid "WiiTDB Path"
+#~ msgstr "Dossier WiiTDB"
+
+#~ msgid "WiiTDB is up to date."
+#~ msgstr "WiiTDB est à jour."
+
+#~ msgid "for WiiTDB and hosting covers / disc images"
+#~ msgstr "pour WiiTDB et l'hébergement des jaquettes"
diff --git a/Languages/german.lang b/Languages/german.lang
index 6977a451..12330159 100644
--- a/Languages/german.lang
+++ b/Languages/german.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-24 16:37+0200\n"
+"POT-Creation-Date: 2011-10-21 20:31+0200\n"
 "PO-Revision-Date: 2010-07-03 17:35-0800\n"
 "Last-Translator: TheRealVisitor\n"
 "Language-Team: Bertilax, Snoozer, wishmasterf, ZEN.13, TheRealVisitor\n"
+"Language: German\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: German\n"
 
 msgid " could not be downloaded."
 msgstr " konnte nicht heruntergeladen werden."
@@ -166,8 +166,8 @@ msgstr "April"
 msgid "Are you sure you want to delete this category?"
 msgstr "Soll diese Kategorie gelöscht werden?"
 
-msgid "Are you sure you want to import game categories from WiiTDB?"
-msgstr "Sollen die Spiele-Kategorien aus der WiiTDB importiert werden?"
+msgid "Are you sure you want to import game categories from GameTDB?"
+msgstr ""
 
 msgid "Are you sure you want to lock USB Loader GX?"
 msgstr "Bist du sicher, dass du USB Loader GX sperren willst?"
@@ -577,6 +577,9 @@ msgstr "Lade Diskcover herunter"
 msgid "Downloading pagelist:"
 msgstr "Lade Seitenliste herunter:"
 
+msgid "Dump NAND to EmuNand"
+msgstr ""
+
 msgid "Dutch"
 msgstr "Niederländisch"
 
@@ -592,6 +595,9 @@ msgstr "FEHLER: Theme kann nicht eingerichtet werden."
 msgid "English"
 msgstr "Englisch"
 
+msgid "Enter Path"
+msgstr ""
+
 msgid "Error"
 msgstr "Fehler"
 
@@ -639,6 +645,9 @@ msgstr "Fehler:"
 msgid "Errors occured."
 msgstr "Fehler aufgetreten."
 
+msgid "Everything"
+msgstr ""
+
 msgid "Exit"
 msgstr "Beenden"
 
@@ -660,6 +669,9 @@ msgstr "Entpacke Dateien..."
 msgid "Extracting files:"
 msgstr "Entpacke Dateien:"
 
+msgid "Extracting nand files:"
+msgstr ""
+
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
@@ -817,6 +829,15 @@ msgstr "Spiel ist bereits installiert:"
 msgid "Game/Install Partition"
 msgstr "Spiel/Instal. Partition"
 
+msgid "GameTDB Files"
+msgstr ""
+
+msgid "GameTDB Path"
+msgstr ""
+
+msgid "GameTDB is up to date."
+msgstr ""
+
 msgid "Gamename [GAMEID]"
 msgstr "Spielname [SPIELID]"
 
@@ -1474,6 +1495,9 @@ msgstr "Die .them Datei wurde in der zip nicht gefunden."
 msgid "The entered directory does not exist. Would you like to create it?"
 msgstr "Das eingegebene Verzeichnis existiert nicht. Möchtest du es erstellen?"
 
+msgid "The files will be extracted to your emu nand path. Attention: All existing files will be overwritten."
+msgstr ""
+
 msgid "The game installation is disabled under this IOS because of instability in usb write."
 msgstr "Das Installieren von Spielen ist bei Verwendung dieses IOS wegen Instabilität beim USB-Schreiben deaktiviert."
 
@@ -1517,8 +1541,8 @@ msgstr "Noch:"
 msgid "Title Launcher"
 msgstr "Channel Launcher"
 
-msgid "Titles from WiiTDB"
-msgstr "Namen aus WiiTDB"
+msgid "Titles from GameTDB"
+msgstr ""
 
 msgid "Tooltips"
 msgstr "Quickinfo"
@@ -1635,6 +1659,9 @@ msgstr "Was möchtest du aktualisieren?"
 msgid "What should be deleted for this game title:"
 msgstr "Was sollte bei diesem Spiel gelöscht werden:"
 
+msgid "What to extract from NAND?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "WiFi Fähigkeiten"
 
@@ -1650,15 +1677,6 @@ msgstr "Wii Menü"
 msgid "Wii Settings"
 msgstr "Wii Datenverwaltung"
 
-msgid "WiiTDB Files"
-msgstr "WiiTDB Dateien"
-
-msgid "WiiTDB Path"
-msgstr "WiiTDB"
-
-msgid "WiiTDB is up to date."
-msgstr "WiiTDB ist aktuell."
-
 msgid "Wiilight"
 msgstr "Licht am Laufwerk"
 
@@ -1713,12 +1731,12 @@ msgstr "Dateien fehlen"
 msgid "for FAT/NTFS support"
 msgstr "für den FAT/NTFS Support"
 
+msgid "for GameTDB and hosting covers / disc images"
+msgstr ""
+
 msgid "for Ocarina"
 msgstr "für Ocarina"
 
-msgid "for WiiTDB and hosting covers / disc images"
-msgstr "für WiiTDB und dem Hosten der (Disc) Cover"
-
 msgid "for diverse patches"
 msgstr "für diverse Patches"
 
@@ -1749,6 +1767,24 @@ msgstr "von"
 msgid "seconds left"
 msgstr "Sekunden verbleiben"
 
+#~ msgid "Are you sure you want to import game categories from WiiTDB?"
+#~ msgstr "Sollen die Spiele-Kategorien aus der WiiTDB importiert werden?"
+
+#~ msgid "Titles from WiiTDB"
+#~ msgstr "Namen aus WiiTDB"
+
+#~ msgid "WiiTDB Files"
+#~ msgstr "WiiTDB Dateien"
+
+#~ msgid "WiiTDB Path"
+#~ msgstr "WiiTDB"
+
+#~ msgid "WiiTDB is up to date."
+#~ msgstr "WiiTDB ist aktuell."
+
+#~ msgid "for WiiTDB and hosting covers / disc images"
+#~ msgstr "für WiiTDB und dem Hosten der (Disc) Cover"
+
 #~ msgid "Automatic port switching is done on the fly. You need to change all custom paths to SD-Card first for this option or else it could damage a filesystem."
 #~ msgstr "Automatische Portumschaltung wird jetzt direkt zur Programmlaufzeit durchgeführt. Für diese Option müssen zuerst alle eigenen Pfade auf die SD Karte verweisen, da ansonsten das Dateisystem beschädigt werden könnte."
 
diff --git a/Languages/hungarian.lang b/Languages/hungarian.lang
index 4523797a..12d8c7a3 100644
--- a/Languages/hungarian.lang
+++ b/Languages/hungarian.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-24 15:12+0200\n"
+"POT-Creation-Date: 2011-10-21 20:31+0200\n"
 "PO-Revision-Date: 2009-12-29 11:05+0100\n"
 "Last-Translator: Springdale\n"
 "Language-Team: Tusk, Springdale\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 msgid " could not be downloaded."
 msgstr "nem letölthetõ."
@@ -166,7 +166,7 @@ msgstr "Ápr"
 msgid "Are you sure you want to delete this category?"
 msgstr ""
 
-msgid "Are you sure you want to import game categories from WiiTDB?"
+msgid "Are you sure you want to import game categories from GameTDB?"
 msgstr ""
 
 msgid "Are you sure you want to lock USB Loader GX?"
@@ -577,6 +577,9 @@ msgstr ""
 msgid "Downloading pagelist:"
 msgstr ""
 
+msgid "Dump NAND to EmuNand"
+msgstr ""
+
 msgid "Dutch"
 msgstr "Holland"
 
@@ -592,6 +595,9 @@ msgstr "HIBA: Téma nem állítható be"
 msgid "English"
 msgstr "Angol"
 
+msgid "Enter Path"
+msgstr ""
+
 msgid "Error"
 msgstr "Hiba"
 
@@ -639,6 +645,9 @@ msgstr "Hiba:"
 msgid "Errors occured."
 msgstr ""
 
+msgid "Everything"
+msgstr ""
+
 msgid "Exit"
 msgstr ""
 
@@ -660,6 +669,9 @@ msgstr "Fájlok kicsomagolása..."
 msgid "Extracting files:"
 msgstr ""
 
+msgid "Extracting nand files:"
+msgstr ""
+
 msgid "Failed"
 msgstr ""
 
@@ -817,6 +829,15 @@ msgstr "A játék már fel van telepítve:"
 msgid "Game/Install Partition"
 msgstr ""
 
+msgid "GameTDB Files"
+msgstr ""
+
+msgid "GameTDB Path"
+msgstr ""
+
+msgid "GameTDB is up to date."
+msgstr ""
+
 msgid "Gamename [GAMEID]"
 msgstr ""
 
@@ -1474,6 +1495,9 @@ msgstr ""
 msgid "The entered directory does not exist. Would you like to create it?"
 msgstr "A megadott könyvtár nem létezik. Létrehozzuk?"
 
+msgid "The files will be extracted to your emu nand path. Attention: All existing files will be overwritten."
+msgstr ""
+
 msgid "The game installation is disabled under this IOS because of instability in usb write."
 msgstr ""
 
@@ -1517,8 +1541,8 @@ msgstr "Hátralevõ idõ"
 msgid "Title Launcher"
 msgstr "Programindító"
 
-msgid "Titles from WiiTDB"
-msgstr "Címek WiiTDB fájlból"
+msgid "Titles from GameTDB"
+msgstr ""
 
 msgid "Tooltips"
 msgstr "Súgók"
@@ -1635,6 +1659,9 @@ msgstr "Mit szeretnél frissíteni?"
 msgid "What should be deleted for this game title:"
 msgstr ""
 
+msgid "What to extract from NAND?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "WiFi Sajátosságok"
 
@@ -1650,15 +1677,6 @@ msgstr "Wii Menü"
 msgid "Wii Settings"
 msgstr "Wii Beállítások"
 
-msgid "WiiTDB Files"
-msgstr "WiiTDB fájlok"
-
-msgid "WiiTDB Path"
-msgstr "WiiTDB Útvonala"
-
-msgid "WiiTDB is up to date."
-msgstr ""
-
 msgid "Wiilight"
 msgstr "WiiFény"
 
@@ -1713,12 +1731,12 @@ msgstr "hátralévõ fájl"
 msgid "for FAT/NTFS support"
 msgstr "FAT/NTFS támogatás"
 
+msgid "for GameTDB and hosting covers / disc images"
+msgstr ""
+
 msgid "for Ocarina"
 msgstr ": Ocarina"
 
-msgid "for WiiTDB and hosting covers / disc images"
-msgstr ": WiiTDB és borítók/lemezfotók"
-
 msgid "for diverse patches"
 msgstr ": többféle patch"
 
@@ -1749,6 +1767,18 @@ msgstr "./"
 msgid "seconds left"
 msgstr "hátralévõ másodperc"
 
+#~ msgid "Titles from WiiTDB"
+#~ msgstr "Címek WiiTDB fájlból"
+
+#~ msgid "WiiTDB Files"
+#~ msgstr "WiiTDB fájlok"
+
+#~ msgid "WiiTDB Path"
+#~ msgstr "WiiTDB Útvonala"
+
+#~ msgid "for WiiTDB and hosting covers / disc images"
+#~ msgstr ": WiiTDB és borítók/lemezfotók"
+
 #~ msgid "Install partitions"
 #~ msgstr "Partíciók telepítése"
 
diff --git a/Languages/italian.lang b/Languages/italian.lang
index c2c75fb1..8e5bdba2 100644
--- a/Languages/italian.lang
+++ b/Languages/italian.lang
@@ -5,10 +5,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-24 15:12+0200\n"
+"POT-Creation-Date: 2011-10-21 20:31+0200\n"
 "PO-Revision-Date: 2011-09-11 12:19+0100\n"
 "Last-Translator: bovirus <bovirus@live.it>\n"
 "Language-Team: Cambo\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -165,8 +166,8 @@ msgstr "Aprile"
 msgid "Are you sure you want to delete this category?"
 msgstr "Eliminare questa categoria?"
 
-msgid "Are you sure you want to import game categories from WiiTDB?"
-msgstr "Importare le categorie da WiiTDB?"
+msgid "Are you sure you want to import game categories from GameTDB?"
+msgstr ""
 
 msgid "Are you sure you want to lock USB Loader GX?"
 msgstr "Bloccare USB Loader GX?"
@@ -576,6 +577,9 @@ msgstr "Download imm. disco originali"
 msgid "Downloading pagelist:"
 msgstr "Download pagina elenco:"
 
+msgid "Dump NAND to EmuNand"
+msgstr ""
+
 msgid "Dutch"
 msgstr "Olandese"
 
@@ -591,6 +595,9 @@ msgstr "ERRORE: impossibile configurare il tema."
 msgid "English"
 msgstr "Inglese"
 
+msgid "Enter Path"
+msgstr ""
+
 msgid "Error"
 msgstr "Errore"
 
@@ -638,6 +645,9 @@ msgstr "Errore:"
 msgid "Errors occured."
 msgstr ""
 
+msgid "Everything"
+msgstr ""
+
 msgid "Exit"
 msgstr "Esci"
 
@@ -659,6 +669,9 @@ msgstr "Decompressione dei file..."
 msgid "Extracting files:"
 msgstr ""
 
+msgid "Extracting nand files:"
+msgstr ""
+
 msgid "Failed"
 msgstr "Errore"
 
@@ -816,6 +829,15 @@ msgstr "Gioco già installato:"
 msgid "Game/Install Partition"
 msgstr "Partizione giochi/inst."
 
+msgid "GameTDB Files"
+msgstr ""
+
+msgid "GameTDB Path"
+msgstr ""
+
+msgid "GameTDB is up to date."
+msgstr ""
+
 msgid "Gamename [GAMEID]"
 msgstr "Nomegioco [IDGIOCO]"
 
@@ -1473,6 +1495,9 @@ msgstr "Il file .them non è stato trovato nel file zip."
 msgid "The entered directory does not exist. Would you like to create it?"
 msgstr "La cartella indicata non esiste. Crearla?"
 
+msgid "The files will be extracted to your emu nand path. Attention: All existing files will be overwritten."
+msgstr ""
+
 msgid "The game installation is disabled under this IOS because of instability in usb write."
 msgstr "L'installazione dei giochi è disabilitata poiché la scrittura sul disco USB è instabile usando questo IOS"
 
@@ -1516,8 +1541,8 @@ msgstr "Rimanente:"
 msgid "Title Launcher"
 msgstr "Avvio titoli"
 
-msgid "Titles from WiiTDB"
-msgstr "Titoli dal file WiiTDB"
+msgid "Titles from GameTDB"
+msgstr ""
 
 msgid "Tooltips"
 msgstr "Suggerimenti"
@@ -1634,6 +1659,9 @@ msgstr "Che cosa aggiornare?"
 msgid "What should be deleted for this game title:"
 msgstr "Cosa eliminare per questo gioco?"
 
+msgid "What to extract from NAND?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "Funzionalità WiFi"
 
@@ -1649,15 +1677,6 @@ msgstr "Menu Wii"
 msgid "Wii Settings"
 msgstr "Impostazioni Wii"
 
-msgid "WiiTDB Files"
-msgstr "File WiiTDB"
-
-msgid "WiiTDB Path"
-msgstr "Percorso Archivio WiiTDB"
-
-msgid "WiiTDB is up to date."
-msgstr "WiiTDB è aggiornato."
-
 msgid "Wiilight"
 msgstr "Illuminazione Wii"
 
@@ -1712,12 +1731,12 @@ msgstr "file mancanti"
 msgid "for FAT/NTFS support"
 msgstr "per il supporto FAT/NTFS"
 
+msgid "for GameTDB and hosting covers / disc images"
+msgstr ""
+
 msgid "for Ocarina"
 msgstr "per Ocarina"
 
-msgid "for WiiTDB and hosting covers / disc images"
-msgstr "per l'archivio WiiTDB e le copertine online"
-
 msgid "for diverse patches"
 msgstr "per le numerose correzioni"
 
@@ -1747,3 +1766,21 @@ msgstr "di"
 
 msgid "seconds left"
 msgstr "secondi rimanenti"
+
+#~ msgid "Are you sure you want to import game categories from WiiTDB?"
+#~ msgstr "Importare le categorie da WiiTDB?"
+
+#~ msgid "Titles from WiiTDB"
+#~ msgstr "Titoli dal file WiiTDB"
+
+#~ msgid "WiiTDB Files"
+#~ msgstr "File WiiTDB"
+
+#~ msgid "WiiTDB Path"
+#~ msgstr "Percorso Archivio WiiTDB"
+
+#~ msgid "WiiTDB is up to date."
+#~ msgstr "WiiTDB è aggiornato."
+
+#~ msgid "for WiiTDB and hosting covers / disc images"
+#~ msgstr "per l'archivio WiiTDB e le copertine online"
diff --git a/Languages/japanese.lang b/Languages/japanese.lang
index 27137ed3..5782ad21 100644
--- a/Languages/japanese.lang
+++ b/Languages/japanese.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-24 15:12+0200\n"
+"POT-Creation-Date: 2011-10-21 20:31+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: hosigumayuugi\n"
 "Language-Team: hosigumayuugi, papa, ichiroling\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 msgid " could not be downloaded."
 msgstr "ﾀﾞｳﾝﾛｰﾄﾞできませんでした"
@@ -166,8 +166,8 @@ msgstr "4月"
 msgid "Are you sure you want to delete this category?"
 msgstr "カテゴリを削除しますか?"
 
-msgid "Are you sure you want to import game categories from WiiTDB?"
-msgstr "WiiTDBからカテゴリをインポートしますか?"
+msgid "Are you sure you want to import game categories from GameTDB?"
+msgstr ""
 
 msgid "Are you sure you want to lock USB Loader GX?"
 msgstr "USB Loader GXをロックしますか?"
@@ -577,6 +577,9 @@ msgstr "公式ﾚｰﾍﾞﾙをダウンロード中"
 msgid "Downloading pagelist:"
 msgstr "リストをダウンロード中:"
 
+msgid "Dump NAND to EmuNand"
+msgstr ""
+
 msgid "Dutch"
 msgstr "オランダ語"
 
@@ -592,6 +595,9 @@ msgstr "テーマを適用できませんでした"
 msgid "English"
 msgstr "英語"
 
+msgid "Enter Path"
+msgstr ""
+
 msgid "Error"
 msgstr "エラー"
 
@@ -639,6 +645,9 @@ msgstr "エラー:"
 msgid "Errors occured."
 msgstr "エラーが発生しました"
 
+msgid "Everything"
+msgstr ""
+
 msgid "Exit"
 msgstr "終了"
 
@@ -660,6 +669,9 @@ msgstr "解凍中です…"
 msgid "Extracting files:"
 msgstr "書き出し中:"
 
+msgid "Extracting nand files:"
+msgstr ""
+
 msgid "Failed"
 msgstr "失敗"
 
@@ -817,6 +829,15 @@ msgstr "このｹﾞｰﾑは既にｲﾝｽﾄｰﾙされています:"
 msgid "Game/Install Partition"
 msgstr "ｹﾞｰﾑのｲﾝｽﾄｰﾙ領域"
 
+msgid "GameTDB Files"
+msgstr ""
+
+msgid "GameTDB Path"
+msgstr ""
+
+msgid "GameTDB is up to date."
+msgstr ""
+
 msgid "Gamename [GAMEID]"
 msgstr "ゲーム名 [ゲームID]"
 
@@ -1474,6 +1495,9 @@ msgstr ".themファイルがzip内にありません"
 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 ""
+
 msgid "The game installation is disabled under this IOS because of instability in usb write."
 msgstr "このIOSでのゲームの追加は不安定なため無効になっています"
 
@@ -1517,8 +1541,8 @@ msgstr "残り時間:"
 msgid "Title Launcher"
 msgstr "ランチャー"
 
-msgid "Titles from WiiTDB"
-msgstr "ｹﾞｰﾑ名の日本語化"
+msgid "Titles from GameTDB"
+msgstr ""
 
 msgid "Tooltips"
 msgstr "ヒントバルーン"
@@ -1635,6 +1659,9 @@ msgstr "更新の選択"
 msgid "What should be deleted for this game title:"
 msgstr "このゲームの何を削除しますか:"
 
+msgid "What to extract from NAND?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "ネットワーク対応"
 
@@ -1650,15 +1677,6 @@ msgstr "Wiiメニューへ"
 msgid "Wii Settings"
 msgstr "データ管理"
 
-msgid "WiiTDB Files"
-msgstr "ゲーム名リスト"
-
-msgid "WiiTDB Path"
-msgstr "ゲーム名リスト"
-
-msgid "WiiTDB is up to date."
-msgstr "WiiTDBが更新されました"
-
 msgid "Wiilight"
 msgstr "スロット点灯機能"
 
@@ -1713,12 +1731,12 @@ msgstr "個で完了"
 msgid "for FAT/NTFS support"
 msgstr "…FATとNTFSへの対応"
 
+msgid "for GameTDB and hosting covers / disc images"
+msgstr ""
+
 msgid "for Ocarina"
 msgstr "…Ocarinaを制作"
 
-msgid "for WiiTDB and hosting covers / disc images"
-msgstr "WiiTDB…様々な画像を配布"
-
 msgid "for diverse patches"
 msgstr "…様々なパッチを制作"
 
@@ -1748,3 +1766,21 @@ msgstr "中"
 
 msgid "seconds left"
 msgstr "秒で完了"
+
+#~ msgid "Are you sure you want to import game categories from WiiTDB?"
+#~ msgstr "WiiTDBからカテゴリをインポートしますか?"
+
+#~ msgid "Titles from WiiTDB"
+#~ msgstr "ｹﾞｰﾑ名の日本語化"
+
+#~ msgid "WiiTDB Files"
+#~ msgstr "ゲーム名リスト"
+
+#~ msgid "WiiTDB Path"
+#~ msgstr "ゲーム名リスト"
+
+#~ msgid "WiiTDB is up to date."
+#~ msgstr "WiiTDBが更新されました"
+
+#~ msgid "for WiiTDB and hosting covers / disc images"
+#~ msgstr "WiiTDB…様々な画像を配布"
diff --git a/Languages/korean.lang b/Languages/korean.lang
index db84f2a2..eddb0b44 100644
--- a/Languages/korean.lang
+++ b/Languages/korean.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-24 15:12+0200\n"
+"POT-Creation-Date: 2011-10-21 20:31+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: nextos@korea.com\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 msgid " could not be downloaded."
 msgstr " 다운로드할수 없음."
@@ -166,7 +166,7 @@ msgstr "4월"
 msgid "Are you sure you want to delete this category?"
 msgstr ""
 
-msgid "Are you sure you want to import game categories from WiiTDB?"
+msgid "Are you sure you want to import game categories from GameTDB?"
 msgstr ""
 
 msgid "Are you sure you want to lock USB Loader GX?"
@@ -577,6 +577,9 @@ msgstr ""
 msgid "Downloading pagelist:"
 msgstr ""
 
+msgid "Dump NAND to EmuNand"
+msgstr ""
+
 msgid "Dutch"
 msgstr "네덜란드어"
 
@@ -592,6 +595,9 @@ msgstr ""
 msgid "English"
 msgstr "영어"
 
+msgid "Enter Path"
+msgstr ""
+
 msgid "Error"
 msgstr "에러"
 
@@ -639,6 +645,9 @@ msgstr "에러:"
 msgid "Errors occured."
 msgstr ""
 
+msgid "Everything"
+msgstr ""
+
 msgid "Exit"
 msgstr ""
 
@@ -660,6 +669,9 @@ msgstr ""
 msgid "Extracting files:"
 msgstr ""
 
+msgid "Extracting nand files:"
+msgstr ""
+
 msgid "Failed"
 msgstr ""
 
@@ -817,6 +829,15 @@ msgstr "게임이 이미 설치되어 있습니다."
 msgid "Game/Install Partition"
 msgstr ""
 
+msgid "GameTDB Files"
+msgstr ""
+
+msgid "GameTDB Path"
+msgstr ""
+
+msgid "GameTDB is up to date."
+msgstr ""
+
 msgid "Gamename [GAMEID]"
 msgstr ""
 
@@ -1474,6 +1495,9 @@ msgstr ""
 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 ""
+
 msgid "The game installation is disabled under this IOS because of instability in usb write."
 msgstr ""
 
@@ -1517,8 +1541,8 @@ msgstr "남은 시간:"
 msgid "Title Launcher"
 msgstr "타이틀 런처"
 
-msgid "Titles from WiiTDB"
-msgstr "WiiTDB에서 타이틀을"
+msgid "Titles from GameTDB"
+msgstr ""
 
 msgid "Tooltips"
 msgstr "Tooltips"
@@ -1635,6 +1659,9 @@ msgstr "무엇을 업데이트 할까요?"
 msgid "What should be deleted for this game title:"
 msgstr ""
 
+msgid "What to extract from NAND?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "WiFi 형태"
 
@@ -1650,15 +1677,6 @@ msgstr "Wii 메뉴로"
 msgid "Wii Settings"
 msgstr "위 설정"
 
-msgid "WiiTDB Files"
-msgstr "WiiTDB 화일"
-
-msgid "WiiTDB Path"
-msgstr "WiiTDB경로"
-
-msgid "WiiTDB is up to date."
-msgstr ""
-
 msgid "Wiilight"
 msgstr "Wiilight"
 
@@ -1713,12 +1731,12 @@ msgstr "화일들이 남음"
 msgid "for FAT/NTFS support"
 msgstr ""
 
+msgid "for GameTDB and hosting covers / disc images"
+msgstr ""
+
 msgid "for Ocarina"
 msgstr "Ocarina 위하여"
 
-msgid "for WiiTDB and hosting covers / disc images"
-msgstr "WiiTDB, 커버, 디스크이미지를 위하여"
-
 msgid "for diverse patches"
 msgstr "디버스 패치를 위하여"
 
@@ -1749,6 +1767,18 @@ msgstr "중"
 msgid "seconds left"
 msgstr "초 남았습니다"
 
+#~ msgid "Titles from WiiTDB"
+#~ msgstr "WiiTDB에서 타이틀을"
+
+#~ msgid "WiiTDB Files"
+#~ msgstr "WiiTDB 화일"
+
+#~ msgid "WiiTDB Path"
+#~ msgstr "WiiTDB경로"
+
+#~ msgid "for WiiTDB and hosting covers / disc images"
+#~ msgstr "WiiTDB, 커버, 디스크이미지를 위하여"
+
 #~ msgid " Wad Saved as:"
 #~ msgstr " Wad 저장은:"
 
diff --git a/Languages/norwegian.lang b/Languages/norwegian.lang
index 8608da59..0fa7e923 100644
--- a/Languages/norwegian.lang
+++ b/Languages/norwegian.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-24 15:12+0200\n"
+"POT-Creation-Date: 2011-10-21 20:31+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: raschi\n"
 "Language-Team: raschi\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 msgid " could not be downloaded."
 msgstr " kan ikke lastes ned."
@@ -166,8 +166,8 @@ msgstr ""
 msgid "Are you sure you want to delete this category?"
 msgstr "Er du sikker på at du vil slette denne kategorien?"
 
-msgid "Are you sure you want to import game categories from WiiTDB?"
-msgstr "Er du sikker på at du vil importere kategorier fra WiiTDB?"
+msgid "Are you sure you want to import game categories from GameTDB?"
+msgstr ""
 
 msgid "Are you sure you want to lock USB Loader GX?"
 msgstr "Er du sikker på at du vil låse USB Loader GX?"
@@ -577,6 +577,9 @@ msgstr "Laster ned originale platebilde"
 msgid "Downloading pagelist:"
 msgstr "Laster ned sideliste:"
 
+msgid "Dump NAND to EmuNand"
+msgstr ""
+
 msgid "Dutch"
 msgstr "Nederlandsk"
 
@@ -592,6 +595,9 @@ msgstr "FEIL: Kan ikke laste tema."
 msgid "English"
 msgstr "Engelsk"
 
+msgid "Enter Path"
+msgstr ""
+
 msgid "Error"
 msgstr "Feil"
 
@@ -639,6 +645,9 @@ msgstr "Feil:"
 msgid "Errors occured."
 msgstr ""
 
+msgid "Everything"
+msgstr ""
+
 msgid "Exit"
 msgstr "Avslutt"
 
@@ -660,6 +669,9 @@ msgstr "Pakker ut filer..."
 msgid "Extracting files:"
 msgstr ""
 
+msgid "Extracting nand files:"
+msgstr ""
+
 msgid "Failed"
 msgstr "Feilet"
 
@@ -817,6 +829,15 @@ msgstr "Spillet er allerede installert:"
 msgid "Game/Install Partition"
 msgstr "Spill/installer partisjon"
 
+msgid "GameTDB Files"
+msgstr ""
+
+msgid "GameTDB Path"
+msgstr ""
+
+msgid "GameTDB is up to date."
+msgstr ""
+
 msgid "Gamename [GAMEID]"
 msgstr "Spillnavn [SPILLID]"
 
@@ -1474,6 +1495,9 @@ msgstr "Filen .them ble ikke funnet i zip."
 msgid "The entered directory does not exist. Would you like to create it?"
 msgstr "Valgt mappe finnes ikke. Vil du opprette den?"
 
+msgid "The files will be extracted to your emu nand path. Attention: All existing files will be overwritten."
+msgstr ""
+
 msgid "The game installation is disabled under this IOS because of instability in usb write."
 msgstr "Spillinstallasjon er deaktivert under dette IOS pga ustabilitet ved skriving til USB."
 
@@ -1517,8 +1541,8 @@ msgstr "Tid igjen:"
 msgid "Title Launcher"
 msgstr "Tittel Laster"
 
-msgid "Titles from WiiTDB"
-msgstr "Titler fra WiiTDB"
+msgid "Titles from GameTDB"
+msgstr ""
 
 msgid "Tooltips"
 msgstr "Verktøystips"
@@ -1635,6 +1659,9 @@ msgstr "Hva vil du oppdatere?"
 msgid "What should be deleted for this game title:"
 msgstr "Hva skal slettes for denne spilltittel:"
 
+msgid "What to extract from NAND?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "WiFi egenskaper"
 
@@ -1650,15 +1677,6 @@ msgstr "Wii Meny"
 msgid "Wii Settings"
 msgstr "Wii Innstillinger"
 
-msgid "WiiTDB Files"
-msgstr "WiiTDB filer"
-
-msgid "WiiTDB Path"
-msgstr "WiiTDB sti"
-
-msgid "WiiTDB is up to date."
-msgstr "WiiTDB er oppdatert."
-
 msgid "Wiilight"
 msgstr "Wii DVD lys"
 
@@ -1713,11 +1731,11 @@ msgstr "filer gjenstår"
 msgid "for FAT/NTFS support"
 msgstr "for FAT/NTFS støtte"
 
-msgid "for Ocarina"
+msgid "for GameTDB and hosting covers / disc images"
 msgstr ""
 
-msgid "for WiiTDB and hosting covers / disc images"
-msgstr "for WiiTDB og hosting av bilder"
+msgid "for Ocarina"
+msgstr ""
 
 msgid "for diverse patches"
 msgstr "for diverse patcher"
@@ -1748,3 +1766,21 @@ msgstr "av"
 
 msgid "seconds left"
 msgstr "sekunder gjenstår"
+
+#~ msgid "Are you sure you want to import game categories from WiiTDB?"
+#~ msgstr "Er du sikker på at du vil importere kategorier fra WiiTDB?"
+
+#~ msgid "Titles from WiiTDB"
+#~ msgstr "Titler fra WiiTDB"
+
+#~ msgid "WiiTDB Files"
+#~ msgstr "WiiTDB filer"
+
+#~ msgid "WiiTDB Path"
+#~ msgstr "WiiTDB sti"
+
+#~ msgid "WiiTDB is up to date."
+#~ msgstr "WiiTDB er oppdatert."
+
+#~ msgid "for WiiTDB and hosting covers / disc images"
+#~ msgstr "for WiiTDB og hosting av bilder"
diff --git a/Languages/polish.lang b/Languages/polish.lang
index 6463d23a..bd862e2d 100644
--- a/Languages/polish.lang
+++ b/Languages/polish.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-24 15:12+0200\n"
+"POT-Creation-Date: 2011-10-21 20:31+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: ziom666 (zadania_prog@vp.pl)\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 msgid " could not be downloaded."
 msgstr " nie udalo sie pobrac"
@@ -166,7 +166,7 @@ msgstr "Kwiecien"
 msgid "Are you sure you want to delete this category?"
 msgstr ""
 
-msgid "Are you sure you want to import game categories from WiiTDB?"
+msgid "Are you sure you want to import game categories from GameTDB?"
 msgstr ""
 
 msgid "Are you sure you want to lock USB Loader GX?"
@@ -577,6 +577,9 @@ msgstr ""
 msgid "Downloading pagelist:"
 msgstr ""
 
+msgid "Dump NAND to EmuNand"
+msgstr ""
+
 msgid "Dutch"
 msgstr "holenderski"
 
@@ -592,6 +595,9 @@ msgstr "Blad: nie mozna ustawic tematu"
 msgid "English"
 msgstr "angielski"
 
+msgid "Enter Path"
+msgstr ""
+
 msgid "Error"
 msgstr "Blad"
 
@@ -639,6 +645,9 @@ msgstr "Blad:"
 msgid "Errors occured."
 msgstr ""
 
+msgid "Everything"
+msgstr ""
+
 msgid "Exit"
 msgstr ""
 
@@ -660,6 +669,9 @@ msgstr "Rozpakowywanie plikow..."
 msgid "Extracting files:"
 msgstr ""
 
+msgid "Extracting nand files:"
+msgstr ""
+
 msgid "Failed"
 msgstr ""
 
@@ -817,6 +829,15 @@ msgstr "Gra jest juz zainstalowana:"
 msgid "Game/Install Partition"
 msgstr ""
 
+msgid "GameTDB Files"
+msgstr ""
+
+msgid "GameTDB Path"
+msgstr ""
+
+msgid "GameTDB is up to date."
+msgstr ""
+
 msgid "Gamename [GAMEID]"
 msgstr ""
 
@@ -1474,6 +1495,9 @@ msgstr ""
 msgid "The entered directory does not exist. Would you like to create it?"
 msgstr "Katalog nie istnieje. Utworzyc?"
 
+msgid "The files will be extracted to your emu nand path. Attention: All existing files will be overwritten."
+msgstr ""
+
 msgid "The game installation is disabled under this IOS because of instability in usb write."
 msgstr ""
 
@@ -1517,8 +1541,8 @@ msgstr "Czas pozostaly"
 msgid "Title Launcher"
 msgstr "Uruchom tytul"
 
-msgid "Titles from WiiTDB"
-msgstr "Tytuly z pliku WiiTDB"
+msgid "Titles from GameTDB"
+msgstr ""
 
 msgid "Tooltips"
 msgstr "Chmurki z podpowiedziami"
@@ -1635,6 +1659,9 @@ msgstr "Rodzaj aktualizacji"
 msgid "What should be deleted for this game title:"
 msgstr ""
 
+msgid "What to extract from NAND?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "Opcje WiFi"
 
@@ -1650,15 +1677,6 @@ msgstr ""
 msgid "Wii Settings"
 msgstr "Opcje Wii"
 
-msgid "WiiTDB Files"
-msgstr "WiiTDB"
-
-msgid "WiiTDB Path"
-msgstr "Sciezka WiiTDBPath"
-
-msgid "WiiTDB is up to date."
-msgstr ""
-
 msgid "Wiilight"
 msgstr "Dioda Wii"
 
@@ -1713,12 +1731,12 @@ msgstr "pozostalo"
 msgid "for FAT/NTFS support"
 msgstr "za pomoc przy FAT/NTFS"
 
+msgid "for GameTDB and hosting covers / disc images"
+msgstr ""
+
 msgid "for Ocarina"
 msgstr "dla Ocarina"
 
-msgid "for WiiTDB and hosting covers / disc images"
-msgstr "za WiiTDB i hostowanie okladek/obrazkow plyt"
-
 msgid "for diverse patches"
 msgstr "za rozne poprawki"
 
@@ -1749,6 +1767,18 @@ msgstr "z"
 msgid "seconds left"
 msgstr "sekund pozostalo"
 
+#~ msgid "Titles from WiiTDB"
+#~ msgstr "Tytuly z pliku WiiTDB"
+
+#~ msgid "WiiTDB Files"
+#~ msgstr "WiiTDB"
+
+#~ msgid "WiiTDB Path"
+#~ msgstr "Sciezka WiiTDBPath"
+
+#~ msgid "for WiiTDB and hosting covers / disc images"
+#~ msgstr "za WiiTDB i hostowanie okladek/obrazkow plyt"
+
 #~ msgid "Install partitions"
 #~ msgstr "Zainstaluj partycje"
 
diff --git a/Languages/portuguese_br.lang b/Languages/portuguese_br.lang
index 3fecd09e..cd217dc1 100644
--- a/Languages/portuguese_br.lang
+++ b/Languages/portuguese_br.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-24 15:12+0200\n"
+"POT-Creation-Date: 2011-10-21 20:31+0200\n"
 "PO-Revision-Date: 2009-10-23 18:52+0200\n"
 "Last-Translator: aniemotion\n"
 "Language-Team: boto12, aniemotion\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 msgid " could not be downloaded."
 msgstr " não foi baixado."
@@ -166,8 +166,8 @@ msgstr "Abr"
 msgid "Are you sure you want to delete this category?"
 msgstr "Tem certeza que quer deletar essa categoria?"
 
-msgid "Are you sure you want to import game categories from WiiTDB?"
-msgstr "Tem certeza que quer importar as categorias do WiiTDB?"
+msgid "Are you sure you want to import game categories from GameTDB?"
+msgstr ""
 
 msgid "Are you sure you want to lock USB Loader GX?"
 msgstr "Tem certeza que quer bloquear?"
@@ -577,6 +577,9 @@ msgstr ""
 msgid "Downloading pagelist:"
 msgstr ""
 
+msgid "Dump NAND to EmuNand"
+msgstr ""
+
 msgid "Dutch"
 msgstr "Holandês"
 
@@ -592,6 +595,9 @@ msgstr "ERRO: Impossível aplicar tema"
 msgid "English"
 msgstr "Inglês"
 
+msgid "Enter Path"
+msgstr ""
+
 msgid "Error"
 msgstr "Erro"
 
@@ -639,6 +645,9 @@ msgstr "Erro:"
 msgid "Errors occured."
 msgstr ""
 
+msgid "Everything"
+msgstr ""
+
 msgid "Exit"
 msgstr ""
 
@@ -660,6 +669,9 @@ msgstr "Extraindo arquivos..."
 msgid "Extracting files:"
 msgstr ""
 
+msgid "Extracting nand files:"
+msgstr ""
+
 msgid "Failed"
 msgstr ""
 
@@ -817,6 +829,15 @@ msgstr "Este jogo já está instalado:"
 msgid "Game/Install Partition"
 msgstr ""
 
+msgid "GameTDB Files"
+msgstr ""
+
+msgid "GameTDB Path"
+msgstr ""
+
+msgid "GameTDB is up to date."
+msgstr ""
+
 msgid "Gamename [GAMEID]"
 msgstr "Nome do Jogo [GAMEID]"
 
@@ -1474,6 +1495,9 @@ msgstr ""
 msgid "The entered directory does not exist. Would you like to create it?"
 msgstr "O diretorio não existe. Gostaria de cria-lo?"
 
+msgid "The files will be extracted to your emu nand path. Attention: All existing files will be overwritten."
+msgstr ""
+
 msgid "The game installation is disabled under this IOS because of instability in usb write."
 msgstr ""
 
@@ -1517,8 +1541,8 @@ msgstr "Tempo restante:"
 msgid "Title Launcher"
 msgstr "Laucher de Títulos"
 
-msgid "Titles from WiiTDB"
-msgstr "Títulos do WiiTDB"
+msgid "Titles from GameTDB"
+msgstr ""
 
 msgid "Tooltips"
 msgstr "Dicas"
@@ -1635,6 +1659,9 @@ msgstr "O que deseja atualizar?"
 msgid "What should be deleted for this game title:"
 msgstr ""
 
+msgid "What to extract from NAND?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "Rede sem fios"
 
@@ -1650,15 +1677,6 @@ msgstr "Menu do Wii"
 msgid "Wii Settings"
 msgstr "Configuração do Wii"
 
-msgid "WiiTDB Files"
-msgstr "WiiTDB"
-
-msgid "WiiTDB Path"
-msgstr "Pasta WiiTDB"
-
-msgid "WiiTDB is up to date."
-msgstr ""
-
 msgid "Wiilight"
 msgstr "Iluminação Leitor"
 
@@ -1713,12 +1731,12 @@ msgstr "arquivos restantes"
 msgid "for FAT/NTFS support"
 msgstr "para suporte a FAT/NTFS"
 
+msgid "for GameTDB and hosting covers / disc images"
+msgstr ""
+
 msgid "for Ocarina"
 msgstr "pelo Ocarina"
 
-msgid "for WiiTDB and hosting covers / disc images"
-msgstr "por WiiTDB e hospedando img. capas / discos"
-
 msgid "for diverse patches"
 msgstr "por diversos patches"
 
@@ -1748,3 +1766,18 @@ msgstr "de"
 
 msgid "seconds left"
 msgstr "segundos restantes"
+
+#~ msgid "Are you sure you want to import game categories from WiiTDB?"
+#~ msgstr "Tem certeza que quer importar as categorias do WiiTDB?"
+
+#~ msgid "Titles from WiiTDB"
+#~ msgstr "Títulos do WiiTDB"
+
+#~ msgid "WiiTDB Files"
+#~ msgstr "WiiTDB"
+
+#~ msgid "WiiTDB Path"
+#~ msgstr "Pasta WiiTDB"
+
+#~ msgid "for WiiTDB and hosting covers / disc images"
+#~ msgstr "por WiiTDB e hospedando img. capas / discos"
diff --git a/Languages/portuguese_pt.lang b/Languages/portuguese_pt.lang
index 913eeb73..5b3403da 100644
--- a/Languages/portuguese_pt.lang
+++ b/Languages/portuguese_pt.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-24 15:12+0200\n"
+"POT-Creation-Date: 2011-10-21 20:31+0200\n"
 "PO-Revision-Date: 2011-09-19 13:30+0100\n"
 "Last-Translator: pplucky <pplucky@gmail.com>\n"
 "Language-Team: Sky8000, pplucky\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 msgid " could not be downloaded."
 msgstr " não foi descarregado."
@@ -166,8 +166,8 @@ msgstr "Abr"
 msgid "Are you sure you want to delete this category?"
 msgstr "Tem a certeza que quer apagar esta categoria?"
 
-msgid "Are you sure you want to import game categories from WiiTDB?"
-msgstr "Tem a certeza que quer importar as categorias de jogos da WiiTDB?"
+msgid "Are you sure you want to import game categories from GameTDB?"
+msgstr ""
 
 msgid "Are you sure you want to lock USB Loader GX?"
 msgstr "Tem a certeza que quer bloquear o USB Loader GX?"
@@ -577,6 +577,9 @@ msgstr "A Descarregar Imagens Disco Originais"
 msgid "Downloading pagelist:"
 msgstr "A Descarregar a lista:"
 
+msgid "Dump NAND to EmuNand"
+msgstr ""
+
 msgid "Dutch"
 msgstr "Holandês"
 
@@ -592,6 +595,9 @@ msgstr "ERRO: Impossível configurar tema."
 msgid "English"
 msgstr "Inglês"
 
+msgid "Enter Path"
+msgstr ""
+
 msgid "Error"
 msgstr "Erro"
 
@@ -639,6 +645,9 @@ msgstr "Erro:"
 msgid "Errors occured."
 msgstr ""
 
+msgid "Everything"
+msgstr ""
+
 msgid "Exit"
 msgstr "Sair"
 
@@ -660,6 +669,9 @@ msgstr "A Extrair ficheiros..."
 msgid "Extracting files:"
 msgstr ""
 
+msgid "Extracting nand files:"
+msgstr ""
+
 msgid "Failed"
 msgstr "Falhou"
 
@@ -817,6 +829,15 @@ msgstr "O jogo já está instalado:"
 msgid "Game/Install Partition"
 msgstr "Jogo/Partição Instalação"
 
+msgid "GameTDB Files"
+msgstr ""
+
+msgid "GameTDB Path"
+msgstr ""
+
+msgid "GameTDB is up to date."
+msgstr ""
+
 msgid "Gamename [GAMEID]"
 msgstr "Nome Jogo [IDJOGO]"
 
@@ -1474,6 +1495,9 @@ msgstr "O ficheiro .them não foi encontrado no zip"
 msgid "The entered directory does not exist. Would you like to create it?"
 msgstr "A pasta não existe, pretende criá-la?"
 
+msgid "The files will be extracted to your emu nand path. Attention: All existing files will be overwritten."
+msgstr ""
+
 msgid "The game installation is disabled under this IOS because of instability in usb write."
 msgstr "A instalação de jogo está desabilitada neste IOS devido a instabilidade na escrita usb"
 
@@ -1517,8 +1541,8 @@ msgstr "Tempo rem:"
 msgid "Title Launcher"
 msgstr "Gestor de Títulos"
 
-msgid "Titles from WiiTDB"
-msgstr "Títulos do WiiTDB"
+msgid "Titles from GameTDB"
+msgstr ""
 
 msgid "Tooltips"
 msgstr "Dicas"
@@ -1635,6 +1659,9 @@ msgstr "Que componente deseja actualizar?"
 msgid "What should be deleted for this game title:"
 msgstr "O que deve ser apagado para este jogo:"
 
+msgid "What to extract from NAND?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "Rede sem fios"
 
@@ -1650,15 +1677,6 @@ msgstr "Menu Wii"
 msgid "Wii Settings"
 msgstr "Definições Wii"
 
-msgid "WiiTDB Files"
-msgstr "WiiTDB"
-
-msgid "WiiTDB Path"
-msgstr "Cam. WiiTDB"
-
-msgid "WiiTDB is up to date."
-msgstr "WiiTDB está actualizado."
-
 msgid "Wiilight"
 msgstr "Iluminação Leitor"
 
@@ -1713,12 +1731,12 @@ msgstr "ficheiros restantes"
 msgid "for FAT/NTFS support"
 msgstr "pelo suporte FAT/NTFS"
 
+msgid "for GameTDB and hosting covers / disc images"
+msgstr ""
+
 msgid "for Ocarina"
 msgstr "pelo Ocarina"
 
-msgid "for WiiTDB and hosting covers / disc images"
-msgstr "por WiiTDB e alojar img. capas / discos"
-
 msgid "for diverse patches"
 msgstr "por diversos patches"
 
@@ -1748,3 +1766,21 @@ msgstr "de"
 
 msgid "seconds left"
 msgstr "segundos restantes"
+
+#~ msgid "Are you sure you want to import game categories from WiiTDB?"
+#~ msgstr "Tem a certeza que quer importar as categorias de jogos da WiiTDB?"
+
+#~ msgid "Titles from WiiTDB"
+#~ msgstr "Títulos do WiiTDB"
+
+#~ msgid "WiiTDB Files"
+#~ msgstr "WiiTDB"
+
+#~ msgid "WiiTDB Path"
+#~ msgstr "Cam. WiiTDB"
+
+#~ msgid "WiiTDB is up to date."
+#~ msgstr "WiiTDB está actualizado."
+
+#~ msgid "for WiiTDB and hosting covers / disc images"
+#~ msgstr "por WiiTDB e alojar img. capas / discos"
diff --git a/Languages/russian.lang b/Languages/russian.lang
index 11fbdd62..92b7d075 100644
--- a/Languages/russian.lang
+++ b/Languages/russian.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-24 15:12+0200\n"
+"POT-Creation-Date: 2011-10-21 20:31+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: nikolai_ca\n"
 "Language-Team: Kir, alendit, nikolai_ca\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 msgid " could not be downloaded."
 msgstr " не мог быть загружен"
@@ -166,7 +166,7 @@ msgstr "Апр"
 msgid "Are you sure you want to delete this category?"
 msgstr ""
 
-msgid "Are you sure you want to import game categories from WiiTDB?"
+msgid "Are you sure you want to import game categories from GameTDB?"
 msgstr ""
 
 msgid "Are you sure you want to lock USB Loader GX?"
@@ -577,6 +577,9 @@ msgstr ""
 msgid "Downloading pagelist:"
 msgstr ""
 
+msgid "Dump NAND to EmuNand"
+msgstr ""
+
 msgid "Dutch"
 msgstr "Голландский"
 
@@ -592,6 +595,9 @@ msgstr "ОШИБКА: Не удалось установить тему."
 msgid "English"
 msgstr "Английский"
 
+msgid "Enter Path"
+msgstr ""
+
 msgid "Error"
 msgstr "Ошибка"
 
@@ -639,6 +645,9 @@ msgstr "Ошибка:"
 msgid "Errors occured."
 msgstr ""
 
+msgid "Everything"
+msgstr ""
+
 msgid "Exit"
 msgstr ""
 
@@ -660,6 +669,9 @@ msgstr "Распаковка файлов..."
 msgid "Extracting files:"
 msgstr ""
 
+msgid "Extracting nand files:"
+msgstr ""
+
 msgid "Failed"
 msgstr ""
 
@@ -817,6 +829,15 @@ msgstr "Игра уже установлена:"
 msgid "Game/Install Partition"
 msgstr ""
 
+msgid "GameTDB Files"
+msgstr ""
+
+msgid "GameTDB Path"
+msgstr ""
+
+msgid "GameTDB is up to date."
+msgstr ""
+
 msgid "Gamename [GAMEID]"
 msgstr ""
 
@@ -1474,6 +1495,9 @@ msgstr ""
 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 ""
+
 msgid "The game installation is disabled under this IOS because of instability in usb write."
 msgstr ""
 
@@ -1517,8 +1541,8 @@ msgstr "Осталось времени:"
 msgid "Title Launcher"
 msgstr "Загрузчик тайтла"
 
-msgid "Titles from WiiTDB"
-msgstr "Названия из WiiTDB"
+msgid "Titles from GameTDB"
+msgstr ""
 
 msgid "Tooltips"
 msgstr "Подсказки"
@@ -1635,6 +1659,9 @@ msgstr "Что Вы хотите обновить?"
 msgid "What should be deleted for this game title:"
 msgstr ""
 
+msgid "What to extract from NAND?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "свойства WiFi"
 
@@ -1650,15 +1677,6 @@ msgstr "Меню Wii"
 msgid "Wii Settings"
 msgstr "Установки Wii"
 
-msgid "WiiTDB Files"
-msgstr "Файлы WiiTDB"
-
-msgid "WiiTDB Path"
-msgstr "Путь к WiiTDB"
-
-msgid "WiiTDB is up to date."
-msgstr ""
-
 msgid "Wiilight"
 msgstr "Подсветка Wii"
 
@@ -1713,12 +1731,12 @@ msgstr "файлов осталось"
 msgid "for FAT/NTFS support"
 msgstr "для поддержки FAT/NTFS"
 
+msgid "for GameTDB and hosting covers / disc images"
+msgstr ""
+
 msgid "for Ocarina"
 msgstr "за Ocarina"
 
-msgid "for WiiTDB and hosting covers / disc images"
-msgstr "за WIITDB и хостинг изображений обложек/дисков"
-
 msgid "for diverse patches"
 msgstr "за различные патчи"
 
@@ -1749,6 +1767,18 @@ msgstr "из"
 msgid "seconds left"
 msgstr "секунд осталось"
 
+#~ msgid "Titles from WiiTDB"
+#~ msgstr "Названия из WiiTDB"
+
+#~ msgid "WiiTDB Files"
+#~ msgstr "Файлы WiiTDB"
+
+#~ msgid "WiiTDB Path"
+#~ msgstr "Путь к WiiTDB"
+
+#~ msgid "for WiiTDB and hosting covers / disc images"
+#~ msgstr "за WIITDB и хостинг изображений обложек/дисков"
+
 #~ msgid "Install partitions"
 #~ msgstr "Установить разделы"
 
diff --git a/Languages/schinese.lang b/Languages/schinese.lang
index bf07c429..c3517168 100644
--- a/Languages/schinese.lang
+++ b/Languages/schinese.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-24 15:12+0200\n"
+"POT-Creation-Date: 2011-10-21 20:31+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: knife.hu kavid emul8ion\n"
 "Language-Team: kavid\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 msgid " could not be downloaded."
 msgstr "不能下载."
@@ -166,7 +166,7 @@ msgstr "四月"
 msgid "Are you sure you want to delete this category?"
 msgstr ""
 
-msgid "Are you sure you want to import game categories from WiiTDB?"
+msgid "Are you sure you want to import game categories from GameTDB?"
 msgstr ""
 
 msgid "Are you sure you want to lock USB Loader GX?"
@@ -577,6 +577,9 @@ msgstr "正在下载原始光盘封面"
 msgid "Downloading pagelist:"
 msgstr "正在下载分页列表:"
 
+msgid "Dump NAND to EmuNand"
+msgstr ""
+
 msgid "Dutch"
 msgstr "荷文"
 
@@ -592,6 +595,9 @@ msgstr "错误: 无法设置主题."
 msgid "English"
 msgstr "英文"
 
+msgid "Enter Path"
+msgstr ""
+
 msgid "Error"
 msgstr "错误"
 
@@ -639,6 +645,9 @@ msgstr "错误:"
 msgid "Errors occured."
 msgstr ""
 
+msgid "Everything"
+msgstr ""
+
 msgid "Exit"
 msgstr "退出"
 
@@ -660,6 +669,9 @@ msgstr "正在解压缩文件"
 msgid "Extracting files:"
 msgstr ""
 
+msgid "Extracting nand files:"
+msgstr ""
+
 msgid "Failed"
 msgstr ""
 
@@ -817,6 +829,15 @@ msgstr "已安装的游戏:"
 msgid "Game/Install Partition"
 msgstr "游戏/安装分区"
 
+msgid "GameTDB Files"
+msgstr ""
+
+msgid "GameTDB Path"
+msgstr ""
+
+msgid "GameTDB is up to date."
+msgstr ""
+
 msgid "Gamename [GAMEID]"
 msgstr "游戏名[游戏ID]"
 
@@ -1474,6 +1495,9 @@ msgstr "zip文件中没有找到.them文件"
 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 ""
+
 msgid "The game installation is disabled under this IOS because of instability in usb write."
 msgstr "由于USB写入不稳定，在这个IOS下游戏安装被禁用"
 
@@ -1517,8 +1541,8 @@ msgstr "剩余时间:"
 msgid "Title Launcher"
 msgstr "系统频道"
 
-msgid "Titles from WiiTDB"
-msgstr "用WiiTDB游戏名"
+msgid "Titles from GameTDB"
+msgstr ""
 
 msgid "Tooltips"
 msgstr "提示信息"
@@ -1635,6 +1659,9 @@ msgstr "要升级什么?"
 msgid "What should be deleted for this game title:"
 msgstr "要删除这个游戏的什么:"
 
+msgid "What to extract from NAND?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "WiFi 功能"
 
@@ -1650,15 +1677,6 @@ msgstr "Wii 系统菜单"
 msgid "Wii Settings"
 msgstr "Wii 设置"
 
-msgid "WiiTDB Files"
-msgstr "WiiTDB文件"
-
-msgid "WiiTDB Path"
-msgstr "WiiTDB路径"
-
-msgid "WiiTDB is up to date."
-msgstr "WiiTDB已更新."
-
 msgid "Wiilight"
 msgstr "光驱灯"
 
@@ -1713,12 +1731,12 @@ msgstr "剩余文件"
 msgid "for FAT/NTFS support"
 msgstr "的 FAT/NTFS 支持"
 
+msgid "for GameTDB and hosting covers / disc images"
+msgstr ""
+
 msgid "for Ocarina"
 msgstr "的 Ocarina"
 
-msgid "for WiiTDB and hosting covers / disc images"
-msgstr "的 WiiTDB 和封面下载"
-
 msgid "for diverse patches"
 msgstr "的多种修正"
 
@@ -1749,6 +1767,21 @@ msgstr "的"
 msgid "seconds left"
 msgstr "剩余秒数"
 
+#~ msgid "Titles from WiiTDB"
+#~ msgstr "用WiiTDB游戏名"
+
+#~ msgid "WiiTDB Files"
+#~ msgstr "WiiTDB文件"
+
+#~ msgid "WiiTDB Path"
+#~ msgstr "WiiTDB路径"
+
+#~ msgid "WiiTDB is up to date."
+#~ msgstr "WiiTDB已更新."
+
+#~ msgid "for WiiTDB and hosting covers / disc images"
+#~ msgstr "的 WiiTDB 和封面下载"
+
 #~ msgid "Automatic port switching is done on the fly. You need to change all custom paths to SD-Card first for this option or else it could damage a filesystem."
 #~ msgstr "接口自动切换已生效。你需要立即更改所有自定义路径为SD卡，否则可能会损坏USB分区上的文件系统。"
 
diff --git a/Languages/spanish.lang b/Languages/spanish.lang
index 41e37499..c57b99c4 100644
--- a/Languages/spanish.lang
+++ b/Languages/spanish.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-24 15:12+0200\n"
+"POT-Creation-Date: 2011-10-21 20:31+0200\n"
 "PO-Revision-Date: 2011-07-25 16:40+0200\n"
 "Last-Translator: hvy109\n"
 "Language-Team: Penn, SirPalax, hvy109\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 msgid " could not be downloaded."
 msgstr " no se han podido descargar."
@@ -166,8 +166,8 @@ msgstr "Abr"
 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 WiiTDB?"
-msgstr "¿Estás seguro de importar las categorías desde WiiTDB?"
+msgid "Are you sure you want to import game categories from GameTDB?"
+msgstr ""
 
 msgid "Are you sure you want to lock USB Loader GX?"
 msgstr "¿Estás seguro de bloquear USB Loader GX?"
@@ -577,6 +577,9 @@ msgstr "Descargando Img. Discos Originales"
 msgid "Downloading pagelist:"
 msgstr "Descargando lista de páginas:"
 
+msgid "Dump NAND to EmuNand"
+msgstr ""
+
 msgid "Dutch"
 msgstr "Holandés"
 
@@ -592,6 +595,9 @@ msgstr "ERROR: No se puede configurar el tema."
 msgid "English"
 msgstr "Inglés"
 
+msgid "Enter Path"
+msgstr ""
+
 msgid "Error"
 msgstr ""
 
@@ -639,6 +645,9 @@ msgstr ""
 msgid "Errors occured."
 msgstr ""
 
+msgid "Everything"
+msgstr ""
+
 msgid "Exit"
 msgstr "Salir"
 
@@ -660,6 +669,9 @@ msgstr "Extrayendo archivos..."
 msgid "Extracting files:"
 msgstr ""
 
+msgid "Extracting nand files:"
+msgstr ""
+
 msgid "Failed"
 msgstr "Fallo"
 
@@ -817,6 +829,15 @@ msgstr "El juego ya estaba instalado:"
 msgid "Game/Install Partition"
 msgstr "Partición de los Juegos"
 
+msgid "GameTDB Files"
+msgstr ""
+
+msgid "GameTDB Path"
+msgstr ""
+
+msgid "GameTDB is up to date."
+msgstr ""
+
 msgid "Gamename [GAMEID]"
 msgstr "NombreDelJuego [IDdelJuego]"
 
@@ -1474,6 +1495,9 @@ msgstr "El archivo .them no se encontró en el zip."
 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 ""
+
 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."
 
@@ -1517,8 +1541,8 @@ msgstr "Quedan:"
 msgid "Title Launcher"
 msgstr "Lanzador de Canales"
 
-msgid "Titles from WiiTDB"
-msgstr "Títulos WiiTDB"
+msgid "Titles from GameTDB"
+msgstr ""
 
 msgid "Tooltips"
 msgstr "InfoBurbujas"
@@ -1635,6 +1659,9 @@ msgstr "¿Qué quieres actualizar?"
 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 ""
+
 msgid "WiFi Features"
 msgstr "Características WiFi"
 
@@ -1650,15 +1677,6 @@ msgstr "Menú de Wii"
 msgid "Wii Settings"
 msgstr "Opciones de Wii"
 
-msgid "WiiTDB Files"
-msgstr "WiiTDB"
-
-msgid "WiiTDB Path"
-msgstr "Ruta WiiTDB"
-
-msgid "WiiTDB is up to date."
-msgstr "WiiTDB está actualizado."
-
 msgid "Wiilight"
 msgstr "Iluminar lector"
 
@@ -1713,12 +1731,12 @@ msgstr "archivos pendientes"
 msgid "for FAT/NTFS support"
 msgstr "por el soporte FAT/NTFS"
 
+msgid "for GameTDB and hosting covers / disc images"
+msgstr ""
+
 msgid "for Ocarina"
 msgstr "por Ocarina"
 
-msgid "for WiiTDB and hosting covers / disc images"
-msgstr "por WiiTDB y alojar carátulas e imágenes"
-
 msgid "for diverse patches"
 msgstr "por diversos parches"
 
@@ -1748,3 +1766,21 @@ msgstr "de"
 
 msgid "seconds left"
 msgstr "segundos restantes"
+
+#~ msgid "Are you sure you want to import game categories from WiiTDB?"
+#~ msgstr "¿Estás seguro de importar las categorías desde WiiTDB?"
+
+#~ msgid "Titles from WiiTDB"
+#~ msgstr "Títulos WiiTDB"
+
+#~ msgid "WiiTDB Files"
+#~ msgstr "WiiTDB"
+
+#~ msgid "WiiTDB Path"
+#~ msgstr "Ruta WiiTDB"
+
+#~ msgid "WiiTDB is up to date."
+#~ msgstr "WiiTDB está actualizado."
+
+#~ msgid "for WiiTDB and hosting covers / disc images"
+#~ msgstr "por WiiTDB y alojar carátulas e imágenes"
diff --git a/Languages/swedish.lang b/Languages/swedish.lang
index d4197547..56d1b7ba 100644
--- a/Languages/swedish.lang
+++ b/Languages/swedish.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-24 15:12+0200\n"
+"POT-Creation-Date: 2011-10-21 20:31+0200\n"
 "PO-Revision-Date: 2010-01-19 17:39+0200\n"
 "Last-Translator: Katsurou\n"
 "Language-Team: Katsurou, pirateX\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 msgid " could not be downloaded."
 msgstr "Kunde inte laddas ner."
@@ -166,7 +166,7 @@ msgstr "Apr"
 msgid "Are you sure you want to delete this category?"
 msgstr ""
 
-msgid "Are you sure you want to import game categories from WiiTDB?"
+msgid "Are you sure you want to import game categories from GameTDB?"
 msgstr ""
 
 msgid "Are you sure you want to lock USB Loader GX?"
@@ -577,6 +577,9 @@ msgstr ""
 msgid "Downloading pagelist:"
 msgstr ""
 
+msgid "Dump NAND to EmuNand"
+msgstr ""
+
 msgid "Dutch"
 msgstr "Nederländska"
 
@@ -592,6 +595,9 @@ msgstr "FEL: Kan inte ställa in tema"
 msgid "English"
 msgstr "Engelska"
 
+msgid "Enter Path"
+msgstr ""
+
 msgid "Error"
 msgstr "Fel"
 
@@ -639,6 +645,9 @@ msgstr "Fel:"
 msgid "Errors occured."
 msgstr ""
 
+msgid "Everything"
+msgstr ""
+
 msgid "Exit"
 msgstr ""
 
@@ -660,6 +669,9 @@ msgstr "Packar upp filer..."
 msgid "Extracting files:"
 msgstr ""
 
+msgid "Extracting nand files:"
+msgstr ""
+
 msgid "Failed"
 msgstr ""
 
@@ -817,6 +829,15 @@ msgstr "Spelet är redan installerat:"
 msgid "Game/Install Partition"
 msgstr ""
 
+msgid "GameTDB Files"
+msgstr ""
+
+msgid "GameTDB Path"
+msgstr ""
+
+msgid "GameTDB is up to date."
+msgstr ""
+
 msgid "Gamename [GAMEID]"
 msgstr ""
 
@@ -1474,6 +1495,9 @@ msgstr ""
 msgid "The entered directory does not exist. Would you like to create it?"
 msgstr "Den angivna katalogen existerar inte. Vill du skapa den?"
 
+msgid "The files will be extracted to your emu nand path. Attention: All existing files will be overwritten."
+msgstr ""
+
 msgid "The game installation is disabled under this IOS because of instability in usb write."
 msgstr ""
 
@@ -1517,8 +1541,8 @@ msgstr "Tid kvar:"
 msgid "Title Launcher"
 msgstr "Titel startare"
 
-msgid "Titles from WiiTDB"
-msgstr "Titlar från WiiTDB"
+msgid "Titles from GameTDB"
+msgstr ""
 
 msgid "Tooltips"
 msgstr "Verktygstips"
@@ -1635,6 +1659,9 @@ msgstr "Vad vill du uppdatera?"
 msgid "What should be deleted for this game title:"
 msgstr ""
 
+msgid "What to extract from NAND?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "WiFi funktioner"
 
@@ -1650,15 +1677,6 @@ msgstr "Wii-meny"
 msgid "Wii Settings"
 msgstr "Wii inställningar"
 
-msgid "WiiTDB Files"
-msgstr "WiiTDB"
-
-msgid "WiiTDB Path"
-msgstr "WiiTDB-sökväg"
-
-msgid "WiiTDB is up to date."
-msgstr ""
-
 msgid "Wiilight"
 msgstr "Wii-ljus"
 
@@ -1713,12 +1731,12 @@ msgstr "filer kvar"
 msgid "for FAT/NTFS support"
 msgstr "för FAT/NTFS stöd"
 
+msgid "for GameTDB and hosting covers / disc images"
+msgstr ""
+
 msgid "for Ocarina"
 msgstr "för Ocarina"
 
-msgid "for WiiTDB and hosting covers / disc images"
-msgstr "för WiiTDB och lagring av omslag / skivbilder"
-
 msgid "for diverse patches"
 msgstr "för diverse patcher"
 
@@ -1749,6 +1767,18 @@ msgstr "av"
 msgid "seconds left"
 msgstr "sekunder kvar"
 
+#~ msgid "Titles from WiiTDB"
+#~ msgstr "Titlar från WiiTDB"
+
+#~ msgid "WiiTDB Files"
+#~ msgstr "WiiTDB"
+
+#~ msgid "WiiTDB Path"
+#~ msgstr "WiiTDB-sökväg"
+
+#~ msgid "for WiiTDB and hosting covers / disc images"
+#~ msgstr "för WiiTDB och lagring av omslag / skivbilder"
+
 #~ msgid "Install partitions"
 #~ msgstr "Installera partitioner"
 
diff --git a/Languages/tchinese.lang b/Languages/tchinese.lang
index 32a71ba3..805d224b 100644
--- a/Languages/tchinese.lang
+++ b/Languages/tchinese.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-24 15:12+0200\n"
+"POT-Creation-Date: 2011-10-21 20:31+0200\n"
 "PO-Revision-Date: 2010-02-15 21:00+0800\n"
 "Last-Translator: Jane.H\n"
 "Language-Team: kyogc, Miller, Mika Li, Jane.H\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 msgid " could not be downloaded."
 msgstr "不能下載。"
@@ -166,8 +166,8 @@ msgstr "四月"
 msgid "Are you sure you want to delete this category?"
 msgstr "確定要刪除此類別嗎？"
 
-msgid "Are you sure you want to import game categories from WiiTDB?"
-msgstr "確定要從WiiTDB匯入遊戲類別嗎？"
+msgid "Are you sure you want to import game categories from GameTDB?"
+msgstr ""
 
 msgid "Are you sure you want to lock USB Loader GX?"
 msgstr "確定要鎖上 USB Loader GX嗎？"
@@ -577,6 +577,9 @@ msgstr "下載原始光碟圖片"
 msgid "Downloading pagelist:"
 msgstr "下載頁面清單："
 
+msgid "Dump NAND to EmuNand"
+msgstr ""
+
 msgid "Dutch"
 msgstr "荷蘭文"
 
@@ -592,6 +595,9 @@ msgstr "錯誤：無法設定佈景主題。"
 msgid "English"
 msgstr "英文"
 
+msgid "Enter Path"
+msgstr ""
+
 msgid "Error"
 msgstr "錯誤"
 
@@ -639,6 +645,9 @@ msgstr "錯誤："
 msgid "Errors occured."
 msgstr ""
 
+msgid "Everything"
+msgstr ""
+
 msgid "Exit"
 msgstr "退出"
 
@@ -660,6 +669,9 @@ msgstr "提取檔案中..."
 msgid "Extracting files:"
 msgstr ""
 
+msgid "Extracting nand files:"
+msgstr ""
+
 msgid "Failed"
 msgstr "失敗"
 
@@ -817,6 +829,15 @@ msgstr "已安裝過遊戲:"
 msgid "Game/Install Partition"
 msgstr "遊戲/安裝磁區"
 
+msgid "GameTDB Files"
+msgstr ""
+
+msgid "GameTDB Path"
+msgstr ""
+
+msgid "GameTDB is up to date."
+msgstr ""
+
 msgid "Gamename [GAMEID]"
 msgstr "遊戲名稱 [GAMEID]"
 
@@ -1474,6 +1495,9 @@ msgstr "在zip中找不到 .them檔。"
 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 ""
+
 msgid "The game installation is disabled under this IOS because of instability in usb write."
 msgstr "用此IOS遊戲安裝選項會被關閉，因為USB寫入資料不穩定。"
 
@@ -1517,8 +1541,8 @@ msgstr "剩餘時間："
 msgid "Title Launcher"
 msgstr "系統頻道"
 
-msgid "Titles from WiiTDB"
-msgstr "從WiiTDB顯示遊戲名稱"
+msgid "Titles from GameTDB"
+msgstr ""
 
 msgid "Tooltips"
 msgstr "提示信息"
@@ -1635,6 +1659,9 @@ msgstr "更新何者？"
 msgid "What should be deleted for this game title:"
 msgstr "這遊戲title應刪除什麼："
 
+msgid "What to extract from NAND?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "WiFi功能設定"
 
@@ -1650,15 +1677,6 @@ msgstr "Wii系統選單"
 msgid "Wii Settings"
 msgstr "Wii主機設定"
 
-msgid "WiiTDB Files"
-msgstr "WiiTDB檔案"
-
-msgid "WiiTDB Path"
-msgstr "WiiTDB路徑"
-
-msgid "WiiTDB is up to date."
-msgstr "WiiTDB保持最新。"
-
 msgid "Wiilight"
 msgstr "光碟機藍光"
 
@@ -1713,12 +1731,12 @@ msgstr "剩下的檔案"
 msgid "for FAT/NTFS support"
 msgstr "FAT/NTFS 格式支援"
 
+msgid "for GameTDB and hosting covers / disc images"
+msgstr ""
+
 msgid "for Ocarina"
 msgstr "的 金手指"
 
-msgid "for WiiTDB and hosting covers / disc images"
-msgstr "設置 WiiTDB 與封面 / 光碟圖片檔案存放空間"
-
 msgid "for diverse patches"
 msgstr "的多種修正"
 
@@ -1748,3 +1766,21 @@ msgstr "的"
 
 msgid "seconds left"
 msgstr "剩餘秒數"
+
+#~ msgid "Are you sure you want to import game categories from WiiTDB?"
+#~ msgstr "確定要從WiiTDB匯入遊戲類別嗎？"
+
+#~ msgid "Titles from WiiTDB"
+#~ msgstr "從WiiTDB顯示遊戲名稱"
+
+#~ msgid "WiiTDB Files"
+#~ msgstr "WiiTDB檔案"
+
+#~ msgid "WiiTDB Path"
+#~ msgstr "WiiTDB路徑"
+
+#~ msgid "WiiTDB is up to date."
+#~ msgstr "WiiTDB保持最新。"
+
+#~ msgid "for WiiTDB and hosting covers / disc images"
+#~ msgstr "設置 WiiTDB 與封面 / 光碟圖片檔案存放空間"
diff --git a/Languages/thai.lang b/Languages/thai.lang
index ef680deb..fdfacf42 100644
--- a/Languages/thai.lang
+++ b/Languages/thai.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-24 15:12+0200\n"
+"POT-Creation-Date: 2011-10-21 20:31+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: Nitro_subzero \n"
 "Language-Team: Nitro_subzero\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 msgid " could not be downloaded."
 msgstr " ไม่สามารถดาวน์โหลดได้"
@@ -166,7 +166,7 @@ msgstr "เมษ."
 msgid "Are you sure you want to delete this category?"
 msgstr ""
 
-msgid "Are you sure you want to import game categories from WiiTDB?"
+msgid "Are you sure you want to import game categories from GameTDB?"
 msgstr ""
 
 msgid "Are you sure you want to lock USB Loader GX?"
@@ -577,6 +577,9 @@ msgstr ""
 msgid "Downloading pagelist:"
 msgstr ""
 
+msgid "Dump NAND to EmuNand"
+msgstr ""
+
 msgid "Dutch"
 msgstr "เนเธอร์แลนด์"
 
@@ -592,6 +595,9 @@ msgstr ""
 msgid "English"
 msgstr "อังกฤษ"
 
+msgid "Enter Path"
+msgstr ""
+
 msgid "Error"
 msgstr "ผิดพลาด"
 
@@ -639,6 +645,9 @@ msgstr "ผิดพลาด:"
 msgid "Errors occured."
 msgstr ""
 
+msgid "Everything"
+msgstr ""
+
 msgid "Exit"
 msgstr ""
 
@@ -660,6 +669,9 @@ msgstr "กำลังขยายไฟล์..."
 msgid "Extracting files:"
 msgstr ""
 
+msgid "Extracting nand files:"
+msgstr ""
+
 msgid "Failed"
 msgstr ""
 
@@ -817,6 +829,15 @@ msgstr "เกมส์นี้ถูกติดตั้งอยู่แล
 msgid "Game/Install Partition"
 msgstr ""
 
+msgid "GameTDB Files"
+msgstr ""
+
+msgid "GameTDB Path"
+msgstr ""
+
+msgid "GameTDB is up to date."
+msgstr ""
+
 msgid "Gamename [GAMEID]"
 msgstr ""
 
@@ -1474,6 +1495,9 @@ msgstr ""
 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 ""
+
 msgid "The game installation is disabled under this IOS because of instability in usb write."
 msgstr ""
 
@@ -1517,8 +1541,8 @@ msgstr "เหลือเวลาอีก:"
 msgid "Title Launcher"
 msgstr "Title Launcher"
 
-msgid "Titles from WiiTDB"
-msgstr "Title จาก WiiTDB"
+msgid "Titles from GameTDB"
+msgstr ""
 
 msgid "Tooltips"
 msgstr "คำแนะนำ"
@@ -1635,6 +1659,9 @@ msgstr "คุณต้องการอัพเดทอะไร ?"
 msgid "What should be deleted for this game title:"
 msgstr ""
 
+msgid "What to extract from NAND?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "ความสามารถของ Wi Fi"
 
@@ -1650,15 +1677,6 @@ msgstr "เมนู Wii"
 msgid "Wii Settings"
 msgstr "การปรับแต่ง Wii"
 
-msgid "WiiTDB Files"
-msgstr "ไฟล์ WiiTDB"
-
-msgid "WiiTDB Path"
-msgstr "ที่อยู่ WiiTDB"
-
-msgid "WiiTDB is up to date."
-msgstr ""
-
 msgid "Wiilight"
 msgstr "ความสว่างของ Wii"
 
@@ -1713,12 +1731,12 @@ msgstr "ไฟล์ที่ยังเหลือ"
 msgid "for FAT/NTFS support"
 msgstr ""
 
+msgid "for GameTDB and hosting covers / disc images"
+msgstr ""
+
 msgid "for Ocarina"
 msgstr "สำหรับ Ocarina"
 
-msgid "for WiiTDB and hosting covers / disc images"
-msgstr "สำหรับ WiiTDB และ ปก/รูปแผ่นดิสก์"
-
 msgid "for diverse patches"
 msgstr "แก้ diverse"
 
@@ -1749,6 +1767,18 @@ msgstr "จาก"
 msgid "seconds left"
 msgstr "วินาทีที่เหลือ"
 
+#~ msgid "Titles from WiiTDB"
+#~ msgstr "Title จาก WiiTDB"
+
+#~ msgid "WiiTDB Files"
+#~ msgstr "ไฟล์ WiiTDB"
+
+#~ msgid "WiiTDB Path"
+#~ msgstr "ที่อยู่ WiiTDB"
+
+#~ msgid "for WiiTDB and hosting covers / disc images"
+#~ msgstr "สำหรับ WiiTDB และ ปก/รูปแผ่นดิสก์"
+
 #~ msgid " Wad Saved as:"
 #~ msgstr " บันทึก Wad เป็น:"
 
diff --git a/Languages/turkish.lang b/Languages/turkish.lang
index 9de95bd8..7f48c58c 100644
--- a/Languages/turkish.lang
+++ b/Languages/turkish.lang
@@ -5,14 +5,14 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-09-24 15:12+0200\n"
+"POT-Creation-Date: 2011-10-21 20:31+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: omercigingelini\n"
 "Language-Team: omercigingelini\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
 
 msgid " could not be downloaded."
 msgstr " indirilemedi."
@@ -166,7 +166,7 @@ msgstr "Nis"
 msgid "Are you sure you want to delete this category?"
 msgstr ""
 
-msgid "Are you sure you want to import game categories from WiiTDB?"
+msgid "Are you sure you want to import game categories from GameTDB?"
 msgstr ""
 
 msgid "Are you sure you want to lock USB Loader GX?"
@@ -577,6 +577,9 @@ msgstr ""
 msgid "Downloading pagelist:"
 msgstr ""
 
+msgid "Dump NAND to EmuNand"
+msgstr ""
+
 msgid "Dutch"
 msgstr "Flaman"
 
@@ -592,6 +595,9 @@ msgstr ""
 msgid "English"
 msgstr "Ingilizce"
 
+msgid "Enter Path"
+msgstr ""
+
 msgid "Error"
 msgstr "Hata"
 
@@ -639,6 +645,9 @@ msgstr "Hata:"
 msgid "Errors occured."
 msgstr ""
 
+msgid "Everything"
+msgstr ""
+
 msgid "Exit"
 msgstr ""
 
@@ -660,6 +669,9 @@ msgstr "Dosyalar çıkarılıyor..."
 msgid "Extracting files:"
 msgstr ""
 
+msgid "Extracting nand files:"
+msgstr ""
+
 msgid "Failed"
 msgstr ""
 
@@ -817,6 +829,15 @@ msgstr "Oyun zaten kurulu:"
 msgid "Game/Install Partition"
 msgstr ""
 
+msgid "GameTDB Files"
+msgstr ""
+
+msgid "GameTDB Path"
+msgstr ""
+
+msgid "GameTDB is up to date."
+msgstr ""
+
 msgid "Gamename [GAMEID]"
 msgstr ""
 
@@ -1474,6 +1495,9 @@ msgstr ""
 msgid "The entered directory does not exist. Would you like to create it?"
 msgstr "Girilen klasör mevcut değil. Oluşturmak ister misin?"
 
+msgid "The files will be extracted to your emu nand path. Attention: All existing files will be overwritten."
+msgstr ""
+
 msgid "The game installation is disabled under this IOS because of instability in usb write."
 msgstr ""
 
@@ -1517,8 +1541,8 @@ msgstr "Kalan zaman:"
 msgid "Title Launcher"
 msgstr "Başlık Başlatıcı"
 
-msgid "Titles from WiiTDB"
-msgstr "WiiTDB deki Başlıklar"
+msgid "Titles from GameTDB"
+msgstr ""
 
 msgid "Tooltips"
 msgstr "Yardımlar"
@@ -1635,6 +1659,9 @@ msgstr "Neyi güncelleme istiyorsun?"
 msgid "What should be deleted for this game title:"
 msgstr ""
 
+msgid "What to extract from NAND?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "WiFi Özellikleri"
 
@@ -1650,15 +1677,6 @@ msgstr "Wii Menü"
 msgid "Wii Settings"
 msgstr "Wii Ayarları"
 
-msgid "WiiTDB Files"
-msgstr "WiiTDB Dosyaları"
-
-msgid "WiiTDB Path"
-msgstr "WiiTDB Yaması"
-
-msgid "WiiTDB is up to date."
-msgstr ""
-
 msgid "Wiilight"
 msgstr ""
 
@@ -1713,12 +1731,12 @@ msgstr "dosyalar kaldı"
 msgid "for FAT/NTFS support"
 msgstr ""
 
+msgid "for GameTDB and hosting covers / disc images"
+msgstr ""
+
 msgid "for Ocarina"
 msgstr "Ocarina için"
 
-msgid "for WiiTDB and hosting covers / disc images"
-msgstr "WiiTDB ve kapak/disk resimlerini sunduğu için"
-
 msgid "for diverse patches"
 msgstr "çeşitli yamalar için"
 
@@ -1749,6 +1767,18 @@ msgstr "./"
 msgid "seconds left"
 msgstr "saniye kaldı"
 
+#~ msgid "Titles from WiiTDB"
+#~ msgstr "WiiTDB deki Başlıklar"
+
+#~ msgid "WiiTDB Files"
+#~ msgstr "WiiTDB Dosyaları"
+
+#~ msgid "WiiTDB Path"
+#~ msgstr "WiiTDB Yaması"
+
+#~ msgid "for WiiTDB and hosting covers / disc images"
+#~ msgstr "WiiTDB ve kapak/disk resimlerini sunduğu için"
+
 #~ msgid " Wad Saved as:"
 #~ msgstr " Kaydedilen Wad:"
 
diff --git a/source/network/ImageDownloader.cpp b/source/network/ImageDownloader.cpp
index a4884ef4..5b78d3a8 100644
--- a/source/network/ImageDownloader.cpp
+++ b/source/network/ImageDownloader.cpp
@@ -15,12 +15,12 @@
 
 #define VALID_IMAGE(x) (!(x.size == 36864 || x.size <= 1024 || x.size == 7386 || x.size <= 1174 || x.size == 4446 || x.data == NULL))
 
-static const char *serverURL3D = "http://wiitdb.com/wiitdb/artwork/cover3D/";
-static const char *serverURL2D = "http://wiitdb.com/wiitdb/artwork/cover/";
-static const char *serverURLFullHQ = "http://wiitdb.com/wiitdb/artwork/coverfullHQ/";
-static const char *serverURLFull = "http://wiitdb.com/wiitdb/artwork/coverfull/";
-static const char *serverURLOrigDiscs = "http://wiitdb.com/wiitdb/artwork/disc/";
-static const char *serverURLCustomDiscs = "http://wiitdb.com/wiitdb/artwork/disccustom/";
+static const char *serverURL3D = "http://art.gametdb.com/wii/cover3D/";
+static const char *serverURL2D = "http://art.gametdb.com/wii/cover/";
+static const char *serverURLFullHQ = "http://art.gametdb.com/wii/coverfullHQ/";
+static const char *serverURLFull = "http://art.gametdb.com/wii/coverfull/";
+static const char *serverURLOrigDiscs = "http://art.gametdb.com/wii/disc/";
+static const char *serverURLCustomDiscs = "http://art.gametdb.com/wii/disccustom/";
 
 void ImageDownloader::DownloadImages()
 {
@@ -141,7 +141,7 @@ int ImageDownloader::DownloadProcess(int TotalDownloadCount)
 		if(ProgressCanceled())
 			break;
 
-		snprintf(progressMsg, sizeof(progressMsg), "http://wiitdb.com : %s.png", MissingImages[i].gameID.c_str());
+		snprintf(progressMsg, sizeof(progressMsg), "http://gametdb.com : %s.png", MissingImages[i].gameID.c_str());
 
 		ShowProgress(MissingImages[i].progressTitle, fmt("%i %s", TotalDownloadCount - pos, tr( "files left" )), progressMsg, pos, TotalDownloadCount);
 
diff --git a/source/network/update.cpp b/source/network/update.cpp
index ef910f75..d3b86d04 100644
--- a/source/network/update.cpp
+++ b/source/network/update.cpp
@@ -46,13 +46,13 @@
 #include "utils/ShowError.h"
 #include "prompts/PromptWindows.h"
 #include "FileOperations/fileops.h"
-#include "xml/WiiTDB.hpp"
+#include "xml/GameTDB.hpp"
 #include "wad/nandtitle.h"
 #include "wad/wad.h"
 #include "sys.h"
 #include "svnrev.h"
 
-static const char * WiiTDB_URL = "http://wiitdb.com/wiitdb.zip";
+static const char * GameTDB_URL = "http://gametdb.com/wiitdb.zip";
 
 /****************************************************************************
  * Checking if an Update is available
@@ -97,7 +97,7 @@ int CheckForBetaUpdate()
 	return revnumber;
 }
 
-static bool CheckNewWiiTDBVersion(const char *url)
+static bool CheckNewGameTDBVersion(const char *url)
 {
 	u64 Version = 0;
 
@@ -105,10 +105,10 @@ static bool CheckNewWiiTDBVersion(const char *url)
 	if(!HEAD_Responde)
 		return false;
 
-	char * version_ptr = strstr(HEAD_Responde, "X-WiiTDB-Timestamp: ");
+	char * version_ptr = strstr(HEAD_Responde, "X-GameTDB-Timestamp: ");
 	if(version_ptr)
 	{
-		version_ptr += strlen("X-WiiTDB-Timestamp: ");
+		version_ptr += strlen("X-GameTDB-Timestamp: ");
 		Version = strtoull(version_ptr, NULL, 10);
 	}
 
@@ -120,27 +120,27 @@ static bool CheckNewWiiTDBVersion(const char *url)
 		Filepath += '/';
 	Filepath += "wiitdb.xml";
 
-	WiiTDB XML_DB;
+	GameTDB XML_DB;
 
 	if(!XML_DB.OpenFile((Filepath.c_str())))
 		return true;	//! If no file exists we need the file
 
-	u64 ExistingVersion = XML_DB.GetWiiTDBVersion();
+	u64 ExistingVersion = XML_DB.GetGameTDBVersion();
 
-	gprintf("Existing WiiTDB Version: %llu Online WiiTDB Version: %llu\n", ExistingVersion, Version);
+	gprintf("Existing GameTDB Version: %llu Online GameTDB Version: %llu\n", ExistingVersion, Version);
 
 	return (ExistingVersion != Version);
 }
 
-int UpdateWiiTDB()
+int UpdateGameTDB()
 {
-	if(CheckNewWiiTDBVersion(WiiTDB_URL) == false)
+	if(CheckNewGameTDBVersion(GameTDB_URL) == false)
 	{
-		gprintf("Not updating WiiTDB: Version is the same\n");
+		gprintf("Not updating GameTDB: Version is the same\n");
 		return -1;
 	}
 
-	gprintf("Updating WiiTDB...\n");
+	gprintf("Updating GameTDB...\n");
 
 	string ZipPath = Settings.titlestxt_path;
 	if(Settings.titlestxt_path[ZipPath.size()-1] != '/')
@@ -148,7 +148,7 @@ int UpdateWiiTDB()
 
 	ZipPath += "wiitdb.zip";
 
-	int filesize = DownloadFileToPath(WiiTDB_URL, ZipPath.c_str(), false);
+	int filesize = DownloadFileToPath(GameTDB_URL, ZipPath.c_str(), false);
 
 	if(filesize <= 0)
 		return -1;
@@ -161,7 +161,7 @@ int UpdateWiiTDB()
 	remove(ZipPath.c_str());
 
 	//! Reload all titles because the file changed now.
-	GameTitles.LoadTitlesFromWiiTDB(Settings.titlestxt_path, true);
+	GameTitles.LoadTitlesFromGameTDB(Settings.titlestxt_path, true);
 
 	return (result ? filesize : -1);
 }
@@ -288,7 +288,7 @@ static int ApplicationDownload(int newrev)
 	{
 		UpdateIconPng();
 		UpdateMetaXml();
-		UpdateWiiTDB();
+		UpdateGameTDB();
 		DownloadAllLanguageFiles();
 	}
 
@@ -321,7 +321,7 @@ int UpdateApp()
 		return -1;
 	}
 
-	int choice = WindowPrompt(tr( "What do you want to update?" ), 0, "USB Loader GX", tr( "WiiTDB Files" ), tr( "Language File" ), tr( "Cancel" ));
+	int choice = WindowPrompt(tr( "What do you want to update?" ), 0, "USB Loader GX", tr( "GameTDB Files" ), tr( "Language File" ), tr( "Cancel" ));
 	if(choice == 0)
 		return -1;
 
@@ -338,9 +338,9 @@ int UpdateApp()
 	}
 	else if (choice == 2)
 	{
-		if(UpdateWiiTDB() < 0)
+		if(UpdateGameTDB() < 0)
 		{
-			WindowPrompt(fmt("%s", tr( "WiiTDB is up to date." )), 0, tr("OK"));
+			WindowPrompt(fmt("%s", tr( "GameTDB is up to date." )), 0, tr("OK"));
 			return 1;
 		}
 		else
diff --git a/source/network/update.h b/source/network/update.h
index 56a87462..b9e2b05b 100644
--- a/source/network/update.h
+++ b/source/network/update.h
@@ -31,7 +31,7 @@
 
 int CheckUpdate();
 int CheckForBetaUpdate();
-int UpdateWiiTDB();
+int UpdateGameTDB();
 int UpdateApp();
 
 #endif
diff --git a/source/prompts/PromptWindows.cpp b/source/prompts/PromptWindows.cpp
index 7f85b8d5..13a571cf 100644
--- a/source/prompts/PromptWindows.cpp
+++ b/source/prompts/PromptWindows.cpp
@@ -232,9 +232,9 @@ void WindowCredits()
 
 	char SvnRev[80];
 #ifdef FULLCHANNEL
-	snprintf(SvnRev, sizeof(SvnRev), "Rev%sc   IOS%u (Rev %u)", GetRev(), IOS_GetVersion(), IOS_GetRevision());
+	snprintf(SvnRev, sizeof(SvnRev), "v2.3c RC1   IOS%u (Rev %u)", IOS_GetVersion(), IOS_GetRevision());
 #else
-	snprintf(SvnRev, sizeof(SvnRev), "Rev%s   IOS%u (Rev %u)", GetRev(), IOS_GetVersion(), IOS_GetRevision());
+	snprintf(SvnRev, sizeof(SvnRev), "v2.3 RC1   IOS%u (Rev %u)", IOS_GetVersion(), IOS_GetRevision());
 #endif
 
 	char IosInfo[80] = "";
@@ -324,7 +324,7 @@ void WindowCredits()
 	txt[i]->SetPosition(10, y);
 	i++;
 
-	sprintf(text, "lustar %s", tr( "for WiiTDB and hosting covers / disc images" ));
+	sprintf(text, "lustar %s", tr( "for GameTDB and hosting covers / disc images" ));
 	txt[i] = new GuiText(text);
 	txt[i]->SetAlignment(ALIGN_LEFT, ALIGN_TOP);
 	txt[i]->SetPosition(160, y);
diff --git a/source/prompts/TitleBrowser.cpp b/source/prompts/TitleBrowser.cpp
index 34939f3e..0d1825a0 100644
--- a/source/prompts/TitleBrowser.cpp
+++ b/source/prompts/TitleBrowser.cpp
@@ -21,7 +21,7 @@
 #include "menu.h"
 #include "audio.h"
 #include "wad/wad.h"
-#include "xml/WiiTDB.hpp"
+#include "xml/GameTDB.hpp"
 #include "wad/nandtitle.h"
 #include "../usbloader/utils.h"
 #include "../gecko.h"
@@ -75,7 +75,7 @@ bool TitleSelector(char output[])
 	std::string Filepath = Settings.titlestxt_path;
 	Filepath += "wiitdb.xml";
 
-	WiiTDB *XML_DB = new WiiTDB(Filepath.c_str());
+	GameTDB *XML_DB = new GameTDB(Filepath.c_str());
 	XML_DB->SetLanguageCode(Settings.db_language);
 
 	s32 i = 0;
@@ -262,7 +262,7 @@ int TitleBrowser()
 	std::string Filepath = Settings.titlestxt_path;
 	Filepath += "wiitdb.xml";
 
-	WiiTDB *XML_DB = new WiiTDB(Filepath.c_str());
+	GameTDB *XML_DB = new GameTDB(Filepath.c_str());
 	XML_DB->SetLanguageCode(Settings.db_language);
 
 	u32 i = 0;
diff --git a/source/prompts/gameinfo.cpp b/source/prompts/gameinfo.cpp
index 41a973a6..b5ed9637 100644
--- a/source/prompts/gameinfo.cpp
+++ b/source/prompts/gameinfo.cpp
@@ -21,7 +21,7 @@
 #include "gameinfo.h"
 #include "usbloader/GameList.h"
 #include "gecko.h"
-#include "xml/WiiTDB.hpp"
+#include "xml/GameTDB.hpp"
 #include "utils/ShowError.h"
 #include "BoxCover/BoxCover.hpp"
 
@@ -40,7 +40,7 @@ static int InternalShowGameInfo(char *ID)
 	char xmlpath[300];
 	snprintf(xmlpath, sizeof(xmlpath), "%swiitdb.xml", Settings.titlestxt_path);
 
-	WiiTDB XML_DB;
+	GameTDB XML_DB;
 
 	if(!XML_DB.OpenFile(xmlpath))
 	{
@@ -130,7 +130,7 @@ static int InternalShowGameInfo(char *ID)
 	GuiText * genreTitleTxt = NULL;
 	GuiText ** genreTxt = NULL;
 	GuiText ** wifiTxt = NULL;
-	GuiText * wiitdb1Txt = NULL;
+	GuiText * gametdb1Txt = NULL;
 	GuiText * memTxt = NULL;
 
 	GuiWindow gameinfoWindow(600, 308);
@@ -824,10 +824,10 @@ static int InternalShowGameInfo(char *ID)
 		txtWindow.Append(&dnBtn);
 	}
 
-	wiitdb1Txt = new GuiText("http://wiitdb.com", 16, ( GXColor ) {0, 0, 0, 255});
-	wiitdb1Txt->SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM);
-	wiitdb1Txt->SetPosition(40, -15);
-	gameinfoWindow.Append(wiitdb1Txt);
+	gametdb1Txt = new GuiText("http://gametdb.com", 16, ( GXColor ) {0, 0, 0, 255});
+	gametdb1Txt->SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM);
+	gametdb1Txt->SetPosition(40, -15);
+	gameinfoWindow.Append(gametdb1Txt);
 	if(coverImg) gameinfoWindow.Append(coverImg);
 
 	// Set info window first
@@ -1020,7 +1020,7 @@ static int InternalShowGameInfo(char *ID)
 	delete titleTxt;
 	delete synopsisTxt;
 	delete genreTitleTxt;
-	delete wiitdb1Txt;
+	delete gametdb1Txt;
 	delete memTxt;
 	delete categoryTitle;
 
diff --git a/source/settings/CGameCategories.cpp b/source/settings/CGameCategories.cpp
index b689321c..76dde7bf 100644
--- a/source/settings/CGameCategories.cpp
+++ b/source/settings/CGameCategories.cpp
@@ -31,7 +31,7 @@
 #include "language/gettext.h"
 #include "FileOperations/fileops.h"
 #include "prompts/ProgressWindow.h"
-#include "xml/WiiTDB.hpp"
+#include "xml/GameTDB.hpp"
 #include "utils/StringTools.h"
 #include "svnrev.h"
 
@@ -352,9 +352,9 @@ bool CGameCategories::isInCategory(const char *gameID, unsigned int id)
 	return false;
 }
 
-bool CGameCategories::ImportFromWiiTDB(const string &xmlpath)
+bool CGameCategories::ImportFromGameTDB(const string &xmlpath)
 {
-	WiiTDB XML_DB;
+	GameTDB XML_DB;
 
 	if(!XML_DB.OpenFile(xmlpath.c_str()))
 		return false;
diff --git a/source/settings/CGameCategories.hpp b/source/settings/CGameCategories.hpp
index 05a1789a..e804cf67 100644
--- a/source/settings/CGameCategories.hpp
+++ b/source/settings/CGameCategories.hpp
@@ -50,7 +50,7 @@ class CGameCategories
 		void RemoveGameCategories(const string &gameID);
 		const vector<unsigned int> &operator[](const char *gameID) const;
 		const vector<unsigned int> &operator[](const unsigned char *gameID) const { return operator[]((const char *) gameID); }
-		bool ImportFromWiiTDB(const string &xmlpath);
+		bool ImportFromGameTDB(const string &xmlpath);
 		void clear() { List.clear(); CategoryList.clear(); };
 		static bool isInCategory(const char *gameID, unsigned int id);
 
diff --git a/source/settings/GameTitles.cpp b/source/settings/GameTitles.cpp
index 455c76c3..04bbf81f 100644
--- a/source/settings/GameTitles.cpp
+++ b/source/settings/GameTitles.cpp
@@ -2,7 +2,7 @@
 #include "GameTitles.h"
 #include "CSettings.h"
 #include "usbloader/GameList.h"
-#include "xml/WiiTDB.hpp"
+#include "xml/GameTDB.hpp"
 
 CGameTitles GameTitles;
 
@@ -38,7 +38,7 @@ const char * CGameTitles::GetTitle(const char * id) const
 			return TitleList[i].Title.c_str();
 	}
 
-	//! Since not found in the WiiTDB search in the game header for a title
+	//! Since not found in the GameTDB search in the game header for a title
 	if(gameList.GameCount() != gameList.size())
 		gameList.LoadUnfiltered();
 
@@ -209,7 +209,7 @@ void CGameTitles::RemoveUnusedCache(std::vector<std::string> &MissingTitles)
 	}
 }
 
-void CGameTitles::LoadTitlesFromWiiTDB(const char * path, bool forceCacheReload)
+void CGameTitles::LoadTitlesFromGameTDB(const char * path, bool forceCacheReload)
 {
 	this->SetDefault();
 
@@ -242,7 +242,7 @@ void CGameTitles::LoadTitlesFromWiiTDB(const char * path, bool forceCacheReload)
 
 	std::string Title;
 
-	WiiTDB XML_DB(Filepath.c_str());
+	GameTDB XML_DB(Filepath.c_str());
 	XML_DB.SetLanguageCode(Settings.db_language);
 	int Rating;
 	std::string RatValTxt;
@@ -264,7 +264,7 @@ void CGameTitles::LoadTitlesFromWiiTDB(const char * path, bool forceCacheReload)
 		if(!XML_DB.GetRatingValue(MissingTitles[i].c_str(), RatValTxt))
 			continue;
 
-		TitleList[TitleList.size()-1].ParentalRating = WiiTDB::ConvertRating(RatValTxt.c_str(), WiiTDB::RatingToString(Rating), "PEGI");
+		TitleList[TitleList.size()-1].ParentalRating = GameTDB::ConvertRating(RatValTxt.c_str(), GameTDB::RatingToString(Rating), "PEGI");
 		int ret = XML_DB.GetPlayers(MissingTitles[i].c_str());
 		if(ret > 0)
 			TitleList[TitleList.size()-1].PlayersCount = ret;
diff --git a/source/settings/GameTitles.h b/source/settings/GameTitles.h
index 3f63a1e1..b38d6efa 100644
--- a/source/settings/GameTitles.h
+++ b/source/settings/GameTitles.h
@@ -1,5 +1,5 @@
-#ifndef WIITDB_TITLES_H_
-#define WIITDB_TITLES_H_
+#ifndef GAMETDB_TITLES_H_
+#define GAMETDB_TITLES_H_
 
 #include <string>
 #include <vector>
@@ -18,7 +18,7 @@ typedef struct _GameTitle
 class CGameTitles
 {
 	public:
-		//! Set a game title from wiitdb
+		//! Set a game title from GameTDB
 		void SetGameTitle(const char * id, const char * title);
 		//! Overload
 		void SetGameTitle(const u8 * id, const char * title) { SetGameTitle((const char *) id, title); };
@@ -34,8 +34,8 @@ class CGameTitles
 		int GetParentalRating(const char * id) const;
 		//! Get possible number of players for this game
 		int GetPlayersCount(const char * id) const;
-		//! Load Game Titles from WiiTDB
-		void LoadTitlesFromWiiTDB(const char * path, bool forceCacheReload = false);
+		//! Load Game Titles from GameTDB
+		void LoadTitlesFromGameTDB(const char * path, bool forceCacheReload = false);
 		//! Set default game titles
 		void SetDefault();
 		//! Free memory and remove all titles - Same as SetDefault()
diff --git a/source/settings/SettingsPrompts.cpp b/source/settings/SettingsPrompts.cpp
index ca1b1b60..d1e4648f 100644
--- a/source/settings/SettingsPrompts.cpp
+++ b/source/settings/SettingsPrompts.cpp
@@ -320,7 +320,7 @@ int MenuLanguageSelect()
 	//! Reload game list in new language
 	if(strcmp(Settings.db_language, OldLangCode) != 0)
 	{
-		GameTitles.LoadTitlesFromWiiTDB(Settings.titlestxt_path);
+		GameTitles.LoadTitlesFromGameTDB(Settings.titlestxt_path);
 	}
 
 	w.SetEffect( EFFECT_FADE, -20 );
diff --git a/source/settings/menus/CustomPathsSM.cpp b/source/settings/menus/CustomPathsSM.cpp
index f1bceaa1..164ac4c9 100644
--- a/source/settings/menus/CustomPathsSM.cpp
+++ b/source/settings/menus/CustomPathsSM.cpp
@@ -41,7 +41,7 @@ CustomPathsSM::CustomPathsSM()
 	Options->SetName(Idx++, tr("Full Cover Path"));
 	Options->SetName(Idx++, tr("Disc Artwork Path"));
 	Options->SetName(Idx++, tr("Theme Path"));
-	Options->SetName(Idx++, tr("WiiTDB Path"));
+	Options->SetName(Idx++, tr("GameTDB Path"));
 	Options->SetName(Idx++, tr("Update Path"));
 	Options->SetName(Idx++, tr("GCT Cheatcodes Path"));
 	Options->SetName(Idx++, tr("TXT Cheatcodes Path"));
@@ -76,7 +76,7 @@ void CustomPathsSM::SetOptionValues()
 	//! Settings: Theme Path
 	Options->SetValue(Idx++, Settings.theme_path);
 
-	//! Settings: WiiTDB Path
+	//! Settings: GameTDB Path
 	Options->SetValue(Idx++, Settings.titlestxt_path);
 
 	//! Settings: Update Path
@@ -157,10 +157,10 @@ int CustomPathsSM::GetMenuInternal()
 		ChangePath(Settings.theme_path, sizeof(Settings.theme_path));
 	}
 
-	//! Settings: WiiTDB Path
+	//! Settings: GameTDB Path
 	else if (ret == ++Idx)
 	{
-		titleTxt->SetText(tr( "WiiTDB Path" ));
+		titleTxt->SetText(tr( "GameTDB Path" ));
 		ChangePath(Settings.titlestxt_path, sizeof(Settings.titlestxt_path));
 	}
 
diff --git a/source/settings/menus/FeatureSettingsMenu.cpp b/source/settings/menus/FeatureSettingsMenu.cpp
index b774205d..ce9b49e0 100644
--- a/source/settings/menus/FeatureSettingsMenu.cpp
+++ b/source/settings/menus/FeatureSettingsMenu.cpp
@@ -53,7 +53,7 @@ FeatureSettingsMenu::FeatureSettingsMenu()
 	: SettingsMenu(tr("Features Settings"), &GuiOptions, MENU_NONE)
 {
 	int Idx = 0;
-	Options->SetName(Idx++, "%s", tr( "Titles from WiiTDB" ));
+	Options->SetName(Idx++, "%s", tr( "Titles from GameTDB" ));
 	Options->SetName(Idx++, "%s", tr( "Cache Titles" ));
 	Options->SetName(Idx++, "%s", tr( "Wiilight" ));
 	Options->SetName(Idx++, "%s", tr( "Rumble" ));
@@ -73,7 +73,7 @@ FeatureSettingsMenu::~FeatureSettingsMenu()
 {
 	if (Settings.titlesOverride != OldTitlesOverride)
 	{
-		GameTitles.LoadTitlesFromWiiTDB(Settings.titlestxt_path, true);
+		GameTitles.LoadTitlesFromGameTDB(Settings.titlestxt_path, true);
 		if(!Settings.titlesOverride)
 			gameList.ReadGameList();
 	}
@@ -83,7 +83,7 @@ void FeatureSettingsMenu::SetOptionValues()
 {
 	int Idx = 0;
 
-	//! Settings: Titles from WiiTDB
+	//! Settings: Titles from GameTDB
 	Options->SetValue(Idx++, "%s", tr( OnOffText[Settings.titlesOverride] ));
 
 	//! Settings: Cache Titles
@@ -104,7 +104,7 @@ void FeatureSettingsMenu::SetOptionValues()
 	//! Settings: Wiinnertag
 	Options->SetValue(Idx++, "%s", tr( OnOffText[Settings.Wiinnertag] ));
 
-	//! Settings: Import categories from WiiTDB
+	//! Settings: Import categories from GameTDB
 	Options->SetValue(Idx++, " ");
 
 	//! Settings: Export Savegames to EmuNand
@@ -124,7 +124,7 @@ int FeatureSettingsMenu::GetMenuInternal()
 	int Idx = -1;
 
 
-	//! Settings: Titles from WiiTDB
+	//! Settings: Titles from GameTDB
 	if (ret == ++Idx)
 	{
 		if (++Settings.titlesOverride >= MAX_ON_OFF) Settings.titlesOverride = 0;
@@ -136,7 +136,7 @@ int FeatureSettingsMenu::GetMenuInternal()
 		if (++Settings.CacheTitles >= MAX_ON_OFF) Settings.CacheTitles = 0;
 
 		if(Settings.CacheTitles) //! create new cache file
-			GameTitles.LoadTitlesFromWiiTDB(Settings.titlestxt_path);
+			GameTitles.LoadTitlesFromGameTDB(Settings.titlestxt_path);
 	}
 
 	//! Settings: Wiilight
@@ -203,15 +203,15 @@ int FeatureSettingsMenu::GetMenuInternal()
 		}
 	}
 
-	//! Settings: Import categories from WiiTDB
+	//! Settings: Import categories from GameTDB
 	else if (ret == ++Idx)
 	{
-		int choice = WindowPrompt(tr("Import Categories"), tr("Are you sure you want to import game categories from WiiTDB?"), tr("Yes"), tr("Cancel"));
+		int choice = WindowPrompt(tr("Import Categories"), tr("Are you sure you want to import game categories from GameTDB?"), tr("Yes"), tr("Cancel"));
 		if(choice)
 		{
 			char xmlpath[300];
 			snprintf(xmlpath, sizeof(xmlpath), "%swiitdb.xml", Settings.titlestxt_path);
-			if(!GameCategories.ImportFromWiiTDB(xmlpath))
+			if(!GameCategories.ImportFromGameTDB(xmlpath))
 			{
 				WindowPrompt(tr("Error"), tr("Could not open the WiiTDB.xml file."), tr("OK"));
 			}
diff --git a/source/settings/menus/GUISettingsMenu.cpp b/source/settings/menus/GUISettingsMenu.cpp
index d19b8692..5fe9b608 100644
--- a/source/settings/menus/GUISettingsMenu.cpp
+++ b/source/settings/menus/GUISettingsMenu.cpp
@@ -31,6 +31,7 @@
 #include "settings/GameTitles.h"
 #include "settings/CGameCategories.hpp"
 #include "usbloader/wbfs.h"
+#include "themes/CTheme.h"
 #include "utils/tools.h"
 
 static const char * OnOffText[MAX_ON_OFF] =
@@ -218,7 +219,7 @@ int GuiSettingsMenu::GetMenuInternal()
 		if (returnhere == 2)
 		{
 			//! Language changed. Reload game titles with new lang code.
-			GameTitles.LoadTitlesFromWiiTDB(Settings.titlestxt_path);
+			GameTitles.LoadTitlesFromGameTDB(Settings.titlestxt_path);
 			return MENU_SETTINGS;
 		}
 
@@ -347,6 +348,15 @@ int GuiSettingsMenu::GetMenuInternal()
 	else if (ret == ++Idx)
 	{
 		if (++Settings.UseSystemFont >= MAX_ON_OFF) Settings.UseSystemFont = 0;
+
+		HaltGui();
+		Theme::LoadFont(Settings.ConfigPath);
+		ResumeGui();
+
+		if(Settings.FontScaleFactor == 1.0f && Settings.UseSystemFont == ON)
+			Settings.FontScaleFactor = 0.8f;
+		else if(Settings.FontScaleFactor == 0.8f && Settings.UseSystemFont == OFF)
+			Settings.FontScaleFactor = 1.0f;
 	}
 
 	SetOptionValues();
diff --git a/source/settings/menus/HardDriveSM.cpp b/source/settings/menus/HardDriveSM.cpp
index d8832cb0..66bde7a0 100644
--- a/source/settings/menus/HardDriveSM.cpp
+++ b/source/settings/menus/HardDriveSM.cpp
@@ -113,7 +113,7 @@ HardDriveSM::~HardDriveSM()
 
 		//! Reload the new game titles
 		gameList.ReadGameList();
-		GameTitles.LoadTitlesFromWiiTDB(Settings.titlestxt_path);
+		GameTitles.LoadTitlesFromGameTDB(Settings.titlestxt_path);
 	}
 }
 
diff --git a/source/themes/CTheme.cpp b/source/themes/CTheme.cpp
index d46a4862..2078cbf2 100644
--- a/source/themes/CTheme.cpp
+++ b/source/themes/CTheme.cpp
@@ -273,6 +273,7 @@ bool Theme::LoadFont(const char *path)
 		loadedFontSize = Resources::GetFileSize("font.ttf");
 	}
 
+	delete fontSystem;
 
 	fontSystem = new FreeTypeGX(loadedFont, loadedFontSize, loadedFont == systemFont);
 
diff --git a/source/usbloader/GameList.cpp b/source/usbloader/GameList.cpp
index 8b036140..8d79d1cd 100644
--- a/source/usbloader/GameList.cpp
+++ b/source/usbloader/GameList.cpp
@@ -231,7 +231,7 @@ int GameList::FilterList(const wchar_t * gameFilter)
 			if (GameConfig && GameConfig->parentalcontrol > Settings.parentalcontrol)
 				continue;
 
-			// Check game rating in WiiTDB, since the default Wii parental control setting is enabled
+			// Check game rating in GameTDB, since the default Wii parental control setting is enabled
 			int rating = GameTitles.GetParentalRating((char *) header->id);
 			if (rating > Settings.parentalcontrol)
 				continue;
diff --git a/source/usbloader/MountGamePartition.cpp b/source/usbloader/MountGamePartition.cpp
index 4a69303a..20d52653 100644
--- a/source/usbloader/MountGamePartition.cpp
+++ b/source/usbloader/MountGamePartition.cpp
@@ -10,7 +10,7 @@
 #include "usbloader/wbfs.h"
 #include "usbloader/GameList.h"
 #include "settings/GameTitles.h"
-#include "xml/WiiTDB.hpp"
+#include "xml/GameTDB.hpp"
 
 static int FindGamePartition()
 {
@@ -144,14 +144,14 @@ int MountGamePartition(bool ShowGUI)
 		Sys_LoadMenu();
 	}
 
-	gprintf("LoadTitlesFromWiiTDB\n");
+	gprintf("LoadTitlesFromGameTDB\n");
 	//! Clear list if available
 	GameTitles.Clear();
 
-	//! gameList is loaded in GameTitles.LoadTitlesFromWiiTDB after cache file load
+	//! gameList is loaded in GameTitles.LoadTitlesFromGameTDB after cache file load
 	//! for speed up purpose. If titles override active, load game list here.
 	if(Settings.titlesOverride)
-		GameTitles.LoadTitlesFromWiiTDB(Settings.titlestxt_path);
+		GameTitles.LoadTitlesFromGameTDB(Settings.titlestxt_path);
 	else
 		gameList.LoadUnfiltered();
 
diff --git a/source/xml/WiiTDB.cpp b/source/xml/GameTDB.cpp
similarity index 90%
rename from source/xml/WiiTDB.cpp
rename to source/xml/GameTDB.cpp
index 2aed5553..7d63d2bd 100644
--- a/source/xml/WiiTDB.cpp
+++ b/source/xml/GameTDB.cpp
@@ -25,7 +25,7 @@
 #include <stdlib.h>
 #include <string>
 #include <cstring>
-#include "WiiTDB.hpp"
+#include "GameTDB.hpp"
 
 #define NAME_OFFSET_DB  "wiitdb_offsets.bin"
 #define MAXREADSIZE	 1024*1024   // Cache size only for parsing the offsets: 1MB
@@ -48,23 +48,23 @@ static const ReplaceStruct Replacements[] =
 	{ NULL, '\0', 0 }
 };
 
-WiiTDB::WiiTDB()
+GameTDB::GameTDB()
 	: file(0), LangCode("EN"), GameNodeCache(0)
 {
 }
 
-WiiTDB::WiiTDB(const char * filepath)
+GameTDB::GameTDB(const char * filepath)
 	: file(0), LangCode("EN"), GameNodeCache(0)
 {
 	OpenFile(filepath);
 }
 
-WiiTDB::~WiiTDB()
+GameTDB::~GameTDB()
 {
 	CloseFile();
 }
 
-bool WiiTDB::OpenFile(const char * filepath)
+bool GameTDB::OpenFile(const char * filepath)
 {
 	if(!filepath)
 		return false;
@@ -85,7 +85,7 @@ bool WiiTDB::OpenFile(const char * filepath)
 	return (file != NULL);
 }
 
-void WiiTDB::CloseFile()
+void GameTDB::CloseFile()
 {
 	OffsetMap.clear();
 	vector<GameOffsets>().swap(OffsetMap);
@@ -99,7 +99,7 @@ void WiiTDB::CloseFile()
 	file = NULL;
 }
 
-bool WiiTDB::LoadGameOffsets(const char * path)
+bool GameTDB::LoadGameOffsets(const char * path)
 {
 	if(!path)
 		return false;
@@ -119,7 +119,7 @@ bool WiiTDB::LoadGameOffsets(const char * path)
 		return result;
 	}
 
-	unsigned long long ExistingVersion = GetWiiTDBVersion();
+	unsigned long long ExistingVersion = GetGameTDBVersion();
 	unsigned long long Version = 0;
 	unsigned int NodeCount = 0;
 
@@ -164,7 +164,7 @@ bool WiiTDB::LoadGameOffsets(const char * path)
 	return true;
 }
 
-bool WiiTDB::SaveGameOffsets(const char * path)
+bool GameTDB::SaveGameOffsets(const char * path)
 {
 	if(OffsetMap.size() == 0 || !path)
 		return false;
@@ -173,7 +173,7 @@ bool WiiTDB::SaveGameOffsets(const char * path)
 	if(!fp)
 		return false;
 
-	unsigned long long ExistingVersion = GetWiiTDBVersion();
+	unsigned long long ExistingVersion = GetGameTDBVersion();
 	unsigned int NodeCount = OffsetMap.size();
 
 	if(fwrite(&ExistingVersion, 1, sizeof(ExistingVersion), fp) != sizeof(ExistingVersion))
@@ -199,7 +199,7 @@ bool WiiTDB::SaveGameOffsets(const char * path)
 	return true;
 }
 
-unsigned long long WiiTDB::GetWiiTDBVersion()
+unsigned long long GameTDB::GetGameTDBVersion()
 {
 	if(!file)
 		return 0;
@@ -216,7 +216,7 @@ unsigned long long WiiTDB::GetWiiTDBVersion()
 	return strtoull(VersionText, NULL, 10);
 }
 
-int WiiTDB::GetData(char * data, int offset, int size)
+int GameTDB::GetData(char * data, int offset, int size)
 {
 	if(!file || !data)
 		return -1;
@@ -226,7 +226,7 @@ int WiiTDB::GetData(char * data, int offset, int size)
 	return fread(data, 1, size, file);
 }
 
-char * WiiTDB::LoadGameNode(const char * id)
+char * GameTDB::LoadGameNode(const char * id)
 {
 	unsigned int read = 0;
 
@@ -249,7 +249,7 @@ char * WiiTDB::LoadGameNode(const char * id)
 	return data;
 }
 
-char * WiiTDB::GetGameNode(const char * id)
+char * GameTDB::GetGameNode(const char * id)
 {
 	char * data = NULL;
 
@@ -278,7 +278,7 @@ char * WiiTDB::GetGameNode(const char * id)
 	return data;
 }
 
-GameOffsets * WiiTDB::GetGameOffset(const char * gameID)
+GameOffsets * GameTDB::GetGameOffset(const char * gameID)
 {
 	for(unsigned int i = 0; i < OffsetMap.size(); ++i)
 	{
@@ -327,7 +327,7 @@ static inline char * CleanText(char * in_text)
 	return in_text;
 }
 
-char * WiiTDB::GetNodeText(char * data, const char * nodestart, const char * nodeend)
+char * GameTDB::GetNodeText(char * data, const char * nodestart, const char * nodeend)
 {
 	if(!data || !nodestart || !nodeend)
 		return NULL;
@@ -347,7 +347,7 @@ char * WiiTDB::GetNodeText(char * data, const char * nodestart, const char * nod
 	return CleanText(position);
 }
 
-char * WiiTDB::SeekLang(char * text, const char * langcode)
+char * GameTDB::SeekLang(char * text, const char * langcode)
 {
 	if(!text || !langcode) return NULL;
 
@@ -373,7 +373,7 @@ char * WiiTDB::SeekLang(char * text, const char * langcode)
 	return NULL;
 }
 
-bool WiiTDB::ParseFile()
+bool GameTDB::ParseFile()
 {
 	OffsetMap.clear();
 
@@ -437,7 +437,7 @@ bool WiiTDB::ParseFile()
 	return true;
 }
 
-bool WiiTDB::GetTitle(const char * id, string & title)
+bool GameTDB::GetTitle(const char * id, string & title)
 {
 	if(!id)
 		return false;
@@ -471,7 +471,7 @@ bool WiiTDB::GetTitle(const char * id, string & title)
 	return true;
 }
 
-bool WiiTDB::GetSynopsis(const char * id, string & synopsis)
+bool GameTDB::GetSynopsis(const char * id, string & synopsis)
 {
 	if(!id)
 		return false;
@@ -505,7 +505,7 @@ bool WiiTDB::GetSynopsis(const char * id, string & synopsis)
 	return true;
 }
 
-bool WiiTDB::GetRegion(const char * id, string & region)
+bool GameTDB::GetRegion(const char * id, string & region)
 {
 	if(!id)
 		return false;
@@ -528,7 +528,7 @@ bool WiiTDB::GetRegion(const char * id, string & region)
 	return true;
 }
 
-bool WiiTDB::GetDeveloper(const char * id, string & dev)
+bool GameTDB::GetDeveloper(const char * id, string & dev)
 {
 	if(!id)
 		return false;
@@ -551,7 +551,7 @@ bool WiiTDB::GetDeveloper(const char * id, string & dev)
 	return true;
 }
 
-bool WiiTDB::GetPublisher(const char * id, string & pub)
+bool GameTDB::GetPublisher(const char * id, string & pub)
 {
 	if(!id)
 		return false;
@@ -574,7 +574,7 @@ bool WiiTDB::GetPublisher(const char * id, string & pub)
 	return true;
 }
 
-unsigned int WiiTDB::GetPublishDate(const char * id)
+unsigned int GameTDB::GetPublishDate(const char * id)
 {
 	if(!id)
 		return 0;
@@ -621,7 +621,7 @@ unsigned int WiiTDB::GetPublishDate(const char * id)
 	return ((year & 0xFFFF) << 16 | (month & 0xFF) << 8 | (day & 0xFF));
 }
 
-bool WiiTDB::GetGenreList(const char * id, vector<string> & genre)
+bool GameTDB::GetGenreList(const char * id, vector<string> & genre)
 {
 	if(!id)
 		return false;
@@ -673,7 +673,7 @@ bool WiiTDB::GetGenreList(const char * id, vector<string> & genre)
 	return true;
 }
 
-const char * WiiTDB::RatingToString(int rating)
+const char * GameTDB::RatingToString(int rating)
 {
 	switch(rating)
 	{
@@ -690,7 +690,7 @@ const char * WiiTDB::RatingToString(int rating)
 	return NULL;
 }
 
-int WiiTDB::StringToRating(const char *rate_string)
+int GameTDB::StringToRating(const char *rate_string)
 {
 	if (strcasecmp(rate_string, "CERO") == 0)
 		return 0;
@@ -704,7 +704,7 @@ int WiiTDB::StringToRating(const char *rate_string)
 	return -1;
 }
 
-int WiiTDB::ConvertRating(const char *value, const char *from, const char *to)
+int GameTDB::ConvertRating(const char *value, const char *from, const char *to)
 {
 	if (strcasecmp(from, to) == 0)
 	{
@@ -770,7 +770,7 @@ int WiiTDB::ConvertRating(const char *value, const char *from, const char *to)
 	return -1;
 }
 
-int WiiTDB::GetRating(const char * id)
+int GameTDB::GetRating(const char * id)
 {
 	int rating = -1;
 
@@ -802,7 +802,7 @@ int WiiTDB::GetRating(const char * id)
 	return rating;
 }
 
-bool WiiTDB::GetRatingValue(const char * id, string & rating_value)
+bool GameTDB::GetRatingValue(const char * id, string & rating_value)
 {
 	if(!id)
 		return false;
@@ -832,7 +832,7 @@ bool WiiTDB::GetRatingValue(const char * id, string & rating_value)
 	return true;
 }
 
-int WiiTDB::GetRatingDescriptorList(const char * id, vector<string> & desc_list)
+int GameTDB::GetRatingDescriptorList(const char * id, vector<string> & desc_list)
 {
 	if(!id)
 		return -1;
@@ -876,7 +876,7 @@ int WiiTDB::GetRatingDescriptorList(const char * id, vector<string> & desc_list)
 	return desc_list.size();
 }
 
-int WiiTDB::GetWifiPlayers(const char * id)
+int GameTDB::GetWifiPlayers(const char * id)
 {
 	int players = -1;
 
@@ -899,7 +899,7 @@ int WiiTDB::GetWifiPlayers(const char * id)
 	return players;
 }
 
-int WiiTDB::GetWifiFeatureList(const char * id, vector<string> & feat_list)
+int GameTDB::GetWifiFeatureList(const char * id, vector<string> & feat_list)
 {
 	if(!id)
 		return -1;
@@ -948,7 +948,7 @@ int WiiTDB::GetWifiFeatureList(const char * id, vector<string> & feat_list)
 	return feat_list.size();
 }
 
-int WiiTDB::GetPlayers(const char * id)
+int GameTDB::GetPlayers(const char * id)
 {
 	int players = -1;
 
@@ -971,7 +971,7 @@ int WiiTDB::GetPlayers(const char * id)
 	return players;
 }
 
-int WiiTDB::GetAccessoirList(const char * id, vector<Accessoir> & acc_list)
+int GameTDB::GetAccessoirList(const char * id, vector<Accessoir> & acc_list)
 {
 	if(!id)
 		return -1;
@@ -1031,7 +1031,7 @@ int WiiTDB::GetAccessoirList(const char * id, vector<Accessoir> & acc_list)
 	return acc_list.size();
 }
 
-int WiiTDB::GetCaseColor(const char * id)
+int GameTDB::GetCaseColor(const char * id)
 {
 	int color = -1;
 
@@ -1054,7 +1054,7 @@ int WiiTDB::GetCaseColor(const char * id)
 	return color;
 }
 
-bool WiiTDB::GetGameXMLInfo(const char * id, GameXMLInfo * gameInfo)
+bool GameTDB::GetGameXMLInfo(const char * id, GameXMLInfo * gameInfo)
 {
 	if(!id || !gameInfo)
 		return false;
diff --git a/source/xml/WiiTDB.hpp b/source/xml/GameTDB.hpp
similarity index 94%
rename from source/xml/WiiTDB.hpp
rename to source/xml/GameTDB.hpp
index 90b98981..6dad185f 100644
--- a/source/xml/WiiTDB.hpp
+++ b/source/xml/GameTDB.hpp
@@ -21,8 +21,8 @@
  * 3. This notice may not be removed or altered from any source
  * distribution.
  ***************************************************************************/
-#ifndef WIITDB_HPP_
-#define WIITDB_HPP_
+#ifndef GAMETDB_HPP_
+#define GAMETDB_HPP_
 
 #include <vector>
 #include <string>
@@ -63,19 +63,19 @@ typedef struct _GameOffsets
 	unsigned int nodesize;
 } __attribute__((__packed__)) GameOffsets;
 
-class WiiTDB
+class GameTDB
 {
 	public:
 		//! Constructor
-		WiiTDB();
+		GameTDB();
 		//! Constructor
 		//! If filepath is passed the xml file is opened and the node offsets are loaded
-		WiiTDB(const char * filepath);
+		GameTDB(const char * filepath);
 		//! Destructor
-		~WiiTDB();
+		~GameTDB();
 		//! If filepath is passed the xml file is opened and the node offsets are loaded
 		bool OpenFile(const char * filepath);
-		//! Closes the WiiTDB xml file
+		//! Closes the GameTDB xml file
 		void CloseFile();
 		//! Set the language code which should be use to find the appropriate language
 		//! If the language code is not found, the language code defaults to EN
@@ -99,7 +99,7 @@ class WiiTDB
 		//! Get the genre list of a game for a specific game id
 		bool GetGenreList(const char * id, vector<string> & genre);
 		//! Get the rating type for a specific game id
-		//! The rating type can be converted to a string with WiiTDB::RatingToString(rating)
+		//! The rating type can be converted to a string with GameTDB::RatingToString(rating)
 		int GetRating(const char * id);
 		//! Get the rating value for a specific game id
 		bool GetRatingValue(const char * id, string & rating_value);
@@ -129,8 +129,8 @@ class WiiTDB
 		static int StringToRating(const char *rate_string);
 		//! Convert a rating to another rating
 		static int ConvertRating(const char *value, const char *from, const char *to);
-		//! Get the version of the wiitdb xml database
-		unsigned long long GetWiiTDBVersion();
+		//! Get the version of the gametdb xml database
+		unsigned long long GetGameTDBVersion();
 		//! Get the entry count in the xml database
 		inline size_t GetEntryCount() { return OffsetMap.size(); };
 	private: