From 83e3aa545c68c3492fdaa9dac5a451f82ff4d49d Mon Sep 17 00:00:00 2001
From: cyan06 <cyan06@users.noreply.github.com>
Date: Sat, 2 Jan 2016 16:23:01 +0000
Subject: [PATCH] * Fixed custom banner download issue introduced in r1259. *
 Fixed spelling mistake in image download function. * Reverted HTTP to non SSL
 revision (r1252). * Removed Nintendont internal update feature (requires
 SSL). * Added batch wad (un)install from a folder. * Changed the wad install
 menu interface. * Added an option to the wad class to display or hide errors
 on wad install. * Fixed RemoveDirectory return value. * Added game type and
 console name in exported game list. (requested)

* Updated French language
---
 HBC/meta.xml                                  |   4 +-
 Languages/czech.lang                          |  49 +-
 Languages/danish.lang                         |  55 ++-
 Languages/dutch.lang                          |  55 ++-
 Languages/english.lang                        |  47 +-
 Languages/finnish.lang                        |  49 +-
 Languages/french.lang                         |  67 ++-
 Languages/german.lang                         |  61 ++-
 Languages/greek.lang                          |  55 ++-
 Languages/hungarian.lang                      |  49 +-
 Languages/italian.lang                        |  55 ++-
 Languages/japanese.lang                       |  55 ++-
 Languages/korean.lang                         |  49 +-
 Languages/norwegian.lang                      |  49 +-
 Languages/polish.lang                         |  49 +-
 Languages/portuguese_br.lang                  |  61 ++-
 Languages/portuguese_pt.lang                  |  49 +-
 Languages/russian.lang                        |  49 +-
 Languages/schinese.lang                       |  55 ++-
 Languages/spanish.lang                        |  61 ++-
 Languages/swedish.lang                        |  49 +-
 Languages/tchinese.lang                       |  55 ++-
 Languages/thai.lang                           |  49 +-
 Languages/turkish.lang                        |  49 +-
 source/FileOperations/DirList.h               |   3 +
 source/FileOperations/fileops.cpp             |   2 +-
 source/GameCube/GCGames.cpp                   |  10 +-
 source/network/ImageDownloader.cpp            |   6 +-
 source/network/http.c                         | 462 +++++++-----------
 source/network/http.h                         |  26 +-
 source/prompts/gameinfo.cpp                   |  50 +-
 source/settings/menus/FeatureSettingsMenu.cpp | 145 +++++-
 source/utils/wifi_gecko.c                     |   2 +-
 source/wad/wad.cpp                            |  69 ++-
 source/wad/wad.h                              |   4 +-
 35 files changed, 1332 insertions(+), 672 deletions(-)

diff --git a/HBC/meta.xml b/HBC/meta.xml
index e905814f..1703191a 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 r1259</version>
-		<release_date>20151117142425</release_date>
+		<version>3.0 r1260</version>
+		<release_date>20160102155330</release_date>
 		<!--   // remove this line to enable arguments
 		<arguments>
 				<arg>--ios=250</arg>
diff --git a/Languages/czech.lang b/Languages/czech.lang
index 82c045a4..8fbd10d1 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-08-14 16:24+0200\n"
+"POT-Creation-Date: 2016-01-02 16:53+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: David Jelinek (djelinek@hotmail.com) e->e,r->r,u->u, c->c \n"
 "Language-Team: r1056 - last version on http://djelinek.sweb.cz/_USBLoderGX/czech.lang \n"
@@ -31,6 +31,14 @@ msgstr ""
 msgid "%i missing files"
 msgstr ""
 
+#, c-format
+msgid "%i wad file(s) not processed!"
+msgstr ""
+
+#, c-format
+msgid "%i wad found."
+msgstr ""
+
 #, c-format
 msgid "%s only accepts GameCube backups in ISO format."
 msgstr ""
@@ -132,6 +140,9 @@ msgstr "Všechny obrázky staženy úspešně."
 msgid "All the features of USB Loader GX are unlocked."
 msgstr "Všechny možnosti USB Loader GX jsou odemceny"
 
+msgid "All wad files processed successfully."
+msgstr ""
+
 msgid "Alternate DOL"
 msgstr "Náhradní DOL"
 
@@ -180,6 +191,9 @@ msgstr ""
 msgid "Attention!"
 msgstr ""
 
+msgid "Attention: All savegames will be deleted."
+msgstr ""
+
 msgid "Aug"
 msgstr "Srp"
 
@@ -712,9 +726,6 @@ msgstr ""
 msgid "Do you want to sync free space info sector on all FAT32 partitions?"
 msgstr "Prejete si synchronizovat informace o volných sektorech na vsech FAT 32 oddílech?"
 
-msgid "Do you want to update this file?"
-msgstr ""
-
 msgid "Do you wish to update/download all language files?"
 msgstr "Prejete si zaktualizovat vsechny jazykové soubory?"
 
@@ -778,6 +789,9 @@ msgstr "CHYBA:"
 msgid "ERROR: Can't set up theme."
 msgstr "CHYBA: Nelze nastavit téma."
 
+msgid "EmuNAND Wad Manager"
+msgstr ""
+
 msgid "EmuNand Channels"
 msgstr ""
 
@@ -924,6 +938,9 @@ msgstr ""
 msgid "Feb"
 msgstr "Ún"
 
+msgid "File"
+msgstr ""
+
 msgid "File not found."
 msgstr "Soubor nenalezen"
 
@@ -946,6 +963,9 @@ msgstr "Ploché obaly"
 msgid "Flip-X"
 msgstr ""
 
+msgid "Folder"
+msgstr ""
+
 msgid "Font Scale Factor"
 msgstr ""
 
@@ -1224,12 +1244,12 @@ msgstr "Chyba pri instalaci"
 msgid "Install Partitions"
 msgstr ""
 
-msgid "Install WAD to EmuNand"
-msgstr ""
-
 msgid "Install a game"
 msgstr "Nainstalovat hru"
 
+msgid "Install error - Cleaning incomplete data."
+msgstr ""
+
 msgid "Install finished"
 msgstr ""
 
@@ -1540,6 +1560,9 @@ msgstr "Žádné téma nebylo nalezeno na serveru."
 msgid "No themes found."
 msgstr ""
 
+msgid "No wad file found in this folder."
+msgstr ""
+
 msgid "NoSSL only"
 msgstr ""
 
@@ -1741,6 +1764,9 @@ msgstr ""
 msgid "Receiving file from:"
 msgstr "Prijímám soubor z:"
 
+msgid "Region Free"
+msgstr ""
+
 msgid "Region Patch"
 msgstr "Patch regionu"
 
@@ -2221,9 +2247,6 @@ msgstr "Aktualizace DOL"
 msgid "Update Files"
 msgstr "Zaktualizuj soubory"
 
-msgid "Update Nintendont"
-msgstr ""
-
 msgid "Update Path"
 msgstr "Cesta pro aktualizaci"
 
@@ -2276,9 +2299,6 @@ msgstr ""
 msgid "Virtual Pointer Speed"
 msgstr ""
 
-msgid "WAD Installation"
-msgstr ""
-
 msgid "WDM Files Path"
 msgstr "Cesta k WDM soborum"
 
@@ -2315,6 +2335,9 @@ msgstr ""
 msgid "Which device do you want to use for Nintendont files?"
 msgstr ""
 
+msgid "Which mode do you want to use?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "WiFi možnosti"
 
diff --git a/Languages/danish.lang b/Languages/danish.lang
index d11c9a90..33f8a450 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-08-14 16:24+0200\n"
+"POT-Creation-Date: 2016-01-02 16:53+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: Fox888[dk]\n"
 "Language-Team: [dk]\n"
@@ -31,6 +31,14 @@ msgstr "%i filer ikke fundet på server!"
 msgid "%i missing files"
 msgstr "%i filer mangler"
 
+#, c-format
+msgid "%i wad file(s) not processed!"
+msgstr ""
+
+#, c-format
+msgid "%i wad found."
+msgstr ""
+
 #, c-format
 msgid "%s only accepts GameCube backups in ISO format."
 msgstr ""
@@ -132,6 +140,9 @@ msgstr "Lykkedes at downloade alle billeder."
 msgid "All the features of USB Loader GX are unlocked."
 msgstr "Alle USB Loader GX's funktioner er låst op."
 
+msgid "All wad files processed successfully."
+msgstr ""
+
 msgid "Alternate DOL"
 msgstr "Alternativ DOL"
 
@@ -180,6 +191,9 @@ msgstr "Formatforhold"
 msgid "Attention!"
 msgstr ""
 
+msgid "Attention: All savegames will be deleted."
+msgstr ""
+
 msgid "Aug"
 msgstr ""
 
@@ -712,9 +726,6 @@ msgstr ""
 msgid "Do you want to sync free space info sector on all FAT32 partitions?"
 msgstr "Vil du synkronisere fri plads info sector på alle FAT32 Partitioner?"
 
-msgid "Do you want to update this file?"
-msgstr ""
-
 msgid "Do you wish to update/download all language files?"
 msgstr "Skal alle sprogfiler opdateres/downloades?"
 
@@ -778,6 +789,9 @@ msgstr "FEJL:"
 msgid "ERROR: Can't set up theme."
 msgstr "FEJL: Temaet kan ikke bruges."
 
+msgid "EmuNAND Wad Manager"
+msgstr ""
+
 msgid "EmuNand Channels"
 msgstr "EmuNand kanaler"
 
@@ -924,6 +938,9 @@ msgstr "Særlige indstillinger"
 msgid "Feb"
 msgstr ""
 
+msgid "File"
+msgstr ""
+
 msgid "File not found."
 msgstr "Fil ikke fundet."
 
@@ -946,6 +963,9 @@ msgstr "Flad Cover"
 msgid "Flip-X"
 msgstr ""
 
+msgid "Folder"
+msgstr ""
+
 msgid "Font Scale Factor"
 msgstr ""
 
@@ -1224,12 +1244,12 @@ msgstr "Installationsfejl!"
 msgid "Install Partitions"
 msgstr "Installer partitioner"
 
-msgid "Install WAD to EmuNand"
-msgstr "Installer WAD til EmuNand"
-
 msgid "Install a game"
 msgstr "Installér nyt spil"
 
+msgid "Install error - Cleaning incomplete data."
+msgstr ""
+
 msgid "Install finished"
 msgstr "Installering færdig"
 
@@ -1540,6 +1560,9 @@ msgstr "Der blev ikke fundet nogle temaer på denne side."
 msgid "No themes found."
 msgstr "Ingen temaer fundet."
 
+msgid "No wad file found in this folder."
+msgstr ""
+
 msgid "NoSSL only"
 msgstr ""
 
@@ -1741,6 +1764,9 @@ msgstr "Ægte Nand"
 msgid "Receiving file from:"
 msgstr "Henter fil fra:"
 
+msgid "Region Free"
+msgstr ""
+
 msgid "Region Patch"
 msgstr ""
 
@@ -2221,9 +2247,6 @@ msgstr "Opdatér DOL"
 msgid "Update Files"
 msgstr "Opdatér filer"
 
-msgid "Update Nintendont"
-msgstr ""
-
 msgid "Update Path"
 msgstr "Sti til opdateringer"
 
@@ -2276,9 +2299,6 @@ msgstr ""
 msgid "Virtual Pointer Speed"
 msgstr "Virtual pointer hastighed"
 
-msgid "WAD Installation"
-msgstr " WAD installation"
-
 msgid "WDM Files Path"
 msgstr "Sti til WDM filer"
 
@@ -2315,6 +2335,9 @@ msgstr ""
 msgid "Which device do you want to use for Nintendont files?"
 msgstr ""
 
+msgid "Which mode do you want to use?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "WiFi-indstillinger"
 
@@ -2451,6 +2474,12 @@ msgstr "af"
 msgid "seconds left"
 msgstr "sekunder tilbage"
 
+#~ msgid "Install WAD to EmuNand"
+#~ msgstr "Installer WAD til EmuNand"
+
+#~ msgid "WAD Installation"
+#~ msgstr " WAD installation"
+
 #~ msgid "GameTDB Path"
 #~ msgstr "Sti til GameTDB"
 
diff --git a/Languages/dutch.lang b/Languages/dutch.lang
index ec8ff991..88f4d445 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-08-14 16:24+0200\n"
+"POT-Creation-Date: 2016-01-02 16:53+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -31,6 +31,14 @@ msgstr "%i bestanden niet gevonden op de server!"
 msgid "%i missing files"
 msgstr "%i missende bestanden"
 
+#, c-format
+msgid "%i wad file(s) not processed!"
+msgstr ""
+
+#, c-format
+msgid "%i wad found."
+msgstr ""
+
 #, c-format
 msgid "%s only accepts GameCube backups in ISO format."
 msgstr "%s accepteerd alleen GameCube backups in ISO formaat."
@@ -132,6 +140,9 @@ msgstr "Alle plaatjes succesvol gedownload."
 msgid "All the features of USB Loader GX are unlocked."
 msgstr "Alle functies van USB Loader GX zijn vrijgegeven."
 
+msgid "All wad files processed successfully."
+msgstr ""
+
 msgid "Alternate DOL"
 msgstr "Alternatieve DOL"
 
@@ -180,6 +191,9 @@ msgstr "verhouding ratio"
 msgid "Attention!"
 msgstr "Opgelet!"
 
+msgid "Attention: All savegames will be deleted."
+msgstr ""
+
 msgid "Aug"
 msgstr ""
 
@@ -712,9 +726,6 @@ msgstr "Wil je het spel nu starten?"
 msgid "Do you want to sync free space info sector on all FAT32 partitions?"
 msgstr "Wil je de vrije ruimte informatie sector synchroniseren op alle FAT32 partities?"
 
-msgid "Do you want to update this file?"
-msgstr ""
-
 msgid "Do you wish to update/download all language files?"
 msgstr "Wil je alle taalbestanden updaten/downloaden?"
 
@@ -778,6 +789,9 @@ msgstr "FOUT:"
 msgid "ERROR: Can't set up theme."
 msgstr "FOUT: Kan thema niet instellen"
 
+msgid "EmuNAND Wad Manager"
+msgstr ""
+
 msgid "EmuNand Channels"
 msgstr "EmuNand Kanalen"
 
@@ -924,6 +938,9 @@ msgstr "Functie Instellingen"
 msgid "Feb"
 msgstr ""
 
+msgid "File"
+msgstr ""
+
 msgid "File not found."
 msgstr "Bestand niet gevonden."
 
@@ -946,6 +963,9 @@ msgstr "Platte hoesjes"
 msgid "Flip-X"
 msgstr "X omwisselen"
 
+msgid "Folder"
+msgstr ""
+
 msgid "Font Scale Factor"
 msgstr "Lettertype Schaal Factor"
 
@@ -1224,12 +1244,12 @@ msgstr "Installatiefout!"
 msgid "Install Partitions"
 msgstr "Installatie Partitie"
 
-msgid "Install WAD to EmuNand"
-msgstr "Installeer WAD naar EmuNand"
-
 msgid "Install a game"
 msgstr "Spel installeren"
 
+msgid "Install error - Cleaning incomplete data."
+msgstr ""
+
 msgid "Install finished"
 msgstr "Installatie voltooid"
 
@@ -1540,6 +1560,9 @@ msgstr "Geen thema's gevonden op de site."
 msgid "No themes found."
 msgstr "Geen thema's gevonden."
 
+msgid "No wad file found in this folder."
+msgstr ""
+
 msgid "NoSSL only"
 msgstr ""
 
@@ -1741,6 +1764,9 @@ msgstr "Echte Nand"
 msgid "Receiving file from:"
 msgstr "Bestand ontvangen van:"
 
+msgid "Region Free"
+msgstr ""
+
 msgid "Region Patch"
 msgstr "Regio Patch"
 
@@ -2221,9 +2247,6 @@ msgstr "DOL updaten"
 msgid "Update Files"
 msgstr "Bestanden Updaten"
 
-msgid "Update Nintendont"
-msgstr ""
-
 msgid "Update Path"
 msgstr "Updatelocatie"
 
@@ -2276,9 +2299,6 @@ msgstr ""
 msgid "Virtual Pointer Speed"
 msgstr "Virtuele Muis Snelheid"
 
-msgid "WAD Installation"
-msgstr "WAD Installatie"
-
 msgid "WDM Files Path"
 msgstr "Locatie WDM bestanden"
 
@@ -2315,6 +2335,9 @@ msgstr ""
 msgid "Which device do you want to use for Nintendont files?"
 msgstr ""
 
+msgid "Which mode do you want to use?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "WiFi Functies"
 
@@ -2451,6 +2474,12 @@ msgstr "van"
 msgid "seconds left"
 msgstr "seconde resterend"
 
+#~ msgid "Install WAD to EmuNand"
+#~ msgstr "Installeer WAD naar EmuNand"
+
+#~ msgid "WAD Installation"
+#~ msgstr "WAD Installatie"
+
 #~ msgid "GameTDB Path"
 #~ msgstr "Map naar GameTBD"
 
diff --git a/Languages/english.lang b/Languages/english.lang
index f4a4e03b..2098dc3c 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-08-14 16:24+0200\n"
+"POT-Creation-Date: 2016-01-02 16:53+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -31,6 +31,14 @@ msgstr ""
 msgid "%i missing files"
 msgstr ""
 
+#, c-format
+msgid "%i wad file(s) not processed!"
+msgstr ""
+
+#, c-format
+msgid "%i wad found."
+msgstr ""
+
 #, c-format
 msgid "%s only accepts GameCube backups in ISO format."
 msgstr ""
@@ -132,6 +140,9 @@ msgstr ""
 msgid "All the features of USB Loader GX are unlocked."
 msgstr ""
 
+msgid "All wad files processed successfully."
+msgstr ""
+
 msgid "Alternate DOL"
 msgstr ""
 
@@ -180,6 +191,9 @@ msgstr ""
 msgid "Attention!"
 msgstr ""
 
+msgid "Attention: All savegames will be deleted."
+msgstr ""
+
 msgid "Aug"
 msgstr ""
 
@@ -712,9 +726,6 @@ msgstr ""
 msgid "Do you want to sync free space info sector on all FAT32 partitions?"
 msgstr ""
 
-msgid "Do you want to update this file?"
-msgstr ""
-
 msgid "Do you wish to update/download all language files?"
 msgstr ""
 
@@ -778,6 +789,9 @@ msgstr ""
 msgid "ERROR: Can't set up theme."
 msgstr ""
 
+msgid "EmuNAND Wad Manager"
+msgstr ""
+
 msgid "EmuNand Channels"
 msgstr ""
 
@@ -924,6 +938,9 @@ msgstr ""
 msgid "Feb"
 msgstr ""
 
+msgid "File"
+msgstr ""
+
 msgid "File not found."
 msgstr ""
 
@@ -946,6 +963,9 @@ msgstr ""
 msgid "Flip-X"
 msgstr ""
 
+msgid "Folder"
+msgstr ""
+
 msgid "Font Scale Factor"
 msgstr ""
 
@@ -1224,10 +1244,10 @@ msgstr ""
 msgid "Install Partitions"
 msgstr ""
 
-msgid "Install WAD to EmuNand"
+msgid "Install a game"
 msgstr ""
 
-msgid "Install a game"
+msgid "Install error - Cleaning incomplete data."
 msgstr ""
 
 msgid "Install finished"
@@ -1540,6 +1560,9 @@ msgstr ""
 msgid "No themes found."
 msgstr ""
 
+msgid "No wad file found in this folder."
+msgstr ""
+
 msgid "NoSSL only"
 msgstr ""
 
@@ -1741,6 +1764,9 @@ msgstr ""
 msgid "Receiving file from:"
 msgstr ""
 
+msgid "Region Free"
+msgstr ""
+
 msgid "Region Patch"
 msgstr ""
 
@@ -2221,9 +2247,6 @@ msgstr ""
 msgid "Update Files"
 msgstr ""
 
-msgid "Update Nintendont"
-msgstr ""
-
 msgid "Update Path"
 msgstr ""
 
@@ -2276,9 +2299,6 @@ msgstr ""
 msgid "Virtual Pointer Speed"
 msgstr ""
 
-msgid "WAD Installation"
-msgstr ""
-
 msgid "WDM Files Path"
 msgstr ""
 
@@ -2315,6 +2335,9 @@ msgstr ""
 msgid "Which device do you want to use for Nintendont files?"
 msgstr ""
 
+msgid "Which mode do you want to use?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr ""
 
diff --git a/Languages/finnish.lang b/Languages/finnish.lang
index 362c70e2..330679bc 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-08-14 16:24+0200\n"
+"POT-Creation-Date: 2016-01-02 16:53+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: c64rmx\n"
 "Language-Team: \n"
@@ -31,6 +31,14 @@ msgstr ""
 msgid "%i missing files"
 msgstr ""
 
+#, c-format
+msgid "%i wad file(s) not processed!"
+msgstr ""
+
+#, c-format
+msgid "%i wad found."
+msgstr ""
+
 #, c-format
 msgid "%s only accepts GameCube backups in ISO format."
 msgstr ""
@@ -132,6 +140,9 @@ msgstr ""
 msgid "All the features of USB Loader GX are unlocked."
 msgstr "Kaikki asetukset on nyt käytettävissä."
 
+msgid "All wad files processed successfully."
+msgstr ""
+
 msgid "Alternate DOL"
 msgstr "Vaihtoehto DOL"
 
@@ -180,6 +191,9 @@ msgstr ""
 msgid "Attention!"
 msgstr ""
 
+msgid "Attention: All savegames will be deleted."
+msgstr ""
+
 msgid "Aug"
 msgstr "elo"
 
@@ -712,9 +726,6 @@ msgstr ""
 msgid "Do you want to sync free space info sector on all FAT32 partitions?"
 msgstr ""
 
-msgid "Do you want to update this file?"
-msgstr ""
-
 msgid "Do you wish to update/download all language files?"
 msgstr "Haluatko päivittää/ladata kaikki kielitiedostot?"
 
@@ -778,6 +789,9 @@ msgstr "VIRHE:"
 msgid "ERROR: Can't set up theme."
 msgstr ""
 
+msgid "EmuNAND Wad Manager"
+msgstr ""
+
 msgid "EmuNand Channels"
 msgstr ""
 
@@ -924,6 +938,9 @@ msgstr ""
 msgid "Feb"
 msgstr "helmi"
 
+msgid "File"
+msgstr ""
+
 msgid "File not found."
 msgstr "Tiedostoa ei löytynyt"
 
@@ -946,6 +963,9 @@ msgstr ""
 msgid "Flip-X"
 msgstr "Käännä-X"
 
+msgid "Folder"
+msgstr ""
+
 msgid "Font Scale Factor"
 msgstr ""
 
@@ -1224,12 +1244,12 @@ msgstr "Asennusvirhe!"
 msgid "Install Partitions"
 msgstr ""
 
-msgid "Install WAD to EmuNand"
-msgstr ""
-
 msgid "Install a game"
 msgstr "Asenna peli"
 
+msgid "Install error - Cleaning incomplete data."
+msgstr ""
+
 msgid "Install finished"
 msgstr ""
 
@@ -1540,6 +1560,9 @@ msgstr ""
 msgid "No themes found."
 msgstr ""
 
+msgid "No wad file found in this folder."
+msgstr ""
+
 msgid "NoSSL only"
 msgstr ""
 
@@ -1741,6 +1764,9 @@ msgstr ""
 msgid "Receiving file from:"
 msgstr "Ladataan tiedostoa:"
 
+msgid "Region Free"
+msgstr ""
+
 msgid "Region Patch"
 msgstr ""
 
@@ -2221,9 +2247,6 @@ msgstr "Päivitä DOL"
 msgid "Update Files"
 msgstr "Päivitä tiedostot"
 
-msgid "Update Nintendont"
-msgstr ""
-
 msgid "Update Path"
 msgstr "Päivityspolku"
 
@@ -2276,9 +2299,6 @@ msgstr ""
 msgid "Virtual Pointer Speed"
 msgstr ""
 
-msgid "WAD Installation"
-msgstr ""
-
 msgid "WDM Files Path"
 msgstr ""
 
@@ -2315,6 +2335,9 @@ msgstr ""
 msgid "Which device do you want to use for Nintendont files?"
 msgstr ""
 
+msgid "Which mode do you want to use?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "WiFi ominaisuudet"
 
diff --git a/Languages/french.lang b/Languages/french.lang
index 06bab183..285dafd0 100644
--- a/Languages/french.lang
+++ b/Languages/french.lang
@@ -1,11 +1,11 @@
 # USB Loader GX language source file.
-# French.lang - r1255
+# French.lang - r1260
 # don't delete/change this line (é).
 msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-08-14 16:24+0200\n"
+"POT-Creation-Date: 2016-01-02 16:53+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: Cyan\n"
 "Language-Team: Badablek, Amour, ikya, Cyan & Kin8\n"
@@ -31,6 +31,14 @@ msgstr "%i fichier(s) introuvable(s) sur le serveur !"
 msgid "%i missing files"
 msgstr "%i fichier(s) manquant(s)"
 
+#, c-format
+msgid "%i wad file(s) not processed!"
+msgstr "%i fichier(s) wad non traité(s)!"
+
+#, c-format
+msgid "%i wad found."
+msgstr "%i wad trouvé(s)."
+
 #, c-format
 msgid "%s only accepts GameCube backups in ISO format."
 msgstr "%s n'accepte que les jeux GameCube au format ISO."
@@ -132,6 +140,9 @@ msgstr "Images correctement téléchargées"
 msgid "All the features of USB Loader GX are unlocked."
 msgstr "Toutes les fonctionnalités sont déverrouillées."
 
+msgid "All wad files processed successfully."
+msgstr "Tous les fichiers wad ont été traités avec succès."
+
 msgid "Alternate DOL"
 msgstr "DOL alternatif"
 
@@ -180,6 +191,9 @@ msgstr "Format d'image"
 msgid "Attention!"
 msgstr "Attention !"
 
+msgid "Attention: All savegames will be deleted."
+msgstr "Attention : Toutes les sauvegardes seront supprimées."
+
 msgid "Aug"
 msgstr "Août"
 
@@ -689,7 +703,7 @@ msgid "Do you want to extract all the save games?"
 msgstr "Extraire toutes les sauvegardes ?"
 
 msgid "Do you want to extract the save game?"
-msgstr "Voulez-vous extraire la sauvegarde ?"
+msgstr "Voulez-vous extraire la sauvegarde ?"
 
 msgid "Do you want to format:"
 msgstr "Voulez-vous formater:"
@@ -712,9 +726,6 @@ msgstr "Voulez-vous démarrer le jeu maintenant ?"
 msgid "Do you want to sync free space info sector on all FAT32 partitions?"
 msgstr "Voulez-vous synchroniser l'information d'espace libre disponible sur toutes les partitions FAT32 ?"
 
-msgid "Do you want to update this file?"
-msgstr "Voulez-vous mettre à jour ce fichier ?"
-
 msgid "Do you wish to update/download all language files?"
 msgstr "Voulez-vous actualiser/télécharger tous les fichiers langue ?"
 
@@ -778,6 +789,9 @@ msgstr "ERREUR:"
 msgid "ERROR: Can't set up theme."
 msgstr "ERREUR: Configuration thème impossible."
 
+msgid "EmuNAND Wad Manager"
+msgstr "ÉmuNand Wad Manager"
+
 msgid "EmuNand Channels"
 msgstr "Chaînes sur ÉmuNand"
 
@@ -924,6 +938,9 @@ msgstr "Fonctionnalités"
 msgid "Feb"
 msgstr "Fév"
 
+msgid "File"
+msgstr "Fichier"
+
 msgid "File not found."
 msgstr "Fichier introuvable."
 
@@ -946,6 +963,9 @@ msgstr "Jaquettes 2D"
 msgid "Flip-X"
 msgstr "Anim. jeu suivant"
 
+msgid "Folder"
+msgstr "Dossier"
+
 msgid "Font Scale Factor"
 msgstr "Échelle de la police"
 
@@ -1224,12 +1244,12 @@ msgstr "Erreur à l'installation !"
 msgid "Install Partitions"
 msgstr "Partitions jeu Wii à installer"
 
-msgid "Install WAD to EmuNand"
-msgstr "Installer WAD sur ÉmuNand"
-
 msgid "Install a game"
 msgstr "Installer un jeu"
 
+msgid "Install error - Cleaning incomplete data."
+msgstr "Erreur lors de l'installation ! Suppression des données incomplètes."
+
 msgid "Install finished"
 msgstr "Installation terminée"
 
@@ -1540,6 +1560,9 @@ msgstr "Aucun thème trouvé sur le site."
 msgid "No themes found."
 msgstr "Aucun thème trouvé."
 
+msgid "No wad file found in this folder."
+msgstr "Aucun fichier Wad trouvé dans ce dossier."
+
 msgid "NoSSL only"
 msgstr "NoSSL seulement"
 
@@ -1741,6 +1764,9 @@ msgstr "Nand réelle"
 msgid "Receiving file from:"
 msgstr "Réception du fichier de:"
 
+msgid "Region Free"
+msgstr ""
+
 msgid "Region Patch"
 msgstr "Patch Région"
 
@@ -1841,7 +1867,7 @@ msgid "Saved"
 msgstr "Sauvegardé"
 
 msgid "Savegame might not exist for this game."
-msgstr "La sauvegarde de ce jeu est peut-être existante."
+msgstr "La sauvegarde de ce jeu est peut-être inexistante."
 
 msgid "Screensaver"
 msgstr "Économiseur d'écran"
@@ -2221,9 +2247,6 @@ msgstr "DOL seul"
 msgid "Update Files"
 msgstr "MàJ Fichiers"
 
-msgid "Update Nintendont"
-msgstr "Mettre Nintendont à jour"
-
 msgid "Update Path"
 msgstr "Dossier de mise à jour"
 
@@ -2276,9 +2299,6 @@ msgstr "Échelle de l'image"
 msgid "Virtual Pointer Speed"
 msgstr "Vitesse du pointeur virtuel"
 
-msgid "WAD Installation"
-msgstr "Installation WAD"
-
 msgid "WDM Files Path"
 msgstr "Dossier fichiers WDM"
 
@@ -2315,6 +2335,9 @@ msgstr "Où voulez-vous extraire votre NAND ?"
 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 "Which mode do you want to use?"
+msgstr "Quel mode voulez-vous utiliser ?"
+
 msgid "WiFi Features"
 msgstr "Connexion WiFi"
 
@@ -2451,6 +2474,18 @@ msgstr "sur"
 msgid "seconds left"
 msgstr "secondes restantes"
 
+#~ msgid "Do you want to update this file?"
+#~ msgstr "Voulez-vous mettre à jour ce fichier ?"
+
+#~ msgid "Install WAD to EmuNand"
+#~ msgstr "Installer WAD sur ÉmuNand"
+
+#~ msgid "Update Nintendont"
+#~ msgstr "Mettre Nintendont à jour"
+
+#~ msgid "WAD Installation"
+#~ msgstr "Installation WAD"
+
 #~ msgid "GameTDB Path"
 #~ msgstr "Dossier GameTDB"
 
diff --git a/Languages/german.lang b/Languages/german.lang
index dcb80684..b0b1a10c 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-08-14 16:24+0200\n"
+"POT-Creation-Date: 2016-01-02 16:53+0100\n"
 "PO-Revision-Date: 2010-07-03 17:35-0800\n"
 "Last-Translator: Sabykos\n"
 "Language-Team: Bertilax, Snoozer, wishmasterf, ZEN.13, TheRealVisitor\n"
@@ -31,6 +31,14 @@ msgstr "%i Dateien auf dem Server nicht gefunden!"
 msgid "%i missing files"
 msgstr "%i fehlende Dateien"
 
+#, c-format
+msgid "%i wad file(s) not processed!"
+msgstr ""
+
+#, c-format
+msgid "%i wad found."
+msgstr ""
+
 #, c-format
 msgid "%s only accepts GameCube backups in ISO format."
 msgstr "%s benötigt GameCube Backups im ISO Format."
@@ -132,6 +140,9 @@ msgstr "Alle Bilder erfolgreich heruntergeladen"
 msgid "All the features of USB Loader GX are unlocked."
 msgstr "Alle Funktionen des USB Loader GX sind jetzt freigeschaltet."
 
+msgid "All wad files processed successfully."
+msgstr ""
+
 msgid "Alternate DOL"
 msgstr "Alternative DOL"
 
@@ -180,6 +191,9 @@ msgstr "Seitenverhältnis"
 msgid "Attention!"
 msgstr "Achtung!"
 
+msgid "Attention: All savegames will be deleted."
+msgstr ""
+
 msgid "Aug"
 msgstr "August"
 
@@ -712,9 +726,6 @@ msgstr "Soll ein neues Spiel gestartet werden?"
 msgid "Do you want to sync free space info sector on all FAT32 partitions?"
 msgstr "Soll die freier Speicher Info auf allen Partitionen synchronisiert werden?"
 
-msgid "Do you want to update this file?"
-msgstr "Diese Datei updaten?"
-
 msgid "Do you wish to update/download all language files?"
 msgstr "Alle Sprachdateien aktualisieren?"
 
@@ -778,6 +789,9 @@ msgstr "FEHLER:"
 msgid "ERROR: Can't set up theme."
 msgstr "FEHLER: Theme kann nicht eingerichtet werden."
 
+msgid "EmuNAND Wad Manager"
+msgstr ""
+
 msgid "EmuNand Channels"
 msgstr "EmuNand Kanäle"
 
@@ -924,6 +938,9 @@ msgstr "Features Optionen"
 msgid "Feb"
 msgstr "Februar"
 
+msgid "File"
+msgstr ""
+
 msgid "File not found."
 msgstr "Datei nicht gefunden."
 
@@ -946,6 +963,9 @@ msgstr "2D Cover"
 msgid "Flip-X"
 msgstr "Flip-X"
 
+msgid "Folder"
+msgstr ""
+
 msgid "Font Scale Factor"
 msgstr "Schrift-Skalierwert"
 
@@ -1224,12 +1244,12 @@ msgstr "Installationsfehler!"
 msgid "Install Partitions"
 msgstr "Inst. Partitionen"
 
-msgid "Install WAD to EmuNand"
-msgstr "Install. WAD in EmuNand"
-
 msgid "Install a game"
 msgstr "Spiel installieren"
 
+msgid "Install error - Cleaning incomplete data."
+msgstr ""
+
 msgid "Install finished"
 msgstr "Installation beendet"
 
@@ -1540,6 +1560,9 @@ msgstr "Keine Themes auf der Seite gefunden."
 msgid "No themes found."
 msgstr "Keine Themes gefunden."
 
+msgid "No wad file found in this folder."
+msgstr ""
+
 msgid "NoSSL only"
 msgstr "Nur NoSSL"
 
@@ -1741,6 +1764,9 @@ msgstr "Echtes Nand"
 msgid "Receiving file from:"
 msgstr "Empfange Datei von:"
 
+msgid "Region Free"
+msgstr ""
+
 msgid "Region Patch"
 msgstr "Region Patch"
 
@@ -2221,9 +2247,6 @@ msgstr "Nur DOL"
 msgid "Update Files"
 msgstr "Aktualisieren"
 
-msgid "Update Nintendont"
-msgstr "Aktualisiere Nintendont"
-
 msgid "Update Path"
 msgstr "Updates"
 
@@ -2276,9 +2299,6 @@ msgstr ""
 msgid "Virtual Pointer Speed"
 msgstr "Pointergeschwindigkeit"
 
-msgid "WAD Installation"
-msgstr "WAD-Installation"
-
 msgid "WDM Files Path"
 msgstr "WDM Dateien"
 
@@ -2315,6 +2335,9 @@ msgstr ""
 msgid "Which device do you want to use for Nintendont files?"
 msgstr ""
 
+msgid "Which mode do you want to use?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "WiFi Fähigkeiten"
 
@@ -2451,6 +2474,18 @@ msgstr "von"
 msgid "seconds left"
 msgstr "Sekunden verbleiben"
 
+#~ msgid "Do you want to update this file?"
+#~ msgstr "Diese Datei updaten?"
+
+#~ msgid "Install WAD to EmuNand"
+#~ msgstr "Install. WAD in EmuNand"
+
+#~ msgid "Update Nintendont"
+#~ msgstr "Aktualisiere Nintendont"
+
+#~ msgid "WAD Installation"
+#~ msgstr "WAD-Installation"
+
 #~ msgid "GameTDB Path"
 #~ msgstr "GameTDB"
 
diff --git a/Languages/greek.lang b/Languages/greek.lang
index 940d4a5a..df1d244d 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-08-14 16:24+0200\n"
+"POT-Creation-Date: 2016-01-02 16:53+0100\n"
 "Last-Translator: nakata6790\n"
 "Language-Team: nakata6790 (aka0107@gmail.com)\n"
 "MIME-Version: 1.0\n"
@@ -30,6 +30,14 @@ msgstr "%ôá áñ÷åßá äåí âñÝèçêáí óôïí server!"
 msgid "%i missing files"
 msgstr "%ôá ÷áìÝíá áñ÷åßá"
 
+#, c-format
+msgid "%i wad file(s) not processed!"
+msgstr ""
+
+#, c-format
+msgid "%i wad found."
+msgstr ""
+
 #, c-format
 msgid "%s only accepts GameCube backups in ISO format."
 msgstr ""
@@ -131,6 +139,9 @@ msgstr "¼ëåò ïé åéêüíåò ëÞöèçóáí åðéôõ÷þò."
 msgid "All the features of USB Loader GX are unlocked."
 msgstr "üëåò ïé ñõèìßóåéò ôïõ USB Loader GX åßíáé îåêëåéäùìÝíåò."
 
+msgid "All wad files processed successfully."
+msgstr ""
+
 msgid "Alternate DOL"
 msgstr "Åíáëëáêôéêü DOL"
 
@@ -179,6 +190,9 @@ msgstr "Áíáëïãßá ïèüíçò"
 msgid "Attention!"
 msgstr "ÐÑÏÓÏ×Ç!"
 
+msgid "Attention: All savegames will be deleted."
+msgstr ""
+
 msgid "Aug"
 msgstr "Áýãïõóôïò"
 
@@ -711,9 +725,6 @@ msgstr "ÈÝëåôå íá åêêéíÞóåôå ôï ðñüãñáììá ôþñá;
 msgid "Do you want to sync free space info sector on all FAT32 partitions?"
 msgstr "ÈÝëåôå íá óõã÷ñïíßóåôå ôïí êåíü ÷þñï áðü üëá ôá FAT32 partitions;"
 
-msgid "Do you want to update this file?"
-msgstr ""
-
 msgid "Do you wish to update/download all language files?"
 msgstr "ÈÝëåôå íá áíáâáèìßóåôå/êáôåâÜóåôå üëá ôá áñ÷åßá ìåôáöñÜóåùí;"
 
@@ -777,6 +788,9 @@ msgstr "ÓÖÁËÌÁ:"
 msgid "ERROR: Can't set up theme."
 msgstr "ÓÖÁËÌÁ: Äåí åßíáé äõíáôÞ ç åãêáôÜóôáóç èÝìáôïò."
 
+msgid "EmuNAND Wad Manager"
+msgstr ""
+
 msgid "EmuNand Channels"
 msgstr "ÊáíÜëéá áðü ôçí åéêïíéêÞ nand "
 
@@ -923,6 +937,9 @@ msgstr "Ñõèìßóåéò åðéìÝñïõò óôïé÷åßùí"
 msgid "Feb"
 msgstr "ÖåâñïõÜñéïò"
 
+msgid "File"
+msgstr ""
+
 msgid "File not found."
 msgstr "Ôï áñ÷åßï äåí âñÝèçêå."
 
@@ -945,6 +962,9 @@ msgstr "2D åîþöõëëá"
 msgid "Flip-X"
 msgstr "ïñéæüíôéá áíáóôñïöÞ"
 
+msgid "Folder"
+msgstr ""
+
 msgid "Font Scale Factor"
 msgstr "ÌÝãåèïò ãñáììáôïóåéñÜò"
 
@@ -1223,12 +1243,12 @@ msgstr "ÓöÜëìá åãêáôÜóôáóçò!"
 msgid "Install Partitions"
 msgstr "Partitions åãêáôÜóôáóçò"
 
-msgid "Install WAD to EmuNand"
-msgstr "ÅãêáôÜóôáóç WAD óôçí åéêïíéêÞ NAND"
-
 msgid "Install a game"
 msgstr "ÅãêáôáóôÞóôå åíá ðáé÷íßäé"
 
+msgid "Install error - Cleaning incomplete data."
+msgstr ""
+
 msgid "Install finished"
 msgstr "Ç åãêáôÜóôáóç ïëïêëçñþèçêå"
 
@@ -1539,6 +1559,9 @@ msgstr "Äåí âñÝèçêáí èÝìáôá óôï site."
 msgid "No themes found."
 msgstr "Äåí âñÝèçêáí èÝìáôá."
 
+msgid "No wad file found in this folder."
+msgstr ""
+
 msgid "NoSSL only"
 msgstr ""
 
@@ -1740,6 +1763,9 @@ msgstr "ðñáãìáôéêÞ ìíÞìç NAND"
 msgid "Receiving file from:"
 msgstr "ËÞøç áñ÷åßïõ áðü:"
 
+msgid "Region Free"
+msgstr ""
+
 msgid "Region Patch"
 msgstr "Patch ðåñéï÷Þò ðñïÝëåõóçò"
 
@@ -2220,9 +2246,6 @@ msgstr "ÁíáâÜèìéóç DOL"
 msgid "Update Files"
 msgstr "ÁíáâÜèìéóç áñ÷åßùí"
 
-msgid "Update Nintendont"
-msgstr ""
-
 msgid "Update Path"
 msgstr "ÌïíïðÜôé áñ÷åßùí áíáâÜèìéóçò."
 
@@ -2275,9 +2298,6 @@ msgstr ""
 msgid "Virtual Pointer Speed"
 msgstr "Ôá÷ýôçôá åéêïíéêïý äåßêôç"
 
-msgid "WAD Installation"
-msgstr "ÅãêáôÜóôáóç WAD"
-
 msgid "WDM Files Path"
 msgstr "ÌïíïðÜôé áñ÷åßùí WDM"
 
@@ -2314,6 +2334,9 @@ msgstr ""
 msgid "Which device do you want to use for Nintendont files?"
 msgstr ""
 
+msgid "Which mode do you want to use?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "Ëåéôïõñãßåò wi-fi"
 
@@ -2450,6 +2473,12 @@ msgstr "áðü"
 msgid "seconds left"
 msgstr "äåõôåñüëåðôá áðïìÝíïõí"
 
+#~ msgid "Install WAD to EmuNand"
+#~ msgstr "ÅãêáôÜóôáóç WAD óôçí åéêïíéêÞ NAND"
+
+#~ msgid "WAD Installation"
+#~ msgstr "ÅãêáôÜóôáóç WAD"
+
 #~ msgid "GameTDB Path"
 #~ msgstr "Äéåýèõíóç/ìïíïðÜôé áñ÷åßïõ GameTDB"
 
diff --git a/Languages/hungarian.lang b/Languages/hungarian.lang
index 11f78b5e..f919c13b 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-08-14 16:24+0200\n"
+"POT-Creation-Date: 2016-01-02 16:53+0100\n"
 "PO-Revision-Date: 2009-12-29 11:05+0100\n"
 "Last-Translator: Springdale\n"
 "Language-Team: Tusk, Springdale\n"
@@ -31,6 +31,14 @@ msgstr ""
 msgid "%i missing files"
 msgstr ""
 
+#, c-format
+msgid "%i wad file(s) not processed!"
+msgstr ""
+
+#, c-format
+msgid "%i wad found."
+msgstr ""
+
 #, c-format
 msgid "%s only accepts GameCube backups in ISO format."
 msgstr ""
@@ -132,6 +140,9 @@ msgstr ""
 msgid "All the features of USB Loader GX are unlocked."
 msgstr "Az USB Loader GX minden funkciója elérhetõ."
 
+msgid "All wad files processed successfully."
+msgstr ""
+
 msgid "Alternate DOL"
 msgstr "Alternatív DOL"
 
@@ -180,6 +191,9 @@ msgstr ""
 msgid "Attention!"
 msgstr ""
 
+msgid "Attention: All savegames will be deleted."
+msgstr ""
+
 msgid "Aug"
 msgstr ""
 
@@ -712,9 +726,6 @@ msgstr ""
 msgid "Do you want to sync free space info sector on all FAT32 partitions?"
 msgstr ""
 
-msgid "Do you want to update this file?"
-msgstr ""
-
 msgid "Do you wish to update/download all language files?"
 msgstr "Minden nyelvi fájl letöltése/frissítése?"
 
@@ -778,6 +789,9 @@ msgstr "HIBA:"
 msgid "ERROR: Can't set up theme."
 msgstr "HIBA: Téma nem állítható be"
 
+msgid "EmuNAND Wad Manager"
+msgstr ""
+
 msgid "EmuNand Channels"
 msgstr ""
 
@@ -924,6 +938,9 @@ msgstr ""
 msgid "Feb"
 msgstr ""
 
+msgid "File"
+msgstr ""
+
 msgid "File not found."
 msgstr "Fájl nem található"
 
@@ -946,6 +963,9 @@ msgstr ""
 msgid "Flip-X"
 msgstr ""
 
+msgid "Folder"
+msgstr ""
+
 msgid "Font Scale Factor"
 msgstr ""
 
@@ -1224,12 +1244,12 @@ msgstr "Telepítési Hiba!"
 msgid "Install Partitions"
 msgstr ""
 
-msgid "Install WAD to EmuNand"
-msgstr ""
-
 msgid "Install a game"
 msgstr "Játék telepítése"
 
+msgid "Install error - Cleaning incomplete data."
+msgstr ""
+
 msgid "Install finished"
 msgstr ""
 
@@ -1540,6 +1560,9 @@ msgstr "Nem találhatóak témák az oldalon."
 msgid "No themes found."
 msgstr ""
 
+msgid "No wad file found in this folder."
+msgstr ""
+
 msgid "NoSSL only"
 msgstr ""
 
@@ -1741,6 +1764,9 @@ msgstr ""
 msgid "Receiving file from:"
 msgstr "Fájl fogadása innen:"
 
+msgid "Region Free"
+msgstr ""
+
 msgid "Region Patch"
 msgstr ""
 
@@ -2221,9 +2247,6 @@ msgstr "DOL Frissítése"
 msgid "Update Files"
 msgstr "Fájlok frissítése"
 
-msgid "Update Nintendont"
-msgstr ""
-
 msgid "Update Path"
 msgstr "Frissítés Útvonala"
 
@@ -2276,9 +2299,6 @@ msgstr ""
 msgid "Virtual Pointer Speed"
 msgstr ""
 
-msgid "WAD Installation"
-msgstr ""
-
 msgid "WDM Files Path"
 msgstr ""
 
@@ -2315,6 +2335,9 @@ msgstr ""
 msgid "Which device do you want to use for Nintendont files?"
 msgstr ""
 
+msgid "Which mode do you want to use?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "WiFi Sajátosságok"
 
diff --git a/Languages/italian.lang b/Languages/italian.lang
index b06013d3..1c492147 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-08-14 16:24+0200\n"
+"POT-Creation-Date: 2016-01-02 16:53+0100\n"
 "PO-Revision-Date: 2011-09-11 12:19+0100\n"
 "Last-Translator: xFede\n"
 "Language-Team: xFede (fedeanto11@gmail.com)\n"
@@ -31,6 +31,14 @@ msgstr "%i file non trovati sul server!"
 msgid "%i missing files"
 msgstr "%i file mancanti"
 
+#, c-format
+msgid "%i wad file(s) not processed!"
+msgstr ""
+
+#, c-format
+msgid "%i wad found."
+msgstr ""
+
 #, c-format
 msgid "%s only accepts GameCube backups in ISO format."
 msgstr ""
@@ -132,6 +140,9 @@ msgstr "Tutte le immagini sono state scaricate."
 msgid "All the features of USB Loader GX are unlocked."
 msgstr "Tutte le funzioni di USB Loader GX sono sbloccate."
 
+msgid "All wad files processed successfully."
+msgstr ""
+
 msgid "Alternate DOL"
 msgstr "DOL alternativo"
 
@@ -180,6 +191,9 @@ msgstr "Formato TV"
 msgid "Attention!"
 msgstr "Attenzione!"
 
+msgid "Attention: All savegames will be deleted."
+msgstr ""
+
 msgid "Aug"
 msgstr "Agosto"
 
@@ -712,9 +726,6 @@ msgstr "Vuoi avviare il gioco ora?"
 msgid "Do you want to sync free space info sector on all FAT32 partitions?"
 msgstr "Vuoi sincronizzare le info sullo spazio libero in tutte le partizioni FAT32?"
 
-msgid "Do you want to update this file?"
-msgstr ""
-
 msgid "Do you wish to update/download all language files?"
 msgstr "Vuoi scaricare/aggiornare tutte le traduzioni?"
 
@@ -778,6 +789,9 @@ msgstr "ERRORE:"
 msgid "ERROR: Can't set up theme."
 msgstr "ERRORE: Impossibile configurare il tema."
 
+msgid "EmuNAND Wad Manager"
+msgstr ""
+
 msgid "EmuNand Channels"
 msgstr "Canali NAND emulata"
 
@@ -924,6 +938,9 @@ msgstr "Impost. funzionalità"
 msgid "Feb"
 msgstr "Febbraio"
 
+msgid "File"
+msgstr ""
+
 msgid "File not found."
 msgstr "File non trovato."
 
@@ -946,6 +963,9 @@ msgstr "Copertine 2D"
 msgid "Flip-X"
 msgstr "Scorrimento dischi"
 
+msgid "Folder"
+msgstr ""
+
 msgid "Font Scale Factor"
 msgstr "Rapporto font"
 
@@ -1224,12 +1244,12 @@ msgstr "Errore durante l'installazione!"
 msgid "Install Partitions"
 msgstr "Installa partizioni"
 
-msgid "Install WAD to EmuNand"
-msgstr "Installa WAD nella NAND emulata"
-
 msgid "Install a game"
 msgstr "Installa un gioco"
 
+msgid "Install error - Cleaning incomplete data."
+msgstr ""
+
 msgid "Install finished"
 msgstr "Installazione completata"
 
@@ -1540,6 +1560,9 @@ msgstr "Nessun tema trovato sul sito."
 msgid "No themes found."
 msgstr "Nessun tema trovato."
 
+msgid "No wad file found in this folder."
+msgstr ""
+
 msgid "NoSSL only"
 msgstr ""
 
@@ -1741,6 +1764,9 @@ msgstr "NAND reale"
 msgid "Receiving file from:"
 msgstr "Ricevendo file da:"
 
+msgid "Region Free"
+msgstr ""
+
 msgid "Region Patch"
 msgstr "Patch regione"
 
@@ -2221,9 +2247,6 @@ msgstr "Aggiorna DOL"
 msgid "Update Files"
 msgstr "Aggiorna i file"
 
-msgid "Update Nintendont"
-msgstr ""
-
 msgid "Update Path"
 msgstr "Percorso degli agg."
 
@@ -2276,9 +2299,6 @@ msgstr ""
 msgid "Virtual Pointer Speed"
 msgstr "Velocità puntatore virtuale"
 
-msgid "WAD Installation"
-msgstr "Installazione WAD"
-
 msgid "WDM Files Path"
 msgstr "Percorso file WDM"
 
@@ -2315,6 +2335,9 @@ msgstr ""
 msgid "Which device do you want to use for Nintendont files?"
 msgstr ""
 
+msgid "Which mode do you want to use?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "Funzionalità wi-fi"
 
@@ -2451,6 +2474,12 @@ msgstr "di"
 msgid "seconds left"
 msgstr "secondi rimasti"
 
+#~ msgid "Install WAD to EmuNand"
+#~ msgstr "Installa WAD nella NAND emulata"
+
+#~ msgid "WAD Installation"
+#~ msgstr "Installazione WAD"
+
 #~ msgid "GameTDB Path"
 #~ msgstr "Percorso GameTDB"
 
diff --git a/Languages/japanese.lang b/Languages/japanese.lang
index d5dcdd0e..c667c5c9 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-08-14 16:24+0200\n"
+"POT-Creation-Date: 2016-01-02 16:53+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: hosigumayuugi\n"
 "Language-Team: hosigumayuugi\n"
@@ -31,6 +31,14 @@ msgstr "%i 個のﾌｧｲﾙがｻｰﾊﾞｰにありません"
 msgid "%i missing files"
 msgstr "%i 個のﾌｧｲﾙが不足しています"
 
+#, c-format
+msgid "%i wad file(s) not processed!"
+msgstr ""
+
+#, c-format
+msgid "%i wad found."
+msgstr ""
+
 #, c-format
 msgid "%s only accepts GameCube backups in ISO format."
 msgstr ""
@@ -132,6 +140,9 @@ msgstr "全ての画像をダウンロードしました"
 msgid "All the features of USB Loader GX are unlocked."
 msgstr "使用制限が解除されました"
 
+msgid "All wad files processed successfully."
+msgstr ""
+
 msgid "Alternate DOL"
 msgstr "代替DOL起動"
 
@@ -180,6 +191,9 @@ msgstr "アスペクト比"
 msgid "Attention!"
 msgstr "注意!"
 
+msgid "Attention: All savegames will be deleted."
+msgstr ""
+
 msgid "Aug"
 msgstr "8月"
 
@@ -712,9 +726,6 @@ msgstr "ゲームを起動しますか?"
 msgid "Do you want to sync free space info sector on all FAT32 partitions?"
 msgstr "全てのFAT32領域のセクタで空き容量情報を同期しますか？"
 
-msgid "Do you want to update this file?"
-msgstr ""
-
 msgid "Do you wish to update/download all language files?"
 msgstr "すべての言語をダウンロードしますか？"
 
@@ -778,6 +789,9 @@ msgstr "エラー："
 msgid "ERROR: Can't set up theme."
 msgstr "テーマを適用できませんでした"
 
+msgid "EmuNAND Wad Manager"
+msgstr ""
+
 msgid "EmuNand Channels"
 msgstr "エミュNANDチャンネル"
 
@@ -924,6 +938,9 @@ msgstr "機能設定"
 msgid "Feb"
 msgstr "2月"
 
+msgid "File"
+msgstr ""
+
 msgid "File not found."
 msgstr "ファイルが見つかりません"
 
@@ -946,6 +963,9 @@ msgstr "正面カバー"
 msgid "Flip-X"
 msgstr "ゲームリストの回転"
 
+msgid "Folder"
+msgstr ""
+
 msgid "Font Scale Factor"
 msgstr "文字サイズの補正率"
 
@@ -1224,12 +1244,12 @@ msgstr "インストールエラー!"
 msgid "Install Partitions"
 msgstr "インストール領域"
 
-msgid "Install WAD to EmuNand"
-msgstr "WADをｴﾐｭNANDへｲﾝｽﾄｰﾙ"
-
 msgid "Install a game"
 msgstr "ゲームをインストール"
 
+msgid "Install error - Cleaning incomplete data."
+msgstr ""
+
 msgid "Install finished"
 msgstr "インストールが終了しました"
 
@@ -1540,6 +1560,9 @@ msgstr "テーマが見つかりません"
 msgid "No themes found."
 msgstr "ﾃｰﾏが見つかりません"
 
+msgid "No wad file found in this folder."
+msgstr ""
+
 msgid "NoSSL only"
 msgstr ""
 
@@ -1741,6 +1764,9 @@ msgstr "Wii本体NAND"
 msgid "Receiving file from:"
 msgstr "ファイルを受信中:"
 
+msgid "Region Free"
+msgstr ""
+
 msgid "Region Patch"
 msgstr "リージョンパッチ"
 
@@ -2221,9 +2247,6 @@ msgstr "DOLのみ"
 msgid "Update Files"
 msgstr "すべて更新"
 
-msgid "Update Nintendont"
-msgstr ""
-
 msgid "Update Path"
 msgstr "GXのdol"
 
@@ -2276,9 +2299,6 @@ msgstr ""
 msgid "Virtual Pointer Speed"
 msgstr "ポインタの速度"
 
-msgid "WAD Installation"
-msgstr "WADインストール"
-
 msgid "WDM Files Path"
 msgstr "WDMファイル"
 
@@ -2315,6 +2335,9 @@ msgstr ""
 msgid "Which device do you want to use for Nintendont files?"
 msgstr ""
 
+msgid "Which mode do you want to use?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "ネットワーク対応"
 
@@ -2451,6 +2474,12 @@ msgstr "中"
 msgid "seconds left"
 msgstr "秒で完了"
 
+#~ msgid "Install WAD to EmuNand"
+#~ msgstr "WADをｴﾐｭNANDへｲﾝｽﾄｰﾙ"
+
+#~ msgid "WAD Installation"
+#~ msgstr "WADインストール"
+
 #~ msgid "GameTDB Path"
 #~ msgstr "ゲーム名リスト"
 
diff --git a/Languages/korean.lang b/Languages/korean.lang
index da5a171e..cb9c54e0 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-08-14 16:24+0200\n"
+"POT-Creation-Date: 2016-01-02 16:53+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: nextos@korea.com\n"
 "Language-Team: \n"
@@ -31,6 +31,14 @@ msgstr ""
 msgid "%i missing files"
 msgstr ""
 
+#, c-format
+msgid "%i wad file(s) not processed!"
+msgstr ""
+
+#, c-format
+msgid "%i wad found."
+msgstr ""
+
 #, c-format
 msgid "%s only accepts GameCube backups in ISO format."
 msgstr ""
@@ -132,6 +140,9 @@ msgstr ""
 msgid "All the features of USB Loader GX are unlocked."
 msgstr "모든 USB로더 GX 기능 잠금 해제."
 
+msgid "All wad files processed successfully."
+msgstr ""
+
 msgid "Alternate DOL"
 msgstr "Alternate DOL"
 
@@ -180,6 +191,9 @@ msgstr ""
 msgid "Attention!"
 msgstr ""
 
+msgid "Attention: All savegames will be deleted."
+msgstr ""
+
 msgid "Aug"
 msgstr "8월"
 
@@ -712,9 +726,6 @@ msgstr ""
 msgid "Do you want to sync free space info sector on all FAT32 partitions?"
 msgstr ""
 
-msgid "Do you want to update this file?"
-msgstr ""
-
 msgid "Do you wish to update/download all language files?"
 msgstr "정말로 모든 언어화일을 업데이트하고 다운로드 할까요?"
 
@@ -778,6 +789,9 @@ msgstr "에러:"
 msgid "ERROR: Can't set up theme."
 msgstr ""
 
+msgid "EmuNAND Wad Manager"
+msgstr ""
+
 msgid "EmuNand Channels"
 msgstr ""
 
@@ -924,6 +938,9 @@ msgstr ""
 msgid "Feb"
 msgstr "2월"
 
+msgid "File"
+msgstr ""
+
 msgid "File not found."
 msgstr "파일을 찾을수가 없네요."
 
@@ -946,6 +963,9 @@ msgstr ""
 msgid "Flip-X"
 msgstr "좌/우 설정"
 
+msgid "Folder"
+msgstr ""
+
 msgid "Font Scale Factor"
 msgstr ""
 
@@ -1224,12 +1244,12 @@ msgstr "설치 에러!"
 msgid "Install Partitions"
 msgstr ""
 
-msgid "Install WAD to EmuNand"
-msgstr ""
-
 msgid "Install a game"
 msgstr "게임을 설치할까요"
 
+msgid "Install error - Cleaning incomplete data."
+msgstr ""
+
 msgid "Install finished"
 msgstr ""
 
@@ -1540,6 +1560,9 @@ msgstr ""
 msgid "No themes found."
 msgstr ""
 
+msgid "No wad file found in this folder."
+msgstr ""
+
 msgid "NoSSL only"
 msgstr ""
 
@@ -1741,6 +1764,9 @@ msgstr ""
 msgid "Receiving file from:"
 msgstr "파일 추출 :"
 
+msgid "Region Free"
+msgstr ""
+
 msgid "Region Patch"
 msgstr ""
 
@@ -2221,9 +2247,6 @@ msgstr "DOL 업데이트"
 msgid "Update Files"
 msgstr "화일 업데이트"
 
-msgid "Update Nintendont"
-msgstr ""
-
 msgid "Update Path"
 msgstr "업데이트 경로"
 
@@ -2276,9 +2299,6 @@ msgstr ""
 msgid "Virtual Pointer Speed"
 msgstr ""
 
-msgid "WAD Installation"
-msgstr ""
-
 msgid "WDM Files Path"
 msgstr ""
 
@@ -2315,6 +2335,9 @@ msgstr ""
 msgid "Which device do you want to use for Nintendont files?"
 msgstr ""
 
+msgid "Which mode do you want to use?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "WiFi 형태"
 
diff --git a/Languages/norwegian.lang b/Languages/norwegian.lang
index 75846235..9579b909 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-08-14 16:24+0200\n"
+"POT-Creation-Date: 2016-01-02 16:53+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: raschi\n"
 "Language-Team: raschi\n"
@@ -31,6 +31,14 @@ msgstr "%i filer ikke funnet på server!"
 msgid "%i missing files"
 msgstr "%i filer mangler"
 
+#, c-format
+msgid "%i wad file(s) not processed!"
+msgstr ""
+
+#, c-format
+msgid "%i wad found."
+msgstr ""
+
 #, c-format
 msgid "%s only accepts GameCube backups in ISO format."
 msgstr ""
@@ -132,6 +140,9 @@ msgstr "Alle bilder lastet ned ok."
 msgid "All the features of USB Loader GX are unlocked."
 msgstr "Alle funksjonene til USB Loader GX er opplåst."
 
+msgid "All wad files processed successfully."
+msgstr ""
+
 msgid "Alternate DOL"
 msgstr "Alternativ DOL"
 
@@ -180,6 +191,9 @@ msgstr ""
 msgid "Attention!"
 msgstr ""
 
+msgid "Attention: All savegames will be deleted."
+msgstr ""
+
 msgid "Aug"
 msgstr ""
 
@@ -712,9 +726,6 @@ msgstr ""
 msgid "Do you want to sync free space info sector on all FAT32 partitions?"
 msgstr "Vil du synkronisere ledig plass info sektor på alle FAT32 partisjoner?"
 
-msgid "Do you want to update this file?"
-msgstr ""
-
 msgid "Do you wish to update/download all language files?"
 msgstr "Vil du oppdatere/laste ned alle språkfiler?"
 
@@ -778,6 +789,9 @@ msgstr "FEIL:"
 msgid "ERROR: Can't set up theme."
 msgstr "FEIL: Kan ikke laste tema."
 
+msgid "EmuNAND Wad Manager"
+msgstr ""
+
 msgid "EmuNand Channels"
 msgstr ""
 
@@ -924,6 +938,9 @@ msgstr "Funksjonsinnstillinger"
 msgid "Feb"
 msgstr ""
 
+msgid "File"
+msgstr ""
+
 msgid "File not found."
 msgstr "Fil ikke funnet."
 
@@ -946,6 +963,9 @@ msgstr "2D cover"
 msgid "Flip-X"
 msgstr ""
 
+msgid "Folder"
+msgstr ""
+
 msgid "Font Scale Factor"
 msgstr "Tekst størrelsesfaktor"
 
@@ -1224,12 +1244,12 @@ msgstr "Installasjonsfeil!"
 msgid "Install Partitions"
 msgstr "Installer partisjoner"
 
-msgid "Install WAD to EmuNand"
-msgstr ""
-
 msgid "Install a game"
 msgstr "Installér et spill"
 
+msgid "Install error - Cleaning incomplete data."
+msgstr ""
+
 msgid "Install finished"
 msgstr ""
 
@@ -1540,6 +1560,9 @@ msgstr "Ingen temaer funnet på websiden."
 msgid "No themes found."
 msgstr "Ingen temaer funnet."
 
+msgid "No wad file found in this folder."
+msgstr ""
+
 msgid "NoSSL only"
 msgstr ""
 
@@ -1741,6 +1764,9 @@ msgstr ""
 msgid "Receiving file from:"
 msgstr "Mottar fil fra:"
 
+msgid "Region Free"
+msgstr ""
+
 msgid "Region Patch"
 msgstr ""
 
@@ -2221,9 +2247,6 @@ msgstr "Oppdater DOL"
 msgid "Update Files"
 msgstr "Oppdater filer"
 
-msgid "Update Nintendont"
-msgstr ""
-
 msgid "Update Path"
 msgstr "Oppdatering sti"
 
@@ -2276,9 +2299,6 @@ msgstr ""
 msgid "Virtual Pointer Speed"
 msgstr ""
 
-msgid "WAD Installation"
-msgstr ""
-
 msgid "WDM Files Path"
 msgstr "WDM sti"
 
@@ -2315,6 +2335,9 @@ msgstr ""
 msgid "Which device do you want to use for Nintendont files?"
 msgstr ""
 
+msgid "Which mode do you want to use?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "WiFi egenskaper"
 
diff --git a/Languages/polish.lang b/Languages/polish.lang
index e9a96f3e..13d61062 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-08-14 16:24+0200\n"
+"POT-Creation-Date: 2016-01-02 16:53+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: ziom666 (zadania_prog@vp.pl)\n"
 "Language-Team: \n"
@@ -31,6 +31,14 @@ msgstr ""
 msgid "%i missing files"
 msgstr ""
 
+#, c-format
+msgid "%i wad file(s) not processed!"
+msgstr ""
+
+#, c-format
+msgid "%i wad found."
+msgstr ""
+
 #, c-format
 msgid "%s only accepts GameCube backups in ISO format."
 msgstr ""
@@ -132,6 +140,9 @@ msgstr ""
 msgid "All the features of USB Loader GX are unlocked."
 msgstr "USB Loader GX odblokowany"
 
+msgid "All wad files processed successfully."
+msgstr ""
+
 msgid "Alternate DOL"
 msgstr "Alternatywny DOL"
 
@@ -180,6 +191,9 @@ msgstr ""
 msgid "Attention!"
 msgstr ""
 
+msgid "Attention: All savegames will be deleted."
+msgstr ""
+
 msgid "Aug"
 msgstr "Sierpien"
 
@@ -712,9 +726,6 @@ msgstr ""
 msgid "Do you want to sync free space info sector on all FAT32 partitions?"
 msgstr ""
 
-msgid "Do you want to update this file?"
-msgstr ""
-
 msgid "Do you wish to update/download all language files?"
 msgstr "Zaktualizowac wszystkie pliki jezykowe?"
 
@@ -778,6 +789,9 @@ msgstr "Blad:"
 msgid "ERROR: Can't set up theme."
 msgstr "Blad: nie mozna ustawic tematu"
 
+msgid "EmuNAND Wad Manager"
+msgstr ""
+
 msgid "EmuNand Channels"
 msgstr ""
 
@@ -924,6 +938,9 @@ msgstr ""
 msgid "Feb"
 msgstr "Luty"
 
+msgid "File"
+msgstr ""
+
 msgid "File not found."
 msgstr "Nie znaleziono pliku."
 
@@ -946,6 +963,9 @@ msgstr ""
 msgid "Flip-X"
 msgstr "Obrot na osi X"
 
+msgid "Folder"
+msgstr ""
+
 msgid "Font Scale Factor"
 msgstr ""
 
@@ -1224,12 +1244,12 @@ msgstr "Blad instalacji"
 msgid "Install Partitions"
 msgstr ""
 
-msgid "Install WAD to EmuNand"
-msgstr ""
-
 msgid "Install a game"
 msgstr "Zainstaluj gre"
 
+msgid "Install error - Cleaning incomplete data."
+msgstr ""
+
 msgid "Install finished"
 msgstr ""
 
@@ -1540,6 +1560,9 @@ msgstr "Nie znaleziono tematow na tej stronie"
 msgid "No themes found."
 msgstr ""
 
+msgid "No wad file found in this folder."
+msgstr ""
+
 msgid "NoSSL only"
 msgstr ""
 
@@ -1741,6 +1764,9 @@ msgstr ""
 msgid "Receiving file from:"
 msgstr "Otrzymywanie pliku z:"
 
+msgid "Region Free"
+msgstr ""
+
 msgid "Region Patch"
 msgstr ""
 
@@ -2221,9 +2247,6 @@ msgstr "Zaktualizuj Dol"
 msgid "Update Files"
 msgstr "Zaktualizuj pliki"
 
-msgid "Update Nintendont"
-msgstr ""
-
 msgid "Update Path"
 msgstr "Sciezka aktualizacji"
 
@@ -2276,9 +2299,6 @@ msgstr ""
 msgid "Virtual Pointer Speed"
 msgstr ""
 
-msgid "WAD Installation"
-msgstr ""
-
 msgid "WDM Files Path"
 msgstr ""
 
@@ -2315,6 +2335,9 @@ msgstr ""
 msgid "Which device do you want to use for Nintendont files?"
 msgstr ""
 
+msgid "Which mode do you want to use?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "Opcje WiFi"
 
diff --git a/Languages/portuguese_br.lang b/Languages/portuguese_br.lang
index e9ef060f..d2ae62c5 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-08-14 16:24+0200\n"
+"POT-Creation-Date: 2016-01-02 16:53+0100\n"
 "PO-Revision-Date: 2011-11-03 11:00+0000\n"
 "Last-Translator: Codemaster <javafangamers@hotmail.com>\n"
 "Language-Team: Sky8000, pplucky\n"
@@ -31,6 +31,14 @@ msgstr "%i arquivos não encontrados no servidor!"
 msgid "%i missing files"
 msgstr "%i arquivos faltando"
 
+#, c-format
+msgid "%i wad file(s) not processed!"
+msgstr ""
+
+#, c-format
+msgid "%i wad found."
+msgstr ""
+
 #, c-format
 msgid "%s only accepts GameCube backups in ISO format."
 msgstr "%s somente aceita jogos de GameCube no formato ISO."
@@ -132,6 +140,9 @@ msgstr "Todas as imagens foram baixadas com sucesso."
 msgid "All the features of USB Loader GX are unlocked."
 msgstr "Todas as funcionalidades foram desbloqueadas."
 
+msgid "All wad files processed successfully."
+msgstr ""
+
 msgid "Alternate DOL"
 msgstr "DOL alternativo"
 
@@ -180,6 +191,9 @@ msgstr "Aspecto"
 msgid "Attention!"
 msgstr "Atenção!"
 
+msgid "Attention: All savegames will be deleted."
+msgstr ""
+
 msgid "Aug"
 msgstr "Ago"
 
@@ -712,9 +726,6 @@ msgstr "Deseja iniciar o jogo agora?"
 msgid "Do you want to sync free space info sector on all FAT32 partitions?"
 msgstr "Deseja sincronizar a info de espaço livre em todas as partições FAT32?"
 
-msgid "Do you want to update this file?"
-msgstr "Deseja atualizar esse arquivo?"
-
 msgid "Do you wish to update/download all language files?"
 msgstr "Deseja atualizar os arquivos de idioma?"
 
@@ -778,6 +789,9 @@ msgstr "ERRO:"
 msgid "ERROR: Can't set up theme."
 msgstr "ERRO: Impossível configurar tema."
 
+msgid "EmuNAND Wad Manager"
+msgstr ""
+
 msgid "EmuNand Channels"
 msgstr "Canais Emu NAND"
 
@@ -924,6 +938,9 @@ msgstr "Funcionalidades"
 msgid "Feb"
 msgstr "Fev"
 
+msgid "File"
+msgstr ""
+
 msgid "File not found."
 msgstr "Arquivo não encontrado."
 
@@ -946,6 +963,9 @@ msgstr "Capas Planas"
 msgid "Flip-X"
 msgstr "Paginação Horizontal"
 
+msgid "Folder"
+msgstr ""
+
 msgid "Font Scale Factor"
 msgstr "Tamanho Fonte"
 
@@ -1224,12 +1244,12 @@ msgstr "Erro de Instalação!"
 msgid "Install Partitions"
 msgstr "Instalar Partições"
 
-msgid "Install WAD to EmuNand"
-msgstr "Instalar WAD para Emu NAND"
-
 msgid "Install a game"
 msgstr "Instalar um jogo"
 
+msgid "Install error - Cleaning incomplete data."
+msgstr ""
+
 msgid "Install finished"
 msgstr "Instalação finalizada"
 
@@ -1540,6 +1560,9 @@ msgstr "Nenhum tema encontrado no site."
 msgid "No themes found."
 msgstr "Nenhum tema encontrado."
 
+msgid "No wad file found in this folder."
+msgstr ""
+
 msgid "NoSSL only"
 msgstr ""
 
@@ -1741,6 +1764,9 @@ msgstr "NAND Real"
 msgid "Receiving file from:"
 msgstr "Recebendo arquivo de:"
 
+msgid "Region Free"
+msgstr ""
+
 msgid "Region Patch"
 msgstr "Patch Região"
 
@@ -2221,9 +2247,6 @@ msgstr "Atualizar DOL"
 msgid "Update Files"
 msgstr "Atualizar arquivos"
 
-msgid "Update Nintendont"
-msgstr "Atualizar Nintendont"
-
 msgid "Update Path"
 msgstr "Atualização"
 
@@ -2276,9 +2299,6 @@ msgstr ""
 msgid "Virtual Pointer Speed"
 msgstr "Velocidade do Ponteiro"
 
-msgid "WAD Installation"
-msgstr "Instalação de WAD"
-
 msgid "WDM Files Path"
 msgstr "Arquivos WDM"
 
@@ -2315,6 +2335,9 @@ msgstr ""
 msgid "Which device do you want to use for Nintendont files?"
 msgstr ""
 
+msgid "Which mode do you want to use?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "Rede Sem Fio"
 
@@ -2451,6 +2474,18 @@ msgstr "de"
 msgid "seconds left"
 msgstr "segundos restantes"
 
+#~ msgid "Do you want to update this file?"
+#~ msgstr "Deseja atualizar esse arquivo?"
+
+#~ msgid "Install WAD to EmuNand"
+#~ msgstr "Instalar WAD para Emu NAND"
+
+#~ msgid "Update Nintendont"
+#~ msgstr "Atualizar Nintendont"
+
+#~ msgid "WAD Installation"
+#~ msgstr "Instalação de WAD"
+
 #~ msgid "GameTDB Path"
 #~ msgstr "GameTDB"
 
diff --git a/Languages/portuguese_pt.lang b/Languages/portuguese_pt.lang
index c66c0f55..3118a624 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-08-14 16:24+0200\n"
+"POT-Creation-Date: 2016-01-02 16:53+0100\n"
 "PO-Revision-Date: 2011-11-03 11:00+0000\n"
 "Last-Translator: pplucky <pplucky@gmail.com>\n"
 "Language-Team: Sky8000, pplucky\n"
@@ -31,6 +31,14 @@ msgstr "%i ficheiros não encontrados no servidor!"
 msgid "%i missing files"
 msgstr "%i ficheiros em falta"
 
+#, c-format
+msgid "%i wad file(s) not processed!"
+msgstr ""
+
+#, c-format
+msgid "%i wad found."
+msgstr ""
+
 #, c-format
 msgid "%s only accepts GameCube backups in ISO format."
 msgstr ""
@@ -132,6 +140,9 @@ msgstr "Todas as imagens descarregadas com sucesso."
 msgid "All the features of USB Loader GX are unlocked."
 msgstr "Todas as funcionalidades desbloqueadas."
 
+msgid "All wad files processed successfully."
+msgstr ""
+
 msgid "Alternate DOL"
 msgstr "DOL alternativo"
 
@@ -180,6 +191,9 @@ msgstr ""
 msgid "Attention!"
 msgstr ""
 
+msgid "Attention: All savegames will be deleted."
+msgstr ""
+
 msgid "Aug"
 msgstr "Ago"
 
@@ -712,9 +726,6 @@ msgstr ""
 msgid "Do you want to sync free space info sector on all FAT32 partitions?"
 msgstr "Deseja sincronizar a info de espaço livre em todas as partições FAT32?"
 
-msgid "Do you want to update this file?"
-msgstr ""
-
 msgid "Do you wish to update/download all language files?"
 msgstr "Queres actualizar todos os ficheiros de idioma?"
 
@@ -778,6 +789,9 @@ msgstr "ERRO:"
 msgid "ERROR: Can't set up theme."
 msgstr "ERRO: Impossível configurar tema."
 
+msgid "EmuNAND Wad Manager"
+msgstr ""
+
 msgid "EmuNand Channels"
 msgstr ""
 
@@ -924,6 +938,9 @@ msgstr "Def. Funcionalidades"
 msgid "Feb"
 msgstr "Fev"
 
+msgid "File"
+msgstr ""
+
 msgid "File not found."
 msgstr "Ficheiro não encontrado."
 
@@ -946,6 +963,9 @@ msgstr "Capas Planas"
 msgid "Flip-X"
 msgstr "Paginação Horizontal"
 
+msgid "Folder"
+msgstr ""
+
 msgid "Font Scale Factor"
 msgstr "Factor Escala Fonte"
 
@@ -1224,12 +1244,12 @@ msgstr "Erro de Instalação!"
 msgid "Install Partitions"
 msgstr "Instalar Partições"
 
-msgid "Install WAD to EmuNand"
-msgstr ""
-
 msgid "Install a game"
 msgstr "Instalar um jogo"
 
+msgid "Install error - Cleaning incomplete data."
+msgstr ""
+
 msgid "Install finished"
 msgstr "Instalação finalizada"
 
@@ -1540,6 +1560,9 @@ msgstr "Nenhum tema encontrado no site."
 msgid "No themes found."
 msgstr "Nenhum tema encontrado."
 
+msgid "No wad file found in this folder."
+msgstr ""
+
 msgid "NoSSL only"
 msgstr ""
 
@@ -1741,6 +1764,9 @@ msgstr ""
 msgid "Receiving file from:"
 msgstr "A receber ficheiro de:"
 
+msgid "Region Free"
+msgstr ""
+
 msgid "Region Patch"
 msgstr "Patch Região"
 
@@ -2221,9 +2247,6 @@ msgstr "Actualizar DOL"
 msgid "Update Files"
 msgstr "Actualizar ficheiros"
 
-msgid "Update Nintendont"
-msgstr ""
-
 msgid "Update Path"
 msgstr "Cam. Actualização"
 
@@ -2276,9 +2299,6 @@ msgstr ""
 msgid "Virtual Pointer Speed"
 msgstr ""
 
-msgid "WAD Installation"
-msgstr ""
-
 msgid "WDM Files Path"
 msgstr "Cam. Ficheiros WDM"
 
@@ -2315,6 +2335,9 @@ msgstr ""
 msgid "Which device do you want to use for Nintendont files?"
 msgstr ""
 
+msgid "Which mode do you want to use?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "Rede sem fios"
 
diff --git a/Languages/russian.lang b/Languages/russian.lang
index 9951a502..e073e94b 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-08-14 16:24+0200\n"
+"POT-Creation-Date: 2016-01-02 16:53+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: nikolai_ca\n"
 "Language-Team: Kir, alendit, nikolai_ca\n"
@@ -31,6 +31,14 @@ msgstr ""
 msgid "%i missing files"
 msgstr ""
 
+#, c-format
+msgid "%i wad file(s) not processed!"
+msgstr ""
+
+#, c-format
+msgid "%i wad found."
+msgstr ""
+
 #, c-format
 msgid "%s only accepts GameCube backups in ISO format."
 msgstr ""
@@ -132,6 +140,9 @@ msgstr ""
 msgid "All the features of USB Loader GX are unlocked."
 msgstr "Все функции USB Loader GX разблокированы."
 
+msgid "All wad files processed successfully."
+msgstr ""
+
 msgid "Alternate DOL"
 msgstr "Альтернативный DOL"
 
@@ -180,6 +191,9 @@ msgstr ""
 msgid "Attention!"
 msgstr ""
 
+msgid "Attention: All savegames will be deleted."
+msgstr ""
+
 msgid "Aug"
 msgstr "Авг"
 
@@ -712,9 +726,6 @@ msgstr ""
 msgid "Do you want to sync free space info sector on all FAT32 partitions?"
 msgstr ""
 
-msgid "Do you want to update this file?"
-msgstr ""
-
 msgid "Do you wish to update/download all language files?"
 msgstr "Вы действительно хотите обновить/загрузить все языковые файлы?"
 
@@ -778,6 +789,9 @@ msgstr "ОШИБКА:"
 msgid "ERROR: Can't set up theme."
 msgstr "ОШИБКА: Не удалось установить тему."
 
+msgid "EmuNAND Wad Manager"
+msgstr ""
+
 msgid "EmuNand Channels"
 msgstr ""
 
@@ -924,6 +938,9 @@ msgstr ""
 msgid "Feb"
 msgstr "Фев"
 
+msgid "File"
+msgstr ""
+
 msgid "File not found."
 msgstr "Файл не найден"
 
@@ -946,6 +963,9 @@ msgstr ""
 msgid "Flip-X"
 msgstr "Flip-X"
 
+msgid "Folder"
+msgstr ""
+
 msgid "Font Scale Factor"
 msgstr ""
 
@@ -1224,12 +1244,12 @@ msgstr "Ошибка установки!"
 msgid "Install Partitions"
 msgstr ""
 
-msgid "Install WAD to EmuNand"
-msgstr ""
-
 msgid "Install a game"
 msgstr "Установить игру"
 
+msgid "Install error - Cleaning incomplete data."
+msgstr ""
+
 msgid "Install finished"
 msgstr ""
 
@@ -1540,6 +1560,9 @@ msgstr "На сайте не найдено ни одной темы"
 msgid "No themes found."
 msgstr ""
 
+msgid "No wad file found in this folder."
+msgstr ""
+
 msgid "NoSSL only"
 msgstr ""
 
@@ -1741,6 +1764,9 @@ msgstr ""
 msgid "Receiving file from:"
 msgstr "Получение файлы из:"
 
+msgid "Region Free"
+msgstr ""
+
 msgid "Region Patch"
 msgstr ""
 
@@ -2221,9 +2247,6 @@ msgstr "Обновить DOL"
 msgid "Update Files"
 msgstr "Обновить файлы"
 
-msgid "Update Nintendont"
-msgstr ""
-
 msgid "Update Path"
 msgstr "Путь к обновлениям"
 
@@ -2276,9 +2299,6 @@ msgstr ""
 msgid "Virtual Pointer Speed"
 msgstr ""
 
-msgid "WAD Installation"
-msgstr ""
-
 msgid "WDM Files Path"
 msgstr ""
 
@@ -2315,6 +2335,9 @@ msgstr ""
 msgid "Which device do you want to use for Nintendont files?"
 msgstr ""
 
+msgid "Which mode do you want to use?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "свойства WiFi"
 
diff --git a/Languages/schinese.lang b/Languages/schinese.lang
index 338fac37..d5c2d1b9 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-08-14 16:24+0200\n"
+"POT-Creation-Date: 2016-01-02 16:53+0100\n"
 "PO-Revision-Date: 2013-08-13 07:03+0800\n"
 "Last-Translator: \n"
 "Language-Team: oCameLo\n"
@@ -31,6 +31,14 @@ msgstr "在服务器上未找到 %i 个文件！"
 msgid "%i missing files"
 msgstr "缺少 %i 个文件"
 
+#, c-format
+msgid "%i wad file(s) not processed!"
+msgstr ""
+
+#, c-format
+msgid "%i wad found."
+msgstr ""
+
 #, c-format
 msgid "%s only accepts GameCube backups in ISO format."
 msgstr "%s只能识别Gamecube备份格式的ISO镜像文件。"
@@ -132,6 +140,9 @@ msgstr "所有图片已成功下载。"
 msgid "All the features of USB Loader GX are unlocked."
 msgstr "所有 USB Loader GX 功能已解锁."
 
+msgid "All wad files processed successfully."
+msgstr ""
+
 msgid "Alternate DOL"
 msgstr "可选择 DOL 文件"
 
@@ -180,6 +191,9 @@ msgstr "长宽比例"
 msgid "Attention!"
 msgstr "注意！"
 
+msgid "Attention: All savegames will be deleted."
+msgstr ""
+
 msgid "Aug"
 msgstr "八月"
 
@@ -712,9 +726,6 @@ msgstr "是否立刻开始游戏？"
 msgid "Do you want to sync free space info sector on all FAT32 partitions?"
 msgstr "是否同步剩余空间信息扇区到所有 FAT32 分区？"
 
-msgid "Do you want to update this file?"
-msgstr ""
-
 msgid "Do you wish to update/download all language files?"
 msgstr "升级/下载语言文件？"
 
@@ -778,6 +789,9 @@ msgstr "错误："
 msgid "ERROR: Can't set up theme."
 msgstr "错误：无法设置主题。"
 
+msgid "EmuNAND Wad Manager"
+msgstr ""
+
 msgid "EmuNand Channels"
 msgstr "EmuNand 频道"
 
@@ -924,6 +938,9 @@ msgstr "功能设置"
 msgid "Feb"
 msgstr "二月"
 
+msgid "File"
+msgstr ""
+
 msgid "File not found."
 msgstr "找不到文件。"
 
@@ -946,6 +963,9 @@ msgstr "普通封面"
 msgid "Flip-X"
 msgstr "按键规则"
 
+msgid "Folder"
+msgstr ""
+
 msgid "Font Scale Factor"
 msgstr "字体比例因数"
 
@@ -1224,12 +1244,12 @@ msgstr "安装错误！"
 msgid "Install Partitions"
 msgstr "安装分区"
 
-msgid "Install WAD to EmuNand"
-msgstr "安装 WAD 至 EmuNand"
-
 msgid "Install a game"
 msgstr "安装游戏"
 
+msgid "Install error - Cleaning incomplete data."
+msgstr ""
+
 msgid "Install finished"
 msgstr "安装已完成"
 
@@ -1540,6 +1560,9 @@ msgstr "网站上没找到主题。"
 msgid "No themes found."
 msgstr "没有找到主题。"
 
+msgid "No wad file found in this folder."
+msgstr ""
+
 msgid "NoSSL only"
 msgstr ""
 
@@ -1741,6 +1764,9 @@ msgstr "真实 Nand"
 msgid "Receiving file from:"
 msgstr "接收文件："
 
+msgid "Region Free"
+msgstr ""
+
 msgid "Region Patch"
 msgstr "区域补丁"
 
@@ -2221,9 +2247,6 @@ msgstr "仅升级主程序"
 msgid "Update Files"
 msgstr "升级文件"
 
-msgid "Update Nintendont"
-msgstr ""
-
 msgid "Update Path"
 msgstr "升级文件存放路径"
 
@@ -2276,9 +2299,6 @@ msgstr ""
 msgid "Virtual Pointer Speed"
 msgstr "虚拟指针速度"
 
-msgid "WAD Installation"
-msgstr "WAD 安装"
-
 msgid "WDM Files Path"
 msgstr "WDM 文件路径"
 
@@ -2315,6 +2335,9 @@ msgstr ""
 msgid "Which device do you want to use for Nintendont files?"
 msgstr ""
 
+msgid "Which mode do you want to use?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "WiFi 功能"
 
@@ -2451,6 +2474,12 @@ msgstr "的"
 msgid "seconds left"
 msgstr "剩余秒数"
 
+#~ msgid "Install WAD to EmuNand"
+#~ msgstr "安装 WAD 至 EmuNand"
+
+#~ msgid "WAD Installation"
+#~ msgstr "WAD 安装"
+
 #~ msgid "GameTDB Path"
 #~ msgstr "GameTDB 路径"
 
diff --git a/Languages/spanish.lang b/Languages/spanish.lang
index bc91ac2b..bf5b996a 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-08-14 16:24+0200\n"
+"POT-Creation-Date: 2016-01-02 16:53+0100\n"
 "PO-Revision-Date: 2011-07-25 16:40+0200\n"
 "Last-Translator: Galen/xFede\n"
 "Language-Team: Penn, SirPalax, hvy109\n"
@@ -31,6 +31,14 @@ msgstr "¡%i archivos no encontrados en servidor!"
 msgid "%i missing files"
 msgstr "Faltan %i archivos"
 
+#, c-format
+msgid "%i wad file(s) not processed!"
+msgstr ""
+
+#, c-format
+msgid "%i wad found."
+msgstr ""
+
 #, c-format
 msgid "%s only accepts GameCube backups in ISO format."
 msgstr "%s sólo acepta juegos de GameCube en formato ISO."
@@ -132,6 +140,9 @@ msgstr "Todas las imagenes descargadas con éxito."
 msgid "All the features of USB Loader GX are unlocked."
 msgstr "Todas las características del USB Loader GX desbloqueadas."
 
+msgid "All wad files processed successfully."
+msgstr ""
+
 msgid "Alternate DOL"
 msgstr "DOL Alternativo"
 
@@ -180,6 +191,9 @@ msgstr "Relación de Aspecto"
 msgid "Attention!"
 msgstr "¡Atención!"
 
+msgid "Attention: All savegames will be deleted."
+msgstr ""
+
 msgid "Aug"
 msgstr "Ago"
 
@@ -712,9 +726,6 @@ msgstr "¿Quieres comenzar el juego ahora?"
 msgid "Do you want to sync free space info sector on all FAT32 partitions?"
 msgstr "¿Quieres sincronizar el sector de información de espacio libre en todas las particiones FAT32?"
 
-msgid "Do you want to update this file?"
-msgstr "¿Quieres actualizar este archivo?"
-
 msgid "Do you wish to update/download all language files?"
 msgstr "¿Quieres actualizar/descargar todos los archivos de idiomas?"
 
@@ -778,6 +789,9 @@ msgstr ""
 msgid "ERROR: Can't set up theme."
 msgstr "ERROR: No se puede configurar el tema."
 
+msgid "EmuNAND Wad Manager"
+msgstr ""
+
 msgid "EmuNand Channels"
 msgstr "Canales en Nand Emulada"
 
@@ -924,6 +938,9 @@ msgstr "Configuración de las características"
 msgid "Feb"
 msgstr ""
 
+msgid "File"
+msgstr ""
+
 msgid "File not found."
 msgstr "Archivo no encontrado."
 
@@ -946,6 +963,9 @@ msgstr "Carátulas 2D"
 msgid "Flip-X"
 msgstr "Animación Menú Disco"
 
+msgid "Folder"
+msgstr ""
+
 msgid "Font Scale Factor"
 msgstr "Escala textos"
 
@@ -1224,12 +1244,12 @@ msgstr "¡Error de Instalación!"
 msgid "Install Partitions"
 msgstr "Instalar Particiones"
 
-msgid "Install WAD to EmuNand"
-msgstr "Instalar WAD en Nand Emu."
-
 msgid "Install a game"
 msgstr "Instalar un juego"
 
+msgid "Install error - Cleaning incomplete data."
+msgstr ""
+
 msgid "Install finished"
 msgstr "Instalación terminada"
 
@@ -1540,6 +1560,9 @@ msgstr "No hay Temas en este sitio."
 msgid "No themes found."
 msgstr "Ningún tema encontrado."
 
+msgid "No wad file found in this folder."
+msgstr ""
+
 msgid "NoSSL only"
 msgstr "Sólo NoSSL"
 
@@ -1741,6 +1764,9 @@ msgstr "Nand Real"
 msgid "Receiving file from:"
 msgstr "Recibir archivo desde:"
 
+msgid "Region Free"
+msgstr ""
+
 msgid "Region Patch"
 msgstr "Parche región"
 
@@ -2221,9 +2247,6 @@ msgstr "Actualizar DOL"
 msgid "Update Files"
 msgstr "Actual. archivos"
 
-msgid "Update Nintendont"
-msgstr "Actualizar Nintendont"
-
 msgid "Update Path"
 msgstr "Ruta Actualización"
 
@@ -2276,9 +2299,6 @@ msgstr ""
 msgid "Virtual Pointer Speed"
 msgstr "Vel. Puntero Virtual"
 
-msgid "WAD Installation"
-msgstr "Instalacion WAD"
-
 msgid "WDM Files Path"
 msgstr "Rutas Archivos WDM"
 
@@ -2315,6 +2335,9 @@ msgstr ""
 msgid "Which device do you want to use for Nintendont files?"
 msgstr ""
 
+msgid "Which mode do you want to use?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "Características WiFi"
 
@@ -2451,6 +2474,18 @@ msgstr "de"
 msgid "seconds left"
 msgstr "segundos restantes"
 
+#~ msgid "Do you want to update this file?"
+#~ msgstr "¿Quieres actualizar este archivo?"
+
+#~ msgid "Install WAD to EmuNand"
+#~ msgstr "Instalar WAD en Nand Emu."
+
+#~ msgid "Update Nintendont"
+#~ msgstr "Actualizar Nintendont"
+
+#~ msgid "WAD Installation"
+#~ msgstr "Instalacion WAD"
+
 #~ msgid "GameTDB Path"
 #~ msgstr "Ruta GameDTB"
 
diff --git a/Languages/swedish.lang b/Languages/swedish.lang
index 61180900..12fb61cb 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-08-14 16:24+0200\n"
+"POT-Creation-Date: 2016-01-02 16:53+0100\n"
 "PO-Revision-Date: 2010-01-19 17:39+0200\n"
 "Last-Translator: Katsurou\n"
 "Language-Team: Katsurou, pirateX\n"
@@ -31,6 +31,14 @@ msgstr ""
 msgid "%i missing files"
 msgstr ""
 
+#, c-format
+msgid "%i wad file(s) not processed!"
+msgstr ""
+
+#, c-format
+msgid "%i wad found."
+msgstr ""
+
 #, c-format
 msgid "%s only accepts GameCube backups in ISO format."
 msgstr ""
@@ -132,6 +140,9 @@ msgstr ""
 msgid "All the features of USB Loader GX are unlocked."
 msgstr "Alla funktioner i USB Loader GX är upplåsta."
 
+msgid "All wad files processed successfully."
+msgstr ""
+
 msgid "Alternate DOL"
 msgstr "Alternativ DOL"
 
@@ -180,6 +191,9 @@ msgstr ""
 msgid "Attention!"
 msgstr ""
 
+msgid "Attention: All savegames will be deleted."
+msgstr ""
+
 msgid "Aug"
 msgstr ""
 
@@ -712,9 +726,6 @@ msgstr ""
 msgid "Do you want to sync free space info sector on all FAT32 partitions?"
 msgstr ""
 
-msgid "Do you want to update this file?"
-msgstr ""
-
 msgid "Do you wish to update/download all language files?"
 msgstr "Vill du uppdatera/ladda ner alla språkfiler?"
 
@@ -778,6 +789,9 @@ msgstr "FEL:"
 msgid "ERROR: Can't set up theme."
 msgstr "FEL: Kan inte ställa in tema"
 
+msgid "EmuNAND Wad Manager"
+msgstr ""
+
 msgid "EmuNand Channels"
 msgstr ""
 
@@ -924,6 +938,9 @@ msgstr ""
 msgid "Feb"
 msgstr ""
 
+msgid "File"
+msgstr ""
+
 msgid "File not found."
 msgstr "Kunde inte hitta fil"
 
@@ -946,6 +963,9 @@ msgstr ""
 msgid "Flip-X"
 msgstr "Vänd-X"
 
+msgid "Folder"
+msgstr ""
+
 msgid "Font Scale Factor"
 msgstr ""
 
@@ -1224,12 +1244,12 @@ msgstr "Fel vid installering!"
 msgid "Install Partitions"
 msgstr ""
 
-msgid "Install WAD to EmuNand"
-msgstr ""
-
 msgid "Install a game"
 msgstr "Installera ett spel"
 
+msgid "Install error - Cleaning incomplete data."
+msgstr ""
+
 msgid "Install finished"
 msgstr ""
 
@@ -1540,6 +1560,9 @@ msgstr "Inga teman hittades på sidan."
 msgid "No themes found."
 msgstr ""
 
+msgid "No wad file found in this folder."
+msgstr ""
+
 msgid "NoSSL only"
 msgstr ""
 
@@ -1741,6 +1764,9 @@ msgstr ""
 msgid "Receiving file from:"
 msgstr "Tar emot filer från:"
 
+msgid "Region Free"
+msgstr ""
+
 msgid "Region Patch"
 msgstr ""
 
@@ -2221,9 +2247,6 @@ msgstr "Updatera DOL"
 msgid "Update Files"
 msgstr "Uppdatera Filer"
 
-msgid "Update Nintendont"
-msgstr ""
-
 msgid "Update Path"
 msgstr "Sökväg till uppdatering"
 
@@ -2276,9 +2299,6 @@ msgstr ""
 msgid "Virtual Pointer Speed"
 msgstr ""
 
-msgid "WAD Installation"
-msgstr ""
-
 msgid "WDM Files Path"
 msgstr ""
 
@@ -2315,6 +2335,9 @@ msgstr ""
 msgid "Which device do you want to use for Nintendont files?"
 msgstr ""
 
+msgid "Which mode do you want to use?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "WiFi funktioner"
 
diff --git a/Languages/tchinese.lang b/Languages/tchinese.lang
index 6e7a97cc..298a5521 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-08-14 16:24+0200\n"
+"POT-Creation-Date: 2016-01-02 16:53+0100\n"
 "PO-Revision-Date: 2010-02-15 21:00+0800\n"
 "Last-Translator: Jane.H\n"
 "Language-Team: kyogc, Miller, Mika Li, Jane.H\n"
@@ -31,6 +31,14 @@ msgstr "伺服器上找不到%i個檔！"
 msgid "%i missing files"
 msgstr "缺少%i個檔案"
 
+#, c-format
+msgid "%i wad file(s) not processed!"
+msgstr ""
+
+#, c-format
+msgid "%i wad found."
+msgstr ""
+
 #, c-format
 msgid "%s only accepts GameCube backups in ISO format."
 msgstr ""
@@ -132,6 +140,9 @@ msgstr "所有圖片已下載成功。"
 msgid "All the features of USB Loader GX are unlocked."
 msgstr "USB Loader GX 所有功能已解鎖."
 
+msgid "All wad files processed successfully."
+msgstr ""
+
 msgid "Alternate DOL"
 msgstr "可選擇Alt DOL檔"
 
@@ -180,6 +191,9 @@ msgstr "長寬比率"
 msgid "Attention!"
 msgstr "注意!"
 
+msgid "Attention: All savegames will be deleted."
+msgstr ""
+
 msgid "Aug"
 msgstr "八月"
 
@@ -712,9 +726,6 @@ msgstr "是否現在要開始遊戲？"
 msgid "Do you want to sync free space info sector on all FAT32 partitions?"
 msgstr "是否要同步所有FAT32分區可用空間資訊？"
 
-msgid "Do you want to update this file?"
-msgstr ""
-
 msgid "Do you wish to update/download all language files?"
 msgstr "是否要更新/下載所有語言檔案嗎？"
 
@@ -778,6 +789,9 @@ msgstr "錯誤："
 msgid "ERROR: Can't set up theme."
 msgstr "錯誤：無法設定佈景主題。"
 
+msgid "EmuNAND Wad Manager"
+msgstr ""
+
 msgid "EmuNand Channels"
 msgstr "模擬Nand 頻道"
 
@@ -924,6 +938,9 @@ msgstr "功能設定"
 msgid "Feb"
 msgstr "二月"
 
+msgid "File"
+msgstr ""
+
 msgid "File not found."
 msgstr "找不到該檔案。"
 
@@ -946,6 +963,9 @@ msgstr "平面封面"
 msgid "Flip-X"
 msgstr "按鍵規則"
 
+msgid "Folder"
+msgstr ""
+
 msgid "Font Scale Factor"
 msgstr "字型比例倍數"
 
@@ -1224,12 +1244,12 @@ msgstr "安裝錯誤！"
 msgid "Install Partitions"
 msgstr "安裝磁區"
 
-msgid "Install WAD to EmuNand"
-msgstr "安裝 WAD 到模擬Nand"
-
 msgid "Install a game"
 msgstr "安裝遊戲"
 
+msgid "Install error - Cleaning incomplete data."
+msgstr ""
+
 msgid "Install finished"
 msgstr "已安裝完成"
 
@@ -1540,6 +1560,9 @@ msgstr "在網站上找不到主題。"
 msgid "No themes found."
 msgstr "找不到佈景主題。"
 
+msgid "No wad file found in this folder."
+msgstr ""
+
 msgid "NoSSL only"
 msgstr ""
 
@@ -1741,6 +1764,9 @@ msgstr "真實的Nand"
 msgid "Receiving file from:"
 msgstr "正在接收檔案來源:"
 
+msgid "Region Free"
+msgstr ""
+
 msgid "Region Patch"
 msgstr "區碼修正"
 
@@ -2221,9 +2247,6 @@ msgstr "僅更新主程式"
 msgid "Update Files"
 msgstr "更新檔案"
 
-msgid "Update Nintendont"
-msgstr ""
-
 msgid "Update Path"
 msgstr "更新路徑"
 
@@ -2276,9 +2299,6 @@ msgstr ""
 msgid "Virtual Pointer Speed"
 msgstr "虛擬指針的速度"
 
-msgid "WAD Installation"
-msgstr "WAD 安裝"
-
 msgid "WDM Files Path"
 msgstr "WDM檔案路徑"
 
@@ -2315,6 +2335,9 @@ msgstr ""
 msgid "Which device do you want to use for Nintendont files?"
 msgstr ""
 
+msgid "Which mode do you want to use?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "WiFi功能設定"
 
@@ -2451,6 +2474,12 @@ msgstr "的"
 msgid "seconds left"
 msgstr "剩餘秒數"
 
+#~ msgid "Install WAD to EmuNand"
+#~ msgstr "安裝 WAD 到模擬Nand"
+
+#~ msgid "WAD Installation"
+#~ msgstr "WAD 安裝"
+
 #~ msgid "GameTDB Path"
 #~ msgstr "GameTDB 路徑"
 
diff --git a/Languages/thai.lang b/Languages/thai.lang
index 371b2ce2..770ea8c3 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-08-14 16:24+0200\n"
+"POT-Creation-Date: 2016-01-02 16:53+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: Nitro_subzero \n"
 "Language-Team: Nitro_subzero\n"
@@ -31,6 +31,14 @@ msgstr ""
 msgid "%i missing files"
 msgstr ""
 
+#, c-format
+msgid "%i wad file(s) not processed!"
+msgstr ""
+
+#, c-format
+msgid "%i wad found."
+msgstr ""
+
 #, c-format
 msgid "%s only accepts GameCube backups in ISO format."
 msgstr ""
@@ -132,6 +140,9 @@ msgstr ""
 msgid "All the features of USB Loader GX are unlocked."
 msgstr "ความสามารถทั้งหมดของ USB Loader GX ถูกเปิดให้ใช้."
 
+msgid "All wad files processed successfully."
+msgstr ""
+
 msgid "Alternate DOL"
 msgstr "เปลี่ยน DOL "
 
@@ -180,6 +191,9 @@ msgstr ""
 msgid "Attention!"
 msgstr ""
 
+msgid "Attention: All savegames will be deleted."
+msgstr ""
+
 msgid "Aug"
 msgstr "สค."
 
@@ -712,9 +726,6 @@ msgstr ""
 msgid "Do you want to sync free space info sector on all FAT32 partitions?"
 msgstr ""
 
-msgid "Do you want to update this file?"
-msgstr ""
-
 msgid "Do you wish to update/download all language files?"
 msgstr "ต้องการอัพเดทหรือดาวน์โหลด ไฟล์ภาษา ทั้งหมด?"
 
@@ -778,6 +789,9 @@ msgstr "ผิดพลาด:"
 msgid "ERROR: Can't set up theme."
 msgstr ""
 
+msgid "EmuNAND Wad Manager"
+msgstr ""
+
 msgid "EmuNand Channels"
 msgstr ""
 
@@ -924,6 +938,9 @@ msgstr ""
 msgid "Feb"
 msgstr "กพ."
 
+msgid "File"
+msgstr ""
+
 msgid "File not found."
 msgstr "ไม่พบไฟล์"
 
@@ -946,6 +963,9 @@ msgstr ""
 msgid "Flip-X"
 msgstr "กลับ-X"
 
+msgid "Folder"
+msgstr ""
+
 msgid "Font Scale Factor"
 msgstr ""
 
@@ -1224,12 +1244,12 @@ msgstr "ผิดพลาดขณะติดตั้ง!"
 msgid "Install Partitions"
 msgstr ""
 
-msgid "Install WAD to EmuNand"
-msgstr ""
-
 msgid "Install a game"
 msgstr "ติดตั้งเกมส์"
 
+msgid "Install error - Cleaning incomplete data."
+msgstr ""
+
 msgid "Install finished"
 msgstr ""
 
@@ -1540,6 +1560,9 @@ msgstr "ไม่พบธีมบนเวบไซต์"
 msgid "No themes found."
 msgstr ""
 
+msgid "No wad file found in this folder."
+msgstr ""
+
 msgid "NoSSL only"
 msgstr ""
 
@@ -1741,6 +1764,9 @@ msgstr ""
 msgid "Receiving file from:"
 msgstr "ได้รับไฟล์จาก:"
 
+msgid "Region Free"
+msgstr ""
+
 msgid "Region Patch"
 msgstr ""
 
@@ -2221,9 +2247,6 @@ msgstr "อัพเดท DOL"
 msgid "Update Files"
 msgstr "อัพเดทไฟล์"
 
-msgid "Update Nintendont"
-msgstr ""
-
 msgid "Update Path"
 msgstr "ที่อยู่ Update"
 
@@ -2276,9 +2299,6 @@ msgstr ""
 msgid "Virtual Pointer Speed"
 msgstr ""
 
-msgid "WAD Installation"
-msgstr ""
-
 msgid "WDM Files Path"
 msgstr ""
 
@@ -2315,6 +2335,9 @@ msgstr ""
 msgid "Which device do you want to use for Nintendont files?"
 msgstr ""
 
+msgid "Which mode do you want to use?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "ความสามารถของ Wi Fi"
 
diff --git a/Languages/turkish.lang b/Languages/turkish.lang
index a08270da..b66387bb 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-08-14 16:24+0200\n"
+"POT-Creation-Date: 2016-01-02 16:53+0100\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: omercigingelini\n"
 "Language-Team: omercigingelini\n"
@@ -31,6 +31,14 @@ msgstr ""
 msgid "%i missing files"
 msgstr ""
 
+#, c-format
+msgid "%i wad file(s) not processed!"
+msgstr ""
+
+#, c-format
+msgid "%i wad found."
+msgstr ""
+
 #, c-format
 msgid "%s only accepts GameCube backups in ISO format."
 msgstr ""
@@ -132,6 +140,9 @@ msgstr ""
 msgid "All the features of USB Loader GX are unlocked."
 msgstr "USB Loader GX'in tüm özellikleri kilitli."
 
+msgid "All wad files processed successfully."
+msgstr ""
+
 msgid "Alternate DOL"
 msgstr "Alternatif DOL"
 
@@ -180,6 +191,9 @@ msgstr ""
 msgid "Attention!"
 msgstr ""
 
+msgid "Attention: All savegames will be deleted."
+msgstr ""
+
 msgid "Aug"
 msgstr "Ağu"
 
@@ -712,9 +726,6 @@ msgstr ""
 msgid "Do you want to sync free space info sector on all FAT32 partitions?"
 msgstr ""
 
-msgid "Do you want to update this file?"
-msgstr ""
-
 msgid "Do you wish to update/download all language files?"
 msgstr "Tüm dil dosyalarını indirmek/güncellemek istiyor musunuz?"
 
@@ -778,6 +789,9 @@ msgstr "HATA:"
 msgid "ERROR: Can't set up theme."
 msgstr ""
 
+msgid "EmuNAND Wad Manager"
+msgstr ""
+
 msgid "EmuNand Channels"
 msgstr ""
 
@@ -924,6 +938,9 @@ msgstr ""
 msgid "Feb"
 msgstr "Şub"
 
+msgid "File"
+msgstr ""
+
 msgid "File not found."
 msgstr "Dosya bulunamadı"
 
@@ -946,6 +963,9 @@ msgstr ""
 msgid "Flip-X"
 msgstr "Çevir-X"
 
+msgid "Folder"
+msgstr ""
+
 msgid "Font Scale Factor"
 msgstr ""
 
@@ -1224,12 +1244,12 @@ msgstr "Kurulum Hatasi!"
 msgid "Install Partitions"
 msgstr ""
 
-msgid "Install WAD to EmuNand"
-msgstr ""
-
 msgid "Install a game"
 msgstr "Oyun kur"
 
+msgid "Install error - Cleaning incomplete data."
+msgstr ""
+
 msgid "Install finished"
 msgstr ""
 
@@ -1540,6 +1560,9 @@ msgstr "Bu sitede tema bulunamadı"
 msgid "No themes found."
 msgstr ""
 
+msgid "No wad file found in this folder."
+msgstr ""
+
 msgid "NoSSL only"
 msgstr ""
 
@@ -1741,6 +1764,9 @@ msgstr ""
 msgid "Receiving file from:"
 msgstr "Dosyanın alındığı yer:"
 
+msgid "Region Free"
+msgstr ""
+
 msgid "Region Patch"
 msgstr ""
 
@@ -2221,9 +2247,6 @@ msgstr "DOL Güncelle"
 msgid "Update Files"
 msgstr "Dosyaları Güncelle"
 
-msgid "Update Nintendont"
-msgstr ""
-
 msgid "Update Path"
 msgstr "Güncelleme Yolu"
 
@@ -2276,9 +2299,6 @@ msgstr ""
 msgid "Virtual Pointer Speed"
 msgstr ""
 
-msgid "WAD Installation"
-msgstr ""
-
 msgid "WDM Files Path"
 msgstr ""
 
@@ -2315,6 +2335,9 @@ msgstr ""
 msgid "Which device do you want to use for Nintendont files?"
 msgstr ""
 
+msgid "Which mode do you want to use?"
+msgstr ""
+
 msgid "WiFi Features"
 msgstr "WiFi Özellikleri"
 
diff --git a/source/FileOperations/DirList.h b/source/FileOperations/DirList.h
index 475f7fd5..caece414 100644
--- a/source/FileOperations/DirList.h
+++ b/source/FileOperations/DirList.h
@@ -65,6 +65,9 @@ class DirList
 		//! Is index a dir or a file
 		//!\param list index
 		bool IsDir(int index) { if(!valid(index)) return 0; return FileInfo[index].isDir; }
+		//! Erase an entry of the list
+		//!\param list index
+		void RemoveEntrie(int index) { if(!valid(index)) return; FileInfo.erase(FileInfo.begin()+index); }
 		//! Get the filecount of the whole list
 		int GetFilecount() { return FileInfo.size(); }
 		//! Sort list by filepath
diff --git a/source/FileOperations/fileops.cpp b/source/FileOperations/fileops.cpp
index b5453ea8..4e23f9f7 100644
--- a/source/FileOperations/fileops.cpp
+++ b/source/FileOperations/fileops.cpp
@@ -464,7 +464,7 @@ extern "C" bool RemoveDirectory(const char *path)
 	ProgressStop();
 	ProgressCancelEnable(false);
 
-	return (RemoveFile(folderpath.c_str()) == 0);
+	return (remove(folderpath.c_str()) == 0);
 }
 
 /****************************************************************************
diff --git a/source/GameCube/GCGames.cpp b/source/GameCube/GCGames.cpp
index d9fff15a..07129a42 100644
--- a/source/GameCube/GCGames.cpp
+++ b/source/GameCube/GCGames.cpp
@@ -295,7 +295,6 @@ bool GCGames::RemoveGame(const char *gameID)
 
 	char filepath[512];
 	int result = 0;
-	int ret;
 
 	// the main path is the SD path as it is prefered, now delete USB
 	char cIsoPath[256];
@@ -305,23 +304,20 @@ bool GCGames::RemoveGame(const char *gameID)
 	{
 		// Remove game iso
 		snprintf(filepath, sizeof(filepath), "%s%s", Settings.GameCubePath, cIsoPath);
-		ret = RemoveFile(filepath);
-		if(ret != 0)
+		if(!RemoveFile(filepath))
 			result = -1;
 
 		// Remove path
 		char *pathPtr = strrchr(filepath, '/');
 		if(pathPtr) *pathPtr = 0;
-		ret = RemoveFile(filepath);
-		if(ret != 0)
+		if(!RemoveFile(filepath))
 			result = -1;
 	}
 	else if(header->type == TYPE_GAME_GC_EXTRACTED)
 	{
 		//! remove extracted gamecube game
 		snprintf(filepath, sizeof(filepath), "%s%s", Settings.GameCubePath, cIsoPath);
-		ret = RemoveDirectory(path);
-		if(ret < 0)
+		if(!RemoveDirectory(path))
 			result = -1;
 	}
 
diff --git a/source/network/ImageDownloader.cpp b/source/network/ImageDownloader.cpp
index a6fe2288..14788776 100644
--- a/source/network/ImageDownloader.cpp
+++ b/source/network/ImageDownloader.cpp
@@ -144,7 +144,7 @@ void ImageDownloader::FindMissing(const char *writepath, const char *downloadURL
 
 	std::vector<std::string> MissingFilesList;
 
-	if((Settings.LoaderMode & MODE_GCGAMES) && strcmp(fileExt, ".nbr") == 0)
+	if((Settings.LoaderMode & MODE_GCGAMES) && strcmp(fileExt, ".bnr") == 0)
 	{
 		short LoaderModeBackup = Settings.LoaderMode;
 		Settings.LoaderMode = MODE_GCGAMES;		// Limit banner download for GameCube Only.
@@ -244,7 +244,7 @@ struct block ImageDownloader::DownloadImage(const char * url, const char * gameI
 		snprintf(downloadURL, sizeof(downloadURL), "%s%s.bnr", url, gameID);
 		gprintf("%s", downloadURL);
 		struct block file = downloadfile(downloadURL);
-		if(IsValidBanner(file.data))
+		if(file.size > 132 && IsValidBanner(file.data)) // 132 = IMET magic location in the banner with u8 header
 			return file;
 
 		free(file.data);
@@ -252,7 +252,7 @@ struct block ImageDownloader::DownloadImage(const char * url, const char * gameI
 		snprintf(downloadURL, sizeof(downloadURL), "%s%.3s.bnr", url, gameID);
 		gprintf(" - Not found. trying ID3:\n%s", downloadURL);
 		file = downloadfile(downloadURL);
-		if(IsValidBanner(file.data))
+		if(file.size > 132 && IsValidBanner(file.data))
 			return file;
 
 		gprintf(" - Not found.\n");
diff --git a/source/network/http.c b/source/network/http.c
index f3228bb9..bf2b387c 100644
--- a/source/network/http.c
+++ b/source/network/http.c
@@ -1,8 +1,7 @@
 /*  http -- http convenience functions
 
     Copyright (C) 2008 bushing
-				  2008-2014 Dimok
-				  2015 Fix94 ; Cyan
+				  2008-2014 Dimok, Cyan
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -18,24 +17,12 @@
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <ogc/lwp_watchdog.h>
-
 #include "http.h"
-#include "ssl.h"
 #include "../svnrev.h"
-#include "prompts/ProgressWindow.h"
-#include "language/gettext.h"
 #include "gecko.h"
 
 extern char incommingIP[50];
 static u8 retryloop = 0;
-static bool displayProgressWindow = false;
-
-http_res result;
-u16 http_port;
-u32 http_status;
-u32 content_length;
-char content_location[255] = "";
 
 /**
  * Emptyblock is a statically defined variable for functions to return if they are unable
@@ -43,19 +30,18 @@ char content_location[255] = "";
  */
 const struct block emptyblock = { 0, NULL };
 
+//The maximum amount of bytes to send per net_write() call
+//#define NET_BUFFER_SIZE 1024
+#define NET_BUFFER_SIZE 3600
+
 // Write our message to the server
-static s32 tcp_write(s32 server, char *msg)
+static s32 send_message(s32 server, char *msg)
 {
 	s32 bytes_transferred = 0;
 	s32 remaining = strlen(msg);
-	s32 res = 0;
 	while (remaining)
 	{
-		if(http_port == 443)
-			res = (bytes_transferred = ssl_write(server, msg, remaining > NET_BUFFER_SIZE ? NET_BUFFER_SIZE : remaining));
-		else
-			res = (bytes_transferred = net_write(server, msg, remaining > NET_BUFFER_SIZE ? NET_BUFFER_SIZE : remaining));
-		if (res > 0)
+		if ((bytes_transferred = net_write(server, msg, remaining > NET_BUFFER_SIZE ? NET_BUFFER_SIZE : remaining)) > 0)
 		{
 			remaining -= bytes_transferred;
 			msg += bytes_transferred;
@@ -80,7 +66,7 @@ static s32 tcp_write(s32 server, char *msg)
  * @param u32 the port to connect to on the server
  * @return s32 The connection to the server (negative number if connection could not be established)
  */
-static s32 tcp_connect(u32 ipaddress, u16 socket_port)
+static s32 server_connect(u32 ipaddress, u16 socket_port)
 {
 	//Initialize socket
 	s32 connection = net_socket(AF_INET, SOCK_STREAM, IPPROTO_IP);
@@ -94,7 +80,7 @@ static s32 tcp_connect(u32 ipaddress, u16 socket_port)
 
 	sprintf(incommingIP, "%s", inet_ntoa(connect_addr.sin_addr));
 
-	//Attempt to open the socket
+	//Attemt to open the socket
 	if (net_connect(connection, (struct sockaddr*) &connect_addr, sizeof(connect_addr)) == -1)
 	{
 		net_close(connection);
@@ -103,168 +89,82 @@ static s32 tcp_connect(u32 ipaddress, u16 socket_port)
 	return connection;
 }
 
-/**
- * Reads the current connection data line by line
- *
- * @return string up to "\r\n" or until max_length is reached.
- */
-char * tcp_readLine (const s32 s, const u16 max_length, const u64 start_time, const u16 timeout) {
-	char *buf;
-	u16 c;
-	s32 res;
-	char *ret;
+//The amount of memory in bytes reserved initially to store the HTTP response in
+//Be careful in increasing this number, reading from a socket on the Wii
+//will fail if you request more than 20k or so
+#define HTTP_BUFFER_SIZE 1024 * 5
 
-	buf = malloc(max_length);
-
-	c = 0;
-	ret = NULL;
-	while (true) {
-		if (ticks_to_millisecs (diff_ticks (start_time, gettime ())) > timeout)
-			break;
-
-		if(http_port == 443)
-			res = ssl_read (s, &buf[c], 1);
-		else
-			res = net_read (s, &buf[c], 1);
-
-		if ((res == 0) || (res == -EAGAIN)) {
-			usleep (20 * 1000);
-
-			continue;
-		}
-
-		if (res < 0) break;
-
-		if ((c > 0) && (buf[c - 1] == '\r') && (buf[c] == '\n')) {
-			if (c == 1) {
-				ret = strdup ("");
-
-				break;
-			}
-
-			ret = strndup (buf, c - 1);
-
-			break;
-		}
-
-		c++;
-
-		if (c == max_length)
-			break;
-	}
-
-	free (buf);
-	return ret;
-}
+//The amount of memory the buffer should expanded with if the buffer is full
+#define HTTP_BUFFER_GROWTH 1024 * 5
 
 /**
- * This function reads all the data from a connection into a buffer.
+ * This function reads all the data from a connection into a buffer which it returns.
+ * It will return an empty buffer if something doesn't go as planned
  *
  * @param s32 connection The connection identifier to suck the response out of
- * @return bool True if data downloaded succesfully.
+ * @return block A 'block' struct (see http.h) in which the buffer is located
  */
-bool tcp_readData(const s32 connection, u8 **buffer, const u32 length)
+struct block read_message(s32 connection)
 {
-	u8 *p;
-	u32 left, block, received;
-	s64 t;
-	s32 res;
+	//Create a block of memory to put in the response
+	struct block buffer;
+	buffer.data = malloc(HTTP_BUFFER_SIZE);
+	buffer.size = HTTP_BUFFER_SIZE;
 
-	p = *buffer;
-	left = length;
-	received = 0;
-
-	t = gettime ();
-	while (left)
+	if (buffer.data == NULL)
 	{
-		if (ticks_to_millisecs (diff_ticks (t, gettime ())) > TCP_BLOCK_RECV_TIMEOUT)
-			break;
+		return emptyblock;
+	}
 
-		// Update the progress bar
-		if(displayProgressWindow)
+	//The offset variable always points to the first byte of memory that is free in the buffer
+	u32 offset = 0;
+
+	while (1)
+	{
+		//Fill the buffer with a new batch of bytes from the connection,
+		//starting from where we left of in the buffer till the end of the buffer
+		s32 bytes_read = net_read(connection, buffer.data + offset, buffer.size - offset);
+
+		//Anything below 0 is an error in the connection
+		if (bytes_read < 0)
 		{
-			ShowProgress(received, length);
-			if(ProgressCanceled())
+			//printf("Connection error from net_read()  Errorcode: %i\n", bytes_read);
+			return emptyblock;
+		}
+
+		//No more bytes were read into the buffer,
+		//we assume this means the HTTP response is done
+		if (bytes_read == 0)
+		{
+			break;
+		}
+
+		offset += bytes_read;
+
+		//Check if we have enough buffer left over,
+		//if not expand it with an additional HTTP_BUFFER_GROWTH worth of bytes
+		if (offset >= buffer.size)
+		{
+			buffer.size += HTTP_BUFFER_GROWTH;
+			u8 * tmp = realloc(buffer.data, buffer.size);
+
+			if (tmp == NULL)
 			{
-				ProgressStop();
-				break;
+				free(buffer.data);
+				return emptyblock;
 			}
+			else
+				buffer.data = tmp;
 		}
-
-		// Get next block size
-		block = left;
-		if (block > TCP_BLOCK_SIZE)
-			block = TCP_BLOCK_SIZE;
-
-		if(http_port == 443)
-			res = ssl_read (connection, p, block);
-		else
-			res = net_read (connection, p, block);
-
-		if ((res == 0) || (res == -EAGAIN))
-		{
-			usleep (20 * 1000);
-			continue;
-		}
-
-		if (res < 0) break;
-
-		received += res;
-		left -= res;
-		p += res;
-
-		// update timing after each downloaded block
-		t = gettime ();
 	}
 
-	return left == 0;
-}
+	//At the end of above loop offset should be precisely the amount of bytes that were read from the connection
+	buffer.size = offset;
 
-/**
- * Parse the HTTP replied header
- *
- * @param s32 connection identification
- * @return bool true if max header lines not reached. Stores HTTP answers into global variables.
- */
-u8 read_header(s32 connection)
-{
-	int linecount = 0;
-	result = HTTPR_OK;
+	//Shrink the size of the buffer so the data fits exactly in it
+	buffer.data = realloc(buffer.data, buffer.size);
 
-	for (linecount = 0; linecount < 32; linecount++)
-	{
-		char *line = tcp_readLine (connection, 0xff, gettime(), (u16)HTTP_TIMEOUT);
-
-		if (!line)
-		{
-			http_status = 404;
-			result = HTTPR_ERR_REQUEST;
-			break;
-		}
-
-		if (strlen (line) < 1)
-		{
-			free (line);
-			line = NULL;
-			break;
-		}
-
-		sscanf (line, "HTTP/1.%*u %u", &http_status);
-		sscanf (line, "Content-Length: %u", &content_length);
-		sscanf (line, "Location: %s", content_location);
-		//gprintf(line);
-		//gprintf("\n");
-		free (line);
-		line = NULL;
-	}
-
-	if (linecount == 32)
-	{
-		http_status = 404;
-		result = HTTPR_ERR_REQUEST;
-	}
-
-	return result;
+	return buffer;
 }
 
 /**
@@ -273,27 +173,15 @@ u8 read_header(s32 connection)
  */
 struct block downloadfile(const char *url)
 {
-	int sslcontext = -1;
-
 	//Check if the url starts with "http://", if not it is not considered a valid url
-	if (strncmp(url, "http://", strlen("http://")) == 0)
-		http_port = 80;
-	else if(strncmp(url, "https://", strlen("https://")) == 0)
+	if (strncmp(url, "http://", strlen("http://")) != 0)
 	{
-		http_port = 443;
-		gprintf("Initializing ssl...\n");
-		if(ssl_init() < 0)
-			return emptyblock;
-	}
-	else
+		//printf("URL '%s' doesn't start with 'http://'\n", url);
 		return emptyblock;
+	}
 
 	//Locate the path part of the url by searching for '/' past "http://"
-	char *path = 0;
-	if(http_port == 443)
-		path = strchr(url + strlen("https://"), '/');
-	else
-		path = strchr(url + strlen("http://"), '/');
+	char *path = strchr(url + strlen("http://"), '/');
 
 	//At the very least the url has to end with '/', ending with just a domain is invalid
 	if (path == NULL)
@@ -303,7 +191,7 @@ struct block downloadfile(const char *url)
 	}
 
 	//Extract the domain part out of the url
-	int domainlength = path - url - strlen("http://") - (http_port == 443 ? 1 : 0);
+	int domainlength = path - url - strlen("http://");
 
 	if (domainlength == 0)
 	{
@@ -312,7 +200,7 @@ struct block downloadfile(const char *url)
 	}
 
 	char domain[domainlength + 1];
-	strlcpy(domain, url + strlen("http://") + (http_port == 443 ? 1 : 0), domainlength + 1);
+	strlcpy(domain, url + strlen("http://"), domainlength + 1);
 
 	//Parsing of the URL is done, start making an actual connection
 	u32 ipaddress = getipbynamecached(domain);
@@ -323,7 +211,7 @@ struct block downloadfile(const char *url)
 		return emptyblock;
 	}
 
-	s32 connection = tcp_connect(ipaddress, http_port);
+	s32 connection = server_connect(ipaddress, 80);
 
 	if (connection < 0)
 	{
@@ -331,39 +219,6 @@ struct block downloadfile(const char *url)
 		return emptyblock;
 	}
 
-	if(http_port == 443)
-	{
-		//patched out anyways so just to set something
-		sslcontext = ssl_new((u8*)domain,0);
-
-		if(sslcontext < 0)
-		{
-			//gprintf("ssl_new\n");
-			result = HTTPR_ERR_CONNECT;
-			net_close (connection);
-			return emptyblock;
-		}
-		//patched out anyways so just to set something
-		ssl_setbuiltinclientcert(sslcontext,0);
-		if(ssl_connect(sslcontext,connection) < 0)
-		{
-			//gprintf("ssl_connect\n");
-			result = HTTPR_ERR_CONNECT;
-			ssl_shutdown(sslcontext);
-			net_close (connection);
-			return emptyblock;
-		}
-		int ret = ssl_handshake(sslcontext);
-		if(ret < 0)
-		{
-			//gprintf("ssl_handshake %i\n", ret);
-			result = HTTPR_ERR_STATUS;
-			ssl_shutdown(sslcontext);
-			net_close (connection);
-			return emptyblock;
-		}
-	}
-
 	// Remove Referer from the request header for incompatible websites (ex. Cloudflare proxy)
 	char referer[domainlength + 12];
 	snprintf(referer, sizeof(referer), "Referer: %s\r\n", domain);
@@ -380,101 +235,131 @@ struct block downloadfile(const char *url)
 	//gprintf("%s\n",header);
 
 	//Do the request and get the response
-	tcp_write(http_port == 443 ? sslcontext : connection, header);
-	read_header( http_port == 443 ? sslcontext : connection);
+	send_message(connection, header);
+	struct block response = read_message(connection);
+	net_close(connection);
+	
+	// dump response
+	// hexdump(response.data, response.size);
+	
+	//Search for the 4-character sequence \r\n\r\n in the response which signals the start of the http payload (file)
+	unsigned char *filestart = NULL;
+	u32 filesize = 0;
+	u32 i;
+	char newURL[512];
+	bool redirect = false;
 
-	if (http_status >= 400) // Not found
+	for (i = 3; i < response.size; i++)
 	{
-		//gprintf("HTTP ERROR: %d\n", http_status);
-		return emptyblock;
-	}
-
-	if(!content_length)
-		content_length = 0;
-
-	// create data buffer to return
-	struct block response;
-	response.data = malloc(content_length);
-	response.size = content_length;
-	if (response.data == NULL)
-	{
-		return emptyblock;
-	}
-
-	if (http_status == 200)
-	{
-		if(displayProgressWindow)
+		if (response.data[i] == '\n' && response.data[i - 1] == '\r' && response.data[i - 2] == '\n' && response.data[i - 3] == '\r')
 		{
-			ProgressCancelEnable(true);
-			StartProgress(tr("Downloading file..."), tr("Please wait"), 0, false, false);
-		}
-
-		int ret = tcp_readData(http_port == 443 ? sslcontext : connection, &response.data, content_length);
-		if(!ret)
-		{
-			free(response.data);
-			result = HTTPR_ERR_RECEIVE;
-			if(http_port == 443)
-				ssl_shutdown(sslcontext);
-			net_close (connection);
-			return emptyblock;
+			filestart = response.data + i + 1;
+			filesize = response.size - i - 1;
+			
+			// Check the HTTP response code
+			if (response.size > 10 && strncmp((char*)response.data, "HTTP/", 5)==0) 
+			{
+				char htstat[i];
+				strncpy(htstat, (char*)response.data, i);
+				htstat[i] = 0;
+				char *codep;
+				codep = strchr(htstat, ' ');
+				if (codep) 
+				{
+					int code;
+					if (sscanf(codep+1, "%d", &code) == 1) 
+					{
+						//gprintf("HTTP response code: %d\n", code);
+						if (code == 302) // 302 FOUND (redirected link)
+						{
+							char *ptr = strcasestr((char*)response.data, "Location: ");
+							if(ptr)
+							{
+								ptr += strlen("Location: ");
+								strncpy(newURL, ptr, sizeof(newURL));
+								*(strchr(newURL, '\r'))=0;
+								
+								redirect = true;
+								//gprintf("New URL to download = %s \n", newURL);
+							}
+							else
+							{
+								//gprintf("HTTP ERROR: %s\n", htstat);
+								free(response.data);
+								return emptyblock;
+							}
+						}
+						if (code >=400) // Not found
+						{
+							//gprintf("HTTP ERROR: %s\n", htstat);
+							free(response.data);
+							return emptyblock;
+						}
+					}
+				}
+			}
+			break;
 		}
 	}
-	else if (http_status == 302) // 302 FOUND (redirected link)
-	{
-		// close current connection
-		if(http_port == 443)
-			ssl_shutdown(sslcontext);
-		net_close (connection);
 
-		// prevent infinite loops
+	if(redirect)
+	{
+		// Prevent endless loop
 		retryloop++;
 		if(retryloop > 3)
 		{
 			retryloop = 0;
+			free(response.data);
 			return emptyblock;
 		}
-
-		struct block redirected = downloadfile(content_location);
-		if(redirected.size == 0)
-			return emptyblock;
+		
+		struct block redirected = downloadfile(newURL);
 
 		// copy the newURL data into the original data
 		u8 * tmp = realloc(response.data, redirected.size);
 		if (tmp == NULL)
 		{
-			gprintf("Could not allocate enough memory for new URL. Download canceled.\n");
+			//gprintf("Could not allocate enough memory for new URL. Download canceled.\n");
 			free(response.data);
-			response.size = 0;
 			free(redirected.data);
-			result = HTTPR_ERR_RECEIVE;
-			if(http_port == 443)
-				ssl_shutdown(sslcontext);
-			net_close (connection);
 			return emptyblock;
 		}
 		response.data = tmp;
 		memcpy(response.data, redirected.data, redirected.size);
-		free(redirected.data);
-		response.size = redirected.size;
 
+		// Set filestart's new size based on redirected file
+		filestart = response.data;
+		filesize = redirected.size;
+		free(redirected.data);
+		
 	}
 	retryloop = 0;
-	
-	// reset progress window if used
-	if(displayProgressWindow)
+
+	if (filestart == NULL)
 	{
-		ProgressStop();
-		ProgressCancelEnable(false);
-		displayProgressWindow = false;
+		//printf("HTTP Response was without a file\n");
+		free(response.data);
+		return emptyblock;
 	}
 
-	result = HTTPR_OK;
-	if(http_port == 443)
-		ssl_shutdown(sslcontext);
-	net_close (connection);
-	
-	return response;
+	//Copy the file part of the response into a new memoryblock to return
+	struct block file;
+	file.data = malloc(filesize);
+	file.size = filesize;
+
+	if (file.data == NULL)
+	{
+		//printf("No more memory to copy file from HTTP response\n");
+		free(response.data);
+		return emptyblock;
+	}
+
+	memcpy(file.data, filestart, filesize);
+
+	//Dispose of the original response
+	free(response.data);
+
+	return file;
 }
 
 s32 GetConnection(char * domain)
@@ -485,12 +370,7 @@ s32 GetConnection(char * domain)
 	{
 		return -1;
 	}
-	s32 connection = tcp_connect(ipaddress, 80);
+	s32 connection = server_connect(ipaddress, 80);
 	return connection;
 
 }
-
-void displayDownloadProgress(bool display)
-{
-	displayProgressWindow = display;
-}
\ No newline at end of file
diff --git a/source/network/http.h b/source/network/http.h
index 0f9fe19d..f1008c50 100644
--- a/source/network/http.h
+++ b/source/network/http.h
@@ -6,27 +6,6 @@
 #include <stdarg.h>
 #include <string.h>
 
-
-#define TCP_CONNECT_TIMEOUT 5000
-#define TCP_BLOCK_SIZE (16 * 1024)
-#define TCP_BLOCK_RECV_TIMEOUT 4000
-#define TCP_BLOCK_SEND_TIMEOUT 4000
-#define HTTP_TIMEOUT 300000
-
-//The maximum amount of bytes to send per net_write() call
-#define NET_BUFFER_SIZE 3600
-
-
-typedef enum {
-	HTTPR_OK,
-	HTTPR_ERR_CONNECT,
-	HTTPR_ERR_REQUEST,
-	HTTPR_ERR_STATUS,
-	HTTPR_ERR_TOOBIG,
-	HTTPR_ERR_RECEIVE
-} http_res;
-
-
 #ifdef __cplusplus
 extern "C"
 {
@@ -39,15 +18,14 @@ extern "C"
 	 */
 	struct block
 	{
-		u32 size;
-		unsigned char *data;
+			u32 size;
+			unsigned char *data;
 	};
 
 	extern const struct block emptyblock;
 
 	struct block downloadfile(const char *url);
 	s32 GetConnection(char * domain);
-	void displayDownloadProgress(bool display);
 
 #ifdef __cplusplus
 }
diff --git a/source/prompts/gameinfo.cpp b/source/prompts/gameinfo.cpp
index 971118ab..cfeb4a35 100644
--- a/source/prompts/gameinfo.cpp
+++ b/source/prompts/gameinfo.cpp
@@ -25,6 +25,46 @@
 #include "utils/ShowError.h"
 #include "BoxCover/BoxCover.hpp"
 
+static inline const char * ConsoleFromTitleID(const char* TitleID)
+{
+	switch (TitleID[0])
+	{
+		case 'W': return "WiiWare";
+		case 'D': return "VC_Arcade";
+		case 'H': return "Wii_System_Channel";
+		case 'F': return "VC_NES";
+		case 'G': return "GameCube";
+		case 'J': return "VC_SNES";
+		case 'N': return "VC_N64";
+		case 'L': return "VC_Master_System";
+		case 'M': return "VC_Genesis_Megadrive";
+		case 'E': return "VC_NeoGeo";
+		case 'C': return "VC_Commodore";
+		case 'X': return "VC_MSX";
+		case 'P': return "VC_TurboGraphX";
+		case 'Q': return "VC_TurboGraphX-CD";
+		case 'R': return "Wii_Game_Disc";
+		case 'S': return "Wii_Game_Disc";
+		default: return "Unknown";
+	}
+}
+
+static inline const char * HdrTypeText(u8 type)
+{
+	switch (type)
+	{
+	
+		case TYPE_GAME_WII_IMG		: return "Wii_Image";
+		case TYPE_GAME_WII_DISC		: return "Wii_Disc";
+		case TYPE_GAME_GC_IMG		: return "Gamecube_Image";
+		case TYPE_GAME_GC_DISC		: return "Gamecube_Disc";
+		case TYPE_GAME_GC_EXTRACTED	: return "Gamecube_Extracted";
+		case TYPE_GAME_NANDCHAN		: return "Channel_NAND";
+		case TYPE_GAME_EMUNANDCHAN	: return "Channel_EmuNAND";
+		default						: return "Unknown";
+	}
+}
+
 /****************************************************************************
  * gameinfo
  ***************************************************************************/
@@ -1107,13 +1147,13 @@ bool save_gamelist(bool bCSV) // save gamelist
 
 	if (bCSV)
 	{
-		fprintf(f, "\"ID\",\"Size(GB)\",\"Name\"\n");
+		fprintf(f, "\"ID\",\"Size(GB)\",\"Name\",\"Type\",\"Console\"\n");
 
 		for (i = 0; i < gameList.size(); i++)
 		{
 			struct discHdr* header = gameList[i];
 			WBFS_GameSize(header->id, &size);
-			fprintf(f, "\"%.6s\",\"%.2f\",\"%s\"\n", (char*)header->id, size, GameTitles.GetTitle(header));
+			fprintf(f, "\"%.6s\",\"%.2f\",\"%s\",\"%s\",\"%s\"\n", (char*)header->id, size, GameTitles.GetTitle(header), HdrTypeText(header->type), ConsoleFromTitleID((char*)header->id));
 		}
 	}
 	else
@@ -1122,7 +1162,7 @@ bool save_gamelist(bool bCSV) // save gamelist
 		fprintf(f, "# This file was created based on your list of games and language settings.\n\n");
 
 		fprintf(f, "%.2fGB %s %.2fGB %s\n\n", freespace, tr( "of" ), (freespace + used), tr( "free" ));
-		fprintf(f, "ID	 Size(GB)  Name\n");
+		fprintf(f, "ID	 Size(GB)  Name        ;   Game type    ;   Console (based on TitleID) \n");
 
 		for (i = 0; i < gameList.size(); i++)
 		{
@@ -1130,7 +1170,9 @@ bool save_gamelist(bool bCSV) // save gamelist
 			WBFS_GameSize(header->id, &size);
 			fprintf(f, "%.6s", (char*)header->id);
 			fprintf(f, " [%.2f]   ", size);
-			fprintf(f, " %s", GameTitles.GetTitle(header));
+			fprintf(f, " %s ; ", GameTitles.GetTitle(header));
+			fprintf(f, " %s ; ", HdrTypeText(header->type));
+			fprintf(f, " %s  ", ConsoleFromTitleID((char*)header->id));
 			fprintf(f, "\n");
 		}
 	}
diff --git a/source/settings/menus/FeatureSettingsMenu.cpp b/source/settings/menus/FeatureSettingsMenu.cpp
index 517e305b..fa3322f8 100644
--- a/source/settings/menus/FeatureSettingsMenu.cpp
+++ b/source/settings/menus/FeatureSettingsMenu.cpp
@@ -32,8 +32,9 @@
 #include "settings/SettingsPrompts.h"
 #include "network/Wiinnertag.h"
 #include "network/networkops.h"
-#include "network/http.h"
 #include "FileOperations/fileops.h"
+#include "FileOperations/DirList.h"
+#include "utils/StringTools.h"
 #include "prompts/PromptWindows.h"
 #include "prompts/ProgressWindow.h"
 #include "prompts/filebrowser.h"
@@ -74,8 +75,8 @@ FeatureSettingsMenu::FeatureSettingsMenu()
 	Options->SetName(Idx++, "%s", tr( "Export Miis to EmuNand" ));
 	Options->SetName(Idx++, "%s", tr( "Export SYSCONF to EmuNand" ));
 	Options->SetName(Idx++, "%s", tr( "Dump NAND to EmuNand" ));
-	Options->SetName(Idx++, "%s", tr( "Install WAD to EmuNand" ));
-	Options->SetName(Idx++, "%s", tr( "Update Nintendont" ));
+	Options->SetName(Idx++, "%s", tr( "EmuNAND Wad Manager" ));
+//	Options->SetName(Idx++, "%s", tr( "Update Nintendont" ));
 	Options->SetName(Idx++, "%s", tr( "WiiU Widescreen" ));
 	Options->SetName(Idx++, "%s", tr( "Boot Neek System Menu" ));
 
@@ -152,11 +153,11 @@ void FeatureSettingsMenu::SetOptionValues()
 	//! Settings: Dump NAND to EmuNand
 	Options->SetValue(Idx++, " ");
 
-	//! Settings: Install WAD to EmuNand
+	//! Settings: EmuNand Wad Manager
 	Options->SetValue(Idx++, " ");
 
 	//! Settings: Update Nintendont
-	Options->SetValue(Idx++, " ");
+	//Options->SetValue(Idx++, " ");
 
 	//! Settings: WiiU Widescreen
 	Options->SetValue(Idx++, " ");
@@ -485,7 +486,7 @@ int FeatureSettingsMenu::GetMenuInternal()
 		}
 	}
 
-	//! Settings: Install WAD to EmuNand
+	//! Settings: EmuNand Wad Manager
 	else if (ret == ++Idx)
 	{
 		GuiWindow * parent = (GuiWindow *) parentElement;
@@ -495,23 +496,131 @@ int FeatureSettingsMenu::GetMenuInternal()
 
 		char wadpath[150];
 		snprintf(wadpath, sizeof(wadpath), "%s/wad/", Settings.BootDevice);
-
-		int result = BrowseDevice(wadpath, sizeof(wadpath), FB_DEFAULT);
-		if(result)
+		
+		int choice = WindowPrompt(tr("EmuNAND Wad Manager"), tr("Which mode do you want to use?"), tr("File"), tr("Folder"), tr("Cancel"));
+		if(choice == 1) 			// File mode
 		{
-			int choice = WindowPrompt(tr("WAD Installation"), tr("What do you want to do?"), tr("Install"), tr("Uninstall"), tr("Cancel"));
-			if(choice == 1)
+			int result = BrowseDevice(wadpath, sizeof(wadpath), FB_DEFAULT );
+			if(result)
 			{
-				Wad wadFile(wadpath);
-				wadFile.Install(Settings.NandEmuChanPath);
+				choice = WindowPrompt(tr("EmuNAND Wad Manager"), tr("What do you want to do?"), tr("Install"), tr("Uninstall"), tr("Cancel"));
+				if(choice == 1) 	// File install
+				{
+					Wad wadFile(wadpath);
+					if(!wadFile.Install(Settings.NandEmuChanPath))
+					{
+						// install error - Try to cleanup any partially installed wad data
+						WindowPrompt(tr("EmuNAND Wad Manager"), tr("Install error - Cleaning incomplete data."), tr( "OK" ));
+						//gprintf("Error   : %s\n", wadpath);
+						wadFile.UnInstall(Settings.NandEmuChanPath);
+					}
+				}
+				else if(choice == 2) // File uninstall
+				{
+					Wad wadFile(wadpath);
+					wadFile.UnInstall(Settings.NandEmuChanPath);
+				}
+				
+				// Refresh new EmuNAND content
 				Channels::Instance()->GetEmuChannelList();
 				GameTitles.LoadTitlesFromGameTDB(Settings.titlestxt_path);
 			}
-			else if(choice == 2)
+		}
+		else if(choice == 2)		// Folder mode
+		{
+			int result = BrowseDevice(wadpath, sizeof(wadpath), FB_DEFAULT, noFILES );
+			if(result)
 			{
-				Wad wadFile(wadpath);
-				wadFile.UnInstall(Settings.NandEmuChanPath);
-				Channels::Instance()->GetEmuChannelList();
+				DirList* wadList = new DirList(wadpath, ".wad", DirList::Files);
+				if(wadList->GetFilecount())
+				{
+					char found[20];
+					snprintf(found, sizeof(found), fmt(tr("%i wad found."), wadList->GetFilecount()));
+					choice = WindowPrompt(tr("EmuNAND Wad Manager"), fmt("%s %s", found, tr("What do you want to do?")), tr("Install"), tr("Uninstall"), tr("Cancel"));
+					if(choice == 1) // Folder install
+					{
+						for(int i = 0; i < wadList->GetFilecount(); i++)
+						{
+							Wad wadFile(wadList->GetFilepath(i), false);
+							if(wadFile.Install(Settings.NandEmuChanPath))
+							{
+								//gprintf("Success : %s\n", wadList->GetFilepath(i));
+								wadList->RemoveEntrie(i);
+								--i;
+							}
+							else 	// install error - Try to cleanup any partially installed wad data
+							{
+								//gprintf("Error   : %s\n", wadList->GetFilepath(i));
+								wadFile.UnInstall(Settings.NandEmuChanPath);
+							}
+						}
+					}
+					if(choice == 2) // Folder uninstall
+					{
+						if(WindowPrompt(tr("EmuNAND Wad Manager"), tr("Attention: All savegames will be deleted."), tr("Uninstall"), tr("Cancel")))
+						{
+							for(int i = 0; i < wadList->GetFilecount(); i++)
+							{
+								Wad wadFile(wadList->GetFilepath(i), false);
+								if(wadFile.UnInstall(Settings.NandEmuChanPath))
+								{
+									//gprintf("uninst. : %s\n", wadList->GetFilepath(i));
+									wadList->RemoveEntrie(i);
+									--i;
+								}
+							}
+						}
+						else
+							choice = 0;
+					}
+
+					// check if there is any remaining unprocessed wad
+					if(choice != 0)
+					{
+						if(wadList->GetFilecount() == 0)
+							WindowPrompt(tr("EmuNAND Wad Manager"), tr("All wad files processed successfully."), tr( "OK" ));
+						else
+						{
+							if(WindowPrompt(tr( "EmuNAND Wad Manager" ), fmt(tr("%i wad file(s) not processed!"), wadList->GetFilecount()), tr("Save List"), tr( "OK" )))
+							{
+								char path[200];
+								snprintf(path, sizeof(path), "%s/WadManager_errors.txt", Settings.update_path);
+
+								FILE *f = fopen(path, "a");
+								if(f)
+								{
+									time_t rawtime = time(NULL);
+									char theTime[11];
+									theTime[0] = 0;
+									strftime(theTime, sizeof(theTime), "%Y-%m-%d", localtime(&rawtime));
+									fprintf(f, "\r\n\r\nEmuNAND Wad Manager - %10s\r\n--------------------------------\r\n", theTime);
+									fprintf(f, "%s %s\r\n", choice == 1 ? "Error installing to" : "Error uninstalling from", Settings.NandEmuChanPath);
+									fprintf(f, "%s\r\n", choice == 1 ? "List of user canceled installation or bad wad files." : "Titles not on EmuNAND or weren't correctly installed.");
+									
+									for(int i = 0; i < wadList->GetFilecount(); i++)
+									{
+										fprintf(f, "%s\r\n", wadList->GetFilepath(i));
+										//gprintf("%s\n", wadList->GetFilepath(i));
+									}
+
+									fclose(f);
+								}
+								else
+									WindowPrompt(tr( "EmuNAND Wad Manager" ), tr("Error writing the data."), tr( "OK" ));
+							}
+						}		
+					}
+						
+					// Refresh new EmuNAND content
+					Channels::Instance()->GetEmuChannelList();
+					GameTitles.LoadTitlesFromGameTDB(Settings.titlestxt_path);
+				}
+				else
+				{
+					WindowPrompt(tr( "EmuNAND Wad Manager" ), tr("No wad file found in this folder."), tr( "OK" ));
+				}
+				
+				delete wadList;
 			}
 		}
 
@@ -519,6 +628,7 @@ int FeatureSettingsMenu::GetMenuInternal()
 		this->Append(optionBrowser);
 	}
 
+/*
 	//! Settings: Update Nintendont
 	else if (ret == ++Idx)
 	{
@@ -578,6 +688,7 @@ int FeatureSettingsMenu::GetMenuInternal()
 			}
 		}
 	}
+*/
 
 	// WiiU Aspect switcher (Thanks Tueidj)
 	else if (ret == ++Idx)
diff --git a/source/utils/wifi_gecko.c b/source/utils/wifi_gecko.c
index 2eabb4f4..d3c978d2 100644
--- a/source/utils/wifi_gecko.c
+++ b/source/utils/wifi_gecko.c
@@ -30,7 +30,7 @@
 #include <unistd.h>
 #include <network.h>
 
-#define DESTINATION_IP	  "192.168.0.255"
+#define DESTINATION_IP	  "192.168.1.255"
 #define DESTINATION_PORT	4405
 
 static int connection = -1;
diff --git a/source/wad/wad.cpp b/source/wad/wad.cpp
index 35706142..868adc74 100644
--- a/source/wad/wad.cpp
+++ b/source/wad/wad.cpp
@@ -43,12 +43,13 @@ typedef struct uid_entry {
 	u32 uid;
 } __attribute__((packed)) uid_entry_t;
 
-Wad::Wad(const char *wadpath)
+Wad::Wad(const char *wadpath, bool prompt)
 	: pFile(0), header(0),
 	  p_tik(0), p_tmd(0),
 	  content_map(0), content_map_size(0),
 	  content_start(0)
 {
+	showPrompt = prompt;
 	Open(wadpath);
 }
 
@@ -90,7 +91,8 @@ bool Wad::Open(const char *wadpath)
 	pFile = fopen(wadpath, "rb");
 	if(!pFile)
 	{
-		ShowError(tr("Can't open file: %s"), wadpath);
+		if(showPrompt)
+			ShowError(tr("Can't open file: %s"), wadpath);
 		return false;
 	}
 
@@ -98,20 +100,23 @@ bool Wad::Open(const char *wadpath)
 	header = (wadHeader *) malloc(sizeof(wadHeader));
 	if(!header)
 	{
-		ShowError(tr("Not enough memory."));
+		if(showPrompt)
+			ShowError(tr("Not enough memory."));
 		return false;
 	}
 
 	if(fread(header, 1, sizeof(wadHeader), pFile) != sizeof(wadHeader))
 	{
-		ShowError(tr("Failed to read wad header."));
+		if(showPrompt)
+			ShowError(tr("Failed to read wad header."));
 		return false;
 	}
 
 	// Check for sanity
 	if(header->header_len != sizeof(wadHeader))
 	{
-		ShowError(tr("Invalid wad file."));
+		if(showPrompt)
+			ShowError(tr("Invalid wad file."));
 		return false;
 	}
 
@@ -124,7 +129,8 @@ bool Wad::Open(const char *wadpath)
 	p_tik = (u8 *) malloc(header->tik_len);
 	if(!p_tik)
 	{
-		ShowError(tr("Not enough memory."));
+		if(showPrompt)
+			ShowError(tr("Not enough memory."));
 		return false;
 	}
 
@@ -132,7 +138,8 @@ bool Wad::Open(const char *wadpath)
 
 	if(fread(p_tik, 1, header->tik_len, pFile) != header->tik_len)
 	{
-		ShowError(tr("Failed to read ticket."));
+		if(showPrompt)
+			ShowError(tr("Failed to read ticket."));
 		return false;
 	}
 
@@ -142,7 +149,8 @@ bool Wad::Open(const char *wadpath)
 	p_tmd = (u8 *) malloc(header->tmd_len);
 	if(!p_tik)
 	{
-		ShowError(tr("Not enough memory."));
+		if(showPrompt)
+			ShowError(tr("Not enough memory."));
 		return false;
 	}
 
@@ -150,7 +158,8 @@ bool Wad::Open(const char *wadpath)
 
 	if(fread(p_tmd, 1, header->tmd_len, pFile) != header->tmd_len)
 	{
-		ShowError(tr("Failed to read tmd file."));
+		if(showPrompt)
+			ShowError(tr("Failed to read tmd file."));
 		return false;
 	}
 
@@ -170,6 +179,13 @@ bool Wad::UnInstall(const char *installpath)
 	char filepath[1024];
 	tmd *tmd_data = (tmd *) SIGNATURE_PAYLOAD((signed_blob *) p_tmd);
 
+	// trim ending slash
+	while(installpath[strlen(installpath)-1] == '/')
+	{
+		char *pathPtr = strrchr(installpath, '/');
+		if(pathPtr) *pathPtr = 0;
+	}
+	
 	int result = true;
 
 	// Remove ticket
@@ -222,7 +238,7 @@ bool Wad::Install(const char *installpath)
 	ProgressCancelEnable(true);
 	StartProgress(0, 0, 0, true, true);
 
-	// Install contens
+	// Install contents
 	bool result = InstallContents(installpath);
 
 	// Stop progress
@@ -244,14 +260,15 @@ bool Wad::WriteFile(const char *filepath, u8 *buffer, u32 len)
 	FILE *f = fopen(filepath, "wb");
 	if(!f)
 	{
-		ShowError(tr("Can't create file: %s"), filepath);
+		if(showPrompt)
+			ShowError(tr("Can't create file: %s"), filepath);
 		return false;
 	}
 
 	u32 write = fwrite(buffer, 1, len, f);
 	fclose(f);
 
-	if(write != len)
+	if(write != len && showPrompt)
 		ShowError(tr("Write error on file: %s"), filepath);
 
 	return (write == len);
@@ -267,6 +284,7 @@ bool Wad::InstallContents(const char *installpath)
 	char filepath[1024];
 	char progressTxt[80];
 	u8 iv[16];
+	bool userCanceled = false;
 
 	// tmd
 	tmd *tmd_data = (tmd *) SIGNATURE_PAYLOAD((signed_blob *) p_tmd);
@@ -321,7 +339,8 @@ bool Wad::InstallContents(const char *installpath)
 		FILE *fp = fopen(filepath, "wb");
 		if(!fp)
 		{
-			ShowError(tr("Can't create file: %s"), filepath);
+			if(showPrompt)
+				ShowError(tr("Can't create file: %s"), filepath);
 			return false;
 		}
 
@@ -329,7 +348,8 @@ bool Wad::InstallContents(const char *installpath)
 		u8 * outbuf = (u8 *) malloc(blocksize);
 		if(!inbuf || !outbuf)
 		{
-			ShowError(tr("Not enough memory."));
+			if(showPrompt)
+				ShowError(tr("Not enough memory."));
 			if(inbuf) free(inbuf);
 			if(outbuf) free(outbuf);
 			fclose(fp);
@@ -346,7 +366,7 @@ bool Wad::InstallContents(const char *installpath)
 		{
 			if(ProgressCanceled())
 			{
-				done = len;
+				userCanceled = true;
 				break;
 			}
 
@@ -388,10 +408,15 @@ bool Wad::InstallContents(const char *installpath)
 		// update progress variable
 		totalDone += len;
 
+		// Check if the user canceled the install manually
+		if(userCanceled)
+			return false;
+		
 		// Check if the read/write process stopped before finishing
 		if(done < len)
 		{
-			ShowError(tr("File read/write error."));
+			if(showPrompt)
+				ShowError(tr("File read/write error."));
 			return false;
 		}
 	}
@@ -407,7 +432,8 @@ int Wad::CheckContentMap(const char *installpath, tmd_content *content, char *fi
 		snprintf(filepath, 1024, "%s/shared1/content.map", installpath);
 		if(LoadFileToMem(filepath, &content_map, &content_map_size) < 0 || content_map_size < sizeof(map_entry_t))
 		{
-			ShowError(tr("Can't read file: %s"), filepath);
+			if(showPrompt)
+				ShowError(tr("Can't read file: %s"), filepath);
 			return -1;
 		}
 
@@ -427,7 +453,8 @@ int Wad::CheckContentMap(const char *installpath, tmd_content *content, char *fi
 	u8 *tmp = (u8 *) realloc(content_map, (next_entry + 1) * sizeof(map_entry_t));
 	if(!tmp)
 	{
-		ShowError(tr("Not enough memory."));
+		if(showPrompt)
+			ShowError(tr("Not enough memory."));
 		return -1;
 	}
 
@@ -459,7 +486,8 @@ bool Wad::SetTitleUID(const char *installpath, const u64 &tid)
 
 	if(LoadFileToMem(filepath, &uid_sys, &uid_sys_size) < 0 || uid_sys_size < sizeof(uid_entry_t))
 	{
-		ShowError(tr("Can't read file: %s"), filepath);
+		if(showPrompt)
+			ShowError(tr("Can't read file: %s"), filepath);
 		if(uid_sys) free(uid_sys);
 		return false;
 	}
@@ -482,7 +510,8 @@ bool Wad::SetTitleUID(const char *installpath, const u64 &tid)
 	u8 *tmp = (u8 *) realloc(uid_sys, (next_entry + 1) * sizeof(uid_entry_t));
 	if(!tmp)
 	{
-		ShowError(tr("Not enough memory."));
+		if(showPrompt)
+			ShowError(tr("Not enough memory."));
 		free(uid_sys);
 		return -1;
 	}
diff --git a/source/wad/wad.h b/source/wad/wad.h
index 7bb6ff2c..dab23006 100644
--- a/source/wad/wad.h
+++ b/source/wad/wad.h
@@ -39,12 +39,13 @@ typedef struct
 class Wad
 {
 public:
-	Wad(const char *wadpath = 0);
+	Wad(const char *wadpath = 0, bool prompt = true);
 	virtual ~Wad();
 	bool Open(const char *wadpath);
 	void Close(void);
 	bool Install(const char *installpath);
 	bool UnInstall(const char *installpath);
+	void SetPrompt(bool choice) { showPrompt = choice; };
 private:
 	bool InstallContents(const char *installpath);
 	int CheckContentMap(const char *installpath, tmd_content *content, char *filepath);
@@ -57,6 +58,7 @@ private:
 	u8 *content_map;
 	u32 content_map_size;
 	u32 content_start;
+	bool showPrompt;
 };
 
 #endif