From bc98a3918701a07cf480838f3bd2542426751a3c Mon Sep 17 00:00:00 2001
From: Cyan <cyan06@users.noreply.github.com>
Date: Sun, 17 Jun 2012 18:02:25 +0000
Subject: [PATCH] * Optimizing previous changes (Thanks Dimok) * Fixed crashing
 problem when launching a game before banner caching is completed. (Dimok) *
 Fixed theme downloader stuck at 100% after unzipping. * Fixed prompt typo and
 prompt behavior when exiting the copy/delete GC menu. * Renamed string
 "Rename Game on WBFS" to "Rename Game Title".

---
 HBC/META.XML                            |  4 +--
 Languages/czech.lang                    | 11 ++++---
 Languages/danish.lang                   | 11 ++++---
 Languages/dutch.lang                    | 11 ++++---
 Languages/english.lang                  |  6 ++--
 Languages/finnish.lang                  |  9 ++++--
 Languages/french.lang                   | 13 +++++----
 Languages/german.lang                   | 12 ++++++--
 Languages/hungarian.lang                | 11 ++++---
 Languages/italian.lang                  | 11 ++++---
 Languages/japanese.lang                 | 12 ++++++--
 Languages/korean.lang                   | 11 ++++---
 Languages/norwegian.lang                | 11 ++++---
 Languages/polish.lang                   | 11 ++++---
 Languages/portuguese_br.lang            | 11 ++++---
 Languages/portuguese_pt.lang            | 11 ++++---
 Languages/russian.lang                  | 11 ++++---
 Languages/schinese.lang                 | 11 ++++---
 Languages/spanish.lang                  | 14 ++++++---
 Languages/swedish.lang                  | 11 ++++---
 Languages/tchinese.lang                 | 14 ++++++---
 Languages/thai.lang                     | 11 ++++---
 Languages/turkish.lang                  | 11 ++++---
 source/FileOperations/fileops.cpp       |  2 ++
 source/GUI/gui_checkboxbrowser.cpp      | 33 ++-------------------
 source/GUI/gui_checkboxbrowser.hpp      | 10 +------
 source/prompts/CategorySwitchPrompt.cpp | 38 ++++++++++++++-----------
 source/prompts/CategorySwitchPrompt.hpp |  7 -----
 source/prompts/GCDeleteMenu.cpp         |  2 +-
 source/prompts/GCMultiDiscMenu.cpp      |  2 +-
 source/prompts/GameWindow.cpp           |  2 +-
 source/sys.cpp                          |  3 +-
 source/usbloader/GameList.cpp           |  7 +++--
 33 files changed, 197 insertions(+), 158 deletions(-)

diff --git a/HBC/META.XML b/HBC/META.XML
index f906083a..29573cea 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 r1189</version>
-		<release_date>201206090828</release_date>
+		<version>3.0 r1190</version>
+		<release_date>201206171744</release_date>
 		<!--   // remove this line to enable arguments
 		<arguments>
 				<arg>--ios=250</arg>
diff --git a/Languages/czech.lang b/Languages/czech.lang
index 851d94d3..80c83eff 100644
--- a/Languages/czech.lang
+++ b/Languages/czech.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-18 16:22+0200\n"
+"POT-Creation-Date: 2012-06-17 19:45+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: David Jelinek (djelinek@hotmail.com) e->e,r->r,u->u, c->c \n"
 "Language-Team: r1056 - last version on http://djelinek.sweb.cz/_USBLoderGX/czech.lang \n"
@@ -620,7 +620,7 @@ msgstr ""
 msgid "Do you want to delete a game on SD?"
 msgstr ""
 
-msgid "Do you want to discart changes?"
+msgid "Do you want to discard changes?"
 msgstr ""
 
 msgid "Do you want to download this theme?"
@@ -1568,8 +1568,8 @@ msgstr ""
 msgid "Remove update"
 msgstr "Odstranit aktualizaci"
 
-msgid "Rename Game on WBFS"
-msgstr "Prejmenovat hru na WBFS"
+msgid "Rename Game Title"
+msgstr ""
 
 msgid "Rename category"
 msgstr ""
@@ -2111,6 +2111,9 @@ msgstr "z "
 msgid "seconds left"
 msgstr "sekund zbývá"
 
+#~ msgid "Rename Game on WBFS"
+#~ msgstr "Prejmenovat hru na WBFS"
+
 #~ msgid "Successfully Updated thanks to www.techjawa.com"
 #~ msgstr "Úspešne zaktualizováno díky www.techjawa.com"
 
diff --git a/Languages/danish.lang b/Languages/danish.lang
index a65ec9d4..f5c2dcef 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: 2012-05-18 16:22+0200\n"
+"POT-Creation-Date: 2012-06-17 19:45+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: Fox888[dk]\n"
 "Language-Team: [dk]\n"
@@ -620,7 +620,7 @@ msgstr ""
 msgid "Do you want to delete a game on SD?"
 msgstr ""
 
-msgid "Do you want to discart changes?"
+msgid "Do you want to discard changes?"
 msgstr ""
 
 msgid "Do you want to download this theme?"
@@ -1568,8 +1568,8 @@ msgstr "Husk at låse op"
 msgid "Remove update"
 msgstr "Fjern opdatering"
 
-msgid "Rename Game on WBFS"
-msgstr "Omdøb spil på WBFS"
+msgid "Rename Game Title"
+msgstr ""
 
 msgid "Rename category"
 msgstr "Omdøb kategori"
@@ -2111,6 +2111,9 @@ msgstr "af"
 msgid "seconds left"
 msgstr "sekunder tilbage"
 
+#~ msgid "Rename Game on WBFS"
+#~ msgstr "Omdøb spil på WBFS"
+
 #~ msgid "Successfully Updated thanks to www.techjawa.com"
 #~ msgstr "Opdateringen lykkedes takket været www.techjawa.com"
 
diff --git a/Languages/dutch.lang b/Languages/dutch.lang
index e2b90218..940aca23 100644
--- a/Languages/dutch.lang
+++ b/Languages/dutch.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-18 16:22+0200\n"
+"POT-Creation-Date: 2012-06-17 19:45+0200\n"
 "PO-Revision-Date: 2011-12-17 14:22+0100\n"
 "Last-Translator: Arthur117\n"
 "Language-Team: tj_cool, glowy, Arthur117\n"
@@ -620,7 +620,7 @@ msgstr ""
 msgid "Do you want to delete a game on SD?"
 msgstr ""
 
-msgid "Do you want to discart changes?"
+msgid "Do you want to discard changes?"
 msgstr ""
 
 msgid "Do you want to download this theme?"
@@ -1568,8 +1568,8 @@ msgstr "Unlock onthouden"
 msgid "Remove update"
 msgstr "Verwijder update"
 
-msgid "Rename Game on WBFS"
-msgstr "Spel hernoemen op WBFS"
+msgid "Rename Game Title"
+msgstr ""
 
 msgid "Rename category"
 msgstr "Hernoem categorie"
@@ -2111,6 +2111,9 @@ msgstr "van"
 msgid "seconds left"
 msgstr "seconden over"
 
+#~ msgid "Rename Game on WBFS"
+#~ msgstr "Spel hernoemen op WBFS"
+
 #~ msgid "Successfully Updated thanks to www.techjawa.com"
 #~ msgstr "Met succes ge-update met dank aan www.techjawa.com"
 
diff --git a/Languages/english.lang b/Languages/english.lang
index 967b161b..92af9248 100644
--- a/Languages/english.lang
+++ b/Languages/english.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-18 16:22+0200\n"
+"POT-Creation-Date: 2012-06-17 19:45+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
@@ -620,7 +620,7 @@ msgstr ""
 msgid "Do you want to delete a game on SD?"
 msgstr ""
 
-msgid "Do you want to discart changes?"
+msgid "Do you want to discard changes?"
 msgstr ""
 
 msgid "Do you want to download this theme?"
@@ -1568,7 +1568,7 @@ msgstr ""
 msgid "Remove update"
 msgstr ""
 
-msgid "Rename Game on WBFS"
+msgid "Rename Game Title"
 msgstr ""
 
 msgid "Rename category"
diff --git a/Languages/finnish.lang b/Languages/finnish.lang
index 421c0cb4..74032720 100644
--- a/Languages/finnish.lang
+++ b/Languages/finnish.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-18 16:22+0200\n"
+"POT-Creation-Date: 2012-06-17 19:45+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: c64rmx\n"
 "Language-Team: \n"
@@ -620,7 +620,7 @@ msgstr ""
 msgid "Do you want to delete a game on SD?"
 msgstr ""
 
-msgid "Do you want to discart changes?"
+msgid "Do you want to discard changes?"
 msgstr ""
 
 msgid "Do you want to download this theme?"
@@ -1568,7 +1568,7 @@ msgstr ""
 msgid "Remove update"
 msgstr ""
 
-msgid "Rename Game on WBFS"
+msgid "Rename Game Title"
 msgstr "Uudelleennimeä peli"
 
 msgid "Rename category"
@@ -2111,6 +2111,9 @@ msgstr "josta"
 msgid "seconds left"
 msgstr "sekuntia jäljellä"
 
+#~ msgid "Rename Game on WBFS"
+#~ msgstr "Uudelleennimeä peli"
+
 #~ msgid "for hosting the update files"
 #~ msgstr "Tiedostojen hostauksesta"
 
diff --git a/Languages/french.lang b/Languages/french.lang
index 69f536af..c33f1fe1 100644
--- a/Languages/french.lang
+++ b/Languages/french.lang
@@ -1,11 +1,11 @@
 # USB Loader GX language source file.
-# French.lang - r1188
+# French.lang - r1190
 # don't delete/change this line (é).
 msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-18 16:22+0200\n"
+"POT-Creation-Date: 2012-06-17 19:45+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: Cyan\n"
 "Language-Team: Badablek, Amour, ikya, Cyan & Kin8\n"
@@ -620,7 +620,7 @@ msgstr "Vous devez copier le jeu sur la carte SD."
 msgid "Do you want to delete a game on SD?"
 msgstr "Voulez-vous supprimer un jeu de la carte SD ?"
 
-msgid "Do you want to discart changes?"
+msgid "Do you want to discard changes?"
 msgstr "Voulez-vous annuler les changements ?"
 
 msgid "Do you want to download this theme?"
@@ -687,7 +687,7 @@ msgid "Downloading original Discarts"
 msgstr "Téléch. des labels DVD originaux"
 
 msgid "Downloading pagelist:"
-msgstr "Téléch. des prévisualisations :"
+msgstr "Téléch. liste des thèmes :"
 
 msgid "Dump NAND to EmuNand"
 msgstr "Extraire NAND vers ÉmuNand"
@@ -1568,7 +1568,7 @@ msgstr "Mémoriser le verrouillage"
 msgid "Remove update"
 msgstr "Supprimer MàJ"
 
-msgid "Rename Game on WBFS"
+msgid "Rename Game Title"
 msgstr "Renommer le jeu"
 
 msgid "Rename category"
@@ -2111,6 +2111,9 @@ msgstr "sur"
 msgid "seconds left"
 msgstr "secondes restantes"
 
+#~ msgid "Rename Game on WBFS"
+#~ msgstr "Renommer le jeu"
+
 #~ msgid "Beginning"
 #~ msgstr "Début"
 
diff --git a/Languages/german.lang b/Languages/german.lang
index 827c7d31..e3ab49d7 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: 2012-05-19 12:18+0200\n"
+"POT-Creation-Date: 2012-06-17 19:45+0200\n"
 "PO-Revision-Date: 2010-07-03 17:35-0800\n"
 "Last-Translator: TheRealVisitor\n"
 "Language-Team: Bertilax, Snoozer, wishmasterf, ZEN.13, TheRealVisitor\n"
@@ -620,7 +620,7 @@ msgstr "Soll ein Spiel auf die SD kopiert oder davon gelöscht werden?"
 msgid "Do you want to delete a game on SD?"
 msgstr "Soll ein Spiel von der SD gelöscht werden?"
 
-msgid "Do you want to discart changes?"
+msgid "Do you want to discard changes?"
 msgstr "Änderungen verwerfen?"
 
 msgid "Do you want to download this theme?"
@@ -1568,7 +1568,7 @@ msgstr "Entsperrung behalten"
 msgid "Remove update"
 msgstr "Update entfernen"
 
-msgid "Rename Game on WBFS"
+msgid "Rename Game Title"
 msgstr "Spiel umbenennen"
 
 msgid "Rename category"
@@ -2111,6 +2111,12 @@ msgstr "von"
 msgid "seconds left"
 msgstr "Sekunden verbleiben"
 
+#~ msgid "Rename Game on WBFS"
+#~ msgstr "Spiel umbenennen"
+
+#~ msgid "Do you want to discart changes?"
+#~ msgstr "Änderungen verwerfen?"
+
 #~ msgid "Beginning"
 #~ msgstr "Anfang"
 
diff --git a/Languages/hungarian.lang b/Languages/hungarian.lang
index 185b6a51..2f36f524 100644
--- a/Languages/hungarian.lang
+++ b/Languages/hungarian.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-18 16:22+0200\n"
+"POT-Creation-Date: 2012-06-17 19:45+0200\n"
 "PO-Revision-Date: 2009-12-29 11:05+0100\n"
 "Last-Translator: Springdale\n"
 "Language-Team: Tusk, Springdale\n"
@@ -620,7 +620,7 @@ msgstr ""
 msgid "Do you want to delete a game on SD?"
 msgstr ""
 
-msgid "Do you want to discart changes?"
+msgid "Do you want to discard changes?"
 msgstr ""
 
 msgid "Do you want to download this theme?"
@@ -1568,8 +1568,8 @@ msgstr ""
 msgid "Remove update"
 msgstr ""
 
-msgid "Rename Game on WBFS"
-msgstr "WBFS játék átnevezése"
+msgid "Rename Game Title"
+msgstr ""
 
 msgid "Rename category"
 msgstr ""
@@ -2111,6 +2111,9 @@ msgstr "./"
 msgid "seconds left"
 msgstr "hátralévõ másodperc"
 
+#~ msgid "Rename Game on WBFS"
+#~ msgstr "WBFS játék átnevezése"
+
 #~ msgid "for hosting the update files"
 #~ msgstr ": frissítési fájlok tárhelye"
 
diff --git a/Languages/italian.lang b/Languages/italian.lang
index fc626bf3..e52fa2ca 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: 2012-05-18 16:22+0200\n"
+"POT-Creation-Date: 2012-06-17 19:45+0200\n"
 "PO-Revision-Date: 2011-09-11 12:19+0100\n"
 "Last-Translator: xFede\n"
 "Language-Team: Cambo, xFede\n"
@@ -620,7 +620,7 @@ msgstr ""
 msgid "Do you want to delete a game on SD?"
 msgstr ""
 
-msgid "Do you want to discart changes?"
+msgid "Do you want to discard changes?"
 msgstr ""
 
 msgid "Do you want to download this theme?"
@@ -1568,8 +1568,8 @@ msgstr "Ricorda Sblocco"
 msgid "Remove update"
 msgstr "Rimuovi Agg."
 
-msgid "Rename Game on WBFS"
-msgstr "Rinomina Gioco in WBFS"
+msgid "Rename Game Title"
+msgstr ""
 
 msgid "Rename category"
 msgstr "Rinomina Categoria"
@@ -2111,6 +2111,9 @@ msgstr "di"
 msgid "seconds left"
 msgstr "secondi rimasti"
 
+#~ msgid "Rename Game on WBFS"
+#~ msgstr "Rinomina Gioco in WBFS"
+
 #~ msgid "Successfully Updated thanks to www.techjawa.com"
 #~ msgstr "Aggiornato Correttamente, grazie a www.techjawa.com"
 
diff --git a/Languages/japanese.lang b/Languages/japanese.lang
index 94c00396..2fb124fa 100644
--- a/Languages/japanese.lang
+++ b/Languages/japanese.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-18 16:22+0200\n"
+"POT-Creation-Date: 2012-06-17 19:45+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: hosigumayuugi\n"
 "Language-Team: hosigumayuugi\n"
@@ -1568,8 +1568,8 @@ msgstr "ロック解除を記憶"
 msgid "Remove update"
 msgstr "更新を取り除く"
 
-msgid "Rename Game on WBFS"
-msgstr "WBFS内のゲーム名を変更"
+msgid "Rename Game Title"
+msgstr ""
 
 msgid "Rename category"
 msgstr "カテゴリの名前を変更"
@@ -2111,6 +2111,12 @@ msgstr "中"
 msgid "seconds left"
 msgstr "秒で完了"
 
+#~ msgid "Rename Game on WBFS"
+#~ msgstr "WBFS内のゲーム名を変更"
+
+#~ msgid "Do you want to discart changes?"
+#~ msgstr "変更を破棄しますか?"
+
 #~ msgid "Successfully Updated thanks to www.techjawa.com"
 #~ msgstr "更新しました www.techjawa.comに感謝!"
 
diff --git a/Languages/korean.lang b/Languages/korean.lang
index 01e8ce28..a830a65d 100644
--- a/Languages/korean.lang
+++ b/Languages/korean.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-18 16:22+0200\n"
+"POT-Creation-Date: 2012-06-17 19:45+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: nextos@korea.com\n"
 "Language-Team: \n"
@@ -620,7 +620,7 @@ msgstr ""
 msgid "Do you want to delete a game on SD?"
 msgstr ""
 
-msgid "Do you want to discart changes?"
+msgid "Do you want to discard changes?"
 msgstr ""
 
 msgid "Do you want to download this theme?"
@@ -1568,8 +1568,8 @@ msgstr ""
 msgid "Remove update"
 msgstr ""
 
-msgid "Rename Game on WBFS"
-msgstr "WBFS에서 게임 이름 변경"
+msgid "Rename Game Title"
+msgstr ""
 
 msgid "Rename category"
 msgstr ""
@@ -2111,6 +2111,9 @@ msgstr "중"
 msgid "seconds left"
 msgstr "초 남았습니다"
 
+#~ msgid "Rename Game on WBFS"
+#~ msgstr "WBFS에서 게임 이름 변경"
+
 #~ msgid "for hosting the update files"
 #~ msgstr "업데이트 화일 호스팅을 위하여"
 
diff --git a/Languages/norwegian.lang b/Languages/norwegian.lang
index 466fc59c..d6740434 100644
--- a/Languages/norwegian.lang
+++ b/Languages/norwegian.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-18 16:22+0200\n"
+"POT-Creation-Date: 2012-06-17 19:45+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: raschi\n"
 "Language-Team: raschi\n"
@@ -620,7 +620,7 @@ msgstr ""
 msgid "Do you want to delete a game on SD?"
 msgstr ""
 
-msgid "Do you want to discart changes?"
+msgid "Do you want to discard changes?"
 msgstr ""
 
 msgid "Do you want to download this theme?"
@@ -1568,8 +1568,8 @@ msgstr ""
 msgid "Remove update"
 msgstr "Fjern oppdatering"
 
-msgid "Rename Game on WBFS"
-msgstr "Gi nytt navn til spill på WBFS"
+msgid "Rename Game Title"
+msgstr ""
 
 msgid "Rename category"
 msgstr "Gi nytt navn til kategori"
@@ -2111,6 +2111,9 @@ msgstr "av"
 msgid "seconds left"
 msgstr "sekunder gjenstår"
 
+#~ msgid "Rename Game on WBFS"
+#~ msgstr "Gi nytt navn til spill på WBFS"
+
 #~ msgid "Successfully Updated thanks to www.techjawa.com"
 #~ msgstr "Vellykket oppdatering takket være www.techjawa.com"
 
diff --git a/Languages/polish.lang b/Languages/polish.lang
index 7035c656..8d468971 100644
--- a/Languages/polish.lang
+++ b/Languages/polish.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-18 16:22+0200\n"
+"POT-Creation-Date: 2012-06-17 19:45+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: ziom666 (zadania_prog@vp.pl)\n"
 "Language-Team: \n"
@@ -620,7 +620,7 @@ msgstr ""
 msgid "Do you want to delete a game on SD?"
 msgstr ""
 
-msgid "Do you want to discart changes?"
+msgid "Do you want to discard changes?"
 msgstr ""
 
 msgid "Do you want to download this theme?"
@@ -1568,8 +1568,8 @@ msgstr ""
 msgid "Remove update"
 msgstr ""
 
-msgid "Rename Game on WBFS"
-msgstr "Zmien tytul gry na WBFS"
+msgid "Rename Game Title"
+msgstr ""
 
 msgid "Rename category"
 msgstr ""
@@ -2111,6 +2111,9 @@ msgstr "z"
 msgid "seconds left"
 msgstr "sekund pozostalo"
 
+#~ msgid "Rename Game on WBFS"
+#~ msgstr "Zmien tytul gry na WBFS"
+
 #~ msgid "for hosting the update files"
 #~ msgstr "za hostowanie plikow aktualizacji"
 
diff --git a/Languages/portuguese_br.lang b/Languages/portuguese_br.lang
index 3b96b6e9..de288a6d 100644
--- a/Languages/portuguese_br.lang
+++ b/Languages/portuguese_br.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-18 16:22+0200\n"
+"POT-Creation-Date: 2012-06-17 19:45+0200\n"
 "PO-Revision-Date: 2009-10-23 18:52+0200\n"
 "Last-Translator: aniemotion\n"
 "Language-Team: boto12, aniemotion\n"
@@ -620,7 +620,7 @@ msgstr ""
 msgid "Do you want to delete a game on SD?"
 msgstr ""
 
-msgid "Do you want to discart changes?"
+msgid "Do you want to discard changes?"
 msgstr ""
 
 msgid "Do you want to download this theme?"
@@ -1568,8 +1568,8 @@ msgstr ""
 msgid "Remove update"
 msgstr "Remover atualização"
 
-msgid "Rename Game on WBFS"
-msgstr "Alterar nome do jogo na partição WBFS"
+msgid "Rename Game Title"
+msgstr ""
 
 msgid "Rename category"
 msgstr ""
@@ -2111,6 +2111,9 @@ msgstr "de"
 msgid "seconds left"
 msgstr "segundos restantes"
 
+#~ msgid "Rename Game on WBFS"
+#~ msgstr "Alterar nome do jogo na partição WBFS"
+
 #~ msgid "Successfully Updated thanks to www.techjawa.com"
 #~ msgstr "Atualizado com sucesso graças a www.techjawa.com"
 
diff --git a/Languages/portuguese_pt.lang b/Languages/portuguese_pt.lang
index f16f3c75..e4d70248 100644
--- a/Languages/portuguese_pt.lang
+++ b/Languages/portuguese_pt.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-18 16:22+0200\n"
+"POT-Creation-Date: 2012-06-17 19:45+0200\n"
 "PO-Revision-Date: 2011-11-03 11:00+0000\n"
 "Last-Translator: pplucky <pplucky@gmail.com>\n"
 "Language-Team: Sky8000, pplucky\n"
@@ -620,7 +620,7 @@ msgstr ""
 msgid "Do you want to delete a game on SD?"
 msgstr ""
 
-msgid "Do you want to discart changes?"
+msgid "Do you want to discard changes?"
 msgstr ""
 
 msgid "Do you want to download this theme?"
@@ -1568,8 +1568,8 @@ msgstr "Lembrar Desbloqueio"
 msgid "Remove update"
 msgstr "Remover actualização"
 
-msgid "Rename Game on WBFS"
-msgstr "Renomear jogo (WBFS)"
+msgid "Rename Game Title"
+msgstr "Renomear jogo"
 
 msgid "Rename category"
 msgstr "Renomear categ."
@@ -2111,6 +2111,9 @@ msgstr "de"
 msgid "seconds left"
 msgstr "segundos restantes"
 
+#~ msgid "Rename Game on WBFS"
+#~ msgstr "Renomear jogo (WBFS)"
+
 #~ msgid "Successfully Updated thanks to www.techjawa.com"
 #~ msgstr "Actualizado com sucesso graças a www.techjawa.com"
 
diff --git a/Languages/russian.lang b/Languages/russian.lang
index 0536dab0..6753b1b3 100644
--- a/Languages/russian.lang
+++ b/Languages/russian.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-18 16:22+0200\n"
+"POT-Creation-Date: 2012-06-17 19:45+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: nikolai_ca\n"
 "Language-Team: Kir, alendit, nikolai_ca\n"
@@ -620,7 +620,7 @@ msgstr ""
 msgid "Do you want to delete a game on SD?"
 msgstr ""
 
-msgid "Do you want to discart changes?"
+msgid "Do you want to discard changes?"
 msgstr ""
 
 msgid "Do you want to download this theme?"
@@ -1568,8 +1568,8 @@ msgstr ""
 msgid "Remove update"
 msgstr ""
 
-msgid "Rename Game on WBFS"
-msgstr "Переименовать игры в WBFS"
+msgid "Rename Game Title"
+msgstr ""
 
 msgid "Rename category"
 msgstr ""
@@ -2111,6 +2111,9 @@ msgstr "из"
 msgid "seconds left"
 msgstr "секунд осталось"
 
+#~ msgid "Rename Game on WBFS"
+#~ msgstr "Переименовать игры в WBFS"
+
 #~ msgid "for hosting the update files"
 #~ msgstr "за хостинг обновлений"
 
diff --git a/Languages/schinese.lang b/Languages/schinese.lang
index c9282a95..bb3d588e 100644
--- a/Languages/schinese.lang
+++ b/Languages/schinese.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-18 16:22+0200\n"
+"POT-Creation-Date: 2012-06-17 19:45+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: knife.hu kavid emul8ion\n"
 "Language-Team: kavid\n"
@@ -620,7 +620,7 @@ msgstr ""
 msgid "Do you want to delete a game on SD?"
 msgstr ""
 
-msgid "Do you want to discart changes?"
+msgid "Do you want to discard changes?"
 msgstr ""
 
 msgid "Do you want to download this theme?"
@@ -1568,8 +1568,8 @@ msgstr ""
 msgid "Remove update"
 msgstr "删除更新"
 
-msgid "Rename Game on WBFS"
-msgstr "改变 WBFS (硬盘)上的游戏名称"
+msgid "Rename Game Title"
+msgstr ""
 
 msgid "Rename category"
 msgstr ""
@@ -2111,6 +2111,9 @@ msgstr "的"
 msgid "seconds left"
 msgstr "剩余秒数"
 
+#~ msgid "Rename Game on WBFS"
+#~ msgstr "改变 WBFS (硬盘)上的游戏名称"
+
 #~ msgid "Successfully Updated thanks to www.techjawa.com"
 #~ msgstr "更新成功.感谢www.techjawa.com"
 
diff --git a/Languages/spanish.lang b/Languages/spanish.lang
index 2b0e2c59..ee32d5ee 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: 2012-05-19 12:24+0200\n"
+"POT-Creation-Date: 2012-06-17 19:45+0200\n"
 "PO-Revision-Date: 2011-07-25 16:40+0200\n"
 "Last-Translator: Galen/xFede\n"
 "Language-Team: Penn, SirPalax, hvy109\n"
@@ -620,7 +620,7 @@ msgstr "¿Quieres copiar el juego a la tarjeta SD o borrar un juego en la tarjet
 msgid "Do you want to delete a game on SD?"
 msgstr "¿Quieres borrar un juego en la tarjeta SD?"
 
-msgid "Do you want to discart changes?"
+msgid "Do you want to discard changes?"
 msgstr "¿quieres descartar los cambios?"
 
 msgid "Do you want to download this theme?"
@@ -1568,8 +1568,8 @@ msgstr "Recordar bloqueo"
 msgid "Remove update"
 msgstr "Quitar actualización"
 
-msgid "Rename Game on WBFS"
-msgstr "Renombrar juego en WBFS"
+msgid "Rename Game Title"
+msgstr ""
 
 msgid "Rename category"
 msgstr "Renombrar categoría"
@@ -2111,6 +2111,12 @@ msgstr "de"
 msgid "seconds left"
 msgstr "segundos restantes"
 
+#~ msgid "Rename Game on WBFS"
+#~ msgstr "Renombrar juego en WBFS"
+
+#~ msgid "Do you want to discart changes?"
+#~ msgstr "¿quieres descartar los cambios?"
+
 #~ msgid "Successfully Updated thanks to www.techjawa.com"
 #~ msgstr "Actualización correcta gracias a www.techjawa.com"
 
diff --git a/Languages/swedish.lang b/Languages/swedish.lang
index aa870d52..201bc7fe 100644
--- a/Languages/swedish.lang
+++ b/Languages/swedish.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-18 16:22+0200\n"
+"POT-Creation-Date: 2012-06-17 19:45+0200\n"
 "PO-Revision-Date: 2010-01-19 17:39+0200\n"
 "Last-Translator: Katsurou\n"
 "Language-Team: Katsurou, pirateX\n"
@@ -620,7 +620,7 @@ msgstr ""
 msgid "Do you want to delete a game on SD?"
 msgstr ""
 
-msgid "Do you want to discart changes?"
+msgid "Do you want to discard changes?"
 msgstr ""
 
 msgid "Do you want to download this theme?"
@@ -1568,8 +1568,8 @@ msgstr ""
 msgid "Remove update"
 msgstr ""
 
-msgid "Rename Game on WBFS"
-msgstr "Döp om spel på WBFS"
+msgid "Rename Game Title"
+msgstr ""
 
 msgid "Rename category"
 msgstr ""
@@ -2111,6 +2111,9 @@ msgstr "av"
 msgid "seconds left"
 msgstr "sekunder kvar"
 
+#~ msgid "Rename Game on WBFS"
+#~ msgstr "Döp om spel på WBFS"
+
 #~ msgid "for hosting the update files"
 #~ msgstr "för lagring av uppdateringar"
 
diff --git a/Languages/tchinese.lang b/Languages/tchinese.lang
index a64c567b..b10b1aa6 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: 2012-05-19 12:20+0200\n"
+"POT-Creation-Date: 2012-06-17 19:45+0200\n"
 "PO-Revision-Date: 2010-02-15 21:00+0800\n"
 "Last-Translator: Jane.H\n"
 "Language-Team: kyogc, Miller, Mika Li, Jane.H\n"
@@ -620,7 +620,7 @@ msgstr "是否要複製遊戲到SD卡或刪除SD卡上的遊戲？"
 msgid "Do you want to delete a game on SD?"
 msgstr "是否要刪除SD卡上的遊戲？"
 
-msgid "Do you want to discart changes?"
+msgid "Do you want to discard changes?"
 msgstr "是否要放棄變更？"
 
 msgid "Do you want to download this theme?"
@@ -1568,8 +1568,8 @@ msgstr "儲存解鎖"
 msgid "Remove update"
 msgstr "移除更新"
 
-msgid "Rename Game on WBFS"
-msgstr "WBFS上的遊戲重新命名"
+msgid "Rename Game Title"
+msgstr ""
 
 msgid "Rename category"
 msgstr "類別重新命名"
@@ -2110,3 +2110,9 @@ msgstr "的"
 
 msgid "seconds left"
 msgstr "剩餘秒數"
+
+#~ msgid "Rename Game on WBFS"
+#~ msgstr "WBFS上的遊戲重新命名"
+
+#~ msgid "Do you want to discart changes?"
+#~ msgstr "是否要放棄變更？"
diff --git a/Languages/thai.lang b/Languages/thai.lang
index cfa9397c..27b20fe0 100644
--- a/Languages/thai.lang
+++ b/Languages/thai.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-18 16:22+0200\n"
+"POT-Creation-Date: 2012-06-17 19:45+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: Nitro_subzero \n"
 "Language-Team: Nitro_subzero\n"
@@ -620,7 +620,7 @@ msgstr ""
 msgid "Do you want to delete a game on SD?"
 msgstr ""
 
-msgid "Do you want to discart changes?"
+msgid "Do you want to discard changes?"
 msgstr ""
 
 msgid "Do you want to download this theme?"
@@ -1568,8 +1568,8 @@ msgstr ""
 msgid "Remove update"
 msgstr ""
 
-msgid "Rename Game on WBFS"
-msgstr "เปลี่ยนชื่อเกมส์บน WBFS"
+msgid "Rename Game Title"
+msgstr ""
 
 msgid "Rename category"
 msgstr ""
@@ -2111,6 +2111,9 @@ msgstr "จาก"
 msgid "seconds left"
 msgstr "วินาทีที่เหลือ"
 
+#~ msgid "Rename Game on WBFS"
+#~ msgstr "เปลี่ยนชื่อเกมส์บน WBFS"
+
 #~ msgid "for hosting the update files"
 #~ msgstr "สำหรับที่เก็บไฟล์อัพเดท"
 
diff --git a/Languages/turkish.lang b/Languages/turkish.lang
index dd462787..7aab4f21 100644
--- a/Languages/turkish.lang
+++ b/Languages/turkish.lang
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: USB Loader GX\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-18 16:22+0200\n"
+"POT-Creation-Date: 2012-06-17 19:45+0200\n"
 "PO-Revision-Date: 2009-10-01 01:00+0200\n"
 "Last-Translator: omercigingelini\n"
 "Language-Team: omercigingelini\n"
@@ -620,7 +620,7 @@ msgstr ""
 msgid "Do you want to delete a game on SD?"
 msgstr ""
 
-msgid "Do you want to discart changes?"
+msgid "Do you want to discard changes?"
 msgstr ""
 
 msgid "Do you want to download this theme?"
@@ -1568,8 +1568,8 @@ msgstr ""
 msgid "Remove update"
 msgstr ""
 
-msgid "Rename Game on WBFS"
-msgstr "WBFS'deki oyunu yeniden isimlendir"
+msgid "Rename Game Title"
+msgstr ""
 
 msgid "Rename category"
 msgstr ""
@@ -2111,6 +2111,9 @@ msgstr "./"
 msgid "seconds left"
 msgstr "saniye kaldı"
 
+#~ msgid "Rename Game on WBFS"
+#~ msgstr "WBFS'deki oyunu yeniden isimlendir"
+
 #~ msgid "for hosting the update files"
 #~ msgstr "güncelleme dosyalarını sunduğu için"
 
diff --git a/source/FileOperations/fileops.cpp b/source/FileOperations/fileops.cpp
index 49807921..b5453ea8 100644
--- a/source/FileOperations/fileops.cpp
+++ b/source/FileOperations/fileops.cpp
@@ -357,6 +357,8 @@ extern "C" int CopyFile(const char * src, const char * dest)
 	}
 	while (read > 0);
 
+	ProgressStop();
+	
 	free(buffer);
 	fclose(source);
 	fclose(destination);
diff --git a/source/GUI/gui_checkboxbrowser.cpp b/source/GUI/gui_checkboxbrowser.cpp
index 5e5226fb..3acd85ee 100644
--- a/source/GUI/gui_checkboxbrowser.cpp
+++ b/source/GUI/gui_checkboxbrowser.cpp
@@ -81,36 +81,7 @@ void GuiCheckboxBrowser::Clear()
 	checkBoxList.clear();
 }
 
-bool GuiCheckboxBrowser::AddEntrie(const string &text, bool checked)
-{
-	LOCK(this);
-	int currentSize = checkBoxList.size();
-	textLineList.resize(currentSize+1);
-	checkBoxList.resize(currentSize+1);
-
-	checkBoxList[currentSize] = new GuiCheckbox(30, 30);
-	checkBoxList[currentSize]->SetParent(this);
-	checkBoxList[currentSize]->SetChecked(checked);
-	checkBoxList[currentSize]->SetAlignment(ALIGN_RIGHT, ALIGN_TOP);
-	checkBoxList[currentSize]->SetTrigger(&trigA);
-	checkBoxList[currentSize]->SetClickSize(width-30-scrollBar.GetWidth(), 30);
-	checkBoxList[currentSize]->Clicked.connect(this, &GuiCheckboxBrowser::OnCheckboxClick);
-
-	textLineList[currentSize] = new GuiText(text.c_str(), 18, thColor("r=0 g=0 b=0 a=255 - checkbox browser text color"));
-	textLineList[currentSize]->SetParent(this);
-	textLineList[currentSize]->SetAlignment(ALIGN_LEFT, ALIGN_TOP);
-	textLineList[currentSize]->SetMaxWidth(maxTextWidth, DOTTED);
-
-	if(textLineDrawn.size() < (u32) maxSize)
-	{
-		textLineDrawn.push_back(textLineList[currentSize]);
-		checkBoxDrawn.push_back(checkBoxList[currentSize]);
-	}
-
-	return true;
-}
-
-bool GuiCheckboxBrowser::AddEntrieMultiStates(const string &text, bool checked, int style)
+bool GuiCheckboxBrowser::AddEntrie(const string &text, bool checked, int style, bool multistates)
 {
 	LOCK(this);
 	int currentSize = checkBoxList.size();
@@ -121,7 +92,7 @@ bool GuiCheckboxBrowser::AddEntrieMultiStates(const string &text, bool checked,
 	checkBoxList[currentSize]->SetParent(this);
 	checkBoxList[currentSize]->SetChecked(checked);
 	checkBoxList[currentSize]->SetStyle(style);
-	checkBoxList[currentSize]->SetMultiStates(true);
+	checkBoxList[currentSize]->SetMultiStates(multistates);
 	checkBoxList[currentSize]->SetAlignment(ALIGN_RIGHT, ALIGN_TOP);
 	checkBoxList[currentSize]->SetTrigger(&trigA);
 	checkBoxList[currentSize]->SetClickSize(width-30-scrollBar.GetWidth(), 30);
diff --git a/source/GUI/gui_checkboxbrowser.hpp b/source/GUI/gui_checkboxbrowser.hpp
index abc0bc97..1f70850d 100644
--- a/source/GUI/gui_checkboxbrowser.hpp
+++ b/source/GUI/gui_checkboxbrowser.hpp
@@ -36,8 +36,7 @@ class GuiCheckboxBrowser : public GuiElement, public sigslot::has_slots<>
 	public:
 		GuiCheckboxBrowser(int w, int h, int maxSize = 7);
 		virtual ~GuiCheckboxBrowser();
-		bool AddEntrie(const string &text, bool checked = false);
-		bool AddEntrieMultiStates(const string &text, bool checked = false, int style = CHECKSIGN);
+		bool AddEntrie(const string &text, bool checked = false, int style = GuiCheckbox::CHECKSIGN, bool multistates = false);
 		int GetSelected() const { return pageIndex+selectedItem; }
 		bool IsChecked(u32 i) { if(i >= checkBoxList.size()) return false; else return checkBoxList[i]->IsChecked(); }
 		GuiCheckbox *GetCheckbox(u32 i) { if(i >= checkBoxList.size()) return NULL; else return checkBoxList[i]; }
@@ -48,13 +47,6 @@ class GuiCheckboxBrowser : public GuiElement, public sigslot::has_slots<>
 		void Draw();
 		void Update(GuiTrigger *t);
 		sigslot::signal2<GuiCheckbox *, int> checkBoxClicked;
-		enum
-		{
-			CHECKSIGN,
-			CROSS,
-			PLUS,
-			MAX_CHECKBOX_STYLE
-		};
 	private:
 		void onListChange(int SelItem, int SelInd);
 		void OnCheckboxClick(GuiButton *sender, int chan, const POINT &pointer);
diff --git a/source/prompts/CategorySwitchPrompt.cpp b/source/prompts/CategorySwitchPrompt.cpp
index c91bfd86..eae679a3 100644
--- a/source/prompts/CategorySwitchPrompt.cpp
+++ b/source/prompts/CategorySwitchPrompt.cpp
@@ -52,7 +52,7 @@ void CategorySwitchPrompt::onBrowserRefresh()
 	do
 	{
 		bool checked = false;
-		int style = CHECKSIGN;
+		int style = GuiCheckbox::CHECKSIGN;
 
 		// Verify the Enabled Categories [v]
 		for(u32 i = 0; i < Settings.EnabledCategories.size(); ++i)
@@ -66,29 +66,33 @@ void CategorySwitchPrompt::onBrowserRefresh()
 		
 		// Verify the Forbidden Categories [X]
 		if(!checked)
-		for(u32 i = 0; i < Settings.ForbiddenCategories.size(); ++i)
 		{
-			if(Settings.ForbiddenCategories[i] == GameCategories.CategoryList.getCurrentID())
+			for(u32 i = 0; i < Settings.ForbiddenCategories.size(); ++i)
 			{
-				checked = true;
-				style = CROSS;
-				break;
+				if(Settings.ForbiddenCategories[i] == GameCategories.CategoryList.getCurrentID())
+				{
+					checked = true;
+					style = GuiCheckbox::CROSS;
+					break;
+				}
 			}
 		}
 		
 		// Verify the Required Categories [+]
 		if(!checked)
-		for(u32 i = 0; i < Settings.RequiredCategories.size(); ++i)
 		{
-			if(Settings.RequiredCategories[i] == GameCategories.CategoryList.getCurrentID())
+			for(u32 i = 0; i < Settings.RequiredCategories.size(); ++i)
 			{
-				checked = true;
-				style = PLUS;
-				break;
+				if(Settings.RequiredCategories[i] == GameCategories.CategoryList.getCurrentID())
+				{
+					checked = true;
+					style = GuiCheckbox::PLUS;
+					break;
+				}
 			}
 		}
 		
-		browser->AddEntrieMultiStates(tr(GameCategories.CategoryList.getCurrentName().c_str()), checked, style);
+		browser->AddEntrie(tr(GameCategories.CategoryList.getCurrentName().c_str()), checked, style, true);
 	}
 	while(GameCategories.CategoryList.goToNext());
 
@@ -116,13 +120,13 @@ void CategorySwitchPrompt::OnCheckboxClick(GuiCheckbox *checkBox, int index)
 			}
 		}
 	}
-	else if(checkBox->GetStyle() == CHECKSIGN)
+	else if(checkBox->GetStyle() == GuiCheckbox::CHECKSIGN)
 	{
 		// Add to Enabled
 		Settings.EnabledCategories.push_back(GameCategories.CategoryList.getCurrentID());
 		markChanged();
 	}
-	else if(checkBox->GetStyle() == CROSS)
+	else if(checkBox->GetStyle() == GuiCheckbox::CROSS)
 	{
 		// Remove from Enabled
 		for(i = 0; i < Settings.EnabledCategories.size(); ++i)
@@ -137,7 +141,7 @@ void CategorySwitchPrompt::OnCheckboxClick(GuiCheckbox *checkBox, int index)
 		Settings.ForbiddenCategories.push_back(GameCategories.CategoryList.getCurrentID());
 		markChanged();
 	}
-	else if(checkBox->GetStyle() == PLUS && index > 0)
+	else if(checkBox->GetStyle() == GuiCheckbox::PLUS && index > 0)
 	{
 		// Remove from Forbidden
 		for(i = 0; i < Settings.ForbiddenCategories.size(); ++i)
@@ -154,9 +158,9 @@ void CategorySwitchPrompt::OnCheckboxClick(GuiCheckbox *checkBox, int index)
 	}
 
 	// Override Style cycling for category "All"
-	if(index == 0 && checkBox->GetStyle() == PLUS)
+	if(index == 0 && checkBox->GetStyle() == GuiCheckbox::PLUS)
 	{
-		checkBox->SetStyle(CHECKSIGN);
+		checkBox->SetStyle(GuiCheckbox::CHECKSIGN);
 		checkBox->SetChecked(false);
 		for(i = 0; i < Settings.ForbiddenCategories.size(); ++i)
 		{
diff --git a/source/prompts/CategorySwitchPrompt.hpp b/source/prompts/CategorySwitchPrompt.hpp
index 0a867e8b..b5ed484b 100644
--- a/source/prompts/CategorySwitchPrompt.hpp
+++ b/source/prompts/CategorySwitchPrompt.hpp
@@ -40,11 +40,4 @@ class CategorySwitchPrompt : public CategoryPrompt
 		const std::vector<u32> oldSettingForbidden;
 };
 
-enum
-{
-	CHECKSIGN,
-	CROSS,
-	PLUS,
-	MAX_CHECKBOX_STYLE
-};
 #endif
diff --git a/source/prompts/GCDeleteMenu.cpp b/source/prompts/GCDeleteMenu.cpp
index 75192805..9e21fcdd 100644
--- a/source/prompts/GCDeleteMenu.cpp
+++ b/source/prompts/GCDeleteMenu.cpp
@@ -77,7 +77,7 @@ int GCDeleteMenu::Show()
 
 		else if(backBtn->GetState() == STATE_CLICKED)
 		{
-			if(!changed || !WindowPrompt(tr("Do you want to discart changes?"), 0, tr("Yes"), tr("No")))
+			if(!changed || WindowPrompt(tr("Do you want to discard changes?"), 0, tr("Yes"), tr("No")))
 				break;
 
 			backBtn->ResetState();
diff --git a/source/prompts/GCMultiDiscMenu.cpp b/source/prompts/GCMultiDiscMenu.cpp
index 4af93762..45b2ae17 100644
--- a/source/prompts/GCMultiDiscMenu.cpp
+++ b/source/prompts/GCMultiDiscMenu.cpp
@@ -55,7 +55,7 @@ int GCMultiDiscMenu::ShowSelection()
 
 		else if(backBtn->GetState() == STATE_CLICKED)
 		{
-			if(!changed || !WindowPrompt(tr("Do you want to discart changes?"), 0, tr("Yes"), tr("No")))
+			if(!changed || WindowPrompt(tr("Do you want to discard changes?"), 0, tr("Yes"), tr("No")))
 				break;
 
 			backBtn->ResetState();
diff --git a/source/prompts/GameWindow.cpp b/source/prompts/GameWindow.cpp
index 82c10253..8e7d11ac 100644
--- a/source/prompts/GameWindow.cpp
+++ b/source/prompts/GameWindow.cpp
@@ -82,7 +82,7 @@ GameWindow::GameWindow(GameBrowseMenu *m, struct discHdr *header)
 
 	dialogBoxImg = new GuiImage(dialogBox);
 
-	nameBtnTT = new GuiTooltip(tr( "Rename Game on WBFS" ));
+	nameBtnTT = new GuiTooltip(tr( "Rename Game Title" ));
 	if (Settings.wsprompt) nameBtnTT->SetWidescreen(Settings.widescreen);
 	nameTxt = new GuiText("", 22, thColor("r=0 g=0 b=0 a=255 - game window name text color"));
 	if (Settings.wsprompt) nameTxt->SetWidescreen(Settings.widescreen);
diff --git a/source/sys.cpp b/source/sys.cpp
index b9a2f433..b8be4d66 100644
--- a/source/sys.cpp
+++ b/source/sys.cpp
@@ -74,6 +74,8 @@ void AppCleanUp(void)
 
 	app_clean = true;
 
+	BannerAsync::ThreadExit();
+
 	if(Settings.CacheTitles)
 		GameTitles.WriteCachedTitles(Settings.titlestxt_path);
 	Settings.Save();
@@ -94,7 +96,6 @@ void AppCleanUp(void)
 
 	gettextCleanUp();
 	Theme::CleanUp();
-	BannerAsync::ThreadExit();
 	NewTitles::DestroyInstance();
 	ThreadedTask::DestroyInstance();
 	SoundHandler::DestroyInstance();
diff --git a/source/usbloader/GameList.cpp b/source/usbloader/GameList.cpp
index 1da98e52..ff720c0d 100644
--- a/source/usbloader/GameList.cpp
+++ b/source/usbloader/GameList.cpp
@@ -38,6 +38,8 @@
 #include "memory/memory.h"
 #include "Channels/channels.h"
 
+enum { DISABLED, ENABLED, HIDEFORBIDDEN };
+
 GameList gameList;
 
 void GameList::clear()
@@ -229,10 +231,9 @@ void GameList::InternalFilterList(std::vector<struct discHdr> &FullList)
 
 		//! Category filter
 		u32 n;
-		enum { DISABLED, ENABLED, HIDEFORBIDDEN };
 		int allType = DISABLED;
 		// verify the display mode for category "All"
-		for(u32 n = 0; n < Settings.EnabledCategories.size(); ++n)
+		for(n = 0; n < Settings.EnabledCategories.size(); ++n)
 		{
 			if(Settings.EnabledCategories[n] == 0)
 			{
@@ -240,7 +241,7 @@ void GameList::InternalFilterList(std::vector<struct discHdr> &FullList)
 				break;
 			}
 		}
-		for(u32 n = 0; n < Settings.ForbiddenCategories.size(); ++n)
+		for(n = 0; n < Settings.ForbiddenCategories.size(); ++n)
 		{
 			if(Settings.ForbiddenCategories[n] == 0)
 			{