From e66ef07e0d4acbf4fff53af592df99a18ce54c60 Mon Sep 17 00:00:00 2001
From: MELERIX <melerix@outlook.com>
Date: Wed, 4 Mar 2015 18:38:06 -0300
Subject: [PATCH] More Updates related with Translations.

- Added few Desc where missing.
- Added a Missing String in English main lang file.
- Fixed some typos in the original english strings.
- Removed few Unused Strings.
- Sorted Strings by IDs.
---
 Lang/English.pj.Lang                          | 145 +++++------------
 Lang/Spanish.pj.Lang                          | 151 +++++-------------
 Source/Project64/Multilanguage.h              |  61 ++-----
 .../Multilanguage/Language Class.cpp          | 102 +++++++-----
 4 files changed, 157 insertions(+), 302 deletions(-)

diff --git a/Lang/English.pj.Lang b/Lang/English.pj.Lang
index baa5325b9..a952980c3 100644
--- a/Lang/English.pj.Lang
+++ b/Lang/English.pj.Lang
@@ -5,7 +5,7 @@
 #1  #  "English"		// LANGUAGE ID
 #2  #  "Tooie"			// Author
 #3  #  "2.2"			// Version
-#4  #  "February, 2015"		// Date
+#4  #  "March, 2015"		// Date
 
 //About DLL Dialog
 #5  #  "Current Language"
@@ -48,7 +48,7 @@
 #129#  "Current Save S&tate"
 #130#  "Cheats..."
 #131#  "GS Button"
-#132#  "Resume"
+#132#  "R&esume"
 #133#  "&Soft Reset"
 #134#  "&Hard Reset"
 
@@ -109,45 +109,6 @@
 #229#  "Save Slot - 9"
 #230#  "Save Slot - 10"
 
-// Menu Descriptions
-#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"
-#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"
-#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"
-#267#  "Change emulation from window mode to full screen"
-#268#  "Make window stay on top of all other windows"
-#269#  "Change settings inside the Graphics plugin"
-#270#  "Change settings inside the Audio plugin"
-#271#  "Change settings inside the Controller plugin (i.e. set keys)"
-#272#  "Change settings inside the RSP plugin"
-#273#  "Show the CPU usage of the emulator split over different resources"
-#274#  "View/Change settings for this application"
-#275#  "View Manual for application"
-#276#  "View FAQ for application"
-#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"
-#281#  "Change Application to using this language"
-#282#  "Choose this quick save location"
-#283#  "Play selected game"
-#284#  "Information about selected game"
-#285#  "Edit Settings for selected game"
-#286#  "Edit cheats for selected game"
-
 /*********************************************************************************
 * Rom Browser                                                                    *
 *********************************************************************************/
@@ -171,12 +132,13 @@
 #316#  "Genre"
 #317#  "Players"
 #318#  "Force Feedback"
+#319#  "File Format"
 
 //Select Rom
 #320#  "Select current Rom Directory"
 
 //Messages
-#340#  "Bad ROM? Use GoodN64 & check for updated RDB"
+#340#  "Bad ROM? Use GoodN64 & check for updated INI"
 
 /*********************************************************************************
 * Options                                                                        *
@@ -190,16 +152,16 @@
 #403#  "Options"
 #404#  "Rom Selection"
 #405#  "Advanced"
-#406#  "Rom Settings"
+#406#  "General Settings"
 #407#  "Shell Integration"
-#408#  "Rom Notes"
+#408#  "Notes"
 #409#  "Keyboard Shortcuts"
 #410#  "Status"
 #411#  "Recompiler"
 
 //Plugin Dialog
 #420#  "About"
-#421#  " Reality Signal Processor plugin: "
+#421#  " RSP (reality signal processor) plugin: "
 #422#  " Video (graphics) plugin: "
 #423#  " Audio (sound) plugin: "
 #424#  " Input (controller) plugin: "
@@ -214,15 +176,15 @@
 #443#  " Instant saves: "
 #444#  " Screen Shots: "
 #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"
+#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: "
 #452#  "Select texture pack directory"
 
-//Options Dialog
+//Options (general) Tab
 #460#  "Pause emulation when window is not active?"
 #461#  "On loading a ROM go to full screen"
 #462#  "Hide Advanced Settings"
@@ -346,14 +308,6 @@
 #710#  "Increase Game Speed"
 #711#  "Decrease Game Speed"
 
-// short cut editor
-#1100#  "Reset Short Cuts"
-#1101#  "Are you sure you want to reset the short cuts?\n\nThis action cannot be undone."
-#1102#  "File Menu"
-#1103#  "System Menu"
-#1104#  "Options"
-#1105#  "Save Slots"
-
 /*********************************************************************************
 * ROM Information                                                                *
 *********************************************************************************/
@@ -391,11 +345,6 @@
 #1009#  "Clear"
 #1010#  " Cheat Notes: "
 #1011#  "Add to DB"
-#1022#  "Add Cheat"
-#1023#  "New Cheat"
-#1024#  "<address> <value>"
-#1025#  "Options:"
-#1026#  "<value> <label>"
 
 //Code extension
 #1012#  "Code Extensions"
@@ -410,6 +359,11 @@
 #1019#  "from"
 #1020#  "to"
 #1021#  "&Notes:"
+#1022#  "Add Cheat"
+#1023#  "New Cheat"
+#1024#  "<address> <value>"
+#1025#  "Options:"
+#1026#  "<value> <label>"
 
 //Edit Cheat
 #1027#  "Edit Cheat"
@@ -422,69 +376,46 @@
 #1041#  "Edit"
 #1042#  "Delete"
 
+// short cut editor
+#1100#  "Reset Short Cuts"
+#1101#  "Are you sure you want to reset the short cuts?\n\nThis action cannot be undone."
+#1102#  "File Menu"
+#1103#  "System Menu"
+#1104#  "Options"
+#1105#  "Save Slots"
+
 /*********************************************************************************
 * Messages                                                                       *
 *********************************************************************************/
 #2000#  "*** CPU PAUSED ***"
 #2001#  "CPU Resumed"
-#2002#  "In a permanent loop that cannot be exited.
-Emulation will now stop.
-
-Verify ROM and ROM Settings."
+#2002#  "In a permanent loop that cannot be exited. \nEmulation will now stop. \n\nVerify ROM and ROM Settings."
 #2003#  "Failed to allocate Memory"
-#2004#  "The default or selected video plugin is missing or invalid.
-
-Check that you have at least one compatible plugin file in your plugin folder."
-#2005#  "The default or selected audio plugin is missing or invalid.
-
-Check that you have at least one compatible plugin file in your plugin folder."
-#2006#  "The default or selected RSP plugin is missing or invalid.
-
-Check that you have Project64 properly installed with a valid plugin path."
-#2007#  "The default or selected input plugin is missing or invalid.
-
-Check that you have at least one compatible plugin file in your plugin folder."
+#2004#  "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."
+#2005#  "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."
+#2006#  "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."
+#2007#  "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."
 #2008#  "Failed to load plugin:"
-#2009#  "Failed to load word
-
-Verify ROM and ROM Settings."
+#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"
-#2014#  "Attempt to open zip file failed.
-Missing or corrupt zip file - check path and file.
-
-You may need to restart the application."
+#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.
-
-Verify your ROMs with GoodN64."
+#2017#  "File loaded does not appear to be a valid Nintendo64 ROM. \n\nVerify your ROMs with GoodN64."
 #2018#  "Unknown country"
 #2019#  "Unknown Cic Chip"
 #2020#  "Unknown file format"
-#2021#  "Unknown memory action
-
-Emulation now stoped"
+#2021#  "Unknown memory action\n\nEmulation stop"
 #2022#  "Unhandled R4300i OpCode at"
-#2023#  "Executing from non-mapped space.
-
-Verify ROM and ROM Settings."
-#2024#  "State save does not appear to match the running ROM.
-
-State saves must be saved & loaded between 100% identical ROMs,
-in particular the REGION and VERSION need to be the same.
-Loading this state is likely to cause the game and/or emulator to crash.
-
-Are you sure you want to continue loading?"
+#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?"
 #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.
-If you don't want to lose your place, answer No and make a state save first.
-
-Change 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 make a state save first. \n\nChange plugins and restart game now?"
 #2029#  "Change Plugins"
 #2030#  "Emulation ended"
 #2031#  "Emulation started"
diff --git a/Lang/Spanish.pj.Lang b/Lang/Spanish.pj.Lang
index bab722ead..1ceecfed4 100644
--- a/Lang/Spanish.pj.Lang
+++ b/Lang/Spanish.pj.Lang
@@ -4,7 +4,7 @@
 //About DLL
 #1  #  "Español"		// LANGUAGE ID
 #2  #  "MELERIX"		// Author
-#3  #  "20150301"		// Version
+#3  #  "2.2"			// Version
 #4  #  "March, 2015"		// Date
 
 //About DLL Dialog
@@ -48,7 +48,7 @@
 #129#  "&Partida Guardada Actual"
 #130#  "Trucos..."
 #131#  "Botón GS"
-#132#  "Continuar"
+#132#  "C&ontinuar"
 #133#  "&Reinicio Simple"
 #134#  "&Reinicio Completo"
 
@@ -109,45 +109,6 @@
 #229#  "Ranura de Guardado - 9"
 #230#  "Ranura de Guardado - 10"
 
-// Menu Descriptions
-#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"
-#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"
-#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"
-#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"
-#270#  "Cambiar ajustes dentro del plugin de Audio"
-#271#  "Cambiar ajustes dentro del plugin de Control (es decir definir las teclas)"
-#272#  "Cambiar ajustes dentro del plugin de RSP"
-#273#  "Mostrar uso del CPU del emulador dividido sobre diferentes recursos"
-#274#  "Ver/Cambiar ajustes para esta aplicación"
-#275#  "Ver Manual para la aplicación"
-#276#  "Ver FAQ para la aplicación"
-#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"
-#281#  "Cambiar Aplicación para usar este lenguaje"
-#282#  "Elegir esta ubicación de guardado rápido"
-#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                                                                    *
 *********************************************************************************/
@@ -171,12 +132,13 @@
 #316#  "Genero"
 #317#  "Jugadores"
 #318#  "Retroalimentación de Fuerza"
+#319#  "Formato del Archivo"
 
 //Select Rom
 #320#  "Seleccionar Directorio actual de Roms"
 
 //Messages
-#340#  "ROM Dañado? Usa GoodN64 y verifica por una RDB actualizada"
+#340#  "ROM Dañado? Usa GoodN64 y comprueba por un INI actualizado"
 
 /*********************************************************************************
 * Options                                                                        *
@@ -190,19 +152,19 @@
 #403#  "Opciones"
 #404#  "Selección de Rom"
 #405#  "Avanzado"
-#406#  "Ajustes del Rom"
+#406#  "Ajustes Generales"
 #407#  "Integración de Shell"
-#408#  "Notas del Rom"
+#408#  "Notas"
 #409#  "Atajos de Teclado"
 #410#  "Estado"
 #411#  "Recompilador"
 
 //Plugin Dialog
 #420#  "Acerca de"
-#421#  " plugin de Reality Signal Processor: "
+#421#  " plugin de RSP (reality signal processor): "
 #422#  " plugin de Vídeo (gráficos): "
 #423#  " plugin de Audio (sonido) : "
-#424#  " plugin de Control (mando): "
+#424#  " plugin de Entrada (mando): "
 #425#  "Usar GFX de Alto Nivel?"
 #426#  "Usar Audio de Alto Nivel?"
 #427#  "** Usar Plugin de Sistema **"
@@ -214,11 +176,11 @@
 #443#  " Guardados Instantáneos: "
 #444#  " 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"
-#450#  "Seleccionar Directorio de capturas de pantalla"
+#446#  "Seleccionar directorio de plugins"
+#447#  "Seleccionar directorio de roms"
+#448#  "Seleccionar directorio de guardados automáticos"
+#449#  "Seleccionar directorio de guardados instantáneos"
+#450#  "Seleccionar directorio de capturas de pantalla"
 #451#  " Directorio de Texturas: "
 #452#  "Seleccionar directorio de paquetes de texturas"
 
@@ -247,7 +209,7 @@
 #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 actual rom 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:"
@@ -346,14 +308,6 @@
 #710#  "Incrementar Velocidad del Juego"
 #711#  "Disminuir Velocidad del Juego"
 
-// short cut editor
-#1100#  "Reiniciar Accesos Directos"
-#1101#  "Estás seguro de que quieres reiniciar los accesos directos?\n\nEsta acción no se puede deshacer."
-#1102#  "Menú de Archivo"
-#1103#  "Menú de Sistema"
-#1104#  "Opciones"
-#1105#  "Ranuras de Guardado"
-
 /*********************************************************************************
 * ROM Information                                                                *
 *********************************************************************************/
@@ -391,11 +345,6 @@
 #1009#  "Limpiar"
 #1010#  " Notas del Truco: "
 #1011#  "Añadir a la BD"
-#1022#  "Agregar Truco"
-#1023#  "Nuevo Truco"
-#1024#  "<dirección> <valor>"
-#1025#  "Opciones:"
-#1026#  "<valor> <etiqueta>"
 
 //Code extension
 #1012#  "Extensiones de Código"
@@ -410,6 +359,11 @@
 #1019#  "de"
 #1020#  "para"
 #1021#  "&Notas:"
+#1022#  "Agregar Truco"
+#1023#  "Nuevo Truco"
+#1024#  "<dirección> <valor>"
+#1025#  "Opciones:"
+#1026#  "<valor> <etiqueta>"
 
 //Edit Cheat
 #1027#  "Editar Truco" 
@@ -422,69 +376,46 @@
 #1041# "Editar" 
 #1042# "Borrar"
 
+// short cut editor
+#1100#  "Reiniciar Accesos Directos"
+#1101#  "Estás seguro de que quieres reiniciar los accesos directos?\n\nEsta acción no se puede deshacer."
+#1102#  "Menú de Archivo"
+#1103#  "Menú de Sistema"
+#1104#  "Opciones"
+#1105#  "Ranuras de Guardado"
+
 /*********************************************************************************
 * Messages                                                                       *
 *********************************************************************************/
 #2000#  "*** CPU PAUSADO ***"
 #2001#  "CPU Reanudado"
-#2002#  "En un bucle permanente que no se puede salir.
-La Emulación ahora se detendrá.
-
-Comprueba el ROM y los Ajustes del ROM."
+#2002#  "En un bucle permanente que no se puede salir. \nLa Emulación ahora se detendrá. \n\nComprueba el ROM y los Ajustes del ROM."
 #2003#  "Error al asignar Memoria"
-#2004#  "El plugin predeterminado o seleccionado de vídeo falta o es invalido.
-
-Comprueba que tengas al menos un archivo de plugin compatible en tu carpeta de plugins."
-#2005#  "El plugin predeterminado o seleccionado de audio falta o es invalido.
-
-Comprueba que tengas al menos un archivo de plugin compatible en tu carpeta de plugins."
-#2006#  "El plugin predeterminado o seleccionado de RSP falta o es invalido.
-
-Comprueba que tengas Project64 correctamente instalado con una ruta valida de plugins."
-#2007#  "El plugin predeterminado o seleccionado de entrada falta o es invalido.
-
-Comprueba que tengas al menos un archivo de plugin compatible en tu carpeta de plugins."
+#2004#  "El plugin predeterminado o seleccionado de vídeo falta o es invalido. \n\nNecesitas entrar en Ajustes y seleccionar un plugin de vídeo (gráficos).\nComprueba que tengas al menos un archivo de plugin compatible en tu carpeta de plugins."
+#2005#  "El plugin predeterminado o seleccionado de audio falta o es invalido. \n\nNecesitas entrar en Ajustes y seleccionar un plugin de audio (sonido).\nComprueba que tengas al menos un archivo de plugin compatible en tu carpeta de plugins."
+#2006#  "El plugin predeterminado o seleccionado de RSP falta o es invalido. \n\nNecesitas entrar en Ajustes y seleccionar un plugin RSP.\nComprueba que tengas al menos un archivo de plugin compatible en tu carpeta de plugins."
+#2007#  "El plugin predeterminado o seleccionado de entrada falta o es invalido. \n\nNecesitas entrar en Ajustes y seleccionar un plugin de vídeo (gráficos).\nComprueba que tengas al menos un archivo de plugin compatible en tu carpeta de plugins."
 #2008#  "Error al cargar plugin:"
-#2009#  "Error al cargar palabra
-
-Compruebe el ROM y los Ajustes del ROM."
-#2010#  "Error al abrir el Archivo Guardado"
+#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"
-#2014#  "Intento de abrir el archivo zip fallido.
-Falta o esta corrupto el archivo zip - comprueba la ruta y el archivo.
-
-Es posible que necesites reiniciar la aplicación."
+#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."
-
-Verifica tus ROMs con GoodN64."
+#2017#  "El archivo cargado no parece ser un ROM de Nintendo64 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
-
-Emulación detenida"
+#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.
-
-Verifica el ROM y los Ajustes del ROM."
-#2024#  "La partida guardada no parece coincidir con el ROM en ejecución.
-
-Las Partidas Guardadas deben ser guardadas y cargadas entre ROMs 100% idénticos,
-en particular la REGION y VERSION necesita ser la misma.
-Cargar esta partida es probable que cause al juego y/o al emulador se bloquee.
-
-Estas seguro de que quieres continuar cargando?"
+#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?"
 #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.
-Si no quieres perder tu posición, responde No y guarda una partida primero.
-
-¿Cambiar 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 una partida primero. \n\nCambiar plugins y reiniciar juego ahora?"
 #2029#  "Cambiar Plugins"
 #2030#  "Emulación finalizada"
 #2031#  "Emulación iniciada"
diff --git a/Source/Project64/Multilanguage.h b/Source/Project64/Multilanguage.h
index 1cf33f606..cf019d85c 100644
--- a/Source/Project64/Multilanguage.h
+++ b/Source/Project64/Multilanguage.h
@@ -16,10 +16,13 @@ enum LanguageStringID{
 /*********************************************************************************
 * Meta Information                                                               *
 *********************************************************************************/
+//About DLL
 	LANGUAGE_NAME	       = 1,
 	LANGUAGE_AUTHOR	        =2,
 	LANGUAGE_VERSION        =3,
 	LANGUAGE_DATE	        =4,
+
+//About DLL Dialog
 	INI_CURRENT_LANG        =5,
 	INI_AUTHOR		        =6,
 	INI_VERSION		        =7,
@@ -31,6 +34,7 @@ enum LanguageStringID{
 
 //About INI title
 	INI_TITLE               =20,
+
 /*********************************************************************************
 * Numbers                                                                        *
 *********************************************************************************/
@@ -45,7 +49,10 @@ enum LanguageStringID{
 	NUMBER_8		      =  58,
 	NUMBER_9		      =  59,
 
-// Menu
+/*********************************************************************************
+* Menu                                                                           *
+*********************************************************************************/
+//File Menu
 	MENU_FILE				=100,
 		MENU_OPEN			=101,
 		MENU_ROM_INFO		=102,
@@ -57,6 +64,7 @@ enum LanguageStringID{
 		MENU_RECENT_DIR		=108,
 		MENU_EXIT			=109,
 
+//System Menu
 	MENU_SYSTEM				=120,
 		MENU_RESET			=121,
 		MENU_PAUSE			=122,
@@ -73,6 +81,7 @@ enum LanguageStringID{
 		MENU_RESET_SOFT		=133, //added in build 1.7.50
 		MENU_RESET_HARD		=134, //added in build 1.7.50
 
+//Options Menu
 	MENU_OPTIONS		=	140,
 		MENU_FULL_SCREEN=	141,
 		MENU_ON_TOP		=	142,
@@ -83,10 +92,13 @@ enum LanguageStringID{
 		MENU_SHOW_CPU	=	147,
 		MENU_SETTINGS	=	148,
 
+//Debugger Menu
 	MENU_DEBUGGER		=	160,
 
+//Language Menu
 	MENU_LANGUAGE		=	175,
 
+//Help Menu
 	MENU_HELP			=	180,
 		MENU_ABOUT_INI	=	181,
 		MENU_ABOUT_PJ64	=	182,
@@ -126,45 +138,6 @@ enum LanguageStringID{
 	SAVE_SLOT_9			=	229,
 	SAVE_SLOT_10		=	230,
 
-// Menu Descriptions
-	MENUDES_OPEN		=	250,
-	MENUDES_ROM_INFO	=	251,
-	MENUDES_START		=	252,
-	MENUDES_END			=	253,
-	MENUDES_CHOOSE_ROM	=	254,
-	MENUDES_REFRESH		=	255,
-	MENUDES_EXIT		=	256,
-	MENUDES_RESET		=	257,
-	MENUDES_PAUSE		=	258,
-	MENUDES_BITMAP		=	259,
-	MENUDES_LIMIT_FPS	=	260,
-	MENUDES_SAVE		=	261,
-	MENUDES_SAVE_AS		=	262,
-	MENUDES_RESTORE		=	263,
-	MENUDES_LOAD		=	264,
-	MENUDES_CHEAT		=	265,
-	MENUDES_GS_BUTTON	=	266,
-	MENUDES_FULL_SCREEN	=	267,
-	MENUDES_ON_TOP		=	268,
-	MENUDES_CONFG_GFX	=	269,
-	MENUDES_CONFG_AUDIO	=	270,
-	MENUDES_CONFG_CTRL	=	271,
-	MENUDES_CONFG_RSP	=	272,
-	MENUDES_SHOW_CPU	=	273,
-	MENUDES_SETTINGS	=	274,
-	MENUDES_USER_MAN	=	275,
-	MENUDES_GAME_FAQ	=	276,
-	MENUDES_ABOUT_INI	=	277,
-	MENUDES_ABOUT_PJ64	=	278,
-	MENUDES_RECENT_ROM	=	279,
-	MENUDES_RECENT_DIR	=	280,
-	MENUDES_LANGUAGES	=	281,
-	MENUDES_GAME_SLOT	=	282,
-	MENUDES_PLAY_GAME	=	283,
-	MENUDES_GAME_INFO	=	284,
-	MENUDES_GAME_SETTINGS=	285,
-	MENUDES_GAME_CHEATS	=	286,
-
 /*********************************************************************************
 * Rom Browser                                                                    *
 *********************************************************************************/
@@ -304,7 +277,7 @@ enum LanguageStringID{
 	CORE_RECOMPILER		=	541,
 	CORE_SYNC			=	542,
 
-//Core Styles
+//Self Mod Methods
 	SMCM_NONE		=		560,
 	SMCM_CACHE		=		561,
 	SMCM_PROECTED	=		562,
@@ -354,7 +327,6 @@ enum LanguageStringID{
     ACCEL_CPUSTATE_2        =  689,
     ACCEL_CPUSTATE_3        =  690,
     ACCEL_CPUSTATE_4        =  691,
-	
 
 // Frame Rate Option
     STR_FR_VIS              = 700,
@@ -403,7 +375,7 @@ enum LanguageStringID{
 	CHEAT_ADDCHEAT_NOTES=	1010,
 	CHEAT_ADD_TO_DB 	=	1011,
 
-	//Code extension
+//Code extension
 	CHEAT_CODE_EXT_TITLE	=1012,
 	CHEAT_CODE_EXT_TXT		=1013,
 	CHEAT_OK				=1014,
@@ -422,10 +394,9 @@ enum LanguageStringID{
 	CHEAT_ADDCHEAT_OPT 		=1025,
 	CHEAT_ADDCHEAT_OPTDES 	=1026,
 
-
 //Edit Cheat
 	CHEAT_EDITCHEAT_WINDOW	=1027,
-	CHEAT_EDITCHEAT_UPDATE	=1028,	
+	CHEAT_EDITCHEAT_UPDATE	=1028,
 	CHEAT_CHANGED_MSG   	=1029,
 	CHEAT_CHANGED_TITLE   	=1030,
 
diff --git a/Source/Project64/Multilanguage/Language Class.cpp b/Source/Project64/Multilanguage/Language Class.cpp
index c3346c5d7..d4bf45f2d 100644
--- a/Source/Project64/Multilanguage/Language Class.cpp	
+++ b/Source/Project64/Multilanguage/Language Class.cpp	
@@ -17,6 +17,17 @@ void CLanguage::LoadDefaultStrings (void)
 #define DEF_STR(ID,str) m_DefaultStrings.insert(LANG_STRINGS::value_type(ID,str))
 
 	DEF_STR(EMPTY_STRING,        L""                        );
+
+/*********************************************************************************
+* Meta Information                                                               *
+*********************************************************************************/
+//About DLL
+	DEF_STR(LANGUAGE_NAME,		 L""						);
+	DEF_STR(LANGUAGE_AUTHOR,	 L""						);
+	DEF_STR(LANGUAGE_VERSION,	 L""						);
+	DEF_STR(LANGUAGE_DATE,		 L""						);
+
+//About DLL Dialog
 	DEF_STR(INI_CURRENT_LANG,    L"Current Language"        );
 	DEF_STR(INI_AUTHOR,          L"Author"                  );
 	DEF_STR(INI_VERSION,         L"Version"                 );
@@ -25,12 +36,9 @@ void CLanguage::LoadDefaultStrings (void)
 	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_TITLE,           L"About INI Files"         );
 
-	DEF_STR(LANGUAGE_NAME,		 L""						   );
-	DEF_STR(LANGUAGE_AUTHOR,	 L""						   );
-	DEF_STR(LANGUAGE_VERSION,	 L""						   );
-	DEF_STR(LANGUAGE_DATE,		 L""						   );
+//About INI title
+	DEF_STR(INI_TITLE,           L"About INI Files"         );
 
 /*********************************************************************************
 * Numbers                                                                        *
@@ -46,6 +54,10 @@ void CLanguage::LoadDefaultStrings (void)
 	DEF_STR(NUMBER_8,             L"8"                      );
 	DEF_STR(NUMBER_9,             L"9"                      );
 
+/*********************************************************************************
+* Menu                                                                           *
+*********************************************************************************/
+//File Menu
 	DEF_STR(MENU_FILE,     L"&File"     );
 		DEF_STR(MENU_OPEN,       L"&Open Rom"               );
 		DEF_STR(MENU_ROM_INFO,   L"Rom &Info...."           );
@@ -56,13 +68,11 @@ void CLanguage::LoadDefaultStrings (void)
 		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
 	DEF_STR(MENU_SYSTEM,   L"&System"   );
-		DEF_STR(MENU_RESET,       L"&Reset"                 );
-		DEF_STR(MENU_RESET_SOFT,  L"&Soft Reset"            );
-		DEF_STR(MENU_RESET_HARD,  L"&Hard Reset"            );
 		DEF_STR(MENU_RESET,       L"&Reset"                 );
 		DEF_STR(MENU_PAUSE,       L"&Pause"                 );
-		DEF_STR(MENU_RESUME,      L"R&esume"                );
 		DEF_STR(MENU_BITMAP,      L"Generate Bitmap"        );
 		DEF_STR(MENU_LIMIT_FPS,   L"Limit FPS"              );
 		DEF_STR(MENU_SAVE,        L"&Save"                  );
@@ -70,19 +80,13 @@ void CLanguage::LoadDefaultStrings (void)
 		DEF_STR(MENU_RESTORE,     L"&Restore"               );
 		DEF_STR(MENU_LOAD,        L"Load..."                );
 		DEF_STR(MENU_CURRENT_SAVE,L"Current Save S&tate"    );
-			DEF_STR(MENU_SLOT_DEFAULT,L"Default"            );
-			DEF_STR(MENU_SLOT_1,      L"Slot 1"             );
-			DEF_STR(MENU_SLOT_2,      L"Slot 2"             );
-			DEF_STR(MENU_SLOT_3,      L"Slot 3"             );
-			DEF_STR(MENU_SLOT_4,      L"Slot 4"             );
-			DEF_STR(MENU_SLOT_5,      L"Slot 5"             );
-			DEF_STR(MENU_SLOT_6,      L"Slot 6"             );
-			DEF_STR(MENU_SLOT_7,      L"Slot 7"             );
-			DEF_STR(MENU_SLOT_8,      L"Slot 8"             );
-			DEF_STR(MENU_SLOT_9,      L"Slot 9"             );
-			DEF_STR(MENU_SLOT_10,     L"Slot 10"            );
 		DEF_STR(MENU_CHEAT,       L"Cheats..."              );
 		DEF_STR(MENU_GS_BUTTON,   L"GS Button"              );
+		DEF_STR(MENU_RESUME,      L"R&esume"                );
+		DEF_STR(MENU_RESET_SOFT,  L"&Soft Reset"            );
+		DEF_STR(MENU_RESET_HARD,  L"&Hard Reset"            );
+
+//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"                );
@@ -92,12 +96,39 @@ void CLanguage::LoadDefaultStrings (void)
 		DEF_STR(MENU_CONFG_RSP,   L"Configure RSP Plugin..."        );
 		DEF_STR(MENU_SHOW_CPU,    L"Show CPU usage %"               );
 		DEF_STR(MENU_SETTINGS,    L"&Settings..."                   );
+
+//Debugger Menu
 	DEF_STR(MENU_DEBUGGER, L"&Debugger" );
+
+//Language Menu
 	DEF_STR(MENU_LANGUAGE, L"&Language" );
+
+//Help Menu
 	DEF_STR(MENU_HELP,     L"&Help"     );
 		DEF_STR(MENU_ABOUT_INI,   L"About &INI Files"   );
 		DEF_STR(MENU_ABOUT_PJ64,  L"&About Project 64"  );
+		DEF_STR(MENU_FORUM,	      L"Support &Forum"     );
+		DEF_STR(MENU_HOMEPAGE,	  L"&Homepage"          );
 
+//Current Save Slot menu
+	DEF_STR(MENU_SLOT_DEFAULT,    L"Default"            );
+	DEF_STR(MENU_SLOT_1,      L"Slot 1"             );
+	DEF_STR(MENU_SLOT_2,      L"Slot 2"             );
+	DEF_STR(MENU_SLOT_3,      L"Slot 3"             );
+	DEF_STR(MENU_SLOT_4,      L"Slot 4"             );
+	DEF_STR(MENU_SLOT_5,      L"Slot 5"             );
+	DEF_STR(MENU_SLOT_6,      L"Slot 6"             );
+	DEF_STR(MENU_SLOT_7,      L"Slot 7"             );
+	DEF_STR(MENU_SLOT_8,      L"Slot 8"             );
+	DEF_STR(MENU_SLOT_9,      L"Slot 9"             );
+	DEF_STR(MENU_SLOT_10,     L"Slot 10"            );
+
+//Pop up Menu
+	DEF_STR(POPUP_PLAY,      L"Play Game"  );
+	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"  );
 
 //Alternate Name to save Slot
 	DEF_STR(SAVE_SLOT_DEFAULT,L"Save Slot - Default"       );
@@ -111,13 +142,6 @@ void CLanguage::LoadDefaultStrings (void)
 	DEF_STR(SAVE_SLOT_8,      L"Save Slot - 8"             );
 	DEF_STR(SAVE_SLOT_9,      L"Save Slot - 9"             );
 	DEF_STR(SAVE_SLOT_10,     L"Save Slot - 10"            );
-		
-//Pop up Menu
-	DEF_STR(POPUP_PLAY,      L"Play Game"  );
-	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"  );
 
 /*********************************************************************************
 * Rom Browser                                                                    *
@@ -163,15 +187,15 @@ void CLanguage::LoadDefaultStrings (void)
 	DEF_STR(TAB_ROMSELECTION,L"Rom Selection");
 	DEF_STR(TAB_ADVANCED,    L"Advanced");
 	DEF_STR(TAB_ROMSETTINGS, L"General Settings");
-	DEF_STR(TAB_ROMNOTES,    L"Notes");
 	DEF_STR(TAB_SHELLINTERGATION,L"Shell Integration");
+	DEF_STR(TAB_ROMNOTES,    L"Notes");
 	DEF_STR(TAB_SHORTCUTS,    L"Keyboard Shortcuts");
 	DEF_STR(TAB_ROMSTATUS,    L"Status");
 	DEF_STR(TAB_RECOMPILER,   L"Recompiler");
 
 //Plugin Dialog
 	DEF_STR(PLUG_ABOUT,    L"About");
-	DEF_STR(PLUG_RSP,      L" 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: ");
@@ -355,11 +379,6 @@ void CLanguage::LoadDefaultStrings (void)
 	DEF_STR(CHEAT_ADDCHEAT_CLEAR,  L"Clear");
 	DEF_STR(CHEAT_ADDCHEAT_NOTES,  L" Cheat Notes: ");
 	DEF_STR(CHEAT_ADD_TO_DB,       L"Add to DB");
-	DEF_STR(CHEAT_ADDCHEAT_ADD,    L"Add Cheat");
-	DEF_STR(CHEAT_ADDCHEAT_NEW,    L"New Cheat");
-	DEF_STR(CHEAT_ADDCHEAT_CODEDES,L"<address> <value>");
-	DEF_STR(CHEAT_ADDCHEAT_OPT,    L"Options:");
-	DEF_STR(CHEAT_ADDCHEAT_OPTDES, L"<value> <label>");
 
 //Code extension
 	DEF_STR(CHEAT_CODE_EXT_TITLE,  L"Code Extensions");
@@ -374,6 +393,11 @@ void CLanguage::LoadDefaultStrings (void)
 	DEF_STR(CHEAT_FROM,            L"from");
 	DEF_STR(CHEAT_TO,              L"to");
 	DEF_STR(CHEAT_NOTES,           L"&Notes:");
+	DEF_STR(CHEAT_ADDCHEAT_ADD,    L"Add Cheat");
+	DEF_STR(CHEAT_ADDCHEAT_NEW,    L"New Cheat");
+	DEF_STR(CHEAT_ADDCHEAT_CODEDES,L"<address> <value>");
+	DEF_STR(CHEAT_ADDCHEAT_OPT,    L"Options:");
+	DEF_STR(CHEAT_ADDCHEAT_OPTDES, L"<value> <label>");
 
 //Edit Cheat
 	DEF_STR(CHEAT_EDITCHEAT_WINDOW,L"Edit Cheat");
@@ -401,10 +425,10 @@ void CLanguage::LoadDefaultStrings (void)
 	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_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 an RSP 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 a video (graphics) plugin.\nCheck that you have at least one compatible plugin file in your plugin folder.");
+	DEF_STR(MSG_FAIL_INIT_GFX,      L"The default or selected video plugin is missing or invalid. \n\nYou need to go into Settings and select a video (graphics) plugin.\nCheck that you have at least one compatible plugin file in your plugin folder.");
+	DEF_STR(MSG_FAIL_INIT_AUDIO,    L"The default or selected audio plugin is missing or invalid. \n\nYou need to go into Settings and select a audio (sound) plugin.\nCheck that you have at least one compatible plugin file in your plugin folder.");
+	DEF_STR(MSG_FAIL_INIT_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");
@@ -447,8 +471,6 @@ void CLanguage::LoadDefaultStrings (void)
 	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(MENU_FORUM,	            L"Support &Forum");
-	DEF_STR(MENU_HOMEPAGE,	        L"&Homepage");
 	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");