From 44aa2604362abd54aa8d3c69539871d9573b0039 Mon Sep 17 00:00:00 2001 From: MELERIX Date: Mon, 26 Oct 2015 19:08:51 -0300 Subject: [PATCH 1/2] Minor changes in English main file --- Lang/English.pj.Lang | 2 +- Source/Project64/Multilanguage/Language Class.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Lang/English.pj.Lang b/Lang/English.pj.Lang index e527a9d89..07465641d 100644 --- a/Lang/English.pj.Lang +++ b/Lang/English.pj.Lang @@ -241,7 +241,7 @@ #484# "Use ROM browser" #485# "Use directory recursion" #486# "Available fields:" -#487# "Show fields in this order:" +#487# "Order of fields:" #488# "Add ->" #489# "<- Remove" #490# "Up" diff --git a/Source/Project64/Multilanguage/Language Class.cpp b/Source/Project64/Multilanguage/Language Class.cpp index 3622da5d7..d9ba7ca31 100644 --- a/Source/Project64/Multilanguage/Language Class.cpp +++ b/Source/Project64/Multilanguage/Language Class.cpp @@ -238,7 +238,7 @@ void CLanguage::LoadDefaultStrings (void) DEF_STR(RB_USE, L"Use ROM browser"); DEF_STR(RB_DIR_RECURSION, L"Use directory recursion"); DEF_STR(RB_AVALIABLE_FIELDS, L"Available fields:"); - DEF_STR(RB_SHOW_FIELDS, L"Show fields in this order:"); + DEF_STR(RB_SHOW_FIELDS, L"Order of fields:"); DEF_STR(RB_ADD, L"Add ->"); DEF_STR(RB_REMOVE, L"<- Remove"); DEF_STR(RB_UP, L"Up"); @@ -486,7 +486,7 @@ void CLanguage::LoadDefaultStrings (void) DEF_STR(MSG_MENUITEM_ASSIGNED, L"Short-cut has already been assigned to another menu item."); DEF_STR(MSG_NO_SEL_SHORTCUT, L"No shortcut has been selected to be removed."); DEF_STR(MSG_WAITING_FOR_START, L"ROM loaded. Waiting for emulation to start."); - DEF_STR(MSG_INVALID_EXE, L"Project64 Beta is for members only.\n\nIf you have an account at www.pj64-emu.com, you should not be seeing this error!!\nPlease contact us on the site."); + DEF_STR(MSG_INVALID_EXE, L"Project64 beta versions are for members only.\n\nIf you have an account at www.pj64-emu.com, you should not be seeing this error!!\nPlease contact us on the site."); DEF_STR(MSG_INVALID_EXE_TITLE, L"Program Error"); DEF_STR(MSG_7Z_FILE_NOT_FOUND, L"Failed to find filename in 7z file"); DEF_STR(MSG_SET_LLE_GFX_TITLE, L"Graphics Low-Level Emulation"); From afd470914dafefb5ef71f2e4dde27d615729811f Mon Sep 17 00:00:00 2001 From: unknown Date: Mon, 26 Oct 2015 18:11:18 -0400 Subject: [PATCH 2/2] Fix non-MSVC compiler errors: undeclared sprintf() --- Source/Common/md5.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Source/Common/md5.h b/Source/Common/md5.h index ea9a5f2a7..423b9e0fe 100644 --- a/Source/Common/md5.h +++ b/Source/Common/md5.h @@ -42,6 +42,9 @@ documentation and/or software. #if !defined(AFX_MD5_H__6DD6923B_E241_40CE_81A3_4C2C88C140E4__INCLUDED_) #define AFX_MD5_H__6DD6923B_E241_40CE_81A3_4C2C88C140E4__INCLUDED_ +/* sprintf() */ +#include + #include #include #include "path.h"