diff --git a/po/wxvbam/wxvbam.pot b/po/wxvbam/wxvbam.pot
index 8d426ebb..f21a0ff0 100644
--- a/po/wxvbam/wxvbam.pot
+++ b/po/wxvbam/wxvbam.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-02-05 17:29+0000\n"
+"POT-Creation-Date: 2023-02-05 19:53+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -62,37 +62,37 @@ msgid "<config>=<value>"
 msgstr ""
 
 #: wxvbam.cpp:613
-msgid "Configuration/build error: can't find built-in xrc"
+msgid "Configuration / build error: can't find built-in xrc"
 msgstr ""
 
 #: wxvbam.cpp:621
 #, c-format
 msgid ""
 "Wrote built-in configuration to %s.\n"
-"To override, remove all but changed root node(s).  First found root node of "
+"To override, remove all but changed root node(s). First found root node of "
 "correct name in any .xrc or .xrs files in following search path overrides "
 "built-in:"
 msgstr ""
 
-#: wxvbam.cpp:636
+#: wxvbam.cpp:635
 msgid "Configuration is read from, in order:"
 msgstr ""
 
-#: wxvbam.cpp:650
+#: wxvbam.cpp:649
 #, c-format
 msgid ""
 "Wrote built-in override file to %s\n"
-"To override, delete all but changed section.  First found section is used "
+"To override, delete all but changed section. First found section is used "
 "from search path:"
 msgstr ""
 
-#: wxvbam.cpp:656
+#: wxvbam.cpp:655
 msgid ""
 "\n"
 "\tbuilt-in"
 msgstr ""
 
-#: wxvbam.cpp:671
+#: wxvbam.cpp:670
 msgid ""
 "Options set from the command line are saved if any configuration changes are "
 "made in the user interface.\n"
@@ -101,17 +101,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: wxvbam.cpp:679
+#: wxvbam.cpp:678
 msgid ""
 "The commands available for the Keyboard/* option are:\n"
 "\n"
 msgstr ""
 
-#: wxvbam.cpp:690
+#: wxvbam.cpp:689
 msgid "Configuration file not found."
 msgstr ""
 
-#: wxvbam.cpp:723
+#: wxvbam.cpp:722
 msgid "Bad configuration option or multiple ROM files given:\n"
 msgstr ""
 
@@ -183,12 +183,12 @@ msgstr ""
 msgid "Removing cheats"
 msgstr ""
 
-#: guiinit.cpp:758 xrc/JoyPanel.xrc:364
-msgid "GameShark"
+#: guiinit.cpp:758
+msgid "Game Shark"
 msgstr ""
 
-#: guiinit.cpp:759 cmdevents.cpp:705
-msgid "GameGenie"
+#: guiinit.cpp:759
+msgid "Game Genie"
 msgstr ""
 
 #: guiinit.cpp:761
@@ -196,11 +196,11 @@ msgid "Generic Code"
 msgstr ""
 
 #: guiinit.cpp:762
-msgid "GameShark Advance"
+msgid "Game Shark Advance"
 msgstr ""
 
 #: guiinit.cpp:763
-msgid "CodeBreaker Advance"
+msgid "Code Breaker Advance"
 msgstr ""
 
 #: guiinit.cpp:764
@@ -259,11 +259,11 @@ msgstr ""
 
 #: guiinit.cpp:1734
 #, c-format
-msgid "%d x %d - %dbpp @ %dHz"
+msgid "%d x %d - %d bpp @ %d Hz"
 msgstr ""
 
 #: guiinit.cpp:1976
-msgid "This will clear all user-defined accelerators.  Are you sure?"
+msgid "This will clear all user-defined accelerators. Are you sure?"
 msgstr ""
 
 #: guiinit.cpp:1976
@@ -289,7 +289,7 @@ msgstr ""
 
 #: guiinit.cpp:2771
 #, c-format
-msgid "Menu accelerator %s for %s overrides default for %s ; keeping menu"
+msgid "Menu accelerator %s for %s overrides default for %s; keeping menu"
 msgstr ""
 
 #: guiinit.cpp:2910
@@ -334,7 +334,7 @@ msgid "Text files (*.txt;*.log)|*.txt;*.log|"
 msgstr ""
 
 #: viewers.cpp:562 viewers.cpp:772 gfxviewers.cpp:1600 gfxviewers.cpp:1742
-#: cmdevents.cpp:1187 cmdevents.cpp:1265 cmdevents.cpp:1335 cmdevents.cpp:1406
+#: cmdevents.cpp:1184 cmdevents.cpp:1262 cmdevents.cpp:1332 cmdevents.cpp:1403
 #: viewsupt.cpp:1180
 msgid "Select output file"
 msgstr ""
@@ -360,7 +360,7 @@ msgid "0x03000000 - IRAM"
 msgstr ""
 
 #: viewers.cpp:817
-msgid "0x04000000 - I/O"
+msgid "0x04000000 - I / O"
 msgstr ""
 
 #: viewers.cpp:818
@@ -404,7 +404,7 @@ msgid "0xD000 - WRAM"
 msgstr ""
 
 #: viewers.cpp:930
-msgid "0xFF00 - I/O"
+msgid "0xFF00 - I / O"
 msgstr ""
 
 #: viewers.cpp:931
@@ -421,406 +421,410 @@ msgid ""
 "Table (*.act)|*.act"
 msgstr ""
 
-#: gfxviewers.cpp:1601 gfxviewers.cpp:1743 cmdevents.cpp:1188 viewsupt.cpp:1181
+#: gfxviewers.cpp:1601 gfxviewers.cpp:1743 cmdevents.cpp:1185 viewsupt.cpp:1181
 msgid "PNG images|*.png|BMP images|*.bmp"
 msgstr ""
 
 #: cmdevents.cpp:134
 msgid ""
-"GameBoy Advance Files (*.agb;*.gba;*.bin;*.elf;*.mb;*.zip;*.7z;*.rar)|*.agb;"
+"Game Boy Advance Files (*.agb;*.gba;*.bin;*.elf;*.mb;*.zip;*.7z;*.rar)|*.agb;"
 "*.gba;*.bin;*.elf;*.mb;*.agb.gz;*.gba.gz;*.bin.gz;*.elf.gz;*.mb.gz;*.agb.z;*."
-"gba.z;*.bin.z;*.elf.z;*.mb.z;*.zip;*.7z;*.rar|GameBoy Files (*.dmg;*.gb;*."
+"gba.z;*.bin.z;*.elf.z;*.mb.z;*.zip;*.7z;*.rar|Game Boy Files (*.dmg;*.gb;*."
 "gbc;*.cgb;*.sgb;*.zip;*.7z;*.rar)|*.dmg;*.gb;*.gbc;*.cgb;*.sgb;*.dmg.gz;*.gb."
 "gz;*.gbc.gz;*.cgb.gz;*.sgb.gz;*.dmg.z;*.gb.z;*.gbc.z;*.cgb.z;*.sgb.z;*.zip;"
 "*.7z;*.rar|"
 msgstr ""
 
-#: cmdevents.cpp:146
+#: cmdevents.cpp:145
 msgid "Open ROM file"
 msgstr ""
 
-#: cmdevents.cpp:163
+#: cmdevents.cpp:162
 msgid ""
-"GameBoy Files (*.dmg;*.gb;*.gbc;*.cgb;*.sgb;*.zip;*.7z;*.rar)|*.dmg;*.gb;*."
+"Game Boy Files (*.dmg;*.gb;*.gbc;*.cgb;*.sgb;*.zip;*.7z;*.rar)|*.dmg;*.gb;*."
 "gbc;*.cgb;*.sgb;*.dmg.gz;*.gb.gz;*.gbc.gz;*.cgb.gz;*.sgb.gz;*.dmg.z;*.gb.z;*."
 "gbc.z;*.cgb.z;*.sgb.z;*.zip;*.7z;*.rar|"
 msgstr ""
 
-#: cmdevents.cpp:170
+#: cmdevents.cpp:168
 msgid "Open GB ROM file"
 msgstr ""
 
-#: cmdevents.cpp:187
+#: cmdevents.cpp:185
 msgid ""
-"GameBoy Color Files (*.dmg;*.gb;*.gbc;*.cgb;*.sgb;*.zip;*.7z;*.rar)|*.dmg;*."
+"Game Boy Color Files (*.dmg;*.gb;*.gbc;*.cgb;*.sgb;*.zip;*.7z;*.rar)|*.dmg;*."
 "gb;*.gbc;*.cgb;*.sgb;*.dmg.gz;*.gb.gz;*.gbc.gz;*.cgb.gz;*.sgb.gz;*.dmg.z;*."
 "gb.z;*.gbc.z;*.cgb.z;*.sgb.z;*.zip;*.7z;*.rar|"
 msgstr ""
 
-#: cmdevents.cpp:194
+#: cmdevents.cpp:191
 msgid "Open GBC ROM file"
 msgstr ""
 
-#: cmdevents.cpp:613 cmdevents.cpp:729 cmdevents.cpp:768 cmdevents.cpp:841
+#: cmdevents.cpp:610 cmdevents.cpp:726 cmdevents.cpp:765 cmdevents.cpp:838
 msgid "Unknown"
 msgstr ""
 
-#: cmdevents.cpp:621
+#: cmdevents.cpp:618
 msgid "ROM"
 msgstr ""
 
-#: cmdevents.cpp:625
-msgid "ROM+MBC1"
+#: cmdevents.cpp:622
+msgid "ROM + MBC1"
 msgstr ""
 
-#: cmdevents.cpp:629
-msgid "ROM+MBC1+RAM"
+#: cmdevents.cpp:626
+msgid "ROM + MBC1 + RAM"
 msgstr ""
 
-#: cmdevents.cpp:633
-msgid "ROM+MBC1+RAM+BATT"
+#: cmdevents.cpp:630
+msgid "ROM + MBC1 + RAM + BATT"
 msgstr ""
 
-#: cmdevents.cpp:637
-msgid "ROM+MBC2"
+#: cmdevents.cpp:634
+msgid "ROM + MBC2"
 msgstr ""
 
-#: cmdevents.cpp:641
-msgid "ROM+MBC2+BATT"
+#: cmdevents.cpp:638
+msgid "ROM + MBC2 + BATT"
 msgstr ""
 
-#: cmdevents.cpp:645
-msgid "ROM+MMM01"
+#: cmdevents.cpp:642
+msgid "ROM + MMM01"
 msgstr ""
 
-#: cmdevents.cpp:649
-msgid "ROM+MMM01+RAM"
+#: cmdevents.cpp:646
+msgid "ROM + MMM01 + RAM"
 msgstr ""
 
-#: cmdevents.cpp:653
-msgid "ROM+MMM01+RAM+BATT"
+#: cmdevents.cpp:650
+msgid "ROM + MMM01 + RAM + BATT"
 msgstr ""
 
-#: cmdevents.cpp:657
-msgid "ROM+MBC3+TIMER+BATT"
+#: cmdevents.cpp:654
+msgid "ROM + MBC3 + TIMER + BATT"
 msgstr ""
 
-#: cmdevents.cpp:661
-msgid "ROM+MBC3+TIMER+RAM+BATT"
+#: cmdevents.cpp:658
+msgid "ROM + MBC3 + TIMER + RAM + BATT"
 msgstr ""
 
-#: cmdevents.cpp:665
-msgid "ROM+MBC3"
+#: cmdevents.cpp:662
+msgid "ROM + MBC3"
 msgstr ""
 
-#: cmdevents.cpp:669
-msgid "ROM+MBC3+RAM"
+#: cmdevents.cpp:666
+msgid "ROM + MBC3 + RAM"
 msgstr ""
 
-#: cmdevents.cpp:673
-msgid "ROM+MBC3+RAM+BATT"
+#: cmdevents.cpp:670
+msgid "ROM + MBC3 + RAM + BATT"
 msgstr ""
 
-#: cmdevents.cpp:677
-msgid "ROM+MBC5"
+#: cmdevents.cpp:674
+msgid "ROM + MBC5"
 msgstr ""
 
-#: cmdevents.cpp:681
-msgid "ROM+MBC5+RAM"
+#: cmdevents.cpp:678
+msgid "ROM + MBC5 + RAM"
 msgstr ""
 
-#: cmdevents.cpp:685
-msgid "ROM+MBC5+RAM+BATT"
+#: cmdevents.cpp:682
+msgid "ROM + MBC5 + RAM + BATT"
 msgstr ""
 
-#: cmdevents.cpp:689
-msgid "ROM+MBC5+RUMBLE"
+#: cmdevents.cpp:686
+msgid "ROM + MBC5 + RUMBLE"
 msgstr ""
 
-#: cmdevents.cpp:693
-msgid "ROM+MBC5+RUMBLE+RAM"
+#: cmdevents.cpp:690
+msgid "ROM + MBC5 + RUMBLE + RAM"
 msgstr ""
 
-#: cmdevents.cpp:697
-msgid "ROM+MBC5+RUMBLE+RAM+BATT"
+#: cmdevents.cpp:694
+msgid "ROM + MBC5 + RUMBLE + RAM + BATT"
 msgstr ""
 
-#: cmdevents.cpp:701
-msgid "ROM+MBC7+BATT"
+#: cmdevents.cpp:698
+msgid "ROM + MBC7 + BATT"
 msgstr ""
 
-#: cmdevents.cpp:709
+#: cmdevents.cpp:702
+msgid "GameGenie"
+msgstr ""
+
+#: cmdevents.cpp:706
 msgid "GameShark V3.0"
 msgstr ""
 
-#: cmdevents.cpp:713
-msgid "ROM+POCKET CAMERA"
+#: cmdevents.cpp:710
+msgid "ROM + POCKET CAMERA"
 msgstr ""
 
-#: cmdevents.cpp:717
-msgid "ROM+BANDAI TAMA5"
+#: cmdevents.cpp:714
+msgid "ROM + BANDAI TAMA5"
 msgstr ""
 
-#: cmdevents.cpp:721
-msgid "ROM+HuC-3"
+#: cmdevents.cpp:718
+msgid "ROM + HuC-3"
 msgstr ""
 
-#: cmdevents.cpp:725
-msgid "ROM+HuC-1"
+#: cmdevents.cpp:722
+msgid "ROM + HuC-1"
 msgstr ""
 
-#: cmdevents.cpp:775 dialogs/display-config.cpp:353 xrc/DisplayConfig.xrc:85
+#: cmdevents.cpp:772 dialogs/display-config.cpp:353 xrc/DisplayConfig.xrc:85
 #: xrc/DisplayConfig.xrc:135 xrc/DisplayConfig.xrc:221
 #: xrc/GameBoyAdvanceConfig.xrc:32 xrc/GameBoyAdvanceConfig.xrc:204
 #: xrc/SoundConfig.xrc:219 xrc/SoundConfig.xrc:309
 msgid "None"
 msgstr ""
 
-#: cmdevents.cpp:877 cmdevents.cpp:899
+#: cmdevents.cpp:874 cmdevents.cpp:896
 msgid "Select Dot Code file"
 msgstr ""
 
-#: cmdevents.cpp:879 cmdevents.cpp:901
+#: cmdevents.cpp:876 cmdevents.cpp:898
 msgid "e-Reader Dot Code (*.bin;*.raw)|*.bin;*.raw"
 msgstr ""
 
-#: cmdevents.cpp:920 cmdevents.cpp:1115
+#: cmdevents.cpp:917 cmdevents.cpp:1112
 msgid "Select battery file"
 msgstr ""
 
-#: cmdevents.cpp:921 cmdevents.cpp:1116
+#: cmdevents.cpp:918 cmdevents.cpp:1113
 msgid "Battery file (*.sav)|*.sav|Flash save (*.dat)|*.dat"
 msgstr ""
 
-#: cmdevents.cpp:929
+#: cmdevents.cpp:926
 msgid ""
 "Importing a battery file will erase any saved games (permanently after the "
-"next write).  Do you want to continue?"
+"next write). Do you want to continue?"
 msgstr ""
 
-#: cmdevents.cpp:930 cmdevents.cpp:958 cmdevents.cpp:1078
+#: cmdevents.cpp:927 cmdevents.cpp:955 cmdevents.cpp:1075
 msgid "Confirm import"
 msgstr ""
 
-#: cmdevents.cpp:936 panel.cpp:450
+#: cmdevents.cpp:933 panel.cpp:450
 #, c-format
 msgid "Loaded battery %s"
 msgstr ""
 
-#: cmdevents.cpp:938
+#: cmdevents.cpp:935
 #, c-format
 msgid "Error loading battery %s"
 msgstr ""
 
-#: cmdevents.cpp:947
+#: cmdevents.cpp:944
 msgid "Select code file"
 msgstr ""
 
-#: cmdevents.cpp:948
-msgid "Gameshark Code File (*.spc;*.xpc)|*.spc;*.xpc"
+#: cmdevents.cpp:945
+msgid "Game Shark Code File (*.spc;*.xpc)|*.spc;*.xpc"
 msgstr ""
 
-#: cmdevents.cpp:948
-msgid "Gameshark Code File (*.gcf)|*.gcf"
+#: cmdevents.cpp:945
+msgid "Game Shark Code File (*.gcf)|*.gcf"
 msgstr ""
 
-#: cmdevents.cpp:957
+#: cmdevents.cpp:954
 msgid ""
-"Importing a code file will replace any loaded cheats.  Do you want to "
+"Importing a code file will replace any loaded cheats. Do you want to "
 "continue?"
 msgstr ""
 
-#: cmdevents.cpp:974
+#: cmdevents.cpp:971
 #, c-format
 msgid "Cannot open file %s"
 msgstr ""
 
-#: cmdevents.cpp:984
+#: cmdevents.cpp:981
 #, c-format
 msgid "Unsupported code file %s"
 msgstr ""
 
-#: cmdevents.cpp:1054
+#: cmdevents.cpp:1051
 #, c-format
 msgid "Loaded code file %s"
 msgstr ""
 
-#: cmdevents.cpp:1056
+#: cmdevents.cpp:1053
 #, c-format
 msgid "Error loading code file %s"
 msgstr ""
 
-#: cmdevents.cpp:1067 cmdevents.cpp:1143
+#: cmdevents.cpp:1064 cmdevents.cpp:1140
 msgid "Select snapshot file"
 msgstr ""
 
-#: cmdevents.cpp:1068
+#: cmdevents.cpp:1065
 msgid ""
-"GS & PAC Snapshots (*.sps;*.xps)|*.sps;*.xps|GameShark SP Snapshots (*.gsv)|"
+"GS & PAC Snapshots (*.sps;*.xps)|*.sps;*.xps|Game Shark SP Snapshots (*.gsv)|"
 "*.gsv"
 msgstr ""
 
-#: cmdevents.cpp:1068
-msgid "Gameboy Snapshot (*.gbs)|*.gbs"
+#: cmdevents.cpp:1065
+msgid "Game Boy Snapshot (*.gbs)|*.gbs"
 msgstr ""
 
-#: cmdevents.cpp:1077
+#: cmdevents.cpp:1074
 msgid ""
 "Importing a snapshot file will erase any saved games (permanently after the "
-"next write).  Do you want to continue?"
+"next write). Do you want to continue?"
 msgstr ""
 
-#: cmdevents.cpp:1102
+#: cmdevents.cpp:1099
 #, c-format
 msgid "Loaded snapshot file %s"
 msgstr ""
 
-#: cmdevents.cpp:1104
+#: cmdevents.cpp:1101
 #, c-format
 msgid "Error loading snapshot file %s"
 msgstr ""
 
-#: cmdevents.cpp:1127
+#: cmdevents.cpp:1124
 #, c-format
 msgid "Wrote battery %s"
 msgstr ""
 
-#: cmdevents.cpp:1129 panel.cpp:756
+#: cmdevents.cpp:1126 panel.cpp:756
 #, c-format
 msgid "Error writing battery %s"
 msgstr ""
 
-#: cmdevents.cpp:1137
+#: cmdevents.cpp:1134
 msgid "EEPROM saves cannot be exported"
 msgstr ""
 
-#: cmdevents.cpp:1144
-msgid "Gameshark Snapshot (*.sps)|*.sps"
+#: cmdevents.cpp:1141
+msgid "Game Shark Snapshot (*.sps)|*.sps"
 msgstr ""
 
-#: cmdevents.cpp:1158
-msgid "Exported from VisualBoyAdvance-M"
+#: cmdevents.cpp:1155
+msgid "Exported from Visual Boy Advance-M"
 msgstr ""
 
-#: cmdevents.cpp:1170
+#: cmdevents.cpp:1167
 #, c-format
 msgid "Saved snapshot file %s"
 msgstr ""
 
-#: cmdevents.cpp:1172
+#: cmdevents.cpp:1169
 #, c-format
 msgid "Error saving snapshot file %s"
 msgstr ""
 
-#: cmdevents.cpp:1212 sys.cpp:558
+#: cmdevents.cpp:1209 sys.cpp:558
 #, c-format
 msgid "Wrote snapshot %s"
 msgstr ""
 
-#: cmdevents.cpp:1233 cmdevents.cpp:1303 cmdevents.cpp:1374 cmdevents.cpp:1440
+#: cmdevents.cpp:1230 cmdevents.cpp:1300 cmdevents.cpp:1371 cmdevents.cpp:1437
 msgid " files ("
 msgstr ""
 
-#: cmdevents.cpp:1473
+#: cmdevents.cpp:1470
 msgid "Select file"
 msgstr ""
 
-#: cmdevents.cpp:1790 cmdevents.cpp:1883
+#: cmdevents.cpp:1787 cmdevents.cpp:1880
 msgid "Select state file"
 msgstr ""
 
-#: cmdevents.cpp:1791 cmdevents.cpp:1884
-msgid "VisualBoyAdvance saved game files|*.sgm"
+#: cmdevents.cpp:1788 cmdevents.cpp:1881
+msgid "Visual Boy Advance saved game files|*.sgm"
 msgstr ""
 
-#: cmdevents.cpp:1914 cmdevents.cpp:1924 cmdevents.cpp:1935
+#: cmdevents.cpp:1911 cmdevents.cpp:1921 cmdevents.cpp:1932
 #, c-format
 msgid "Current state slot #%d"
 msgstr ""
 
-#: cmdevents.cpp:2005
-msgid "Cannot use Colorizer Hack when GB BIOS File is enabled."
+#: cmdevents.cpp:2002
+msgid "Cannot use Colorizer Hack when Game Boy BIOS File is enabled."
 msgstr ""
 
-#: cmdevents.cpp:2220
+#: cmdevents.cpp:2217
 msgid "Sound enabled"
 msgstr ""
 
-#: cmdevents.cpp:2220
+#: cmdevents.cpp:2217
 msgid "Sound disabled"
 msgstr ""
 
-#: cmdevents.cpp:2233 cmdevents.cpp:2247
+#: cmdevents.cpp:2230 cmdevents.cpp:2244
 #, c-format
-msgid "Volume: %d%%"
+msgid "Volume: %d %%"
 msgstr ""
 
-#: cmdevents.cpp:2322
+#: cmdevents.cpp:2319
 msgid "Set to 0 for pseudo tty"
 msgstr ""
 
-#: cmdevents.cpp:2324
+#: cmdevents.cpp:2321
 msgid "Port to wait for connection:"
 msgstr ""
 
-#: cmdevents.cpp:2325
+#: cmdevents.cpp:2322
 msgid "GDB Connection"
 msgstr ""
 
-#: cmdevents.cpp:2378
+#: cmdevents.cpp:2375
 #, c-format
 msgid "Waiting for connection at %s"
 msgstr ""
 
-#: cmdevents.cpp:2385
+#: cmdevents.cpp:2382
 #, c-format
 msgid "Waiting for connection on port %d"
 msgstr ""
 
-#: cmdevents.cpp:2388
+#: cmdevents.cpp:2385
 msgid "Waiting for GDB..."
 msgstr ""
 
-#: cmdevents.cpp:2812 panel.cpp:250 panel.cpp:365
+#: cmdevents.cpp:2809 panel.cpp:250 panel.cpp:365
 msgid "Could not initialize the sound driver!"
 msgstr ""
 
-#: cmdevents.cpp:2916
-msgid "Nintendo GameBoy (+Color+Advance) emulator."
+#: cmdevents.cpp:2913
+msgid "Nintendo Game Boy / Color / Advance) emulator."
 msgstr ""
 
-#: cmdevents.cpp:2917
+#: cmdevents.cpp:2914
 msgid ""
 "Copyright (C) 1999-2003 Forgotten\n"
 "Copyright (C) 2004-2006 VBA development team\n"
 "Copyright (C) 2007-2020 VBA-M development team"
 msgstr ""
 
-#: cmdevents.cpp:2918
+#: cmdevents.cpp:2916
 msgid ""
-"This program is free software: you can redistribute it and/or modify\n"
+"This program is free software: you can redistribute it and / or modify\n"
 "it under the terms of the GNU General Public License as published by\n"
 "the Free Software Foundation, either version 2 of the License, or\n"
 "(at your option) any later version.\n"
 "\n"
 "This program is distributed in the hope that it will be useful,\n"
 "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
 "GNU General Public License for more details.\n"
 "\n"
 "You should have received a copy of the GNU General Public License\n"
-"along with this program.  If not, see http://www.gnu.org/licenses ."
+"along with this program. If not, see http://www.gnu.org/licenses ."
 msgstr ""
 
-#: cmdevents.cpp:3156
-msgid "Cannot use GB BIOS when Colorizer Hack is enabled."
+#: cmdevents.cpp:3157
+msgid "Cannot use Game Boy BIOS when Colorizer Hack is enabled."
 msgstr ""
 
-#: cmdevents.cpp:3217
-msgid "LAN link is already active.  Disable link mode to disconnect."
+#: cmdevents.cpp:3218
+msgid "LAN link is already active. Disable link mode to disconnect."
 msgstr ""
 
-#: cmdevents.cpp:3223
+#: cmdevents.cpp:3224
 msgid "Network is not supported in local mode."
 msgstr ""
 
@@ -899,12 +903,12 @@ msgstr ""
 
 #: sys.cpp:449
 #, c-format
-msgid "%d%%(%d, %d fps)"
+msgid "%d %% (%d, %d fps)"
 msgstr ""
 
 #: sys.cpp:457
 #, c-format
-msgid "%d%%"
+msgid "%d %%"
 msgstr ""
 
 #: sys.cpp:879 xrc/GBPrinter.xrc:65
@@ -958,8 +962,8 @@ msgstr ""
 
 #: panel.cpp:262
 msgid ""
-"Cannot use GB BIOS file when Colorizer Hack is enabled, disabling GB BIOS "
-"file."
+"Cannot use Game Boy BIOS file when Colorizer Hack is enabled, disabling Game "
+"Boy BIOS file."
 msgstr ""
 
 #: panel.cpp:279 panel.cpp:379
@@ -998,31 +1002,31 @@ msgstr ""
 
 #: panel.cpp:932
 #, c-format
-msgid "Fullscreen mode %dx%d-%d@%d not supported; looking for another"
+msgid "Fullscreen mode %d x %d - %d @ %d not supported; looking for another"
 msgstr ""
 
 #: panel.cpp:970
 #, c-format
-msgid "Fullscreen mode %dx%d-%d@%d not supported"
+msgid "Fullscreen mode %d x %d - %d @ %d not supported"
 msgstr ""
 
 #: panel.cpp:975
 #, c-format
-msgid "Valid mode: %dx%d-%d@%d"
+msgid "Valid mode: %d x %d - %d @ %d"
 msgstr ""
 
 #: panel.cpp:983
 #, c-format
-msgid "Chose mode %dx%d-%d@%d"
+msgid "Chose mode %d x %d - %d @ %d"
 msgstr ""
 
 #: panel.cpp:987
 #, c-format
-msgid "Failed to change mode to %dx%d-%d@%d"
+msgid "Failed to change mode to %d x %d - %d @ %d"
 msgstr ""
 
 #: panel.cpp:1075
-msgid "Not a valid GBA cartridge"
+msgid "Not a valid Game Boy Advance cartridge"
 msgstr ""
 
 #: panel.cpp:1245
@@ -1104,7 +1108,7 @@ msgstr ""
 
 #: panel.cpp:2527
 #, c-format
-msgid "Error in audio/video recording (%s); aborting"
+msgid "Error in audio / video recording (%s); aborting"
 msgstr ""
 
 #: panel.cpp:2533
@@ -1166,11 +1170,11 @@ msgid "Retain aspect ratio when resizing"
 msgstr ""
 
 #: config/internal/option-internal.cpp:338
-msgid "BIOS file to use for GB, if enabled"
+msgid "BIOS file to use for Game Boy, if enabled"
 msgstr ""
 
 #: config/internal/option-internal.cpp:341
-msgid "GB color enhancement, if enabled"
+msgid "Game Boy color enhancement, if enabled"
 msgstr ""
 
 #: config/internal/option-internal.cpp:343
@@ -1183,7 +1187,7 @@ msgid "Apply LCD filter, if enabled"
 msgstr ""
 
 #: config/internal/option-internal.cpp:346
-msgid "BIOS file to use for GBC, if enabled"
+msgid "BIOS file to use for Game Boy Color, if enabled"
 msgstr ""
 
 #: config/internal/option-internal.cpp:349
@@ -1215,7 +1219,7 @@ msgid "Directory to look for ROM files"
 msgstr ""
 
 #: config/internal/option-internal.cpp:369
-msgid "Directory to look for GBC ROM files"
+msgid "Directory to look for Game Boy Color ROM files"
 msgstr ""
 
 #: config/internal/option-internal.cpp:373
@@ -1270,7 +1274,7 @@ msgstr ""
 
 #: config/internal/option-internal.cpp:410
 msgid ""
-"Directory to store A/V and game recordings (relative paths are relative to "
+"Directory to store A / V and game recordings (relative paths are relative to "
 "ROM)"
 msgstr ""
 
@@ -1295,13 +1299,13 @@ msgstr ""
 #: config/internal/option-internal.cpp:429
 msgid ""
 "The parameter Joypad/<n>/<button> contains a comma-separated list of key "
-"names which map to joypad #<n> button <button>.  Button is one of Up, Down, "
-"Left, Right, A, B, L, R, Select, Start, MotionUp, MotionDown, MotionLeft, "
-"MotionRight, AutoA, AutoB, Speed, Capture, GS"
+"names which map to joypad #<n> button <button>. Button is one of Up, Down, "
+"Left, Right, A, B, L, R, Select, Start, Motion Up, Motion Down, Motion Left, "
+"Motion Right, Autofire A, Autofire B, Speed, Capture, GS"
 msgstr ""
 
 #: config/internal/option-internal.cpp:436
-msgid "The autofire toggle period, in frames (1/60 s)"
+msgid "The autofire toggle period, in frames (1 / 60 s)"
 msgstr ""
 
 #: config/internal/option-internal.cpp:439
@@ -1311,7 +1315,7 @@ msgstr ""
 #: config/internal/option-internal.cpp:444
 msgid ""
 "The parameter Keyboard/<cmd> contains a comma-separated list of key names (e."
-"g. Alt-Shift-F1).  When the named key is pressed, the command <cmd> is "
+"g. Alt + Shift + F1).  When the named key is pressed, the command <cmd> is "
 "executed."
 msgstr ""
 
@@ -1320,11 +1324,11 @@ msgid "Enable AGB debug print"
 msgstr ""
 
 #: config/internal/option-internal.cpp:453
-msgid "Auto skip frames."
+msgid "Auto skip frames"
 msgstr ""
 
 #: config/internal/option-internal.cpp:455
-msgid "Apply IPS/UPS/IPF patches if found"
+msgid "Apply IPS / UPS / IPF patches if found"
 msgstr ""
 
 #: config/internal/option-internal.cpp:457
@@ -1332,7 +1336,7 @@ msgid "Automatically save and load cheat list"
 msgstr ""
 
 #: config/internal/option-internal.cpp:460
-msgid "Automatically enable border for Super GameBoy games"
+msgid "Automatically enable border for Super Game Boy games"
 msgstr ""
 
 #: config/internal/option-internal.cpp:462
@@ -1356,11 +1360,11 @@ msgid "Type of system to emulate"
 msgstr ""
 
 #: config/internal/option-internal.cpp:472
-msgid "Flash size 0 = 64KB 1 = 128KB"
+msgid "Flash size 0 = 64 KB 1 = 128 KB"
 msgstr ""
 
 #: config/internal/option-internal.cpp:475
-msgid "Skip frames.  Values are 0-9 or -1 to skip automatically based on time."
+msgid "Skip frames. Values are 0-9 or -1 to skip automatically based on time."
 msgstr ""
 
 #: config/internal/option-internal.cpp:478
@@ -1420,11 +1424,11 @@ msgid "Do not overwrite native (battery) save when loading state"
 msgstr ""
 
 #: config/internal/option-internal.cpp:514
-msgid "Throttle game speed, even when accelerated (0-450%, 0 = no throttle)"
+msgid "Throttle game speed, even when accelerated (0-450 %, 0 = no throttle)"
 msgstr ""
 
 #: config/internal/option-internal.cpp:518
-msgid "Set throttle for speedup key (0-3000%, 0 = no throttle)"
+msgid "Set throttle for speedup key (0-3000 %, 0 = no throttle)"
 msgstr ""
 
 #: config/internal/option-internal.cpp:521
@@ -1436,7 +1440,7 @@ msgid "Use frame skip for speedup throttle"
 msgstr ""
 
 #: config/internal/option-internal.cpp:527
-msgid "Use the specified BIOS file for GB"
+msgid "Use the specified BIOS file for Game Boy"
 msgstr ""
 
 #: config/internal/option-internal.cpp:529
@@ -1444,7 +1448,7 @@ msgid "Use the specified BIOS file"
 msgstr ""
 
 #: config/internal/option-internal.cpp:531
-msgid "Use the specified BIOS file for GBC"
+msgid "Use the specified BIOS file for Game Boy Color"
 msgstr ""
 
 #: config/internal/option-internal.cpp:532
@@ -1504,31 +1508,31 @@ msgid "Bit mask of sound channels to enable"
 msgstr ""
 
 #: config/internal/option-internal.cpp:570
-msgid "GBA sound filtering (%)"
+msgid "Game Boy Advance sound filtering (%)"
 msgstr ""
 
 #: config/internal/option-internal.cpp:573
-msgid "GBA sound interpolation"
+msgid "Game Boy Advance sound interpolation"
 msgstr ""
 
 #: config/internal/option-internal.cpp:574
-msgid "GB sound declicking"
+msgid "Game Boy sound declicking"
 msgstr ""
 
 #: config/internal/option-internal.cpp:576
-msgid "GB echo effect (%)"
+msgid "Game Boy echo effect (%)"
 msgstr ""
 
 #: config/internal/option-internal.cpp:578
-msgid "Enable GB sound effects"
+msgid "Enable Game Boy sound effects"
 msgstr ""
 
 #: config/internal/option-internal.cpp:579
-msgid "GB stereo effect (%)"
+msgid "Game Boy stereo effect (%)"
 msgstr ""
 
 #: config/internal/option-internal.cpp:582
-msgid "GB surround sound effect (%)"
+msgid "Game Boy surround sound effect (%)"
 msgstr ""
 
 #: config/internal/option-internal.cpp:583
@@ -1673,11 +1677,16 @@ msgstr ""
 msgid "FAudio: Creating source voice failed!"
 msgstr ""
 
-#: dsound.cpp:89 dsound.cpp:103
+#: dsound.cpp:89
 #, c-format
 msgid "Cannot create DirectSound %08x"
 msgstr ""
 
+#: dsound.cpp:103
+#, c-format
+msgid "Cannot create Direct Sound %08x"
+msgstr ""
+
 #: dsound.cpp:108
 #, c-format
 msgid "Cannot SetCooperativeLevel %08x"
@@ -1811,7 +1820,7 @@ msgid "&Hexadecimal"
 msgstr ""
 
 #: xrc/CheatCreate.xrc:97
-msgid "Signed/Unsigned"
+msgid "Signed / Unsigned"
 msgstr ""
 
 #: xrc/CheatCreate.xrc:107
@@ -2138,7 +2147,7 @@ msgid "Pixelate"
 msgstr ""
 
 #: xrc/DisplayConfig.xrc:90
-msgid "Advance MAME Scale2x"
+msgid "Advance MAME Scale 2x"
 msgstr ""
 
 #: xrc/DisplayConfig.xrc:91
@@ -2206,11 +2215,11 @@ msgid "xBRZ 6x"
 msgstr ""
 
 #: xrc/DisplayConfig.xrc:115
-msgid "Plugin :"
+msgid "Plugin:"
 msgstr ""
 
 #: xrc/DisplayConfig.xrc:127
-msgid "Interframe blending :"
+msgid "Interframe blending:"
 msgstr ""
 
 #: xrc/DisplayConfig.xrc:136
@@ -2230,7 +2239,7 @@ msgid "Frame Skip"
 msgstr ""
 
 #: xrc/DisplayConfig.xrc:177
-msgid "&Number of frames to skip :"
+msgid "&Number of frames to skip:"
 msgstr ""
 
 #: xrc/DisplayConfig.xrc:199
@@ -2238,7 +2247,7 @@ msgid "Speed"
 msgstr ""
 
 #: xrc/DisplayConfig.xrc:215
-msgid "Speed indicator :"
+msgid "Speed indicator:"
 msgstr ""
 
 #: xrc/DisplayConfig.xrc:222
@@ -2254,11 +2263,11 @@ msgid "On-Screen Display"
 msgstr ""
 
 #: xrc/DisplayConfig.xrc:247
-msgid "Default magnification :"
+msgid "Default magnification:"
 msgstr ""
 
 #: xrc/DisplayConfig.xrc:266
-msgid "Maximum magnification factor :"
+msgid "Maximum magnification factor:"
 msgstr ""
 
 #: xrc/DisplayConfig.xrc:267
@@ -2370,11 +2379,11 @@ msgid "Weird Colors"
 msgstr ""
 
 #: xrc/GBColorPrefPanel.xrc:17
-msgid "Real GB Colors"
+msgid "Real Game Boy Colors"
 msgstr ""
 
 #: xrc/GBColorPrefPanel.xrc:18
-msgid "Real 'GB on GBASP' Colors"
+msgid "Real 'Game Boy on Game Boy Advance Special' Colors"
 msgstr ""
 
 #: xrc/GBColorPrefPanel.xrc:46 xrc/GBPaletteViewer.xrc:17 xrc/MapViewer.xrc:54
@@ -2633,7 +2642,7 @@ msgid "Game Boy Advance settings"
 msgstr ""
 
 #: xrc/GameBoyAdvanceConfig.xrc:21
-msgid "Save type :"
+msgid "Save type:"
 msgstr ""
 
 #: xrc/GameBoyAdvanceConfig.xrc:27 xrc/GameBoyAdvanceConfig.xrc:199
@@ -2653,20 +2662,20 @@ msgstr ""
 msgid "Flash"
 msgstr ""
 
-#: xrc/GameBoyAdvanceConfig.xrc:31
+#: xrc/GameBoyAdvanceConfig.xrc:31 xrc/GameBoyAdvanceConfig.xrc:203
 msgid "EEPROM + Sensor"
 msgstr ""
 
 #: xrc/GameBoyAdvanceConfig.xrc:43
-msgid "Flash size :"
+msgid "Flash size:"
 msgstr ""
 
 #: xrc/GameBoyAdvanceConfig.xrc:49 xrc/GameBoyAdvanceConfig.xrc:221
-msgid "64K"
+msgid "64 K"
 msgstr ""
 
 #: xrc/GameBoyAdvanceConfig.xrc:50 xrc/GameBoyAdvanceConfig.xrc:222
-msgid "128K"
+msgid "128 K"
 msgstr ""
 
 #: xrc/GameBoyAdvanceConfig.xrc:64
@@ -2682,11 +2691,11 @@ msgid "Save type"
 msgstr ""
 
 #: xrc/GameBoyAdvanceConfig.xrc:92
-msgid "BIOS file :"
+msgid "BIOS file:"
 msgstr ""
 
 #: xrc/GameBoyAdvanceConfig.xrc:115
-msgid "Current BIOS file :"
+msgid "Current BIOS file:"
 msgstr ""
 
 #: xrc/GameBoyAdvanceConfig.xrc:122 xrc/GameBoyConfig.xrc:138
@@ -2728,10 +2737,6 @@ msgstr ""
 msgid "Save Type:"
 msgstr ""
 
-#: xrc/GameBoyAdvanceConfig.xrc:203
-msgid "EEPROM+Sensor"
-msgstr ""
-
 #: xrc/GameBoyAdvanceConfig.xrc:212
 msgid "Flash Size:"
 msgstr ""
@@ -2749,11 +2754,11 @@ msgid "Game Overrides"
 msgstr ""
 
 #: xrc/GameBoyConfig.xrc:4
-msgid "GameBoy settings"
+msgid "Game Boy settings"
 msgstr ""
 
 #: xrc/GameBoyConfig.xrc:20
-msgid "Emulated &system :"
+msgid "Emulated &system:"
 msgstr ""
 
 #: xrc/GameBoyConfig.xrc:30
@@ -2777,7 +2782,7 @@ msgid "Super Game Boy 2"
 msgstr ""
 
 #: xrc/GameBoyConfig.xrc:48
-msgid "Display &borders :"
+msgid "Display &borders:"
 msgstr ""
 
 #: xrc/GameBoyConfig.xrc:57
@@ -2793,7 +2798,7 @@ msgid "System"
 msgstr ""
 
 #: xrc/GameBoyConfig.xrc:84
-msgid "GB Boot &ROM file :"
+msgid "Game Boy Boot &ROM file:"
 msgstr ""
 
 #: xrc/GameBoyConfig.xrc:91 xrc/GameBoyConfig.xrc:113
@@ -2801,15 +2806,15 @@ msgid "Select a File"
 msgstr ""
 
 #: xrc/GameBoyConfig.xrc:106
-msgid "GBC Boot ROM &file :"
+msgid "Game Boy Color Boot ROM &file:"
 msgstr ""
 
 #: xrc/GameBoyConfig.xrc:131
-msgid "Current GB BIOS file :"
+msgid "Current Game Boy BIOS file:"
 msgstr ""
 
 #: xrc/GameBoyConfig.xrc:152
-msgid "Current GBC BIOS file :"
+msgid "Current Game Boy Color BIOS file:"
 msgstr ""
 
 #: xrc/GameBoyConfig.xrc:186
@@ -2845,7 +2850,7 @@ msgid "&BMP"
 msgstr ""
 
 #: xrc/GeneralConfig.xrc:57
-msgid "&Rewind interval :"
+msgid "&Rewind interval:"
 msgstr ""
 
 #: xrc/GeneralConfig.xrc:58
@@ -2950,9 +2955,9 @@ msgstr ""
 
 #: xrc/JoyPanel.xrc:8
 msgid ""
-"Click a field and press a key or move joystick to add.  Press backspace to "
-"delete last added key.  Resize window or click inside and move pointer to "
-"see entire contents if too small."
+"Click a field and press a key or move joystick to add. Press backspace to "
+"delete last added key. Resize window or click inside and move pointer to see "
+"entire contents if too small."
 msgstr ""
 
 #: xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:456
@@ -3012,11 +3017,15 @@ msgid "Autofire B"
 msgstr ""
 
 #: xrc/JoyPanel.xrc:342
-msgid "Motion Left/Dark"
+msgid "Motion Left / Dark"
+msgstr ""
+
+#: xrc/JoyPanel.xrc:364
+msgid "GameShark"
 msgstr ""
 
 #: xrc/JoyPanel.xrc:386
-msgid "Motion Right/Light"
+msgid "Motion Right / Light"
 msgstr ""
 
 #: xrc/JoyPanel.xrc:408
@@ -3140,11 +3149,11 @@ msgid "Open..."
 msgstr ""
 
 #: xrc/MainMenu.xrc:10
-msgid "Open &GB..."
+msgid "Open &Game Boy..."
 msgstr ""
 
 #: xrc/MainMenu.xrc:13
-msgid "Open GB&C..."
+msgid "Open Game Boy &Color..."
 msgstr ""
 
 #: xrc/MainMenu.xrc:16
@@ -3232,7 +3241,7 @@ msgid "1&0"
 msgstr ""
 
 #: xrc/MainMenu.xrc:89
-msgid "From &File ..."
+msgid "From &File..."
 msgstr ""
 
 #: xrc/MainMenu.xrc:93
@@ -3260,7 +3269,7 @@ msgid "Increase state slot number and save"
 msgstr ""
 
 #: xrc/MainMenu.xrc:145
-msgid "To &File ..."
+msgid "To &File..."
 msgstr ""
 
 #: xrc/MainMenu.xrc:147
@@ -3280,10 +3289,10 @@ msgid "&Battery file..."
 msgstr ""
 
 #: xrc/MainMenu.xrc:161
-msgid "Gameshark &code file..."
+msgid "Game Shark &code file..."
 msgstr ""
 
-#: xrc/MainMenu.xrc:164 xrc/MainMenu.xrc:173
+#: xrc/MainMenu.xrc:164
 msgid "&Gameshark snapshot..."
 msgstr ""
 
@@ -3291,6 +3300,10 @@ msgstr ""
 msgid "&Import"
 msgstr ""
 
+#: xrc/MainMenu.xrc:173
+msgid "&Game Shark snapshot..."
+msgstr ""
+
 #: xrc/MainMenu.xrc:175
 msgid "&Export"
 msgstr ""
@@ -3380,7 +3393,7 @@ msgid "&Skip BIOS"
 msgstr ""
 
 #: xrc/MainMenu.xrc:255
-msgid "&Auto IPS/UPS/IPF patch"
+msgid "&Auto IPS / UPS / IPF patch"
 msgstr ""
 
 #: xrc/MainMenu.xrc:259
@@ -3400,7 +3413,7 @@ msgid "&Link"
 msgstr ""
 
 #: xrc/MainMenu.xrc:272
-msgid "Start &Network Link ..."
+msgid "Start &Network Link..."
 msgstr ""
 
 #: xrc/MainMenu.xrc:277
@@ -3416,7 +3429,7 @@ msgid "&Wireless"
 msgstr ""
 
 #: xrc/MainMenu.xrc:289
-msgid "&GameCube"
+msgid "&Game Cube"
 msgstr ""
 
 #: xrc/MainMenu.xrc:293 xrc/MainMenu.xrc:521
@@ -3437,7 +3450,7 @@ msgstr ""
 
 #: xrc/MainMenu.xrc:310 xrc/MainMenu.xrc:316 xrc/MainMenu.xrc:387
 #: xrc/MainMenu.xrc:423
-msgid "&Configure ..."
+msgid "&Configure..."
 msgstr ""
 
 #: xrc/MainMenu.xrc:314
@@ -3525,19 +3538,19 @@ msgid "&Toggle sound"
 msgstr ""
 
 #: xrc/MainMenu.xrc:403
-msgid "&GBA sound interpolation"
+msgid "&Game Boy Advance sound interpolation"
 msgstr ""
 
 #: xrc/MainMenu.xrc:408
-msgid "&GB sound enhancement"
+msgid "&Game Boy sound enhancement"
 msgstr ""
 
 #: xrc/MainMenu.xrc:412
-msgid "&GB surround sound effect"
+msgid "&Game Boy surround sound effect"
 msgstr ""
 
 #: xrc/MainMenu.xrc:416
-msgid "&GB sound declicking"
+msgid "&Game Boy sound declicking"
 msgstr ""
 
 #: xrc/MainMenu.xrc:421
@@ -3581,7 +3594,7 @@ msgid "&Game Boy Advance"
 msgstr ""
 
 #: xrc/MainMenu.xrc:500 xrc/MainMenu.xrc:523
-msgid "Configure ..."
+msgid "Configure..."
 msgstr ""
 
 #: xrc/MainMenu.xrc:504
@@ -3601,15 +3614,15 @@ msgid "&LCD Filter"
 msgstr ""
 
 #: xrc/MainMenu.xrc:527
-msgid "&GB color option"
+msgid "&Game Boy color option"
 msgstr ""
 
 #: xrc/MainMenu.xrc:535
-msgid "&GB Colorizer Hack (requires restart)"
+msgid "&Game Boy Colorizer Hack (requires restart)"
 msgstr ""
 
 #: xrc/MainMenu.xrc:539
-msgid "&GB printer"
+msgid "&Game Boy printer"
 msgstr ""
 
 #: xrc/MainMenu.xrc:543
@@ -3621,31 +3634,31 @@ msgid "&Save printouts as screen captures"
 msgstr ""
 
 #: xrc/MainMenu.xrc:552
-msgid "&Use GB BIOS file (requires restart)"
+msgid "&Use Game Boy BIOS file (requires restart)"
 msgstr ""
 
 #: xrc/MainMenu.xrc:556
-msgid "&Use GBC BIOS file"
+msgid "&Use Game Boy Color BIOS file"
 msgstr ""
 
 #: xrc/MainMenu.xrc:561
-msgid "&General ..."
+msgid "&General..."
 msgstr ""
 
 #: xrc/MainMenu.xrc:564
-msgid "&Speedup / Turbo ..."
+msgid "&Speedup / Turbo..."
 msgstr ""
 
 #: xrc/MainMenu.xrc:567
-msgid "D&irectories ..."
+msgid "D&irectories..."
 msgstr ""
 
 #: xrc/MainMenu.xrc:570
-msgid "&Key Shortcuts ..."
+msgid "&Key Shortcuts..."
 msgstr ""
 
 #: xrc/MainMenu.xrc:573
-msgid "&UI Settings ..."
+msgid "&UI Settings..."
 msgstr ""
 
 #: xrc/MainMenu.xrc:577
@@ -3657,15 +3670,15 @@ msgid "&Cheats"
 msgstr ""
 
 #: xrc/MainMenu.xrc:581
-msgid "List &cheats ..."
+msgid "List &cheats..."
 msgstr ""
 
 #: xrc/MainMenu.xrc:584
-msgid "Find c&heat ..."
+msgid "Find c&heat..."
 msgstr ""
 
 #: xrc/MainMenu.xrc:588
-msgid "A&utomatically save/load cheats"
+msgid "A&utomatically save / load cheats"
 msgstr ""
 
 #: xrc/MainMenu.xrc:592
@@ -3801,7 +3814,7 @@ msgid "Report &Bugs"
 msgstr ""
 
 #: xrc/MainMenu.xrc:727
-msgid "VBA-M Support &Forum"
+msgid "Visual Boy Advance-M Support &Forum"
 msgstr ""
 
 #: xrc/MainMenu.xrc:730
@@ -3837,19 +3850,19 @@ msgid "Frame"
 msgstr ""
 
 #: xrc/MapViewer.xrc:35
-msgid "BG0"
+msgid "BG 0"
 msgstr ""
 
 #: xrc/MapViewer.xrc:41
-msgid "BG1"
+msgid "BG 1"
 msgstr ""
 
 #: xrc/MapViewer.xrc:46
-msgid "BG2"
+msgid "BG 2"
 msgstr ""
 
 #: xrc/MapViewer.xrc:51
-msgid "BG3"
+msgid "BG 3"
 msgstr ""
 
 #: xrc/MapViewer.xrc:84
@@ -3957,7 +3970,7 @@ msgid "Sound Settings"
 msgstr ""
 
 #: xrc/SoundConfig.xrc:16
-msgid "Volume :"
+msgid "Volume:"
 msgstr ""
 
 #: xrc/SoundConfig.xrc:34
@@ -3969,7 +3982,7 @@ msgid "Maximum"
 msgstr ""
 
 #: xrc/SoundConfig.xrc:71
-msgid "Sample rate :"
+msgid "Sample rate:"
 msgstr ""
 
 #: xrc/SoundConfig.xrc:77
@@ -3997,7 +4010,7 @@ msgid "OpenAL"
 msgstr ""
 
 #: xrc/SoundConfig.xrc:118
-msgid "DirectSound"
+msgid "Direct Sound"
 msgstr ""
 
 #: xrc/SoundConfig.xrc:125
@@ -4045,7 +4058,7 @@ msgid "Center"
 msgstr ""
 
 #: xrc/SoundConfig.xrc:269
-msgid "Left/Right"
+msgid "Left / Right"
 msgstr ""
 
 #: xrc/SoundConfig.xrc:298
diff --git a/src/wx/cmdevents.cpp b/src/wx/cmdevents.cpp
index 82879197..f59dc0e6 100644
--- a/src/wx/cmdevents.cpp
+++ b/src/wx/cmdevents.cpp
@@ -131,17 +131,16 @@ EVT_HANDLER(wxID_OPEN, "Open ROM...")
     open_dir = wxGetApp().GetAbsolutePath(gopts.gba_rom_dir);
     // FIXME: ignore if non-existent or not a dir
     wxString pats = _(
-        "GameBoy Advance Files (*.agb;*.gba;*.bin;*.elf;*.mb;*.zip;*.7z;*.rar)|"
+        "Game Boy Advance Files (*.agb;*.gba;*.bin;*.elf;*.mb;*.zip;*.7z;*.rar)|"
         "*.agb;*.gba;*.bin;*.elf;*.mb;"
         "*.agb.gz;*.gba.gz;*.bin.gz;*.elf.gz;*.mb.gz;"
         "*.agb.z;*.gba.z;*.bin.z;*.elf.z;*.mb.z;"
-        "*.zip;*.7z;*.rar"
-        "|GameBoy Files (*.dmg;*.gb;*.gbc;*.cgb;*.sgb;*.zip;*.7z;*.rar)|"
+        "*.zip;*.7z;*.rar|"
+        "Game Boy Files (*.dmg;*.gb;*.gbc;*.cgb;*.sgb;*.zip;*.7z;*.rar)|"
         "*.dmg;*.gb;*.gbc;*.cgb;*.sgb;"
         "*.dmg.gz;*.gb.gz;*.gbc.gz;*.cgb.gz;*.sgb.gz;"
         "*.dmg.z;*.gb.z;*.gbc.z;*.cgb.z;*.sgb.z;"
-        "*.zip;*.7z;*.rar"
-        "|");
+        "*.zip;*.7z;*.rar|");
     pats.append(wxALL_FILES);
     wxFileDialog dlg(this, _("Open ROM file"), open_dir, wxT(""),
         pats,
@@ -160,12 +159,11 @@ EVT_HANDLER(OpenGB, "Open GB...")
     open_dir = wxGetApp().GetAbsolutePath(gopts.gb_rom_dir);
     // FIXME: ignore if non-existent or not a dir
     wxString pats = _(
-        "GameBoy Files (*.dmg;*.gb;*.gbc;*.cgb;*.sgb;*.zip;*.7z;*.rar)|"
+        "Game Boy Files (*.dmg;*.gb;*.gbc;*.cgb;*.sgb;*.zip;*.7z;*.rar)|"
         "*.dmg;*.gb;*.gbc;*.cgb;*.sgb;"
         "*.dmg.gz;*.gb.gz;*.gbc.gz;*.cgb.gz;*.sgb.gz;"
         "*.dmg.z;*.gb.z;*.gbc.z;*.cgb.z;*.sgb.z;"
-        "*.zip;*.7z;*.rar"
-        "|");
+        "*.zip;*.7z;*.rar|");
     pats.append(wxALL_FILES);
     wxFileDialog dlg(this, _("Open GB ROM file"), open_dir, wxT(""),
         pats,
@@ -184,12 +182,11 @@ EVT_HANDLER(OpenGBC, "Open GBC...")
     open_dir = wxGetApp().GetAbsolutePath(gopts.gbc_rom_dir);
     // FIXME: ignore if non-existent or not a dir
     wxString pats = _(
-        "GameBoy Color Files (*.dmg;*.gb;*.gbc;*.cgb;*.sgb;*.zip;*.7z;*.rar)|"
+        "Game Boy Color Files (*.dmg;*.gb;*.gbc;*.cgb;*.sgb;*.zip;*.7z;*.rar)|"
         "*.dmg;*.gb;*.gbc;*.cgb;*.sgb;"
         "*.dmg.gz;*.gb.gz;*.gbc.gz;*.cgb.gz;*.sgb.gz;"
         "*.dmg.z;*.gb.z;*.gbc.z;*.cgb.z;*.sgb.z;"
-        "*.zip;*.7z;*.rar"
-        "|");
+        "*.zip;*.7z;*.rar|");
     pats.append(wxALL_FILES);
     wxFileDialog dlg(this, _("Open GBC ROM file"), open_dir, wxT(""),
         pats,
@@ -622,83 +619,83 @@ EVT_HANDLER_MASK(RomInformation, "ROM information...", CMDEN_GB | CMDEN_GBA)
             break;
 
         case 0x01:
-            type = _("ROM+MBC1");
+            type = _("ROM + MBC1");
             break;
 
         case 0x02:
-            type = _("ROM+MBC1+RAM");
+            type = _("ROM + MBC1 + RAM");
             break;
 
         case 0x03:
-            type = _("ROM+MBC1+RAM+BATT");
+            type = _("ROM + MBC1 + RAM + BATT");
             break;
 
         case 0x05:
-            type = _("ROM+MBC2");
+            type = _("ROM + MBC2");
             break;
 
         case 0x06:
-            type = _("ROM+MBC2+BATT");
+            type = _("ROM + MBC2 + BATT");
             break;
 
         case 0x0b:
-            type = _("ROM+MMM01");
+            type = _("ROM + MMM01");
             break;
 
         case 0x0c:
-            type = _("ROM+MMM01+RAM");
+            type = _("ROM + MMM01 + RAM");
             break;
 
         case 0x0d:
-            type = _("ROM+MMM01+RAM+BATT");
+            type = _("ROM + MMM01 + RAM + BATT");
             break;
 
         case 0x0f:
-            type = _("ROM+MBC3+TIMER+BATT");
+            type = _("ROM + MBC3 + TIMER + BATT");
             break;
 
         case 0x10:
-            type = _("ROM+MBC3+TIMER+RAM+BATT");
+            type = _("ROM + MBC3 + TIMER + RAM + BATT");
             break;
 
         case 0x11:
-            type = _("ROM+MBC3");
+            type = _("ROM + MBC3");
             break;
 
         case 0x12:
-            type = _("ROM+MBC3+RAM");
+            type = _("ROM + MBC3 + RAM");
             break;
 
         case 0x13:
-            type = _("ROM+MBC3+RAM+BATT");
+            type = _("ROM + MBC3 + RAM + BATT");
             break;
 
         case 0x19:
-            type = _("ROM+MBC5");
+            type = _("ROM + MBC5");
             break;
 
         case 0x1a:
-            type = _("ROM+MBC5+RAM");
+            type = _("ROM + MBC5 + RAM");
             break;
 
         case 0x1b:
-            type = _("ROM+MBC5+RAM+BATT");
+            type = _("ROM + MBC5 + RAM + BATT");
             break;
 
         case 0x1c:
-            type = _("ROM+MBC5+RUMBLE");
+            type = _("ROM + MBC5 + RUMBLE");
             break;
 
         case 0x1d:
-            type = _("ROM+MBC5+RUMBLE+RAM");
+            type = _("ROM + MBC5 + RUMBLE + RAM");
             break;
 
         case 0x1e:
-            type = _("ROM+MBC5+RUMBLE+RAM+BATT");
+            type = _("ROM + MBC5 + RUMBLE + RAM + BATT");
             break;
 
         case 0x22:
-            type = _("ROM+MBC7+BATT");
+            type = _("ROM + MBC7 + BATT");
             break;
 
         case 0x55:
@@ -710,19 +707,19 @@ EVT_HANDLER_MASK(RomInformation, "ROM information...", CMDEN_GB | CMDEN_GBA)
             break;
 
         case 0xfc:
-            type = _("ROM+POCKET CAMERA");
+            type = _("ROM + POCKET CAMERA");
             break;
 
         case 0xfd:
-            type = _("ROM+BANDAI TAMA5");
+            type = _("ROM + BANDAI TAMA5");
             break;
 
         case 0xfe:
-            type = _("ROM+HuC-3");
+            type = _("ROM + HuC-3");
             break;
 
         case 0xff:
-            type = _("ROM+HuC-1");
+            type = _("ROM + HuC-1");
             break;
 
         default:
@@ -926,7 +923,7 @@ EVT_HANDLER_MASK(ImportBatteryFile, "Import battery file...", CMDEN_GB | CMDEN_G
         return;
 
     wxString fn = dlg.GetPath();
-    ret = wxMessageBox(_("Importing a battery file will erase any saved games (permanently after the next write).  Do you want to continue?"),
+    ret = wxMessageBox(_("Importing a battery file will erase any saved games (permanently after the next write). Do you want to continue?"),
         _("Confirm import"), wxYES_NO | wxICON_EXCLAMATION);
 
     if (ret == wxYES) {
@@ -941,11 +938,11 @@ EVT_HANDLER_MASK(ImportBatteryFile, "Import battery file...", CMDEN_GB | CMDEN_G
     }
 }
 
-EVT_HANDLER_MASK(ImportGamesharkCodeFile, "Import GameShark code file...", CMDEN_GB | CMDEN_GBA)
+EVT_HANDLER_MASK(ImportGamesharkCodeFile, "Import Game Shark code file...", CMDEN_GB | CMDEN_GBA)
 {
     static wxString path;
     wxFileDialog dlg(this, _("Select code file"), path, wxEmptyString,
-        panel->game_type() == IMAGE_GBA ? _("Gameshark Code File (*.spc;*.xpc)|*.spc;*.xpc") : _("Gameshark Code File (*.gcf)|*.gcf"),
+        panel->game_type() == IMAGE_GBA ? _("Game Shark Code File (*.spc;*.xpc)|*.spc;*.xpc") : _("Game Shark Code File (*.gcf)|*.gcf"),
         wxFD_OPEN | wxFD_FILE_MUST_EXIST);
     int ret = ShowModal(&dlg);
     path = dlg.GetDirectory();
@@ -954,7 +951,7 @@ EVT_HANDLER_MASK(ImportGamesharkCodeFile, "Import GameShark code file...", CMDEN
         return;
 
     wxString fn = dlg.GetPath();
-    ret = wxMessageBox(_("Importing a code file will replace any loaded cheats.  Do you want to continue?"),
+    ret = wxMessageBox(_("Importing a code file will replace any loaded cheats. Do you want to continue?"),
         _("Confirm import"), wxYES_NO | wxICON_EXCLAMATION);
 
     if (ret == wxYES) {
@@ -1062,10 +1059,10 @@ EVT_HANDLER_MASK(ImportGamesharkCodeFile, "Import GameShark code file...", CMDEN
 static wxString gss_path;
 
 EVT_HANDLER_MASK(ImportGamesharkActionReplaySnapshot,
-    "Import GameShark Action Replay snapshot...", CMDEN_GB | CMDEN_GBA)
+    "Import Game Shark Action Replay snapshot...", CMDEN_GB | CMDEN_GBA)
 {
     wxFileDialog dlg(this, _("Select snapshot file"), gss_path, wxEmptyString,
-        panel->game_type() == IMAGE_GBA ? _("GS & PAC Snapshots (*.sps;*.xps)|*.sps;*.xps|GameShark SP Snapshots (*.gsv)|*.gsv") : _("Gameboy Snapshot (*.gbs)|*.gbs"),
+        panel->game_type() == IMAGE_GBA ? _("GS & PAC Snapshots (*.sps;*.xps)|*.sps;*.xps|Game Shark SP Snapshots (*.gsv)|*.gsv") : _("Game Boy Snapshot (*.gbs)|*.gbs"),
         wxFD_OPEN | wxFD_FILE_MUST_EXIST);
     int ret = ShowModal(&dlg);
     gss_path = dlg.GetDirectory();
@@ -1074,7 +1071,7 @@ EVT_HANDLER_MASK(ImportGamesharkActionReplaySnapshot,
         return;
 
     wxString fn = dlg.GetPath();
-    ret = wxMessageBox(_("Importing a snapshot file will erase any saved games (permanently after the next write).  Do you want to continue?"),
+    ret = wxMessageBox(_("Importing a snapshot file will erase any saved games (permanently after the next write). Do you want to continue?"),
         _("Confirm import"), wxYES_NO | wxICON_EXCLAMATION);
 
     if (ret == wxYES) {
@@ -1141,7 +1138,7 @@ EVT_HANDLER_MASK(ExportGamesharkSnapshot, "Export GameShark snapshot...", CMDEN_
     wxString def_name = panel->game_name();
     def_name.append(wxT(".sps"));
     wxFileDialog dlg(this, _("Select snapshot file"), gss_path, def_name,
-        _("Gameshark Snapshot (*.sps)|*.sps"), wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
+        _("Game Shark Snapshot (*.sps)|*.sps"), wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
     int ret = ShowModal(&dlg);
     gss_path = dlg.GetDirectory();
 
@@ -1155,7 +1152,7 @@ EVT_HANDLER_MASK(ExportGamesharkSnapshot, "Export GameShark snapshot...", CMDEN_
                *n = XRCCTRL(*infodlg, "Notes", wxTextCtrl);
     tit->SetValue(wxString((const char*)&rom[0xa0], wxConvLibc, 12));
     dsc->SetValue(wxDateTime::Now().Format(wxT("%c")));
-    n->SetValue(_("Exported from VisualBoyAdvance-M"));
+    n->SetValue(_("Exported from Visual Boy Advance-M"));
 
     if (ShowModal(infodlg) != wxID_OK)
         return;
@@ -1788,7 +1785,7 @@ EVT_HANDLER_MASK(Load, "Load state...", CMDEN_GB | CMDEN_GBA)
         st_dir = panel->state_dir();
 
     wxFileDialog dlg(this, _("Select state file"), st_dir, wxEmptyString,
-        _("VisualBoyAdvance saved game files|*.sgm"), wxFD_OPEN | wxFD_FILE_MUST_EXIST);
+        _("Visual Boy Advance saved game files|*.sgm"), wxFD_OPEN | wxFD_FILE_MUST_EXIST);
     int ret = ShowModal(&dlg);
     st_dir = dlg.GetDirectory();
 
@@ -1881,7 +1878,7 @@ EVT_HANDLER_MASK(Save, "Save state as...", CMDEN_GB | CMDEN_GBA)
         st_dir = panel->state_dir();
 
     wxFileDialog dlg(this, _("Select state file"), st_dir, wxEmptyString,
-        _("VisualBoyAdvance saved game files|*.sgm"), wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
+        _("Visual Boy Advance saved game files|*.sgm"), wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
     int ret = ShowModal(&dlg);
     st_dir = dlg.GetDirectory();
 
@@ -2002,7 +1999,7 @@ EVT_HANDLER(ColorizerHack, "Enable Colorizer Hack (toggle)")
     GetMenuOptionBool("ColorizerHack", &val);
 
     if (val && gopts.use_bios_file_gb) {
-        wxLogError(_("Cannot use Colorizer Hack when GB BIOS File is enabled."));
+        wxLogError(_("Cannot use Colorizer Hack when Game Boy BIOS File is enabled."));
         val = 0;
         SetMenuOption("ColorizerHack", 0);
     }
@@ -2230,7 +2227,7 @@ EVT_HANDLER(IncreaseVolume, "Increase volume")
     update_opts();
     soundSetVolume((float)gopts.sound_vol / 100.0);
     wxString msg;
-    msg.Printf(_("Volume: %d%%"), gopts.sound_vol);
+    msg.Printf(_("Volume: %d %%"), gopts.sound_vol);
     systemScreenMessage(msg);
 }
 
@@ -2244,7 +2241,7 @@ EVT_HANDLER(DecreaseVolume, "Decrease volume")
     update_opts();
     soundSetVolume((float)gopts.sound_vol / 100.0);
     wxString msg;
-    msg.Printf(_("Volume: %d%%"), gopts.sound_vol);
+    msg.Printf(_("Volume: %d %%"), gopts.sound_vol);
     systemScreenMessage(msg);
 }
 
@@ -2913,18 +2910,22 @@ EVT_HANDLER(wxID_ABOUT, "About...")
     // but at least win32 standard about is nothing special
     ai.SetWebSite(wxT("http://www.vba-m.com/"));
     ai.SetIcon(GetIcons().GetIcon(wxSize(32, 32), wxIconBundle::FALLBACK_NEAREST_LARGER));
-    ai.SetDescription(_("Nintendo GameBoy (+Color+Advance) emulator."));
+    ai.SetDescription(_("Nintendo Game Boy / Color / Advance) emulator."));
     ai.SetCopyright(_("Copyright (C) 1999-2003 Forgotten\nCopyright (C) 2004-2006 VBA development team\nCopyright (C) 2007-2020 VBA-M development team"));
-    ai.SetLicense(_("This program is free software: you can redistribute it and/or modify\n"
-                    "it under the terms of the GNU General Public License as published by\n"
-                    "the Free Software Foundation, either version 2 of the License, or\n"
-                    "(at your option) any later version.\n\n"
-                    "This program is distributed in the hope that it will be useful,\n"
-                    "but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
-                    "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\n"
-                    "GNU General Public License for more details.\n\n"
-                    "You should have received a copy of the GNU General Public License\n"
-                    "along with this program.  If not, see http://www.gnu.org/licenses ."));
+    ai.SetLicense(_(
+"This program is free software: you can redistribute it and / or modify\n"
+"it under the terms of the GNU General Public License as published by\n"
+"the Free Software Foundation, either version 2 of the License, or\n"
+"(at your option) any later version.\n"
+"\n"
+"This program is distributed in the hope that it will be useful,\n"
+"but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
+"MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n"
+"GNU General Public License for more details.\n"
+"\n"
+"You should have received a copy of the GNU General Public License\n"
+"along with this program. If not, see http://www.gnu.org/licenses ."
+    ));
     // from gtk
     ai.AddDeveloper(wxT("Forgotten"));
     ai.AddDeveloper(wxT("kxu"));
@@ -3153,7 +3154,7 @@ EVT_HANDLER(BootRomGB, "Use the specified BIOS file for GB")
     GetMenuOptionInt("BootRomGB", &val, 1);
 
     if (val == 1 && colorizerHack == 1) {
-        wxLogError(_("Cannot use GB BIOS when Colorizer Hack is enabled."));
+        wxLogError(_("Cannot use Game Boy BIOS when Colorizer Hack is enabled."));
         val = 0;
         SetMenuOption("BootRomGB", 0);
     }
@@ -3214,7 +3215,7 @@ EVT_HANDLER_MASK(LanLink, "Start Network link", CMDEN_LINK_ANY)
     if (mode != LINK_DISCONNECTED) {
         // while we could deactivate the command when connected, it is more
         // user-friendly to display a message indidcating why
-        wxLogError(_("LAN link is already active.  Disable link mode to disconnect."));
+        wxLogError(_("LAN link is already active. Disable link mode to disconnect."));
         return;
     }
 
diff --git a/src/wx/config/internal/option-internal.cpp b/src/wx/config/internal/option-internal.cpp
index cc3d1021..985b6690 100644
--- a/src/wx/config/internal/option-internal.cpp
+++ b/src/wx/config/internal/option-internal.cpp
@@ -335,15 +335,15 @@ const std::array<OptionData, kNbOptions + 1> kAllOptionsData = {
                _("Retain aspect ratio when resizing"), Option::Type::kBool},
 
     /// GB
-    OptionData{"GB/BiosFile", "", _("BIOS file to use for GB, if enabled"),
+    OptionData{"GB/BiosFile", "", _("BIOS file to use for Game Boy, if enabled"),
                Option::Type::kString},
     OptionData{"GB/ColorOption", "GBColorOption",
-               _("GB color enhancement, if enabled"), Option::Type::kInt},
+               _("Game Boy color enhancement, if enabled"), Option::Type::kInt},
     OptionData{"GB/ColorizerHack", "ColorizerHack",
                _("Enable DX Colorization Hacks"), Option::Type::kInt},
     OptionData{"GB/LCDFilter", "GBLcdFilter", _("Apply LCD filter, if enabled"),
                Option::Type::kBool},
-    OptionData{"GB/GBCBiosFile", "", _("BIOS file to use for GBC, if enabled"),
+    OptionData{"GB/GBCBiosFile", "", _("BIOS file to use for Game Boy Color, if enabled"),
                Option::Type::kString},
     OptionData{"GB/Palette0", "",
                _("The default palette, as 8 comma-separated 4-digit hex "
@@ -366,7 +366,7 @@ const std::array<OptionData, kNbOptions + 1> kAllOptionsData = {
         Option::Type::kBool},
     OptionData{"GB/ROMDir", "", _("Directory to look for ROM files"),
                Option::Type::kString},
-    OptionData{"GB/GBCROMDir", "", _("Directory to look for GBC ROM files"),
+    OptionData{"GB/GBCROMDir", "", _("Directory to look for Game Boy Color ROM files"),
                Option::Type::kString},
 
     /// GBA
@@ -407,7 +407,7 @@ const std::array<OptionData, kNbOptions + 1> kAllOptionsData = {
     OptionData{"General/FreezeRecent", "", _("Freeze recent load list"),
                Option::Type::kBool},
     OptionData{"General/RecordingDir", "",
-               _("Directory to store A/V and game recordings (relative paths "
+               _("Directory to store A / V and game recordings (relative paths "
                  "are relative to ROM)"),
                Option::Type::kString},
     OptionData{"General/RewindInterval", "",
@@ -427,13 +427,13 @@ const std::array<OptionData, kNbOptions + 1> kAllOptionsData = {
     /// Joypad
     OptionData{"Joypad/*/*", "",
                _("The parameter Joypad/<n>/<button> contains a comma-separated "
-                 "list of key names which map to joypad #<n> button <button>.  "
+                 "list of key names which map to joypad #<n> button <button>. "
                  "Button is one of Up, Down, Left, Right, A, B, L, R, Select, "
-                 "Start, MotionUp, MotionDown, MotionLeft, MotionRight, AutoA, "
-                 "AutoB, Speed, Capture, GS"),
+                 "Start, Motion Up, Motion Down, Motion Left, Motion Right, Autofire A, "
+                 "Autofire B, Speed, Capture, GS"),
                Option::Type::kNone},
     OptionData{"Joypad/AutofireThrottle", "",
-               _("The autofire toggle period, in frames (1/60 s)"),
+               _("The autofire toggle period, in frames (1 / 60 s)"),
                Option::Type::kInt},
     OptionData{"Joypad/Default", "",
                _("The number of the stick to use in single-player mode"),
@@ -442,7 +442,7 @@ const std::array<OptionData, kNbOptions + 1> kAllOptionsData = {
     /// Keyboard
     OptionData{"Keyboard/*", "",
                _("The parameter Keyboard/<cmd> contains a comma-separated list "
-                 "of key names (e.g. Alt-Shift-F1).  When the named key is "
+                 "of key names (e.g. Alt + Shift + F1).  When the named key is "
                  "pressed, the command <cmd> is executed."),
                Option::Type::kNone},
 
@@ -450,14 +450,14 @@ const std::array<OptionData, kNbOptions + 1> kAllOptionsData = {
     OptionData{"preferences/agbPrint", "AGBPrinter",
                _("Enable AGB debug print"), Option::Type::kInt},
     OptionData{"preferences/autoFrameSkip", "FrameSkipAuto",
-               _("Auto skip frames."), Option::Type::kInt},
+               _("Auto skip frames"), Option::Type::kInt},
     OptionData{"preferences/autoPatch", "ApplyPatches",
-               _("Apply IPS/UPS/IPF patches if found"), Option::Type::kInt},
+               _("Apply IPS / UPS / IPF patches if found"), Option::Type::kInt},
     OptionData{"preferences/autoSaveLoadCheatList", "",
                _("Automatically save and load cheat list"),
                Option::Type::kBool},
     OptionData{"preferences/borderAutomatic", "",
-               _("Automatically enable border for Super GameBoy games"),
+               _("Automatically enable border for Super Game Boy games"),
                Option::Type::kInt},
     OptionData{"preferences/borderOn", "", _("Always enable border"),
                Option::Type::kInt},
@@ -469,10 +469,10 @@ const std::array<OptionData, kNbOptions + 1> kAllOptionsData = {
                _("Disable on-screen status messages"), Option::Type::kInt},
     OptionData{"preferences/emulatorType", "", _("Type of system to emulate"),
                Option::Type::kInt},
-    OptionData{"preferences/flashSize", "", _("Flash size 0 = 64KB 1 = 128KB"),
+    OptionData{"preferences/flashSize", "", _("Flash size 0 = 64 KB 1 = 128 KB"),
                Option::Type::kInt},
     OptionData{"preferences/frameSkip", "FrameSkip",
-               _("Skip frames.  Values are 0-9 or -1 to skip automatically "
+               _("Skip frames. Values are 0-9 or -1 to skip automatically "
                  "based on time."),
                Option::Type::kInt},
     OptionData{"preferences/gbPaletteOption", "", _("The palette to use"),
@@ -511,11 +511,11 @@ const std::array<OptionData, kNbOptions + 1> kAllOptionsData = {
                _("Do not overwrite native (battery) save when loading state"),
                Option::Type::kInt},
     OptionData{"preferences/throttle", "",
-               _("Throttle game speed, even when accelerated (0-450%, 0 = no "
+               _("Throttle game speed, even when accelerated (0-450 %, 0 = no "
                  "throttle)"),
                Option::Type::kUnsigned},
     OptionData{"preferences/speedupThrottle", "",
-               _("Set throttle for speedup key (0-3000%, 0 = no throttle)"),
+               _("Set throttle for speedup key (0-3000 %, 0 = no throttle)"),
                Option::Type::kUnsigned},
     OptionData{"preferences/speedupFrameSkip", "",
                _("Number of frames to skip with speedup (instead of speedup "
@@ -524,11 +524,11 @@ const std::array<OptionData, kNbOptions + 1> kAllOptionsData = {
     OptionData{"preferences/speedupThrottleFrameSkip", "",
                _("Use frame skip for speedup throttle"), Option::Type::kBool},
     OptionData{"preferences/useBiosGB", "BootRomGB",
-               _("Use the specified BIOS file for GB"), Option::Type::kBool},
+               _("Use the specified BIOS file for Game Boy"), Option::Type::kBool},
     OptionData{"preferences/useBiosGBA", "BootRomEn",
                _("Use the specified BIOS file"), Option::Type::kBool},
     OptionData{"preferences/useBiosGBC", "BootRomGBC",
-               _("Use the specified BIOS file for GBC"), Option::Type::kBool},
+               _("Use the specified BIOS file for Game Boy Color"), Option::Type::kBool},
     OptionData{"preferences/vsync", "VSync", _("Wait for vertical sync"),
                Option::Type::kBool},
 
@@ -567,19 +567,19 @@ const std::array<OptionData, kNbOptions + 1> kAllOptionsData = {
                Option::Type::kInt},
     OptionData{"Sound/Enable", "", _("Bit mask of sound channels to enable"),
                Option::Type::kInt},
-    OptionData{"Sound/GBAFiltering", "", _("GBA sound filtering (%)"),
+    OptionData{"Sound/GBAFiltering", "", _("Game Boy Advance sound filtering (%)"),
                Option::Type::kInt},
     OptionData{"Sound/GBAInterpolation", "GBASoundInterpolation",
-               _("GBA sound interpolation"), Option::Type::kBool},
-    OptionData{"Sound/GBDeclicking", "GBDeclicking", _("GB sound declicking"),
+               _("Game Boy Advance sound interpolation"), Option::Type::kBool},
+    OptionData{"Sound/GBDeclicking", "GBDeclicking", _("Game Boy sound declicking"),
                Option::Type::kBool},
-    OptionData{"Sound/GBEcho", "", _("GB echo effect (%)"), Option::Type::kInt},
+    OptionData{"Sound/GBEcho", "", _("Game Boy echo effect (%)"), Option::Type::kInt},
     OptionData{"Sound/GBEnableEffects", "GBEnhanceSound",
-               _("Enable GB sound effects"), Option::Type::kBool},
-    OptionData{"Sound/GBStereo", "", _("GB stereo effect (%)"),
+               _("Enable Game Boy sound effects"), Option::Type::kBool},
+    OptionData{"Sound/GBStereo", "", _("Game Boy stereo effect (%)"),
                Option::Type::kInt},
     OptionData{"Sound/GBSurround", "GBSurround",
-               _("GB surround sound effect (%)"), Option::Type::kBool},
+               _("Game Boy surround sound effect (%)"), Option::Type::kBool},
     OptionData{"Sound/Quality", "", _("Sound sample rate (kHz)"),
                Option::Type::kSoundQuality},
     OptionData{"Sound/Volume", "", _("Sound volume (%)"), Option::Type::kInt},
diff --git a/src/wx/dsound.cpp b/src/wx/dsound.cpp
index 3af22c51..5733aeb2 100644
--- a/src/wx/dsound.cpp
+++ b/src/wx/dsound.cpp
@@ -100,7 +100,7 @@ bool DirectSound::init(long sampleRate)
     pDirectSound->Initialize(&dev);
 
     if (hr != DS_OK) {
-        wxLogError(_("Cannot create DirectSound %08x"), hr);
+        wxLogError(_("Cannot create Direct Sound %08x"), hr);
         return false;
     }
 
diff --git a/src/wx/guiinit.cpp b/src/wx/guiinit.cpp
index f74800cd..d377b9f2 100644
--- a/src/wx/guiinit.cpp
+++ b/src/wx/guiinit.cpp
@@ -755,12 +755,12 @@ public:
         ch->Clear();
 
         if (clh.isgb) {
-            ch->Append(_("GameShark"));
-            ch->Append(_("GameGenie"));
+            ch->Append(_("Game Shark"));
+            ch->Append(_("Game Genie"));
         } else {
             ch->Append(_("Generic Code"));
-            ch->Append(_("GameShark Advance"));
-            ch->Append(_("CodeBreaker Advance"));
+            ch->Append(_("Game Shark Advance"));
+            ch->Append(_("Code Breaker Advance"));
             ch->Append(_("Flashcart CHT"));
         }
 
@@ -1731,7 +1731,7 @@ public:
         wxString s;
 
         for (size_t i = 0; i < vm.size(); i++) {
-            s.Printf(_("%d x %d - %dbpp @ %dHz"), vm[i].w, vm[i].h, vm[i].bpp, vm[i].refresh);
+            s.Printf(_("%d x %d - %d bpp @ %d Hz"), vm[i].w, vm[i].h, vm[i].bpp, vm[i].refresh);
             c->Append(s);
 
             if (!modeno && gopts.fs_mode.w == vm[i].w && gopts.fs_mode.h == vm[i].h) {
@@ -1973,7 +1973,7 @@ public:
     void ResetAll(wxCommandEvent& ev)
     {
         (void)ev; // unused params
-        if (user_accels.empty() || wxMessageBox(_("This will clear all user-defined accelerators.  Are you sure?"), _("Confirm"), wxYES_NO) != wxYES)
+        if (user_accels.empty() || wxMessageBox(_("This will clear all user-defined accelerators. Are you sure?"), _("Confirm"), wxYES_NO) != wxYES)
             return;
 
         user_accels.clear();
@@ -2768,7 +2768,7 @@ bool MainFrame::BindControls()
                                         if (cmdtab[cmd].cmd_id == e->GetCommand())
                                             break;
 
-                                    wxLogInfo(_("Menu accelerator %s for %s overrides default for %s ; keeping menu"),
+                                    wxLogInfo(_("Menu accelerator %s for %s overrides default for %s; keeping menu"),
                                         wxKeyTextCtrl::ToString(a->GetFlags(), a->GetKeyCode()).c_str(),
                                         mi->GetItemLabelText().c_str(),
                                         cmdtab[cmd].cmd.c_str());
diff --git a/src/wx/panel.cpp b/src/wx/panel.cpp
index 1c568db0..cd737e03 100644
--- a/src/wx/panel.cpp
+++ b/src/wx/panel.cpp
@@ -259,7 +259,7 @@ void GameArea::LoadGame(const wxString& name)
 
         // Disable bios loading when using colorizer hack.
         if (gopts.use_bios_file_gb && colorizerHack) {
-            wxLogError(_("Cannot use GB BIOS file when Colorizer Hack is enabled, disabling GB BIOS file."));
+            wxLogError(_("Cannot use Game Boy BIOS file when Colorizer Hack is enabled, disabling Game Boy BIOS file."));
             gopts.use_bios_file_gb = false;
             update_opts();
         }
@@ -929,7 +929,7 @@ void GameArea::ShowFullScreen(bool full)
             wxDisplay d(dno);
 
             if (!d.ChangeMode(gopts.fs_mode)) {
-                wxLogInfo(_("Fullscreen mode %dx%d-%d@%d not supported; looking for another"),
+                wxLogInfo(_("Fullscreen mode %d x %d - %d @ %d not supported; looking for another"),
                     gopts.fs_mode.w, gopts.fs_mode.h, gopts.fs_mode.bpp, gopts.fs_mode.refresh);
                 // specifying a mode may not work with bpp/rate of 0
                 // in particular, unix does Matches() in wrong direction
@@ -967,12 +967,12 @@ void GameArea::ShowFullScreen(bool full)
                     i = best_mode;
 
                 if (i == vm.size()) {
-                    wxLogWarning(_("Fullscreen mode %dx%d-%d@%d not supported"),
+                    wxLogWarning(_("Fullscreen mode %d x %d - %d @ %d not supported"),
                         gopts.fs_mode.w, gopts.fs_mode.h, gopts.fs_mode.bpp, gopts.fs_mode.refresh);
                     gopts.fs_mode = wxVideoMode();
 
                     for (i = 0; i < vm.size(); i++)
-                        wxLogInfo(_("Valid mode: %dx%d-%d@%d"), vm[i].w,
+                        wxLogInfo(_("Valid mode: %d x %d - %d @ %d"), vm[i].w,
                             vm[i].h, vm[i].bpp,
                             vm[i].refresh);
                 } else {
@@ -980,11 +980,11 @@ void GameArea::ShowFullScreen(bool full)
                     gopts.fs_mode.refresh = vm[i].refresh;
                 }
 
-                wxLogInfo(_("Chose mode %dx%d-%d@%d"),
+                wxLogInfo(_("Chose mode %d x %d - %d @ %d"),
                     gopts.fs_mode.w, gopts.fs_mode.h, gopts.fs_mode.bpp, gopts.fs_mode.refresh);
 
                 if (!d.ChangeMode(gopts.fs_mode)) {
-                    wxLogWarning(_("Failed to change mode to %dx%d-%d@%d"),
+                    wxLogWarning(_("Failed to change mode to %d x %d - %d @ %d"),
                         gopts.fs_mode.w, gopts.fs_mode.h, gopts.fs_mode.bpp, gopts.fs_mode.refresh);
                     gopts.fs_mode.w = 0;
                 }
@@ -1072,7 +1072,7 @@ void GameArea::OnIdle(wxIdleEvent& event)
             mf->GDBBreak();
 
         if (debugger && loaded != IMAGE_GBA) {
-            wxLogError(_("Not a valid GBA cartridge"));
+            wxLogError(_("Not a valid Game Boy Advance cartridge"));
             UnloadGame();
         }
 #endif
@@ -2524,7 +2524,7 @@ void GameArea::AddFrame(const uint16_t* data, int length)
     recording::MediaRet ret;
 
     if ((ret = vid_rec.AddFrame(data, length)) != recording::MRET_OK) {
-        wxLogError(_("Error in audio/video recording (%s); aborting"),
+        wxLogError(_("Error in audio / video recording (%s); aborting"),
             media_err(ret));
         vid_rec.Stop();
     }
diff --git a/src/wx/sys.cpp b/src/wx/sys.cpp
index 1f2bd52f..f4cc679f 100644
--- a/src/wx/sys.cpp
+++ b/src/wx/sys.cpp
@@ -446,7 +446,7 @@ void systemShowSpeed(int speed)
 {
     MainFrame* f = wxGetApp().frame;
     wxString s;
-    s.Printf(_("%d%%(%d, %d fps)"), speed, systemFrameSkip, frames * speed / 100);
+    s.Printf(_("%d %% (%d, %d fps)"), speed, systemFrameSkip, frames * speed / 100);
 
     switch (showSpeed) {
     case SS_NONE:
@@ -454,7 +454,7 @@ void systemShowSpeed(int speed)
         break;
 
     case SS_PERCENT:
-        f->GetPanel()->osdstat.Printf(_("%d%%"), speed);
+        f->GetPanel()->osdstat.Printf(_("%d %%"), speed);
         break;
 
     case SS_DETAILED:
diff --git a/src/wx/viewers.cpp b/src/wx/viewers.cpp
index ce8466cd..32b51224 100644
--- a/src/wx/viewers.cpp
+++ b/src/wx/viewers.cpp
@@ -814,7 +814,7 @@ public:
         bs->Append(_("0x00000000 - BIOS"));
         bs->Append(_("0x02000000 - WRAM"));
         bs->Append(_("0x03000000 - IRAM"));
-        bs->Append(_("0x04000000 - I/O"));
+        bs->Append(_("0x04000000 - I / O"));
         bs->Append(_("0x05000000 - PALETTE"));
         bs->Append(_("0x06000000 - VRAM"));
         bs->Append(_("0x07000000 - OAM"));
@@ -927,7 +927,7 @@ public:
         bs->Append(_("0xA000 - SRAM"));
         bs->Append(_("0xC000 - RAM"));
         bs->Append(_("0xD000 - WRAM"));
-        bs->Append(_("0xFF00 - I/O"));
+        bs->Append(_("0xFF00 - I / O"));
         bs->Append(_("0xFF80 - RAM"));
         bs->SetSelection(1);
         Fit();
diff --git a/src/wx/wxvbam.cpp b/src/wx/wxvbam.cpp
index 9e506c32..988751bf 100644
--- a/src/wx/wxvbam.cpp
+++ b/src/wx/wxvbam.cpp
@@ -610,7 +610,7 @@ bool wxvbamApp::OnCmdLineParsed(wxCmdLineParser& cl)
         wxFSFile* f = fs.OpenFile(wxT("memory:wxvbam.xrs#zip:wxvbam.xrs$wxvbam.xrc"));
 
         if (!f) {
-            wxLogError(_("Configuration/build error: can't find built-in xrc"));
+            wxLogError(_("Configuration / build error: can't find built-in xrc"));
             return false;
         }
 
@@ -619,9 +619,8 @@ bool wxvbamApp::OnCmdLineParsed(wxCmdLineParser& cl)
         delete f;
         wxString lm;
         lm.Printf(_("Wrote built-in configuration to %s.\n"
-                    "To override, remove all but changed root node(s).  "
-                    "First found root node of correct name in any .xrc or "
-                    ".xrs files in following search path overrides built-in:"),
+                    "To override, remove all but changed root node(s). First found root node of correct name in any ."
+                    "xrc or .xrs files in following search path overrides built-in:"),
             s.c_str());
         tack_full_path(lm);
         wxLogMessage(lm);
@@ -648,7 +647,7 @@ bool wxvbamApp::OnCmdLineParsed(wxCmdLineParser& cl)
         os.Write(builtin_over, sizeof(builtin_over));
         wxString lm;
         lm.Printf(_("Wrote built-in override file to %s\n"
-                    "To override, delete all but changed section.  First found section is used from search path:"),
+                    "To override, delete all but changed section. First found section is used from search path:"),
             s.c_str());
         wxString oi = wxFileName::GetPathSeparator();
         oi += wxT("vba-over.ini");
diff --git a/src/wx/xrc/CheatCreate.xrc b/src/wx/xrc/CheatCreate.xrc
index ebe163e1..3440554a 100644
--- a/src/wx/xrc/CheatCreate.xrc
+++ b/src/wx/xrc/CheatCreate.xrc
@@ -94,7 +94,7 @@
                     <flag>wxALL</flag>
                     <border>5</border>
                   </object>
-                  <label>Signed/Unsigned</label>
+                  <label>Signed / Unsigned</label>
                   <orient>wxVERTICAL</orient>
                 </object>
                 <flag>wxALL|wxEXPAND</flag>
diff --git a/src/wx/xrc/DisplayConfig.xrc b/src/wx/xrc/DisplayConfig.xrc
index 35f361f8..6fc91ced 100644
--- a/src/wx/xrc/DisplayConfig.xrc
+++ b/src/wx/xrc/DisplayConfig.xrc
@@ -87,7 +87,7 @@
                     <item>Super 2xSaI</item>
                     <item>Super Eagle</item>
                     <item>Pixelate</item>
-                    <item>Advance MAME Scale2x</item>
+                    <item>Advance MAME Scale 2x</item>
                     <item>Bilinear</item>
                     <item>Bilinear Plus</item>
                     <item>Scanlines</item>
@@ -112,7 +112,7 @@
               </object>
 			  <object class="sizeritem">
                 <object class="wxStaticText" name="PluginLab">
-                  <label>Plugin :</label>
+                  <label>Plugin:</label>
                 </object>
 				<flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
 				<border>5</border>
@@ -124,7 +124,7 @@
               </object>
               <object class="sizeritem">
                 <object class="wxStaticText">
-                  <label>Interframe blending :</label>
+                  <label>Interframe blending:</label>
                 </object>
                 <flag>wxRIGHT|wxALL|wxALIGN_CENTRE_VERTICAL</flag>
                 <border>5</border>
@@ -174,7 +174,7 @@
                   <orient>wxHORIZONTAL</orient>
                   <object class="sizeritem">
                     <object class="wxStaticText" name="FrameSkipLab">
-                      <label>_Number of frames to skip :</label>
+                      <label>_Number of frames to skip:</label>
                     </object>
                     <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
                     <border>5</border>
@@ -212,7 +212,7 @@
                     <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
                     <border>5</border>
                     <object class="wxStaticText">
-                      <label>Speed indicator :</label>
+                      <label>Speed indicator:</label>
                     </object>
                   </object>
                   <object class="sizeritem">
@@ -244,7 +244,7 @@
             <object class="wxBoxSizer">
               <object class="sizeritem">
                 <object class="wxStaticText">
-                  <label>Default magnification :</label>
+                  <label>Default magnification:</label>
                 </object>
                 <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
                 <border>5</border>
@@ -263,7 +263,7 @@
             <object class="wxBoxSizer">
               <object class="sizeritem">
                 <object class="wxStaticText">
-                  <label>Maximum magnification factor :</label>
+                  <label>Maximum magnification factor:</label>
                   <tooltip>0 = no maximum</tooltip>
                 </object>
                 <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
diff --git a/src/wx/xrc/GBColorPrefPanel.xrc b/src/wx/xrc/GBColorPrefPanel.xrc
index c55e51ed..4ea12ebd 100644
--- a/src/wx/xrc/GBColorPrefPanel.xrc
+++ b/src/wx/xrc/GBColorPrefPanel.xrc
@@ -14,8 +14,8 @@
             <item>Hot Desert</item>
             <item>Pink Dreams</item>
             <item>Weird Colors</item>
-            <item>Real GB Colors</item>
-            <item>Real 'GB on GBASP' Colors</item>
+            <item>Real Game Boy Colors</item>
+            <item>Real 'Game Boy on Game Boy Advance Special' Colors</item>
           </content>
         </object>
         <flag>wxALL|wxEXPAND</flag>
diff --git a/src/wx/xrc/GameBoyAdvanceConfig.xrc b/src/wx/xrc/GameBoyAdvanceConfig.xrc
index c423c34e..a0d9168e 100644
--- a/src/wx/xrc/GameBoyAdvanceConfig.xrc
+++ b/src/wx/xrc/GameBoyAdvanceConfig.xrc
@@ -18,7 +18,7 @@
                     <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
                     <border>5</border>
                     <object class="wxStaticText">
-                      <label>Save type :</label>
+                      <label>Save type:</label>
                     </object>
                   </object>
                   <object class="sizeritem">
@@ -40,14 +40,14 @@
                     <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
                     <border>5</border>
                     <object class="wxStaticText">
-                      <label>Flash size :</label>
+                      <label>Flash size:</label>
                     </object>
                   </object>
                   <object class="sizeritem">
                     <object class="wxChoice" name="FlashSize">
                       <content>
-                        <item>64K</item>
-                        <item>128K</item>
+                        <item>64 K</item>
+                        <item>128 K</item>
                       </content>
                     </object>
                     <option>1</option>
@@ -89,7 +89,7 @@
                   <orient>wxHORIZONTAL</orient>
                   <object class="sizeritem">
                     <object class="wxStaticText" name="BootRomLab">
-                      <label>BIOS file :</label>
+                      <label>BIOS file:</label>
                     </object>
                     <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
                     <border>5</border>
@@ -112,7 +112,7 @@
                   <orient>wxHORIZONTAL</orient>
                   <object class="sizeritem">
                     <object class="wxStaticText">
-                      <label>Current BIOS file :</label>
+                      <label>Current BIOS file:</label>
                     </object>
                     <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
                     <border>5</border>
@@ -200,7 +200,7 @@
                     <item>EEPROM</item>
                     <item>SRAM</item>
                     <item>Flash</item>
-                    <item>EEPROM+Sensor</item>
+                    <item>EEPROM + Sensor</item>
                     <item>None</item>
                   </content>
                 </object>
@@ -218,8 +218,8 @@
                 <object class="wxChoice" name="OvFlashSize">
                   <content>
                     <item>Default</item>
-                    <item>64K</item>
-                    <item>128K</item>
+                    <item>64 K</item>
+                    <item>128 K</item>
                   </content>
                 </object>
                 <flag>wxALL|wxEXPAND</flag>
diff --git a/src/wx/xrc/GameBoyConfig.xrc b/src/wx/xrc/GameBoyConfig.xrc
index 99daceda..efe63395 100644
--- a/src/wx/xrc/GameBoyConfig.xrc
+++ b/src/wx/xrc/GameBoyConfig.xrc
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <resource xmlns="http://www.wxwidgets.org/wxxrc" version="2.5.3.0">
   <object class="wxDialog" name="GameBoyConfig">
-    <title>GameBoy settings</title>
+    <title>Game Boy settings</title>
     <object class="wxBoxSizer">
     <orient>wxVERTICAL</orient>
     <object class="sizeritem">
@@ -17,7 +17,7 @@
               <orient>wxHORIZONTAL</orient>
               <object class="sizeritem">
                 <object class="wxStaticText">
-                  <label>Emulated _system :</label>
+                  <label>Emulated _system:</label>
                 </object>
                 <option>1</option>
                 <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
@@ -45,7 +45,7 @@
               <orient>wxHORIZONTAL</orient>
               <object class="sizeritem">
                 <object class="wxStaticText">
-                  <label>Display _borders :</label>
+                  <label>Display _borders:</label>
                 </object>
                 <option>1</option>
                 <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
@@ -81,7 +81,7 @@
               <orient>wxHORIZONTAL</orient>
               <object class="sizeritem">
                 <object class="wxStaticText" name="BootRomLab">
-                  <label>GB Boot _ROM file :</label>
+                  <label>Game Boy Boot _ROM file:</label>
                 </object>
                 <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
                 <border>5</border>
@@ -103,7 +103,7 @@
               <orient>wxHORIZONTAL</orient>
               <object class="sizeritem">
                 <object class="wxStaticText" name="CBootRomLab">
-                  <label>GBC Boot ROM _file :</label>
+                  <label>Game Boy Color Boot ROM _file:</label>
                 </object>
                 <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
                 <border>5</border>
@@ -128,7 +128,7 @@
               <orient>wxHORIZONTAL</orient>
               <object class="sizeritem">
                 <object class="wxStaticText">
-                  <label>Current GB BIOS file :</label>
+                  <label>Current Game Boy BIOS file:</label>
                 </object>
                 <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
                 <border>5</border>
@@ -149,7 +149,7 @@
               <orient>wxHORIZONTAL</orient>
               <object class="sizeritem">
                 <object class="wxStaticText">
-              <label>Current GBC BIOS file :</label>
+              <label>Current Game Boy Color BIOS file:</label>
                 </object>
                 <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
                 <border>5</border>
diff --git a/src/wx/xrc/GeneralConfig.xrc b/src/wx/xrc/GeneralConfig.xrc
index 2117962f..7a9c4c5b 100644
--- a/src/wx/xrc/GeneralConfig.xrc
+++ b/src/wx/xrc/GeneralConfig.xrc
@@ -54,7 +54,7 @@
               <orient>wxHORIZONTAL</orient>
               <object class="sizeritem">
                 <object class="wxStaticText">
-                  <label>_Rewind interval :</label>
+                  <label>_Rewind interval:</label>
                   <tooltip>If not empty or 0, enable rewind (seconds)</tooltip>
                 </object>
                 <flag>wxALL|wxALIGN_CENTRE_VERTICAL</flag>
diff --git a/src/wx/xrc/JoyPanel.xrc b/src/wx/xrc/JoyPanel.xrc
index 79aa1bf5..f5931ec0 100644
--- a/src/wx/xrc/JoyPanel.xrc
+++ b/src/wx/xrc/JoyPanel.xrc
@@ -5,7 +5,7 @@
       <orient>wxVERTICAL</orient>
       <object class="sizeritem">
         <object class="wxNotebook">
-          <tooltip>Click a field and press a key or move joystick to add.  Press backspace to delete last added key.  Resize window or click inside and move pointer to see entire contents if too small.</tooltip>
+          <tooltip>Click a field and press a key or move joystick to add. Press backspace to delete last added key. Resize window or click inside and move pointer to see entire contents if too small.</tooltip>
           <object class="notebookpage">
             <object class="wxPanel">
               <object class="wxFlexGridSizer">
@@ -339,7 +339,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxStaticText">
-                    <label>Motion Left/Dark</label>
+                    <label>Motion Left / Dark</label>
                   </object>
                   <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
                   <border>5</border>
@@ -383,7 +383,7 @@
                 </object>
                 <object class="sizeritem">
                   <object class="wxStaticText">
-                    <label>Motion Right/Light</label>
+                    <label>Motion Right / Light</label>
                   </object>
                   <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
                   <border>5</border>
diff --git a/src/wx/xrc/MainMenu.xrc b/src/wx/xrc/MainMenu.xrc
index 8a76a11b..4cffaad6 100644
--- a/src/wx/xrc/MainMenu.xrc
+++ b/src/wx/xrc/MainMenu.xrc
@@ -7,10 +7,10 @@
         <label>Open...</label>
       </object>
       <object class="wxMenuItem" name="OpenGB">
-        <label>Open _GB...</label>
+        <label>Open _Game Boy...</label>
       </object>
       <object class="wxMenuItem" name="OpenGBC">
-        <label>Open GB_C...</label>
+        <label>Open Game Boy _Color...</label>
       </object>
       <object class="wxMenu" name="RecentMenu">
         <label>Open rece_nt</label>
@@ -86,7 +86,7 @@
         </object>
         <object class="separator"/>
         <object class="wxMenuItem" name="Load">
-          <label>From _File ...</label>
+          <label>From _File...</label>
         </object>
         <object class="separator"/>
         <object class="wxMenuItem" name="KeepSaves">
@@ -142,7 +142,7 @@
         </object>
         <object class="separator"/>
         <object class="wxMenuItem" name="Save">
-          <label>To _File ...</label>
+          <label>To _File...</label>
         </object>
         <label>_Save state</label>
       </object>
@@ -158,7 +158,7 @@
           <label>_Battery file...</label>
         </object>
         <object class="wxMenuItem" name="ImportGamesharkCodeFile">
-          <label>Gameshark _code file...</label>
+          <label>Game Shark _code file...</label>
         </object>
         <object class="wxMenuItem" name="ImportGamesharkActionReplaySnapshot">
           <label>_Gameshark snapshot...</label>
@@ -170,7 +170,7 @@
           <label>_Battery file...</label>
         </object>
         <object class="wxMenuItem" name="ExportGamesharkSnapshot">
-          <label>_Gameshark snapshot...</label>
+          <label>_Game Shark snapshot...</label>
         </object>
         <label>_Export</label>
       </object>
@@ -252,7 +252,7 @@
         <checkable>1</checkable>
       </object>
       <object class="wxMenuItem" name="ApplyPatches">
-        <label>_Auto IPS/UPS/IPF patch</label>
+        <label>_Auto IPS / UPS / IPF patch</label>
         <checkable>1</checkable>
       </object>
       <object class="wxMenuItem" name="PauseWhenInactive">
@@ -269,7 +269,7 @@
       <object class="wxMenu" name="LinkMenu">
         <label>_Link</label>
         <object class="wxMenuItem" name="LanLink">
-          <label>Start _Network Link ...</label>
+          <label>Start _Network Link...</label>
         </object>
         <object class="wxMenu">
           <label>_Type</label>
@@ -286,7 +286,7 @@
             <checkable>1</checkable>
           </object>
           <object class="wxMenuItem" name="LinkType3GameCube">
-            <label>_GameCube</label>
+            <label>_Game Cube</label>
             <checkable>1</checkable>
           </object>
           <object class="wxMenuItem" name="LinkType4Gameboy">
@@ -307,13 +307,13 @@
           <checkable>1</checkable>
         </object>
         <object class="wxMenuItem" name="LinkConfigure">
-          <label>_Configure ...</label>
+          <label>_Configure...</label>
         </object>
       </object>
       <object class="wxMenu">
         <label>_Video</label>
         <object class="wxMenuItem" name="DisplayConfigure">
-          <label>_Configure ...</label>
+          <label>_Configure...</label>
         </object>
         <object class="separator"/>
         <object class="wxMenuItem" name="Fullscreen">
@@ -384,7 +384,7 @@
       <object class="wxMenu">
         <label>_Audio</label>
         <object class="wxMenuItem" name="SoundConfigure">
-          <label>_Configure ...</label>
+          <label>_Configure...</label>
         </object>
         <object class="wxMenuItem" name="IncreaseVolume">
           <label>_Increase volume</label>
@@ -400,27 +400,27 @@
         </object>
         <object class="separator"/>
         <object class="wxMenuItem" name="GBASoundInterpolation">
-          <label>_GBA sound interpolation</label>
+          <label>_Game Boy Advance sound interpolation</label>
           <checkable>1</checkable>
         </object>
         <object class="separator"/>
         <object class="wxMenuItem" name="GBEnhanceSound">
-          <label>_GB sound enhancement</label>
+          <label>_Game Boy sound enhancement</label>
           <checkable>1</checkable>
         </object>
         <object class="wxMenuItem" name="GBSurround">
-          <label>_GB surround sound effect</label>
+          <label>_Game Boy surround sound effect</label>
           <checkable>1</checkable>
         </object>
         <object class="wxMenuItem" name="GBDeclicking">
-          <label>_GB sound declicking</label>
+          <label>_Game Boy sound declicking</label>
           <checkable>1</checkable>
         </object>
       </object>
       <object class="wxMenu">
         <label>_Input</label>
         <object class="wxMenuItem" name="JoypadConfigure">
-          <label>_Configure ...</label>
+          <label>_Configure...</label>
         </object>
         <object class="wxMenuItem" name="AllowKeyboardBackgroundInput">
           <label>Allow _keyboard background input</label>
@@ -497,7 +497,7 @@
       <object class="wxMenu">
         <label>_Game Boy Advance</label>
         <object class="wxMenuItem" name="GameBoyAdvanceConfigure">
-          <label>Configure ...</label>
+          <label>Configure...</label>
         </object>
         <object class="separator"/>
         <object class="wxMenuItem" name="RTC">
@@ -520,11 +520,11 @@
       <object class="wxMenu">
         <label>_Game Boy</label>
         <object class="wxMenuItem" name="GameBoyConfigure">
-          <label>Configure ...</label>
+          <label>Configure...</label>
         </object>
         <object class="separator"/>
         <object class="wxMenuItem" name="GBColorOption">
-          <label>_GB color option</label>
+          <label>_Game Boy color option</label>
           <checkable>1</checkable>
         </object>
         <object class="wxMenuItem" name="GBLcdFilter">
@@ -532,11 +532,11 @@
           <checkable>1</checkable>
         </object>
         <object class="wxMenuItem" name="ColorizerHack">
-          <label>_GB Colorizer Hack (requires restart)</label>
+          <label>_Game Boy Colorizer Hack (requires restart)</label>
           <checkable>1</checkable>
         </object>        
         <object class="wxMenuItem" name="Printer">
-          <label>_GB printer</label>
+          <label>_Game Boy printer</label>
           <checkable>1</checkable>
         </object>
         <object class="wxMenuItem" name="PrintGather">
@@ -549,28 +549,28 @@
         </object>
         <object class="separator"/>
         <object class="wxMenuItem" name="BootRomGB">
-          <label>_Use GB BIOS file (requires restart)</label>
+          <label>_Use Game Boy BIOS file (requires restart)</label>
           <checkable>1</checkable>
         </object>
         <object class="wxMenuItem" name="BootRomGBC">
-          <label>_Use GBC BIOS file</label>
+          <label>_Use Game Boy Color BIOS file</label>
           <checkable>1</checkable>
         </object>
       </object>
         <object class="wxMenuItem" name="GeneralConfigure">
-          <label>_General ...</label>
+          <label>_General...</label>
         </object>
         <object class="wxMenuItem" name="SpeedupConfigure">
-          <label>_Speedup / Turbo ...</label>
+          <label>_Speedup / Turbo...</label>
         </object>
         <object class="wxMenuItem" name="EmulatorDirectories">
-          <label>D_irectories ...</label>
+          <label>D_irectories...</label>
         </object>
         <object class="wxMenuItem" name="Customize">
-          <label>_Key Shortcuts ...</label>
+          <label>_Key Shortcuts...</label>
         </object>
         <object class="wxMenuItem" name="UIConfigure">
-          <label>_UI Settings ...</label>
+          <label>_UI Settings...</label>
         </object>
     </object>
     <object class="wxMenu">
@@ -578,14 +578,14 @@
       <object class="wxMenu">
         <label>_Cheats</label>
         <object class="wxMenuItem" name="CheatsList">
-          <label>List _cheats ...</label>
+          <label>List _cheats...</label>
         </object>
         <object class="wxMenuItem" name="CheatsSearch">
-          <label>Find c_heat ...</label>
+          <label>Find c_heat...</label>
         </object>
         <object class="separator"/>
         <object class="wxMenuItem" name="CheatsAutoSaveLoad">
-          <label>A_utomatically save/load cheats</label>
+          <label>A_utomatically save / load cheats</label>
           <checkable>1</checkable>
         </object>
         <object class="wxMenuItem" name="CheatsEnable">
@@ -724,7 +724,7 @@
         <label>Report _Bugs</label>
       </object>
       <object class="wxMenuItem" name="FAQ">
-        <label>VBA-M Support _Forum</label>
+        <label>Visual Boy Advance-M Support _Forum</label>
       </object>
       <object class="wxMenuItem" name="Translate">
         <label>Translations</label>
diff --git a/src/wx/xrc/MapViewer.xrc b/src/wx/xrc/MapViewer.xrc
index 5111071f..6e7173c5 100644
--- a/src/wx/xrc/MapViewer.xrc
+++ b/src/wx/xrc/MapViewer.xrc
@@ -32,23 +32,23 @@
                 <object class="wxStaticBoxSizer">
                   <object class="sizeritem">
                     <object class="wxRadioButton" name="BG0">
-                      <label>BG0</label>
+                      <label>BG 0</label>
                       <style>wxRB_GROUP</style>
                     </object>
                   </object>
                   <object class="sizeritem">
                     <object class="wxRadioButton" name="BG1">
-                      <label>BG1</label>
+                      <label>BG 1</label>
                     </object>
                   </object>
                   <object class="sizeritem">
                     <object class="wxRadioButton" name="BG2">
-                      <label>BG2</label>
+                      <label>BG 2</label>
                     </object>
                   </object>
                   <object class="sizeritem">
                     <object class="wxRadioButton" name="BG3">
-                      <label>BG3</label>
+                      <label>BG 3</label>
                     </object>
                   </object>
                   <label>Background</label>
diff --git a/src/wx/xrc/SoundConfig.xrc b/src/wx/xrc/SoundConfig.xrc
index 9e6c54cc..c9dd5120 100644
--- a/src/wx/xrc/SoundConfig.xrc
+++ b/src/wx/xrc/SoundConfig.xrc
@@ -13,7 +13,7 @@
             <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
             <border>5</border>
             <object class="wxStaticText">
-              <label>Volume :</label>
+              <label>Volume:</label>
             </object>
           </object>
           <object class="sizeritem">
@@ -68,7 +68,7 @@
             <flag>wxALL|wxALIGN_RIGHT|wxALIGN_CENTRE_VERTICAL</flag>
             <border>5</border>
             <object class="wxStaticText">
-              <label>Sample rate :</label>
+              <label>Sample rate:</label>
             </object>
           </object>
           <object class="sizeritem">
@@ -115,7 +115,7 @@
                   </object>
                   <object class="sizeritem">
                     <object class="wxRadioButton" name="DirectSound">
-                      <label>DirectSound</label>
+                      <label>Direct Sound</label>
                     </object>
                     <flag>wxALL</flag>
                     <border>5</border>
@@ -266,7 +266,7 @@
                         </object>
                         <object class="sizeritem">
                           <object class="wxStaticText">
-                            <label>Left/Right</label>
+                            <label>Left / Right</label>
                           </object>
                           <flag>wxALL</flag>
                           <border>5</border>