ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge https://github.com/project64/project64 into crapware

This commit is contained in:
MELERIX 2015-10-26 21:39:26 -03:00
parent c70079880f a52104aa25
commit 2e223de168
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Lang/English.pj.Lang
View File

@ -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"

3
Source/Common/md5.h
View File

@ -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 <stdio.h>
#include <string>
#include <functional>
#include "path.h"

4
Source/Project64/Multilanguage/Language Class.cpp
View File

@ -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");