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

2015-03-26 15:40:16 -04:00 · 2015-03-26 15:40:16 -04:00 · f8fd57d52e
parent 1d26ffc661 2bea10d721
commit f8fd57d52e
31 changed files with 777 additions and 2319 deletions
--- a/.gitignore
+++ b/.gitignore
@ -4,6 +4,7 @@
 *.sdf
 *.suo
 *.user
+Thumbs.db
 /Bin/Debug
 /Bin/Package
 /Bin/Release
--- a/Config/Glide64.rdb
+++ b/Config/Glide64.rdb
--- a/Config/Project64.rdb
+++ b/Config/Project64.rdb
@ -232,6 +232,7 @@ Internal Name=A Bug's Life
 Status=Compatible
 Counter Factor=1
 32bit=No
+ViRefresh=2200

 [2B38AEC0-6350B810-C:46]
 Good Name=A Bug's Life (F)
@ -239,6 +240,7 @@ Internal Name=A Bug's Life
 Status=Compatible
 Counter Factor=1
 32bit=No
+ViRefresh=2200

 [DFF227D9-0D4D8169-C:44]
 Good Name=A Bug's Life (G)
@ -246,6 +248,7 @@ Internal Name=A Bug's Life
 Status=Compatible
 Counter Factor=1
 32bit=No
+ViRefresh=2200

 [F63B89CE-4582D57D-C:49]
 Good Name=A Bug's Life (I)
@ -253,6 +256,7 @@ Internal Name=A Bug's Life
 Status=Compatible
 Counter Factor=1
 32bit=No
+ViRefresh=2200

 [82DC04FD-CF2D82F4-C:45]
 Good Name=A Bug's Life (U)
@ -260,6 +264,7 @@ Internal Name=A Bug's Life
 Status=Compatible
 Counter Factor=1
 32bit=No
+ViRefresh=2200

 [62F6BE95-F102D6D6-C:50]
 Good Name=AeroFighters Assault (E) (M3)
@ -1457,6 +1462,7 @@ Status=Compatible
 Core Note=(see GameFAQ)
 Plugin Note=[video] (see GameFAQ)
 32bit=No
+AiCountPerBytes=625
 Counter Factor=1
 Culling=1
 RDRAM Size=8
@ -1469,6 +1475,9 @@ Status=Compatible
 Core Note=(see GameFAQ)
 Plugin Note=[video] (see GameFAQ)
 32bit=No
+AiCountPerBytes=625
+Counter Factor=1
+Dsound-SyncAudio=1
 RDRAM Size=8
 Save Type=16kbit Eeprom

@ -1480,7 +1489,9 @@ Core Note=(see GameFAQ)
 Plugin Note=[video] (see GameFAQ)
 32bit=No
 AiCountPerBytes=625
+Counter Factor=1
 Culling=1
+Dsound-SyncAudio=1
 Emulate Clear=1
 Primary Frame Buffer=1
 RDRAM Size=8
@ -1494,6 +1505,7 @@ Core Note=(see GameFAQ)
 Plugin Note=[video] (see GameFAQ)
 32bit=No
 Counter Factor=1
+Dsound-SyncAudio=1
 RDRAM Size=8
 Save Type=16kbit Eeprom

@ -2015,6 +2027,7 @@ Internal Name=F3 Ì³×²É¼ÚÝ2
 Status=Uncertain
 Core Note=?
 Plugin Note=[video] (see GameFAQ)
+32bit=No
 Clear Frame=2
 Counter Factor=1
 Culling=1
@ -2161,6 +2174,7 @@ Plugin Note=[video] errors:textures
 Good Name=Goemon - Mononoke Sugoroku (J)
 Internal Name=ºÞ´ÓÝÓÉÉ¹½ºÞÛ¸
 Status=Compatible
+32bit=No

 [4252A5AD-AE6FBF4E-C:45]
 Good Name=Goemon's Great Adventure (U)
@ -2173,6 +2187,7 @@ AiCountPerBytes=50
 Good Name=Golden Nugget 64 (U)
 Internal Name=GOLDEN NUGGET 64
 Status=Compatible
+Linking=Off

 [0414CA61-2E57B8AA-C:50]
 Good Name=GoldenEye 007 (E)
@ -2578,6 +2593,8 @@ ViRefresh=2050
 Good Name=Indy Racing 2000 (U)
 Internal Name=INDY RACING 2000
 Status=Compatible
+Core Note=high system requirement
+Fixed Audio=1
 RDRAM Size=8

 [F41B6343-C10661E6-C:50]
@ -4604,7 +4621,7 @@ Status=Compatible
 Good Name=Quake II (E)
 Internal Name=QUAKE II
 Status=Compatible
-Plugin Note=[video] depth problem, flicker; use Glide64 (see GameFAQ)
+Plugin Note=[video] Glide64 Underwater Depth issues.
 Counter Factor=1
 RDRAM Size=8

@ -4612,7 +4629,7 @@ RDRAM Size=8
 Good Name=Quake II (U)
 Internal Name=QUAKE II
 Status=Compatible
-Plugin Note=[video] depth problem, flicker; use Glide64 (see GameFAQ)
+Plugin Note=[video] Glide64 Underwater Depth issues.
 Counter Factor=1
 Culling=1
 RDRAM Size=8
@ -5418,6 +5435,7 @@ Sync Audio=0
 Good Name=Star Wars Episode I - Racer (E) (M3)
 Internal Name=STAR WARS EP1 RACER
 Status=Compatible
+Counter Factor=1
 Culling=1
 Emulate Clear=1
 RDRAM Size=8
@ -5427,6 +5445,7 @@ Save Type=16kbit Eeprom
 Good Name=Star Wars Episode I - Racer (J)
 Internal Name=STAR WARS EP1 RACER
 Status=Compatible
+Counter Factor=1
 Culling=1
 Emulate Clear=1
 RDRAM Size=8
@ -5436,6 +5455,7 @@ Save Type=16kbit Eeprom
 Good Name=Star Wars Episode I - Racer (U)
 Internal Name=STAR WARS EP1 RACER
 Status=Compatible
+Counter Factor=1
 Culling=1
 Emulate Clear=1
 RDRAM Size=8
@ -6230,12 +6250,24 @@ Internal Name=Toy Story 2
 Status=Compatible
 Counter Factor=1

+[BC4F2AB8-AA99E32E-C:44]
+Good Name=Toy Story 2 (G) (V1.1)
+Internal Name=Toy Story 2
+Status=Compatible
+Counter Factor=1
+
 [A150743E-CF2522CD-C:45]
 Good Name=Toy Story 2 (U)
 Internal Name=Toy Story 2
 Status=Compatible
 Counter Factor=1

+[C151AD61-280FFF22-C:45]
+Good Name=Toy Story 2 (U) (V1.1)
+Internal Name=Toy Story 2
+Status=Compatible
+Counter Factor=1
+
 [91691C3D-F4AC5B4D-C:4A]
 Good Name=Transformers - Beast Wars Metals 64 (J)
 Internal Name=BEASTWARSMETALS64
--- a/Portuguese.pj.Lang
+++ b/Portuguese.pj.Lang
@ -231,6 +231,7 @@
 #464#  "Desativar proteção de tela quando rodar a rom"
 #465#  "Mostrar Frame Rate"
 #466#  "Mudar forma de visualização do Frame Rate"
+#467#  "Verificar se o Project64 já está em execução"

 //Rom Browser Tab
 #480#  "Máx # de Roms Lembradas (Máx 10):"
@ -266,6 +267,7 @@

 //Rom Options
 #520#  "Estilo do core da CPU:"
+#521#  "Frequência de atualização da VI:"
 #522#  "Tamanho da Memória:"
 #523#  "Ligamento de Blocos Avançado:"
 #524#  "Tipo de Salvamento Padrão:"
@ -274,13 +276,16 @@
 #527#  "Usar o TLB"
 #528#  "Caching do registro"
 #529#  "Atrasar o SI Interrupt"
-#530#  "Hack do SP"
+#530#  "SP Rápido"
 #531#  "Padrão"
 #532#  "Sinal de Áudio do RSP"
 #533#  "Timing de Áudio Fixo"
-#534#  "Function lookup method:"
-#535#  "Custom Self Mod Method"
+#534#  "Método de Função de Pesquisa:"
+#535#  "Método de Self Mod Personalizado"
 #536#  "Sincronizar através do Áudio"
+#537#  "Contagem de IA Por Byte"
+#538#  "Motor 32 Bit"
+#539#  "Atrasar Interrupção DP"

 //Core Styles
 #540#  "Interpretador"
@ -347,6 +352,11 @@
 #710#  "Aumentar Velocidade do Jogo"
 #711#  "Diminuir Velocidade do Jogo"

+//Bottom Page Buttons
+#720#  "Resetar Página"
+#721#  "Resetar Tudo"
+#722#  "Aplicar"
+
 /*********************************************************************************
 * ROM Information                                                                *
 *********************************************************************************/
--- a/(Simplified).pj.Lang
+++ b/(Simplified).pj.Lang
@ -3,7 +3,7 @@
 *********************************************************************************/
 //About DLL
 #1  #  "简体中文"		 	// LANGUAGE ID
-#2  #  "莫尼卡，samuelyuan"	// Author
+#2  #  "山姆"			// Author
 #3  #  "2.2"		        // Version
 #4  #  "2015 年 3 月 11 日"	// Date

@ -12,8 +12,8 @@
 #6  #  "作者"
 #7  #  "版本"
 #8  #  "日期"
-#9  #  "访问作者主页"
-#10 #  "Rom 数据库 (.RDB)"
+#9  #  "访问首页"
+#10 #  "ROM 数据库 (.RDB)"
 #11 #  "金手指文件 (.CHT)"
 #12 #  "扩展 Rom 信息 (.RDX)"

@ -25,14 +25,14 @@
 *********************************************************************************/
 //File Menu
 #100#  "文件(&F)"
-#101#  "打开 Rom(&O)"
-#102#  "Rom 信息(&I)...."
+#101#  "打开 ROM(&O)"
+#102#  "ROM 信息(&I)...."
 #103#  "开始模拟"
 #104#  "停止模拟(&S)"
-#105#  "选择 Rom 目录..."
-#106#  "刷新 Rom 列表"
-#107#  "近期的 Rom"
-#108#  "近期的 Rom 目录"
+#105#  "选择 ROM 目录..."
+#106#  "刷新 ROM 列表"
+#107#  "最近的 ROM"
+#108#  "最近的 ROM 目录"
 #109#  "退出(&X)"

 //System Menu
@ -40,12 +40,12 @@
 #121#  "重置(&R)"
 #122#  "暂停(&P)"
 #123#  "截图"
-#124#  "限制帧数"
-#125#  "保存(&S)"
+#124#  "限制帧率"
+#125#  "存档(&S)"
 #126#  "另存为..."
-#127#  "还原(&R)"
-#128#  "载入(&L)..."
-#129#  "选择保存位置(&T)"
+#127#  "读档(&L)"
+#128#  "载入..."
+#129#  "当前存档(&T)"
 #130#  "金手指..."
 #131#  "GS 按钮"
 #132#  "继续"
@ -55,13 +55,13 @@
 //Options Menu
 #140#  "选项(&O)"
 #141#  "全屏模式(&F)"
-#142#  "总在最前(&T)"
+#142#  "总在最上层(&T)"
 #143#  "设置图形插件..."
 #144#  "设置音频插件..."
 #145#  "设置控制器插件..."
 #146#  "设置 RSP 插件..."
 #147#  "显示 CPU 占用率 %"
-#148#  "系统设置(&S)..."
+#148#  "设置(&S)..."

 //Debugger Menu
 #160#  "调试器(&D)"
@ -71,64 +71,64 @@

 //Help Menu
 #180#  "帮助(&H)"
-#181#  "关于 &INI 文件"
+#181#  "关于配置文件(&I)"
 #182#  "关于 Project64(&A)"
 #183#  "支持论坛(&F)"
-#184#  "主页(&H)"
+#184#  "首页(&H)"

 //Current Save Slot menu
 #190#  "默认"
-#191#  "位置 1"
-#192#  "位置 2"
-#193#  "位置 3"
-#194#  "位置 4"
-#195#  "位置 5"
-#196#  "位置 6"
-#197#  "位置 7"
-#198#  "位置 8"
-#199#  "位置 9"
-#200#  "位置 10"
+#191#  "插槽 1"
+#192#  "插槽 2"
+#193#  "插槽 3"
+#194#  "插槽 4"
+#195#  "插槽 5"
+#196#  "插槽 6"
+#197#  "插槽 7"
+#198#  "插槽 8"
+#199#  "插槽 9"
+#200#  "插槽 10"

 //Pop up Menu
 #210#  "运行游戏"
-#211#  "Rom 信息"
+#211#  "ROM 信息"
 #212#  "编辑游戏设置"
 #213#  "编辑金手指"
-#214#  "图形(GFX) 插件"
+#214#  "图形插件"

 //Alternate Name to save Slot
 #220# "默认"
-#221# "存储位置 - 1"
-#222# "存储位置 - 2"
-#223# "存储位置 - 3"
-#224# "存储位置 - 4"
-#225# "存储位置 - 5"
-#226# "存储位置 - 6"
-#227# "存储位置 - 7"
-#228# "存储位置 - 8"
-#229# "存储位置 - 9"
-#230# "存储位置 - 10"
+#221# "保存槽 - 1"
+#222# "保存槽 - 2"
+#223# "保存槽 - 3"
+#224# "保存槽 - 4"
+#225# "保存槽 - 5"
+#226# "保存槽 - 6"
+#227# "保存槽 - 7"
+#228# "保存槽 - 8"
+#229# "保存槽 - 9"
+#230# "保存槽 - 10"

 // Menu Descriptions
-#250#  "打开一个 N64 rom 镜像"
-#251#  "显示已装载镜像的信息"
-#252#  "开始模拟已载入的镜像"
-#253#  "停止模拟已载入的镜像"
-#254#  "选择 Rom 目录"
-#255#  "刷新 Rom 浏览器当前的 Rom 列表"
+#250#  "打开一个 N64 ROM 镜像"
+#251#  "显示已载入的镜像的信息"
+#252#  "开始模拟已载入的 ROM 镜像"
+#253#  "停止模拟已载入的 ROM 镜像"
+#254#  "选择 ROM 目录"
+#255#  "在 ROM 浏览器中刷新当前 ROM 列表"
 #256#  "退出这个应用程序"
-#257#  "重新引导当前的 Rom 镜像 (重新装载一些已改动的设置)"
-#258#  "暂停/继续模拟当前的 Rom"
+#257#  "重新引导当前的 ROM 镜像 (重新装载一些已改动的设置)"
+#258#  "暂停/继续模拟当前的 ROM"
 #259#  "为当前的屏幕图象创建一个位图文件"
-#260#  "为当前的 N64 速度限制帧数"
+#260#  "将帧率限制为当前的 N64 速度"
 #261#  "为当前的系统创建一个即时存档"
-#262#  "选择要创建即时存档的位置"
+#262#  "选择你想要创建即时存档的位置"
 #263#  "载入一个即时存档"
-#264#  "选择一个要载入的即时存档"
+#264#  "选择你想要载入的即时存档"
 #265#  "开启/关闭 Gameshark 代码"
 #266#  "在特定的金手指中使用 Gameshark 按钮"
-#267#  "将模拟器的显示模式由窗口改为全屏"
-#268#  "使窗口总是停留在其它窗口之上"
+#267#  "将模拟器从窗口到全屏"
+#268#  "将窗口置于最顶层"
 #269#  "更改图形插件的设置"
 #270#  "更改音频插件的设置"
 #271#  "更改控制器插件的设置"
@ -139,9 +139,9 @@
 #276#  "查看这个程序的游戏 FAQ"
 #277#  "关于支持文件的作者"
 #278#  "关于程序和作者"
-#279#  "打开这个先前打开过的 Rom"
-#280#  "选择您的 Rom 目录"
-#281#  "改变应用程序正使用的语言"
+#279#  "打开以前打开过的 ROM"
+#280#  "选择您的 ROM 目录"
+#281#  "将应用程序使用该语言"
 #282#  "选择这个即时存档位置"
 #283#  "运行所选择的游戏"
 #284#  "关于所选择游戏的信息"
@ -156,7 +156,7 @@
 #301#  "内部名称"
 #302#  "正确的名称"
 #303#  "状态"
-#304#  "Rom 容量"
+#304#  "ROM 容量"
 #305#  "说明 (核心)"
 #306#  "说明 (默认插件)"
 #307#  "说明 (用户)"
@ -174,10 +174,10 @@
 #319#  "文件格式"

 //Select Rom
-#320#  "选择当前的 Rom 目录"
+#320#  "选择当前的 ROM 目录"

 //Messages
-#340#  "错误的 ROM? 请使用 GoodN64 并检查更新您的 INI"
+#340#  "错误的 ROM? 请使用 GoodN64 并检查更新的　RDB"

 /*********************************************************************************
 * Options                                                                        *
@ -189,34 +189,34 @@
 #401#  "插件"
 #402#  "目录"
 #403#  "选项"
-#404#  "Rom 状态显示设置"
+#404#  "ROM 状态显示设置"
 #405#  "高级"
-#406#  "Rom 设置"
+#406#  "ROM 设置"
 #407#  "文件关联设置"
-#408#  "Rom 说明"
+#408#  "ROM 说明"
 #409#  "键盘快捷键"
 #410#  "状态"
 #411#  "重编译"

 //Plugin Dialog
 #420#  "关于"
-#421#  " 实时信号处理器(RSP)插件: "
+#421#  " RSP (实时信号处理器)插件: "
 #422#  " 视频 (图形) 插件: "
 #423#  " 音频 (声音) 插件: "
 #424#  " 输入 (控制器) 插件: "
-#425#  "是否使用高级图形(GFX)?"
-#426#  "是否使用高级音频?"
+#425#  "是否使用高级(HLE)图形?"
+#426#  "是否使用高级(HLE)音频?"
 #427#  "** 使用系统插件 **"

 //Directory Dialog
 #440#  " 插件目录: "
-#441#  " Rom 目录: "
+#441#  " ROM 目录: "
 #442#  " N64 自动存档: "
-#443#  " 即时记忆: "
+#443#  " 即时存档: "
 #444#  " 截图: "
-#445#  "最后一次打开 Rom 的目录."
+#445#  "最后一次打开 ROM 的目录."
 #446#  "选择插件目录"
-#447#  "选择 Rom 目录"
+#447#  "选择 ROM 目录"
 #448#  "选择自动存档目录"
 #449#  "选择即时存档目录"
 #450#  "选择截图文件目录"
@ -226,18 +226,19 @@
 //Options Dialog
 #460#  "当窗口挂起时暂停模拟器"
 #461#  "载入 Rom 完毕后切换为全屏模式"
-#462#  "隐藏高级设置选项"
-#463#  "记忆已选择的金手指"
-#464#  "当运行rom时，禁用屏幕保护程序"
+#462#  "隐藏高级设置"
+#463#  "记住已选择的金手指"
+#464#  "在ROM运行时禁用屏幕保护程序"
 #465#  "显示帧速率"
-#466#  "改变帧速率的显示类型"
+#466#  "帧速率回显"
+#467#  "检查Project64是否已经在运行"

 //Rom Browser Tab
-#480#  "最大 # Rom 记忆数 (最大 10):"
-#481#  "Rom"
-#482#  "最大 # Rom 目录记忆数 (最大 10):"
+#480#  "最大 # ROM 记录数 (最大 10):"
+#481#  "ROM"
+#482#  "最大 # ROM 目录记录数 (最大 10):"
 #483#  "目录"
-#484#  "使用 Rom 浏览器"
+#484#  "使用 ROM 浏览器"
 #485#  "包含所有子目录"
 #486#  "可显示的状态:"
 #487#  "已显示的状态:"
@ -248,15 +249,15 @@
 #492#  "自动刷新浏览器"

 //Advanced Options
-#500#  "在这里的大多数被更改的选项要重新载入一个 Rom 或将当前的 Rom 重置才能生效"
-#501#  "默认核心"
-#502#  "CPU 核心类型:"
+#500#  "在这里的大多数被更改的选项要重新载入一个 ROM 或将当前的 ROM 重置才能生效"
+#501#  "默认内核"
+#502#  "CPU 内核类型:"
 #503#  "自我修改码方案:"
-#504#  "默认记忆容量:"
-#505#  "扩展模块连接:"
-#506#  "当 Rom 载入完毕后开始模拟"
-#507#  "总是从 ini 中覆盖默认设置"
-#508#  "自动压缩即时记忆文件"
+#504#  "默认存档容量:"
+#505#  "高级模块连接:"
+#506#  "当 ROM 加载后开始模拟"
+#507#  "总是从 RDB 中覆盖默认设置"
+#508#  "自动压缩即时存档文件"
 #509#  "开启调试器"
 #510#  "缓存"
 #511#  "PI DMA"
@ -265,41 +266,44 @@
 #514#  "TLB 取消映射关系"

 //Rom Options
-#520#  "CPU 核心类型:"
-#521#  "自我修改码方案:"
-#522#  "记忆容量:"
+#520#  "CPU 内核类型:"
+#521#  "VI 刷新率"
+#522#  "内存容量:"
 #523#  "扩展模块连接:"
-#524#  "默认记忆类型:"
-#525#  "计算因数:"
+#524#  "默认存档类型:"
+#525#  "计数器因数:"
 #526#  "较大的编译器缓冲"
 #527#  "使用 TLB"
-#528#  "寄存缓冲器"
-#529#  "延迟 SI 中断信号"
-#530#  "SP Hack"
+#528#  "寄存器缓存"
+#529#  "SI 中断延迟"
+#530#  "快速度(SP)"
 #531#  "默认"
 #532#  "RSP 音频信号"
-#533#  "固定音频定时"
+#533#  "固定音频计时"
 #534#  "查询函数方案:"
 #535#  "自定义自我修改方案"
-#536#  "使用音频同步"
+#536#  "使用同步音频"
+#537#  "AI 每字节计数"
+#538#  "32位引擎"
+#539#  "DP 中断延迟"

 //Core Styles
 #540#  "注释器"
 #541#  "重编译"
-#542#  "核心同步"
+#542#  "内核同步"

 //Self Mod Methods
 #560#  "无"
 #561#  "缓冲器"
-#562#  "保护模式内存"
+#562#  "保护内存"
 #563#  "效验内存和缓冲器"
-#564#  "改变内存和缓冲器"
+#564#  "修改内存和缓冲器"
 #565#  "效验内存进步"
 #566#  "清除代码缓存"

 //Function Lookup method
-#570# "真实查找表"
-#571# "虚拟查找表 "
+#570# "物理查询表"
+#571# "虚拟查询表 "
 #572# "修改内存"

 //RDRAM Size
@ -311,18 +315,18 @@
 #601#  "关"

 //Save Type
-#620#  "使用第一次使用的记忆类型"
+#620#  "使用最初的存档类型"
 #621#  "4kbit Eeprom"
 #622#  "16kbit Eeprom"
 #623#  "32kbytes SRAM"
 #624#  "Flashram"

 //Shell Integration Tab
-#640#  "要关联的文件扩展名:"
+#640#  "文件扩展名的关联:"

 //Rom Notes
 #660#  "Rom 状态:"
-#661#  "核心说明:"
+#661#  "内核说明:"
 #662#  "插件说明:"

 // Accelerator Selector
@ -333,21 +337,26 @@
 #684#  "目前设置为:"
 #685#  "设置"
 #686#  "移除"
-#687#  "将重置所存储的快捷键"
+#687#  "重置所有快捷键"
 #688#  "游戏未运行"
 #689#  "游戏正在运行"
 #690#  "游戏正在运行 (窗口)"
 #691#  "游戏正在运行 (全屏)"

 // Frame Rate Option
-#700# "每秒场消隐期"
-#701# "每秒显示列表"
+#700# "每秒垂直中断 (VI/s)"
+#701# "每秒显示列表 (DL/s)"
 #702# "速度百分比"

 // Increase speed
 #710# "提高游戏速度"
 #711# "降低游戏速度"

+//Bottom page buttons
+#720#  "重置此页"
+#721#  "全部重设"
+#722#  "应用"
+
 /*********************************************************************************
 * ROM Information                                                                *
 *********************************************************************************/
@ -358,7 +367,7 @@
 #801#  "ROM 名称:"
 #802#  "文件名:"
 #803#  "路径:"
-#804#  "Rom 容量:"
+#804#  "ROM 容量:"
 #805#  "卡带 ID:"
 #806#  "厂商:"
 #807#  "国家:"
@ -397,7 +406,7 @@
 #1017#  "请选择一个值:"
 #1018#  "数值(&V)"
 #1019#  "从"
-#1020#  "到"
+#1020#  "至"
 #1021#  "说明(&N):"
 #1022#  "添加金手指"
 #1023#  "新建金手指"
@ -452,7 +461,7 @@
 #2009#  "载入设置失败

 请检查 ROM 和 ROM 设置。"
-#2010#  "打开记忆文件失败"
+#2010#  "打开存档文件失败"
 #2011#  "打开 Eeprom 失败"
 #2012#  "打开 Flashram 失败"
 #2013#  "打开记忆卡失败"
@ -464,7 +473,7 @@
 #2016#  "在尝试打开 Zip 文件时发生错误。"
 #2017#  "被载入的文件看来不是一个正确的 Nintendo64 ROM。

-请使用 GoodN64 来效验你的 Rom。"
+请使用 GoodN64 来效验你的 ROM。"
 #2018#  "未知的国家"
 #2019#  "未知的 Cic 芯片"
 #2020#  "未知的文件格式"
@ -475,9 +484,9 @@
 #2023#  "没有运行所需的映射空间。

 请检查 Rom 和 Rom 设置."
-#2024#  "即时记忆看来不是当前正在运行的 Rom 的。
+#2024#  "即时记忆看来不是当前正在运行的 ROM 的。

-即时记忆必须在 100% 相同的 Rom 上保存和载入,
+即时记忆必须在 100% 相同的 ROM 上保存和载入,
 特别是版本和区域必须相同。
 载入这个即时记忆可能使模拟器或游戏死机

@ -485,33 +494,33 @@
 #2025#  "错误"
 #2026#  "没有在 Lut 中发现版权序列。  游戏可能无法运行。"
 #2027#  "复制保护失败"
-#2028#  "改变插件需要 Project64 重置后重新运行这个 Rom。
-如果您不想在现在丢失游戏进度, 那么请回答否然后保存一个即时记忆。
+#2028#  "改变插件需要 Project64 重置后重新运行这个 ROM。
+如果您不想丢失游戏进度, 那么请回答否然后保存一个即时存档。

 改变插件并且重置游戏吗?"
 #2029#  "改变插件"
 #2030#  "模拟器已停止"
 #2031#  "开始模拟"
-#2032#  "不能载入即时记忆"
-#2033#  "已载入即时记忆"
-#2034#  "保存即时记忆到"
-#2035#  "记忆区域"
-#2036#  "交换数位镜像"
+#2032#  "无法读档"
+#2033#  "已读档"
+#2034#  "已存档到"
+#2035#  "即时存档"
+#2036#  "字节交换镜像"
 #2037#  "关闭 N64 镜像"
 #2038#  "已载入"
-#2039#  "正载入镜像"
-#2040#  "无法打开 Rom 因为插件没有正确初始化"
+#2039#  "正在载入镜像"
+#2040#  "无法打开 ROM 因为插件没有正确初始化"
 #2041#  "您确实要删除这个吗?"
 #2042#  "删除金手指"
 #2043#  "修改名称已被使用"
-#2044#  "您超过了这个 Rom 的最大修改值"
+#2044#  "您超过了这个 ROM 的最大修改值"
 #2045#  "插件正在初始化"
 #2046# 	"您还未设置个虚拟键作为选项"
 #2047#  "您必须选择一个选项分配给菜单选项"
 #2048#  "快捷键已被分配为另一个选项"
 #2049#  "在移除前，还未选择快捷键"
-#2050#  "Rom已被载入。正在等待模拟开始。"
-#2051#  "project64 beta仅限于会员.
+#2050#  "ROM 已被载入。正在等待模拟开始。"
+#2051#  "Project64 beta仅限于会员.

 如果你在pj64.net上有账户, 你不应看到此错误！！

@ -519,11 +528,11 @@
 #2052#  "程序错误"
 #2053#  "无法在7z文件中查询文件名"
 #2054#  "使用低级画面"
-#2055#  "低级图形(LLE　GFX)不是平时使用的！！！
-建议您仅在测试环境下使用低级图形, 玩游戏时不要使用低级图形
+#2055#  "低级(LLE)图形不是平时使用的！！！
+建议您仅在测试环境下使用低级(LLE)图形, 玩游戏时不要使用低级(LLE)图形

-您确定修改为低级图形(LLE　GFX)?"
+您确定修改为低级(LLE)图形?"
 #2056# "使用高级音频"
-#2057# "高级音频需要第三方插件！！！
-如果您使用的第三方插件不支持高级音频，您将听不到声音。
-是否使用高级音频?"
+#2057# "高级(HLE)音频需要第三方插件！！！
+如果您使用的第三方插件不支持高级(HLE)音频，您将听不到声音。
+是否使用高级(HLE)音频?"
--- a/Lang/ChineseB5.pj.lang
+++ b/Lang/ChineseB5.pj.lang
@ -1,426 +0,0 @@
-/*********************************************************************************
-* What's New                                                                     *
-*********************************************************************************/
-//Alt+KEYS shortcut added (credit to mygod for pointing this out! Thanks)
-//Review and some 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#  "常置桌面 &A &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"
-
-/*********************************************************************************
-* Options                                                                        *
-*********************************************************************************/
-//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#  "刪除"
-
-/*********************************************************************************
-* Messages                                                                       *
-*********************************************************************************/
-#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#  "此遊戲檔已無法新增作弊碼"
--- a/Lang/ChineseGB.pj.lang
+++ b/Lang/ChineseGB.pj.lang
@ -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#  "此游戏档已无法新增作弊码"
--- a/Lang/English.pj.Lang
+++ b/Lang/English.pj.Lang
@ -15,24 +15,24 @@
 #9  #  "Visit Home Page"
 #10 #  "ROM Database (.RDB)"
 #11 #  "Cheat Code file (.CHT)"
-#12 #  "Extended Rom Info (.RDX)"
+#12 #  "Extended ROM Info (.RDX)"

 //About INI title
-#20 #  "About INI Files"
+#20 #  "About Config Files"

 /*********************************************************************************
 * Menu                                                                           *
 *********************************************************************************/
 //File Menu
 #100#  "&File"
-#101#  "&Open Rom"
-#102#  "Rom &Info...."
+#101#  "&Open ROM"
+#102#  "ROM &Info...."
 #103#  "Start Emulation"
 #104#  "&End Emulation"
-#105#  "Choose Rom Directory..."
-#106#  "Refresh Rom List"
-#107#  "Recent Rom"
-#108#  "Recent Rom Directories"
+#105#  "Choose ROM Directory..."
+#106#  "Refresh ROM List"
+#107#  "Recent ROM"
+#108#  "Recent ROM Directories"
 #109#  "E&xit"

 //System Menu
@ -41,9 +41,9 @@
 #122#  "&Pause"
 #123#  "Generate Bitmap"
 #124#  "Limit FPS"
-#125#  "&Save"
+#125#  "&Save State"
 #126#  "Save As..."
-#127#  "&Restore"
+#127#  "&Load State"
 #128#  "Load..."
 #129#  "Current Save S&tate"
 #130#  "Cheats..."
@ -71,7 +71,7 @@

 //Help Menu
 #180#  "&Help"
-#181#  "About &INI Files"
+#181#  "About Conf&ig Files"
 #182#  "&About Project64"
 #183# "Support &Forum"
 #184# "&Homepage"
@ -91,10 +91,10 @@

 //Pop up Menu
 #210#  "Play Game"
-#211#  "Rom Information"
+#211#  "ROM Information"
 #212#  "Edit Game Settings"
 #213#  "Edit Cheats"
-#214#  "GFX Plugin"
+#214#  "Graphics Plugin"

 //Alternate Name to save Slot
 #220#  "Default"
@ -110,23 +110,23 @@
 #230#  "Save Slot - 10"

 // Menu Descriptions
-#250#  "Open a N64 rom image"
+#250#  "Open a N64 ROM image"
 #251#  "Display Information about the loaded image"
-#252#  "Start Emulation of the loaded rom image"
-#253#  "Stop Emulation of the loaded rom image"
-#254#  "Select Rom Directory"
+#252#  "Start Emulation of the loaded ROM image"
+#253#  "Stop Emulation of the loaded ROM image"
+#254#  "Select ROM Directory"
 #255#  "Refresh Current list of ROMs in the ROM Browser"
 #256#  "Exit this application"
-#257#  "Reboot the current rom image (reload any settings changes)"
-#258#  "Pause/Resume emulation of the current running rom"
+#257#  "Reboot the current ROM image (reload any settings changes)"
+#258#  "Pause/Resume emulation of the current running ROM"
 #259#  "Generate a Bitmap image of the current Screen"
-#260#  "Limit FPS to the correct speed of the n64"
-#261#  "Create a instant of the current system for quick save"
-#262#  "Create a instant of the current system with selecting file location"
-#263#  "Load a quick instant save"
-#264#  "Choose an instant save file to load"
-#265#  "Enable/Disable Game shark cheats"
-#266#  "Game shark button is used with specific cheats"
+#260#  "Limit FPS to the correct speed of the N64"
+#261#  "Save the current system state"
+#262#  "Save the current system state in a selected file location"
+#263#  "Load the saved system state"
+#264#  "Choose a saved system state file to load"
+#265#  "Enable/Disable Game Shark cheats"
+#266#  "Game Shark button is used with specific cheats"
 #267#  "Change emulation from window mode to fullscreen"
 #268#  "Make window stay on top of all other windows"
 #269#  "Change settings inside the Graphics plugin"
@ -140,23 +140,23 @@
 #278#  "About the application and Authors"
 #277#  "About the Authors of the support files"
 #279#  "Open this previous opened ROM image"
-#280#  "Choose this directory as your rom directory"
+#280#  "Choose this directory as your ROM directory"
 #281#  "Change Application to using this language"
-#282#  "Choose this quick save location"
+#282#  "Choose this save location for the saved state"
 #283#  "Play selected game"
 #284#  "Information about selected game"
 #285#  "Edit Settings for selected game"
 #286#  "Edit cheats for selected game"

 /*********************************************************************************
-* Rom Browser                                                                    *
+* ROM Browser                                                                    *
 *********************************************************************************/
-//Rom Browser Fields
+//ROM Browser Fields
 #300#  "File Name"
 #301#  "Internal Name"
 #302#  "Good Name"
 #303#  "Status"
-#304#  "Rom Size"
+#304#  "ROM Size"
 #305#  "Notes (Core)"
 #306#  "Notes (default plugins)"
 #307#  "Notes (User)"
@ -173,11 +173,11 @@
 #318#  "Force Feedback"
 #319#  "File Format"

-//Select Rom
-#320#  "Select current Rom Directory"
+//Select ROM
+#320#  "Select current ROM Directory"

 //Messages
-#340#  "Bad ROM? Use GoodN64 & check for updated INI"
+#340#  "Bad ROM? Use GoodN64 & check for updated RDB"

 /*********************************************************************************
 * Options                                                                        *
@ -189,7 +189,7 @@
 #401#  "Plugins"
 #402#  "Directories"
 #403#  "Options"
-#404#  "Rom Selection"
+#404#  "ROM Selection"
 #405#  "Advanced"
 #406#  "General Settings"
 #407#  "Shell Integration"
@ -204,40 +204,41 @@
 #422#  " Video (graphics) plugin: "
 #423#  " Audio (sound) plugin: "
 #424#  " Input (controller) plugin: "
-#425#  "Use High Level GFX?"
-#426#  "Use High Level Audio?"
+#425#  "Use HLE Graphics"
+#426#  "Use HLE Audio"
 #427#  "** Use System Plugin **"

 //Directory Dialog
-#440#  " Plugin Directory:: "
-#441#  " Rom Directory: "
-#442#  " N64 Auto saves: "
-#443#  " Instant saves: "
-#444#  " Screen Shots: "
-#445#  "Last folder that a rom was open from."
+#440#  " Plugin Directory: "
+#441#  " ROM Directory: "
+#442#  " N64 native saves Directory: "
+#443#  " State Directory: "
+#444#  " Screenshot Directory: "
+#445#  "Last folder that a ROM was open from."
 #446#  "Select plugin directory"
-#447#  "Select rom directory"
-#448#  "Select automatic save directory"
-#449#  "Select instant save directory"
-#450#  "Select snap shot directory"
-#451#  " Texture Directory: "
+#447#  "Select ROM directory"
+#448#  "Select N64 native saves directory"
+#449#  "Select state directory"
+#450#  "Select screenshot directory"
+#451#  " Texture pack Directory: "
 #452#  "Select texture pack directory"

 //Options (general) Tab
-#460#  "Pause emulation when window is not active?"
-#461#  "On loading a ROM go to full screen"
+#460#  "Pause emulation when window is not active"
+#461#  "Go to fullscreen when loading a ROM"
 #462#  "Hide Advanced Settings"
 #463#  "Remember selected cheats"
-#464#  "Disable Screen Saver when running rom"
+#464#  "Disable Screen Saver when running a 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):"
-#481#  "roms"
-#482#  "Max # of Rom Dirs Remembered (Max 10):"
-#483#  "dirs"
-#484#  "Use Rom Browser"
+//ROM Browser Tab
+#480#  "Max # of ROMs Remembered (0-10):"
+#481#  "ROMs"
+#482#  "Max # of ROM Dirs Remembered (0-10):"
+#483#  "Dirs"
+#484#  "Use ROM Browser"
 #485#  "Use Directory recursion"
 #486#  "Available fields:"
 #487#  "Show fields in this order:"
@ -248,15 +249,15 @@
 #492#  "Automatically refresh browser"

 //Advanced Options
-#500#  "Most of these changes will not take effect till a new rom is opened or current rom is reset."
+#500#  "Most of these changes will not take effect until 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?"
-#507#  "Always overwrite default settings with ones from ini?"
-#508#  "Automatically compress instant saves"
+#506#  "Start Emulation when ROM is opened"
+#507#  "Always override default settings with ones from RDB"
+#508#  "Automatically compress saved states"
 #509#  "Enable Debugger"
 #510#  "Cache"
 #511#  "PI DMA"
@ -264,8 +265,9 @@
 #513#  "Protect Memory"
 #514#  "TLB Unmapping"

-//Rom Options
+//ROM Options
 #520#  "CPU core style:"
+#521#  "VI Refresh Rate:"
 #522#  "Memory Size:"
 #523#  "Advanced Block Linking:"
 #524#  "Default Save type:"
@ -274,18 +276,21 @@
 #527#  "Use TLB"
 #528#  "Register caching"
 #529#  "Delay SI Interrupt"
-#530#  "SP Hack"
+#530#  "Fast SP"
 #531#  "Default"
 #532#  "RSP Audio Signal"
 #533#  "Fixed Audio Timing"
 #534#  "Function lookup method:"
 #535#  "Custom Self Mod Method"
 #536#  "Sync using Audio"
+#537#  "AI Count Per Byte"
+#538#  "32 Bit Engine"
+#539#  "Delay DP Interrupt"

 //Core Styles
 #540#  "Interpreter"
 #541#  "Recompiler"
-#542#  "Synchronise Cores"
+#542#  "Synchronize Cores"

 //Self Mod Methods
 #560#  "None"
@ -296,7 +301,7 @@
 #565#  "Check Memory Advance"
 #566#  "Clear Code on Cache"

-//Function Lookup memthod
+//Function Lookup method
 #570#  "Physical Lookup Table"
 #571#  "Virtual Lookup Table"
 #572#  "Change Memory"
@ -311,16 +316,16 @@

 //Save Type
 #620#  "Use First Used Save Type"
-#621#  "4kbit Eeprom"
-#622#  "16kbit Eeprom"
+#621#  "4kbit EEPROM"
+#622#  "16kbit EEPROM"
 #623#  "32kbytes SRAM"
-#624#  "Flashram"
+#624#  "FlashRAM"

 //Shell Integration Tab
 #640#  "File extension association:"

-//Rom Notes
-#660#  "Rom Status:"
+//ROM Notes
+#660#  "ROM Status:"
 #661#  "Core Note:"
 #662#  "Plugin Note:"

@ -335,29 +340,34 @@
 #687#  "Reset All"
 #688#  "Game not playing"
 #689#  "Game playing"
-#690#  "Game playing (windowed)"
+#690#  "Game playing (Windowed)"
 #691#  "Game playing (Fullscreen)"

 // Frame Rate Option
-#700#  "Vertical Interupts per second"
+#700#  "Vertical Interrupts per second"
 #701#  "Display Lists per second"
-#702#  "Percent of Speed"
+#702#  "Percentage of Speed"

 // Increase speed
 #710#  "Increase Game Speed"
 #711#  "Decrease Game Speed"

+//Bottom Page Buttons
+#720#  "Reset Page"
+#721#  "Reset All"
+#722#  "Apply"
+
 /*********************************************************************************
 * ROM Information                                                                *
 *********************************************************************************/
-//Rom Info Title
-#800#  "Rom Information"
+//ROM Info Title
+#800#  "ROM Information"

-//Rom Info Text
+//ROM Info Text
 #801#  "ROM Name:"
 #802#  "File Name:"
 #803#  "Location:"
-#804#  "Rom Size:"
+#804#  "ROM Size:"
 #805#  "Cartridge ID:"
 #806#  "Manufacturer:"
 #807#  "Country:"
@ -407,7 +417,7 @@
 //Edit Cheat
 #1027#  "Edit Cheat"
 #1028#  "Update Cheat"
-#1029#  "Cheat has been changed do you want to update?"
+#1029#  "Cheat has been changed.\n\nDo you want to update?"
 #1030#  "Cheat Updated"

 //Cheat Popup Menu
@ -437,50 +447,50 @@
 #2008#  "Failed to load plugin:"
 #2009#  "Failed to load word\n\nVerify ROM and ROM Settings."
 #2010#  "Failed to open Save File"
-#2011#  "Failed to open Eeprom"
-#2012#  "Failed to open Flashram"
-#2013#  "Failed to open mempak"
+#2011#  "Failed to open EEPROM"
+#2012#  "Failed to open FlashRAM"
+#2013#  "Failed to open Mempak"
 #2014#  "Attempt to open zip file failed. \n\nProbably a corrupt zip file - try unzipping ROM manually."
 #2015#  "Attempt to open file failed."
 #2016#  "Error occurred when trying to open zip file."
-#2017#  "File loaded does not appear to be a valid Nintendo64 ROM. \n\nVerify your ROMs with GoodN64."
+#2017#  "File loaded does not appear to be a valid N64 ROM. \n\nVerify your ROMs with GoodN64."
 #2018#  "Unknown country"
-#2019#  "Unknown Cic Chip"
+#2019#  "Unknown CIC Chip"
 #2020#  "Unknown file format"
-#2021#  "Unknown memory action\n\nEmulation stop"
+#2021#  "Unknown memory action\n\nEmulation stopped"
 #2022#  "Unhandled R4300i OpCode at"
 #2023#  "Executing from non-mapped space.\n\nVerify ROM and ROM Settings."
-#2024#  "State save does not appear to match the running ROM. \n\nState saves 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?"
+#2024#  "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 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?"
 #2025#  "Error"
 #2026#  "Copyright sequence not found in LUT.  Game will no longer function."
 #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 make a state save first. \n\nChange plugins and restart game 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"
 #2030#  "Emulation ended"
 #2031#  "Emulation started"
-#2032#  "Unable to load save state"
-#2033#  "Loaded save state"
-#2034#  "Saved current state to"
-#2035#  "Save state slot"
+#2032#  "Unable to load State"
+#2033#  "Loaded State"
+#2034#  "Saved current State to"
+#2035#  "State slot"
 #2036#  "Byte swapping image"
 #2037#  "Choosing N64 image"
 #2038#  "Loaded"
 #2039#  "Loading image"
-#2040#  "Cannot open a rom because plugins have not successfully initialised"
+#2040#  "Cannot open a ROM because plugins have not successfully initialized"
 #2041#  "Are you sure you really want to delete this?"
 #2042#  "Delete Cheat"
 #2043#  "Cheat Name is already in use"
-#2044#  "You Have reached the Maximum amount of cheats for this rom"
-#2045#  "Plug-in Initializing"
+#2044#  "You Have reached the Maximum amount of cheats for this ROM"
+#2045#  "Plugin initializing"
 #2046#  "You have not selected a virtual key to assign to the menu item"
 #2047#  "You need to select a menu item to assign this key to"
 #2048#  "Short cut has already been assigned to another menu item"
 #2049#  "No shortcut has been selected to be removed"
-#2050#  "Rom Loaded. Waiting for emulation to start."
-#2051#  "project64 beta is for members only.\n\nif you have an account at pj64.net, you should not be seeing this error!!\nplease contact us on the site"
+#2050#  "ROM Loaded. Waiting for emulation to start."
+#2051#  "Project64 beta is for members only.\n\nIf you have an account at pj64.net, you should not be seeing this error!!\nPlease contact us on the site"
 #2052#  "Program Error"
 #2053#  "Failed to find filename in 7z file"
-#2054#  "Use Low Level Graphics"
-#2055#  "Low Level Graphics are not for general use!!!\nIt is advisable that you only use this for testing, not for playing any games with\n\nChange to LLE GFX?"
-#2056#  "Use High Level Audio"
-#2057#  "High level Audio requires a 3rd party plugin!!!\nIf you do not use a 3rd party plugin that supports high level audio then you will hear no sound.\n\nUse high level audio?"
+#2054#  "Use LLE Graphics"
+#2055#  "LLE Graphics are not for general use!!!\nIt is advisable that you only use this for testing, and not for playing games.\n\nChange to LLE Graphics?"
+#2056#  "Use HLE Audio"
+#2057#  "HLE Audio requires a 3rd party plugin!!!\nIf you do not use a 3rd party plugin that supports HLE audio, you will hear no sound.\n\nChange to HLE Audio?"
--- a/Lang/German_int.pj.Lang
+++ b/Lang/German_int.pj.Lang
@ -1,440 +0,0 @@
-/*********************************************************************************
-* Meta Information                                                               *
-*********************************************************************************/
-//About DLL
-#1  #  "Deutsch international"	// LANGUAGE ID
-#2  #  "Volodymyr Dudenko"	// Author
-#3  #  "1.6.3"		        // Version
-#4  #  "04. April 2005"          // Date
-
-//About DLL Dialog
-#5  #  "Uebersetzung (Lang\German.pj.Lang)"
-#6  #  "Autor"
-#7  #  "Version"
-#8  #  "Datum"
-#9  #  "Homepage des Autors"
-#10 #  "ROM Datenbank (Project64.rdb)"
-#11 #  "Cheat Code Datei (Project64.cht)"
-#12 #  "Zusaetzliche ROM Info (Project64.rdx)"
-
-//About INI title
-#20 #  "Dateien im Gebrauch:"
-
-/*********************************************************************************
-* Menu                                                                           *
-*********************************************************************************/
-//File Menu
-#100#  "&Datei"
-#101#  "ROM &oeffnen..."
-#102#  "ROM &Info..."
-#103#  "Emulation &starten"
-#104#  "Emulation &beenden"
-#105#  "ROMverzeichnis &auswaehlen..."
-#106#  "Browserliste &erneuern"
-#107#  "&ROMliste"
-#108#  "&Verzeichnisse"
-#109#  "Beende&n"
-
-//System Menu
-#120#  "&System"
-#121#  "&Zuruecksetzen"
-#122#  "&Pause"
-#123#  "Screensho&t"
-#124#  "&Geschwindigkeitsbegrenzung"
-#125#  "Spie&lstand speichern"
-#126#  "Speichern &unter..."
-#127#  "Spielst&and laden"
-#128#  "Laden &von..."
-#129#  "Speicher&block"
-#130#  "&Cheats..."
-#131#  "GS &Knopf"
-#132#  "&Fortsetzen"
-
-//Options Menu
-#140#  "&Optionen"
-#141#  "Voll&bild"
-#142#  "&Immer im Vordergrund"
-#143#  "&Videoplugin..."
-#144#  "&Audioplugin..."
-#145#  "&Kontrollerplugin..."
-#146#  "&RSP Konfiguration..."
-#147#  "&Prozessorauslastung anzeigen"
-#148#  "&Einstellungen..."
-
-//Debugger Menu
-#160#  "Debugge&r"
-
-//Language Menu
-#175#  "S&prache"
-
-//Help Menu
-#180#  "&Hilfe"
-#181#  "Benutzte &Dateien"
-#182#  "&Ueber Project64"
-#183#  "&Forum"
-#184#  "&Homepage"
-
-//Current Save Slot menu
-#190#  "&Programmeigen (.pj)"
-#191#  "Block&1 (.pj1)"
-#192#  "Block&2 (.pj2)"
-#193#  "Block&3 (.pj3)"
-#194#  "Block&4 (.pj4)"
-#195#  "Block&5 (.pj5)"
-#196#  "Block&6 (.pj6)"
-#197#  "Block&7 (.pj7)"
-#198#  "Block&8 (.pj8)"
-#199#  "Block&9 (.pj9)"
-#200#  "Block1&0 (.pj0)"
-
-//Pop up Menu
-#210#  "&Spiel spielen"
-#211#  "&ROM Info"
-#212#  "Spieleinstellunge&n"
-#213#  "&Cheats bearbeiten"
-
-// Menu Descriptions
-#250#  "Spiel oeffnen (es kann auch in einer .zip Datei sein)"
-#251#  "Informationen ueber das geladene Spiel anzeigen"
-#252#  "Emulation des geladenen Spiels starten"
-#253#  "Emulation des geladenen Spiels beenden"
-#254#  "Spiele aus diesem Verzeichnis werden im Browser angezeigt"
-#255#  "Hier druecken wenn neue Spiele ins Verzeichnis hinzugefuegt wurden"
-#256#  "Programm beenden"
-#257#  "Geladenes Spiel zuruecksetzen"
-#258#  "Geladenes Spiel anhalten/fortsetzen"
-#259#  "Bild vom Bildschirm in das Screenshotverzeichnis speichern"
-#260#  "Anzahl der Bilder pro Sekunde auf den korrekten Stand bringen"
-#261#  "Derzeitigen Spielstand im gewaehlten Speicherblock speichern"
-#262#  "Derzeitigen Spielstand in das gewaehlte Verzeichnis speichern"
-#263#  "Gespeicherten Spielstand laden"
-#264#  "Gespeicherten Spielstand auswaehlen und laden"
-#265#  "GameShark Cheats fuer das geladene Spiel auswaehlen"
-#266#  "Emuliert das Druecken des GameShark-Knopfes fuer bestimmte Cheats"
-#267#  "Vom Fenster zu Vollbild umschalten"
-#268#  "Dieses Fenster ueber allen anderen anzeigen"
-#269#  "Videoplugin konfigurieren"
-#270#  "Audioplugin konfigurieren"
-#271#  "Kontrollerplugin konfigurieren"
-#272#  "RSP Plugin konfigurieren"
-#273#  "Informationen ueber die Auslastung des Zentralprozessors anzeigen/verbergen"
-#274#  "Programmeinstellungen konfigurieren"
-#275#  "Bedienungsanleitung zum Programm lesen"
-#276#  "Game FAQ lesen"
-#277#  "Ueber die Autoren der Hilfsdateien"
-#278#  "Ueber das Programm und die Autoren"
-#279#  "Dieses ROM oeffnen"
-#280#  "Dieses Verzeichnis als ROMverzeichnis auswaehlen"
-#281#  "Diese Sprache benutzen"
-#282#  "Speicherblock auswaehlen"
-#283#  "Das gewaehlte Spiel laden"
-#284#  "Informationen ueber das gewaehlte Spiel anzeigen"
-#285#  "Spieleinstellungen in der .rdb Datei konfigurieren"
-#286#  "Cheats fuer das gewaehlte Spiel in der .cht Datei bearbeiten"
-
-/*********************************************************************************
-* Rom Browser                                                                    *
-*********************************************************************************/
-//Rom Browser Fields
-#300#  "Dateiname"
-#301#  "Name intern"
-#302#  "Name laut GoodN64"
-#303#  "Status"
-#304#  "ROM Groesse"
-#305#  "Vermerke - Kern"
-#306#  "Vermerke - Plugin"
-#307#  "Ihre Vermerke in Project64.rdn"
-#308#  "Cartridge ID"
-#309#  "Hersteller"
-#310#  "Region"
-#311#  "Entwickler"
-#312#  "CRC1"
-#313#  "CRC2"
-#314#  "CIC Chip"
-#315#  "Erschienen am"
-#316#  "Genre"
-#317#  "Anzahl der Spieler"
-#318#  "Force Feedback"
-
-//Select Rom
-#320#  "ROMverzeichnis fuer den Browser auswaehlen"
-
-//Messages
-#340#  "Schlechtes ROM? Benutzen Sie GoodN64 und suchen Sie nach neuen Hilfsdateien"
-
-/*********************************************************************************
-* Options                                                                        *
-*********************************************************************************/
-//Options Title
-#400#  "Einstellungen"
-
-//Tabs
-#401#  "Plugins"
-#402#  "Verzeichnisse"
-#403#  "Optionen"
-#404#  "Listen"
-#405#  "Zusaetzlich"
-#406#  "ROMeinstellungen"
-#407#  "Integration"
-#408#  "Vermerke zum ROM"
-
-//Plugin Dialog
-#420#  "Info"
-#421#  "&RSP Plugin"
-#422#  "&Videoplugin"
-#423#  "&Audioplugin"
-#424#  "&Kontrollerplugin"
-
-//Directory Dialog
-#440#  "&Pluginverzeichnis:"
-#441#  "&ROMverzeichnis:"
-#442#  "&N64 Spielstaende im Verzeichnis:"
-#443#  "&Project64 Spielstaende im Verzeichnis:"
-#444#  "Screenshots im &Verzeichnis:"
-#445#  "&Letztes ROMverzeichnis speichern"
-#446#  "Verzeichnis fuer Plugins auswaehlen"
-#447#  "Verzeichnis fuer ROMs auswaehlen"
-#448#  "Verzeichnis fuer N64 Spielstaende auswaehlen"
-#449#  "Verzeichnis fuer Project64 Spielstaende auswaehlen"
-#450#  "Verzeichnis fuer Screenshots auswaehlen"
-
-//Options Dialog
-#460#  "&Emulation anhalten wenn Fenster nicht aktiv"
-#461#  "&Beim Spielstart zum Vollbild umschalten"
-#462#  "&Zusaetzliche Optionen verbergen (empfohlen)"
-#463#  "&Gewaehlte Cheats speichern"
-
-//Rom Browser Tab
-#480#  "&ROMs in der ROMliste (bis 10):"
-#481#  "Stueck"
-#482#  "&Verzeichnisse in der Liste (bis 10):"
-#483#  "Stueck"
-#484#  "&Browser eingeschaltet"
-#485#  "&Mehrere Verzeichnisse"
-#486#  "&Nicht in der Browserliste:"
-#487#  "Reihen&folge:"
-#488#  "&Hin ->"
-#489#  "<- &Zurueck"
-#490#  "H&oeher"
-#491#  "T&iefer"
-
-//Advanced Options
-#500#  "Diese Einstellungen werden benutzt wenn keine .rdb Datei da ist oder wenn die Ueberschreibeoption unten deaktiviert ist."
-#501#  "&Kern Default"
-#502#  "&R4300i Kern:"
-#503#  "&selbstmodifizierender Code:"
-#504#  "RDRAM &Groesse:"
-#505#  "&Advanced Block Linking:"
-#506#  "&Emulation gleich nach dem Laden des Spiels starten"
-#507#  "&Diese Einstellungen mit denen von der .rdb Datei ueberschreiben"
-#508#  "Alle Spielstaende &zippen"
-
-//Rom Options
-#520#  "R4300i &Kern:"
-#521#  "selbst&modifizierender Code:"
-#522#  "RDRAM &Groesse:"
-#523#  "&Advanced Block Linking:"
-#524#  "&Speicherart:"
-#525#  "&Counter Factor:"
-#526#  "Groesserer &Puffer"
-#527#  "&TLB"
-#528#  "&Registercaching"
-#529#  "SI seltener &unterbrechen"
-#530#  "SP &Hack"
-#531#  "Default"
-#532#  "Audio durch RSP"
-
-//Core Styles
-#540#  "Interpreter"
-#541#  "Rekompilierer"
-#542#  "Kerne synchronisieren"
-
-//Self Mod Methods
-#560#  "nichts unternehmen"
-#561#  "Cache"
-#562#  "Speicher beschuetzen"
-#563#  "Speicher & Cache pruefen"
-#564#  "Speicher & Cache aendern"
-#565#  "Speicher besser pruefen"
-
-//RDRAM Size
-#580#  "4 MB"
-#581#  "8 MB"
-
-//Advanced Block Linking
-#600#  "Ein"
-#601#  "Aus"
-
-//Save Type
-#620#  "Automatisch"
-#621#  "4kbit EEPROM"
-#622#  "16kbit EEPROM"
-#623#  "32kbyte SRAM"
-#624#  "128kbyte FlashRAM"
-
-//Shell Intergration Tab
-#640#  "Mit Project64 verbinden:"
-
-//Rom Notes
-#660#  "&Status:"
-#661#  "Vermerke - &Kern:"
-#662#  "Vermerke - &Plugins:"
-
-/*********************************************************************************
-* ROM Information                                                                *
-*********************************************************************************/
-//Rom Info Title Title
-#800#  "ROM Info"
-
-//Rom Info Text
-#801#  "Name intern"
-#802#  "Dateiname"
-#803#  "Pfad"
-#804#  "Groesse"
-#805#  "Cartridge ID"
-#806#  "Hersteller"
-#807#  "Region"
-#808#  "CRC1"
-#809#  "CRC2"
-#810#  "CIC chip"
-
-/*********************************************************************************
-* Cheats                                                                         *
-*********************************************************************************/
-//Cheat List
-#1000#  "Cheats"
-#1001#  "Cheats:"
-#1002#  "Vermerke: "
-#1003#  "Alle aktivieren"
-#1004#  "Alle &deaktivieren"
-
-//Add Cheat
-#1005#  "Cheat hinzufuegen"
-#1006#  "Name:"
-#1007#  "Code:"
-#1008#  "Einfuegen"
-#1009#  "Loeschen"
-#1010#  " Vermerke: "
-#1011#  "Zur Datenbank hinzufuegen"
-#1022#  "Hinzufuegen"
-#1023#  "Neuer Cheat"
-#1024#  "<Adresse> <Inhalt>"
-#1025#  "Optionen:"
-#1026#  "<Inhalt> <Markierung>"
-
-//Code extension
-#1012#  "Codeerweiterung"
-#1013#  "Inhalt fuer den Gebrauch mit:"
-#1014#  "Ja"
-#1015#  "Nein"
-
-//Digital Value
-#1016#  "Groessezahl"
-#1017#  "Inhalt auswaehlen fuer:"
-#1018#  "&Inhalt"
-#1019#  "von"
-#1020#  "bis"
-#1021#  "&Vermerke:"
-
-//Edit Cheat
-#1027#  "Cheat bearbeiten"
-#1028#  "Speichern"
-
-//Cheat Popup Menu
-#1040#  "Cheat hinzufuegen..."
-#1041#  "Bearbeiten..."
-#1042#  "Loeschen"
-
-/*********************************************************************************
-* Messages                                                                       *
-*********************************************************************************/
-#2000#  "Angehalten"
-#2001#  "Fortgesetzt"
-#2002#  "Programm befindet sich in einem Kreislauf ohne Ausweg.
-Emulation wird jetzt beendet.
-
-Tip: ROM und Einstellungen ueberpruefen."
-#2003#  "Fehler bei Speichervermittlung"
-#2004#  "Videoplugin nicht gefunden oder beschaedigt.
-
-Tip: Sie sollen in Einstellungen ein passendes Videoplugin auswaehlen. 
-Es soll sich wenigstens ein passendes Plugin im Pluginverzeichnis befinden."
-#2005#  "Audioplugin nicht gefunden oder beschaedigt.
-
-Sie sollen in Einstellungen ein passendes Audioplugin auswaehlen. 
-Es soll sich wenigstens ein passendes Plugin im Pluginverzeichnis befinden."
-#2006#  "RSP Plugin nicht gefunden oder beschaedigt.
-
-Tip: Sie sollen in Einstellungen ein passendes RSP Plugin auswaehlen. 
-Es soll sich wenigstens ein passendes Plugin im Pluginverzeichnis befinden."
-#2007#  "Kontrollerplugin nicht gefunden oder beschaedigt.
-
-Tip: Sie sollen in Einstellungen ein passendes Kontrollerplugin auswaehlen. 
-Es soll sich wenigstens ein passendes Plugin im Pluginverzeichnis befinden."
-#2008#  "Fehler beim Oeffnen von:"
-#2009#  "Fehler beim Oeffnen des Wortes
-
-Tip: ROM und Einstellungen ueberpruefen."
-#2010#  "Fehler beim Oeffnen des Spielstandes"
-#2011#  "Fehler beim Oeffnen von EEPROM"
-#2012#  "Fehler beim Oeffnen von FlashRAM"
-#2013#  "Fehler beim Oeffnen vom MemPak"
-#2014#  "Der Versuch eine .zip Datei zu oeffnen hat fehlgeschlagen.
-
-Tip: die Datei kann beschaedigt sein - Datei und Pfad ueberpruefen."
-#2015#  "Fehler beim Versuch Datei zu oeffnen."
-#2016#  "Fehler beim Versuch .zip Datei zu oeffnen."
-#2017#  "Geladene Datei scheint kein gueltiger Nintendo64 ROM zu sein.
-
-Tip: ROMs mit GoodN64 ueberpruefen."
-#2018#  "Unbekannte Region"
-#2019#  "unbekannter CIC Chip"
-#2020#  "Unbekannte Datei"
-#2021#  "Unbekannte Speicherhandlung
-
-Emulation gestoppt"
-#2022#  "Unkontrollierbares R4300i OpCode in"
-#2023#  "Befehl wurde falsch Ausgefuehrt.
-
-Tip: ROM und Einstellungen ueberpruefen."
-#2024#  "Spielstand scheint zum ROM nicht zu passen. 
-
-Spielstaende sollen zwischen auf 100% gleichen Spielen gespeichert und geladen werden, 
-dass heisst REGION und VERSION sollen gleich sein.
-Das Laden dieses Spielstandes kann zum Absturz des Spiels und/oder Emulators fuehren.
-
-Wollen Sie wirklich das Laden fortsetzen?"
-#2025#  "Kern- oder Programmfehler"
-#2026#  "Copyright im LUT nicht gefunden.  Das Spiel ist nicht mehr funktionsfaehig."
-#2027#  "Kopierschutzabsage"
-#2028#  "Pluginwechsel fuehrt zur Zuruecksetzung des laufenden Spiels.
-
-Tip: wenn Sie den derzeitigen Spielstand nicht verlieren wollen, 
-antworten Sie Nein und speichern Sie den Spielstand zuerst.
-
-Plugins wechseln und Spiel zuruecksetzen?"
-#2029#  "Pluginwechsel"
-#2030#  "Emulation beendet"
-#2031#  "Emulation gestartet"
-#2032#  "Unmoeglich zu laden: Spielstand"
-#2033#  "Geladen: Spielstand"
-#2034#  "Gespeichert: Spielstand"
-#2035#  "Derzeitiger Speicherblock"
-#2036#  "Anpassung des ROMs"
-#2037#  "ROM wird ausgewaehlt"
-#2038#  "Geladen"
-#2039#  "ROM wird geladen"
-#2040#  "Sie koennen ein ROM nicht oeffnen bis alle Plugins (Video, Audio, Kontroller und RSP) initialisiert sind.
- 
-Tip: versuchen Sie in Einstellungen passende Plugins auszuwaehlen."
-#2041#  "Sind Sie sicher dass Sie diesen Cheat loeschen wollen?"
-#2042#  "Cheat loeschen"
-#2043#  "Cheatname existiert schon, bitte einen anderen Namen waehlen."
-#2044#  "Sie haben die maximale Anzahl von Cheats fuer dieses Spiel erreicht."
-
-//Thanks to hellhound for fixing 266, 274, 2028, 2033 and 2034.
-//Thanks to Bartleby for fixing 2024.
-//Thanks to DarkThunder for active participation.
-//Official support site: http://vdx2004.narod.ru
-//Made in Ukraine.
-//Fin.
--- a/Lang/Spanish.pj.Lang
+++ b/Lang/Spanish.pj.Lang
@ -15,23 +15,23 @@
 #9  #  "Visitar la Pagina Principal"
 #10 #  "Base de datos de ROMS (.RDB)"
 #11 #  "Archivo de Códigos de Trucos (.CHT)"
-#12 #  "Información Extendida del Rom (.RDX)"
+#12 #  "Información Extendida del ROM (.RDX)"

 //About INI title
-#20 #  "Acerca de los Archivos INI"
+#20 #  "Acerca de los Archivos de Configuración"

 /*********************************************************************************
 * Menu                                                                           *
 *********************************************************************************/
 //File Menu
 #100#  "&Archivo"
-#101#  "&Abrir Rom"
-#102#  "&Info del Rom...."
+#101#  "&Abrir ROM"
+#102#  "&Info del ROM...."
 #103#  "Iniciar Emulación"
 #104#  "&Finalizar Emulación"
 #105#  "Elegir Directorio de ROMs..."
 #106#  "Actualizar Lista de ROMs"
-#107#  "Rom Reciente"
+#107#  "ROM Reciente"
 #108#  "Directorio de ROMs Reciente"
 #109#  "&Salir"

@ -41,11 +41,11 @@
 #122#  "&Pausar"
 #123#  "Generar Bitmap"
 #124#  "Limitar FPS"
-#125#  "&Guardar"
+#125#  "&Guardar Estado"
 #126#  "Guardar Como..."
-#127#  "&Restaurar"
+#127#  "&Cargar Estado"
 #128#  "Cargar..."
-#129#  "&Partida Guardada Actual"
+#129#  "&Estado Guardado Actual"
 #130#  "Trucos..."
 #131#  "Botón GS"
 #132#  "C&ontinuar"
@ -71,7 +71,7 @@

 //Help Menu
 #180#  "Ayuda"
-#181#  "Acerca de los Archivos &INI"
+#181#  "Acerca de los Archivos de Conf&iguración"
 #182#  "&Acerca de Project64"
 #183# "&Foro de Soporte"
 #184# "&Pagina Principal"
@ -91,10 +91,10 @@

 //Pop up Menu
 #210#  "Jugar Juego"
-#211#  "Información del Rom"
+#211#  "Información del ROM"
 #212#  "Editar Ajustes del Juego"
 #213#  "Editar Trucos"
-#214#  "Plugin GFX"
+#214#  "Plugin Gráfico"

 //Alternate Name to save Slot
 #220#  "Predeterminado"
@ -110,23 +110,23 @@
 #230#  "Ranura de Guardado - 10"

 // Menu Descriptions
-#250#  "Abrir una imagen rom de N64"
+#250#  "Abrir una imagen ROM de N64"
 #251#  "Mostrar Información acerca de la imagen cargada"
-#252#  "Iniciar Emulación de la imagen rom cargada"
-#253#  "Detener Emulación de la imagen rom cargada"
-#254#  "Seleccionar Directorio de Roms"
+#252#  "Iniciar Emulación de la imagen ROM cargada"
+#253#  "Detener Emulación de la imagen ROM cargada"
+#254#  "Seleccionar Directorio de ROMs"
 #255#  "Actualizar la lista Actual de ROMs en el Navegador de ROMs"
 #256#  "Salir de esta aplicación"
-#257#  "Reiniciar la imagen rom actual (recarga cualquier cambio de ajustes)"
-#258#  "Pausar/Reanudar emulación del rom en ejecución actual"
+#257#  "Reiniciar la imagen ROM actual (recarga cualquier cambio de ajustes)"
+#258#  "Pausar/Reanudar emulación del ROM en ejecución actual"
 #259#  "Generar una imagen Bitmap de la Pantalla actual"
 #260#  "Limitar FPS a la velocidad correcta del N64"
-#261#  "Crear una instantánea del sistema actual para guardado rápido"
-#262#  "Crear una instantánea del sistema actual seleccionando la ubicación del archivo"
-#263#  "Cargar una instantánea de guardado rápido"
-#264#  "Elegir un archivo de guardado instantáneo para cargar"
-#265#  "Activar/Desactivar trucos Game shark"
-#266#  "El Botón Game shark es usado con trucos específicos"
+#261#  "Guardar el estado de sistema actual"
+#262#  "Guardar el estado de sistema actual en una ubicación de archivo seleccionada"
+#263#  "Cargar el estado de sistema guardado"
+#264#  "Elegir un estado de sistema guardado para cargar"
+#265#  "Activar/Desactivar trucos Game Shark"
+#266#  "El Botón Game Shark es usado con trucos específicos"
 #267#  "Cambiar emulación de modo ventana a pantalla completa"
 #268#  "Hacer que la ventana quede por encima las demás ventanas"
 #269#  "Cambiar ajustes dentro del plugin de Gráficos"
@ -140,24 +140,24 @@
 #278#  "Acerca de la aplicación y Autores"
 #277#  "Acerca de los Autores de los archivos de soporte"
 #279#  "Abrir esta imagen ROM abierta previamente"
-#280#  "Elegir este directorio como tu directorio de roms"
+#280#  "Elegir este directorio como tu directorio de ROMs"
 #281#  "Cambiar Aplicación para usar este lenguaje"
-#282#  "Elegir esta ubicación de guardado rápido"
+#282#  "Elegir esta ubicación de guardado para los estados guardados"
 #283#  "Jugar juego seleccionado"
 #284#  "Información acerca del juego seleccionado"
 #285#  "Editar Ajustes para el juego seleccionado"
 #286#  "Editar trucos para el juego seleccionado"

 /*********************************************************************************
-* Rom Browser                                                                    *
+* ROM Browser                                                                    *
 *********************************************************************************/
-//Rom Browser Fields
+//ROM Browser Fields
 #300#  "Nombre del Archivo"
 #301#  "Nombre Interno"
 #302#  "Nombre Correcto"
 #303#  "Estado"
-#304#  "Tamaño del Rom"
-#305#  "Notas (Nucleo)"
+#304#  "Tamaño del ROM"
+#305#  "Notas (Núcleo)"
 #306#  "Notas (plugins predeterminados)"
 #307#  "Notas (Usuario)"
 #308#  "ID del Cartucho"
@ -173,11 +173,11 @@
 #318#  "Retroalimentación de Fuerza"
 #319#  "Formato del Archivo"

-//Select Rom
-#320#  "Seleccionar Directorio actual de Roms"
+//Select ROM
+#320#  "Seleccionar Directorio actual de ROMs"

 //Messages
-#340#  "ROM Dañado? Usa GoodN64 y comprueba por un INI actualizado"
+#340#  "ROM Dañado? Usa GoodN64 y comprueba por una RDB actualizada"

 /*********************************************************************************
 * Options                                                                        *
@ -189,7 +189,7 @@
 #401#  "Plugins"
 #402#  "Directorios"
 #403#  "Opciones"
-#404#  "Selección de Rom"
+#404#  "Selección de ROM"
 #405#  "Avanzado"
 #406#  "Ajustes Generales"
 #407#  "Integración de Shell"
@ -204,40 +204,41 @@
 #422#  " plugin de Vídeo (gráficos): "
 #423#  " plugin de Audio (sonido) : "
 #424#  " plugin de Entrada (mando): "
-#425#  "Usar GFX de Alto Nivel?"
-#426#  "Usar Audio de Alto Nivel?"
+#425#  "Usar Gráficos HLE"
+#426#  "Usar Audio HLE"
 #427#  "** Usar Plugin de Sistema **"

 //Directory Dialog
-#440#  " Directorio de Plugins:: "
-#441#  " Directorio de Roms: "
-#442#  " Guardados Automáticos de N64: "
-#443#  " Guardados Instantáneos: "
-#444#  " Capturas de Pantalla: "
-#445#  "Ultima Carpeta de la cual un rom fue abierto."
+#440#  " Directorio de Plugins: "
+#441#  " Directorio de ROMs: "
+#442#  " Directorio de guardados nativos de N64: "
+#443#  " Directorio de Estados: "
+#444#  " Directorio de Capturas de Pantalla: "
+#445#  "Ultima Carpeta de la cual un ROM fue abierto."
 #446#  "Seleccionar directorio de plugins"
-#447#  "Seleccionar directorio de roms"
-#448#  "Seleccionar directorio de guardados automáticos"
-#449#  "Seleccionar directorio de guardados instantáneos"
+#447#  "Seleccionar directorio de ROMs"
+#448#  "Seleccionar directorio de guardados nativos de N64"
+#449#  "Seleccionar directorio de estados"
 #450#  "Seleccionar directorio de capturas de pantalla"
-#451#  " Directorio de Texturas: "
+#451#  " Directorio de paquete de Texturas: "
 #452#  "Seleccionar directorio de paquetes de texturas"

 //Options Dialog
-#460#  "Pausar emulación cuando la ventana no este activa?"
-#461#  "Al cargar un ROM ir a pantalla completa"
+#460#  "Pausar emulación cuando la ventana no este activa"
+#461#  "Ir a pantalla completa al cargar un ROM"
 #462#  "Ocultar Ajustes Avanzados"
 #463#  "Recordar trucos seleccionados"
-#464#  "Desactivar Protector de Pantalla cuando un rom esté en ejecución"
+#464#  "Desactivar Protector de Pantalla cuando un ROM esté en ejecución"
 #465#  "Mostrar Frecuencia de Cuadros"
 #466#  "Cambiar Tipo de Frecuencia de Cuadros"
+#467#  "Comprobar si Project64 ya está en ejecución"

-//Rom Browser Tab
-#480#  "Máx # de Roms Recordados (Máx 10):"
-#481#  "roms"
-#482#  "Máx # de Directorios de Roms Recordados (Máx 10):"
-#483#  "directorios"
-#484#  "Usar Navegador de Roms"
+//ROM Browser Tab
+#480#  "Máx # de ROMs Recordados (0-10):"
+#481#  "ROMs"
+#482#  "Máx # de Directorios de ROMs Recordados (0-10):"
+#483#  "Directorios"
+#484#  "Usar Navegador de ROMs"
 #485#  "Usar recursión de Directorio"
 #486#  "Campos disponibles:"
 #487#  "Mostrar campos en este orden:"
@ -248,24 +249,25 @@
 #492#  "Actualizar navegador automáticamente"

 //Advanced Options
-#500#  "La mayoría de estos cambios no tendrán efecto hasta que un nuevo rom sea abierto o el rom actual sea reiniciado."
+#500#  "La mayoría de estos cambios no tendrán efecto hasta que un nuevo ROM sea abierto o el ROM actual sea reiniciado."
 #501#  "Predeterminados del Núcleo"
 #502#  "Estilo de núcleo del CPU:"
-#503#  "Método de código Self-mod:"
+#503#  "Métodos Self-mod:"
 #504#  "Tamaño Predeterminado de Memoria:"
 #505#  "Vinculación Avanzada de Bloques:"
-#506#  "Iniciar Emulación cuando el rom sea abierto?"
-#507#  "Siempre sobrescribir ajustes predeterminados con los del ini?"
-#508#  "Comprimir automáticamente guardados instantáneos"
+#506#  "Iniciar Emulación cuando el ROM sea abierto"
+#507#  "Siempre sustituir los ajustes predeterminados con los de la RDB"
+#508#  "Comprimir automáticamente estados guardados"
 #509#  "Habilitar Depurador"
 #510#  "Caché"
 #511#  "PI DMA"
 #512#  "Inicio Cambiado"
 #513#  "Proteger Memoria"
-#514#  "TLB Unmapping"
+#514#  "TLB No Mapeado"

-//Rom Options
+//ROM Options
 #520#  "Estilo de núcleo del CPU:"
+#521#  "Frecuencia de Actualización de VI:"
 #522#  "Tamaño de Memoria:"
 #523#  "Vinculación Avanzada de Bloques:"
 #524#  "Tipo de Guardado predeterminado:"
@ -274,13 +276,16 @@
 #527#  "Usar TLB"
 #528#  "Registrar almacenamiento en caché"
 #529#  "Demorar Interrupción SI"
-#530#  "Hack SP"
+#530#  "SP Rápido"
 #531#  "Predeterminado"
 #532#  "Señal de Audio RSP"
 #533#  "Tiempo de Audio Fijo"
 #534#  "Método de Función de búsqueda:"
-#535#  "Método Personalizado Self Mod"
+#535#  "Método Self Mod Personalizado"
 #536#  "Sincronizar usando Audio"
+#537#  "Contador De AI Por Byte"
+#538#  "Motor de 32 Bit"
+#539#  "Demorar Interrupción DP"

 //Core Styles
 #540#  "Interpretador"
@ -296,7 +301,7 @@
 #565#  "Comprobar Avance de Memoria"
 #566#  "Limpiar Código en Caché"

-//Function Lookup memthod
+//Function Lookup method
 #570#  "Tabla Física de Búsqueda"
 #571#  "Tabla Virtual de Búsqueda"
 #572#  "Cambiar Memoria"
@ -311,16 +316,16 @@

 //Save Type
 #620#  "Usar Primer Tipo de Guardado Usado"
-#621#  "4Kbit Eeprom"
-#622#  "16Kbit Eeprom"
+#621#  "4Kbit EEPROM"
+#622#  "16Kbit EEPROM"
 #623#  "32Kbytes SRAM"
-#624#  "Flashram"
+#624#  "FlashRAM"

 //Shell Integration Tab
 #640#  "Asociación de extensión de archivo:"

-//Rom Notes
-#660#  "Estado del Rom:"
+//ROM Notes
+#660#  "Estado del ROM:"
 #661#  "Nota del Núcleo:"
 #662#  "Nota del Plugin:"

@ -335,7 +340,7 @@
 #687#  "Reiniciar Todo"
 #688#  "Juego no se está jugando"
 #689#  "Jugando Juego"
-#690#  "Jugando Juego (ventana)"
+#690#  "Jugando Juego (Ventana)"
 #691#  "Jugando Juego (Pantalla Completa)"

 // Frame Rate Option
@ -347,11 +352,16 @@
 #710#  "Incrementar Velocidad del Juego"
 #711#  "Disminuir Velocidad del Juego"

+//Bottom Page Buttons
+#720#  "Reiniciar Página"
+#721#  "Reiniciar Todo"
+#722#  "Aplicar"
+
 /*********************************************************************************
 * ROM Information                                                                *
 *********************************************************************************/
-//Rom Info Title
-#800#  "Información del Rom"
+//ROM Info Title
+#800#  "Información del ROM"

 //Rom Info Text
 #801#  "Nombre del ROM:"
@ -407,7 +417,7 @@
 //Edit Cheat
 #1027#  "Editar Truco"
 #1028#  "Actualizar Truco"
-#1029#  "El Truco ha sido cambiado, quieres actualizar?"
+#1029#  "El Truco ha sido cambiado.\n\nQuieres actualizar?"
 #1030#  "Truco Actualizado"

 //Cheat Popup Menu
@ -437,50 +447,50 @@
 #2008#  "Error al cargar plugin:"
 #2009#  "Error al cargar palabra\n\nComprueba el ROM y los Ajustes del ROM."
 #2010#  "Error al abrir el Archivo de Guardado"
-#2011#  "Error al abrir Eeprom"
-#2012#  "Error al abrir Flashram"
-#2013#  "Error al abrir mempak"
+#2011#  "Error al abrir EEPROM"
+#2012#  "Error al abrir FlashRAM"
+#2013#  "Error al abrir Mempak"
 #2014#  "Intento de abrir el archivo zip fallido. \n\nProbablemente un archivo zip corrupto - prueba descomprimir el ROM manualmente."
 #2015#  "Intento de abrir el archivo fallido."
 #2016#  "Ocurrió un error cuando se intentaba abrir el archivo zip."
-#2017#  "El archivo cargado no parece ser un ROM de Nintendo64 valido. \n\nComprueba tus ROMs con GoodN64."
+#2017#  "El archivo cargado no parece ser un ROM de N64 valido. \n\nComprueba tus ROMs con GoodN64."
 #2018#  "País desconocido"
 #2019#  "Chip CIC desconocido"
 #2020#  "Formato de archivo desconocido"
 #2021#  "Acción de memoria desconocida\n\nEmulación detenida"
 #2022#  "OpCode R4300i no manejado en"
 #2023#  "Ejecutando desde un espacio no-mapeado.\n\nComprueba el ROM y los Ajustes del ROM."
-#2024#  "La partida guardada no parece coincidir con el ROM en ejecución. \n\nLas Partidas Guardadas deben ser guardadas y cargadas entre ROMs 100% idénticos, \nen particular la REGION y VERSION necesita ser la misma. \nCargar esta partida es probable que cause al juego y/o al emulador se bloquee. \n\nEstas seguro de que quieres continuar cargando?"
+#2024#  "El Estado no parece coincidir con el ROM en ejecución. \n\nLos Estados deben ser guardados y cargados entre ROMs 100% idénticos, \nEn particular la REGION y VERSION necesita ser la misma. \nCargar esta Estado es probable que cause al juego y/o al emulador se bloquee. \n\nEstás seguro de que quieres continuar cargando?"
 #2025#  "Error"
 #2026#  "Secuencia de Copyright no encontrada en el LUT.  El Juego ya no funcionara."
 #2027#  "Falla en la Protección de Copia"
-#2028#  "Cambiar un plugin requiere que Project64 reinicie un ROM en ejecución. \nSi no quieres perder tu posición, responde No y guarda una partida primero. \n\nCambiar plugins y reiniciar juego ahora?"
+#2028#  "Cambiar un plugin requiere que Project64 reinicie un ROM en ejecución. \nSi no quieres perder tu posición, responde No y guarda el Estado actual primero. \n\nCambiar plugins y reiniciar el ROM ahora?"
 #2029#  "Cambiar Plugins"
 #2030#  "Emulación finalizada"
 #2031#  "Emulación iniciada"
-#2032#  "Imposible cargar partida guardada"
-#2033#  "Cargada la partida guardada"
-#2034#  "Guardar partida actual en"
-#2035#  "Ranura de partida guardada"
+#2032#  "Imposible cargar Estado"
+#2033#  "Estado Cargado"
+#2034#  "Guardar Estado actual en"
+#2035#  "Ranura de Estado"
 #2036#  "Imagen de Intercambio de Byte"
 #2037#  "Eligiendo imagen de N64"
 #2038#  "Cargada"
 #2039#  "Cargando imagen"
-#2040#  "No se puede abrir un rom porque los plugins no se han inicializado correctamente"
-#2041#  "Estas seguro de que realmente quieres borrar esto?" 
+#2040#  "No se puede abrir un ROM porque los plugins no se han inicializado correctamente"
+#2041#  "Estás seguro de que realmente quieres borrar esto?"
 #2042#  "Borrar Truco"
-#2043#  "El Nombre del Truco ya esta en uso" 
-#2044#  "Haz Alcanzado la cantidad Máxima de trucos para este rom"
-#2045#  "Inicializando el Plug-in"
+#2043#  "El Nombre del Truco ya está en uso"
+#2044#  "Haz Alcanzado la cantidad Máxima de trucos para este ROM"
+#2045#  "Inicializando el Plugin"
 #2046#  "No has seleccionado una tecla virtual para asignarla al elemento del menú"
 #2047#  "Necesitas seleccionar un elemento del menú para asignarle esta tecla a"
 #2048#  "El Acceso directo ya está asignado a otro elemento del menú"
 #2049#  "Ningún acceso directo ha sido seleccionado para ser removido"
-#2050#  "Rom Cargada. Esperando por la emulación para iniciar."
-#2051#  "project64 beta es solo para miembros.\n\nsi tienes una cuenta en pj64.net, no deberías estar viendo este error!!\npor favor contacta con nosotros en el sitio"
+#2050#  "ROM Cargada. Esperando por la emulación para iniciar."
+#2051#  "Project64 beta es solo para miembros.\n\nSi tienes una cuenta en pj64.net, no deberías estar viendo este error!!\nPor favor contacta con nosotros en el sitio"
 #2052#  "Error del Programa"
 #2053#  "Fallo al encontrar el nombre de archivo en archivo 7z"
-#2054#  "Usar Gráficos de Bajo Nivel "
-#2055#  "Los Gráficos de Bajo Nivel no son para uso general!!!\nEs aconsejable que tu solo uses esto para pruebas, no para jugar algún juego con ello\n\nCambiar a LLE GFX?"
-#2056#  "Usar Audio de Alto Nivel"
-#2057#  "El Audio de Alto nivel requiere un plugin de terceros!!!\nSi no usas un plugin de terceros que soporte audio de alto nivel entonces no oirás ningún sonido.\n\nUsar audio de alto nivel?"
+#2054#  "Usar Gráficos LLE"
+#2055#  "Los Gráficos LLE no son para uso general!!!\nEs aconsejable que tu solo uses esto para pruebas, y no para jugar juegos.\n\nCambiar a Gráficos LLE?"
+#2056#  "Usar Audio HLE"
+#2057#  "El Audio HLE requiere un plugin de terceros!!!\nSi no usas un plugin de terceros que soporte audio HLE, no oirás ningún sonido.\n\nCambiar a Audio HLE?"
--- a/Source/Glide64/Config.cpp
+++ b/Source/Glide64/Config.cpp
@ -1310,3 +1310,28 @@ void CALL DllAbout ( HWND hParent )
  hostWindow = NULL;
 #endif
 }
+
+void general_setting(short setting_ID, const char * name, unsigned int value)
+{
+    RegisterSetting(
+        setting_ID,
+        Data_DWORD_General,
+        name,
+        NULL,
+        value,
+        NULL
+    );
+    return;
+}
+void game_setting(short setting_ID, const char * name, unsigned int value)
+{
+    RegisterSetting(
+        setting_ID,
+        Data_DWORD_Game,
+        name,
+        NULL,
+        value,
+        NULL
+    );
+    return;
+}
--- a/Source/Glide64/Config.h
+++ b/Source/Glide64/Config.h
@ -286,4 +286,9 @@ enum {

 extern short Set_basic_mode, Set_texture_dir;

+extern void
+    general_setting(short setting_ID, const char * name, unsigned int value);
+extern void
+    game_setting(short setting_ID, const char * name, unsigned int value);
+
 #endif // CONFIG_H
--- a/Source/Glide64/DepthBufferRender.cpp
+++ b/Source/Glide64/DepthBufferRender.cpp
@ -87,7 +87,7 @@ static int left_z, left_dzdy;

 extern "C" int imul16(int x, int y);
 extern "C" int imul14(int x, int y);
-extern "C" int idiv16(int x, int y);
+extern int idiv16(int x, int y);

 __inline int iceil(int x)
 {
--- a/Source/Glide64/FixedPoint.asm.cpp
+++ b/Source/Glide64/FixedPoint.asm.cpp
@ -35,6 +35,12 @@
 ;
 ;****************************************************************/

+#if defined(_MSC_VER) && !defined(_STDINT)
+typedef signed __int64          int64_t;
+#else
+#include <stdint.h>
+#endif
+
 // (x * y) >> 16
 extern "C" int __declspec(naked) imul16(int x, int y)
 {
@ -65,19 +71,12 @@ extern "C" int  __declspec(naked) imul14(int x, int y)
 	}
 }

-//(x << 16) / y
-extern "C" int __declspec(naked) idiv16(int x, int y)
+int idiv16(int x, int y)
 {
-	_asm {
-		push ebp
-		mov ebp,esp
-		mov   eax, [x]
-		mov   ebx, [y]
-		mov   edx,eax   
-		sar   edx,16
-		shl   eax,16    
-		idiv  ebx  
-		leave
-		ret
-	}
+    int64_t result;
+    const int64_t m = (int64_t)(x);
+    const int64_t n = (int64_t)(y);
+
+    result = (m << 16) / n;
+    return (int)(result);
 }
--- a/Source/Glide64/Main.cpp
+++ b/Source/Glide64/Main.cpp
@ -623,18 +623,18 @@ void WriteSettings (bool saveEmulationSettings)
    SetSetting(Set_lodmode, settings.lodmode);
    SetSetting(Set_aspect, settings.aspectmode);

-    SetSetting(Set_fb_read_always, settings.frame_buffer&fb_ref ? 1 : 0l);
-    SetSetting(Set_fb_smart, settings.frame_buffer & fb_emulation ? 1 : 0l);
-    SetSetting(Set_fb_hires, settings.frame_buffer & fb_hwfbe ? 1 : 0l);
-    SetSetting(Set_fb_get_info, settings.frame_buffer & fb_get_info ? 1 : 0l);
-    SetSetting(Set_fb_render, settings.frame_buffer & fb_depth_render ? 1 : 0l);
-    SetSetting(Set_detect_cpu_write, settings.frame_buffer & fb_cpu_write_hack ? 1 : 0l);
+    SetSetting(Set_fb_read_always, settings.frame_buffer&fb_ref ? 1 : 0);
+    SetSetting(Set_fb_smart, settings.frame_buffer & fb_emulation ? 1 : 0);
+    SetSetting(Set_fb_hires, settings.frame_buffer & fb_hwfbe ? 1 : 0);
+    SetSetting(Set_fb_get_info, settings.frame_buffer & fb_get_info ? 1 : 0);
+    SetSetting(Set_fb_render, settings.frame_buffer & fb_depth_render ? 1 : 0);
+    SetSetting(Set_detect_cpu_write, settings.frame_buffer & fb_cpu_write_hack ? 1 : 0);
    if (settings.frame_buffer & fb_read_back_to_screen)
      SetSetting(Set_read_back_to_screen, 1);
    else if (settings.frame_buffer & fb_read_back_to_screen2)
      SetSetting(Set_read_back_to_screen, 2);
    else
-      SetSetting(Set_read_back_to_screen, 0l);
+      SetSetting(Set_read_back_to_screen, 0);
  }

  FlushSettings();
@ -1578,90 +1578,90 @@ void CALL PluginLoaded (void)
 	Set_texture_dir = FindSystemSettingId("Dir:Texture");

 	SetModuleName("Glide64");
-	RegisterSetting(Set_CardId, Data_DWORD_General,"card_id",NULL,0l,NULL);
-	RegisterSetting(Set_Resolution, Data_DWORD_General,"resolution",NULL,7,NULL);
-	RegisterSetting(Set_vsync, Data_DWORD_General,"vsync",NULL,1,NULL);
-	RegisterSetting(Set_ssformat, Data_DWORD_General,"ssformat",NULL,1,NULL);
-	RegisterSetting(Set_ShowFps, Data_DWORD_General,"show_fps",NULL,0l,NULL);
-	RegisterSetting(Set_clock, Data_DWORD_General,"clock",NULL,0l,NULL);
-	RegisterSetting(Set_clock_24_hr, Data_DWORD_General,"clock_24_hr",NULL,0l,NULL);
-	RegisterSetting(Set_texenh_options, Data_DWORD_General,"texenh_options",NULL,0l,NULL);
-	RegisterSetting(Set_hotkeys, Data_DWORD_General,"hotkeys",NULL,1l,NULL);
-	RegisterSetting(Set_wrpResolution, Data_DWORD_General,"wrpResolution",NULL,0l,NULL);
-	RegisterSetting(Set_wrpVRAM, Data_DWORD_General,"wrpVRAM",NULL,0l,NULL);
-	RegisterSetting(Set_wrpFBO, Data_DWORD_General,"wrpFBO",NULL,0l,NULL);
-	RegisterSetting(Set_wrpAnisotropic, Data_DWORD_General,"wrpAnisotropic",NULL,0l,NULL);
-	RegisterSetting(Set_autodetect_ucode, Data_DWORD_General,"autodetect_ucode",NULL, 1,NULL);
-	RegisterSetting(Set_ucode, Data_DWORD_General,"ucode",NULL, 2,NULL);
-	RegisterSetting(Set_wireframe, Data_DWORD_General,"wireframe",NULL, 0l,NULL);
-	RegisterSetting(Set_wfmode, Data_DWORD_General,"wfmode",NULL, 1,NULL);
-	RegisterSetting(Set_logging, Data_DWORD_General,"logging",NULL, 0l,NULL);
-	RegisterSetting(Set_log_clear, Data_DWORD_General,"log_clear",NULL, 0l,NULL);
-	RegisterSetting(Set_run_in_window, Data_DWORD_General,"run_in_window",NULL, 0l,NULL);
-	RegisterSetting(Set_elogging, Data_DWORD_General,"elogging",NULL, 0l,NULL);
-	RegisterSetting(Set_filter_cache, Data_DWORD_General,"filter_cache",NULL, 0l,NULL);
-	RegisterSetting(Set_unk_as_red, Data_DWORD_General,"unk_as_red",NULL, 0l,NULL);
-	RegisterSetting(Set_log_unk, Data_DWORD_General,"log_unk",NULL, 0l,NULL);
-	RegisterSetting(Set_unk_clear, Data_DWORD_General,"unk_clear",NULL, 0l,NULL);
-	RegisterSetting(Set_ghq_fltr, Data_DWORD_General,"ghq_fltr",NULL, 0l,NULL);
-	RegisterSetting(Set_ghq_cmpr, Data_DWORD_General,"ghq_cmpr",NULL, 0l,NULL);
-	RegisterSetting(Set_ghq_enht, Data_DWORD_General,"ghq_enht",NULL, 0l,NULL);
-	RegisterSetting(Set_ghq_hirs, Data_DWORD_General,"ghq_hirs",NULL, 0l,NULL);
-	RegisterSetting(Set_ghq_enht_cmpr, Data_DWORD_General,"ghq_enht_cmpr",NULL, 0l,NULL);
-	RegisterSetting(Set_ghq_enht_tile, Data_DWORD_General,"ghq_enht_tile",NULL, 0l,NULL);
-	RegisterSetting(Set_ghq_enht_f16bpp, Data_DWORD_General,"ghq_enht_f16bpp",NULL, 0l,NULL);
-	RegisterSetting(Set_ghq_enht_gz, Data_DWORD_General,"ghq_enht_gz",NULL, 1L,NULL);
-	RegisterSetting(Set_ghq_enht_nobg, Data_DWORD_General,"ghq_enht_nobg",NULL, 0l,NULL);
-	RegisterSetting(Set_ghq_hirs_cmpr, Data_DWORD_General,"ghq_hirs_cmpr",NULL, 0l,NULL);
-	RegisterSetting(Set_ghq_hirs_tile, Data_DWORD_General,"ghq_hirs_tile",NULL, 0l,NULL);
-	RegisterSetting(Set_ghq_hirs_f16bpp, Data_DWORD_General,"ghq_hirs_f16bpp",NULL, 0l,NULL);
-	RegisterSetting(Set_ghq_hirs_gz, Data_DWORD_General,"ghq_hirs_gz",NULL, 1,NULL);
-	RegisterSetting(Set_ghq_hirs_altcrc, Data_DWORD_General,"ghq_hirs_altcrc",NULL, 1,NULL);
-	RegisterSetting(Set_ghq_cache_save, Data_DWORD_General,"ghq_cache_save",NULL, 1,NULL);
-	RegisterSetting(Set_ghq_cache_size, Data_DWORD_General,"ghq_cache_size",NULL, 0l,NULL);
-	RegisterSetting(Set_ghq_hirs_let_texartists_fly, Data_DWORD_General,"ghq_hirs_let_texartists_fly",NULL, 0l,NULL);
-	RegisterSetting(Set_ghq_hirs_dump, Data_DWORD_General,"ghq_hirs_dump",NULL, 0l,NULL);
+	general_setting(Set_CardId, "card_id", 0);
+	general_setting(Set_Resolution, "resolution", 7);
+	general_setting(Set_vsync, "vsync", 1);
+	general_setting(Set_ssformat, "ssformat", 1);
+	general_setting(Set_ShowFps, "show_fps", 0);
+	general_setting(Set_clock, "clock", 0);
+	general_setting(Set_clock_24_hr, "clock_24_hr", 0);
+	general_setting(Set_texenh_options, "texenh_options", 0);
+	general_setting(Set_hotkeys, "hotkeys", 1);
+	general_setting(Set_wrpResolution, "wrpResolution", 0);
+	general_setting(Set_wrpVRAM, "wrpVRAM", 0);
+	general_setting(Set_wrpFBO, "wrpFBO", 0);
+	general_setting(Set_wrpAnisotropic, "wrpAnisotropic", 0);
+	general_setting(Set_autodetect_ucode, "autodetect_ucode", 1);
+	general_setting(Set_ucode, "ucode", 2);
+	general_setting(Set_wireframe, "wireframe", 0);
+	general_setting(Set_wfmode, "wfmode", 1);
+	general_setting(Set_logging, "logging", 0);
+	general_setting(Set_log_clear, "log_clear", 0);
+	general_setting(Set_run_in_window, "run_in_window", 0);
+	general_setting(Set_elogging, "elogging", 0);
+	general_setting(Set_filter_cache, "filter_cache", 0);
+	general_setting(Set_unk_as_red, "unk_as_red", 0);
+	general_setting(Set_log_unk, "log_unk", 0);
+	general_setting(Set_unk_clear, "unk_clear", 0);
+	general_setting(Set_ghq_fltr, "ghq_fltr", 0);
+	general_setting(Set_ghq_cmpr, "ghq_cmpr", 0);
+	general_setting(Set_ghq_enht, "ghq_enht", 0);
+	general_setting(Set_ghq_hirs, "ghq_hirs", 0);
+	general_setting(Set_ghq_enht_cmpr, "ghq_enht_cmpr", 0);
+	general_setting(Set_ghq_enht_tile, "ghq_enht_tile", 0);
+	general_setting(Set_ghq_enht_f16bpp, "ghq_enht_f16bpp", 0);
+	general_setting(Set_ghq_enht_gz, "ghq_enht_gz", 1);
+	general_setting(Set_ghq_enht_nobg, "ghq_enht_nobg", 0);
+	general_setting(Set_ghq_hirs_cmpr, "ghq_hirs_cmpr", 0);
+	general_setting(Set_ghq_hirs_tile, "ghq_hirs_tile", 0);
+	general_setting(Set_ghq_hirs_f16bpp, "ghq_hirs_f16bpp", 0);
+	general_setting(Set_ghq_hirs_gz, "ghq_hirs_gz", 1);
+	general_setting(Set_ghq_hirs_altcrc, "ghq_hirs_altcrc", 1);
+	general_setting(Set_ghq_cache_save, "ghq_cache_save", 1);
+	general_setting(Set_ghq_cache_size, "ghq_cache_size", 0);
+	general_setting(Set_ghq_hirs_let_texartists_fly, "ghq_hirs_let_texartists_fly", 0);
+	general_setting(Set_ghq_hirs_dump, "ghq_hirs_dump", 0);

-	RegisterSetting(Set_alt_tex_size,Data_DWORD_Game,"alt_tex_size",NULL,0l,NULL);
-	RegisterSetting(Set_use_sts1_only,Data_DWORD_Game,"use_sts1_only",NULL,0l,NULL);
-	RegisterSetting(Set_force_calc_sphere,Data_DWORD_Game,"force_calc_sphere",NULL,0l,NULL);
-	RegisterSetting(Set_correct_viewport,Data_DWORD_Game,"correct_viewport",NULL,0l,NULL);
-	RegisterSetting(Set_increase_texrect_edge,Data_DWORD_Game,"increase_texrect_edge",NULL,0,NULL);
-	RegisterSetting(Set_decrease_fillrect_edge,Data_DWORD_Game,"decrease_fillrect_edge",NULL,0l,NULL);
-	RegisterSetting(Set_texture_correction,Data_DWORD_Game,"texture_correction",NULL,1,NULL);
-	RegisterSetting(Set_pal230,Data_DWORD_Game,"pal230",NULL,0l,NULL);
-	RegisterSetting(Set_stipple_mode,Data_DWORD_Game,"stipple_mode",NULL,2,NULL);
+	game_setting(Set_alt_tex_size, "alt_tex_size", 0);
+	game_setting(Set_use_sts1_only, "use_sts1_only", 0);
+	game_setting(Set_force_calc_sphere, "force_calc_sphere", 0);
+	game_setting(Set_correct_viewport, "correct_viewport", 0);
+	game_setting(Set_increase_texrect_edge, "increase_texrect_edge", 0);
+	game_setting(Set_decrease_fillrect_edge, "decrease_fillrect_edge", 0);
+	game_setting(Set_texture_correction, "texture_correction", 1);
+	game_setting(Set_pal230, "pal230", 0);
+	game_setting(Set_stipple_mode, "stipple_mode", 2);

-	RegisterSetting(Set_stipple_pattern,Data_DWORD_Game,"stipple_pattern",NULL,1041204192,NULL);
-	RegisterSetting(Set_force_microcheck,Data_DWORD_Game,"force_microcheck",NULL,0l,NULL);
-	RegisterSetting(Set_force_quad3d,Data_DWORD_Game,"force_quad3d",NULL,0l,NULL);
-	RegisterSetting(Set_clip_zmin,Data_DWORD_Game,"clip_zmin",NULL,0l,NULL);
-	RegisterSetting(Set_clip_zmax,Data_DWORD_Game,"clip_zmax",NULL,1,NULL);
-	RegisterSetting(Set_fast_crc,Data_DWORD_Game,"fast_crc",NULL,1,NULL);
-	RegisterSetting(Set_adjust_aspect,Data_DWORD_Game,"adjust_aspect",NULL,1,NULL);
-	RegisterSetting(Set_zmode_compare_less,Data_DWORD_Game,"zmode_compare_less",NULL,0l,NULL);
-	RegisterSetting(Set_old_style_adither,Data_DWORD_Game,"old_style_adither",NULL,0l,NULL);
-	RegisterSetting(Set_n64_z_scale,Data_DWORD_Game,"n64_z_scale",NULL,0l,NULL);
-	RegisterSetting(Set_optimize_texrect,Data_DWORD_Game,"optimize_texrect",NULL,1,NULL);
-	RegisterSetting(Set_ignore_aux_copy,Data_DWORD_Game,"ignore_aux_copy",NULL,(unsigned int)-1,NULL);
-	RegisterSetting(Set_hires_buf_clear,Data_DWORD_Game,"hires_buf_clear",NULL,1,NULL);
-	RegisterSetting(Set_fb_read_alpha,Data_DWORD_Game,"fb_read_alpha",NULL,0l,NULL);
-	RegisterSetting(Set_useless_is_useless,Data_DWORD_Game,"useless_is_useless",NULL,(unsigned int)-1,NULL);
-	RegisterSetting(Set_fb_crc_mode,Data_DWORD_Game,"fb_crc_mode",NULL,1,NULL);
-	RegisterSetting(Set_filtering,Data_DWORD_Game,"filtering",NULL,0l,NULL);
-	RegisterSetting(Set_fog,Data_DWORD_Game,"fog",NULL,1,NULL);
-	RegisterSetting(Set_buff_clear,Data_DWORD_Game,"buff_clear",NULL,1,NULL);
-	RegisterSetting(Set_swapmode,Data_DWORD_Game,"swapmode",NULL,1,NULL);
-	RegisterSetting(Set_aspect,Data_DWORD_Game,"aspect",NULL,0l,NULL);
-	RegisterSetting(Set_lodmode,Data_DWORD_Game,"lodmode",NULL,0l,NULL);
+	game_setting(Set_stipple_pattern, "stipple_pattern", 0x3E0F83E0);
+	game_setting(Set_force_microcheck, "force_microcheck", 0);
+	game_setting(Set_force_quad3d, "force_quad3d", 0);
+	game_setting(Set_clip_zmin, "clip_zmin", 0);
+	game_setting(Set_clip_zmax, "clip_zmax", 1);
+	game_setting(Set_fast_crc, "fast_crc", 1);
+	game_setting(Set_adjust_aspect, "adjust_aspect", 1);
+	game_setting(Set_zmode_compare_less, "zmode_compare_less", 0);
+	game_setting(Set_old_style_adither, "old_style_adither", 0);
+	game_setting(Set_n64_z_scale, "n64_z_scale", 0);
+	game_setting(Set_optimize_texrect, "optimize_texrect", 1);
+	game_setting(Set_ignore_aux_copy, "ignore_aux_copy", (unsigned int)-1);
+	game_setting(Set_hires_buf_clear, "hires_buf_clear", 1);
+	game_setting(Set_fb_read_alpha, "fb_read_alpha", 0);
+	game_setting(Set_useless_is_useless, "useless_is_useless", (unsigned int)-1);
+	game_setting(Set_fb_crc_mode, "fb_crc_mode", 1);
+	game_setting(Set_filtering, "filtering", 0);
+	game_setting(Set_fog, "fog", 1);
+	game_setting(Set_buff_clear, "buff_clear", 1);
+	game_setting(Set_swapmode, "swapmode", 1);
+	game_setting(Set_aspect, "aspect", 0);
+	game_setting(Set_lodmode, "lodmode", 0);

-	RegisterSetting(Set_fb_smart,Data_DWORD_Game,"fb_smart",NULL,0l,NULL);
-	RegisterSetting(Set_fb_hires,Data_DWORD_Game,"fb_hires",NULL,1,NULL);
-	RegisterSetting(Set_fb_read_always,Data_DWORD_Game,"fb_read_always",NULL,0l,NULL);
-	RegisterSetting(Set_read_back_to_screen,Data_DWORD_Game,"read_back_to_screen",NULL,0l,NULL);
-	RegisterSetting(Set_detect_cpu_write,Data_DWORD_Game,"detect_cpu_write",NULL,0l,NULL);
-	RegisterSetting(Set_fb_get_info,Data_DWORD_Game,"fb_get_info",NULL,0l,NULL);
-	RegisterSetting(Set_fb_render,Data_DWORD_Game,"fb_render",NULL,0,NULL);
+	game_setting(Set_fb_smart, "fb_smart", 1);
+	game_setting(Set_fb_hires, "fb_hires", 1);
+	game_setting(Set_fb_read_always, "fb_read_always", 0);
+	game_setting(Set_read_back_to_screen, "read_back_to_screen", 0);
+	game_setting(Set_detect_cpu_write, "detect_cpu_write", 0);
+	game_setting(Set_fb_get_info, "fb_get_info", 0);
+	game_setting(Set_fb_render, "fb_render", 1);
 }

 /******************************************************************
--- a/Source/Installer/Installer.iss
+++ b/Source/Installer/Installer.iss
@ -29,36 +29,7 @@ Source: "{#BaseDir}\Config\Glide64.rdb"; DestDir: "{app}\Config"
 Source: "{#BaseDir}\Config\Project64.cht"; DestDir: "{app}\Config"
 Source: "{#BaseDir}\Config\Project64.rdb"; DestDir: "{app}\Config"
 Source: "{#BaseDir}\Config\Project64.rdx"; DestDir: "{app}\Config"
-Source: "{#BaseDir}\Lang\Brazilian Portuguese.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Bulgarian.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Chinese (Simplified).pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Chinese (Taiwan).pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Chinese (Traditional).pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\ChineseB5.pj.lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\ChineseGB.pj.lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Czech.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Danish.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Dutch.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\English.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\English_alternative.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Finnish.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\French.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\German.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\German_int.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\German_localised.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Greek.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Hungarian.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Italian.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Italian_alternative.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Japanese.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Lithuanian.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Norwegian.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Polish.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Russian.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Spanish.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Swedish.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\T-Chinese.pj.Lang"; DestDir: "{app}\Lang"
-Source: "{#BaseDir}\Lang\Ukrainian.pj.Lang"; DestDir: "{app}\Lang"
+Source: "{#BaseDir}\Lang\*.pj.Lang"; DestDir: "{app}\Lang"
 Source: "{#BaseDir}\Plugin\Audio\Jabo_Dsound.dll"; DestDir: "{app}\Plugin\Audio"
 Source: "{#BaseDir}\Plugin\GFX\Jabo_Direct3D8.dll"; DestDir: "{app}\Plugin\GFX"
 Source: "{#BaseDir}\Plugin\GFX\PJ64Glide64.dll"; DestDir: "{app}\Plugin\GFX"
--- a/Source/Installer/package_zip.bat
+++ b/Source/Installer/package_zip.bat
@ -5,7 +5,7 @@ cd /d %~dp0..\..\
 SET base_dir=%cd%
 cd /d %current_dir%

-rd "%base_dir%\Bin\Package" /Q /S
+rd "%base_dir%\Bin\Package" /Q /S > NUL 2>&1
 md "%base_dir%\Bin\Package"
 md "%base_dir%\Bin\Package\Config"
 md "%base_dir%\Bin\Package\Lang"
@ -20,36 +20,7 @@ copy "%base_dir%\Config\Glide64.rdb" "%base_dir%\Bin\Package\Config"
 copy "%base_dir%\Config\Project64.cht" "%base_dir%\Bin\Package\Config"
 copy "%base_dir%\Config\Project64.rdb" "%base_dir%\Bin\Package\Config"
 copy "%base_dir%\Config\Project64.rdx" "%base_dir%\Bin\Package\Config"
-copy "%base_dir%\Lang\Brazilian Portuguese.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Bulgarian.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Chinese (Simplified).pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Chinese (Taiwan).pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Chinese (Traditional).pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\ChineseB5.pj.lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\ChineseGB.pj.lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Czech.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Danish.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Dutch.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\English.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\English_alternative.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Finnish.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\French.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\German.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\German_int.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\German_localised.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Greek.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Hungarian.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Italian.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Italian_alternative.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Japanese.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Lithuanian.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Norwegian.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Polish.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Russian.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Spanish.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Swedish.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\T-Chinese.pj.Lang" "%base_dir%\Bin\Package\Lang"
-copy "%base_dir%\Lang\Ukrainian.pj.Lang" "%base_dir%\Bin\Package\Lang"
+copy "%base_dir%\Lang\*.pj.Lang" "%base_dir%\Bin\Package\Lang"
 copy "%base_dir%\Plugin\Audio\Jabo_Dsound.dll" "%base_dir%\Bin\Package\Plugin\Audio"
 copy "%base_dir%\Plugin\GFX\Jabo_Direct3D8.dll" "%base_dir%\Bin\Package\Plugin\GFX"
 copy "%base_dir%\Plugin\GFX\PJ64Glide64.dll" "%base_dir%\Bin\Package\Plugin\GFX"
--- 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,
@ -295,6 +296,7 @@ enum LanguageStringID{

 //Rom Options
 	ROM_CPU_STYLE		=	520,
+	ROM_VIREFRESH		=	521,
 	ROM_MEM_SIZE		=	522,
 	ROM_ABL				=	523,
 	ROM_SAVE_TYPE		=	524,
@ -303,13 +305,16 @@ enum LanguageStringID{
 	ROM_USE_TLB			=	527,
 	ROM_REG_CACHE		=	528,
 	ROM_DELAY_SI		=	529,
-	ROM_SP_HACK			=	530,
+	ROM_FAST_SP			=	530,
 	ROM_DEFAULT			=	531,
 	ROM_AUDIO_SIGNAL    =   532,
 	ROM_FIXED_AUDIO     =   533,
 	ROM_FUNC_FIND       =   534,
 	ROM_CUSTOM_SMM      =   535,
 	ROM_SYNC_AUDIO      =   536,
+	ROM_COUNTPERBYTE	=	537,
+	ROM_32BIT			=	538,
+	ROM_DELAY_DP		=	539,

 //Core Styles
 	CORE_INTERPTER		=	540,
@ -376,6 +381,11 @@ enum LanguageStringID{
    STR_INSREASE_SPEED      = 710,
    STR_DECREASE_SPEED      = 711,

+//Bottom page buttons
+	BOTTOM_RESET_PAGE		= 720,
+	BOTTOM_RESET_ALL		= 721,
+	BOTTOM_APPLY			= 722,
+
 /*********************************************************************************
 * ROM Information                                                                *
 *********************************************************************************/
--- a/Source/Project64/Multilanguage/Language
+++ b/Source/Project64/Multilanguage/Language
@ -34,11 +34,11 @@ void CLanguage::LoadDefaultStrings (void)
 	DEF_STR(INI_DATE,            L"Date"                    );
 	DEF_STR(INI_HOMEPAGE,        L"Visit Home Page"         );
 	DEF_STR(INI_CURRENT_RDB,     L"ROM Database (.RDB)"     );
-	DEF_STR(INI_CURRENT_CHT,     L"Cheat Code file (.CHT)"  );
-	DEF_STR(INI_CURRENT_RDX,     L"Extended Rom Info (.RDX)");
+	DEF_STR(INI_CURRENT_CHT,     L"Cheat Code File (.CHT)"  );
+	DEF_STR(INI_CURRENT_RDX,     L"Extended ROM Info (.RDX)");

 //About INI title
-	DEF_STR(INI_TITLE,           L"About INI Files"         );
+	DEF_STR(INI_TITLE,           L"About Config Files"         );

 /*********************************************************************************
 * Numbers                                                                        *
@ -59,14 +59,14 @@ void CLanguage::LoadDefaultStrings (void)
 *********************************************************************************/
 //File Menu
 	DEF_STR(MENU_FILE,     L"&File"     );
-		DEF_STR(MENU_OPEN,       L"&Open Rom"               );
-		DEF_STR(MENU_ROM_INFO,   L"Rom &Info...."           );
+		DEF_STR(MENU_OPEN,       L"&Open ROM"               );
+		DEF_STR(MENU_ROM_INFO,   L"ROM &Info...."           );
 		DEF_STR(MENU_START,      L"Start Emulation"         );
 		DEF_STR(MENU_END,        L"&End Emulation"          );
-		DEF_STR(MENU_CHOOSE_ROM, L"Choose Rom Directory..." );
-		DEF_STR(MENU_REFRESH,    L"Refresh Rom List"        );
-		DEF_STR(MENU_RECENT_ROM, L"Recent Rom"              );
-		DEF_STR(MENU_RECENT_DIR, L"Recent Rom Directories"  );
+		DEF_STR(MENU_CHOOSE_ROM, L"Choose ROM Directory..." );
+		DEF_STR(MENU_REFRESH,    L"Refresh ROM List"        );
+		DEF_STR(MENU_RECENT_ROM, L"Recent ROM"              );
+		DEF_STR(MENU_RECENT_DIR, L"Recent ROM Directories"  );
 		DEF_STR(MENU_EXIT,       L"E&xit"                   );

 //System Menu
@ -75,9 +75,9 @@ void CLanguage::LoadDefaultStrings (void)
 		DEF_STR(MENU_PAUSE,       L"&Pause"                 );
 		DEF_STR(MENU_BITMAP,      L"Generate Bitmap"        );
 		DEF_STR(MENU_LIMIT_FPS,   L"Limit FPS"              );
-		DEF_STR(MENU_SAVE,        L"&Save"                  );
+		DEF_STR(MENU_SAVE,        L"&Save State"                  );
 		DEF_STR(MENU_SAVE_AS,     L"Save As..."             );
-		DEF_STR(MENU_RESTORE,     L"&Restore"               );
+		DEF_STR(MENU_RESTORE,     L"&Load State"               );
 		DEF_STR(MENU_LOAD,        L"Load..."                );
 		DEF_STR(MENU_CURRENT_SAVE,L"Current Save S&tate"    );
 		DEF_STR(MENU_CHEAT,       L"Cheats..."              );
@ -89,12 +89,12 @@ void CLanguage::LoadDefaultStrings (void)
 //Options Menu
 	DEF_STR(MENU_OPTIONS,  L"&Options"  );
 		DEF_STR(MENU_FULL_SCREEN, L"&Full Screen"                   );
-		DEF_STR(MENU_ON_TOP,      L"&Always On &Top"                );
+		DEF_STR(MENU_ON_TOP,      L"&Always on &Top"                );
 		DEF_STR(MENU_CONFG_GFX,   L"Configure Graphics Plugin..."   );
 		DEF_STR(MENU_CONFG_AUDIO, L"Configure Audio Plugin..."      );
 		DEF_STR(MENU_CONFG_CTRL,  L"Configure Controller Plugin..." );
 		DEF_STR(MENU_CONFG_RSP,   L"Configure RSP Plugin..."        );
-		DEF_STR(MENU_SHOW_CPU,    L"Show CPU usage %"               );
+		DEF_STR(MENU_SHOW_CPU,    L"Show CPU Usage"                 );
 		DEF_STR(MENU_SETTINGS,    L"&Settings..."                   );

 //Debugger Menu
@ -105,7 +105,7 @@ void CLanguage::LoadDefaultStrings (void)

 //Help Menu
 	DEF_STR(MENU_HELP,     L"&Help"     );
-		DEF_STR(MENU_ABOUT_INI,   L"About &INI Files"   );
+		DEF_STR(MENU_ABOUT_INI,   L"About Conf&ig Files"   );
 		DEF_STR(MENU_ABOUT_PJ64,  L"&About Project64"  );
 		DEF_STR(MENU_FORUM,	      L"Support &Forum"     );
 		DEF_STR(MENU_HOMEPAGE,	  L"&Homepage"          );
@ -125,10 +125,10 @@ void CLanguage::LoadDefaultStrings (void)

 //Pop up Menu
 	DEF_STR(POPUP_PLAY,      L"Play Game"  );
-	DEF_STR(POPUP_INFO,      L"Rom Information"  );
+	DEF_STR(POPUP_INFO,      L"ROM Information"  );
 	DEF_STR(POPUP_SETTINGS,  L"Edit Game Settings"  );
 	DEF_STR(POPUP_CHEATS,    L"Edit Cheats"  );
-	DEF_STR(POPUP_GFX_PLUGIN,L"GFX Plugin"  );
+	DEF_STR(POPUP_GFX_PLUGIN,L"Graphics Plugin"  );

 //Alternate Name to save Slot
 	DEF_STR(SAVE_SLOT_DEFAULT,L"Save Slot - Default"       );
@ -144,17 +144,17 @@ void CLanguage::LoadDefaultStrings (void)
 	DEF_STR(SAVE_SLOT_10,     L"Save Slot - 10"            );

 /*********************************************************************************
-* Rom Browser                                                                    *
+* ROM Browser                                                                    *
 *********************************************************************************/
-//Rom Browser Fields
+//ROM Browser Fields
 	DEF_STR(RB_FILENAME,     L"File Name" );
 	DEF_STR(RB_INTERNALNAME, L"Internal Name" );
 	DEF_STR(RB_GOODNAME,     L"Good Name" );
 	DEF_STR(RB_STATUS,       L"Status" );
-	DEF_STR(RB_ROMSIZE,      L"Rom Size" );
-	DEF_STR(RB_NOTES_CORE,   L"Notes (Core)" );
+	DEF_STR(RB_ROMSIZE,      L"ROM Size" );
+	DEF_STR(RB_NOTES_CORE,   L"Notes (core)" );
 	DEF_STR(RB_NOTES_PLUGIN, L"Notes (default plugins)" );
-	DEF_STR(RB_NOTES_USER,   L"Notes (User)" );
+	DEF_STR(RB_NOTES_USER,   L"Notes (user)" );
 	DEF_STR(RB_CART_ID,      L"Cartridge ID" );
 	DEF_STR(RB_MANUFACTUER,  L"Manufacturer" );
 	DEF_STR(RB_COUNTRY,      L"Country" );
@ -168,11 +168,11 @@ void CLanguage::LoadDefaultStrings (void)
 	DEF_STR(RB_FORCE_FEEDBACK,L"Force Feedback" );
 	DEF_STR(RB_FILE_FORMAT,   L"File Format" );

-//Select Rom
-	DEF_STR(SELECT_ROM_DIR,  L"Select current Rom Directory" );
+//Select ROM
+	DEF_STR(SELECT_ROM_DIR,  L"Select current ROM directory" );

 //Messages
-	DEF_STR(RB_NOT_GOOD_FILE,L"Bad ROM? Use GoodN64 & check for updated INI" );
+	DEF_STR(RB_NOT_GOOD_FILE,L"Bad ROM? Use GoodN64 & check for updated RDB" );

 /*********************************************************************************
 * Options                                                                        *
@ -184,7 +184,7 @@ void CLanguage::LoadDefaultStrings (void)
 	DEF_STR(TAB_PLUGIN,      L"Plugins");
 	DEF_STR(TAB_DIRECTORY,   L"Directories");
 	DEF_STR(TAB_OPTIONS,     L"Options");
-	DEF_STR(TAB_ROMSELECTION,L"Rom Selection");
+	DEF_STR(TAB_ROMSELECTION,L"ROM Selection");
 	DEF_STR(TAB_ADVANCED,    L"Advanced");
 	DEF_STR(TAB_ROMSETTINGS, L"General Settings");
 	DEF_STR(TAB_SHELLINTERGATION,L"Shell Integration");
@ -195,45 +195,46 @@ void CLanguage::LoadDefaultStrings (void)

 //Plugin Dialog
 	DEF_STR(PLUG_ABOUT,    L"About");
-	DEF_STR(PLUG_RSP,      L" RSP (reality signal processor) plugin: ");
+	DEF_STR(PLUG_RSP,      L" RSP (Reality Signal Processor) plugin: ");
 	DEF_STR(PLUG_GFX,      L" Video (graphics) plugin: ");
 	DEF_STR(PLUG_AUDIO,    L" Audio (sound) plugin: ");
 	DEF_STR(PLUG_CTRL,     L" Input (controller) plugin: ");
-	DEF_STR(PLUG_HLE_GFX,  L"Use High Level GFX?");
-	DEF_STR(PLUG_HLE_AUDIO,L"Use High Level Audio?");
+	DEF_STR(PLUG_HLE_GFX,  L"Graphics HLE");
+	DEF_STR(PLUG_HLE_AUDIO,L"Audio HLE");
 	DEF_STR(PLUG_DEFAULT,  L"** Use System Plugin **");

 //Directory Dialog
-	DEF_STR(DIR_PLUGIN,        L" Plugin Directoy: ");
-	DEF_STR(DIR_ROM,           L" Rom Directory: ");
-	DEF_STR(DIR_AUTO_SAVE,     L" N64 Auto saves: ");
-	DEF_STR(DIR_INSTANT_SAVE,  L" Instant saves: ");
-	DEF_STR(DIR_SCREEN_SHOT,   L" Screen Shots: ");
-	DEF_STR(DIR_ROM_DEFAULT,   L"Last folder that a rom was open from.");
+	DEF_STR(DIR_PLUGIN,        L" Plugin directory: ");
+	DEF_STR(DIR_ROM,           L" ROM directory: ");
+	DEF_STR(DIR_AUTO_SAVE,     L" N64 native saves directory: ");
+	DEF_STR(DIR_INSTANT_SAVE,  L" Saved states directory: ");
+	DEF_STR(DIR_SCREEN_SHOT,   L" Screenshot directory: ");
+	DEF_STR(DIR_ROM_DEFAULT,   L"Last folder that a ROM was open from");
 	DEF_STR(DIR_SELECT_PLUGIN, L"Select plugin directory");
-	DEF_STR(DIR_SELECT_ROM,    L"Select rom directory");
-	DEF_STR(DIR_SELECT_AUTO,   L"Select automatic save directory");
-	DEF_STR(DIR_SELECT_INSTANT,L"Select instant save directory");
-	DEF_STR(DIR_SELECT_SCREEN, L"Select snap shot directory");
-	DEF_STR(DIR_TEXTURE,        L" Texture Directory: ");
+	DEF_STR(DIR_SELECT_ROM,    L"Select ROM directory");
+	DEF_STR(DIR_SELECT_AUTO,   L"Select N64 native saves directory");
+	DEF_STR(DIR_SELECT_INSTANT,L"Select saved states directory");
+	DEF_STR(DIR_SELECT_SCREEN, L"Select screenshot directory");
+	DEF_STR(DIR_TEXTURE,        L" Texture pack directory: ");
 	DEF_STR(DIR_SELECT_TEXTURE, L"Select texture pack directory");

 //Options (general) Tab
-	DEF_STR(OPTION_AUTO_SLEEP,      L"Pause emulation when window is not active?");
-	DEF_STR(OPTION_AUTO_FULLSCREEN, L"On loading a ROM go to full screen");
-	DEF_STR(OPTION_BASIC_MODE,      L"Hide Advanced Settings");
+	DEF_STR(OPTION_AUTO_SLEEP,      L"Pause emulation when window is not active");
+	DEF_STR(OPTION_AUTO_FULLSCREEN, L"Enter full-screen mode when loading a ROM");
+	DEF_STR(OPTION_BASIC_MODE,      L"Hide advanced settings");
 	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_DISABLE_SS,      L"Disable screen saver when running a ROM");
+	DEF_STR(OPTION_DISPLAY_FR,      L"Display speed");
+	DEF_STR(OPTION_CHECK_RUNNING,   L"Check if Project64 is already running");
+	DEF_STR(OPTION_CHANGE_FR,       L"Speed display:");

-//Rom Browser Tab
-	DEF_STR(RB_MAX_ROMS,         L"Max # of Roms Remembered (Max 10):");
-	DEF_STR(RB_ROMS,             L"roms");
-	DEF_STR(RB_MAX_DIRS,         L"Max # of Rom Dirs Remembered (Max 10):");
+//ROM Browser Tab
+	DEF_STR(RB_MAX_ROMS,         L"Max # of ROMs remembered (0-10):");
+	DEF_STR(RB_ROMS,             L"ROMs");
+	DEF_STR(RB_MAX_DIRS,         L"Max # of ROM dirs remembered (0-10):");
 	DEF_STR(RB_DIRS,             L"dirs");
-	DEF_STR(RB_USE,              L"Use Rom Browser");
-	DEF_STR(RB_DIR_RECURSION,    L"Use Directory recursion");
+	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_ADD,              L"Add ->");
@ -243,58 +244,62 @@ void CLanguage::LoadDefaultStrings (void)
 	DEF_STR(RB_REFRESH,          L"Automatically refresh browser");

 //Advanced Options
-	DEF_STR(ADVANCE_INFO,        L"Most of these changes will not take effect till 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_CPU_STYLE,   L"CPU core style:");
 	DEF_STR(ADVANCE_SMCM,        L"Self-mod code method:");
-	DEF_STR(ADVANCE_MEM_SIZE,    L"Default Memory Size:");
-	DEF_STR(ADVANCE_ABL,         L"Advanced Block Linking:");
-	DEF_STR(ADVANCE_AUTO_START,  L"Start Emulation when rom is opened?");
-	DEF_STR(ADVANCE_OVERWRITE,   L"Always overwrite default settings with ones from ini?");
-	DEF_STR(ADVANCE_COMPRESS,    L"Automatically compress instant saves");
-	DEF_STR(ADVANCE_DEBUGGER,    L"Enable Debugger");
+	DEF_STR(ADVANCE_MEM_SIZE,    L"Default memory size:");
+	DEF_STR(ADVANCE_ABL,         L"Advanced block linking:");
+	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_COMPRESS,    L"Automatically compress saves states");
+	DEF_STR(ADVANCE_DEBUGGER,    L"Enable debugger");
 	DEF_STR(ADVANCE_SMM_CACHE,   L"Cache");
 	DEF_STR(ADVANCE_SMM_PIDMA,   L"PI DMA");
-	DEF_STR(ADVANCE_SMM_VALIDATE,L"Start Changed");
-	DEF_STR(ADVANCE_SMM_PROTECT, L"Protect Memory");
-	DEF_STR(ADVANCE_SMM_TLB,     L"TLB Unmapping");
+	DEF_STR(ADVANCE_SMM_VALIDATE,L"Start changed");
+	DEF_STR(ADVANCE_SMM_PROTECT, L"Protect memory");
+	DEF_STR(ADVANCE_SMM_TLB,     L"TLB unmapping");

-//Rom Options
+//ROM Options
 	DEF_STR(ROM_CPU_STYLE,       L"CPU core style:");
-	DEF_STR(ROM_MEM_SIZE,        L"Memory Size:");
-	DEF_STR(ROM_ABL,             L"Advanced Block Linking:");
-	DEF_STR(ROM_SAVE_TYPE,       L"Default Save type:");
-	DEF_STR(ROM_COUNTER_FACTOR,  L"Counter Factor:");
-	DEF_STR(ROM_LARGE_BUFFER,    L"Larger Compile Buffer");
+	DEF_STR(ROM_VIREFRESH,       L"VI refresh rate:");
+	DEF_STR(ROM_MEM_SIZE,        L"Memory size:");
+	DEF_STR(ROM_ABL,             L"Advanced block linking:");
+	DEF_STR(ROM_SAVE_TYPE,       L"Default save type:");
+	DEF_STR(ROM_COUNTER_FACTOR,  L"Counter factor:");
+	DEF_STR(ROM_LARGE_BUFFER,    L"Larger compile buffer");
 	DEF_STR(ROM_USE_TLB,         L"Use TLB");
 	DEF_STR(ROM_REG_CACHE,       L"Register caching");
-	DEF_STR(ROM_DELAY_SI,        L"Delay SI Interrupt");
-	DEF_STR(ROM_SP_HACK,         L"SP Hack");
+	DEF_STR(ROM_DELAY_SI,        L"Delay SI interrupt");
+	DEF_STR(ROM_FAST_SP,         L"Fast SP");
 	DEF_STR(ROM_DEFAULT,         L"Default");
-	DEF_STR(ROM_AUDIO_SIGNAL,    L"RSP Audio Signal");
-	DEF_STR(ROM_FIXED_AUDIO,     L"Fixed Audio Timing");
+	DEF_STR(ROM_AUDIO_SIGNAL,    L"RSP audio signal");
+	DEF_STR(ROM_FIXED_AUDIO,     L"Fixed audio timing");
 	DEF_STR(ROM_FUNC_FIND,       L"Function lookup method:");
-	DEF_STR(ROM_CUSTOM_SMM,      L"Custom Self Mod Method");
-	DEF_STR(ROM_SYNC_AUDIO,      L"Sync using Audio");
+	DEF_STR(ROM_CUSTOM_SMM,      L"Custom self mod Method");
+	DEF_STR(ROM_SYNC_AUDIO,      L"Sync using audio");
+	DEF_STR(ROM_COUNTPERBYTE,	 L"AI count per byte:");
+	DEF_STR(ROM_32BIT,			 L"32-bit engine:");
+	DEF_STR(ROM_DELAY_DP,		 L"Delay DP interrupt:");

 //Core Styles
 	DEF_STR(CORE_INTERPTER,      L"Interpreter");
 	DEF_STR(CORE_RECOMPILER,     L"Recompiler");
-	DEF_STR(CORE_SYNC,           L"Synchronise Cores");
+	DEF_STR(CORE_SYNC,           L"Synchronize cores");

 //Self Mod Methods
 	DEF_STR(SMCM_NONE,           L"None");
 	DEF_STR(SMCM_CACHE,          L"Cache");
-	DEF_STR(SMCM_PROECTED,       L"Protect Memory");
-	DEF_STR(SMCM_CHECK_MEM,      L"Check Memory & Cache");
-	DEF_STR(SMCM_CHANGE_MEM,     L"Change Memory & Cache");
-	DEF_STR(SMCM_CHECK_ADV,      L"Check Memory Advance");
-	DEF_STR(SMCM_CACHE2,         L"Clear Code on Cache");
+	DEF_STR(SMCM_PROECTED,       L"Protect memory");
+	DEF_STR(SMCM_CHECK_MEM,      L"Check memory & cache");
+	DEF_STR(SMCM_CHANGE_MEM,     L"Change memory & cache");
+	DEF_STR(SMCM_CHECK_ADV,      L"Check memory advance");
+	DEF_STR(SMCM_CACHE2,         L"Clear code on cache");

-//Function Lookup memthod
-	DEF_STR(FLM_PLOOKUP,         L"Physical Lookup Table");
-	DEF_STR(FLM_VLOOKUP,         L"Virtual Lookup Table");
-	DEF_STR(FLM_CHANGEMEM,       L"Change Memory");
+//Function Lookup method
+	DEF_STR(FLM_PLOOKUP,         L"Physical lookup table");
+	DEF_STR(FLM_VLOOKUP,         L"Virtual lookup table");
+	DEF_STR(FLM_CHANGEMEM,       L"Change memory");

 //RDRAM Size
 	DEF_STR(RDRAM_4MB,           L"4 MB");
@ -305,60 +310,65 @@ void CLanguage::LoadDefaultStrings (void)
 	DEF_STR(ABL_OFF,             L"Off");

 //Save Type
-	DEF_STR(SAVE_FIRST_USED,     L"Use First Used Save Type");
-	DEF_STR(SAVE_4K_EEPROM,      L"4kbit Eeprom");
-	DEF_STR(SAVE_16K_EEPROM,     L"16kbit Eeprom");
-	DEF_STR(SAVE_SRAM,           L"32kbytes SRAM");
-	DEF_STR(SAVE_FLASHRAM,       L"Flashram");
+	DEF_STR(SAVE_FIRST_USED,     L"Use first used save type");
+	DEF_STR(SAVE_4K_EEPROM,      L"4-kbit EEPROM");
+	DEF_STR(SAVE_16K_EEPROM,     L"16-kbit EEPROM");
+	DEF_STR(SAVE_SRAM,           L"32-kbyte SRAM");
+	DEF_STR(SAVE_FLASHRAM,       L"Flash RAM");

-//Shell Intergration Tab
+//Shell Integration Tab
 	DEF_STR(SHELL_TEXT,          L"File extension association:");

-//Rom Notes
-	DEF_STR(NOTE_STATUS,         L"Rom Status:");
-	DEF_STR(NOTE_CORE,           L"Core Note:");
-	DEF_STR(NOTE_PLUGIN,         L"Plugin Note:");
+//ROM Notes
+	DEF_STR(NOTE_STATUS,         L"ROM status:");
+	DEF_STR(NOTE_CORE,           L"Core note:");
+	DEF_STR(NOTE_PLUGIN,         L"Plugin note:");

 // Accelerator Selector
-	DEF_STR(ACCEL_CPUSTATE_TITLE,    L"CPU State:");
-	DEF_STR(ACCEL_MENUITEM_TITLE,    L"Menu Item:");
-	DEF_STR(ACCEL_CURRENTKEYS_TITLE, L"Current Keys:");
-	DEF_STR(ACCEL_SELKEY_TITLE,      L"Select New Shortcut Key:");
-	DEF_STR(ACCEL_ASSIGNEDTO_TITLE,  L"Currently Assigned To:");
+	DEF_STR(ACCEL_CPUSTATE_TITLE,    L"CPU state:");
+	DEF_STR(ACCEL_MENUITEM_TITLE,    L"Menu item:");
+	DEF_STR(ACCEL_CURRENTKEYS_TITLE, L"Current keys:");
+	DEF_STR(ACCEL_SELKEY_TITLE,      L"Select new shortcut key:");
+	DEF_STR(ACCEL_ASSIGNEDTO_TITLE,  L"Currently assigned to:");
 	DEF_STR(ACCEL_ASSIGN_BTN,        L"Assign");
 	DEF_STR(ACCEL_REMOVE_BTN,        L"Remove");
-	DEF_STR(ACCEL_RESETALL_BTN,      L"Reset All");
+	DEF_STR(ACCEL_RESETALL_BTN,      L"Reset all");
 	DEF_STR(ACCEL_CPUSTATE_1,        L"Game not playing");
 	DEF_STR(ACCEL_CPUSTATE_2,        L"Game playing");
 	DEF_STR(ACCEL_CPUSTATE_3,        L"Game playing (windowed)");
-	DEF_STR(ACCEL_CPUSTATE_4,        L"Game playing (Fullscreen)");
+	DEF_STR(ACCEL_CPUSTATE_4,        L"Game playing (full-screen)");

 // Frame Rate Option
-	DEF_STR(STR_FR_VIS,              L"Vertical Interupts per second");
-	DEF_STR(STR_FR_DLS,              L"Display Lists per second");
-	DEF_STR(STR_FR_PERCENT,          L"Percent of Speed");
+	DEF_STR(STR_FR_VIS,              L"Vertical interrupts per second");
+	DEF_STR(STR_FR_DLS,              L"Display lists per second");
+	DEF_STR(STR_FR_PERCENT,          L"Percentage of full speed");

 // Increase speed
 	DEF_STR(STR_INSREASE_SPEED,      L"Increase Game Speed");
 	DEF_STR(STR_DECREASE_SPEED,      L"Decrease Game Speed");

+//Bottom page buttons
+	DEF_STR(BOTTOM_RESET_PAGE,      L"Reset Page");
+	DEF_STR(BOTTOM_RESET_ALL,       L"Reset All");
+	DEF_STR(BOTTOM_APPLY,			L"Apply");
+	
 /*********************************************************************************
 * ROM Information                                                                *
 *********************************************************************************/
-//Rom Info Title Title
-	DEF_STR(INFO_TITLE,             L"Rom Information");
+//ROM Info Title
+	DEF_STR(INFO_TITLE,             L"ROM Information");

-//Rom Info Text
-	DEF_STR(INFO_ROM_NAME_TEXT,     L"ROM Name:");
-	DEF_STR(INFO_FILE_NAME_TEXT,    L"File Name:");
+//ROM Info Text
+	DEF_STR(INFO_ROM_NAME_TEXT,     L"ROM name:");
+	DEF_STR(INFO_FILE_NAME_TEXT,    L"File name:");
 	DEF_STR(INFO_LOCATION_TEXT,     L"Location:");
-	DEF_STR(INFO_SIZE_TEXT,         L"Rom Size:");
+	DEF_STR(INFO_SIZE_TEXT,         L"ROM size:");
 	DEF_STR(INFO_CART_ID_TEXT,      L"Cartridge ID:");
 	DEF_STR(INFO_MANUFACTURER_TEXT, L"Manufacturer:");
 	DEF_STR(INFO_COUNTRY_TEXT,      L"Country:");
 	DEF_STR(INFO_CRC1_TEXT,         L"CRC1:");
 	DEF_STR(INFO_CRC2_TEXT,         L"CRC2:");
-	DEF_STR(INFO_CIC_CHIP_TEXT,     L"CIC Chip:");
+	DEF_STR(INFO_CIC_CHIP_TEXT,     L"CIC chip:");
 	DEF_STR(INFO_MD5_TEXT,          L"MD5:");

 /*********************************************************************************
@ -402,17 +412,17 @@ void CLanguage::LoadDefaultStrings (void)
 //Edit Cheat
 	DEF_STR(CHEAT_EDITCHEAT_WINDOW,L"Edit Cheat");
 	DEF_STR(CHEAT_EDITCHEAT_UPDATE,L"Update Cheat");
-	DEF_STR(CHEAT_CHANGED_MSG,     L"Cheat has been changed do you want to update?");
-	DEF_STR(CHEAT_CHANGED_TITLE,   L"Cheat Updated");
+	DEF_STR(CHEAT_CHANGED_MSG,     L"Cheat has been changed.\n\nDo you want to update?");
+	DEF_STR(CHEAT_CHANGED_TITLE,   L"Cheat updated");

 //Cheat Popup Menu
 	DEF_STR(CHEAT_ADDNEW,          L"Add New Cheat...");
 	DEF_STR(CHEAT_EDIT,            L"Edit");
 	DEF_STR(CHEAT_DELETE,          L"Delete");

-// short cut editor
-	DEF_STR(STR_SHORTCUT_RESET_TITLE, L"Reset Short Cuts");
-	DEF_STR(STR_SHORTCUT_RESET_TEXT,  L"Are you sure you want to reset the short cuts?\n\nThis action cannot be undone.");
+// short-cut editor
+	DEF_STR(STR_SHORTCUT_RESET_TITLE, L"Reset short-cuts");
+	DEF_STR(STR_SHORTCUT_RESET_TEXT,  L"Are you sure you want to reset the short-cuts?\n\nThis action cannot be undone.");
 	DEF_STR(STR_SHORTCUT_FILEMENU,    L"File Menu");
 	DEF_STR(STR_SHORTCUT_SYSTEMMENU,  L"System Menu");
 	DEF_STR(STR_SHORTCUT_OPTIONS,     L"Options");
@ -422,63 +432,63 @@ void CLanguage::LoadDefaultStrings (void)
 * Messages                                                                       *
 *********************************************************************************/
 	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_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_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_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_OPEN_SAVE,     L"Failed to open Save File");
-	DEF_STR(MSG_FAIL_OPEN_EEPROM,   L"Failed to open Eeprom");
-	DEF_STR(MSG_FAIL_OPEN_FLASH,    L"Failed to open Flashram");
+	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_EEPROM,   L"Failed to open EEPROM");
+	DEF_STR(MSG_FAIL_OPEN_FLASH,    L"Failed to open flash RAM");
 	DEF_STR(MSG_FAIL_OPEN_MEMPAK,   L"Failed to open mempak");
 	DEF_STR(MSG_FAIL_OPEN_ZIP,      L"Attempt to open zip file failed. \n\nProbably a corrupt zip file - try unzipping ROM manually.");
 	DEF_STR(MSG_FAIL_OPEN_IMAGE,    L"Attempt to open file failed.");
-	DEF_STR(MSG_FAIL_ZIP,           L"Error occured when trying to open zip file.");
-	DEF_STR(MSG_FAIL_IMAGE,         L"File loaded does not appear to be a valid Nintendo64 ROM. \n\nVerify your ROMs with GoodN64.");
+	DEF_STR(MSG_FAIL_ZIP,           L"Error occurred when trying to open zip file.");
+	DEF_STR(MSG_FAIL_IMAGE,         L"File loaded does not appear to be a valid N64 ROM. \n\nVerify your ROMs with GoodN64.");
 	DEF_STR(MSG_UNKNOWN_COUNTRY,    L"Unknown country");
-	DEF_STR(MSG_UNKNOWN_CIC_CHIP,   L"Unknown Cic Chip");
+	DEF_STR(MSG_UNKNOWN_CIC_CHIP,   L"Unknown CIC chip");
 	DEF_STR(MSG_UNKNOWN_FILE_FORMAT,L"Unknown file format");
-	DEF_STR(MSG_UNKNOWN_MEM_ACTION, L"Unknown memory action\n\nEmulation stop");
-	DEF_STR(MSG_UNHANDLED_OP,       L"Unhandled R4300i OpCode at");
-	DEF_STR(MSG_NONMAPPED_SPACE,    L"Executing from non-mapped space.\n\nVerify ROM and ROM Settings.");
-	DEF_STR(MSG_SAVE_STATE_HEADER,  L"State save does not appear to match the running ROM. \n\nState saves 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?");
+	DEF_STR(MSG_UNKNOWN_MEM_ACTION, L"Unknown memory action\n\nEmulation stopped");
+	DEF_STR(MSG_UNHANDLED_OP,       L"Unhandled R4300i opcode at");
+	DEF_STR(MSG_NONMAPPED_SPACE,    L"Executing from non-mapped space.\n\nVerify ROM and ROM settings.");
+	DEF_STR(MSG_SAVE_STATE_HEADER,  L"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?");
 	DEF_STR(MSG_MSGBOX_TITLE,       L"Error");
 	DEF_STR(MSG_PIF2_ERROR,         L"Copyright sequence not found in LUT.  Game will no longer function.");
 	DEF_STR(MSG_PIF2_TITLE,         L"Copy Protection Failure");
-	DEF_STR(MSG_PLUGIN_CHANGE,      L"Changing a plugin requires Project64 to reset a running ROM. \nIf you don't want to lose your place, answer No and make a state save first. \n\nChange plugins and restart game now?");
+	DEF_STR(MSG_PLUGIN_CHANGE,      L"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?");
 	DEF_STR(MSG_PLUGIN_CHANGE_TITLE,L"Change Plugins");
 	DEF_STR(MSG_EMULATION_ENDED,    L"Emulation ended");
 	DEF_STR(MSG_EMULATION_STARTED,  L"Emulation started");
-	DEF_STR(MSG_UNABLED_LOAD_STATE, L"Unable to load save state");
-	DEF_STR(MSG_LOADED_STATE,       L"Loaded save state");
+	DEF_STR(MSG_UNABLED_LOAD_STATE, L"Unable to load state");
+	DEF_STR(MSG_LOADED_STATE,       L"Loaded state");
 	DEF_STR(MSG_SAVED_STATE,        L"Saved current state to");
-	DEF_STR(MSG_SAVE_SLOT,          L"Save state slot");
-	DEF_STR(MSG_BYTESWAP,           L"Byte swapping image");
+	DEF_STR(MSG_SAVE_SLOT,          L"State slot");
+	DEF_STR(MSG_BYTESWAP,           L"Byte-swapping image");
 	DEF_STR(MSG_CHOOSE_IMAGE,       L"Choosing N64 image");
 	DEF_STR(MSG_LOADED,             L"Loaded");
 	DEF_STR(MSG_LOADING,            L"Loading image");
-	DEF_STR(MSG_PLUGIN_NOT_INIT,    L"Cannot open a rom because plugins have not successfully initialised");
+	DEF_STR(MSG_PLUGIN_NOT_INIT,    L"Cannot open a ROM because plugins have not successfully initialized.");
 	DEF_STR(MSG_DEL_SURE,           L"Are you sure you really want to delete this?");
 	DEF_STR(MSG_DEL_TITLE,          L"Delete Cheat");
-	DEF_STR(MSG_CHEAT_NAME_IN_USE,  L"Cheat Name is already in use");
-	DEF_STR(MSG_MAX_CHEATS,         L"You Have reached the Maximum amount of cheats for this rom");
-	DEF_STR(MSG_PLUGIN_INIT,		L"Plug-in Initializing");
-	DEF_STR(MSG_NO_SHORTCUT_SEL,	L"You have not selected a virtual key to assign to the menu item");
-	DEF_STR(MSG_NO_MENUITEM_SEL,	L"You need to select a menu item to assign this key to");
-	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 pj64.net, you should not be seeing this error!!\nplease contact us on the site");
+	DEF_STR(MSG_CHEAT_NAME_IN_USE,  L"Cheat name is already in use.");
+	DEF_STR(MSG_MAX_CHEATS,         L"You have reached the maximum amount of cheats for this ROM.");
+	DEF_STR(MSG_PLUGIN_INIT,		L"Plugin initializing");
+	DEF_STR(MSG_NO_SHORTCUT_SEL,	L"You have not selected a virtual key to assign to the menu item.");
+	DEF_STR(MSG_NO_MENUITEM_SEL,	L"You need to select a menu item to assign this key to.");
+	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 pj64.net, 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"Use Low Level Graphics");
-	DEF_STR(MSG_SET_LLE_GFX_MSG,    L"Low Level Graphics are not for general use!!!\nIt is advisable that you only use this for testing, not for playing any games with\n\nChange to LLE GFX?");
-	DEF_STR(MSG_SET_HLE_AUD_TITLE,  L"Use High Level Audio");
-	DEF_STR(MSG_SET_HLE_AUD_MSG,    L"High level Audio requires a 3rd party plugin!!!\nIf you do not use a 3rd party plugin that supports high level audio then you will hear no sound.\n\nUse high level audio?");
+	DEF_STR(MSG_SET_LLE_GFX_TITLE,  L"Graphics Low-Level Emulation");
+	DEF_STR(MSG_SET_LLE_GFX_MSG,    L"Graphics LLE is not for general use!!!\nIt is advisable that you only use this for testing and not for playing games.\n\nChange to graphics LLE?");
+	DEF_STR(MSG_SET_HLE_AUD_TITLE,  L"Audio High-Level Emulation");
+	DEF_STR(MSG_SET_HLE_AUD_MSG,    L"Audio HLE requires a third-party plugin!!!\nIf you do not use a third-party audio plugin that supports HLE, you will hear no sound.\n\nChange to audio HLE?");
 }

 LRESULT CALLBACK LangSelectProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
--- a/Source/Project64/Settings/Game
+++ b/Source/Project64/Settings/Game
@ -54,9 +54,6 @@ void CGameSettings::RefreshGameSettings()
 	m_bFastSP           = g_Settings->LoadBool(Game_FastSP);
 	m_RspAudioSignal    = g_Settings->LoadBool(Game_RspAudioSignal);
 	m_bRomInMemory      = g_Settings->LoadBool(Game_LoadRomToMemory);
-	m_bFastSP           = g_Settings->LoadBool(Game_FastSP);
-	m_b32Bit            = g_Settings->LoadBool(Game_32Bit);
-
 	m_RegCaching        = g_Settings->LoadBool(Game_RegCache);
 	m_bLinkBlocks       = g_Settings->LoadBool(Game_BlockLinking);
 	m_LookUpMode        = g_Settings->LoadDword(Game_FuncLookupMode);
--- a/Source/Project64/Settings/Settings
+++ b/Source/Project64/Settings/Settings
@ -192,7 +192,7 @@ void CSettings::AddHowToHandleSetting ()
 	AddHandler(Game_DelaySI,            new CSettingTypeGame("Delay SI",Rdb_DelaySi));
 	AddHandler(Game_RspAudioSignal,     new CSettingTypeGame("Audio Signal",Rdb_RspAudioSignal));
 	AddHandler(Game_32Bit,              new CSettingTypeGame("32bit",Rdb_32Bit));
-	AddHandler(Game_FastSP,             new CSettingTypeGame("SP Hack",Rdb_FastSP));
+	AddHandler(Game_FastSP,             new CSettingTypeGame("Fast SP",Rdb_FastSP));
 	AddHandler(Game_CurrentSaveState,   new CSettingTypeTempNumber(0));
 	AddHandler(Game_SyncViaAudio,       new CSettingTypeGame("Sync Audio",Rdb_SyncViaAudio));
 	AddHandler(Game_UseHleGfx,          new CSettingTypeGame("HLE GFX",Rdb_UseHleGfx));
--- a/Interface/Bitmaps/Thumbs.db
+++ b/Interface/Bitmaps/Thumbs.db
--- a/Interface/Icons/Thumbs.db
+++ b/Interface/Icons/Thumbs.db
--- a/Source/Project64/User
+++ b/Source/Project64/User
@ -379,7 +379,7 @@ void CRomBrowser::CreateRomListControl (void)
 {
 	m_hRomList = (HWND)CreateWindowEx( WS_EX_CLIENTEDGE,WC_LISTVIEW,NULL,
 					WS_TABSTOP | WS_VISIBLE | WS_CHILD | LVS_OWNERDRAWFIXED |
-					WS_BORDER | LVS_SINGLESEL | LVS_REPORT,
+					LVS_SINGLESEL | LVS_REPORT,
 					0,0,0,0,m_MainWindow,(HMENU)IDC_ROMLIST,GetModuleHandle(NULL),NULL);	
 	ResetRomBrowserColomuns();
 	LoadRomList();
--- a/Source/Project64/User
+++ b/Source/Project64/User
@ -88,6 +88,13 @@ LRESULT	CSettingConfig::OnInitDialog(UINT /*uMsg*/, WPARAM /*wParam*/, LPARAM /*

 	CConfigSettingSection * SettingsSection;

+	//Set the text for all gui Items
+	SetDlgItemTextW(m_hWnd, IDC_RESET_PAGE, GS(BOTTOM_RESET_PAGE));
+	SetDlgItemTextW(m_hWnd, IDC_RESET_ALL, GS(BOTTOM_RESET_ALL));
+	SetDlgItemTextW(m_hWnd, IDOK, GS(CHEAT_OK));
+	SetDlgItemTextW(m_hWnd, IDCANCEL, GS(CHEAT_CANCEL));
+	SetDlgItemTextW(m_hWnd, IDAPPLY, GS(BOTTOM_APPLY));
+
 	if (m_GameConfig)
 	{
 		if (g_Settings->LoadBool(Setting_RdbEditor))
--- a/Interface/Settings/Settings
+++ b/Interface/Settings/Settings
@ -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);
--- a/Interface/Settings/Settings
+++ b/Interface/Settings/Settings
@ -20,12 +20,18 @@ 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));
+	SetDlgItemTextW(m_hWnd, IDC_VIREFESH_TEXT, GS(ROM_VIREFRESH));
+	SetDlgItemTextW(m_hWnd, IDC_COUNTPERBYTE_TEXT, GS(ROM_COUNTPERBYTE));

-	SetDlgItemTextW(m_hWnd, IDC_SYNC_AUDIO, GS(ROM_SYNC_AUDIO));
+	SetDlgItemTextW(m_hWnd, IDC_ROM_32BIT, GS(ROM_32BIT));
 	SetDlgItemTextW(m_hWnd, IDC_ROM_FIXEDAUDIO, GS(ROM_FIXED_AUDIO));
+	SetDlgItemTextW(m_hWnd, IDC_DELAY_DP, GS(ROM_DELAY_DP));
+	SetDlgItemTextW(m_hWnd, IDC_SYNC_AUDIO, GS(ROM_SYNC_AUDIO));
 	SetDlgItemTextW(m_hWnd, IDC_USE_TLB, GS(ROM_USE_TLB));
 	SetDlgItemTextW(m_hWnd, IDC_DELAY_SI, GS(ROM_DELAY_SI)); 
 	SetDlgItemTextW(m_hWnd,	IDC_AUDIO_SIGNAL, GS(ROM_AUDIO_SIGNAL));
--- a/Interface/Settings/Settings
+++ b/Interface/Settings/Settings
@ -22,13 +22,17 @@ 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_ROM_FASTSP, GS(ROM_FAST_SP));
+
+	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));
-	SetDlgItemTextW(m_hWnd, IDC_SMM_TLB, GS(ADVANCE_SMM_PROTECT));
-	SetDlgItemTextW(m_hWnd, IDC_SMM_PROTECT, GS(ADVANCE_SMM_TLB));
+	SetDlgItemTextW(m_hWnd, IDC_SMM_TLB, GS(ADVANCE_SMM_TLB));
+	SetDlgItemTextW(m_hWnd, IDC_SMM_PROTECT, GS(ADVANCE_SMM_PROTECT));

 	m_SelfModGroup.Attach(GetDlgItem(IDC_SMM_FRAME));

--- a/Interface/Settings/Settings
+++ b/Interface/Settings/Settings
@ -25,7 +25,9 @@ CGeneralOptionsPage::CGeneralOptionsPage(CSettingConfig * SettingsConfig, HWND h
 	SetDlgItemTextW(m_hWnd, IDC_SCREEN_SAVER, GS(OPTION_DISABLE_SS));
 	SetDlgItemTextW(m_hWnd, IDC_BASIC_MODE, GS(OPTION_BASIC_MODE));
 	SetDlgItemTextW(m_hWnd, IDC_MAXROMS_TXT, GS(RB_MAX_ROMS));
+	SetDlgItemTextW(m_hWnd, IDC_ROMSEL_TEXT2, GS(RB_ROMS));
 	SetDlgItemTextW(m_hWnd, IDC_MAXROMDIR_TXT, GS(RB_MAX_DIRS));
+	SetDlgItemTextW(m_hWnd, IDC_ROMSEL_TEXT4, GS(RB_DIRS));

 	AddModCheckBox(GetDlgItem(IDC_AUTOSLEEP),Setting_AutoSleep);
 	AddModCheckBox(GetDlgItem(IDC_LOAD_FULLSCREEN),Setting_AutoFullscreen);
--- a/Source/nragev20/NRagePluginV2.cpp
+++ b/Source/nragev20/NRagePluginV2.cpp
@ -894,6 +894,7 @@ void FillControls(CONTROL Controls[4])
 			{
 			case PAK_MEM:
 				Controls[i].Plugin = PLUGIN_MEMPAK;
+				Controls[i].RawData = false;
 				break;
 			case PAK_RUMBLE:
 				Controls[i].Plugin = PLUGIN_RUMBLE_PAK;
--- a/Source/nragev20/configs/Controller1.cpf
+++ b/Source/nragev20/configs/Controller1.cpf
@ -1,6 +1,6 @@
 Plugged=1
 RawData=1
-PakType=0
+PakType=1
 RealN64Range=1
 RapidFireEnabled=0
 RapidFireRate=3