From 4611ae199873d8a541a8897dd2ed7b56c2da3b67 Mon Sep 17 00:00:00 2001
From: cyan06 <cyan06@users.noreply.github.com>
Date: Sat, 4 Apr 2015 16:04:30 +0000
Subject: [PATCH] * Fixed compilation warning (Thanks Greywolf) * Added current
 version and revision number to boot screen * Renamed "Gametdb Path" to
 "Titles Path" and set   default path for title's files to /titles/ subfolder.
 * Added a prompt to move existing files when editing   Titles path.
 (Greywolf) * Added an option to display Multi-disc prompt when   launching
 gamecube games with DM/DML/Nintendont. * Fixed exiting the credit page (press
 B to exit) * Set Loader's IOS setting to 58 if only 58 is available. *
 Removed unneeded IOS58 patches to libruntimeiospatch

Nintendont:
* Added Nintendont 3.304+ new version detection.
* Removed warning if HID is enabled without controller.ini
  on r3.304+. HID setting still used to copy .ini if needed.
* Fixed Booting game from USB if not on the first partition.
* Fixed loading settings/cheats/controller.ini when booting
  from Disc.
* Added a missing warning message if kenobiwii.bin is not
  found but debug option is enabled on Wii consoles.

* Updated French language file
---
 HBC/META.XML                             |   4 +-
 Languages/czech.lang                     |  21 +-
 Languages/danish.lang                    |  24 ++-
 Languages/dutch.lang                     |  26 ++-
 Languages/english.lang                   |  21 +-
 Languages/finnish.lang                   |  21 +-
 Languages/french.lang                    |  33 ++-
 Languages/german.lang                    |  26 ++-
 Languages/greek.lang                     |  26 ++-
 Languages/hungarian.lang                 |  21 +-
 Languages/italian.lang                   |  26 ++-
 Languages/japanese.lang                  |  26 ++-
 Languages/korean.lang                    |  21 +-
 Languages/norwegian.lang                 |  21 +-
 Languages/polish.lang                    |  21 +-
 Languages/portuguese_br.lang             |  26 ++-
 Languages/portuguese_pt.lang             |  24 ++-
 Languages/russian.lang                   |  21 +-
 Languages/schinese.lang                  |  26 ++-
 Languages/spanish.lang                   |  29 ++-
 Languages/swedish.lang                   |  21 +-
 Languages/tchinese.lang                  |  26 ++-
 Languages/thai.lang                      |  21 +-
 Languages/turkish.lang                   |  21 +-
 source/GameCube/GCGames.cpp              |  60 ++++--
 source/GameCube/GCGames.h                |   5 +-
 source/StartUpProcess.cpp                |  18 ++
 source/StartUpProcess.h                  |   1 +
 source/banner/Animator.h                 |   2 +
 source/banner/Material.h                 |   1 +
 source/prompts/PromptWindows.cpp         |  31 ++-
 source/settings/CSettings.cpp            |   9 +-
 source/settings/CSettings.h              |   1 +
 source/settings/menus/CustomPathsSM.cpp  |  47 ++++-
 source/settings/menus/CustomPathsSM.hpp  |   3 +
 source/settings/menus/LoaderSettings.cpp |  38 ++--
 source/system/runtimeiospatch.c          |   6 +-
 source/usbloader/GameBooter.cpp          | 248 +++++++++++++----------
 38 files changed, 712 insertions(+), 311 deletions(-)

diff --git a/HBC/META.XML b/HBC/META.XML
index 3b76a57f..29d8c71f 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>3.0 r1243</version>
-		<release_date>20150308164242</release_date>
+		<version>3.0 r1244</version>
+		<release_date>20150404152023</release_date>
 		<!--   // remove this line to enable arguments
 		<arguments>
 				<arg>--ios=250</arg>
diff --git a/Languages/czech.lang b/Languages/czech.lang
index 11a5718d..a984cc72 100644
--- a/Languages/czech.lang
+++ b/Languages/czech.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-14 16:29+0100\n"
+"POT-Creation-Date: 2015-04-04 16:59+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"
@@ -619,6 +619,9 @@ msgstr ""
 msgid "Disc read error."
 msgstr ""
 
+msgid "Disc-Select Prompt"
+msgstr ""
+
 msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?"
 msgstr ""
 
@@ -688,6 +691,9 @@ msgstr ""
 msgid "Do you want to load the default theme?"
 msgstr "Prejete si nahrát výchozí téma?"
 
+msgid "Do you want to move the file(s)? Any existing ones will be deleted!"
+msgstr ""
+
 msgid "Do you want to re-init network?"
 msgstr ""
 
@@ -1105,9 +1111,6 @@ msgstr ""
 msgid "GameCube Source"
 msgstr ""
 
-msgid "GameTDB Path"
-msgstr ""
-
 msgid "Gamename [GAMEID]"
 msgstr "Název hry [IdHry]"
 
@@ -1399,6 +1402,9 @@ msgstr "Spustit z DVD"
 msgid "Mount USB at launch"
 msgstr ""
 
+msgid "Move File"
+msgstr ""
+
 msgid "Multiple Partitions"
 msgstr ""
 
@@ -2033,6 +2039,9 @@ msgstr ""
 msgid "Title Launcher"
 msgstr "Spouštec kanálu"
 
+msgid "Titles Path"
+msgstr ""
+
 msgid "Titles from GameTDB"
 msgstr ""
 
@@ -2228,10 +2237,10 @@ msgstr "Co si prejete smazat pro tento titul:"
 msgid "What to extract from NAND?"
 msgstr ""
 
-msgid "Where do you want MCEmu to be located?"
+msgid "Where should the game be installed to?"
 msgstr ""
 
-msgid "Where should the game be installed to?"
+msgid "Which device do you want to use for Nintendont files?"
 msgstr ""
 
 msgid "WiFi Features"
diff --git a/Languages/danish.lang b/Languages/danish.lang
index b58f73aa..b31a0238 100644
--- a/Languages/danish.lang
+++ b/Languages/danish.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-14 16:29+0100\n"
+"POT-Creation-Date: 2015-04-04 16:59+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: Fox888[dk]\n"
 "Language-Team: [dk]\n"
@@ -619,6 +619,9 @@ msgstr ""
 msgid "Disc read error."
 msgstr ""
 
+msgid "Disc-Select Prompt"
+msgstr ""
+
 msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?"
 msgstr ""
 
@@ -688,6 +691,9 @@ msgstr ""
 msgid "Do you want to load the default theme?"
 msgstr "Vil du indlæse standard tema?"
 
+msgid "Do you want to move the file(s)? Any existing ones will be deleted!"
+msgstr ""
+
 msgid "Do you want to re-init network?"
 msgstr "Vil du genetablere netværket?"
 
@@ -1105,9 +1111,6 @@ msgstr ""
 msgid "GameCube Source"
 msgstr ""
 
-msgid "GameTDB Path"
-msgstr "Sti til GameTDB"
-
 msgid "Gamename [GAMEID]"
 msgstr ""
 
@@ -1399,6 +1402,9 @@ msgstr "Mount DVD-drev"
 msgid "Mount USB at launch"
 msgstr ""
 
+msgid "Move File"
+msgstr ""
+
 msgid "Multiple Partitions"
 msgstr "Multiple Partitioner"
 
@@ -2033,6 +2039,9 @@ msgstr ""
 msgid "Title Launcher"
 msgstr "Titel-starter"
 
+msgid "Titles Path"
+msgstr ""
+
 msgid "Titles from GameTDB"
 msgstr "Titler fra GameTDB"
 
@@ -2228,10 +2237,10 @@ msgstr "Hvad skal der slettes for dette spil:"
 msgid "What to extract from NAND?"
 msgstr "Hvad skal der udpakkes fra NAND?"
 
-msgid "Where do you want MCEmu to be located?"
+msgid "Where should the game be installed to?"
 msgstr ""
 
-msgid "Where should the game be installed to?"
+msgid "Which device do you want to use for Nintendont files?"
 msgstr ""
 
 msgid "WiFi Features"
@@ -2367,6 +2376,9 @@ msgstr "af"
 msgid "seconds left"
 msgstr "sekunder tilbage"
 
+#~ msgid "GameTDB Path"
+#~ msgstr "Sti til GameTDB"
+
 #~ msgid "Error 002 fix"
 #~ msgstr "Error 002 fix"
 
diff --git a/Languages/dutch.lang b/Languages/dutch.lang
index 09b6ea54..0e265638 100644
--- a/Languages/dutch.lang
+++ b/Languages/dutch.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-14 16:29+0100\n"
+"POT-Creation-Date: 2015-04-04 16:59+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -619,6 +619,9 @@ msgstr ""
 msgid "Disc read error."
 msgstr "Disk leesfout."
 
+msgid "Disc-Select Prompt"
+msgstr ""
+
 msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?"
 msgstr "Disc2 moet in een ongecomprimeerd formaat worden opgeslagen om te werken met DM (L) V2.6+, weet je zeker dat je wilt installeren in een gecomprimeerd formaat?"
 
@@ -688,6 +691,9 @@ msgstr "Wil je de geselecteerde spellen installeren?"
 msgid "Do you want to load the default theme?"
 msgstr "Wil je het standaard thema laden?"
 
+msgid "Do you want to move the file(s)? Any existing ones will be deleted!"
+msgstr ""
+
 msgid "Do you want to re-init network?"
 msgstr "Wil je het netwerk herinitialiseren?"
 
@@ -1105,9 +1111,6 @@ msgstr "GameCube Modus"
 msgid "GameCube Source"
 msgstr "GameCube Bron"
 
-msgid "GameTDB Path"
-msgstr "Map naar GameTBD"
-
 msgid "Gamename [GAMEID]"
 msgstr "Spelnaam [SPELID]"
 
@@ -1399,6 +1402,9 @@ msgstr "DVD Laden"
 msgid "Mount USB at launch"
 msgstr ""
 
+msgid "Move File"
+msgstr ""
+
 msgid "Multiple Partitions"
 msgstr "Meerdere partities"
 
@@ -2033,6 +2039,9 @@ msgstr "Timer Fix"
 msgid "Title Launcher"
 msgstr "Titel Launcher"
 
+msgid "Titles Path"
+msgstr ""
+
 msgid "Titles from GameTDB"
 msgstr "Titels van GameTDB"
 
@@ -2228,12 +2237,12 @@ msgstr "Wat moet er verwijderd worden voor deze spel titel:"
 msgid "What to extract from NAND?"
 msgstr "Wat uitpakken van NAND?"
 
-msgid "Where do you want MCEmu to be located?"
-msgstr ""
-
 msgid "Where should the game be installed to?"
 msgstr "Waar moet het spel naar geïnstelleerd worden?"
 
+msgid "Which device do you want to use for Nintendont files?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "WiFi Functies"
 
@@ -2367,6 +2376,9 @@ msgstr "van"
 msgid "seconds left"
 msgstr "seconde resterend"
 
+#~ msgid "GameTDB Path"
+#~ msgstr "Map naar GameTBD"
+
 #~ msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."
 #~ msgstr "Om GameCube spellen met %s te spelen moet je je 'Hoofd GameCube Pad' op een primary partitie zetten."
 
diff --git a/Languages/english.lang b/Languages/english.lang
index 489f924b..2acd9524 100644
--- a/Languages/english.lang
+++ b/Languages/english.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-14 16:29+0100\n"
+"POT-Creation-Date: 2015-04-04 16:59+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -619,6 +619,9 @@ msgstr ""
 msgid "Disc read error."
 msgstr ""
 
+msgid "Disc-Select Prompt"
+msgstr ""
+
 msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?"
 msgstr ""
 
@@ -688,6 +691,9 @@ msgstr ""
 msgid "Do you want to load the default theme?"
 msgstr ""
 
+msgid "Do you want to move the file(s)? Any existing ones will be deleted!"
+msgstr ""
+
 msgid "Do you want to re-init network?"
 msgstr ""
 
@@ -1105,9 +1111,6 @@ msgstr ""
 msgid "GameCube Source"
 msgstr ""
 
-msgid "GameTDB Path"
-msgstr ""
-
 msgid "Gamename [GAMEID]"
 msgstr ""
 
@@ -1399,6 +1402,9 @@ msgstr ""
 msgid "Mount USB at launch"
 msgstr ""
 
+msgid "Move File"
+msgstr ""
+
 msgid "Multiple Partitions"
 msgstr ""
 
@@ -2033,6 +2039,9 @@ msgstr ""
 msgid "Title Launcher"
 msgstr ""
 
+msgid "Titles Path"
+msgstr ""
+
 msgid "Titles from GameTDB"
 msgstr ""
 
@@ -2228,10 +2237,10 @@ msgstr ""
 msgid "What to extract from NAND?"
 msgstr ""
 
-msgid "Where do you want MCEmu to be located?"
+msgid "Where should the game be installed to?"
 msgstr ""
 
-msgid "Where should the game be installed to?"
+msgid "Which device do you want to use for Nintendont files?"
 msgstr ""
 
 msgid "WiFi Features"
diff --git a/Languages/finnish.lang b/Languages/finnish.lang
index 5439c86c..d71afc93 100644
--- a/Languages/finnish.lang
+++ b/Languages/finnish.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-14 16:29+0100\n"
+"POT-Creation-Date: 2015-04-04 16:59+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: c64rmx\n"
 "Language-Team: \n"
@@ -619,6 +619,9 @@ msgstr ""
 msgid "Disc read error."
 msgstr ""
 
+msgid "Disc-Select Prompt"
+msgstr ""
+
 msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?"
 msgstr ""
 
@@ -688,6 +691,9 @@ msgstr ""
 msgid "Do you want to load the default theme?"
 msgstr ""
 
+msgid "Do you want to move the file(s)? Any existing ones will be deleted!"
+msgstr ""
+
 msgid "Do you want to re-init network?"
 msgstr ""
 
@@ -1105,9 +1111,6 @@ msgstr ""
 msgid "GameCube Source"
 msgstr ""
 
-msgid "GameTDB Path"
-msgstr ""
-
 msgid "Gamename [GAMEID]"
 msgstr ""
 
@@ -1399,6 +1402,9 @@ msgstr ""
 msgid "Mount USB at launch"
 msgstr ""
 
+msgid "Move File"
+msgstr ""
+
 msgid "Multiple Partitions"
 msgstr ""
 
@@ -2033,6 +2039,9 @@ msgstr ""
 msgid "Title Launcher"
 msgstr "Nimilaukaisin"
 
+msgid "Titles Path"
+msgstr ""
+
 msgid "Titles from GameTDB"
 msgstr ""
 
@@ -2228,10 +2237,10 @@ msgstr ""
 msgid "What to extract from NAND?"
 msgstr ""
 
-msgid "Where do you want MCEmu to be located?"
+msgid "Where should the game be installed to?"
 msgstr ""
 
-msgid "Where should the game be installed to?"
+msgid "Which device do you want to use for Nintendont files?"
 msgstr ""
 
 msgid "WiFi Features"
diff --git a/Languages/french.lang b/Languages/french.lang
index d277f8eb..f83fb8b1 100644
--- a/Languages/french.lang
+++ b/Languages/french.lang
@@ -1,11 +1,11 @@
 # USB Loader GX language source file.
-# French.lang - r1241
+# French.lang - r1244
 # don't delete/change this line (é).
 msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-14 16:29+0100\n"
+"POT-Creation-Date: 2015-04-04 16:59+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: Cyan\n"
 "Language-Team: Badablek, Amour, ikya, Cyan & Kin8\n"
@@ -619,6 +619,9 @@ msgstr "Temporiser l'accès disque"
 msgid "Disc read error."
 msgstr "Erreur de lecture du disque."
 
+msgid "Disc-Select Prompt"
+msgstr "Demander choix du disque"
+
 msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?"
 msgstr "Le disque 2 doit être installé dans un format non compressé pour fonctionner avec DM(L) v2.6+, voulez-vous vraiment l'installer compressé ?"
 
@@ -688,6 +691,9 @@ msgstr "Voulez-vous installer les jeux sélectionnés ?"
 msgid "Do you want to load the default theme?"
 msgstr "Voulez-vous charger le thème par défaut ?"
 
+msgid "Do you want to move the file(s)? Any existing ones will be deleted!"
+msgstr "Voulez-vous déplacer le(s) fichier(s) ? Tout fichier existant sera supprimé !"
+
 msgid "Do you want to re-init network?"
 msgstr "Voulez-vous réinitialiser la connexion ?"
 
@@ -1028,7 +1034,7 @@ msgid "GC Install Compressed"
 msgstr "Instal. jeux GC compressés"
 
 msgid "GCT Cheatcodes Path"
-msgstr "Dossier GCT de triche"
+msgstr "Dossier GCT de triches"
 
 msgid "GCT File created"
 msgstr "Fichier GCT créé"
@@ -1105,9 +1111,6 @@ msgstr "Mode GameCube"
 msgid "GameCube Source"
 msgstr "Source GameCube"
 
-msgid "GameTDB Path"
-msgstr "Dossier GameTDB"
-
 msgid "Gamename [GAMEID]"
 msgstr "NomJeu [IDJEU]"
 
@@ -1399,6 +1402,9 @@ msgstr "Charger le DVD"
 msgid "Mount USB at launch"
 msgstr "Charger USB au démarrage"
 
+msgid "Move File"
+msgstr "Déplacement de fichier"
+
 msgid "Multiple Partitions"
 msgstr "Partitions multiples"
 
@@ -2033,6 +2039,9 @@ msgstr "Correction du timing"
 msgid "Title Launcher"
 msgstr "Menu Chaînes"
 
+msgid "Titles Path"
+msgstr "Dossier titres"
+
 msgid "Titles from GameTDB"
 msgstr "Titres de GameTDB"
 
@@ -2228,12 +2237,12 @@ msgstr "Que voulez-vous supprimer pour ce titre?"
 msgid "What to extract from NAND?"
 msgstr "Que voulez-vous extraire de la NAND ?"
 
-msgid "Where do you want MCEmu to be located?"
-msgstr "Quel emplacement utiliser pour la sauvegarde ?"
-
 msgid "Where should the game be installed to?"
 msgstr "Où installer ce jeu ?"
 
+msgid "Which device do you want to use for Nintendont files?"
+msgstr "Quel périphérique voulez-vous utiliser pour les fichiers de Nintendont ?"
+
 msgid "WiFi Features"
 msgstr "Connexion WiFi"
 
@@ -2367,6 +2376,12 @@ msgstr "sur"
 msgid "seconds left"
 msgstr "secondes restantes"
 
+#~ msgid "GameTDB Path"
+#~ msgstr "Dossier GameTDB"
+
+#~ msgid "Where do you want MCEmu to be located?"
+#~ msgstr "Quel emplacement utiliser pour la sauvegarde ?"
+
 #~ msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."
 #~ msgstr "Pour lancer les jeux GameCube avec %s vouz devez placer votre 'Dossier GameCube principal' sur une partition principale."
 
diff --git a/Languages/german.lang b/Languages/german.lang
index 1f2cd9c9..69d1f0bf 100644
--- a/Languages/german.lang
+++ b/Languages/german.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-14 16:29+0100\n"
+"POT-Creation-Date: 2015-04-04 16:59+0200\n"
 "PO-Revision-Date: 2010-07-03 17:35-0800\n"
 "Last-Translator: Sabykos\n"
 "Language-Team: Bertilax, Snoozer, wishmasterf, ZEN.13, TheRealVisitor\n"
@@ -619,6 +619,9 @@ msgstr "Disc Leseverzögerung"
 msgid "Disc read error."
 msgstr "Disk Lesefehler"
 
+msgid "Disc-Select Prompt"
+msgstr ""
+
 msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?"
 msgstr "Disk 2 muss unkomprimiert sein, um mit DM(L) 2.6+ zu funktionieren. Sicher, dass du die Disk komprimiert installieren möchtest?"
 
@@ -688,6 +691,9 @@ msgstr "Sollen gewählte Spiele instelliert werden?"
 msgid "Do you want to load the default theme?"
 msgstr "Soll das DEFAULT Theme geladen werden?"
 
+msgid "Do you want to move the file(s)? Any existing ones will be deleted!"
+msgstr ""
+
 msgid "Do you want to re-init network?"
 msgstr "Netzwerk re-initialisieren?"
 
@@ -1105,9 +1111,6 @@ msgstr "GameCube Modus"
 msgid "GameCube Source"
 msgstr "GameCube Quelle"
 
-msgid "GameTDB Path"
-msgstr "GameTDB"
-
 msgid "Gamename [GAMEID]"
 msgstr "Spielname [SPIELID]"
 
@@ -1399,6 +1402,9 @@ msgstr "Spiel starten"
 msgid "Mount USB at launch"
 msgstr "USB beim Start mounten"
 
+msgid "Move File"
+msgstr ""
+
 msgid "Multiple Partitions"
 msgstr "Mehrere Partitionen"
 
@@ -2033,6 +2039,9 @@ msgstr ""
 msgid "Title Launcher"
 msgstr "Channel Launcher"
 
+msgid "Titles Path"
+msgstr ""
+
 msgid "Titles from GameTDB"
 msgstr "Namen aus der WiiTDB"
 
@@ -2228,12 +2237,12 @@ msgstr "Was sollte bei diesem Spiel gelöscht werden:"
 msgid "What to extract from NAND?"
 msgstr "Was soll aus dem NAND kopiert werden?"
 
-msgid "Where do you want MCEmu to be located?"
-msgstr ""
-
 msgid "Where should the game be installed to?"
 msgstr "Wohin soll das Spiel installiert werden?"
 
+msgid "Which device do you want to use for Nintendont files?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "WiFi Fähigkeiten"
 
@@ -2367,6 +2376,9 @@ msgstr "von"
 msgid "seconds left"
 msgstr "Sekunden verbleiben"
 
+#~ msgid "GameTDB Path"
+#~ msgstr "GameTDB"
+
 #~ msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."
 #~ msgstr "Dein GameCube Hauptpfad muss auf eine primäre Partition verweisen, um GameCube Spiele mit %s% starten zu können."
 
diff --git a/Languages/greek.lang b/Languages/greek.lang
index 58303963..dc221432 100644
--- a/Languages/greek.lang
+++ b/Languages/greek.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-14 16:29+0100\n"
+"POT-Creation-Date: 2015-04-04 16:59+0200\n"
 "Last-Translator: nakata6790\n"
 "Language-Team: nakata6790 (aka0107@gmail.com)\n"
 "MIME-Version: 1.0\n"
@@ -618,6 +618,9 @@ msgstr ""
 msgid "Disc read error."
 msgstr "ÓöÜëìá êáôá ôçí áíÜãíùóç äßóêïõ."
 
+msgid "Disc-Select Prompt"
+msgstr ""
+
 msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?"
 msgstr ""
 
@@ -687,6 +690,9 @@ msgstr "ÈÝëåôå íá åãêáôáóôÞóåôå ôá åðéëåãìÝíá 
 msgid "Do you want to load the default theme?"
 msgstr "ÈÝëåôå íá ÷ñçóéìðïðïéÞóôå ôï âáóéêü èÝìá;"
 
+msgid "Do you want to move the file(s)? Any existing ones will be deleted!"
+msgstr ""
+
 msgid "Do you want to re-init network?"
 msgstr "ÈÝëåôå íá åðáíáóõíäåèåß ôï ðñüãñáììá ìå ôï äéáäßêôõï;"
 
@@ -1104,9 +1110,6 @@ msgstr "ÌÝèïäïò öüñôùóçò ðáé÷íéäéþí GameCube"
 msgid "GameCube Source"
 msgstr ""
 
-msgid "GameTDB Path"
-msgstr "Äéåýèõíóç/ìïíïðÜôé áñ÷åßïõ GameTDB"
-
 msgid "Gamename [GAMEID]"
 msgstr "üíïìá ðáé÷íéäéïý [êùäéêüòðáé÷íéäéïý]"
 
@@ -1398,6 +1401,9 @@ msgstr "Öüñôùóç DVD"
 msgid "Mount USB at launch"
 msgstr ""
 
+msgid "Move File"
+msgstr ""
+
 msgid "Multiple Partitions"
 msgstr "ðïëëáðëÜ partitions"
 
@@ -2032,6 +2038,9 @@ msgstr ""
 msgid "Title Launcher"
 msgstr "ÅêêéíçôÞò ôßôëùí"
 
+msgid "Titles Path"
+msgstr ""
+
 msgid "Titles from GameTDB"
 msgstr "Ôßôëïé áðü ôï GameTDB"
 
@@ -2227,12 +2236,12 @@ msgstr "Ôé èá èÝëáôå íá äéáãñÜøåôå áðü áõôü ôïí
 msgid "What to extract from NAND?"
 msgstr "Ôé íá ìåôáöåñèåß áðü ôç ìíÞìç NAND?"
 
-msgid "Where do you want MCEmu to be located?"
-msgstr ""
-
 msgid "Where should the game be installed to?"
 msgstr "Ðïõ íá åãêáôáóôáèåß ôï ðáé÷íßäé;"
 
+msgid "Which device do you want to use for Nintendont files?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "Ëåéôïõñãßåò wi-fi"
 
@@ -2366,6 +2375,9 @@ msgstr "áðü"
 msgid "seconds left"
 msgstr "äåõôåñüëåðôá áðïìÝíïõí"
 
+#~ msgid "GameTDB Path"
+#~ msgstr "Äéåýèõíóç/ìïíïðÜôé áñ÷åßïõ GameTDB"
+
 #~ msgid "Anti"
 #~ msgstr "ÊáôÜ"
 
diff --git a/Languages/hungarian.lang b/Languages/hungarian.lang
index 0e1a1ab2..eda9005a 100644
--- a/Languages/hungarian.lang
+++ b/Languages/hungarian.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-14 16:29+0100\n"
+"POT-Creation-Date: 2015-04-04 16:59+0200\n"
 "PO-Revision-Date: 2009-12-29 11:05+0100\n"
 "Last-Translator: Springdale\n"
 "Language-Team: Tusk, Springdale\n"
@@ -619,6 +619,9 @@ msgstr ""
 msgid "Disc read error."
 msgstr ""
 
+msgid "Disc-Select Prompt"
+msgstr ""
+
 msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?"
 msgstr ""
 
@@ -688,6 +691,9 @@ msgstr ""
 msgid "Do you want to load the default theme?"
 msgstr ""
 
+msgid "Do you want to move the file(s)? Any existing ones will be deleted!"
+msgstr ""
+
 msgid "Do you want to re-init network?"
 msgstr ""
 
@@ -1105,9 +1111,6 @@ msgstr ""
 msgid "GameCube Source"
 msgstr ""
 
-msgid "GameTDB Path"
-msgstr ""
-
 msgid "Gamename [GAMEID]"
 msgstr ""
 
@@ -1399,6 +1402,9 @@ msgstr "DVD meghajtó felcsatolása"
 msgid "Mount USB at launch"
 msgstr ""
 
+msgid "Move File"
+msgstr ""
+
 msgid "Multiple Partitions"
 msgstr ""
 
@@ -2033,6 +2039,9 @@ msgstr ""
 msgid "Title Launcher"
 msgstr "Programindító"
 
+msgid "Titles Path"
+msgstr ""
+
 msgid "Titles from GameTDB"
 msgstr ""
 
@@ -2228,10 +2237,10 @@ msgstr ""
 msgid "What to extract from NAND?"
 msgstr ""
 
-msgid "Where do you want MCEmu to be located?"
+msgid "Where should the game be installed to?"
 msgstr ""
 
-msgid "Where should the game be installed to?"
+msgid "Which device do you want to use for Nintendont files?"
 msgstr ""
 
 msgid "WiFi Features"
diff --git a/Languages/italian.lang b/Languages/italian.lang
index e4653584..846cdb5a 100644
--- a/Languages/italian.lang
+++ b/Languages/italian.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-14 16:29+0100\n"
+"POT-Creation-Date: 2015-04-04 16:59+0200\n"
 "PO-Revision-Date: 2011-09-11 12:19+0100\n"
 "Last-Translator: xFede\n"
 "Language-Team: xFede (fedeanto11@gmail.com)\n"
@@ -619,6 +619,9 @@ msgstr ""
 msgid "Disc read error."
 msgstr "Errore durante la lettura del disco."
 
+msgid "Disc-Select Prompt"
+msgstr ""
+
 msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?"
 msgstr "Il disco 2 deve essere installato in formato non compresso per funzionare con DM(L) v2.6+, sicuro di volerlo installare in formato compresso?"
 
@@ -688,6 +691,9 @@ msgstr "Vuoi installare i giochi selezionati?"
 msgid "Do you want to load the default theme?"
 msgstr "Vuoi caricare il tema predefinito?"
 
+msgid "Do you want to move the file(s)? Any existing ones will be deleted!"
+msgstr ""
+
 msgid "Do you want to re-init network?"
 msgstr "Vuoi reinizializzare la rete?"
 
@@ -1105,9 +1111,6 @@ msgstr "Modalità GameCube"
 msgid "GameCube Source"
 msgstr "Sorgente GameCube"
 
-msgid "GameTDB Path"
-msgstr "Percorso GameTDB"
-
 msgid "Gamename [GAMEID]"
 msgstr "Nomegioco [IDGIOCO]"
 
@@ -1399,6 +1402,9 @@ msgstr "Avvia DVD"
 msgid "Mount USB at launch"
 msgstr ""
 
+msgid "Move File"
+msgstr ""
+
 msgid "Multiple Partitions"
 msgstr "Partizioni multiple"
 
@@ -2033,6 +2039,9 @@ msgstr ""
 msgid "Title Launcher"
 msgstr "Avvia titoli"
 
+msgid "Titles Path"
+msgstr ""
+
 msgid "Titles from GameTDB"
 msgstr "Titoli da GameTDB"
 
@@ -2228,12 +2237,12 @@ msgstr "Cosa deve essere eliminato per questo gioco:"
 msgid "What to extract from NAND?"
 msgstr "Che cosa vuoi estrarre dalla NAND?"
 
-msgid "Where do you want MCEmu to be located?"
-msgstr ""
-
 msgid "Where should the game be installed to?"
 msgstr "Dove deve essere installato il gioco?"
 
+msgid "Which device do you want to use for Nintendont files?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "Funzionalità wi-fi"
 
@@ -2367,6 +2376,9 @@ msgstr "di"
 msgid "seconds left"
 msgstr "secondi rimasti"
 
+#~ msgid "GameTDB Path"
+#~ msgstr "Percorso GameTDB"
+
 #~ msgid "Anti"
 #~ msgstr "Anti"
 
diff --git a/Languages/japanese.lang b/Languages/japanese.lang
index 7e66522b..44f78328 100644
--- a/Languages/japanese.lang
+++ b/Languages/japanese.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-14 16:29+0100\n"
+"POT-Creation-Date: 2015-04-04 16:59+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: hosigumayuugi\n"
 "Language-Team: hosigumayuugi\n"
@@ -619,6 +619,9 @@ msgstr ""
 msgid "Disc read error."
 msgstr "読み込みエラー"
 
+msgid "Disc-Select Prompt"
+msgstr ""
+
 msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?"
 msgstr ""
 
@@ -688,6 +691,9 @@ msgstr "選択したゲームをインストールしますか?"
 msgid "Do you want to load the default theme?"
 msgstr "標準のテーマを読み込みますか?"
 
+msgid "Do you want to move the file(s)? Any existing ones will be deleted!"
+msgstr ""
+
 msgid "Do you want to re-init network?"
 msgstr "ネットワークに再接続しますか?"
 
@@ -1105,9 +1111,6 @@ msgstr "GCモード"
 msgid "GameCube Source"
 msgstr ""
 
-msgid "GameTDB Path"
-msgstr "ゲーム名リスト"
-
 msgid "Gamename [GAMEID]"
 msgstr "ゲーム名 [ゲームID]"
 
@@ -1399,6 +1402,9 @@ msgstr "DVDを起動"
 msgid "Mount USB at launch"
 msgstr ""
 
+msgid "Move File"
+msgstr ""
+
 msgid "Multiple Partitions"
 msgstr "マルチ領域"
 
@@ -2033,6 +2039,9 @@ msgstr ""
 msgid "Title Launcher"
 msgstr "ランチャー"
 
+msgid "Titles Path"
+msgstr ""
+
 msgid "Titles from GameTDB"
 msgstr "ｹﾞｰﾑ名の日本語化"
 
@@ -2228,12 +2237,12 @@ msgstr "このゲームの何を削除しますか:"
 msgid "What to extract from NAND?"
 msgstr "何をNANDから書き出しますか?"
 
-msgid "Where do you want MCEmu to be located?"
-msgstr ""
-
 msgid "Where should the game be installed to?"
 msgstr "どこにインストールしますか?"
 
+msgid "Which device do you want to use for Nintendont files?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "ネットワーク対応"
 
@@ -2367,6 +2376,9 @@ msgstr "中"
 msgid "seconds left"
 msgstr "秒で完了"
 
+#~ msgid "GameTDB Path"
+#~ msgstr "ゲーム名リスト"
+
 #~ msgid "Anti"
 #~ msgstr "アンチ"
 
diff --git a/Languages/korean.lang b/Languages/korean.lang
index 3b625c8f..4f2d63fd 100644
--- a/Languages/korean.lang
+++ b/Languages/korean.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-14 16:29+0100\n"
+"POT-Creation-Date: 2015-04-04 16:59+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: nextos@korea.com\n"
 "Language-Team: \n"
@@ -619,6 +619,9 @@ msgstr ""
 msgid "Disc read error."
 msgstr ""
 
+msgid "Disc-Select Prompt"
+msgstr ""
+
 msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?"
 msgstr ""
 
@@ -688,6 +691,9 @@ msgstr ""
 msgid "Do you want to load the default theme?"
 msgstr ""
 
+msgid "Do you want to move the file(s)? Any existing ones will be deleted!"
+msgstr ""
+
 msgid "Do you want to re-init network?"
 msgstr ""
 
@@ -1105,9 +1111,6 @@ msgstr ""
 msgid "GameCube Source"
 msgstr ""
 
-msgid "GameTDB Path"
-msgstr ""
-
 msgid "Gamename [GAMEID]"
 msgstr ""
 
@@ -1399,6 +1402,9 @@ msgstr ""
 msgid "Mount USB at launch"
 msgstr ""
 
+msgid "Move File"
+msgstr ""
+
 msgid "Multiple Partitions"
 msgstr ""
 
@@ -2033,6 +2039,9 @@ msgstr ""
 msgid "Title Launcher"
 msgstr "타이틀 런처"
 
+msgid "Titles Path"
+msgstr ""
+
 msgid "Titles from GameTDB"
 msgstr ""
 
@@ -2228,10 +2237,10 @@ msgstr ""
 msgid "What to extract from NAND?"
 msgstr ""
 
-msgid "Where do you want MCEmu to be located?"
+msgid "Where should the game be installed to?"
 msgstr ""
 
-msgid "Where should the game be installed to?"
+msgid "Which device do you want to use for Nintendont files?"
 msgstr ""
 
 msgid "WiFi Features"
diff --git a/Languages/norwegian.lang b/Languages/norwegian.lang
index 22e6fcf7..becb8ec6 100644
--- a/Languages/norwegian.lang
+++ b/Languages/norwegian.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-14 16:29+0100\n"
+"POT-Creation-Date: 2015-04-04 16:59+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: raschi\n"
 "Language-Team: raschi\n"
@@ -619,6 +619,9 @@ msgstr ""
 msgid "Disc read error."
 msgstr ""
 
+msgid "Disc-Select Prompt"
+msgstr ""
+
 msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?"
 msgstr ""
 
@@ -688,6 +691,9 @@ msgstr ""
 msgid "Do you want to load the default theme?"
 msgstr "Vil du laste standard tema?"
 
+msgid "Do you want to move the file(s)? Any existing ones will be deleted!"
+msgstr ""
+
 msgid "Do you want to re-init network?"
 msgstr ""
 
@@ -1105,9 +1111,6 @@ msgstr ""
 msgid "GameCube Source"
 msgstr ""
 
-msgid "GameTDB Path"
-msgstr ""
-
 msgid "Gamename [GAMEID]"
 msgstr "Spillnavn [SPILLID]"
 
@@ -1399,6 +1402,9 @@ msgstr "Last DVD stasjon"
 msgid "Mount USB at launch"
 msgstr ""
 
+msgid "Move File"
+msgstr ""
+
 msgid "Multiple Partitions"
 msgstr "Flere partisjoner"
 
@@ -2033,6 +2039,9 @@ msgstr ""
 msgid "Title Launcher"
 msgstr "Tittel Laster"
 
+msgid "Titles Path"
+msgstr ""
+
 msgid "Titles from GameTDB"
 msgstr ""
 
@@ -2228,10 +2237,10 @@ msgstr "Hva skal slettes for denne spilltittel:"
 msgid "What to extract from NAND?"
 msgstr ""
 
-msgid "Where do you want MCEmu to be located?"
+msgid "Where should the game be installed to?"
 msgstr ""
 
-msgid "Where should the game be installed to?"
+msgid "Which device do you want to use for Nintendont files?"
 msgstr ""
 
 msgid "WiFi Features"
diff --git a/Languages/polish.lang b/Languages/polish.lang
index c933eefd..cafe7003 100644
--- a/Languages/polish.lang
+++ b/Languages/polish.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-14 16:29+0100\n"
+"POT-Creation-Date: 2015-04-04 16:59+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: ziom666 (zadania_prog@vp.pl)\n"
 "Language-Team: \n"
@@ -619,6 +619,9 @@ msgstr ""
 msgid "Disc read error."
 msgstr ""
 
+msgid "Disc-Select Prompt"
+msgstr ""
+
 msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?"
 msgstr ""
 
@@ -688,6 +691,9 @@ msgstr ""
 msgid "Do you want to load the default theme?"
 msgstr ""
 
+msgid "Do you want to move the file(s)? Any existing ones will be deleted!"
+msgstr ""
+
 msgid "Do you want to re-init network?"
 msgstr ""
 
@@ -1105,9 +1111,6 @@ msgstr ""
 msgid "GameCube Source"
 msgstr ""
 
-msgid "GameTDB Path"
-msgstr ""
-
 msgid "Gamename [GAMEID]"
 msgstr ""
 
@@ -1399,6 +1402,9 @@ msgstr "Uruchom naped DVD"
 msgid "Mount USB at launch"
 msgstr ""
 
+msgid "Move File"
+msgstr ""
+
 msgid "Multiple Partitions"
 msgstr ""
 
@@ -2033,6 +2039,9 @@ msgstr ""
 msgid "Title Launcher"
 msgstr "Uruchom tytul"
 
+msgid "Titles Path"
+msgstr ""
+
 msgid "Titles from GameTDB"
 msgstr ""
 
@@ -2228,10 +2237,10 @@ msgstr ""
 msgid "What to extract from NAND?"
 msgstr ""
 
-msgid "Where do you want MCEmu to be located?"
+msgid "Where should the game be installed to?"
 msgstr ""
 
-msgid "Where should the game be installed to?"
+msgid "Which device do you want to use for Nintendont files?"
 msgstr ""
 
 msgid "WiFi Features"
diff --git a/Languages/portuguese_br.lang b/Languages/portuguese_br.lang
index 883b48c3..7307659c 100644
--- a/Languages/portuguese_br.lang
+++ b/Languages/portuguese_br.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-14 16:29+0100\n"
+"POT-Creation-Date: 2015-04-04 16:59+0200\n"
 "PO-Revision-Date: 2011-11-03 11:00+0000\n"
 "Last-Translator: Codemaster <javafangamers@hotmail.com>\n"
 "Language-Team: Sky8000, pplucky\n"
@@ -619,6 +619,9 @@ msgstr "Atrasar Leitura do Disco"
 msgid "Disc read error."
 msgstr "Erro de leitura do disco."
 
+msgid "Disc-Select Prompt"
+msgstr ""
+
 msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?"
 msgstr "O Disco 2 precisa ser descomprimido para funcionar nessa versão do DIOS MIOS. Tem certeza de que quer instalar usando compressão?"
 
@@ -688,6 +691,9 @@ msgstr "Deseja instalar os jogos selecionados?"
 msgid "Do you want to load the default theme?"
 msgstr "Deseja carregar o tema padrão?"
 
+msgid "Do you want to move the file(s)? Any existing ones will be deleted!"
+msgstr ""
+
 msgid "Do you want to re-init network?"
 msgstr "Deseja reiniciar a rede?"
 
@@ -1105,9 +1111,6 @@ msgstr "Carregar Jogos Usando"
 msgid "GameCube Source"
 msgstr "Pasta de Jogos"
 
-msgid "GameTDB Path"
-msgstr "GameTDB"
-
 msgid "Gamename [GAMEID]"
 msgstr "Nome Jogo [IDJOGO]"
 
@@ -1399,6 +1402,9 @@ msgstr "Rodar Jogo"
 msgid "Mount USB at launch"
 msgstr "Montar USB ao iniciar"
 
+msgid "Move File"
+msgstr ""
+
 msgid "Multiple Partitions"
 msgstr "Partições múltiplas"
 
@@ -2033,6 +2039,9 @@ msgstr ""
 msgid "Title Launcher"
 msgstr "Gestor de Títulos"
 
+msgid "Titles Path"
+msgstr ""
+
 msgid "Titles from GameTDB"
 msgstr "Títulos do GameTDB"
 
@@ -2228,12 +2237,12 @@ msgstr "O que deve ser apagado para este jogo:"
 msgid "What to extract from NAND?"
 msgstr "O que extrair da NAND?"
 
-msgid "Where do you want MCEmu to be located?"
-msgstr ""
-
 msgid "Where should the game be installed to?"
 msgstr "Aonde o jogo será instalado?"
 
+msgid "Which device do you want to use for Nintendont files?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "Rede Sem Fio"
 
@@ -2367,6 +2376,9 @@ msgstr "de"
 msgid "seconds left"
 msgstr "segundos restantes"
 
+#~ msgid "GameTDB Path"
+#~ msgstr "GameTDB"
+
 #~ msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."
 #~ msgstr "Para rodar jogos de GameCube com %s, você precisa escolher uma pasta que esteja numa partição primária."
 
diff --git a/Languages/portuguese_pt.lang b/Languages/portuguese_pt.lang
index 0c7b0a88..ff0a717f 100644
--- a/Languages/portuguese_pt.lang
+++ b/Languages/portuguese_pt.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-14 16:29+0100\n"
+"POT-Creation-Date: 2015-04-04 16:59+0200\n"
 "PO-Revision-Date: 2011-11-03 11:00+0000\n"
 "Last-Translator: pplucky <pplucky@gmail.com>\n"
 "Language-Team: Sky8000, pplucky\n"
@@ -619,6 +619,9 @@ msgstr ""
 msgid "Disc read error."
 msgstr ""
 
+msgid "Disc-Select Prompt"
+msgstr ""
+
 msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?"
 msgstr ""
 
@@ -688,6 +691,9 @@ msgstr ""
 msgid "Do you want to load the default theme?"
 msgstr "Deseja carregar o tema por defeito?"
 
+msgid "Do you want to move the file(s)? Any existing ones will be deleted!"
+msgstr ""
+
 msgid "Do you want to re-init network?"
 msgstr "Deseja reinicializar a rede?"
 
@@ -1105,9 +1111,6 @@ msgstr ""
 msgid "GameCube Source"
 msgstr ""
 
-msgid "GameTDB Path"
-msgstr "Cam. GameTDB"
-
 msgid "Gamename [GAMEID]"
 msgstr "Nome Jogo [IDJOGO]"
 
@@ -1399,6 +1402,9 @@ msgstr "Montar Unidade de DVD"
 msgid "Mount USB at launch"
 msgstr ""
 
+msgid "Move File"
+msgstr ""
+
 msgid "Multiple Partitions"
 msgstr "Partições múltiplas"
 
@@ -2033,6 +2039,9 @@ msgstr ""
 msgid "Title Launcher"
 msgstr "Gestor de Títulos"
 
+msgid "Titles Path"
+msgstr ""
+
 msgid "Titles from GameTDB"
 msgstr "Títulos do GameTDB"
 
@@ -2228,10 +2237,10 @@ msgstr "O que deve ser apagado para este jogo:"
 msgid "What to extract from NAND?"
 msgstr "O que extrair da NAND?"
 
-msgid "Where do you want MCEmu to be located?"
+msgid "Where should the game be installed to?"
 msgstr ""
 
-msgid "Where should the game be installed to?"
+msgid "Which device do you want to use for Nintendont files?"
 msgstr ""
 
 msgid "WiFi Features"
@@ -2367,6 +2376,9 @@ msgstr "de"
 msgid "seconds left"
 msgstr "segundos restantes"
 
+#~ msgid "GameTDB Path"
+#~ msgstr "Cam. GameTDB"
+
 #~ msgid "Anti"
 #~ msgstr "Anti"
 
diff --git a/Languages/russian.lang b/Languages/russian.lang
index 2f5ab894..00d87f82 100644
--- a/Languages/russian.lang
+++ b/Languages/russian.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-14 16:29+0100\n"
+"POT-Creation-Date: 2015-04-04 16:59+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: nikolai_ca\n"
 "Language-Team: Kir, alendit, nikolai_ca\n"
@@ -619,6 +619,9 @@ msgstr ""
 msgid "Disc read error."
 msgstr ""
 
+msgid "Disc-Select Prompt"
+msgstr ""
+
 msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?"
 msgstr ""
 
@@ -688,6 +691,9 @@ msgstr ""
 msgid "Do you want to load the default theme?"
 msgstr ""
 
+msgid "Do you want to move the file(s)? Any existing ones will be deleted!"
+msgstr ""
+
 msgid "Do you want to re-init network?"
 msgstr ""
 
@@ -1105,9 +1111,6 @@ msgstr ""
 msgid "GameCube Source"
 msgstr ""
 
-msgid "GameTDB Path"
-msgstr ""
-
 msgid "Gamename [GAMEID]"
 msgstr ""
 
@@ -1399,6 +1402,9 @@ msgstr "Монтировать DVD"
 msgid "Mount USB at launch"
 msgstr ""
 
+msgid "Move File"
+msgstr ""
+
 msgid "Multiple Partitions"
 msgstr ""
 
@@ -2033,6 +2039,9 @@ msgstr ""
 msgid "Title Launcher"
 msgstr "Загрузчик тайтла"
 
+msgid "Titles Path"
+msgstr ""
+
 msgid "Titles from GameTDB"
 msgstr ""
 
@@ -2228,10 +2237,10 @@ msgstr ""
 msgid "What to extract from NAND?"
 msgstr ""
 
-msgid "Where do you want MCEmu to be located?"
+msgid "Where should the game be installed to?"
 msgstr ""
 
-msgid "Where should the game be installed to?"
+msgid "Which device do you want to use for Nintendont files?"
 msgstr ""
 
 msgid "WiFi Features"
diff --git a/Languages/schinese.lang b/Languages/schinese.lang
index 5d391520..4e470c8f 100644
--- a/Languages/schinese.lang
+++ b/Languages/schinese.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-14 16:29+0100\n"
+"POT-Creation-Date: 2015-04-04 16:59+0200\n"
 "PO-Revision-Date: 2013-08-13 07:03+0800\n"
 "Last-Translator: \n"
 "Language-Team: oCameLo\n"
@@ -619,6 +619,9 @@ msgstr ""
 msgid "Disc read error."
 msgstr "光盘读取错误。"
 
+msgid "Disc-Select Prompt"
+msgstr ""
+
 msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?"
 msgstr "DM(L) v2.6 或以上版本需要将光盘 2 安装为非压缩格式，是否仍然以压缩格式安装？"
 
@@ -688,6 +691,9 @@ msgstr "是否安装选定的游戏？"
 msgid "Do you want to load the default theme?"
 msgstr "要加载默认主题吗？"
 
+msgid "Do you want to move the file(s)? Any existing ones will be deleted!"
+msgstr ""
+
 msgid "Do you want to re-init network?"
 msgstr "是否重新初始化网络？"
 
@@ -1105,9 +1111,6 @@ msgstr "GameCube 模式"
 msgid "GameCube Source"
 msgstr "GameCube 来源"
 
-msgid "GameTDB Path"
-msgstr "GameTDB 路径"
-
 msgid "Gamename [GAMEID]"
 msgstr "游戏名 [GAMEID]"
 
@@ -1399,6 +1402,9 @@ msgstr "挂载 DVD 光驱"
 msgid "Mount USB at launch"
 msgstr "开启时加载USB设备"
 
+msgid "Move File"
+msgstr ""
+
 msgid "Multiple Partitions"
 msgstr "多分区"
 
@@ -2033,6 +2039,9 @@ msgstr "定时器修复"
 msgid "Title Launcher"
 msgstr "系统频道"
 
+msgid "Titles Path"
+msgstr ""
+
 msgid "Titles from GameTDB"
 msgstr "从 GameTDB 读取标题"
 
@@ -2228,12 +2237,12 @@ msgstr "要删除这个游戏的什么："
 msgid "What to extract from NAND?"
 msgstr "从 NAND 中提取什么？"
 
-msgid "Where do you want MCEmu to be located?"
-msgstr ""
-
 msgid "Where should the game be installed to?"
 msgstr "游戏安装到什么地方？"
 
+msgid "Which device do you want to use for Nintendont files?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "WiFi 功能"
 
@@ -2367,6 +2376,9 @@ msgstr "的"
 msgid "seconds left"
 msgstr "剩余秒数"
 
+#~ msgid "GameTDB Path"
+#~ msgstr "GameTDB 路径"
+
 #~ msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."
 #~ msgstr "为了运行Gamecube游戏需要用%s设置你的'主Gamecube路径'在主分区上."
 
diff --git a/Languages/spanish.lang b/Languages/spanish.lang
index ab65ff9a..dfb806b9 100644
--- a/Languages/spanish.lang
+++ b/Languages/spanish.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-14 16:29+0100\n"
+"POT-Creation-Date: 2015-04-04 16:59+0200\n"
 "PO-Revision-Date: 2011-07-25 16:40+0200\n"
 "Last-Translator: Galen/xFede\n"
 "Language-Team: Penn, SirPalax, hvy109\n"
@@ -619,6 +619,9 @@ msgstr "Delay lectura disco"
 msgid "Disc read error."
 msgstr "Error de lectura del disco."
 
+msgid "Disc-Select Prompt"
+msgstr ""
+
 msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?"
 msgstr "DM(L) v2.6+ necesita el disco 2 en formato original (sin compresión), ¿estás seguro que deseas instalarlo en formato comprimido?"
 
@@ -688,6 +691,9 @@ msgstr "¿Quieres instalar los juegos seleccionados?"
 msgid "Do you want to load the default theme?"
 msgstr "¿Quieres cargar el tema por defecto?"
 
+msgid "Do you want to move the file(s)? Any existing ones will be deleted!"
+msgstr ""
+
 msgid "Do you want to re-init network?"
 msgstr "¿Quieres reiniciar la red?"
 
@@ -1105,9 +1111,6 @@ msgstr "Modo GameCube"
 msgid "GameCube Source"
 msgstr "Origen GameCube"
 
-msgid "GameTDB Path"
-msgstr "Ruta GameDTB"
-
 msgid "Gamename [GAMEID]"
 msgstr "Nombrejuego [IDJUEGO]"
 
@@ -1399,6 +1402,9 @@ msgstr "Montar unidad DVD"
 msgid "Mount USB at launch"
 msgstr "Montar USB al inicio"
 
+msgid "Move File"
+msgstr ""
+
 msgid "Multiple Partitions"
 msgstr "Múltiples Particiones"
 
@@ -2033,6 +2039,9 @@ msgstr "Corrección del timer"
 msgid "Title Launcher"
 msgstr "Lanzador de Canales"
 
+msgid "Titles Path"
+msgstr ""
+
 msgid "Titles from GameTDB"
 msgstr "Titulos de GameTDB"
 
@@ -2228,12 +2237,12 @@ msgstr "Qué se debería borrar para este juego:"
 msgid "What to extract from NAND?"
 msgstr "¿Que Extraer de la Nand?"
 
-msgid "Where do you want MCEmu to be located?"
-msgstr "¿Dónde deseas guardar la MCEmu?"
-
 msgid "Where should the game be installed to?"
 msgstr "¿Donde debe ser instalado el juego?"
 
+msgid "Which device do you want to use for Nintendont files?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "Características WiFi"
 
@@ -2367,6 +2376,12 @@ msgstr "de"
 msgid "seconds left"
 msgstr "segundos restantes"
 
+#~ msgid "GameTDB Path"
+#~ msgstr "Ruta GameDTB"
+
+#~ msgid "Where do you want MCEmu to be located?"
+#~ msgstr "¿Dónde deseas guardar la MCEmu?"
+
 #~ msgid "To run GameCube games with %s you need to set your 'Main GameCube Path' on a primary partition."
 #~ msgstr "Para cargar juegos de GameCube con %s debes configurar tu Ruta GameCube principal en una partición primaria."
 
diff --git a/Languages/swedish.lang b/Languages/swedish.lang
index e085d0fe..e0753f0a 100644
--- a/Languages/swedish.lang
+++ b/Languages/swedish.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-14 16:29+0100\n"
+"POT-Creation-Date: 2015-04-04 16:59+0200\n"
 "PO-Revision-Date: 2010-01-19 17:39+0200\n"
 "Last-Translator: Katsurou\n"
 "Language-Team: Katsurou, pirateX\n"
@@ -619,6 +619,9 @@ msgstr ""
 msgid "Disc read error."
 msgstr ""
 
+msgid "Disc-Select Prompt"
+msgstr ""
+
 msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?"
 msgstr ""
 
@@ -688,6 +691,9 @@ msgstr ""
 msgid "Do you want to load the default theme?"
 msgstr ""
 
+msgid "Do you want to move the file(s)? Any existing ones will be deleted!"
+msgstr ""
+
 msgid "Do you want to re-init network?"
 msgstr ""
 
@@ -1105,9 +1111,6 @@ msgstr ""
 msgid "GameCube Source"
 msgstr ""
 
-msgid "GameTDB Path"
-msgstr ""
-
 msgid "Gamename [GAMEID]"
 msgstr ""
 
@@ -1399,6 +1402,9 @@ msgstr "Montera DVD läsare"
 msgid "Mount USB at launch"
 msgstr ""
 
+msgid "Move File"
+msgstr ""
+
 msgid "Multiple Partitions"
 msgstr ""
 
@@ -2033,6 +2039,9 @@ msgstr ""
 msgid "Title Launcher"
 msgstr "Titel startare"
 
+msgid "Titles Path"
+msgstr ""
+
 msgid "Titles from GameTDB"
 msgstr ""
 
@@ -2228,10 +2237,10 @@ msgstr ""
 msgid "What to extract from NAND?"
 msgstr ""
 
-msgid "Where do you want MCEmu to be located?"
+msgid "Where should the game be installed to?"
 msgstr ""
 
-msgid "Where should the game be installed to?"
+msgid "Which device do you want to use for Nintendont files?"
 msgstr ""
 
 msgid "WiFi Features"
diff --git a/Languages/tchinese.lang b/Languages/tchinese.lang
index 0a82084e..fec52785 100644
--- a/Languages/tchinese.lang
+++ b/Languages/tchinese.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-14 16:29+0100\n"
+"POT-Creation-Date: 2015-04-04 16:59+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"
@@ -619,6 +619,9 @@ msgstr ""
 msgid "Disc read error."
 msgstr "光碟讀取錯誤"
 
+msgid "Disc-Select Prompt"
+msgstr ""
+
 msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?"
 msgstr "光碟2 需被安裝為未壓縮格式才可用DM(L) v2.6+執行，確定要安裝為壓縮格式嗎？"
 
@@ -688,6 +691,9 @@ msgstr "是否要安裝選取的遊戲？"
 msgid "Do you want to load the default theme?"
 msgstr "是否要載入預設佈景主題嗎？"
 
+msgid "Do you want to move the file(s)? Any existing ones will be deleted!"
+msgstr ""
+
 msgid "Do you want to re-init network?"
 msgstr "是否要重新初始化網路？"
 
@@ -1105,9 +1111,6 @@ msgstr "GameCube 模式"
 msgid "GameCube Source"
 msgstr "GameCube 來源"
 
-msgid "GameTDB Path"
-msgstr "GameTDB 路徑"
-
 msgid "Gamename [GAMEID]"
 msgstr "遊戲名稱 [GAMEID]"
 
@@ -1399,6 +1402,9 @@ msgstr "掛載DVD光碟"
 msgid "Mount USB at launch"
 msgstr ""
 
+msgid "Move File"
+msgstr ""
+
 msgid "Multiple Partitions"
 msgstr "多重磁區"
 
@@ -2033,6 +2039,9 @@ msgstr ""
 msgid "Title Launcher"
 msgstr "系統頻道"
 
+msgid "Titles Path"
+msgstr ""
+
 msgid "Titles from GameTDB"
 msgstr "從GameTDB顯示遊戲名稱"
 
@@ -2228,12 +2237,12 @@ msgstr "這遊戲title應刪除什麼："
 msgid "What to extract from NAND?"
 msgstr "從 NAND 提取什麼？"
 
-msgid "Where do you want MCEmu to be located?"
-msgstr ""
-
 msgid "Where should the game be installed to?"
 msgstr "遊戲應安裝到何處"
 
+msgid "Which device do you want to use for Nintendont files?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "WiFi功能設定"
 
@@ -2367,6 +2376,9 @@ msgstr "的"
 msgid "seconds left"
 msgstr "剩餘秒數"
 
+#~ msgid "GameTDB Path"
+#~ msgstr "GameTDB 路徑"
+
 #~ msgid "Anti"
 #~ msgstr "防止"
 
diff --git a/Languages/thai.lang b/Languages/thai.lang
index a70fce26..09ce5d3e 100644
--- a/Languages/thai.lang
+++ b/Languages/thai.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-14 16:29+0100\n"
+"POT-Creation-Date: 2015-04-04 16:59+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: Nitro_subzero \n"
 "Language-Team: Nitro_subzero\n"
@@ -619,6 +619,9 @@ msgstr ""
 msgid "Disc read error."
 msgstr ""
 
+msgid "Disc-Select Prompt"
+msgstr ""
+
 msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?"
 msgstr ""
 
@@ -688,6 +691,9 @@ msgstr ""
 msgid "Do you want to load the default theme?"
 msgstr ""
 
+msgid "Do you want to move the file(s)? Any existing ones will be deleted!"
+msgstr ""
+
 msgid "Do you want to re-init network?"
 msgstr ""
 
@@ -1105,9 +1111,6 @@ msgstr ""
 msgid "GameCube Source"
 msgstr ""
 
-msgid "GameTDB Path"
-msgstr ""
-
 msgid "Gamename [GAMEID]"
 msgstr ""
 
@@ -1399,6 +1402,9 @@ msgstr "เชื่อม DVD ไดร์ฟ"
 msgid "Mount USB at launch"
 msgstr ""
 
+msgid "Move File"
+msgstr ""
+
 msgid "Multiple Partitions"
 msgstr ""
 
@@ -2033,6 +2039,9 @@ msgstr ""
 msgid "Title Launcher"
 msgstr "Title Launcher"
 
+msgid "Titles Path"
+msgstr ""
+
 msgid "Titles from GameTDB"
 msgstr ""
 
@@ -2228,10 +2237,10 @@ msgstr ""
 msgid "What to extract from NAND?"
 msgstr ""
 
-msgid "Where do you want MCEmu to be located?"
+msgid "Where should the game be installed to?"
 msgstr ""
 
-msgid "Where should the game be installed to?"
+msgid "Which device do you want to use for Nintendont files?"
 msgstr ""
 
 msgid "WiFi Features"
diff --git a/Languages/turkish.lang b/Languages/turkish.lang
index 25bb773f..4e63c0c6 100644
--- a/Languages/turkish.lang
+++ b/Languages/turkish.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-02-14 16:29+0100\n"
+"POT-Creation-Date: 2015-04-04 16:59+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: omercigingelini\n"
 "Language-Team: omercigingelini\n"
@@ -619,6 +619,9 @@ msgstr ""
 msgid "Disc read error."
 msgstr ""
 
+msgid "Disc-Select Prompt"
+msgstr ""
+
 msgid "Disc2 needs to be installed in uncompressed format to work with DM(L) v2.6+, are you sure you want to install in compressed format?"
 msgstr ""
 
@@ -688,6 +691,9 @@ msgstr ""
 msgid "Do you want to load the default theme?"
 msgstr ""
 
+msgid "Do you want to move the file(s)? Any existing ones will be deleted!"
+msgstr ""
+
 msgid "Do you want to re-init network?"
 msgstr ""
 
@@ -1105,9 +1111,6 @@ msgstr ""
 msgid "GameCube Source"
 msgstr ""
 
-msgid "GameTDB Path"
-msgstr ""
-
 msgid "Gamename [GAMEID]"
 msgstr ""
 
@@ -1399,6 +1402,9 @@ msgstr "DVD sürücüsü bağla"
 msgid "Mount USB at launch"
 msgstr ""
 
+msgid "Move File"
+msgstr ""
+
 msgid "Multiple Partitions"
 msgstr ""
 
@@ -2033,6 +2039,9 @@ msgstr ""
 msgid "Title Launcher"
 msgstr "Başlık Başlatıcı"
 
+msgid "Titles Path"
+msgstr ""
+
 msgid "Titles from GameTDB"
 msgstr ""
 
@@ -2228,10 +2237,10 @@ msgstr ""
 msgid "What to extract from NAND?"
 msgstr ""
 
-msgid "Where do you want MCEmu to be located?"
+msgid "Where should the game be installed to?"
 msgstr ""
 
-msgid "Where should the game be installed to?"
+msgid "Which device do you want to use for Nintendont files?"
 msgstr ""
 
 msgid "WiFi Features"
diff --git a/source/GameCube/GCGames.cpp b/source/GameCube/GCGames.cpp
index ffb1b7b6..d9fff15a 100644
--- a/source/GameCube/GCGames.cpp
+++ b/source/GameCube/GCGames.cpp
@@ -31,8 +31,6 @@
 #include "menu.h"
 #include "gecko.h"
 
-static char NINBuildDate[21];
-
 GCGames *GCGames::instance = NULL;
 
 inline bool isGameID(const u8 *id)
@@ -569,7 +567,7 @@ bool GCGames::CopyUSB2SD(const struct discHdr *header)
 	}
 }
 
-const char *nintendontBuildDate(const char *NIN_loader_path)
+int nintendontBuildDate(const char *NIN_loader_path, char *NINBuildDate)
 {
 
 	char NIN_loader[100];
@@ -580,23 +578,24 @@ const char *nintendontBuildDate(const char *NIN_loader_path)
 	{
 		u8 *buffer = NULL;
 		u32 filesize = 0;
+		const char* str = "Nintendont Loader";
 		bool found = false;
 		if(LoadFileToMem(NIN_loader, &buffer, &filesize))
 		{
-			for(u32 i = 0; i < filesize-60; ++i)
+			for(u32 i = 0; i < filesize-100; ++i)
 			{
-				if((*(u32*)(buffer+i+2)) == 'nten' && (*(u32*)(buffer+i+6)) == 'dont' && (*(u32*)(buffer+i+11)) == 'Load')
+				if( memcmp(buffer+i, str, strlen(str)) == 0)
 				{
 					// Write buffer in NINheader
 					char NINHeader[100];
-					for(int j = 0 ; j < 99 ; j++)
+					for(u8 j = 0 ; j < 99 ; j++)
 						NINHeader[j] = *(u8*)(buffer+i+j) == 0 ? ' ' : *(u8*)(buffer+i+j); // replace \0 with a space.
 					NINHeader[99] = '\0';
 
 					// Search month string start position in header
 					char *dateStart = NULL;
-					const char * month[] = {"Jan ", "Feb ", "Mar ", "Apr ", "May ", "Jun ", "Jui ", "Aug ", "Sep ", "Oct ", "Nov ", "Dec "};
-					for(int m = 0 ; m < 12 ; m++) 
+					const char *month[] = {"Jan ", "Feb ", "Mar ", "Apr ", "May ", "Jun ", "Jui ", "Aug ", "Sep ", "Oct ", "Nov ", "Dec "};
+					for(u8 m = 0 ; m < 12 ; m++) 
 					{
 						dateStart = strstr(NINHeader, month[m]);
 						if(dateStart != NULL)
@@ -607,7 +606,7 @@ const char *nintendontBuildDate(const char *NIN_loader_path)
 					
 					dateStart[20] = '\0';
 					
-					snprintf(NINBuildDate, sizeof(NINBuildDate), "%.20s", dateStart);
+					sprintf(NINBuildDate, "%.20s", dateStart);
 					gprintf("Nintendont Build date : %.20s \n", dateStart);
 					
 					found = true;
@@ -616,19 +615,40 @@ const char *nintendontBuildDate(const char *NIN_loader_path)
 			}
 			free(buffer);
 		}
-		
 		if(found)
-			return NINBuildDate;
+			return 1;
 	}
 	
-	return "";
-
+	return 0;
 }
 
-
-
-
-
-
-
-
+int nintendontVersion(const char *NIN_loader_path, char *NINVersion, int len)
+{
+	char NIN_loader[100];
+	u32 NINRev = 0;
+	snprintf(NIN_loader, sizeof(NIN_loader), "%sboot.dol", NIN_loader_path);
+	if(!CheckFile(NIN_loader))
+		snprintf(NIN_loader, sizeof(NIN_loader), "%sloader.dol", NIN_loader_path);
+	if(CheckFile(NIN_loader))
+	{
+		u8 *buffer = NULL;
+		u32 filesize = 0;
+		const char* str = "$$Version:";
+		if(LoadFileToMem(NIN_loader, &buffer, &filesize))
+		{
+			for(u32 i = 0; i < filesize; i += 32)
+			{
+				if(memcmp( buffer+i, str, strlen(str)) == 0)
+				{
+					// Write buffer in NINVersion
+					snprintf(NINVersion, len, "%s", buffer+i+strlen(str));
+					NINRev = atoi(strchr(NINVersion, '.')+1);
+					break;
+				}
+			}
+			free(buffer);
+		}
+	}
+	
+	return NINRev;
+}
diff --git a/source/GameCube/GCGames.h b/source/GameCube/GCGames.h
index ad15d8ef..38bc3e41 100644
--- a/source/GameCube/GCGames.h
+++ b/source/GameCube/GCGames.h
@@ -23,9 +23,10 @@
 #include "usbloader/disc.h"
 #include "settings/CSettings.h"
 
-using namespace std;
+int nintendontBuildDate(const char *NIN_loader_path, char* NINBuildDate);
+int nintendontVersion(const char *NIN_loader_path, char* NINVersion, int len);
 
-const char *nintendontBuildDate(const char *NIN_loader_path);
+using namespace std;
 
 class GCGames
 {
diff --git a/source/StartUpProcess.cpp b/source/StartUpProcess.cpp
index 87f9bf96..57ab8796 100644
--- a/source/StartUpProcess.cpp
+++ b/source/StartUpProcess.cpp
@@ -23,6 +23,7 @@
 #include "usbloader/GameList.h"
 #include "utils/tools.h"
 #include "sys.h"
+#include "svnrev.h"
 
 StartUpProcess::StartUpProcess()
 {
@@ -44,6 +45,20 @@ StartUpProcess::StartUpProcess()
 	messageTxt->SetAlignment(ALIGN_CENTER, ALIGN_MIDDLE);
 	messageTxt->SetPosition(screenwidth/2, screenheight/2+60);
 
+	versionTxt = new GuiText(" ", 15, (GXColor) {255, 255, 255, 255});
+	versionTxt->SetAlignment(ALIGN_LEFT, ALIGN_BOTTOM);
+	versionTxt->SetPosition(20, screenheight-20);
+
+#ifdef FULLCHANNEL
+	versionTxt->SetTextf("v3.0c Rev%s", GetRev());
+#else
+	versionTxt->SetTextf("v3.0  Rev%s", GetRev());
+#endif
+
+#if 0 // enable if you release a modded version
+	versionTxt->SetTextf("v3.0  Rev%s mod", GetRev());
+#endif
+
 	cancelTxt = new GuiText("Press B to cancel", 18, (GXColor) {255, 255, 255, 255});
 	cancelTxt->SetAlignment(ALIGN_CENTER, ALIGN_MIDDLE);
 	cancelTxt->SetPosition(screenwidth/2, screenheight/2+90);
@@ -64,6 +79,7 @@ StartUpProcess::~StartUpProcess()
 	delete GXImage;
 	delete titleTxt;
 	delete messageTxt;
+	delete versionTxt;
 	delete cancelTxt;
 	delete cancelBtn;
 	delete trigB;
@@ -231,6 +247,7 @@ int StartUpProcess::Execute()
 		}
 		else
 		{
+			Settings.LoaderIOS = 58;
 			SetTextf("Running on IOS 58. Wii disc based games and some channels will not work.");
 			sleep(5);
 		}
@@ -365,6 +382,7 @@ void StartUpProcess::Draw()
 	GXImage->Draw();
 	titleTxt->Draw();
 	messageTxt->Draw();
+	versionTxt->Draw();
 	if(drawCancel)
 		cancelTxt->Draw();
 	Menu_Render();
diff --git a/source/StartUpProcess.h b/source/StartUpProcess.h
index 8f890570..174feba6 100644
--- a/source/StartUpProcess.h
+++ b/source/StartUpProcess.h
@@ -25,6 +25,7 @@ class StartUpProcess
 		GuiImage * GXImage;
 		GuiText * titleTxt;
 		GuiText * messageTxt;
+		GuiText * versionTxt;
 		GuiText * cancelTxt;
 		GuiButton * cancelBtn;
 		GuiTrigger * trigB;
diff --git a/source/banner/Animator.h b/source/banner/Animator.h
index 962d8186..333c6ef5 100644
--- a/source/banner/Animator.h
+++ b/source/banner/Animator.h
@@ -144,6 +144,8 @@ class Layout;
 class Animator
 {
 public:
+	virtual ~Animator() {}
+
 	static const u32 MAGIC_ANIMATION = MAKE_FOURCC('R', 'L', 'A', 'N');
 	static const u32 MAGIC_PANE_ANIMATION_INFO = MAKE_FOURCC('p', 'a', 'i', '1');
 
diff --git a/source/banner/Material.h b/source/banner/Material.h
index 50d744ce..4e5b547a 100644
--- a/source/banner/Material.h
+++ b/source/banner/Material.h
@@ -44,6 +44,7 @@ public:
 	} __attribute__((packed));
 
 	Material();
+	virtual ~Material() {}
 
 	void Load(Material::Header *mat);
 	void Apply(const BannerResources& resources, u8 render_alpha, bool modulate) const;
diff --git a/source/prompts/PromptWindows.cpp b/source/prompts/PromptWindows.cpp
index 9ddd12ea..6be4a7af 100644
--- a/source/prompts/PromptWindows.cpp
+++ b/source/prompts/PromptWindows.cpp
@@ -255,7 +255,12 @@ void WindowCredits()
 	creditsMusic->SetLoop(1);
 	creditsMusic->Play();
 
-	bool exit = false;
+	GuiTrigger trigB;
+	trigB.SetButtonOnlyTrigger(-1, WPAD_BUTTON_B | WPAD_CLASSIC_BUTTON_B, PAD_BUTTON_B);
+	GuiButton backBtn(0, 0);
+	backBtn.SetPosition(-20, -20);
+	backBtn.SetTrigger(&trigB);
+	
 	u32 i = 0;
 	int y = 20;
 	float oldFontScale = Settings.FontScaleFactor;
@@ -329,9 +334,18 @@ void WindowCredits()
 
 	// Check if Nintendont is available
 	char GCInfo2[80] = "";
-	const char* NINBuildDate = nintendontBuildDate(Settings.NINLoaderPath);
-	if(strlen(NINBuildDate) > 0)
-		snprintf(GCInfo2, sizeof(GCInfo2), "Nintendont Built %.20s",  NINBuildDate );
+	char NINVersion[7]= "";
+	nintendontVersion(Settings.NINLoaderPath, NINVersion, sizeof(NINVersion));
+	if(strlen(NINVersion) > 0)
+	{
+		snprintf(GCInfo2, sizeof(GCInfo2), "Nintendont v%.6s",  NINVersion );
+	}
+	else
+	{
+		char NINBuildDate[21] = "";
+		if(nintendontBuildDate(Settings.NINLoaderPath, NINBuildDate))
+			snprintf(GCInfo2, sizeof(GCInfo2), "Nintendont Built %.20s",  NINBuildDate );
+	}
 
 	// Header - Top left
 	currentTxt = new GuiText(GCInfo2, 16, ( GXColor ) {255, 255, 255, 255});
@@ -522,6 +536,7 @@ void WindowCredits()
 
 	creditsWindow.Append(&creditsWindowBox);
 	creditsWindow.Append(&starImg);
+	creditsWindow.Append(&backBtn);
 
 	creditsWindow.SetEffect(EFFECT_FADE, 30);
 
@@ -530,7 +545,7 @@ void WindowCredits()
 	mainWindow->Append(&creditsWindow);
 	ResumeGui();
 
-	while (!exit)
+	while(backBtn.GetState() != STATE_CLICKED)
 	{
 		usleep(12000);
 
@@ -542,11 +557,9 @@ void WindowCredits()
 		angle++;
 		if (angle > 360) angle = 0;
 		starImg.SetAngle(angle);
-
-		if (ButtonsPressed() != 0)
-			exit = true;
 	}
-
+	backBtn.ResetState();
+	
 	creditsMusic->Stop();
 
 	delete creditsMusic;
diff --git a/source/settings/CSettings.cpp b/source/settings/CSettings.cpp
index a062e3ea..5693d23d 100644
--- a/source/settings/CSettings.cpp
+++ b/source/settings/CSettings.cpp
@@ -59,7 +59,7 @@ void CSettings::SetDefault()
 	snprintf(covers2d_path, sizeof(covers2d_path), "%simages/2D/", ConfigPath);
 	snprintf(coversFull_path, sizeof(coversFull_path), "%simages/full/", ConfigPath);
 	snprintf(disc_path, sizeof(disc_path), "%simages/disc/", ConfigPath);
-	snprintf(titlestxt_path, sizeof(titlestxt_path), "%s", ConfigPath);
+	snprintf(titlestxt_path, sizeof(titlestxt_path), "%stitles", ConfigPath);
 	snprintf(languagefiles_path, sizeof(languagefiles_path), "%slanguage/", ConfigPath);
 	snprintf(update_path, sizeof(update_path), "%s/apps/usbloader_gx/", BootDevice);
 	snprintf(BNRCachePath, sizeof(BNRCachePath), "%s/apps/usbloader_gx/cache_bnr/", BootDevice);
@@ -173,6 +173,7 @@ void CSettings::SetDefault()
 	GCBannerScale = 1.5f;
 	GameCubeMode = GC_MODE_MIOS;
 	GameCubeSource = AUTO;
+	MultiDiscPrompt = OFF;
 	DMLVideo = DML_VIDEO_AUTO;
 	DMLProgPatch = OFF;
 	DMLNMM = OFF;
@@ -423,6 +424,7 @@ bool CSettings::Save()
 	fprintf(file, "GameCubeSDPath = %s\n", GameCubeSDPath);
 	fprintf(file, "GameCubeMode = %d\n", GameCubeMode);
 	fprintf(file, "GameCubeSource = %d\n", GameCubeSource);
+	fprintf(file, "MultiDiscPrompt = %d\n", MultiDiscPrompt);
 	fprintf(file, "DMLVideo = %d\n", DMLVideo);
 	fprintf(file, "DMLProgPatch = %d\n", DMLProgPatch);
 	fprintf(file, "DMLNMM = %d\n", DMLNMM);
@@ -865,6 +867,11 @@ bool CSettings::SetSetting(char *name, char *value)
 		GameCubeSource = atoi(value);
 		return true;
 	}
+	else if (strcmp(name, "MultiDiscPrompt") == 0)
+	{
+		MultiDiscPrompt = atoi(value);
+		return true;
+	}
 	else if (strcmp(name, "DMLVideo") == 0)
 	{
 		DMLVideo = atoi(value);
diff --git a/source/settings/CSettings.h b/source/settings/CSettings.h
index efba8824..a5dbc543 100644
--- a/source/settings/CSettings.h
+++ b/source/settings/CSettings.h
@@ -177,6 +177,7 @@ class CSettings
 		float GCBannerScale;
 		short GameCubeMode;
 		short GameCubeSource;
+		short MultiDiscPrompt;
 		short DMLVideo;
 		short DMLProgPatch;
 		short DMLNMM;
diff --git a/source/settings/menus/CustomPathsSM.cpp b/source/settings/menus/CustomPathsSM.cpp
index 83066a01..32e6bf2d 100644
--- a/source/settings/menus/CustomPathsSM.cpp
+++ b/source/settings/menus/CustomPathsSM.cpp
@@ -30,9 +30,11 @@
 #include "settings/CSettings.h"
 #include "settings/SettingsEnums.h"
 #include "prompts/PromptWindows.h"
+#include "prompts/ProgressWindow.h"
 #include "language/gettext.h"
 #include "prompts/filebrowser.h"
 #include "themes/CTheme.h"
+#include "FileOperations/fileops.h"
 #include "gecko.h"
 
 CustomPathsSM::CustomPathsSM()
@@ -44,7 +46,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("GameTDB Path"));
+	Options->SetName(Idx++, tr("Titles Path"));
 	Options->SetName(Idx++, tr("Update Path"));
 	Options->SetName(Idx++, tr("GCT Cheatcodes Path"));
 	Options->SetName(Idx++, tr("TXT Cheatcodes Path"));
@@ -85,7 +87,7 @@ void CustomPathsSM::SetOptionValues()
 	//! Settings: Theme Path
 	Options->SetValue(Idx++, Settings.theme_path);
 
-	//! Settings: GameTDB Path
+	//! Settings: Titles Path
 	Options->SetValue(Idx++, Settings.titlestxt_path);
 
 	//! Settings: Update Path
@@ -184,11 +186,28 @@ int CustomPathsSM::GetMenuInternal()
 		ChangePath(Settings.theme_path, sizeof(Settings.theme_path));
 	}
 
-	//! Settings: GameTDB Path
+	//! Settings: Titles Path
 	else if (ret == ++Idx)
 	{
-		titleTxt->SetText(tr( "GameTDB Path" ));
-		ChangePath(Settings.titlestxt_path, sizeof(Settings.titlestxt_path));
+		char oldPath[100];
+		strncpy(oldPath, Settings.titlestxt_path, sizeof(Settings.titlestxt_path));
+
+		titleTxt->SetText(tr("Titles Path"));
+		if (ChangePath(Settings.titlestxt_path, sizeof(Settings.titlestxt_path)))
+		{
+			if(strlen(oldPath) != strlen(Settings.titlestxt_path) || strcmp(oldPath, Settings.titlestxt_path) != 0)
+			{
+				if (WindowPrompt(tr("Move File"), tr("Do you want to move the file(s)? Any existing ones will be deleted!"), tr("Yes"), tr("Cancel")) == 1)
+				{
+					MoveDbFile(oldPath, Settings.titlestxt_path, "wiitdb.xml");
+					MoveDbFile(oldPath, Settings.titlestxt_path, "TitlesCache.bin");
+					MoveDbFile(oldPath, Settings.titlestxt_path, "wiitdb_offsets.bin");
+					MoveDbFile(oldPath, Settings.titlestxt_path, "GameTimestamps.txt");
+				
+					WindowPrompt(tr("Process finished."), 0, tr("OK"));
+				}
+			}
+		}
 	}
 
 	//! Settings: Update Path
@@ -382,3 +401,21 @@ int CustomPathsSM::ChangePath(char * SettingsPath, int SizeOfPath)
 
 	return result;
 }
+
+void CustomPathsSM::MoveDbFile(const char* oldPath, const char* newPath, const char* fileName)
+{
+	char srcPath[300], destPath[300];
+	memset(srcPath, 0, 300);
+	memset(destPath, 0, 300);
+
+	snprintf(srcPath, sizeof(srcPath), "%s/%s", oldPath, fileName);
+	snprintf(destPath, sizeof(destPath), "%s/%s", newPath, fileName);
+
+	if (CheckFile(srcPath))
+	{
+		if (CheckFile(destPath))
+			RemoveFile(destPath);
+
+		MoveFile(srcPath, destPath);
+	}
+}
diff --git a/source/settings/menus/CustomPathsSM.hpp b/source/settings/menus/CustomPathsSM.hpp
index f0fde689..ff77b2af 100644
--- a/source/settings/menus/CustomPathsSM.hpp
+++ b/source/settings/menus/CustomPathsSM.hpp
@@ -36,6 +36,9 @@ class CustomPathsSM : public SettingsMenu
 		int ChangePath(char * SettingsPath, int SizeOfPath);
 
 		OptionList GuiOptions;
+
+	private:
+		void MoveDbFile(const char* oldPath, const char* newPath, const char* fileName);
 };
 
 
diff --git a/source/settings/menus/LoaderSettings.cpp b/source/settings/menus/LoaderSettings.cpp
index 7183653d..1d677cce 100644
--- a/source/settings/menus/LoaderSettings.cpp
+++ b/source/settings/menus/LoaderSettings.cpp
@@ -217,6 +217,7 @@ LoaderSettings::LoaderSettings()
 	Options->SetName(Idx++, "%s", tr( "Progressive Patch" ));
 	Options->SetName(Idx++, "%s", tr( "Force Widescreen" ));
 	Options->SetName(Idx++, "%s", tr( "Debug" ));
+	Options->SetName(Idx++, "%s", tr( "Disc-Select Prompt" ));
 	Options->SetName(Idx++, "%s", tr( "--==   DIOS MIOS (Lite) " ));
 	Options->SetName(Idx++, "%s", tr( "NMM Mode" ));
 	Options->SetName(Idx++, "%s", tr( "PAD Hook" ));
@@ -377,9 +378,12 @@ void LoaderSettings::SetOptionValues()
 	//! Settings: DML + NIN Force Widescreen
 	Options->SetValue(Idx++, "%s", tr(OnOffText[Settings.DMLWidescreen]));
 
-	//! Settings: DML Debug
+	//! Settings: DML + NIN Debug
 	Options->SetValue(Idx++, "%s", tr(DMLDebug[Settings.DMLDebug]));
 
+	//! Settings: DML + NIN MultiDiscPrompt
+	Options->SetValue(Idx++, "%s", tr(OnOffText[Settings.MultiDiscPrompt]));
+
 	//! Settings: TITLE - GameCube DIOS MIOS (Lite)
 	Options->SetValue(Idx++, "==--   ");
 
@@ -404,40 +408,40 @@ void LoaderSettings::SetOptionValues()
 	//! Settings: TITLE - Nintendont
 	Options->SetValue(Idx++, "==--   ");
 
-	//! Settings: TITLE - NIN Auto Boot
+	//! Settings: NIN Auto Boot
 	Options->SetValue(Idx++, "%s", tr(OnOffText[Settings.NINAutoboot]));
 
-	//! Settings: TITLE - NIN Nincfg.bin file
+	//! Settings: NIN Nincfg.bin file
 	Options->SetValue(Idx++, "%s", tr(NINCfgText[Settings.NINSettings]));
 
-	//! Settings: TITLE - NIN Video Deflicker
+	//! Settings: NIN Video Deflicker
 	Options->SetValue(Idx++, "%s", tr(OnOffText[Settings.NINDeflicker]));
 
-	//! Settings: TITLE - NIN Memory Card Emulation
+	//! Settings: NIN Memory Card Emulation
 	Options->SetValue(Idx++, "%s", tr(NINMCText[Settings.NINMCEmulation]));
 
-	//! Settings: TITLE - NIN Memory Card Blocks Size
+	//! Settings: NIN Memory Card Blocks Size
 	Options->SetValue(Idx++, "%d", MEM_CARD_BLOCKS(Settings.NINMCSize));
 
-	//! Settings: TITLE - NIN USB-HID controller
+	//! Settings: NIN USB-HID controller
 	Options->SetValue(Idx++, "%s", tr(OnOffText[Settings.NINUSBHID]));
 
-	//! Settings: TITLE - NIN MaxPads - Number of GameCube controllers
+	//! Settings: NIN MaxPads - Number of GameCube controllers
 	Options->SetValue(Idx++, "%i", Settings.NINMaxPads);
 
-	//! Settings: TITLE - NIN Native Controller
+	//! Settings: NIN Native Controller
 	Options->SetValue(Idx++, "%s", tr(OnOffText[Settings.NINNativeSI]));
 
-	//! Settings: TITLE - WiiU Widescreen
+	//! Settings: WiiU Widescreen
 	Options->SetValue(Idx++, "%s", tr(OnOffText[Settings.NINWiiUWide]));
 
-	//! Settings: TITLE - NIN LED Activity
+	//! Settings: NIN LED Activity
 	Options->SetValue(Idx++, "%s", tr(OnOffText[Settings.NINLED]));
 
-	//! Settings: TITLE - NIN OS Report
+	//! Settings: NIN OS Report
 	Options->SetValue(Idx++, "%s", tr(OnOffText[Settings.NINOSReport]));
 
-	//! Settings: TITLE - NIN Log to file
+	//! Settings: NIN Log to file
 	Options->SetValue(Idx++, "%s", tr(OnOffText[Settings.NINLog]));
 
 	//! Settings: TITLE - Devolution
@@ -691,12 +695,18 @@ int LoaderSettings::GetMenuInternal()
 		if (++Settings.DMLWidescreen >= MAX_ON_OFF) Settings.DMLWidescreen = 0;
 	}
 
-	//! Settings: DML Debug
+	//! Settings: DML + NIN Debug
 	else if (ret == ++Idx)
 	{
 		if (++Settings.DMLDebug >= 3) Settings.DMLDebug = 0;
 	}
 
+	//! Settings: DML + NIN MultiDiscPrompt
+	else if (ret == ++Idx)
+	{
+		if (++Settings.MultiDiscPrompt >= MAX_ON_OFF) Settings.MultiDiscPrompt = 0;
+	}
+
 	//! Settings: TITLE - GameCube DIOS MIOS (Lite)
 	else if (ret == ++Idx)
 	{
diff --git a/source/system/runtimeiospatch.c b/source/system/runtimeiospatch.c
index 66650576..3ee67421 100644
--- a/source/system/runtimeiospatch.c
+++ b/source/system/runtimeiospatch.c
@@ -137,12 +137,12 @@ s32 IosPatch_RUNTIME(bool wii, bool sciifii, bool vwii, bool verbose) {
 			if(verbose) printf(">> Applying standard Wii patches:\n");
 			count += apply_patch("di_readlimit", di_readlimit_old, sizeof(di_readlimit_old), di_readlimit_patch, sizeof(di_readlimit_patch), 12, verbose);
 			count += apply_patch("isfs_permissions", isfs_permissions_old, sizeof(isfs_permissions_old), isfs_permissions_patch, sizeof(isfs_permissions_patch), 0, verbose);
-			count += apply_patch("es_setuid", setuid_old, sizeof(setuid_old), setuid_patch, sizeof(setuid_patch), 0, verbose);
+			//count += apply_patch("es_setuid", setuid_old, sizeof(setuid_old), setuid_patch, sizeof(setuid_patch), 0, verbose);
 			count += apply_patch("es_identify", es_identify_old, sizeof(es_identify_old), es_identify_patch, sizeof(es_identify_patch), 2, verbose);
 			count += apply_patch("hash_check", hash_old, sizeof(hash_old), hash_patch, sizeof(hash_patch), 1, verbose);
 			count += apply_patch("new_hash_check", new_hash_old, sizeof(new_hash_old), hash_patch, sizeof(hash_patch), 1, verbose);
-			count += apply_patch("isfs_setattr_pt1", isfs_setattr_pt1_old, sizeof(isfs_setattr_pt1_old), isfs_setattr_pt1_patch, sizeof(isfs_setattr_pt1_patch), 0, verbose);
-			count += apply_patch("isfs_setattr_pt2", isfs_setattr_pt2_old, sizeof(isfs_setattr_pt2_old), isfs_setattr_pt2_patch, sizeof(isfs_setattr_pt2_patch), 0, verbose);
+			//count += apply_patch("isfs_setattr_pt1", isfs_setattr_pt1_old, sizeof(isfs_setattr_pt1_old), isfs_setattr_pt1_patch, sizeof(isfs_setattr_pt1_patch), 0, verbose);
+			//count += apply_patch("isfs_setattr_pt2", isfs_setattr_pt2_old, sizeof(isfs_setattr_pt2_old), isfs_setattr_pt2_patch, sizeof(isfs_setattr_pt2_patch), 0, verbose);
 		}
 		if(sciifii)
 		{
diff --git a/source/usbloader/GameBooter.cpp b/source/usbloader/GameBooter.cpp
index 7a5bb8fb..dbaf1282 100644
--- a/source/usbloader/GameBooter.cpp
+++ b/source/usbloader/GameBooter.cpp
@@ -422,6 +422,7 @@ int GameBooter::BootDIOSMIOS(struct discHdr *gameHdr)
 	GameCFG * game_cfg = GameSettings.GetGameCFG(gameHdr->id);
 	s8 languageChoice = game_cfg->language == INHERIT ? Settings.language - 1 : game_cfg->language;
 	u8 ocarinaChoice = game_cfg->ocarina == INHERIT ? Settings.ocarina : game_cfg->ocarina;
+	u8 multiDiscChoice = Settings.MultiDiscPrompt;
 	u8 dmlVideoChoice = game_cfg->DMLVideo == INHERIT ? Settings.DMLVideo : game_cfg->DMLVideo;
 	u8 dmlProgressivePatch = game_cfg->DMLProgPatch == INHERIT ? Settings.DMLProgPatch : game_cfg->DMLProgPatch;
 	u8 dmlNMMChoice = game_cfg->DMLNMM == INHERIT ? Settings.DMLNMM : game_cfg->DMLNMM;
@@ -554,7 +555,7 @@ int GameBooter::BootDIOSMIOS(struct discHdr *gameHdr)
 
 	// Check if game has multi Discs
 	bool bootDisc2 = false;
-	if(gameHdr->type != TYPE_GAME_GC_DISC && gameHdr->disc_no == 0 && currentMIOS != QUADFORCE)
+	if(multiDiscChoice && gameHdr->type != TYPE_GAME_GC_DISC && gameHdr->disc_no == 0 && currentMIOS != QUADFORCE)
 	{
 		char disc2Path[255];
 		snprintf(disc2Path, sizeof(disc2Path), "%s", RealPath);
@@ -942,6 +943,7 @@ int GameBooter::BootNintendont(struct discHdr *gameHdr)
 	GameCFG * game_cfg = GameSettings.GetGameCFG(gameHdr->id);
 	s8 languageChoice = game_cfg->language == INHERIT ? Settings.language -1 : game_cfg->language;
 	u8 ocarinaChoice = game_cfg->ocarina == INHERIT ? Settings.ocarina : game_cfg->ocarina;
+	u8 multiDiscChoice = Settings.MultiDiscPrompt;
 	u8 ninVideoChoice = game_cfg->DMLVideo == INHERIT ? Settings.DMLVideo : game_cfg->DMLVideo;
 	u8 ninProgressivePatch = game_cfg->DMLProgPatch == INHERIT ? Settings.DMLProgPatch : game_cfg->DMLProgPatch;
 	u8 ninDeflickerChoice = game_cfg->NINDeflicker == INHERIT ? Settings.NINDeflicker : game_cfg->NINDeflicker;
@@ -1034,102 +1036,120 @@ int GameBooter::BootNintendont(struct discHdr *gameHdr)
 
 	// Check Nintendont version
 	u32 NIN_cfg_version = NIN_CFG_VERSION;
+	char NINVersion[7]= "";
+	u32 NINRev = 0;
 	bool NINArgsboot = false;
-	const char* NINBuildDate = nintendontBuildDate(ninLoaderPath);
-	if(strlen(NINBuildDate) > 1)
+	NINRev = nintendontVersion(Settings.NINLoaderPath, NINVersion, sizeof(NINVersion));
+	if(NINRev > 0) // Version available since 3.324
 	{
-		//Current build date
-		struct tm time;
-		strptime(NINBuildDate, "%b %d %Y %H:%M:%S", &time);
-		const time_t NINLoaderTime = mktime(&time);
+		gprintf("NIN: Nintendont revision = %d \n", NINRev);
 		
-	
-		// Alpha0.1
-		strptime("Sep 20 2013 15:27:01", "%b %d %Y %H:%M:%S", &time);
-		if(NINLoaderTime == mktime(&time))
-		{
-			WindowPrompt(tr("Error:"), tr("USBloaderGX r1218 is required for Nintendont Alpha v0.1. Please update your Nintendont boot.dol version."), tr("Ok"));
-			return 0;
-		}
-
-		// r01 - r40
-		strptime("Mar 30 2014 12:33:44", "%b %d %Y %H:%M:%S", &time); // r42 - NIN_CFG_VERSION = 2
-		if(NINLoaderTime < mktime(&time))
-		{
-			gprintf("Nintendont r01 - r40 detected. Using CFG version 0x00000001\n");
-			NIN_cfg_version = 1;
-			
-			strptime("Mar 29 2014 10:49:31", "%b %d %Y %H:%M:%S", &time); // r39
-			if(NINLoaderTime < mktime(&time) && strncmp(RealPath, "usb", 3) == 0)
-			{
-				if(WindowPrompt(tr("Warning:"), tr("This Nintendont version does not support games on USB."), tr("Continue"), tr("Cancel")) == 0)
-				return 0;
-			}
-		}
-		
-		// v1.01 - v1.134
-		strptime("Aug  5 2014 22:38:21", "%b %d %Y %H:%M:%S", &time); // v1.135 - NIN_CFG_VERSION = 3
-		if(NINLoaderTime < mktime(&time) && NIN_cfg_version != 1)
-		{
-			gprintf("Nintendont v1.01 - v1.134 detected. Using CFG version 0x00000002\n");
-			NIN_cfg_version = 2;
-			// no need to fake NIN_CFG struct size, the size is checked in nintendont only since v1.143
-		}
-		
-		// v2.200 to 2.207
-		strptime("Nov  6 2014.17:33:30", "%b %d %Y %H:%M:%S", &time); // v1.208
-		if(ninAutobootChoice && NINLoaderTime < mktime(&time))
-		{
-			strptime("Oct 31 2014 21:14:47", "%b %d %Y %H:%M:%S", &time); // v1.200
-			if(NINLoaderTime >= mktime(&time))
-			{
-				WindowPrompt(tr("Warning:"), tr("This Nintendont version is not correctly supported. Auto boot disabled."), tr("Ok"));
-				ninAutobootChoice = OFF;
-			}
-		}
-	
-		// v2.259 - disc support
-		strptime("Dec 23 2014 17:28:56", "%b %d %Y %H:%M:%S", &time); // v1.259
-		if(gameHdr->type == TYPE_GAME_GC_DISC && NINLoaderTime < mktime(&time))
-		{
-			WindowPrompt(tr("Error:"), tr("To run GameCube games from Disc you need to set the GameCube mode to MIOS in the game settings."), tr("OK"));
-			return 0;
-		}
-		
-		
-		// checks argsboot
-		if(ninAutobootChoice)
-		{
-			u8 *buffer = NULL;
-			u32 filesize = 0;
-			if(LoadFileToMem(NIN_loader_path, &buffer, &filesize))
-			{
-				for(u32 i = 0; i < filesize; i += 0x10)
-				{
-					if((*(u32*)(buffer+i)) == 'args' && (*(u32*)(buffer+i+4)) == 'boot')
-					{
-						gprintf("NIN: argsboot found at %08x, using arguments instead of Nincfg.bin\n", i);
-						NINArgsboot = true;
-						break;
-					}
-				}
-				free(buffer);
-			}
-		}
+		NINArgsboot = true; //	no need to check argsboot string, 3.324+ supports it.
 	}
 	else
 	{
-		int choice = WindowPrompt(tr("Warning:"), tr("USBloaderGX couldn't verify Nintendont boot.dol file. Launch this boot.dol anyway?"), tr("Yes"), tr("Cancel"));
-		if(choice == 0)
-			return 0;
+		char NINBuildDate[21] = "";
+		if(nintendontBuildDate(Settings.NINLoaderPath, NINBuildDate))
+		{
+			//Current build date
+			struct tm time;
+			strptime(NINBuildDate, "%b %d %Y %H:%M:%S", &time);
+			const time_t NINLoaderTime = mktime(&time);
+			
+			// Alpha0.1
+			strptime("Sep 20 2013 15:27:01", "%b %d %Y %H:%M:%S", &time);
+			if(NINLoaderTime == mktime(&time))
+			{
+				WindowPrompt(tr("Error:"), tr("USBloaderGX r1218 is required for Nintendont Alpha v0.1. Please update your Nintendont boot.dol version."), tr("Ok"));
+				return 0;
+			}
+			
+			// r01 - r40
+			strptime("Mar 30 2014 12:33:44", "%b %d %Y %H:%M:%S", &time); // r42 - NIN_CFG_VERSION = 2
+			if(NINLoaderTime < mktime(&time))
+			{
+				gprintf("Nintendont r01 - r40 detected. Using CFG version 0x00000001\n");
+				NIN_cfg_version = 1;
+				
+				strptime("Mar 29 2014 10:49:31", "%b %d %Y %H:%M:%S", &time); // r39
+				if(NINLoaderTime < mktime(&time) && strncmp(RealPath, "usb", 3) == 0)
+				{
+					if(WindowPrompt(tr("Warning:"), tr("This Nintendont version does not support games on USB."), tr("Continue"), tr("Cancel")) == 0)
+					return 0;
+				}
+			}
+			
+			// v1.01 - v1.134
+			strptime("Aug  5 2014 22:38:21", "%b %d %Y %H:%M:%S", &time); // v1.135 - NIN_CFG_VERSION = 3
+			if(NINLoaderTime < mktime(&time) && NIN_cfg_version != 1)
+			{
+				gprintf("Nintendont v1.01 - v1.134 detected. Using CFG version 0x00000002\n");
+				NIN_cfg_version = 2;
+				// no need to fake NIN_CFG struct size, the size is checked in nintendont only since v1.143
+			}
+			
+			// v2.200 to 2.207
+			strptime("Nov  6 2014.17:33:30", "%b %d %Y %H:%M:%S", &time); // v1.208
+			if(ninAutobootChoice && NINLoaderTime < mktime(&time))
+			{
+				strptime("Oct 31 2014 21:14:47", "%b %d %Y %H:%M:%S", &time); // v1.200
+				if(NINLoaderTime >= mktime(&time))
+				{
+					WindowPrompt(tr("Warning:"), tr("This Nintendont version is not correctly supported. Auto boot disabled."), tr("Ok"));
+					ninAutobootChoice = OFF;
+				}
+			}
+			
+			// v2.259 - disc support
+			strptime("Dec 23 2014 17:28:56", "%b %d %Y %H:%M:%S", &time); // v1.259
+			if(gameHdr->type == TYPE_GAME_GC_DISC && NINLoaderTime < mktime(&time))
+			{
+				WindowPrompt(tr("Error:"), tr("To run GameCube games from Disc you need to set the GameCube mode to MIOS in the game settings."), tr("OK"));
+				return 0;
+			}
+			
+			// v3.304 - Controller.ini is now optional
+			strptime("Feb 23 2015 05:32:16", "%b %d %Y %H:%M:%S", &time); // v3.304
+			if(NINLoaderTime >= mktime(&time))
+			{
+				NINRev = 304;
+			}
+			
+			
+			// checks argsboot
+			if(ninAutobootChoice)
+			{
+				u8 *buffer = NULL;
+				u32 filesize = 0;
+				if(LoadFileToMem(NIN_loader_path, &buffer, &filesize))
+				{
+					for(u32 i = 0; i < filesize; i += 0x10)
+					{
+						if((*(u32*)(buffer+i)) == 'args' && (*(u32*)(buffer+i+4)) == 'boot')
+						{
+							gprintf("NIN: argsboot found at %08x, using arguments instead of Nincfg.bin\n", i);
+							NINArgsboot = true;
+							break;
+						}
+					}
+					free(buffer);
+				}
+			}
+		}
+		else
+		{
+			int choice = WindowPrompt(tr("Warning:"), tr("USBloaderGX couldn't verify Nintendont boot.dol file. Launch this boot.dol anyway?"), tr("Yes"), tr("Cancel"));
+			if(choice == 0)
+				return 0;
+		}
 	}
 
 	// Set used device when launching game from disc
-	if(gameHdr->type == TYPE_GAME_GC_DISC && ninMCEmulationChoice)
+	if(gameHdr->type == TYPE_GAME_GC_DISC)
 	{
 		if(Settings.GameCubeSource >= GC_SOURCE_AUTO && strncmp(Settings.GameCubePath, "usb", 3) == 0)
 		{
-			if(WindowPrompt("", tr("Where do you want MCEmu to be located?"), tr("SD"), tr("USB")) == 1)
+			if(WindowPrompt("", tr("Which device do you want to use for Nintendont files?"), tr("SD"), tr("USB")) == 1)
 				snprintf(RealPath, sizeof(RealPath), "%s:/", DeviceHandler::GetDevicePrefix(Settings.GameCubeSDPath));
 			else
 				snprintf(RealPath, sizeof(RealPath), "%s:/", DeviceHandler::GetDevicePrefix(Settings.GameCubePath));
@@ -1162,24 +1182,28 @@ int GameBooter::BootNintendont(struct discHdr *gameHdr)
 	}
 
 	// Check kenobiwii.bin
-	if(ocarinaChoice)
+	if(ocarinaChoice || (ninDebugChoice && !isWiiU()))
 	{
 		char kenobiwii_path[30]; 
 		snprintf(kenobiwii_path, sizeof(kenobiwii_path), "%s:/sneek/kenobiwii.bin", DeviceHandler::GetDevicePrefix(RealPath));
 		if(!CheckFile(kenobiwii_path))
 		{
 			// try to copy kenobiwii from the other device
-			char kenobiwii_srcpath[30]; 
-			snprintf(kenobiwii_srcpath, sizeof(kenobiwii_srcpath), "%s:/sneek/kenobiwii.bin", strncmp(RealPath, "usb", 3) == 0 ? "sd" : "usb1");
-			gprintf("kenobiwii source path = %s \n", kenobiwii_srcpath);
-			if(CheckFile(kenobiwii_srcpath))
+			if(strcmp(Settings.GameCubePath, Settings.GameCubeSDPath) != 0)
 			{
-				if(CopyFile(kenobiwii_srcpath, kenobiwii_path) < 0)
+				char kenobiwii_srcpath[30]; 
+				
+				snprintf(kenobiwii_srcpath, sizeof(kenobiwii_srcpath), "%s:/sneek/kenobiwii.bin", strncmp(RealPath, "usb", 3) == 0 ? "sd" : DeviceHandler::GetDevicePrefix(Settings.GameCubePath));
+				gprintf("kenobiwii source path = %s \n", kenobiwii_srcpath);
+				if(CheckFile(kenobiwii_srcpath))
 				{
-					gprintf("NIN: Couldn't copy %s to %s.\n", kenobiwii_srcpath, kenobiwii_path);
-					RemoveFile(kenobiwii_path);
-					if(WindowPrompt(tr("Warning:"), fmt(tr("To use ocarina with %s you need the %s file."), LoaderName, kenobiwii_path), tr("Continue"), tr("Cancel")) == 0)
-						return 0;
+					if(CopyFile(kenobiwii_srcpath, kenobiwii_path) < 0)
+					{
+						gprintf("NIN: Couldn't copy %s to %s.\n", kenobiwii_srcpath, kenobiwii_path);
+						RemoveFile(kenobiwii_path);
+						if(WindowPrompt(tr("Warning:"), fmt(tr("To use ocarina with %s you need the %s file."), LoaderName, kenobiwii_path), tr("Continue"), tr("Cancel")) == 0)
+							return 0;
+					}
 				}
 			}
 			else
@@ -1196,11 +1220,11 @@ int GameBooter::BootNintendont(struct discHdr *gameHdr)
 		// Check controller.ini file in priority, then controllers folder, for compatibility with older nintendont versions.
 		char controllerini_path[30]; 
 		snprintf(controllerini_path, sizeof(controllerini_path), "%s:/controller.ini", DeviceHandler::GetDevicePrefix(RealPath));
-		if(!CheckFile(controllerini_path))
+		if(!CheckFile(controllerini_path) && strcmp(Settings.GameCubePath, Settings.GameCubeSDPath) != 0)
 		{
 			// try to copy controller.ini from the other device
 			char controllerini_srcpath[30]; 
-			snprintf(controllerini_srcpath, sizeof(controllerini_srcpath), "%s:/controller.ini", strncmp(RealPath, "usb", 3) == 0 ? "sd" : "usb1");
+			snprintf(controllerini_srcpath, sizeof(controllerini_srcpath), "%s:/controller.ini", strncmp(RealPath, "usb", 3) == 0 ? "sd" : DeviceHandler::GetDevicePrefix(Settings.GameCubePath));
 			gprintf("Controller.ini source path = %s \n", controllerini_srcpath);
 			if(CheckFile(controllerini_srcpath))
 			{
@@ -1208,8 +1232,11 @@ int GameBooter::BootNintendont(struct discHdr *gameHdr)
 				{
 					gprintf("NIN: Couldn't copy %s to %s.\n", controllerini_srcpath, controllerini_path);
 					RemoveFile(controllerini_path);
-					if(WindowPrompt(tr("Warning:"), fmt(tr("To use HID with %s you need the %s file."), LoaderName, controllerini_path), tr("Continue"), tr("Cancel")) == 0)
-						return 0;
+					if(NINRev < 304) // HID is always enabled and controller.ini optional since r304
+					{
+						if(WindowPrompt(tr("Warning:"), fmt(tr("To use HID with %s you need the %s file."), LoaderName, controllerini_path), tr("Continue"), tr("Cancel")) == 0)
+							return 0;
+					}
 				}
 			}
 			else // check controllers folder if no controller.ini found on root.
@@ -1217,11 +1244,11 @@ int GameBooter::BootNintendont(struct discHdr *gameHdr)
 			
 				// Check gamepath:/controllers/ folder
 				snprintf(controllerini_path, sizeof(controllerini_path), "%s:/controllers/", DeviceHandler::GetDevicePrefix(RealPath));
-				if(!CheckFile(controllerini_path))
+				if(!CheckFile(controllerini_path) && strcmp(Settings.GameCubePath, Settings.GameCubeSDPath) != 0)
 				{
 					// try to copy controllers folder from the other device
 					char controllerini_srcpath[30]; 
-					snprintf(controllerini_srcpath, sizeof(controllerini_srcpath), "%s:/controllers/", strncmp(RealPath, "usb", 3) == 0 ? "sd" : "usb1");
+					snprintf(controllerini_srcpath, sizeof(controllerini_srcpath), "%s:/controllers/", strncmp(RealPath, "usb", 3) == 0 ? "sd" : DeviceHandler::GetDevicePrefix(Settings.GameCubePath));
 					gprintf("Controllers folder source path = %s \n", controllerini_srcpath);
 					if(CheckFile(controllerini_srcpath))
 					{
@@ -1231,7 +1258,7 @@ int GameBooter::BootNintendont(struct discHdr *gameHdr)
 							RemoveDirectory(controllerini_path);
 						}
 					}
-					else
+					else if(NINRev < 304)
 					{
 						snprintf(controllerini_path, sizeof(controllerini_path), "%s:/controller.ini", DeviceHandler::GetDevicePrefix(RealPath));
 						if(WindowPrompt(tr("Warning:"), fmt(tr("To use HID with %s you need the %s file."), LoaderName, controllerini_path), tr("Continue"), tr("Cancel")) == 0)
@@ -1245,7 +1272,7 @@ int GameBooter::BootNintendont(struct discHdr *gameHdr)
 	
 	// Check if game has multi Discs
 	bool bootDisc2 = false;
-	if(gameHdr->type != TYPE_GAME_GC_DISC && gameHdr->disc_no == 0)
+	if(multiDiscChoice && gameHdr->type != TYPE_GAME_GC_DISC && gameHdr->disc_no == 0)
 	{
 		char disc2Path[255];
 		snprintf(disc2Path, sizeof(disc2Path), "%s", RealPath);
@@ -1414,8 +1441,19 @@ int GameBooter::BootNintendont(struct discHdr *gameHdr)
 	// Delete existing nincfg.bin files
 	if(ninSettingsChoice == OFF)
 	{
-		RemoveFile("sd:/nincfg.bin");
-		RemoveFile("usb1:/nincfg.bin");
+		char NINCfgPath[17];
+		
+		// Nintendont loader partition
+		snprintf(NINCfgPath, sizeof(NINCfgPath), "%s:/nincfg.bin", DeviceHandler::GetDevicePrefix(NIN_loader_path));
+		RemoveFile(NINCfgPath);
+		
+		// game partition
+		if(strncmp(NINCfgPath, RealPath, 4) != 0)
+		{
+			snprintf(NINCfgPath, sizeof(NINCfgPath), "%s:/nincfg.bin", DeviceHandler::GetDevicePrefix(RealPath));
+			RemoveFile(NINCfgPath);
+		}
+		
 	}
 	else if(ninSettingsChoice == ON || !NINArgsboot)
 	{