[vba-commit] VisualBoyAdvance/src Cheats.cpp,1.18,1.19 GBA.cpp,1.53,1.54 NLS.h,1.2,1.3 RTC.cpp,1.5,1.6 Util.cpp,1.20,1.21 elf.cpp,1.16,1.17

[S?bastien G. <kx...@us...>]

Update of /cvsroot/vba/VisualBoyAdvance/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17105/src

Modified Files:
	Cheats.cpp GBA.cpp NLS.h RTC.cpp Util.cpp elf.cpp 
Log Message:
Extended the gettext support to the core. Minor fixes. French translation is now almost complete.

Index: Util.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/Util.cpp,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** Util.cpp	23 Jan 2004 11:42:03 -0000	1.20
--- Util.cpp	5 May 2004 16:01:11 -0000	1.21
***************
*** 59,63 ****
  
    if(!fp) {
!     systemMessage(MSG_ERROR_CREATING_FILE, "Error creating file %s", fileName);
      return false;
    }
--- 59,63 ----
  
    if(!fp) {
!     systemMessage(MSG_ERROR_CREATING_FILE, N_("Error creating file %s"), fileName);
      return false;
    }
***************
*** 268,272 ****
  
    if(!fp) {
!     systemMessage(MSG_ERROR_CREATING_FILE, "Error creating file %s", fileName);
      return false;
    }
--- 268,272 ----
  
    if(!fp) {
!     systemMessage(MSG_ERROR_CREATING_FILE, N_("Error creating file %s"), fileName);
      return false;
    }
***************
*** 586,590 ****
      
      if(unz == NULL) {
!       systemMessage(MSG_CANNOT_OPEN_FILE, "Cannot open file %s", file);
        return IMAGE_UNKNOWN;
      }
--- 586,590 ----
      
      if(unz == NULL) {
!       systemMessage(MSG_CANNOT_OPEN_FILE, N_("Cannot open file %s"), file);
        return IMAGE_UNKNOWN;
      }
***************
*** 594,598 ****
      if(r != UNZ_OK) {
        unzClose(unz);
!       systemMessage(MSG_BAD_ZIP_FILE, "Bad ZIP file %s", file);
        return IMAGE_UNKNOWN;
      }
--- 594,598 ----
      if(r != UNZ_OK) {
        unzClose(unz);
!       systemMessage(MSG_BAD_ZIP_FILE, N_("Bad ZIP file %s"), file);
        return IMAGE_UNKNOWN;
      }
***************
*** 614,618 ****
        if(r != UNZ_OK) {
          unzClose(unz);
!         systemMessage(MSG_BAD_ZIP_FILE,"Bad ZIP file %s", file);
          return IMAGE_UNKNOWN;
        }
--- 614,618 ----
        if(r != UNZ_OK) {
          unzClose(unz);
!         systemMessage(MSG_BAD_ZIP_FILE, N_("Bad ZIP file %s"), file);
          return IMAGE_UNKNOWN;
        }
***************
*** 637,641 ****
      if(found == IMAGE_UNKNOWN) {
        systemMessage(MSG_NO_IMAGE_ON_ZIP,
!                     "No image found on ZIP file %s", file);
        return found;
      }
--- 637,641 ----
      if(found == IMAGE_UNKNOWN) {
        systemMessage(MSG_NO_IMAGE_ON_ZIP,
!                     N_("No image found on ZIP file %s"), file);
        return found;
      }
***************
*** 698,702 ****
      
    if(unz == NULL) {
!     systemMessage(MSG_CANNOT_OPEN_FILE, "Cannot open file %s", file);
      return NULL;
    }
--- 698,702 ----
      
    if(unz == NULL) {
!     systemMessage(MSG_CANNOT_OPEN_FILE, N_("Cannot open file %s"), file);
      return NULL;
    }
***************
*** 705,709 ****
    if(r != UNZ_OK) {
      unzClose(unz);
!     systemMessage(MSG_BAD_ZIP_FILE, "Bad ZIP file %s", file);
      return NULL;
    }
--- 705,709 ----
    if(r != UNZ_OK) {
      unzClose(unz);
!     systemMessage(MSG_BAD_ZIP_FILE, N_("Bad ZIP file %s"), file);
      return NULL;
    }
***************
*** 725,729 ****
      if(r != UNZ_OK) {
        unzClose(unz);
!       systemMessage(MSG_BAD_ZIP_FILE,"Bad ZIP file %s", file);
        return NULL;
      }
--- 725,729 ----
      if(r != UNZ_OK) {
        unzClose(unz);
!       systemMessage(MSG_BAD_ZIP_FILE, N_("Bad ZIP file %s"), file);
        return NULL;
      }
***************
*** 743,747 ****
      unzClose(unz);
      systemMessage(MSG_NO_IMAGE_ON_ZIP,
!                   "No image found on ZIP file %s", file);
      return NULL;
    }
--- 743,747 ----
      unzClose(unz);
      systemMessage(MSG_NO_IMAGE_ON_ZIP,
!                   N_("No image found on ZIP file %s"), file);
      return NULL;
    }
***************
*** 754,758 ****
    if(r != UNZ_OK) {
      unzClose(unz);
!     systemMessage(MSG_ERROR_OPENING_IMAGE,"Error opening image %s", buffer);
      return NULL;
    }
--- 754,758 ----
    if(r != UNZ_OK) {
      unzClose(unz);
!     systemMessage(MSG_ERROR_OPENING_IMAGE, N_("Error opening image %s"), buffer);
      return NULL;
    }
***************
*** 765,769 ****
        unzCloseCurrentFile(unz);
        unzClose(unz);
!       systemMessage(MSG_OUT_OF_MEMORY, "Failed to allocate memory for %s",
                      "data");
        return NULL;
--- 765,769 ----
        unzCloseCurrentFile(unz);
        unzClose(unz);
!       systemMessage(MSG_OUT_OF_MEMORY, N_("Failed to allocate memory for %s"),
                      "data");
        return NULL;
***************
*** 781,785 ****
    if(r != (int)read) {
      systemMessage(MSG_ERROR_READING_IMAGE,
!                   "Error reading image %s", buffer);
      if(data == NULL)
        free(image);
--- 781,785 ----
    if(r != (int)read) {
      systemMessage(MSG_ERROR_READING_IMAGE,
!                   N_("Error reading image %s"), buffer);
      if(data == NULL)
        free(image);
***************
*** 800,804 ****
  
    if(f == NULL) {
!     systemMessage(MSG_ERROR_OPENING_IMAGE, "Error opening image %s", file);
      return NULL;
    }
--- 800,804 ----
  
    if(f == NULL) {
!     systemMessage(MSG_ERROR_OPENING_IMAGE, N_("Error opening image %s"), file);
      return NULL;
    }
***************
*** 814,818 ****
    if(gz == NULL) {
      // should not happen, but who knows?
!     systemMessage(MSG_ERROR_OPENING_IMAGE, "Error opening image %s", file);
      return NULL;
    }
--- 814,818 ----
    if(gz == NULL) {
      // should not happen, but who knows?
!     systemMessage(MSG_ERROR_OPENING_IMAGE, N_("Error opening image %s"), file);
      return NULL;
    }
***************
*** 823,827 ****
      image = (u8 *)malloc(utilGetSize(size));
      if(image == NULL) {
!       systemMessage(MSG_OUT_OF_MEMORY, "Failed to allocate memory for %s",
                      "data");
        fclose(f);
--- 823,827 ----
      image = (u8 *)malloc(utilGetSize(size));
      if(image == NULL) {
!       systemMessage(MSG_OUT_OF_MEMORY, N_("Failed to allocate memory for %s"),
                      "data");
        fclose(f);
***************
*** 836,840 ****
    if(r != (int)read) {
      systemMessage(MSG_ERROR_READING_IMAGE,
!                   "Error reading image %s", file);
      if(data == NULL)
        free(image);
--- 836,840 ----
    if(r != (int)read) {
      systemMessage(MSG_ERROR_READING_IMAGE,
!                   N_("Error reading image %s"), file);
      if(data == NULL)
        free(image);
***************
*** 875,879 ****
        if(!r) {
          systemMessage(MSG_ERROR_READING_IMAGE,
!                       "Error reading image %s", buffer);
          urarlib_freelist(rarList);
          return NULL;
--- 875,879 ----
        if(!r) {
          systemMessage(MSG_ERROR_READING_IMAGE,
!                       N_("Error reading image %s"), buffer);
          urarlib_freelist(rarList);
          return NULL;
***************
*** 887,891 ****
      }
      systemMessage(MSG_NO_IMAGE_ON_ZIP,
!                   "No image found on RAR file %s", file);
      urarlib_freelist(rarList);
      return NULL;
--- 887,891 ----
      }
      systemMessage(MSG_NO_IMAGE_ON_ZIP,
!                   N_("No image found on RAR file %s"), file);
      urarlib_freelist(rarList);
      return NULL;
***************
*** 918,922 ****
  
    if(!f) {
!     systemMessage(MSG_ERROR_OPENING_IMAGE, "Error opening image %s", file);
      return NULL;
    }
--- 918,922 ----
  
    if(!f) {
!     systemMessage(MSG_ERROR_OPENING_IMAGE, N_("Error opening image %s"), file);
      return NULL;
    }
***************
*** 931,935 ****
      image = (u8 *)malloc(utilGetSize(size));
      if(image == NULL) {
!       systemMessage(MSG_OUT_OF_MEMORY, "Failed to allocate memory for %s",
                      "data");
        fclose(f);
--- 931,935 ----
      image = (u8 *)malloc(utilGetSize(size));
      if(image == NULL) {
!       systemMessage(MSG_OUT_OF_MEMORY, N_("Failed to allocate memory for %s"),
                      "data");
        fclose(f);
***************
*** 944,948 ****
    if(r != (int)read) {
      systemMessage(MSG_ERROR_READING_IMAGE,
!                   "Error reading image %s", file);
      if(data == NULL)
        free(image);
--- 944,948 ----
    if(r != (int)read) {
      systemMessage(MSG_ERROR_READING_IMAGE,
!                   N_("Error reading image %s"), file);
      if(data == NULL)
        free(image);

Index: RTC.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/RTC.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** RTC.cpp	31 Jan 2004 21:43:43 -0000	1.5
--- RTC.cpp	5 May 2004 16:01:11 -0000	1.6
***************
*** 22,25 ****
--- 22,26 ----
  #include "Port.h"
  #include "Util.h"
+ #include "NLS.h"
  
  #include <time.h>
***************
*** 154,158 ****
                break;
              default:
!               systemMessage(0, "Unknown RTC command %02x", rtcClockData.command);
                rtcClockData.state = IDLE;
                break;
--- 155,159 ----
                break;
              default:
!               systemMessage(0, N_("Unknown RTC command %02x"), rtcClockData.command);
                rtcClockData.state = IDLE;
                break;

Index: NLS.h
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/NLS.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** NLS.h	26 Nov 2002 21:27:44 -0000	1.2
--- NLS.h	5 May 2004 16:01:11 -0000	1.3
***************
*** 17,20 ****
--- 17,23 ----
   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
+ 
+ #define N_(String) (String)
+ 
  #define MSG_UNSUPPORTED_VBA_SGM             1
  #define MSG_CANNOT_LOAD_SGM                 2

Index: Cheats.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/Cheats.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** Cheats.cpp	24 Feb 2004 10:40:23 -0000	1.18
--- Cheats.cpp	5 May 2004 16:01:11 -0000	1.19
***************
*** 651,660 ****
    int len = strlen(code);
    if(len != 11 && len != 13 && len != 17) {
!     systemMessage(MSG_INVALID_CHEAT_CODE, "Invalid cheat code '%s'", code);
      return false;
    }
  
    if(code[8] != ':') {
!     systemMessage(MSG_INVALID_CHEAT_CODE, "Invalid cheat code '%s'", code);
      return false;    
    }
--- 651,660 ----
    int len = strlen(code);
    if(len != 11 && len != 13 && len != 17) {
!     systemMessage(MSG_INVALID_CHEAT_CODE, N_("Invalid cheat code '%s'"), code);
      return false;
    }
  
    if(code[8] != ':') {
!     systemMessage(MSG_INVALID_CHEAT_CODE, N_("Invalid cheat code '%s'"), code);
      return false;    
    }
***************
*** 665,669 ****
        // wrong cheat
        systemMessage(MSG_INVALID_CHEAT_CODE,
!                     "Invalid cheat code '%s'", code);
        return false;
      }
--- 665,669 ----
        // wrong cheat
        systemMessage(MSG_INVALID_CHEAT_CODE,
!                     N_("Invalid cheat code '%s'"), code);
        return false;
      }
***************
*** 673,677 ****
        // wrong cheat
        systemMessage(MSG_INVALID_CHEAT_CODE,
!                     "Invalid cheat code '%s'", code);
        return false;
      }
--- 673,677 ----
        // wrong cheat
        systemMessage(MSG_INVALID_CHEAT_CODE,
!                     N_("Invalid cheat code '%s'"), code);
        return false;
      }
***************
*** 692,696 ****
    default:
      systemMessage(MSG_INVALID_CHEAT_CODE_ADDRESS,
!                   "Invalid cheat code address: %08x",
                    address);
      return false;
--- 692,696 ----
    default:
      systemMessage(MSG_INVALID_CHEAT_CODE_ADDRESS,
!                   N_("Invalid cheat code address: %08x"),
                    address);
      return false;
***************
*** 736,740 ****
      // wrong cheat
      systemMessage(MSG_INVALID_GSA_CODE,
!                   "Invalid GSA code. Format is XXXXXXXXYYYYYYYY");
      return;
    }
--- 736,740 ----
      // wrong cheat
      systemMessage(MSG_INVALID_GSA_CODE,
!                   N_("Invalid GSA code. Format is XXXXXXXXYYYYYYYY"));
      return;
    }
***************
*** 745,749 ****
        // wrong cheat
        systemMessage(MSG_INVALID_GSA_CODE,
!                     "Invalid GSA code. Format is XXXXXXXXYYYYYYYY");
        return;
      }
--- 745,749 ----
        // wrong cheat
        systemMessage(MSG_INVALID_GSA_CODE,
!                     N_("Invalid GSA code. Format is XXXXXXXXYYYYYYYY"));
        return;
      }
***************
*** 771,775 ****
        *((u32 *)buffer2) = READ32LE(((u32 *)&rom[0xac]));
        buffer2[4] = 0;
!       systemMessage(MSG_GBA_CODE_WARNING, "Warning: cheats are for game %s. Current game is %s.\nCodes may not work correctly.",
                      buffer, buffer2);
      }
--- 771,775 ----
        *((u32 *)buffer2) = READ32LE(((u32 *)&rom[0xac]));
        buffer2[4] = 0;
!       systemMessage(MSG_GBA_CODE_WARNING, N_("Warning: cheats are for game %s. Current game is %s.\nCodes may not work correctly."),
                      buffer, buffer2);
      }
***************
*** 1305,1309 ****
      // wrong cheat
      systemMessage(MSG_INVALID_CBA_CODE,
!                   "Invalid CBA code. Format is XXXXXXXX YYYY.");
      return;
    }
--- 1305,1309 ----
      // wrong cheat
      systemMessage(MSG_INVALID_CBA_CODE,
!                   N_("Invalid CBA code. Format is XXXXXXXX YYYY."));
      return;
    }
***************
*** 1314,1318 ****
        // wrong cheat
        systemMessage(MSG_INVALID_CBA_CODE,
!                     "Invalid CBA code. Format is XXXXXXXX YYYY.");
        return;
      }
--- 1314,1318 ----
        // wrong cheat
        systemMessage(MSG_INVALID_CBA_CODE,
!                     N_("Invalid CBA code. Format is XXXXXXXX YYYY."));
        return;
      }
***************
*** 1321,1325 ****
    if(code[8] != ' ') {
      systemMessage(MSG_INVALID_CBA_CODE,
!                   "Invalid CBA code. Format is XXXXXXXX YYYY.");
      return;    
    }
--- 1321,1325 ----
    if(code[8] != ' ') {
      systemMessage(MSG_INVALID_CBA_CODE,
!                   N_("Invalid CBA code. Format is XXXXXXXX YYYY."));
      return;    
    }
***************
*** 1329,1333 ****
        // wrong cheat
        systemMessage(MSG_INVALID_CBA_CODE,
!                     "Invalid CBA code. Format is XXXXXXXX YYYY.");
        return;
      }
--- 1329,1333 ----
        // wrong cheat
        systemMessage(MSG_INVALID_CBA_CODE,
!                     N_("Invalid CBA code. Format is XXXXXXXX YYYY."));
        return;
      }
***************
*** 1383,1387 ****
          if(crc != address) {
            systemMessage(MSG_CBA_CODE_WARNING,
!                         "Warning: Codes seem to be for a different game.\nCodes may not work correctly.");
          }
          cheatsAdd(code, desc, address & 0x0FFFFFFF, value, 512, 
--- 1383,1387 ----
          if(crc != address) {
            systemMessage(MSG_CBA_CODE_WARNING,
!                         N_("Warning: Codes seem to be for a different game.\nCodes may not work correctly."));
          }
          cheatsAdd(code, desc, address & 0x0FFFFFFF, value, 512, 
***************
*** 1543,1547 ****
    if(version != 1) {
      systemMessage(MSG_UNSUPPORTED_CHEAT_LIST_VERSION,
!                   "Unsupported cheat list version %d", version);
      fclose(f);
      return false;
--- 1543,1547 ----
    if(version != 1) {
      systemMessage(MSG_UNSUPPORTED_CHEAT_LIST_VERSION,
!                   N_("Unsupported cheat list version %d"), version);
      fclose(f);
      return false;
***************
*** 1556,1560 ****
    if(type != 0) {
      systemMessage(MSG_UNSUPPORTED_CHEAT_LIST_TYPE,
!                   "Unsupported cheat list type %d", type);
      fclose(f);
      return false;
--- 1556,1560 ----
    if(type != 0) {
      systemMessage(MSG_UNSUPPORTED_CHEAT_LIST_TYPE,
!                   N_("Unsupported cheat list type %d"), type);
      fclose(f);
      return false;

Index: elf.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/elf.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** elf.cpp	3 May 2004 16:58:35 -0000	1.16
--- elf.cpp	5 May 2004 16:01:11 -0000	1.17
***************
*** 2812,2816 ****
       READ16LE(&header->e_machine) != 40 ||
       header->clazz != 1) {
!     systemMessage(0, "Not a valid ELF file %s", name);
      free(elfFileData);
      elfFileData = NULL;
--- 2812,2816 ----
       READ16LE(&header->e_machine) != 40 ||
       header->clazz != 1) {
!     systemMessage(0, N_("Not a valid ELF file %s"), name);
      free(elfFileData);
      elfFileData = NULL;

Index: GBA.cpp
===================================================================
RCS file: /cvsroot/vba/VisualBoyAdvance/src/GBA.cpp,v
retrieving revision 1.53
retrieving revision 1.54
diff -C2 -d -r1.53 -r1.54
*** GBA.cpp	20 Mar 2004 00:18:33 -0000	1.53
--- GBA.cpp	5 May 2004 16:01:11 -0000	1.54
***************
*** 662,666 ****
  
    if(gzFile == NULL) {
!     systemMessage(MSG_ERROR_CREATING_FILE, "Error creating file %s", file);
      return false;
    }
--- 662,666 ----
  
    if(gzFile == NULL) {
!     systemMessage(MSG_ERROR_CREATING_FILE, N_("Error creating file %s"), file);
      return false;
    }
***************
*** 699,703 ****
    if(version > SAVE_GAME_VERSION || version < SAVE_GAME_VERSION_1) {
      systemMessage(MSG_UNSUPPORTED_VBA_SGM,
!                   "Unsupported VisualBoyAdvance save game version %d",
                    version);
      return false;
--- 699,703 ----
    if(version > SAVE_GAME_VERSION || version < SAVE_GAME_VERSION_1) {
      systemMessage(MSG_UNSUPPORTED_VBA_SGM,
!                   N_("Unsupported VisualBoyAdvance save game version %d"),
                    version);
      return false;
***************
*** 713,717 ****
        if(romname[i] < 32)
          romname[i] = 32;
!     systemMessage(MSG_CANNOT_LOAD_SGM,"Cannot load save game for %s", romname);
      return false;
    }
--- 713,717 ----
        if(romname[i] < 32)
          romname[i] = 32;
!     systemMessage(MSG_CANNOT_LOAD_SGM, N_("Cannot load save game for %s"), romname);
      return false;
    }
***************
*** 722,729 ****
      if(useBios)
        systemMessage(MSG_SAVE_GAME_NOT_USING_BIOS,
!                     "Save game is not using the BIOS files");
      else
        systemMessage(MSG_SAVE_GAME_USING_BIOS,
!                     "Save game is using the BIOS file");
      return false;
    }
--- 722,729 ----
      if(useBios)
        systemMessage(MSG_SAVE_GAME_NOT_USING_BIOS,
!                     N_("Save game is not using the BIOS files"));
      else
        systemMessage(MSG_SAVE_GAME_USING_BIOS,
!                     N_("Save game is using the BIOS file"));
      return false;
    }
***************
*** 805,809 ****
    default:
      systemMessage(MSG_UNSUPPORTED_SAVE_TYPE,
!                   "Unsupported save type %d", saveType);
      break;
    }
--- 805,809 ----
    default:
      systemMessage(MSG_UNSUPPORTED_SAVE_TYPE,
!                   N_("Unsupported save type %d"), saveType);
      break;
    }
***************
*** 847,851 ****
      
      if(!file) {
!       systemMessage(MSG_ERROR_CREATING_FILE, "Error creating file %s",
                      fileName);
        return false;
--- 847,851 ----
      
      if(!file) {
!       systemMessage(MSG_ERROR_CREATING_FILE, N_("Error creating file %s"),
                      fileName);
        return false;
***************
*** 885,889 ****
      
      if(!file) {
!       systemMessage(MSG_ERROR_CREATING_FILE, "Error creating file %s",
                      fileName);
        return false;
--- 885,889 ----
      
      if(!file) {
!       systemMessage(MSG_ERROR_CREATING_FILE, N_("Error creating file %s"),
                      fileName);
        return false;
***************
*** 920,924 ****
      
    if(!file) {
!     systemMessage(MSG_CANNOT_OPEN_FILE, "Cannot open file %s", fileName);
      return false;
    }
--- 920,924 ----
      
    if(!file) {
!     systemMessage(MSG_CANNOT_OPEN_FILE, N_("Cannot open file %s"), fileName);
      return false;
    }
***************
*** 955,959 ****
    if(memcmp(buffer, buffer2, 16)) {
      systemMessage(MSG_CANNOT_IMPORT_SNAPSHOT_FOR,
!                   "Cannot import snapshot for %s. Current game is %s",
                    buffer,
                    buffer2);
--- 955,959 ----
    if(memcmp(buffer, buffer2, 16)) {
      systemMessage(MSG_CANNOT_IMPORT_SNAPSHOT_FOR,
!                   N_("Cannot import snapshot for %s. Current game is %s"),
                    buffer,
                    buffer2);
***************
*** 969,973 ****
    } else {
      systemMessage(MSG_UNSUPPORTED_SNAPSHOT_FILE,
!                   "Unsupported snapshot file %s",
                    fileName);
      fclose(file);
--- 969,973 ----
    } else {
      systemMessage(MSG_UNSUPPORTED_SNAPSHOT_FILE,
!                   N_("Unsupported snapshot file %s"),
                    fileName);
      fclose(file);
***************
*** 987,991 ****
      
    if(!file) {
!     systemMessage(MSG_CANNOT_OPEN_FILE, "Cannot open file %s", fileName);
      return false;
    }
--- 987,991 ----
      
    if(!file) {
!     systemMessage(MSG_CANNOT_OPEN_FILE, N_("Cannot open file %s"), fileName);
      return false;
    }
***************
*** 1272,1276 ****
    rom = (u8 *)malloc(0x2000000);
    if(rom == NULL) {
!     systemMessage(MSG_OUT_OF_MEMORY, "Failed to allocate memory for %s",
                    "ROM");
      return 0;
--- 1272,1276 ----
    rom = (u8 *)malloc(0x2000000);
    if(rom == NULL) {
!     systemMessage(MSG_OUT_OF_MEMORY, N_("Failed to allocate memory for %s"),
                    "ROM");
      return 0;
***************
*** 1278,1282 ****
    workRAM = (u8 *)calloc(1, 0x40000);
    if(workRAM == NULL) {
!     systemMessage(MSG_OUT_OF_MEMORY, "Failed to allocate memory for %s",
                    "WRAM");
      return 0;
--- 1278,1282 ----
    workRAM = (u8 *)calloc(1, 0x40000);
    if(workRAM == NULL) {
!     systemMessage(MSG_OUT_OF_MEMORY, N_("Failed to allocate memory for %s"),
                    "WRAM");
      return 0;
***************
*** 1290,1294 ****
      FILE *f = fopen(szFile, "rb");
      if(!f) {
!       systemMessage(MSG_ERROR_OPENING_IMAGE, "Error opening image %s",
                      szFile);
        free(rom);
--- 1290,1294 ----
      FILE *f = fopen(szFile, "rb");
      if(!f) {
!       systemMessage(MSG_ERROR_OPENING_IMAGE, N_("Error opening image %s"),
                      szFile);
        free(rom);
***************
*** 1327,1331 ****
    bios = (u8 *)calloc(1,0x4000);
    if(bios == NULL) {
!     systemMessage(MSG_OUT_OF_MEMORY, "Failed to allocate memory for %s",
                    "BIOS");
      CPUCleanUp();
--- 1327,1331 ----
    bios = (u8 *)calloc(1,0x4000);
    if(bios == NULL) {
!     systemMessage(MSG_OUT_OF_MEMORY, N_("Failed to allocate memory for %s"),
                    "BIOS");
      CPUCleanUp();
***************
*** 1334,1338 ****
    internalRAM = (u8 *)calloc(1,0x8000);
    if(internalRAM == NULL) {
!     systemMessage(MSG_OUT_OF_MEMORY, "Failed to allocate memory for %s",
                    "IRAM");
      CPUCleanUp();
--- 1334,1338 ----
    internalRAM = (u8 *)calloc(1,0x8000);
    if(internalRAM == NULL) {
!     systemMessage(MSG_OUT_OF_MEMORY, N_("Failed to allocate memory for %s"),
                    "IRAM");
      CPUCleanUp();
***************
*** 1341,1345 ****
    paletteRAM = (u8 *)calloc(1,0x400);
    if(paletteRAM == NULL) {
!     systemMessage(MSG_OUT_OF_MEMORY, "Failed to allocate memory for %s",
                    "PRAM");
      CPUCleanUp();
--- 1341,1345 ----
    paletteRAM = (u8 *)calloc(1,0x400);
    if(paletteRAM == NULL) {
!     systemMessage(MSG_OUT_OF_MEMORY, N_("Failed to allocate memory for %s"),
                    "PRAM");
      CPUCleanUp();
***************
*** 1348,1352 ****
    vram = (u8 *)calloc(1, 0x20000);
    if(vram == NULL) {
!     systemMessage(MSG_OUT_OF_MEMORY, "Failed to allocate memory for %s",
                    "VRAM");
      CPUCleanUp();
--- 1348,1352 ----
    vram = (u8 *)calloc(1, 0x20000);
    if(vram == NULL) {
!     systemMessage(MSG_OUT_OF_MEMORY, N_("Failed to allocate memory for %s"),
                    "VRAM");
      CPUCleanUp();
***************
*** 1355,1359 ****
    oam = (u8 *)calloc(1, 0x400);
    if(oam == NULL) {
!     systemMessage(MSG_OUT_OF_MEMORY, "Failed to allocate memory for %s",
                    "OAM");
      CPUCleanUp();
--- 1355,1359 ----
    oam = (u8 *)calloc(1, 0x400);
    if(oam == NULL) {
!     systemMessage(MSG_OUT_OF_MEMORY, N_("Failed to allocate memory for %s"),
                    "OAM");
      CPUCleanUp();
***************
*** 1362,1366 ****
    pix = (u8 *)calloc(1, 4 * 241 * 162);
    if(pix == NULL) {
!     systemMessage(MSG_OUT_OF_MEMORY, "Failed to allocate memory for %s",
                    "PIX");
      CPUCleanUp();
--- 1362,1366 ----
    pix = (u8 *)calloc(1, 4 * 241 * 162);
    if(pix == NULL) {
!     systemMessage(MSG_OUT_OF_MEMORY, N_("Failed to allocate memory for %s"),
                    "PIX");
      CPUCleanUp();
***************
*** 1369,1373 ****
    ioMem = (u8 *)calloc(1, 0x400);
    if(ioMem == NULL) {
!     systemMessage(MSG_OUT_OF_MEMORY, "Failed to allocate memory for %s",
                    "IO");
      CPUCleanUp();
--- 1369,1373 ----
    ioMem = (u8 *)calloc(1, 0x400);
    if(ioMem == NULL) {
!     systemMessage(MSG_OUT_OF_MEMORY, N_("Failed to allocate memory for %s"),
                    "IO");
      CPUCleanUp();
***************
*** 1604,1608 ****
      break;    
    default:
!     systemMessage(MSG_UNSUPPORTED_ARM_MODE,"Unsupported ARM mode %02x", mode);
      break;
    }
--- 1604,1608 ----
      break;    
    default:
!     systemMessage(MSG_UNSUPPORTED_ARM_MODE, N_("Unsupported ARM mode %02x"), mode);
      break;
    }
***************
*** 1837,1841 ****
      if(!disableMessage) {
        systemMessage(MSG_UNSUPPORTED_BIOS_FUNCTION,
!                     "Unsupported BIOS function %02x called from %08x. A BIOS file is needed in order to get correct behaviour.",
                      comment,
                      armMode ? armNextPC - 4: armNextPC - 2);
--- 1837,1841 ----
      if(!disableMessage) {
        systemMessage(MSG_UNSUPPORTED_BIOS_FUNCTION,
!                     N_("Unsupported BIOS function %02x called from %08x. A BIOS file is needed in order to get correct behaviour."),
                      comment,
                      armMode ? armNextPC - 4: armNextPC - 2);
***************
*** 2945,2949 ****
          useBios = true;
        else
!         systemMessage(MSG_INVALID_BIOS_FILE_SIZE, "Invalid BIOS file size");
      }
    }
--- 2945,2949 ----
          useBios = true;
        else
!         systemMessage(MSG_INVALID_BIOS_FILE_SIZE, N_("Invalid BIOS file size"));
      }
    }