From: S?bastien G. <kx...@us...> - 2004-05-05 16:01:21
|
Update of /cvsroot/vba/VisualBoyAdvance/src/gb In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17105/src/gb Modified Files: GB.cpp gbCheats.cpp gbCodes.h gbCodesCB.h Log Message: Extended the gettext support to the core. Minor fixes. French translation is now almost complete. Index: gbCodes.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gb/gbCodes.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** gbCodes.h 30 Jan 2004 00:48:29 -0000 1.4 --- gbCodes.h 5 May 2004 16:01:12 -0000 1.5 *************** *** 1401,1405 **** break; default: ! systemMessage(0, "Unknown opcode %02x at %04x", gbReadOpcode(PC.W-1),PC.W-1); emulating = false; --- 1401,1405 ---- break; default: ! systemMessage(0, N_("Unknown opcode %02x at %04x"), gbReadOpcode(PC.W-1),PC.W-1); emulating = false; Index: gbCodesCB.h =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gb/gbCodesCB.h,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** gbCodesCB.h 20 Oct 2002 13:03:12 -0000 1.1 --- gbCodesCB.h 5 May 2004 16:01:12 -0000 1.2 *************** *** 1282,1286 **** break; default: ! systemMessage(0, "Unknown opcode %02x at %04x", gbReadOpcode(PC.W-1),PC.W-1); emulating = false; --- 1282,1286 ---- break; default: ! systemMessage(0, N_("Unknown opcode %02x at %04x"), gbReadOpcode(PC.W-1),PC.W-1); emulating = false; Index: GB.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gb/GB.cpp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** GB.cpp 5 Feb 2004 11:38:31 -0000 1.17 --- GB.cpp 5 May 2004 16:01:12 -0000 1.18 *************** *** 1660,1664 **** if(gzFile == NULL) { ! systemMessage(MSG_ERROR_CREATING_FILE, "Error creating file %s", name); return; } --- 1660,1664 ---- if(gzFile == NULL) { ! systemMessage(MSG_ERROR_CREATING_FILE, N_("Error creating file %s"), name); return; } *************** *** 1677,1681 **** if(file == NULL) { ! systemMessage(MSG_ERROR_CREATING_FILE, "Error creating file %s", name); return; } --- 1677,1681 ---- if(file == NULL) { ! systemMessage(MSG_ERROR_CREATING_FILE, N_("Error creating file %s"), name); return; } *************** *** 1694,1698 **** if(gzFile == NULL) { ! systemMessage(MSG_ERROR_CREATING_FILE, "Error creating file %s", name); return; } --- 1694,1698 ---- if(gzFile == NULL) { ! systemMessage(MSG_ERROR_CREATING_FILE, N_("Error creating file %s"), name); return; } *************** *** 1717,1721 **** if(gzFile == NULL) { ! systemMessage(MSG_ERROR_CREATING_FILE,"Error creating file %s", name); return; } --- 1717,1721 ---- if(gzFile == NULL) { ! systemMessage(MSG_ERROR_CREATING_FILE, N_("Error creating file %s"), name); return; } *************** *** 1734,1738 **** if(file == NULL) { ! systemMessage(MSG_ERROR_CREATING_FILE, "Error creating file %s", name); return; } --- 1734,1738 ---- if(file == NULL) { ! systemMessage(MSG_ERROR_CREATING_FILE, N_("Error creating file %s"), name); return; } *************** *** 1759,1763 **** if(read != gbRamSize) { ! systemMessage(MSG_FAILED_TO_READ_SGM, "Failed to read complete save game %s (%d)", name, read); gzclose(gzFile); return false; --- 1759,1763 ---- if(read != gbRamSize) { ! systemMessage(MSG_FAILED_TO_READ_SGM, N_("Failed to read complete save game %s (%d)"), name, read); gzclose(gzFile); return false; *************** *** 1783,1787 **** if(read != 256) { systemMessage(MSG_FAILED_TO_READ_SGM, ! "Failed to read complete save game %s (%d)", name, read); fclose(file); return false; --- 1783,1787 ---- if(read != 256) { systemMessage(MSG_FAILED_TO_READ_SGM, ! N_("Failed to read complete save game %s (%d)"), name, read); fclose(file); return false; *************** *** 1808,1812 **** if(read != gbRamSize) { systemMessage(MSG_FAILED_TO_READ_SGM, ! "Failed to read complete save game %s (%d)", name, read); } else { read = gzread(gzFile, --- 1808,1812 ---- if(read != gbRamSize) { systemMessage(MSG_FAILED_TO_READ_SGM, ! N_("Failed to read complete save game %s (%d)"), name, read); } else { read = gzread(gzFile, *************** *** 1816,1820 **** if(read != (sizeof(int)*10 + sizeof(time_t)) && read != 0) { systemMessage(MSG_FAILED_TO_READ_RTC, ! "Failed to read RTC from save game %s (continuing)", name); res = false; --- 1816,1820 ---- if(read != (sizeof(int)*10 + sizeof(time_t)) && read != 0) { systemMessage(MSG_FAILED_TO_READ_RTC, ! N_("Failed to read RTC from save game %s (continuing)"), name); res = false; *************** *** 1840,1844 **** if(read != gbRamSize) { systemMessage(MSG_FAILED_TO_READ_SGM, ! "Failed to read complete save game %s (%d)", name, read); gzclose(gzFile); return false; --- 1840,1844 ---- if(read != gbRamSize) { systemMessage(MSG_FAILED_TO_READ_SGM, ! N_("Failed to read complete save game %s (%d)"), name, read); gzclose(gzFile); return false; *************** *** 1864,1868 **** if(read != 256) { systemMessage(MSG_FAILED_TO_READ_SGM, ! "Failed to read complete save game %s (%d)", name, read); fclose(file); return false; --- 1864,1868 ---- if(read != 256) { systemMessage(MSG_FAILED_TO_READ_SGM, ! N_("Failed to read complete save game %s (%d)"), name, read); fclose(file); return false; *************** *** 1975,1979 **** if(!file) { ! systemMessage(MSG_CANNOT_OPEN_FILE, "Cannot open file %s", fileName); return false; } --- 1975,1979 ---- if(!file) { ! systemMessage(MSG_CANNOT_OPEN_FILE, N_("Cannot open file %s"), fileName); return false; } *************** *** 1989,1993 **** if(memcmp(buffer, buffer2, 15)) { systemMessage(MSG_CANNOT_IMPORT_SNAPSHOT_FOR, ! "Cannot import snapshot for %s. Current game is %s", buffer, buffer2); --- 1989,1993 ---- if(memcmp(buffer, buffer2, 15)) { systemMessage(MSG_CANNOT_IMPORT_SNAPSHOT_FOR, ! N_("Cannot import snapshot for %s. Current game is %s"), buffer, buffer2); *************** *** 2016,2020 **** default: systemMessage(MSG_UNSUPPORTED_SNAPSHOT_FILE, ! "Unsupported snapshot file %s", fileName); fclose(file); --- 2016,2020 ---- default: systemMessage(MSG_UNSUPPORTED_SNAPSHOT_FILE, ! N_("Unsupported snapshot file %s"), fileName); fclose(file); *************** *** 2193,2197 **** if(version > GBSAVE_GAME_VERSION || version < 0) { systemMessage(MSG_UNSUPPORTED_VB_SGM, ! "Unsupported VisualBoy save game version %d", version); return false; } --- 2193,2197 ---- if(version > GBSAVE_GAME_VERSION || version < 0) { systemMessage(MSG_UNSUPPORTED_VB_SGM, ! N_("Unsupported VisualBoy save game version %d"), version); return false; } *************** *** 2203,2207 **** if(memcmp(&gbRom[0x134], romname, 15) != 0) { systemMessage(MSG_CANNOT_LOAD_SGM_FOR, ! "Cannot load save game for %s. Playing %s", romname, &gbRom[0x134]); return false; --- 2203,2207 ---- if(memcmp(&gbRom[0x134], romname, 15) != 0) { systemMessage(MSG_CANNOT_LOAD_SGM_FOR, ! N_("Cannot load save game for %s. Playing %s"), romname, &gbRom[0x134]); return false; *************** *** 2462,2466 **** if(gbRom[0x148] > 8) { systemMessage(MSG_UNSUPPORTED_ROM_SIZE, ! "Unsupported rom size %02x", gbRom[0x148]); return false; } --- 2462,2466 ---- if(gbRom[0x148] > 8) { systemMessage(MSG_UNSUPPORTED_ROM_SIZE, ! N_("Unsupported rom size %02x"), gbRom[0x148]); return false; } *************** *** 2474,2478 **** if(gbRom[0x149] > 5) { systemMessage(MSG_UNSUPPORTED_RAM_SIZE, ! "Unsupported ram size %02x", gbRom[0x149]); return false; } --- 2474,2478 ---- if(gbRom[0x149] > 5) { systemMessage(MSG_UNSUPPORTED_RAM_SIZE, ! N_("Unsupported ram size %02x"), gbRom[0x149]); return false; } *************** *** 2550,2554 **** default: systemMessage(MSG_UNKNOWN_CARTRIDGE_TYPE, ! "Unknown cartridge type %02x", type); return false; } --- 2550,2554 ---- default: systemMessage(MSG_UNKNOWN_CARTRIDGE_TYPE, ! N_("Unknown cartridge type %02x"), type); return false; } Index: gbCheats.cpp =================================================================== RCS file: /cvsroot/vba/VisualBoyAdvance/src/gb/gbCheats.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** gbCheats.cpp 20 Nov 2003 02:39:11 -0000 1.5 --- gbCheats.cpp 5 May 2004 16:01:12 -0000 1.6 *************** *** 128,132 **** if(version != 1) { systemMessage(MSG_UNSUPPORTED_CHEAT_LIST_VERSION, ! "Unsupported cheat list version %d", version); fclose(f); return false; --- 128,132 ---- if(version != 1) { systemMessage(MSG_UNSUPPORTED_CHEAT_LIST_VERSION, ! N_("Unsupported cheat list version %d"), version); fclose(f); return false; *************** *** 141,145 **** if(type != 1) { systemMessage(MSG_UNSUPPORTED_CHEAT_LIST_TYPE, ! "Unsupported cheat list type %d", type); fclose(f); return false; --- 141,145 ---- if(type != 1) { systemMessage(MSG_UNSUPPORTED_CHEAT_LIST_TYPE, ! N_("Unsupported cheat list type %d"), type); fclose(f); return false; *************** *** 192,196 **** if(gbCheatNumber > 99) { systemMessage(MSG_MAXIMUM_NUMBER_OF_CHEATS, ! "Maximum number of cheats reached."); return; } --- 192,196 ---- if(gbCheatNumber > 99) { systemMessage(MSG_MAXIMUM_NUMBER_OF_CHEATS, ! N_("Maximum number of cheats reached.")); return; } *************** *** 198,202 **** if(!gbVerifyGsCode(code)) { systemMessage(MSG_INVALID_GAMESHARK_CODE, ! "Invalid GameShark code: %s", code); return; } --- 198,202 ---- if(!gbVerifyGsCode(code)) { systemMessage(MSG_INVALID_GAMESHARK_CODE, ! N_("Invalid GameShark code: %s"), code); return; } *************** *** 302,306 **** if(gbCheatNumber > 99) { systemMessage(MSG_MAXIMUM_NUMBER_OF_CHEATS, ! "Maximum number of cheats reached."); return; } --- 302,306 ---- if(gbCheatNumber > 99) { systemMessage(MSG_MAXIMUM_NUMBER_OF_CHEATS, ! N_("Maximum number of cheats reached.")); return; } *************** *** 308,312 **** if(!gbVerifyGgCode(code)) { systemMessage(MSG_INVALID_GAMEGENIE_CODE, ! "Invalid GameGenie code: %s", code); return; } --- 308,312 ---- if(!gbVerifyGgCode(code)) { systemMessage(MSG_INVALID_GAMEGENIE_CODE, ! N_("Invalid GameGenie code: %s"), code); return; } *************** *** 353,357 **** if(i < 0 || i >= gbCheatNumber) { systemMessage(MSG_INVALID_CHEAT_TO_REMOVE, ! "Invalid cheat to remove %d", i); return; } --- 353,357 ---- if(i < 0 || i >= gbCheatNumber) { systemMessage(MSG_INVALID_CHEAT_TO_REMOVE, ! N_("Invalid cheat to remove %d"), i); return; } *************** *** 398,402 **** if(!file) { ! systemMessage(MSG_CANNOT_OPEN_FILE, "Cannot open file %s", fileName); return false; } --- 398,402 ---- if(!file) { ! systemMessage(MSG_CANNOT_OPEN_FILE, N_("Cannot open file %s"), fileName); return false; } |