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

Merge pull request #338 from MELERIX/patch 

Sync English.pj.Lang <==> Language Class.cpp
This commit is contained in:
zilmar 2015-03-29 17:34:05 +11:00
parent 83edebcae2 2878f53b75
commit 2bcf9c806f
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Lang/English.pj.Lang
View File

@ -97,7 +97,7 @@
#214# "Graphics Plugin" #214# "Graphics Plugin"
//Alternate Name to save Slot //Alternate Name to save Slot
#220# "Default" #220# "Save Slot - Default"
#221# "Save Slot - 1" #221# "Save Slot - 1"
#222# "Save Slot - 2" #222# "Save Slot - 2"
#223# "Save Slot - 3" #223# "Save Slot - 3"
@ -238,7 +238,7 @@
#481# "ROMs" #481# "ROMs"
#482# "Max # of ROM dirs remembered (0-10):" #482# "Max # of ROM dirs remembered (0-10):"
#483# "dirs" #483# "dirs"
#484# "Use ROM Browser" #484# "Use ROM browser"
#485# "Use directory recursion" #485# "Use directory recursion"
#486# "Available fields:" #486# "Available fields:"
#487# "Show fields in this order:" #487# "Show fields in this order:"
@ -290,16 +290,16 @@
//Core Styles //Core Styles
#540# "Interpreter" #540# "Interpreter"
#541# "Recompiler" #541# "Recompiler"
#542# "Synchronize Cores" #542# "Synchronize cores"
//Self Mod Methods //Self Mod Methods
#560# "None" #560# "None"
#561# "Cache" #561# "Cache"
#562# "Protect Memory" #562# "Protect memory"
#563# "Check Memory & Cache" #563# "Check memory & cache"
#564# "Change Memory & Cache" #564# "Change memory & cache"
#565# "Check Memory Advance" #565# "Check memory advance"
#566# "Clear Code on Cache" #566# "Clear code on cache"
//Function Lookup method //Function Lookup method
#570# "Physical lookup table" #570# "Physical lookup table"
@ -352,7 +352,7 @@
#710# "Increase Game Speed" #710# "Increase Game Speed"
#711# "Decrease Game Speed" #711# "Decrease Game Speed"
//Bottom Page Buttons //Bottom page buttons
#720# "Reset Page" #720# "Reset Page"
#721# "Reset All" #721# "Reset All"
#722# "Apply" #722# "Apply"
@ -460,11 +460,11 @@
#2021# "Unknown memory action\n\nEmulation stopped" #2021# "Unknown memory action\n\nEmulation stopped"
#2022# "Unhandled R4300i opcode at" #2022# "Unhandled R4300i opcode at"
#2023# "Executing from non-mapped space.\n\nVerify ROM and ROM settings." #2023# "Executing from non-mapped space.\n\nVerify ROM and ROM settings."
#2024# "Saved state does not appear to match the running ROM. \n\nSaved states must be saved & loaded between 100% identical ROMs. \nIn particular, the REGION and VERSION must be the same. \nLoading this State is likely to cause the game and/or emulator to crash. \n\nAre you sure you want to continue loading?" #2024# "This saved state does not appear to match the running ROM. \n\nStates must be saved & loaded between 100% identical ROMs. \nIn particular the REGION and VERSION need to be the same. \nLoading this state is likely to cause the game and/or emulator to crash. \n\nAre you sure you want to continue loading?"
#2025# "Error" #2025# "Error"
#2026# "Copyright sequence not found in LUT. Game will no longer function." #2026# "Copyright sequence not found in LUT. Game will no longer function."
#2027# "Copy Protection Failure" #2027# "Copy Protection Failure"
#2028# "Changing a plugin requires Project64 to reset a running ROM. \nIf you don't want to lose your place, answer No and save the current State first. \n\nChange plugins and reset ROM now?" #2028# "Changing a plugin requires Project64 to reset a running ROM. \nIf you don't want to lose your place, answer No and save the current state first. \n\nChange plugins and reset ROM now?"
#2029# "Change Plugins" #2029# "Change Plugins"
#2030# "Emulation ended" #2030# "Emulation ended"
#2031# "Emulation started" #2031# "Emulation started"

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

@ -247,12 +247,12 @@ void CLanguage::LoadDefaultStrings (void)
DEF_STR(ADVANCE_INFO, L"Most of these changes will not take effect until a new ROM is opened or current ROM is reset."); DEF_STR(ADVANCE_INFO, L"Most of these changes will not take effect until a new ROM is opened or current ROM is reset.");
DEF_STR(ADVANCE_DEFAULTS, L"Core Defaults"); DEF_STR(ADVANCE_DEFAULTS, L"Core Defaults");
DEF_STR(ADVANCE_CPU_STYLE, L"CPU core style:"); DEF_STR(ADVANCE_CPU_STYLE, L"CPU core style:");
DEF_STR(ADVANCE_SMCM, L"Self-mod code method:"); DEF_STR(ADVANCE_SMCM, L"Self-mod methods:");
DEF_STR(ADVANCE_MEM_SIZE, L"Default memory size:"); DEF_STR(ADVANCE_MEM_SIZE, L"Default memory size:");
DEF_STR(ADVANCE_ABL, L"Advanced block linking:"); DEF_STR(ADVANCE_ABL, L"Advanced block linking:");
DEF_STR(ADVANCE_AUTO_START, L"Start emulation when ROM is opened"); DEF_STR(ADVANCE_AUTO_START, L"Start emulation when ROM is opened");
DEF_STR(ADVANCE_OVERWRITE, L"Always override default settings with ones from RDB"); DEF_STR(ADVANCE_OVERWRITE, L"Always override default settings with ones from RDB");
DEF_STR(ADVANCE_COMPRESS, L"Automatically compress saves states"); DEF_STR(ADVANCE_COMPRESS, L"Automatically compress saved states");
DEF_STR(ADVANCE_DEBUGGER, L"Enable debugger"); DEF_STR(ADVANCE_DEBUGGER, L"Enable debugger");
DEF_STR(ADVANCE_SMM_CACHE, L"Cache"); DEF_STR(ADVANCE_SMM_CACHE, L"Cache");
DEF_STR(ADVANCE_SMM_PIDMA, L"PI DMA"); DEF_STR(ADVANCE_SMM_PIDMA, L"PI DMA");
@ -310,7 +310,7 @@ void CLanguage::LoadDefaultStrings (void)
DEF_STR(ABL_OFF, L"Off"); DEF_STR(ABL_OFF, L"Off");
//Save Type //Save Type
DEF_STR(SAVE_FIRST_USED, L"Use first used save type"); DEF_STR(SAVE_FIRST_USED, L"Use first-used save type");
DEF_STR(SAVE_4K_EEPROM, L"4-kbit EEPROM"); DEF_STR(SAVE_4K_EEPROM, L"4-kbit EEPROM");
DEF_STR(SAVE_16K_EEPROM, L"16-kbit EEPROM"); DEF_STR(SAVE_16K_EEPROM, L"16-kbit EEPROM");
DEF_STR(SAVE_SRAM, L"32-kbyte SRAM"); DEF_STR(SAVE_SRAM, L"32-kbyte SRAM");
@ -433,14 +433,14 @@ void CLanguage::LoadDefaultStrings (void)
*********************************************************************************/ *********************************************************************************/
DEF_STR(MSG_CPU_PAUSED, L"*** CPU PAUSED ***"); DEF_STR(MSG_CPU_PAUSED, L"*** CPU PAUSED ***");
DEF_STR(MSG_CPU_RESUMED, L"CPU resumed"); DEF_STR(MSG_CPU_RESUMED, L"CPU resumed");
DEF_STR(MSG_PERM_LOOP, L"In a permanent loop that cannot be exited. \nEmulation will now stop. \n\nVerify ROM and ROM Settings."); DEF_STR(MSG_PERM_LOOP, L"In a permanent loop that cannot be exited. \nEmulation will now stop. \n\nVerify ROM and ROM settings.");
DEF_STR(MSG_MEM_ALLOC_ERROR, L"Failed to allocate memory"); DEF_STR(MSG_MEM_ALLOC_ERROR, L"Failed to allocate memory");
DEF_STR(MSG_FAIL_INIT_GFX, L"The default or selected video plugin is missing or invalid. \n\nYou need to go into Settings and select a video (graphics) plugin.\nCheck that you have at least one compatible plugin file in your plugin folder."); DEF_STR(MSG_FAIL_INIT_GFX, L"The default or selected video plugin is missing or invalid. \n\nYou need to go into Settings and select a video (graphics) plugin.\nCheck that you have at least one compatible plugin file in your plugin folder.");
DEF_STR(MSG_FAIL_INIT_AUDIO, L"The default or selected audio plugin is missing or invalid. \n\nYou need to go into Settings and select a audio (sound) plugin.\nCheck that you have at least one compatible plugin file in your plugin folder."); DEF_STR(MSG_FAIL_INIT_AUDIO, L"The default or selected audio plugin is missing or invalid. \n\nYou need to go into Settings and select a audio (sound) plugin.\nCheck that you have at least one compatible plugin file in your plugin folder.");
DEF_STR(MSG_FAIL_INIT_RSP, L"The default or selected RSP plugin is missing or invalid. \n\nYou need to go into Settings and select a RSP (Reality Signal Processor) plugin.\nCheck that you have at least one compatible plugin file in your plugin folder."); DEF_STR(MSG_FAIL_INIT_RSP, L"The default or selected RSP plugin is missing or invalid. \n\nYou need to go into Settings and select a RSP (Reality Signal Processor) plugin.\nCheck that you have at least one compatible plugin file in your plugin folder.");
DEF_STR(MSG_FAIL_INIT_CONTROL, L"The default or selected input plugin is missing or invalid. \n\nYou need to go into Settings and select an input (controller) plugin.\nCheck that you have at least one compatible plugin file in your plugin folder."); DEF_STR(MSG_FAIL_INIT_CONTROL, L"The default or selected input plugin is missing or invalid. \n\nYou need to go into Settings and select an input (controller) plugin.\nCheck that you have at least one compatible plugin file in your plugin folder.");
DEF_STR(MSG_FAIL_LOAD_PLUGIN, L"Failed to load plugin:"); DEF_STR(MSG_FAIL_LOAD_PLUGIN, L"Failed to load plugin:");
DEF_STR(MSG_FAIL_LOAD_WORD, L"Failed to load word\n\nVerify ROM and ROM settings."); DEF_STR(MSG_FAIL_LOAD_WORD, L"Failed to load word.\n\nVerify ROM and ROM settings.");
DEF_STR(MSG_FAIL_OPEN_SAVE, L"Failed to open save file"); DEF_STR(MSG_FAIL_OPEN_SAVE, L"Failed to open save file");
DEF_STR(MSG_FAIL_OPEN_EEPROM, L"Failed to open EEPROM"); DEF_STR(MSG_FAIL_OPEN_EEPROM, L"Failed to open EEPROM");
DEF_STR(MSG_FAIL_OPEN_FLASH, L"Failed to open flash RAM"); DEF_STR(MSG_FAIL_OPEN_FLASH, L"Failed to open flash RAM");