diff --git a/po/wxvbam/es.po b/po/wxvbam/es.po
index 16919c8c..e2010678 100644
--- a/po/wxvbam/es.po
+++ b/po/wxvbam/es.po
@@ -8,6 +8,7 @@
 # Ein Striker <ein.striker@gmail.com>, 2017
 # javidg96, 2015
 # jorge perez <theghostxxaz@gmail.com>, 2021
+# Jose Castillo <josecastillo.prz85@gmail.com>, 2021
 # Marco123V <MarcoVillalejos@hotmail.com>, 2015
 # Marco Yurazeck <luthias@gmail.com>, 2020
 # MELERIX, 2015
@@ -19,8 +20,8 @@ msgstr ""
 "Project-Id-Version: VBA-M\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-12-05 11:34+0000\n"
-"PO-Revision-Date: 2021-01-02 03:02+0000\n"
-"Last-Translator: jorge perez <theghostxxaz@gmail.com>\n"
+"PO-Revision-Date: 2021-02-01 11:36+0000\n"
+"Last-Translator: Jose Castillo <josecastillo.prz85@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/bgk/vba-m/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,7 +55,7 @@ msgstr ""
 
 #: wxvbam.cpp:526
 msgid "Set a configuration file"
-msgstr ""
+msgstr "Asignar un archivo de configuración"
 
 #: wxvbam.cpp:530
 msgid "Delete shared link state first, if it exists"
@@ -66,7 +67,7 @@ msgstr ""
 
 #: wxvbam.cpp:540
 msgid "ROM file"
-msgstr ""
+msgstr "Archivo ROM"
 
 #: wxvbam.cpp:542
 msgid "<config>=<value>"
@@ -116,7 +117,7 @@ msgstr ""
 
 #: wxvbam.cpp:660
 msgid "Configuration file not found."
-msgstr ""
+msgstr "Archivo de configuración no encontrado."
 
 #: wxvbam.cpp:693
 msgid "Bad configuration option or multiple ROM files given:\n"
@@ -124,11 +125,11 @@ msgstr ""
 
 #: guiinit.cpp:81
 msgid "Start!"
-msgstr ""
+msgstr "¡Comenzar!"
 
 #: guiinit.cpp:100 xrc/NetLink.xrc:99
 msgid "Connect"
-msgstr ""
+msgstr "Conectar"
 
 #: guiinit.cpp:117
 msgid "You must enter a valid host name"
@@ -136,11 +137,11 @@ msgstr ""
 
 #: guiinit.cpp:118
 msgid "Host name invalid"
-msgstr ""
+msgstr "La dirección IP del servidor es: %s"
 
 #: guiinit.cpp:136
 msgid "Waiting for clients..."
-msgstr ""
+msgstr "Esperando clientes..."
 
 #: guiinit.cpp:137
 #, c-format
@@ -149,12 +150,12 @@ msgstr ""
 
 #: guiinit.cpp:139
 msgid "Waiting for connection..."
-msgstr ""
+msgstr "Esperando conexión..."
 
 #: guiinit.cpp:140
 #, c-format
 msgid "Connecting to %s\n"
-msgstr ""
+msgstr "Conectando a %s \n"
 
 #: guiinit.cpp:173
 msgid ""
@@ -164,7 +165,7 @@ msgstr ""
 
 #: guiinit.cpp:240 guiinit.cpp:293
 msgid "Select cheat file"
-msgstr ""
+msgstr "Seleccionar archivo de trucos"
 
 #: guiinit.cpp:241
 msgid "VBA cheat lists (*.clt)|*.clt|CHT cheat lists (*.cht)|*.cht"
@@ -172,7 +173,7 @@ msgstr ""
 
 #: guiinit.cpp:260 panel.cpp:437
 msgid "Loaded cheats"
-msgstr ""
+msgstr "Trucos cargados"
 
 #: guiinit.cpp:294
 msgid "VBA cheat lists (*.clt)|*.clt"
@@ -180,15 +181,15 @@ msgstr ""
 
 #: guiinit.cpp:312
 msgid "Saved cheats"
-msgstr ""
+msgstr "Trucos guardados"
 
 #: guiinit.cpp:343 guiinit.cpp:362
 msgid "Restore old values?"
-msgstr ""
+msgstr "¿Restaurar valores anteriores?"
 
 #: guiinit.cpp:344 guiinit.cpp:363
 msgid "Removing cheats"
-msgstr ""
+msgstr "Eliminando trucos"
 
 #: guiinit.cpp:754 xrc/JoyPanel.xrc:364
 msgid "GameShark"
@@ -221,23 +222,23 @@ msgstr ""
 #: guiinit.cpp:866
 #, c-format
 msgid "Search produced %d results.  Please refine better"
-msgstr ""
+msgstr "La búsqueda encontró %d resultados. Por favor especifique más"
 
 #: guiinit.cpp:878
 msgid "Search produced no results"
-msgstr ""
+msgstr "La búsqueda no encontró resultados"
 
 #: guiinit.cpp:1041
 msgid "8-bit "
-msgstr ""
+msgstr "8-bit"
 
 #: guiinit.cpp:1045
 msgid "16-bit "
-msgstr ""
+msgstr "16-bit"
 
 #: guiinit.cpp:1049
 msgid "32-bit "
-msgstr ""
+msgstr "32-bit"
 
 #: guiinit.cpp:1055
 msgid "signed decimal"
@@ -258,11 +259,11 @@ msgstr ""
 
 #: guiinit.cpp:1553
 msgid "Default device"
-msgstr ""
+msgstr "Dispositivo por defecto"
 
 #: guiinit.cpp:1727
 msgid "Desktop mode"
-msgstr ""
+msgstr "Modo escritorio"
 
 #: guiinit.cpp:1734
 #, c-format
@@ -274,16 +275,16 @@ msgstr ""
 #: xrc/GameBoyAdvanceConfig.xrc:32 xrc/GameBoyAdvanceConfig.xrc:204
 #: xrc/SoundConfig.xrc:219 xrc/SoundConfig.xrc:309
 msgid "None"
-msgstr ""
+msgstr "Ninguno"
 
 #: guiinit.cpp:1888
 #, c-format
 msgid "No usable rpi plugins found in %s"
-msgstr ""
+msgstr "No se puede usar el complemento rpi encontrado en %s"
 
 #: guiinit.cpp:1908 xrc/DisplayConfig.xrc:107
 msgid "Plugin"
-msgstr ""
+msgstr "Complemento"
 
 #: guiinit.cpp:1936
 msgid "Please select a plugin or a different filter"
@@ -291,27 +292,27 @@ msgstr ""
 
 #: guiinit.cpp:1937
 msgid "Plugin selection error"
-msgstr ""
+msgstr "Error de selección de complemento"
 
 #: guiinit.cpp:2150
 msgid "This will clear all user-defined accelerators.  Are you sure?"
-msgstr ""
+msgstr "Esto borrará todos los aceleradores definidos por el usuario. ¿Estás seguro?"
 
 #: guiinit.cpp:2150
 msgid "Confirm"
-msgstr ""
+msgstr "Confirmar"
 
 #: guiinit.cpp:2740
 msgid "Main icon not found"
-msgstr ""
+msgstr "Icono principal no encontrado"
 
 #: guiinit.cpp:2750
 msgid "Browse"
-msgstr ""
+msgstr "Navegador"
 
 #: guiinit.cpp:2764
 msgid "Main display panel not found"
-msgstr ""
+msgstr "Panel de visualización principal no encontrado"
 
 #: guiinit.cpp:2929
 #, c-format
@@ -326,35 +327,35 @@ msgstr ""
 #: guiinit.cpp:3081
 #, c-format
 msgid "Invalid menu item %s; removing"
-msgstr ""
+msgstr "Elemento de menú %s no válido; eliminando"
 
 #: guiinit.cpp:3289
 msgid "Code"
-msgstr ""
+msgstr "Código"
 
 #: guiinit.cpp:3298
 msgid "Description"
-msgstr ""
+msgstr "Descripción"
 
 #: guiinit.cpp:3372 xrc/CheatAdd.xrc:31
 msgid "Address"
-msgstr ""
+msgstr "Dirección"
 
 #: guiinit.cpp:3373
 msgid "Old Value"
-msgstr ""
+msgstr "Valor anterior"
 
 #: guiinit.cpp:3374
 msgid "New Value"
-msgstr ""
+msgstr "Nuevo valor"
 
 #: guiinit.cpp:3895
 msgid "Menu commands"
-msgstr ""
+msgstr "Menú de comandos"
 
 #: guiinit.cpp:3918
 msgid "Other commands"
-msgstr ""
+msgstr "Otros comandos"
 
 #: guiinit.cpp:4029
 msgid "JoyBus host invalid; disabling"
@@ -362,13 +363,13 @@ msgstr ""
 
 #: viewers.cpp:560
 msgid "Text files (*.txt;*.log)|*.txt;*.log|"
-msgstr ""
+msgstr "Archivos de texto (*.txt;*.log)|*.txt;*log|"
 
 #: viewers.cpp:562 viewers.cpp:772 gfxviewers.cpp:1600 gfxviewers.cpp:1742
 #: cmdevents.cpp:1158 cmdevents.cpp:1236 cmdevents.cpp:1306 cmdevents.cpp:1333
 #: viewsupt.cpp:1181
 msgid "Select output file"
-msgstr ""
+msgstr "Seleccionar archivo de salida"
 
 #: viewers.cpp:698 viewers.cpp:770
 msgid "Memory dumps (*.dmp;*.bin)|*.dmp;*.bin|"
@@ -444,7 +445,7 @@ msgstr ""
 
 #: gfxviewers.cpp:1141
 msgid "Select output file and type"
-msgstr ""
+msgstr "Seleccionar archivo de salida y tipo"
 
 #: gfxviewers.cpp:1142
 msgid ""
@@ -467,7 +468,7 @@ msgstr ""
 
 #: cmdevents.cpp:117
 msgid "Open ROM file"
-msgstr ""
+msgstr "Abrir archivo ROM"
 
 #: cmdevents.cpp:134
 msgid ""
@@ -477,7 +478,7 @@ msgstr ""
 
 #: cmdevents.cpp:141
 msgid "Open GB ROM file"
-msgstr ""
+msgstr "Abrir archivo GB ROM"
 
 #: cmdevents.cpp:158
 msgid ""
@@ -487,75 +488,75 @@ msgstr ""
 
 #: cmdevents.cpp:165
 msgid "Open GBC ROM file"
-msgstr ""
+msgstr "Abrir archivo GBC ROM"
 
 #: cmdevents.cpp:584 cmdevents.cpp:700 cmdevents.cpp:739 cmdevents.cpp:812
 msgid "Unknown"
-msgstr ""
+msgstr "Desconocido"
 
 #: cmdevents.cpp:592
 msgid "ROM"
-msgstr ""
+msgstr "ROM"
 
 #: cmdevents.cpp:596
 msgid "ROM+MBC1"
-msgstr ""
+msgstr "ROM+MBC1"
 
 #: cmdevents.cpp:600
 msgid "ROM+MBC1+RAM"
-msgstr ""
+msgstr "ROM+MBC1+RAM"
 
 #: cmdevents.cpp:604
 msgid "ROM+MBC1+RAM+BATT"
-msgstr ""
+msgstr "ROM+MBC1+RAM+BATT"
 
 #: cmdevents.cpp:608
 msgid "ROM+MBC2"
-msgstr ""
+msgstr "ROM+MBC2"
 
 #: cmdevents.cpp:612
 msgid "ROM+MBC2+BATT"
-msgstr ""
+msgstr "ROM+MBC2+BATT"
 
 #: cmdevents.cpp:616
 msgid "ROM+MMM01"
-msgstr ""
+msgstr "ROM+MMM01"
 
 #: cmdevents.cpp:620
 msgid "ROM+MMM01+RAM"
-msgstr ""
+msgstr "ROM+MMM01+RAM"
 
 #: cmdevents.cpp:624
 msgid "ROM+MMM01+RAM+BATT"
-msgstr ""
+msgstr "ROM+MMM01+RAM+BATT"
 
 #: cmdevents.cpp:628
 msgid "ROM+MBC3+TIMER+BATT"
-msgstr ""
+msgstr "ROM+MBC3+TIMER+BATT"
 
 #: cmdevents.cpp:632
 msgid "ROM+MBC3+TIMER+RAM+BATT"
-msgstr ""
+msgstr "ROM+MBC3+TIMER+RAM+BATT"
 
 #: cmdevents.cpp:636
 msgid "ROM+MBC3"
-msgstr ""
+msgstr "ROM+MBC3"
 
 #: cmdevents.cpp:640
 msgid "ROM+MBC3+RAM"
-msgstr ""
+msgstr "ROM+MBC3+RAM"
 
 #: cmdevents.cpp:644
 msgid "ROM+MBC3+RAM+BATT"
-msgstr ""
+msgstr "ROM+MBC3+RAM+BATT"
 
 #: cmdevents.cpp:648
 msgid "ROM+MBC5"
-msgstr ""
+msgstr "ROM+MBC5"
 
 #: cmdevents.cpp:652
 msgid "ROM+MBC5+RAM"
-msgstr ""
+msgstr "ROM+MBC5+RAM"
 
 #: cmdevents.cpp:656
 msgid "ROM+MBC5+RAM+BATT"
@@ -631,7 +632,7 @@ msgstr ""
 #: cmdevents.cpp:909
 #, c-format
 msgid "Error loading battery %s"
-msgstr ""
+msgstr "Error al cargar la batería %s"
 
 #: cmdevents.cpp:918
 msgid "Select code file"
@@ -654,7 +655,7 @@ msgstr ""
 #: cmdevents.cpp:945
 #, c-format
 msgid "Cannot open file %s"
-msgstr ""
+msgstr "no se puede abrir el archivo %s"
 
 #: cmdevents.cpp:955
 #, c-format
@@ -3356,15 +3357,15 @@ msgstr ""
 
 #: xrc/MapViewer.xrc:16
 msgid "Frame 0"
-msgstr ""
+msgstr "Fotograma 0"
 
 #: xrc/MapViewer.xrc:22
 msgid "Frame 1"
-msgstr ""
+msgstr "Fotograma 1"
 
 #: xrc/MapViewer.xrc:25
 msgid "Frame"
-msgstr ""
+msgstr "Fotograma"
 
 #: xrc/MapViewer.xrc:35
 msgid "BG0"
@@ -3392,15 +3393,15 @@ msgstr ""
 
 #: xrc/MapViewer.xrc:100 xrc/MemSelRegion.xrc:22 xrc/OAMViewer.xrc:77
 msgid "Size:"
-msgstr ""
+msgstr "Tamaño:"
 
 #: xrc/MapViewer.xrc:108 xrc/OAMViewer.xrc:45
 msgid "Colors:"
-msgstr ""
+msgstr "Colores:"
 
 #: xrc/MapViewer.xrc:124
 msgid "Mosaic:"
-msgstr ""
+msgstr "Mosaico:"
 
 #: xrc/MapViewer.xrc:132
 msgid "Overflow:"
@@ -3424,11 +3425,11 @@ msgstr ""
 
 #: xrc/MemViewer.xrc:83
 msgid "Current address:"
-msgstr ""
+msgstr "Dirección actual:"
 
 #: xrc/MemViewer.xrc:108
 msgid "&Load..."
-msgstr ""
+msgstr "&Carga..."
 
 #: xrc/NetLink.xrc:4
 msgid "Start Network Link"
@@ -3436,15 +3437,15 @@ msgstr ""
 
 #: xrc/NetLink.xrc:11
 msgid "Server"
-msgstr ""
+msgstr "Servidor"
 
 #: xrc/NetLink.xrc:19
 msgid "Client"
-msgstr ""
+msgstr "Cliente"
 
 #: xrc/NetLink.xrc:32
 msgid "Players:"
-msgstr ""
+msgstr "Jugadores:"
 
 #: xrc/NetLink.xrc:41
 msgid "2"
@@ -3460,11 +3461,11 @@ msgstr ""
 
 #: xrc/NetLink.xrc:67
 msgid "Server:"
-msgstr ""
+msgstr "Servidor:"
 
 #: xrc/NetLink.xrc:81
 msgid "Port:"
-msgstr ""
+msgstr "Puerto:"
 
 #: xrc/OAMViewer.xrc:4
 msgid "OAM Viewer"
@@ -3484,23 +3485,23 @@ msgstr ""
 
 #: xrc/SoundConfig.xrc:4
 msgid "Sound Settings"
-msgstr ""
+msgstr "Ajuste de sonidos"
 
 #: xrc/SoundConfig.xrc:16
 msgid "Volume :"
-msgstr ""
+msgstr "Volumen:"
 
 #: xrc/SoundConfig.xrc:34
 msgid "Mute"
-msgstr ""
+msgstr "Silencio"
 
 #: xrc/SoundConfig.xrc:54 xrc/SoundConfig.xrc:320
 msgid "Maximum"
-msgstr ""
+msgstr "Máximo"
 
 #: xrc/SoundConfig.xrc:71
 msgid "Sample rate :"
-msgstr ""
+msgstr "Tasa de muestreo:"
 
 #: xrc/SoundConfig.xrc:77
 msgid "48 KHz"
@@ -3540,7 +3541,7 @@ msgstr ""
 
 #: xrc/SoundConfig.xrc:146
 msgid "Device"
-msgstr ""
+msgstr "Dispositivo"
 
 #: xrc/SoundConfig.xrc:154
 msgid "Enable stereo upmixing"
@@ -3556,7 +3557,7 @@ msgstr ""
 
 #: xrc/SoundConfig.xrc:198
 msgid "Advanced"
-msgstr ""
+msgstr "Avanzado"
 
 #: xrc/SoundConfig.xrc:230
 msgid "Lots"
@@ -3564,23 +3565,23 @@ msgstr ""
 
 #: xrc/SoundConfig.xrc:239
 msgid "Echo"
-msgstr ""
+msgstr "Repetir"
 
 #: xrc/SoundConfig.xrc:247
 msgid "Stereo"
-msgstr ""
+msgstr "Estéreo"
 
 #: xrc/SoundConfig.xrc:258
 msgid "Center"
-msgstr ""
+msgstr "Centro"
 
 #: xrc/SoundConfig.xrc:269
 msgid "Left/Right"
-msgstr ""
+msgstr "Izquierda/Derecha"
 
 #: xrc/SoundConfig.xrc:298
 msgid "Sound filtering"
-msgstr ""
+msgstr "Filtrado de sonido"
 
 #: xrc/TileViewer.xrc:4
 msgid "Tile Viewer"
@@ -3596,31 +3597,31 @@ msgstr ""
 
 #: xrc/TileViewer.xrc:24
 msgid "Colors"
-msgstr ""
+msgstr "Colores"
 
 #: xrc/TileViewer.xrc:34
 msgid "0x600&0000"
-msgstr ""
+msgstr "0x600&0000"
 
 #: xrc/TileViewer.xrc:40
 msgid "0x600&4000"
-msgstr ""
+msgstr "0x600&4000"
 
 #: xrc/TileViewer.xrc:45
 msgid "0x600&8000"
-msgstr ""
+msgstr "0x600&8000"
 
 #: xrc/TileViewer.xrc:50
 msgid "0x600&C000"
-msgstr ""
+msgstr "0x600&C000"
 
 #: xrc/TileViewer.xrc:55
 msgid "0x60&10000"
-msgstr ""
+msgstr "0x60&10000"
 
 #: xrc/SpeedupConfig.xrc:4
 msgid "SpeedUp / Turbo Settings"
-msgstr ""
+msgstr "Aceleración / Ajustes del turbo"
 
 #: xrc/SpeedupConfig.xrc:9
 msgid "Speedup Throttle"
@@ -3628,12 +3629,12 @@ msgstr ""
 
 #: xrc/SpeedupConfig.xrc:50
 msgid "Frame skip"
-msgstr ""
+msgstr "Saltar fotograma"
 
 #: xrc/UIConfig.xrc:4
 msgid "User Interface Settings"
-msgstr ""
+msgstr "Ajustes de la interfaz de usuario"
 
 #: xrc/UIConfig.xrc:9
 msgid "Hide Menu Bar"
-msgstr ""
+msgstr "Ocultar barra de menú"
diff --git a/po/wxvbam/es_ES.po b/po/wxvbam/es_ES.po
index 2594daad..6bfb83e1 100644
--- a/po/wxvbam/es_ES.po
+++ b/po/wxvbam/es_ES.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Andreu van Walré, 2021
 # Daniel Carrasco <danielmadrid19@gmail.com>, 2016
 # Sergio . <serchoyt@gmail.com>, 2018
 msgid ""
@@ -10,8 +11,8 @@ msgstr ""
 "Project-Id-Version: VBA-M\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-12-05 11:34+0000\n"
-"PO-Revision-Date: 2020-12-17 05:28+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2021-01-14 15:04+0000\n"
+"Last-Translator: Andreu van Walré\n"
 "Language-Team: Spanish (Spain) (http://www.transifex.com/bgk/vba-m/language/es_ES/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,7 +42,7 @@ msgstr ""
 
 #: wxvbam.cpp:523
 msgid "Start in full-screen mode"
-msgstr ""
+msgstr "Iniciar en modo pantalla completa"
 
 #: wxvbam.cpp:526
 msgid "Set a configuration file"
diff --git a/po/wxvbam/ru.po b/po/wxvbam/ru.po
index b570e5e7..a52bed16 100644
--- a/po/wxvbam/ru.po
+++ b/po/wxvbam/ru.po
@@ -13,13 +13,14 @@
 # teorex <teorex3@gmail.com>, 2020
 # Алексей Гаврилов <flexxx_seva@mail.ru>, 2018
 # Михаил Михаил <sined116@gmail.com>, 2016
+# Радмир Амиров <darkmantro79@gmail.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: VBA-M\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-12-05 11:34+0000\n"
-"PO-Revision-Date: 2020-12-17 05:28+0000\n"
-"Last-Translator: Transifex Bot <>\n"
+"PO-Revision-Date: 2021-01-19 11:18+0000\n"
+"Last-Translator: Радмир Амиров <darkmantro79@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/bgk/vba-m/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -813,7 +814,7 @@ msgstr "Использовать межкадровое смешивание #%d
 
 #: cmdevents.cpp:2720 panel.cpp:193 panel.cpp:296
 msgid "Could not initialize the sound driver!"
-msgstr ""
+msgstr "Не удалось инициализировать звуковые драйвера!"
 
 #: cmdevents.cpp:2824
 msgid "Nintendo GameBoy (+Color+Advance) emulator."
@@ -1061,7 +1062,7 @@ msgstr ""
 
 #: panel.cpp:2322
 msgid "No VSYNC available on this platform"
-msgstr ""
+msgstr "VSYNC не доступна на данной платформе"
 
 #: panel.cpp:2418
 msgid "memory allocation error"
diff --git a/po/wxvbam/zh_CN.po b/po/wxvbam/zh_CN.po
index f213da79..08df8c20 100644
--- a/po/wxvbam/zh_CN.po
+++ b/po/wxvbam/zh_CN.po
@@ -10,13 +10,14 @@
 # 后海游泳大老爷 <my.yuicn@gmail.com>, 2015
 # 天绝星 <c.cejhb@gmail.com>, 2017,2019-2020
 # 沈舒超 <ssc19940105@gmail.com>, 2015
+# 王晨旭 <wcxu21@126.com>, 2021
 msgid ""
 msgstr ""
 "Project-Id-Version: VBA-M\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-12-05 11:34+0000\n"
-"PO-Revision-Date: 2020-12-18 05:58+0000\n"
-"Last-Translator: 天绝星 <c.cejhb@gmail.com>\n"
+"PO-Revision-Date: 2021-01-31 09:23+0000\n"
+"Last-Translator: 王晨旭 <wcxu21@126.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/bgk/vba-m/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -2051,7 +2052,7 @@ msgstr "Bank:"
 #: xrc/GBOAMViewer.xrc:149 xrc/GBTileViewer.xrc:152 xrc/MemViewer.xrc:115
 #: xrc/OAMViewer.xrc:162 xrc/TileViewer.xrc:168
 msgid "&Save..."
-msgstr "保存...(&S)"
+msgstr "保存(&S)..."
 
 #: xrc/GBPaletteViewer.xrc:8 xrc/PaletteViewer.xrc:9
 msgid "Click on a color for more information"
@@ -2059,7 +2060,7 @@ msgstr "单击一个颜色以获取更多信息"
 
 #: xrc/GBPaletteViewer.xrc:27 xrc/PaletteViewer.xrc:105
 msgid "Save &BG..."
-msgstr "保存 BG...(&B)"
+msgstr "保存 BG(&B)..."
 
 #: xrc/GBPaletteViewer.xrc:38 xrc/PaletteViewer.xrc:33
 msgid "Sprite"
@@ -2067,7 +2068,7 @@ msgstr "精灵块"
 
 #: xrc/GBPaletteViewer.xrc:48 xrc/PaletteViewer.xrc:111
 msgid "Save &Sprite..."
-msgstr "保存精灵块...(&S)"
+msgstr "保存精灵块(&S)..."
 
 #: xrc/GBPaletteViewer.xrc:67
 msgid "Index:"
@@ -2283,7 +2284,7 @@ msgstr "模拟系统(&S) :"
 
 #: xrc/GameBoyConfig.xrc:30
 msgid "Game Boy Color"
-msgstr "Game Boy Color"
+msgstr "Game Boy 颜色"
 
 #: xrc/GameBoyConfig.xrc:31
 msgid "Super Game Boy"
@@ -2667,11 +2668,11 @@ msgstr "打开..."
 
 #: xrc/MainMenu.xrc:10
 msgid "Open &GB..."
-msgstr "打开 GB...(&G)"
+msgstr "打开 GB(&G)..."
 
 #: xrc/MainMenu.xrc:13
 msgid "Open GB&C..."
-msgstr "打开 GBC...(&C)"
+msgstr "打开 GBC(&C)..."
 
 #: xrc/MainMenu.xrc:16
 msgid "Open rece&nt"
@@ -2695,19 +2696,19 @@ msgstr "e-Reader(&E)"
 
 #: xrc/MainMenu.xrc:32
 msgid "&Reset Loading Dot Code"
-msgstr "重置载入的点代码...(&R)"
+msgstr "重置载入的点代码(&R)"
 
 #: xrc/MainMenu.xrc:35
 msgid "&Load Dot Code..."
-msgstr "载入点代码...(&L)"
+msgstr "载入点代码(&L)..."
 
 #: xrc/MainMenu.xrc:38
 msgid "&Reset Saving Dot Code"
-msgstr "重置保存的点代码...(&R)"
+msgstr "重置保存的点代码(&R)..."
 
 #: xrc/MainMenu.xrc:41
 msgid "&Save Dot Code..."
-msgstr "保存点代码...(&S)"
+msgstr "保存点代码(&S)..."
 
 #: xrc/MainMenu.xrc:47
 msgid "Most &recent"
@@ -2759,7 +2760,7 @@ msgstr "1&0"
 
 #: xrc/MainMenu.xrc:89
 msgid "From &File ..."
-msgstr "来自文件...(&F)"
+msgstr "从文件(&F)..."
 
 #: xrc/MainMenu.xrc:93
 msgid "Do not change &battery save"
@@ -2787,7 +2788,7 @@ msgstr "增加状态插槽号并保存"
 
 #: xrc/MainMenu.xrc:145
 msgid "To &File ..."
-msgstr "到文件...(&F)"
+msgstr "到文件(&F)..."
 
 #: xrc/MainMenu.xrc:147
 msgid "&Save state"
@@ -2803,15 +2804,15 @@ msgstr "减少状态插槽号"
 
 #: xrc/MainMenu.xrc:158 xrc/MainMenu.xrc:170
 msgid "&Battery file..."
-msgstr "电池文件...(&B)"
+msgstr "电池文件(&B)..."
 
 #: xrc/MainMenu.xrc:161
 msgid "Gameshark &code file..."
-msgstr "Gameshark 代码文件...(&C)"
+msgstr "Gameshark 代码文件(&C)..."
 
 #: xrc/MainMenu.xrc:164 xrc/MainMenu.xrc:173
 msgid "&Gameshark snapshot..."
-msgstr "Gameshark 快照...(&G)"
+msgstr "Gameshark 快照(&G)..."
 
 #: xrc/MainMenu.xrc:166
 msgid "&Import"
@@ -2823,11 +2824,11 @@ msgstr "导出(&E)"
 
 #: xrc/MainMenu.xrc:179
 msgid "Screen capt&ure..."
-msgstr "屏幕捕获...(&U)"
+msgstr "屏幕捕获(&U)..."
 
 #: xrc/MainMenu.xrc:183
 msgid "Start &sound recording..."
-msgstr "开始录制声音...(&S)"
+msgstr "开始录制声音(&S)..."
 
 #: xrc/MainMenu.xrc:186
 msgid "Stop s&ound recording"
@@ -2835,7 +2836,7 @@ msgstr "停止录制声音(&O)"
 
 #: xrc/MainMenu.xrc:189
 msgid "Start &video recording..."
-msgstr "开始录制视频...(&V)"
+msgstr "开始录制视频(&V)..."
 
 #: xrc/MainMenu.xrc:192
 msgid "Stop v&ideo recording"
@@ -2843,7 +2844,7 @@ msgstr "停止录制视频(&I)"
 
 #: xrc/MainMenu.xrc:195
 msgid "Start &game recording..."
-msgstr "开始录制游戏...(&G)"
+msgstr "开始录制游戏(&G)..."
 
 #: xrc/MainMenu.xrc:198
 msgid "Stop g&ame recording"
@@ -2855,7 +2856,7 @@ msgstr "录制(&R)"
 
 #: xrc/MainMenu.xrc:204
 msgid "Start playing &movie..."
-msgstr "开始播放影片...(&M)"
+msgstr "开始播放影片(&M)..."
 
 #: xrc/MainMenu.xrc:207
 msgid "Stop playing m&ovie"
@@ -2927,7 +2928,7 @@ msgstr "连接(&L)"
 
 #: xrc/MainMenu.xrc:272
 msgid "Start &Network Link ..."
-msgstr "开始网络连接 ...(&N)"
+msgstr "开始网络连接(&N)..."
 
 #: xrc/MainMenu.xrc:277
 msgid "&Nothing"
@@ -2964,7 +2965,7 @@ msgstr "速度破解(&S)"
 #: xrc/MainMenu.xrc:310 xrc/MainMenu.xrc:316 xrc/MainMenu.xrc:391
 #: xrc/MainMenu.xrc:427
 msgid "&Configure ..."
-msgstr "配置 ...(&C)"
+msgstr "配置(&C)..."
 
 #: xrc/MainMenu.xrc:314
 msgid "&Video"
@@ -3104,7 +3105,7 @@ msgstr "&R"
 
 #: xrc/MainMenu.xrc:458
 msgid "&Autohold"
-msgstr "自动保留(&A)"
+msgstr "自动保持(&A)"
 
 #: xrc/MainMenu.xrc:502
 msgid "&Game Boy Advance"
@@ -3172,7 +3173,7 @@ msgstr "快捷键(&K)"
 
 #: xrc/MainMenu.xrc:573
 msgid "&UI Settings ..."
-msgstr "界面设置...(&U)"
+msgstr "界面设置(&U)..."
 
 #: xrc/MainMenu.xrc:577
 msgid "&Tools"
@@ -3184,11 +3185,11 @@ msgstr "金手指(&C)"
 
 #: xrc/MainMenu.xrc:581
 msgid "List &cheats ..."
-msgstr "金手指列表 ...(&C)"
+msgstr "金手指列表(&C)..."
 
 #: xrc/MainMenu.xrc:584
 msgid "Find c&heat ..."
-msgstr "搜索金手指 ...(&H)"
+msgstr "搜索金手指(&H)..."
 
 #: xrc/MainMenu.xrc:588
 msgid "A&utomatically save/load cheats"
@@ -3204,7 +3205,7 @@ msgstr "切入 GDB(&B)"
 
 #: xrc/MainMenu.xrc:603
 msgid "&Configure port..."
-msgstr "配置端口...(&C)"
+msgstr "配置端口(&C)..."
 
 #: xrc/MainMenu.xrc:606
 msgid "&Break on load"
@@ -3220,35 +3221,35 @@ msgstr "GDB(&G)"
 
 #: xrc/MainMenu.xrc:616
 msgid "&Disassemble..."
-msgstr "反编译...(&D)"
+msgstr "反编译(&D)..."
 
 #: xrc/MainMenu.xrc:619
 msgid "&Logging..."
-msgstr "日志...(&L)"
+msgstr "日志(&L)..."
 
 #: xrc/MainMenu.xrc:622
 msgid "&IO Viewer..."
-msgstr "IO 查看器...(&I)"
+msgstr "IO 查看器(&I)..."
 
 #: xrc/MainMenu.xrc:625
 msgid "&Map Viewer..."
-msgstr "图层查看器...(&M)"
+msgstr "图层查看器(&M)..."
 
 #: xrc/MainMenu.xrc:628
 msgid "M&emory Viewer..."
-msgstr "内存查看器...(&E)"
+msgstr "内存查看器(&E)..."
 
 #: xrc/MainMenu.xrc:631
 msgid "&OAM Viewer..."
-msgstr "OAM 查看器...(&O)"
+msgstr "OAM 查看器(&O)..."
 
 #: xrc/MainMenu.xrc:634
 msgid "&Palette Viewer..."
-msgstr "调色板查看器...(&P)"
+msgstr "调色板查看器(&P)..."
 
 #: xrc/MainMenu.xrc:637
 msgid "&Tile Viewer..."
-msgstr "碎片查看器...(&T)"
+msgstr "碎片查看器(&T)..."
 
 #: xrc/MainMenu.xrc:642
 msgid "Show all video layers"
@@ -3316,11 +3317,11 @@ msgstr "Direct Sound &B"
 
 #: xrc/MainMenu.xrc:718
 msgid "&Sound Channels"
-msgstr "&声道"
+msgstr "声道(&S)"
 
 #: xrc/MainMenu.xrc:722
 msgid "&Help"
-msgstr "&帮助"
+msgstr "帮助(&H)"
 
 #: xrc/MainMenu.xrc:724
 msgid "Report &Bugs"
@@ -3344,7 +3345,7 @@ msgstr "恢复默认设置"
 
 #: xrc/MainMenu.xrc:745
 msgid "&About..."
-msgstr "关于...(&A)"
+msgstr "关于(&A)..."
 
 #: xrc/MapViewer.xrc:4
 msgid "Map Viewer"
@@ -3352,11 +3353,11 @@ msgstr "图层查看器"
 
 #: xrc/MapViewer.xrc:16
 msgid "Frame 0"
-msgstr "Frame 0"
+msgstr "帧 0"
 
 #: xrc/MapViewer.xrc:22
 msgid "Frame 1"
-msgstr "Frame 1"
+msgstr "帧 1"
 
 #: xrc/MapViewer.xrc:25
 msgid "Frame"
@@ -3424,7 +3425,7 @@ msgstr "当前地址: "
 
 #: xrc/MemViewer.xrc:108
 msgid "&Load..."
-msgstr "载入...(&L)"
+msgstr "载入(&L)..."
 
 #: xrc/NetLink.xrc:4
 msgid "Start Network Link"
@@ -3476,7 +3477,7 @@ msgstr "调色板"
 
 #: xrc/PaletteViewer.xrc:88
 msgid "C&hange backdrop color..."
-msgstr "更改背景颜色...(&H)"
+msgstr "更改背景颜色(&H)..."
 
 #: xrc/SoundConfig.xrc:4
 msgid "Sound Settings"