diff --git a/Languages/danish.lang b/Languages/danish.lang
index 125077c6..954127c9 100644
--- a/Languages/danish.lang
+++ b/Languages/danish.lang
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-11 09:19-0400\n"
+"POT-Creation-Date: 2009-07-12 07:20-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
diff --git a/Languages/dutch.lang b/Languages/dutch.lang
index 785754af..8d102441 100644
--- a/Languages/dutch.lang
+++ b/Languages/dutch.lang
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-11 09:19-0400\n"
+"POT-Creation-Date: 2009-07-12 07:20-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
diff --git a/Languages/english.lang b/Languages/english.lang
index 31f54e73..91390759 100644
--- a/Languages/english.lang
+++ b/Languages/english.lang
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-11 09:19-0400\n"
+"POT-Creation-Date: 2009-07-12 07:20-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
diff --git a/Languages/finnish.lang b/Languages/finnish.lang
index de70f0e2..82ef9127 100644
--- a/Languages/finnish.lang
+++ b/Languages/finnish.lang
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-11 09:19-0400\n"
+"POT-Creation-Date: 2009-07-12 07:20-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
diff --git a/Languages/french.lang b/Languages/french.lang
index 9855ee0b..45525dd1 100644
--- a/Languages/french.lang
+++ b/Languages/french.lang
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-11 09:19-0400\n"
+"POT-Creation-Date: 2009-07-12 07:20-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
diff --git a/Languages/german.lang b/Languages/german.lang
index 84c8485e..aa44c392 100644
--- a/Languages/german.lang
+++ b/Languages/german.lang
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-11 09:19-0400\n"
+"POT-Creation-Date: 2009-07-12 07:20-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
diff --git a/Languages/italian.lang b/Languages/italian.lang
index d2dd97e7..2f3f72e7 100644
--- a/Languages/italian.lang
+++ b/Languages/italian.lang
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-11 09:19-0400\n"
+"POT-Creation-Date: 2009-07-12 07:20-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
diff --git a/Languages/japanese.lang b/Languages/japanese.lang
index 86416c12..2557baf9 100644
--- a/Languages/japanese.lang
+++ b/Languages/japanese.lang
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-11 09:19-0400\n"
+"POT-Creation-Date: 2009-07-12 07:20-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
diff --git a/Languages/korean.lang b/Languages/korean.lang
index f13d6164..56e25b76 100644
--- a/Languages/korean.lang
+++ b/Languages/korean.lang
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-11 09:19-0400\n"
+"POT-Creation-Date: 2009-07-12 07:20-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
diff --git a/Languages/norwegian.lang b/Languages/norwegian.lang
index aa964948..3feb24ef 100644
--- a/Languages/norwegian.lang
+++ b/Languages/norwegian.lang
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-11 09:19-0400\n"
+"POT-Creation-Date: 2009-07-12 07:20-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
diff --git a/Languages/portuguese_br.lang b/Languages/portuguese_br.lang
index fe40caa8..d1dfca03 100644
--- a/Languages/portuguese_br.lang
+++ b/Languages/portuguese_br.lang
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-11 09:19-0400\n"
+"POT-Creation-Date: 2009-07-12 07:20-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
diff --git a/Languages/portuguese_pt.lang b/Languages/portuguese_pt.lang
index ce1923e6..0754a2fb 100644
--- a/Languages/portuguese_pt.lang
+++ b/Languages/portuguese_pt.lang
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-11 09:19-0400\n"
+"POT-Creation-Date: 2009-07-12 07:20-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
diff --git a/Languages/russian.lang b/Languages/russian.lang
index 2044fb7f..d4a00a65 100644
--- a/Languages/russian.lang
+++ b/Languages/russian.lang
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-11 09:19-0400\n"
+"POT-Creation-Date: 2009-07-12 07:20-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
diff --git a/Languages/schinese.lang b/Languages/schinese.lang
index c0fcec37..7cb87cb8 100644
--- a/Languages/schinese.lang
+++ b/Languages/schinese.lang
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-11 09:19-0400\n"
+"POT-Creation-Date: 2009-07-12 07:20-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
diff --git a/Languages/spanish.lang b/Languages/spanish.lang
index 882480c3..10586d47 100644
--- a/Languages/spanish.lang
+++ b/Languages/spanish.lang
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-11 09:19-0400\n"
+"POT-Creation-Date: 2009-07-12 07:20-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
diff --git a/Languages/swedish.lang b/Languages/swedish.lang
index af52b0e3..dcd7e41d 100644
--- a/Languages/swedish.lang
+++ b/Languages/swedish.lang
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-11 09:19-0400\n"
+"POT-Creation-Date: 2009-07-12 07:20-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
diff --git a/Languages/tchinese.lang b/Languages/tchinese.lang
index 1d36cfec..832adc81 100644
--- a/Languages/tchinese.lang
+++ b/Languages/tchinese.lang
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-11 09:19-0400\n"
+"POT-Creation-Date: 2009-07-12 07:20-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
diff --git a/Languages/turkish.lang b/Languages/turkish.lang
index 59798cb8..b503283b 100644
--- a/Languages/turkish.lang
+++ b/Languages/turkish.lang
@@ -4,7 +4,7 @@ msgid ""
msgstr ""
"Project-Id-Version: USB Loader GX\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-07-11 09:19-0400\n"
+"POT-Creation-Date: 2009-07-12 07:20-0400\n"
"PO-Revision-Date: \n"
"Last-Translator: \n"
"Language-Team: \n"
diff --git a/gui.pnproj b/gui.pnproj
index 1f81e925..dbfecb5d 100644
--- a/gui.pnproj
+++ b/gui.pnproj
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/gui.pnps b/gui.pnps
index 4c1815a0..a0b1534a 100644
--- a/gui.pnps
+++ b/gui.pnps
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/source/prompts/PromptWindows.cpp b/source/prompts/PromptWindows.cpp
index f506395b..a13731c9 100644
--- a/source/prompts/PromptWindows.cpp
+++ b/source/prompts/PromptWindows.cpp
@@ -171,9 +171,21 @@ void WindowCredits()
txt[i] = new GuiText(tr("Credits"), 26, (GXColor){255, 255, 255, 255});
txt[i]->SetAlignment(ALIGN_CENTRE, ALIGN_TOP); txt[i]->SetPosition(0,12); i++;
+
+ #ifdef NOTFULLCHANNEL
char SvnRev[30];
snprintf(SvnRev,sizeof(SvnRev), "Rev%s IOS%u (Rev %u)", SVN_REV, IOS_GetVersion(), IOS_GetRevision());
-
+ #else
+ char svnTmp[4];//did this to hide the M after the rev# that is made by altering it
+ //to be ready to be in a full channel
+ snprintf(svnTmp,sizeof(svnTmp), "%s", SVN_REV);
+ char SvnRev[30];
+ snprintf(SvnRev,sizeof(SvnRev), "Rev%s IOS%u (Rev %u)", svnTmp, IOS_GetVersion(), IOS_GetRevision());
+ #endif
+
+
+
+
txt[i] = new GuiText(SvnRev, 16, (GXColor){255, 255, 255, 255});
txt[i]->SetAlignment(ALIGN_RIGHT, ALIGN_TOP); txt[i]->SetPosition(0,y); i++; y+=34;
@@ -2592,7 +2604,7 @@ int ProgressUpdateWindow()
char dolpath[150];
// char dolpathsuccess[150];//use coverspath as a folder for the update wad so we dont make a new folder and have to delete it
- snprintf(dolpath, sizeof(dolpath), "%sUNEO.wad", Settings.covers_path);
+ snprintf(dolpath, sizeof(dolpath), "%sULNR.wad", Settings.covers_path);
//snprintf(dolpathsuccess, sizeof(dolpathsuccess), "%sUNEO.wad", Settings.covers_path);
while (!IsNetworkInit()) {
@@ -2630,8 +2642,8 @@ int ProgressUpdateWindow()
promptWindow.Append(&progressbarImg);
promptWindow.Append(&progressbarOutlineImg);
promptWindow.Append(&prTxt);
- msgTxt.SetTextf("%s Rev%i wad.", tr("Downloading"), newrev);//download the wad but it is saved as a txt file.
- s32 filesize = download_request("http://www.techjawa.com/usbloadergx/UNEO.txt");//for some reason it didn't download completely when saved as a wad.
+ msgTxt.SetTextf("%s Rev%i wad.", tr("Downloading"), newrev);//download the wad but it is saved as a genaric file.
+ s32 filesize = download_request("http://www.techjawa.com/usbloadergx/ULNR.file");//for some reason it didn't download completely when saved as a wad.
if(filesize > 0) {
FILE * pfile;
pfile = fopen(dolpath, "wb");//here we save the txt as a wad
@@ -2645,7 +2657,7 @@ int ProgressUpdateWindow()
progressbarImg.SetTile(100*i/filesize);
}
msg2Txt.SetTextf("%iKB/%iKB", i/1024, filesize/1024);
-
+
if(btn1.GetState() == STATE_CLICKED) {
fclose(pfile);
remove(dolpath);
@@ -2696,8 +2708,15 @@ int ProgressUpdateWindow()
}
}
+ promptWindow.SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_OUT, 50);
+ while(promptWindow.GetEffect() > 0) usleep(50);
+ HaltGui();
+ mainWindow->Remove(&promptWindow);
+ //mainWindow->SetState(STATE_DEFAULT);
+ ResumeGui();
CloseConnection();
+ sleep(1);//sleep 1 because it froze without this for some reason
if(!failed && ret >= 0) {
@@ -2733,11 +2752,11 @@ int ProgressUpdateWindow()
Sys_BackToLoader();
}
- promptWindow.SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_OUT, 50);
- while(promptWindow.GetEffect() > 0) usleep(50);
+ // promptWindow.SetEffect(EFFECT_SLIDE_TOP | EFFECT_SLIDE_OUT, 50);
+ //while(promptWindow.GetEffect() > 0) usleep(50);
HaltGui();
- mainWindow->Remove(&promptWindow);
+ //mainWindow->Remove(&promptWindow);
mainWindow->SetState(STATE_DEFAULT);
ResumeGui();
diff --git a/source/settings/Settings.cpp b/source/settings/Settings.cpp
index 5ae2992c..c34928b2 100644
--- a/source/settings/Settings.cpp
+++ b/source/settings/Settings.cpp
@@ -1193,7 +1193,7 @@ int MenuSettings()
options2.SetName(3, "%s", tr("titles.txt Path"));
options2.SetName(4, "%s", tr("Updatepath"));
options2.SetName(5, "%s", tr("Cheatcodes Path"));
- options2.SetName(6, "%s", tr("TXTCheatcodes Path"));
+ options2.SetName(6, "%s", tr("TXTCheatcodes Path"));
options2.SetName(7, "%s", tr("Dol Path"));
for(int i = 0; i <= MAXOPTIONS; i++) options2.SetValue(i, NULL);
w.Append(&optionBrowser2);