From 63c146b528ed31816d325089705c25d1ee4d6d97 Mon Sep 17 00:00:00 2001 From: dimok321 <15055714+dimok789@users.noreply.github.com> Date: Sun, 9 Jan 2011 16:03:29 +0000 Subject: [PATCH] *Revert constant version number in credits (from release v2.0 to svn) *Redirected language download link to trunk *Fixed channel build *Updated german and french language file for v2.0 --- HBC/META.XML | 4 +-- Languages/french.lang | 46 +++++++++++++++--------------- Languages/german.lang | 2 +- source/language/UpdateLanguage.cpp | 2 +- source/libs/libwbfs/libwbfs_os.h | 5 ++-- source/network/update.cpp | 7 +++-- source/prompts/PromptWindows.cpp | 4 +-- 7 files changed, 37 insertions(+), 33 deletions(-) diff --git a/HBC/META.XML b/HBC/META.XML index 7108ced5..0f55bb24 100644 --- a/HBC/META.XML +++ b/HBC/META.XML @@ -2,8 +2,8 @@ USB Loader GX USB Loader GX Team - 2.0 r1036 - 201101081426 + 2.0 r1038 + 201101091047 Loads games from USB-devices USB Loader GX is a libwiigui based USB iso loader with a wii-like GUI. You can install games to your HDDs and boot them with shorter loading times. diff --git a/Languages/french.lang b/Languages/french.lang index 86d898a0..ccc77e83 100644 --- a/Languages/french.lang +++ b/Languages/french.lang @@ -1,13 +1,13 @@ # USB Loader GX language source file. -# French V14 r1033 +# French V15 r1037 (USBLoader GX v2.0) # don't delete/change this line (é). msgid "" msgstr "" "Project-Id-Version: USB Loader GX\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-01-09 11:32+0100\n" +"POT-Creation-Date: 2011-01-06 19:58+0100\n" "PO-Revision-Date: 2009-10-01 01:00+0200\n" -"Last-Translator: Andresayang, Cyan, jero\n" +"Last-Translator: Cyan\n" "Language-Team: Badablek, Amour, ikya & Kin8\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" @@ -216,7 +216,7 @@ msgid "Change Play Path" msgstr "Changer dossier" msgid "Cheatfile is blank" -msgstr "Fichier de triche vide" +msgstr "Fichier de triches vide" msgid "Clear" msgstr "Effacer" @@ -234,7 +234,7 @@ msgid "Close" msgstr "Fermer" msgid "Code Download" -msgstr "Téléchargement codes" +msgstr "Téléchargement des codes" #, c-format msgid "Coded by: %s" @@ -329,10 +329,10 @@ msgid "Delete ?" msgstr "Supprimer ?" msgid "Delete Cheat GCT" -msgstr "Supprimer GCT de triche" +msgstr "Supprimer GCT de triches" msgid "Delete Cheat TXT" -msgstr "Supprimer TXT de triche" +msgstr "Supprimer TXT de triches" msgid "Delete Cover Artwork" msgstr "Supprimer la jaquette" @@ -350,7 +350,7 @@ msgid "Directory does not exist!" msgstr "Répertoire inexistant!" msgid "Disc Artwork Download" -msgstr "Téléch. labels DVD" +msgstr "Téléch. des labels DVD" msgid "Disc Artwork Path" msgstr "Dossier labels DVD" @@ -395,7 +395,7 @@ msgid "Do you want to format:" msgstr "Voulez-vous formater:" msgid "Do you want to load the default theme?" -msgstr "Voulez vous charger le thème par défaut ?" +msgstr "Voulez-vous charger le thème par défaut ?" msgid "Do you want to load this theme?" msgstr "Voulez-vous charger ce thème ?" @@ -428,7 +428,7 @@ msgid "Downloading covers" msgstr "Téléchargement des jaquettes" msgid "Downloading custom Discarts" -msgstr "Téléchargement des labels DVD persos" +msgstr "Téléch. des labels DVD persos" msgid "Downloading file" msgstr "Téléchargement du fichier" @@ -440,7 +440,7 @@ msgid "Downloading image:" msgstr "Téléchargement de l'image:" msgid "Downloading original Discarts" -msgstr "Téléchargement des labels DVD originaux" +msgstr "Téléch. des labels DVD originaux" msgid "Downloading pagelist:" msgstr "Téléchargement de la liste:" @@ -578,7 +578,7 @@ msgid "GAMEID_Gamename" msgstr "IDJEU_NomJeu" msgid "GCT Cheatcodes Path" -msgstr "Dossier GCT de triche" +msgstr "Dossier GCT de triches" msgid "GCT File created" msgstr "Fichier GCT créé" @@ -596,7 +596,7 @@ msgid "Game Language" msgstr "Langue du jeu" msgid "Game Load" -msgstr "Chargement des jeux" +msgstr "Paramètres du jeu" msgid "Game Lock" msgstr "Verrouiller le jeu" @@ -608,10 +608,10 @@ msgid "Game Size" msgstr "Taille du jeu" msgid "Game Sound Mode" -msgstr "Son de présentation" +msgstr "Mode d'intro des jeux" msgid "Game Sound Volume" -msgstr "Volume du son des jeux" +msgstr "Volume des intros" msgid "Game Split Size" msgstr "Découpage des jeux" @@ -767,7 +767,7 @@ msgid "Load this DOL as alternate DOL?" msgstr "Charger comme DOL alternatif ?" msgid "Loader Settings" -msgstr "" +msgstr "Paramètres du Loader" msgid "Loading default theme." msgstr "Chargement thème par défaut." @@ -794,7 +794,7 @@ msgid "Loop Music" msgstr "Répéter musique" msgid "Loop Sound" -msgstr "Son en boucle" +msgstr "Intro en boucle" msgid "Main tester:" msgstr "Testeur:" @@ -839,7 +839,7 @@ msgid "No" msgstr "Non" msgid "No Cheatfile found" -msgstr "Aucun fichier de triche trouvé" +msgstr "Aucun fichier de triches trouvé" msgid "No DOL file found on disc." msgstr "Aucun DOL trouvé dans ce jeu." @@ -854,7 +854,7 @@ msgid "No WBFS or FAT/NTFS/EXT partition found" msgstr "Partition WBFS ou FAT/NTFS/EXT non trouvée" msgid "No cheats were selected" -msgstr "Aucune sélection de triche" +msgstr "Aucune sélection de triches" msgid "No data could be read." msgstr "Lecture des données impossible." @@ -1121,10 +1121,10 @@ msgid "Sound Settings" msgstr "Réglages du son" msgid "Sound+BGM" -msgstr "Son + Fond sonore" +msgstr "Intro + fond sonore" msgid "Sound+Quiet" -msgstr "Son + Silence" +msgstr "Intro + silence" msgid "Spanish" msgstr "Espagnol" @@ -1579,7 +1579,7 @@ msgstr "secondes restantes" #~ msgstr "Forcer" #~ msgid "GCT Cheatcodes Path changed" -#~ msgstr "Dossier GCT de triche modifié" +#~ msgstr "Dossier GCT de triches modifié" #~ msgid "Hermes CIOS" #~ msgstr "CIOS d'Hermès" @@ -1633,7 +1633,7 @@ msgstr "secondes restantes" #~ msgstr "Choix du DOL" #~ msgid "TXT Cheatcodes Path changed" -#~ msgstr "Dossier TXT de Triche modifié" +#~ msgstr "Dossier TXT de triches modifié" #~ msgid "Theme Download Path changed" #~ msgstr "Dossier Thèmes Téléch. modifié" diff --git a/Languages/german.lang b/Languages/german.lang index 75265da2..f7d3643d 100644 --- a/Languages/german.lang +++ b/Languages/german.lang @@ -767,7 +767,7 @@ msgid "Load this DOL as alternate DOL?" msgstr "Diese DOL als Alternative DOL laden?" msgid "Loader Settings" -msgstr "" +msgstr "Loader Einstellungen" msgid "Loading default theme." msgstr "Lade Standardtheme" diff --git a/source/language/UpdateLanguage.cpp b/source/language/UpdateLanguage.cpp index c6dd1525..289bc563 100644 --- a/source/language/UpdateLanguage.cpp +++ b/source/language/UpdateLanguage.cpp @@ -19,7 +19,7 @@ #include "utils/ShowError.h" #include "gecko.h" -static const char * LanguageFilesURL = "http://usbloader-gui.googlecode.com/svn/tags/USBLoaderGX_v2/Languages/"; +static const char * LanguageFilesURL = "http://usbloader-gui.googlecode.com/svn/trunk/Languages/"; int DownloadAllLanguageFiles() { diff --git a/source/libs/libwbfs/libwbfs_os.h b/source/libs/libwbfs/libwbfs_os.h index f0931e5e..773a5d29 100644 --- a/source/libs/libwbfs/libwbfs_os.h +++ b/source/libs/libwbfs/libwbfs_os.h @@ -2,6 +2,7 @@ #define LIBWBFS_GLUE_H #include +#include "memory/mem2.h" #define debug_printf(fmt, ...); @@ -12,9 +13,9 @@ #include #include -#define wbfs_malloc(x) malloc(x) +#define wbfs_malloc(x) MEM2_alloc(x) #define wbfs_free(x) free(x) -#define wbfs_ioalloc(x) memalign(32, ((x) + 31) & ~31) +#define wbfs_ioalloc(x) MEM2_alloc(((x) + 31) & ~31) #define wbfs_iofree(x) free(x) #define wbfs_be16(x) (*((u16*)(x))) #define wbfs_be32(x) (*((u32*)(x))) diff --git a/source/network/update.cpp b/source/network/update.cpp index 05631d30..b0cb746f 100644 --- a/source/network/update.cpp +++ b/source/network/update.cpp @@ -47,7 +47,10 @@ #include "prompts/PromptWindows.h" #include "FileOperations/fileops.h" #include "xml/WiiTDB.hpp" +#include "wad/nandtitle.h" +#include "wad/wad.h" #include "buildtype.h" +#include "sys.h" #include "svnrev.h" static const char * WiiTDB_URL = "http://wiitdb.com/wiitdb.zip"; @@ -256,7 +259,7 @@ static int ApplicationDownload(int newrev) else { #ifdef FULLCHANNEL - FILE * wadFile = fopen(realpath, "rb"); + FILE * wadFile = fopen(tmppath, "rb"); if(!wadFile) { update_error = true; @@ -273,7 +276,7 @@ static int ApplicationDownload(int newrev) else WindowPrompt(tr( "Success" ), tr( "The wad file was installed" ), tr( "OK" )); - RemoveFile(realpath); + RemoveFile(tmppath); #else gprintf("%s\n%s\n", realpath, tmppath); RemoveFile(realpath); diff --git a/source/prompts/PromptWindows.cpp b/source/prompts/PromptWindows.cpp index 5ba64082..ec4e9e06 100644 --- a/source/prompts/PromptWindows.cpp +++ b/source/prompts/PromptWindows.cpp @@ -242,10 +242,10 @@ void WindowCredits() #ifdef FULLCHANNEL char SvnRev[30]; - snprintf( SvnRev, sizeof( SvnRev ), "V2.0c IOS%u (Rev %u)", IOS_GetVersion(), IOS_GetRevision() ); + snprintf( SvnRev, sizeof( SvnRev ), "Rev%sc IOS%u (Rev %u)", GetRev(), IOS_GetVersion(), IOS_GetRevision() ); #else char SvnRev[30]; - snprintf(SvnRev, sizeof(SvnRev), "V2.0 IOS%u (Rev %u)", IOS_GetVersion(), IOS_GetRevision()); + snprintf(SvnRev, sizeof(SvnRev), "Rev%s IOS%u (Rev %u)", GetRev(), IOS_GetVersion(), IOS_GetRevision()); #endif txt[i] = new GuiText(SvnRev, 16, ( GXColor ) {255, 255, 255, 255});