From f2cacbf0451cacddcd52b671adc4f4714134ed34 Mon Sep 17 00:00:00 2001 From: Samuel Yuan Date: Fri, 20 Mar 2015 14:36:29 -0400 Subject: [PATCH] Updated some more UI strings --- Lang/Chinese (Simplified).pj.Lang | 9 +- Lang/ChineseGB.pj.lang | 426 ------------------ Lang/English.pj.Lang | 5 +- Source/Project64/Multilanguage.h | 1 + .../Multilanguage/Language Class.cpp | 3 +- .../Settings Page - Advanced Options.cpp | 2 + .../Settings Page - Game - General.cpp | 2 + .../Settings Page - Game - Recompiler.cpp | 5 +- 8 files changed, 19 insertions(+), 434 deletions(-) delete mode 100644 Lang/ChineseGB.pj.lang diff --git a/Lang/Chinese (Simplified).pj.Lang b/Lang/Chinese (Simplified).pj.Lang index 5e1707bdb..9eb2acf8e 100644 --- a/Lang/Chinese (Simplified).pj.Lang +++ b/Lang/Chinese (Simplified).pj.Lang @@ -230,7 +230,8 @@ #463# "记忆已选择的金手指" #464# "当运行rom时，禁用屏幕保护程序" #465# "显示帧速率" -#466# "改变帧速率的显示类型" +#466# "帧速率回显" +#467# "检查Project64是否已经在运行" //Rom Browser Tab #480# "最大 # Rom 记忆数 (最大 10):" @@ -340,8 +341,8 @@ #691# "游戏正在运行 (全屏)" // Frame Rate Option -#700# "每秒场消隐期" -#701# "每秒显示列表" +#700# "每秒垂直中断 (VI/s)" +#701# "每秒显示列表 (DL/s)" #702# "速度百分比" // Increase speed @@ -397,7 +398,7 @@ #1017# "请选择一个值:" #1018# "数值(&V)" #1019# "从" -#1020# "到" +#1020# "至" #1021# "说明(&N):" #1022# "添加金手指" #1023# "新建金手指" diff --git a/Lang/ChineseGB.pj.lang b/Lang/ChineseGB.pj.lang deleted file mode 100644 index 6880e44ef..000000000 --- a/Lang/ChineseGB.pj.lang +++ /dev/null @@ -1,426 +0,0 @@ -/********************************************************************************* -* What's New * -*********************************************************************************/ -//Alt+KEYS shortcut added (credit to mygod for pointing this out! Thanks) -//Review and minor mistake corrected - -/********************************************************************************* -* Meta Information * -*********************************************************************************/ -//About DLL -#1# "简体中文" -#2# "Maximus" -#3# "1.1" -#4# "10th September 2002" - -//About DLL Dialog -#5# "目前语文" -#6# "作者" -#7# "版本" -#8# "日期" -#9# "浏览网页" -#10# "游戏档资料库（.RDB）" -#11# "作弊码资料库（.CHT）" -#12# "游戏档讯息资料库（.RDX）" - -//About INI title -#20 # "关於INI" - -/********************************************************************************* -* Menu * -*********************************************************************************/ -//File Menu -#100# "文件 &F" -#101# "打开 &O" -#102# "讯息... &I" -#103# "开始模拟" -#104# "结束模拟" -#105# "选择文件夹..." -#106# "刷新" -#107# "最近使用游戏档" -#108# "最近使用游戏档文件夹" -#109# "离开 &X" - -//System Menu -#120# "系统 &S" -#121# "重新启动 &R" -#122# "暂停 &P" -#123# "萤幕抓取" -#124# "限制FPS" -#125# "储存 &S" -#126# "更名另存..." -#127# "读取 &R" -#128# "读取档案..." -#129# "快速存档 &T" -#130# "作弊码..." -#131# "作弊码按钮" -#132# "继续" - -//Options Menu -#140# "设置 &O" -#141# "全萤幕 &F" -#142# "常置桌面 &T" -#143# "影像设定..." -#144# "音效设定..." -#145# "输入设定..." -#146# "RSP设定..." -#147# "显示CPU使用率%" -#148# "设定... &S" - -//Debugger Menu -#160# "除错 &D" - -//Language Menu -#175# "语文 &L" - -//Help Menu -#180# "帮助 &H" -#181# "关於INI &I" -#182# "关於Project 64 &A" - -//Current Save Slot menu -#190# "初始设定" -#191# "快存捷径一" -#192# "快存捷径二" -#193# "快存捷径三" -#194# "快存捷径四" -#195# "快存捷径五" -#196# "快存捷径六" -#197# "快存捷径七" -#198# "快存捷径八" -#199# "快存捷径九" -#200# "快存捷径十" - -//Pop up Menu -#210# "执行游戏" -#211# "讯息" -#212# "游戏设定" -#213# "作弊码编辑" - -// Menu Descriptions -#250# "打开N64游戏档" -#251# "显示N64游戏档讯息" -#252# "开始执行游戏模拟" -#253# "停止执行游戏模拟" -#254# "选择游戏档文件夹" -#255# "刷新游戏档列示" -#256# "离开模拟器" -#257# "重新启动游戏档（变更设定）" -#258# "暂定/继续游戏" -#259# "抓取游戏画面" -#260# "限制FPS以变更模拟器执行速度" -#261# "进行快速存档" -#262# "进行快速存档（快存捷径选择）" -#263# "读取快存档" -#264# "读取指定快存档" -#265# "启动/关闭GAME SHARK作弊码" -#266# "特殊作弊码按钮" -#267# "全萤幕切换" -#268# "游戏视窗常置於桌面" -#269# "变更影像设定" -#270# "变更音效设定" -#271# "变更输入设定" -#272# "变更RSP设定" -#273# "显示目前处理器资源" -#274# "观看/变更目前系统设定" -#275# "观看使用手册" -#276# "观看常见问题集" -#277# "关於INI" -#278# "关於程式" -#279# "打开此游戏档" -#280# "选择此文件夹为指定文件夹" -#281# "变更语文设定" -#282# "选择此快存捷径" -#283# "执行此游戏档" -#284# "此游戏档讯息" -#285# "指定游戏档设定" -#286# "指定游戏档作弊码设定" - -/********************************************************************************* -* ROM Browser * -*********************************************************************************/ -//Rom Browser Fields -#300# "档案名" -#301# "游戏名称" -#302# "正常游戏档" -#303# "状况" -#304# "游戏档容量" -#305# "核心程式备注" -#306# "外挂程式备注" -#307# "使用者备注" -#308# "游戏标签" -#309# "发行公司" -#310# "国家" -#311# "设计公司" -#312# "CRC1" -#313# "CRC2" -#314# "CIC CHIP" -#315# "发行日期" -#316# "类型" -#317# "玩家人数" - -//Select Rom -#320# "选择此游戏档文件夹" - -//Messages -#340# "此为问题游戏档？请使用GOODN64确定或查阅最新版INI" - -/********************************************************************************* -* Option * -*********************************************************************************/ -//Options Title -#400# "设定" - -//Tabs -#401# "外挂程式" -#402# "文件夹" -#403# "选项" -#404# "游戏档选择" -#405# "进阶设定" -#406# "游戏档设定" -#407# "副档名连结" -#408# "游戏档备注" - -//Plugin Dialog -#420# "关於" -#421# "同位讯号处理器（RSP）外挂程式：" -#422# "影像外挂程式：" -#423# "音效外挂程式：" -#424# "输入设备外挂程式：" - -//Directory Dialog -#440# "外挂程式文件夹：" -#441# "游戏档文件夹：" -#442# "N64自动存档：" -#443# "快存：" -#444# "画面抓取：" -#445# "前次游戏档文件夹" -#446# "选择外挂程式文件夹" -#447# "选择游戏档文件夹" -#448# "选择自存档文件夹" -#449# "选择快存档文件夹" -#450# "选择抓取画面存档路径" - -//Options Dialog -#460# "当跳离模拟器视窗时暂停游戏" -#461# "直接切换为全萤幕" -#462# "隐藏进阶设定" -#463# "自动记忆所选择作弊码" - -//Rom Browser Tab -#480# "最大游戏档数记忆（最多十个）：" -#481# "游戏档" -#482# "最大游戏档路径数记忆（最多十个）：" -#483# "路径" -#484# "使用游戏档浏览器" -#485# "使用完整路径名称" -#486# "可用选项：" -#487# "以此次序显示：" -#488# "加入->" -#489# "<-删除" -#490# "移上" -#491# "移下" - -//Advanced Options -#500# "除非重新启动或更换游戏档，否则多数效果将无法更新/显示" -#501# "核心程式初始设定" -#502# "核心处理器模式：" -#503# "记忆体处理模式：" -#504# "记忆体容量（初始设定）：" -#505# "ADVANCED BLOCK LINKING：" -#506# "打开游戏档时自动开始进行模拟" -#507# "自动覆盖INI初始设定" -#508# "自动压缩快存档" - -//Rom Options -#520# "核心处理器模式：" -#521# "记忆体处理模式：" -#522# "记忆体容量：" -#523# "ADVANCED BLOCK LINKING：" -#524# "储存模式：" -#525# "COUNTER FACTOR：" -#526# "LARGE COMPILE BUFFER" -#527# "使用TLB" -#528# "REGISTER CACHING" -#529# "暂缓SI INTERRUPT" -#530# "SP HACK" -#531# "初始设定" - -//Core Styles -#540# "INTERPRETER" -#541# "RECOMPILER" -#542# "SYNCHRONISE CORES" - -//Self Mod Methods -#560# "NONE" -#561# "CACHE" -#562# "PROTECT MEMORY" -#563# "CHECK MEMORY & CACHE" -#564# "CHANGE MEMORY & CACHE" -#565# "CHECK MEMORY ADVANCED" - -//RDRAM Size -#580# "4 MB" -#581# "8 MB" - -//Advanced Block Linking -#600# "启动" -#601# "关闭" - -//Save Type -#620# "使用优先类型" -#621# "4KBIT EEPROM" -#622# "16KBIT EEPROM" -#623# "32KBYTES SRAM" -#624# "FLASHRAM" - -//Shell Integration Tab -#640# "连结副档名：" - -//Rom Notes -#660# "游戏档状况：" -#661# "核心程式备注：" -#662# "外挂程式备注：" - -/********************************************************************************* -* ROM Information * -*********************************************************************************/ -//Rom Info Title -#800# "游戏档资讯" - -//Rom Info Text -#801# "游戏名称：" -#802# "档案名称：" -#803# "位置：" -#804# "容量：" -#805# "游戏标签：" -#806# "设计公司：" -#807# "国家：" -#808# "CRC1：" -#809# "CRC2：" -#810# "CIC CHIP：" - -/********************************************************************************* -* Cheats * -*********************************************************************************/ -//Cheat List -#1000# "作弊码" -#1001# "作弊码：" -#1002# "备注：" -#1003# "全部选择" -#1004# "全部不选择" - -//Add Cheat -#1005# "加入作弊码" -#1006# "名称：" -#1007# "作弊码：" -#1008# "增加" -#1009# "清除" -#1010# "作弊码备注：" -#1011# "加入资料库" -#1022# "加入作弊码" -#1023# "新增作弊码" -#1024# "〈位置〉〈数值〉" -#1025# "选项：" -#1026# "〈位置〉〈数值〉" - -//Code extension -#1012# "进阶码" -#1013# "请选择使用数值：" -#1014# "确定" -#1015# "取消" - -//Digital Value -#1016# "数据" -#1017# "请输入数值：" -#1018# "数值" -#1019# "由" -#1020# "至" -#1021# "备注：" - -//Edit Cheat -#1027# "作弊码编辑" -#1028# "作弊码更新" - -//Cheat Popup Menu -#1040# "新增作弊码" -#1041# "编辑" -#1042# "删除" - -/********************************************************************************* -* Message * -*********************************************************************************/ -#2000# "*** 暂停 ***" -#2001# "继续" -#2002# "程式出现循环错误，模拟将停止。 - -请重新设定游戏" -#2003# "搜索记忆位置失败" -#2004# "影像外挂程式错误。 - -请确认是否有系统所支援外挂程式存在" -#2005# "音效外挂程式错误。 - -请确认是否有系统所支援外挂程式存在" -#2006# "RSP外挂程式错误。 - -请确认PROJECT64是否完整安装" -#2007# "输入外挂程式错误。 - -请确认是否有系统所支援外挂程式存在" -#2008# "无法读取外挂程式：" -#2009# "无法读取。 - -请确认游戏档设定" -#2010# "无法读取存档" -#2011# "无法读取EEPROM" -#2012# "无法读取FLASHRAM" -#2013# "无法读取MEMPAK" -#2014# "无法读取压缩档。 -请检查压缩档状况。 - -模拟器或许需要重新启动" -#2015# "无法打开文件" -#2016# "打开压缩档出错" -#2017# "此档案为错误游戏档。 - -请使用GOODN64确认" -#2018# "资料不明（国家）" -#2019# "资料不明（CIC CHIP）" -#2020# "资料不明（档案格式）" -#2021# "资料不明（记忆体执行错误） - -模拟停止" -#2022# "无法执行R4300I OPCODE" -#2023# "程式执行错误。 - -请确认游戏档设定" -#2024# "此快存档无法执行於此游戏档。 - -快存档必需使用於原本游戏档，区码及版本也必需相同。 -强迫读取将造成程式无法正常执行。 - -确定读取？" -#2025# "错误" -#2026# "版权资讯不明。此游戏档将无法正常执行。" -#2027# "拷贝防护失败" -#2028# "更换外挂程式后模拟器将重新启动。 -如果您不想失去目前游戏进度，请选择“否”并进行快存。 - -确定更换外挂程式？" -#2029# "更换外挂程式" -#2030# "模拟结束" -#2031# "模拟开始" -#2032# "无法读取快存捷径" -#2033# "读取快存捷径" -#2034# "将目前进度储存於" -#2035# "快存结束" -#2036# "游戏档位元更换（BYTE SWAPPING IMAGE）" -#2037# "选择N64游戏档" -#2038# "读取" -#2039# "读取游戏档" -#2040# "外挂程式尚未启动，游戏档无法执行" -#2041# "确定删除？" -#2042# "删除作弊码" -#2043# "此作弊码名称经已使用" -#2044# "此游戏档已无法新增作弊码" diff --git a/Lang/English.pj.Lang b/Lang/English.pj.Lang index e7e4a5fa8..5e872232f 100644 --- a/Lang/English.pj.Lang +++ b/Lang/English.pj.Lang @@ -230,7 +230,8 @@ #463# "Remember selected cheats" #464# "Disable Screen Saver when running rom" #465# "Display Frame Rate" -#466# "Change Frame Rate Display Type" +#466# "Frame Rate Display" +#467# "Check if project64 is already running" //Rom Browser Tab #480# "Max # of Roms Remembered (Max 10):" @@ -251,7 +252,7 @@ #500# "Most of these changes will not take effect till a new rom is opened or current rom is reset." #501# "Core Defaults" #502# "CPU core style:" -#503# "Self-mod code method:" +#503# "Self Mod Methods" #504# "Default Memory Size:" #505# "Advanced Block Linking:" #506# "Start Emulation when rom is opened?" diff --git a/Source/Project64/Multilanguage.h b/Source/Project64/Multilanguage.h index 1e5c5f4ab..49469f71d 100644 --- a/Source/Project64/Multilanguage.h +++ b/Source/Project64/Multilanguage.h @@ -260,6 +260,7 @@ enum LanguageStringID{ OPTION_DISABLE_SS =464, OPTION_DISPLAY_FR =465, OPTION_CHANGE_FR =466, + OPTION_CHECK_RUNNING =467, //Rom Browser Tab RB_MAX_ROMS = 480, diff --git a/Source/Project64/Multilanguage/Language Class.cpp b/Source/Project64/Multilanguage/Language Class.cpp index 58e0b1553..0c07c8d07 100644 --- a/Source/Project64/Multilanguage/Language Class.cpp +++ b/Source/Project64/Multilanguage/Language Class.cpp @@ -225,7 +225,8 @@ void CLanguage::LoadDefaultStrings (void) DEF_STR(OPTION_REMEMBER_CHEAT, L"Remember selected cheats"); DEF_STR(OPTION_DISABLE_SS, L"Disable Screen Saver when running rom"); DEF_STR(OPTION_DISPLAY_FR, L"Display Frame Rate"); - DEF_STR(OPTION_CHANGE_FR, L"Change Frame Rate Display Type"); + DEF_STR(OPTION_CHECK_RUNNING, L"Check if project64 is already running"); + DEF_STR(OPTION_CHANGE_FR, L"Frame Rate Display"); //Rom Browser Tab DEF_STR(RB_MAX_ROMS, L"Max # of Roms Remembered (Max 10):"); diff --git a/Source/Project64/User Interface/Settings/Settings Page - Advanced Options.cpp b/Source/Project64/User Interface/Settings/Settings Page - Advanced Options.cpp index 7ce3df90c..c91c6e1bc 100644 --- a/Source/Project64/User Interface/Settings/Settings Page - Advanced Options.cpp +++ b/Source/Project64/User Interface/Settings/Settings Page - Advanced Options.cpp @@ -23,6 +23,8 @@ CAdvancedOptionsPage::CAdvancedOptionsPage (HWND hParent, const RECT & rcDispay SetDlgItemTextW(m_hWnd, IDC_ZIP, GS(ADVANCE_COMPRESS)); SetDlgItemTextW(m_hWnd, IDC_DEBUGGER, GS(ADVANCE_DEBUGGER)); SetDlgItemTextW(m_hWnd, IDC_REMEMBER_CHEAT, GS(OPTION_REMEMBER_CHEAT)); + SetDlgItemTextW(m_hWnd, IDC_CHECK_RUNNING, GS(OPTION_CHECK_RUNNING)); + SetDlgItemTextW(m_hWnd, IDC_DISPLAY_FRAMERATE, GS(OPTION_CHANGE_FR)); AddModCheckBox(GetDlgItem(IDC_START_ON_ROM_OPEN),Setting_AutoStart); AddModCheckBox(GetDlgItem(IDC_ZIP),Setting_AutoZipInstantSave); diff --git a/Source/Project64/User Interface/Settings/Settings Page - Game - General.cpp b/Source/Project64/User Interface/Settings/Settings Page - Game - General.cpp index e12a3fde0..feda78a97 100644 --- a/Source/Project64/User Interface/Settings/Settings Page - Game - General.cpp +++ b/Source/Project64/User Interface/Settings/Settings Page - Game - General.cpp @@ -20,6 +20,8 @@ CGameGeneralPage::CGameGeneralPage (HWND hParent, const RECT & rcDispay ) } //Set the text for all gui Items + SetDlgItemTextW(m_hWnd, IDC_GOOD_NAME_TEXT, GS(RB_GOODNAME)); + SetDlgItemTextW(m_hWnd, IDC_MEMORY_SIZE_TEXT, GS(ROM_MEM_SIZE)); SetDlgItemTextW(m_hWnd, IDC_SAVE_TYPE_TEXT, GS(ROM_SAVE_TYPE)); SetDlgItemTextW(m_hWnd, IDC_COUNTFACT_TEXT, GS(ROM_COUNTER_FACTOR)); diff --git a/Source/Project64/User Interface/Settings/Settings Page - Game - Recompiler.cpp b/Source/Project64/User Interface/Settings/Settings Page - Game - Recompiler.cpp index f69b6c960..6f8b5cf6b 100644 --- a/Source/Project64/User Interface/Settings/Settings Page - Game - Recompiler.cpp +++ b/Source/Project64/User Interface/Settings/Settings Page - Game - Recompiler.cpp @@ -22,8 +22,11 @@ CGameRecompilePage::CGameRecompilePage (HWND hParent, const RECT & rcDispay ) //Set the text for all gui Items SetDlgItemTextW(m_hWnd, IDC_CPU_TYPE_TEXT, GS(ROM_CPU_STYLE)); SetDlgItemTextW(m_hWnd, IDC_FUNCFIND_TEXT, GS(ROM_FUNC_FIND)); - SetDlgItemTextW(m_hWnd, IDC_ROM_REGCACHE, GS(ROM_REG_CACHE)); + SetDlgItemTextW(m_hWnd, IDC_ROM_REGCACHE, GS(ROM_REG_CACHE)); + SetDlgItemTextW(m_hWnd, IDC_BLOCK_LINKING, GS(ADVANCE_ABL)); + + SetDlgItemTextW(m_hWnd, IDC_SMM_FRAME, GS(ADVANCE_SMCM)); SetDlgItemTextW(m_hWnd, IDC_SMM_CACHE, GS(ADVANCE_SMM_CACHE)); SetDlgItemTextW(m_hWnd, IDC_SMM_DMA, GS(ADVANCE_SMM_PIDMA)); SetDlgItemTextW(m_hWnd, IDC_SMM_VALIDATE, GS(ADVANCE_SMM_VALIDATE));