From bbd5b76f2aab65c75e0b98e6daa315e2370af1c9 Mon Sep 17 00:00:00 2001
From: Rafael Kitover <rkitover@gmail.com>
Date: Wed, 24 Apr 2024 02:00:25 +0000
Subject: [PATCH] translations: transifex pull

Signed-off-by: Rafael Kitover <rkitover@gmail.com>
---
 po/wxvbam/bg.po      | 437 +++++++++++++++++++++++--------------------
 po/wxvbam/br.po      | 437 +++++++++++++++++++++++--------------------
 po/wxvbam/cs.po      | 437 +++++++++++++++++++++++--------------------
 po/wxvbam/de.po      | 437 +++++++++++++++++++++++--------------------
 po/wxvbam/el.po      | 437 +++++++++++++++++++++++--------------------
 po/wxvbam/es.po      | 437 +++++++++++++++++++++++--------------------
 po/wxvbam/es_419.po  | 437 +++++++++++++++++++++++--------------------
 po/wxvbam/fr_FR.po   | 437 +++++++++++++++++++++++--------------------
 po/wxvbam/gl.po      | 437 +++++++++++++++++++++++--------------------
 po/wxvbam/he_IL.po   | 437 +++++++++++++++++++++++--------------------
 po/wxvbam/hu_HU.po   | 437 +++++++++++++++++++++++--------------------
 po/wxvbam/id.po      | 437 +++++++++++++++++++++++--------------------
 po/wxvbam/it_IT.po   | 437 +++++++++++++++++++++++--------------------
 po/wxvbam/ja.po      | 437 +++++++++++++++++++++++--------------------
 po/wxvbam/ja_JP.po   | 437 +++++++++++++++++++++++--------------------
 po/wxvbam/ko_KR.po   | 437 +++++++++++++++++++++++--------------------
 po/wxvbam/ms_MY.po   | 437 +++++++++++++++++++++++--------------------
 po/wxvbam/nb.po      | 437 +++++++++++++++++++++++--------------------
 po/wxvbam/nl.po      | 437 +++++++++++++++++++++++--------------------
 po/wxvbam/pl_PL.po   | 437 +++++++++++++++++++++++--------------------
 po/wxvbam/pt_BR.po   | 437 +++++++++++++++++++++++--------------------
 po/wxvbam/pt_PT.po   | 437 +++++++++++++++++++++++--------------------
 po/wxvbam/ru_RU.po   | 437 +++++++++++++++++++++++--------------------
 po/wxvbam/sv.po      | 437 +++++++++++++++++++++++--------------------
 po/wxvbam/tr.po      | 437 +++++++++++++++++++++++--------------------
 po/wxvbam/uk.po      | 437 +++++++++++++++++++++++--------------------
 po/wxvbam/ur_PK.po   | 437 +++++++++++++++++++++++--------------------
 po/wxvbam/zh-Hans.po | 437 +++++++++++++++++++++++--------------------
 po/wxvbam/zh_CN.po   | 437 +++++++++++++++++++++++--------------------
 29 files changed, 6873 insertions(+), 5800 deletions(-)

diff --git a/po/wxvbam/bg.po b/po/wxvbam/bg.po
index 64b08be5..738b3e5d 100644
--- a/po/wxvbam/bg.po
+++ b/po/wxvbam/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VBA-M\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-23 22:00+0000\n"
+"POT-Creation-Date: 2024-04-24 02:00+0000\n"
 "PO-Revision-Date: 2011-12-03 19:42+0000\n"
 "Last-Translator: Aleksandar Hadzhivelichkov <Raphaelo245@gmail.com>, 2022\n"
 "Language-Team: Bulgarian (http://app.transifex.com/bgk/vba-m/language/bg/)\n"
@@ -319,174 +319,263 @@ msgstr ""
 msgid "Network is not supported in local mode."
 msgstr "Мрежа не се поддържа в локален режим."
 
-#: config/internal/option-internal.cpp:379
-msgid "Use bilinear filter with 3d renderer"
+#: config/command.cpp:28 xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
+msgid "Up"
+msgstr "Нагоре"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
+msgid "Down"
+msgstr "Надолу"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
+msgid "Left"
+msgstr "Наляво"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
+msgid "Right"
+msgstr "Надясно"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:37
+msgid "A"
+msgstr "A"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:83
+msgid "B"
+msgstr "B"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:129
+msgid "L"
+msgstr "L"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:175
+msgid "R"
+msgstr "R"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
+msgid "Select"
+msgstr "Избери"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
+msgid "Start"
+msgstr "Започни"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:254
+msgid "Motion Up"
+msgstr "Движение нагоре"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:298
+msgid "Motion Down"
+msgstr "Движение надолу"
+
+#: config/command.cpp:30
+msgid "Motion Left"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion Right"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion In"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Motion Out"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto A"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto B"
+msgstr ""
+
+#: config/command.cpp:31 xrc/DisplayConfig.xrc:200
+msgid "Speed"
+msgstr "Скорост"
+
+#: config/command.cpp:31
+msgid "Capture"
+msgstr ""
+
+#: config/command.cpp:32
+msgid "GameShark"
+msgstr ""
+
+#: config/command.cpp:106
+#, c-format
+msgid "Joypad %zu %s"
 msgstr ""
 
 #: config/internal/option-internal.cpp:380
-msgid "Full-screen filter to apply"
+msgid "Use bilinear filter with 3d renderer"
 msgstr ""
 
 #: config/internal/option-internal.cpp:381
-msgid "Filter plugin library"
+msgid "Full-screen filter to apply"
 msgstr ""
 
 #: config/internal/option-internal.cpp:382
-msgid "Interframe blending function"
+msgid "Filter plugin library"
 msgstr ""
 
 #: config/internal/option-internal.cpp:383
+msgid "Interframe blending function"
+msgstr ""
+
+#: config/internal/option-internal.cpp:384
 msgid "Keep window on top"
 msgstr ""
 
-#: config/internal/option-internal.cpp:385
+#: config/internal/option-internal.cpp:386
 msgid "Maximum number of threads to run filters in"
 msgstr ""
 
-#: config/internal/option-internal.cpp:387
+#: config/internal/option-internal.cpp:388
 msgid "Render method; if unsupported, simple method will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:388
+#: config/internal/option-internal.cpp:389
 msgid "Default scale factor"
 msgstr ""
 
-#: config/internal/option-internal.cpp:389
+#: config/internal/option-internal.cpp:390
 msgid "Retain aspect ratio when resizing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:392
+#: config/internal/option-internal.cpp:393
 msgid "BIOS file to use for Game Boy, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:393
+#: config/internal/option-internal.cpp:394
 msgid "Game Boy color enhancement, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:394
+#: config/internal/option-internal.cpp:395
 msgid "Enable DX Colorization Hacks"
 msgstr ""
 
-#: config/internal/option-internal.cpp:395
-#: config/internal/option-internal.cpp:419
+#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:420
 msgid "Apply LCD filter, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:397
 msgid "BIOS file to use for Game Boy Color, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:398
+#: config/internal/option-internal.cpp:399
 msgid ""
 "The default palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:401
+#: config/internal/option-internal.cpp:402
 msgid ""
 "The first user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:404
+#: config/internal/option-internal.cpp:405
 msgid ""
 "The second user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:407
+#: config/internal/option-internal.cpp:408
 msgid "Automatically gather a full page before printing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:409
+#: config/internal/option-internal.cpp:410
 msgid "Automatically save printouts as screen captures with -print suffix"
 msgstr ""
 
-#: config/internal/option-internal.cpp:411
-#: config/internal/option-internal.cpp:439
+#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:440
 msgid "Directory to look for ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:413
 msgid "Directory to look for Game Boy Color ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:415
+#: config/internal/option-internal.cpp:416
 msgid "BIOS file to use, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:425
+#: config/internal/option-internal.cpp:426
 msgid "Enable link at boot"
 msgstr ""
 
-#: config/internal/option-internal.cpp:430
+#: config/internal/option-internal.cpp:431
 msgid "Enable faster network protocol by default"
 msgstr ""
 
-#: config/internal/option-internal.cpp:432
+#: config/internal/option-internal.cpp:433
 msgid "Default network link client host"
 msgstr ""
 
-#: config/internal/option-internal.cpp:433
+#: config/internal/option-internal.cpp:434
 msgid "Default network link server IP to bind"
 msgstr ""
 
-#: config/internal/option-internal.cpp:434
+#: config/internal/option-internal.cpp:435
 msgid "Default network link port (server and client)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:435
+#: config/internal/option-internal.cpp:436
 msgid "Default network protocol"
 msgstr ""
 
-#: config/internal/option-internal.cpp:436
+#: config/internal/option-internal.cpp:437
 msgid "Link timeout (ms)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:437
+#: config/internal/option-internal.cpp:438
 msgid "Link cable type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:442
+#: config/internal/option-internal.cpp:443
 msgid "Automatically load last saved state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:444
+#: config/internal/option-internal.cpp:445
 msgid ""
 "Directory to store game save files (relative paths are relative to ROM; "
 "blank is config dir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:446
+#: config/internal/option-internal.cpp:447
 msgid "Freeze recent load list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:448
+#: config/internal/option-internal.cpp:449
 msgid ""
 "Directory to store A / V and game recordings (relative paths are relative to"
 " ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:451
+#: config/internal/option-internal.cpp:452
 msgid "Number of seconds between rewind snapshots (0 to disable)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:453
+#: config/internal/option-internal.cpp:454
 msgid "Directory to store screenshots (relative paths are relative to ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:456
+#: config/internal/option-internal.cpp:457
 msgid ""
 "Directory to store saved state files (relative paths are relative to "
 "BatteryDir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:458
+#: config/internal/option-internal.cpp:459
 msgid "Enable status bar"
 msgstr ""
 
-#: config/internal/option-internal.cpp:459
+#: config/internal/option-internal.cpp:460
 msgid "INI file version (DO NOT MODIFY)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:463
+#: config/internal/option-internal.cpp:464
 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, "
@@ -494,266 +583,266 @@ msgid ""
 "MotionRight, AutoA, AutoB, Speed, Capture, GS"
 msgstr ""
 
-#: config/internal/option-internal.cpp:468
+#: config/internal/option-internal.cpp:469
 msgid "The autofire toggle period, in frames (1/60 s)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:469
+#: config/internal/option-internal.cpp:470
 msgid "The number of the stick to use in single-player mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:471
+#: config/internal/option-internal.cpp:472
 msgid "Whether to enable SDL GameController mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:475
+#: config/internal/option-internal.cpp:476
 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 "
 "executed."
 msgstr ""
 
-#: config/internal/option-internal.cpp:480
+#: config/internal/option-internal.cpp:481
 msgid "Enable AGB debug print"
 msgstr ""
 
-#: config/internal/option-internal.cpp:481
+#: config/internal/option-internal.cpp:482
 msgid "Auto skip frames"
 msgstr ""
 
-#: config/internal/option-internal.cpp:483
+#: config/internal/option-internal.cpp:484
 msgid "Apply IPS / UPS / IPF patches if found"
 msgstr ""
 
-#: config/internal/option-internal.cpp:485
+#: config/internal/option-internal.cpp:486
 msgid "Automatically save and load cheat list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:489
+#: config/internal/option-internal.cpp:490
 msgid "Automatically enable border for Super Game Boy games"
 msgstr ""
 
-#: config/internal/option-internal.cpp:491
+#: config/internal/option-internal.cpp:492
 msgid "Always enable border"
 msgstr ""
 
-#: config/internal/option-internal.cpp:492
+#: config/internal/option-internal.cpp:493
 msgid "Screen capture file format"
 msgstr ""
 
-#: config/internal/option-internal.cpp:493
+#: config/internal/option-internal.cpp:494
 msgid "Enable cheats"
 msgstr ""
 
-#: config/internal/option-internal.cpp:494
+#: config/internal/option-internal.cpp:495
 msgid "Disable on-screen status messages"
 msgstr ""
 
-#: config/internal/option-internal.cpp:495
+#: config/internal/option-internal.cpp:496
 msgid "Type of system to emulate"
 msgstr ""
 
-#: config/internal/option-internal.cpp:496
+#: config/internal/option-internal.cpp:497
 msgid "Flash size 0 = 64 KB 1 = 128 KB"
 msgstr ""
 
-#: config/internal/option-internal.cpp:498
+#: config/internal/option-internal.cpp:499
 msgid "Skip frames. Values are 0-9 or -1 to skip automatically based on time."
 msgstr ""
 
-#: config/internal/option-internal.cpp:500
+#: config/internal/option-internal.cpp:501
 msgid "The palette to use"
 msgstr ""
 
-#: config/internal/option-internal.cpp:501
+#: config/internal/option-internal.cpp:502
 msgid "Enable printer emulation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:503
+#: config/internal/option-internal.cpp:504
 msgid "Break into GDB after loading the game."
 msgstr ""
 
-#: config/internal/option-internal.cpp:504
+#: config/internal/option-internal.cpp:505
 msgid "Port to connect GDB to"
 msgstr ""
 
-#: config/internal/option-internal.cpp:506
+#: config/internal/option-internal.cpp:507
 msgid "Number of players in network"
 msgstr ""
 
-#: config/internal/option-internal.cpp:508
+#: config/internal/option-internal.cpp:509
 msgid "Maximum scale factor (0 = no limit)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:510
+#: config/internal/option-internal.cpp:511
 msgid "Pause game when main window loses focus"
 msgstr ""
 
-#: config/internal/option-internal.cpp:512
+#: config/internal/option-internal.cpp:513
 msgid "Enable RTC (vba-over.ini override is rtcEnabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:513
+#: config/internal/option-internal.cpp:514
 msgid "Native save (\"battery\") hardware type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:514
+#: config/internal/option-internal.cpp:515
 msgid "Show speed indicator"
 msgstr ""
 
-#: config/internal/option-internal.cpp:516
+#: config/internal/option-internal.cpp:517
 msgid "Draw on-screen messages transparently"
 msgstr ""
 
-#: config/internal/option-internal.cpp:517
+#: config/internal/option-internal.cpp:518
 msgid "Skip BIOS initialization"
 msgstr ""
 
-#: config/internal/option-internal.cpp:519
+#: config/internal/option-internal.cpp:520
 msgid "Do not overwrite cheat list when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:521
+#: config/internal/option-internal.cpp:522
 msgid "Do not overwrite native (battery) save when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:523
+#: config/internal/option-internal.cpp:524
 msgid "Throttle game speed, even when accelerated (0-450 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:526
+#: config/internal/option-internal.cpp:527
 msgid "Set throttle for speedup key (0-3000 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:528
+#: config/internal/option-internal.cpp:529
 msgid "Number of frames to skip with speedup (instead of speedup throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:531
+#: config/internal/option-internal.cpp:532
 msgid "Use frame skip for speedup throttle"
 msgstr ""
 
-#: config/internal/option-internal.cpp:532
+#: config/internal/option-internal.cpp:533
 msgid "Use the specified BIOS file for Game Boy"
 msgstr ""
 
-#: config/internal/option-internal.cpp:533
+#: config/internal/option-internal.cpp:534
 msgid "Use the specified BIOS file"
 msgstr ""
 
-#: config/internal/option-internal.cpp:535
+#: config/internal/option-internal.cpp:536
 msgid "Use the specified BIOS file for Game Boy Color"
 msgstr ""
 
-#: config/internal/option-internal.cpp:536
+#: config/internal/option-internal.cpp:537
 msgid "Wait for vertical sync"
 msgstr ""
 
-#: config/internal/option-internal.cpp:539
+#: config/internal/option-internal.cpp:540
 msgid "Enter fullscreen mode at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:540
+#: config/internal/option-internal.cpp:541
 msgid "Window maximized"
 msgstr ""
 
-#: config/internal/option-internal.cpp:541
+#: config/internal/option-internal.cpp:542
 msgid "Window height at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:542
+#: config/internal/option-internal.cpp:543
 msgid "Window width at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:543
+#: config/internal/option-internal.cpp:544
 msgid "Window axis X position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:544
+#: config/internal/option-internal.cpp:545
 msgid "Window axis Y position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:548
+#: config/internal/option-internal.cpp:549
 msgid "Capture key events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:550
+#: config/internal/option-internal.cpp:551
 msgid "Capture joy events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:551
+#: config/internal/option-internal.cpp:552
 msgid "Hide menu bar when mouse is inactive"
 msgstr ""
 
-#: config/internal/option-internal.cpp:553
+#: config/internal/option-internal.cpp:554
 msgid "Suspend screensaver when game is running"
 msgstr ""
 
-#: config/internal/option-internal.cpp:556
+#: config/internal/option-internal.cpp:557
 msgid "Sound API; if unsupported, default API will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:557
+#: config/internal/option-internal.cpp:558
 msgid "Device ID of chosen audio device for chosen driver"
 msgstr ""
 
-#: config/internal/option-internal.cpp:558
+#: config/internal/option-internal.cpp:559
 msgid "Number of sound buffers"
 msgstr ""
 
-#: config/internal/option-internal.cpp:559
+#: config/internal/option-internal.cpp:560
 msgid "Bit mask of sound channels to enable"
 msgstr ""
 
-#: config/internal/option-internal.cpp:560
+#: config/internal/option-internal.cpp:561
 msgid "Game Boy Advance sound filtering (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:562
+#: config/internal/option-internal.cpp:563
 msgid "Game Boy Advance sound interpolation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:563
+#: config/internal/option-internal.cpp:564
 msgid "Game Boy sound declicking"
 msgstr ""
 
-#: config/internal/option-internal.cpp:564
+#: config/internal/option-internal.cpp:565
 msgid "Game Boy echo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:565
+#: config/internal/option-internal.cpp:566
 msgid "Enable Game Boy sound effects"
 msgstr ""
 
-#: config/internal/option-internal.cpp:566
+#: config/internal/option-internal.cpp:567
 msgid "Game Boy stereo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:567
+#: config/internal/option-internal.cpp:568
 msgid "Game Boy surround sound effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:568
+#: config/internal/option-internal.cpp:569
 msgid "Sound sample rate (kHz)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:569
+#: config/internal/option-internal.cpp:570
 msgid "Use DirectSound hardware acceleration"
 msgstr ""
 
-#: config/internal/option-internal.cpp:570
+#: config/internal/option-internal.cpp:571
 msgid "Upmix stereo to surround"
 msgstr ""
 
-#: config/internal/option-internal.cpp:571
+#: config/internal/option-internal.cpp:572
 msgid "Sound volume (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:639
-#: config/internal/option-internal.cpp:659
-#: config/internal/option-internal.cpp:680
-#: config/internal/option-internal.cpp:700
-#: config/internal/option-internal.cpp:719
+#: config/internal/option-internal.cpp:640
+#: config/internal/option-internal.cpp:660
+#: config/internal/option-internal.cpp:681
+#: config/internal/option-internal.cpp:701
+#: config/internal/option-internal.cpp:720
 #, c-format
 msgid "Invalid value %s for option %s; valid values are %s"
 msgstr ""
@@ -768,7 +857,7 @@ msgstr "Невалидна стойност %f за опция %s; валидн
 msgid "Invalid value %d for option %s; valid values are %d - %d"
 msgstr "Невалидна стойност %d за опция %s; валидни стойности са %d - %d"
 
-#: config/option.cpp:480 opts.cpp:621 opts.cpp:630 opts.cpp:639 opts.cpp:648
+#: config/option.cpp:480 opts.cpp:468 opts.cpp:477 opts.cpp:486 opts.cpp:495
 #, c-format
 msgid "Invalid value %s for option %s"
 msgstr ""
@@ -933,19 +1022,19 @@ msgstr "Meta+"
 msgid "Key"
 msgstr ""
 
-#: dialogs/accel-config.cpp:149
+#: dialogs/accel-config.cpp:148
 msgid "Menu commands"
 msgstr "Меню команди"
 
-#: dialogs/accel-config.cpp:261
+#: dialogs/accel-config.cpp:259
 msgid "This will clear all user-defined accelerators. Are you sure?"
 msgstr ""
 
-#: dialogs/accel-config.cpp:261 dialogs/accel-config.cpp:298
+#: dialogs/accel-config.cpp:259 dialogs/accel-config.cpp:306
 msgid "Confirm"
 msgstr "Потвърждаване"
 
-#: dialogs/accel-config.cpp:295
+#: dialogs/accel-config.cpp:304
 #, c-format
 msgid "This will unassign \"%s\" from \"%s\". Are you sure?"
 msgstr ""
@@ -1317,22 +1406,22 @@ msgstr "Стара стойност"
 msgid "New Value"
 msgstr "Нова стойност"
 
-#: guiinit.cpp:2518
+#: guiinit.cpp:2519
 msgid "JoyBus host invalid; disabling"
 msgstr "JoyBus гостоприемник невалиден ; забранява се"
 
-#: opts.cpp:298
+#: opts.cpp:154
 msgid ""
 "The INI file was written for a more recent version of VBA-M. Some INI option"
 " values may have been reset."
 msgstr ""
 
-#: opts.cpp:480 opts.cpp:500 opts.cpp:685
+#: opts.cpp:339 opts.cpp:355 opts.cpp:522
 #, c-format
 msgid "Invalid key binding %s for %s"
 msgstr "Невалидно подвързване на клавиш %s за %s"
 
-#: opts.cpp:707
+#: opts.cpp:528
 #, c-format
 msgid "Unknown option %s with value %s"
 msgstr ""
@@ -1556,37 +1645,37 @@ msgstr "Възпроизвеждане приключи"
 msgid "%d %% (%d, %d fps)"
 msgstr ""
 
-#: sys.cpp:899 xrc/GBPrinter.xrc:65
+#: sys.cpp:898 xrc/GBPrinter.xrc:65
 msgid "&Discard"
 msgstr "&Отхвърли"
 
-#: sys.cpp:933
+#: sys.cpp:932
 msgid "Image files (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 msgstr "Файлове на образи (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 
-#: sys.cpp:942
+#: sys.cpp:941
 msgid "Save printer image to"
 msgstr "Запази образ на принтер към"
 
-#: sys.cpp:956 sys.cpp:1140
+#: sys.cpp:955 sys.cpp:1139
 #, c-format
 msgid "Wrote printer output to %s"
 msgstr "Записан изход на принтер към %s"
 
-#: sys.cpp:961 sys.cpp:1032
+#: sys.cpp:960 sys.cpp:1031
 msgid "&Close"
 msgstr "&Затвори"
 
-#: sys.cpp:1027
+#: sys.cpp:1026
 msgid "Printed"
 msgstr "Отпечатан"
 
-#: sys.cpp:1302
+#: sys.cpp:1301
 #, c-format
 msgid "Error opening pseudo tty: %s"
 msgstr "Грешка при отваряне на псевдо tty: %s"
 
-#: sys.cpp:1401
+#: sys.cpp:1400
 #, c-format
 msgid "Error setting up server socket (%d)"
 msgstr "Грешка при настройване на сървърно гнездо (%d)"
@@ -1620,80 +1709,80 @@ msgstr ""
 msgid "Unable to load dialog %s from resources"
 msgstr "Не може да се зареди диалог %s от ресурси"
 
-#: wxvbam.cpp:398 wxvbam.cpp:415
+#: wxvbam.cpp:401 wxvbam.cpp:418
 #, c-format
 msgid "Invalid configuration file provided: %s"
 msgstr ""
 
-#: wxvbam.cpp:559
+#: wxvbam.cpp:558
 msgid "Could not create main window"
 msgstr "Не можа да се създаде главен прозорец"
 
-#: wxvbam.cpp:634
+#: wxvbam.cpp:633
 msgid "Save built-in XRC file and exit"
 msgstr "Запази вграден XRC файл и излез"
 
-#: wxvbam.cpp:637
+#: wxvbam.cpp:636
 msgid "Save built-in vba-over.ini and exit"
 msgstr "Запази вграден vba-over.ini и излез"
 
-#: wxvbam.cpp:640
+#: wxvbam.cpp:639
 msgid "Print configuration path and exit"
 msgstr "Изпиши пътя на конфигурация и излез"
 
-#: wxvbam.cpp:643
+#: wxvbam.cpp:642
 msgid "Start in full-screen mode"
 msgstr "Стартирай в режим на цял екран"
 
-#: wxvbam.cpp:646
+#: wxvbam.cpp:645
 msgid "Set a configuration file"
 msgstr "Задай конфигурационен файл"
 
-#: wxvbam.cpp:650
+#: wxvbam.cpp:649
 msgid "Delete shared link state first, if it exists"
 msgstr "Изтрий състоянието на споделена връзка първо, ако съществува"
 
-#: wxvbam.cpp:657
+#: wxvbam.cpp:656
 msgid "List all settable options and exit"
 msgstr "Изброй всички регулируеми опции и излез"
 
-#: wxvbam.cpp:660
+#: wxvbam.cpp:659
 msgid "ROM file"
 msgstr "ROM файл"
 
-#: wxvbam.cpp:662
+#: wxvbam.cpp:661
 msgid "<config>=<value>"
 msgstr "<config>=<value>"
 
-#: wxvbam.cpp:693
+#: wxvbam.cpp:692
 msgid "Configuration / build error: can't find built-in xrc"
 msgstr ""
 
-#: wxvbam.cpp:701
+#: wxvbam.cpp:700
 #, c-format
 msgid ""
 "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:"
 msgstr ""
 
-#: wxvbam.cpp:715
+#: wxvbam.cpp:714
 msgid "Configuration is read from, in order:"
 msgstr "Конфигурацията се чете от, по ред:"
 
-#: wxvbam.cpp:729
+#: wxvbam.cpp:728
 #, c-format
 msgid ""
 "Wrote built-in override file to %s\n"
 "To override, delete all but changed section. First found section is used from search path:"
 msgstr ""
 
-#: wxvbam.cpp:735
+#: wxvbam.cpp:734
 msgid ""
 "\n"
 "\tbuilt-in"
 msgstr "\n\tвграден"
 
-#: wxvbam.cpp:750
+#: wxvbam.cpp:749
 msgid ""
 "Options set from the command line are saved if any configuration changes are made in the user interface.\n"
 "\n"
@@ -1701,17 +1790,17 @@ msgid ""
 "\n"
 msgstr "Опции, зададени от командният ред се запазват, ако всякакви конфигурационни промени са направени в потребителския интерфейс.\n\nЗа флагови опции, вярно и невярно са уточнени ако 1 и 0, съответно.\n\n"
 
-#: wxvbam.cpp:758
+#: wxvbam.cpp:757
 msgid ""
 "The commands available for the Keyboard/* option are:\n"
 "\n"
 msgstr "Командите налични за Клавиатурата/* опция са:\n\n"
 
-#: wxvbam.cpp:769
+#: wxvbam.cpp:768
 msgid "Configuration file not found."
 msgstr "Конфигурационен файл не е открит."
 
-#: wxvbam.cpp:800
+#: wxvbam.cpp:799
 msgid "Bad configuration option or multiple ROM files given:\n"
 msgstr "Лоша конфигурационна опция или множество ROM файлове са дадени:\n"
 
@@ -2223,10 +2312,6 @@ msgstr "Прескачане на кадри"
 msgid "&Number of frames to skip:"
 msgstr ""
 
-#: xrc/DisplayConfig.xrc:200
-msgid "Speed"
-msgstr "Скорост"
-
 #: xrc/DisplayConfig.xrc:216
 msgid "Speed indicator:"
 msgstr ""
@@ -2762,58 +2847,10 @@ msgid ""
 " entire contents if too small."
 msgstr ""
 
-#: xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
-msgid "Up"
-msgstr "Нагоре"
-
-#: xrc/JoyPanel.xrc:37
-msgid "A"
-msgstr "A"
-
-#: xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
-msgid "Down"
-msgstr "Надолу"
-
-#: xrc/JoyPanel.xrc:83
-msgid "B"
-msgstr "B"
-
-#: xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
-msgid "Left"
-msgstr "Наляво"
-
-#: xrc/JoyPanel.xrc:129
-msgid "L"
-msgstr "L"
-
-#: xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
-msgid "Right"
-msgstr "Надясно"
-
-#: xrc/JoyPanel.xrc:175
-msgid "R"
-msgstr "R"
-
-#: xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
-msgid "Select"
-msgstr "Избери"
-
-#: xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
-msgid "Start"
-msgstr "Започни"
-
-#: xrc/JoyPanel.xrc:254
-msgid "Motion Up"
-msgstr "Движение нагоре"
-
 #: xrc/JoyPanel.xrc:276
 msgid "Autofire A"
 msgstr "Автоогън A"
 
-#: xrc/JoyPanel.xrc:298
-msgid "Motion Down"
-msgstr "Движение надолу"
-
 #: xrc/JoyPanel.xrc:320
 msgid "Autofire B"
 msgstr "Автоогън B"
diff --git a/po/wxvbam/br.po b/po/wxvbam/br.po
index 1e38a5aa..53b63641 100644
--- a/po/wxvbam/br.po
+++ b/po/wxvbam/br.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VBA-M\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-23 22:00+0000\n"
+"POT-Creation-Date: 2024-04-24 02:00+0000\n"
 "PO-Revision-Date: 2011-12-03 19:42+0000\n"
 "Last-Translator: Irriep Nala Novram <per.morvan.bzh29@gmail.com>, 2017,2019\n"
 "Language-Team: Breton (http://app.transifex.com/bgk/vba-m/language/br/)\n"
@@ -319,174 +319,263 @@ msgstr ""
 msgid "Network is not supported in local mode."
 msgstr "Ne vez ket degemeret ar rouedad e mod lec'hel."
 
-#: config/internal/option-internal.cpp:379
-msgid "Use bilinear filter with 3d renderer"
+#: config/command.cpp:28 xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
+msgid "Up"
+msgstr "Us"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
+msgid "Down"
+msgstr "Traoñ"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
+msgid "Left"
+msgstr "Kleiz"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
+msgid "Right"
+msgstr "Dehou"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:37
+msgid "A"
+msgstr "A"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:83
+msgid "B"
+msgstr "B"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:129
+msgid "L"
+msgstr "L"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:175
+msgid "R"
+msgstr "R"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
+msgid "Select"
+msgstr "Diuziñ"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
+msgid "Start"
+msgstr "Kregiñ"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:254
+msgid "Motion Up"
+msgstr "War-grec'h"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:298
+msgid "Motion Down"
+msgstr "War-draoñ"
+
+#: config/command.cpp:30
+msgid "Motion Left"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion Right"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion In"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Motion Out"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto A"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto B"
+msgstr ""
+
+#: config/command.cpp:31 xrc/DisplayConfig.xrc:200
+msgid "Speed"
+msgstr "Tizh"
+
+#: config/command.cpp:31
+msgid "Capture"
+msgstr ""
+
+#: config/command.cpp:32
+msgid "GameShark"
+msgstr ""
+
+#: config/command.cpp:106
+#, c-format
+msgid "Joypad %zu %s"
 msgstr ""
 
 #: config/internal/option-internal.cpp:380
-msgid "Full-screen filter to apply"
+msgid "Use bilinear filter with 3d renderer"
 msgstr ""
 
 #: config/internal/option-internal.cpp:381
-msgid "Filter plugin library"
+msgid "Full-screen filter to apply"
 msgstr ""
 
 #: config/internal/option-internal.cpp:382
-msgid "Interframe blending function"
+msgid "Filter plugin library"
 msgstr ""
 
 #: config/internal/option-internal.cpp:383
+msgid "Interframe blending function"
+msgstr ""
+
+#: config/internal/option-internal.cpp:384
 msgid "Keep window on top"
 msgstr ""
 
-#: config/internal/option-internal.cpp:385
+#: config/internal/option-internal.cpp:386
 msgid "Maximum number of threads to run filters in"
 msgstr ""
 
-#: config/internal/option-internal.cpp:387
+#: config/internal/option-internal.cpp:388
 msgid "Render method; if unsupported, simple method will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:388
+#: config/internal/option-internal.cpp:389
 msgid "Default scale factor"
 msgstr ""
 
-#: config/internal/option-internal.cpp:389
+#: config/internal/option-internal.cpp:390
 msgid "Retain aspect ratio when resizing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:392
+#: config/internal/option-internal.cpp:393
 msgid "BIOS file to use for Game Boy, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:393
+#: config/internal/option-internal.cpp:394
 msgid "Game Boy color enhancement, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:394
+#: config/internal/option-internal.cpp:395
 msgid "Enable DX Colorization Hacks"
 msgstr ""
 
-#: config/internal/option-internal.cpp:395
-#: config/internal/option-internal.cpp:419
+#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:420
 msgid "Apply LCD filter, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:397
 msgid "BIOS file to use for Game Boy Color, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:398
+#: config/internal/option-internal.cpp:399
 msgid ""
 "The default palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:401
+#: config/internal/option-internal.cpp:402
 msgid ""
 "The first user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:404
+#: config/internal/option-internal.cpp:405
 msgid ""
 "The second user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:407
+#: config/internal/option-internal.cpp:408
 msgid "Automatically gather a full page before printing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:409
+#: config/internal/option-internal.cpp:410
 msgid "Automatically save printouts as screen captures with -print suffix"
 msgstr ""
 
-#: config/internal/option-internal.cpp:411
-#: config/internal/option-internal.cpp:439
+#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:440
 msgid "Directory to look for ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:413
 msgid "Directory to look for Game Boy Color ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:415
+#: config/internal/option-internal.cpp:416
 msgid "BIOS file to use, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:425
+#: config/internal/option-internal.cpp:426
 msgid "Enable link at boot"
 msgstr ""
 
-#: config/internal/option-internal.cpp:430
+#: config/internal/option-internal.cpp:431
 msgid "Enable faster network protocol by default"
 msgstr ""
 
-#: config/internal/option-internal.cpp:432
+#: config/internal/option-internal.cpp:433
 msgid "Default network link client host"
 msgstr ""
 
-#: config/internal/option-internal.cpp:433
+#: config/internal/option-internal.cpp:434
 msgid "Default network link server IP to bind"
 msgstr ""
 
-#: config/internal/option-internal.cpp:434
+#: config/internal/option-internal.cpp:435
 msgid "Default network link port (server and client)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:435
+#: config/internal/option-internal.cpp:436
 msgid "Default network protocol"
 msgstr ""
 
-#: config/internal/option-internal.cpp:436
+#: config/internal/option-internal.cpp:437
 msgid "Link timeout (ms)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:437
+#: config/internal/option-internal.cpp:438
 msgid "Link cable type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:442
+#: config/internal/option-internal.cpp:443
 msgid "Automatically load last saved state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:444
+#: config/internal/option-internal.cpp:445
 msgid ""
 "Directory to store game save files (relative paths are relative to ROM; "
 "blank is config dir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:446
+#: config/internal/option-internal.cpp:447
 msgid "Freeze recent load list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:448
+#: config/internal/option-internal.cpp:449
 msgid ""
 "Directory to store A / V and game recordings (relative paths are relative to"
 " ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:451
+#: config/internal/option-internal.cpp:452
 msgid "Number of seconds between rewind snapshots (0 to disable)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:453
+#: config/internal/option-internal.cpp:454
 msgid "Directory to store screenshots (relative paths are relative to ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:456
+#: config/internal/option-internal.cpp:457
 msgid ""
 "Directory to store saved state files (relative paths are relative to "
 "BatteryDir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:458
+#: config/internal/option-internal.cpp:459
 msgid "Enable status bar"
 msgstr ""
 
-#: config/internal/option-internal.cpp:459
+#: config/internal/option-internal.cpp:460
 msgid "INI file version (DO NOT MODIFY)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:463
+#: config/internal/option-internal.cpp:464
 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, "
@@ -494,266 +583,266 @@ msgid ""
 "MotionRight, AutoA, AutoB, Speed, Capture, GS"
 msgstr ""
 
-#: config/internal/option-internal.cpp:468
+#: config/internal/option-internal.cpp:469
 msgid "The autofire toggle period, in frames (1/60 s)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:469
+#: config/internal/option-internal.cpp:470
 msgid "The number of the stick to use in single-player mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:471
+#: config/internal/option-internal.cpp:472
 msgid "Whether to enable SDL GameController mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:475
+#: config/internal/option-internal.cpp:476
 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 "
 "executed."
 msgstr ""
 
-#: config/internal/option-internal.cpp:480
+#: config/internal/option-internal.cpp:481
 msgid "Enable AGB debug print"
 msgstr ""
 
-#: config/internal/option-internal.cpp:481
+#: config/internal/option-internal.cpp:482
 msgid "Auto skip frames"
 msgstr ""
 
-#: config/internal/option-internal.cpp:483
+#: config/internal/option-internal.cpp:484
 msgid "Apply IPS / UPS / IPF patches if found"
 msgstr ""
 
-#: config/internal/option-internal.cpp:485
+#: config/internal/option-internal.cpp:486
 msgid "Automatically save and load cheat list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:489
+#: config/internal/option-internal.cpp:490
 msgid "Automatically enable border for Super Game Boy games"
 msgstr ""
 
-#: config/internal/option-internal.cpp:491
+#: config/internal/option-internal.cpp:492
 msgid "Always enable border"
 msgstr ""
 
-#: config/internal/option-internal.cpp:492
+#: config/internal/option-internal.cpp:493
 msgid "Screen capture file format"
 msgstr ""
 
-#: config/internal/option-internal.cpp:493
+#: config/internal/option-internal.cpp:494
 msgid "Enable cheats"
 msgstr ""
 
-#: config/internal/option-internal.cpp:494
+#: config/internal/option-internal.cpp:495
 msgid "Disable on-screen status messages"
 msgstr ""
 
-#: config/internal/option-internal.cpp:495
+#: config/internal/option-internal.cpp:496
 msgid "Type of system to emulate"
 msgstr ""
 
-#: config/internal/option-internal.cpp:496
+#: config/internal/option-internal.cpp:497
 msgid "Flash size 0 = 64 KB 1 = 128 KB"
 msgstr ""
 
-#: config/internal/option-internal.cpp:498
+#: config/internal/option-internal.cpp:499
 msgid "Skip frames. Values are 0-9 or -1 to skip automatically based on time."
 msgstr ""
 
-#: config/internal/option-internal.cpp:500
+#: config/internal/option-internal.cpp:501
 msgid "The palette to use"
 msgstr ""
 
-#: config/internal/option-internal.cpp:501
+#: config/internal/option-internal.cpp:502
 msgid "Enable printer emulation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:503
+#: config/internal/option-internal.cpp:504
 msgid "Break into GDB after loading the game."
 msgstr ""
 
-#: config/internal/option-internal.cpp:504
+#: config/internal/option-internal.cpp:505
 msgid "Port to connect GDB to"
 msgstr ""
 
-#: config/internal/option-internal.cpp:506
+#: config/internal/option-internal.cpp:507
 msgid "Number of players in network"
 msgstr ""
 
-#: config/internal/option-internal.cpp:508
+#: config/internal/option-internal.cpp:509
 msgid "Maximum scale factor (0 = no limit)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:510
+#: config/internal/option-internal.cpp:511
 msgid "Pause game when main window loses focus"
 msgstr ""
 
-#: config/internal/option-internal.cpp:512
+#: config/internal/option-internal.cpp:513
 msgid "Enable RTC (vba-over.ini override is rtcEnabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:513
+#: config/internal/option-internal.cpp:514
 msgid "Native save (\"battery\") hardware type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:514
+#: config/internal/option-internal.cpp:515
 msgid "Show speed indicator"
 msgstr ""
 
-#: config/internal/option-internal.cpp:516
+#: config/internal/option-internal.cpp:517
 msgid "Draw on-screen messages transparently"
 msgstr ""
 
-#: config/internal/option-internal.cpp:517
+#: config/internal/option-internal.cpp:518
 msgid "Skip BIOS initialization"
 msgstr ""
 
-#: config/internal/option-internal.cpp:519
+#: config/internal/option-internal.cpp:520
 msgid "Do not overwrite cheat list when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:521
+#: config/internal/option-internal.cpp:522
 msgid "Do not overwrite native (battery) save when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:523
+#: config/internal/option-internal.cpp:524
 msgid "Throttle game speed, even when accelerated (0-450 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:526
+#: config/internal/option-internal.cpp:527
 msgid "Set throttle for speedup key (0-3000 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:528
+#: config/internal/option-internal.cpp:529
 msgid "Number of frames to skip with speedup (instead of speedup throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:531
+#: config/internal/option-internal.cpp:532
 msgid "Use frame skip for speedup throttle"
 msgstr ""
 
-#: config/internal/option-internal.cpp:532
+#: config/internal/option-internal.cpp:533
 msgid "Use the specified BIOS file for Game Boy"
 msgstr ""
 
-#: config/internal/option-internal.cpp:533
+#: config/internal/option-internal.cpp:534
 msgid "Use the specified BIOS file"
 msgstr ""
 
-#: config/internal/option-internal.cpp:535
+#: config/internal/option-internal.cpp:536
 msgid "Use the specified BIOS file for Game Boy Color"
 msgstr ""
 
-#: config/internal/option-internal.cpp:536
+#: config/internal/option-internal.cpp:537
 msgid "Wait for vertical sync"
 msgstr ""
 
-#: config/internal/option-internal.cpp:539
+#: config/internal/option-internal.cpp:540
 msgid "Enter fullscreen mode at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:540
+#: config/internal/option-internal.cpp:541
 msgid "Window maximized"
 msgstr ""
 
-#: config/internal/option-internal.cpp:541
+#: config/internal/option-internal.cpp:542
 msgid "Window height at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:542
+#: config/internal/option-internal.cpp:543
 msgid "Window width at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:543
+#: config/internal/option-internal.cpp:544
 msgid "Window axis X position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:544
+#: config/internal/option-internal.cpp:545
 msgid "Window axis Y position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:548
+#: config/internal/option-internal.cpp:549
 msgid "Capture key events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:550
+#: config/internal/option-internal.cpp:551
 msgid "Capture joy events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:551
+#: config/internal/option-internal.cpp:552
 msgid "Hide menu bar when mouse is inactive"
 msgstr ""
 
-#: config/internal/option-internal.cpp:553
+#: config/internal/option-internal.cpp:554
 msgid "Suspend screensaver when game is running"
 msgstr ""
 
-#: config/internal/option-internal.cpp:556
+#: config/internal/option-internal.cpp:557
 msgid "Sound API; if unsupported, default API will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:557
+#: config/internal/option-internal.cpp:558
 msgid "Device ID of chosen audio device for chosen driver"
 msgstr ""
 
-#: config/internal/option-internal.cpp:558
+#: config/internal/option-internal.cpp:559
 msgid "Number of sound buffers"
 msgstr ""
 
-#: config/internal/option-internal.cpp:559
+#: config/internal/option-internal.cpp:560
 msgid "Bit mask of sound channels to enable"
 msgstr ""
 
-#: config/internal/option-internal.cpp:560
+#: config/internal/option-internal.cpp:561
 msgid "Game Boy Advance sound filtering (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:562
+#: config/internal/option-internal.cpp:563
 msgid "Game Boy Advance sound interpolation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:563
+#: config/internal/option-internal.cpp:564
 msgid "Game Boy sound declicking"
 msgstr ""
 
-#: config/internal/option-internal.cpp:564
+#: config/internal/option-internal.cpp:565
 msgid "Game Boy echo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:565
+#: config/internal/option-internal.cpp:566
 msgid "Enable Game Boy sound effects"
 msgstr ""
 
-#: config/internal/option-internal.cpp:566
+#: config/internal/option-internal.cpp:567
 msgid "Game Boy stereo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:567
+#: config/internal/option-internal.cpp:568
 msgid "Game Boy surround sound effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:568
+#: config/internal/option-internal.cpp:569
 msgid "Sound sample rate (kHz)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:569
+#: config/internal/option-internal.cpp:570
 msgid "Use DirectSound hardware acceleration"
 msgstr ""
 
-#: config/internal/option-internal.cpp:570
+#: config/internal/option-internal.cpp:571
 msgid "Upmix stereo to surround"
 msgstr ""
 
-#: config/internal/option-internal.cpp:571
+#: config/internal/option-internal.cpp:572
 msgid "Sound volume (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:639
-#: config/internal/option-internal.cpp:659
-#: config/internal/option-internal.cpp:680
-#: config/internal/option-internal.cpp:700
-#: config/internal/option-internal.cpp:719
+#: config/internal/option-internal.cpp:640
+#: config/internal/option-internal.cpp:660
+#: config/internal/option-internal.cpp:681
+#: config/internal/option-internal.cpp:701
+#: config/internal/option-internal.cpp:720
 #, c-format
 msgid "Invalid value %s for option %s; valid values are %s"
 msgstr ""
@@ -768,7 +857,7 @@ msgstr "Talvoud diwir %f evit an opsionoù %s; an talvoudegezhioù mat a zo %f -
 msgid "Invalid value %d for option %s; valid values are %d - %d"
 msgstr "Talvoud diwir %d evit an opsionoù %s; an talvoudegezhioù mat a zo %d - %d"
 
-#: config/option.cpp:480 opts.cpp:621 opts.cpp:630 opts.cpp:639 opts.cpp:648
+#: config/option.cpp:480 opts.cpp:468 opts.cpp:477 opts.cpp:486 opts.cpp:495
 #, c-format
 msgid "Invalid value %s for option %s"
 msgstr ""
@@ -933,19 +1022,19 @@ msgstr "Meta+"
 msgid "Key"
 msgstr ""
 
-#: dialogs/accel-config.cpp:149
+#: dialogs/accel-config.cpp:148
 msgid "Menu commands"
 msgstr "Lañser an urzhiadoù"
 
-#: dialogs/accel-config.cpp:261
+#: dialogs/accel-config.cpp:259
 msgid "This will clear all user-defined accelerators. Are you sure?"
 msgstr ""
 
-#: dialogs/accel-config.cpp:261 dialogs/accel-config.cpp:298
+#: dialogs/accel-config.cpp:259 dialogs/accel-config.cpp:306
 msgid "Confirm"
 msgstr "Kadarnaat"
 
-#: dialogs/accel-config.cpp:295
+#: dialogs/accel-config.cpp:304
 #, c-format
 msgid "This will unassign \"%s\" from \"%s\". Are you sure?"
 msgstr ""
@@ -1317,22 +1406,22 @@ msgstr "Talvoudegezh kozh"
 msgid "New Value"
 msgstr "Talvoudegezh nevez"
 
-#: guiinit.cpp:2518
+#: guiinit.cpp:2519
 msgid "JoyBus host invalid; disabling"
 msgstr "Ostiz JoyBus nann-dalvoudus; o titalvoudekaat"
 
-#: opts.cpp:298
+#: opts.cpp:154
 msgid ""
 "The INI file was written for a more recent version of VBA-M. Some INI option"
 " values may have been reset."
 msgstr ""
 
-#: opts.cpp:480 opts.cpp:500 opts.cpp:685
+#: opts.cpp:339 opts.cpp:355 opts.cpp:522
 #, c-format
 msgid "Invalid key binding %s for %s"
 msgstr "Blokad an touchennoù direizh %s evit %s"
 
-#: opts.cpp:707
+#: opts.cpp:528
 #, c-format
 msgid "Unknown option %s with value %s"
 msgstr ""
@@ -1556,37 +1645,37 @@ msgstr "Fin al lennadenn"
 msgid "%d %% (%d, %d fps)"
 msgstr ""
 
-#: sys.cpp:899 xrc/GBPrinter.xrc:65
+#: sys.cpp:898 xrc/GBPrinter.xrc:65
 msgid "&Discard"
 msgstr "&Stlepel"
 
-#: sys.cpp:933
+#: sys.cpp:932
 msgid "Image files (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 msgstr "Restroù skeudenn (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 
-#: sys.cpp:942
+#: sys.cpp:941
 msgid "Save printer image to"
 msgstr "Enrollañ skeudenn ar voullerezh e-barzh"
 
-#: sys.cpp:956 sys.cpp:1140
+#: sys.cpp:955 sys.cpp:1139
 #, c-format
 msgid "Wrote printer output to %s"
 msgstr "Ezvont ar voullerezh skrivet e-barzh %s"
 
-#: sys.cpp:961 sys.cpp:1032
+#: sys.cpp:960 sys.cpp:1031
 msgid "&Close"
 msgstr "&Serriñ"
 
-#: sys.cpp:1027
+#: sys.cpp:1026
 msgid "Printed"
 msgstr "Moullet"
 
-#: sys.cpp:1302
+#: sys.cpp:1301
 #, c-format
 msgid "Error opening pseudo tty: %s"
 msgstr "Fazi en ur zigeriñ al lesanv tty: %s"
 
-#: sys.cpp:1401
+#: sys.cpp:1400
 #, c-format
 msgid "Error setting up server socket (%d)"
 msgstr "Fazi gant kefluniadur ar socket eus ar servijer (%d)"
@@ -1620,80 +1709,80 @@ msgstr ""
 msgid "Unable to load dialog %s from resources"
 msgstr "Dibosupl eo kargañ an diviz %s diwar ar vammenn"
 
-#: wxvbam.cpp:398 wxvbam.cpp:415
+#: wxvbam.cpp:401 wxvbam.cpp:418
 #, c-format
 msgid "Invalid configuration file provided: %s"
 msgstr ""
 
-#: wxvbam.cpp:559
+#: wxvbam.cpp:558
 msgid "Could not create main window"
 msgstr "N'hall ket krouiñ ar prenestr-pennañ"
 
-#: wxvbam.cpp:634
+#: wxvbam.cpp:633
 msgid "Save built-in XRC file and exit"
 msgstr "Enrollañ ar restr XRC enframmet ha kuitait"
 
-#: wxvbam.cpp:637
+#: wxvbam.cpp:636
 msgid "Save built-in vba-over.ini and exit"
 msgstr "Enrollañ ar restr vba-over.ini enframmet ha kuitait"
 
-#: wxvbam.cpp:640
+#: wxvbam.cpp:639
 msgid "Print configuration path and exit"
 msgstr "Moulla hent ar c'hefluniadur ha kuitaat"
 
-#: wxvbam.cpp:643
+#: wxvbam.cpp:642
 msgid "Start in full-screen mode"
 msgstr "Kregiñ e-barzh ar mod skramm-leun"
 
-#: wxvbam.cpp:646
+#: wxvbam.cpp:645
 msgid "Set a configuration file"
 msgstr ""
 
-#: wxvbam.cpp:650
+#: wxvbam.cpp:649
 msgid "Delete shared link state first, if it exists"
 msgstr "Diverkañ stad ar c'hevreadur rannet da gentañ mar plij, ma 'z eus anezhañ"
 
-#: wxvbam.cpp:657
+#: wxvbam.cpp:656
 msgid "List all settable options and exit"
 msgstr "Listennañ an holl zibarzhioù kefluniadus ha kuitaat"
 
-#: wxvbam.cpp:660
+#: wxvbam.cpp:659
 msgid "ROM file"
 msgstr "Restr ROM"
 
-#: wxvbam.cpp:662
+#: wxvbam.cpp:661
 msgid "<config>=<value>"
 msgstr "<config>=<value>"
 
-#: wxvbam.cpp:693
+#: wxvbam.cpp:692
 msgid "Configuration / build error: can't find built-in xrc"
 msgstr ""
 
-#: wxvbam.cpp:701
+#: wxvbam.cpp:700
 #, c-format
 msgid ""
 "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:"
 msgstr ""
 
-#: wxvbam.cpp:715
+#: wxvbam.cpp:714
 msgid "Configuration is read from, in order:"
 msgstr "Ar c'hefluniadur a zo lennet adalek, en urzh:"
 
-#: wxvbam.cpp:729
+#: wxvbam.cpp:728
 #, c-format
 msgid ""
 "Wrote built-in override file to %s\n"
 "To override, delete all but changed section. First found section is used from search path:"
 msgstr ""
 
-#: wxvbam.cpp:735
+#: wxvbam.cpp:734
 msgid ""
 "\n"
 "\tbuilt-in"
 msgstr "\n\tbuilt-in"
 
-#: wxvbam.cpp:750
+#: wxvbam.cpp:749
 msgid ""
 "Options set from the command line are saved if any configuration changes are made in the user interface.\n"
 "\n"
@@ -1701,17 +1790,17 @@ msgid ""
 "\n"
 msgstr "An dibarzhioù ensavet adalek al linenn urzhiad a zo enrollet ma vez ur chañchamant kefluniadur e etrefas an implijer.\n\nEvit an dibarzhioù lec'hiañ, an talvoudegezhioù gwir ha gaou a zo spisaet evel 1 ha 0.\n"
 
-#: wxvbam.cpp:758
+#: wxvbam.cpp:757
 msgid ""
 "The commands available for the Keyboard/* option are:\n"
 "\n"
 msgstr "An urzhiadoù hegerz evit an dibarzh Klavier/* a zo:\n\n"
 
-#: wxvbam.cpp:769
+#: wxvbam.cpp:768
 msgid "Configuration file not found."
 msgstr ""
 
-#: wxvbam.cpp:800
+#: wxvbam.cpp:799
 msgid "Bad configuration option or multiple ROM files given:\n"
 msgstr "Kefluniadur fall an dibarzhioù pe restroù ROM-lies roet:\n"
 
@@ -2223,10 +2312,6 @@ msgstr "Lamm-sternioù"
 msgid "&Number of frames to skip:"
 msgstr ""
 
-#: xrc/DisplayConfig.xrc:200
-msgid "Speed"
-msgstr "Tizh"
-
 #: xrc/DisplayConfig.xrc:216
 msgid "Speed indicator:"
 msgstr ""
@@ -2762,58 +2847,10 @@ msgid ""
 " entire contents if too small."
 msgstr ""
 
-#: xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
-msgid "Up"
-msgstr "Us"
-
-#: xrc/JoyPanel.xrc:37
-msgid "A"
-msgstr "A"
-
-#: xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
-msgid "Down"
-msgstr "Traoñ"
-
-#: xrc/JoyPanel.xrc:83
-msgid "B"
-msgstr "B"
-
-#: xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
-msgid "Left"
-msgstr "Kleiz"
-
-#: xrc/JoyPanel.xrc:129
-msgid "L"
-msgstr "L"
-
-#: xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
-msgid "Right"
-msgstr "Dehou"
-
-#: xrc/JoyPanel.xrc:175
-msgid "R"
-msgstr "R"
-
-#: xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
-msgid "Select"
-msgstr "Diuziñ"
-
-#: xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
-msgid "Start"
-msgstr "Kregiñ"
-
-#: xrc/JoyPanel.xrc:254
-msgid "Motion Up"
-msgstr "War-grec'h"
-
 #: xrc/JoyPanel.xrc:276
 msgid "Autofire A"
 msgstr "Emdenn A"
 
-#: xrc/JoyPanel.xrc:298
-msgid "Motion Down"
-msgstr "War-draoñ"
-
 #: xrc/JoyPanel.xrc:320
 msgid "Autofire B"
 msgstr "Emdenn B"
diff --git a/po/wxvbam/cs.po b/po/wxvbam/cs.po
index 463bdf63..f7908594 100644
--- a/po/wxvbam/cs.po
+++ b/po/wxvbam/cs.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VBA-M\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-23 22:00+0000\n"
+"POT-Creation-Date: 2024-04-24 02:00+0000\n"
 "PO-Revision-Date: 2011-12-03 19:42+0000\n"
 "Last-Translator: Patrik Jager <patrikusp@gmail.com>, 2018\n"
 "Language-Team: Czech (http://app.transifex.com/bgk/vba-m/language/cs/)\n"
@@ -323,174 +323,263 @@ msgstr ""
 msgid "Network is not supported in local mode."
 msgstr "Síť není podporována v místním režimu."
 
-#: config/internal/option-internal.cpp:379
-msgid "Use bilinear filter with 3d renderer"
+#: config/command.cpp:28 xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
+msgid "Up"
+msgstr "Nahoru"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
+msgid "Down"
+msgstr "Dolů"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
+msgid "Left"
+msgstr "Doleva"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
+msgid "Right"
+msgstr "Doprava"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:37
+msgid "A"
+msgstr "A"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:83
+msgid "B"
+msgstr "B"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:129
+msgid "L"
+msgstr "L"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:175
+msgid "R"
+msgstr "R"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
+msgid "Select"
+msgstr "Select"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
+msgid "Start"
+msgstr "Start"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:254
+msgid "Motion Up"
+msgstr "Pohyb nahoru"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:298
+msgid "Motion Down"
+msgstr "Pohyb dolů"
+
+#: config/command.cpp:30
+msgid "Motion Left"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion Right"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion In"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Motion Out"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto A"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto B"
+msgstr ""
+
+#: config/command.cpp:31 xrc/DisplayConfig.xrc:200
+msgid "Speed"
+msgstr "Rychlost"
+
+#: config/command.cpp:31
+msgid "Capture"
+msgstr ""
+
+#: config/command.cpp:32
+msgid "GameShark"
+msgstr ""
+
+#: config/command.cpp:106
+#, c-format
+msgid "Joypad %zu %s"
 msgstr ""
 
 #: config/internal/option-internal.cpp:380
-msgid "Full-screen filter to apply"
+msgid "Use bilinear filter with 3d renderer"
 msgstr ""
 
 #: config/internal/option-internal.cpp:381
-msgid "Filter plugin library"
+msgid "Full-screen filter to apply"
 msgstr ""
 
 #: config/internal/option-internal.cpp:382
-msgid "Interframe blending function"
+msgid "Filter plugin library"
 msgstr ""
 
 #: config/internal/option-internal.cpp:383
+msgid "Interframe blending function"
+msgstr ""
+
+#: config/internal/option-internal.cpp:384
 msgid "Keep window on top"
 msgstr ""
 
-#: config/internal/option-internal.cpp:385
+#: config/internal/option-internal.cpp:386
 msgid "Maximum number of threads to run filters in"
 msgstr ""
 
-#: config/internal/option-internal.cpp:387
+#: config/internal/option-internal.cpp:388
 msgid "Render method; if unsupported, simple method will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:388
+#: config/internal/option-internal.cpp:389
 msgid "Default scale factor"
 msgstr ""
 
-#: config/internal/option-internal.cpp:389
+#: config/internal/option-internal.cpp:390
 msgid "Retain aspect ratio when resizing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:392
+#: config/internal/option-internal.cpp:393
 msgid "BIOS file to use for Game Boy, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:393
+#: config/internal/option-internal.cpp:394
 msgid "Game Boy color enhancement, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:394
+#: config/internal/option-internal.cpp:395
 msgid "Enable DX Colorization Hacks"
 msgstr ""
 
-#: config/internal/option-internal.cpp:395
-#: config/internal/option-internal.cpp:419
+#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:420
 msgid "Apply LCD filter, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:397
 msgid "BIOS file to use for Game Boy Color, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:398
+#: config/internal/option-internal.cpp:399
 msgid ""
 "The default palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:401
+#: config/internal/option-internal.cpp:402
 msgid ""
 "The first user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:404
+#: config/internal/option-internal.cpp:405
 msgid ""
 "The second user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:407
+#: config/internal/option-internal.cpp:408
 msgid "Automatically gather a full page before printing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:409
+#: config/internal/option-internal.cpp:410
 msgid "Automatically save printouts as screen captures with -print suffix"
 msgstr ""
 
-#: config/internal/option-internal.cpp:411
-#: config/internal/option-internal.cpp:439
+#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:440
 msgid "Directory to look for ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:413
 msgid "Directory to look for Game Boy Color ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:415
+#: config/internal/option-internal.cpp:416
 msgid "BIOS file to use, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:425
+#: config/internal/option-internal.cpp:426
 msgid "Enable link at boot"
 msgstr ""
 
-#: config/internal/option-internal.cpp:430
+#: config/internal/option-internal.cpp:431
 msgid "Enable faster network protocol by default"
 msgstr ""
 
-#: config/internal/option-internal.cpp:432
+#: config/internal/option-internal.cpp:433
 msgid "Default network link client host"
 msgstr ""
 
-#: config/internal/option-internal.cpp:433
+#: config/internal/option-internal.cpp:434
 msgid "Default network link server IP to bind"
 msgstr ""
 
-#: config/internal/option-internal.cpp:434
+#: config/internal/option-internal.cpp:435
 msgid "Default network link port (server and client)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:435
+#: config/internal/option-internal.cpp:436
 msgid "Default network protocol"
 msgstr ""
 
-#: config/internal/option-internal.cpp:436
+#: config/internal/option-internal.cpp:437
 msgid "Link timeout (ms)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:437
+#: config/internal/option-internal.cpp:438
 msgid "Link cable type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:442
+#: config/internal/option-internal.cpp:443
 msgid "Automatically load last saved state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:444
+#: config/internal/option-internal.cpp:445
 msgid ""
 "Directory to store game save files (relative paths are relative to ROM; "
 "blank is config dir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:446
+#: config/internal/option-internal.cpp:447
 msgid "Freeze recent load list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:448
+#: config/internal/option-internal.cpp:449
 msgid ""
 "Directory to store A / V and game recordings (relative paths are relative to"
 " ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:451
+#: config/internal/option-internal.cpp:452
 msgid "Number of seconds between rewind snapshots (0 to disable)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:453
+#: config/internal/option-internal.cpp:454
 msgid "Directory to store screenshots (relative paths are relative to ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:456
+#: config/internal/option-internal.cpp:457
 msgid ""
 "Directory to store saved state files (relative paths are relative to "
 "BatteryDir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:458
+#: config/internal/option-internal.cpp:459
 msgid "Enable status bar"
 msgstr ""
 
-#: config/internal/option-internal.cpp:459
+#: config/internal/option-internal.cpp:460
 msgid "INI file version (DO NOT MODIFY)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:463
+#: config/internal/option-internal.cpp:464
 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, "
@@ -498,266 +587,266 @@ msgid ""
 "MotionRight, AutoA, AutoB, Speed, Capture, GS"
 msgstr ""
 
-#: config/internal/option-internal.cpp:468
+#: config/internal/option-internal.cpp:469
 msgid "The autofire toggle period, in frames (1/60 s)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:469
+#: config/internal/option-internal.cpp:470
 msgid "The number of the stick to use in single-player mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:471
+#: config/internal/option-internal.cpp:472
 msgid "Whether to enable SDL GameController mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:475
+#: config/internal/option-internal.cpp:476
 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 "
 "executed."
 msgstr ""
 
-#: config/internal/option-internal.cpp:480
+#: config/internal/option-internal.cpp:481
 msgid "Enable AGB debug print"
 msgstr ""
 
-#: config/internal/option-internal.cpp:481
+#: config/internal/option-internal.cpp:482
 msgid "Auto skip frames"
 msgstr ""
 
-#: config/internal/option-internal.cpp:483
+#: config/internal/option-internal.cpp:484
 msgid "Apply IPS / UPS / IPF patches if found"
 msgstr ""
 
-#: config/internal/option-internal.cpp:485
+#: config/internal/option-internal.cpp:486
 msgid "Automatically save and load cheat list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:489
+#: config/internal/option-internal.cpp:490
 msgid "Automatically enable border for Super Game Boy games"
 msgstr ""
 
-#: config/internal/option-internal.cpp:491
+#: config/internal/option-internal.cpp:492
 msgid "Always enable border"
 msgstr ""
 
-#: config/internal/option-internal.cpp:492
+#: config/internal/option-internal.cpp:493
 msgid "Screen capture file format"
 msgstr ""
 
-#: config/internal/option-internal.cpp:493
+#: config/internal/option-internal.cpp:494
 msgid "Enable cheats"
 msgstr ""
 
-#: config/internal/option-internal.cpp:494
+#: config/internal/option-internal.cpp:495
 msgid "Disable on-screen status messages"
 msgstr ""
 
-#: config/internal/option-internal.cpp:495
+#: config/internal/option-internal.cpp:496
 msgid "Type of system to emulate"
 msgstr ""
 
-#: config/internal/option-internal.cpp:496
+#: config/internal/option-internal.cpp:497
 msgid "Flash size 0 = 64 KB 1 = 128 KB"
 msgstr ""
 
-#: config/internal/option-internal.cpp:498
+#: config/internal/option-internal.cpp:499
 msgid "Skip frames. Values are 0-9 or -1 to skip automatically based on time."
 msgstr ""
 
-#: config/internal/option-internal.cpp:500
+#: config/internal/option-internal.cpp:501
 msgid "The palette to use"
 msgstr ""
 
-#: config/internal/option-internal.cpp:501
+#: config/internal/option-internal.cpp:502
 msgid "Enable printer emulation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:503
+#: config/internal/option-internal.cpp:504
 msgid "Break into GDB after loading the game."
 msgstr ""
 
-#: config/internal/option-internal.cpp:504
+#: config/internal/option-internal.cpp:505
 msgid "Port to connect GDB to"
 msgstr ""
 
-#: config/internal/option-internal.cpp:506
+#: config/internal/option-internal.cpp:507
 msgid "Number of players in network"
 msgstr ""
 
-#: config/internal/option-internal.cpp:508
+#: config/internal/option-internal.cpp:509
 msgid "Maximum scale factor (0 = no limit)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:510
+#: config/internal/option-internal.cpp:511
 msgid "Pause game when main window loses focus"
 msgstr ""
 
-#: config/internal/option-internal.cpp:512
+#: config/internal/option-internal.cpp:513
 msgid "Enable RTC (vba-over.ini override is rtcEnabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:513
+#: config/internal/option-internal.cpp:514
 msgid "Native save (\"battery\") hardware type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:514
+#: config/internal/option-internal.cpp:515
 msgid "Show speed indicator"
 msgstr ""
 
-#: config/internal/option-internal.cpp:516
+#: config/internal/option-internal.cpp:517
 msgid "Draw on-screen messages transparently"
 msgstr ""
 
-#: config/internal/option-internal.cpp:517
+#: config/internal/option-internal.cpp:518
 msgid "Skip BIOS initialization"
 msgstr ""
 
-#: config/internal/option-internal.cpp:519
+#: config/internal/option-internal.cpp:520
 msgid "Do not overwrite cheat list when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:521
+#: config/internal/option-internal.cpp:522
 msgid "Do not overwrite native (battery) save when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:523
+#: config/internal/option-internal.cpp:524
 msgid "Throttle game speed, even when accelerated (0-450 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:526
+#: config/internal/option-internal.cpp:527
 msgid "Set throttle for speedup key (0-3000 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:528
+#: config/internal/option-internal.cpp:529
 msgid "Number of frames to skip with speedup (instead of speedup throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:531
+#: config/internal/option-internal.cpp:532
 msgid "Use frame skip for speedup throttle"
 msgstr ""
 
-#: config/internal/option-internal.cpp:532
+#: config/internal/option-internal.cpp:533
 msgid "Use the specified BIOS file for Game Boy"
 msgstr ""
 
-#: config/internal/option-internal.cpp:533
+#: config/internal/option-internal.cpp:534
 msgid "Use the specified BIOS file"
 msgstr ""
 
-#: config/internal/option-internal.cpp:535
+#: config/internal/option-internal.cpp:536
 msgid "Use the specified BIOS file for Game Boy Color"
 msgstr ""
 
-#: config/internal/option-internal.cpp:536
+#: config/internal/option-internal.cpp:537
 msgid "Wait for vertical sync"
 msgstr ""
 
-#: config/internal/option-internal.cpp:539
+#: config/internal/option-internal.cpp:540
 msgid "Enter fullscreen mode at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:540
+#: config/internal/option-internal.cpp:541
 msgid "Window maximized"
 msgstr ""
 
-#: config/internal/option-internal.cpp:541
+#: config/internal/option-internal.cpp:542
 msgid "Window height at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:542
+#: config/internal/option-internal.cpp:543
 msgid "Window width at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:543
+#: config/internal/option-internal.cpp:544
 msgid "Window axis X position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:544
+#: config/internal/option-internal.cpp:545
 msgid "Window axis Y position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:548
+#: config/internal/option-internal.cpp:549
 msgid "Capture key events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:550
+#: config/internal/option-internal.cpp:551
 msgid "Capture joy events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:551
+#: config/internal/option-internal.cpp:552
 msgid "Hide menu bar when mouse is inactive"
 msgstr ""
 
-#: config/internal/option-internal.cpp:553
+#: config/internal/option-internal.cpp:554
 msgid "Suspend screensaver when game is running"
 msgstr ""
 
-#: config/internal/option-internal.cpp:556
+#: config/internal/option-internal.cpp:557
 msgid "Sound API; if unsupported, default API will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:557
+#: config/internal/option-internal.cpp:558
 msgid "Device ID of chosen audio device for chosen driver"
 msgstr ""
 
-#: config/internal/option-internal.cpp:558
+#: config/internal/option-internal.cpp:559
 msgid "Number of sound buffers"
 msgstr ""
 
-#: config/internal/option-internal.cpp:559
+#: config/internal/option-internal.cpp:560
 msgid "Bit mask of sound channels to enable"
 msgstr ""
 
-#: config/internal/option-internal.cpp:560
+#: config/internal/option-internal.cpp:561
 msgid "Game Boy Advance sound filtering (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:562
+#: config/internal/option-internal.cpp:563
 msgid "Game Boy Advance sound interpolation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:563
+#: config/internal/option-internal.cpp:564
 msgid "Game Boy sound declicking"
 msgstr ""
 
-#: config/internal/option-internal.cpp:564
+#: config/internal/option-internal.cpp:565
 msgid "Game Boy echo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:565
+#: config/internal/option-internal.cpp:566
 msgid "Enable Game Boy sound effects"
 msgstr ""
 
-#: config/internal/option-internal.cpp:566
+#: config/internal/option-internal.cpp:567
 msgid "Game Boy stereo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:567
+#: config/internal/option-internal.cpp:568
 msgid "Game Boy surround sound effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:568
+#: config/internal/option-internal.cpp:569
 msgid "Sound sample rate (kHz)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:569
+#: config/internal/option-internal.cpp:570
 msgid "Use DirectSound hardware acceleration"
 msgstr ""
 
-#: config/internal/option-internal.cpp:570
+#: config/internal/option-internal.cpp:571
 msgid "Upmix stereo to surround"
 msgstr ""
 
-#: config/internal/option-internal.cpp:571
+#: config/internal/option-internal.cpp:572
 msgid "Sound volume (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:639
-#: config/internal/option-internal.cpp:659
-#: config/internal/option-internal.cpp:680
-#: config/internal/option-internal.cpp:700
-#: config/internal/option-internal.cpp:719
+#: config/internal/option-internal.cpp:640
+#: config/internal/option-internal.cpp:660
+#: config/internal/option-internal.cpp:681
+#: config/internal/option-internal.cpp:701
+#: config/internal/option-internal.cpp:720
 #, c-format
 msgid "Invalid value %s for option %s; valid values are %s"
 msgstr ""
@@ -772,7 +861,7 @@ msgstr "Neplatná hodnota %f pro volbu %s; jsou platné hodnoty %f - %f"
 msgid "Invalid value %d for option %s; valid values are %d - %d"
 msgstr "Neplatná hodnota %d pro volbu %s; platné hodnoty jsou %d - %d"
 
-#: config/option.cpp:480 opts.cpp:621 opts.cpp:630 opts.cpp:639 opts.cpp:648
+#: config/option.cpp:480 opts.cpp:468 opts.cpp:477 opts.cpp:486 opts.cpp:495
 #, c-format
 msgid "Invalid value %s for option %s"
 msgstr ""
@@ -937,19 +1026,19 @@ msgstr "Meta+"
 msgid "Key"
 msgstr ""
 
-#: dialogs/accel-config.cpp:149
+#: dialogs/accel-config.cpp:148
 msgid "Menu commands"
 msgstr "Příkazy nabídky"
 
-#: dialogs/accel-config.cpp:261
+#: dialogs/accel-config.cpp:259
 msgid "This will clear all user-defined accelerators. Are you sure?"
 msgstr ""
 
-#: dialogs/accel-config.cpp:261 dialogs/accel-config.cpp:298
+#: dialogs/accel-config.cpp:259 dialogs/accel-config.cpp:306
 msgid "Confirm"
 msgstr "Potvrdit"
 
-#: dialogs/accel-config.cpp:295
+#: dialogs/accel-config.cpp:304
 #, c-format
 msgid "This will unassign \"%s\" from \"%s\". Are you sure?"
 msgstr ""
@@ -1321,22 +1410,22 @@ msgstr "Stará hodnota"
 msgid "New Value"
 msgstr "Nová hodnota"
 
-#: guiinit.cpp:2518
+#: guiinit.cpp:2519
 msgid "JoyBus host invalid; disabling"
 msgstr "Neplatný hostitel JoyBus; probíhá vypínání"
 
-#: opts.cpp:298
+#: opts.cpp:154
 msgid ""
 "The INI file was written for a more recent version of VBA-M. Some INI option"
 " values may have been reset."
 msgstr ""
 
-#: opts.cpp:480 opts.cpp:500 opts.cpp:685
+#: opts.cpp:339 opts.cpp:355 opts.cpp:522
 #, c-format
 msgid "Invalid key binding %s for %s"
 msgstr "Neplatné svázání klávesy %s k %s"
 
-#: opts.cpp:707
+#: opts.cpp:528
 #, c-format
 msgid "Unknown option %s with value %s"
 msgstr ""
@@ -1560,37 +1649,37 @@ msgstr "Konec přehrávání"
 msgid "%d %% (%d, %d fps)"
 msgstr ""
 
-#: sys.cpp:899 xrc/GBPrinter.xrc:65
+#: sys.cpp:898 xrc/GBPrinter.xrc:65
 msgid "&Discard"
 msgstr "&Zahodit"
 
-#: sys.cpp:933
+#: sys.cpp:932
 msgid "Image files (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 msgstr "Obrázkový soubor (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 
-#: sys.cpp:942
+#: sys.cpp:941
 msgid "Save printer image to"
 msgstr "Uložit obrázek tiskárny do"
 
-#: sys.cpp:956 sys.cpp:1140
+#: sys.cpp:955 sys.cpp:1139
 #, c-format
 msgid "Wrote printer output to %s"
 msgstr "Výstup tiskárny zapsán do %s"
 
-#: sys.cpp:961 sys.cpp:1032
+#: sys.cpp:960 sys.cpp:1031
 msgid "&Close"
 msgstr "&Zavřít"
 
-#: sys.cpp:1027
+#: sys.cpp:1026
 msgid "Printed"
 msgstr "Vytisknuto"
 
-#: sys.cpp:1302
+#: sys.cpp:1301
 #, c-format
 msgid "Error opening pseudo tty: %s"
 msgstr "Chyba při otevírání pseudo tty: %s"
 
-#: sys.cpp:1401
+#: sys.cpp:1400
 #, c-format
 msgid "Error setting up server socket (%d)"
 msgstr "Chyba při nastavování soketu serveru (%d)"
@@ -1624,80 +1713,80 @@ msgstr ""
 msgid "Unable to load dialog %s from resources"
 msgstr "Nelze načíst dialogové okno %s ze zdrojů."
 
-#: wxvbam.cpp:398 wxvbam.cpp:415
+#: wxvbam.cpp:401 wxvbam.cpp:418
 #, c-format
 msgid "Invalid configuration file provided: %s"
 msgstr ""
 
-#: wxvbam.cpp:559
+#: wxvbam.cpp:558
 msgid "Could not create main window"
 msgstr "Nelze vytvořit hlavní okno"
 
-#: wxvbam.cpp:634
+#: wxvbam.cpp:633
 msgid "Save built-in XRC file and exit"
 msgstr "Uložit soubor zabudovaného XRC a ukončit"
 
-#: wxvbam.cpp:637
+#: wxvbam.cpp:636
 msgid "Save built-in vba-over.ini and exit"
 msgstr "Uložit zabudované vba-over.ini a ukončit"
 
-#: wxvbam.cpp:640
+#: wxvbam.cpp:639
 msgid "Print configuration path and exit"
 msgstr "Vypsat cestu pro nastavení a ukončit"
 
-#: wxvbam.cpp:643
+#: wxvbam.cpp:642
 msgid "Start in full-screen mode"
 msgstr "Spustit v režimu celé obrazovky"
 
-#: wxvbam.cpp:646
+#: wxvbam.cpp:645
 msgid "Set a configuration file"
 msgstr ""
 
-#: wxvbam.cpp:650
+#: wxvbam.cpp:649
 msgid "Delete shared link state first, if it exists"
 msgstr "Nejdříve smazat stav sdíleného spojení, pokud existuje"
 
-#: wxvbam.cpp:657
+#: wxvbam.cpp:656
 msgid "List all settable options and exit"
 msgstr "Vypsat všechny nastavitelné volby a ukončit"
 
-#: wxvbam.cpp:660
+#: wxvbam.cpp:659
 msgid "ROM file"
 msgstr "Soubor ROM"
 
-#: wxvbam.cpp:662
+#: wxvbam.cpp:661
 msgid "<config>=<value>"
 msgstr "<nastavení>=<hodnota>"
 
-#: wxvbam.cpp:693
+#: wxvbam.cpp:692
 msgid "Configuration / build error: can't find built-in xrc"
 msgstr ""
 
-#: wxvbam.cpp:701
+#: wxvbam.cpp:700
 #, c-format
 msgid ""
 "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:"
 msgstr ""
 
-#: wxvbam.cpp:715
+#: wxvbam.cpp:714
 msgid "Configuration is read from, in order:"
 msgstr "Nastavení je načítáno z umístění v tomto pořadí:"
 
-#: wxvbam.cpp:729
+#: wxvbam.cpp:728
 #, c-format
 msgid ""
 "Wrote built-in override file to %s\n"
 "To override, delete all but changed section. First found section is used from search path:"
 msgstr ""
 
-#: wxvbam.cpp:735
+#: wxvbam.cpp:734
 msgid ""
 "\n"
 "\tbuilt-in"
 msgstr "\n\tzabudované"
 
-#: wxvbam.cpp:750
+#: wxvbam.cpp:749
 msgid ""
 "Options set from the command line are saved if any configuration changes are made in the user interface.\n"
 "\n"
@@ -1705,17 +1794,17 @@ msgid ""
 "\n"
 msgstr "Možnosti nastavené z příkazového řádku jsou uloženy v případě jakékoliv změny konfigurace provedeny v uživatelském rozhraní.\n\nPro volby flag, pravdivé a falešné jsou specifikovány jako 1 and 0, resp.\n\n"
 
-#: wxvbam.cpp:758
+#: wxvbam.cpp:757
 msgid ""
 "The commands available for the Keyboard/* option are:\n"
 "\n"
 msgstr "Příkazy dostupné pro volbu Keyboard/* jsou:\n\n"
 
-#: wxvbam.cpp:769
+#: wxvbam.cpp:768
 msgid "Configuration file not found."
 msgstr ""
 
-#: wxvbam.cpp:800
+#: wxvbam.cpp:799
 msgid "Bad configuration option or multiple ROM files given:\n"
 msgstr "Špatná volba nastavení, nebo předáno více souborů ROM:\n"
 
@@ -2227,10 +2316,6 @@ msgstr "Přeskakování snímku"
 msgid "&Number of frames to skip:"
 msgstr ""
 
-#: xrc/DisplayConfig.xrc:200
-msgid "Speed"
-msgstr "Rychlost"
-
 #: xrc/DisplayConfig.xrc:216
 msgid "Speed indicator:"
 msgstr ""
@@ -2766,58 +2851,10 @@ msgid ""
 " entire contents if too small."
 msgstr ""
 
-#: xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
-msgid "Up"
-msgstr "Nahoru"
-
-#: xrc/JoyPanel.xrc:37
-msgid "A"
-msgstr "A"
-
-#: xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
-msgid "Down"
-msgstr "Dolů"
-
-#: xrc/JoyPanel.xrc:83
-msgid "B"
-msgstr "B"
-
-#: xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
-msgid "Left"
-msgstr "Doleva"
-
-#: xrc/JoyPanel.xrc:129
-msgid "L"
-msgstr "L"
-
-#: xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
-msgid "Right"
-msgstr "Doprava"
-
-#: xrc/JoyPanel.xrc:175
-msgid "R"
-msgstr "R"
-
-#: xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
-msgid "Select"
-msgstr "Select"
-
-#: xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
-msgid "Start"
-msgstr "Start"
-
-#: xrc/JoyPanel.xrc:254
-msgid "Motion Up"
-msgstr "Pohyb nahoru"
-
 #: xrc/JoyPanel.xrc:276
 msgid "Autofire A"
 msgstr ""
 
-#: xrc/JoyPanel.xrc:298
-msgid "Motion Down"
-msgstr "Pohyb dolů"
-
 #: xrc/JoyPanel.xrc:320
 msgid "Autofire B"
 msgstr ""
diff --git a/po/wxvbam/de.po b/po/wxvbam/de.po
index 8b0372e2..cc3e7e9c 100644
--- a/po/wxvbam/de.po
+++ b/po/wxvbam/de.po
@@ -22,7 +22,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VBA-M\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-23 22:00+0000\n"
+"POT-Creation-Date: 2024-04-24 02:00+0000\n"
 "PO-Revision-Date: 2011-12-03 19:42+0000\n"
 "Last-Translator: Peter Tpoint <peter.traxl@gmail.com>, 2021\n"
 "Language-Team: German (http://app.transifex.com/bgk/vba-m/language/de/)\n"
@@ -333,174 +333,263 @@ msgstr ""
 msgid "Network is not supported in local mode."
 msgstr "Netzwerk wird in lokalem Modus nicht unterstützt."
 
-#: config/internal/option-internal.cpp:379
-msgid "Use bilinear filter with 3d renderer"
+#: config/command.cpp:28 xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
+msgid "Up"
+msgstr "Oben"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
+msgid "Down"
+msgstr "Unten"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
+msgid "Left"
+msgstr "Links"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
+msgid "Right"
+msgstr "Rechts"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:37
+msgid "A"
+msgstr "A"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:83
+msgid "B"
+msgstr "B"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:129
+msgid "L"
+msgstr "L"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:175
+msgid "R"
+msgstr "R"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
+msgid "Select"
+msgstr "Select"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
+msgid "Start"
+msgstr "Start"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:254
+msgid "Motion Up"
+msgstr "Bewegung nach oben"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:298
+msgid "Motion Down"
+msgstr "Bewegung nach unten"
+
+#: config/command.cpp:30
+msgid "Motion Left"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion Right"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion In"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Motion Out"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto A"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto B"
+msgstr ""
+
+#: config/command.cpp:31 xrc/DisplayConfig.xrc:200
+msgid "Speed"
+msgstr "Geschwindigkeit"
+
+#: config/command.cpp:31
+msgid "Capture"
+msgstr ""
+
+#: config/command.cpp:32
+msgid "GameShark"
+msgstr ""
+
+#: config/command.cpp:106
+#, c-format
+msgid "Joypad %zu %s"
 msgstr ""
 
 #: config/internal/option-internal.cpp:380
-msgid "Full-screen filter to apply"
+msgid "Use bilinear filter with 3d renderer"
 msgstr ""
 
 #: config/internal/option-internal.cpp:381
-msgid "Filter plugin library"
+msgid "Full-screen filter to apply"
 msgstr ""
 
 #: config/internal/option-internal.cpp:382
-msgid "Interframe blending function"
+msgid "Filter plugin library"
 msgstr ""
 
 #: config/internal/option-internal.cpp:383
+msgid "Interframe blending function"
+msgstr ""
+
+#: config/internal/option-internal.cpp:384
 msgid "Keep window on top"
 msgstr ""
 
-#: config/internal/option-internal.cpp:385
+#: config/internal/option-internal.cpp:386
 msgid "Maximum number of threads to run filters in"
 msgstr ""
 
-#: config/internal/option-internal.cpp:387
+#: config/internal/option-internal.cpp:388
 msgid "Render method; if unsupported, simple method will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:388
+#: config/internal/option-internal.cpp:389
 msgid "Default scale factor"
 msgstr ""
 
-#: config/internal/option-internal.cpp:389
+#: config/internal/option-internal.cpp:390
 msgid "Retain aspect ratio when resizing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:392
+#: config/internal/option-internal.cpp:393
 msgid "BIOS file to use for Game Boy, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:393
+#: config/internal/option-internal.cpp:394
 msgid "Game Boy color enhancement, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:394
+#: config/internal/option-internal.cpp:395
 msgid "Enable DX Colorization Hacks"
 msgstr ""
 
-#: config/internal/option-internal.cpp:395
-#: config/internal/option-internal.cpp:419
+#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:420
 msgid "Apply LCD filter, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:397
 msgid "BIOS file to use for Game Boy Color, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:398
+#: config/internal/option-internal.cpp:399
 msgid ""
 "The default palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:401
+#: config/internal/option-internal.cpp:402
 msgid ""
 "The first user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:404
+#: config/internal/option-internal.cpp:405
 msgid ""
 "The second user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:407
+#: config/internal/option-internal.cpp:408
 msgid "Automatically gather a full page before printing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:409
+#: config/internal/option-internal.cpp:410
 msgid "Automatically save printouts as screen captures with -print suffix"
 msgstr ""
 
-#: config/internal/option-internal.cpp:411
-#: config/internal/option-internal.cpp:439
+#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:440
 msgid "Directory to look for ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:413
 msgid "Directory to look for Game Boy Color ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:415
+#: config/internal/option-internal.cpp:416
 msgid "BIOS file to use, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:425
+#: config/internal/option-internal.cpp:426
 msgid "Enable link at boot"
 msgstr ""
 
-#: config/internal/option-internal.cpp:430
+#: config/internal/option-internal.cpp:431
 msgid "Enable faster network protocol by default"
 msgstr ""
 
-#: config/internal/option-internal.cpp:432
+#: config/internal/option-internal.cpp:433
 msgid "Default network link client host"
 msgstr ""
 
-#: config/internal/option-internal.cpp:433
+#: config/internal/option-internal.cpp:434
 msgid "Default network link server IP to bind"
 msgstr ""
 
-#: config/internal/option-internal.cpp:434
+#: config/internal/option-internal.cpp:435
 msgid "Default network link port (server and client)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:435
+#: config/internal/option-internal.cpp:436
 msgid "Default network protocol"
 msgstr ""
 
-#: config/internal/option-internal.cpp:436
+#: config/internal/option-internal.cpp:437
 msgid "Link timeout (ms)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:437
+#: config/internal/option-internal.cpp:438
 msgid "Link cable type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:442
+#: config/internal/option-internal.cpp:443
 msgid "Automatically load last saved state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:444
+#: config/internal/option-internal.cpp:445
 msgid ""
 "Directory to store game save files (relative paths are relative to ROM; "
 "blank is config dir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:446
+#: config/internal/option-internal.cpp:447
 msgid "Freeze recent load list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:448
+#: config/internal/option-internal.cpp:449
 msgid ""
 "Directory to store A / V and game recordings (relative paths are relative to"
 " ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:451
+#: config/internal/option-internal.cpp:452
 msgid "Number of seconds between rewind snapshots (0 to disable)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:453
+#: config/internal/option-internal.cpp:454
 msgid "Directory to store screenshots (relative paths are relative to ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:456
+#: config/internal/option-internal.cpp:457
 msgid ""
 "Directory to store saved state files (relative paths are relative to "
 "BatteryDir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:458
+#: config/internal/option-internal.cpp:459
 msgid "Enable status bar"
 msgstr ""
 
-#: config/internal/option-internal.cpp:459
+#: config/internal/option-internal.cpp:460
 msgid "INI file version (DO NOT MODIFY)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:463
+#: config/internal/option-internal.cpp:464
 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, "
@@ -508,266 +597,266 @@ msgid ""
 "MotionRight, AutoA, AutoB, Speed, Capture, GS"
 msgstr ""
 
-#: config/internal/option-internal.cpp:468
+#: config/internal/option-internal.cpp:469
 msgid "The autofire toggle period, in frames (1/60 s)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:469
+#: config/internal/option-internal.cpp:470
 msgid "The number of the stick to use in single-player mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:471
+#: config/internal/option-internal.cpp:472
 msgid "Whether to enable SDL GameController mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:475
+#: config/internal/option-internal.cpp:476
 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 "
 "executed."
 msgstr ""
 
-#: config/internal/option-internal.cpp:480
+#: config/internal/option-internal.cpp:481
 msgid "Enable AGB debug print"
 msgstr ""
 
-#: config/internal/option-internal.cpp:481
+#: config/internal/option-internal.cpp:482
 msgid "Auto skip frames"
 msgstr ""
 
-#: config/internal/option-internal.cpp:483
+#: config/internal/option-internal.cpp:484
 msgid "Apply IPS / UPS / IPF patches if found"
 msgstr ""
 
-#: config/internal/option-internal.cpp:485
+#: config/internal/option-internal.cpp:486
 msgid "Automatically save and load cheat list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:489
+#: config/internal/option-internal.cpp:490
 msgid "Automatically enable border for Super Game Boy games"
 msgstr ""
 
-#: config/internal/option-internal.cpp:491
+#: config/internal/option-internal.cpp:492
 msgid "Always enable border"
 msgstr ""
 
-#: config/internal/option-internal.cpp:492
+#: config/internal/option-internal.cpp:493
 msgid "Screen capture file format"
 msgstr ""
 
-#: config/internal/option-internal.cpp:493
+#: config/internal/option-internal.cpp:494
 msgid "Enable cheats"
 msgstr ""
 
-#: config/internal/option-internal.cpp:494
+#: config/internal/option-internal.cpp:495
 msgid "Disable on-screen status messages"
 msgstr ""
 
-#: config/internal/option-internal.cpp:495
+#: config/internal/option-internal.cpp:496
 msgid "Type of system to emulate"
 msgstr ""
 
-#: config/internal/option-internal.cpp:496
+#: config/internal/option-internal.cpp:497
 msgid "Flash size 0 = 64 KB 1 = 128 KB"
 msgstr ""
 
-#: config/internal/option-internal.cpp:498
+#: config/internal/option-internal.cpp:499
 msgid "Skip frames. Values are 0-9 or -1 to skip automatically based on time."
 msgstr ""
 
-#: config/internal/option-internal.cpp:500
+#: config/internal/option-internal.cpp:501
 msgid "The palette to use"
 msgstr ""
 
-#: config/internal/option-internal.cpp:501
+#: config/internal/option-internal.cpp:502
 msgid "Enable printer emulation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:503
+#: config/internal/option-internal.cpp:504
 msgid "Break into GDB after loading the game."
 msgstr ""
 
-#: config/internal/option-internal.cpp:504
+#: config/internal/option-internal.cpp:505
 msgid "Port to connect GDB to"
 msgstr ""
 
-#: config/internal/option-internal.cpp:506
+#: config/internal/option-internal.cpp:507
 msgid "Number of players in network"
 msgstr ""
 
-#: config/internal/option-internal.cpp:508
+#: config/internal/option-internal.cpp:509
 msgid "Maximum scale factor (0 = no limit)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:510
+#: config/internal/option-internal.cpp:511
 msgid "Pause game when main window loses focus"
 msgstr ""
 
-#: config/internal/option-internal.cpp:512
+#: config/internal/option-internal.cpp:513
 msgid "Enable RTC (vba-over.ini override is rtcEnabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:513
+#: config/internal/option-internal.cpp:514
 msgid "Native save (\"battery\") hardware type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:514
+#: config/internal/option-internal.cpp:515
 msgid "Show speed indicator"
 msgstr ""
 
-#: config/internal/option-internal.cpp:516
+#: config/internal/option-internal.cpp:517
 msgid "Draw on-screen messages transparently"
 msgstr ""
 
-#: config/internal/option-internal.cpp:517
+#: config/internal/option-internal.cpp:518
 msgid "Skip BIOS initialization"
 msgstr ""
 
-#: config/internal/option-internal.cpp:519
+#: config/internal/option-internal.cpp:520
 msgid "Do not overwrite cheat list when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:521
+#: config/internal/option-internal.cpp:522
 msgid "Do not overwrite native (battery) save when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:523
+#: config/internal/option-internal.cpp:524
 msgid "Throttle game speed, even when accelerated (0-450 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:526
+#: config/internal/option-internal.cpp:527
 msgid "Set throttle for speedup key (0-3000 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:528
+#: config/internal/option-internal.cpp:529
 msgid "Number of frames to skip with speedup (instead of speedup throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:531
+#: config/internal/option-internal.cpp:532
 msgid "Use frame skip for speedup throttle"
 msgstr ""
 
-#: config/internal/option-internal.cpp:532
+#: config/internal/option-internal.cpp:533
 msgid "Use the specified BIOS file for Game Boy"
 msgstr ""
 
-#: config/internal/option-internal.cpp:533
+#: config/internal/option-internal.cpp:534
 msgid "Use the specified BIOS file"
 msgstr ""
 
-#: config/internal/option-internal.cpp:535
+#: config/internal/option-internal.cpp:536
 msgid "Use the specified BIOS file for Game Boy Color"
 msgstr ""
 
-#: config/internal/option-internal.cpp:536
+#: config/internal/option-internal.cpp:537
 msgid "Wait for vertical sync"
 msgstr ""
 
-#: config/internal/option-internal.cpp:539
+#: config/internal/option-internal.cpp:540
 msgid "Enter fullscreen mode at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:540
+#: config/internal/option-internal.cpp:541
 msgid "Window maximized"
 msgstr ""
 
-#: config/internal/option-internal.cpp:541
+#: config/internal/option-internal.cpp:542
 msgid "Window height at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:542
+#: config/internal/option-internal.cpp:543
 msgid "Window width at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:543
+#: config/internal/option-internal.cpp:544
 msgid "Window axis X position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:544
+#: config/internal/option-internal.cpp:545
 msgid "Window axis Y position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:548
+#: config/internal/option-internal.cpp:549
 msgid "Capture key events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:550
+#: config/internal/option-internal.cpp:551
 msgid "Capture joy events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:551
+#: config/internal/option-internal.cpp:552
 msgid "Hide menu bar when mouse is inactive"
 msgstr ""
 
-#: config/internal/option-internal.cpp:553
+#: config/internal/option-internal.cpp:554
 msgid "Suspend screensaver when game is running"
 msgstr ""
 
-#: config/internal/option-internal.cpp:556
+#: config/internal/option-internal.cpp:557
 msgid "Sound API; if unsupported, default API will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:557
+#: config/internal/option-internal.cpp:558
 msgid "Device ID of chosen audio device for chosen driver"
 msgstr ""
 
-#: config/internal/option-internal.cpp:558
+#: config/internal/option-internal.cpp:559
 msgid "Number of sound buffers"
 msgstr ""
 
-#: config/internal/option-internal.cpp:559
+#: config/internal/option-internal.cpp:560
 msgid "Bit mask of sound channels to enable"
 msgstr ""
 
-#: config/internal/option-internal.cpp:560
+#: config/internal/option-internal.cpp:561
 msgid "Game Boy Advance sound filtering (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:562
+#: config/internal/option-internal.cpp:563
 msgid "Game Boy Advance sound interpolation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:563
+#: config/internal/option-internal.cpp:564
 msgid "Game Boy sound declicking"
 msgstr ""
 
-#: config/internal/option-internal.cpp:564
+#: config/internal/option-internal.cpp:565
 msgid "Game Boy echo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:565
+#: config/internal/option-internal.cpp:566
 msgid "Enable Game Boy sound effects"
 msgstr ""
 
-#: config/internal/option-internal.cpp:566
+#: config/internal/option-internal.cpp:567
 msgid "Game Boy stereo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:567
+#: config/internal/option-internal.cpp:568
 msgid "Game Boy surround sound effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:568
+#: config/internal/option-internal.cpp:569
 msgid "Sound sample rate (kHz)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:569
+#: config/internal/option-internal.cpp:570
 msgid "Use DirectSound hardware acceleration"
 msgstr ""
 
-#: config/internal/option-internal.cpp:570
+#: config/internal/option-internal.cpp:571
 msgid "Upmix stereo to surround"
 msgstr ""
 
-#: config/internal/option-internal.cpp:571
+#: config/internal/option-internal.cpp:572
 msgid "Sound volume (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:639
-#: config/internal/option-internal.cpp:659
-#: config/internal/option-internal.cpp:680
-#: config/internal/option-internal.cpp:700
-#: config/internal/option-internal.cpp:719
+#: config/internal/option-internal.cpp:640
+#: config/internal/option-internal.cpp:660
+#: config/internal/option-internal.cpp:681
+#: config/internal/option-internal.cpp:701
+#: config/internal/option-internal.cpp:720
 #, c-format
 msgid "Invalid value %s for option %s; valid values are %s"
 msgstr ""
@@ -782,7 +871,7 @@ msgstr "Ungültiger Wert 1 %f für Option 2 %s; gültige Werte sind 1 %f-1 %f"
 msgid "Invalid value %d for option %s; valid values are %d - %d"
 msgstr "Ungültiger Wert %d für Option %s; gültige Werte sind %d -%d"
 
-#: config/option.cpp:480 opts.cpp:621 opts.cpp:630 opts.cpp:639 opts.cpp:648
+#: config/option.cpp:480 opts.cpp:468 opts.cpp:477 opts.cpp:486 opts.cpp:495
 #, c-format
 msgid "Invalid value %s for option %s"
 msgstr ""
@@ -947,19 +1036,19 @@ msgstr "Meta+"
 msgid "Key"
 msgstr ""
 
-#: dialogs/accel-config.cpp:149
+#: dialogs/accel-config.cpp:148
 msgid "Menu commands"
 msgstr "Menükommandos"
 
-#: dialogs/accel-config.cpp:261
+#: dialogs/accel-config.cpp:259
 msgid "This will clear all user-defined accelerators. Are you sure?"
 msgstr ""
 
-#: dialogs/accel-config.cpp:261 dialogs/accel-config.cpp:298
+#: dialogs/accel-config.cpp:259 dialogs/accel-config.cpp:306
 msgid "Confirm"
 msgstr "Bestätigen"
 
-#: dialogs/accel-config.cpp:295
+#: dialogs/accel-config.cpp:304
 #, c-format
 msgid "This will unassign \"%s\" from \"%s\". Are you sure?"
 msgstr ""
@@ -1331,22 +1420,22 @@ msgstr "Ursprünglicher Wert"
 msgid "New Value"
 msgstr "Neuer Wert"
 
-#: guiinit.cpp:2518
+#: guiinit.cpp:2519
 msgid "JoyBus host invalid; disabling"
 msgstr "JoyBus-Host ungültig; wird deaktiviert"
 
-#: opts.cpp:298
+#: opts.cpp:154
 msgid ""
 "The INI file was written for a more recent version of VBA-M. Some INI option"
 " values may have been reset."
 msgstr ""
 
-#: opts.cpp:480 opts.cpp:500 opts.cpp:685
+#: opts.cpp:339 opts.cpp:355 opts.cpp:522
 #, c-format
 msgid "Invalid key binding %s for %s"
 msgstr "Ungültige Tastenkombination %s für %s"
 
-#: opts.cpp:707
+#: opts.cpp:528
 #, c-format
 msgid "Unknown option %s with value %s"
 msgstr ""
@@ -1570,37 +1659,37 @@ msgstr "Aufzeichnung wurde abgespielt"
 msgid "%d %% (%d, %d fps)"
 msgstr ""
 
-#: sys.cpp:899 xrc/GBPrinter.xrc:65
+#: sys.cpp:898 xrc/GBPrinter.xrc:65
 msgid "&Discard"
 msgstr "Verwerfen"
 
-#: sys.cpp:933
+#: sys.cpp:932
 msgid "Image files (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 msgstr "Bilddateien (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 
-#: sys.cpp:942
+#: sys.cpp:941
 msgid "Save printer image to"
 msgstr "Druckerbild speichern in"
 
-#: sys.cpp:956 sys.cpp:1140
+#: sys.cpp:955 sys.cpp:1139
 #, c-format
 msgid "Wrote printer output to %s"
 msgstr "Druckerbild gespeichert in %s"
 
-#: sys.cpp:961 sys.cpp:1032
+#: sys.cpp:960 sys.cpp:1031
 msgid "&Close"
 msgstr "S&chließen"
 
-#: sys.cpp:1027
+#: sys.cpp:1026
 msgid "Printed"
 msgstr "Ausdruck fertig"
 
-#: sys.cpp:1302
+#: sys.cpp:1301
 #, c-format
 msgid "Error opening pseudo tty: %s"
 msgstr "Fehler beim Öffnen von Pseudo-TTY: %s"
 
-#: sys.cpp:1401
+#: sys.cpp:1400
 #, c-format
 msgid "Error setting up server socket (%d)"
 msgstr "Fehler beim Einrichten von Server-Socket (%d)"
@@ -1634,80 +1723,80 @@ msgstr ""
 msgid "Unable to load dialog %s from resources"
 msgstr "Dialog %s aus Ressourcen konnte nicht geladen werden"
 
-#: wxvbam.cpp:398 wxvbam.cpp:415
+#: wxvbam.cpp:401 wxvbam.cpp:418
 #, c-format
 msgid "Invalid configuration file provided: %s"
 msgstr ""
 
-#: wxvbam.cpp:559
+#: wxvbam.cpp:558
 msgid "Could not create main window"
 msgstr "Hauptfenster konnte nicht erstellt werden"
 
-#: wxvbam.cpp:634
+#: wxvbam.cpp:633
 msgid "Save built-in XRC file and exit"
 msgstr "Interne XRC-Datei speichern und beenden"
 
-#: wxvbam.cpp:637
+#: wxvbam.cpp:636
 msgid "Save built-in vba-over.ini and exit"
 msgstr "Interne vba-over.ini speichern und beenden"
 
-#: wxvbam.cpp:640
+#: wxvbam.cpp:639
 msgid "Print configuration path and exit"
 msgstr "Konfigurationspfad ausgeben und beenden"
 
-#: wxvbam.cpp:643
+#: wxvbam.cpp:642
 msgid "Start in full-screen mode"
 msgstr "Im Vollbildmodus starten"
 
-#: wxvbam.cpp:646
+#: wxvbam.cpp:645
 msgid "Set a configuration file"
 msgstr "Konfigurationsdatei festlegen"
 
-#: wxvbam.cpp:650
+#: wxvbam.cpp:649
 msgid "Delete shared link state first, if it exists"
 msgstr "Erst verknüpften Linkzustand löschen, falls einer existiert"
 
-#: wxvbam.cpp:657
+#: wxvbam.cpp:656
 msgid "List all settable options and exit"
 msgstr "Alle einstellbaren Optionen auflisten und beenden"
 
-#: wxvbam.cpp:660
+#: wxvbam.cpp:659
 msgid "ROM file"
 msgstr "ROM-Datei"
 
-#: wxvbam.cpp:662
+#: wxvbam.cpp:661
 msgid "<config>=<value>"
 msgstr "<config>=<value>"
 
-#: wxvbam.cpp:693
+#: wxvbam.cpp:692
 msgid "Configuration / build error: can't find built-in xrc"
 msgstr ""
 
-#: wxvbam.cpp:701
+#: wxvbam.cpp:700
 #, c-format
 msgid ""
 "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:"
 msgstr ""
 
-#: wxvbam.cpp:715
+#: wxvbam.cpp:714
 msgid "Configuration is read from, in order:"
 msgstr "Konfiguration wird der Reihe nach gelesen aus:"
 
-#: wxvbam.cpp:729
+#: wxvbam.cpp:728
 #, c-format
 msgid ""
 "Wrote built-in override file to %s\n"
 "To override, delete all but changed section. First found section is used from search path:"
 msgstr ""
 
-#: wxvbam.cpp:735
+#: wxvbam.cpp:734
 msgid ""
 "\n"
 "\tbuilt-in"
 msgstr "\n\tintern"
 
-#: wxvbam.cpp:750
+#: wxvbam.cpp:749
 msgid ""
 "Options set from the command line are saved if any configuration changes are made in the user interface.\n"
 "\n"
@@ -1715,17 +1804,17 @@ msgid ""
 "\n"
 msgstr "Von der Kommandozeile gesetzte Optionen werden gespeichert, wenn Einstellungen im Benutzer-Interface geändert werden.\n\nFür Flag-Einstellungen sind TRUE und FALSE als 1 und 0 definiert.\n\n"
 
-#: wxvbam.cpp:758
+#: wxvbam.cpp:757
 msgid ""
 "The commands available for the Keyboard/* option are:\n"
 "\n"
 msgstr "Die verfügbaren Tastaturkommandos sind:\n\n"
 
-#: wxvbam.cpp:769
+#: wxvbam.cpp:768
 msgid "Configuration file not found."
 msgstr "Konfigurationsdatei nicht gefunden"
 
-#: wxvbam.cpp:800
+#: wxvbam.cpp:799
 msgid "Bad configuration option or multiple ROM files given:\n"
 msgstr "Fehlerhafte Konfiguration oder mehrere ROM-Dateien übergeben:\n"
 
@@ -2237,10 +2326,6 @@ msgstr "Frames auslassen"
 msgid "&Number of frames to skip:"
 msgstr ""
 
-#: xrc/DisplayConfig.xrc:200
-msgid "Speed"
-msgstr "Geschwindigkeit"
-
 #: xrc/DisplayConfig.xrc:216
 msgid "Speed indicator:"
 msgstr ""
@@ -2776,58 +2861,10 @@ msgid ""
 " entire contents if too small."
 msgstr ""
 
-#: xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
-msgid "Up"
-msgstr "Oben"
-
-#: xrc/JoyPanel.xrc:37
-msgid "A"
-msgstr "A"
-
-#: xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
-msgid "Down"
-msgstr "Unten"
-
-#: xrc/JoyPanel.xrc:83
-msgid "B"
-msgstr "B"
-
-#: xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
-msgid "Left"
-msgstr "Links"
-
-#: xrc/JoyPanel.xrc:129
-msgid "L"
-msgstr "L"
-
-#: xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
-msgid "Right"
-msgstr "Rechts"
-
-#: xrc/JoyPanel.xrc:175
-msgid "R"
-msgstr "R"
-
-#: xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
-msgid "Select"
-msgstr "Select"
-
-#: xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
-msgid "Start"
-msgstr "Start"
-
-#: xrc/JoyPanel.xrc:254
-msgid "Motion Up"
-msgstr "Bewegung nach oben"
-
 #: xrc/JoyPanel.xrc:276
 msgid "Autofire A"
 msgstr "Autofeuer A"
 
-#: xrc/JoyPanel.xrc:298
-msgid "Motion Down"
-msgstr "Bewegung nach unten"
-
 #: xrc/JoyPanel.xrc:320
 msgid "Autofire B"
 msgstr "Autofeuer B"
diff --git a/po/wxvbam/el.po b/po/wxvbam/el.po
index 97a7991a..d28918ee 100644
--- a/po/wxvbam/el.po
+++ b/po/wxvbam/el.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VBA-M\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-23 22:00+0000\n"
+"POT-Creation-Date: 2024-04-24 02:00+0000\n"
 "PO-Revision-Date: 2011-12-03 19:42+0000\n"
 "Last-Translator: Stathis Galazios <infin1ty@hol.gr>, 2016-2017\n"
 "Language-Team: Greek (http://app.transifex.com/bgk/vba-m/language/el/)\n"
@@ -319,174 +319,263 @@ msgstr ""
 msgid "Network is not supported in local mode."
 msgstr "Το δίκτυο δεν υποστηρίζεται σε τοπική λειτουργία."
 
-#: config/internal/option-internal.cpp:379
-msgid "Use bilinear filter with 3d renderer"
+#: config/command.cpp:28 xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
+msgid "Up"
+msgstr "Πάνω"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
+msgid "Down"
+msgstr "Κάτω"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
+msgid "Left"
+msgstr "Αριστερά"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
+msgid "Right"
+msgstr "Δεξιά"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:37
+msgid "A"
+msgstr "A"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:83
+msgid "B"
+msgstr "B"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:129
+msgid "L"
+msgstr "L"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:175
+msgid "R"
+msgstr "R"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
+msgid "Select"
+msgstr "Select"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
+msgid "Start"
+msgstr "Start"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:254
+msgid "Motion Up"
+msgstr "Κίνηση πάνω"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:298
+msgid "Motion Down"
+msgstr "Κίνηση κάτω"
+
+#: config/command.cpp:30
+msgid "Motion Left"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion Right"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion In"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Motion Out"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto A"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto B"
+msgstr ""
+
+#: config/command.cpp:31 xrc/DisplayConfig.xrc:200
+msgid "Speed"
+msgstr "Ταχύτητα"
+
+#: config/command.cpp:31
+msgid "Capture"
+msgstr ""
+
+#: config/command.cpp:32
+msgid "GameShark"
+msgstr ""
+
+#: config/command.cpp:106
+#, c-format
+msgid "Joypad %zu %s"
 msgstr ""
 
 #: config/internal/option-internal.cpp:380
-msgid "Full-screen filter to apply"
+msgid "Use bilinear filter with 3d renderer"
 msgstr ""
 
 #: config/internal/option-internal.cpp:381
-msgid "Filter plugin library"
+msgid "Full-screen filter to apply"
 msgstr ""
 
 #: config/internal/option-internal.cpp:382
-msgid "Interframe blending function"
+msgid "Filter plugin library"
 msgstr ""
 
 #: config/internal/option-internal.cpp:383
+msgid "Interframe blending function"
+msgstr ""
+
+#: config/internal/option-internal.cpp:384
 msgid "Keep window on top"
 msgstr ""
 
-#: config/internal/option-internal.cpp:385
+#: config/internal/option-internal.cpp:386
 msgid "Maximum number of threads to run filters in"
 msgstr ""
 
-#: config/internal/option-internal.cpp:387
+#: config/internal/option-internal.cpp:388
 msgid "Render method; if unsupported, simple method will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:388
+#: config/internal/option-internal.cpp:389
 msgid "Default scale factor"
 msgstr ""
 
-#: config/internal/option-internal.cpp:389
+#: config/internal/option-internal.cpp:390
 msgid "Retain aspect ratio when resizing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:392
+#: config/internal/option-internal.cpp:393
 msgid "BIOS file to use for Game Boy, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:393
+#: config/internal/option-internal.cpp:394
 msgid "Game Boy color enhancement, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:394
+#: config/internal/option-internal.cpp:395
 msgid "Enable DX Colorization Hacks"
 msgstr ""
 
-#: config/internal/option-internal.cpp:395
-#: config/internal/option-internal.cpp:419
+#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:420
 msgid "Apply LCD filter, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:397
 msgid "BIOS file to use for Game Boy Color, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:398
+#: config/internal/option-internal.cpp:399
 msgid ""
 "The default palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:401
+#: config/internal/option-internal.cpp:402
 msgid ""
 "The first user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:404
+#: config/internal/option-internal.cpp:405
 msgid ""
 "The second user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:407
+#: config/internal/option-internal.cpp:408
 msgid "Automatically gather a full page before printing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:409
+#: config/internal/option-internal.cpp:410
 msgid "Automatically save printouts as screen captures with -print suffix"
 msgstr ""
 
-#: config/internal/option-internal.cpp:411
-#: config/internal/option-internal.cpp:439
+#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:440
 msgid "Directory to look for ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:413
 msgid "Directory to look for Game Boy Color ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:415
+#: config/internal/option-internal.cpp:416
 msgid "BIOS file to use, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:425
+#: config/internal/option-internal.cpp:426
 msgid "Enable link at boot"
 msgstr ""
 
-#: config/internal/option-internal.cpp:430
+#: config/internal/option-internal.cpp:431
 msgid "Enable faster network protocol by default"
 msgstr ""
 
-#: config/internal/option-internal.cpp:432
+#: config/internal/option-internal.cpp:433
 msgid "Default network link client host"
 msgstr ""
 
-#: config/internal/option-internal.cpp:433
+#: config/internal/option-internal.cpp:434
 msgid "Default network link server IP to bind"
 msgstr ""
 
-#: config/internal/option-internal.cpp:434
+#: config/internal/option-internal.cpp:435
 msgid "Default network link port (server and client)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:435
+#: config/internal/option-internal.cpp:436
 msgid "Default network protocol"
 msgstr ""
 
-#: config/internal/option-internal.cpp:436
+#: config/internal/option-internal.cpp:437
 msgid "Link timeout (ms)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:437
+#: config/internal/option-internal.cpp:438
 msgid "Link cable type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:442
+#: config/internal/option-internal.cpp:443
 msgid "Automatically load last saved state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:444
+#: config/internal/option-internal.cpp:445
 msgid ""
 "Directory to store game save files (relative paths are relative to ROM; "
 "blank is config dir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:446
+#: config/internal/option-internal.cpp:447
 msgid "Freeze recent load list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:448
+#: config/internal/option-internal.cpp:449
 msgid ""
 "Directory to store A / V and game recordings (relative paths are relative to"
 " ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:451
+#: config/internal/option-internal.cpp:452
 msgid "Number of seconds between rewind snapshots (0 to disable)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:453
+#: config/internal/option-internal.cpp:454
 msgid "Directory to store screenshots (relative paths are relative to ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:456
+#: config/internal/option-internal.cpp:457
 msgid ""
 "Directory to store saved state files (relative paths are relative to "
 "BatteryDir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:458
+#: config/internal/option-internal.cpp:459
 msgid "Enable status bar"
 msgstr ""
 
-#: config/internal/option-internal.cpp:459
+#: config/internal/option-internal.cpp:460
 msgid "INI file version (DO NOT MODIFY)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:463
+#: config/internal/option-internal.cpp:464
 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, "
@@ -494,266 +583,266 @@ msgid ""
 "MotionRight, AutoA, AutoB, Speed, Capture, GS"
 msgstr ""
 
-#: config/internal/option-internal.cpp:468
+#: config/internal/option-internal.cpp:469
 msgid "The autofire toggle period, in frames (1/60 s)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:469
+#: config/internal/option-internal.cpp:470
 msgid "The number of the stick to use in single-player mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:471
+#: config/internal/option-internal.cpp:472
 msgid "Whether to enable SDL GameController mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:475
+#: config/internal/option-internal.cpp:476
 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 "
 "executed."
 msgstr ""
 
-#: config/internal/option-internal.cpp:480
+#: config/internal/option-internal.cpp:481
 msgid "Enable AGB debug print"
 msgstr ""
 
-#: config/internal/option-internal.cpp:481
+#: config/internal/option-internal.cpp:482
 msgid "Auto skip frames"
 msgstr ""
 
-#: config/internal/option-internal.cpp:483
+#: config/internal/option-internal.cpp:484
 msgid "Apply IPS / UPS / IPF patches if found"
 msgstr ""
 
-#: config/internal/option-internal.cpp:485
+#: config/internal/option-internal.cpp:486
 msgid "Automatically save and load cheat list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:489
+#: config/internal/option-internal.cpp:490
 msgid "Automatically enable border for Super Game Boy games"
 msgstr ""
 
-#: config/internal/option-internal.cpp:491
+#: config/internal/option-internal.cpp:492
 msgid "Always enable border"
 msgstr ""
 
-#: config/internal/option-internal.cpp:492
+#: config/internal/option-internal.cpp:493
 msgid "Screen capture file format"
 msgstr ""
 
-#: config/internal/option-internal.cpp:493
+#: config/internal/option-internal.cpp:494
 msgid "Enable cheats"
 msgstr ""
 
-#: config/internal/option-internal.cpp:494
+#: config/internal/option-internal.cpp:495
 msgid "Disable on-screen status messages"
 msgstr ""
 
-#: config/internal/option-internal.cpp:495
+#: config/internal/option-internal.cpp:496
 msgid "Type of system to emulate"
 msgstr ""
 
-#: config/internal/option-internal.cpp:496
+#: config/internal/option-internal.cpp:497
 msgid "Flash size 0 = 64 KB 1 = 128 KB"
 msgstr ""
 
-#: config/internal/option-internal.cpp:498
+#: config/internal/option-internal.cpp:499
 msgid "Skip frames. Values are 0-9 or -1 to skip automatically based on time."
 msgstr ""
 
-#: config/internal/option-internal.cpp:500
+#: config/internal/option-internal.cpp:501
 msgid "The palette to use"
 msgstr ""
 
-#: config/internal/option-internal.cpp:501
+#: config/internal/option-internal.cpp:502
 msgid "Enable printer emulation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:503
+#: config/internal/option-internal.cpp:504
 msgid "Break into GDB after loading the game."
 msgstr ""
 
-#: config/internal/option-internal.cpp:504
+#: config/internal/option-internal.cpp:505
 msgid "Port to connect GDB to"
 msgstr ""
 
-#: config/internal/option-internal.cpp:506
+#: config/internal/option-internal.cpp:507
 msgid "Number of players in network"
 msgstr ""
 
-#: config/internal/option-internal.cpp:508
+#: config/internal/option-internal.cpp:509
 msgid "Maximum scale factor (0 = no limit)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:510
+#: config/internal/option-internal.cpp:511
 msgid "Pause game when main window loses focus"
 msgstr ""
 
-#: config/internal/option-internal.cpp:512
+#: config/internal/option-internal.cpp:513
 msgid "Enable RTC (vba-over.ini override is rtcEnabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:513
+#: config/internal/option-internal.cpp:514
 msgid "Native save (\"battery\") hardware type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:514
+#: config/internal/option-internal.cpp:515
 msgid "Show speed indicator"
 msgstr ""
 
-#: config/internal/option-internal.cpp:516
+#: config/internal/option-internal.cpp:517
 msgid "Draw on-screen messages transparently"
 msgstr ""
 
-#: config/internal/option-internal.cpp:517
+#: config/internal/option-internal.cpp:518
 msgid "Skip BIOS initialization"
 msgstr ""
 
-#: config/internal/option-internal.cpp:519
+#: config/internal/option-internal.cpp:520
 msgid "Do not overwrite cheat list when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:521
+#: config/internal/option-internal.cpp:522
 msgid "Do not overwrite native (battery) save when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:523
+#: config/internal/option-internal.cpp:524
 msgid "Throttle game speed, even when accelerated (0-450 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:526
+#: config/internal/option-internal.cpp:527
 msgid "Set throttle for speedup key (0-3000 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:528
+#: config/internal/option-internal.cpp:529
 msgid "Number of frames to skip with speedup (instead of speedup throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:531
+#: config/internal/option-internal.cpp:532
 msgid "Use frame skip for speedup throttle"
 msgstr ""
 
-#: config/internal/option-internal.cpp:532
+#: config/internal/option-internal.cpp:533
 msgid "Use the specified BIOS file for Game Boy"
 msgstr ""
 
-#: config/internal/option-internal.cpp:533
+#: config/internal/option-internal.cpp:534
 msgid "Use the specified BIOS file"
 msgstr ""
 
-#: config/internal/option-internal.cpp:535
+#: config/internal/option-internal.cpp:536
 msgid "Use the specified BIOS file for Game Boy Color"
 msgstr ""
 
-#: config/internal/option-internal.cpp:536
+#: config/internal/option-internal.cpp:537
 msgid "Wait for vertical sync"
 msgstr ""
 
-#: config/internal/option-internal.cpp:539
+#: config/internal/option-internal.cpp:540
 msgid "Enter fullscreen mode at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:540
+#: config/internal/option-internal.cpp:541
 msgid "Window maximized"
 msgstr ""
 
-#: config/internal/option-internal.cpp:541
+#: config/internal/option-internal.cpp:542
 msgid "Window height at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:542
+#: config/internal/option-internal.cpp:543
 msgid "Window width at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:543
+#: config/internal/option-internal.cpp:544
 msgid "Window axis X position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:544
+#: config/internal/option-internal.cpp:545
 msgid "Window axis Y position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:548
+#: config/internal/option-internal.cpp:549
 msgid "Capture key events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:550
+#: config/internal/option-internal.cpp:551
 msgid "Capture joy events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:551
+#: config/internal/option-internal.cpp:552
 msgid "Hide menu bar when mouse is inactive"
 msgstr ""
 
-#: config/internal/option-internal.cpp:553
+#: config/internal/option-internal.cpp:554
 msgid "Suspend screensaver when game is running"
 msgstr ""
 
-#: config/internal/option-internal.cpp:556
+#: config/internal/option-internal.cpp:557
 msgid "Sound API; if unsupported, default API will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:557
+#: config/internal/option-internal.cpp:558
 msgid "Device ID of chosen audio device for chosen driver"
 msgstr ""
 
-#: config/internal/option-internal.cpp:558
+#: config/internal/option-internal.cpp:559
 msgid "Number of sound buffers"
 msgstr ""
 
-#: config/internal/option-internal.cpp:559
+#: config/internal/option-internal.cpp:560
 msgid "Bit mask of sound channels to enable"
 msgstr ""
 
-#: config/internal/option-internal.cpp:560
+#: config/internal/option-internal.cpp:561
 msgid "Game Boy Advance sound filtering (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:562
+#: config/internal/option-internal.cpp:563
 msgid "Game Boy Advance sound interpolation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:563
+#: config/internal/option-internal.cpp:564
 msgid "Game Boy sound declicking"
 msgstr ""
 
-#: config/internal/option-internal.cpp:564
+#: config/internal/option-internal.cpp:565
 msgid "Game Boy echo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:565
+#: config/internal/option-internal.cpp:566
 msgid "Enable Game Boy sound effects"
 msgstr ""
 
-#: config/internal/option-internal.cpp:566
+#: config/internal/option-internal.cpp:567
 msgid "Game Boy stereo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:567
+#: config/internal/option-internal.cpp:568
 msgid "Game Boy surround sound effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:568
+#: config/internal/option-internal.cpp:569
 msgid "Sound sample rate (kHz)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:569
+#: config/internal/option-internal.cpp:570
 msgid "Use DirectSound hardware acceleration"
 msgstr ""
 
-#: config/internal/option-internal.cpp:570
+#: config/internal/option-internal.cpp:571
 msgid "Upmix stereo to surround"
 msgstr ""
 
-#: config/internal/option-internal.cpp:571
+#: config/internal/option-internal.cpp:572
 msgid "Sound volume (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:639
-#: config/internal/option-internal.cpp:659
-#: config/internal/option-internal.cpp:680
-#: config/internal/option-internal.cpp:700
-#: config/internal/option-internal.cpp:719
+#: config/internal/option-internal.cpp:640
+#: config/internal/option-internal.cpp:660
+#: config/internal/option-internal.cpp:681
+#: config/internal/option-internal.cpp:701
+#: config/internal/option-internal.cpp:720
 #, c-format
 msgid "Invalid value %s for option %s; valid values are %s"
 msgstr ""
@@ -768,7 +857,7 @@ msgstr "Μη έγκυρη τιμή %f για την επιλογή %s. Οι έγ
 msgid "Invalid value %d for option %s; valid values are %d - %d"
 msgstr "Μη έγκυρη τιμή %d για την επιλογή %s, οι έγκυρες τιμές είναι %d - %d"
 
-#: config/option.cpp:480 opts.cpp:621 opts.cpp:630 opts.cpp:639 opts.cpp:648
+#: config/option.cpp:480 opts.cpp:468 opts.cpp:477 opts.cpp:486 opts.cpp:495
 #, c-format
 msgid "Invalid value %s for option %s"
 msgstr ""
@@ -933,19 +1022,19 @@ msgstr "Meta+"
 msgid "Key"
 msgstr ""
 
-#: dialogs/accel-config.cpp:149
+#: dialogs/accel-config.cpp:148
 msgid "Menu commands"
 msgstr "Εντολές μενού"
 
-#: dialogs/accel-config.cpp:261
+#: dialogs/accel-config.cpp:259
 msgid "This will clear all user-defined accelerators. Are you sure?"
 msgstr ""
 
-#: dialogs/accel-config.cpp:261 dialogs/accel-config.cpp:298
+#: dialogs/accel-config.cpp:259 dialogs/accel-config.cpp:306
 msgid "Confirm"
 msgstr "Επιβεβαίωση"
 
-#: dialogs/accel-config.cpp:295
+#: dialogs/accel-config.cpp:304
 #, c-format
 msgid "This will unassign \"%s\" from \"%s\". Are you sure?"
 msgstr ""
@@ -1317,22 +1406,22 @@ msgstr "Προηγούμενη τιμή"
 msgid "New Value"
 msgstr "Νέα τιμή"
 
-#: guiinit.cpp:2518
+#: guiinit.cpp:2519
 msgid "JoyBus host invalid; disabling"
 msgstr "Μη έγκυρος JoyBus host, απενεργοποίηση"
 
-#: opts.cpp:298
+#: opts.cpp:154
 msgid ""
 "The INI file was written for a more recent version of VBA-M. Some INI option"
 " values may have been reset."
 msgstr ""
 
-#: opts.cpp:480 opts.cpp:500 opts.cpp:685
+#: opts.cpp:339 opts.cpp:355 opts.cpp:522
 #, c-format
 msgid "Invalid key binding %s for %s"
 msgstr "Μη έγκυρη αντιστοίχιση πλήκτρου %s για %s"
 
-#: opts.cpp:707
+#: opts.cpp:528
 #, c-format
 msgid "Unknown option %s with value %s"
 msgstr ""
@@ -1556,37 +1645,37 @@ msgstr "Η αναπαραγωγή έληξε"
 msgid "%d %% (%d, %d fps)"
 msgstr ""
 
-#: sys.cpp:899 xrc/GBPrinter.xrc:65
+#: sys.cpp:898 xrc/GBPrinter.xrc:65
 msgid "&Discard"
 msgstr "Απόρριψη"
 
-#: sys.cpp:933
+#: sys.cpp:932
 msgid "Image files (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 msgstr "Αρχεία εικόνας (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 
-#: sys.cpp:942
+#: sys.cpp:941
 msgid "Save printer image to"
 msgstr "Αποθήκευση εικόνας εκτυπωτή σε"
 
-#: sys.cpp:956 sys.cpp:1140
+#: sys.cpp:955 sys.cpp:1139
 #, c-format
 msgid "Wrote printer output to %s"
 msgstr "Εγγράφηκε η έξοδος εκτυπωτή σε %s"
 
-#: sys.cpp:961 sys.cpp:1032
+#: sys.cpp:960 sys.cpp:1031
 msgid "&Close"
 msgstr "Κλείσιμο"
 
-#: sys.cpp:1027
+#: sys.cpp:1026
 msgid "Printed"
 msgstr "Εκτπώθηκε"
 
-#: sys.cpp:1302
+#: sys.cpp:1301
 #, c-format
 msgid "Error opening pseudo tty: %s"
 msgstr "Σφάλμα ανοίγματος ψευδο-tty: %s"
 
-#: sys.cpp:1401
+#: sys.cpp:1400
 #, c-format
 msgid "Error setting up server socket (%d)"
 msgstr "Σφάλμα ρύθμισης θύρας διακομιστή (%d)"
@@ -1620,80 +1709,80 @@ msgstr ""
 msgid "Unable to load dialog %s from resources"
 msgstr "Αδυναμία φόρτωσης παραθύρου %s από τις πηγές"
 
-#: wxvbam.cpp:398 wxvbam.cpp:415
+#: wxvbam.cpp:401 wxvbam.cpp:418
 #, c-format
 msgid "Invalid configuration file provided: %s"
 msgstr ""
 
-#: wxvbam.cpp:559
+#: wxvbam.cpp:558
 msgid "Could not create main window"
 msgstr "Αδυναμία δημιουργίας κεντρικού παραθύρου"
 
-#: wxvbam.cpp:634
+#: wxvbam.cpp:633
 msgid "Save built-in XRC file and exit"
 msgstr "Αποθήκευση ενσωματωμένου αρχείου XRC και έξοδος"
 
-#: wxvbam.cpp:637
+#: wxvbam.cpp:636
 msgid "Save built-in vba-over.ini and exit"
 msgstr "Αποθήκευση του ενσωματωμένου vba-over.ini και έξοδος"
 
-#: wxvbam.cpp:640
+#: wxvbam.cpp:639
 msgid "Print configuration path and exit"
 msgstr "Εκτύπωση διαδρομής ρυθμίσεων και έξοδος"
 
-#: wxvbam.cpp:643
+#: wxvbam.cpp:642
 msgid "Start in full-screen mode"
 msgstr "Έναρξη σε λειτουργία πλήρους οθόνης"
 
-#: wxvbam.cpp:646
+#: wxvbam.cpp:645
 msgid "Set a configuration file"
 msgstr ""
 
-#: wxvbam.cpp:650
+#: wxvbam.cpp:649
 msgid "Delete shared link state first, if it exists"
 msgstr "Διαγραφή κατάστασης κοινής σύνδεσης πρώτα, εάν υπάρχει"
 
-#: wxvbam.cpp:657
+#: wxvbam.cpp:656
 msgid "List all settable options and exit"
 msgstr "Εμφάνιση όλων των επιλογών προς ρύθμιση και έξοδος"
 
-#: wxvbam.cpp:660
+#: wxvbam.cpp:659
 msgid "ROM file"
 msgstr "Αρχείο ROM"
 
-#: wxvbam.cpp:662
+#: wxvbam.cpp:661
 msgid "<config>=<value>"
 msgstr "<config>=<value>"
 
-#: wxvbam.cpp:693
+#: wxvbam.cpp:692
 msgid "Configuration / build error: can't find built-in xrc"
 msgstr ""
 
-#: wxvbam.cpp:701
+#: wxvbam.cpp:700
 #, c-format
 msgid ""
 "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:"
 msgstr ""
 
-#: wxvbam.cpp:715
+#: wxvbam.cpp:714
 msgid "Configuration is read from, in order:"
 msgstr "Οι ρυθμίσεις διαβάζονται από, κατά σειρά:"
 
-#: wxvbam.cpp:729
+#: wxvbam.cpp:728
 #, c-format
 msgid ""
 "Wrote built-in override file to %s\n"
 "To override, delete all but changed section. First found section is used from search path:"
 msgstr ""
 
-#: wxvbam.cpp:735
+#: wxvbam.cpp:734
 msgid ""
 "\n"
 "\tbuilt-in"
 msgstr "\n\tενσωματωμένο"
 
-#: wxvbam.cpp:750
+#: wxvbam.cpp:749
 msgid ""
 "Options set from the command line are saved if any configuration changes are made in the user interface.\n"
 "\n"
@@ -1701,17 +1790,17 @@ msgid ""
 "\n"
 msgstr "Οι επιλογές που ορίζονται από τη γραμμή εντολών αποθηκεύονται εάν γίνουν αλλαγές διαμόρφωσης στη διεπαφή χρήστη.\n\nΓια επιλογές σημαιών, τα «αληθές» και «ψευδές» ορίζονται με 1 και 0 αντίστοιχα.\n\n"
 
-#: wxvbam.cpp:758
+#: wxvbam.cpp:757
 msgid ""
 "The commands available for the Keyboard/* option are:\n"
 "\n"
 msgstr "Οι διαθέσιμες εντολές για την επιλογή Πληκτρολόγιο/* είναι:\n\n"
 
-#: wxvbam.cpp:769
+#: wxvbam.cpp:768
 msgid "Configuration file not found."
 msgstr ""
 
-#: wxvbam.cpp:800
+#: wxvbam.cpp:799
 msgid "Bad configuration option or multiple ROM files given:\n"
 msgstr "Λάθος επιλογή διαμόρφωσης ή πολλά δοθέντα αρχεία ROM:\n"
 
@@ -2223,10 +2312,6 @@ msgstr "Παράλειψη καρέ"
 msgid "&Number of frames to skip:"
 msgstr ""
 
-#: xrc/DisplayConfig.xrc:200
-msgid "Speed"
-msgstr "Ταχύτητα"
-
 #: xrc/DisplayConfig.xrc:216
 msgid "Speed indicator:"
 msgstr ""
@@ -2762,58 +2847,10 @@ msgid ""
 " entire contents if too small."
 msgstr ""
 
-#: xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
-msgid "Up"
-msgstr "Πάνω"
-
-#: xrc/JoyPanel.xrc:37
-msgid "A"
-msgstr "A"
-
-#: xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
-msgid "Down"
-msgstr "Κάτω"
-
-#: xrc/JoyPanel.xrc:83
-msgid "B"
-msgstr "B"
-
-#: xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
-msgid "Left"
-msgstr "Αριστερά"
-
-#: xrc/JoyPanel.xrc:129
-msgid "L"
-msgstr "L"
-
-#: xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
-msgid "Right"
-msgstr "Δεξιά"
-
-#: xrc/JoyPanel.xrc:175
-msgid "R"
-msgstr "R"
-
-#: xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
-msgid "Select"
-msgstr "Select"
-
-#: xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
-msgid "Start"
-msgstr "Start"
-
-#: xrc/JoyPanel.xrc:254
-msgid "Motion Up"
-msgstr "Κίνηση πάνω"
-
 #: xrc/JoyPanel.xrc:276
 msgid "Autofire A"
 msgstr "Συνεχόμενα A"
 
-#: xrc/JoyPanel.xrc:298
-msgid "Motion Down"
-msgstr "Κίνηση κάτω"
-
 #: xrc/JoyPanel.xrc:320
 msgid "Autofire B"
 msgstr "Συνεχόμενα B"
diff --git a/po/wxvbam/es.po b/po/wxvbam/es.po
index f265f509..6bd216f8 100644
--- a/po/wxvbam/es.po
+++ b/po/wxvbam/es.po
@@ -27,7 +27,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VBA-M\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-23 22:00+0000\n"
+"POT-Creation-Date: 2024-04-24 02:00+0000\n"
 "PO-Revision-Date: 2011-12-03 19:42+0000\n"
 "Last-Translator: Dani Quiroz, 2022\n"
 "Language-Team: Spanish (http://app.transifex.com/bgk/vba-m/language/es/)\n"
@@ -338,174 +338,263 @@ msgstr ""
 msgid "Network is not supported in local mode."
 msgstr "La red no es compatible en modo local."
 
-#: config/internal/option-internal.cpp:379
-msgid "Use bilinear filter with 3d renderer"
+#: config/command.cpp:28 xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
+msgid "Up"
+msgstr "Arriba"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
+msgid "Down"
+msgstr "Abajo"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
+msgid "Left"
+msgstr "Izquierda"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
+msgid "Right"
+msgstr "Derecha"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:37
+msgid "A"
+msgstr "A"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:83
+msgid "B"
+msgstr "B"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:129
+msgid "L"
+msgstr "L"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:175
+msgid "R"
+msgstr "R"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
+msgid "Select"
+msgstr "Select"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
+msgid "Start"
+msgstr "Start"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:254
+msgid "Motion Up"
+msgstr "Mover arriba"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:298
+msgid "Motion Down"
+msgstr "Mover abajo"
+
+#: config/command.cpp:30
+msgid "Motion Left"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion Right"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion In"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Motion Out"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto A"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto B"
+msgstr ""
+
+#: config/command.cpp:31 xrc/DisplayConfig.xrc:200
+msgid "Speed"
+msgstr "Rapidez"
+
+#: config/command.cpp:31
+msgid "Capture"
+msgstr ""
+
+#: config/command.cpp:32
+msgid "GameShark"
+msgstr ""
+
+#: config/command.cpp:106
+#, c-format
+msgid "Joypad %zu %s"
 msgstr ""
 
 #: config/internal/option-internal.cpp:380
-msgid "Full-screen filter to apply"
+msgid "Use bilinear filter with 3d renderer"
 msgstr ""
 
 #: config/internal/option-internal.cpp:381
-msgid "Filter plugin library"
+msgid "Full-screen filter to apply"
 msgstr ""
 
 #: config/internal/option-internal.cpp:382
-msgid "Interframe blending function"
+msgid "Filter plugin library"
 msgstr ""
 
 #: config/internal/option-internal.cpp:383
+msgid "Interframe blending function"
+msgstr ""
+
+#: config/internal/option-internal.cpp:384
 msgid "Keep window on top"
 msgstr ""
 
-#: config/internal/option-internal.cpp:385
+#: config/internal/option-internal.cpp:386
 msgid "Maximum number of threads to run filters in"
 msgstr ""
 
-#: config/internal/option-internal.cpp:387
+#: config/internal/option-internal.cpp:388
 msgid "Render method; if unsupported, simple method will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:388
+#: config/internal/option-internal.cpp:389
 msgid "Default scale factor"
 msgstr "Factor de escala predeterminado"
 
-#: config/internal/option-internal.cpp:389
+#: config/internal/option-internal.cpp:390
 msgid "Retain aspect ratio when resizing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:392
+#: config/internal/option-internal.cpp:393
 msgid "BIOS file to use for Game Boy, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:393
+#: config/internal/option-internal.cpp:394
 msgid "Game Boy color enhancement, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:394
+#: config/internal/option-internal.cpp:395
 msgid "Enable DX Colorization Hacks"
 msgstr ""
 
-#: config/internal/option-internal.cpp:395
-#: config/internal/option-internal.cpp:419
+#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:420
 msgid "Apply LCD filter, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:397
 msgid "BIOS file to use for Game Boy Color, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:398
+#: config/internal/option-internal.cpp:399
 msgid ""
 "The default palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:401
+#: config/internal/option-internal.cpp:402
 msgid ""
 "The first user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:404
+#: config/internal/option-internal.cpp:405
 msgid ""
 "The second user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:407
+#: config/internal/option-internal.cpp:408
 msgid "Automatically gather a full page before printing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:409
+#: config/internal/option-internal.cpp:410
 msgid "Automatically save printouts as screen captures with -print suffix"
 msgstr ""
 
-#: config/internal/option-internal.cpp:411
-#: config/internal/option-internal.cpp:439
+#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:440
 msgid "Directory to look for ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:413
 msgid "Directory to look for Game Boy Color ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:415
+#: config/internal/option-internal.cpp:416
 msgid "BIOS file to use, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:425
+#: config/internal/option-internal.cpp:426
 msgid "Enable link at boot"
 msgstr ""
 
-#: config/internal/option-internal.cpp:430
+#: config/internal/option-internal.cpp:431
 msgid "Enable faster network protocol by default"
 msgstr ""
 
-#: config/internal/option-internal.cpp:432
+#: config/internal/option-internal.cpp:433
 msgid "Default network link client host"
 msgstr ""
 
-#: config/internal/option-internal.cpp:433
+#: config/internal/option-internal.cpp:434
 msgid "Default network link server IP to bind"
 msgstr ""
 
-#: config/internal/option-internal.cpp:434
+#: config/internal/option-internal.cpp:435
 msgid "Default network link port (server and client)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:435
+#: config/internal/option-internal.cpp:436
 msgid "Default network protocol"
 msgstr ""
 
-#: config/internal/option-internal.cpp:436
+#: config/internal/option-internal.cpp:437
 msgid "Link timeout (ms)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:437
+#: config/internal/option-internal.cpp:438
 msgid "Link cable type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:442
+#: config/internal/option-internal.cpp:443
 msgid "Automatically load last saved state"
 msgstr "Cargar automáticamente último archivo guardado"
 
-#: config/internal/option-internal.cpp:444
+#: config/internal/option-internal.cpp:445
 msgid ""
 "Directory to store game save files (relative paths are relative to ROM; "
 "blank is config dir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:446
+#: config/internal/option-internal.cpp:447
 msgid "Freeze recent load list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:448
+#: config/internal/option-internal.cpp:449
 msgid ""
 "Directory to store A / V and game recordings (relative paths are relative to"
 " ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:451
+#: config/internal/option-internal.cpp:452
 msgid "Number of seconds between rewind snapshots (0 to disable)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:453
+#: config/internal/option-internal.cpp:454
 msgid "Directory to store screenshots (relative paths are relative to ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:456
+#: config/internal/option-internal.cpp:457
 msgid ""
 "Directory to store saved state files (relative paths are relative to "
 "BatteryDir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:458
+#: config/internal/option-internal.cpp:459
 msgid "Enable status bar"
 msgstr "Habilitar barra de estado"
 
-#: config/internal/option-internal.cpp:459
+#: config/internal/option-internal.cpp:460
 msgid "INI file version (DO NOT MODIFY)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:463
+#: config/internal/option-internal.cpp:464
 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, "
@@ -513,266 +602,266 @@ msgid ""
 "MotionRight, AutoA, AutoB, Speed, Capture, GS"
 msgstr ""
 
-#: config/internal/option-internal.cpp:468
+#: config/internal/option-internal.cpp:469
 msgid "The autofire toggle period, in frames (1/60 s)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:469
+#: config/internal/option-internal.cpp:470
 msgid "The number of the stick to use in single-player mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:471
+#: config/internal/option-internal.cpp:472
 msgid "Whether to enable SDL GameController mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:475
+#: config/internal/option-internal.cpp:476
 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 "
 "executed."
 msgstr ""
 
-#: config/internal/option-internal.cpp:480
+#: config/internal/option-internal.cpp:481
 msgid "Enable AGB debug print"
 msgstr ""
 
-#: config/internal/option-internal.cpp:481
+#: config/internal/option-internal.cpp:482
 msgid "Auto skip frames"
 msgstr ""
 
-#: config/internal/option-internal.cpp:483
+#: config/internal/option-internal.cpp:484
 msgid "Apply IPS / UPS / IPF patches if found"
 msgstr ""
 
-#: config/internal/option-internal.cpp:485
+#: config/internal/option-internal.cpp:486
 msgid "Automatically save and load cheat list"
 msgstr "Guardar y cargar trucos automáticamente"
 
-#: config/internal/option-internal.cpp:489
+#: config/internal/option-internal.cpp:490
 msgid "Automatically enable border for Super Game Boy games"
 msgstr ""
 
-#: config/internal/option-internal.cpp:491
+#: config/internal/option-internal.cpp:492
 msgid "Always enable border"
 msgstr ""
 
-#: config/internal/option-internal.cpp:492
+#: config/internal/option-internal.cpp:493
 msgid "Screen capture file format"
 msgstr ""
 
-#: config/internal/option-internal.cpp:493
+#: config/internal/option-internal.cpp:494
 msgid "Enable cheats"
 msgstr "Habilitar trucos"
 
-#: config/internal/option-internal.cpp:494
+#: config/internal/option-internal.cpp:495
 msgid "Disable on-screen status messages"
 msgstr ""
 
-#: config/internal/option-internal.cpp:495
+#: config/internal/option-internal.cpp:496
 msgid "Type of system to emulate"
 msgstr ""
 
-#: config/internal/option-internal.cpp:496
+#: config/internal/option-internal.cpp:497
 msgid "Flash size 0 = 64 KB 1 = 128 KB"
 msgstr ""
 
-#: config/internal/option-internal.cpp:498
+#: config/internal/option-internal.cpp:499
 msgid "Skip frames. Values are 0-9 or -1 to skip automatically based on time."
 msgstr ""
 
-#: config/internal/option-internal.cpp:500
+#: config/internal/option-internal.cpp:501
 msgid "The palette to use"
 msgstr ""
 
-#: config/internal/option-internal.cpp:501
+#: config/internal/option-internal.cpp:502
 msgid "Enable printer emulation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:503
+#: config/internal/option-internal.cpp:504
 msgid "Break into GDB after loading the game."
 msgstr ""
 
-#: config/internal/option-internal.cpp:504
+#: config/internal/option-internal.cpp:505
 msgid "Port to connect GDB to"
 msgstr ""
 
-#: config/internal/option-internal.cpp:506
+#: config/internal/option-internal.cpp:507
 msgid "Number of players in network"
 msgstr "Número de jugadores en la red"
 
-#: config/internal/option-internal.cpp:508
+#: config/internal/option-internal.cpp:509
 msgid "Maximum scale factor (0 = no limit)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:510
+#: config/internal/option-internal.cpp:511
 msgid "Pause game when main window loses focus"
 msgstr ""
 
-#: config/internal/option-internal.cpp:512
+#: config/internal/option-internal.cpp:513
 msgid "Enable RTC (vba-over.ini override is rtcEnabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:513
+#: config/internal/option-internal.cpp:514
 msgid "Native save (\"battery\") hardware type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:514
+#: config/internal/option-internal.cpp:515
 msgid "Show speed indicator"
 msgstr "Mostrar indicador de velocidad"
 
-#: config/internal/option-internal.cpp:516
+#: config/internal/option-internal.cpp:517
 msgid "Draw on-screen messages transparently"
 msgstr ""
 
-#: config/internal/option-internal.cpp:517
+#: config/internal/option-internal.cpp:518
 msgid "Skip BIOS initialization"
 msgstr ""
 
-#: config/internal/option-internal.cpp:519
+#: config/internal/option-internal.cpp:520
 msgid "Do not overwrite cheat list when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:521
+#: config/internal/option-internal.cpp:522
 msgid "Do not overwrite native (battery) save when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:523
+#: config/internal/option-internal.cpp:524
 msgid "Throttle game speed, even when accelerated (0-450 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:526
+#: config/internal/option-internal.cpp:527
 msgid "Set throttle for speedup key (0-3000 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:528
+#: config/internal/option-internal.cpp:529
 msgid "Number of frames to skip with speedup (instead of speedup throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:531
+#: config/internal/option-internal.cpp:532
 msgid "Use frame skip for speedup throttle"
 msgstr ""
 
-#: config/internal/option-internal.cpp:532
+#: config/internal/option-internal.cpp:533
 msgid "Use the specified BIOS file for Game Boy"
 msgstr ""
 
-#: config/internal/option-internal.cpp:533
+#: config/internal/option-internal.cpp:534
 msgid "Use the specified BIOS file"
 msgstr ""
 
-#: config/internal/option-internal.cpp:535
+#: config/internal/option-internal.cpp:536
 msgid "Use the specified BIOS file for Game Boy Color"
 msgstr ""
 
-#: config/internal/option-internal.cpp:536
+#: config/internal/option-internal.cpp:537
 msgid "Wait for vertical sync"
 msgstr ""
 
-#: config/internal/option-internal.cpp:539
+#: config/internal/option-internal.cpp:540
 msgid "Enter fullscreen mode at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:540
+#: config/internal/option-internal.cpp:541
 msgid "Window maximized"
 msgstr ""
 
-#: config/internal/option-internal.cpp:541
+#: config/internal/option-internal.cpp:542
 msgid "Window height at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:542
+#: config/internal/option-internal.cpp:543
 msgid "Window width at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:543
+#: config/internal/option-internal.cpp:544
 msgid "Window axis X position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:544
+#: config/internal/option-internal.cpp:545
 msgid "Window axis Y position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:548
+#: config/internal/option-internal.cpp:549
 msgid "Capture key events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:550
+#: config/internal/option-internal.cpp:551
 msgid "Capture joy events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:551
+#: config/internal/option-internal.cpp:552
 msgid "Hide menu bar when mouse is inactive"
 msgstr "Ocultar barra de menú cuando el ratón esté inactivo"
 
-#: config/internal/option-internal.cpp:553
+#: config/internal/option-internal.cpp:554
 msgid "Suspend screensaver when game is running"
 msgstr ""
 
-#: config/internal/option-internal.cpp:556
+#: config/internal/option-internal.cpp:557
 msgid "Sound API; if unsupported, default API will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:557
+#: config/internal/option-internal.cpp:558
 msgid "Device ID of chosen audio device for chosen driver"
 msgstr ""
 
-#: config/internal/option-internal.cpp:558
+#: config/internal/option-internal.cpp:559
 msgid "Number of sound buffers"
 msgstr ""
 
-#: config/internal/option-internal.cpp:559
+#: config/internal/option-internal.cpp:560
 msgid "Bit mask of sound channels to enable"
 msgstr ""
 
-#: config/internal/option-internal.cpp:560
+#: config/internal/option-internal.cpp:561
 msgid "Game Boy Advance sound filtering (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:562
+#: config/internal/option-internal.cpp:563
 msgid "Game Boy Advance sound interpolation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:563
+#: config/internal/option-internal.cpp:564
 msgid "Game Boy sound declicking"
 msgstr ""
 
-#: config/internal/option-internal.cpp:564
+#: config/internal/option-internal.cpp:565
 msgid "Game Boy echo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:565
+#: config/internal/option-internal.cpp:566
 msgid "Enable Game Boy sound effects"
 msgstr ""
 
-#: config/internal/option-internal.cpp:566
+#: config/internal/option-internal.cpp:567
 msgid "Game Boy stereo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:567
+#: config/internal/option-internal.cpp:568
 msgid "Game Boy surround sound effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:568
+#: config/internal/option-internal.cpp:569
 msgid "Sound sample rate (kHz)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:569
+#: config/internal/option-internal.cpp:570
 msgid "Use DirectSound hardware acceleration"
 msgstr ""
 
-#: config/internal/option-internal.cpp:570
+#: config/internal/option-internal.cpp:571
 msgid "Upmix stereo to surround"
 msgstr ""
 
-#: config/internal/option-internal.cpp:571
+#: config/internal/option-internal.cpp:572
 msgid "Sound volume (%)"
 msgstr "Volumen (%)"
 
-#: config/internal/option-internal.cpp:639
-#: config/internal/option-internal.cpp:659
-#: config/internal/option-internal.cpp:680
-#: config/internal/option-internal.cpp:700
-#: config/internal/option-internal.cpp:719
+#: config/internal/option-internal.cpp:640
+#: config/internal/option-internal.cpp:660
+#: config/internal/option-internal.cpp:681
+#: config/internal/option-internal.cpp:701
+#: config/internal/option-internal.cpp:720
 #, c-format
 msgid "Invalid value %s for option %s; valid values are %s"
 msgstr ""
@@ -787,7 +876,7 @@ msgstr "Valor invalido %f para opciones %s; los valores validos son %f - %f"
 msgid "Invalid value %d for option %s; valid values are %d - %d"
 msgstr "Valor invalido %d para opciones %s; los valores validos son %d - %d"
 
-#: config/option.cpp:480 opts.cpp:621 opts.cpp:630 opts.cpp:639 opts.cpp:648
+#: config/option.cpp:480 opts.cpp:468 opts.cpp:477 opts.cpp:486 opts.cpp:495
 #, c-format
 msgid "Invalid value %s for option %s"
 msgstr ""
@@ -952,19 +1041,19 @@ msgstr "Meta+"
 msgid "Key"
 msgstr ""
 
-#: dialogs/accel-config.cpp:149
+#: dialogs/accel-config.cpp:148
 msgid "Menu commands"
 msgstr "Menú de comandos"
 
-#: dialogs/accel-config.cpp:261
+#: dialogs/accel-config.cpp:259
 msgid "This will clear all user-defined accelerators. Are you sure?"
 msgstr ""
 
-#: dialogs/accel-config.cpp:261 dialogs/accel-config.cpp:298
+#: dialogs/accel-config.cpp:259 dialogs/accel-config.cpp:306
 msgid "Confirm"
 msgstr "Confirmar"
 
-#: dialogs/accel-config.cpp:295
+#: dialogs/accel-config.cpp:304
 #, c-format
 msgid "This will unassign \"%s\" from \"%s\". Are you sure?"
 msgstr ""
@@ -1336,22 +1425,22 @@ msgstr "Valor anterior"
 msgid "New Value"
 msgstr "Nuevo valor"
 
-#: guiinit.cpp:2518
+#: guiinit.cpp:2519
 msgid "JoyBus host invalid; disabling"
 msgstr "host de JoyBus inválido; deshabilitando"
 
-#: opts.cpp:298
+#: opts.cpp:154
 msgid ""
 "The INI file was written for a more recent version of VBA-M. Some INI option"
 " values may have been reset."
 msgstr ""
 
-#: opts.cpp:480 opts.cpp:500 opts.cpp:685
+#: opts.cpp:339 opts.cpp:355 opts.cpp:522
 #, c-format
 msgid "Invalid key binding %s for %s"
 msgstr "Tecla %s inválida para %s"
 
-#: opts.cpp:707
+#: opts.cpp:528
 #, c-format
 msgid "Unknown option %s with value %s"
 msgstr ""
@@ -1575,37 +1664,37 @@ msgstr "Reproducción finalizada"
 msgid "%d %% (%d, %d fps)"
 msgstr ""
 
-#: sys.cpp:899 xrc/GBPrinter.xrc:65
+#: sys.cpp:898 xrc/GBPrinter.xrc:65
 msgid "&Discard"
 msgstr "&Descartar"
 
-#: sys.cpp:933
+#: sys.cpp:932
 msgid "Image files (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 msgstr "Archivos de imagen (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 
-#: sys.cpp:942
+#: sys.cpp:941
 msgid "Save printer image to"
 msgstr "Guardar la imagen de la impresora en:"
 
-#: sys.cpp:956 sys.cpp:1140
+#: sys.cpp:955 sys.cpp:1139
 #, c-format
 msgid "Wrote printer output to %s"
 msgstr "Escribir la salida de la impresora en %s"
 
-#: sys.cpp:961 sys.cpp:1032
+#: sys.cpp:960 sys.cpp:1031
 msgid "&Close"
 msgstr "&Cerrar"
 
-#: sys.cpp:1027
+#: sys.cpp:1026
 msgid "Printed"
 msgstr "Impreso"
 
-#: sys.cpp:1302
+#: sys.cpp:1301
 #, c-format
 msgid "Error opening pseudo tty: %s"
 msgstr "Error al abrir pseudo terminal: %s"
 
-#: sys.cpp:1401
+#: sys.cpp:1400
 #, c-format
 msgid "Error setting up server socket (%d)"
 msgstr "Error al configurar el enchufe del servidor (%d)"
@@ -1639,80 +1728,80 @@ msgstr ""
 msgid "Unable to load dialog %s from resources"
 msgstr "No se puede cargar el diálogo %s de recursos"
 
-#: wxvbam.cpp:398 wxvbam.cpp:415
+#: wxvbam.cpp:401 wxvbam.cpp:418
 #, c-format
 msgid "Invalid configuration file provided: %s"
 msgstr ""
 
-#: wxvbam.cpp:559
+#: wxvbam.cpp:558
 msgid "Could not create main window"
 msgstr "No se puede crear la ventana principal"
 
-#: wxvbam.cpp:634
+#: wxvbam.cpp:633
 msgid "Save built-in XRC file and exit"
 msgstr "Guardar el archivo XRC integrado y salir"
 
-#: wxvbam.cpp:637
+#: wxvbam.cpp:636
 msgid "Save built-in vba-over.ini and exit"
 msgstr "Guardar archivo integrado vba-over.ini y salir"
 
-#: wxvbam.cpp:640
+#: wxvbam.cpp:639
 msgid "Print configuration path and exit"
 msgstr "Mostrar ruta de configuración y salir"
 
-#: wxvbam.cpp:643
+#: wxvbam.cpp:642
 msgid "Start in full-screen mode"
 msgstr "Empezar en modo pantalla completa"
 
-#: wxvbam.cpp:646
+#: wxvbam.cpp:645
 msgid "Set a configuration file"
 msgstr "Asignar archivo de configuración"
 
-#: wxvbam.cpp:650
+#: wxvbam.cpp:649
 msgid "Delete shared link state first, if it exists"
 msgstr "Borrar estado de enlace compartido primero, si aún existe"
 
-#: wxvbam.cpp:657
+#: wxvbam.cpp:656
 msgid "List all settable options and exit"
 msgstr "Mostrar todas las opciones configurables y salir"
 
-#: wxvbam.cpp:660
+#: wxvbam.cpp:659
 msgid "ROM file"
 msgstr "Archivo ROM"
 
-#: wxvbam.cpp:662
+#: wxvbam.cpp:661
 msgid "<config>=<value>"
 msgstr "<config>=<value>"
 
-#: wxvbam.cpp:693
+#: wxvbam.cpp:692
 msgid "Configuration / build error: can't find built-in xrc"
 msgstr ""
 
-#: wxvbam.cpp:701
+#: wxvbam.cpp:700
 #, c-format
 msgid ""
 "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:"
 msgstr ""
 
-#: wxvbam.cpp:715
+#: wxvbam.cpp:714
 msgid "Configuration is read from, in order:"
 msgstr "La configuración es leída desde, en orden:"
 
-#: wxvbam.cpp:729
+#: wxvbam.cpp:728
 #, c-format
 msgid ""
 "Wrote built-in override file to %s\n"
 "To override, delete all but changed section. First found section is used from search path:"
 msgstr ""
 
-#: wxvbam.cpp:735
+#: wxvbam.cpp:734
 msgid ""
 "\n"
 "\tbuilt-in"
 msgstr "\n\tintegrado"
 
-#: wxvbam.cpp:750
+#: wxvbam.cpp:749
 msgid ""
 "Options set from the command line are saved if any configuration changes are made in the user interface.\n"
 "\n"
@@ -1720,17 +1809,17 @@ msgid ""
 "\n"
 msgstr "Las opciones establecidas desde la línea de comandos se guardan si se realizan cambios de configuración en la interfaz de usuario.\n\nPara las opciones marcadas, verdadero y falso se especifican como 1 y 0, respectivamente.\n\n"
 
-#: wxvbam.cpp:758
+#: wxvbam.cpp:757
 msgid ""
 "The commands available for the Keyboard/* option are:\n"
 "\n"
 msgstr "Los comandos disponibles para la opción de Teclado/* son:\n\n"
 
-#: wxvbam.cpp:769
+#: wxvbam.cpp:768
 msgid "Configuration file not found."
 msgstr "Archivo de configuración no encontrado."
 
-#: wxvbam.cpp:800
+#: wxvbam.cpp:799
 msgid "Bad configuration option or multiple ROM files given:\n"
 msgstr "Se ha proporcionado una mala configuración o se han recibido múltiples archivos ROM:\n"
 
@@ -2242,10 +2331,6 @@ msgstr "Saltar fotograma"
 msgid "&Number of frames to skip:"
 msgstr ""
 
-#: xrc/DisplayConfig.xrc:200
-msgid "Speed"
-msgstr "Rapidez"
-
 #: xrc/DisplayConfig.xrc:216
 msgid "Speed indicator:"
 msgstr ""
@@ -2781,58 +2866,10 @@ msgid ""
 " entire contents if too small."
 msgstr ""
 
-#: xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
-msgid "Up"
-msgstr "Arriba"
-
-#: xrc/JoyPanel.xrc:37
-msgid "A"
-msgstr "A"
-
-#: xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
-msgid "Down"
-msgstr "Abajo"
-
-#: xrc/JoyPanel.xrc:83
-msgid "B"
-msgstr "B"
-
-#: xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
-msgid "Left"
-msgstr "Izquierda"
-
-#: xrc/JoyPanel.xrc:129
-msgid "L"
-msgstr "L"
-
-#: xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
-msgid "Right"
-msgstr "Derecha"
-
-#: xrc/JoyPanel.xrc:175
-msgid "R"
-msgstr "R"
-
-#: xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
-msgid "Select"
-msgstr "Select"
-
-#: xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
-msgid "Start"
-msgstr "Start"
-
-#: xrc/JoyPanel.xrc:254
-msgid "Motion Up"
-msgstr "Mover arriba"
-
 #: xrc/JoyPanel.xrc:276
 msgid "Autofire A"
 msgstr "Auto presionar A"
 
-#: xrc/JoyPanel.xrc:298
-msgid "Motion Down"
-msgstr "Mover abajo"
-
 #: xrc/JoyPanel.xrc:320
 msgid "Autofire B"
 msgstr "Auto presionar B"
diff --git a/po/wxvbam/es_419.po b/po/wxvbam/es_419.po
index d9b6dcb3..efc099a8 100644
--- a/po/wxvbam/es_419.po
+++ b/po/wxvbam/es_419.po
@@ -18,7 +18,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VBA-M\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-23 22:00+0000\n"
+"POT-Creation-Date: 2024-04-24 02:00+0000\n"
 "PO-Revision-Date: 2011-12-03 19:42+0000\n"
 "Last-Translator: Yeferson Galviz, 2023\n"
 "Language-Team: Spanish (Latin America) (http://app.transifex.com/bgk/vba-m/language/es_419/)\n"
@@ -329,174 +329,263 @@ msgstr "La conexión LAN ya está activa. Deshabilite el modo de enlace para des
 msgid "Network is not supported in local mode."
 msgstr "La red no es compatible en modo local."
 
-#: config/internal/option-internal.cpp:379
+#: config/command.cpp:28 xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
+msgid "Up"
+msgstr "Up"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
+msgid "Down"
+msgstr "Down"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
+msgid "Left"
+msgstr "Left"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
+msgid "Right"
+msgstr "Right"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:37
+msgid "A"
+msgstr "A"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:83
+msgid "B"
+msgstr "B"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:129
+msgid "L"
+msgstr "L"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:175
+msgid "R"
+msgstr "R"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
+msgid "Select"
+msgstr "Select"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
+msgid "Start"
+msgstr "Start"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:254
+msgid "Motion Up"
+msgstr "Motion Up"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:298
+msgid "Motion Down"
+msgstr "Motion Down"
+
+#: config/command.cpp:30
+msgid "Motion Left"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion Right"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion In"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Motion Out"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto A"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto B"
+msgstr ""
+
+#: config/command.cpp:31 xrc/DisplayConfig.xrc:200
+msgid "Speed"
+msgstr "Speed"
+
+#: config/command.cpp:31
+msgid "Capture"
+msgstr ""
+
+#: config/command.cpp:32
+msgid "GameShark"
+msgstr ""
+
+#: config/command.cpp:106
+#, c-format
+msgid "Joypad %zu %s"
+msgstr ""
+
+#: config/internal/option-internal.cpp:380
 msgid "Use bilinear filter with 3d renderer"
 msgstr "Utilizar filtro bilineal con renderizado 3d"
 
-#: config/internal/option-internal.cpp:380
+#: config/internal/option-internal.cpp:381
 msgid "Full-screen filter to apply"
 msgstr "Filtro de pantalla completa para aplicar"
 
-#: config/internal/option-internal.cpp:381
+#: config/internal/option-internal.cpp:382
 msgid "Filter plugin library"
 msgstr "Filter plugin library"
 
-#: config/internal/option-internal.cpp:382
+#: config/internal/option-internal.cpp:383
 msgid "Interframe blending function"
 msgstr "Función de mezcla entre fotogramas"
 
-#: config/internal/option-internal.cpp:383
+#: config/internal/option-internal.cpp:384
 msgid "Keep window on top"
 msgstr "Mantener ventana encima"
 
-#: config/internal/option-internal.cpp:385
+#: config/internal/option-internal.cpp:386
 msgid "Maximum number of threads to run filters in"
 msgstr "Número máximo de subprocesos para ejecutar filtros en"
 
-#: config/internal/option-internal.cpp:387
+#: config/internal/option-internal.cpp:388
 msgid "Render method; if unsupported, simple method will be used"
 msgstr "Método de renderizado; si es incompatible, se utilizará un método simple"
 
-#: config/internal/option-internal.cpp:388
+#: config/internal/option-internal.cpp:389
 msgid "Default scale factor"
 msgstr "Factor de escala predeterminado"
 
-#: config/internal/option-internal.cpp:389
+#: config/internal/option-internal.cpp:390
 msgid "Retain aspect ratio when resizing"
 msgstr "Mantener la relación de aspecto al cambiar el tamaño"
 
-#: config/internal/option-internal.cpp:392
+#: config/internal/option-internal.cpp:393
 msgid "BIOS file to use for Game Boy, if enabled"
 msgstr "Archivo BIOS para usar con Game Boy, si es que está habilitado"
 
-#: config/internal/option-internal.cpp:393
+#: config/internal/option-internal.cpp:394
 msgid "Game Boy color enhancement, if enabled"
 msgstr "Mejora de color de Game Boy, si es que está habilitada"
 
-#: config/internal/option-internal.cpp:394
+#: config/internal/option-internal.cpp:395
 msgid "Enable DX Colorization Hacks"
 msgstr "Habilitar DX Colorization Hacks"
 
-#: config/internal/option-internal.cpp:395
-#: config/internal/option-internal.cpp:419
+#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:420
 msgid "Apply LCD filter, if enabled"
 msgstr "Aplicar Filtro LCD, si es que está habilitado."
 
-#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:397
 msgid "BIOS file to use for Game Boy Color, if enabled"
 msgstr "Archivo BIOS para usar con Game Boy Color, si es que está habilitado"
 
-#: config/internal/option-internal.cpp:398
+#: config/internal/option-internal.cpp:399
 msgid ""
 "The default palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr "The default palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 
-#: config/internal/option-internal.cpp:401
+#: config/internal/option-internal.cpp:402
 msgid ""
 "The first user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr "The first user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 
-#: config/internal/option-internal.cpp:404
+#: config/internal/option-internal.cpp:405
 msgid ""
 "The second user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr "The second user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 
-#: config/internal/option-internal.cpp:407
+#: config/internal/option-internal.cpp:408
 msgid "Automatically gather a full page before printing"
 msgstr "Automatically gather a full page before printing"
 
-#: config/internal/option-internal.cpp:409
+#: config/internal/option-internal.cpp:410
 msgid "Automatically save printouts as screen captures with -print suffix"
 msgstr "Automatically save printouts as screen captures with -print suffix"
 
-#: config/internal/option-internal.cpp:411
-#: config/internal/option-internal.cpp:439
+#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:440
 msgid "Directory to look for ROM files"
 msgstr "Directorio para buscar archivos ROM"
 
-#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:413
 msgid "Directory to look for Game Boy Color ROM files"
 msgstr "Directorio para buscar archivos ROM de Game Boy Color"
 
-#: config/internal/option-internal.cpp:415
+#: config/internal/option-internal.cpp:416
 msgid "BIOS file to use, if enabled"
 msgstr "Archivo BIOS para usar, si es que está habilitado"
 
-#: config/internal/option-internal.cpp:425
+#: config/internal/option-internal.cpp:426
 msgid "Enable link at boot"
 msgstr "Habilitar enlace en el arranque"
 
-#: config/internal/option-internal.cpp:430
+#: config/internal/option-internal.cpp:431
 msgid "Enable faster network protocol by default"
 msgstr "Habilitar protocolo de rapidez de red de manera predeterminada"
 
-#: config/internal/option-internal.cpp:432
+#: config/internal/option-internal.cpp:433
 msgid "Default network link client host"
 msgstr "Host de cliente de enlace de red predeterminado"
 
-#: config/internal/option-internal.cpp:433
+#: config/internal/option-internal.cpp:434
 msgid "Default network link server IP to bind"
 msgstr "IP de servidor de enlace de red predeterminado para enlazar"
 
-#: config/internal/option-internal.cpp:434
+#: config/internal/option-internal.cpp:435
 msgid "Default network link port (server and client)"
 msgstr "Puerto de enlace de red predeterminado (servidor y cliente)"
 
-#: config/internal/option-internal.cpp:435
+#: config/internal/option-internal.cpp:436
 msgid "Default network protocol"
 msgstr "Protocolo de red predeterminado"
 
-#: config/internal/option-internal.cpp:436
+#: config/internal/option-internal.cpp:437
 msgid "Link timeout (ms)"
 msgstr "Tiempo de espera del enlace (ms)"
 
-#: config/internal/option-internal.cpp:437
+#: config/internal/option-internal.cpp:438
 msgid "Link cable type"
 msgstr "Tipo de cable de enlace"
 
-#: config/internal/option-internal.cpp:442
+#: config/internal/option-internal.cpp:443
 msgid "Automatically load last saved state"
 msgstr "Cargar automáticamente último archivo guardado"
 
-#: config/internal/option-internal.cpp:444
+#: config/internal/option-internal.cpp:445
 msgid ""
 "Directory to store game save files (relative paths are relative to ROM; "
 "blank is config dir)"
 msgstr "Directorio para almacenar archivos guardados del juego (las rutas relativas son relativas a la ROM; el espacio en blanco es el directorio de configuración)"
 
-#: config/internal/option-internal.cpp:446
+#: config/internal/option-internal.cpp:447
 msgid "Freeze recent load list"
 msgstr "Congelar lista de carga reciente"
 
-#: config/internal/option-internal.cpp:448
+#: config/internal/option-internal.cpp:449
 msgid ""
 "Directory to store A / V and game recordings (relative paths are relative to"
 " ROM)"
 msgstr "Directorio para almacenar A/V y grabaciones de juegos (las rutas relativas son relativas a la ROM)"
 
-#: config/internal/option-internal.cpp:451
+#: config/internal/option-internal.cpp:452
 msgid "Number of seconds between rewind snapshots (0 to disable)"
 msgstr "Número de segundos entre snapshots de rebobinado (0 para deshabilitar)"
 
-#: config/internal/option-internal.cpp:453
+#: config/internal/option-internal.cpp:454
 msgid "Directory to store screenshots (relative paths are relative to ROM)"
 msgstr "Directorio para guardar capturas de pantalla (las rutas relativas son relativas a la ROM)"
 
-#: config/internal/option-internal.cpp:456
+#: config/internal/option-internal.cpp:457
 msgid ""
 "Directory to store saved state files (relative paths are relative to "
 "BatteryDir)"
 msgstr "Directory to store saved state files (relative paths are relative to BatteryDir)"
 
-#: config/internal/option-internal.cpp:458
+#: config/internal/option-internal.cpp:459
 msgid "Enable status bar"
 msgstr "Habilitar barra de estado"
 
-#: config/internal/option-internal.cpp:459
+#: config/internal/option-internal.cpp:460
 msgid "INI file version (DO NOT MODIFY)"
 msgstr "Versión archivo INI (NO MODIFICAR)"
 
-#: config/internal/option-internal.cpp:463
+#: config/internal/option-internal.cpp:464
 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, "
@@ -504,266 +593,266 @@ msgid ""
 "MotionRight, AutoA, AutoB, Speed, Capture, GS"
 msgstr "El parámetro Joypad/<n>/<button> contiene una lista separada por comas de los nombres de las teclas que se asignan al joypad #<n> del botón<button>. El botón es uno de los siguientes: Arriba, Abajo, Izquierda, Derecha, A, B, L, R, Seleccionar, Inicio, Mover hacia arriba, Mover hacia abajo, Mover hacia la izquierda, Mover hacia la derecha, AutoA, AutoB, Velocidad, Capturar, GS"
 
-#: config/internal/option-internal.cpp:468
+#: config/internal/option-internal.cpp:469
 msgid "The autofire toggle period, in frames (1/60 s)"
 msgstr "El período de alternancia de disparo automático, en fotogramas (1/60 s)"
 
-#: config/internal/option-internal.cpp:469
+#: config/internal/option-internal.cpp:470
 msgid "The number of the stick to use in single-player mode"
 msgstr "The number of the stick to use in single-player mode"
 
-#: config/internal/option-internal.cpp:471
+#: config/internal/option-internal.cpp:472
 msgid "Whether to enable SDL GameController mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:475
+#: config/internal/option-internal.cpp:476
 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 "
 "executed."
 msgstr "El parámetro Keyboard/<cmd> contiene una lista de nombres de teclas separados por comas (por ejemplo, Alt-Shift-F1).  Cuando se presiona la tecla nombrada, se ejecuta el comando <cmd>."
 
-#: config/internal/option-internal.cpp:480
+#: config/internal/option-internal.cpp:481
 msgid "Enable AGB debug print"
 msgstr "Habilitar impresión de depuración AGB"
 
-#: config/internal/option-internal.cpp:481
+#: config/internal/option-internal.cpp:482
 msgid "Auto skip frames"
 msgstr "Saltar automáticamente fotogramas"
 
-#: config/internal/option-internal.cpp:483
+#: config/internal/option-internal.cpp:484
 msgid "Apply IPS / UPS / IPF patches if found"
 msgstr "Aplicar parches IPS/UPS/IPF si es que se encuentran"
 
-#: config/internal/option-internal.cpp:485
+#: config/internal/option-internal.cpp:486
 msgid "Automatically save and load cheat list"
 msgstr "Guardar y cargar automáticamente la lista de trucos"
 
-#: config/internal/option-internal.cpp:489
+#: config/internal/option-internal.cpp:490
 msgid "Automatically enable border for Super Game Boy games"
 msgstr "Habilitar automáticamente el borde para los juegos de Super Game Boy"
 
-#: config/internal/option-internal.cpp:491
+#: config/internal/option-internal.cpp:492
 msgid "Always enable border"
 msgstr "Siempre habilitar borde"
 
-#: config/internal/option-internal.cpp:492
+#: config/internal/option-internal.cpp:493
 msgid "Screen capture file format"
 msgstr "Formato de archivo de captura de pantalla"
 
-#: config/internal/option-internal.cpp:493
+#: config/internal/option-internal.cpp:494
 msgid "Enable cheats"
 msgstr "Habilitar trucos"
 
-#: config/internal/option-internal.cpp:494
+#: config/internal/option-internal.cpp:495
 msgid "Disable on-screen status messages"
 msgstr "Desactivar mensajes de estado en pantalla"
 
-#: config/internal/option-internal.cpp:495
+#: config/internal/option-internal.cpp:496
 msgid "Type of system to emulate"
 msgstr "Tipo de sistema a emular"
 
-#: config/internal/option-internal.cpp:496
+#: config/internal/option-internal.cpp:497
 msgid "Flash size 0 = 64 KB 1 = 128 KB"
 msgstr "Tamaño de Flash 0 = 64 KB 1 = 128 KB"
 
-#: config/internal/option-internal.cpp:498
+#: config/internal/option-internal.cpp:499
 msgid "Skip frames. Values are 0-9 or -1 to skip automatically based on time."
 msgstr "Saltar fotogramas. Los valores son 0-9 o -1 para saltar automáticamente según el tiempo."
 
-#: config/internal/option-internal.cpp:500
+#: config/internal/option-internal.cpp:501
 msgid "The palette to use"
 msgstr "La paleta a utilizar"
 
-#: config/internal/option-internal.cpp:501
+#: config/internal/option-internal.cpp:502
 msgid "Enable printer emulation"
 msgstr "Habilitar la emulación de impresora"
 
-#: config/internal/option-internal.cpp:503
+#: config/internal/option-internal.cpp:504
 msgid "Break into GDB after loading the game."
 msgstr "Acceder a GDB después de cargar el juego."
 
-#: config/internal/option-internal.cpp:504
+#: config/internal/option-internal.cpp:505
 msgid "Port to connect GDB to"
 msgstr "Puerto para conectar GDB a"
 
-#: config/internal/option-internal.cpp:506
+#: config/internal/option-internal.cpp:507
 msgid "Number of players in network"
 msgstr "Número de jugadores en la red"
 
-#: config/internal/option-internal.cpp:508
+#: config/internal/option-internal.cpp:509
 msgid "Maximum scale factor (0 = no limit)"
 msgstr "Factor de escala máximo (0 = sin límite)"
 
-#: config/internal/option-internal.cpp:510
+#: config/internal/option-internal.cpp:511
 msgid "Pause game when main window loses focus"
 msgstr "Pausar el juego cuando la ventana principal pierde el enfoque"
 
-#: config/internal/option-internal.cpp:512
+#: config/internal/option-internal.cpp:513
 msgid "Enable RTC (vba-over.ini override is rtcEnabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:513
+#: config/internal/option-internal.cpp:514
 msgid "Native save (\"battery\") hardware type"
 msgstr "Tipo de hardware de guardado nativo (\"battery\")"
 
-#: config/internal/option-internal.cpp:514
+#: config/internal/option-internal.cpp:515
 msgid "Show speed indicator"
 msgstr "Mostrar indicador de velocidad"
 
-#: config/internal/option-internal.cpp:516
+#: config/internal/option-internal.cpp:517
 msgid "Draw on-screen messages transparently"
 msgstr "Dibujar mensajes en pantalla de forma transparente"
 
-#: config/internal/option-internal.cpp:517
+#: config/internal/option-internal.cpp:518
 msgid "Skip BIOS initialization"
 msgstr "Omitir la inicialización de la BIOS"
 
-#: config/internal/option-internal.cpp:519
+#: config/internal/option-internal.cpp:520
 msgid "Do not overwrite cheat list when loading state"
 msgstr "No sobreescribir trucos al cargar"
 
-#: config/internal/option-internal.cpp:521
+#: config/internal/option-internal.cpp:522
 msgid "Do not overwrite native (battery) save when loading state"
 msgstr "No sobrescribir la función nativa (battery) de guardar al cargar el estado"
 
-#: config/internal/option-internal.cpp:523
+#: config/internal/option-internal.cpp:524
 msgid "Throttle game speed, even when accelerated (0-450 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:526
+#: config/internal/option-internal.cpp:527
 msgid "Set throttle for speedup key (0-3000 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:528
+#: config/internal/option-internal.cpp:529
 msgid "Number of frames to skip with speedup (instead of speedup throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:531
+#: config/internal/option-internal.cpp:532
 msgid "Use frame skip for speedup throttle"
 msgstr ""
 
-#: config/internal/option-internal.cpp:532
+#: config/internal/option-internal.cpp:533
 msgid "Use the specified BIOS file for Game Boy"
 msgstr "Usar el archivo BIOS especificado para Game Boy"
 
-#: config/internal/option-internal.cpp:533
+#: config/internal/option-internal.cpp:534
 msgid "Use the specified BIOS file"
 msgstr "Usar el archivo BIOS especificado"
 
-#: config/internal/option-internal.cpp:535
+#: config/internal/option-internal.cpp:536
 msgid "Use the specified BIOS file for Game Boy Color"
 msgstr ""
 
-#: config/internal/option-internal.cpp:536
+#: config/internal/option-internal.cpp:537
 msgid "Wait for vertical sync"
 msgstr "Esperar a la sincronización vertical"
 
-#: config/internal/option-internal.cpp:539
+#: config/internal/option-internal.cpp:540
 msgid "Enter fullscreen mode at startup"
 msgstr "Iniciar en modo de pantalla completa"
 
-#: config/internal/option-internal.cpp:540
+#: config/internal/option-internal.cpp:541
 msgid "Window maximized"
 msgstr ""
 
-#: config/internal/option-internal.cpp:541
+#: config/internal/option-internal.cpp:542
 msgid "Window height at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:542
+#: config/internal/option-internal.cpp:543
 msgid "Window width at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:543
+#: config/internal/option-internal.cpp:544
 msgid "Window axis X position at startup"
 msgstr "Posición del eje X de la ventana al inicio"
 
-#: config/internal/option-internal.cpp:544
+#: config/internal/option-internal.cpp:545
 msgid "Window axis Y position at startup"
 msgstr "Posición del eje Y de la ventana al inicio"
 
-#: config/internal/option-internal.cpp:548
+#: config/internal/option-internal.cpp:549
 msgid "Capture key events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:550
+#: config/internal/option-internal.cpp:551
 msgid "Capture joy events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:551
+#: config/internal/option-internal.cpp:552
 msgid "Hide menu bar when mouse is inactive"
 msgstr "Ocultar barra de menú cuando el ratón esté inactivo"
 
-#: config/internal/option-internal.cpp:553
+#: config/internal/option-internal.cpp:554
 msgid "Suspend screensaver when game is running"
 msgstr ""
 
-#: config/internal/option-internal.cpp:556
+#: config/internal/option-internal.cpp:557
 msgid "Sound API; if unsupported, default API will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:557
+#: config/internal/option-internal.cpp:558
 msgid "Device ID of chosen audio device for chosen driver"
 msgstr ""
 
-#: config/internal/option-internal.cpp:558
+#: config/internal/option-internal.cpp:559
 msgid "Number of sound buffers"
 msgstr "Número de \"buffers\" de sonido:"
 
-#: config/internal/option-internal.cpp:559
+#: config/internal/option-internal.cpp:560
 msgid "Bit mask of sound channels to enable"
 msgstr ""
 
-#: config/internal/option-internal.cpp:560
+#: config/internal/option-internal.cpp:561
 msgid "Game Boy Advance sound filtering (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:562
+#: config/internal/option-internal.cpp:563
 msgid "Game Boy Advance sound interpolation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:563
+#: config/internal/option-internal.cpp:564
 msgid "Game Boy sound declicking"
 msgstr ""
 
-#: config/internal/option-internal.cpp:564
+#: config/internal/option-internal.cpp:565
 msgid "Game Boy echo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:565
+#: config/internal/option-internal.cpp:566
 msgid "Enable Game Boy sound effects"
 msgstr ""
 
-#: config/internal/option-internal.cpp:566
+#: config/internal/option-internal.cpp:567
 msgid "Game Boy stereo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:567
+#: config/internal/option-internal.cpp:568
 msgid "Game Boy surround sound effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:568
+#: config/internal/option-internal.cpp:569
 msgid "Sound sample rate (kHz)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:569
+#: config/internal/option-internal.cpp:570
 msgid "Use DirectSound hardware acceleration"
 msgstr ""
 
-#: config/internal/option-internal.cpp:570
+#: config/internal/option-internal.cpp:571
 msgid "Upmix stereo to surround"
 msgstr ""
 
-#: config/internal/option-internal.cpp:571
+#: config/internal/option-internal.cpp:572
 msgid "Sound volume (%)"
 msgstr "Volumen (%)"
 
-#: config/internal/option-internal.cpp:639
-#: config/internal/option-internal.cpp:659
-#: config/internal/option-internal.cpp:680
-#: config/internal/option-internal.cpp:700
-#: config/internal/option-internal.cpp:719
+#: config/internal/option-internal.cpp:640
+#: config/internal/option-internal.cpp:660
+#: config/internal/option-internal.cpp:681
+#: config/internal/option-internal.cpp:701
+#: config/internal/option-internal.cpp:720
 #, c-format
 msgid "Invalid value %s for option %s; valid values are %s"
 msgstr ""
@@ -778,7 +867,7 @@ msgstr "Invalid value %f for option %s; valid values are %f - %f"
 msgid "Invalid value %d for option %s; valid values are %d - %d"
 msgstr "Invalid value %d for option %s; valid values are %d - %d"
 
-#: config/option.cpp:480 opts.cpp:621 opts.cpp:630 opts.cpp:639 opts.cpp:648
+#: config/option.cpp:480 opts.cpp:468 opts.cpp:477 opts.cpp:486 opts.cpp:495
 #, c-format
 msgid "Invalid value %s for option %s"
 msgstr "Valor invalido %s para opción %s"
@@ -943,19 +1032,19 @@ msgstr "Meta+"
 msgid "Key"
 msgstr ""
 
-#: dialogs/accel-config.cpp:149
+#: dialogs/accel-config.cpp:148
 msgid "Menu commands"
 msgstr "Menu commands"
 
-#: dialogs/accel-config.cpp:261
+#: dialogs/accel-config.cpp:259
 msgid "This will clear all user-defined accelerators. Are you sure?"
 msgstr "Esto eliminará todos los aceleradores definidos por el usuario. ¿Está seguro?"
 
-#: dialogs/accel-config.cpp:261 dialogs/accel-config.cpp:298
+#: dialogs/accel-config.cpp:259 dialogs/accel-config.cpp:306
 msgid "Confirm"
 msgstr "Confirm"
 
-#: dialogs/accel-config.cpp:295
+#: dialogs/accel-config.cpp:304
 #, c-format
 msgid "This will unassign \"%s\" from \"%s\". Are you sure?"
 msgstr ""
@@ -1327,22 +1416,22 @@ msgstr "Old Value"
 msgid "New Value"
 msgstr "New Value"
 
-#: guiinit.cpp:2518
+#: guiinit.cpp:2519
 msgid "JoyBus host invalid; disabling"
 msgstr "JoyBus host invalid; disabling"
 
-#: opts.cpp:298
+#: opts.cpp:154
 msgid ""
 "The INI file was written for a more recent version of VBA-M. Some INI option"
 " values may have been reset."
 msgstr "El archivo INI se escribió para una versión más reciente de VBA-M. Algunos opciones del archivo INI pueden haber sido restablecidos."
 
-#: opts.cpp:480 opts.cpp:500 opts.cpp:685
+#: opts.cpp:339 opts.cpp:355 opts.cpp:522
 #, c-format
 msgid "Invalid key binding %s for %s"
 msgstr "Atajo de tecla invalido %s para %s"
 
-#: opts.cpp:707
+#: opts.cpp:528
 #, c-format
 msgid "Unknown option %s with value %s"
 msgstr "Opción desconocida %s con valor %s"
@@ -1566,37 +1655,37 @@ msgstr "Reproducción finalizada"
 msgid "%d %% (%d, %d fps)"
 msgstr "%d %% (%d, %d fps)"
 
-#: sys.cpp:899 xrc/GBPrinter.xrc:65
+#: sys.cpp:898 xrc/GBPrinter.xrc:65
 msgid "&Discard"
 msgstr "&Discard"
 
-#: sys.cpp:933
+#: sys.cpp:932
 msgid "Image files (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 msgstr "Archivos de imagen (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 
-#: sys.cpp:942
+#: sys.cpp:941
 msgid "Save printer image to"
 msgstr "Save printer image to"
 
-#: sys.cpp:956 sys.cpp:1140
+#: sys.cpp:955 sys.cpp:1139
 #, c-format
 msgid "Wrote printer output to %s"
 msgstr "Wrote printer output to %s"
 
-#: sys.cpp:961 sys.cpp:1032
+#: sys.cpp:960 sys.cpp:1031
 msgid "&Close"
 msgstr "&Close"
 
-#: sys.cpp:1027
+#: sys.cpp:1026
 msgid "Printed"
 msgstr "Printed"
 
-#: sys.cpp:1302
+#: sys.cpp:1301
 #, c-format
 msgid "Error opening pseudo tty: %s"
 msgstr "Error opening pseudo tty: %s"
 
-#: sys.cpp:1401
+#: sys.cpp:1400
 #, c-format
 msgid "Error setting up server socket (%d)"
 msgstr "Error setting up server socket (%d)"
@@ -1630,80 +1719,80 @@ msgstr ""
 msgid "Unable to load dialog %s from resources"
 msgstr "Unable to load dialog %s from resources"
 
-#: wxvbam.cpp:398 wxvbam.cpp:415
+#: wxvbam.cpp:401 wxvbam.cpp:418
 #, c-format
 msgid "Invalid configuration file provided: %s"
 msgstr "Archivo de configuración proporcionado invalido: %s"
 
-#: wxvbam.cpp:559
+#: wxvbam.cpp:558
 msgid "Could not create main window"
 msgstr "No se pudo crear ventana principal"
 
-#: wxvbam.cpp:634
+#: wxvbam.cpp:633
 msgid "Save built-in XRC file and exit"
 msgstr "Guardar el archivo XRC integrado y salir"
 
-#: wxvbam.cpp:637
+#: wxvbam.cpp:636
 msgid "Save built-in vba-over.ini and exit"
 msgstr "Guardar el archivo vba-over.ini integrado y salir"
 
-#: wxvbam.cpp:640
+#: wxvbam.cpp:639
 msgid "Print configuration path and exit"
 msgstr "Mostrar ruta de configuración y salir"
 
-#: wxvbam.cpp:643
+#: wxvbam.cpp:642
 msgid "Start in full-screen mode"
 msgstr "Empezar en modo de pantalla completa"
 
-#: wxvbam.cpp:646
+#: wxvbam.cpp:645
 msgid "Set a configuration file"
 msgstr "Establecer un archivo de configuración"
 
-#: wxvbam.cpp:650
+#: wxvbam.cpp:649
 msgid "Delete shared link state first, if it exists"
 msgstr "Eliminar el estado de enlace compartido, si existe"
 
-#: wxvbam.cpp:657
+#: wxvbam.cpp:656
 msgid "List all settable options and exit"
 msgstr "Enlista todas las opciones establecidas y salir"
 
-#: wxvbam.cpp:660
+#: wxvbam.cpp:659
 msgid "ROM file"
 msgstr "Archivo ROM"
 
-#: wxvbam.cpp:662
+#: wxvbam.cpp:661
 msgid "<config>=<value>"
 msgstr "<config>=<value>"
 
-#: wxvbam.cpp:693
+#: wxvbam.cpp:692
 msgid "Configuration / build error: can't find built-in xrc"
 msgstr "Error de configuración/compilación: no se puede encontrar el xrc integrado"
 
-#: wxvbam.cpp:701
+#: wxvbam.cpp:700
 #, c-format
 msgid ""
 "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:"
 msgstr "Wrote built-in configuration to %s.\nTo 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:"
 
-#: wxvbam.cpp:715
+#: wxvbam.cpp:714
 msgid "Configuration is read from, in order:"
 msgstr "Configuration is read from, in order:"
 
-#: wxvbam.cpp:729
+#: wxvbam.cpp:728
 #, c-format
 msgid ""
 "Wrote built-in override file to %s\n"
 "To override, delete all but changed section. First found section is used from search path:"
 msgstr "Wrote built-in override file to %s\nTo override, delete all but changed section. First found section is used from search path:"
 
-#: wxvbam.cpp:735
+#: wxvbam.cpp:734
 msgid ""
 "\n"
 "\tbuilt-in"
 msgstr "\n\tbuilt-in"
 
-#: wxvbam.cpp:750
+#: wxvbam.cpp:749
 msgid ""
 "Options set from the command line are saved if any configuration changes are made in the user interface.\n"
 "\n"
@@ -1711,17 +1800,17 @@ msgid ""
 "\n"
 msgstr "Las opciones establecidas desde la línea de comandos se guardan si se realizan cambios de configuración en la interfaz de usuario.\n\nPara las opciones de marca, verdadero y falso se especifican como 1 y 0, respectivamente.\n\n"
 
-#: wxvbam.cpp:758
+#: wxvbam.cpp:757
 msgid ""
 "The commands available for the Keyboard/* option are:\n"
 "\n"
 msgstr "The commands available for the Keyboard/* option are:\n\n"
 
-#: wxvbam.cpp:769
+#: wxvbam.cpp:768
 msgid "Configuration file not found."
 msgstr "Configuration file not found."
 
-#: wxvbam.cpp:800
+#: wxvbam.cpp:799
 msgid "Bad configuration option or multiple ROM files given:\n"
 msgstr "Bad configuration option or multiple ROM files given:\n"
 
@@ -2233,10 +2322,6 @@ msgstr "Frame Skip"
 msgid "&Number of frames to skip:"
 msgstr ""
 
-#: xrc/DisplayConfig.xrc:200
-msgid "Speed"
-msgstr "Speed"
-
 #: xrc/DisplayConfig.xrc:216
 msgid "Speed indicator:"
 msgstr ""
@@ -2772,58 +2857,10 @@ msgid ""
 " entire contents if too small."
 msgstr ""
 
-#: xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
-msgid "Up"
-msgstr "Up"
-
-#: xrc/JoyPanel.xrc:37
-msgid "A"
-msgstr "A"
-
-#: xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
-msgid "Down"
-msgstr "Down"
-
-#: xrc/JoyPanel.xrc:83
-msgid "B"
-msgstr "B"
-
-#: xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
-msgid "Left"
-msgstr "Left"
-
-#: xrc/JoyPanel.xrc:129
-msgid "L"
-msgstr "L"
-
-#: xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
-msgid "Right"
-msgstr "Right"
-
-#: xrc/JoyPanel.xrc:175
-msgid "R"
-msgstr "R"
-
-#: xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
-msgid "Select"
-msgstr "Select"
-
-#: xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
-msgid "Start"
-msgstr "Start"
-
-#: xrc/JoyPanel.xrc:254
-msgid "Motion Up"
-msgstr "Motion Up"
-
 #: xrc/JoyPanel.xrc:276
 msgid "Autofire A"
 msgstr "Autofire A"
 
-#: xrc/JoyPanel.xrc:298
-msgid "Motion Down"
-msgstr "Motion Down"
-
 #: xrc/JoyPanel.xrc:320
 msgid "Autofire B"
 msgstr "Autofire B"
diff --git a/po/wxvbam/fr_FR.po b/po/wxvbam/fr_FR.po
index bcbc01ba..d3487036 100644
--- a/po/wxvbam/fr_FR.po
+++ b/po/wxvbam/fr_FR.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VBA-M\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-23 22:00+0000\n"
+"POT-Creation-Date: 2024-04-24 02:00+0000\n"
 "PO-Revision-Date: 2011-12-03 19:42+0000\n"
 "Last-Translator: Thibault <thibaultbruneliere@gmail.com>, 2019\n"
 "Language-Team: French (France) (http://app.transifex.com/bgk/vba-m/language/fr_FR/)\n"
@@ -326,174 +326,263 @@ msgstr ""
 msgid "Network is not supported in local mode."
 msgstr "Le réseau n'est pas supporté en mode local."
 
-#: config/internal/option-internal.cpp:379
+#: config/command.cpp:28 xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
+msgid "Up"
+msgstr "Haut"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
+msgid "Down"
+msgstr "Bas"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
+msgid "Left"
+msgstr "Gauche"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
+msgid "Right"
+msgstr "Droite"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:37
+msgid "A"
+msgstr "A"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:83
+msgid "B"
+msgstr "B"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:129
+msgid "L"
+msgstr "L"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:175
+msgid "R"
+msgstr "R"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
+msgid "Select"
+msgstr "Select"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
+msgid "Start"
+msgstr "Start"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:254
+msgid "Motion Up"
+msgstr "Mouvement haut"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:298
+msgid "Motion Down"
+msgstr "Mouvement bas"
+
+#: config/command.cpp:30
+msgid "Motion Left"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion Right"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion In"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Motion Out"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto A"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto B"
+msgstr ""
+
+#: config/command.cpp:31 xrc/DisplayConfig.xrc:200
+msgid "Speed"
+msgstr "Vitesse"
+
+#: config/command.cpp:31
+msgid "Capture"
+msgstr ""
+
+#: config/command.cpp:32
+msgid "GameShark"
+msgstr ""
+
+#: config/command.cpp:106
+#, c-format
+msgid "Joypad %zu %s"
+msgstr ""
+
+#: config/internal/option-internal.cpp:380
 msgid "Use bilinear filter with 3d renderer"
 msgstr "Utilise le filtre bilinéaire avec le rendu 3D"
 
-#: config/internal/option-internal.cpp:380
+#: config/internal/option-internal.cpp:381
 msgid "Full-screen filter to apply"
 msgstr "Filtre Plein Ecran à appliquer"
 
-#: config/internal/option-internal.cpp:381
+#: config/internal/option-internal.cpp:382
 msgid "Filter plugin library"
 msgstr "Bibliothèque du plugin Filtre"
 
-#: config/internal/option-internal.cpp:382
+#: config/internal/option-internal.cpp:383
 msgid "Interframe blending function"
 msgstr "Fonction de mélange des interframes"
 
-#: config/internal/option-internal.cpp:383
+#: config/internal/option-internal.cpp:384
 msgid "Keep window on top"
 msgstr "Garder la fenêtre sur le dessus"
 
-#: config/internal/option-internal.cpp:385
+#: config/internal/option-internal.cpp:386
 msgid "Maximum number of threads to run filters in"
 msgstr "Nombre maximum de processus pour lancer les filtres dans"
 
-#: config/internal/option-internal.cpp:387
+#: config/internal/option-internal.cpp:388
 msgid "Render method; if unsupported, simple method will be used"
 msgstr "la méthode de rendu ; si non supporté, la méthode simple sera utilisé"
 
-#: config/internal/option-internal.cpp:388
+#: config/internal/option-internal.cpp:389
 msgid "Default scale factor"
 msgstr "Facteur d'échelle par défaut"
 
-#: config/internal/option-internal.cpp:389
+#: config/internal/option-internal.cpp:390
 msgid "Retain aspect ratio when resizing"
 msgstr "Conserver les propotions lors du redimensionnement"
 
-#: config/internal/option-internal.cpp:392
+#: config/internal/option-internal.cpp:393
 msgid "BIOS file to use for Game Boy, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:393
+#: config/internal/option-internal.cpp:394
 msgid "Game Boy color enhancement, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:394
+#: config/internal/option-internal.cpp:395
 msgid "Enable DX Colorization Hacks"
 msgstr "Activer les hacks de colorisation DX"
 
-#: config/internal/option-internal.cpp:395
-#: config/internal/option-internal.cpp:419
+#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:420
 msgid "Apply LCD filter, if enabled"
 msgstr "Appliquer le filtre LCD, s'il est activé"
 
-#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:397
 msgid "BIOS file to use for Game Boy Color, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:398
+#: config/internal/option-internal.cpp:399
 msgid ""
 "The default palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr "La palette par défaut, sous forme de 8 entiers hexagonaux à 4 chiffres séparés par des virgules (rgb555)."
 
-#: config/internal/option-internal.cpp:401
+#: config/internal/option-internal.cpp:402
 msgid ""
 "The first user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr "La première palette de l'utilisateur, sous forme de 8 entiers hexagonaux à 4 chiffres séparés par des virgules (rgb555)."
 
-#: config/internal/option-internal.cpp:404
+#: config/internal/option-internal.cpp:405
 msgid ""
 "The second user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr "La deuxième palette utilisateur, sous la forme de 8 entiers hexagonaux à 4 chiffres séparés par des virgules (rgb555)."
 
-#: config/internal/option-internal.cpp:407
+#: config/internal/option-internal.cpp:408
 msgid "Automatically gather a full page before printing"
 msgstr "Rassembler automatiquement une page entière avant l'impression"
 
-#: config/internal/option-internal.cpp:409
+#: config/internal/option-internal.cpp:410
 msgid "Automatically save printouts as screen captures with -print suffix"
 msgstr "Enregistrer automatiquement les impressions en tant que captures d'écran avec le suffixe -print."
 
-#: config/internal/option-internal.cpp:411
-#: config/internal/option-internal.cpp:439
+#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:440
 msgid "Directory to look for ROM files"
 msgstr "Répertoire pour rechercher les fichiers ROM"
 
-#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:413
 msgid "Directory to look for Game Boy Color ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:415
+#: config/internal/option-internal.cpp:416
 msgid "BIOS file to use, if enabled"
 msgstr "Fichier BIOS à utiliser, si activé"
 
-#: config/internal/option-internal.cpp:425
+#: config/internal/option-internal.cpp:426
 msgid "Enable link at boot"
 msgstr "Activer le link au démarrage"
 
-#: config/internal/option-internal.cpp:430
+#: config/internal/option-internal.cpp:431
 msgid "Enable faster network protocol by default"
 msgstr "Activez le protocole réseau le plus rapide par défaut"
 
-#: config/internal/option-internal.cpp:432
+#: config/internal/option-internal.cpp:433
 msgid "Default network link client host"
 msgstr "Lien réseau par défaut du client hôte"
 
-#: config/internal/option-internal.cpp:433
+#: config/internal/option-internal.cpp:434
 msgid "Default network link server IP to bind"
 msgstr "IP du serveur de lien réseau par défaut à définir"
 
-#: config/internal/option-internal.cpp:434
+#: config/internal/option-internal.cpp:435
 msgid "Default network link port (server and client)"
 msgstr "Port de liaison réseau par défaut (serveur et client)"
 
-#: config/internal/option-internal.cpp:435
+#: config/internal/option-internal.cpp:436
 msgid "Default network protocol"
 msgstr "Protocole réseau par défaut"
 
-#: config/internal/option-internal.cpp:436
+#: config/internal/option-internal.cpp:437
 msgid "Link timeout (ms)"
 msgstr "Délai de liaison (ms)"
 
-#: config/internal/option-internal.cpp:437
+#: config/internal/option-internal.cpp:438
 msgid "Link cable type"
 msgstr "Type de cable pour le Link"
 
-#: config/internal/option-internal.cpp:442
+#: config/internal/option-internal.cpp:443
 msgid "Automatically load last saved state"
 msgstr "Chargement automatique du dernier état sauvegardé"
 
-#: config/internal/option-internal.cpp:444
+#: config/internal/option-internal.cpp:445
 msgid ""
 "Directory to store game save files (relative paths are relative to ROM; "
 "blank is config dir)"
 msgstr "Répertoire pour stocker les fichiers de sauvegarde du jeu (les chemins relatifs sont relatifs à la ROM ; blank est le répertoire de configuration)"
 
-#: config/internal/option-internal.cpp:446
+#: config/internal/option-internal.cpp:447
 msgid "Freeze recent load list"
 msgstr "Geler la liste des chargements récents"
 
-#: config/internal/option-internal.cpp:448
+#: config/internal/option-internal.cpp:449
 msgid ""
 "Directory to store A / V and game recordings (relative paths are relative to"
 " ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:451
+#: config/internal/option-internal.cpp:452
 msgid "Number of seconds between rewind snapshots (0 to disable)"
 msgstr "Nombre de secondes entre les captures d'écran de rembobinage (0 à désactiver)"
 
-#: config/internal/option-internal.cpp:453
+#: config/internal/option-internal.cpp:454
 msgid "Directory to store screenshots (relative paths are relative to ROM)"
 msgstr "Répertoire pour stocker les captures d'écran (les chemins relatifs sont relatifs à la ROM)"
 
-#: config/internal/option-internal.cpp:456
+#: config/internal/option-internal.cpp:457
 msgid ""
 "Directory to store saved state files (relative paths are relative to "
 "BatteryDir)"
 msgstr "Répertoire pour stocker les fichiers d'état sauvegardés (les chemins relatifs sont relatifs àBatteryDir)"
 
-#: config/internal/option-internal.cpp:458
+#: config/internal/option-internal.cpp:459
 msgid "Enable status bar"
 msgstr "Activer la barre d'état"
 
-#: config/internal/option-internal.cpp:459
+#: config/internal/option-internal.cpp:460
 msgid "INI file version (DO NOT MODIFY)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:463
+#: config/internal/option-internal.cpp:464
 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, "
@@ -501,266 +590,266 @@ msgid ""
 "MotionRight, AutoA, AutoB, Speed, Capture, GS"
 msgstr ""
 
-#: config/internal/option-internal.cpp:468
+#: config/internal/option-internal.cpp:469
 msgid "The autofire toggle period, in frames (1/60 s)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:469
+#: config/internal/option-internal.cpp:470
 msgid "The number of the stick to use in single-player mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:471
+#: config/internal/option-internal.cpp:472
 msgid "Whether to enable SDL GameController mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:475
+#: config/internal/option-internal.cpp:476
 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 "
 "executed."
 msgstr ""
 
-#: config/internal/option-internal.cpp:480
+#: config/internal/option-internal.cpp:481
 msgid "Enable AGB debug print"
 msgstr "Activer l'impression de débogage de l'AGB"
 
-#: config/internal/option-internal.cpp:481
+#: config/internal/option-internal.cpp:482
 msgid "Auto skip frames"
 msgstr ""
 
-#: config/internal/option-internal.cpp:483
+#: config/internal/option-internal.cpp:484
 msgid "Apply IPS / UPS / IPF patches if found"
 msgstr ""
 
-#: config/internal/option-internal.cpp:485
+#: config/internal/option-internal.cpp:486
 msgid "Automatically save and load cheat list"
 msgstr "Sauvegarde et chargement automatiques de la liste des codes de triches"
 
-#: config/internal/option-internal.cpp:489
+#: config/internal/option-internal.cpp:490
 msgid "Automatically enable border for Super Game Boy games"
 msgstr ""
 
-#: config/internal/option-internal.cpp:491
+#: config/internal/option-internal.cpp:492
 msgid "Always enable border"
 msgstr "Toujours activer la bordure"
 
-#: config/internal/option-internal.cpp:492
+#: config/internal/option-internal.cpp:493
 msgid "Screen capture file format"
 msgstr "Format de fichier de capture d'écran"
 
-#: config/internal/option-internal.cpp:493
+#: config/internal/option-internal.cpp:494
 msgid "Enable cheats"
 msgstr "Activer les codes de triches"
 
-#: config/internal/option-internal.cpp:494
+#: config/internal/option-internal.cpp:495
 msgid "Disable on-screen status messages"
 msgstr "Désactiver les messages d'état à l'écran"
 
-#: config/internal/option-internal.cpp:495
+#: config/internal/option-internal.cpp:496
 msgid "Type of system to emulate"
 msgstr "Type de système à émuler"
 
-#: config/internal/option-internal.cpp:496
+#: config/internal/option-internal.cpp:497
 msgid "Flash size 0 = 64 KB 1 = 128 KB"
 msgstr ""
 
-#: config/internal/option-internal.cpp:498
+#: config/internal/option-internal.cpp:499
 msgid "Skip frames. Values are 0-9 or -1 to skip automatically based on time."
 msgstr ""
 
-#: config/internal/option-internal.cpp:500
+#: config/internal/option-internal.cpp:501
 msgid "The palette to use"
 msgstr "La palette à utiliser"
 
-#: config/internal/option-internal.cpp:501
+#: config/internal/option-internal.cpp:502
 msgid "Enable printer emulation"
 msgstr "Activer l'émulation de l'imprimante"
 
-#: config/internal/option-internal.cpp:503
+#: config/internal/option-internal.cpp:504
 msgid "Break into GDB after loading the game."
 msgstr "Entrer dans GDB après avoir chargé le jeu."
 
-#: config/internal/option-internal.cpp:504
+#: config/internal/option-internal.cpp:505
 msgid "Port to connect GDB to"
 msgstr ""
 
-#: config/internal/option-internal.cpp:506
+#: config/internal/option-internal.cpp:507
 msgid "Number of players in network"
 msgstr "Nombre de joueurs dans le réseau"
 
-#: config/internal/option-internal.cpp:508
+#: config/internal/option-internal.cpp:509
 msgid "Maximum scale factor (0 = no limit)"
 msgstr "Facteur d'échelle maximum (0 = aucune limite)"
 
-#: config/internal/option-internal.cpp:510
+#: config/internal/option-internal.cpp:511
 msgid "Pause game when main window loses focus"
 msgstr "Pause du jeu lorsque la fenêtre principale perd le focus"
 
-#: config/internal/option-internal.cpp:512
+#: config/internal/option-internal.cpp:513
 msgid "Enable RTC (vba-over.ini override is rtcEnabled"
 msgstr "Activer le RTC (réécrire vba-over.ini est rtcEnabled)"
 
-#: config/internal/option-internal.cpp:513
+#: config/internal/option-internal.cpp:514
 msgid "Native save (\"battery\") hardware type"
 msgstr "Type de matériel de sauvegarde natif (\"batterie\")"
 
-#: config/internal/option-internal.cpp:514
+#: config/internal/option-internal.cpp:515
 msgid "Show speed indicator"
 msgstr "Afficher l'indicateur de vitesse"
 
-#: config/internal/option-internal.cpp:516
+#: config/internal/option-internal.cpp:517
 msgid "Draw on-screen messages transparently"
 msgstr "Dessiner des messages à l'écran de manière transparente"
 
-#: config/internal/option-internal.cpp:517
+#: config/internal/option-internal.cpp:518
 msgid "Skip BIOS initialization"
 msgstr "Passer l'initialisation du BIOS"
 
-#: config/internal/option-internal.cpp:519
+#: config/internal/option-internal.cpp:520
 msgid "Do not overwrite cheat list when loading state"
 msgstr "Ne pas écraser la liste des cheats lors du chargement de l'état."
 
-#: config/internal/option-internal.cpp:521
+#: config/internal/option-internal.cpp:522
 msgid "Do not overwrite native (battery) save when loading state"
 msgstr "Ne pas écraser la sauvegarde native (batterie) lors du chargement de l'état"
 
-#: config/internal/option-internal.cpp:523
+#: config/internal/option-internal.cpp:524
 msgid "Throttle game speed, even when accelerated (0-450 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:526
+#: config/internal/option-internal.cpp:527
 msgid "Set throttle for speedup key (0-3000 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:528
+#: config/internal/option-internal.cpp:529
 msgid "Number of frames to skip with speedup (instead of speedup throttle)"
 msgstr "Nombre d'images à sauter avec le speedup (au lieu de l'accélérateur de speedup)"
 
-#: config/internal/option-internal.cpp:531
+#: config/internal/option-internal.cpp:532
 msgid "Use frame skip for speedup throttle"
 msgstr "Utiliser le saut de trame pour accélérer l'accélérateur."
 
-#: config/internal/option-internal.cpp:532
+#: config/internal/option-internal.cpp:533
 msgid "Use the specified BIOS file for Game Boy"
 msgstr ""
 
-#: config/internal/option-internal.cpp:533
+#: config/internal/option-internal.cpp:534
 msgid "Use the specified BIOS file"
 msgstr "Utiliser le fichier BIOS spécifié"
 
-#: config/internal/option-internal.cpp:535
+#: config/internal/option-internal.cpp:536
 msgid "Use the specified BIOS file for Game Boy Color"
 msgstr ""
 
-#: config/internal/option-internal.cpp:536
+#: config/internal/option-internal.cpp:537
 msgid "Wait for vertical sync"
 msgstr "Attendre la synchronisation verticale"
 
-#: config/internal/option-internal.cpp:539
+#: config/internal/option-internal.cpp:540
 msgid "Enter fullscreen mode at startup"
 msgstr "Entrer en mode plein écran au démarrage"
 
-#: config/internal/option-internal.cpp:540
+#: config/internal/option-internal.cpp:541
 msgid "Window maximized"
 msgstr "Fenêtre maximisée"
 
-#: config/internal/option-internal.cpp:541
+#: config/internal/option-internal.cpp:542
 msgid "Window height at startup"
 msgstr "Hauteur de la fenêtre au démarrage"
 
-#: config/internal/option-internal.cpp:542
+#: config/internal/option-internal.cpp:543
 msgid "Window width at startup"
 msgstr "Largeur de la fenêtre au démarrage"
 
-#: config/internal/option-internal.cpp:543
+#: config/internal/option-internal.cpp:544
 msgid "Window axis X position at startup"
 msgstr "Position X de l'axe de la fenêtre au démarrage"
 
-#: config/internal/option-internal.cpp:544
+#: config/internal/option-internal.cpp:545
 msgid "Window axis Y position at startup"
 msgstr "Position Y de l'axe de la fenêtre au démarrage"
 
-#: config/internal/option-internal.cpp:548
+#: config/internal/option-internal.cpp:549
 msgid "Capture key events while on background"
 msgstr "Capturez les événements clés en arrière-plan"
 
-#: config/internal/option-internal.cpp:550
+#: config/internal/option-internal.cpp:551
 msgid "Capture joy events while on background"
 msgstr "Capture des événements du joystick en arrière-plan"
 
-#: config/internal/option-internal.cpp:551
+#: config/internal/option-internal.cpp:552
 msgid "Hide menu bar when mouse is inactive"
 msgstr "Masquer la barre de menu lorsque la souris est inactive"
 
-#: config/internal/option-internal.cpp:553
+#: config/internal/option-internal.cpp:554
 msgid "Suspend screensaver when game is running"
 msgstr ""
 
-#: config/internal/option-internal.cpp:556
+#: config/internal/option-internal.cpp:557
 msgid "Sound API; if unsupported, default API will be used"
 msgstr "API Son ; si elle n'est pas prise en charge, l'API par défaut sera utilisée."
 
-#: config/internal/option-internal.cpp:557
+#: config/internal/option-internal.cpp:558
 msgid "Device ID of chosen audio device for chosen driver"
 msgstr "Device ID du périphérique audio choisi pour le pilote choisi"
 
-#: config/internal/option-internal.cpp:558
+#: config/internal/option-internal.cpp:559
 msgid "Number of sound buffers"
 msgstr "Nombre de tampons sonores"
 
-#: config/internal/option-internal.cpp:559
+#: config/internal/option-internal.cpp:560
 msgid "Bit mask of sound channels to enable"
 msgstr "Masque de bits des canaux sonores à activer"
 
-#: config/internal/option-internal.cpp:560
+#: config/internal/option-internal.cpp:561
 msgid "Game Boy Advance sound filtering (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:562
+#: config/internal/option-internal.cpp:563
 msgid "Game Boy Advance sound interpolation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:563
+#: config/internal/option-internal.cpp:564
 msgid "Game Boy sound declicking"
 msgstr ""
 
-#: config/internal/option-internal.cpp:564
+#: config/internal/option-internal.cpp:565
 msgid "Game Boy echo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:565
+#: config/internal/option-internal.cpp:566
 msgid "Enable Game Boy sound effects"
 msgstr ""
 
-#: config/internal/option-internal.cpp:566
+#: config/internal/option-internal.cpp:567
 msgid "Game Boy stereo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:567
+#: config/internal/option-internal.cpp:568
 msgid "Game Boy surround sound effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:568
+#: config/internal/option-internal.cpp:569
 msgid "Sound sample rate (kHz)"
 msgstr "Fréquence d'échantillonnage du son (kHz)"
 
-#: config/internal/option-internal.cpp:569
+#: config/internal/option-internal.cpp:570
 msgid "Use DirectSound hardware acceleration"
 msgstr ""
 
-#: config/internal/option-internal.cpp:570
+#: config/internal/option-internal.cpp:571
 msgid "Upmix stereo to surround"
 msgstr ""
 
-#: config/internal/option-internal.cpp:571
+#: config/internal/option-internal.cpp:572
 msgid "Sound volume (%)"
 msgstr "Volume du Son (%)"
 
-#: config/internal/option-internal.cpp:639
-#: config/internal/option-internal.cpp:659
-#: config/internal/option-internal.cpp:680
-#: config/internal/option-internal.cpp:700
-#: config/internal/option-internal.cpp:719
+#: config/internal/option-internal.cpp:640
+#: config/internal/option-internal.cpp:660
+#: config/internal/option-internal.cpp:681
+#: config/internal/option-internal.cpp:701
+#: config/internal/option-internal.cpp:720
 #, c-format
 msgid "Invalid value %s for option %s; valid values are %s"
 msgstr "Valeur invalide %s pour l'option %s ; les valeurs valides sont %s"
@@ -775,7 +864,7 @@ msgstr "Valeur invalide %f pour l'option %s; les valeurs valides sont %f - %f"
 msgid "Invalid value %d for option %s; valid values are %d - %d"
 msgstr "Valeur Invalide %d pour l'option %s; les valeurs valides sont %d - %d"
 
-#: config/option.cpp:480 opts.cpp:621 opts.cpp:630 opts.cpp:639 opts.cpp:648
+#: config/option.cpp:480 opts.cpp:468 opts.cpp:477 opts.cpp:486 opts.cpp:495
 #, c-format
 msgid "Invalid value %s for option %s"
 msgstr ""
@@ -940,19 +1029,19 @@ msgstr "Meta+"
 msgid "Key"
 msgstr ""
 
-#: dialogs/accel-config.cpp:149
+#: dialogs/accel-config.cpp:148
 msgid "Menu commands"
 msgstr "Commandes du menu"
 
-#: dialogs/accel-config.cpp:261
+#: dialogs/accel-config.cpp:259
 msgid "This will clear all user-defined accelerators. Are you sure?"
 msgstr ""
 
-#: dialogs/accel-config.cpp:261 dialogs/accel-config.cpp:298
+#: dialogs/accel-config.cpp:259 dialogs/accel-config.cpp:306
 msgid "Confirm"
 msgstr "Confirmer"
 
-#: dialogs/accel-config.cpp:295
+#: dialogs/accel-config.cpp:304
 #, c-format
 msgid "This will unassign \"%s\" from \"%s\". Are you sure?"
 msgstr ""
@@ -1324,22 +1413,22 @@ msgstr "Ancienne valeur"
 msgid "New Value"
 msgstr "Nouvelle valeur"
 
-#: guiinit.cpp:2518
+#: guiinit.cpp:2519
 msgid "JoyBus host invalid; disabling"
 msgstr "Hôte JoyBus invalide ; désactivation"
 
-#: opts.cpp:298
+#: opts.cpp:154
 msgid ""
 "The INI file was written for a more recent version of VBA-M. Some INI option"
 " values may have been reset."
 msgstr ""
 
-#: opts.cpp:480 opts.cpp:500 opts.cpp:685
+#: opts.cpp:339 opts.cpp:355 opts.cpp:522
 #, c-format
 msgid "Invalid key binding %s for %s"
 msgstr "Définition de la touche invalide %s pour %s"
 
-#: opts.cpp:707
+#: opts.cpp:528
 #, c-format
 msgid "Unknown option %s with value %s"
 msgstr ""
@@ -1563,37 +1652,37 @@ msgstr "Playback terminé"
 msgid "%d %% (%d, %d fps)"
 msgstr ""
 
-#: sys.cpp:899 xrc/GBPrinter.xrc:65
+#: sys.cpp:898 xrc/GBPrinter.xrc:65
 msgid "&Discard"
 msgstr "&Jeter"
 
-#: sys.cpp:933
+#: sys.cpp:932
 msgid "Image files (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 msgstr "Fichiers image (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 
-#: sys.cpp:942
+#: sys.cpp:941
 msgid "Save printer image to"
 msgstr "Sauvegarder l'image de l'imprimante vers"
 
-#: sys.cpp:956 sys.cpp:1140
+#: sys.cpp:955 sys.cpp:1139
 #, c-format
 msgid "Wrote printer output to %s"
 msgstr "Ecrire la sortie de l'imprimante vers %s"
 
-#: sys.cpp:961 sys.cpp:1032
+#: sys.cpp:960 sys.cpp:1031
 msgid "&Close"
 msgstr "&Fermer"
 
-#: sys.cpp:1027
+#: sys.cpp:1026
 msgid "Printed"
 msgstr "Imprimé"
 
-#: sys.cpp:1302
+#: sys.cpp:1301
 #, c-format
 msgid "Error opening pseudo tty: %s"
 msgstr "Erreur de l'ouverture du pseudo tty: %s"
 
-#: sys.cpp:1401
+#: sys.cpp:1400
 #, c-format
 msgid "Error setting up server socket (%d)"
 msgstr "Erreur du paramétrage du socket du serveur (%d)"
@@ -1627,80 +1716,80 @@ msgstr ""
 msgid "Unable to load dialog %s from resources"
 msgstr "Ne peut pas charger le dialogue %s depuis les ressources"
 
-#: wxvbam.cpp:398 wxvbam.cpp:415
+#: wxvbam.cpp:401 wxvbam.cpp:418
 #, c-format
 msgid "Invalid configuration file provided: %s"
 msgstr ""
 
-#: wxvbam.cpp:559
+#: wxvbam.cpp:558
 msgid "Could not create main window"
 msgstr "Ne peut pas créer la fenêtre principale"
 
-#: wxvbam.cpp:634
+#: wxvbam.cpp:633
 msgid "Save built-in XRC file and exit"
 msgstr "Sauvegarder le fichier XRC intégré et quitter"
 
-#: wxvbam.cpp:637
+#: wxvbam.cpp:636
 msgid "Save built-in vba-over.ini and exit"
 msgstr "Sauvegarder vba-over.ini intégré et quitter"
 
-#: wxvbam.cpp:640
+#: wxvbam.cpp:639
 msgid "Print configuration path and exit"
 msgstr "Imprimer le chemin de configuration et quitter"
 
-#: wxvbam.cpp:643
+#: wxvbam.cpp:642
 msgid "Start in full-screen mode"
 msgstr "Démarrer en mode plein écran"
 
-#: wxvbam.cpp:646
+#: wxvbam.cpp:645
 msgid "Set a configuration file"
 msgstr "Choisir un fichier de configuration"
 
-#: wxvbam.cpp:650
+#: wxvbam.cpp:649
 msgid "Delete shared link state first, if it exists"
 msgstr "Effacer d'abord l'état du lien partagé, s'il existe"
 
-#: wxvbam.cpp:657
+#: wxvbam.cpp:656
 msgid "List all settable options and exit"
 msgstr "Lister toutes les options configurables et quitter"
 
-#: wxvbam.cpp:660
+#: wxvbam.cpp:659
 msgid "ROM file"
 msgstr "Fichier ROM"
 
-#: wxvbam.cpp:662
+#: wxvbam.cpp:661
 msgid "<config>=<value>"
 msgstr "<config>=<value>"
 
-#: wxvbam.cpp:693
+#: wxvbam.cpp:692
 msgid "Configuration / build error: can't find built-in xrc"
 msgstr ""
 
-#: wxvbam.cpp:701
+#: wxvbam.cpp:700
 #, c-format
 msgid ""
 "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:"
 msgstr ""
 
-#: wxvbam.cpp:715
+#: wxvbam.cpp:714
 msgid "Configuration is read from, in order:"
 msgstr "La configuration est lue depuis, dans l'ordre :"
 
-#: wxvbam.cpp:729
+#: wxvbam.cpp:728
 #, c-format
 msgid ""
 "Wrote built-in override file to %s\n"
 "To override, delete all but changed section. First found section is used from search path:"
 msgstr ""
 
-#: wxvbam.cpp:735
+#: wxvbam.cpp:734
 msgid ""
 "\n"
 "\tbuilt-in"
 msgstr "\n\tintégré"
 
-#: wxvbam.cpp:750
+#: wxvbam.cpp:749
 msgid ""
 "Options set from the command line are saved if any configuration changes are made in the user interface.\n"
 "\n"
@@ -1708,17 +1797,17 @@ msgid ""
 "\n"
 msgstr "Les options définies depuis la ligne de commande sont sauvegardées si des changements de configuration sont faits dans l'interface utilisateur.\n\nPour les options flag, vrai et faux sont spécifiés comme 1 et 0, respectivement.\n\n"
 
-#: wxvbam.cpp:758
+#: wxvbam.cpp:757
 msgid ""
 "The commands available for the Keyboard/* option are:\n"
 "\n"
 msgstr "Les commandes disponibles pour l'option du Clavier/* sont :\n\n"
 
-#: wxvbam.cpp:769
+#: wxvbam.cpp:768
 msgid "Configuration file not found."
 msgstr ""
 
-#: wxvbam.cpp:800
+#: wxvbam.cpp:799
 msgid "Bad configuration option or multiple ROM files given:\n"
 msgstr "L'option de mauvaise configuration ou des fichiers ROM multiples donnés :\n"
 
@@ -2230,10 +2319,6 @@ msgstr "Saut d'image"
 msgid "&Number of frames to skip:"
 msgstr ""
 
-#: xrc/DisplayConfig.xrc:200
-msgid "Speed"
-msgstr "Vitesse"
-
 #: xrc/DisplayConfig.xrc:216
 msgid "Speed indicator:"
 msgstr ""
@@ -2769,58 +2854,10 @@ msgid ""
 " entire contents if too small."
 msgstr ""
 
-#: xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
-msgid "Up"
-msgstr "Haut"
-
-#: xrc/JoyPanel.xrc:37
-msgid "A"
-msgstr "A"
-
-#: xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
-msgid "Down"
-msgstr "Bas"
-
-#: xrc/JoyPanel.xrc:83
-msgid "B"
-msgstr "B"
-
-#: xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
-msgid "Left"
-msgstr "Gauche"
-
-#: xrc/JoyPanel.xrc:129
-msgid "L"
-msgstr "L"
-
-#: xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
-msgid "Right"
-msgstr "Droite"
-
-#: xrc/JoyPanel.xrc:175
-msgid "R"
-msgstr "R"
-
-#: xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
-msgid "Select"
-msgstr "Select"
-
-#: xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
-msgid "Start"
-msgstr "Start"
-
-#: xrc/JoyPanel.xrc:254
-msgid "Motion Up"
-msgstr "Mouvement haut"
-
 #: xrc/JoyPanel.xrc:276
 msgid "Autofire A"
 msgstr "Tir automatique A"
 
-#: xrc/JoyPanel.xrc:298
-msgid "Motion Down"
-msgstr "Mouvement bas"
-
 #: xrc/JoyPanel.xrc:320
 msgid "Autofire B"
 msgstr "Tir automatique B"
diff --git a/po/wxvbam/gl.po b/po/wxvbam/gl.po
index 7dba5ddb..239c6677 100644
--- a/po/wxvbam/gl.po
+++ b/po/wxvbam/gl.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VBA-M\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-23 22:00+0000\n"
+"POT-Creation-Date: 2024-04-24 02:00+0000\n"
 "PO-Revision-Date: 2011-12-03 19:42+0000\n"
 "Last-Translator: David Rebolo Magariños <drgaga345@gmail.com>, 2021\n"
 "Language-Team: Galician (http://app.transifex.com/bgk/vba-m/language/gl/)\n"
@@ -322,174 +322,263 @@ msgstr ""
 msgid "Network is not supported in local mode."
 msgstr "A rede non se admite no modo local."
 
-#: config/internal/option-internal.cpp:379
-msgid "Use bilinear filter with 3d renderer"
+#: config/command.cpp:28 xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
+msgid "Up"
+msgstr "Arriba"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
+msgid "Down"
+msgstr "Abaixo"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
+msgid "Left"
+msgstr "Esquerda"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
+msgid "Right"
+msgstr "Dereita"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:37
+msgid "A"
+msgstr "A"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:83
+msgid "B"
+msgstr "B"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:129
+msgid "L"
+msgstr "L"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:175
+msgid "R"
+msgstr "R"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
+msgid "Select"
+msgstr "Select"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
+msgid "Start"
+msgstr "Start"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:254
+msgid "Motion Up"
+msgstr "Movemento arriba"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:298
+msgid "Motion Down"
+msgstr "Movemento abaixo"
+
+#: config/command.cpp:30
+msgid "Motion Left"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion Right"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion In"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Motion Out"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto A"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto B"
+msgstr ""
+
+#: config/command.cpp:31 xrc/DisplayConfig.xrc:200
+msgid "Speed"
+msgstr "Velocidade"
+
+#: config/command.cpp:31
+msgid "Capture"
+msgstr ""
+
+#: config/command.cpp:32
+msgid "GameShark"
+msgstr ""
+
+#: config/command.cpp:106
+#, c-format
+msgid "Joypad %zu %s"
 msgstr ""
 
 #: config/internal/option-internal.cpp:380
-msgid "Full-screen filter to apply"
+msgid "Use bilinear filter with 3d renderer"
 msgstr ""
 
 #: config/internal/option-internal.cpp:381
-msgid "Filter plugin library"
+msgid "Full-screen filter to apply"
 msgstr ""
 
 #: config/internal/option-internal.cpp:382
-msgid "Interframe blending function"
+msgid "Filter plugin library"
 msgstr ""
 
 #: config/internal/option-internal.cpp:383
+msgid "Interframe blending function"
+msgstr ""
+
+#: config/internal/option-internal.cpp:384
 msgid "Keep window on top"
 msgstr ""
 
-#: config/internal/option-internal.cpp:385
+#: config/internal/option-internal.cpp:386
 msgid "Maximum number of threads to run filters in"
 msgstr ""
 
-#: config/internal/option-internal.cpp:387
+#: config/internal/option-internal.cpp:388
 msgid "Render method; if unsupported, simple method will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:388
+#: config/internal/option-internal.cpp:389
 msgid "Default scale factor"
 msgstr ""
 
-#: config/internal/option-internal.cpp:389
+#: config/internal/option-internal.cpp:390
 msgid "Retain aspect ratio when resizing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:392
+#: config/internal/option-internal.cpp:393
 msgid "BIOS file to use for Game Boy, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:393
+#: config/internal/option-internal.cpp:394
 msgid "Game Boy color enhancement, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:394
+#: config/internal/option-internal.cpp:395
 msgid "Enable DX Colorization Hacks"
 msgstr ""
 
-#: config/internal/option-internal.cpp:395
-#: config/internal/option-internal.cpp:419
+#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:420
 msgid "Apply LCD filter, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:397
 msgid "BIOS file to use for Game Boy Color, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:398
+#: config/internal/option-internal.cpp:399
 msgid ""
 "The default palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:401
+#: config/internal/option-internal.cpp:402
 msgid ""
 "The first user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:404
+#: config/internal/option-internal.cpp:405
 msgid ""
 "The second user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:407
+#: config/internal/option-internal.cpp:408
 msgid "Automatically gather a full page before printing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:409
+#: config/internal/option-internal.cpp:410
 msgid "Automatically save printouts as screen captures with -print suffix"
 msgstr ""
 
-#: config/internal/option-internal.cpp:411
-#: config/internal/option-internal.cpp:439
+#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:440
 msgid "Directory to look for ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:413
 msgid "Directory to look for Game Boy Color ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:415
+#: config/internal/option-internal.cpp:416
 msgid "BIOS file to use, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:425
+#: config/internal/option-internal.cpp:426
 msgid "Enable link at boot"
 msgstr ""
 
-#: config/internal/option-internal.cpp:430
+#: config/internal/option-internal.cpp:431
 msgid "Enable faster network protocol by default"
 msgstr ""
 
-#: config/internal/option-internal.cpp:432
+#: config/internal/option-internal.cpp:433
 msgid "Default network link client host"
 msgstr ""
 
-#: config/internal/option-internal.cpp:433
+#: config/internal/option-internal.cpp:434
 msgid "Default network link server IP to bind"
 msgstr ""
 
-#: config/internal/option-internal.cpp:434
+#: config/internal/option-internal.cpp:435
 msgid "Default network link port (server and client)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:435
+#: config/internal/option-internal.cpp:436
 msgid "Default network protocol"
 msgstr ""
 
-#: config/internal/option-internal.cpp:436
+#: config/internal/option-internal.cpp:437
 msgid "Link timeout (ms)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:437
+#: config/internal/option-internal.cpp:438
 msgid "Link cable type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:442
+#: config/internal/option-internal.cpp:443
 msgid "Automatically load last saved state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:444
+#: config/internal/option-internal.cpp:445
 msgid ""
 "Directory to store game save files (relative paths are relative to ROM; "
 "blank is config dir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:446
+#: config/internal/option-internal.cpp:447
 msgid "Freeze recent load list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:448
+#: config/internal/option-internal.cpp:449
 msgid ""
 "Directory to store A / V and game recordings (relative paths are relative to"
 " ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:451
+#: config/internal/option-internal.cpp:452
 msgid "Number of seconds between rewind snapshots (0 to disable)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:453
+#: config/internal/option-internal.cpp:454
 msgid "Directory to store screenshots (relative paths are relative to ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:456
+#: config/internal/option-internal.cpp:457
 msgid ""
 "Directory to store saved state files (relative paths are relative to "
 "BatteryDir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:458
+#: config/internal/option-internal.cpp:459
 msgid "Enable status bar"
 msgstr ""
 
-#: config/internal/option-internal.cpp:459
+#: config/internal/option-internal.cpp:460
 msgid "INI file version (DO NOT MODIFY)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:463
+#: config/internal/option-internal.cpp:464
 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, "
@@ -497,266 +586,266 @@ msgid ""
 "MotionRight, AutoA, AutoB, Speed, Capture, GS"
 msgstr ""
 
-#: config/internal/option-internal.cpp:468
+#: config/internal/option-internal.cpp:469
 msgid "The autofire toggle period, in frames (1/60 s)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:469
+#: config/internal/option-internal.cpp:470
 msgid "The number of the stick to use in single-player mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:471
+#: config/internal/option-internal.cpp:472
 msgid "Whether to enable SDL GameController mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:475
+#: config/internal/option-internal.cpp:476
 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 "
 "executed."
 msgstr ""
 
-#: config/internal/option-internal.cpp:480
+#: config/internal/option-internal.cpp:481
 msgid "Enable AGB debug print"
 msgstr ""
 
-#: config/internal/option-internal.cpp:481
+#: config/internal/option-internal.cpp:482
 msgid "Auto skip frames"
 msgstr ""
 
-#: config/internal/option-internal.cpp:483
+#: config/internal/option-internal.cpp:484
 msgid "Apply IPS / UPS / IPF patches if found"
 msgstr ""
 
-#: config/internal/option-internal.cpp:485
+#: config/internal/option-internal.cpp:486
 msgid "Automatically save and load cheat list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:489
+#: config/internal/option-internal.cpp:490
 msgid "Automatically enable border for Super Game Boy games"
 msgstr ""
 
-#: config/internal/option-internal.cpp:491
+#: config/internal/option-internal.cpp:492
 msgid "Always enable border"
 msgstr ""
 
-#: config/internal/option-internal.cpp:492
+#: config/internal/option-internal.cpp:493
 msgid "Screen capture file format"
 msgstr ""
 
-#: config/internal/option-internal.cpp:493
+#: config/internal/option-internal.cpp:494
 msgid "Enable cheats"
 msgstr ""
 
-#: config/internal/option-internal.cpp:494
+#: config/internal/option-internal.cpp:495
 msgid "Disable on-screen status messages"
 msgstr ""
 
-#: config/internal/option-internal.cpp:495
+#: config/internal/option-internal.cpp:496
 msgid "Type of system to emulate"
 msgstr ""
 
-#: config/internal/option-internal.cpp:496
+#: config/internal/option-internal.cpp:497
 msgid "Flash size 0 = 64 KB 1 = 128 KB"
 msgstr ""
 
-#: config/internal/option-internal.cpp:498
+#: config/internal/option-internal.cpp:499
 msgid "Skip frames. Values are 0-9 or -1 to skip automatically based on time."
 msgstr ""
 
-#: config/internal/option-internal.cpp:500
+#: config/internal/option-internal.cpp:501
 msgid "The palette to use"
 msgstr ""
 
-#: config/internal/option-internal.cpp:501
+#: config/internal/option-internal.cpp:502
 msgid "Enable printer emulation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:503
+#: config/internal/option-internal.cpp:504
 msgid "Break into GDB after loading the game."
 msgstr ""
 
-#: config/internal/option-internal.cpp:504
+#: config/internal/option-internal.cpp:505
 msgid "Port to connect GDB to"
 msgstr ""
 
-#: config/internal/option-internal.cpp:506
+#: config/internal/option-internal.cpp:507
 msgid "Number of players in network"
 msgstr ""
 
-#: config/internal/option-internal.cpp:508
+#: config/internal/option-internal.cpp:509
 msgid "Maximum scale factor (0 = no limit)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:510
+#: config/internal/option-internal.cpp:511
 msgid "Pause game when main window loses focus"
 msgstr ""
 
-#: config/internal/option-internal.cpp:512
+#: config/internal/option-internal.cpp:513
 msgid "Enable RTC (vba-over.ini override is rtcEnabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:513
+#: config/internal/option-internal.cpp:514
 msgid "Native save (\"battery\") hardware type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:514
+#: config/internal/option-internal.cpp:515
 msgid "Show speed indicator"
 msgstr ""
 
-#: config/internal/option-internal.cpp:516
+#: config/internal/option-internal.cpp:517
 msgid "Draw on-screen messages transparently"
 msgstr ""
 
-#: config/internal/option-internal.cpp:517
+#: config/internal/option-internal.cpp:518
 msgid "Skip BIOS initialization"
 msgstr ""
 
-#: config/internal/option-internal.cpp:519
+#: config/internal/option-internal.cpp:520
 msgid "Do not overwrite cheat list when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:521
+#: config/internal/option-internal.cpp:522
 msgid "Do not overwrite native (battery) save when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:523
+#: config/internal/option-internal.cpp:524
 msgid "Throttle game speed, even when accelerated (0-450 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:526
+#: config/internal/option-internal.cpp:527
 msgid "Set throttle for speedup key (0-3000 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:528
+#: config/internal/option-internal.cpp:529
 msgid "Number of frames to skip with speedup (instead of speedup throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:531
+#: config/internal/option-internal.cpp:532
 msgid "Use frame skip for speedup throttle"
 msgstr ""
 
-#: config/internal/option-internal.cpp:532
+#: config/internal/option-internal.cpp:533
 msgid "Use the specified BIOS file for Game Boy"
 msgstr ""
 
-#: config/internal/option-internal.cpp:533
+#: config/internal/option-internal.cpp:534
 msgid "Use the specified BIOS file"
 msgstr ""
 
-#: config/internal/option-internal.cpp:535
+#: config/internal/option-internal.cpp:536
 msgid "Use the specified BIOS file for Game Boy Color"
 msgstr ""
 
-#: config/internal/option-internal.cpp:536
+#: config/internal/option-internal.cpp:537
 msgid "Wait for vertical sync"
 msgstr ""
 
-#: config/internal/option-internal.cpp:539
+#: config/internal/option-internal.cpp:540
 msgid "Enter fullscreen mode at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:540
+#: config/internal/option-internal.cpp:541
 msgid "Window maximized"
 msgstr ""
 
-#: config/internal/option-internal.cpp:541
+#: config/internal/option-internal.cpp:542
 msgid "Window height at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:542
+#: config/internal/option-internal.cpp:543
 msgid "Window width at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:543
+#: config/internal/option-internal.cpp:544
 msgid "Window axis X position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:544
+#: config/internal/option-internal.cpp:545
 msgid "Window axis Y position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:548
+#: config/internal/option-internal.cpp:549
 msgid "Capture key events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:550
+#: config/internal/option-internal.cpp:551
 msgid "Capture joy events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:551
+#: config/internal/option-internal.cpp:552
 msgid "Hide menu bar when mouse is inactive"
 msgstr ""
 
-#: config/internal/option-internal.cpp:553
+#: config/internal/option-internal.cpp:554
 msgid "Suspend screensaver when game is running"
 msgstr ""
 
-#: config/internal/option-internal.cpp:556
+#: config/internal/option-internal.cpp:557
 msgid "Sound API; if unsupported, default API will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:557
+#: config/internal/option-internal.cpp:558
 msgid "Device ID of chosen audio device for chosen driver"
 msgstr ""
 
-#: config/internal/option-internal.cpp:558
+#: config/internal/option-internal.cpp:559
 msgid "Number of sound buffers"
 msgstr ""
 
-#: config/internal/option-internal.cpp:559
+#: config/internal/option-internal.cpp:560
 msgid "Bit mask of sound channels to enable"
 msgstr ""
 
-#: config/internal/option-internal.cpp:560
+#: config/internal/option-internal.cpp:561
 msgid "Game Boy Advance sound filtering (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:562
+#: config/internal/option-internal.cpp:563
 msgid "Game Boy Advance sound interpolation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:563
+#: config/internal/option-internal.cpp:564
 msgid "Game Boy sound declicking"
 msgstr ""
 
-#: config/internal/option-internal.cpp:564
+#: config/internal/option-internal.cpp:565
 msgid "Game Boy echo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:565
+#: config/internal/option-internal.cpp:566
 msgid "Enable Game Boy sound effects"
 msgstr ""
 
-#: config/internal/option-internal.cpp:566
+#: config/internal/option-internal.cpp:567
 msgid "Game Boy stereo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:567
+#: config/internal/option-internal.cpp:568
 msgid "Game Boy surround sound effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:568
+#: config/internal/option-internal.cpp:569
 msgid "Sound sample rate (kHz)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:569
+#: config/internal/option-internal.cpp:570
 msgid "Use DirectSound hardware acceleration"
 msgstr ""
 
-#: config/internal/option-internal.cpp:570
+#: config/internal/option-internal.cpp:571
 msgid "Upmix stereo to surround"
 msgstr ""
 
-#: config/internal/option-internal.cpp:571
+#: config/internal/option-internal.cpp:572
 msgid "Sound volume (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:639
-#: config/internal/option-internal.cpp:659
-#: config/internal/option-internal.cpp:680
-#: config/internal/option-internal.cpp:700
-#: config/internal/option-internal.cpp:719
+#: config/internal/option-internal.cpp:640
+#: config/internal/option-internal.cpp:660
+#: config/internal/option-internal.cpp:681
+#: config/internal/option-internal.cpp:701
+#: config/internal/option-internal.cpp:720
 #, c-format
 msgid "Invalid value %s for option %s; valid values are %s"
 msgstr ""
@@ -771,7 +860,7 @@ msgstr "Valor non válido %f para a opción %s; os valores válidos son %f - %f"
 msgid "Invalid value %d for option %s; valid values are %d - %d"
 msgstr "Valor non válido %d para a opción %s; os valores válidos son %d - %d"
 
-#: config/option.cpp:480 opts.cpp:621 opts.cpp:630 opts.cpp:639 opts.cpp:648
+#: config/option.cpp:480 opts.cpp:468 opts.cpp:477 opts.cpp:486 opts.cpp:495
 #, c-format
 msgid "Invalid value %s for option %s"
 msgstr ""
@@ -936,19 +1025,19 @@ msgstr "Meta+"
 msgid "Key"
 msgstr ""
 
-#: dialogs/accel-config.cpp:149
+#: dialogs/accel-config.cpp:148
 msgid "Menu commands"
 msgstr "Menú de comandos"
 
-#: dialogs/accel-config.cpp:261
+#: dialogs/accel-config.cpp:259
 msgid "This will clear all user-defined accelerators. Are you sure?"
 msgstr ""
 
-#: dialogs/accel-config.cpp:261 dialogs/accel-config.cpp:298
+#: dialogs/accel-config.cpp:259 dialogs/accel-config.cpp:306
 msgid "Confirm"
 msgstr "Confirmar"
 
-#: dialogs/accel-config.cpp:295
+#: dialogs/accel-config.cpp:304
 #, c-format
 msgid "This will unassign \"%s\" from \"%s\". Are you sure?"
 msgstr ""
@@ -1320,22 +1409,22 @@ msgstr "Valor antigo"
 msgid "New Value"
 msgstr "Novo valor"
 
-#: guiinit.cpp:2518
+#: guiinit.cpp:2519
 msgid "JoyBus host invalid; disabling"
 msgstr "Servidor JoyBus non válido; desactivando"
 
-#: opts.cpp:298
+#: opts.cpp:154
 msgid ""
 "The INI file was written for a more recent version of VBA-M. Some INI option"
 " values may have been reset."
 msgstr ""
 
-#: opts.cpp:480 opts.cpp:500 opts.cpp:685
+#: opts.cpp:339 opts.cpp:355 opts.cpp:522
 #, c-format
 msgid "Invalid key binding %s for %s"
 msgstr "Teclas de vinculación non válidas %s para %s"
 
-#: opts.cpp:707
+#: opts.cpp:528
 #, c-format
 msgid "Unknown option %s with value %s"
 msgstr ""
@@ -1559,37 +1648,37 @@ msgstr "Finalizou a reprodución"
 msgid "%d %% (%d, %d fps)"
 msgstr ""
 
-#: sys.cpp:899 xrc/GBPrinter.xrc:65
+#: sys.cpp:898 xrc/GBPrinter.xrc:65
 msgid "&Discard"
 msgstr "&Desbotar"
 
-#: sys.cpp:933
+#: sys.cpp:932
 msgid "Image files (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 msgstr "Ficheiros de imaxe (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 
-#: sys.cpp:942
+#: sys.cpp:941
 msgid "Save printer image to"
 msgstr "Gardar imaxe de impresora a"
 
-#: sys.cpp:956 sys.cpp:1140
+#: sys.cpp:955 sys.cpp:1139
 #, c-format
 msgid "Wrote printer output to %s"
 msgstr "Saída de impresora escrita a %s"
 
-#: sys.cpp:961 sys.cpp:1032
+#: sys.cpp:960 sys.cpp:1031
 msgid "&Close"
 msgstr "Pe&char"
 
-#: sys.cpp:1027
+#: sys.cpp:1026
 msgid "Printed"
 msgstr "Impreso"
 
-#: sys.cpp:1302
+#: sys.cpp:1301
 #, c-format
 msgid "Error opening pseudo tty: %s"
 msgstr "Erro ao abrir pseudo tty: %s"
 
-#: sys.cpp:1401
+#: sys.cpp:1400
 #, c-format
 msgid "Error setting up server socket (%d)"
 msgstr "Erro ao axustar o socket do servidor (%d)"
@@ -1623,80 +1712,80 @@ msgstr ""
 msgid "Unable to load dialog %s from resources"
 msgstr "Non se puido cargar o diálogo %s dos recursos"
 
-#: wxvbam.cpp:398 wxvbam.cpp:415
+#: wxvbam.cpp:401 wxvbam.cpp:418
 #, c-format
 msgid "Invalid configuration file provided: %s"
 msgstr ""
 
-#: wxvbam.cpp:559
+#: wxvbam.cpp:558
 msgid "Could not create main window"
 msgstr "Non se pode crear a xanela principal"
 
-#: wxvbam.cpp:634
+#: wxvbam.cpp:633
 msgid "Save built-in XRC file and exit"
 msgstr "Gardar o ficheiro XRC integrado e saír"
 
-#: wxvbam.cpp:637
+#: wxvbam.cpp:636
 msgid "Save built-in vba-over.ini and exit"
 msgstr "Gardar vba-over.ini integrado e saír"
 
-#: wxvbam.cpp:640
+#: wxvbam.cpp:639
 msgid "Print configuration path and exit"
 msgstr "Imprimir camiño de configuración e saír"
 
-#: wxvbam.cpp:643
+#: wxvbam.cpp:642
 msgid "Start in full-screen mode"
 msgstr "Iniciar en modo pantalla completa"
 
-#: wxvbam.cpp:646
+#: wxvbam.cpp:645
 msgid "Set a configuration file"
 msgstr "Estabelecer un ficheiro de configuración"
 
-#: wxvbam.cpp:650
+#: wxvbam.cpp:649
 msgid "Delete shared link state first, if it exists"
 msgstr "Borrar estado da ligazón compartida, se existe"
 
-#: wxvbam.cpp:657
+#: wxvbam.cpp:656
 msgid "List all settable options and exit"
 msgstr "Enumera todas as opcións configurábeis e saír"
 
-#: wxvbam.cpp:660
+#: wxvbam.cpp:659
 msgid "ROM file"
 msgstr "Ficheiro ROM"
 
-#: wxvbam.cpp:662
+#: wxvbam.cpp:661
 msgid "<config>=<value>"
 msgstr "<config>=<value>"
 
-#: wxvbam.cpp:693
+#: wxvbam.cpp:692
 msgid "Configuration / build error: can't find built-in xrc"
 msgstr ""
 
-#: wxvbam.cpp:701
+#: wxvbam.cpp:700
 #, c-format
 msgid ""
 "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:"
 msgstr ""
 
-#: wxvbam.cpp:715
+#: wxvbam.cpp:714
 msgid "Configuration is read from, in order:"
 msgstr "A configuración lese dende, en orde:"
 
-#: wxvbam.cpp:729
+#: wxvbam.cpp:728
 #, c-format
 msgid ""
 "Wrote built-in override file to %s\n"
 "To override, delete all but changed section. First found section is used from search path:"
 msgstr ""
 
-#: wxvbam.cpp:735
+#: wxvbam.cpp:734
 msgid ""
 "\n"
 "\tbuilt-in"
 msgstr "\n\tintegrado"
 
-#: wxvbam.cpp:750
+#: wxvbam.cpp:749
 msgid ""
 "Options set from the command line are saved if any configuration changes are made in the user interface.\n"
 "\n"
@@ -1704,17 +1793,17 @@ msgid ""
 "\n"
 msgstr "As opcións estabelecidas dende a liña de comandos gárdanse se se fan cambios na interface de usuario.\n\nPara as opcións do indicador, certo e falso especifícanse como 1 e 0, respectivamente.\n\n"
 
-#: wxvbam.cpp:758
+#: wxvbam.cpp:757
 msgid ""
 "The commands available for the Keyboard/* option are:\n"
 "\n"
 msgstr "Os comandos dispoñíbeis para a opción teclado/* son:\n\n"
 
-#: wxvbam.cpp:769
+#: wxvbam.cpp:768
 msgid "Configuration file not found."
 msgstr "Non se atopa o ficheiro de configuración."
 
-#: wxvbam.cpp:800
+#: wxvbam.cpp:799
 msgid "Bad configuration option or multiple ROM files given:\n"
 msgstr "Mala opción de configuración ou proporcionáronse múltiples ficheiros ROM:\n"
 
@@ -2226,10 +2315,6 @@ msgstr "Omitir fotograma"
 msgid "&Number of frames to skip:"
 msgstr ""
 
-#: xrc/DisplayConfig.xrc:200
-msgid "Speed"
-msgstr "Velocidade"
-
 #: xrc/DisplayConfig.xrc:216
 msgid "Speed indicator:"
 msgstr ""
@@ -2765,58 +2850,10 @@ msgid ""
 " entire contents if too small."
 msgstr ""
 
-#: xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
-msgid "Up"
-msgstr "Arriba"
-
-#: xrc/JoyPanel.xrc:37
-msgid "A"
-msgstr "A"
-
-#: xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
-msgid "Down"
-msgstr "Abaixo"
-
-#: xrc/JoyPanel.xrc:83
-msgid "B"
-msgstr "B"
-
-#: xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
-msgid "Left"
-msgstr "Esquerda"
-
-#: xrc/JoyPanel.xrc:129
-msgid "L"
-msgstr "L"
-
-#: xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
-msgid "Right"
-msgstr "Dereita"
-
-#: xrc/JoyPanel.xrc:175
-msgid "R"
-msgstr "R"
-
-#: xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
-msgid "Select"
-msgstr "Select"
-
-#: xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
-msgid "Start"
-msgstr "Start"
-
-#: xrc/JoyPanel.xrc:254
-msgid "Motion Up"
-msgstr "Movemento arriba"
-
 #: xrc/JoyPanel.xrc:276
 msgid "Autofire A"
 msgstr "Pulsado automático A"
 
-#: xrc/JoyPanel.xrc:298
-msgid "Motion Down"
-msgstr "Movemento abaixo"
-
 #: xrc/JoyPanel.xrc:320
 msgid "Autofire B"
 msgstr "Pulsado automático B"
diff --git a/po/wxvbam/he_IL.po b/po/wxvbam/he_IL.po
index 774e892b..002cea29 100644
--- a/po/wxvbam/he_IL.po
+++ b/po/wxvbam/he_IL.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VBA-M\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-23 22:00+0000\n"
+"POT-Creation-Date: 2024-04-24 02:00+0000\n"
 "PO-Revision-Date: 2011-12-03 19:42+0000\n"
 "Last-Translator: Ds886 <daniel.ashkenazi@gmail.com>, 2022\n"
 "Language-Team: Hebrew (Israel) (http://app.transifex.com/bgk/vba-m/language/he_IL/)\n"
@@ -320,174 +320,263 @@ msgstr ""
 msgid "Network is not supported in local mode."
 msgstr "הרשת לא מאופשרת במצב מקומי."
 
-#: config/internal/option-internal.cpp:379
+#: config/command.cpp:28 xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
+msgid "Up"
+msgstr "למעלה"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
+msgid "Down"
+msgstr "למטה"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
+msgid "Left"
+msgstr "שמאל"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
+msgid "Right"
+msgstr "ימין"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:37
+msgid "A"
+msgstr "A"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:83
+msgid "B"
+msgstr "B"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:129
+msgid "L"
+msgstr "כפתור שמאלי"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:175
+msgid "R"
+msgstr "כפתור ימני"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
+msgid "Select"
+msgstr "בחר"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
+msgid "Start"
+msgstr "התחל"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:254
+msgid "Motion Up"
+msgstr "תנועה למעלה"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:298
+msgid "Motion Down"
+msgstr "תנועה למטה"
+
+#: config/command.cpp:30
+msgid "Motion Left"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion Right"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion In"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Motion Out"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto A"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto B"
+msgstr ""
+
+#: config/command.cpp:31 xrc/DisplayConfig.xrc:200
+msgid "Speed"
+msgstr "מהירות"
+
+#: config/command.cpp:31
+msgid "Capture"
+msgstr ""
+
+#: config/command.cpp:32
+msgid "GameShark"
+msgstr ""
+
+#: config/command.cpp:106
+#, c-format
+msgid "Joypad %zu %s"
+msgstr ""
+
+#: config/internal/option-internal.cpp:380
 msgid "Use bilinear filter with 3d renderer"
 msgstr "תפעיל מסנן דו-לינארי עם המרנדר תלת מימד"
 
-#: config/internal/option-internal.cpp:380
+#: config/internal/option-internal.cpp:381
 msgid "Full-screen filter to apply"
 msgstr "המסנן מסך מלא אשר ליהיות מוכל"
 
-#: config/internal/option-internal.cpp:381
+#: config/internal/option-internal.cpp:382
 msgid "Filter plugin library"
 msgstr "ספריית תוספי סינון"
 
-#: config/internal/option-internal.cpp:382
+#: config/internal/option-internal.cpp:383
 msgid "Interframe blending function"
 msgstr "שימוש בממזג intrerframe "
 
-#: config/internal/option-internal.cpp:383
+#: config/internal/option-internal.cpp:384
 msgid "Keep window on top"
 msgstr "נעל את החלון מעל הכל"
 
-#: config/internal/option-internal.cpp:385
+#: config/internal/option-internal.cpp:386
 msgid "Maximum number of threads to run filters in"
 msgstr "כמות ה-threads  להרצת מסנננים ב"
 
-#: config/internal/option-internal.cpp:387
+#: config/internal/option-internal.cpp:388
 msgid "Render method; if unsupported, simple method will be used"
 msgstr "מנוע הרינדור לא נתמך, המנוע הפשוט יהיה בשימוש"
 
-#: config/internal/option-internal.cpp:388
+#: config/internal/option-internal.cpp:389
 msgid "Default scale factor"
 msgstr "ברירת המחדל עבור קנה מידה של הגודל"
 
-#: config/internal/option-internal.cpp:389
+#: config/internal/option-internal.cpp:390
 msgid "Retain aspect ratio when resizing"
 msgstr "שמור על הקנה מידה כאשר מתשנה גודל החלון"
 
-#: config/internal/option-internal.cpp:392
+#: config/internal/option-internal.cpp:393
 msgid "BIOS file to use for Game Boy, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:393
+#: config/internal/option-internal.cpp:394
 msgid "Game Boy color enhancement, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:394
+#: config/internal/option-internal.cpp:395
 msgid "Enable DX Colorization Hacks"
 msgstr "הפעל האקים של צביעה של DX"
 
-#: config/internal/option-internal.cpp:395
-#: config/internal/option-internal.cpp:419
+#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:420
 msgid "Apply LCD filter, if enabled"
 msgstr "החל מסנן ‎‏LCD במידה ומאופשר"
 
-#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:397
 msgid "BIOS file to use for Game Boy Color, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:398
+#: config/internal/option-internal.cpp:399
 msgid ""
 "The default palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr "ברירת המחדל עבור פלטת הצבעים, הכנס כ-4 ספרות שלמות הקסדצימליות מופרדות בפסיק(rgb555‎‏)."
 
-#: config/internal/option-internal.cpp:401
+#: config/internal/option-internal.cpp:402
 msgid ""
 "The first user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:404
+#: config/internal/option-internal.cpp:405
 msgid ""
 "The second user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:407
+#: config/internal/option-internal.cpp:408
 msgid "Automatically gather a full page before printing"
 msgstr "תאגור באופן אוטומטי דף שלם לפני הדפסה"
 
-#: config/internal/option-internal.cpp:409
+#: config/internal/option-internal.cpp:410
 msgid "Automatically save printouts as screen captures with -print suffix"
 msgstr "שמור באופן אוטמטי הדפסות כלכידת מסך עם הסיומת \"‎-print‏\""
 
-#: config/internal/option-internal.cpp:411
-#: config/internal/option-internal.cpp:439
+#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:440
 msgid "Directory to look for ROM files"
 msgstr "תיקייה לחפש בה קבצי ‎ROM"
 
-#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:413
 msgid "Directory to look for Game Boy Color ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:415
+#: config/internal/option-internal.cpp:416
 msgid "BIOS file to use, if enabled"
 msgstr "קבצי ‫BIOS לשימוש, אם מאופשר"
 
-#: config/internal/option-internal.cpp:425
+#: config/internal/option-internal.cpp:426
 msgid "Enable link at boot"
 msgstr "הפעל קישור בזמן הפעלה ראשונית"
 
-#: config/internal/option-internal.cpp:430
+#: config/internal/option-internal.cpp:431
 msgid "Enable faster network protocol by default"
 msgstr ""
 
-#: config/internal/option-internal.cpp:432
+#: config/internal/option-internal.cpp:433
 msgid "Default network link client host"
 msgstr ""
 
-#: config/internal/option-internal.cpp:433
+#: config/internal/option-internal.cpp:434
 msgid "Default network link server IP to bind"
 msgstr ""
 
-#: config/internal/option-internal.cpp:434
+#: config/internal/option-internal.cpp:435
 msgid "Default network link port (server and client)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:435
+#: config/internal/option-internal.cpp:436
 msgid "Default network protocol"
 msgstr ""
 
-#: config/internal/option-internal.cpp:436
+#: config/internal/option-internal.cpp:437
 msgid "Link timeout (ms)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:437
+#: config/internal/option-internal.cpp:438
 msgid "Link cable type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:442
+#: config/internal/option-internal.cpp:443
 msgid "Automatically load last saved state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:444
+#: config/internal/option-internal.cpp:445
 msgid ""
 "Directory to store game save files (relative paths are relative to ROM; "
 "blank is config dir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:446
+#: config/internal/option-internal.cpp:447
 msgid "Freeze recent load list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:448
+#: config/internal/option-internal.cpp:449
 msgid ""
 "Directory to store A / V and game recordings (relative paths are relative to"
 " ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:451
+#: config/internal/option-internal.cpp:452
 msgid "Number of seconds between rewind snapshots (0 to disable)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:453
+#: config/internal/option-internal.cpp:454
 msgid "Directory to store screenshots (relative paths are relative to ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:456
+#: config/internal/option-internal.cpp:457
 msgid ""
 "Directory to store saved state files (relative paths are relative to "
 "BatteryDir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:458
+#: config/internal/option-internal.cpp:459
 msgid "Enable status bar"
 msgstr ""
 
-#: config/internal/option-internal.cpp:459
+#: config/internal/option-internal.cpp:460
 msgid "INI file version (DO NOT MODIFY)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:463
+#: config/internal/option-internal.cpp:464
 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, "
@@ -495,266 +584,266 @@ msgid ""
 "MotionRight, AutoA, AutoB, Speed, Capture, GS"
 msgstr ""
 
-#: config/internal/option-internal.cpp:468
+#: config/internal/option-internal.cpp:469
 msgid "The autofire toggle period, in frames (1/60 s)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:469
+#: config/internal/option-internal.cpp:470
 msgid "The number of the stick to use in single-player mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:471
+#: config/internal/option-internal.cpp:472
 msgid "Whether to enable SDL GameController mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:475
+#: config/internal/option-internal.cpp:476
 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 "
 "executed."
 msgstr ""
 
-#: config/internal/option-internal.cpp:480
+#: config/internal/option-internal.cpp:481
 msgid "Enable AGB debug print"
 msgstr ""
 
-#: config/internal/option-internal.cpp:481
+#: config/internal/option-internal.cpp:482
 msgid "Auto skip frames"
 msgstr ""
 
-#: config/internal/option-internal.cpp:483
+#: config/internal/option-internal.cpp:484
 msgid "Apply IPS / UPS / IPF patches if found"
 msgstr ""
 
-#: config/internal/option-internal.cpp:485
+#: config/internal/option-internal.cpp:486
 msgid "Automatically save and load cheat list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:489
+#: config/internal/option-internal.cpp:490
 msgid "Automatically enable border for Super Game Boy games"
 msgstr ""
 
-#: config/internal/option-internal.cpp:491
+#: config/internal/option-internal.cpp:492
 msgid "Always enable border"
 msgstr ""
 
-#: config/internal/option-internal.cpp:492
+#: config/internal/option-internal.cpp:493
 msgid "Screen capture file format"
 msgstr ""
 
-#: config/internal/option-internal.cpp:493
+#: config/internal/option-internal.cpp:494
 msgid "Enable cheats"
 msgstr ""
 
-#: config/internal/option-internal.cpp:494
+#: config/internal/option-internal.cpp:495
 msgid "Disable on-screen status messages"
 msgstr ""
 
-#: config/internal/option-internal.cpp:495
+#: config/internal/option-internal.cpp:496
 msgid "Type of system to emulate"
 msgstr ""
 
-#: config/internal/option-internal.cpp:496
+#: config/internal/option-internal.cpp:497
 msgid "Flash size 0 = 64 KB 1 = 128 KB"
 msgstr ""
 
-#: config/internal/option-internal.cpp:498
+#: config/internal/option-internal.cpp:499
 msgid "Skip frames. Values are 0-9 or -1 to skip automatically based on time."
 msgstr ""
 
-#: config/internal/option-internal.cpp:500
+#: config/internal/option-internal.cpp:501
 msgid "The palette to use"
 msgstr ""
 
-#: config/internal/option-internal.cpp:501
+#: config/internal/option-internal.cpp:502
 msgid "Enable printer emulation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:503
+#: config/internal/option-internal.cpp:504
 msgid "Break into GDB after loading the game."
 msgstr ""
 
-#: config/internal/option-internal.cpp:504
+#: config/internal/option-internal.cpp:505
 msgid "Port to connect GDB to"
 msgstr ""
 
-#: config/internal/option-internal.cpp:506
+#: config/internal/option-internal.cpp:507
 msgid "Number of players in network"
 msgstr ""
 
-#: config/internal/option-internal.cpp:508
+#: config/internal/option-internal.cpp:509
 msgid "Maximum scale factor (0 = no limit)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:510
+#: config/internal/option-internal.cpp:511
 msgid "Pause game when main window loses focus"
 msgstr ""
 
-#: config/internal/option-internal.cpp:512
+#: config/internal/option-internal.cpp:513
 msgid "Enable RTC (vba-over.ini override is rtcEnabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:513
+#: config/internal/option-internal.cpp:514
 msgid "Native save (\"battery\") hardware type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:514
+#: config/internal/option-internal.cpp:515
 msgid "Show speed indicator"
 msgstr ""
 
-#: config/internal/option-internal.cpp:516
+#: config/internal/option-internal.cpp:517
 msgid "Draw on-screen messages transparently"
 msgstr ""
 
-#: config/internal/option-internal.cpp:517
+#: config/internal/option-internal.cpp:518
 msgid "Skip BIOS initialization"
 msgstr ""
 
-#: config/internal/option-internal.cpp:519
+#: config/internal/option-internal.cpp:520
 msgid "Do not overwrite cheat list when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:521
+#: config/internal/option-internal.cpp:522
 msgid "Do not overwrite native (battery) save when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:523
+#: config/internal/option-internal.cpp:524
 msgid "Throttle game speed, even when accelerated (0-450 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:526
+#: config/internal/option-internal.cpp:527
 msgid "Set throttle for speedup key (0-3000 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:528
+#: config/internal/option-internal.cpp:529
 msgid "Number of frames to skip with speedup (instead of speedup throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:531
+#: config/internal/option-internal.cpp:532
 msgid "Use frame skip for speedup throttle"
 msgstr ""
 
-#: config/internal/option-internal.cpp:532
+#: config/internal/option-internal.cpp:533
 msgid "Use the specified BIOS file for Game Boy"
 msgstr ""
 
-#: config/internal/option-internal.cpp:533
+#: config/internal/option-internal.cpp:534
 msgid "Use the specified BIOS file"
 msgstr ""
 
-#: config/internal/option-internal.cpp:535
+#: config/internal/option-internal.cpp:536
 msgid "Use the specified BIOS file for Game Boy Color"
 msgstr ""
 
-#: config/internal/option-internal.cpp:536
+#: config/internal/option-internal.cpp:537
 msgid "Wait for vertical sync"
 msgstr ""
 
-#: config/internal/option-internal.cpp:539
+#: config/internal/option-internal.cpp:540
 msgid "Enter fullscreen mode at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:540
+#: config/internal/option-internal.cpp:541
 msgid "Window maximized"
 msgstr ""
 
-#: config/internal/option-internal.cpp:541
+#: config/internal/option-internal.cpp:542
 msgid "Window height at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:542
+#: config/internal/option-internal.cpp:543
 msgid "Window width at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:543
+#: config/internal/option-internal.cpp:544
 msgid "Window axis X position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:544
+#: config/internal/option-internal.cpp:545
 msgid "Window axis Y position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:548
+#: config/internal/option-internal.cpp:549
 msgid "Capture key events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:550
+#: config/internal/option-internal.cpp:551
 msgid "Capture joy events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:551
+#: config/internal/option-internal.cpp:552
 msgid "Hide menu bar when mouse is inactive"
 msgstr ""
 
-#: config/internal/option-internal.cpp:553
+#: config/internal/option-internal.cpp:554
 msgid "Suspend screensaver when game is running"
 msgstr ""
 
-#: config/internal/option-internal.cpp:556
+#: config/internal/option-internal.cpp:557
 msgid "Sound API; if unsupported, default API will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:557
+#: config/internal/option-internal.cpp:558
 msgid "Device ID of chosen audio device for chosen driver"
 msgstr ""
 
-#: config/internal/option-internal.cpp:558
+#: config/internal/option-internal.cpp:559
 msgid "Number of sound buffers"
 msgstr ""
 
-#: config/internal/option-internal.cpp:559
+#: config/internal/option-internal.cpp:560
 msgid "Bit mask of sound channels to enable"
 msgstr ""
 
-#: config/internal/option-internal.cpp:560
+#: config/internal/option-internal.cpp:561
 msgid "Game Boy Advance sound filtering (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:562
+#: config/internal/option-internal.cpp:563
 msgid "Game Boy Advance sound interpolation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:563
+#: config/internal/option-internal.cpp:564
 msgid "Game Boy sound declicking"
 msgstr ""
 
-#: config/internal/option-internal.cpp:564
+#: config/internal/option-internal.cpp:565
 msgid "Game Boy echo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:565
+#: config/internal/option-internal.cpp:566
 msgid "Enable Game Boy sound effects"
 msgstr ""
 
-#: config/internal/option-internal.cpp:566
+#: config/internal/option-internal.cpp:567
 msgid "Game Boy stereo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:567
+#: config/internal/option-internal.cpp:568
 msgid "Game Boy surround sound effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:568
+#: config/internal/option-internal.cpp:569
 msgid "Sound sample rate (kHz)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:569
+#: config/internal/option-internal.cpp:570
 msgid "Use DirectSound hardware acceleration"
 msgstr ""
 
-#: config/internal/option-internal.cpp:570
+#: config/internal/option-internal.cpp:571
 msgid "Upmix stereo to surround"
 msgstr ""
 
-#: config/internal/option-internal.cpp:571
+#: config/internal/option-internal.cpp:572
 msgid "Sound volume (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:639
-#: config/internal/option-internal.cpp:659
-#: config/internal/option-internal.cpp:680
-#: config/internal/option-internal.cpp:700
-#: config/internal/option-internal.cpp:719
+#: config/internal/option-internal.cpp:640
+#: config/internal/option-internal.cpp:660
+#: config/internal/option-internal.cpp:681
+#: config/internal/option-internal.cpp:701
+#: config/internal/option-internal.cpp:720
 #, c-format
 msgid "Invalid value %s for option %s; valid values are %s"
 msgstr ""
@@ -769,7 +858,7 @@ msgstr "ערך לא תקין %f עבור אפשרות %s; הערכים תקינ
 msgid "Invalid value %d for option %s; valid values are %d - %d"
 msgstr "ערך לא תקין %d עבור אפשרות %s; הערכים תקינים הם %d - %d"
 
-#: config/option.cpp:480 opts.cpp:621 opts.cpp:630 opts.cpp:639 opts.cpp:648
+#: config/option.cpp:480 opts.cpp:468 opts.cpp:477 opts.cpp:486 opts.cpp:495
 #, c-format
 msgid "Invalid value %s for option %s"
 msgstr "הערך %s לא תקין  עבור ההגדרה %s"
@@ -934,19 +1023,19 @@ msgstr "Meta+"
 msgid "Key"
 msgstr ""
 
-#: dialogs/accel-config.cpp:149
+#: dialogs/accel-config.cpp:148
 msgid "Menu commands"
 msgstr "פקודות של התפריט"
 
-#: dialogs/accel-config.cpp:261
+#: dialogs/accel-config.cpp:259
 msgid "This will clear all user-defined accelerators. Are you sure?"
 msgstr ""
 
-#: dialogs/accel-config.cpp:261 dialogs/accel-config.cpp:298
+#: dialogs/accel-config.cpp:259 dialogs/accel-config.cpp:306
 msgid "Confirm"
 msgstr "מאשר"
 
-#: dialogs/accel-config.cpp:295
+#: dialogs/accel-config.cpp:304
 #, c-format
 msgid "This will unassign \"%s\" from \"%s\". Are you sure?"
 msgstr ""
@@ -1318,22 +1407,22 @@ msgstr "ערך ישן"
 msgid "New Value"
 msgstr "ערך חדש"
 
-#: guiinit.cpp:2518
+#: guiinit.cpp:2519
 msgid "JoyBus host invalid; disabling"
 msgstr "מארח JoyBus  איננו תקין; מבטל"
 
-#: opts.cpp:298
+#: opts.cpp:154
 msgid ""
 "The INI file was written for a more recent version of VBA-M. Some INI option"
 " values may have been reset."
 msgstr ""
 
-#: opts.cpp:480 opts.cpp:500 opts.cpp:685
+#: opts.cpp:339 opts.cpp:355 opts.cpp:522
 #, c-format
 msgid "Invalid key binding %s for %s"
 msgstr "בחירת מקישים לא תקינה %s עבור %s"
 
-#: opts.cpp:707
+#: opts.cpp:528
 #, c-format
 msgid "Unknown option %s with value %s"
 msgstr "ההגדרה %s לא ידועה עם הערך %s"
@@ -1557,37 +1646,37 @@ msgstr "הקלטה נגמרה"
 msgid "%d %% (%d, %d fps)"
 msgstr ""
 
-#: sys.cpp:899 xrc/GBPrinter.xrc:65
+#: sys.cpp:898 xrc/GBPrinter.xrc:65
 msgid "&Discard"
 msgstr "&בטל"
 
-#: sys.cpp:933
+#: sys.cpp:932
 msgid "Image files (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 msgstr "קבצי תמונה (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 
-#: sys.cpp:942
+#: sys.cpp:941
 msgid "Save printer image to"
 msgstr "שמור את תמונת המדפסת ל"
 
-#: sys.cpp:956 sys.cpp:1140
+#: sys.cpp:955 sys.cpp:1139
 #, c-format
 msgid "Wrote printer output to %s"
 msgstr "כתב את תמונת המדפסת ל-%s"
 
-#: sys.cpp:961 sys.cpp:1032
+#: sys.cpp:960 sys.cpp:1031
 msgid "&Close"
 msgstr "&סגור"
 
-#: sys.cpp:1027
+#: sys.cpp:1026
 msgid "Printed"
 msgstr "הודפס"
 
-#: sys.cpp:1302
+#: sys.cpp:1301
 #, c-format
 msgid "Error opening pseudo tty: %s"
 msgstr "קרתה שגיאה בעת פתיחת דמוי-tty: %s"
 
-#: sys.cpp:1401
+#: sys.cpp:1400
 #, c-format
 msgid "Error setting up server socket (%d)"
 msgstr "קרתה שגיאה בעת הגדרת הסוקט לשרת(%d)"
@@ -1621,80 +1710,80 @@ msgstr ""
 msgid "Unable to load dialog %s from resources"
 msgstr "לא יכל לטעון את הדיאלוג  %s מהמשאבים"
 
-#: wxvbam.cpp:398 wxvbam.cpp:415
+#: wxvbam.cpp:401 wxvbam.cpp:418
 #, c-format
 msgid "Invalid configuration file provided: %s"
 msgstr ""
 
-#: wxvbam.cpp:559
+#: wxvbam.cpp:558
 msgid "Could not create main window"
 msgstr "לא יכל ליצור את החלון המרכזי"
 
-#: wxvbam.cpp:634
+#: wxvbam.cpp:633
 msgid "Save built-in XRC file and exit"
 msgstr "‏שמור את הקובץ ‎XRC ‏הבסיסי  וצא"
 
-#: wxvbam.cpp:637
+#: wxvbam.cpp:636
 msgid "Save built-in vba-over.ini and exit"
 msgstr "שמור את קובץ vba-over.ini  הבסיסי וצא"
 
-#: wxvbam.cpp:640
+#: wxvbam.cpp:639
 msgid "Print configuration path and exit"
 msgstr "הדפס את נתיב ההגדרות וצא"
 
-#: wxvbam.cpp:643
+#: wxvbam.cpp:642
 msgid "Start in full-screen mode"
 msgstr "התחל במצב מסך מלא"
 
-#: wxvbam.cpp:646
+#: wxvbam.cpp:645
 msgid "Set a configuration file"
 msgstr "קבע קובץ הגדרות"
 
-#: wxvbam.cpp:650
+#: wxvbam.cpp:649
 msgid "Delete shared link state first, if it exists"
 msgstr "מחק את מצב הקישור המשותף קודם במידה והוא קיים"
 
-#: wxvbam.cpp:657
+#: wxvbam.cpp:656
 msgid "List all settable options and exit"
 msgstr "הצג את כל האפשרויות הניתנות  לשינוי וצא"
 
-#: wxvbam.cpp:660
+#: wxvbam.cpp:659
 msgid "ROM file"
 msgstr "קובץ רום"
 
-#: wxvbam.cpp:662
+#: wxvbam.cpp:661
 msgid "<config>=<value>"
 msgstr "<config> = <value>"
 
-#: wxvbam.cpp:693
+#: wxvbam.cpp:692
 msgid "Configuration / build error: can't find built-in xrc"
 msgstr ""
 
-#: wxvbam.cpp:701
+#: wxvbam.cpp:700
 #, c-format
 msgid ""
 "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:"
 msgstr ""
 
-#: wxvbam.cpp:715
+#: wxvbam.cpp:714
 msgid "Configuration is read from, in order:"
 msgstr "הגדרות נקראו, בסדר:"
 
-#: wxvbam.cpp:729
+#: wxvbam.cpp:728
 #, c-format
 msgid ""
 "Wrote built-in override file to %s\n"
 "To override, delete all but changed section. First found section is used from search path:"
 msgstr ""
 
-#: wxvbam.cpp:735
+#: wxvbam.cpp:734
 msgid ""
 "\n"
 "\tbuilt-in"
 msgstr "\nפנימי"
 
-#: wxvbam.cpp:750
+#: wxvbam.cpp:749
 msgid ""
 "Options set from the command line are saved if any configuration changes are made in the user interface.\n"
 "\n"
@@ -1702,17 +1791,17 @@ msgid ""
 "\n"
 msgstr "הגדרות שנקבעו דרך שורת פקודה נשמרים אם נעשה שינוי כלשהו בהגדרות של הממשק.\n\nעל מנת לבחור מהם, אמת ושקר מצויינים כ-1 ו-0 בהתאם.\n"
 
-#: wxvbam.cpp:758
+#: wxvbam.cpp:757
 msgid ""
 "The commands available for the Keyboard/* option are:\n"
 "\n"
 msgstr "אלה הפקודות הזמינות עבור המקלדת\\* האפשרויות הם:\n"
 
-#: wxvbam.cpp:769
+#: wxvbam.cpp:768
 msgid "Configuration file not found."
 msgstr "קובץ ההגדרות לא נמצא."
 
-#: wxvbam.cpp:800
+#: wxvbam.cpp:799
 msgid "Bad configuration option or multiple ROM files given:\n"
 msgstr "ישנה בעיה  בהגדרות שנבחרו או ניתנו מספר רב של קבצי רום:\n"
 
@@ -2224,10 +2313,6 @@ msgstr "דילוג פריימים"
 msgid "&Number of frames to skip:"
 msgstr ""
 
-#: xrc/DisplayConfig.xrc:200
-msgid "Speed"
-msgstr "מהירות"
-
 #: xrc/DisplayConfig.xrc:216
 msgid "Speed indicator:"
 msgstr ""
@@ -2763,58 +2848,10 @@ msgid ""
 " entire contents if too small."
 msgstr ""
 
-#: xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
-msgid "Up"
-msgstr "למעלה"
-
-#: xrc/JoyPanel.xrc:37
-msgid "A"
-msgstr "A"
-
-#: xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
-msgid "Down"
-msgstr "למטה"
-
-#: xrc/JoyPanel.xrc:83
-msgid "B"
-msgstr "B"
-
-#: xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
-msgid "Left"
-msgstr "שמאל"
-
-#: xrc/JoyPanel.xrc:129
-msgid "L"
-msgstr "כפתור שמאלי"
-
-#: xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
-msgid "Right"
-msgstr "ימין"
-
-#: xrc/JoyPanel.xrc:175
-msgid "R"
-msgstr "כפתור ימני"
-
-#: xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
-msgid "Select"
-msgstr "בחר"
-
-#: xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
-msgid "Start"
-msgstr "התחל"
-
-#: xrc/JoyPanel.xrc:254
-msgid "Motion Up"
-msgstr "תנועה למעלה"
-
 #: xrc/JoyPanel.xrc:276
 msgid "Autofire A"
 msgstr "ירייה אוטומטית A"
 
-#: xrc/JoyPanel.xrc:298
-msgid "Motion Down"
-msgstr "תנועה למטה"
-
 #: xrc/JoyPanel.xrc:320
 msgid "Autofire B"
 msgstr "ירייה אוטומטית B"
diff --git a/po/wxvbam/hu_HU.po b/po/wxvbam/hu_HU.po
index c990ac52..36af86a6 100644
--- a/po/wxvbam/hu_HU.po
+++ b/po/wxvbam/hu_HU.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VBA-M\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-23 22:00+0000\n"
+"POT-Creation-Date: 2024-04-24 02:00+0000\n"
 "PO-Revision-Date: 2011-12-03 19:42+0000\n"
 "Last-Translator: Greg@Cyberdyne, 2018\n"
 "Language-Team: Hungarian (Hungary) (http://app.transifex.com/bgk/vba-m/language/hu_HU/)\n"
@@ -321,174 +321,263 @@ msgstr ""
 msgid "Network is not supported in local mode."
 msgstr "Helyi módban hálózat nem támogatott."
 
-#: config/internal/option-internal.cpp:379
+#: config/command.cpp:28 xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
+msgid "Up"
+msgstr "Fel"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
+msgid "Down"
+msgstr "Le"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
+msgid "Left"
+msgstr "Balra"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
+msgid "Right"
+msgstr "Jobbra"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:37
+msgid "A"
+msgstr "A"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:83
+msgid "B"
+msgstr "B"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:129
+msgid "L"
+msgstr "L"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:175
+msgid "R"
+msgstr "R"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
+msgid "Select"
+msgstr "Select"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
+msgid "Start"
+msgstr "Start"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:254
+msgid "Motion Up"
+msgstr "Mozgatás Fel"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:298
+msgid "Motion Down"
+msgstr "Mozgatás Le"
+
+#: config/command.cpp:30
+msgid "Motion Left"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion Right"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion In"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Motion Out"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto A"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto B"
+msgstr ""
+
+#: config/command.cpp:31 xrc/DisplayConfig.xrc:200
+msgid "Speed"
+msgstr "Sebesség"
+
+#: config/command.cpp:31
+msgid "Capture"
+msgstr ""
+
+#: config/command.cpp:32
+msgid "GameShark"
+msgstr ""
+
+#: config/command.cpp:106
+#, c-format
+msgid "Joypad %zu %s"
+msgstr ""
+
+#: config/internal/option-internal.cpp:380
 msgid "Use bilinear filter with 3d renderer"
 msgstr "Bilineáris szűrő használata 3d megjelenítővel"
 
-#: config/internal/option-internal.cpp:380
+#: config/internal/option-internal.cpp:381
 msgid "Full-screen filter to apply"
 msgstr "Alkalmazandó teljesképernyős szűrő"
 
-#: config/internal/option-internal.cpp:381
+#: config/internal/option-internal.cpp:382
 msgid "Filter plugin library"
 msgstr "Szűrő bővítmény könyvtár"
 
-#: config/internal/option-internal.cpp:382
+#: config/internal/option-internal.cpp:383
 msgid "Interframe blending function"
 msgstr "Képkockaközi átmenet funkció"
 
-#: config/internal/option-internal.cpp:383
+#: config/internal/option-internal.cpp:384
 msgid "Keep window on top"
 msgstr "Ablak mindig legfelül"
 
-#: config/internal/option-internal.cpp:385
+#: config/internal/option-internal.cpp:386
 msgid "Maximum number of threads to run filters in"
 msgstr "Szűrőket futtató szálak maximális száma"
 
-#: config/internal/option-internal.cpp:387
+#: config/internal/option-internal.cpp:388
 msgid "Render method; if unsupported, simple method will be used"
 msgstr "Megjelenési mód; ha nem támogatott, egyszerű mód használata"
 
-#: config/internal/option-internal.cpp:388
+#: config/internal/option-internal.cpp:389
 msgid "Default scale factor"
 msgstr "Alapértelmezett méretezési tényező"
 
-#: config/internal/option-internal.cpp:389
+#: config/internal/option-internal.cpp:390
 msgid "Retain aspect ratio when resizing"
 msgstr "Képarány megőrzése átméretezéskor"
 
-#: config/internal/option-internal.cpp:392
+#: config/internal/option-internal.cpp:393
 msgid "BIOS file to use for Game Boy, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:393
+#: config/internal/option-internal.cpp:394
 msgid "Game Boy color enhancement, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:394
+#: config/internal/option-internal.cpp:395
 msgid "Enable DX Colorization Hacks"
 msgstr "DX Színezési Hackek bekapcsolása"
 
-#: config/internal/option-internal.cpp:395
-#: config/internal/option-internal.cpp:419
+#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:420
 msgid "Apply LCD filter, if enabled"
 msgstr "LCD szűrő alkalmazása, ha engedélyezett"
 
-#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:397
 msgid "BIOS file to use for Game Boy Color, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:398
+#: config/internal/option-internal.cpp:399
 msgid ""
 "The default palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr "Az alapértelmezett paletta, 8 vesszővel elválasztott 4 számjegyű hex számként (rgb555)"
 
-#: config/internal/option-internal.cpp:401
+#: config/internal/option-internal.cpp:402
 msgid ""
 "The first user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr "Az elsődleges felhasználói paletta, 8 vesszővel elválasztott 4 számjegyű hex számként (rgb555)"
 
-#: config/internal/option-internal.cpp:404
+#: config/internal/option-internal.cpp:405
 msgid ""
 "The second user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr "A másodlagos felhasználói paletta, 8 vesszővel elválasztott 4 számjegyű hex számként (rgb555)"
 
-#: config/internal/option-internal.cpp:407
+#: config/internal/option-internal.cpp:408
 msgid "Automatically gather a full page before printing"
 msgstr "Teljes lap automata összegyűjtése nyomtatás előtt"
 
-#: config/internal/option-internal.cpp:409
+#: config/internal/option-internal.cpp:410
 msgid "Automatically save printouts as screen captures with -print suffix"
 msgstr "Nyomtatványok automata mentése képernyőképként a -print utótaggal"
 
-#: config/internal/option-internal.cpp:411
-#: config/internal/option-internal.cpp:439
+#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:440
 msgid "Directory to look for ROM files"
 msgstr "ROM fájlok keresési könyvtára"
 
-#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:413
 msgid "Directory to look for Game Boy Color ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:415
+#: config/internal/option-internal.cpp:416
 msgid "BIOS file to use, if enabled"
 msgstr "Használandó BIOS fájl, ha engedélyezett"
 
-#: config/internal/option-internal.cpp:425
+#: config/internal/option-internal.cpp:426
 msgid "Enable link at boot"
 msgstr "Link engedélyezése bootoláskor"
 
-#: config/internal/option-internal.cpp:430
+#: config/internal/option-internal.cpp:431
 msgid "Enable faster network protocol by default"
 msgstr "Gyorsabb hálózati protokoll bekapcsolása alapértelmezettként"
 
-#: config/internal/option-internal.cpp:432
+#: config/internal/option-internal.cpp:433
 msgid "Default network link client host"
 msgstr "Alapértelmezett hálózati kapcsolat kliens gazda"
 
-#: config/internal/option-internal.cpp:433
+#: config/internal/option-internal.cpp:434
 msgid "Default network link server IP to bind"
 msgstr "Társítandó alapértelmezett hálózati kapcsolat szerver IP"
 
-#: config/internal/option-internal.cpp:434
+#: config/internal/option-internal.cpp:435
 msgid "Default network link port (server and client)"
 msgstr "Alapértelmezett hálózati kapcsolat port (szerver és kliens)"
 
-#: config/internal/option-internal.cpp:435
+#: config/internal/option-internal.cpp:436
 msgid "Default network protocol"
 msgstr "Alapértelmezett hálózati protokoll"
 
-#: config/internal/option-internal.cpp:436
+#: config/internal/option-internal.cpp:437
 msgid "Link timeout (ms)"
 msgstr "Hálózati időtúllépés (ms)"
 
-#: config/internal/option-internal.cpp:437
+#: config/internal/option-internal.cpp:438
 msgid "Link cable type"
 msgstr "Hálózati kábel fajta"
 
-#: config/internal/option-internal.cpp:442
+#: config/internal/option-internal.cpp:443
 msgid "Automatically load last saved state"
 msgstr "Utolsó mentett állás automata betöltése"
 
-#: config/internal/option-internal.cpp:444
+#: config/internal/option-internal.cpp:445
 msgid ""
 "Directory to store game save files (relative paths are relative to ROM; "
 "blank is config dir)"
 msgstr "Játékmentés fájlok tárolási könyvtára (a relatív útvonal a ROM-hoz képest az; üresen hagyva a config könyvtár)"
 
-#: config/internal/option-internal.cpp:446
+#: config/internal/option-internal.cpp:447
 msgid "Freeze recent load list"
 msgstr "Mostanában betöltöttek lista jegelése"
 
-#: config/internal/option-internal.cpp:448
+#: config/internal/option-internal.cpp:449
 msgid ""
 "Directory to store A / V and game recordings (relative paths are relative to"
 " ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:451
+#: config/internal/option-internal.cpp:452
 msgid "Number of seconds between rewind snapshots (0 to disable)"
 msgstr "Pillanatképek visszajátszása közti másodperc (0 kikapcsolja)"
 
-#: config/internal/option-internal.cpp:453
+#: config/internal/option-internal.cpp:454
 msgid "Directory to store screenshots (relative paths are relative to ROM)"
 msgstr "Képernyőképek tárolási könyvtára (a relatív útvonal a ROM-hoz képest az)"
 
-#: config/internal/option-internal.cpp:456
+#: config/internal/option-internal.cpp:457
 msgid ""
 "Directory to store saved state files (relative paths are relative to "
 "BatteryDir)"
 msgstr "Mentett játékállások tárolási könyvtára (a relatív útvonal a BatteryDir-hez képest az)"
 
-#: config/internal/option-internal.cpp:458
+#: config/internal/option-internal.cpp:459
 msgid "Enable status bar"
 msgstr "Állapotsor megjelenítése"
 
-#: config/internal/option-internal.cpp:459
+#: config/internal/option-internal.cpp:460
 msgid "INI file version (DO NOT MODIFY)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:463
+#: config/internal/option-internal.cpp:464
 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, "
@@ -496,266 +585,266 @@ msgid ""
 "MotionRight, AutoA, AutoB, Speed, Capture, GS"
 msgstr ""
 
-#: config/internal/option-internal.cpp:468
+#: config/internal/option-internal.cpp:469
 msgid "The autofire toggle period, in frames (1/60 s)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:469
+#: config/internal/option-internal.cpp:470
 msgid "The number of the stick to use in single-player mode"
 msgstr "Botkormány száma egyjátékos módban"
 
-#: config/internal/option-internal.cpp:471
+#: config/internal/option-internal.cpp:472
 msgid "Whether to enable SDL GameController mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:475
+#: config/internal/option-internal.cpp:476
 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 "
 "executed."
 msgstr ""
 
-#: config/internal/option-internal.cpp:480
+#: config/internal/option-internal.cpp:481
 msgid "Enable AGB debug print"
 msgstr "AGB hibakereső nyomat bekapcsolása"
 
-#: config/internal/option-internal.cpp:481
+#: config/internal/option-internal.cpp:482
 msgid "Auto skip frames"
 msgstr ""
 
-#: config/internal/option-internal.cpp:483
+#: config/internal/option-internal.cpp:484
 msgid "Apply IPS / UPS / IPF patches if found"
 msgstr ""
 
-#: config/internal/option-internal.cpp:485
+#: config/internal/option-internal.cpp:486
 msgid "Automatically save and load cheat list"
 msgstr "Csaláslista automata mentése és betöltése"
 
-#: config/internal/option-internal.cpp:489
+#: config/internal/option-internal.cpp:490
 msgid "Automatically enable border for Super Game Boy games"
 msgstr ""
 
-#: config/internal/option-internal.cpp:491
+#: config/internal/option-internal.cpp:492
 msgid "Always enable border"
 msgstr "Keret állandó engedélyezése"
 
-#: config/internal/option-internal.cpp:492
+#: config/internal/option-internal.cpp:493
 msgid "Screen capture file format"
 msgstr "Képrögzítés fájlformátuma"
 
-#: config/internal/option-internal.cpp:493
+#: config/internal/option-internal.cpp:494
 msgid "Enable cheats"
 msgstr "Csalások engedélyezése"
 
-#: config/internal/option-internal.cpp:494
+#: config/internal/option-internal.cpp:495
 msgid "Disable on-screen status messages"
 msgstr "Állapotüzenet feliratok letiltása"
 
-#: config/internal/option-internal.cpp:495
+#: config/internal/option-internal.cpp:496
 msgid "Type of system to emulate"
 msgstr "Emulálandó rendszer típusa"
 
-#: config/internal/option-internal.cpp:496
+#: config/internal/option-internal.cpp:497
 msgid "Flash size 0 = 64 KB 1 = 128 KB"
 msgstr ""
 
-#: config/internal/option-internal.cpp:498
+#: config/internal/option-internal.cpp:499
 msgid "Skip frames. Values are 0-9 or -1 to skip automatically based on time."
 msgstr ""
 
-#: config/internal/option-internal.cpp:500
+#: config/internal/option-internal.cpp:501
 msgid "The palette to use"
 msgstr "Használandó paletta"
 
-#: config/internal/option-internal.cpp:501
+#: config/internal/option-internal.cpp:502
 msgid "Enable printer emulation"
 msgstr "Nyomtatóemulálás engedélyezése"
 
-#: config/internal/option-internal.cpp:503
+#: config/internal/option-internal.cpp:504
 msgid "Break into GDB after loading the game."
 msgstr "Betörés GDB-be a játék betöltése után."
 
-#: config/internal/option-internal.cpp:504
+#: config/internal/option-internal.cpp:505
 msgid "Port to connect GDB to"
 msgstr ""
 
-#: config/internal/option-internal.cpp:506
+#: config/internal/option-internal.cpp:507
 msgid "Number of players in network"
 msgstr "Játékosok száma a hálózaton"
 
-#: config/internal/option-internal.cpp:508
+#: config/internal/option-internal.cpp:509
 msgid "Maximum scale factor (0 = no limit)"
 msgstr "Maximális méretezési tényező (0 = korlátlan)"
 
-#: config/internal/option-internal.cpp:510
+#: config/internal/option-internal.cpp:511
 msgid "Pause game when main window loses focus"
 msgstr "Játék szünetelése a főablak fókuszvesztésekor"
 
-#: config/internal/option-internal.cpp:512
+#: config/internal/option-internal.cpp:513
 msgid "Enable RTC (vba-over.ini override is rtcEnabled"
 msgstr "RTC engedélyezése (vba-over.ini felülbírálás rtcEnabled)"
 
-#: config/internal/option-internal.cpp:513
+#: config/internal/option-internal.cpp:514
 msgid "Native save (\"battery\") hardware type"
 msgstr "Eredeti mentés (\"battery\") hardver típus"
 
-#: config/internal/option-internal.cpp:514
+#: config/internal/option-internal.cpp:515
 msgid "Show speed indicator"
 msgstr "Sebességjelző mutatása"
 
-#: config/internal/option-internal.cpp:516
+#: config/internal/option-internal.cpp:517
 msgid "Draw on-screen messages transparently"
 msgstr "Képben megjelenített üzenetek áttetszően"
 
-#: config/internal/option-internal.cpp:517
+#: config/internal/option-internal.cpp:518
 msgid "Skip BIOS initialization"
 msgstr "BIOS előkészítés kihagyása"
 
-#: config/internal/option-internal.cpp:519
+#: config/internal/option-internal.cpp:520
 msgid "Do not overwrite cheat list when loading state"
 msgstr "Ne írja felül a csaláslistát játékállás betöltésekor"
 
-#: config/internal/option-internal.cpp:521
+#: config/internal/option-internal.cpp:522
 msgid "Do not overwrite native (battery) save when loading state"
 msgstr "Ne írja felül az eredeti (battery) mentést játékállás betöltésekor"
 
-#: config/internal/option-internal.cpp:523
+#: config/internal/option-internal.cpp:524
 msgid "Throttle game speed, even when accelerated (0-450 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:526
+#: config/internal/option-internal.cpp:527
 msgid "Set throttle for speedup key (0-3000 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:528
+#: config/internal/option-internal.cpp:529
 msgid "Number of frames to skip with speedup (instead of speedup throttle)"
 msgstr "Eldobandó képkockák száma gyorsításnál (erőltetett gyorsítás helyett)"
 
-#: config/internal/option-internal.cpp:531
+#: config/internal/option-internal.cpp:532
 msgid "Use frame skip for speedup throttle"
 msgstr "Képkockák eldobása gyorsításkor"
 
-#: config/internal/option-internal.cpp:532
+#: config/internal/option-internal.cpp:533
 msgid "Use the specified BIOS file for Game Boy"
 msgstr ""
 
-#: config/internal/option-internal.cpp:533
+#: config/internal/option-internal.cpp:534
 msgid "Use the specified BIOS file"
 msgstr "A megadott BIOS fájl alkalmazása"
 
-#: config/internal/option-internal.cpp:535
+#: config/internal/option-internal.cpp:536
 msgid "Use the specified BIOS file for Game Boy Color"
 msgstr ""
 
-#: config/internal/option-internal.cpp:536
+#: config/internal/option-internal.cpp:537
 msgid "Wait for vertical sync"
 msgstr "Várakozás függőleges szinkronra"
 
-#: config/internal/option-internal.cpp:539
+#: config/internal/option-internal.cpp:540
 msgid "Enter fullscreen mode at startup"
 msgstr "Teljesképernyős módba lépés induláskor"
 
-#: config/internal/option-internal.cpp:540
+#: config/internal/option-internal.cpp:541
 msgid "Window maximized"
 msgstr "Ablak maximalizálva"
 
-#: config/internal/option-internal.cpp:541
+#: config/internal/option-internal.cpp:542
 msgid "Window height at startup"
 msgstr "Ablak magassága induláskor"
 
-#: config/internal/option-internal.cpp:542
+#: config/internal/option-internal.cpp:543
 msgid "Window width at startup"
 msgstr "Ablak szélessége induláskor"
 
-#: config/internal/option-internal.cpp:543
+#: config/internal/option-internal.cpp:544
 msgid "Window axis X position at startup"
 msgstr "Ablak helyzete a vízszintes tengelyen induláskor"
 
-#: config/internal/option-internal.cpp:544
+#: config/internal/option-internal.cpp:545
 msgid "Window axis Y position at startup"
 msgstr "Ablak helyzete a függőleges tengelyen induláskor"
 
-#: config/internal/option-internal.cpp:548
+#: config/internal/option-internal.cpp:549
 msgid "Capture key events while on background"
 msgstr "Gombleütések észlelése a háttérben is"
 
-#: config/internal/option-internal.cpp:550
+#: config/internal/option-internal.cpp:551
 msgid "Capture joy events while on background"
 msgstr "Botkormány utasítások észlelése a háttérben is"
 
-#: config/internal/option-internal.cpp:551
+#: config/internal/option-internal.cpp:552
 msgid "Hide menu bar when mouse is inactive"
 msgstr "Menüsáv elrejtése amikor az egér inaktív"
 
-#: config/internal/option-internal.cpp:553
+#: config/internal/option-internal.cpp:554
 msgid "Suspend screensaver when game is running"
 msgstr ""
 
-#: config/internal/option-internal.cpp:556
+#: config/internal/option-internal.cpp:557
 msgid "Sound API; if unsupported, default API will be used"
 msgstr "Hang API; az alapértelmezett API használata, ha nem támogatott"
 
-#: config/internal/option-internal.cpp:557
+#: config/internal/option-internal.cpp:558
 msgid "Device ID of chosen audio device for chosen driver"
 msgstr "A kívánt meghajtóhoz választott hangeszköz ID-je"
 
-#: config/internal/option-internal.cpp:558
+#: config/internal/option-internal.cpp:559
 msgid "Number of sound buffers"
 msgstr "Hangpufferek száma"
 
-#: config/internal/option-internal.cpp:559
+#: config/internal/option-internal.cpp:560
 msgid "Bit mask of sound channels to enable"
 msgstr "Bekapcsolandó hangcsatornák bitmaszkja"
 
-#: config/internal/option-internal.cpp:560
+#: config/internal/option-internal.cpp:561
 msgid "Game Boy Advance sound filtering (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:562
+#: config/internal/option-internal.cpp:563
 msgid "Game Boy Advance sound interpolation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:563
+#: config/internal/option-internal.cpp:564
 msgid "Game Boy sound declicking"
 msgstr ""
 
-#: config/internal/option-internal.cpp:564
+#: config/internal/option-internal.cpp:565
 msgid "Game Boy echo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:565
+#: config/internal/option-internal.cpp:566
 msgid "Enable Game Boy sound effects"
 msgstr ""
 
-#: config/internal/option-internal.cpp:566
+#: config/internal/option-internal.cpp:567
 msgid "Game Boy stereo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:567
+#: config/internal/option-internal.cpp:568
 msgid "Game Boy surround sound effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:568
+#: config/internal/option-internal.cpp:569
 msgid "Sound sample rate (kHz)"
 msgstr "Hang mintavételezés (kHz)"
 
-#: config/internal/option-internal.cpp:569
+#: config/internal/option-internal.cpp:570
 msgid "Use DirectSound hardware acceleration"
 msgstr ""
 
-#: config/internal/option-internal.cpp:570
+#: config/internal/option-internal.cpp:571
 msgid "Upmix stereo to surround"
 msgstr ""
 
-#: config/internal/option-internal.cpp:571
+#: config/internal/option-internal.cpp:572
 msgid "Sound volume (%)"
 msgstr "Hangerő (%)"
 
-#: config/internal/option-internal.cpp:639
-#: config/internal/option-internal.cpp:659
-#: config/internal/option-internal.cpp:680
-#: config/internal/option-internal.cpp:700
-#: config/internal/option-internal.cpp:719
+#: config/internal/option-internal.cpp:640
+#: config/internal/option-internal.cpp:660
+#: config/internal/option-internal.cpp:681
+#: config/internal/option-internal.cpp:701
+#: config/internal/option-internal.cpp:720
 #, c-format
 msgid "Invalid value %s for option %s; valid values are %s"
 msgstr "%s érvénytelen érték a %s opcióhoz; használható értékek: %s"
@@ -770,7 +859,7 @@ msgstr "A %f érvénytelen érték a %s opcióhoz; használható értékek: %f -
 msgid "Invalid value %d for option %s; valid values are %d - %d"
 msgstr "A %d érvénytelen érték a %s opcióhoz; használható értékek: %d - %d"
 
-#: config/option.cpp:480 opts.cpp:621 opts.cpp:630 opts.cpp:639 opts.cpp:648
+#: config/option.cpp:480 opts.cpp:468 opts.cpp:477 opts.cpp:486 opts.cpp:495
 #, c-format
 msgid "Invalid value %s for option %s"
 msgstr "%s érvénytelen érték a %s beállításhoz"
@@ -935,19 +1024,19 @@ msgstr "Meta+"
 msgid "Key"
 msgstr ""
 
-#: dialogs/accel-config.cpp:149
+#: dialogs/accel-config.cpp:148
 msgid "Menu commands"
 msgstr "Menü parancsok"
 
-#: dialogs/accel-config.cpp:261
+#: dialogs/accel-config.cpp:259
 msgid "This will clear all user-defined accelerators. Are you sure?"
 msgstr ""
 
-#: dialogs/accel-config.cpp:261 dialogs/accel-config.cpp:298
+#: dialogs/accel-config.cpp:259 dialogs/accel-config.cpp:306
 msgid "Confirm"
 msgstr "Megerősít"
 
-#: dialogs/accel-config.cpp:295
+#: dialogs/accel-config.cpp:304
 #, c-format
 msgid "This will unassign \"%s\" from \"%s\". Are you sure?"
 msgstr ""
@@ -1319,22 +1408,22 @@ msgstr "Régi Érték"
 msgid "New Value"
 msgstr "Új Érték"
 
-#: guiinit.cpp:2518
+#: guiinit.cpp:2519
 msgid "JoyBus host invalid; disabling"
 msgstr "A JoyBus gazda érvénytelen; letiltás"
 
-#: opts.cpp:298
+#: opts.cpp:154
 msgid ""
 "The INI file was written for a more recent version of VBA-M. Some INI option"
 " values may have been reset."
 msgstr ""
 
-#: opts.cpp:480 opts.cpp:500 opts.cpp:685
+#: opts.cpp:339 opts.cpp:355 opts.cpp:522
 #, c-format
 msgid "Invalid key binding %s for %s"
 msgstr "A %s - %s érvénytelen billentyű hozzárendelés"
 
-#: opts.cpp:707
+#: opts.cpp:528
 #, c-format
 msgid "Unknown option %s with value %s"
 msgstr "%s ismeretlen beállítás %s értékkel"
@@ -1558,37 +1647,37 @@ msgstr "A lejátszás véget ért"
 msgid "%d %% (%d, %d fps)"
 msgstr ""
 
-#: sys.cpp:899 xrc/GBPrinter.xrc:65
+#: sys.cpp:898 xrc/GBPrinter.xrc:65
 msgid "&Discard"
 msgstr "El&dobás"
 
-#: sys.cpp:933
+#: sys.cpp:932
 msgid "Image files (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 msgstr "Képfájlok (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 
-#: sys.cpp:942
+#: sys.cpp:941
 msgid "Save printer image to"
 msgstr "Nyomtatási kép mentésének helye"
 
-#: sys.cpp:956 sys.cpp:1140
+#: sys.cpp:955 sys.cpp:1139
 #, c-format
 msgid "Wrote printer output to %s"
 msgstr "Nyomtatási kép kiírva ide: %s"
 
-#: sys.cpp:961 sys.cpp:1032
+#: sys.cpp:960 sys.cpp:1031
 msgid "&Close"
 msgstr "Bezár"
 
-#: sys.cpp:1027
+#: sys.cpp:1026
 msgid "Printed"
 msgstr "Kinyomtatva"
 
-#: sys.cpp:1302
+#: sys.cpp:1301
 #, c-format
 msgid "Error opening pseudo tty: %s"
 msgstr "Hiba az ál-TTY megnyitásakor: %s"
 
-#: sys.cpp:1401
+#: sys.cpp:1400
 #, c-format
 msgid "Error setting up server socket (%d)"
 msgstr "Hiba a szerver socket beállításakor (%d)"
@@ -1622,80 +1711,80 @@ msgstr ""
 msgid "Unable to load dialog %s from resources"
 msgstr "Nem tölthető be a %s párbeszédablak a forrásból"
 
-#: wxvbam.cpp:398 wxvbam.cpp:415
+#: wxvbam.cpp:401 wxvbam.cpp:418
 #, c-format
 msgid "Invalid configuration file provided: %s"
 msgstr ""
 
-#: wxvbam.cpp:559
+#: wxvbam.cpp:558
 msgid "Could not create main window"
 msgstr "A főablak nem nyitható meg"
 
-#: wxvbam.cpp:634
+#: wxvbam.cpp:633
 msgid "Save built-in XRC file and exit"
 msgstr "Beépített XRC fájl mentése és kilépés"
 
-#: wxvbam.cpp:637
+#: wxvbam.cpp:636
 msgid "Save built-in vba-over.ini and exit"
 msgstr "Beépített vba-over.ini mentése és kilépés"
 
-#: wxvbam.cpp:640
+#: wxvbam.cpp:639
 msgid "Print configuration path and exit"
 msgstr "Konfigurációs útvonal kiírása és kilépés"
 
-#: wxvbam.cpp:643
+#: wxvbam.cpp:642
 msgid "Start in full-screen mode"
 msgstr "Indítás teljesképernyős módban"
 
-#: wxvbam.cpp:646
+#: wxvbam.cpp:645
 msgid "Set a configuration file"
 msgstr "Adj meg konfigurációs fájlt"
 
-#: wxvbam.cpp:650
+#: wxvbam.cpp:649
 msgid "Delete shared link state first, if it exists"
 msgstr "Megosztott hivatkozás állapotának törlése elsőként, ha létezik"
 
-#: wxvbam.cpp:657
+#: wxvbam.cpp:656
 msgid "List all settable options and exit"
 msgstr "Összes beállítható elem listázása, majd kilépés"
 
-#: wxvbam.cpp:660
+#: wxvbam.cpp:659
 msgid "ROM file"
 msgstr "ROM fájl"
 
-#: wxvbam.cpp:662
+#: wxvbam.cpp:661
 msgid "<config>=<value>"
 msgstr "<elem>=<érték>"
 
-#: wxvbam.cpp:693
+#: wxvbam.cpp:692
 msgid "Configuration / build error: can't find built-in xrc"
 msgstr ""
 
-#: wxvbam.cpp:701
+#: wxvbam.cpp:700
 #, c-format
 msgid ""
 "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:"
 msgstr ""
 
-#: wxvbam.cpp:715
+#: wxvbam.cpp:714
 msgid "Configuration is read from, in order:"
 msgstr "Kiolvasási sorrendben, a konfiguráció a következő:"
 
-#: wxvbam.cpp:729
+#: wxvbam.cpp:728
 #, c-format
 msgid ""
 "Wrote built-in override file to %s\n"
 "To override, delete all but changed section. First found section is used from search path:"
 msgstr ""
 
-#: wxvbam.cpp:735
+#: wxvbam.cpp:734
 msgid ""
 "\n"
 "\tbuilt-in"
 msgstr "\n\tbeépített"
 
-#: wxvbam.cpp:750
+#: wxvbam.cpp:749
 msgid ""
 "Options set from the command line are saved if any configuration changes are made in the user interface.\n"
 "\n"
@@ -1703,17 +1792,17 @@ msgid ""
 "\n"
 msgstr "A parancssorból kezdeményezett beállítási módosítások akkor kerülnek mentésre, ha a felhasználói felületről is változtatás történik.\n\nFájljelölő beállításoknál, a TRUE és FALSE, 1 és 0-ként lesz meghatározva.\n\n"
 
-#: wxvbam.cpp:758
+#: wxvbam.cpp:757
 msgid ""
 "The commands available for the Keyboard/* option are:\n"
 "\n"
 msgstr "A billentyűzethez rendelkezésre álló parancsok:\n\n"
 
-#: wxvbam.cpp:769
+#: wxvbam.cpp:768
 msgid "Configuration file not found."
 msgstr "A konfigurációs fájl nem található."
 
-#: wxvbam.cpp:800
+#: wxvbam.cpp:799
 msgid "Bad configuration option or multiple ROM files given:\n"
 msgstr "Hibás konfigurációs beállítás, vagy több ROM fájl lett megadva:\n"
 
@@ -2225,10 +2314,6 @@ msgstr "Képkocka Átugrás"
 msgid "&Number of frames to skip:"
 msgstr ""
 
-#: xrc/DisplayConfig.xrc:200
-msgid "Speed"
-msgstr "Sebesség"
-
 #: xrc/DisplayConfig.xrc:216
 msgid "Speed indicator:"
 msgstr ""
@@ -2764,58 +2849,10 @@ msgid ""
 " entire contents if too small."
 msgstr ""
 
-#: xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
-msgid "Up"
-msgstr "Fel"
-
-#: xrc/JoyPanel.xrc:37
-msgid "A"
-msgstr "A"
-
-#: xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
-msgid "Down"
-msgstr "Le"
-
-#: xrc/JoyPanel.xrc:83
-msgid "B"
-msgstr "B"
-
-#: xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
-msgid "Left"
-msgstr "Balra"
-
-#: xrc/JoyPanel.xrc:129
-msgid "L"
-msgstr "L"
-
-#: xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
-msgid "Right"
-msgstr "Jobbra"
-
-#: xrc/JoyPanel.xrc:175
-msgid "R"
-msgstr "R"
-
-#: xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
-msgid "Select"
-msgstr "Select"
-
-#: xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
-msgid "Start"
-msgstr "Start"
-
-#: xrc/JoyPanel.xrc:254
-msgid "Motion Up"
-msgstr "Mozgatás Fel"
-
 #: xrc/JoyPanel.xrc:276
 msgid "Autofire A"
 msgstr "Auto-tűz A"
 
-#: xrc/JoyPanel.xrc:298
-msgid "Motion Down"
-msgstr "Mozgatás Le"
-
 #: xrc/JoyPanel.xrc:320
 msgid "Autofire B"
 msgstr "Auto-tűz B"
diff --git a/po/wxvbam/id.po b/po/wxvbam/id.po
index e3b72146..38861b14 100644
--- a/po/wxvbam/id.po
+++ b/po/wxvbam/id.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VBA-M\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-23 22:00+0000\n"
+"POT-Creation-Date: 2024-04-24 02:00+0000\n"
 "PO-Revision-Date: 2011-12-03 19:42+0000\n"
 "Last-Translator: Dimas Radityo, 2022\n"
 "Language-Team: Indonesian (http://app.transifex.com/bgk/vba-m/language/id/)\n"
@@ -323,174 +323,263 @@ msgstr ""
 msgid "Network is not supported in local mode."
 msgstr "Fitur jaringan tidak didukung dalam mode lokal."
 
-#: config/internal/option-internal.cpp:379
-msgid "Use bilinear filter with 3d renderer"
+#: config/command.cpp:28 xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
+msgid "Up"
+msgstr "Atas"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
+msgid "Down"
+msgstr "Bawah"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
+msgid "Left"
+msgstr "Kiri"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
+msgid "Right"
+msgstr "Kanan"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:37
+msgid "A"
+msgstr "A"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:83
+msgid "B"
+msgstr "B"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:129
+msgid "L"
+msgstr "L"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:175
+msgid "R"
+msgstr "R"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
+msgid "Select"
+msgstr "Select"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
+msgid "Start"
+msgstr "Start"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:254
+msgid "Motion Up"
+msgstr "Gerakan ke Atas"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:298
+msgid "Motion Down"
+msgstr "Gerakan ke Bawah"
+
+#: config/command.cpp:30
+msgid "Motion Left"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion Right"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion In"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Motion Out"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto A"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto B"
+msgstr ""
+
+#: config/command.cpp:31 xrc/DisplayConfig.xrc:200
+msgid "Speed"
+msgstr "Kecepatan"
+
+#: config/command.cpp:31
+msgid "Capture"
+msgstr ""
+
+#: config/command.cpp:32
+msgid "GameShark"
+msgstr ""
+
+#: config/command.cpp:106
+#, c-format
+msgid "Joypad %zu %s"
 msgstr ""
 
 #: config/internal/option-internal.cpp:380
-msgid "Full-screen filter to apply"
+msgid "Use bilinear filter with 3d renderer"
 msgstr ""
 
 #: config/internal/option-internal.cpp:381
-msgid "Filter plugin library"
+msgid "Full-screen filter to apply"
 msgstr ""
 
 #: config/internal/option-internal.cpp:382
-msgid "Interframe blending function"
+msgid "Filter plugin library"
 msgstr ""
 
 #: config/internal/option-internal.cpp:383
+msgid "Interframe blending function"
+msgstr ""
+
+#: config/internal/option-internal.cpp:384
 msgid "Keep window on top"
 msgstr ""
 
-#: config/internal/option-internal.cpp:385
+#: config/internal/option-internal.cpp:386
 msgid "Maximum number of threads to run filters in"
 msgstr ""
 
-#: config/internal/option-internal.cpp:387
+#: config/internal/option-internal.cpp:388
 msgid "Render method; if unsupported, simple method will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:388
+#: config/internal/option-internal.cpp:389
 msgid "Default scale factor"
 msgstr ""
 
-#: config/internal/option-internal.cpp:389
+#: config/internal/option-internal.cpp:390
 msgid "Retain aspect ratio when resizing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:392
+#: config/internal/option-internal.cpp:393
 msgid "BIOS file to use for Game Boy, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:393
+#: config/internal/option-internal.cpp:394
 msgid "Game Boy color enhancement, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:394
+#: config/internal/option-internal.cpp:395
 msgid "Enable DX Colorization Hacks"
 msgstr ""
 
-#: config/internal/option-internal.cpp:395
-#: config/internal/option-internal.cpp:419
+#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:420
 msgid "Apply LCD filter, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:397
 msgid "BIOS file to use for Game Boy Color, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:398
+#: config/internal/option-internal.cpp:399
 msgid ""
 "The default palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:401
+#: config/internal/option-internal.cpp:402
 msgid ""
 "The first user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:404
+#: config/internal/option-internal.cpp:405
 msgid ""
 "The second user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:407
+#: config/internal/option-internal.cpp:408
 msgid "Automatically gather a full page before printing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:409
+#: config/internal/option-internal.cpp:410
 msgid "Automatically save printouts as screen captures with -print suffix"
 msgstr ""
 
-#: config/internal/option-internal.cpp:411
-#: config/internal/option-internal.cpp:439
+#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:440
 msgid "Directory to look for ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:413
 msgid "Directory to look for Game Boy Color ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:415
+#: config/internal/option-internal.cpp:416
 msgid "BIOS file to use, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:425
+#: config/internal/option-internal.cpp:426
 msgid "Enable link at boot"
 msgstr ""
 
-#: config/internal/option-internal.cpp:430
+#: config/internal/option-internal.cpp:431
 msgid "Enable faster network protocol by default"
 msgstr ""
 
-#: config/internal/option-internal.cpp:432
+#: config/internal/option-internal.cpp:433
 msgid "Default network link client host"
 msgstr ""
 
-#: config/internal/option-internal.cpp:433
+#: config/internal/option-internal.cpp:434
 msgid "Default network link server IP to bind"
 msgstr ""
 
-#: config/internal/option-internal.cpp:434
+#: config/internal/option-internal.cpp:435
 msgid "Default network link port (server and client)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:435
+#: config/internal/option-internal.cpp:436
 msgid "Default network protocol"
 msgstr ""
 
-#: config/internal/option-internal.cpp:436
+#: config/internal/option-internal.cpp:437
 msgid "Link timeout (ms)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:437
+#: config/internal/option-internal.cpp:438
 msgid "Link cable type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:442
+#: config/internal/option-internal.cpp:443
 msgid "Automatically load last saved state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:444
+#: config/internal/option-internal.cpp:445
 msgid ""
 "Directory to store game save files (relative paths are relative to ROM; "
 "blank is config dir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:446
+#: config/internal/option-internal.cpp:447
 msgid "Freeze recent load list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:448
+#: config/internal/option-internal.cpp:449
 msgid ""
 "Directory to store A / V and game recordings (relative paths are relative to"
 " ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:451
+#: config/internal/option-internal.cpp:452
 msgid "Number of seconds between rewind snapshots (0 to disable)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:453
+#: config/internal/option-internal.cpp:454
 msgid "Directory to store screenshots (relative paths are relative to ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:456
+#: config/internal/option-internal.cpp:457
 msgid ""
 "Directory to store saved state files (relative paths are relative to "
 "BatteryDir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:458
+#: config/internal/option-internal.cpp:459
 msgid "Enable status bar"
 msgstr ""
 
-#: config/internal/option-internal.cpp:459
+#: config/internal/option-internal.cpp:460
 msgid "INI file version (DO NOT MODIFY)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:463
+#: config/internal/option-internal.cpp:464
 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, "
@@ -498,266 +587,266 @@ msgid ""
 "MotionRight, AutoA, AutoB, Speed, Capture, GS"
 msgstr ""
 
-#: config/internal/option-internal.cpp:468
+#: config/internal/option-internal.cpp:469
 msgid "The autofire toggle period, in frames (1/60 s)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:469
+#: config/internal/option-internal.cpp:470
 msgid "The number of the stick to use in single-player mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:471
+#: config/internal/option-internal.cpp:472
 msgid "Whether to enable SDL GameController mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:475
+#: config/internal/option-internal.cpp:476
 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 "
 "executed."
 msgstr ""
 
-#: config/internal/option-internal.cpp:480
+#: config/internal/option-internal.cpp:481
 msgid "Enable AGB debug print"
 msgstr ""
 
-#: config/internal/option-internal.cpp:481
+#: config/internal/option-internal.cpp:482
 msgid "Auto skip frames"
 msgstr ""
 
-#: config/internal/option-internal.cpp:483
+#: config/internal/option-internal.cpp:484
 msgid "Apply IPS / UPS / IPF patches if found"
 msgstr ""
 
-#: config/internal/option-internal.cpp:485
+#: config/internal/option-internal.cpp:486
 msgid "Automatically save and load cheat list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:489
+#: config/internal/option-internal.cpp:490
 msgid "Automatically enable border for Super Game Boy games"
 msgstr ""
 
-#: config/internal/option-internal.cpp:491
+#: config/internal/option-internal.cpp:492
 msgid "Always enable border"
 msgstr ""
 
-#: config/internal/option-internal.cpp:492
+#: config/internal/option-internal.cpp:493
 msgid "Screen capture file format"
 msgstr ""
 
-#: config/internal/option-internal.cpp:493
+#: config/internal/option-internal.cpp:494
 msgid "Enable cheats"
 msgstr ""
 
-#: config/internal/option-internal.cpp:494
+#: config/internal/option-internal.cpp:495
 msgid "Disable on-screen status messages"
 msgstr ""
 
-#: config/internal/option-internal.cpp:495
+#: config/internal/option-internal.cpp:496
 msgid "Type of system to emulate"
 msgstr ""
 
-#: config/internal/option-internal.cpp:496
+#: config/internal/option-internal.cpp:497
 msgid "Flash size 0 = 64 KB 1 = 128 KB"
 msgstr ""
 
-#: config/internal/option-internal.cpp:498
+#: config/internal/option-internal.cpp:499
 msgid "Skip frames. Values are 0-9 or -1 to skip automatically based on time."
 msgstr ""
 
-#: config/internal/option-internal.cpp:500
+#: config/internal/option-internal.cpp:501
 msgid "The palette to use"
 msgstr ""
 
-#: config/internal/option-internal.cpp:501
+#: config/internal/option-internal.cpp:502
 msgid "Enable printer emulation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:503
+#: config/internal/option-internal.cpp:504
 msgid "Break into GDB after loading the game."
 msgstr ""
 
-#: config/internal/option-internal.cpp:504
+#: config/internal/option-internal.cpp:505
 msgid "Port to connect GDB to"
 msgstr ""
 
-#: config/internal/option-internal.cpp:506
+#: config/internal/option-internal.cpp:507
 msgid "Number of players in network"
 msgstr ""
 
-#: config/internal/option-internal.cpp:508
+#: config/internal/option-internal.cpp:509
 msgid "Maximum scale factor (0 = no limit)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:510
+#: config/internal/option-internal.cpp:511
 msgid "Pause game when main window loses focus"
 msgstr ""
 
-#: config/internal/option-internal.cpp:512
+#: config/internal/option-internal.cpp:513
 msgid "Enable RTC (vba-over.ini override is rtcEnabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:513
+#: config/internal/option-internal.cpp:514
 msgid "Native save (\"battery\") hardware type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:514
+#: config/internal/option-internal.cpp:515
 msgid "Show speed indicator"
 msgstr ""
 
-#: config/internal/option-internal.cpp:516
+#: config/internal/option-internal.cpp:517
 msgid "Draw on-screen messages transparently"
 msgstr ""
 
-#: config/internal/option-internal.cpp:517
+#: config/internal/option-internal.cpp:518
 msgid "Skip BIOS initialization"
 msgstr ""
 
-#: config/internal/option-internal.cpp:519
+#: config/internal/option-internal.cpp:520
 msgid "Do not overwrite cheat list when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:521
+#: config/internal/option-internal.cpp:522
 msgid "Do not overwrite native (battery) save when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:523
+#: config/internal/option-internal.cpp:524
 msgid "Throttle game speed, even when accelerated (0-450 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:526
+#: config/internal/option-internal.cpp:527
 msgid "Set throttle for speedup key (0-3000 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:528
+#: config/internal/option-internal.cpp:529
 msgid "Number of frames to skip with speedup (instead of speedup throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:531
+#: config/internal/option-internal.cpp:532
 msgid "Use frame skip for speedup throttle"
 msgstr ""
 
-#: config/internal/option-internal.cpp:532
+#: config/internal/option-internal.cpp:533
 msgid "Use the specified BIOS file for Game Boy"
 msgstr ""
 
-#: config/internal/option-internal.cpp:533
+#: config/internal/option-internal.cpp:534
 msgid "Use the specified BIOS file"
 msgstr ""
 
-#: config/internal/option-internal.cpp:535
+#: config/internal/option-internal.cpp:536
 msgid "Use the specified BIOS file for Game Boy Color"
 msgstr ""
 
-#: config/internal/option-internal.cpp:536
+#: config/internal/option-internal.cpp:537
 msgid "Wait for vertical sync"
 msgstr ""
 
-#: config/internal/option-internal.cpp:539
+#: config/internal/option-internal.cpp:540
 msgid "Enter fullscreen mode at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:540
+#: config/internal/option-internal.cpp:541
 msgid "Window maximized"
 msgstr ""
 
-#: config/internal/option-internal.cpp:541
+#: config/internal/option-internal.cpp:542
 msgid "Window height at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:542
+#: config/internal/option-internal.cpp:543
 msgid "Window width at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:543
+#: config/internal/option-internal.cpp:544
 msgid "Window axis X position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:544
+#: config/internal/option-internal.cpp:545
 msgid "Window axis Y position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:548
+#: config/internal/option-internal.cpp:549
 msgid "Capture key events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:550
+#: config/internal/option-internal.cpp:551
 msgid "Capture joy events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:551
+#: config/internal/option-internal.cpp:552
 msgid "Hide menu bar when mouse is inactive"
 msgstr ""
 
-#: config/internal/option-internal.cpp:553
+#: config/internal/option-internal.cpp:554
 msgid "Suspend screensaver when game is running"
 msgstr ""
 
-#: config/internal/option-internal.cpp:556
+#: config/internal/option-internal.cpp:557
 msgid "Sound API; if unsupported, default API will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:557
+#: config/internal/option-internal.cpp:558
 msgid "Device ID of chosen audio device for chosen driver"
 msgstr ""
 
-#: config/internal/option-internal.cpp:558
+#: config/internal/option-internal.cpp:559
 msgid "Number of sound buffers"
 msgstr ""
 
-#: config/internal/option-internal.cpp:559
+#: config/internal/option-internal.cpp:560
 msgid "Bit mask of sound channels to enable"
 msgstr ""
 
-#: config/internal/option-internal.cpp:560
+#: config/internal/option-internal.cpp:561
 msgid "Game Boy Advance sound filtering (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:562
+#: config/internal/option-internal.cpp:563
 msgid "Game Boy Advance sound interpolation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:563
+#: config/internal/option-internal.cpp:564
 msgid "Game Boy sound declicking"
 msgstr ""
 
-#: config/internal/option-internal.cpp:564
+#: config/internal/option-internal.cpp:565
 msgid "Game Boy echo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:565
+#: config/internal/option-internal.cpp:566
 msgid "Enable Game Boy sound effects"
 msgstr ""
 
-#: config/internal/option-internal.cpp:566
+#: config/internal/option-internal.cpp:567
 msgid "Game Boy stereo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:567
+#: config/internal/option-internal.cpp:568
 msgid "Game Boy surround sound effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:568
+#: config/internal/option-internal.cpp:569
 msgid "Sound sample rate (kHz)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:569
+#: config/internal/option-internal.cpp:570
 msgid "Use DirectSound hardware acceleration"
 msgstr ""
 
-#: config/internal/option-internal.cpp:570
+#: config/internal/option-internal.cpp:571
 msgid "Upmix stereo to surround"
 msgstr ""
 
-#: config/internal/option-internal.cpp:571
+#: config/internal/option-internal.cpp:572
 msgid "Sound volume (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:639
-#: config/internal/option-internal.cpp:659
-#: config/internal/option-internal.cpp:680
-#: config/internal/option-internal.cpp:700
-#: config/internal/option-internal.cpp:719
+#: config/internal/option-internal.cpp:640
+#: config/internal/option-internal.cpp:660
+#: config/internal/option-internal.cpp:681
+#: config/internal/option-internal.cpp:701
+#: config/internal/option-internal.cpp:720
 #, c-format
 msgid "Invalid value %s for option %s; valid values are %s"
 msgstr ""
@@ -772,7 +861,7 @@ msgstr "Nilai %f salah untuk pilihan %s; nilai yang benar adalah %f - %f"
 msgid "Invalid value %d for option %s; valid values are %d - %d"
 msgstr "Nilai %d tidak valid untuk pilihan %s; nilai yang valid adalah %d - %d"
 
-#: config/option.cpp:480 opts.cpp:621 opts.cpp:630 opts.cpp:639 opts.cpp:648
+#: config/option.cpp:480 opts.cpp:468 opts.cpp:477 opts.cpp:486 opts.cpp:495
 #, c-format
 msgid "Invalid value %s for option %s"
 msgstr ""
@@ -937,19 +1026,19 @@ msgstr "Meta+"
 msgid "Key"
 msgstr ""
 
-#: dialogs/accel-config.cpp:149
+#: dialogs/accel-config.cpp:148
 msgid "Menu commands"
 msgstr "Perintah menu"
 
-#: dialogs/accel-config.cpp:261
+#: dialogs/accel-config.cpp:259
 msgid "This will clear all user-defined accelerators. Are you sure?"
 msgstr ""
 
-#: dialogs/accel-config.cpp:261 dialogs/accel-config.cpp:298
+#: dialogs/accel-config.cpp:259 dialogs/accel-config.cpp:306
 msgid "Confirm"
 msgstr "Konfirmasi"
 
-#: dialogs/accel-config.cpp:295
+#: dialogs/accel-config.cpp:304
 #, c-format
 msgid "This will unassign \"%s\" from \"%s\". Are you sure?"
 msgstr ""
@@ -1321,22 +1410,22 @@ msgstr "Nilai Lama"
 msgid "New Value"
 msgstr "Nilai Baru"
 
-#: guiinit.cpp:2518
+#: guiinit.cpp:2519
 msgid "JoyBus host invalid; disabling"
 msgstr "Host JoyBus tidak valid; menonaktifkan"
 
-#: opts.cpp:298
+#: opts.cpp:154
 msgid ""
 "The INI file was written for a more recent version of VBA-M. Some INI option"
 " values may have been reset."
 msgstr ""
 
-#: opts.cpp:480 opts.cpp:500 opts.cpp:685
+#: opts.cpp:339 opts.cpp:355 opts.cpp:522
 #, c-format
 msgid "Invalid key binding %s for %s"
 msgstr "Pengikatan tombol %s tidak valid untuk %s"
 
-#: opts.cpp:707
+#: opts.cpp:528
 #, c-format
 msgid "Unknown option %s with value %s"
 msgstr ""
@@ -1560,37 +1649,37 @@ msgstr "Pemutaran berakhir"
 msgid "%d %% (%d, %d fps)"
 msgstr ""
 
-#: sys.cpp:899 xrc/GBPrinter.xrc:65
+#: sys.cpp:898 xrc/GBPrinter.xrc:65
 msgid "&Discard"
 msgstr "&Buang"
 
-#: sys.cpp:933
+#: sys.cpp:932
 msgid "Image files (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 msgstr "File gambar (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 
-#: sys.cpp:942
+#: sys.cpp:941
 msgid "Save printer image to"
 msgstr "Simpan gambar printer ke"
 
-#: sys.cpp:956 sys.cpp:1140
+#: sys.cpp:955 sys.cpp:1139
 #, c-format
 msgid "Wrote printer output to %s"
 msgstr "Simpan hasil printer ke %s"
 
-#: sys.cpp:961 sys.cpp:1032
+#: sys.cpp:960 sys.cpp:1031
 msgid "&Close"
 msgstr "&Keluar"
 
-#: sys.cpp:1027
+#: sys.cpp:1026
 msgid "Printed"
 msgstr "Tercetak"
 
-#: sys.cpp:1302
+#: sys.cpp:1301
 #, c-format
 msgid "Error opening pseudo tty: %s"
 msgstr "Terjadi kesalahan dalam membuka pseudo tty: %s"
 
-#: sys.cpp:1401
+#: sys.cpp:1400
 #, c-format
 msgid "Error setting up server socket (%d)"
 msgstr "Terjadi kesalahan dalam mempersiapkan socket server (%d)"
@@ -1624,80 +1713,80 @@ msgstr ""
 msgid "Unable to load dialog %s from resources"
 msgstr "Tidak dapat memuat dialog %s dari sumber"
 
-#: wxvbam.cpp:398 wxvbam.cpp:415
+#: wxvbam.cpp:401 wxvbam.cpp:418
 #, c-format
 msgid "Invalid configuration file provided: %s"
 msgstr ""
 
-#: wxvbam.cpp:559
+#: wxvbam.cpp:558
 msgid "Could not create main window"
 msgstr "Tidak dapat membuat window utama"
 
-#: wxvbam.cpp:634
+#: wxvbam.cpp:633
 msgid "Save built-in XRC file and exit"
 msgstr "Simpan file XRC built-in dan keluar"
 
-#: wxvbam.cpp:637
+#: wxvbam.cpp:636
 msgid "Save built-in vba-over.ini and exit"
 msgstr "Simpan vba-over.ini built-in dan keluar"
 
-#: wxvbam.cpp:640
+#: wxvbam.cpp:639
 msgid "Print configuration path and exit"
 msgstr "Cetak jalur konfigurasi dan keluar"
 
-#: wxvbam.cpp:643
+#: wxvbam.cpp:642
 msgid "Start in full-screen mode"
 msgstr "Mulai dalam mode layar penuh"
 
-#: wxvbam.cpp:646
+#: wxvbam.cpp:645
 msgid "Set a configuration file"
 msgstr ""
 
-#: wxvbam.cpp:650
+#: wxvbam.cpp:649
 msgid "Delete shared link state first, if it exists"
 msgstr "Hapus state hubungan yang dibagikan terlebih dahulu, jika ada"
 
-#: wxvbam.cpp:657
+#: wxvbam.cpp:656
 msgid "List all settable options and exit"
 msgstr "Tampilkan semua pilihan yang dapat diubah dan keluar"
 
-#: wxvbam.cpp:660
+#: wxvbam.cpp:659
 msgid "ROM file"
 msgstr "File ROM"
 
-#: wxvbam.cpp:662
+#: wxvbam.cpp:661
 msgid "<config>=<value>"
 msgstr "<config>=<value>"
 
-#: wxvbam.cpp:693
+#: wxvbam.cpp:692
 msgid "Configuration / build error: can't find built-in xrc"
 msgstr ""
 
-#: wxvbam.cpp:701
+#: wxvbam.cpp:700
 #, c-format
 msgid ""
 "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:"
 msgstr ""
 
-#: wxvbam.cpp:715
+#: wxvbam.cpp:714
 msgid "Configuration is read from, in order:"
 msgstr "Konfigurasi dibaca dari, secara berurutan:"
 
-#: wxvbam.cpp:729
+#: wxvbam.cpp:728
 #, c-format
 msgid ""
 "Wrote built-in override file to %s\n"
 "To override, delete all but changed section. First found section is used from search path:"
 msgstr ""
 
-#: wxvbam.cpp:735
+#: wxvbam.cpp:734
 msgid ""
 "\n"
 "\tbuilt-in"
 msgstr "\n\tbuilt-in"
 
-#: wxvbam.cpp:750
+#: wxvbam.cpp:749
 msgid ""
 "Options set from the command line are saved if any configuration changes are made in the user interface.\n"
 "\n"
@@ -1705,17 +1794,17 @@ msgid ""
 "\n"
 msgstr "Pilihan yang diubah dari command line disimpan jika terjadi perubahan konfigurasi yang dilakukan melalui user interface.\n\nUntuk pilihan flag, nilai benar dan salah ditetapkan dengan 1 dan 0, secara berurutan.\n\n"
 
-#: wxvbam.cpp:758
+#: wxvbam.cpp:757
 msgid ""
 "The commands available for the Keyboard/* option are:\n"
 "\n"
 msgstr "Perintah yang tersedia untuk pilihan Keyboard/* adalah:\n\n"
 
-#: wxvbam.cpp:769
+#: wxvbam.cpp:768
 msgid "Configuration file not found."
 msgstr "File konfigurasi tidak ditemukan"
 
-#: wxvbam.cpp:800
+#: wxvbam.cpp:799
 msgid "Bad configuration option or multiple ROM files given:\n"
 msgstr "Terjadi pemilihan konfigurasi yang buruk atau pemilihan lebih dari satu file ROM:\n"
 
@@ -2227,10 +2316,6 @@ msgstr "Frame Skip"
 msgid "&Number of frames to skip:"
 msgstr ""
 
-#: xrc/DisplayConfig.xrc:200
-msgid "Speed"
-msgstr "Kecepatan"
-
 #: xrc/DisplayConfig.xrc:216
 msgid "Speed indicator:"
 msgstr ""
@@ -2766,58 +2851,10 @@ msgid ""
 " entire contents if too small."
 msgstr ""
 
-#: xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
-msgid "Up"
-msgstr "Atas"
-
-#: xrc/JoyPanel.xrc:37
-msgid "A"
-msgstr "A"
-
-#: xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
-msgid "Down"
-msgstr "Bawah"
-
-#: xrc/JoyPanel.xrc:83
-msgid "B"
-msgstr "B"
-
-#: xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
-msgid "Left"
-msgstr "Kiri"
-
-#: xrc/JoyPanel.xrc:129
-msgid "L"
-msgstr "L"
-
-#: xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
-msgid "Right"
-msgstr "Kanan"
-
-#: xrc/JoyPanel.xrc:175
-msgid "R"
-msgstr "R"
-
-#: xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
-msgid "Select"
-msgstr "Select"
-
-#: xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
-msgid "Start"
-msgstr "Start"
-
-#: xrc/JoyPanel.xrc:254
-msgid "Motion Up"
-msgstr "Gerakan ke Atas"
-
 #: xrc/JoyPanel.xrc:276
 msgid "Autofire A"
 msgstr "Tekan otomatis A"
 
-#: xrc/JoyPanel.xrc:298
-msgid "Motion Down"
-msgstr "Gerakan ke Bawah"
-
 #: xrc/JoyPanel.xrc:320
 msgid "Autofire B"
 msgstr "Tekan otomatis B"
diff --git a/po/wxvbam/it_IT.po b/po/wxvbam/it_IT.po
index de945d0b..8ce9ba68 100644
--- a/po/wxvbam/it_IT.po
+++ b/po/wxvbam/it_IT.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VBA-M\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-23 22:00+0000\n"
+"POT-Creation-Date: 2024-04-24 02:00+0000\n"
 "PO-Revision-Date: 2011-12-03 19:42+0000\n"
 "Last-Translator: JustAnOrange, 2023\n"
 "Language-Team: Italian (Italy) (http://app.transifex.com/bgk/vba-m/language/it_IT/)\n"
@@ -335,174 +335,263 @@ msgstr "LAN Link è gia attivo. DIsattiva la modalità link per disconnettere."
 msgid "Network is not supported in local mode."
 msgstr "La rete non è supportata in modalità locale."
 
-#: config/internal/option-internal.cpp:379
-msgid "Use bilinear filter with 3d renderer"
+#: config/command.cpp:28 xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
+msgid "Up"
+msgstr "Su"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
+msgid "Down"
+msgstr "Giù"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
+msgid "Left"
+msgstr "Sinistra"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
+msgid "Right"
+msgstr "Destra"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:37
+msgid "A"
+msgstr "A"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:83
+msgid "B"
+msgstr "B"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:129
+msgid "L"
+msgstr "L"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:175
+msgid "R"
+msgstr "R"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
+msgid "Select"
+msgstr "Select"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
+msgid "Start"
+msgstr "Start"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:254
+msgid "Motion Up"
+msgstr "Movimento Su"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:298
+msgid "Motion Down"
+msgstr "Movimento Giù"
+
+#: config/command.cpp:30
+msgid "Motion Left"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion Right"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion In"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Motion Out"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto A"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto B"
+msgstr ""
+
+#: config/command.cpp:31 xrc/DisplayConfig.xrc:200
+msgid "Speed"
+msgstr "Velocità"
+
+#: config/command.cpp:31
+msgid "Capture"
+msgstr ""
+
+#: config/command.cpp:32
+msgid "GameShark"
+msgstr ""
+
+#: config/command.cpp:106
+#, c-format
+msgid "Joypad %zu %s"
 msgstr ""
 
 #: config/internal/option-internal.cpp:380
-msgid "Full-screen filter to apply"
+msgid "Use bilinear filter with 3d renderer"
 msgstr ""
 
 #: config/internal/option-internal.cpp:381
-msgid "Filter plugin library"
+msgid "Full-screen filter to apply"
 msgstr ""
 
 #: config/internal/option-internal.cpp:382
-msgid "Interframe blending function"
+msgid "Filter plugin library"
 msgstr ""
 
 #: config/internal/option-internal.cpp:383
+msgid "Interframe blending function"
+msgstr ""
+
+#: config/internal/option-internal.cpp:384
 msgid "Keep window on top"
 msgstr ""
 
-#: config/internal/option-internal.cpp:385
+#: config/internal/option-internal.cpp:386
 msgid "Maximum number of threads to run filters in"
 msgstr ""
 
-#: config/internal/option-internal.cpp:387
+#: config/internal/option-internal.cpp:388
 msgid "Render method; if unsupported, simple method will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:388
+#: config/internal/option-internal.cpp:389
 msgid "Default scale factor"
 msgstr ""
 
-#: config/internal/option-internal.cpp:389
+#: config/internal/option-internal.cpp:390
 msgid "Retain aspect ratio when resizing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:392
+#: config/internal/option-internal.cpp:393
 msgid "BIOS file to use for Game Boy, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:393
+#: config/internal/option-internal.cpp:394
 msgid "Game Boy color enhancement, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:394
+#: config/internal/option-internal.cpp:395
 msgid "Enable DX Colorization Hacks"
 msgstr ""
 
-#: config/internal/option-internal.cpp:395
-#: config/internal/option-internal.cpp:419
+#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:420
 msgid "Apply LCD filter, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:397
 msgid "BIOS file to use for Game Boy Color, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:398
+#: config/internal/option-internal.cpp:399
 msgid ""
 "The default palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:401
+#: config/internal/option-internal.cpp:402
 msgid ""
 "The first user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:404
+#: config/internal/option-internal.cpp:405
 msgid ""
 "The second user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:407
+#: config/internal/option-internal.cpp:408
 msgid "Automatically gather a full page before printing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:409
+#: config/internal/option-internal.cpp:410
 msgid "Automatically save printouts as screen captures with -print suffix"
 msgstr ""
 
-#: config/internal/option-internal.cpp:411
-#: config/internal/option-internal.cpp:439
+#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:440
 msgid "Directory to look for ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:413
 msgid "Directory to look for Game Boy Color ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:415
+#: config/internal/option-internal.cpp:416
 msgid "BIOS file to use, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:425
+#: config/internal/option-internal.cpp:426
 msgid "Enable link at boot"
 msgstr ""
 
-#: config/internal/option-internal.cpp:430
+#: config/internal/option-internal.cpp:431
 msgid "Enable faster network protocol by default"
 msgstr ""
 
-#: config/internal/option-internal.cpp:432
+#: config/internal/option-internal.cpp:433
 msgid "Default network link client host"
 msgstr ""
 
-#: config/internal/option-internal.cpp:433
+#: config/internal/option-internal.cpp:434
 msgid "Default network link server IP to bind"
 msgstr ""
 
-#: config/internal/option-internal.cpp:434
+#: config/internal/option-internal.cpp:435
 msgid "Default network link port (server and client)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:435
+#: config/internal/option-internal.cpp:436
 msgid "Default network protocol"
 msgstr ""
 
-#: config/internal/option-internal.cpp:436
+#: config/internal/option-internal.cpp:437
 msgid "Link timeout (ms)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:437
+#: config/internal/option-internal.cpp:438
 msgid "Link cable type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:442
+#: config/internal/option-internal.cpp:443
 msgid "Automatically load last saved state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:444
+#: config/internal/option-internal.cpp:445
 msgid ""
 "Directory to store game save files (relative paths are relative to ROM; "
 "blank is config dir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:446
+#: config/internal/option-internal.cpp:447
 msgid "Freeze recent load list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:448
+#: config/internal/option-internal.cpp:449
 msgid ""
 "Directory to store A / V and game recordings (relative paths are relative to"
 " ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:451
+#: config/internal/option-internal.cpp:452
 msgid "Number of seconds between rewind snapshots (0 to disable)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:453
+#: config/internal/option-internal.cpp:454
 msgid "Directory to store screenshots (relative paths are relative to ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:456
+#: config/internal/option-internal.cpp:457
 msgid ""
 "Directory to store saved state files (relative paths are relative to "
 "BatteryDir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:458
+#: config/internal/option-internal.cpp:459
 msgid "Enable status bar"
 msgstr ""
 
-#: config/internal/option-internal.cpp:459
+#: config/internal/option-internal.cpp:460
 msgid "INI file version (DO NOT MODIFY)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:463
+#: config/internal/option-internal.cpp:464
 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, "
@@ -510,266 +599,266 @@ msgid ""
 "MotionRight, AutoA, AutoB, Speed, Capture, GS"
 msgstr ""
 
-#: config/internal/option-internal.cpp:468
+#: config/internal/option-internal.cpp:469
 msgid "The autofire toggle period, in frames (1/60 s)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:469
+#: config/internal/option-internal.cpp:470
 msgid "The number of the stick to use in single-player mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:471
+#: config/internal/option-internal.cpp:472
 msgid "Whether to enable SDL GameController mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:475
+#: config/internal/option-internal.cpp:476
 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 "
 "executed."
 msgstr ""
 
-#: config/internal/option-internal.cpp:480
+#: config/internal/option-internal.cpp:481
 msgid "Enable AGB debug print"
 msgstr ""
 
-#: config/internal/option-internal.cpp:481
+#: config/internal/option-internal.cpp:482
 msgid "Auto skip frames"
 msgstr ""
 
-#: config/internal/option-internal.cpp:483
+#: config/internal/option-internal.cpp:484
 msgid "Apply IPS / UPS / IPF patches if found"
 msgstr ""
 
-#: config/internal/option-internal.cpp:485
+#: config/internal/option-internal.cpp:486
 msgid "Automatically save and load cheat list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:489
+#: config/internal/option-internal.cpp:490
 msgid "Automatically enable border for Super Game Boy games"
 msgstr ""
 
-#: config/internal/option-internal.cpp:491
+#: config/internal/option-internal.cpp:492
 msgid "Always enable border"
 msgstr ""
 
-#: config/internal/option-internal.cpp:492
+#: config/internal/option-internal.cpp:493
 msgid "Screen capture file format"
 msgstr ""
 
-#: config/internal/option-internal.cpp:493
+#: config/internal/option-internal.cpp:494
 msgid "Enable cheats"
 msgstr ""
 
-#: config/internal/option-internal.cpp:494
+#: config/internal/option-internal.cpp:495
 msgid "Disable on-screen status messages"
 msgstr ""
 
-#: config/internal/option-internal.cpp:495
+#: config/internal/option-internal.cpp:496
 msgid "Type of system to emulate"
 msgstr ""
 
-#: config/internal/option-internal.cpp:496
+#: config/internal/option-internal.cpp:497
 msgid "Flash size 0 = 64 KB 1 = 128 KB"
 msgstr ""
 
-#: config/internal/option-internal.cpp:498
+#: config/internal/option-internal.cpp:499
 msgid "Skip frames. Values are 0-9 or -1 to skip automatically based on time."
 msgstr ""
 
-#: config/internal/option-internal.cpp:500
+#: config/internal/option-internal.cpp:501
 msgid "The palette to use"
 msgstr ""
 
-#: config/internal/option-internal.cpp:501
+#: config/internal/option-internal.cpp:502
 msgid "Enable printer emulation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:503
+#: config/internal/option-internal.cpp:504
 msgid "Break into GDB after loading the game."
 msgstr ""
 
-#: config/internal/option-internal.cpp:504
+#: config/internal/option-internal.cpp:505
 msgid "Port to connect GDB to"
 msgstr ""
 
-#: config/internal/option-internal.cpp:506
+#: config/internal/option-internal.cpp:507
 msgid "Number of players in network"
 msgstr ""
 
-#: config/internal/option-internal.cpp:508
+#: config/internal/option-internal.cpp:509
 msgid "Maximum scale factor (0 = no limit)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:510
+#: config/internal/option-internal.cpp:511
 msgid "Pause game when main window loses focus"
 msgstr ""
 
-#: config/internal/option-internal.cpp:512
+#: config/internal/option-internal.cpp:513
 msgid "Enable RTC (vba-over.ini override is rtcEnabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:513
+#: config/internal/option-internal.cpp:514
 msgid "Native save (\"battery\") hardware type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:514
+#: config/internal/option-internal.cpp:515
 msgid "Show speed indicator"
 msgstr ""
 
-#: config/internal/option-internal.cpp:516
+#: config/internal/option-internal.cpp:517
 msgid "Draw on-screen messages transparently"
 msgstr ""
 
-#: config/internal/option-internal.cpp:517
+#: config/internal/option-internal.cpp:518
 msgid "Skip BIOS initialization"
 msgstr ""
 
-#: config/internal/option-internal.cpp:519
+#: config/internal/option-internal.cpp:520
 msgid "Do not overwrite cheat list when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:521
+#: config/internal/option-internal.cpp:522
 msgid "Do not overwrite native (battery) save when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:523
+#: config/internal/option-internal.cpp:524
 msgid "Throttle game speed, even when accelerated (0-450 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:526
+#: config/internal/option-internal.cpp:527
 msgid "Set throttle for speedup key (0-3000 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:528
+#: config/internal/option-internal.cpp:529
 msgid "Number of frames to skip with speedup (instead of speedup throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:531
+#: config/internal/option-internal.cpp:532
 msgid "Use frame skip for speedup throttle"
 msgstr ""
 
-#: config/internal/option-internal.cpp:532
+#: config/internal/option-internal.cpp:533
 msgid "Use the specified BIOS file for Game Boy"
 msgstr ""
 
-#: config/internal/option-internal.cpp:533
+#: config/internal/option-internal.cpp:534
 msgid "Use the specified BIOS file"
 msgstr ""
 
-#: config/internal/option-internal.cpp:535
+#: config/internal/option-internal.cpp:536
 msgid "Use the specified BIOS file for Game Boy Color"
 msgstr ""
 
-#: config/internal/option-internal.cpp:536
+#: config/internal/option-internal.cpp:537
 msgid "Wait for vertical sync"
 msgstr ""
 
-#: config/internal/option-internal.cpp:539
+#: config/internal/option-internal.cpp:540
 msgid "Enter fullscreen mode at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:540
+#: config/internal/option-internal.cpp:541
 msgid "Window maximized"
 msgstr ""
 
-#: config/internal/option-internal.cpp:541
+#: config/internal/option-internal.cpp:542
 msgid "Window height at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:542
+#: config/internal/option-internal.cpp:543
 msgid "Window width at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:543
+#: config/internal/option-internal.cpp:544
 msgid "Window axis X position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:544
+#: config/internal/option-internal.cpp:545
 msgid "Window axis Y position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:548
+#: config/internal/option-internal.cpp:549
 msgid "Capture key events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:550
+#: config/internal/option-internal.cpp:551
 msgid "Capture joy events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:551
+#: config/internal/option-internal.cpp:552
 msgid "Hide menu bar when mouse is inactive"
 msgstr ""
 
-#: config/internal/option-internal.cpp:553
+#: config/internal/option-internal.cpp:554
 msgid "Suspend screensaver when game is running"
 msgstr ""
 
-#: config/internal/option-internal.cpp:556
+#: config/internal/option-internal.cpp:557
 msgid "Sound API; if unsupported, default API will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:557
+#: config/internal/option-internal.cpp:558
 msgid "Device ID of chosen audio device for chosen driver"
 msgstr ""
 
-#: config/internal/option-internal.cpp:558
+#: config/internal/option-internal.cpp:559
 msgid "Number of sound buffers"
 msgstr ""
 
-#: config/internal/option-internal.cpp:559
+#: config/internal/option-internal.cpp:560
 msgid "Bit mask of sound channels to enable"
 msgstr ""
 
-#: config/internal/option-internal.cpp:560
+#: config/internal/option-internal.cpp:561
 msgid "Game Boy Advance sound filtering (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:562
+#: config/internal/option-internal.cpp:563
 msgid "Game Boy Advance sound interpolation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:563
+#: config/internal/option-internal.cpp:564
 msgid "Game Boy sound declicking"
 msgstr ""
 
-#: config/internal/option-internal.cpp:564
+#: config/internal/option-internal.cpp:565
 msgid "Game Boy echo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:565
+#: config/internal/option-internal.cpp:566
 msgid "Enable Game Boy sound effects"
 msgstr ""
 
-#: config/internal/option-internal.cpp:566
+#: config/internal/option-internal.cpp:567
 msgid "Game Boy stereo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:567
+#: config/internal/option-internal.cpp:568
 msgid "Game Boy surround sound effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:568
+#: config/internal/option-internal.cpp:569
 msgid "Sound sample rate (kHz)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:569
+#: config/internal/option-internal.cpp:570
 msgid "Use DirectSound hardware acceleration"
 msgstr ""
 
-#: config/internal/option-internal.cpp:570
+#: config/internal/option-internal.cpp:571
 msgid "Upmix stereo to surround"
 msgstr ""
 
-#: config/internal/option-internal.cpp:571
+#: config/internal/option-internal.cpp:572
 msgid "Sound volume (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:639
-#: config/internal/option-internal.cpp:659
-#: config/internal/option-internal.cpp:680
-#: config/internal/option-internal.cpp:700
-#: config/internal/option-internal.cpp:719
+#: config/internal/option-internal.cpp:640
+#: config/internal/option-internal.cpp:660
+#: config/internal/option-internal.cpp:681
+#: config/internal/option-internal.cpp:701
+#: config/internal/option-internal.cpp:720
 #, c-format
 msgid "Invalid value %s for option %s; valid values are %s"
 msgstr ""
@@ -784,7 +873,7 @@ msgstr "Valore %f per l'opzione %s; i valori validi sono %f - %f"
 msgid "Invalid value %d for option %s; valid values are %d - %d"
 msgstr "Valore non valido %d per l'opzione %s; I valori validi sono %d - %d"
 
-#: config/option.cpp:480 opts.cpp:621 opts.cpp:630 opts.cpp:639 opts.cpp:648
+#: config/option.cpp:480 opts.cpp:468 opts.cpp:477 opts.cpp:486 opts.cpp:495
 #, c-format
 msgid "Invalid value %s for option %s"
 msgstr "Il valore %s non è valido per l'opzione \"%s\""
@@ -949,19 +1038,19 @@ msgstr "Meta+"
 msgid "Key"
 msgstr ""
 
-#: dialogs/accel-config.cpp:149
+#: dialogs/accel-config.cpp:148
 msgid "Menu commands"
 msgstr "Menu comandi"
 
-#: dialogs/accel-config.cpp:261
+#: dialogs/accel-config.cpp:259
 msgid "This will clear all user-defined accelerators. Are you sure?"
 msgstr ""
 
-#: dialogs/accel-config.cpp:261 dialogs/accel-config.cpp:298
+#: dialogs/accel-config.cpp:259 dialogs/accel-config.cpp:306
 msgid "Confirm"
 msgstr "Conferma"
 
-#: dialogs/accel-config.cpp:295
+#: dialogs/accel-config.cpp:304
 #, c-format
 msgid "This will unassign \"%s\" from \"%s\". Are you sure?"
 msgstr ""
@@ -1333,22 +1422,22 @@ msgstr "Vecchio valore"
 msgid "New Value"
 msgstr "Nuovo valore"
 
-#: guiinit.cpp:2518
+#: guiinit.cpp:2519
 msgid "JoyBus host invalid; disabling"
 msgstr "Host JoyBus invalido; lo disabilito"
 
-#: opts.cpp:298
+#: opts.cpp:154
 msgid ""
 "The INI file was written for a more recent version of VBA-M. Some INI option"
 " values may have been reset."
 msgstr "Questo file di configurazione è stato creato per una versione più recente di VBA-M.\nAlcune impostazioni potrebbero essere state resettate."
 
-#: opts.cpp:480 opts.cpp:500 opts.cpp:685
+#: opts.cpp:339 opts.cpp:355 opts.cpp:522
 #, c-format
 msgid "Invalid key binding %s for %s"
 msgstr "Tasto obbligatorio non valido %s per %s"
 
-#: opts.cpp:707
+#: opts.cpp:528
 #, c-format
 msgid "Unknown option %s with value %s"
 msgstr "L'opzione \"%s\" con valore \"%s\", è invalida."
@@ -1572,37 +1661,37 @@ msgstr "La riproduzione si è conclusa"
 msgid "%d %% (%d, %d fps)"
 msgstr "%d%%(%d, %d fps)"
 
-#: sys.cpp:899 xrc/GBPrinter.xrc:65
+#: sys.cpp:898 xrc/GBPrinter.xrc:65
 msgid "&Discard"
 msgstr "&scarto"
 
-#: sys.cpp:933
+#: sys.cpp:932
 msgid "Image files (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 msgstr "file immagine  (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 
-#: sys.cpp:942
+#: sys.cpp:941
 msgid "Save printer image to"
 msgstr "Salva stampa immagine in"
 
-#: sys.cpp:956 sys.cpp:1140
+#: sys.cpp:955 sys.cpp:1139
 #, c-format
 msgid "Wrote printer output to %s"
 msgstr "Ha scritto l'output di stampa in %s"
 
-#: sys.cpp:961 sys.cpp:1032
+#: sys.cpp:960 sys.cpp:1031
 msgid "&Close"
 msgstr "&Chiudi"
 
-#: sys.cpp:1027
+#: sys.cpp:1026
 msgid "Printed"
 msgstr "Stampato"
 
-#: sys.cpp:1302
+#: sys.cpp:1301
 #, c-format
 msgid "Error opening pseudo tty: %s"
 msgstr "l'apertura di pseudo tty Errore: %s"
 
-#: sys.cpp:1401
+#: sys.cpp:1400
 #, c-format
 msgid "Error setting up server socket (%d)"
 msgstr "errore di impostazione del socket server (%d)"
@@ -1636,80 +1725,80 @@ msgstr ""
 msgid "Unable to load dialog %s from resources"
 msgstr "Impossibile caricare il dialogo %s dalle risorse"
 
-#: wxvbam.cpp:398 wxvbam.cpp:415
+#: wxvbam.cpp:401 wxvbam.cpp:418
 #, c-format
 msgid "Invalid configuration file provided: %s"
 msgstr "Il file di configurazione \"%s\" è invalido."
 
-#: wxvbam.cpp:559
+#: wxvbam.cpp:558
 msgid "Could not create main window"
 msgstr "Impossibile creare una finestra principale"
 
-#: wxvbam.cpp:634
+#: wxvbam.cpp:633
 msgid "Save built-in XRC file and exit"
 msgstr "Salva file XRC incorporato ed esci"
 
-#: wxvbam.cpp:637
+#: wxvbam.cpp:636
 msgid "Save built-in vba-over.ini and exit"
 msgstr "Salva vba-over.ini integrato ed esci"
 
-#: wxvbam.cpp:640
+#: wxvbam.cpp:639
 msgid "Print configuration path and exit"
 msgstr "Stampa percorso di configurazione ed esci"
 
-#: wxvbam.cpp:643
+#: wxvbam.cpp:642
 msgid "Start in full-screen mode"
 msgstr "Avvia in modalità schermo intero"
 
-#: wxvbam.cpp:646
+#: wxvbam.cpp:645
 msgid "Set a configuration file"
 msgstr "Imposta un file di configurazione"
 
-#: wxvbam.cpp:650
+#: wxvbam.cpp:649
 msgid "Delete shared link state first, if it exists"
 msgstr "Elimina il link condiviso, se esiste"
 
-#: wxvbam.cpp:657
+#: wxvbam.cpp:656
 msgid "List all settable options and exit"
 msgstr "Mostra tutte le opzioni impostabili ed esci"
 
-#: wxvbam.cpp:660
+#: wxvbam.cpp:659
 msgid "ROM file"
 msgstr "ROM file"
 
-#: wxvbam.cpp:662
+#: wxvbam.cpp:661
 msgid "<config>=<value>"
 msgstr "<config>=<value>"
 
-#: wxvbam.cpp:693
+#: wxvbam.cpp:692
 msgid "Configuration / build error: can't find built-in xrc"
 msgstr "C'è un problema con la configurazione/build:\\nImpossibile trovare xrc"
 
-#: wxvbam.cpp:701
+#: wxvbam.cpp:700
 #, c-format
 msgid ""
 "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:"
 msgstr "Configurazione built-in salvata in %s. Per annullare, elimini tutti i nodi di radice non modificati.\\nIl primo nodo di radice con il nome corretto in qualunque file .xrc o .xrs nel seguente percorso di ricerca sovrascrive l'integrata:"
 
-#: wxvbam.cpp:715
+#: wxvbam.cpp:714
 msgid "Configuration is read from, in order:"
 msgstr "La configurazione è letta in quest'ordine da"
 
-#: wxvbam.cpp:729
+#: wxvbam.cpp:728
 #, c-format
 msgid ""
 "Wrote built-in override file to %s\n"
 "To override, delete all but changed section. First found section is used from search path:"
 msgstr "File di override integrato scritto in %s.\nPer annullare, elimina tutte le sezioni non modificate. La prima sezione usata è trovata partendo dal seguente percorso di ricerca:"
 
-#: wxvbam.cpp:735
+#: wxvbam.cpp:734
 msgid ""
 "\n"
 "\tbuilt-in"
 msgstr "\n⇥costruisci"
 
-#: wxvbam.cpp:750
+#: wxvbam.cpp:749
 msgid ""
 "Options set from the command line are saved if any configuration changes are made in the user interface.\n"
 "\n"
@@ -1717,17 +1806,17 @@ msgid ""
 "\n"
 msgstr "Opzioni impostate dalla riga di comando sono salvate se un qualunque cambiamento nella configurazione è applicato dalla interfaccia utente.\n\nPer le opzioni di flag, vero e falso sono rispettivamente 1 e 0\n\n"
 
-#: wxvbam.cpp:758
+#: wxvbam.cpp:757
 msgid ""
 "The commands available for the Keyboard/* option are:\n"
 "\n"
 msgstr "I comandi disponibili per la Tastiera/* option sono:\n\n"
 
-#: wxvbam.cpp:769
+#: wxvbam.cpp:768
 msgid "Configuration file not found."
 msgstr "File di configurazione non trovato"
 
-#: wxvbam.cpp:800
+#: wxvbam.cpp:799
 msgid "Bad configuration option or multiple ROM files given:\n"
 msgstr "Opzione di configurazione errata o file ROM multipli:\n"
 
@@ -2239,10 +2328,6 @@ msgstr "Frameskip"
 msgid "&Number of frames to skip:"
 msgstr ""
 
-#: xrc/DisplayConfig.xrc:200
-msgid "Speed"
-msgstr "Velocità"
-
 #: xrc/DisplayConfig.xrc:216
 msgid "Speed indicator:"
 msgstr ""
@@ -2778,58 +2863,10 @@ msgid ""
 " entire contents if too small."
 msgstr ""
 
-#: xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
-msgid "Up"
-msgstr "Su"
-
-#: xrc/JoyPanel.xrc:37
-msgid "A"
-msgstr "A"
-
-#: xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
-msgid "Down"
-msgstr "Giù"
-
-#: xrc/JoyPanel.xrc:83
-msgid "B"
-msgstr "B"
-
-#: xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
-msgid "Left"
-msgstr "Sinistra"
-
-#: xrc/JoyPanel.xrc:129
-msgid "L"
-msgstr "L"
-
-#: xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
-msgid "Right"
-msgstr "Destra"
-
-#: xrc/JoyPanel.xrc:175
-msgid "R"
-msgstr "R"
-
-#: xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
-msgid "Select"
-msgstr "Select"
-
-#: xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
-msgid "Start"
-msgstr "Start"
-
-#: xrc/JoyPanel.xrc:254
-msgid "Motion Up"
-msgstr "Movimento Su"
-
 #: xrc/JoyPanel.xrc:276
 msgid "Autofire A"
 msgstr "Fuoco automatico A"
 
-#: xrc/JoyPanel.xrc:298
-msgid "Motion Down"
-msgstr "Movimento Giù"
-
 #: xrc/JoyPanel.xrc:320
 msgid "Autofire B"
 msgstr "Fuoco automatico B"
diff --git a/po/wxvbam/ja.po b/po/wxvbam/ja.po
index 0a9d8bcb..fee12f5c 100644
--- a/po/wxvbam/ja.po
+++ b/po/wxvbam/ja.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VBA-M\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-23 22:00+0000\n"
+"POT-Creation-Date: 2024-04-24 02:00+0000\n"
 "PO-Revision-Date: 2011-12-03 19:42+0000\n"
 "Last-Translator: 田中康陽, 2022\n"
 "Language-Team: Japanese (http://app.transifex.com/bgk/vba-m/language/ja/)\n"
@@ -327,174 +327,263 @@ msgstr ""
 msgid "Network is not supported in local mode."
 msgstr "ネットワークはローカルモードではサポートされません。"
 
-#: config/internal/option-internal.cpp:379
-msgid "Use bilinear filter with 3d renderer"
+#: config/command.cpp:28 xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
+msgid "Up"
+msgstr "上"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
+msgid "Down"
+msgstr "下"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
+msgid "Left"
+msgstr "左"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
+msgid "Right"
+msgstr "右"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:37
+msgid "A"
+msgstr "A"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:83
+msgid "B"
+msgstr "B"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:129
+msgid "L"
+msgstr "L"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:175
+msgid "R"
+msgstr "R"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
+msgid "Select"
+msgstr "セレクト"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
+msgid "Start"
+msgstr "スタート"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:254
+msgid "Motion Up"
+msgstr "上（モーションセンサー）"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:298
+msgid "Motion Down"
+msgstr "下（モーションセンサー）"
+
+#: config/command.cpp:30
+msgid "Motion Left"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion Right"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion In"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Motion Out"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto A"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto B"
+msgstr ""
+
+#: config/command.cpp:31 xrc/DisplayConfig.xrc:200
+msgid "Speed"
+msgstr "スピード"
+
+#: config/command.cpp:31
+msgid "Capture"
+msgstr ""
+
+#: config/command.cpp:32
+msgid "GameShark"
+msgstr ""
+
+#: config/command.cpp:106
+#, c-format
+msgid "Joypad %zu %s"
 msgstr ""
 
 #: config/internal/option-internal.cpp:380
-msgid "Full-screen filter to apply"
+msgid "Use bilinear filter with 3d renderer"
 msgstr ""
 
 #: config/internal/option-internal.cpp:381
-msgid "Filter plugin library"
+msgid "Full-screen filter to apply"
 msgstr ""
 
 #: config/internal/option-internal.cpp:382
-msgid "Interframe blending function"
+msgid "Filter plugin library"
 msgstr ""
 
 #: config/internal/option-internal.cpp:383
+msgid "Interframe blending function"
+msgstr ""
+
+#: config/internal/option-internal.cpp:384
 msgid "Keep window on top"
 msgstr ""
 
-#: config/internal/option-internal.cpp:385
+#: config/internal/option-internal.cpp:386
 msgid "Maximum number of threads to run filters in"
 msgstr ""
 
-#: config/internal/option-internal.cpp:387
+#: config/internal/option-internal.cpp:388
 msgid "Render method; if unsupported, simple method will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:388
+#: config/internal/option-internal.cpp:389
 msgid "Default scale factor"
 msgstr ""
 
-#: config/internal/option-internal.cpp:389
+#: config/internal/option-internal.cpp:390
 msgid "Retain aspect ratio when resizing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:392
+#: config/internal/option-internal.cpp:393
 msgid "BIOS file to use for Game Boy, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:393
+#: config/internal/option-internal.cpp:394
 msgid "Game Boy color enhancement, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:394
+#: config/internal/option-internal.cpp:395
 msgid "Enable DX Colorization Hacks"
 msgstr ""
 
-#: config/internal/option-internal.cpp:395
-#: config/internal/option-internal.cpp:419
+#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:420
 msgid "Apply LCD filter, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:397
 msgid "BIOS file to use for Game Boy Color, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:398
+#: config/internal/option-internal.cpp:399
 msgid ""
 "The default palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:401
+#: config/internal/option-internal.cpp:402
 msgid ""
 "The first user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:404
+#: config/internal/option-internal.cpp:405
 msgid ""
 "The second user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:407
+#: config/internal/option-internal.cpp:408
 msgid "Automatically gather a full page before printing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:409
+#: config/internal/option-internal.cpp:410
 msgid "Automatically save printouts as screen captures with -print suffix"
 msgstr ""
 
-#: config/internal/option-internal.cpp:411
-#: config/internal/option-internal.cpp:439
+#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:440
 msgid "Directory to look for ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:413
 msgid "Directory to look for Game Boy Color ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:415
+#: config/internal/option-internal.cpp:416
 msgid "BIOS file to use, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:425
+#: config/internal/option-internal.cpp:426
 msgid "Enable link at boot"
 msgstr ""
 
-#: config/internal/option-internal.cpp:430
+#: config/internal/option-internal.cpp:431
 msgid "Enable faster network protocol by default"
 msgstr ""
 
-#: config/internal/option-internal.cpp:432
+#: config/internal/option-internal.cpp:433
 msgid "Default network link client host"
 msgstr ""
 
-#: config/internal/option-internal.cpp:433
+#: config/internal/option-internal.cpp:434
 msgid "Default network link server IP to bind"
 msgstr ""
 
-#: config/internal/option-internal.cpp:434
+#: config/internal/option-internal.cpp:435
 msgid "Default network link port (server and client)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:435
+#: config/internal/option-internal.cpp:436
 msgid "Default network protocol"
 msgstr ""
 
-#: config/internal/option-internal.cpp:436
+#: config/internal/option-internal.cpp:437
 msgid "Link timeout (ms)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:437
+#: config/internal/option-internal.cpp:438
 msgid "Link cable type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:442
+#: config/internal/option-internal.cpp:443
 msgid "Automatically load last saved state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:444
+#: config/internal/option-internal.cpp:445
 msgid ""
 "Directory to store game save files (relative paths are relative to ROM; "
 "blank is config dir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:446
+#: config/internal/option-internal.cpp:447
 msgid "Freeze recent load list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:448
+#: config/internal/option-internal.cpp:449
 msgid ""
 "Directory to store A / V and game recordings (relative paths are relative to"
 " ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:451
+#: config/internal/option-internal.cpp:452
 msgid "Number of seconds between rewind snapshots (0 to disable)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:453
+#: config/internal/option-internal.cpp:454
 msgid "Directory to store screenshots (relative paths are relative to ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:456
+#: config/internal/option-internal.cpp:457
 msgid ""
 "Directory to store saved state files (relative paths are relative to "
 "BatteryDir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:458
+#: config/internal/option-internal.cpp:459
 msgid "Enable status bar"
 msgstr ""
 
-#: config/internal/option-internal.cpp:459
+#: config/internal/option-internal.cpp:460
 msgid "INI file version (DO NOT MODIFY)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:463
+#: config/internal/option-internal.cpp:464
 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, "
@@ -502,266 +591,266 @@ msgid ""
 "MotionRight, AutoA, AutoB, Speed, Capture, GS"
 msgstr ""
 
-#: config/internal/option-internal.cpp:468
+#: config/internal/option-internal.cpp:469
 msgid "The autofire toggle period, in frames (1/60 s)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:469
+#: config/internal/option-internal.cpp:470
 msgid "The number of the stick to use in single-player mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:471
+#: config/internal/option-internal.cpp:472
 msgid "Whether to enable SDL GameController mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:475
+#: config/internal/option-internal.cpp:476
 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 "
 "executed."
 msgstr ""
 
-#: config/internal/option-internal.cpp:480
+#: config/internal/option-internal.cpp:481
 msgid "Enable AGB debug print"
 msgstr ""
 
-#: config/internal/option-internal.cpp:481
+#: config/internal/option-internal.cpp:482
 msgid "Auto skip frames"
 msgstr ""
 
-#: config/internal/option-internal.cpp:483
+#: config/internal/option-internal.cpp:484
 msgid "Apply IPS / UPS / IPF patches if found"
 msgstr ""
 
-#: config/internal/option-internal.cpp:485
+#: config/internal/option-internal.cpp:486
 msgid "Automatically save and load cheat list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:489
+#: config/internal/option-internal.cpp:490
 msgid "Automatically enable border for Super Game Boy games"
 msgstr ""
 
-#: config/internal/option-internal.cpp:491
+#: config/internal/option-internal.cpp:492
 msgid "Always enable border"
 msgstr ""
 
-#: config/internal/option-internal.cpp:492
+#: config/internal/option-internal.cpp:493
 msgid "Screen capture file format"
 msgstr ""
 
-#: config/internal/option-internal.cpp:493
+#: config/internal/option-internal.cpp:494
 msgid "Enable cheats"
 msgstr ""
 
-#: config/internal/option-internal.cpp:494
+#: config/internal/option-internal.cpp:495
 msgid "Disable on-screen status messages"
 msgstr ""
 
-#: config/internal/option-internal.cpp:495
+#: config/internal/option-internal.cpp:496
 msgid "Type of system to emulate"
 msgstr ""
 
-#: config/internal/option-internal.cpp:496
+#: config/internal/option-internal.cpp:497
 msgid "Flash size 0 = 64 KB 1 = 128 KB"
 msgstr ""
 
-#: config/internal/option-internal.cpp:498
+#: config/internal/option-internal.cpp:499
 msgid "Skip frames. Values are 0-9 or -1 to skip automatically based on time."
 msgstr ""
 
-#: config/internal/option-internal.cpp:500
+#: config/internal/option-internal.cpp:501
 msgid "The palette to use"
 msgstr ""
 
-#: config/internal/option-internal.cpp:501
+#: config/internal/option-internal.cpp:502
 msgid "Enable printer emulation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:503
+#: config/internal/option-internal.cpp:504
 msgid "Break into GDB after loading the game."
 msgstr ""
 
-#: config/internal/option-internal.cpp:504
+#: config/internal/option-internal.cpp:505
 msgid "Port to connect GDB to"
 msgstr ""
 
-#: config/internal/option-internal.cpp:506
+#: config/internal/option-internal.cpp:507
 msgid "Number of players in network"
 msgstr ""
 
-#: config/internal/option-internal.cpp:508
+#: config/internal/option-internal.cpp:509
 msgid "Maximum scale factor (0 = no limit)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:510
+#: config/internal/option-internal.cpp:511
 msgid "Pause game when main window loses focus"
 msgstr ""
 
-#: config/internal/option-internal.cpp:512
+#: config/internal/option-internal.cpp:513
 msgid "Enable RTC (vba-over.ini override is rtcEnabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:513
+#: config/internal/option-internal.cpp:514
 msgid "Native save (\"battery\") hardware type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:514
+#: config/internal/option-internal.cpp:515
 msgid "Show speed indicator"
 msgstr ""
 
-#: config/internal/option-internal.cpp:516
+#: config/internal/option-internal.cpp:517
 msgid "Draw on-screen messages transparently"
 msgstr ""
 
-#: config/internal/option-internal.cpp:517
+#: config/internal/option-internal.cpp:518
 msgid "Skip BIOS initialization"
 msgstr ""
 
-#: config/internal/option-internal.cpp:519
+#: config/internal/option-internal.cpp:520
 msgid "Do not overwrite cheat list when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:521
+#: config/internal/option-internal.cpp:522
 msgid "Do not overwrite native (battery) save when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:523
+#: config/internal/option-internal.cpp:524
 msgid "Throttle game speed, even when accelerated (0-450 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:526
+#: config/internal/option-internal.cpp:527
 msgid "Set throttle for speedup key (0-3000 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:528
+#: config/internal/option-internal.cpp:529
 msgid "Number of frames to skip with speedup (instead of speedup throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:531
+#: config/internal/option-internal.cpp:532
 msgid "Use frame skip for speedup throttle"
 msgstr ""
 
-#: config/internal/option-internal.cpp:532
+#: config/internal/option-internal.cpp:533
 msgid "Use the specified BIOS file for Game Boy"
 msgstr ""
 
-#: config/internal/option-internal.cpp:533
+#: config/internal/option-internal.cpp:534
 msgid "Use the specified BIOS file"
 msgstr ""
 
-#: config/internal/option-internal.cpp:535
+#: config/internal/option-internal.cpp:536
 msgid "Use the specified BIOS file for Game Boy Color"
 msgstr ""
 
-#: config/internal/option-internal.cpp:536
+#: config/internal/option-internal.cpp:537
 msgid "Wait for vertical sync"
 msgstr ""
 
-#: config/internal/option-internal.cpp:539
+#: config/internal/option-internal.cpp:540
 msgid "Enter fullscreen mode at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:540
+#: config/internal/option-internal.cpp:541
 msgid "Window maximized"
 msgstr ""
 
-#: config/internal/option-internal.cpp:541
+#: config/internal/option-internal.cpp:542
 msgid "Window height at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:542
+#: config/internal/option-internal.cpp:543
 msgid "Window width at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:543
+#: config/internal/option-internal.cpp:544
 msgid "Window axis X position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:544
+#: config/internal/option-internal.cpp:545
 msgid "Window axis Y position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:548
+#: config/internal/option-internal.cpp:549
 msgid "Capture key events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:550
+#: config/internal/option-internal.cpp:551
 msgid "Capture joy events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:551
+#: config/internal/option-internal.cpp:552
 msgid "Hide menu bar when mouse is inactive"
 msgstr ""
 
-#: config/internal/option-internal.cpp:553
+#: config/internal/option-internal.cpp:554
 msgid "Suspend screensaver when game is running"
 msgstr ""
 
-#: config/internal/option-internal.cpp:556
+#: config/internal/option-internal.cpp:557
 msgid "Sound API; if unsupported, default API will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:557
+#: config/internal/option-internal.cpp:558
 msgid "Device ID of chosen audio device for chosen driver"
 msgstr ""
 
-#: config/internal/option-internal.cpp:558
+#: config/internal/option-internal.cpp:559
 msgid "Number of sound buffers"
 msgstr ""
 
-#: config/internal/option-internal.cpp:559
+#: config/internal/option-internal.cpp:560
 msgid "Bit mask of sound channels to enable"
 msgstr ""
 
-#: config/internal/option-internal.cpp:560
+#: config/internal/option-internal.cpp:561
 msgid "Game Boy Advance sound filtering (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:562
+#: config/internal/option-internal.cpp:563
 msgid "Game Boy Advance sound interpolation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:563
+#: config/internal/option-internal.cpp:564
 msgid "Game Boy sound declicking"
 msgstr ""
 
-#: config/internal/option-internal.cpp:564
+#: config/internal/option-internal.cpp:565
 msgid "Game Boy echo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:565
+#: config/internal/option-internal.cpp:566
 msgid "Enable Game Boy sound effects"
 msgstr ""
 
-#: config/internal/option-internal.cpp:566
+#: config/internal/option-internal.cpp:567
 msgid "Game Boy stereo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:567
+#: config/internal/option-internal.cpp:568
 msgid "Game Boy surround sound effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:568
+#: config/internal/option-internal.cpp:569
 msgid "Sound sample rate (kHz)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:569
+#: config/internal/option-internal.cpp:570
 msgid "Use DirectSound hardware acceleration"
 msgstr ""
 
-#: config/internal/option-internal.cpp:570
+#: config/internal/option-internal.cpp:571
 msgid "Upmix stereo to surround"
 msgstr ""
 
-#: config/internal/option-internal.cpp:571
+#: config/internal/option-internal.cpp:572
 msgid "Sound volume (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:639
-#: config/internal/option-internal.cpp:659
-#: config/internal/option-internal.cpp:680
-#: config/internal/option-internal.cpp:700
-#: config/internal/option-internal.cpp:719
+#: config/internal/option-internal.cpp:640
+#: config/internal/option-internal.cpp:660
+#: config/internal/option-internal.cpp:681
+#: config/internal/option-internal.cpp:701
+#: config/internal/option-internal.cpp:720
 #, c-format
 msgid "Invalid value %s for option %s; valid values are %s"
 msgstr ""
@@ -776,7 +865,7 @@ msgstr "%fは %sのオプションとして不正な値です。 有効な値は
 msgid "Invalid value %d for option %s; valid values are %d - %d"
 msgstr "%d は %sのオプションとして不正な値です。 有効な値は %d - %d"
 
-#: config/option.cpp:480 opts.cpp:621 opts.cpp:630 opts.cpp:639 opts.cpp:648
+#: config/option.cpp:480 opts.cpp:468 opts.cpp:477 opts.cpp:486 opts.cpp:495
 #, c-format
 msgid "Invalid value %s for option %s"
 msgstr ""
@@ -941,19 +1030,19 @@ msgstr "Meta+"
 msgid "Key"
 msgstr ""
 
-#: dialogs/accel-config.cpp:149
+#: dialogs/accel-config.cpp:148
 msgid "Menu commands"
 msgstr "メニューコマンド"
 
-#: dialogs/accel-config.cpp:261
+#: dialogs/accel-config.cpp:259
 msgid "This will clear all user-defined accelerators. Are you sure?"
 msgstr ""
 
-#: dialogs/accel-config.cpp:261 dialogs/accel-config.cpp:298
+#: dialogs/accel-config.cpp:259 dialogs/accel-config.cpp:306
 msgid "Confirm"
 msgstr "承認"
 
-#: dialogs/accel-config.cpp:295
+#: dialogs/accel-config.cpp:304
 #, c-format
 msgid "This will unassign \"%s\" from \"%s\". Are you sure?"
 msgstr ""
@@ -1325,22 +1414,22 @@ msgstr "以前の値"
 msgid "New Value"
 msgstr "新しい値"
 
-#: guiinit.cpp:2518
+#: guiinit.cpp:2519
 msgid "JoyBus host invalid; disabling"
 msgstr "JoyBusホストが無効です。使用停止"
 
-#: opts.cpp:298
+#: opts.cpp:154
 msgid ""
 "The INI file was written for a more recent version of VBA-M. Some INI option"
 " values may have been reset."
 msgstr ""
 
-#: opts.cpp:480 opts.cpp:500 opts.cpp:685
+#: opts.cpp:339 opts.cpp:355 opts.cpp:522
 #, c-format
 msgid "Invalid key binding %s for %s"
 msgstr "%s キーを %s へ割り当てることはできません"
 
-#: opts.cpp:707
+#: opts.cpp:528
 #, c-format
 msgid "Unknown option %s with value %s"
 msgstr ""
@@ -1564,37 +1653,37 @@ msgstr "プレイバック終了"
 msgid "%d %% (%d, %d fps)"
 msgstr ""
 
-#: sys.cpp:899 xrc/GBPrinter.xrc:65
+#: sys.cpp:898 xrc/GBPrinter.xrc:65
 msgid "&Discard"
 msgstr "破棄"
 
-#: sys.cpp:933
+#: sys.cpp:932
 msgid "Image files (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 msgstr "イメージファイル (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 
-#: sys.cpp:942
+#: sys.cpp:941
 msgid "Save printer image to"
 msgstr "プリンターイメージを保存"
 
-#: sys.cpp:956 sys.cpp:1140
+#: sys.cpp:955 sys.cpp:1139
 #, c-format
 msgid "Wrote printer output to %s"
 msgstr "プリンタ出力を%sへ書き出しました"
 
-#: sys.cpp:961 sys.cpp:1032
+#: sys.cpp:960 sys.cpp:1031
 msgid "&Close"
 msgstr "ROMを閉じる(&C)"
 
-#: sys.cpp:1027
+#: sys.cpp:1026
 msgid "Printed"
 msgstr "印刷"
 
-#: sys.cpp:1302
+#: sys.cpp:1301
 #, c-format
 msgid "Error opening pseudo tty: %s"
 msgstr "仮想端末を開く際にエラーが発生しました: %s"
 
-#: sys.cpp:1401
+#: sys.cpp:1400
 #, c-format
 msgid "Error setting up server socket (%d)"
 msgstr "サーバーソケットのセットアップ時にエラーが発生しました(%d)"
@@ -1628,80 +1717,80 @@ msgstr ""
 msgid "Unable to load dialog %s from resources"
 msgstr "リソースからダイアログ%sを読み込めませんでした"
 
-#: wxvbam.cpp:398 wxvbam.cpp:415
+#: wxvbam.cpp:401 wxvbam.cpp:418
 #, c-format
 msgid "Invalid configuration file provided: %s"
 msgstr ""
 
-#: wxvbam.cpp:559
+#: wxvbam.cpp:558
 msgid "Could not create main window"
 msgstr "メインウィンドウを作成できませんでした"
 
-#: wxvbam.cpp:634
+#: wxvbam.cpp:633
 msgid "Save built-in XRC file and exit"
 msgstr "XRCファイルを保存して終了"
 
-#: wxvbam.cpp:637
+#: wxvbam.cpp:636
 msgid "Save built-in vba-over.ini and exit"
 msgstr "vba-over.ini を保存して終了"
 
-#: wxvbam.cpp:640
+#: wxvbam.cpp:639
 msgid "Print configuration path and exit"
 msgstr "設定ファイルのパスを出力して終了"
 
-#: wxvbam.cpp:643
+#: wxvbam.cpp:642
 msgid "Start in full-screen mode"
 msgstr "全画面表示で開始"
 
-#: wxvbam.cpp:646
+#: wxvbam.cpp:645
 msgid "Set a configuration file"
 msgstr "設定ファイルをセット"
 
-#: wxvbam.cpp:650
+#: wxvbam.cpp:649
 msgid "Delete shared link state first, if it exists"
 msgstr "共有リンク状態が存在する場合は、最初に削除します"
 
-#: wxvbam.cpp:657
+#: wxvbam.cpp:656
 msgid "List all settable options and exit"
 msgstr "設定可能なオプションをすべてリストして終了します"
 
-#: wxvbam.cpp:660
+#: wxvbam.cpp:659
 msgid "ROM file"
 msgstr "ROMファイル"
 
-#: wxvbam.cpp:662
+#: wxvbam.cpp:661
 msgid "<config>=<value>"
 msgstr "<config>=<value>"
 
-#: wxvbam.cpp:693
+#: wxvbam.cpp:692
 msgid "Configuration / build error: can't find built-in xrc"
 msgstr ""
 
-#: wxvbam.cpp:701
+#: wxvbam.cpp:700
 #, c-format
 msgid ""
 "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:"
 msgstr ""
 
-#: wxvbam.cpp:715
+#: wxvbam.cpp:714
 msgid "Configuration is read from, in order:"
 msgstr "構成は、次の順序で読み取られます。"
 
-#: wxvbam.cpp:729
+#: wxvbam.cpp:728
 #, c-format
 msgid ""
 "Wrote built-in override file to %s\n"
 "To override, delete all but changed section. First found section is used from search path:"
 msgstr ""
 
-#: wxvbam.cpp:735
+#: wxvbam.cpp:734
 msgid ""
 "\n"
 "\tbuilt-in"
 msgstr "\n\t組み込み"
 
-#: wxvbam.cpp:750
+#: wxvbam.cpp:749
 msgid ""
 "Options set from the command line are saved if any configuration changes are made in the user interface.\n"
 "\n"
@@ -1709,17 +1798,17 @@ msgid ""
 "\n"
 msgstr "ユーザーインターフェイスで構成を変更するとコマンドラインからの設定されたオプションが保存されます。.\n\nフラグオプションの場合、trueとfalseにそれぞれ1と0を指定できます。\n\n"
 
-#: wxvbam.cpp:758
+#: wxvbam.cpp:757
 msgid ""
 "The commands available for the Keyboard/* option are:\n"
 "\n"
 msgstr "Keyboard / *オプションで使用できるコマンドは次のとおりです。\n\n"
 
-#: wxvbam.cpp:769
+#: wxvbam.cpp:768
 msgid "Configuration file not found."
 msgstr "設定ファイルが見つかりません。"
 
-#: wxvbam.cpp:800
+#: wxvbam.cpp:799
 msgid "Bad configuration option or multiple ROM files given:\n"
 msgstr "設定オプションが不正か、複数のロムファイルが読み込まれました。\n"
 
@@ -2231,10 +2320,6 @@ msgstr "フレームスキップ"
 msgid "&Number of frames to skip:"
 msgstr ""
 
-#: xrc/DisplayConfig.xrc:200
-msgid "Speed"
-msgstr "スピード"
-
 #: xrc/DisplayConfig.xrc:216
 msgid "Speed indicator:"
 msgstr ""
@@ -2770,58 +2855,10 @@ msgid ""
 " entire contents if too small."
 msgstr ""
 
-#: xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
-msgid "Up"
-msgstr "上"
-
-#: xrc/JoyPanel.xrc:37
-msgid "A"
-msgstr "A"
-
-#: xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
-msgid "Down"
-msgstr "下"
-
-#: xrc/JoyPanel.xrc:83
-msgid "B"
-msgstr "B"
-
-#: xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
-msgid "Left"
-msgstr "左"
-
-#: xrc/JoyPanel.xrc:129
-msgid "L"
-msgstr "L"
-
-#: xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
-msgid "Right"
-msgstr "右"
-
-#: xrc/JoyPanel.xrc:175
-msgid "R"
-msgstr "R"
-
-#: xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
-msgid "Select"
-msgstr "セレクト"
-
-#: xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
-msgid "Start"
-msgstr "スタート"
-
-#: xrc/JoyPanel.xrc:254
-msgid "Motion Up"
-msgstr "上（モーションセンサー）"
-
 #: xrc/JoyPanel.xrc:276
 msgid "Autofire A"
 msgstr "A（連射）"
 
-#: xrc/JoyPanel.xrc:298
-msgid "Motion Down"
-msgstr "下（モーションセンサー）"
-
 #: xrc/JoyPanel.xrc:320
 msgid "Autofire B"
 msgstr "B（連射）"
diff --git a/po/wxvbam/ja_JP.po b/po/wxvbam/ja_JP.po
index 04231ed7..ea150ac8 100644
--- a/po/wxvbam/ja_JP.po
+++ b/po/wxvbam/ja_JP.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VBA-M\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-23 22:00+0000\n"
+"POT-Creation-Date: 2024-04-24 02:00+0000\n"
 "PO-Revision-Date: 2011-12-03 19:42+0000\n"
 "Last-Translator: 深谷 承太, 2022\n"
 "Language-Team: Japanese (Japan) (http://app.transifex.com/bgk/vba-m/language/ja_JP/)\n"
@@ -320,174 +320,263 @@ msgstr ""
 msgid "Network is not supported in local mode."
 msgstr ""
 
-#: config/internal/option-internal.cpp:379
-msgid "Use bilinear filter with 3d renderer"
+#: config/command.cpp:28 xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
+msgid "Up"
+msgstr ""
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
+msgid "Down"
+msgstr ""
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
+msgid "Left"
+msgstr ""
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
+msgid "Right"
+msgstr ""
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:37
+msgid "A"
+msgstr ""
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:83
+msgid "B"
+msgstr ""
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:129
+msgid "L"
+msgstr ""
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:175
+msgid "R"
+msgstr ""
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
+msgid "Select"
+msgstr ""
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
+msgid "Start"
+msgstr ""
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:254
+msgid "Motion Up"
+msgstr ""
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:298
+msgid "Motion Down"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion Left"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion Right"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion In"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Motion Out"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto A"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto B"
+msgstr ""
+
+#: config/command.cpp:31 xrc/DisplayConfig.xrc:200
+msgid "Speed"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Capture"
+msgstr ""
+
+#: config/command.cpp:32
+msgid "GameShark"
+msgstr ""
+
+#: config/command.cpp:106
+#, c-format
+msgid "Joypad %zu %s"
 msgstr ""
 
 #: config/internal/option-internal.cpp:380
-msgid "Full-screen filter to apply"
+msgid "Use bilinear filter with 3d renderer"
 msgstr ""
 
 #: config/internal/option-internal.cpp:381
-msgid "Filter plugin library"
+msgid "Full-screen filter to apply"
 msgstr ""
 
 #: config/internal/option-internal.cpp:382
-msgid "Interframe blending function"
+msgid "Filter plugin library"
 msgstr ""
 
 #: config/internal/option-internal.cpp:383
+msgid "Interframe blending function"
+msgstr ""
+
+#: config/internal/option-internal.cpp:384
 msgid "Keep window on top"
 msgstr ""
 
-#: config/internal/option-internal.cpp:385
+#: config/internal/option-internal.cpp:386
 msgid "Maximum number of threads to run filters in"
 msgstr ""
 
-#: config/internal/option-internal.cpp:387
+#: config/internal/option-internal.cpp:388
 msgid "Render method; if unsupported, simple method will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:388
+#: config/internal/option-internal.cpp:389
 msgid "Default scale factor"
 msgstr ""
 
-#: config/internal/option-internal.cpp:389
+#: config/internal/option-internal.cpp:390
 msgid "Retain aspect ratio when resizing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:392
+#: config/internal/option-internal.cpp:393
 msgid "BIOS file to use for Game Boy, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:393
+#: config/internal/option-internal.cpp:394
 msgid "Game Boy color enhancement, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:394
+#: config/internal/option-internal.cpp:395
 msgid "Enable DX Colorization Hacks"
 msgstr ""
 
-#: config/internal/option-internal.cpp:395
-#: config/internal/option-internal.cpp:419
+#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:420
 msgid "Apply LCD filter, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:397
 msgid "BIOS file to use for Game Boy Color, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:398
+#: config/internal/option-internal.cpp:399
 msgid ""
 "The default palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:401
+#: config/internal/option-internal.cpp:402
 msgid ""
 "The first user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:404
+#: config/internal/option-internal.cpp:405
 msgid ""
 "The second user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:407
+#: config/internal/option-internal.cpp:408
 msgid "Automatically gather a full page before printing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:409
+#: config/internal/option-internal.cpp:410
 msgid "Automatically save printouts as screen captures with -print suffix"
 msgstr ""
 
-#: config/internal/option-internal.cpp:411
-#: config/internal/option-internal.cpp:439
+#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:440
 msgid "Directory to look for ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:413
 msgid "Directory to look for Game Boy Color ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:415
+#: config/internal/option-internal.cpp:416
 msgid "BIOS file to use, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:425
+#: config/internal/option-internal.cpp:426
 msgid "Enable link at boot"
 msgstr ""
 
-#: config/internal/option-internal.cpp:430
+#: config/internal/option-internal.cpp:431
 msgid "Enable faster network protocol by default"
 msgstr ""
 
-#: config/internal/option-internal.cpp:432
+#: config/internal/option-internal.cpp:433
 msgid "Default network link client host"
 msgstr ""
 
-#: config/internal/option-internal.cpp:433
+#: config/internal/option-internal.cpp:434
 msgid "Default network link server IP to bind"
 msgstr ""
 
-#: config/internal/option-internal.cpp:434
+#: config/internal/option-internal.cpp:435
 msgid "Default network link port (server and client)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:435
+#: config/internal/option-internal.cpp:436
 msgid "Default network protocol"
 msgstr ""
 
-#: config/internal/option-internal.cpp:436
+#: config/internal/option-internal.cpp:437
 msgid "Link timeout (ms)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:437
+#: config/internal/option-internal.cpp:438
 msgid "Link cable type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:442
+#: config/internal/option-internal.cpp:443
 msgid "Automatically load last saved state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:444
+#: config/internal/option-internal.cpp:445
 msgid ""
 "Directory to store game save files (relative paths are relative to ROM; "
 "blank is config dir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:446
+#: config/internal/option-internal.cpp:447
 msgid "Freeze recent load list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:448
+#: config/internal/option-internal.cpp:449
 msgid ""
 "Directory to store A / V and game recordings (relative paths are relative to"
 " ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:451
+#: config/internal/option-internal.cpp:452
 msgid "Number of seconds between rewind snapshots (0 to disable)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:453
+#: config/internal/option-internal.cpp:454
 msgid "Directory to store screenshots (relative paths are relative to ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:456
+#: config/internal/option-internal.cpp:457
 msgid ""
 "Directory to store saved state files (relative paths are relative to "
 "BatteryDir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:458
+#: config/internal/option-internal.cpp:459
 msgid "Enable status bar"
 msgstr ""
 
-#: config/internal/option-internal.cpp:459
+#: config/internal/option-internal.cpp:460
 msgid "INI file version (DO NOT MODIFY)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:463
+#: config/internal/option-internal.cpp:464
 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, "
@@ -495,266 +584,266 @@ msgid ""
 "MotionRight, AutoA, AutoB, Speed, Capture, GS"
 msgstr ""
 
-#: config/internal/option-internal.cpp:468
+#: config/internal/option-internal.cpp:469
 msgid "The autofire toggle period, in frames (1/60 s)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:469
+#: config/internal/option-internal.cpp:470
 msgid "The number of the stick to use in single-player mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:471
+#: config/internal/option-internal.cpp:472
 msgid "Whether to enable SDL GameController mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:475
+#: config/internal/option-internal.cpp:476
 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 "
 "executed."
 msgstr ""
 
-#: config/internal/option-internal.cpp:480
+#: config/internal/option-internal.cpp:481
 msgid "Enable AGB debug print"
 msgstr ""
 
-#: config/internal/option-internal.cpp:481
+#: config/internal/option-internal.cpp:482
 msgid "Auto skip frames"
 msgstr ""
 
-#: config/internal/option-internal.cpp:483
+#: config/internal/option-internal.cpp:484
 msgid "Apply IPS / UPS / IPF patches if found"
 msgstr ""
 
-#: config/internal/option-internal.cpp:485
+#: config/internal/option-internal.cpp:486
 msgid "Automatically save and load cheat list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:489
+#: config/internal/option-internal.cpp:490
 msgid "Automatically enable border for Super Game Boy games"
 msgstr ""
 
-#: config/internal/option-internal.cpp:491
+#: config/internal/option-internal.cpp:492
 msgid "Always enable border"
 msgstr ""
 
-#: config/internal/option-internal.cpp:492
+#: config/internal/option-internal.cpp:493
 msgid "Screen capture file format"
 msgstr ""
 
-#: config/internal/option-internal.cpp:493
+#: config/internal/option-internal.cpp:494
 msgid "Enable cheats"
 msgstr ""
 
-#: config/internal/option-internal.cpp:494
+#: config/internal/option-internal.cpp:495
 msgid "Disable on-screen status messages"
 msgstr ""
 
-#: config/internal/option-internal.cpp:495
+#: config/internal/option-internal.cpp:496
 msgid "Type of system to emulate"
 msgstr ""
 
-#: config/internal/option-internal.cpp:496
+#: config/internal/option-internal.cpp:497
 msgid "Flash size 0 = 64 KB 1 = 128 KB"
 msgstr ""
 
-#: config/internal/option-internal.cpp:498
+#: config/internal/option-internal.cpp:499
 msgid "Skip frames. Values are 0-9 or -1 to skip automatically based on time."
 msgstr ""
 
-#: config/internal/option-internal.cpp:500
+#: config/internal/option-internal.cpp:501
 msgid "The palette to use"
 msgstr ""
 
-#: config/internal/option-internal.cpp:501
+#: config/internal/option-internal.cpp:502
 msgid "Enable printer emulation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:503
+#: config/internal/option-internal.cpp:504
 msgid "Break into GDB after loading the game."
 msgstr ""
 
-#: config/internal/option-internal.cpp:504
+#: config/internal/option-internal.cpp:505
 msgid "Port to connect GDB to"
 msgstr ""
 
-#: config/internal/option-internal.cpp:506
+#: config/internal/option-internal.cpp:507
 msgid "Number of players in network"
 msgstr ""
 
-#: config/internal/option-internal.cpp:508
+#: config/internal/option-internal.cpp:509
 msgid "Maximum scale factor (0 = no limit)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:510
+#: config/internal/option-internal.cpp:511
 msgid "Pause game when main window loses focus"
 msgstr ""
 
-#: config/internal/option-internal.cpp:512
+#: config/internal/option-internal.cpp:513
 msgid "Enable RTC (vba-over.ini override is rtcEnabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:513
+#: config/internal/option-internal.cpp:514
 msgid "Native save (\"battery\") hardware type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:514
+#: config/internal/option-internal.cpp:515
 msgid "Show speed indicator"
 msgstr ""
 
-#: config/internal/option-internal.cpp:516
+#: config/internal/option-internal.cpp:517
 msgid "Draw on-screen messages transparently"
 msgstr ""
 
-#: config/internal/option-internal.cpp:517
+#: config/internal/option-internal.cpp:518
 msgid "Skip BIOS initialization"
 msgstr ""
 
-#: config/internal/option-internal.cpp:519
+#: config/internal/option-internal.cpp:520
 msgid "Do not overwrite cheat list when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:521
+#: config/internal/option-internal.cpp:522
 msgid "Do not overwrite native (battery) save when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:523
+#: config/internal/option-internal.cpp:524
 msgid "Throttle game speed, even when accelerated (0-450 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:526
+#: config/internal/option-internal.cpp:527
 msgid "Set throttle for speedup key (0-3000 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:528
+#: config/internal/option-internal.cpp:529
 msgid "Number of frames to skip with speedup (instead of speedup throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:531
+#: config/internal/option-internal.cpp:532
 msgid "Use frame skip for speedup throttle"
 msgstr ""
 
-#: config/internal/option-internal.cpp:532
+#: config/internal/option-internal.cpp:533
 msgid "Use the specified BIOS file for Game Boy"
 msgstr ""
 
-#: config/internal/option-internal.cpp:533
+#: config/internal/option-internal.cpp:534
 msgid "Use the specified BIOS file"
 msgstr ""
 
-#: config/internal/option-internal.cpp:535
+#: config/internal/option-internal.cpp:536
 msgid "Use the specified BIOS file for Game Boy Color"
 msgstr ""
 
-#: config/internal/option-internal.cpp:536
+#: config/internal/option-internal.cpp:537
 msgid "Wait for vertical sync"
 msgstr ""
 
-#: config/internal/option-internal.cpp:539
+#: config/internal/option-internal.cpp:540
 msgid "Enter fullscreen mode at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:540
+#: config/internal/option-internal.cpp:541
 msgid "Window maximized"
 msgstr ""
 
-#: config/internal/option-internal.cpp:541
+#: config/internal/option-internal.cpp:542
 msgid "Window height at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:542
+#: config/internal/option-internal.cpp:543
 msgid "Window width at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:543
+#: config/internal/option-internal.cpp:544
 msgid "Window axis X position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:544
+#: config/internal/option-internal.cpp:545
 msgid "Window axis Y position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:548
+#: config/internal/option-internal.cpp:549
 msgid "Capture key events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:550
+#: config/internal/option-internal.cpp:551
 msgid "Capture joy events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:551
+#: config/internal/option-internal.cpp:552
 msgid "Hide menu bar when mouse is inactive"
 msgstr ""
 
-#: config/internal/option-internal.cpp:553
+#: config/internal/option-internal.cpp:554
 msgid "Suspend screensaver when game is running"
 msgstr ""
 
-#: config/internal/option-internal.cpp:556
+#: config/internal/option-internal.cpp:557
 msgid "Sound API; if unsupported, default API will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:557
+#: config/internal/option-internal.cpp:558
 msgid "Device ID of chosen audio device for chosen driver"
 msgstr ""
 
-#: config/internal/option-internal.cpp:558
+#: config/internal/option-internal.cpp:559
 msgid "Number of sound buffers"
 msgstr ""
 
-#: config/internal/option-internal.cpp:559
+#: config/internal/option-internal.cpp:560
 msgid "Bit mask of sound channels to enable"
 msgstr ""
 
-#: config/internal/option-internal.cpp:560
+#: config/internal/option-internal.cpp:561
 msgid "Game Boy Advance sound filtering (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:562
+#: config/internal/option-internal.cpp:563
 msgid "Game Boy Advance sound interpolation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:563
+#: config/internal/option-internal.cpp:564
 msgid "Game Boy sound declicking"
 msgstr ""
 
-#: config/internal/option-internal.cpp:564
+#: config/internal/option-internal.cpp:565
 msgid "Game Boy echo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:565
+#: config/internal/option-internal.cpp:566
 msgid "Enable Game Boy sound effects"
 msgstr ""
 
-#: config/internal/option-internal.cpp:566
+#: config/internal/option-internal.cpp:567
 msgid "Game Boy stereo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:567
+#: config/internal/option-internal.cpp:568
 msgid "Game Boy surround sound effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:568
+#: config/internal/option-internal.cpp:569
 msgid "Sound sample rate (kHz)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:569
+#: config/internal/option-internal.cpp:570
 msgid "Use DirectSound hardware acceleration"
 msgstr ""
 
-#: config/internal/option-internal.cpp:570
+#: config/internal/option-internal.cpp:571
 msgid "Upmix stereo to surround"
 msgstr ""
 
-#: config/internal/option-internal.cpp:571
+#: config/internal/option-internal.cpp:572
 msgid "Sound volume (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:639
-#: config/internal/option-internal.cpp:659
-#: config/internal/option-internal.cpp:680
-#: config/internal/option-internal.cpp:700
-#: config/internal/option-internal.cpp:719
+#: config/internal/option-internal.cpp:640
+#: config/internal/option-internal.cpp:660
+#: config/internal/option-internal.cpp:681
+#: config/internal/option-internal.cpp:701
+#: config/internal/option-internal.cpp:720
 #, c-format
 msgid "Invalid value %s for option %s; valid values are %s"
 msgstr ""
@@ -769,7 +858,7 @@ msgstr ""
 msgid "Invalid value %d for option %s; valid values are %d - %d"
 msgstr ""
 
-#: config/option.cpp:480 opts.cpp:621 opts.cpp:630 opts.cpp:639 opts.cpp:648
+#: config/option.cpp:480 opts.cpp:468 opts.cpp:477 opts.cpp:486 opts.cpp:495
 #, c-format
 msgid "Invalid value %s for option %s"
 msgstr ""
@@ -934,19 +1023,19 @@ msgstr ""
 msgid "Key"
 msgstr ""
 
-#: dialogs/accel-config.cpp:149
+#: dialogs/accel-config.cpp:148
 msgid "Menu commands"
 msgstr ""
 
-#: dialogs/accel-config.cpp:261
+#: dialogs/accel-config.cpp:259
 msgid "This will clear all user-defined accelerators. Are you sure?"
 msgstr ""
 
-#: dialogs/accel-config.cpp:261 dialogs/accel-config.cpp:298
+#: dialogs/accel-config.cpp:259 dialogs/accel-config.cpp:306
 msgid "Confirm"
 msgstr ""
 
-#: dialogs/accel-config.cpp:295
+#: dialogs/accel-config.cpp:304
 #, c-format
 msgid "This will unassign \"%s\" from \"%s\". Are you sure?"
 msgstr ""
@@ -1318,22 +1407,22 @@ msgstr ""
 msgid "New Value"
 msgstr ""
 
-#: guiinit.cpp:2518
+#: guiinit.cpp:2519
 msgid "JoyBus host invalid; disabling"
 msgstr ""
 
-#: opts.cpp:298
+#: opts.cpp:154
 msgid ""
 "The INI file was written for a more recent version of VBA-M. Some INI option"
 " values may have been reset."
 msgstr ""
 
-#: opts.cpp:480 opts.cpp:500 opts.cpp:685
+#: opts.cpp:339 opts.cpp:355 opts.cpp:522
 #, c-format
 msgid "Invalid key binding %s for %s"
 msgstr ""
 
-#: opts.cpp:707
+#: opts.cpp:528
 #, c-format
 msgid "Unknown option %s with value %s"
 msgstr ""
@@ -1557,37 +1646,37 @@ msgstr ""
 msgid "%d %% (%d, %d fps)"
 msgstr ""
 
-#: sys.cpp:899 xrc/GBPrinter.xrc:65
+#: sys.cpp:898 xrc/GBPrinter.xrc:65
 msgid "&Discard"
 msgstr ""
 
-#: sys.cpp:933
+#: sys.cpp:932
 msgid "Image files (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 msgstr ""
 
-#: sys.cpp:942
+#: sys.cpp:941
 msgid "Save printer image to"
 msgstr ""
 
-#: sys.cpp:956 sys.cpp:1140
+#: sys.cpp:955 sys.cpp:1139
 #, c-format
 msgid "Wrote printer output to %s"
 msgstr ""
 
-#: sys.cpp:961 sys.cpp:1032
+#: sys.cpp:960 sys.cpp:1031
 msgid "&Close"
 msgstr ""
 
-#: sys.cpp:1027
+#: sys.cpp:1026
 msgid "Printed"
 msgstr ""
 
-#: sys.cpp:1302
+#: sys.cpp:1301
 #, c-format
 msgid "Error opening pseudo tty: %s"
 msgstr ""
 
-#: sys.cpp:1401
+#: sys.cpp:1400
 #, c-format
 msgid "Error setting up server socket (%d)"
 msgstr ""
@@ -1621,80 +1710,80 @@ msgstr ""
 msgid "Unable to load dialog %s from resources"
 msgstr ""
 
-#: wxvbam.cpp:398 wxvbam.cpp:415
+#: wxvbam.cpp:401 wxvbam.cpp:418
 #, c-format
 msgid "Invalid configuration file provided: %s"
 msgstr ""
 
-#: wxvbam.cpp:559
+#: wxvbam.cpp:558
 msgid "Could not create main window"
 msgstr ""
 
-#: wxvbam.cpp:634
+#: wxvbam.cpp:633
 msgid "Save built-in XRC file and exit"
 msgstr ""
 
-#: wxvbam.cpp:637
+#: wxvbam.cpp:636
 msgid "Save built-in vba-over.ini and exit"
 msgstr ""
 
-#: wxvbam.cpp:640
+#: wxvbam.cpp:639
 msgid "Print configuration path and exit"
 msgstr ""
 
-#: wxvbam.cpp:643
+#: wxvbam.cpp:642
 msgid "Start in full-screen mode"
 msgstr ""
 
-#: wxvbam.cpp:646
+#: wxvbam.cpp:645
 msgid "Set a configuration file"
 msgstr ""
 
-#: wxvbam.cpp:650
+#: wxvbam.cpp:649
 msgid "Delete shared link state first, if it exists"
 msgstr ""
 
-#: wxvbam.cpp:657
+#: wxvbam.cpp:656
 msgid "List all settable options and exit"
 msgstr ""
 
-#: wxvbam.cpp:660
+#: wxvbam.cpp:659
 msgid "ROM file"
 msgstr ""
 
-#: wxvbam.cpp:662
+#: wxvbam.cpp:661
 msgid "<config>=<value>"
 msgstr ""
 
-#: wxvbam.cpp:693
+#: wxvbam.cpp:692
 msgid "Configuration / build error: can't find built-in xrc"
 msgstr ""
 
-#: wxvbam.cpp:701
+#: wxvbam.cpp:700
 #, c-format
 msgid ""
 "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:"
 msgstr ""
 
-#: wxvbam.cpp:715
+#: wxvbam.cpp:714
 msgid "Configuration is read from, in order:"
 msgstr ""
 
-#: wxvbam.cpp:729
+#: wxvbam.cpp:728
 #, c-format
 msgid ""
 "Wrote built-in override file to %s\n"
 "To override, delete all but changed section. First found section is used from search path:"
 msgstr ""
 
-#: wxvbam.cpp:735
+#: wxvbam.cpp:734
 msgid ""
 "\n"
 "\tbuilt-in"
 msgstr ""
 
-#: wxvbam.cpp:750
+#: wxvbam.cpp:749
 msgid ""
 "Options set from the command line are saved if any configuration changes are made in the user interface.\n"
 "\n"
@@ -1702,17 +1791,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: wxvbam.cpp:758
+#: wxvbam.cpp:757
 msgid ""
 "The commands available for the Keyboard/* option are:\n"
 "\n"
 msgstr ""
 
-#: wxvbam.cpp:769
+#: wxvbam.cpp:768
 msgid "Configuration file not found."
 msgstr ""
 
-#: wxvbam.cpp:800
+#: wxvbam.cpp:799
 msgid "Bad configuration option or multiple ROM files given:\n"
 msgstr ""
 
@@ -2224,10 +2313,6 @@ msgstr ""
 msgid "&Number of frames to skip:"
 msgstr ""
 
-#: xrc/DisplayConfig.xrc:200
-msgid "Speed"
-msgstr ""
-
 #: xrc/DisplayConfig.xrc:216
 msgid "Speed indicator:"
 msgstr ""
@@ -2763,58 +2848,10 @@ msgid ""
 " entire contents if too small."
 msgstr ""
 
-#: xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
-msgid "Up"
-msgstr ""
-
-#: xrc/JoyPanel.xrc:37
-msgid "A"
-msgstr ""
-
-#: xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
-msgid "Down"
-msgstr ""
-
-#: xrc/JoyPanel.xrc:83
-msgid "B"
-msgstr ""
-
-#: xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
-msgid "Left"
-msgstr ""
-
-#: xrc/JoyPanel.xrc:129
-msgid "L"
-msgstr ""
-
-#: xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
-msgid "Right"
-msgstr ""
-
-#: xrc/JoyPanel.xrc:175
-msgid "R"
-msgstr ""
-
-#: xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
-msgid "Select"
-msgstr ""
-
-#: xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
-msgid "Start"
-msgstr ""
-
-#: xrc/JoyPanel.xrc:254
-msgid "Motion Up"
-msgstr ""
-
 #: xrc/JoyPanel.xrc:276
 msgid "Autofire A"
 msgstr ""
 
-#: xrc/JoyPanel.xrc:298
-msgid "Motion Down"
-msgstr ""
-
 #: xrc/JoyPanel.xrc:320
 msgid "Autofire B"
 msgstr ""
diff --git a/po/wxvbam/ko_KR.po b/po/wxvbam/ko_KR.po
index c24128d5..54a883e5 100644
--- a/po/wxvbam/ko_KR.po
+++ b/po/wxvbam/ko_KR.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VBA-M\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-23 22:00+0000\n"
+"POT-Creation-Date: 2024-04-24 02:00+0000\n"
 "PO-Revision-Date: 2011-12-03 19:42+0000\n"
 "Last-Translator: Hoseok Seo <ddinghoya@gmail.com>, 2022-2023\n"
 "Language-Team: Korean (Korea) (http://app.transifex.com/bgk/vba-m/language/ko_KR/)\n"
@@ -323,174 +323,263 @@ msgstr "랜 링크가 이미 활성화되어 있습니다. 연결을 끊으려
 msgid "Network is not supported in local mode."
 msgstr "로컬 모드에서는 네트워크가 지원되지 않음."
 
-#: config/internal/option-internal.cpp:379
+#: config/command.cpp:28 xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
+msgid "Up"
+msgstr "상"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
+msgid "Down"
+msgstr "하"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
+msgid "Left"
+msgstr "좌"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
+msgid "Right"
+msgstr "우"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:37
+msgid "A"
+msgstr "A"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:83
+msgid "B"
+msgstr "B"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:129
+msgid "L"
+msgstr "L"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:175
+msgid "R"
+msgstr "R"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
+msgid "Select"
+msgstr "Select"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
+msgid "Start"
+msgstr "Start"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:254
+msgid "Motion Up"
+msgstr "위 동작"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:298
+msgid "Motion Down"
+msgstr "아래 동작"
+
+#: config/command.cpp:30
+msgid "Motion Left"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion Right"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion In"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Motion Out"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto A"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto B"
+msgstr ""
+
+#: config/command.cpp:31 xrc/DisplayConfig.xrc:200
+msgid "Speed"
+msgstr "속도"
+
+#: config/command.cpp:31
+msgid "Capture"
+msgstr ""
+
+#: config/command.cpp:32
+msgid "GameShark"
+msgstr ""
+
+#: config/command.cpp:106
+#, c-format
+msgid "Joypad %zu %s"
+msgstr ""
+
+#: config/internal/option-internal.cpp:380
 msgid "Use bilinear filter with 3d renderer"
 msgstr "3d 렌더러와 함께 이중선형 필터 사용"
 
-#: config/internal/option-internal.cpp:380
+#: config/internal/option-internal.cpp:381
 msgid "Full-screen filter to apply"
 msgstr "적용할 전체화면 필터"
 
-#: config/internal/option-internal.cpp:381
+#: config/internal/option-internal.cpp:382
 msgid "Filter plugin library"
 msgstr "필터 플러그인 라이브러리"
 
-#: config/internal/option-internal.cpp:382
+#: config/internal/option-internal.cpp:383
 msgid "Interframe blending function"
 msgstr "인터프레임 블렌딩 기능"
 
-#: config/internal/option-internal.cpp:383
+#: config/internal/option-internal.cpp:384
 msgid "Keep window on top"
 msgstr "창을 맨 위에 유지"
 
-#: config/internal/option-internal.cpp:385
+#: config/internal/option-internal.cpp:386
 msgid "Maximum number of threads to run filters in"
 msgstr "필터를 실행할 최대 스레드 수"
 
-#: config/internal/option-internal.cpp:387
+#: config/internal/option-internal.cpp:388
 msgid "Render method; if unsupported, simple method will be used"
 msgstr "렌더링 방법; 지원되지 않는 경우 간단한 방법 사용"
 
-#: config/internal/option-internal.cpp:388
+#: config/internal/option-internal.cpp:389
 msgid "Default scale factor"
 msgstr "기본 스케일 팩터"
 
-#: config/internal/option-internal.cpp:389
+#: config/internal/option-internal.cpp:390
 msgid "Retain aspect ratio when resizing"
 msgstr "크기 조정 시 화면비 유지"
 
-#: config/internal/option-internal.cpp:392
+#: config/internal/option-internal.cpp:393
 msgid "BIOS file to use for Game Boy, if enabled"
 msgstr "활성화된 경우, 게임보이에서 사용할 바이오스 파일"
 
-#: config/internal/option-internal.cpp:393
+#: config/internal/option-internal.cpp:394
 msgid "Game Boy color enhancement, if enabled"
 msgstr "활성화된 경우, 게임보이 색상 향상"
 
-#: config/internal/option-internal.cpp:394
+#: config/internal/option-internal.cpp:395
 msgid "Enable DX Colorization Hacks"
 msgstr "DX 색상화 해킹 활성화"
 
-#: config/internal/option-internal.cpp:395
-#: config/internal/option-internal.cpp:419
+#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:420
 msgid "Apply LCD filter, if enabled"
 msgstr "활성화된 경우, LCD 필터 적용"
 
-#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:397
 msgid "BIOS file to use for Game Boy Color, if enabled"
 msgstr "활성화된 경우, 게임보이 컬러에 사용할 바이오스 파일"
 
-#: config/internal/option-internal.cpp:398
+#: config/internal/option-internal.cpp:399
 msgid ""
 "The default palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr "기본 팔레트, 8개의 쉼표로 구분된 4자리 16진수 정수 (rgb555) 입니다."
 
-#: config/internal/option-internal.cpp:401
+#: config/internal/option-internal.cpp:402
 msgid ""
 "The first user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr "첫 번째 사용자 팔레트, 8개의 쉼표로 구분된 4자리 16진수 정수 (rgb555) 입니다."
 
-#: config/internal/option-internal.cpp:404
+#: config/internal/option-internal.cpp:405
 msgid ""
 "The second user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr "두 번째 사용자 팔레트, 8개의 쉼표로 구분된 4자리 16진수 정수 (rgb555) 입니다."
 
-#: config/internal/option-internal.cpp:407
+#: config/internal/option-internal.cpp:408
 msgid "Automatically gather a full page before printing"
 msgstr "출력하기 전에 자동으로 전체 페이지 수집"
 
-#: config/internal/option-internal.cpp:409
+#: config/internal/option-internal.cpp:410
 msgid "Automatically save printouts as screen captures with -print suffix"
 msgstr "-print 접미사를 사용하여 출력물을 화면 캡처로 자동 저장"
 
-#: config/internal/option-internal.cpp:411
-#: config/internal/option-internal.cpp:439
+#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:440
 msgid "Directory to look for ROM files"
 msgstr "ROM 파일을 찾을 디렉토리"
 
-#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:413
 msgid "Directory to look for Game Boy Color ROM files"
 msgstr "게임보이 컬러 롬 파일을 찾을 디렉토리"
 
-#: config/internal/option-internal.cpp:415
+#: config/internal/option-internal.cpp:416
 msgid "BIOS file to use, if enabled"
 msgstr "활성화된 경우, 사용할 BIOS 파일"
 
-#: config/internal/option-internal.cpp:425
+#: config/internal/option-internal.cpp:426
 msgid "Enable link at boot"
 msgstr "부팅 시 링크 활성화"
 
-#: config/internal/option-internal.cpp:430
+#: config/internal/option-internal.cpp:431
 msgid "Enable faster network protocol by default"
 msgstr "기본적으로 더 빠른 네트워크 프로토콜 활성화"
 
-#: config/internal/option-internal.cpp:432
+#: config/internal/option-internal.cpp:433
 msgid "Default network link client host"
 msgstr "기본 네트워크 링크 클라이언트 호스트"
 
-#: config/internal/option-internal.cpp:433
+#: config/internal/option-internal.cpp:434
 msgid "Default network link server IP to bind"
 msgstr "바인딩할 기본 네트워크 링크 서버 IP"
 
-#: config/internal/option-internal.cpp:434
+#: config/internal/option-internal.cpp:435
 msgid "Default network link port (server and client)"
 msgstr "기본 네트워크 링크 포트 (서버 및 클라이언트)"
 
-#: config/internal/option-internal.cpp:435
+#: config/internal/option-internal.cpp:436
 msgid "Default network protocol"
 msgstr "기본 네트워크 프로토콜"
 
-#: config/internal/option-internal.cpp:436
+#: config/internal/option-internal.cpp:437
 msgid "Link timeout (ms)"
 msgstr "링크 시간 초과 (ms)"
 
-#: config/internal/option-internal.cpp:437
+#: config/internal/option-internal.cpp:438
 msgid "Link cable type"
 msgstr "링크 케이블 유형"
 
-#: config/internal/option-internal.cpp:442
+#: config/internal/option-internal.cpp:443
 msgid "Automatically load last saved state"
 msgstr "마지막으로 저장된 상태를 자동으로 불러오기"
 
-#: config/internal/option-internal.cpp:444
+#: config/internal/option-internal.cpp:445
 msgid ""
 "Directory to store game save files (relative paths are relative to ROM; "
 "blank is config dir)"
 msgstr "게임 저장 파일을 저장할 디렉터리 (상대 경로는 ROM에 상대적이며 공백은 구성 디렉토리임)"
 
-#: config/internal/option-internal.cpp:446
+#: config/internal/option-internal.cpp:447
 msgid "Freeze recent load list"
 msgstr "최근 불러오기 목록 고정"
 
-#: config/internal/option-internal.cpp:448
+#: config/internal/option-internal.cpp:449
 msgid ""
 "Directory to store A / V and game recordings (relative paths are relative to"
 " ROM)"
 msgstr "A / V 및 게임 녹화를 저장할 디렉토리 (상대 경로는 롬을 기준으로 함)"
 
-#: config/internal/option-internal.cpp:451
+#: config/internal/option-internal.cpp:452
 msgid "Number of seconds between rewind snapshots (0 to disable)"
 msgstr "되감기 스냅샷 사이의 초 수( 비활성화하려면 0)"
 
-#: config/internal/option-internal.cpp:453
+#: config/internal/option-internal.cpp:454
 msgid "Directory to store screenshots (relative paths are relative to ROM)"
 msgstr "스크린샷을 저장할 디렉토리 (상대 경로는 ROM에 상대적임)"
 
-#: config/internal/option-internal.cpp:456
+#: config/internal/option-internal.cpp:457
 msgid ""
 "Directory to store saved state files (relative paths are relative to "
 "BatteryDir)"
 msgstr "저장된 상태 파일을 저장할 디렉토리 (상대 경로는 BatteryDir에 상대적임)"
 
-#: config/internal/option-internal.cpp:458
+#: config/internal/option-internal.cpp:459
 msgid "Enable status bar"
 msgstr "상태 표시줄 활성화"
 
-#: config/internal/option-internal.cpp:459
+#: config/internal/option-internal.cpp:460
 msgid "INI file version (DO NOT MODIFY)"
 msgstr "INI 파일 버전 (수정 금지)"
 
-#: config/internal/option-internal.cpp:463
+#: config/internal/option-internal.cpp:464
 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, "
@@ -498,266 +587,266 @@ msgid ""
 "MotionRight, AutoA, AutoB, Speed, Capture, GS"
 msgstr "조이패드/<n>/<button> 매개변수에는 조이패드 #<n> 버튼 <button>에 매핑되는 쉼표로 구분된 키 이름 목록이 포함되어 있습니다. 버튼은 위쪽, 아래쪽, 왼쪽, 오른쪽, A, B, L, R, 선택, 시작, 모션위쪽, 모션아래쪽, 모션왼쪽, 모션오른쪽, 자동A, 자동B, 속도, 캡쳐, GS 중 하나입니다."
 
-#: config/internal/option-internal.cpp:468
+#: config/internal/option-internal.cpp:469
 msgid "The autofire toggle period, in frames (1/60 s)"
 msgstr "연사 토글 주기, 프레임 단위 (1/60 초)"
 
-#: config/internal/option-internal.cpp:469
+#: config/internal/option-internal.cpp:470
 msgid "The number of the stick to use in single-player mode"
 msgstr "싱글 플레이어 모드에서 사용할 스틱의 수"
 
-#: config/internal/option-internal.cpp:471
+#: config/internal/option-internal.cpp:472
 msgid "Whether to enable SDL GameController mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:475
+#: config/internal/option-internal.cpp:476
 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 "
 "executed."
 msgstr "매개변수 키보드/<cmd>에는 쉼표로 구분된 키 이름 목록이 포함되어 있습니다 (예: Alt-Shift-F1). 이름이 지정된 키를 누르면 명령 <cmd>가 실행됩니다."
 
-#: config/internal/option-internal.cpp:480
+#: config/internal/option-internal.cpp:481
 msgid "Enable AGB debug print"
 msgstr "AGB 디버그 출력 활성화"
 
-#: config/internal/option-internal.cpp:481
+#: config/internal/option-internal.cpp:482
 msgid "Auto skip frames"
 msgstr "프레임 자동 건너뛰기"
 
-#: config/internal/option-internal.cpp:483
+#: config/internal/option-internal.cpp:484
 msgid "Apply IPS / UPS / IPF patches if found"
 msgstr "발견 시 IPS / UPS / IPF 패치 적용"
 
-#: config/internal/option-internal.cpp:485
+#: config/internal/option-internal.cpp:486
 msgid "Automatically save and load cheat list"
 msgstr "치트 목록 자동 저장 및 불러오기"
 
-#: config/internal/option-internal.cpp:489
+#: config/internal/option-internal.cpp:490
 msgid "Automatically enable border for Super Game Boy games"
 msgstr "슈퍼 게임보이 게임에서 테두리 자동 활성화"
 
-#: config/internal/option-internal.cpp:491
+#: config/internal/option-internal.cpp:492
 msgid "Always enable border"
 msgstr "항상 테두리 활성화"
 
-#: config/internal/option-internal.cpp:492
+#: config/internal/option-internal.cpp:493
 msgid "Screen capture file format"
 msgstr "화면 캡처 파일 형식"
 
-#: config/internal/option-internal.cpp:493
+#: config/internal/option-internal.cpp:494
 msgid "Enable cheats"
 msgstr "치트 활성화"
 
-#: config/internal/option-internal.cpp:494
+#: config/internal/option-internal.cpp:495
 msgid "Disable on-screen status messages"
 msgstr "화면 상태 메시지 비활성화"
 
-#: config/internal/option-internal.cpp:495
+#: config/internal/option-internal.cpp:496
 msgid "Type of system to emulate"
 msgstr "에뮬레이션할 시스템 유형"
 
-#: config/internal/option-internal.cpp:496
+#: config/internal/option-internal.cpp:497
 msgid "Flash size 0 = 64 KB 1 = 128 KB"
 msgstr "플래시 크기 0 = 64 KB 1 = 128 KB"
 
-#: config/internal/option-internal.cpp:498
+#: config/internal/option-internal.cpp:499
 msgid "Skip frames. Values are 0-9 or -1 to skip automatically based on time."
 msgstr "프레임 건너뛰기입니다. 값은 0-9 또는 -1이며 시간에 따라 자동으로 건너뜁니다."
 
-#: config/internal/option-internal.cpp:500
+#: config/internal/option-internal.cpp:501
 msgid "The palette to use"
 msgstr "사용할 팔레트"
 
-#: config/internal/option-internal.cpp:501
+#: config/internal/option-internal.cpp:502
 msgid "Enable printer emulation"
 msgstr "프린터 에뮬레이션 활성화"
 
-#: config/internal/option-internal.cpp:503
+#: config/internal/option-internal.cpp:504
 msgid "Break into GDB after loading the game."
 msgstr "게임을 불러온 후 GDB에 개입합니다."
 
-#: config/internal/option-internal.cpp:504
+#: config/internal/option-internal.cpp:505
 msgid "Port to connect GDB to"
 msgstr "GDB를 연결할 포트"
 
-#: config/internal/option-internal.cpp:506
+#: config/internal/option-internal.cpp:507
 msgid "Number of players in network"
 msgstr "네트워크의 플레이어 수"
 
-#: config/internal/option-internal.cpp:508
+#: config/internal/option-internal.cpp:509
 msgid "Maximum scale factor (0 = no limit)"
 msgstr "최대 스케일 팩터 (0 = 제한 없음)"
 
-#: config/internal/option-internal.cpp:510
+#: config/internal/option-internal.cpp:511
 msgid "Pause game when main window loses focus"
 msgstr "기본 창에서 포커스를 잃으면 게임 일시 중지"
 
-#: config/internal/option-internal.cpp:512
+#: config/internal/option-internal.cpp:513
 msgid "Enable RTC (vba-over.ini override is rtcEnabled"
 msgstr "RTC 활성화 (vba-over.ini 재정의는 rtcEnabled임"
 
-#: config/internal/option-internal.cpp:513
+#: config/internal/option-internal.cpp:514
 msgid "Native save (\"battery\") hardware type"
 msgstr "기본 저장 (\"배터리\") 하드웨어 유형"
 
-#: config/internal/option-internal.cpp:514
+#: config/internal/option-internal.cpp:515
 msgid "Show speed indicator"
 msgstr "속도 표시기 표시"
 
-#: config/internal/option-internal.cpp:516
+#: config/internal/option-internal.cpp:517
 msgid "Draw on-screen messages transparently"
 msgstr "화면 메시지를 투명하게 그리기"
 
-#: config/internal/option-internal.cpp:517
+#: config/internal/option-internal.cpp:518
 msgid "Skip BIOS initialization"
 msgstr "BIOS 초기화 건너뛰기"
 
-#: config/internal/option-internal.cpp:519
+#: config/internal/option-internal.cpp:520
 msgid "Do not overwrite cheat list when loading state"
 msgstr "상태를 불러올 때 치트 목록을 덮어쓰지 않음"
 
-#: config/internal/option-internal.cpp:521
+#: config/internal/option-internal.cpp:522
 msgid "Do not overwrite native (battery) save when loading state"
 msgstr "상태를 불러올 때 기본 (배터리) 저장을 덮어쓰지 않음"
 
-#: config/internal/option-internal.cpp:523
+#: config/internal/option-internal.cpp:524
 msgid "Throttle game speed, even when accelerated (0-450 %, 0 = no throttle)"
 msgstr "가속 시에도 게임 속도 조절 (0-450%, 0 = 스로틀 없음)"
 
-#: config/internal/option-internal.cpp:526
+#: config/internal/option-internal.cpp:527
 msgid "Set throttle for speedup key (0-3000 %, 0 = no throttle)"
 msgstr "속도 향상 키의 스로틀 설정 (0-3000%, 0 = 스로틀 없음)"
 
-#: config/internal/option-internal.cpp:528
+#: config/internal/option-internal.cpp:529
 msgid "Number of frames to skip with speedup (instead of speedup throttle)"
 msgstr "속도 향상으로 건너뛸 프레임 수 (속도 향상 스로틀 대신)"
 
-#: config/internal/option-internal.cpp:531
+#: config/internal/option-internal.cpp:532
 msgid "Use frame skip for speedup throttle"
 msgstr "스로틀 속도 향상을 위해 프레임 건너뛰기 사용"
 
-#: config/internal/option-internal.cpp:532
+#: config/internal/option-internal.cpp:533
 msgid "Use the specified BIOS file for Game Boy"
 msgstr "게임보이에 지정된 바이오스 파일 사용"
 
-#: config/internal/option-internal.cpp:533
+#: config/internal/option-internal.cpp:534
 msgid "Use the specified BIOS file"
 msgstr "지정된 BIOS 파일 사용"
 
-#: config/internal/option-internal.cpp:535
+#: config/internal/option-internal.cpp:536
 msgid "Use the specified BIOS file for Game Boy Color"
 msgstr "게임보이 컬러에 지정된 바이오스 파일 사용"
 
-#: config/internal/option-internal.cpp:536
+#: config/internal/option-internal.cpp:537
 msgid "Wait for vertical sync"
 msgstr "수직 동기화 대기"
 
-#: config/internal/option-internal.cpp:539
+#: config/internal/option-internal.cpp:540
 msgid "Enter fullscreen mode at startup"
 msgstr "시작 시 전체 화면 모드 시작"
 
-#: config/internal/option-internal.cpp:540
+#: config/internal/option-internal.cpp:541
 msgid "Window maximized"
 msgstr "창 최대화"
 
-#: config/internal/option-internal.cpp:541
+#: config/internal/option-internal.cpp:542
 msgid "Window height at startup"
 msgstr "시작 시 창 높이"
 
-#: config/internal/option-internal.cpp:542
+#: config/internal/option-internal.cpp:543
 msgid "Window width at startup"
 msgstr "시작 시 창 너비"
 
-#: config/internal/option-internal.cpp:543
+#: config/internal/option-internal.cpp:544
 msgid "Window axis X position at startup"
 msgstr "시작 시 창 축 X 위치"
 
-#: config/internal/option-internal.cpp:544
+#: config/internal/option-internal.cpp:545
 msgid "Window axis Y position at startup"
 msgstr "시작 시 창 축 Y 위치"
 
-#: config/internal/option-internal.cpp:548
+#: config/internal/option-internal.cpp:549
 msgid "Capture key events while on background"
 msgstr "백그라운드에서 주요 이벤트 캡처"
 
-#: config/internal/option-internal.cpp:550
+#: config/internal/option-internal.cpp:551
 msgid "Capture joy events while on background"
 msgstr "백그라운드에서 조이 이벤트 캡처"
 
-#: config/internal/option-internal.cpp:551
+#: config/internal/option-internal.cpp:552
 msgid "Hide menu bar when mouse is inactive"
 msgstr "마우스가 비활성 상태일 때 메뉴 표시줄 숨기기"
 
-#: config/internal/option-internal.cpp:553
+#: config/internal/option-internal.cpp:554
 msgid "Suspend screensaver when game is running"
 msgstr "게임이 실행 중일 때 화면 보호기 일시 중지"
 
-#: config/internal/option-internal.cpp:556
+#: config/internal/option-internal.cpp:557
 msgid "Sound API; if unsupported, default API will be used"
 msgstr "사운드 API; 지원되지 않는 경우 기본 API 사용"
 
-#: config/internal/option-internal.cpp:557
+#: config/internal/option-internal.cpp:558
 msgid "Device ID of chosen audio device for chosen driver"
 msgstr "선택한 드라이버에 대해 선택한 오디오 장치의 장치 ID"
 
-#: config/internal/option-internal.cpp:558
+#: config/internal/option-internal.cpp:559
 msgid "Number of sound buffers"
 msgstr "사운드 버퍼 수"
 
-#: config/internal/option-internal.cpp:559
+#: config/internal/option-internal.cpp:560
 msgid "Bit mask of sound channels to enable"
 msgstr "활성화할 사운드 채널의 비트 마스크"
 
-#: config/internal/option-internal.cpp:560
+#: config/internal/option-internal.cpp:561
 msgid "Game Boy Advance sound filtering (%)"
 msgstr "게임보이 어드밴스 사운드 필터링 (%)"
 
-#: config/internal/option-internal.cpp:562
+#: config/internal/option-internal.cpp:563
 msgid "Game Boy Advance sound interpolation"
 msgstr "게임보이 어드밴스 사운드 보간"
 
-#: config/internal/option-internal.cpp:563
+#: config/internal/option-internal.cpp:564
 msgid "Game Boy sound declicking"
 msgstr "게임보이 사운드 감소"
 
-#: config/internal/option-internal.cpp:564
+#: config/internal/option-internal.cpp:565
 msgid "Game Boy echo effect (%)"
 msgstr "게임보이 에코 효과 (%)"
 
-#: config/internal/option-internal.cpp:565
+#: config/internal/option-internal.cpp:566
 msgid "Enable Game Boy sound effects"
 msgstr "게임보이 사운드 효과 활성화"
 
-#: config/internal/option-internal.cpp:566
+#: config/internal/option-internal.cpp:567
 msgid "Game Boy stereo effect (%)"
 msgstr "게임보이 스테레오 효과 (%)"
 
-#: config/internal/option-internal.cpp:567
+#: config/internal/option-internal.cpp:568
 msgid "Game Boy surround sound effect (%)"
 msgstr "게임보이 서라운드 사운드 효과 (%)"
 
-#: config/internal/option-internal.cpp:568
+#: config/internal/option-internal.cpp:569
 msgid "Sound sample rate (kHz)"
 msgstr "사운드 샘플링 속도 (kHz)"
 
-#: config/internal/option-internal.cpp:569
+#: config/internal/option-internal.cpp:570
 msgid "Use DirectSound hardware acceleration"
 msgstr ""
 
-#: config/internal/option-internal.cpp:570
+#: config/internal/option-internal.cpp:571
 msgid "Upmix stereo to surround"
 msgstr ""
 
-#: config/internal/option-internal.cpp:571
+#: config/internal/option-internal.cpp:572
 msgid "Sound volume (%)"
 msgstr "사운드 볼륨 (%)"
 
-#: config/internal/option-internal.cpp:639
-#: config/internal/option-internal.cpp:659
-#: config/internal/option-internal.cpp:680
-#: config/internal/option-internal.cpp:700
-#: config/internal/option-internal.cpp:719
+#: config/internal/option-internal.cpp:640
+#: config/internal/option-internal.cpp:660
+#: config/internal/option-internal.cpp:681
+#: config/internal/option-internal.cpp:701
+#: config/internal/option-internal.cpp:720
 #, c-format
 msgid "Invalid value %s for option %s; valid values are %s"
 msgstr "옵션 %s 에 대한 잘못된 값 %s; 유효한 값은 %s"
@@ -772,7 +861,7 @@ msgstr "%f 값은 %s 옵션에 무효합니다; 유효한 값은 %f - %f입니
 msgid "Invalid value %d for option %s; valid values are %d - %d"
 msgstr "%d 값은 %s 옵션에 무효합니다; 유효한 값은 %d - %d입니다."
 
-#: config/option.cpp:480 opts.cpp:621 opts.cpp:630 opts.cpp:639 opts.cpp:648
+#: config/option.cpp:480 opts.cpp:468 opts.cpp:477 opts.cpp:486 opts.cpp:495
 #, c-format
 msgid "Invalid value %s for option %s"
 msgstr "옵션 %s 에 대해 유효하지 않은 값 %s"
@@ -937,19 +1026,19 @@ msgstr "Meta+"
 msgid "Key"
 msgstr ""
 
-#: dialogs/accel-config.cpp:149
+#: dialogs/accel-config.cpp:148
 msgid "Menu commands"
 msgstr "메뉴 명령"
 
-#: dialogs/accel-config.cpp:261
+#: dialogs/accel-config.cpp:259
 msgid "This will clear all user-defined accelerators. Are you sure?"
 msgstr "이렇게 하면 모든 사용자 정의 가속기가 지워집니다. 확실한가요?"
 
-#: dialogs/accel-config.cpp:261 dialogs/accel-config.cpp:298
+#: dialogs/accel-config.cpp:259 dialogs/accel-config.cpp:306
 msgid "Confirm"
 msgstr "확인"
 
-#: dialogs/accel-config.cpp:295
+#: dialogs/accel-config.cpp:304
 #, c-format
 msgid "This will unassign \"%s\" from \"%s\". Are you sure?"
 msgstr "이렇게 하면 \"%s\"에서 \"%s\"의 할당이 해제됩니다. 확실한가요?"
@@ -1321,22 +1410,22 @@ msgstr "오래된 값"
 msgid "New Value"
 msgstr "새로운 값"
 
-#: guiinit.cpp:2518
+#: guiinit.cpp:2519
 msgid "JoyBus host invalid; disabling"
 msgstr "조이버스 호스트 무효; 비활성화합니다."
 
-#: opts.cpp:298
+#: opts.cpp:154
 msgid ""
 "The INI file was written for a more recent version of VBA-M. Some INI option"
 " values may have been reset."
 msgstr "INI 파일은 최신 버전의 VBA-M용으로 작성되었습니다. 일부 INI 옵션 값이 재설정되었을 수 있습니다."
 
-#: opts.cpp:480 opts.cpp:500 opts.cpp:685
+#: opts.cpp:339 opts.cpp:355 opts.cpp:522
 #, c-format
 msgid "Invalid key binding %s for %s"
 msgstr " %s 키는 %s에 무효한 키 설정입니다."
 
-#: opts.cpp:707
+#: opts.cpp:528
 #, c-format
 msgid "Unknown option %s with value %s"
 msgstr "값이 %s 알 수 없는 옵션 %s"
@@ -1560,37 +1649,37 @@ msgstr "재생 종료."
 msgid "%d %% (%d, %d fps)"
 msgstr "%d %% (%d, %d fps)"
 
-#: sys.cpp:899 xrc/GBPrinter.xrc:65
+#: sys.cpp:898 xrc/GBPrinter.xrc:65
 msgid "&Discard"
 msgstr "버리기(&D)"
 
-#: sys.cpp:933
+#: sys.cpp:932
 msgid "Image files (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 msgstr "이미지 파일 (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 
-#: sys.cpp:942
+#: sys.cpp:941
 msgid "Save printer image to"
 msgstr "프린터 이미지 저장 : "
 
-#: sys.cpp:956 sys.cpp:1140
+#: sys.cpp:955 sys.cpp:1139
 #, c-format
 msgid "Wrote printer output to %s"
 msgstr "프린터 출력을 %s에 작성했습니다."
 
-#: sys.cpp:961 sys.cpp:1032
+#: sys.cpp:960 sys.cpp:1031
 msgid "&Close"
 msgstr "닫기(&C)"
 
-#: sys.cpp:1027
+#: sys.cpp:1026
 msgid "Printed"
 msgstr "출력됨"
 
-#: sys.cpp:1302
+#: sys.cpp:1301
 #, c-format
 msgid "Error opening pseudo tty: %s"
 msgstr "가상 tty %s를 열 수 없습니다."
 
-#: sys.cpp:1401
+#: sys.cpp:1400
 #, c-format
 msgid "Error setting up server socket (%d)"
 msgstr "서버 소켓을 설정할 수 없습니다. (%d)"
@@ -1624,80 +1713,80 @@ msgstr ""
 msgid "Unable to load dialog %s from resources"
 msgstr "리소스로부터 대화 %s을 불러올 수 없습니다."
 
-#: wxvbam.cpp:398 wxvbam.cpp:415
+#: wxvbam.cpp:401 wxvbam.cpp:418
 #, c-format
 msgid "Invalid configuration file provided: %s"
 msgstr "제공된 구성 파일이 잘못되었습니다: %s"
 
-#: wxvbam.cpp:559
+#: wxvbam.cpp:558
 msgid "Could not create main window"
 msgstr "메인 윈도우를 생성할 수 없습니다."
 
-#: wxvbam.cpp:634
+#: wxvbam.cpp:633
 msgid "Save built-in XRC file and exit"
 msgstr "built-in XRC 파일을 저장하고 종료합니다."
 
-#: wxvbam.cpp:637
+#: wxvbam.cpp:636
 msgid "Save built-in vba-over.ini and exit"
 msgstr "built-in vba-over.ini 를 저장하고 종료합니다."
 
-#: wxvbam.cpp:640
+#: wxvbam.cpp:639
 msgid "Print configuration path and exit"
 msgstr "설정 경로를 출력하고 종료합니다."
 
-#: wxvbam.cpp:643
+#: wxvbam.cpp:642
 msgid "Start in full-screen mode"
 msgstr "전체화면으로 시작합니다."
 
-#: wxvbam.cpp:646
+#: wxvbam.cpp:645
 msgid "Set a configuration file"
 msgstr "구성 설정 파일을 설정합니다."
 
-#: wxvbam.cpp:650
+#: wxvbam.cpp:649
 msgid "Delete shared link state first, if it exists"
 msgstr "shared link state 파일이 존재한다면 삭제합니다."
 
-#: wxvbam.cpp:657
+#: wxvbam.cpp:656
 msgid "List all settable options and exit"
 msgstr "설정 가능한 옵션을 나열하고 종료합니다."
 
-#: wxvbam.cpp:660
+#: wxvbam.cpp:659
 msgid "ROM file"
 msgstr "ROM 파일"
 
-#: wxvbam.cpp:662
+#: wxvbam.cpp:661
 msgid "<config>=<value>"
 msgstr "<config>=<value>"
 
-#: wxvbam.cpp:693
+#: wxvbam.cpp:692
 msgid "Configuration / build error: can't find built-in xrc"
 msgstr "구성 / 빌드 오류: 기본 제공 xrc를 찾을 수 없음"
 
-#: wxvbam.cpp:701
+#: wxvbam.cpp:700
 #, c-format
 msgid ""
 "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:"
 msgstr "기본 구성을 %s로 작성했습니다.\n재정의하려면 변경된 루트 노드를 제외한 모든 노드를 제거하세요. 다음 검색 경로에서 .xrc 또는 .xrs 파일에서 올바른 이름의 루트 노드를 처음 발견하면 기본값이 재정의됩니다:"
 
-#: wxvbam.cpp:715
+#: wxvbam.cpp:714
 msgid "Configuration is read from, in order:"
 msgstr "설정은 다음으로부터 순서대로 불러옵니다 :"
 
-#: wxvbam.cpp:729
+#: wxvbam.cpp:728
 #, c-format
 msgid ""
 "Wrote built-in override file to %s\n"
 "To override, delete all but changed section. First found section is used from search path:"
 msgstr "기본 제공 오버라이드 파일을 %s로 작성했습니다.\n재정의하려면 변경된 섹션을 제외한 모든 섹션을 삭제합니다. 검색 경로에서 처음 찾은 섹션이 사용됩니다:"
 
-#: wxvbam.cpp:735
+#: wxvbam.cpp:734
 msgid ""
 "\n"
 "\tbuilt-in"
 msgstr "\n\t빌트인"
 
-#: wxvbam.cpp:750
+#: wxvbam.cpp:749
 msgid ""
 "Options set from the command line are saved if any configuration changes are made in the user interface.\n"
 "\n"
@@ -1705,17 +1794,17 @@ msgid ""
 "\n"
 msgstr "사용자 인터페이스에서 설정이 변경되면, 명령 줄에서 선택된 옵션이 저장됩니다. \n\n플래그 옵션에서, true와 false는 각각 1과 0으로 지정됩니다.\n\n"
 
-#: wxvbam.cpp:758
+#: wxvbam.cpp:757
 msgid ""
 "The commands available for the Keyboard/* option are:\n"
 "\n"
 msgstr "키보드 / * 옵션으로 사용 가능한 수준 :\n\n"
 
-#: wxvbam.cpp:769
+#: wxvbam.cpp:768
 msgid "Configuration file not found."
 msgstr "설정 파일을 찾을 수 없습니다."
 
-#: wxvbam.cpp:800
+#: wxvbam.cpp:799
 msgid "Bad configuration option or multiple ROM files given:\n"
 msgstr "설정 옵션이 잘못되었거나, 여러 개의 ROM 파일이 주어졌습니다:\n"
 
@@ -2227,10 +2316,6 @@ msgstr "프레임 생략"
 msgid "&Number of frames to skip:"
 msgstr "건너뛸 프레임 수(&N):"
 
-#: xrc/DisplayConfig.xrc:200
-msgid "Speed"
-msgstr "속도"
-
 #: xrc/DisplayConfig.xrc:216
 msgid "Speed indicator:"
 msgstr "속도 표시기:"
@@ -2766,58 +2851,10 @@ msgid ""
 " entire contents if too small."
 msgstr "필드를 클릭하고 키를 누르거나 조이스틱을 움직여 추가합니다. 마지막으로 추가한 키를 삭제하려면 백스페이스 키를 누릅니다. 창이 너무 작으면 크기를 조정하거나 안쪽을 클릭하고 포인터를 이동하여 전체 내용을 확인합니다."
 
-#: xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
-msgid "Up"
-msgstr "상"
-
-#: xrc/JoyPanel.xrc:37
-msgid "A"
-msgstr "A"
-
-#: xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
-msgid "Down"
-msgstr "하"
-
-#: xrc/JoyPanel.xrc:83
-msgid "B"
-msgstr "B"
-
-#: xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
-msgid "Left"
-msgstr "좌"
-
-#: xrc/JoyPanel.xrc:129
-msgid "L"
-msgstr "L"
-
-#: xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
-msgid "Right"
-msgstr "우"
-
-#: xrc/JoyPanel.xrc:175
-msgid "R"
-msgstr "R"
-
-#: xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
-msgid "Select"
-msgstr "Select"
-
-#: xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
-msgid "Start"
-msgstr "Start"
-
-#: xrc/JoyPanel.xrc:254
-msgid "Motion Up"
-msgstr "위 동작"
-
 #: xrc/JoyPanel.xrc:276
 msgid "Autofire A"
 msgstr "A 버튼 연사"
 
-#: xrc/JoyPanel.xrc:298
-msgid "Motion Down"
-msgstr "아래 동작"
-
 #: xrc/JoyPanel.xrc:320
 msgid "Autofire B"
 msgstr "B 버튼 연사"
diff --git a/po/wxvbam/ms_MY.po b/po/wxvbam/ms_MY.po
index d4ee788e..09fdf940 100644
--- a/po/wxvbam/ms_MY.po
+++ b/po/wxvbam/ms_MY.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VBA-M\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-23 22:00+0000\n"
+"POT-Creation-Date: 2024-04-24 02:00+0000\n"
 "PO-Revision-Date: 2011-12-03 19:42+0000\n"
 "Last-Translator: abuyop <abuyop@gmail.com>, 2017\n"
 "Language-Team: Malay (Malaysia) (http://app.transifex.com/bgk/vba-m/language/ms_MY/)\n"
@@ -319,174 +319,263 @@ msgstr ""
 msgid "Network is not supported in local mode."
 msgstr "Rangkaian tidak disokong dalam mod setempat."
 
-#: config/internal/option-internal.cpp:379
-msgid "Use bilinear filter with 3d renderer"
+#: config/command.cpp:28 xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
+msgid "Up"
+msgstr "Naik"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
+msgid "Down"
+msgstr "Turun"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
+msgid "Left"
+msgstr "Kiri"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
+msgid "Right"
+msgstr "Kanan"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:37
+msgid "A"
+msgstr "A"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:83
+msgid "B"
+msgstr "B"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:129
+msgid "L"
+msgstr "L"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:175
+msgid "R"
+msgstr "R"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
+msgid "Select"
+msgstr "Pilih"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
+msgid "Start"
+msgstr "Mula"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:254
+msgid "Motion Up"
+msgstr "Gerakan Atas"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:298
+msgid "Motion Down"
+msgstr "Gerakan Bawah"
+
+#: config/command.cpp:30
+msgid "Motion Left"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion Right"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion In"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Motion Out"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto A"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto B"
+msgstr ""
+
+#: config/command.cpp:31 xrc/DisplayConfig.xrc:200
+msgid "Speed"
+msgstr "Kelajuan"
+
+#: config/command.cpp:31
+msgid "Capture"
+msgstr ""
+
+#: config/command.cpp:32
+msgid "GameShark"
+msgstr ""
+
+#: config/command.cpp:106
+#, c-format
+msgid "Joypad %zu %s"
 msgstr ""
 
 #: config/internal/option-internal.cpp:380
-msgid "Full-screen filter to apply"
+msgid "Use bilinear filter with 3d renderer"
 msgstr ""
 
 #: config/internal/option-internal.cpp:381
-msgid "Filter plugin library"
+msgid "Full-screen filter to apply"
 msgstr ""
 
 #: config/internal/option-internal.cpp:382
-msgid "Interframe blending function"
+msgid "Filter plugin library"
 msgstr ""
 
 #: config/internal/option-internal.cpp:383
+msgid "Interframe blending function"
+msgstr ""
+
+#: config/internal/option-internal.cpp:384
 msgid "Keep window on top"
 msgstr ""
 
-#: config/internal/option-internal.cpp:385
+#: config/internal/option-internal.cpp:386
 msgid "Maximum number of threads to run filters in"
 msgstr ""
 
-#: config/internal/option-internal.cpp:387
+#: config/internal/option-internal.cpp:388
 msgid "Render method; if unsupported, simple method will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:388
+#: config/internal/option-internal.cpp:389
 msgid "Default scale factor"
 msgstr ""
 
-#: config/internal/option-internal.cpp:389
+#: config/internal/option-internal.cpp:390
 msgid "Retain aspect ratio when resizing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:392
+#: config/internal/option-internal.cpp:393
 msgid "BIOS file to use for Game Boy, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:393
+#: config/internal/option-internal.cpp:394
 msgid "Game Boy color enhancement, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:394
+#: config/internal/option-internal.cpp:395
 msgid "Enable DX Colorization Hacks"
 msgstr ""
 
-#: config/internal/option-internal.cpp:395
-#: config/internal/option-internal.cpp:419
+#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:420
 msgid "Apply LCD filter, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:397
 msgid "BIOS file to use for Game Boy Color, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:398
+#: config/internal/option-internal.cpp:399
 msgid ""
 "The default palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:401
+#: config/internal/option-internal.cpp:402
 msgid ""
 "The first user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:404
+#: config/internal/option-internal.cpp:405
 msgid ""
 "The second user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:407
+#: config/internal/option-internal.cpp:408
 msgid "Automatically gather a full page before printing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:409
+#: config/internal/option-internal.cpp:410
 msgid "Automatically save printouts as screen captures with -print suffix"
 msgstr ""
 
-#: config/internal/option-internal.cpp:411
-#: config/internal/option-internal.cpp:439
+#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:440
 msgid "Directory to look for ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:413
 msgid "Directory to look for Game Boy Color ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:415
+#: config/internal/option-internal.cpp:416
 msgid "BIOS file to use, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:425
+#: config/internal/option-internal.cpp:426
 msgid "Enable link at boot"
 msgstr ""
 
-#: config/internal/option-internal.cpp:430
+#: config/internal/option-internal.cpp:431
 msgid "Enable faster network protocol by default"
 msgstr ""
 
-#: config/internal/option-internal.cpp:432
+#: config/internal/option-internal.cpp:433
 msgid "Default network link client host"
 msgstr ""
 
-#: config/internal/option-internal.cpp:433
+#: config/internal/option-internal.cpp:434
 msgid "Default network link server IP to bind"
 msgstr ""
 
-#: config/internal/option-internal.cpp:434
+#: config/internal/option-internal.cpp:435
 msgid "Default network link port (server and client)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:435
+#: config/internal/option-internal.cpp:436
 msgid "Default network protocol"
 msgstr ""
 
-#: config/internal/option-internal.cpp:436
+#: config/internal/option-internal.cpp:437
 msgid "Link timeout (ms)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:437
+#: config/internal/option-internal.cpp:438
 msgid "Link cable type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:442
+#: config/internal/option-internal.cpp:443
 msgid "Automatically load last saved state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:444
+#: config/internal/option-internal.cpp:445
 msgid ""
 "Directory to store game save files (relative paths are relative to ROM; "
 "blank is config dir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:446
+#: config/internal/option-internal.cpp:447
 msgid "Freeze recent load list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:448
+#: config/internal/option-internal.cpp:449
 msgid ""
 "Directory to store A / V and game recordings (relative paths are relative to"
 " ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:451
+#: config/internal/option-internal.cpp:452
 msgid "Number of seconds between rewind snapshots (0 to disable)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:453
+#: config/internal/option-internal.cpp:454
 msgid "Directory to store screenshots (relative paths are relative to ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:456
+#: config/internal/option-internal.cpp:457
 msgid ""
 "Directory to store saved state files (relative paths are relative to "
 "BatteryDir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:458
+#: config/internal/option-internal.cpp:459
 msgid "Enable status bar"
 msgstr ""
 
-#: config/internal/option-internal.cpp:459
+#: config/internal/option-internal.cpp:460
 msgid "INI file version (DO NOT MODIFY)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:463
+#: config/internal/option-internal.cpp:464
 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, "
@@ -494,266 +583,266 @@ msgid ""
 "MotionRight, AutoA, AutoB, Speed, Capture, GS"
 msgstr ""
 
-#: config/internal/option-internal.cpp:468
+#: config/internal/option-internal.cpp:469
 msgid "The autofire toggle period, in frames (1/60 s)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:469
+#: config/internal/option-internal.cpp:470
 msgid "The number of the stick to use in single-player mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:471
+#: config/internal/option-internal.cpp:472
 msgid "Whether to enable SDL GameController mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:475
+#: config/internal/option-internal.cpp:476
 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 "
 "executed."
 msgstr ""
 
-#: config/internal/option-internal.cpp:480
+#: config/internal/option-internal.cpp:481
 msgid "Enable AGB debug print"
 msgstr ""
 
-#: config/internal/option-internal.cpp:481
+#: config/internal/option-internal.cpp:482
 msgid "Auto skip frames"
 msgstr ""
 
-#: config/internal/option-internal.cpp:483
+#: config/internal/option-internal.cpp:484
 msgid "Apply IPS / UPS / IPF patches if found"
 msgstr ""
 
-#: config/internal/option-internal.cpp:485
+#: config/internal/option-internal.cpp:486
 msgid "Automatically save and load cheat list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:489
+#: config/internal/option-internal.cpp:490
 msgid "Automatically enable border for Super Game Boy games"
 msgstr ""
 
-#: config/internal/option-internal.cpp:491
+#: config/internal/option-internal.cpp:492
 msgid "Always enable border"
 msgstr ""
 
-#: config/internal/option-internal.cpp:492
+#: config/internal/option-internal.cpp:493
 msgid "Screen capture file format"
 msgstr ""
 
-#: config/internal/option-internal.cpp:493
+#: config/internal/option-internal.cpp:494
 msgid "Enable cheats"
 msgstr ""
 
-#: config/internal/option-internal.cpp:494
+#: config/internal/option-internal.cpp:495
 msgid "Disable on-screen status messages"
 msgstr ""
 
-#: config/internal/option-internal.cpp:495
+#: config/internal/option-internal.cpp:496
 msgid "Type of system to emulate"
 msgstr ""
 
-#: config/internal/option-internal.cpp:496
+#: config/internal/option-internal.cpp:497
 msgid "Flash size 0 = 64 KB 1 = 128 KB"
 msgstr ""
 
-#: config/internal/option-internal.cpp:498
+#: config/internal/option-internal.cpp:499
 msgid "Skip frames. Values are 0-9 or -1 to skip automatically based on time."
 msgstr ""
 
-#: config/internal/option-internal.cpp:500
+#: config/internal/option-internal.cpp:501
 msgid "The palette to use"
 msgstr ""
 
-#: config/internal/option-internal.cpp:501
+#: config/internal/option-internal.cpp:502
 msgid "Enable printer emulation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:503
+#: config/internal/option-internal.cpp:504
 msgid "Break into GDB after loading the game."
 msgstr ""
 
-#: config/internal/option-internal.cpp:504
+#: config/internal/option-internal.cpp:505
 msgid "Port to connect GDB to"
 msgstr ""
 
-#: config/internal/option-internal.cpp:506
+#: config/internal/option-internal.cpp:507
 msgid "Number of players in network"
 msgstr ""
 
-#: config/internal/option-internal.cpp:508
+#: config/internal/option-internal.cpp:509
 msgid "Maximum scale factor (0 = no limit)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:510
+#: config/internal/option-internal.cpp:511
 msgid "Pause game when main window loses focus"
 msgstr ""
 
-#: config/internal/option-internal.cpp:512
+#: config/internal/option-internal.cpp:513
 msgid "Enable RTC (vba-over.ini override is rtcEnabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:513
+#: config/internal/option-internal.cpp:514
 msgid "Native save (\"battery\") hardware type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:514
+#: config/internal/option-internal.cpp:515
 msgid "Show speed indicator"
 msgstr ""
 
-#: config/internal/option-internal.cpp:516
+#: config/internal/option-internal.cpp:517
 msgid "Draw on-screen messages transparently"
 msgstr ""
 
-#: config/internal/option-internal.cpp:517
+#: config/internal/option-internal.cpp:518
 msgid "Skip BIOS initialization"
 msgstr ""
 
-#: config/internal/option-internal.cpp:519
+#: config/internal/option-internal.cpp:520
 msgid "Do not overwrite cheat list when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:521
+#: config/internal/option-internal.cpp:522
 msgid "Do not overwrite native (battery) save when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:523
+#: config/internal/option-internal.cpp:524
 msgid "Throttle game speed, even when accelerated (0-450 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:526
+#: config/internal/option-internal.cpp:527
 msgid "Set throttle for speedup key (0-3000 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:528
+#: config/internal/option-internal.cpp:529
 msgid "Number of frames to skip with speedup (instead of speedup throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:531
+#: config/internal/option-internal.cpp:532
 msgid "Use frame skip for speedup throttle"
 msgstr ""
 
-#: config/internal/option-internal.cpp:532
+#: config/internal/option-internal.cpp:533
 msgid "Use the specified BIOS file for Game Boy"
 msgstr ""
 
-#: config/internal/option-internal.cpp:533
+#: config/internal/option-internal.cpp:534
 msgid "Use the specified BIOS file"
 msgstr ""
 
-#: config/internal/option-internal.cpp:535
+#: config/internal/option-internal.cpp:536
 msgid "Use the specified BIOS file for Game Boy Color"
 msgstr ""
 
-#: config/internal/option-internal.cpp:536
+#: config/internal/option-internal.cpp:537
 msgid "Wait for vertical sync"
 msgstr ""
 
-#: config/internal/option-internal.cpp:539
+#: config/internal/option-internal.cpp:540
 msgid "Enter fullscreen mode at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:540
+#: config/internal/option-internal.cpp:541
 msgid "Window maximized"
 msgstr ""
 
-#: config/internal/option-internal.cpp:541
+#: config/internal/option-internal.cpp:542
 msgid "Window height at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:542
+#: config/internal/option-internal.cpp:543
 msgid "Window width at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:543
+#: config/internal/option-internal.cpp:544
 msgid "Window axis X position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:544
+#: config/internal/option-internal.cpp:545
 msgid "Window axis Y position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:548
+#: config/internal/option-internal.cpp:549
 msgid "Capture key events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:550
+#: config/internal/option-internal.cpp:551
 msgid "Capture joy events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:551
+#: config/internal/option-internal.cpp:552
 msgid "Hide menu bar when mouse is inactive"
 msgstr ""
 
-#: config/internal/option-internal.cpp:553
+#: config/internal/option-internal.cpp:554
 msgid "Suspend screensaver when game is running"
 msgstr ""
 
-#: config/internal/option-internal.cpp:556
+#: config/internal/option-internal.cpp:557
 msgid "Sound API; if unsupported, default API will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:557
+#: config/internal/option-internal.cpp:558
 msgid "Device ID of chosen audio device for chosen driver"
 msgstr ""
 
-#: config/internal/option-internal.cpp:558
+#: config/internal/option-internal.cpp:559
 msgid "Number of sound buffers"
 msgstr ""
 
-#: config/internal/option-internal.cpp:559
+#: config/internal/option-internal.cpp:560
 msgid "Bit mask of sound channels to enable"
 msgstr ""
 
-#: config/internal/option-internal.cpp:560
+#: config/internal/option-internal.cpp:561
 msgid "Game Boy Advance sound filtering (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:562
+#: config/internal/option-internal.cpp:563
 msgid "Game Boy Advance sound interpolation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:563
+#: config/internal/option-internal.cpp:564
 msgid "Game Boy sound declicking"
 msgstr ""
 
-#: config/internal/option-internal.cpp:564
+#: config/internal/option-internal.cpp:565
 msgid "Game Boy echo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:565
+#: config/internal/option-internal.cpp:566
 msgid "Enable Game Boy sound effects"
 msgstr ""
 
-#: config/internal/option-internal.cpp:566
+#: config/internal/option-internal.cpp:567
 msgid "Game Boy stereo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:567
+#: config/internal/option-internal.cpp:568
 msgid "Game Boy surround sound effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:568
+#: config/internal/option-internal.cpp:569
 msgid "Sound sample rate (kHz)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:569
+#: config/internal/option-internal.cpp:570
 msgid "Use DirectSound hardware acceleration"
 msgstr ""
 
-#: config/internal/option-internal.cpp:570
+#: config/internal/option-internal.cpp:571
 msgid "Upmix stereo to surround"
 msgstr ""
 
-#: config/internal/option-internal.cpp:571
+#: config/internal/option-internal.cpp:572
 msgid "Sound volume (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:639
-#: config/internal/option-internal.cpp:659
-#: config/internal/option-internal.cpp:680
-#: config/internal/option-internal.cpp:700
-#: config/internal/option-internal.cpp:719
+#: config/internal/option-internal.cpp:640
+#: config/internal/option-internal.cpp:660
+#: config/internal/option-internal.cpp:681
+#: config/internal/option-internal.cpp:701
+#: config/internal/option-internal.cpp:720
 #, c-format
 msgid "Invalid value %s for option %s; valid values are %s"
 msgstr ""
@@ -768,7 +857,7 @@ msgstr "Nilai %f tidak sah bagi pilihan %s; nilai sah adalah %f - %f"
 msgid "Invalid value %d for option %s; valid values are %d - %d"
 msgstr "Nilai %d tidak sah bagi pilihan %s; nilai sah adalah %d - %d"
 
-#: config/option.cpp:480 opts.cpp:621 opts.cpp:630 opts.cpp:639 opts.cpp:648
+#: config/option.cpp:480 opts.cpp:468 opts.cpp:477 opts.cpp:486 opts.cpp:495
 #, c-format
 msgid "Invalid value %s for option %s"
 msgstr ""
@@ -933,19 +1022,19 @@ msgstr "Meta+"
 msgid "Key"
 msgstr ""
 
-#: dialogs/accel-config.cpp:149
+#: dialogs/accel-config.cpp:148
 msgid "Menu commands"
 msgstr "Perintah menu"
 
-#: dialogs/accel-config.cpp:261
+#: dialogs/accel-config.cpp:259
 msgid "This will clear all user-defined accelerators. Are you sure?"
 msgstr ""
 
-#: dialogs/accel-config.cpp:261 dialogs/accel-config.cpp:298
+#: dialogs/accel-config.cpp:259 dialogs/accel-config.cpp:306
 msgid "Confirm"
 msgstr "Sahkan"
 
-#: dialogs/accel-config.cpp:295
+#: dialogs/accel-config.cpp:304
 #, c-format
 msgid "This will unassign \"%s\" from \"%s\". Are you sure?"
 msgstr ""
@@ -1317,22 +1406,22 @@ msgstr "Nilai Lama"
 msgid "New Value"
 msgstr "Nilai Baharu"
 
-#: guiinit.cpp:2518
+#: guiinit.cpp:2519
 msgid "JoyBus host invalid; disabling"
 msgstr "Hos JoyBus tidak sah; dilumpuhkan"
 
-#: opts.cpp:298
+#: opts.cpp:154
 msgid ""
 "The INI file was written for a more recent version of VBA-M. Some INI option"
 " values may have been reset."
 msgstr ""
 
-#: opts.cpp:480 opts.cpp:500 opts.cpp:685
+#: opts.cpp:339 opts.cpp:355 opts.cpp:522
 #, c-format
 msgid "Invalid key binding %s for %s"
 msgstr "Pengikatan kekunci %s tidak sah bagi %s"
 
-#: opts.cpp:707
+#: opts.cpp:528
 #, c-format
 msgid "Unknown option %s with value %s"
 msgstr ""
@@ -1556,37 +1645,37 @@ msgstr "Main balik tamat"
 msgid "%d %% (%d, %d fps)"
 msgstr ""
 
-#: sys.cpp:899 xrc/GBPrinter.xrc:65
+#: sys.cpp:898 xrc/GBPrinter.xrc:65
 msgid "&Discard"
 msgstr "&Singkir"
 
-#: sys.cpp:933
+#: sys.cpp:932
 msgid "Image files (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 msgstr "Fail imej (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 
-#: sys.cpp:942
+#: sys.cpp:941
 msgid "Save printer image to"
 msgstr "Simpan imej pencetak ke"
 
-#: sys.cpp:956 sys.cpp:1140
+#: sys.cpp:955 sys.cpp:1139
 #, c-format
 msgid "Wrote printer output to %s"
 msgstr "Tulis output pencetak ke %s"
 
-#: sys.cpp:961 sys.cpp:1032
+#: sys.cpp:960 sys.cpp:1031
 msgid "&Close"
 msgstr "&Tutup"
 
-#: sys.cpp:1027
+#: sys.cpp:1026
 msgid "Printed"
 msgstr "Dicetak"
 
-#: sys.cpp:1302
+#: sys.cpp:1301
 #, c-format
 msgid "Error opening pseudo tty: %s"
 msgstr "Ralat membuka tty pseudo: %s"
 
-#: sys.cpp:1401
+#: sys.cpp:1400
 #, c-format
 msgid "Error setting up server socket (%d)"
 msgstr "Ralat menetapkan soket pelayan (%d)"
@@ -1620,80 +1709,80 @@ msgstr ""
 msgid "Unable to load dialog %s from resources"
 msgstr "Tidak boleh memuatkan dialog %s dari sumber"
 
-#: wxvbam.cpp:398 wxvbam.cpp:415
+#: wxvbam.cpp:401 wxvbam.cpp:418
 #, c-format
 msgid "Invalid configuration file provided: %s"
 msgstr ""
 
-#: wxvbam.cpp:559
+#: wxvbam.cpp:558
 msgid "Could not create main window"
 msgstr "Tidak dapat cipta tetingkap utama"
 
-#: wxvbam.cpp:634
+#: wxvbam.cpp:633
 msgid "Save built-in XRC file and exit"
 msgstr "Simpan fail terbina-dalam XRC kemudian keluar"
 
-#: wxvbam.cpp:637
+#: wxvbam.cpp:636
 msgid "Save built-in vba-over.ini and exit"
 msgstr "Simpan vba-over.ini terbina-dalam kemudian keluar"
 
-#: wxvbam.cpp:640
+#: wxvbam.cpp:639
 msgid "Print configuration path and exit"
 msgstr "Cetak laluan konfigurasi kemudian keluar"
 
-#: wxvbam.cpp:643
+#: wxvbam.cpp:642
 msgid "Start in full-screen mode"
 msgstr "Mula dalam mod skrin-penuh"
 
-#: wxvbam.cpp:646
+#: wxvbam.cpp:645
 msgid "Set a configuration file"
 msgstr ""
 
-#: wxvbam.cpp:650
+#: wxvbam.cpp:649
 msgid "Delete shared link state first, if it exists"
 msgstr "Padam keadaan pautan terkongsi dahulu, jika ia wujud"
 
-#: wxvbam.cpp:657
+#: wxvbam.cpp:656
 msgid "List all settable options and exit"
 msgstr "Senarai semua pilih boleh ditetapkan kemudian keluar"
 
-#: wxvbam.cpp:660
+#: wxvbam.cpp:659
 msgid "ROM file"
 msgstr "Fail ROM"
 
-#: wxvbam.cpp:662
+#: wxvbam.cpp:661
 msgid "<config>=<value>"
 msgstr "<config>=<value>"
 
-#: wxvbam.cpp:693
+#: wxvbam.cpp:692
 msgid "Configuration / build error: can't find built-in xrc"
 msgstr ""
 
-#: wxvbam.cpp:701
+#: wxvbam.cpp:700
 #, c-format
 msgid ""
 "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:"
 msgstr ""
 
-#: wxvbam.cpp:715
+#: wxvbam.cpp:714
 msgid "Configuration is read from, in order:"
 msgstr "Konfigurasi yang dibaca, dalam tertib:"
 
-#: wxvbam.cpp:729
+#: wxvbam.cpp:728
 #, c-format
 msgid ""
 "Wrote built-in override file to %s\n"
 "To override, delete all but changed section. First found section is used from search path:"
 msgstr ""
 
-#: wxvbam.cpp:735
+#: wxvbam.cpp:734
 msgid ""
 "\n"
 "\tbuilt-in"
 msgstr "\n\tterbina-dalam"
 
-#: wxvbam.cpp:750
+#: wxvbam.cpp:749
 msgid ""
 "Options set from the command line are saved if any configuration changes are made in the user interface.\n"
 "\n"
@@ -1701,17 +1790,17 @@ msgid ""
 "\n"
 msgstr "Pilihan ditetapkan dari senarai perintah disimpan jika ada perubahan konfigurasi dibuat dalam antaramuka pengguna.\n\nUntuk pilihan bendera, benar dan palsu dinyatakan sebagai 1 dan 0.\n\n"
 
-#: wxvbam.cpp:758
+#: wxvbam.cpp:757
 msgid ""
 "The commands available for the Keyboard/* option are:\n"
 "\n"
 msgstr "Perintah tersedia untuk pilihane Papan Kekunci/* adalah:\n\n"
 
-#: wxvbam.cpp:769
+#: wxvbam.cpp:768
 msgid "Configuration file not found."
 msgstr ""
 
-#: wxvbam.cpp:800
+#: wxvbam.cpp:799
 msgid "Bad configuration option or multiple ROM files given:\n"
 msgstr "Pilihan konfigurasi teruk atau fail ROM berbilang diberikan:\n"
 
@@ -2223,10 +2312,6 @@ msgstr "Langkau Bingkai"
 msgid "&Number of frames to skip:"
 msgstr ""
 
-#: xrc/DisplayConfig.xrc:200
-msgid "Speed"
-msgstr "Kelajuan"
-
 #: xrc/DisplayConfig.xrc:216
 msgid "Speed indicator:"
 msgstr ""
@@ -2762,58 +2847,10 @@ msgid ""
 " entire contents if too small."
 msgstr ""
 
-#: xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
-msgid "Up"
-msgstr "Naik"
-
-#: xrc/JoyPanel.xrc:37
-msgid "A"
-msgstr "A"
-
-#: xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
-msgid "Down"
-msgstr "Turun"
-
-#: xrc/JoyPanel.xrc:83
-msgid "B"
-msgstr "B"
-
-#: xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
-msgid "Left"
-msgstr "Kiri"
-
-#: xrc/JoyPanel.xrc:129
-msgid "L"
-msgstr "L"
-
-#: xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
-msgid "Right"
-msgstr "Kanan"
-
-#: xrc/JoyPanel.xrc:175
-msgid "R"
-msgstr "R"
-
-#: xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
-msgid "Select"
-msgstr "Pilih"
-
-#: xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
-msgid "Start"
-msgstr "Mula"
-
-#: xrc/JoyPanel.xrc:254
-msgid "Motion Up"
-msgstr "Gerakan Atas"
-
 #: xrc/JoyPanel.xrc:276
 msgid "Autofire A"
 msgstr "Autotembak A"
 
-#: xrc/JoyPanel.xrc:298
-msgid "Motion Down"
-msgstr "Gerakan Bawah"
-
 #: xrc/JoyPanel.xrc:320
 msgid "Autofire B"
 msgstr "Autotembak B"
diff --git a/po/wxvbam/nb.po b/po/wxvbam/nb.po
index 5590250c..768bc509 100644
--- a/po/wxvbam/nb.po
+++ b/po/wxvbam/nb.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VBA-M\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-23 22:00+0000\n"
+"POT-Creation-Date: 2024-04-24 02:00+0000\n"
 "PO-Revision-Date: 2011-12-03 19:42+0000\n"
 "Last-Translator: Allan Nordhøy <epost@anotheragency.no>, 2016-2017\n"
 "Language-Team: Norwegian Bokmål (http://app.transifex.com/bgk/vba-m/language/nb/)\n"
@@ -322,174 +322,263 @@ msgstr ""
 msgid "Network is not supported in local mode."
 msgstr "Nettverk er ikke støttet i lokalmodus."
 
-#: config/internal/option-internal.cpp:379
-msgid "Use bilinear filter with 3d renderer"
+#: config/command.cpp:28 xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
+msgid "Up"
+msgstr "Opp"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
+msgid "Down"
+msgstr "Ned"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
+msgid "Left"
+msgstr "Venstre"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
+msgid "Right"
+msgstr "Høyre"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:37
+msgid "A"
+msgstr "A"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:83
+msgid "B"
+msgstr "B"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:129
+msgid "L"
+msgstr "L"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:175
+msgid "R"
+msgstr "R"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
+msgid "Select"
+msgstr "Select-knapp"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
+msgid "Start"
+msgstr "Start-knapp"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:254
+msgid "Motion Up"
+msgstr "Bevegelser Opp"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:298
+msgid "Motion Down"
+msgstr "Bevegelser Ned"
+
+#: config/command.cpp:30
+msgid "Motion Left"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion Right"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion In"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Motion Out"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto A"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto B"
+msgstr ""
+
+#: config/command.cpp:31 xrc/DisplayConfig.xrc:200
+msgid "Speed"
+msgstr "Hastighet"
+
+#: config/command.cpp:31
+msgid "Capture"
+msgstr ""
+
+#: config/command.cpp:32
+msgid "GameShark"
+msgstr ""
+
+#: config/command.cpp:106
+#, c-format
+msgid "Joypad %zu %s"
 msgstr ""
 
 #: config/internal/option-internal.cpp:380
-msgid "Full-screen filter to apply"
+msgid "Use bilinear filter with 3d renderer"
 msgstr ""
 
 #: config/internal/option-internal.cpp:381
-msgid "Filter plugin library"
+msgid "Full-screen filter to apply"
 msgstr ""
 
 #: config/internal/option-internal.cpp:382
-msgid "Interframe blending function"
+msgid "Filter plugin library"
 msgstr ""
 
 #: config/internal/option-internal.cpp:383
+msgid "Interframe blending function"
+msgstr ""
+
+#: config/internal/option-internal.cpp:384
 msgid "Keep window on top"
 msgstr ""
 
-#: config/internal/option-internal.cpp:385
+#: config/internal/option-internal.cpp:386
 msgid "Maximum number of threads to run filters in"
 msgstr ""
 
-#: config/internal/option-internal.cpp:387
+#: config/internal/option-internal.cpp:388
 msgid "Render method; if unsupported, simple method will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:388
+#: config/internal/option-internal.cpp:389
 msgid "Default scale factor"
 msgstr ""
 
-#: config/internal/option-internal.cpp:389
+#: config/internal/option-internal.cpp:390
 msgid "Retain aspect ratio when resizing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:392
+#: config/internal/option-internal.cpp:393
 msgid "BIOS file to use for Game Boy, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:393
+#: config/internal/option-internal.cpp:394
 msgid "Game Boy color enhancement, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:394
+#: config/internal/option-internal.cpp:395
 msgid "Enable DX Colorization Hacks"
 msgstr ""
 
-#: config/internal/option-internal.cpp:395
-#: config/internal/option-internal.cpp:419
+#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:420
 msgid "Apply LCD filter, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:397
 msgid "BIOS file to use for Game Boy Color, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:398
+#: config/internal/option-internal.cpp:399
 msgid ""
 "The default palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:401
+#: config/internal/option-internal.cpp:402
 msgid ""
 "The first user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:404
+#: config/internal/option-internal.cpp:405
 msgid ""
 "The second user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:407
+#: config/internal/option-internal.cpp:408
 msgid "Automatically gather a full page before printing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:409
+#: config/internal/option-internal.cpp:410
 msgid "Automatically save printouts as screen captures with -print suffix"
 msgstr ""
 
-#: config/internal/option-internal.cpp:411
-#: config/internal/option-internal.cpp:439
+#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:440
 msgid "Directory to look for ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:413
 msgid "Directory to look for Game Boy Color ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:415
+#: config/internal/option-internal.cpp:416
 msgid "BIOS file to use, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:425
+#: config/internal/option-internal.cpp:426
 msgid "Enable link at boot"
 msgstr ""
 
-#: config/internal/option-internal.cpp:430
+#: config/internal/option-internal.cpp:431
 msgid "Enable faster network protocol by default"
 msgstr ""
 
-#: config/internal/option-internal.cpp:432
+#: config/internal/option-internal.cpp:433
 msgid "Default network link client host"
 msgstr ""
 
-#: config/internal/option-internal.cpp:433
+#: config/internal/option-internal.cpp:434
 msgid "Default network link server IP to bind"
 msgstr ""
 
-#: config/internal/option-internal.cpp:434
+#: config/internal/option-internal.cpp:435
 msgid "Default network link port (server and client)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:435
+#: config/internal/option-internal.cpp:436
 msgid "Default network protocol"
 msgstr ""
 
-#: config/internal/option-internal.cpp:436
+#: config/internal/option-internal.cpp:437
 msgid "Link timeout (ms)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:437
+#: config/internal/option-internal.cpp:438
 msgid "Link cable type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:442
+#: config/internal/option-internal.cpp:443
 msgid "Automatically load last saved state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:444
+#: config/internal/option-internal.cpp:445
 msgid ""
 "Directory to store game save files (relative paths are relative to ROM; "
 "blank is config dir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:446
+#: config/internal/option-internal.cpp:447
 msgid "Freeze recent load list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:448
+#: config/internal/option-internal.cpp:449
 msgid ""
 "Directory to store A / V and game recordings (relative paths are relative to"
 " ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:451
+#: config/internal/option-internal.cpp:452
 msgid "Number of seconds between rewind snapshots (0 to disable)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:453
+#: config/internal/option-internal.cpp:454
 msgid "Directory to store screenshots (relative paths are relative to ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:456
+#: config/internal/option-internal.cpp:457
 msgid ""
 "Directory to store saved state files (relative paths are relative to "
 "BatteryDir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:458
+#: config/internal/option-internal.cpp:459
 msgid "Enable status bar"
 msgstr ""
 
-#: config/internal/option-internal.cpp:459
+#: config/internal/option-internal.cpp:460
 msgid "INI file version (DO NOT MODIFY)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:463
+#: config/internal/option-internal.cpp:464
 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, "
@@ -497,266 +586,266 @@ msgid ""
 "MotionRight, AutoA, AutoB, Speed, Capture, GS"
 msgstr ""
 
-#: config/internal/option-internal.cpp:468
+#: config/internal/option-internal.cpp:469
 msgid "The autofire toggle period, in frames (1/60 s)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:469
+#: config/internal/option-internal.cpp:470
 msgid "The number of the stick to use in single-player mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:471
+#: config/internal/option-internal.cpp:472
 msgid "Whether to enable SDL GameController mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:475
+#: config/internal/option-internal.cpp:476
 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 "
 "executed."
 msgstr ""
 
-#: config/internal/option-internal.cpp:480
+#: config/internal/option-internal.cpp:481
 msgid "Enable AGB debug print"
 msgstr ""
 
-#: config/internal/option-internal.cpp:481
+#: config/internal/option-internal.cpp:482
 msgid "Auto skip frames"
 msgstr ""
 
-#: config/internal/option-internal.cpp:483
+#: config/internal/option-internal.cpp:484
 msgid "Apply IPS / UPS / IPF patches if found"
 msgstr ""
 
-#: config/internal/option-internal.cpp:485
+#: config/internal/option-internal.cpp:486
 msgid "Automatically save and load cheat list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:489
+#: config/internal/option-internal.cpp:490
 msgid "Automatically enable border for Super Game Boy games"
 msgstr ""
 
-#: config/internal/option-internal.cpp:491
+#: config/internal/option-internal.cpp:492
 msgid "Always enable border"
 msgstr ""
 
-#: config/internal/option-internal.cpp:492
+#: config/internal/option-internal.cpp:493
 msgid "Screen capture file format"
 msgstr ""
 
-#: config/internal/option-internal.cpp:493
+#: config/internal/option-internal.cpp:494
 msgid "Enable cheats"
 msgstr ""
 
-#: config/internal/option-internal.cpp:494
+#: config/internal/option-internal.cpp:495
 msgid "Disable on-screen status messages"
 msgstr ""
 
-#: config/internal/option-internal.cpp:495
+#: config/internal/option-internal.cpp:496
 msgid "Type of system to emulate"
 msgstr ""
 
-#: config/internal/option-internal.cpp:496
+#: config/internal/option-internal.cpp:497
 msgid "Flash size 0 = 64 KB 1 = 128 KB"
 msgstr ""
 
-#: config/internal/option-internal.cpp:498
+#: config/internal/option-internal.cpp:499
 msgid "Skip frames. Values are 0-9 or -1 to skip automatically based on time."
 msgstr ""
 
-#: config/internal/option-internal.cpp:500
+#: config/internal/option-internal.cpp:501
 msgid "The palette to use"
 msgstr ""
 
-#: config/internal/option-internal.cpp:501
+#: config/internal/option-internal.cpp:502
 msgid "Enable printer emulation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:503
+#: config/internal/option-internal.cpp:504
 msgid "Break into GDB after loading the game."
 msgstr ""
 
-#: config/internal/option-internal.cpp:504
+#: config/internal/option-internal.cpp:505
 msgid "Port to connect GDB to"
 msgstr ""
 
-#: config/internal/option-internal.cpp:506
+#: config/internal/option-internal.cpp:507
 msgid "Number of players in network"
 msgstr ""
 
-#: config/internal/option-internal.cpp:508
+#: config/internal/option-internal.cpp:509
 msgid "Maximum scale factor (0 = no limit)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:510
+#: config/internal/option-internal.cpp:511
 msgid "Pause game when main window loses focus"
 msgstr ""
 
-#: config/internal/option-internal.cpp:512
+#: config/internal/option-internal.cpp:513
 msgid "Enable RTC (vba-over.ini override is rtcEnabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:513
+#: config/internal/option-internal.cpp:514
 msgid "Native save (\"battery\") hardware type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:514
+#: config/internal/option-internal.cpp:515
 msgid "Show speed indicator"
 msgstr ""
 
-#: config/internal/option-internal.cpp:516
+#: config/internal/option-internal.cpp:517
 msgid "Draw on-screen messages transparently"
 msgstr ""
 
-#: config/internal/option-internal.cpp:517
+#: config/internal/option-internal.cpp:518
 msgid "Skip BIOS initialization"
 msgstr ""
 
-#: config/internal/option-internal.cpp:519
+#: config/internal/option-internal.cpp:520
 msgid "Do not overwrite cheat list when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:521
+#: config/internal/option-internal.cpp:522
 msgid "Do not overwrite native (battery) save when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:523
+#: config/internal/option-internal.cpp:524
 msgid "Throttle game speed, even when accelerated (0-450 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:526
+#: config/internal/option-internal.cpp:527
 msgid "Set throttle for speedup key (0-3000 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:528
+#: config/internal/option-internal.cpp:529
 msgid "Number of frames to skip with speedup (instead of speedup throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:531
+#: config/internal/option-internal.cpp:532
 msgid "Use frame skip for speedup throttle"
 msgstr ""
 
-#: config/internal/option-internal.cpp:532
+#: config/internal/option-internal.cpp:533
 msgid "Use the specified BIOS file for Game Boy"
 msgstr ""
 
-#: config/internal/option-internal.cpp:533
+#: config/internal/option-internal.cpp:534
 msgid "Use the specified BIOS file"
 msgstr ""
 
-#: config/internal/option-internal.cpp:535
+#: config/internal/option-internal.cpp:536
 msgid "Use the specified BIOS file for Game Boy Color"
 msgstr ""
 
-#: config/internal/option-internal.cpp:536
+#: config/internal/option-internal.cpp:537
 msgid "Wait for vertical sync"
 msgstr ""
 
-#: config/internal/option-internal.cpp:539
+#: config/internal/option-internal.cpp:540
 msgid "Enter fullscreen mode at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:540
+#: config/internal/option-internal.cpp:541
 msgid "Window maximized"
 msgstr ""
 
-#: config/internal/option-internal.cpp:541
+#: config/internal/option-internal.cpp:542
 msgid "Window height at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:542
+#: config/internal/option-internal.cpp:543
 msgid "Window width at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:543
+#: config/internal/option-internal.cpp:544
 msgid "Window axis X position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:544
+#: config/internal/option-internal.cpp:545
 msgid "Window axis Y position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:548
+#: config/internal/option-internal.cpp:549
 msgid "Capture key events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:550
+#: config/internal/option-internal.cpp:551
 msgid "Capture joy events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:551
+#: config/internal/option-internal.cpp:552
 msgid "Hide menu bar when mouse is inactive"
 msgstr ""
 
-#: config/internal/option-internal.cpp:553
+#: config/internal/option-internal.cpp:554
 msgid "Suspend screensaver when game is running"
 msgstr ""
 
-#: config/internal/option-internal.cpp:556
+#: config/internal/option-internal.cpp:557
 msgid "Sound API; if unsupported, default API will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:557
+#: config/internal/option-internal.cpp:558
 msgid "Device ID of chosen audio device for chosen driver"
 msgstr ""
 
-#: config/internal/option-internal.cpp:558
+#: config/internal/option-internal.cpp:559
 msgid "Number of sound buffers"
 msgstr ""
 
-#: config/internal/option-internal.cpp:559
+#: config/internal/option-internal.cpp:560
 msgid "Bit mask of sound channels to enable"
 msgstr ""
 
-#: config/internal/option-internal.cpp:560
+#: config/internal/option-internal.cpp:561
 msgid "Game Boy Advance sound filtering (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:562
+#: config/internal/option-internal.cpp:563
 msgid "Game Boy Advance sound interpolation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:563
+#: config/internal/option-internal.cpp:564
 msgid "Game Boy sound declicking"
 msgstr ""
 
-#: config/internal/option-internal.cpp:564
+#: config/internal/option-internal.cpp:565
 msgid "Game Boy echo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:565
+#: config/internal/option-internal.cpp:566
 msgid "Enable Game Boy sound effects"
 msgstr ""
 
-#: config/internal/option-internal.cpp:566
+#: config/internal/option-internal.cpp:567
 msgid "Game Boy stereo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:567
+#: config/internal/option-internal.cpp:568
 msgid "Game Boy surround sound effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:568
+#: config/internal/option-internal.cpp:569
 msgid "Sound sample rate (kHz)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:569
+#: config/internal/option-internal.cpp:570
 msgid "Use DirectSound hardware acceleration"
 msgstr ""
 
-#: config/internal/option-internal.cpp:570
+#: config/internal/option-internal.cpp:571
 msgid "Upmix stereo to surround"
 msgstr ""
 
-#: config/internal/option-internal.cpp:571
+#: config/internal/option-internal.cpp:572
 msgid "Sound volume (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:639
-#: config/internal/option-internal.cpp:659
-#: config/internal/option-internal.cpp:680
-#: config/internal/option-internal.cpp:700
-#: config/internal/option-internal.cpp:719
+#: config/internal/option-internal.cpp:640
+#: config/internal/option-internal.cpp:660
+#: config/internal/option-internal.cpp:681
+#: config/internal/option-internal.cpp:701
+#: config/internal/option-internal.cpp:720
 #, c-format
 msgid "Invalid value %s for option %s; valid values are %s"
 msgstr ""
@@ -771,7 +860,7 @@ msgstr "Ugyldig verdi %f for valg %s; gyldige verdier er %f - %f"
 msgid "Invalid value %d for option %s; valid values are %d - %d"
 msgstr "Ugyldig verdi %d for valg %s; gyldige verdier er %d - %d"
 
-#: config/option.cpp:480 opts.cpp:621 opts.cpp:630 opts.cpp:639 opts.cpp:648
+#: config/option.cpp:480 opts.cpp:468 opts.cpp:477 opts.cpp:486 opts.cpp:495
 #, c-format
 msgid "Invalid value %s for option %s"
 msgstr ""
@@ -936,19 +1025,19 @@ msgstr "Meta+"
 msgid "Key"
 msgstr ""
 
-#: dialogs/accel-config.cpp:149
+#: dialogs/accel-config.cpp:148
 msgid "Menu commands"
 msgstr "Menyvalg"
 
-#: dialogs/accel-config.cpp:261
+#: dialogs/accel-config.cpp:259
 msgid "This will clear all user-defined accelerators. Are you sure?"
 msgstr ""
 
-#: dialogs/accel-config.cpp:261 dialogs/accel-config.cpp:298
+#: dialogs/accel-config.cpp:259 dialogs/accel-config.cpp:306
 msgid "Confirm"
 msgstr "Bekreft"
 
-#: dialogs/accel-config.cpp:295
+#: dialogs/accel-config.cpp:304
 #, c-format
 msgid "This will unassign \"%s\" from \"%s\". Are you sure?"
 msgstr ""
@@ -1320,22 +1409,22 @@ msgstr "Gammel verdi"
 msgid "New Value"
 msgstr "Ny verdi"
 
-#: guiinit.cpp:2518
+#: guiinit.cpp:2519
 msgid "JoyBus host invalid; disabling"
 msgstr "JoyBus vert ugyldig; deaktiveres"
 
-#: opts.cpp:298
+#: opts.cpp:154
 msgid ""
 "The INI file was written for a more recent version of VBA-M. Some INI option"
 " values may have been reset."
 msgstr ""
 
-#: opts.cpp:480 opts.cpp:500 opts.cpp:685
+#: opts.cpp:339 opts.cpp:355 opts.cpp:522
 #, c-format
 msgid "Invalid key binding %s for %s"
 msgstr "Ugyldig nøkkelbinding %s for %s"
 
-#: opts.cpp:707
+#: opts.cpp:528
 #, c-format
 msgid "Unknown option %s with value %s"
 msgstr ""
@@ -1559,37 +1648,37 @@ msgstr "Avspilling avsluttet"
 msgid "%d %% (%d, %d fps)"
 msgstr ""
 
-#: sys.cpp:899 xrc/GBPrinter.xrc:65
+#: sys.cpp:898 xrc/GBPrinter.xrc:65
 msgid "&Discard"
 msgstr "&Forkast"
 
-#: sys.cpp:933
+#: sys.cpp:932
 msgid "Image files (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 msgstr "Bildefiler (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 
-#: sys.cpp:942
+#: sys.cpp:941
 msgid "Save printer image to"
 msgstr "Lagre printerbilde til"
 
-#: sys.cpp:956 sys.cpp:1140
+#: sys.cpp:955 sys.cpp:1139
 #, c-format
 msgid "Wrote printer output to %s"
 msgstr "Skrev printerutskrift til %s"
 
-#: sys.cpp:961 sys.cpp:1032
+#: sys.cpp:960 sys.cpp:1031
 msgid "&Close"
 msgstr "&Lukk"
 
-#: sys.cpp:1027
+#: sys.cpp:1026
 msgid "Printed"
 msgstr "Skrevet ut"
 
-#: sys.cpp:1302
+#: sys.cpp:1301
 #, c-format
 msgid "Error opening pseudo tty: %s"
 msgstr "Feil under åpning av pseudo tty: %s"
 
-#: sys.cpp:1401
+#: sys.cpp:1400
 #, c-format
 msgid "Error setting up server socket (%d)"
 msgstr "Feil under oppsett av serverkobling (%d)"
@@ -1623,80 +1712,80 @@ msgstr ""
 msgid "Unable to load dialog %s from resources"
 msgstr "Kunne ikke laste dialog %s fra ressurser"
 
-#: wxvbam.cpp:398 wxvbam.cpp:415
+#: wxvbam.cpp:401 wxvbam.cpp:418
 #, c-format
 msgid "Invalid configuration file provided: %s"
 msgstr ""
 
-#: wxvbam.cpp:559
+#: wxvbam.cpp:558
 msgid "Could not create main window"
 msgstr "Kunne ikke opprette hovedvindu"
 
-#: wxvbam.cpp:634
+#: wxvbam.cpp:633
 msgid "Save built-in XRC file and exit"
 msgstr "Lagre innebygget XRC fil og avslutt"
 
-#: wxvbam.cpp:637
+#: wxvbam.cpp:636
 msgid "Save built-in vba-over.ini and exit"
 msgstr "Lagre innebygget vba-over.ini og avslutt"
 
-#: wxvbam.cpp:640
+#: wxvbam.cpp:639
 msgid "Print configuration path and exit"
 msgstr "Vis konfigurasjonssti og avslutt"
 
-#: wxvbam.cpp:643
+#: wxvbam.cpp:642
 msgid "Start in full-screen mode"
 msgstr "Start i fullskjermmodus"
 
-#: wxvbam.cpp:646
+#: wxvbam.cpp:645
 msgid "Set a configuration file"
 msgstr ""
 
-#: wxvbam.cpp:650
+#: wxvbam.cpp:649
 msgid "Delete shared link state first, if it exists"
 msgstr "Slett delt koblingstilstand først dersom den eksisterer"
 
-#: wxvbam.cpp:657
+#: wxvbam.cpp:656
 msgid "List all settable options and exit"
 msgstr "Vis alle overskrivbare valg og avslutt"
 
-#: wxvbam.cpp:660
+#: wxvbam.cpp:659
 msgid "ROM file"
 msgstr "ROM fil"
 
-#: wxvbam.cpp:662
+#: wxvbam.cpp:661
 msgid "<config>=<value>"
 msgstr "<valg>=<verdi>"
 
-#: wxvbam.cpp:693
+#: wxvbam.cpp:692
 msgid "Configuration / build error: can't find built-in xrc"
 msgstr ""
 
-#: wxvbam.cpp:701
+#: wxvbam.cpp:700
 #, c-format
 msgid ""
 "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:"
 msgstr ""
 
-#: wxvbam.cpp:715
+#: wxvbam.cpp:714
 msgid "Configuration is read from, in order:"
 msgstr "Konfigurasjonen ble lest fra (i rekkefølge):"
 
-#: wxvbam.cpp:729
+#: wxvbam.cpp:728
 #, c-format
 msgid ""
 "Wrote built-in override file to %s\n"
 "To override, delete all but changed section. First found section is used from search path:"
 msgstr ""
 
-#: wxvbam.cpp:735
+#: wxvbam.cpp:734
 msgid ""
 "\n"
 "\tbuilt-in"
 msgstr "\n»innebygget"
 
-#: wxvbam.cpp:750
+#: wxvbam.cpp:749
 msgid ""
 "Options set from the command line are saved if any configuration changes are made in the user interface.\n"
 "\n"
@@ -1704,17 +1793,17 @@ msgid ""
 "\n"
 msgstr "Valg satt fra kommandolinjen blir lagret hvis konfigurasjonen blir endret i brukergrensesnittet.\n\nFor flagg-valg oppgis true og false som henholdsvis 1 og 0.\n\n"
 
-#: wxvbam.cpp:758
+#: wxvbam.cpp:757
 msgid ""
 "The commands available for the Keyboard/* option are:\n"
 "\n"
 msgstr "Tilgjengelige kommandoer for Tastatur/* valg er:\n\n"
 
-#: wxvbam.cpp:769
+#: wxvbam.cpp:768
 msgid "Configuration file not found."
 msgstr ""
 
-#: wxvbam.cpp:800
+#: wxvbam.cpp:799
 msgid "Bad configuration option or multiple ROM files given:\n"
 msgstr "Ugyldig konfigurasjonsvalg eller flere ROM filer oppgitt:\n"
 
@@ -2226,10 +2315,6 @@ msgstr "Hopp over rammer å tegne"
 msgid "&Number of frames to skip:"
 msgstr ""
 
-#: xrc/DisplayConfig.xrc:200
-msgid "Speed"
-msgstr "Hastighet"
-
 #: xrc/DisplayConfig.xrc:216
 msgid "Speed indicator:"
 msgstr ""
@@ -2765,58 +2850,10 @@ msgid ""
 " entire contents if too small."
 msgstr ""
 
-#: xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
-msgid "Up"
-msgstr "Opp"
-
-#: xrc/JoyPanel.xrc:37
-msgid "A"
-msgstr "A"
-
-#: xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
-msgid "Down"
-msgstr "Ned"
-
-#: xrc/JoyPanel.xrc:83
-msgid "B"
-msgstr "B"
-
-#: xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
-msgid "Left"
-msgstr "Venstre"
-
-#: xrc/JoyPanel.xrc:129
-msgid "L"
-msgstr "L"
-
-#: xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
-msgid "Right"
-msgstr "Høyre"
-
-#: xrc/JoyPanel.xrc:175
-msgid "R"
-msgstr "R"
-
-#: xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
-msgid "Select"
-msgstr "Select-knapp"
-
-#: xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
-msgid "Start"
-msgstr "Start-knapp"
-
-#: xrc/JoyPanel.xrc:254
-msgid "Motion Up"
-msgstr "Bevegelser Opp"
-
 #: xrc/JoyPanel.xrc:276
 msgid "Autofire A"
 msgstr "Autotrykk-A"
 
-#: xrc/JoyPanel.xrc:298
-msgid "Motion Down"
-msgstr "Bevegelser Ned"
-
 #: xrc/JoyPanel.xrc:320
 msgid "Autofire B"
 msgstr "Autotrykk-B"
diff --git a/po/wxvbam/nl.po b/po/wxvbam/nl.po
index 6e5c618b..bd69d164 100644
--- a/po/wxvbam/nl.po
+++ b/po/wxvbam/nl.po
@@ -12,7 +12,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VBA-M\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-23 22:00+0000\n"
+"POT-Creation-Date: 2024-04-24 02:00+0000\n"
 "PO-Revision-Date: 2011-12-03 19:42+0000\n"
 "Last-Translator: LevensLes The, 2022\n"
 "Language-Team: Dutch (http://app.transifex.com/bgk/vba-m/language/nl/)\n"
@@ -323,174 +323,263 @@ msgstr ""
 msgid "Network is not supported in local mode."
 msgstr "Netwerk wordt niet ondersteund in de lokale modus."
 
-#: config/internal/option-internal.cpp:379
-msgid "Use bilinear filter with 3d renderer"
+#: config/command.cpp:28 xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
+msgid "Up"
+msgstr "Omhoog"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
+msgid "Down"
+msgstr "Omlaag"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
+msgid "Left"
+msgstr "Links"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
+msgid "Right"
+msgstr "Rechts"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:37
+msgid "A"
+msgstr "A"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:83
+msgid "B"
+msgstr "B"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:129
+msgid "L"
+msgstr "L"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:175
+msgid "R"
+msgstr "R"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
+msgid "Select"
+msgstr "Select"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
+msgid "Start"
+msgstr "Start"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:254
+msgid "Motion Up"
+msgstr "Beweging Omhoog"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:298
+msgid "Motion Down"
+msgstr "Beweging Omlaag"
+
+#: config/command.cpp:30
+msgid "Motion Left"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion Right"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion In"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Motion Out"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto A"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto B"
+msgstr ""
+
+#: config/command.cpp:31 xrc/DisplayConfig.xrc:200
+msgid "Speed"
+msgstr "Snelheid"
+
+#: config/command.cpp:31
+msgid "Capture"
+msgstr ""
+
+#: config/command.cpp:32
+msgid "GameShark"
+msgstr ""
+
+#: config/command.cpp:106
+#, c-format
+msgid "Joypad %zu %s"
 msgstr ""
 
 #: config/internal/option-internal.cpp:380
-msgid "Full-screen filter to apply"
+msgid "Use bilinear filter with 3d renderer"
 msgstr ""
 
 #: config/internal/option-internal.cpp:381
-msgid "Filter plugin library"
+msgid "Full-screen filter to apply"
 msgstr ""
 
 #: config/internal/option-internal.cpp:382
-msgid "Interframe blending function"
+msgid "Filter plugin library"
 msgstr ""
 
 #: config/internal/option-internal.cpp:383
+msgid "Interframe blending function"
+msgstr ""
+
+#: config/internal/option-internal.cpp:384
 msgid "Keep window on top"
 msgstr ""
 
-#: config/internal/option-internal.cpp:385
+#: config/internal/option-internal.cpp:386
 msgid "Maximum number of threads to run filters in"
 msgstr ""
 
-#: config/internal/option-internal.cpp:387
+#: config/internal/option-internal.cpp:388
 msgid "Render method; if unsupported, simple method will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:388
+#: config/internal/option-internal.cpp:389
 msgid "Default scale factor"
 msgstr ""
 
-#: config/internal/option-internal.cpp:389
+#: config/internal/option-internal.cpp:390
 msgid "Retain aspect ratio when resizing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:392
+#: config/internal/option-internal.cpp:393
 msgid "BIOS file to use for Game Boy, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:393
+#: config/internal/option-internal.cpp:394
 msgid "Game Boy color enhancement, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:394
+#: config/internal/option-internal.cpp:395
 msgid "Enable DX Colorization Hacks"
 msgstr ""
 
-#: config/internal/option-internal.cpp:395
-#: config/internal/option-internal.cpp:419
+#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:420
 msgid "Apply LCD filter, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:397
 msgid "BIOS file to use for Game Boy Color, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:398
+#: config/internal/option-internal.cpp:399
 msgid ""
 "The default palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:401
+#: config/internal/option-internal.cpp:402
 msgid ""
 "The first user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:404
+#: config/internal/option-internal.cpp:405
 msgid ""
 "The second user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:407
+#: config/internal/option-internal.cpp:408
 msgid "Automatically gather a full page before printing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:409
+#: config/internal/option-internal.cpp:410
 msgid "Automatically save printouts as screen captures with -print suffix"
 msgstr ""
 
-#: config/internal/option-internal.cpp:411
-#: config/internal/option-internal.cpp:439
+#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:440
 msgid "Directory to look for ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:413
 msgid "Directory to look for Game Boy Color ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:415
+#: config/internal/option-internal.cpp:416
 msgid "BIOS file to use, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:425
+#: config/internal/option-internal.cpp:426
 msgid "Enable link at boot"
 msgstr ""
 
-#: config/internal/option-internal.cpp:430
+#: config/internal/option-internal.cpp:431
 msgid "Enable faster network protocol by default"
 msgstr ""
 
-#: config/internal/option-internal.cpp:432
+#: config/internal/option-internal.cpp:433
 msgid "Default network link client host"
 msgstr ""
 
-#: config/internal/option-internal.cpp:433
+#: config/internal/option-internal.cpp:434
 msgid "Default network link server IP to bind"
 msgstr ""
 
-#: config/internal/option-internal.cpp:434
+#: config/internal/option-internal.cpp:435
 msgid "Default network link port (server and client)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:435
+#: config/internal/option-internal.cpp:436
 msgid "Default network protocol"
 msgstr ""
 
-#: config/internal/option-internal.cpp:436
+#: config/internal/option-internal.cpp:437
 msgid "Link timeout (ms)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:437
+#: config/internal/option-internal.cpp:438
 msgid "Link cable type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:442
+#: config/internal/option-internal.cpp:443
 msgid "Automatically load last saved state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:444
+#: config/internal/option-internal.cpp:445
 msgid ""
 "Directory to store game save files (relative paths are relative to ROM; "
 "blank is config dir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:446
+#: config/internal/option-internal.cpp:447
 msgid "Freeze recent load list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:448
+#: config/internal/option-internal.cpp:449
 msgid ""
 "Directory to store A / V and game recordings (relative paths are relative to"
 " ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:451
+#: config/internal/option-internal.cpp:452
 msgid "Number of seconds between rewind snapshots (0 to disable)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:453
+#: config/internal/option-internal.cpp:454
 msgid "Directory to store screenshots (relative paths are relative to ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:456
+#: config/internal/option-internal.cpp:457
 msgid ""
 "Directory to store saved state files (relative paths are relative to "
 "BatteryDir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:458
+#: config/internal/option-internal.cpp:459
 msgid "Enable status bar"
 msgstr ""
 
-#: config/internal/option-internal.cpp:459
+#: config/internal/option-internal.cpp:460
 msgid "INI file version (DO NOT MODIFY)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:463
+#: config/internal/option-internal.cpp:464
 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, "
@@ -498,266 +587,266 @@ msgid ""
 "MotionRight, AutoA, AutoB, Speed, Capture, GS"
 msgstr ""
 
-#: config/internal/option-internal.cpp:468
+#: config/internal/option-internal.cpp:469
 msgid "The autofire toggle period, in frames (1/60 s)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:469
+#: config/internal/option-internal.cpp:470
 msgid "The number of the stick to use in single-player mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:471
+#: config/internal/option-internal.cpp:472
 msgid "Whether to enable SDL GameController mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:475
+#: config/internal/option-internal.cpp:476
 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 "
 "executed."
 msgstr ""
 
-#: config/internal/option-internal.cpp:480
+#: config/internal/option-internal.cpp:481
 msgid "Enable AGB debug print"
 msgstr ""
 
-#: config/internal/option-internal.cpp:481
+#: config/internal/option-internal.cpp:482
 msgid "Auto skip frames"
 msgstr ""
 
-#: config/internal/option-internal.cpp:483
+#: config/internal/option-internal.cpp:484
 msgid "Apply IPS / UPS / IPF patches if found"
 msgstr ""
 
-#: config/internal/option-internal.cpp:485
+#: config/internal/option-internal.cpp:486
 msgid "Automatically save and load cheat list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:489
+#: config/internal/option-internal.cpp:490
 msgid "Automatically enable border for Super Game Boy games"
 msgstr ""
 
-#: config/internal/option-internal.cpp:491
+#: config/internal/option-internal.cpp:492
 msgid "Always enable border"
 msgstr ""
 
-#: config/internal/option-internal.cpp:492
+#: config/internal/option-internal.cpp:493
 msgid "Screen capture file format"
 msgstr ""
 
-#: config/internal/option-internal.cpp:493
+#: config/internal/option-internal.cpp:494
 msgid "Enable cheats"
 msgstr ""
 
-#: config/internal/option-internal.cpp:494
+#: config/internal/option-internal.cpp:495
 msgid "Disable on-screen status messages"
 msgstr ""
 
-#: config/internal/option-internal.cpp:495
+#: config/internal/option-internal.cpp:496
 msgid "Type of system to emulate"
 msgstr ""
 
-#: config/internal/option-internal.cpp:496
+#: config/internal/option-internal.cpp:497
 msgid "Flash size 0 = 64 KB 1 = 128 KB"
 msgstr ""
 
-#: config/internal/option-internal.cpp:498
+#: config/internal/option-internal.cpp:499
 msgid "Skip frames. Values are 0-9 or -1 to skip automatically based on time."
 msgstr ""
 
-#: config/internal/option-internal.cpp:500
+#: config/internal/option-internal.cpp:501
 msgid "The palette to use"
 msgstr ""
 
-#: config/internal/option-internal.cpp:501
+#: config/internal/option-internal.cpp:502
 msgid "Enable printer emulation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:503
+#: config/internal/option-internal.cpp:504
 msgid "Break into GDB after loading the game."
 msgstr ""
 
-#: config/internal/option-internal.cpp:504
+#: config/internal/option-internal.cpp:505
 msgid "Port to connect GDB to"
 msgstr ""
 
-#: config/internal/option-internal.cpp:506
+#: config/internal/option-internal.cpp:507
 msgid "Number of players in network"
 msgstr ""
 
-#: config/internal/option-internal.cpp:508
+#: config/internal/option-internal.cpp:509
 msgid "Maximum scale factor (0 = no limit)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:510
+#: config/internal/option-internal.cpp:511
 msgid "Pause game when main window loses focus"
 msgstr ""
 
-#: config/internal/option-internal.cpp:512
+#: config/internal/option-internal.cpp:513
 msgid "Enable RTC (vba-over.ini override is rtcEnabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:513
+#: config/internal/option-internal.cpp:514
 msgid "Native save (\"battery\") hardware type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:514
+#: config/internal/option-internal.cpp:515
 msgid "Show speed indicator"
 msgstr ""
 
-#: config/internal/option-internal.cpp:516
+#: config/internal/option-internal.cpp:517
 msgid "Draw on-screen messages transparently"
 msgstr ""
 
-#: config/internal/option-internal.cpp:517
+#: config/internal/option-internal.cpp:518
 msgid "Skip BIOS initialization"
 msgstr ""
 
-#: config/internal/option-internal.cpp:519
+#: config/internal/option-internal.cpp:520
 msgid "Do not overwrite cheat list when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:521
+#: config/internal/option-internal.cpp:522
 msgid "Do not overwrite native (battery) save when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:523
+#: config/internal/option-internal.cpp:524
 msgid "Throttle game speed, even when accelerated (0-450 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:526
+#: config/internal/option-internal.cpp:527
 msgid "Set throttle for speedup key (0-3000 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:528
+#: config/internal/option-internal.cpp:529
 msgid "Number of frames to skip with speedup (instead of speedup throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:531
+#: config/internal/option-internal.cpp:532
 msgid "Use frame skip for speedup throttle"
 msgstr ""
 
-#: config/internal/option-internal.cpp:532
+#: config/internal/option-internal.cpp:533
 msgid "Use the specified BIOS file for Game Boy"
 msgstr ""
 
-#: config/internal/option-internal.cpp:533
+#: config/internal/option-internal.cpp:534
 msgid "Use the specified BIOS file"
 msgstr ""
 
-#: config/internal/option-internal.cpp:535
+#: config/internal/option-internal.cpp:536
 msgid "Use the specified BIOS file for Game Boy Color"
 msgstr ""
 
-#: config/internal/option-internal.cpp:536
+#: config/internal/option-internal.cpp:537
 msgid "Wait for vertical sync"
 msgstr ""
 
-#: config/internal/option-internal.cpp:539
+#: config/internal/option-internal.cpp:540
 msgid "Enter fullscreen mode at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:540
+#: config/internal/option-internal.cpp:541
 msgid "Window maximized"
 msgstr ""
 
-#: config/internal/option-internal.cpp:541
+#: config/internal/option-internal.cpp:542
 msgid "Window height at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:542
+#: config/internal/option-internal.cpp:543
 msgid "Window width at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:543
+#: config/internal/option-internal.cpp:544
 msgid "Window axis X position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:544
+#: config/internal/option-internal.cpp:545
 msgid "Window axis Y position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:548
+#: config/internal/option-internal.cpp:549
 msgid "Capture key events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:550
+#: config/internal/option-internal.cpp:551
 msgid "Capture joy events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:551
+#: config/internal/option-internal.cpp:552
 msgid "Hide menu bar when mouse is inactive"
 msgstr ""
 
-#: config/internal/option-internal.cpp:553
+#: config/internal/option-internal.cpp:554
 msgid "Suspend screensaver when game is running"
 msgstr ""
 
-#: config/internal/option-internal.cpp:556
+#: config/internal/option-internal.cpp:557
 msgid "Sound API; if unsupported, default API will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:557
+#: config/internal/option-internal.cpp:558
 msgid "Device ID of chosen audio device for chosen driver"
 msgstr ""
 
-#: config/internal/option-internal.cpp:558
+#: config/internal/option-internal.cpp:559
 msgid "Number of sound buffers"
 msgstr ""
 
-#: config/internal/option-internal.cpp:559
+#: config/internal/option-internal.cpp:560
 msgid "Bit mask of sound channels to enable"
 msgstr ""
 
-#: config/internal/option-internal.cpp:560
+#: config/internal/option-internal.cpp:561
 msgid "Game Boy Advance sound filtering (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:562
+#: config/internal/option-internal.cpp:563
 msgid "Game Boy Advance sound interpolation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:563
+#: config/internal/option-internal.cpp:564
 msgid "Game Boy sound declicking"
 msgstr ""
 
-#: config/internal/option-internal.cpp:564
+#: config/internal/option-internal.cpp:565
 msgid "Game Boy echo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:565
+#: config/internal/option-internal.cpp:566
 msgid "Enable Game Boy sound effects"
 msgstr ""
 
-#: config/internal/option-internal.cpp:566
+#: config/internal/option-internal.cpp:567
 msgid "Game Boy stereo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:567
+#: config/internal/option-internal.cpp:568
 msgid "Game Boy surround sound effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:568
+#: config/internal/option-internal.cpp:569
 msgid "Sound sample rate (kHz)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:569
+#: config/internal/option-internal.cpp:570
 msgid "Use DirectSound hardware acceleration"
 msgstr ""
 
-#: config/internal/option-internal.cpp:570
+#: config/internal/option-internal.cpp:571
 msgid "Upmix stereo to surround"
 msgstr ""
 
-#: config/internal/option-internal.cpp:571
+#: config/internal/option-internal.cpp:572
 msgid "Sound volume (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:639
-#: config/internal/option-internal.cpp:659
-#: config/internal/option-internal.cpp:680
-#: config/internal/option-internal.cpp:700
-#: config/internal/option-internal.cpp:719
+#: config/internal/option-internal.cpp:640
+#: config/internal/option-internal.cpp:660
+#: config/internal/option-internal.cpp:681
+#: config/internal/option-internal.cpp:701
+#: config/internal/option-internal.cpp:720
 #, c-format
 msgid "Invalid value %s for option %s; valid values are %s"
 msgstr ""
@@ -772,7 +861,7 @@ msgstr "Ongeldige waarde %f voor optie %s; geldige waarden zijn %f - %f"
 msgid "Invalid value %d for option %s; valid values are %d - %d"
 msgstr "Ongeldige waarde %d voor optie %s; geldige waarden zijn %d - %d"
 
-#: config/option.cpp:480 opts.cpp:621 opts.cpp:630 opts.cpp:639 opts.cpp:648
+#: config/option.cpp:480 opts.cpp:468 opts.cpp:477 opts.cpp:486 opts.cpp:495
 #, c-format
 msgid "Invalid value %s for option %s"
 msgstr ""
@@ -937,19 +1026,19 @@ msgstr "Meta+"
 msgid "Key"
 msgstr ""
 
-#: dialogs/accel-config.cpp:149
+#: dialogs/accel-config.cpp:148
 msgid "Menu commands"
 msgstr "Menu commando's"
 
-#: dialogs/accel-config.cpp:261
+#: dialogs/accel-config.cpp:259
 msgid "This will clear all user-defined accelerators. Are you sure?"
 msgstr ""
 
-#: dialogs/accel-config.cpp:261 dialogs/accel-config.cpp:298
+#: dialogs/accel-config.cpp:259 dialogs/accel-config.cpp:306
 msgid "Confirm"
 msgstr "Bevestig"
 
-#: dialogs/accel-config.cpp:295
+#: dialogs/accel-config.cpp:304
 #, c-format
 msgid "This will unassign \"%s\" from \"%s\". Are you sure?"
 msgstr ""
@@ -1321,22 +1410,22 @@ msgstr "Oude waarde"
 msgid "New Value"
 msgstr "Nieuwe waarde"
 
-#: guiinit.cpp:2518
+#: guiinit.cpp:2519
 msgid "JoyBus host invalid; disabling"
 msgstr "JoyBus host ongeldig; wordt uitgeschakeld"
 
-#: opts.cpp:298
+#: opts.cpp:154
 msgid ""
 "The INI file was written for a more recent version of VBA-M. Some INI option"
 " values may have been reset."
 msgstr ""
 
-#: opts.cpp:480 opts.cpp:500 opts.cpp:685
+#: opts.cpp:339 opts.cpp:355 opts.cpp:522
 #, c-format
 msgid "Invalid key binding %s for %s"
 msgstr "Ongeldige sleutelbinding %s voor %s"
 
-#: opts.cpp:707
+#: opts.cpp:528
 #, c-format
 msgid "Unknown option %s with value %s"
 msgstr ""
@@ -1560,37 +1649,37 @@ msgstr "Afspelen beëindigd"
 msgid "%d %% (%d, %d fps)"
 msgstr ""
 
-#: sys.cpp:899 xrc/GBPrinter.xrc:65
+#: sys.cpp:898 xrc/GBPrinter.xrc:65
 msgid "&Discard"
 msgstr "&Weggooien"
 
-#: sys.cpp:933
+#: sys.cpp:932
 msgid "Image files (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 msgstr "Afbeeldingsbestanden (* .bmp; *. Jpg; *. Png) | * .bmp; *. Jpg; *. Png |"
 
-#: sys.cpp:942
+#: sys.cpp:941
 msgid "Save printer image to"
 msgstr "Sla printerafbeelding op naar"
 
-#: sys.cpp:956 sys.cpp:1140
+#: sys.cpp:955 sys.cpp:1139
 #, c-format
 msgid "Wrote printer output to %s"
 msgstr "Printer output geschreven naar %s"
 
-#: sys.cpp:961 sys.cpp:1032
+#: sys.cpp:960 sys.cpp:1031
 msgid "&Close"
 msgstr "&Sluiten"
 
-#: sys.cpp:1027
+#: sys.cpp:1026
 msgid "Printed"
 msgstr "Geprint"
 
-#: sys.cpp:1302
+#: sys.cpp:1301
 #, c-format
 msgid "Error opening pseudo tty: %s"
 msgstr "Fout bij openen van pseudo tty: %s"
 
-#: sys.cpp:1401
+#: sys.cpp:1400
 #, c-format
 msgid "Error setting up server socket (%d)"
 msgstr "Fout bij het opzetten van de server socket (%d)"
@@ -1624,80 +1713,80 @@ msgstr ""
 msgid "Unable to load dialog %s from resources"
 msgstr "Kan dialoog %s niet laden uit het bronbestand"
 
-#: wxvbam.cpp:398 wxvbam.cpp:415
+#: wxvbam.cpp:401 wxvbam.cpp:418
 #, c-format
 msgid "Invalid configuration file provided: %s"
 msgstr ""
 
-#: wxvbam.cpp:559
+#: wxvbam.cpp:558
 msgid "Could not create main window"
 msgstr "Kon hoofdvenster niet aanmaken"
 
-#: wxvbam.cpp:634
+#: wxvbam.cpp:633
 msgid "Save built-in XRC file and exit"
 msgstr "Sla ingebouwd XRC bestand op en sluit af"
 
-#: wxvbam.cpp:637
+#: wxvbam.cpp:636
 msgid "Save built-in vba-over.ini and exit"
 msgstr "Sla ingebouwde vba-over.ini op en sluit af"
 
-#: wxvbam.cpp:640
+#: wxvbam.cpp:639
 msgid "Print configuration path and exit"
 msgstr "Geef configuratie pad weer en sluit af"
 
-#: wxvbam.cpp:643
+#: wxvbam.cpp:642
 msgid "Start in full-screen mode"
 msgstr "Start in volledig scherm modus"
 
-#: wxvbam.cpp:646
+#: wxvbam.cpp:645
 msgid "Set a configuration file"
 msgstr "Selecteer een configuratie bestand"
 
-#: wxvbam.cpp:650
+#: wxvbam.cpp:649
 msgid "Delete shared link state first, if it exists"
 msgstr "Verwijder eerst de gedeelde link van de stand, indien aanwezig"
 
-#: wxvbam.cpp:657
+#: wxvbam.cpp:656
 msgid "List all settable options and exit"
 msgstr "Toon alle instelbare opties en sluit af"
 
-#: wxvbam.cpp:660
+#: wxvbam.cpp:659
 msgid "ROM file"
 msgstr "ROM-bestand"
 
-#: wxvbam.cpp:662
+#: wxvbam.cpp:661
 msgid "<config>=<value>"
 msgstr "<configuratie>=<waarde>"
 
-#: wxvbam.cpp:693
+#: wxvbam.cpp:692
 msgid "Configuration / build error: can't find built-in xrc"
 msgstr ""
 
-#: wxvbam.cpp:701
+#: wxvbam.cpp:700
 #, c-format
 msgid ""
 "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:"
 msgstr ""
 
-#: wxvbam.cpp:715
+#: wxvbam.cpp:714
 msgid "Configuration is read from, in order:"
 msgstr "De configuratie wordt uitgelezen in volgorde:"
 
-#: wxvbam.cpp:729
+#: wxvbam.cpp:728
 #, c-format
 msgid ""
 "Wrote built-in override file to %s\n"
 "To override, delete all but changed section. First found section is used from search path:"
 msgstr ""
 
-#: wxvbam.cpp:735
+#: wxvbam.cpp:734
 msgid ""
 "\n"
 "\tbuilt-in"
 msgstr "\n»ingebouwde"
 
-#: wxvbam.cpp:750
+#: wxvbam.cpp:749
 msgid ""
 "Options set from the command line are saved if any configuration changes are made in the user interface.\n"
 "\n"
@@ -1705,17 +1794,17 @@ msgid ""
 "\n"
 msgstr "Opties ingesteld vanaf de opdrachtregel worden opgeslagen zodra er een configuratiewijziging wordt gemaakt in de gebruikersinterface.\n\nVoor flag opties, waar en onwaar zijn gespecificeerd als 1 en 0, respectievelijk,\n\n"
 
-#: wxvbam.cpp:758
+#: wxvbam.cpp:757
 msgid ""
 "The commands available for the Keyboard/* option are:\n"
 "\n"
 msgstr "De commando's beschikbaar voor de Toetsenbord/* optie zijn:\n\n"
 
-#: wxvbam.cpp:769
+#: wxvbam.cpp:768
 msgid "Configuration file not found."
 msgstr "Configuratie bestand niet gevonden."
 
-#: wxvbam.cpp:800
+#: wxvbam.cpp:799
 msgid "Bad configuration option or multiple ROM files given:\n"
 msgstr "Slechte configuratie optie of meerdere ROM bestanden opgegeven:\n"
 
@@ -2227,10 +2316,6 @@ msgstr "Frame Overslaan"
 msgid "&Number of frames to skip:"
 msgstr ""
 
-#: xrc/DisplayConfig.xrc:200
-msgid "Speed"
-msgstr "Snelheid"
-
 #: xrc/DisplayConfig.xrc:216
 msgid "Speed indicator:"
 msgstr ""
@@ -2766,58 +2851,10 @@ msgid ""
 " entire contents if too small."
 msgstr ""
 
-#: xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
-msgid "Up"
-msgstr "Omhoog"
-
-#: xrc/JoyPanel.xrc:37
-msgid "A"
-msgstr "A"
-
-#: xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
-msgid "Down"
-msgstr "Omlaag"
-
-#: xrc/JoyPanel.xrc:83
-msgid "B"
-msgstr "B"
-
-#: xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
-msgid "Left"
-msgstr "Links"
-
-#: xrc/JoyPanel.xrc:129
-msgid "L"
-msgstr "L"
-
-#: xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
-msgid "Right"
-msgstr "Rechts"
-
-#: xrc/JoyPanel.xrc:175
-msgid "R"
-msgstr "R"
-
-#: xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
-msgid "Select"
-msgstr "Select"
-
-#: xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
-msgid "Start"
-msgstr "Start"
-
-#: xrc/JoyPanel.xrc:254
-msgid "Motion Up"
-msgstr "Beweging Omhoog"
-
 #: xrc/JoyPanel.xrc:276
 msgid "Autofire A"
 msgstr "Automatisch drukken op A"
 
-#: xrc/JoyPanel.xrc:298
-msgid "Motion Down"
-msgstr "Beweging Omlaag"
-
 #: xrc/JoyPanel.xrc:320
 msgid "Autofire B"
 msgstr "Automatisch drukken op B"
diff --git a/po/wxvbam/pl_PL.po b/po/wxvbam/pl_PL.po
index e2cb1103..82c66b9d 100644
--- a/po/wxvbam/pl_PL.po
+++ b/po/wxvbam/pl_PL.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VBA-M\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-23 22:00+0000\n"
+"POT-Creation-Date: 2024-04-24 02:00+0000\n"
 "PO-Revision-Date: 2011-12-03 19:42+0000\n"
 "Last-Translator: Damian Drakon <dragon1590@gmail.com>, 2019-2020,2022-2023\n"
 "Language-Team: Polish (Poland) (http://app.transifex.com/bgk/vba-m/language/pl_PL/)\n"
@@ -319,174 +319,263 @@ msgstr "Połączenie LAN jest już aktywne. Wyłącz tryb połączenia aby się
 msgid "Network is not supported in local mode."
 msgstr "W trybie lokalnym sieć nie jest wspierana."
 
-#: config/internal/option-internal.cpp:379
+#: config/command.cpp:28 xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
+msgid "Up"
+msgstr "Góra"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
+msgid "Down"
+msgstr "Dół"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
+msgid "Left"
+msgstr "Lewo"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
+msgid "Right"
+msgstr "Prawo"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:37
+msgid "A"
+msgstr "A"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:83
+msgid "B"
+msgstr "B"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:129
+msgid "L"
+msgstr "L"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:175
+msgid "R"
+msgstr "P"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
+msgid "Select"
+msgstr "Wybierz"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
+msgid "Start"
+msgstr "Start"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:254
+msgid "Motion Up"
+msgstr "Ruch w górę"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:298
+msgid "Motion Down"
+msgstr "Ruch w dół"
+
+#: config/command.cpp:30
+msgid "Motion Left"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion Right"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion In"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Motion Out"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto A"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto B"
+msgstr ""
+
+#: config/command.cpp:31 xrc/DisplayConfig.xrc:200
+msgid "Speed"
+msgstr "Prędkość"
+
+#: config/command.cpp:31
+msgid "Capture"
+msgstr ""
+
+#: config/command.cpp:32
+msgid "GameShark"
+msgstr ""
+
+#: config/command.cpp:106
+#, c-format
+msgid "Joypad %zu %s"
+msgstr ""
+
+#: config/internal/option-internal.cpp:380
 msgid "Use bilinear filter with 3d renderer"
 msgstr "Użyj filtra bilinearnego z rendererem 3d"
 
-#: config/internal/option-internal.cpp:380
+#: config/internal/option-internal.cpp:381
 msgid "Full-screen filter to apply"
 msgstr "Filtr pełnoekranowy do zastosowania"
 
-#: config/internal/option-internal.cpp:381
+#: config/internal/option-internal.cpp:382
 msgid "Filter plugin library"
 msgstr "Biblioteka wtyczek filtrów"
 
-#: config/internal/option-internal.cpp:382
+#: config/internal/option-internal.cpp:383
 msgid "Interframe blending function"
 msgstr "Funkcja mieszania międzyklatkowego"
 
-#: config/internal/option-internal.cpp:383
+#: config/internal/option-internal.cpp:384
 msgid "Keep window on top"
 msgstr "Zachowaj okno na wierzchu"
 
-#: config/internal/option-internal.cpp:385
+#: config/internal/option-internal.cpp:386
 msgid "Maximum number of threads to run filters in"
 msgstr "Maksymalna liczba wątków do uruchomienia filtrów w"
 
-#: config/internal/option-internal.cpp:387
+#: config/internal/option-internal.cpp:388
 msgid "Render method; if unsupported, simple method will be used"
 msgstr "Metoda renderowania; jeśli nie jest obsługiwana, zostanie użyta metoda prosta"
 
-#: config/internal/option-internal.cpp:388
+#: config/internal/option-internal.cpp:389
 msgid "Default scale factor"
 msgstr "Domyślny współczynnik skali"
 
-#: config/internal/option-internal.cpp:389
+#: config/internal/option-internal.cpp:390
 msgid "Retain aspect ratio when resizing"
 msgstr "Zachowaj współczynnik proporcji podczas zmiany rozmiaru"
 
-#: config/internal/option-internal.cpp:392
+#: config/internal/option-internal.cpp:393
 msgid "BIOS file to use for Game Boy, if enabled"
 msgstr "Plik BIOS-u używany dla konsoli Game Boy, jeśli jest włączony"
 
-#: config/internal/option-internal.cpp:393
+#: config/internal/option-internal.cpp:394
 msgid "Game Boy color enhancement, if enabled"
 msgstr "Wzmocnienie kolorów konsoli Game Boy, jeśli jest włączone"
 
-#: config/internal/option-internal.cpp:394
+#: config/internal/option-internal.cpp:395
 msgid "Enable DX Colorization Hacks"
 msgstr "Włącz hacki do koloryzacji DX-a"
 
-#: config/internal/option-internal.cpp:395
-#: config/internal/option-internal.cpp:419
+#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:420
 msgid "Apply LCD filter, if enabled"
 msgstr "Zastosuj filtr LCD, jeśli jest włączony"
 
-#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:397
 msgid "BIOS file to use for Game Boy Color, if enabled"
 msgstr "Plik BIOS-u używany dla konsoli Game Boy Color, jeśli jest włączony"
 
-#: config/internal/option-internal.cpp:398
+#: config/internal/option-internal.cpp:399
 msgid ""
 "The default palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr "Domyślna paleta, jako 8 oddzielonych przecinkami 4-cyfrowych liczb całkowitych w formacie hex (rgb555)."
 
-#: config/internal/option-internal.cpp:401
+#: config/internal/option-internal.cpp:402
 msgid ""
 "The first user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr "Pierwsza paleta użytkownika, jako 8 oddzielonych przecinkami 4-cyfrowych liczb całkowitych w formacie hex (rgb555)."
 
-#: config/internal/option-internal.cpp:404
+#: config/internal/option-internal.cpp:405
 msgid ""
 "The second user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr "Druga paleta użytkownika, jako 8 oddzielonych przecinkami 4-cyfrowych liczb całkowitych w formacie hex (rgb555)."
 
-#: config/internal/option-internal.cpp:407
+#: config/internal/option-internal.cpp:408
 msgid "Automatically gather a full page before printing"
 msgstr "Automatycznie zbieraj pełną stronę przed drukowaniem"
 
-#: config/internal/option-internal.cpp:409
+#: config/internal/option-internal.cpp:410
 msgid "Automatically save printouts as screen captures with -print suffix"
 msgstr "Automatycznie zapisuj wydruki jako zrzuty ekranu z przyrostkiem -print"
 
-#: config/internal/option-internal.cpp:411
-#: config/internal/option-internal.cpp:439
+#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:440
 msgid "Directory to look for ROM files"
 msgstr "Katalog, w którym należy szukać plików ROM"
 
-#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:413
 msgid "Directory to look for Game Boy Color ROM files"
 msgstr "Katalog do szukania plików ROM konsoli Game Boy Color"
 
-#: config/internal/option-internal.cpp:415
+#: config/internal/option-internal.cpp:416
 msgid "BIOS file to use, if enabled"
 msgstr "Plik BIOS-u do użycia, jeśli jest włączony"
 
-#: config/internal/option-internal.cpp:425
+#: config/internal/option-internal.cpp:426
 msgid "Enable link at boot"
 msgstr "Włącz połączenie przy rozruchu"
 
-#: config/internal/option-internal.cpp:430
+#: config/internal/option-internal.cpp:431
 msgid "Enable faster network protocol by default"
 msgstr "Włącz domyślnie szybszy protokół sieciowy"
 
-#: config/internal/option-internal.cpp:432
+#: config/internal/option-internal.cpp:433
 msgid "Default network link client host"
 msgstr "Domyślny host klienta łącza sieciowego"
 
-#: config/internal/option-internal.cpp:433
+#: config/internal/option-internal.cpp:434
 msgid "Default network link server IP to bind"
 msgstr "Domyślne IP serwera łącza sieciowego do powiązania"
 
-#: config/internal/option-internal.cpp:434
+#: config/internal/option-internal.cpp:435
 msgid "Default network link port (server and client)"
 msgstr "Domyślny port łącza sieciowego (serwer i klient)"
 
-#: config/internal/option-internal.cpp:435
+#: config/internal/option-internal.cpp:436
 msgid "Default network protocol"
 msgstr "Domyślny protokół sieciowy"
 
-#: config/internal/option-internal.cpp:436
+#: config/internal/option-internal.cpp:437
 msgid "Link timeout (ms)"
 msgstr "Limit czasu oczekiwania na połączenie (ms)"
 
-#: config/internal/option-internal.cpp:437
+#: config/internal/option-internal.cpp:438
 msgid "Link cable type"
 msgstr "Rodzaj kabla łączącego"
 
-#: config/internal/option-internal.cpp:442
+#: config/internal/option-internal.cpp:443
 msgid "Automatically load last saved state"
 msgstr "Automatycznie wczytaj ostatnio zapisany stan"
 
-#: config/internal/option-internal.cpp:444
+#: config/internal/option-internal.cpp:445
 msgid ""
 "Directory to store game save files (relative paths are relative to ROM; "
 "blank is config dir)"
 msgstr "Katalog do przechowywania plików zapisu gry (ścieżki względne są względne do pamięci ROM; pusty jest katalogiem konfiguracyjnym)"
 
-#: config/internal/option-internal.cpp:446
+#: config/internal/option-internal.cpp:447
 msgid "Freeze recent load list"
 msgstr "Zamroź listę ostatnich załadowań"
 
-#: config/internal/option-internal.cpp:448
+#: config/internal/option-internal.cpp:449
 msgid ""
 "Directory to store A / V and game recordings (relative paths are relative to"
 " ROM)"
 msgstr "Katalog do przechowywania nagrań A / V i gier (ścieżki względne są względne do pamięci ROM)"
 
-#: config/internal/option-internal.cpp:451
+#: config/internal/option-internal.cpp:452
 msgid "Number of seconds between rewind snapshots (0 to disable)"
 msgstr "Liczba sekund pomiędzy kolejnymi migawkami do przewijania (0, aby wyłączyć)"
 
-#: config/internal/option-internal.cpp:453
+#: config/internal/option-internal.cpp:454
 msgid "Directory to store screenshots (relative paths are relative to ROM)"
 msgstr "Katalog do przechowywania zrzutów ekranu (ścieżki względne są względne do pamięci ROM)"
 
-#: config/internal/option-internal.cpp:456
+#: config/internal/option-internal.cpp:457
 msgid ""
 "Directory to store saved state files (relative paths are relative to "
 "BatteryDir)"
 msgstr "Katalog do przechowywania plików zapisanego stanu (ścieżki względne są względne do katalogu baterii)"
 
-#: config/internal/option-internal.cpp:458
+#: config/internal/option-internal.cpp:459
 msgid "Enable status bar"
 msgstr "Włącz pasek stanu"
 
-#: config/internal/option-internal.cpp:459
+#: config/internal/option-internal.cpp:460
 msgid "INI file version (DO NOT MODIFY)"
 msgstr "Wersja pliku INI (NIE MODYFIKUJ)"
 
-#: config/internal/option-internal.cpp:463
+#: config/internal/option-internal.cpp:464
 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, "
@@ -494,266 +583,266 @@ msgid ""
 "MotionRight, AutoA, AutoB, Speed, Capture, GS"
 msgstr "Parametr Joypad/<n>/<button> zawiera oddzieloną przecinkami listę nazw klawiszy, które odpowiadają przyciskowi <button> na joypadzie #3. Przycisk jest jednym z następujących: góra, dół, lewo, prawo, A, B, L, R, Wybierz, Start, Ruch w górę, Ruch w dół, Ruch w lewo, Ruch w prawo, Autostrzał A, Autostrzał B, Prędkość, Capture, GS"
 
-#: config/internal/option-internal.cpp:468
+#: config/internal/option-internal.cpp:469
 msgid "The autofire toggle period, in frames (1/60 s)"
 msgstr "Okres przełączania autostrzału, w klatkach (1/60 s)"
 
-#: config/internal/option-internal.cpp:469
+#: config/internal/option-internal.cpp:470
 msgid "The number of the stick to use in single-player mode"
 msgstr "Numer drążka do użycia w trybie dla jednego gracza"
 
-#: config/internal/option-internal.cpp:471
+#: config/internal/option-internal.cpp:472
 msgid "Whether to enable SDL GameController mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:475
+#: config/internal/option-internal.cpp:476
 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 "
 "executed."
 msgstr "Parametr Klawiatura/<cmd> zawiera listę nazw klawiszy oddzielonych przecinkami (np. Alt-Shift-F1).  Po naciśnięciu nazwanego klawisza wykonywane jest polecenie <cmd> ."
 
-#: config/internal/option-internal.cpp:480
+#: config/internal/option-internal.cpp:481
 msgid "Enable AGB debug print"
 msgstr "Włącz wydruk debugowania konsoli AGB"
 
-#: config/internal/option-internal.cpp:481
+#: config/internal/option-internal.cpp:482
 msgid "Auto skip frames"
 msgstr "Automatyczne pomijanie klatek"
 
-#: config/internal/option-internal.cpp:483
+#: config/internal/option-internal.cpp:484
 msgid "Apply IPS / UPS / IPF patches if found"
 msgstr "Zastosuj poprawki IPS / UPS / IPF, jeśli zostały znalezione"
 
-#: config/internal/option-internal.cpp:485
+#: config/internal/option-internal.cpp:486
 msgid "Automatically save and load cheat list"
 msgstr "Automatycznie zapisz i wczytaj listę kodów"
 
-#: config/internal/option-internal.cpp:489
+#: config/internal/option-internal.cpp:490
 msgid "Automatically enable border for Super Game Boy games"
 msgstr "Automatyczne włączanie obramowania dla gier Super Game Boy"
 
-#: config/internal/option-internal.cpp:491
+#: config/internal/option-internal.cpp:492
 msgid "Always enable border"
 msgstr "Zawsze włączaj obramowanie"
 
-#: config/internal/option-internal.cpp:492
+#: config/internal/option-internal.cpp:493
 msgid "Screen capture file format"
 msgstr "Format pliku zrzutu ekranu"
 
-#: config/internal/option-internal.cpp:493
+#: config/internal/option-internal.cpp:494
 msgid "Enable cheats"
 msgstr "Włącz kody"
 
-#: config/internal/option-internal.cpp:494
+#: config/internal/option-internal.cpp:495
 msgid "Disable on-screen status messages"
 msgstr "Wyłącz komunikaty o stanie na ekranie"
 
-#: config/internal/option-internal.cpp:495
+#: config/internal/option-internal.cpp:496
 msgid "Type of system to emulate"
 msgstr "Typ systemu do emulacji"
 
-#: config/internal/option-internal.cpp:496
+#: config/internal/option-internal.cpp:497
 msgid "Flash size 0 = 64 KB 1 = 128 KB"
 msgstr "Rozmiar pamięci flash 0 = 64 KB 1 = 128 KB"
 
-#: config/internal/option-internal.cpp:498
+#: config/internal/option-internal.cpp:499
 msgid "Skip frames. Values are 0-9 or -1 to skip automatically based on time."
 msgstr "Pomijanie klatek. Wartości to 0-9 lub -1, aby pomijać automatycznie na podstawie czasu."
 
-#: config/internal/option-internal.cpp:500
+#: config/internal/option-internal.cpp:501
 msgid "The palette to use"
 msgstr "Paleta do użycia"
 
-#: config/internal/option-internal.cpp:501
+#: config/internal/option-internal.cpp:502
 msgid "Enable printer emulation"
 msgstr "Włącz emulację drukarki"
 
-#: config/internal/option-internal.cpp:503
+#: config/internal/option-internal.cpp:504
 msgid "Break into GDB after loading the game."
 msgstr "Włam się do GDB po załadowaniu gry."
 
-#: config/internal/option-internal.cpp:504
+#: config/internal/option-internal.cpp:505
 msgid "Port to connect GDB to"
 msgstr "Port, do którego należy podłączyć GDB"
 
-#: config/internal/option-internal.cpp:506
+#: config/internal/option-internal.cpp:507
 msgid "Number of players in network"
 msgstr "Liczba graczy w sieci"
 
-#: config/internal/option-internal.cpp:508
+#: config/internal/option-internal.cpp:509
 msgid "Maximum scale factor (0 = no limit)"
 msgstr "Maksymalny współczynnik skali (0 = bez limitu)"
 
-#: config/internal/option-internal.cpp:510
+#: config/internal/option-internal.cpp:511
 msgid "Pause game when main window loses focus"
 msgstr "Wstrzymaj grę, gdy główne okno straci fokus"
 
-#: config/internal/option-internal.cpp:512
+#: config/internal/option-internal.cpp:513
 msgid "Enable RTC (vba-over.ini override is rtcEnabled"
 msgstr "Włącz RTC (nadpisanie vba-over.ini to rtcEnabled)"
 
-#: config/internal/option-internal.cpp:513
+#: config/internal/option-internal.cpp:514
 msgid "Native save (\"battery\") hardware type"
 msgstr "Typ sprzętu natywnego zapisu (\"bateryjnego\")"
 
-#: config/internal/option-internal.cpp:514
+#: config/internal/option-internal.cpp:515
 msgid "Show speed indicator"
 msgstr "Pokaż wskaźnik prędkości"
 
-#: config/internal/option-internal.cpp:516
+#: config/internal/option-internal.cpp:517
 msgid "Draw on-screen messages transparently"
 msgstr "Rysuj komunikaty na ekranie w przejrzysty sposób"
 
-#: config/internal/option-internal.cpp:517
+#: config/internal/option-internal.cpp:518
 msgid "Skip BIOS initialization"
 msgstr "Pomiń inicjalizację BIOS-u"
 
-#: config/internal/option-internal.cpp:519
+#: config/internal/option-internal.cpp:520
 msgid "Do not overwrite cheat list when loading state"
 msgstr "Nie nadpisuj listy kodów podczas ładowania zapisanego stanu gry"
 
-#: config/internal/option-internal.cpp:521
+#: config/internal/option-internal.cpp:522
 msgid "Do not overwrite native (battery) save when loading state"
 msgstr "Nie nadpisuj natywnego (bateryjnego) zapisu podczas ładowania zapisanego stanu gry"
 
-#: config/internal/option-internal.cpp:523
+#: config/internal/option-internal.cpp:524
 msgid "Throttle game speed, even when accelerated (0-450 %, 0 = no throttle)"
 msgstr "Dławienie prędkości gry, nawet gdy jest przyspieszona (0-450%, 0 = brak dławienia)"
 
-#: config/internal/option-internal.cpp:526
+#: config/internal/option-internal.cpp:527
 msgid "Set throttle for speedup key (0-3000 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:528
+#: config/internal/option-internal.cpp:529
 msgid "Number of frames to skip with speedup (instead of speedup throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:531
+#: config/internal/option-internal.cpp:532
 msgid "Use frame skip for speedup throttle"
 msgstr ""
 
-#: config/internal/option-internal.cpp:532
+#: config/internal/option-internal.cpp:533
 msgid "Use the specified BIOS file for Game Boy"
 msgstr "Użyj określonego pliku BIOS dla konsoli Game Boy"
 
-#: config/internal/option-internal.cpp:533
+#: config/internal/option-internal.cpp:534
 msgid "Use the specified BIOS file"
 msgstr "Użyj określonego pliku BIOS"
 
-#: config/internal/option-internal.cpp:535
+#: config/internal/option-internal.cpp:536
 msgid "Use the specified BIOS file for Game Boy Color"
 msgstr "Użyj określonego pliku BIOS dla konsoli Game Boy Color"
 
-#: config/internal/option-internal.cpp:536
+#: config/internal/option-internal.cpp:537
 msgid "Wait for vertical sync"
 msgstr "Zaczekaj na synchronizację pionową"
 
-#: config/internal/option-internal.cpp:539
+#: config/internal/option-internal.cpp:540
 msgid "Enter fullscreen mode at startup"
 msgstr "Wejdź w tryb pełnoekranowy przy uruchomieniu"
 
-#: config/internal/option-internal.cpp:540
+#: config/internal/option-internal.cpp:541
 msgid "Window maximized"
 msgstr "Okno zmaksymalizowane"
 
-#: config/internal/option-internal.cpp:541
+#: config/internal/option-internal.cpp:542
 msgid "Window height at startup"
 msgstr "Wysokość okna przy uruchomieniu"
 
-#: config/internal/option-internal.cpp:542
+#: config/internal/option-internal.cpp:543
 msgid "Window width at startup"
 msgstr "Szerokość okna przy uruchomieniu"
 
-#: config/internal/option-internal.cpp:543
+#: config/internal/option-internal.cpp:544
 msgid "Window axis X position at startup"
 msgstr "Położenie osi X okna przy uruchomieniu"
 
-#: config/internal/option-internal.cpp:544
+#: config/internal/option-internal.cpp:545
 msgid "Window axis Y position at startup"
 msgstr "Położenie osi Y okna przy uruchomieniu"
 
-#: config/internal/option-internal.cpp:548
+#: config/internal/option-internal.cpp:549
 msgid "Capture key events while on background"
 msgstr "Przechwyć kluczowe zdarzenia w tle"
 
-#: config/internal/option-internal.cpp:550
+#: config/internal/option-internal.cpp:551
 msgid "Capture joy events while on background"
 msgstr "Przechwyć radosne zdarzenia w tle"
 
-#: config/internal/option-internal.cpp:551
+#: config/internal/option-internal.cpp:552
 msgid "Hide menu bar when mouse is inactive"
 msgstr "Ukryj pasek menu, gdy mysz jest nieaktywna"
 
-#: config/internal/option-internal.cpp:553
+#: config/internal/option-internal.cpp:554
 msgid "Suspend screensaver when game is running"
 msgstr "Zawieś wygaszacz ekranu, gdy gra jest uruchomiona"
 
-#: config/internal/option-internal.cpp:556
+#: config/internal/option-internal.cpp:557
 msgid "Sound API; if unsupported, default API will be used"
 msgstr "Interfejs API dźwięku; jeśli nie jest obsługiwany, użyty zostanie domyślny interfejs API"
 
-#: config/internal/option-internal.cpp:557
+#: config/internal/option-internal.cpp:558
 msgid "Device ID of chosen audio device for chosen driver"
 msgstr "Identyfikator urządzenia wybranego urządzenia audio dla wybranego sterownika"
 
-#: config/internal/option-internal.cpp:558
+#: config/internal/option-internal.cpp:559
 msgid "Number of sound buffers"
 msgstr "Liczba buforów dźwięku"
 
-#: config/internal/option-internal.cpp:559
+#: config/internal/option-internal.cpp:560
 msgid "Bit mask of sound channels to enable"
 msgstr "Maska bitowa kanałów dźwięku do włączenia"
 
-#: config/internal/option-internal.cpp:560
+#: config/internal/option-internal.cpp:561
 msgid "Game Boy Advance sound filtering (%)"
 msgstr "Filtrowanie dźwięku konsoli Game Boy Advance (%)"
 
-#: config/internal/option-internal.cpp:562
+#: config/internal/option-internal.cpp:563
 msgid "Game Boy Advance sound interpolation"
 msgstr "Interpolacja dźwięku konsoli Game Boy Advance"
 
-#: config/internal/option-internal.cpp:563
+#: config/internal/option-internal.cpp:564
 msgid "Game Boy sound declicking"
 msgstr "Tłumienie kliknięć dźwięku konsoli Game Boy"
 
-#: config/internal/option-internal.cpp:564
+#: config/internal/option-internal.cpp:565
 msgid "Game Boy echo effect (%)"
 msgstr "Efekt echa konsoli Game Boy (%)"
 
-#: config/internal/option-internal.cpp:565
+#: config/internal/option-internal.cpp:566
 msgid "Enable Game Boy sound effects"
 msgstr "Włącz efekty dźwiękowe konsoli Game Boy"
 
-#: config/internal/option-internal.cpp:566
+#: config/internal/option-internal.cpp:567
 msgid "Game Boy stereo effect (%)"
 msgstr "Efekt stereo konsoli Game Boy (%)"
 
-#: config/internal/option-internal.cpp:567
+#: config/internal/option-internal.cpp:568
 msgid "Game Boy surround sound effect (%)"
 msgstr "Efekt dźwięku przestrzennego konsoli Game Boy (%)"
 
-#: config/internal/option-internal.cpp:568
+#: config/internal/option-internal.cpp:569
 msgid "Sound sample rate (kHz)"
 msgstr "Częstotliwość próbkowania dźwięku (kHz)"
 
-#: config/internal/option-internal.cpp:569
+#: config/internal/option-internal.cpp:570
 msgid "Use DirectSound hardware acceleration"
 msgstr ""
 
-#: config/internal/option-internal.cpp:570
+#: config/internal/option-internal.cpp:571
 msgid "Upmix stereo to surround"
 msgstr ""
 
-#: config/internal/option-internal.cpp:571
+#: config/internal/option-internal.cpp:572
 msgid "Sound volume (%)"
 msgstr "Głośność dźwięku (%)"
 
-#: config/internal/option-internal.cpp:639
-#: config/internal/option-internal.cpp:659
-#: config/internal/option-internal.cpp:680
-#: config/internal/option-internal.cpp:700
-#: config/internal/option-internal.cpp:719
+#: config/internal/option-internal.cpp:640
+#: config/internal/option-internal.cpp:660
+#: config/internal/option-internal.cpp:681
+#: config/internal/option-internal.cpp:701
+#: config/internal/option-internal.cpp:720
 #, c-format
 msgid "Invalid value %s for option %s; valid values are %s"
 msgstr "Nieprawidłowa wartość %s dla opcji %s; prawidłowe wartości to %s"
@@ -768,7 +857,7 @@ msgstr "Nieprawidłowa wartość %f dla opcji %s; prawidłowe wartości to %f -
 msgid "Invalid value %d for option %s; valid values are %d - %d"
 msgstr "Nieprawidłowa wartość %d dla opcji %s; prawidłowe wartości to %d - %d"
 
-#: config/option.cpp:480 opts.cpp:621 opts.cpp:630 opts.cpp:639 opts.cpp:648
+#: config/option.cpp:480 opts.cpp:468 opts.cpp:477 opts.cpp:486 opts.cpp:495
 #, c-format
 msgid "Invalid value %s for option %s"
 msgstr "Nieprawidłowa wartość %s dla opcji %s"
@@ -933,19 +1022,19 @@ msgstr "Meta+"
 msgid "Key"
 msgstr ""
 
-#: dialogs/accel-config.cpp:149
+#: dialogs/accel-config.cpp:148
 msgid "Menu commands"
 msgstr "Polecenia menu"
 
-#: dialogs/accel-config.cpp:261
+#: dialogs/accel-config.cpp:259
 msgid "This will clear all user-defined accelerators. Are you sure?"
 msgstr "To działanie spowoduje usunięcie wszystkich akceleratorów zdefiniowanych przez użytkownika. Czy chcesz kontynuować?"
 
-#: dialogs/accel-config.cpp:261 dialogs/accel-config.cpp:298
+#: dialogs/accel-config.cpp:259 dialogs/accel-config.cpp:306
 msgid "Confirm"
 msgstr "Potwierdź "
 
-#: dialogs/accel-config.cpp:295
+#: dialogs/accel-config.cpp:304
 #, c-format
 msgid "This will unassign \"%s\" from \"%s\". Are you sure?"
 msgstr "Spowoduje to usunięcie przypisania \"%s\" z \"%s\". Czy na pewno?"
@@ -1317,22 +1406,22 @@ msgstr "Stara Wartość"
 msgid "New Value"
 msgstr "Nowa Wartość"
 
-#: guiinit.cpp:2518
+#: guiinit.cpp:2519
 msgid "JoyBus host invalid; disabling"
 msgstr "Nieprawidłowy host JoyBus; wyłączanie"
 
-#: opts.cpp:298
+#: opts.cpp:154
 msgid ""
 "The INI file was written for a more recent version of VBA-M. Some INI option"
 " values may have been reset."
 msgstr "Plik INI został napisany dla nowszej wersji VBA-M. Niektóre wartości opcji INI mogły zostać zresetowane."
 
-#: opts.cpp:480 opts.cpp:500 opts.cpp:685
+#: opts.cpp:339 opts.cpp:355 opts.cpp:522
 #, c-format
 msgid "Invalid key binding %s for %s"
 msgstr "Nieprawidłowe przypisanie klawisza/szy %s dla %s"
 
-#: opts.cpp:707
+#: opts.cpp:528
 #, c-format
 msgid "Unknown option %s with value %s"
 msgstr "Nieznana opcja %s z wartością %s"
@@ -1556,37 +1645,37 @@ msgstr "Odtwarzanie zakończone"
 msgid "%d %% (%d, %d fps)"
 msgstr "%d %% (%d, %d fps)"
 
-#: sys.cpp:899 xrc/GBPrinter.xrc:65
+#: sys.cpp:898 xrc/GBPrinter.xrc:65
 msgid "&Discard"
 msgstr "Odrzuć"
 
-#: sys.cpp:933
+#: sys.cpp:932
 msgid "Image files (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 msgstr "Pliki graficzne (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 
-#: sys.cpp:942
+#: sys.cpp:941
 msgid "Save printer image to"
 msgstr "Zapisz wydruk w"
 
-#: sys.cpp:956 sys.cpp:1140
+#: sys.cpp:955 sys.cpp:1139
 #, c-format
 msgid "Wrote printer output to %s"
 msgstr "Zapisano wydruk w %s"
 
-#: sys.cpp:961 sys.cpp:1032
+#: sys.cpp:960 sys.cpp:1031
 msgid "&Close"
 msgstr "Zamknij"
 
-#: sys.cpp:1027
+#: sys.cpp:1026
 msgid "Printed"
 msgstr "Wydrukowano"
 
-#: sys.cpp:1302
+#: sys.cpp:1301
 #, c-format
 msgid "Error opening pseudo tty: %s"
 msgstr "Niepowodzenie przy otwieraniu pseudo tty: %s"
 
-#: sys.cpp:1401
+#: sys.cpp:1400
 #, c-format
 msgid "Error setting up server socket (%d)"
 msgstr "Niepowodzenie przy konfigurowaniu gniazda serwera (%d)"
@@ -1620,80 +1709,80 @@ msgstr ""
 msgid "Unable to load dialog %s from resources"
 msgstr "Nie można załadować okna dialogowego %s z zasobów"
 
-#: wxvbam.cpp:398 wxvbam.cpp:415
+#: wxvbam.cpp:401 wxvbam.cpp:418
 #, c-format
 msgid "Invalid configuration file provided: %s"
 msgstr "Podano nieprawidłowy plik konfiguracyjny: %s"
 
-#: wxvbam.cpp:559
+#: wxvbam.cpp:558
 msgid "Could not create main window"
 msgstr "Nie można utworzyć okna głównego"
 
-#: wxvbam.cpp:634
+#: wxvbam.cpp:633
 msgid "Save built-in XRC file and exit"
 msgstr "Zapisz wbudowany plik XRC i wyjdź"
 
-#: wxvbam.cpp:637
+#: wxvbam.cpp:636
 msgid "Save built-in vba-over.ini and exit"
 msgstr "Zapisz wbudowaną wersję vba-over.ini i wyjdź"
 
-#: wxvbam.cpp:640
+#: wxvbam.cpp:639
 msgid "Print configuration path and exit"
 msgstr "Wydrukuj ścieżkę konfiguracji i wyjdź"
 
-#: wxvbam.cpp:643
+#: wxvbam.cpp:642
 msgid "Start in full-screen mode"
 msgstr "Uruchom w trybie pełnoekranowym"
 
-#: wxvbam.cpp:646
+#: wxvbam.cpp:645
 msgid "Set a configuration file"
 msgstr "Ustaw plik konfiguracyjny"
 
-#: wxvbam.cpp:650
+#: wxvbam.cpp:649
 msgid "Delete shared link state first, if it exists"
 msgstr "Najpierw usuń stan dzielonego łącza, jeśli istnieje"
 
-#: wxvbam.cpp:657
+#: wxvbam.cpp:656
 msgid "List all settable options and exit"
 msgstr "Wyświetl wszystkie możliwe do ustawienia opcje i wyjdź"
 
-#: wxvbam.cpp:660
+#: wxvbam.cpp:659
 msgid "ROM file"
 msgstr "Plik pamięci ROM"
 
-#: wxvbam.cpp:662
+#: wxvbam.cpp:661
 msgid "<config>=<value>"
 msgstr "<config>=<value>"
 
-#: wxvbam.cpp:693
+#: wxvbam.cpp:692
 msgid "Configuration / build error: can't find built-in xrc"
 msgstr "Błąd konfiguracji / kompilacji: nie można odnaleźć wbudowanego pliku xrc"
 
-#: wxvbam.cpp:701
+#: wxvbam.cpp:700
 #, c-format
 msgid ""
 "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:"
 msgstr "Zapisano wbudowany plik konfiguracyjny do %s.\nAby zastąpić jakieś ustawienia, pozostaw jedynie zmieniony/ne węzeł/zły główny/ne (pozostałe usuń). Pierwszy węzeł główny, którego poprawna nazwa znajduje się w pliku .xrc lub .xrs w następującym folderze, zastępuje wbudowany:"
 
-#: wxvbam.cpp:715
+#: wxvbam.cpp:714
 msgid "Configuration is read from, in order:"
 msgstr "Konfiguracja jest odczytywana, w kolejności, z:"
 
-#: wxvbam.cpp:729
+#: wxvbam.cpp:728
 #, c-format
 msgid ""
 "Wrote built-in override file to %s\n"
 "To override, delete all but changed section. First found section is used from search path:"
 msgstr "Zapisano wbudowany plik zastępowania do %s\nAby zastąpić jakieś ustawienia, pozostaw jedynie zmienioną sekcję, zaś pozostałe usuń. Wykorzystywana jest pierwsza sekcja, znaleziona w pliku/plikach w następującym folderze:"
 
-#: wxvbam.cpp:735
+#: wxvbam.cpp:734
 msgid ""
 "\n"
 "\tbuilt-in"
 msgstr "\n\twbudowany"
 
-#: wxvbam.cpp:750
+#: wxvbam.cpp:749
 msgid ""
 "Options set from the command line are saved if any configuration changes are made in the user interface.\n"
 "\n"
@@ -1701,17 +1790,17 @@ msgid ""
 "\n"
 msgstr "Opcje ustawione za pomocą wiersza poleceń są zapisywane podczas zmiany ustawień w interfejsie użytkownika.\n\nOpcje flag prawda i fałsz są określone odpowiednio jako 1 i 0.\n\n"
 
-#: wxvbam.cpp:758
+#: wxvbam.cpp:757
 msgid ""
 "The commands available for the Keyboard/* option are:\n"
 "\n"
 msgstr "Polecenia dostępne dla opcji Klawiatura/* to:\n\n"
 
-#: wxvbam.cpp:769
+#: wxvbam.cpp:768
 msgid "Configuration file not found."
 msgstr "Nie znaleziono pliku konfiguracyjnego."
 
-#: wxvbam.cpp:800
+#: wxvbam.cpp:799
 msgid "Bad configuration option or multiple ROM files given:\n"
 msgstr "Nieprawidłowe ustawienia lub podanych zostało wiele plików pamięci ROM:\n"
 
@@ -2223,10 +2312,6 @@ msgstr "Pomijanie klatek"
 msgid "&Number of frames to skip:"
 msgstr "Liczba klatek do pominięcia:"
 
-#: xrc/DisplayConfig.xrc:200
-msgid "Speed"
-msgstr "Prędkość"
-
 #: xrc/DisplayConfig.xrc:216
 msgid "Speed indicator:"
 msgstr "Wskaźnik prędkości:"
@@ -2762,58 +2847,10 @@ msgid ""
 " entire contents if too small."
 msgstr "Kliknij pole i naciśnij klawisz lub przesuń joystick, aby dodać. Naciśnij backspace, aby usunąć ostatnio dodany klawisz. Zmień rozmiar okna lub kliknij wewnątrz i przesuń wskaźnik, aby zobaczyć całą zawartość, jeśli jest zbyt mała."
 
-#: xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
-msgid "Up"
-msgstr "Góra"
-
-#: xrc/JoyPanel.xrc:37
-msgid "A"
-msgstr "A"
-
-#: xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
-msgid "Down"
-msgstr "Dół"
-
-#: xrc/JoyPanel.xrc:83
-msgid "B"
-msgstr "B"
-
-#: xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
-msgid "Left"
-msgstr "Lewo"
-
-#: xrc/JoyPanel.xrc:129
-msgid "L"
-msgstr "L"
-
-#: xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
-msgid "Right"
-msgstr "Prawo"
-
-#: xrc/JoyPanel.xrc:175
-msgid "R"
-msgstr "P"
-
-#: xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
-msgid "Select"
-msgstr "Wybierz"
-
-#: xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
-msgid "Start"
-msgstr "Start"
-
-#: xrc/JoyPanel.xrc:254
-msgid "Motion Up"
-msgstr "Ruch w górę"
-
 #: xrc/JoyPanel.xrc:276
 msgid "Autofire A"
 msgstr "Autostrzał A"
 
-#: xrc/JoyPanel.xrc:298
-msgid "Motion Down"
-msgstr "Ruch w dół"
-
 #: xrc/JoyPanel.xrc:320
 msgid "Autofire B"
 msgstr "Autostrzał B"
diff --git a/po/wxvbam/pt_BR.po b/po/wxvbam/pt_BR.po
index 0e016e56..4b1f0cb0 100644
--- a/po/wxvbam/pt_BR.po
+++ b/po/wxvbam/pt_BR.po
@@ -36,7 +36,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VBA-M\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-23 22:00+0000\n"
+"POT-Creation-Date: 2024-04-24 02:00+0000\n"
 "PO-Revision-Date: 2011-12-03 19:42+0000\n"
 "Last-Translator: Mateus, 2020\n"
 "Language-Team: Portuguese (Brazil) (http://app.transifex.com/bgk/vba-m/language/pt_BR/)\n"
@@ -347,174 +347,263 @@ msgstr "O link da LAN já está ativo. Desative o modo link pra desconectar."
 msgid "Network is not supported in local mode."
 msgstr "A rede não é suportada no modo local."
 
-#: config/internal/option-internal.cpp:379
+#: config/command.cpp:28 xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
+msgid "Up"
+msgstr "Pra cima"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
+msgid "Down"
+msgstr "Pra baixo"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
+msgid "Left"
+msgstr "Esquerda"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
+msgid "Right"
+msgstr "Direita"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:37
+msgid "A"
+msgstr "A"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:83
+msgid "B"
+msgstr "B"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:129
+msgid "L"
+msgstr "L"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:175
+msgid "R"
+msgstr "R"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
+msgid "Select"
+msgstr "Select"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
+msgid "Start"
+msgstr "Start"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:254
+msgid "Motion Up"
+msgstr "Movimento pra Cima"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:298
+msgid "Motion Down"
+msgstr "Movimento pra Baixo"
+
+#: config/command.cpp:30
+msgid "Motion Left"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion Right"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion In"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Motion Out"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto A"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto B"
+msgstr ""
+
+#: config/command.cpp:31 xrc/DisplayConfig.xrc:200
+msgid "Speed"
+msgstr "Velocidade"
+
+#: config/command.cpp:31
+msgid "Capture"
+msgstr ""
+
+#: config/command.cpp:32
+msgid "GameShark"
+msgstr ""
+
+#: config/command.cpp:106
+#, c-format
+msgid "Joypad %zu %s"
+msgstr ""
+
+#: config/internal/option-internal.cpp:380
 msgid "Use bilinear filter with 3d renderer"
 msgstr "Usar o filtro bilinear com renderizador 3D"
 
-#: config/internal/option-internal.cpp:380
+#: config/internal/option-internal.cpp:381
 msgid "Full-screen filter to apply"
 msgstr "Filtro de tela cheia a aplicar"
 
-#: config/internal/option-internal.cpp:381
+#: config/internal/option-internal.cpp:382
 msgid "Filter plugin library"
 msgstr "Biblioteca dos plugins dos filtros"
 
-#: config/internal/option-internal.cpp:382
+#: config/internal/option-internal.cpp:383
 msgid "Interframe blending function"
 msgstr "Função de mistura dos interframes"
 
-#: config/internal/option-internal.cpp:383
+#: config/internal/option-internal.cpp:384
 msgid "Keep window on top"
 msgstr "Manter a janela no topo"
 
-#: config/internal/option-internal.cpp:385
+#: config/internal/option-internal.cpp:386
 msgid "Maximum number of threads to run filters in"
 msgstr "Número máximo de threads pra executar os filtros"
 
-#: config/internal/option-internal.cpp:387
+#: config/internal/option-internal.cpp:388
 msgid "Render method; if unsupported, simple method will be used"
 msgstr "Método de renderização; se não for suportado o método simples será usado"
 
-#: config/internal/option-internal.cpp:388
+#: config/internal/option-internal.cpp:389
 msgid "Default scale factor"
 msgstr "Fator de escala padrão"
 
-#: config/internal/option-internal.cpp:389
+#: config/internal/option-internal.cpp:390
 msgid "Retain aspect ratio when resizing"
 msgstr "Reter a proporção do aspecto quando redimensionar"
 
-#: config/internal/option-internal.cpp:392
+#: config/internal/option-internal.cpp:393
 msgid "BIOS file to use for Game Boy, if enabled"
 msgstr "O arquivo da BIOS a usar pro Game Boy se ativado"
 
-#: config/internal/option-internal.cpp:393
+#: config/internal/option-internal.cpp:394
 msgid "Game Boy color enhancement, if enabled"
 msgstr "Melhoria de cor do Game Boy se ativado"
 
-#: config/internal/option-internal.cpp:394
+#: config/internal/option-internal.cpp:395
 msgid "Enable DX Colorization Hacks"
 msgstr "Ativar os hacks de colorização do DX"
 
-#: config/internal/option-internal.cpp:395
-#: config/internal/option-internal.cpp:419
+#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:420
 msgid "Apply LCD filter, if enabled"
 msgstr "Aplicar o filtro LCD, se ativado"
 
-#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:397
 msgid "BIOS file to use for Game Boy Color, if enabled"
 msgstr "O arquivo da BIOS a usar pro Game Boy Color se ativado"
 
-#: config/internal/option-internal.cpp:398
+#: config/internal/option-internal.cpp:399
 msgid ""
 "The default palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr "A paleta padrão, como 8 inteiros hexadecimais de 4 dígitos separados por vírgula (rgb555)."
 
-#: config/internal/option-internal.cpp:401
+#: config/internal/option-internal.cpp:402
 msgid ""
 "The first user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr "A primeira paleta de usuário, como 8 inteiros hexadecimais de 4 dígitos separados por vírgula (rgb555)."
 
-#: config/internal/option-internal.cpp:404
+#: config/internal/option-internal.cpp:405
 msgid ""
 "The second user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr "A segunda paleta do usuário, como 8 inteiros hexadecimais de 4 dígitos separados por vírgula (rgb555)."
 
-#: config/internal/option-internal.cpp:407
+#: config/internal/option-internal.cpp:408
 msgid "Automatically gather a full page before printing"
 msgstr "Reunir automaticamente uma página completa antes de imprimir"
 
-#: config/internal/option-internal.cpp:409
+#: config/internal/option-internal.cpp:410
 msgid "Automatically save printouts as screen captures with -print suffix"
 msgstr "Salvar automaticamente as impressões como capturas de tela com o sufixo -print"
 
-#: config/internal/option-internal.cpp:411
-#: config/internal/option-internal.cpp:439
+#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:440
 msgid "Directory to look for ROM files"
 msgstr "Diretório a vasculhar por arquivos de ROMs"
 
-#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:413
 msgid "Directory to look for Game Boy Color ROM files"
 msgstr "Diretório a vasculhar por arquivos de ROMs do Game Boy Color"
 
-#: config/internal/option-internal.cpp:415
+#: config/internal/option-internal.cpp:416
 msgid "BIOS file to use, if enabled"
 msgstr "O arquivo da BIOS a usar, se ativado"
 
-#: config/internal/option-internal.cpp:425
+#: config/internal/option-internal.cpp:426
 msgid "Enable link at boot"
 msgstr "Ativar o link ao inicializar"
 
-#: config/internal/option-internal.cpp:430
+#: config/internal/option-internal.cpp:431
 msgid "Enable faster network protocol by default"
 msgstr "Ativar o protocolo de rede mais rápido por padrão"
 
-#: config/internal/option-internal.cpp:432
+#: config/internal/option-internal.cpp:433
 msgid "Default network link client host"
 msgstr "Hospedeiro do cliente do link padrão da rede"
 
-#: config/internal/option-internal.cpp:433
+#: config/internal/option-internal.cpp:434
 msgid "Default network link server IP to bind"
 msgstr "IP do servidor do link padrão da rede a vincular"
 
-#: config/internal/option-internal.cpp:434
+#: config/internal/option-internal.cpp:435
 msgid "Default network link port (server and client)"
 msgstr "Porta do link padrão da rede (servidor e cliente)"
 
-#: config/internal/option-internal.cpp:435
+#: config/internal/option-internal.cpp:436
 msgid "Default network protocol"
 msgstr "Protocolo padrão da rede"
 
-#: config/internal/option-internal.cpp:436
+#: config/internal/option-internal.cpp:437
 msgid "Link timeout (ms)"
 msgstr "Tempo pra esgotar o link (ms)"
 
-#: config/internal/option-internal.cpp:437
+#: config/internal/option-internal.cpp:438
 msgid "Link cable type"
 msgstr "Tipo de cabo do link"
 
-#: config/internal/option-internal.cpp:442
+#: config/internal/option-internal.cpp:443
 msgid "Automatically load last saved state"
 msgstr "Carregar automaticamente o último estado salvo"
 
-#: config/internal/option-internal.cpp:444
+#: config/internal/option-internal.cpp:445
 msgid ""
 "Directory to store game save files (relative paths are relative to ROM; "
 "blank is config dir)"
 msgstr "Diretório pra armazenar os arquivos de salvamento dos jogos (os caminhos relativos são relativos a ROM; em branco é o diretório de configuração)"
 
-#: config/internal/option-internal.cpp:446
+#: config/internal/option-internal.cpp:447
 msgid "Freeze recent load list"
 msgstr "Congelar a lista dos carregados recentes"
 
-#: config/internal/option-internal.cpp:448
+#: config/internal/option-internal.cpp:449
 msgid ""
 "Directory to store A / V and game recordings (relative paths are relative to"
 " ROM)"
 msgstr "Diretório pra armazenar gravações de jogos e A/V (os caminhos relativos são relativos a ROM)"
 
-#: config/internal/option-internal.cpp:451
+#: config/internal/option-internal.cpp:452
 msgid "Number of seconds between rewind snapshots (0 to disable)"
 msgstr "Número de segundos entre snapshots de rebobinamento (0 pra desativar)"
 
-#: config/internal/option-internal.cpp:453
+#: config/internal/option-internal.cpp:454
 msgid "Directory to store screenshots (relative paths are relative to ROM)"
 msgstr "Diretório pra armazenar as screenshots (os caminhos relativos são relativos as ROMs)"
 
-#: config/internal/option-internal.cpp:456
+#: config/internal/option-internal.cpp:457
 msgid ""
 "Directory to store saved state files (relative paths are relative to "
 "BatteryDir)"
 msgstr "Diretório pra armazenar os arquivos dos save states (os caminhos relativos são relativos ao Diretório da Bateria)"
 
-#: config/internal/option-internal.cpp:458
+#: config/internal/option-internal.cpp:459
 msgid "Enable status bar"
 msgstr "Ativar a barra de status"
 
-#: config/internal/option-internal.cpp:459
+#: config/internal/option-internal.cpp:460
 msgid "INI file version (DO NOT MODIFY)"
 msgstr "Versão do arquivo INI (NÃO MODIFICAR)"
 
-#: config/internal/option-internal.cpp:463
+#: config/internal/option-internal.cpp:464
 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, "
@@ -522,266 +611,266 @@ msgid ""
 "MotionRight, AutoA, AutoB, Speed, Capture, GS"
 msgstr "O parâmetro Joypad/<n>/<button> contém uma lista separada por vírgula dos nomes-chave os quais mapeiam pro joypad #<n> botão <button>.  O botão é um de Pra Cima, Pra Baixo, Esquerda, Direita, A, B, L, R, Select, Start, MotionUp, MotionDown, MotionLeft, MotionRight, AutoA, AutoB, Velocidade, Captura, GS"
 
-#: config/internal/option-internal.cpp:468
+#: config/internal/option-internal.cpp:469
 msgid "The autofire toggle period, in frames (1/60 s)"
 msgstr "O período de alternância do auto-disparo, em quadros (1/60 s)"
 
-#: config/internal/option-internal.cpp:469
+#: config/internal/option-internal.cpp:470
 msgid "The number of the stick to use in single-player mode"
 msgstr "O número do direcional a usar no modo de um jogador"
 
-#: config/internal/option-internal.cpp:471
+#: config/internal/option-internal.cpp:472
 msgid "Whether to enable SDL GameController mode"
 msgstr "Se deve ativar o modo GameController do SDL"
 
-#: config/internal/option-internal.cpp:475
+#: config/internal/option-internal.cpp:476
 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 "
 "executed."
 msgstr "O parâmetro Teclado/<cmd> contém uma lista separada por vírgula dos nomes-chave (ex: Alt-Shift-F1).  Quando a tecla nomeada é pressionada o comando <cmd> é executado."
 
-#: config/internal/option-internal.cpp:480
+#: config/internal/option-internal.cpp:481
 msgid "Enable AGB debug print"
 msgstr "Ativar a impressão do debug do AGB"
 
-#: config/internal/option-internal.cpp:481
+#: config/internal/option-internal.cpp:482
 msgid "Auto skip frames"
 msgstr "Auto Frameskip"
 
-#: config/internal/option-internal.cpp:483
+#: config/internal/option-internal.cpp:484
 msgid "Apply IPS / UPS / IPF patches if found"
 msgstr "Aplicar os patches IPS/UPS/IPF se forem achados"
 
-#: config/internal/option-internal.cpp:485
+#: config/internal/option-internal.cpp:486
 msgid "Automatically save and load cheat list"
 msgstr "Salvar e carregar a lista de trapaças automaticamente"
 
-#: config/internal/option-internal.cpp:489
+#: config/internal/option-internal.cpp:490
 msgid "Automatically enable border for Super Game Boy games"
 msgstr "Ativar automaticamente a borda pra jogos do Super Game Boy"
 
-#: config/internal/option-internal.cpp:491
+#: config/internal/option-internal.cpp:492
 msgid "Always enable border"
 msgstr "Sempre ativar a borda"
 
-#: config/internal/option-internal.cpp:492
+#: config/internal/option-internal.cpp:493
 msgid "Screen capture file format"
 msgstr "Formato do arquivo de captura de tela"
 
-#: config/internal/option-internal.cpp:493
+#: config/internal/option-internal.cpp:494
 msgid "Enable cheats"
 msgstr "Ativar trapaças"
 
-#: config/internal/option-internal.cpp:494
+#: config/internal/option-internal.cpp:495
 msgid "Disable on-screen status messages"
 msgstr "Desativar mensagens de status na tela"
 
-#: config/internal/option-internal.cpp:495
+#: config/internal/option-internal.cpp:496
 msgid "Type of system to emulate"
 msgstr "Tipo de sistema a emular"
 
-#: config/internal/option-internal.cpp:496
+#: config/internal/option-internal.cpp:497
 msgid "Flash size 0 = 64 KB 1 = 128 KB"
 msgstr "Tamanho do flash 0 = 64 KBs 1 = 128 KBs"
 
-#: config/internal/option-internal.cpp:498
+#: config/internal/option-internal.cpp:499
 msgid "Skip frames. Values are 0-9 or -1 to skip automatically based on time."
 msgstr "Pular frames. Os valores são 0-9 ou -1 pra pular automaticamente baseado no tempo."
 
-#: config/internal/option-internal.cpp:500
+#: config/internal/option-internal.cpp:501
 msgid "The palette to use"
 msgstr "A paleta a usar"
 
-#: config/internal/option-internal.cpp:501
+#: config/internal/option-internal.cpp:502
 msgid "Enable printer emulation"
 msgstr "Ativar a emulação da impressora"
 
-#: config/internal/option-internal.cpp:503
+#: config/internal/option-internal.cpp:504
 msgid "Break into GDB after loading the game."
 msgstr "Entrar no GDB após carregar o jogo."
 
-#: config/internal/option-internal.cpp:504
+#: config/internal/option-internal.cpp:505
 msgid "Port to connect GDB to"
 msgstr "Porta pra conectar o GDB a"
 
-#: config/internal/option-internal.cpp:506
+#: config/internal/option-internal.cpp:507
 msgid "Number of players in network"
 msgstr "Número de jogadores na rede"
 
-#: config/internal/option-internal.cpp:508
+#: config/internal/option-internal.cpp:509
 msgid "Maximum scale factor (0 = no limit)"
 msgstr "Fator de escala máxima (0 = sem limite)"
 
-#: config/internal/option-internal.cpp:510
+#: config/internal/option-internal.cpp:511
 msgid "Pause game when main window loses focus"
 msgstr "Pausar o jogo quando a janela principal perde o foco"
 
-#: config/internal/option-internal.cpp:512
+#: config/internal/option-internal.cpp:513
 msgid "Enable RTC (vba-over.ini override is rtcEnabled"
 msgstr "Ativar RTC (A substituição do vba-over.ini é rtcEnabled)"
 
-#: config/internal/option-internal.cpp:513
+#: config/internal/option-internal.cpp:514
 msgid "Native save (\"battery\") hardware type"
 msgstr "Tipo de hardware de salvamento nativo (\"bateria\")"
 
-#: config/internal/option-internal.cpp:514
+#: config/internal/option-internal.cpp:515
 msgid "Show speed indicator"
 msgstr "Mostrar indicador de velocidade"
 
-#: config/internal/option-internal.cpp:516
+#: config/internal/option-internal.cpp:517
 msgid "Draw on-screen messages transparently"
 msgstr "Desenhar mensagens na tela transparentemente"
 
-#: config/internal/option-internal.cpp:517
+#: config/internal/option-internal.cpp:518
 msgid "Skip BIOS initialization"
 msgstr "Pular a inicialização do BIOS"
 
-#: config/internal/option-internal.cpp:519
+#: config/internal/option-internal.cpp:520
 msgid "Do not overwrite cheat list when loading state"
 msgstr "Não sobrescrever a lista de trapaças quando carregar o state"
 
-#: config/internal/option-internal.cpp:521
+#: config/internal/option-internal.cpp:522
 msgid "Do not overwrite native (battery) save when loading state"
 msgstr "Não sobrescrever o save nativo (bateria) quando carregar o state"
 
-#: config/internal/option-internal.cpp:523
+#: config/internal/option-internal.cpp:524
 msgid "Throttle game speed, even when accelerated (0-450 %, 0 = no throttle)"
 msgstr "Sufocar a velocidade do jogo mesmo quando acelerado (0-450%, 0 = sem acelerador)"
 
-#: config/internal/option-internal.cpp:526
+#: config/internal/option-internal.cpp:527
 msgid "Set throttle for speedup key (0-3000 %, 0 = no throttle)"
 msgstr "Definir o acelerador pra tecla de aceleração (0-3000%, 0 = sem acelerador)"
 
-#: config/internal/option-internal.cpp:528
+#: config/internal/option-internal.cpp:529
 msgid "Number of frames to skip with speedup (instead of speedup throttle)"
 msgstr "Número de quadros a pular com aceleração (ao invés de sufocamento da aceleração)"
 
-#: config/internal/option-internal.cpp:531
+#: config/internal/option-internal.cpp:532
 msgid "Use frame skip for speedup throttle"
 msgstr "Use o pulo de quadros pra sufocar a aceleração"
 
-#: config/internal/option-internal.cpp:532
+#: config/internal/option-internal.cpp:533
 msgid "Use the specified BIOS file for Game Boy"
 msgstr "Usar o arquivo da BIOS especificada pro Game Boy"
 
-#: config/internal/option-internal.cpp:533
+#: config/internal/option-internal.cpp:534
 msgid "Use the specified BIOS file"
 msgstr "Usar o arquivo da BIOS especificada"
 
-#: config/internal/option-internal.cpp:535
+#: config/internal/option-internal.cpp:536
 msgid "Use the specified BIOS file for Game Boy Color"
 msgstr "Usar o arquivo da BIOS especificada pro Game Boy Color"
 
-#: config/internal/option-internal.cpp:536
+#: config/internal/option-internal.cpp:537
 msgid "Wait for vertical sync"
 msgstr "Esperar a sincronização vertical"
 
-#: config/internal/option-internal.cpp:539
+#: config/internal/option-internal.cpp:540
 msgid "Enter fullscreen mode at startup"
 msgstr "Entrar no modo de tela cheia na inicialização"
 
-#: config/internal/option-internal.cpp:540
+#: config/internal/option-internal.cpp:541
 msgid "Window maximized"
 msgstr "Janela maximizada"
 
-#: config/internal/option-internal.cpp:541
+#: config/internal/option-internal.cpp:542
 msgid "Window height at startup"
 msgstr "A altura da janela na inicialização"
 
-#: config/internal/option-internal.cpp:542
+#: config/internal/option-internal.cpp:543
 msgid "Window width at startup"
 msgstr "Largura da janela na inicialização"
 
-#: config/internal/option-internal.cpp:543
+#: config/internal/option-internal.cpp:544
 msgid "Window axis X position at startup"
 msgstr "Posição do eixo X da janela na inicialização"
 
-#: config/internal/option-internal.cpp:544
+#: config/internal/option-internal.cpp:545
 msgid "Window axis Y position at startup"
 msgstr "Posição do eixo Y da janela na inicialização"
 
-#: config/internal/option-internal.cpp:548
+#: config/internal/option-internal.cpp:549
 msgid "Capture key events while on background"
 msgstr "Capturar os eventos-chave enquanto em segundo plano"
 
-#: config/internal/option-internal.cpp:550
+#: config/internal/option-internal.cpp:551
 msgid "Capture joy events while on background"
 msgstr "Capture eventos de alegria enquanto em segundo plano"
 
-#: config/internal/option-internal.cpp:551
+#: config/internal/option-internal.cpp:552
 msgid "Hide menu bar when mouse is inactive"
 msgstr "Esconder a barra do menu quando o mouse está inativo"
 
-#: config/internal/option-internal.cpp:553
+#: config/internal/option-internal.cpp:554
 msgid "Suspend screensaver when game is running"
 msgstr "Suspender o protetor de tela quando o jogo estiver em execução"
 
-#: config/internal/option-internal.cpp:556
+#: config/internal/option-internal.cpp:557
 msgid "Sound API; if unsupported, default API will be used"
 msgstr "API de som; se não for suportada, a API padrão será usada"
 
-#: config/internal/option-internal.cpp:557
+#: config/internal/option-internal.cpp:558
 msgid "Device ID of chosen audio device for chosen driver"
 msgstr "ID do dispositivo de áudio escolhido pro driver escolhido"
 
-#: config/internal/option-internal.cpp:558
+#: config/internal/option-internal.cpp:559
 msgid "Number of sound buffers"
 msgstr "Número de buffers do som"
 
-#: config/internal/option-internal.cpp:559
+#: config/internal/option-internal.cpp:560
 msgid "Bit mask of sound channels to enable"
 msgstr "A máscara do bit dos canais de som a ativar"
 
-#: config/internal/option-internal.cpp:560
+#: config/internal/option-internal.cpp:561
 msgid "Game Boy Advance sound filtering (%)"
 msgstr "Filtragem de som do Game Boy Advance (%)"
 
-#: config/internal/option-internal.cpp:562
+#: config/internal/option-internal.cpp:563
 msgid "Game Boy Advance sound interpolation"
 msgstr "Interpolação de som do Game Boy Advance"
 
-#: config/internal/option-internal.cpp:563
+#: config/internal/option-internal.cpp:564
 msgid "Game Boy sound declicking"
 msgstr "Declicking do som do Game Boy"
 
-#: config/internal/option-internal.cpp:564
+#: config/internal/option-internal.cpp:565
 msgid "Game Boy echo effect (%)"
 msgstr "Efeito de eco do Game Boy (%)"
 
-#: config/internal/option-internal.cpp:565
+#: config/internal/option-internal.cpp:566
 msgid "Enable Game Boy sound effects"
 msgstr "Ativar efeitos sonoros do Game Boy"
 
-#: config/internal/option-internal.cpp:566
+#: config/internal/option-internal.cpp:567
 msgid "Game Boy stereo effect (%)"
 msgstr "Efeito estéreo do Game Boy (%)"
 
-#: config/internal/option-internal.cpp:567
+#: config/internal/option-internal.cpp:568
 msgid "Game Boy surround sound effect (%)"
 msgstr "Efeito de som surround do Game Boy (%)"
 
-#: config/internal/option-internal.cpp:568
+#: config/internal/option-internal.cpp:569
 msgid "Sound sample rate (kHz)"
 msgstr "Taxa de amostra do som (kHz)"
 
-#: config/internal/option-internal.cpp:569
+#: config/internal/option-internal.cpp:570
 msgid "Use DirectSound hardware acceleration"
 msgstr "Usar aceleração do hardware pro DirectSound"
 
-#: config/internal/option-internal.cpp:570
+#: config/internal/option-internal.cpp:571
 msgid "Upmix stereo to surround"
 msgstr "Aumentar número de canais de estéreo pra surroun"
 
-#: config/internal/option-internal.cpp:571
+#: config/internal/option-internal.cpp:572
 msgid "Sound volume (%)"
 msgstr "Volume do som (%)"
 
-#: config/internal/option-internal.cpp:639
-#: config/internal/option-internal.cpp:659
-#: config/internal/option-internal.cpp:680
-#: config/internal/option-internal.cpp:700
-#: config/internal/option-internal.cpp:719
+#: config/internal/option-internal.cpp:640
+#: config/internal/option-internal.cpp:660
+#: config/internal/option-internal.cpp:681
+#: config/internal/option-internal.cpp:701
+#: config/internal/option-internal.cpp:720
 #, c-format
 msgid "Invalid value %s for option %s; valid values are %s"
 msgstr "Valor inválido %s pra opção %s; os valores válidos são %s"
@@ -796,7 +885,7 @@ msgstr "Valor inválido %f para a opção %s; os valores válidos são %f - %f"
 msgid "Invalid value %d for option %s; valid values are %d - %d"
 msgstr "Valor inválido %d para a opção %s; os valores válidos são %d - %d"
 
-#: config/option.cpp:480 opts.cpp:621 opts.cpp:630 opts.cpp:639 opts.cpp:648
+#: config/option.cpp:480 opts.cpp:468 opts.cpp:477 opts.cpp:486 opts.cpp:495
 #, c-format
 msgid "Invalid value %s for option %s"
 msgstr "Valor inválido %s pra opção %s"
@@ -961,19 +1050,19 @@ msgstr "Meta+"
 msgid "Key"
 msgstr ""
 
-#: dialogs/accel-config.cpp:149
+#: dialogs/accel-config.cpp:148
 msgid "Menu commands"
 msgstr "Comandos do menu"
 
-#: dialogs/accel-config.cpp:261
+#: dialogs/accel-config.cpp:259
 msgid "This will clear all user-defined accelerators. Are you sure?"
 msgstr "Isto limpará todos os aceleradores definidos pelo usuário. Você tem certeza?"
 
-#: dialogs/accel-config.cpp:261 dialogs/accel-config.cpp:298
+#: dialogs/accel-config.cpp:259 dialogs/accel-config.cpp:306
 msgid "Confirm"
 msgstr "Confirmar"
 
-#: dialogs/accel-config.cpp:295
+#: dialogs/accel-config.cpp:304
 #, c-format
 msgid "This will unassign \"%s\" from \"%s\". Are you sure?"
 msgstr "Isto removerá o \"%s\" do \"%s\". Você tem certeza?"
@@ -1345,22 +1434,22 @@ msgstr "Valor Antigo"
 msgid "New Value"
 msgstr "Valor Novo"
 
-#: guiinit.cpp:2518
+#: guiinit.cpp:2519
 msgid "JoyBus host invalid; disabling"
 msgstr "Hospedeiro JoyBus inválido; desativando"
 
-#: opts.cpp:298
+#: opts.cpp:154
 msgid ""
 "The INI file was written for a more recent version of VBA-M. Some INI option"
 " values may have been reset."
 msgstr "O arquivo INI foi escrito pra uma versão mais recente do VBA-M. Alguns valores da opção INI podem ter sido resetados."
 
-#: opts.cpp:480 opts.cpp:500 opts.cpp:685
+#: opts.cpp:339 opts.cpp:355 opts.cpp:522
 #, c-format
 msgid "Invalid key binding %s for %s"
 msgstr "Chave obrigatória inválida %s pra %s"
 
-#: opts.cpp:707
+#: opts.cpp:528
 #, c-format
 msgid "Unknown option %s with value %s"
 msgstr "Opção desconhecida %s com o valor %s"
@@ -1584,37 +1673,37 @@ msgstr "Playback finalizado"
 msgid "%d %% (%d, %d fps)"
 msgstr "%d %% (%d, %d fps)"
 
-#: sys.cpp:899 xrc/GBPrinter.xrc:65
+#: sys.cpp:898 xrc/GBPrinter.xrc:65
 msgid "&Discard"
 msgstr "&Descartar"
 
-#: sys.cpp:933
+#: sys.cpp:932
 msgid "Image files (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 msgstr "Arquivos de imagem (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 
-#: sys.cpp:942
+#: sys.cpp:941
 msgid "Save printer image to"
 msgstr "Salvar a imagem da impressora em"
 
-#: sys.cpp:956 sys.cpp:1140
+#: sys.cpp:955 sys.cpp:1139
 #, c-format
 msgid "Wrote printer output to %s"
 msgstr "Gravou a saída da impressora em %s"
 
-#: sys.cpp:961 sys.cpp:1032
+#: sys.cpp:960 sys.cpp:1031
 msgid "&Close"
 msgstr "&Fechar"
 
-#: sys.cpp:1027
+#: sys.cpp:1026
 msgid "Printed"
 msgstr "Impresso"
 
-#: sys.cpp:1302
+#: sys.cpp:1301
 #, c-format
 msgid "Error opening pseudo tty: %s"
 msgstr "Erro ao abrir o pseudo tty: %s"
 
-#: sys.cpp:1401
+#: sys.cpp:1400
 #, c-format
 msgid "Error setting up server socket (%d)"
 msgstr "Erro ao configurar o soquete do servidor (%d)"
@@ -1648,80 +1737,80 @@ msgstr "Azul:"
 msgid "Unable to load dialog %s from resources"
 msgstr "Incapaz de carregar o diálogo %s a partir dos recursos"
 
-#: wxvbam.cpp:398 wxvbam.cpp:415
+#: wxvbam.cpp:401 wxvbam.cpp:418
 #, c-format
 msgid "Invalid configuration file provided: %s"
 msgstr "Arquivo de configuração inválido fornecido: %s"
 
-#: wxvbam.cpp:559
+#: wxvbam.cpp:558
 msgid "Could not create main window"
 msgstr "Não conseguiu criar a janela principal"
 
-#: wxvbam.cpp:634
+#: wxvbam.cpp:633
 msgid "Save built-in XRC file and exit"
 msgstr "Salvar o arquivo e a saída embutidos do XRC"
 
-#: wxvbam.cpp:637
+#: wxvbam.cpp:636
 msgid "Save built-in vba-over.ini and exit"
 msgstr "Salvar o vba-over.ini embutido e sair"
 
-#: wxvbam.cpp:640
+#: wxvbam.cpp:639
 msgid "Print configuration path and exit"
 msgstr "Imprimir o caminho e a saída da configuração"
 
-#: wxvbam.cpp:643
+#: wxvbam.cpp:642
 msgid "Start in full-screen mode"
 msgstr "Iniciar no modo de tela cheia"
 
-#: wxvbam.cpp:646
+#: wxvbam.cpp:645
 msgid "Set a configuration file"
 msgstr "Definir um arquivo de configuração"
 
-#: wxvbam.cpp:650
+#: wxvbam.cpp:649
 msgid "Delete shared link state first, if it exists"
 msgstr "Apagar o estado do link compartilhado primeiro se ele existir"
 
-#: wxvbam.cpp:657
+#: wxvbam.cpp:656
 msgid "List all settable options and exit"
 msgstr "Listar todas as opções configuráveis e sair"
 
-#: wxvbam.cpp:660
+#: wxvbam.cpp:659
 msgid "ROM file"
 msgstr "Arquivo da ROM"
 
-#: wxvbam.cpp:662
+#: wxvbam.cpp:661
 msgid "<config>=<value>"
 msgstr "<config>=<value>"
 
-#: wxvbam.cpp:693
+#: wxvbam.cpp:692
 msgid "Configuration / build error: can't find built-in xrc"
 msgstr "Erro de configuração/compilação: não consegue achar o xrc embutido"
 
-#: wxvbam.cpp:701
+#: wxvbam.cpp:700
 #, c-format
 msgid ""
 "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:"
 msgstr "Gravou a configuração embutida em %s.\nPra substituir remova tudo menos o(s) nó(s) raiz mudado(s). O Primeiro nó raiz encontrado do nome correto em quaisquer arquivos .xrc ou .xrs no seguinte caminho de busca substitui o embutido:"
 
-#: wxvbam.cpp:715
+#: wxvbam.cpp:714
 msgid "Configuration is read from, in order:"
 msgstr "De onde a configuração é lida, em ordem:"
 
-#: wxvbam.cpp:729
+#: wxvbam.cpp:728
 #, c-format
 msgid ""
 "Wrote built-in override file to %s\n"
 "To override, delete all but changed section. First found section is used from search path:"
 msgstr "Gravou o arquivo de substituição embutido em %s\nPra substituir apague tudo menos a seção mudada. A primeira seção encontrada é usada no caminho da busca:"
 
-#: wxvbam.cpp:735
+#: wxvbam.cpp:734
 msgid ""
 "\n"
 "\tbuilt-in"
 msgstr "\n\tembutido"
 
-#: wxvbam.cpp:750
+#: wxvbam.cpp:749
 msgid ""
 "Options set from the command line are saved if any configuration changes are made in the user interface.\n"
 "\n"
@@ -1729,17 +1818,17 @@ msgid ""
 "\n"
 msgstr "As opções definidas na linha de comando são salvas se quaisquer mudanças de configuração são feitas na interface do usuário.\n\nPras opções de bandeira o verdadeiro e o falso estão especificados como 1 e 0 respectivamente.\n\n"
 
-#: wxvbam.cpp:758
+#: wxvbam.cpp:757
 msgid ""
 "The commands available for the Keyboard/* option are:\n"
 "\n"
 msgstr "Os comandos disponíveis para a opção Teclado/* são:\n\n"
 
-#: wxvbam.cpp:769
+#: wxvbam.cpp:768
 msgid "Configuration file not found."
 msgstr "Arquivo de configuração não encontrado."
 
-#: wxvbam.cpp:800
+#: wxvbam.cpp:799
 msgid "Bad configuration option or multiple ROM files given:\n"
 msgstr "Opção ruim da configuração ou múltiplos arquivos de ROMs dados:\n"
 
@@ -2251,10 +2340,6 @@ msgstr "Frame Skip"
 msgid "&Number of frames to skip:"
 msgstr "&Número de frames a ignorar:"
 
-#: xrc/DisplayConfig.xrc:200
-msgid "Speed"
-msgstr "Velocidade"
-
 #: xrc/DisplayConfig.xrc:216
 msgid "Speed indicator:"
 msgstr "Indicador de velocidade:"
@@ -2790,58 +2875,10 @@ msgid ""
 " entire contents if too small."
 msgstr "Clique num campo e pressione uma tecla ou mova o joystick pra adicionar. Pressione o backspace pra apagar a última tecla adicionada. Redimensione a janela ou clique e mova o ponteiro pra ver o conteúdo inteiro se for muito pequeno."
 
-#: xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
-msgid "Up"
-msgstr "Pra cima"
-
-#: xrc/JoyPanel.xrc:37
-msgid "A"
-msgstr "A"
-
-#: xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
-msgid "Down"
-msgstr "Pra baixo"
-
-#: xrc/JoyPanel.xrc:83
-msgid "B"
-msgstr "B"
-
-#: xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
-msgid "Left"
-msgstr "Esquerda"
-
-#: xrc/JoyPanel.xrc:129
-msgid "L"
-msgstr "L"
-
-#: xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
-msgid "Right"
-msgstr "Direita"
-
-#: xrc/JoyPanel.xrc:175
-msgid "R"
-msgstr "R"
-
-#: xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
-msgid "Select"
-msgstr "Select"
-
-#: xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
-msgid "Start"
-msgstr "Start"
-
-#: xrc/JoyPanel.xrc:254
-msgid "Motion Up"
-msgstr "Movimento pra Cima"
-
 #: xrc/JoyPanel.xrc:276
 msgid "Autofire A"
 msgstr "Auto-disparar A"
 
-#: xrc/JoyPanel.xrc:298
-msgid "Motion Down"
-msgstr "Movimento pra Baixo"
-
 #: xrc/JoyPanel.xrc:320
 msgid "Autofire B"
 msgstr "Auto-disparar B"
diff --git a/po/wxvbam/pt_PT.po b/po/wxvbam/pt_PT.po
index f5cbac40..01e7ce5c 100644
--- a/po/wxvbam/pt_PT.po
+++ b/po/wxvbam/pt_PT.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VBA-M\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-23 22:00+0000\n"
+"POT-Creation-Date: 2024-04-24 02:00+0000\n"
 "PO-Revision-Date: 2011-12-03 19:42+0000\n"
 "Last-Translator: Eduardo Cardoso, 2023\n"
 "Language-Team: Portuguese (Portugal) (http://app.transifex.com/bgk/vba-m/language/pt_PT/)\n"
@@ -320,174 +320,263 @@ msgstr ""
 msgid "Network is not supported in local mode."
 msgstr ""
 
-#: config/internal/option-internal.cpp:379
-msgid "Use bilinear filter with 3d renderer"
+#: config/command.cpp:28 xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
+msgid "Up"
+msgstr ""
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
+msgid "Down"
+msgstr ""
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
+msgid "Left"
+msgstr ""
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
+msgid "Right"
+msgstr ""
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:37
+msgid "A"
+msgstr ""
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:83
+msgid "B"
+msgstr ""
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:129
+msgid "L"
+msgstr ""
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:175
+msgid "R"
+msgstr ""
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
+msgid "Select"
+msgstr ""
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
+msgid "Start"
+msgstr ""
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:254
+msgid "Motion Up"
+msgstr ""
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:298
+msgid "Motion Down"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion Left"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion Right"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion In"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Motion Out"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto A"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto B"
+msgstr ""
+
+#: config/command.cpp:31 xrc/DisplayConfig.xrc:200
+msgid "Speed"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Capture"
+msgstr ""
+
+#: config/command.cpp:32
+msgid "GameShark"
+msgstr ""
+
+#: config/command.cpp:106
+#, c-format
+msgid "Joypad %zu %s"
 msgstr ""
 
 #: config/internal/option-internal.cpp:380
-msgid "Full-screen filter to apply"
+msgid "Use bilinear filter with 3d renderer"
 msgstr ""
 
 #: config/internal/option-internal.cpp:381
-msgid "Filter plugin library"
+msgid "Full-screen filter to apply"
 msgstr ""
 
 #: config/internal/option-internal.cpp:382
-msgid "Interframe blending function"
+msgid "Filter plugin library"
 msgstr ""
 
 #: config/internal/option-internal.cpp:383
+msgid "Interframe blending function"
+msgstr ""
+
+#: config/internal/option-internal.cpp:384
 msgid "Keep window on top"
 msgstr ""
 
-#: config/internal/option-internal.cpp:385
+#: config/internal/option-internal.cpp:386
 msgid "Maximum number of threads to run filters in"
 msgstr ""
 
-#: config/internal/option-internal.cpp:387
+#: config/internal/option-internal.cpp:388
 msgid "Render method; if unsupported, simple method will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:388
+#: config/internal/option-internal.cpp:389
 msgid "Default scale factor"
 msgstr ""
 
-#: config/internal/option-internal.cpp:389
+#: config/internal/option-internal.cpp:390
 msgid "Retain aspect ratio when resizing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:392
+#: config/internal/option-internal.cpp:393
 msgid "BIOS file to use for Game Boy, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:393
+#: config/internal/option-internal.cpp:394
 msgid "Game Boy color enhancement, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:394
+#: config/internal/option-internal.cpp:395
 msgid "Enable DX Colorization Hacks"
 msgstr ""
 
-#: config/internal/option-internal.cpp:395
-#: config/internal/option-internal.cpp:419
+#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:420
 msgid "Apply LCD filter, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:397
 msgid "BIOS file to use for Game Boy Color, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:398
+#: config/internal/option-internal.cpp:399
 msgid ""
 "The default palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:401
+#: config/internal/option-internal.cpp:402
 msgid ""
 "The first user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:404
+#: config/internal/option-internal.cpp:405
 msgid ""
 "The second user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:407
+#: config/internal/option-internal.cpp:408
 msgid "Automatically gather a full page before printing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:409
+#: config/internal/option-internal.cpp:410
 msgid "Automatically save printouts as screen captures with -print suffix"
 msgstr ""
 
-#: config/internal/option-internal.cpp:411
-#: config/internal/option-internal.cpp:439
+#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:440
 msgid "Directory to look for ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:413
 msgid "Directory to look for Game Boy Color ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:415
+#: config/internal/option-internal.cpp:416
 msgid "BIOS file to use, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:425
+#: config/internal/option-internal.cpp:426
 msgid "Enable link at boot"
 msgstr ""
 
-#: config/internal/option-internal.cpp:430
+#: config/internal/option-internal.cpp:431
 msgid "Enable faster network protocol by default"
 msgstr ""
 
-#: config/internal/option-internal.cpp:432
+#: config/internal/option-internal.cpp:433
 msgid "Default network link client host"
 msgstr ""
 
-#: config/internal/option-internal.cpp:433
+#: config/internal/option-internal.cpp:434
 msgid "Default network link server IP to bind"
 msgstr ""
 
-#: config/internal/option-internal.cpp:434
+#: config/internal/option-internal.cpp:435
 msgid "Default network link port (server and client)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:435
+#: config/internal/option-internal.cpp:436
 msgid "Default network protocol"
 msgstr ""
 
-#: config/internal/option-internal.cpp:436
+#: config/internal/option-internal.cpp:437
 msgid "Link timeout (ms)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:437
+#: config/internal/option-internal.cpp:438
 msgid "Link cable type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:442
+#: config/internal/option-internal.cpp:443
 msgid "Automatically load last saved state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:444
+#: config/internal/option-internal.cpp:445
 msgid ""
 "Directory to store game save files (relative paths are relative to ROM; "
 "blank is config dir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:446
+#: config/internal/option-internal.cpp:447
 msgid "Freeze recent load list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:448
+#: config/internal/option-internal.cpp:449
 msgid ""
 "Directory to store A / V and game recordings (relative paths are relative to"
 " ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:451
+#: config/internal/option-internal.cpp:452
 msgid "Number of seconds between rewind snapshots (0 to disable)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:453
+#: config/internal/option-internal.cpp:454
 msgid "Directory to store screenshots (relative paths are relative to ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:456
+#: config/internal/option-internal.cpp:457
 msgid ""
 "Directory to store saved state files (relative paths are relative to "
 "BatteryDir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:458
+#: config/internal/option-internal.cpp:459
 msgid "Enable status bar"
 msgstr ""
 
-#: config/internal/option-internal.cpp:459
+#: config/internal/option-internal.cpp:460
 msgid "INI file version (DO NOT MODIFY)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:463
+#: config/internal/option-internal.cpp:464
 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, "
@@ -495,266 +584,266 @@ msgid ""
 "MotionRight, AutoA, AutoB, Speed, Capture, GS"
 msgstr ""
 
-#: config/internal/option-internal.cpp:468
+#: config/internal/option-internal.cpp:469
 msgid "The autofire toggle period, in frames (1/60 s)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:469
+#: config/internal/option-internal.cpp:470
 msgid "The number of the stick to use in single-player mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:471
+#: config/internal/option-internal.cpp:472
 msgid "Whether to enable SDL GameController mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:475
+#: config/internal/option-internal.cpp:476
 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 "
 "executed."
 msgstr ""
 
-#: config/internal/option-internal.cpp:480
+#: config/internal/option-internal.cpp:481
 msgid "Enable AGB debug print"
 msgstr ""
 
-#: config/internal/option-internal.cpp:481
+#: config/internal/option-internal.cpp:482
 msgid "Auto skip frames"
 msgstr ""
 
-#: config/internal/option-internal.cpp:483
+#: config/internal/option-internal.cpp:484
 msgid "Apply IPS / UPS / IPF patches if found"
 msgstr ""
 
-#: config/internal/option-internal.cpp:485
+#: config/internal/option-internal.cpp:486
 msgid "Automatically save and load cheat list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:489
+#: config/internal/option-internal.cpp:490
 msgid "Automatically enable border for Super Game Boy games"
 msgstr ""
 
-#: config/internal/option-internal.cpp:491
+#: config/internal/option-internal.cpp:492
 msgid "Always enable border"
 msgstr ""
 
-#: config/internal/option-internal.cpp:492
+#: config/internal/option-internal.cpp:493
 msgid "Screen capture file format"
 msgstr ""
 
-#: config/internal/option-internal.cpp:493
+#: config/internal/option-internal.cpp:494
 msgid "Enable cheats"
 msgstr ""
 
-#: config/internal/option-internal.cpp:494
+#: config/internal/option-internal.cpp:495
 msgid "Disable on-screen status messages"
 msgstr ""
 
-#: config/internal/option-internal.cpp:495
+#: config/internal/option-internal.cpp:496
 msgid "Type of system to emulate"
 msgstr ""
 
-#: config/internal/option-internal.cpp:496
+#: config/internal/option-internal.cpp:497
 msgid "Flash size 0 = 64 KB 1 = 128 KB"
 msgstr ""
 
-#: config/internal/option-internal.cpp:498
+#: config/internal/option-internal.cpp:499
 msgid "Skip frames. Values are 0-9 or -1 to skip automatically based on time."
 msgstr ""
 
-#: config/internal/option-internal.cpp:500
+#: config/internal/option-internal.cpp:501
 msgid "The palette to use"
 msgstr ""
 
-#: config/internal/option-internal.cpp:501
+#: config/internal/option-internal.cpp:502
 msgid "Enable printer emulation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:503
+#: config/internal/option-internal.cpp:504
 msgid "Break into GDB after loading the game."
 msgstr ""
 
-#: config/internal/option-internal.cpp:504
+#: config/internal/option-internal.cpp:505
 msgid "Port to connect GDB to"
 msgstr ""
 
-#: config/internal/option-internal.cpp:506
+#: config/internal/option-internal.cpp:507
 msgid "Number of players in network"
 msgstr ""
 
-#: config/internal/option-internal.cpp:508
+#: config/internal/option-internal.cpp:509
 msgid "Maximum scale factor (0 = no limit)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:510
+#: config/internal/option-internal.cpp:511
 msgid "Pause game when main window loses focus"
 msgstr ""
 
-#: config/internal/option-internal.cpp:512
+#: config/internal/option-internal.cpp:513
 msgid "Enable RTC (vba-over.ini override is rtcEnabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:513
+#: config/internal/option-internal.cpp:514
 msgid "Native save (\"battery\") hardware type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:514
+#: config/internal/option-internal.cpp:515
 msgid "Show speed indicator"
 msgstr ""
 
-#: config/internal/option-internal.cpp:516
+#: config/internal/option-internal.cpp:517
 msgid "Draw on-screen messages transparently"
 msgstr ""
 
-#: config/internal/option-internal.cpp:517
+#: config/internal/option-internal.cpp:518
 msgid "Skip BIOS initialization"
 msgstr ""
 
-#: config/internal/option-internal.cpp:519
+#: config/internal/option-internal.cpp:520
 msgid "Do not overwrite cheat list when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:521
+#: config/internal/option-internal.cpp:522
 msgid "Do not overwrite native (battery) save when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:523
+#: config/internal/option-internal.cpp:524
 msgid "Throttle game speed, even when accelerated (0-450 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:526
+#: config/internal/option-internal.cpp:527
 msgid "Set throttle for speedup key (0-3000 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:528
+#: config/internal/option-internal.cpp:529
 msgid "Number of frames to skip with speedup (instead of speedup throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:531
+#: config/internal/option-internal.cpp:532
 msgid "Use frame skip for speedup throttle"
 msgstr ""
 
-#: config/internal/option-internal.cpp:532
+#: config/internal/option-internal.cpp:533
 msgid "Use the specified BIOS file for Game Boy"
 msgstr ""
 
-#: config/internal/option-internal.cpp:533
+#: config/internal/option-internal.cpp:534
 msgid "Use the specified BIOS file"
 msgstr ""
 
-#: config/internal/option-internal.cpp:535
+#: config/internal/option-internal.cpp:536
 msgid "Use the specified BIOS file for Game Boy Color"
 msgstr ""
 
-#: config/internal/option-internal.cpp:536
+#: config/internal/option-internal.cpp:537
 msgid "Wait for vertical sync"
 msgstr ""
 
-#: config/internal/option-internal.cpp:539
+#: config/internal/option-internal.cpp:540
 msgid "Enter fullscreen mode at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:540
+#: config/internal/option-internal.cpp:541
 msgid "Window maximized"
 msgstr ""
 
-#: config/internal/option-internal.cpp:541
+#: config/internal/option-internal.cpp:542
 msgid "Window height at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:542
+#: config/internal/option-internal.cpp:543
 msgid "Window width at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:543
+#: config/internal/option-internal.cpp:544
 msgid "Window axis X position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:544
+#: config/internal/option-internal.cpp:545
 msgid "Window axis Y position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:548
+#: config/internal/option-internal.cpp:549
 msgid "Capture key events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:550
+#: config/internal/option-internal.cpp:551
 msgid "Capture joy events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:551
+#: config/internal/option-internal.cpp:552
 msgid "Hide menu bar when mouse is inactive"
 msgstr ""
 
-#: config/internal/option-internal.cpp:553
+#: config/internal/option-internal.cpp:554
 msgid "Suspend screensaver when game is running"
 msgstr ""
 
-#: config/internal/option-internal.cpp:556
+#: config/internal/option-internal.cpp:557
 msgid "Sound API; if unsupported, default API will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:557
+#: config/internal/option-internal.cpp:558
 msgid "Device ID of chosen audio device for chosen driver"
 msgstr ""
 
-#: config/internal/option-internal.cpp:558
+#: config/internal/option-internal.cpp:559
 msgid "Number of sound buffers"
 msgstr ""
 
-#: config/internal/option-internal.cpp:559
+#: config/internal/option-internal.cpp:560
 msgid "Bit mask of sound channels to enable"
 msgstr ""
 
-#: config/internal/option-internal.cpp:560
+#: config/internal/option-internal.cpp:561
 msgid "Game Boy Advance sound filtering (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:562
+#: config/internal/option-internal.cpp:563
 msgid "Game Boy Advance sound interpolation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:563
+#: config/internal/option-internal.cpp:564
 msgid "Game Boy sound declicking"
 msgstr ""
 
-#: config/internal/option-internal.cpp:564
+#: config/internal/option-internal.cpp:565
 msgid "Game Boy echo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:565
+#: config/internal/option-internal.cpp:566
 msgid "Enable Game Boy sound effects"
 msgstr ""
 
-#: config/internal/option-internal.cpp:566
+#: config/internal/option-internal.cpp:567
 msgid "Game Boy stereo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:567
+#: config/internal/option-internal.cpp:568
 msgid "Game Boy surround sound effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:568
+#: config/internal/option-internal.cpp:569
 msgid "Sound sample rate (kHz)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:569
+#: config/internal/option-internal.cpp:570
 msgid "Use DirectSound hardware acceleration"
 msgstr ""
 
-#: config/internal/option-internal.cpp:570
+#: config/internal/option-internal.cpp:571
 msgid "Upmix stereo to surround"
 msgstr ""
 
-#: config/internal/option-internal.cpp:571
+#: config/internal/option-internal.cpp:572
 msgid "Sound volume (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:639
-#: config/internal/option-internal.cpp:659
-#: config/internal/option-internal.cpp:680
-#: config/internal/option-internal.cpp:700
-#: config/internal/option-internal.cpp:719
+#: config/internal/option-internal.cpp:640
+#: config/internal/option-internal.cpp:660
+#: config/internal/option-internal.cpp:681
+#: config/internal/option-internal.cpp:701
+#: config/internal/option-internal.cpp:720
 #, c-format
 msgid "Invalid value %s for option %s; valid values are %s"
 msgstr ""
@@ -769,7 +858,7 @@ msgstr ""
 msgid "Invalid value %d for option %s; valid values are %d - %d"
 msgstr ""
 
-#: config/option.cpp:480 opts.cpp:621 opts.cpp:630 opts.cpp:639 opts.cpp:648
+#: config/option.cpp:480 opts.cpp:468 opts.cpp:477 opts.cpp:486 opts.cpp:495
 #, c-format
 msgid "Invalid value %s for option %s"
 msgstr ""
@@ -934,19 +1023,19 @@ msgstr ""
 msgid "Key"
 msgstr ""
 
-#: dialogs/accel-config.cpp:149
+#: dialogs/accel-config.cpp:148
 msgid "Menu commands"
 msgstr ""
 
-#: dialogs/accel-config.cpp:261
+#: dialogs/accel-config.cpp:259
 msgid "This will clear all user-defined accelerators. Are you sure?"
 msgstr ""
 
-#: dialogs/accel-config.cpp:261 dialogs/accel-config.cpp:298
+#: dialogs/accel-config.cpp:259 dialogs/accel-config.cpp:306
 msgid "Confirm"
 msgstr ""
 
-#: dialogs/accel-config.cpp:295
+#: dialogs/accel-config.cpp:304
 #, c-format
 msgid "This will unassign \"%s\" from \"%s\". Are you sure?"
 msgstr ""
@@ -1318,22 +1407,22 @@ msgstr ""
 msgid "New Value"
 msgstr ""
 
-#: guiinit.cpp:2518
+#: guiinit.cpp:2519
 msgid "JoyBus host invalid; disabling"
 msgstr ""
 
-#: opts.cpp:298
+#: opts.cpp:154
 msgid ""
 "The INI file was written for a more recent version of VBA-M. Some INI option"
 " values may have been reset."
 msgstr ""
 
-#: opts.cpp:480 opts.cpp:500 opts.cpp:685
+#: opts.cpp:339 opts.cpp:355 opts.cpp:522
 #, c-format
 msgid "Invalid key binding %s for %s"
 msgstr ""
 
-#: opts.cpp:707
+#: opts.cpp:528
 #, c-format
 msgid "Unknown option %s with value %s"
 msgstr ""
@@ -1557,37 +1646,37 @@ msgstr ""
 msgid "%d %% (%d, %d fps)"
 msgstr ""
 
-#: sys.cpp:899 xrc/GBPrinter.xrc:65
+#: sys.cpp:898 xrc/GBPrinter.xrc:65
 msgid "&Discard"
 msgstr ""
 
-#: sys.cpp:933
+#: sys.cpp:932
 msgid "Image files (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 msgstr ""
 
-#: sys.cpp:942
+#: sys.cpp:941
 msgid "Save printer image to"
 msgstr ""
 
-#: sys.cpp:956 sys.cpp:1140
+#: sys.cpp:955 sys.cpp:1139
 #, c-format
 msgid "Wrote printer output to %s"
 msgstr ""
 
-#: sys.cpp:961 sys.cpp:1032
+#: sys.cpp:960 sys.cpp:1031
 msgid "&Close"
 msgstr ""
 
-#: sys.cpp:1027
+#: sys.cpp:1026
 msgid "Printed"
 msgstr ""
 
-#: sys.cpp:1302
+#: sys.cpp:1301
 #, c-format
 msgid "Error opening pseudo tty: %s"
 msgstr ""
 
-#: sys.cpp:1401
+#: sys.cpp:1400
 #, c-format
 msgid "Error setting up server socket (%d)"
 msgstr ""
@@ -1621,80 +1710,80 @@ msgstr ""
 msgid "Unable to load dialog %s from resources"
 msgstr ""
 
-#: wxvbam.cpp:398 wxvbam.cpp:415
+#: wxvbam.cpp:401 wxvbam.cpp:418
 #, c-format
 msgid "Invalid configuration file provided: %s"
 msgstr ""
 
-#: wxvbam.cpp:559
+#: wxvbam.cpp:558
 msgid "Could not create main window"
 msgstr ""
 
-#: wxvbam.cpp:634
+#: wxvbam.cpp:633
 msgid "Save built-in XRC file and exit"
 msgstr ""
 
-#: wxvbam.cpp:637
+#: wxvbam.cpp:636
 msgid "Save built-in vba-over.ini and exit"
 msgstr ""
 
-#: wxvbam.cpp:640
+#: wxvbam.cpp:639
 msgid "Print configuration path and exit"
 msgstr ""
 
-#: wxvbam.cpp:643
+#: wxvbam.cpp:642
 msgid "Start in full-screen mode"
 msgstr ""
 
-#: wxvbam.cpp:646
+#: wxvbam.cpp:645
 msgid "Set a configuration file"
 msgstr ""
 
-#: wxvbam.cpp:650
+#: wxvbam.cpp:649
 msgid "Delete shared link state first, if it exists"
 msgstr ""
 
-#: wxvbam.cpp:657
+#: wxvbam.cpp:656
 msgid "List all settable options and exit"
 msgstr ""
 
-#: wxvbam.cpp:660
+#: wxvbam.cpp:659
 msgid "ROM file"
 msgstr ""
 
-#: wxvbam.cpp:662
+#: wxvbam.cpp:661
 msgid "<config>=<value>"
 msgstr ""
 
-#: wxvbam.cpp:693
+#: wxvbam.cpp:692
 msgid "Configuration / build error: can't find built-in xrc"
 msgstr ""
 
-#: wxvbam.cpp:701
+#: wxvbam.cpp:700
 #, c-format
 msgid ""
 "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:"
 msgstr ""
 
-#: wxvbam.cpp:715
+#: wxvbam.cpp:714
 msgid "Configuration is read from, in order:"
 msgstr ""
 
-#: wxvbam.cpp:729
+#: wxvbam.cpp:728
 #, c-format
 msgid ""
 "Wrote built-in override file to %s\n"
 "To override, delete all but changed section. First found section is used from search path:"
 msgstr ""
 
-#: wxvbam.cpp:735
+#: wxvbam.cpp:734
 msgid ""
 "\n"
 "\tbuilt-in"
 msgstr ""
 
-#: wxvbam.cpp:750
+#: wxvbam.cpp:749
 msgid ""
 "Options set from the command line are saved if any configuration changes are made in the user interface.\n"
 "\n"
@@ -1702,17 +1791,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: wxvbam.cpp:758
+#: wxvbam.cpp:757
 msgid ""
 "The commands available for the Keyboard/* option are:\n"
 "\n"
 msgstr ""
 
-#: wxvbam.cpp:769
+#: wxvbam.cpp:768
 msgid "Configuration file not found."
 msgstr ""
 
-#: wxvbam.cpp:800
+#: wxvbam.cpp:799
 msgid "Bad configuration option or multiple ROM files given:\n"
 msgstr ""
 
@@ -2224,10 +2313,6 @@ msgstr ""
 msgid "&Number of frames to skip:"
 msgstr ""
 
-#: xrc/DisplayConfig.xrc:200
-msgid "Speed"
-msgstr ""
-
 #: xrc/DisplayConfig.xrc:216
 msgid "Speed indicator:"
 msgstr ""
@@ -2763,58 +2848,10 @@ msgid ""
 " entire contents if too small."
 msgstr ""
 
-#: xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
-msgid "Up"
-msgstr ""
-
-#: xrc/JoyPanel.xrc:37
-msgid "A"
-msgstr ""
-
-#: xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
-msgid "Down"
-msgstr ""
-
-#: xrc/JoyPanel.xrc:83
-msgid "B"
-msgstr ""
-
-#: xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
-msgid "Left"
-msgstr ""
-
-#: xrc/JoyPanel.xrc:129
-msgid "L"
-msgstr ""
-
-#: xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
-msgid "Right"
-msgstr ""
-
-#: xrc/JoyPanel.xrc:175
-msgid "R"
-msgstr ""
-
-#: xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
-msgid "Select"
-msgstr ""
-
-#: xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
-msgid "Start"
-msgstr ""
-
-#: xrc/JoyPanel.xrc:254
-msgid "Motion Up"
-msgstr ""
-
 #: xrc/JoyPanel.xrc:276
 msgid "Autofire A"
 msgstr ""
 
-#: xrc/JoyPanel.xrc:298
-msgid "Motion Down"
-msgstr ""
-
 #: xrc/JoyPanel.xrc:320
 msgid "Autofire B"
 msgstr ""
diff --git a/po/wxvbam/ru_RU.po b/po/wxvbam/ru_RU.po
index f3e6f5c9..c1d3be92 100644
--- a/po/wxvbam/ru_RU.po
+++ b/po/wxvbam/ru_RU.po
@@ -24,7 +24,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VBA-M\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-23 22:00+0000\n"
+"POT-Creation-Date: 2024-04-24 02:00+0000\n"
 "PO-Revision-Date: 2011-12-03 19:42+0000\n"
 "Last-Translator: Радмир Амиров <darkmantro79@gmail.com>, 2021\n"
 "Language-Team: Russian (Russia) (http://app.transifex.com/bgk/vba-m/language/ru_RU/)\n"
@@ -335,174 +335,263 @@ msgstr ""
 msgid "Network is not supported in local mode."
 msgstr "Сеть не поддерживается в локальном режиме."
 
-#: config/internal/option-internal.cpp:379
-msgid "Use bilinear filter with 3d renderer"
+#: config/command.cpp:28 xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
+msgid "Up"
+msgstr "Вверх"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
+msgid "Down"
+msgstr "Вниз"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
+msgid "Left"
+msgstr "Влево"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
+msgid "Right"
+msgstr "Вправо"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:37
+msgid "A"
+msgstr "A"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:83
+msgid "B"
+msgstr "B"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:129
+msgid "L"
+msgstr "L"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:175
+msgid "R"
+msgstr "R"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
+msgid "Select"
+msgstr "Выбрать"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
+msgid "Start"
+msgstr "Start"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:254
+msgid "Motion Up"
+msgstr "Motion Up"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:298
+msgid "Motion Down"
+msgstr "Motion Down"
+
+#: config/command.cpp:30
+msgid "Motion Left"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion Right"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion In"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Motion Out"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto A"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto B"
+msgstr ""
+
+#: config/command.cpp:31 xrc/DisplayConfig.xrc:200
+msgid "Speed"
+msgstr "Скорость"
+
+#: config/command.cpp:31
+msgid "Capture"
+msgstr ""
+
+#: config/command.cpp:32
+msgid "GameShark"
+msgstr ""
+
+#: config/command.cpp:106
+#, c-format
+msgid "Joypad %zu %s"
 msgstr ""
 
 #: config/internal/option-internal.cpp:380
-msgid "Full-screen filter to apply"
+msgid "Use bilinear filter with 3d renderer"
 msgstr ""
 
 #: config/internal/option-internal.cpp:381
-msgid "Filter plugin library"
+msgid "Full-screen filter to apply"
 msgstr ""
 
 #: config/internal/option-internal.cpp:382
-msgid "Interframe blending function"
+msgid "Filter plugin library"
 msgstr ""
 
 #: config/internal/option-internal.cpp:383
+msgid "Interframe blending function"
+msgstr ""
+
+#: config/internal/option-internal.cpp:384
 msgid "Keep window on top"
 msgstr ""
 
-#: config/internal/option-internal.cpp:385
+#: config/internal/option-internal.cpp:386
 msgid "Maximum number of threads to run filters in"
 msgstr ""
 
-#: config/internal/option-internal.cpp:387
+#: config/internal/option-internal.cpp:388
 msgid "Render method; if unsupported, simple method will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:388
+#: config/internal/option-internal.cpp:389
 msgid "Default scale factor"
 msgstr ""
 
-#: config/internal/option-internal.cpp:389
+#: config/internal/option-internal.cpp:390
 msgid "Retain aspect ratio when resizing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:392
+#: config/internal/option-internal.cpp:393
 msgid "BIOS file to use for Game Boy, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:393
+#: config/internal/option-internal.cpp:394
 msgid "Game Boy color enhancement, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:394
+#: config/internal/option-internal.cpp:395
 msgid "Enable DX Colorization Hacks"
 msgstr ""
 
-#: config/internal/option-internal.cpp:395
-#: config/internal/option-internal.cpp:419
+#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:420
 msgid "Apply LCD filter, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:397
 msgid "BIOS file to use for Game Boy Color, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:398
+#: config/internal/option-internal.cpp:399
 msgid ""
 "The default palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:401
+#: config/internal/option-internal.cpp:402
 msgid ""
 "The first user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:404
+#: config/internal/option-internal.cpp:405
 msgid ""
 "The second user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:407
+#: config/internal/option-internal.cpp:408
 msgid "Automatically gather a full page before printing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:409
+#: config/internal/option-internal.cpp:410
 msgid "Automatically save printouts as screen captures with -print suffix"
 msgstr ""
 
-#: config/internal/option-internal.cpp:411
-#: config/internal/option-internal.cpp:439
+#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:440
 msgid "Directory to look for ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:413
 msgid "Directory to look for Game Boy Color ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:415
+#: config/internal/option-internal.cpp:416
 msgid "BIOS file to use, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:425
+#: config/internal/option-internal.cpp:426
 msgid "Enable link at boot"
 msgstr ""
 
-#: config/internal/option-internal.cpp:430
+#: config/internal/option-internal.cpp:431
 msgid "Enable faster network protocol by default"
 msgstr ""
 
-#: config/internal/option-internal.cpp:432
+#: config/internal/option-internal.cpp:433
 msgid "Default network link client host"
 msgstr ""
 
-#: config/internal/option-internal.cpp:433
+#: config/internal/option-internal.cpp:434
 msgid "Default network link server IP to bind"
 msgstr ""
 
-#: config/internal/option-internal.cpp:434
+#: config/internal/option-internal.cpp:435
 msgid "Default network link port (server and client)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:435
+#: config/internal/option-internal.cpp:436
 msgid "Default network protocol"
 msgstr ""
 
-#: config/internal/option-internal.cpp:436
+#: config/internal/option-internal.cpp:437
 msgid "Link timeout (ms)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:437
+#: config/internal/option-internal.cpp:438
 msgid "Link cable type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:442
+#: config/internal/option-internal.cpp:443
 msgid "Automatically load last saved state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:444
+#: config/internal/option-internal.cpp:445
 msgid ""
 "Directory to store game save files (relative paths are relative to ROM; "
 "blank is config dir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:446
+#: config/internal/option-internal.cpp:447
 msgid "Freeze recent load list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:448
+#: config/internal/option-internal.cpp:449
 msgid ""
 "Directory to store A / V and game recordings (relative paths are relative to"
 " ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:451
+#: config/internal/option-internal.cpp:452
 msgid "Number of seconds between rewind snapshots (0 to disable)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:453
+#: config/internal/option-internal.cpp:454
 msgid "Directory to store screenshots (relative paths are relative to ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:456
+#: config/internal/option-internal.cpp:457
 msgid ""
 "Directory to store saved state files (relative paths are relative to "
 "BatteryDir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:458
+#: config/internal/option-internal.cpp:459
 msgid "Enable status bar"
 msgstr ""
 
-#: config/internal/option-internal.cpp:459
+#: config/internal/option-internal.cpp:460
 msgid "INI file version (DO NOT MODIFY)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:463
+#: config/internal/option-internal.cpp:464
 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, "
@@ -510,266 +599,266 @@ msgid ""
 "MotionRight, AutoA, AutoB, Speed, Capture, GS"
 msgstr ""
 
-#: config/internal/option-internal.cpp:468
+#: config/internal/option-internal.cpp:469
 msgid "The autofire toggle period, in frames (1/60 s)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:469
+#: config/internal/option-internal.cpp:470
 msgid "The number of the stick to use in single-player mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:471
+#: config/internal/option-internal.cpp:472
 msgid "Whether to enable SDL GameController mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:475
+#: config/internal/option-internal.cpp:476
 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 "
 "executed."
 msgstr ""
 
-#: config/internal/option-internal.cpp:480
+#: config/internal/option-internal.cpp:481
 msgid "Enable AGB debug print"
 msgstr ""
 
-#: config/internal/option-internal.cpp:481
+#: config/internal/option-internal.cpp:482
 msgid "Auto skip frames"
 msgstr ""
 
-#: config/internal/option-internal.cpp:483
+#: config/internal/option-internal.cpp:484
 msgid "Apply IPS / UPS / IPF patches if found"
 msgstr ""
 
-#: config/internal/option-internal.cpp:485
+#: config/internal/option-internal.cpp:486
 msgid "Automatically save and load cheat list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:489
+#: config/internal/option-internal.cpp:490
 msgid "Automatically enable border for Super Game Boy games"
 msgstr ""
 
-#: config/internal/option-internal.cpp:491
+#: config/internal/option-internal.cpp:492
 msgid "Always enable border"
 msgstr ""
 
-#: config/internal/option-internal.cpp:492
+#: config/internal/option-internal.cpp:493
 msgid "Screen capture file format"
 msgstr ""
 
-#: config/internal/option-internal.cpp:493
+#: config/internal/option-internal.cpp:494
 msgid "Enable cheats"
 msgstr ""
 
-#: config/internal/option-internal.cpp:494
+#: config/internal/option-internal.cpp:495
 msgid "Disable on-screen status messages"
 msgstr ""
 
-#: config/internal/option-internal.cpp:495
+#: config/internal/option-internal.cpp:496
 msgid "Type of system to emulate"
 msgstr ""
 
-#: config/internal/option-internal.cpp:496
+#: config/internal/option-internal.cpp:497
 msgid "Flash size 0 = 64 KB 1 = 128 KB"
 msgstr ""
 
-#: config/internal/option-internal.cpp:498
+#: config/internal/option-internal.cpp:499
 msgid "Skip frames. Values are 0-9 or -1 to skip automatically based on time."
 msgstr ""
 
-#: config/internal/option-internal.cpp:500
+#: config/internal/option-internal.cpp:501
 msgid "The palette to use"
 msgstr ""
 
-#: config/internal/option-internal.cpp:501
+#: config/internal/option-internal.cpp:502
 msgid "Enable printer emulation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:503
+#: config/internal/option-internal.cpp:504
 msgid "Break into GDB after loading the game."
 msgstr ""
 
-#: config/internal/option-internal.cpp:504
+#: config/internal/option-internal.cpp:505
 msgid "Port to connect GDB to"
 msgstr ""
 
-#: config/internal/option-internal.cpp:506
+#: config/internal/option-internal.cpp:507
 msgid "Number of players in network"
 msgstr ""
 
-#: config/internal/option-internal.cpp:508
+#: config/internal/option-internal.cpp:509
 msgid "Maximum scale factor (0 = no limit)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:510
+#: config/internal/option-internal.cpp:511
 msgid "Pause game when main window loses focus"
 msgstr ""
 
-#: config/internal/option-internal.cpp:512
+#: config/internal/option-internal.cpp:513
 msgid "Enable RTC (vba-over.ini override is rtcEnabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:513
+#: config/internal/option-internal.cpp:514
 msgid "Native save (\"battery\") hardware type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:514
+#: config/internal/option-internal.cpp:515
 msgid "Show speed indicator"
 msgstr ""
 
-#: config/internal/option-internal.cpp:516
+#: config/internal/option-internal.cpp:517
 msgid "Draw on-screen messages transparently"
 msgstr ""
 
-#: config/internal/option-internal.cpp:517
+#: config/internal/option-internal.cpp:518
 msgid "Skip BIOS initialization"
 msgstr ""
 
-#: config/internal/option-internal.cpp:519
+#: config/internal/option-internal.cpp:520
 msgid "Do not overwrite cheat list when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:521
+#: config/internal/option-internal.cpp:522
 msgid "Do not overwrite native (battery) save when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:523
+#: config/internal/option-internal.cpp:524
 msgid "Throttle game speed, even when accelerated (0-450 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:526
+#: config/internal/option-internal.cpp:527
 msgid "Set throttle for speedup key (0-3000 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:528
+#: config/internal/option-internal.cpp:529
 msgid "Number of frames to skip with speedup (instead of speedup throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:531
+#: config/internal/option-internal.cpp:532
 msgid "Use frame skip for speedup throttle"
 msgstr ""
 
-#: config/internal/option-internal.cpp:532
+#: config/internal/option-internal.cpp:533
 msgid "Use the specified BIOS file for Game Boy"
 msgstr ""
 
-#: config/internal/option-internal.cpp:533
+#: config/internal/option-internal.cpp:534
 msgid "Use the specified BIOS file"
 msgstr ""
 
-#: config/internal/option-internal.cpp:535
+#: config/internal/option-internal.cpp:536
 msgid "Use the specified BIOS file for Game Boy Color"
 msgstr ""
 
-#: config/internal/option-internal.cpp:536
+#: config/internal/option-internal.cpp:537
 msgid "Wait for vertical sync"
 msgstr ""
 
-#: config/internal/option-internal.cpp:539
+#: config/internal/option-internal.cpp:540
 msgid "Enter fullscreen mode at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:540
+#: config/internal/option-internal.cpp:541
 msgid "Window maximized"
 msgstr ""
 
-#: config/internal/option-internal.cpp:541
+#: config/internal/option-internal.cpp:542
 msgid "Window height at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:542
+#: config/internal/option-internal.cpp:543
 msgid "Window width at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:543
+#: config/internal/option-internal.cpp:544
 msgid "Window axis X position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:544
+#: config/internal/option-internal.cpp:545
 msgid "Window axis Y position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:548
+#: config/internal/option-internal.cpp:549
 msgid "Capture key events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:550
+#: config/internal/option-internal.cpp:551
 msgid "Capture joy events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:551
+#: config/internal/option-internal.cpp:552
 msgid "Hide menu bar when mouse is inactive"
 msgstr ""
 
-#: config/internal/option-internal.cpp:553
+#: config/internal/option-internal.cpp:554
 msgid "Suspend screensaver when game is running"
 msgstr ""
 
-#: config/internal/option-internal.cpp:556
+#: config/internal/option-internal.cpp:557
 msgid "Sound API; if unsupported, default API will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:557
+#: config/internal/option-internal.cpp:558
 msgid "Device ID of chosen audio device for chosen driver"
 msgstr ""
 
-#: config/internal/option-internal.cpp:558
+#: config/internal/option-internal.cpp:559
 msgid "Number of sound buffers"
 msgstr ""
 
-#: config/internal/option-internal.cpp:559
+#: config/internal/option-internal.cpp:560
 msgid "Bit mask of sound channels to enable"
 msgstr ""
 
-#: config/internal/option-internal.cpp:560
+#: config/internal/option-internal.cpp:561
 msgid "Game Boy Advance sound filtering (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:562
+#: config/internal/option-internal.cpp:563
 msgid "Game Boy Advance sound interpolation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:563
+#: config/internal/option-internal.cpp:564
 msgid "Game Boy sound declicking"
 msgstr ""
 
-#: config/internal/option-internal.cpp:564
+#: config/internal/option-internal.cpp:565
 msgid "Game Boy echo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:565
+#: config/internal/option-internal.cpp:566
 msgid "Enable Game Boy sound effects"
 msgstr ""
 
-#: config/internal/option-internal.cpp:566
+#: config/internal/option-internal.cpp:567
 msgid "Game Boy stereo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:567
+#: config/internal/option-internal.cpp:568
 msgid "Game Boy surround sound effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:568
+#: config/internal/option-internal.cpp:569
 msgid "Sound sample rate (kHz)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:569
+#: config/internal/option-internal.cpp:570
 msgid "Use DirectSound hardware acceleration"
 msgstr ""
 
-#: config/internal/option-internal.cpp:570
+#: config/internal/option-internal.cpp:571
 msgid "Upmix stereo to surround"
 msgstr ""
 
-#: config/internal/option-internal.cpp:571
+#: config/internal/option-internal.cpp:572
 msgid "Sound volume (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:639
-#: config/internal/option-internal.cpp:659
-#: config/internal/option-internal.cpp:680
-#: config/internal/option-internal.cpp:700
-#: config/internal/option-internal.cpp:719
+#: config/internal/option-internal.cpp:640
+#: config/internal/option-internal.cpp:660
+#: config/internal/option-internal.cpp:681
+#: config/internal/option-internal.cpp:701
+#: config/internal/option-internal.cpp:720
 #, c-format
 msgid "Invalid value %s for option %s; valid values are %s"
 msgstr ""
@@ -784,7 +873,7 @@ msgstr "Неверное значение %f для %s; верные значе
 msgid "Invalid value %d for option %s; valid values are %d - %d"
 msgstr "Неверное значение %d для параметра %s; верные значения %d - %d"
 
-#: config/option.cpp:480 opts.cpp:621 opts.cpp:630 opts.cpp:639 opts.cpp:648
+#: config/option.cpp:480 opts.cpp:468 opts.cpp:477 opts.cpp:486 opts.cpp:495
 #, c-format
 msgid "Invalid value %s for option %s"
 msgstr ""
@@ -949,19 +1038,19 @@ msgstr "Meta+"
 msgid "Key"
 msgstr ""
 
-#: dialogs/accel-config.cpp:149
+#: dialogs/accel-config.cpp:148
 msgid "Menu commands"
 msgstr "Команды меню"
 
-#: dialogs/accel-config.cpp:261
+#: dialogs/accel-config.cpp:259
 msgid "This will clear all user-defined accelerators. Are you sure?"
 msgstr ""
 
-#: dialogs/accel-config.cpp:261 dialogs/accel-config.cpp:298
+#: dialogs/accel-config.cpp:259 dialogs/accel-config.cpp:306
 msgid "Confirm"
 msgstr "Подтвердить"
 
-#: dialogs/accel-config.cpp:295
+#: dialogs/accel-config.cpp:304
 #, c-format
 msgid "This will unassign \"%s\" from \"%s\". Are you sure?"
 msgstr ""
@@ -1333,22 +1422,22 @@ msgstr "Старое значение"
 msgid "New Value"
 msgstr "Новое значение"
 
-#: guiinit.cpp:2518
+#: guiinit.cpp:2519
 msgid "JoyBus host invalid; disabling"
 msgstr "Хост JoyBus неверен; отключено"
 
-#: opts.cpp:298
+#: opts.cpp:154
 msgid ""
 "The INI file was written for a more recent version of VBA-M. Some INI option"
 " values may have been reset."
 msgstr ""
 
-#: opts.cpp:480 opts.cpp:500 opts.cpp:685
+#: opts.cpp:339 opts.cpp:355 opts.cpp:522
 #, c-format
 msgid "Invalid key binding %s for %s"
 msgstr "Неверно назначена клавиша %s для %s"
 
-#: opts.cpp:707
+#: opts.cpp:528
 #, c-format
 msgid "Unknown option %s with value %s"
 msgstr ""
@@ -1572,37 +1661,37 @@ msgstr "Воспроизведение закончено"
 msgid "%d %% (%d, %d fps)"
 msgstr ""
 
-#: sys.cpp:899 xrc/GBPrinter.xrc:65
+#: sys.cpp:898 xrc/GBPrinter.xrc:65
 msgid "&Discard"
 msgstr "&Отменить"
 
-#: sys.cpp:933
+#: sys.cpp:932
 msgid "Image files (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 msgstr "Файлы изображений (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 
-#: sys.cpp:942
+#: sys.cpp:941
 msgid "Save printer image to"
 msgstr "Сохранение распечатки в файл"
 
-#: sys.cpp:956 sys.cpp:1140
+#: sys.cpp:955 sys.cpp:1139
 #, c-format
 msgid "Wrote printer output to %s"
 msgstr "Вывод принтера записан в %s"
 
-#: sys.cpp:961 sys.cpp:1032
+#: sys.cpp:960 sys.cpp:1031
 msgid "&Close"
 msgstr "&Закрыть"
 
-#: sys.cpp:1027
+#: sys.cpp:1026
 msgid "Printed"
 msgstr "Распечатано"
 
-#: sys.cpp:1302
+#: sys.cpp:1301
 #, c-format
 msgid "Error opening pseudo tty: %s"
 msgstr "Ошибка открытия псевдотерминала TTY: %s"
 
-#: sys.cpp:1401
+#: sys.cpp:1400
 #, c-format
 msgid "Error setting up server socket (%d)"
 msgstr "Ошибка настройки серверного сокета (%d)"
@@ -1636,80 +1725,80 @@ msgstr ""
 msgid "Unable to load dialog %s from resources"
 msgstr "Невозможно загрузить диалог %s из ресурсов"
 
-#: wxvbam.cpp:398 wxvbam.cpp:415
+#: wxvbam.cpp:401 wxvbam.cpp:418
 #, c-format
 msgid "Invalid configuration file provided: %s"
 msgstr ""
 
-#: wxvbam.cpp:559
+#: wxvbam.cpp:558
 msgid "Could not create main window"
 msgstr "Невозможно создать главное окно"
 
-#: wxvbam.cpp:634
+#: wxvbam.cpp:633
 msgid "Save built-in XRC file and exit"
 msgstr "Сохранить встроенный XRC-файл и выйти"
 
-#: wxvbam.cpp:637
+#: wxvbam.cpp:636
 msgid "Save built-in vba-over.ini and exit"
 msgstr "Сохранить встроенный файл vba-over.ini и выйти"
 
-#: wxvbam.cpp:640
+#: wxvbam.cpp:639
 msgid "Print configuration path and exit"
 msgstr "Напечатать путь к конфигурации и выйти"
 
-#: wxvbam.cpp:643
+#: wxvbam.cpp:642
 msgid "Start in full-screen mode"
 msgstr "Запускать в полноэкранном режиме"
 
-#: wxvbam.cpp:646
+#: wxvbam.cpp:645
 msgid "Set a configuration file"
 msgstr "Задать файл конфигурации"
 
-#: wxvbam.cpp:650
+#: wxvbam.cpp:649
 msgid "Delete shared link state first, if it exists"
 msgstr "Удалить файл состояния подключения, если он существует"
 
-#: wxvbam.cpp:657
+#: wxvbam.cpp:656
 msgid "List all settable options and exit"
 msgstr "Вывести все изменяемые параметры и выйти"
 
-#: wxvbam.cpp:660
+#: wxvbam.cpp:659
 msgid "ROM file"
 msgstr "ROM-файл"
 
-#: wxvbam.cpp:662
+#: wxvbam.cpp:661
 msgid "<config>=<value>"
 msgstr "<параметр>=<значение>"
 
-#: wxvbam.cpp:693
+#: wxvbam.cpp:692
 msgid "Configuration / build error: can't find built-in xrc"
 msgstr ""
 
-#: wxvbam.cpp:701
+#: wxvbam.cpp:700
 #, c-format
 msgid ""
 "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:"
 msgstr ""
 
-#: wxvbam.cpp:715
+#: wxvbam.cpp:714
 msgid "Configuration is read from, in order:"
 msgstr "Конфигурация прочитана из файлов, по порядку:"
 
-#: wxvbam.cpp:729
+#: wxvbam.cpp:728
 #, c-format
 msgid ""
 "Wrote built-in override file to %s\n"
 "To override, delete all but changed section. First found section is used from search path:"
 msgstr ""
 
-#: wxvbam.cpp:735
+#: wxvbam.cpp:734
 msgid ""
 "\n"
 "\tbuilt-in"
 msgstr "\n\tвстроенный"
 
-#: wxvbam.cpp:750
+#: wxvbam.cpp:749
 msgid ""
 "Options set from the command line are saved if any configuration changes are made in the user interface.\n"
 "\n"
@@ -1717,17 +1806,17 @@ msgid ""
 "\n"
 msgstr "Параметры, установленные из командной строки сохраняются, если любые изменения конфигурации сделаны из интерфейса программы.\n\nДля значений true и false используются цифры 1 и 0 соответственно\n"
 
-#: wxvbam.cpp:758
+#: wxvbam.cpp:757
 msgid ""
 "The commands available for the Keyboard/* option are:\n"
 "\n"
 msgstr "Команды для настройки клавиатуры:\n"
 
-#: wxvbam.cpp:769
+#: wxvbam.cpp:768
 msgid "Configuration file not found."
 msgstr "Файл конфигурации не найден."
 
-#: wxvbam.cpp:800
+#: wxvbam.cpp:799
 msgid "Bad configuration option or multiple ROM files given:\n"
 msgstr "Неверный параметр конфигурации или выбрано несколько ROM-файлов:\n"
 
@@ -2239,10 +2328,6 @@ msgstr "Пропустить кадр"
 msgid "&Number of frames to skip:"
 msgstr ""
 
-#: xrc/DisplayConfig.xrc:200
-msgid "Speed"
-msgstr "Скорость"
-
 #: xrc/DisplayConfig.xrc:216
 msgid "Speed indicator:"
 msgstr ""
@@ -2778,58 +2863,10 @@ msgid ""
 " entire contents if too small."
 msgstr ""
 
-#: xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
-msgid "Up"
-msgstr "Вверх"
-
-#: xrc/JoyPanel.xrc:37
-msgid "A"
-msgstr "A"
-
-#: xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
-msgid "Down"
-msgstr "Вниз"
-
-#: xrc/JoyPanel.xrc:83
-msgid "B"
-msgstr "B"
-
-#: xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
-msgid "Left"
-msgstr "Влево"
-
-#: xrc/JoyPanel.xrc:129
-msgid "L"
-msgstr "L"
-
-#: xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
-msgid "Right"
-msgstr "Вправо"
-
-#: xrc/JoyPanel.xrc:175
-msgid "R"
-msgstr "R"
-
-#: xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
-msgid "Select"
-msgstr "Выбрать"
-
-#: xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
-msgid "Start"
-msgstr "Start"
-
-#: xrc/JoyPanel.xrc:254
-msgid "Motion Up"
-msgstr "Motion Up"
-
 #: xrc/JoyPanel.xrc:276
 msgid "Autofire A"
 msgstr "Турбо A"
 
-#: xrc/JoyPanel.xrc:298
-msgid "Motion Down"
-msgstr "Motion Down"
-
 #: xrc/JoyPanel.xrc:320
 msgid "Autofire B"
 msgstr "Турбо B"
diff --git a/po/wxvbam/sv.po b/po/wxvbam/sv.po
index e2d161b9..63d103cb 100644
--- a/po/wxvbam/sv.po
+++ b/po/wxvbam/sv.po
@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VBA-M\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-23 22:00+0000\n"
+"POT-Creation-Date: 2024-04-24 02:00+0000\n"
 "PO-Revision-Date: 2011-12-03 19:42+0000\n"
 "Last-Translator: Sebastian Rasmussen <sebras@gmail.com>, 2020,2022\n"
 "Language-Team: Swedish (http://app.transifex.com/bgk/vba-m/language/sv/)\n"
@@ -326,174 +326,263 @@ msgstr ""
 msgid "Network is not supported in local mode."
 msgstr "Nätverk stöds inte i lokalläge."
 
-#: config/internal/option-internal.cpp:379
-msgid "Use bilinear filter with 3d renderer"
+#: config/command.cpp:28 xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
+msgid "Up"
+msgstr "Upp"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
+msgid "Down"
+msgstr "Ner"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
+msgid "Left"
+msgstr "Vänster"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
+msgid "Right"
+msgstr "Höger"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:37
+msgid "A"
+msgstr "A"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:83
+msgid "B"
+msgstr "B"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:129
+msgid "L"
+msgstr "L"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:175
+msgid "R"
+msgstr "R"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
+msgid "Select"
+msgstr "Välj"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
+msgid "Start"
+msgstr "Start"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:254
+msgid "Motion Up"
+msgstr "Rörelse upp"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:298
+msgid "Motion Down"
+msgstr "Rörelse ned"
+
+#: config/command.cpp:30
+msgid "Motion Left"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion Right"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion In"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Motion Out"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto A"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto B"
+msgstr ""
+
+#: config/command.cpp:31 xrc/DisplayConfig.xrc:200
+msgid "Speed"
+msgstr "Hastighet"
+
+#: config/command.cpp:31
+msgid "Capture"
+msgstr ""
+
+#: config/command.cpp:32
+msgid "GameShark"
+msgstr ""
+
+#: config/command.cpp:106
+#, c-format
+msgid "Joypad %zu %s"
 msgstr ""
 
 #: config/internal/option-internal.cpp:380
-msgid "Full-screen filter to apply"
+msgid "Use bilinear filter with 3d renderer"
 msgstr ""
 
 #: config/internal/option-internal.cpp:381
-msgid "Filter plugin library"
+msgid "Full-screen filter to apply"
 msgstr ""
 
 #: config/internal/option-internal.cpp:382
-msgid "Interframe blending function"
+msgid "Filter plugin library"
 msgstr ""
 
 #: config/internal/option-internal.cpp:383
+msgid "Interframe blending function"
+msgstr ""
+
+#: config/internal/option-internal.cpp:384
 msgid "Keep window on top"
 msgstr ""
 
-#: config/internal/option-internal.cpp:385
+#: config/internal/option-internal.cpp:386
 msgid "Maximum number of threads to run filters in"
 msgstr ""
 
-#: config/internal/option-internal.cpp:387
+#: config/internal/option-internal.cpp:388
 msgid "Render method; if unsupported, simple method will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:388
+#: config/internal/option-internal.cpp:389
 msgid "Default scale factor"
 msgstr ""
 
-#: config/internal/option-internal.cpp:389
+#: config/internal/option-internal.cpp:390
 msgid "Retain aspect ratio when resizing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:392
+#: config/internal/option-internal.cpp:393
 msgid "BIOS file to use for Game Boy, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:393
+#: config/internal/option-internal.cpp:394
 msgid "Game Boy color enhancement, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:394
+#: config/internal/option-internal.cpp:395
 msgid "Enable DX Colorization Hacks"
 msgstr ""
 
-#: config/internal/option-internal.cpp:395
-#: config/internal/option-internal.cpp:419
+#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:420
 msgid "Apply LCD filter, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:397
 msgid "BIOS file to use for Game Boy Color, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:398
+#: config/internal/option-internal.cpp:399
 msgid ""
 "The default palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:401
+#: config/internal/option-internal.cpp:402
 msgid ""
 "The first user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:404
+#: config/internal/option-internal.cpp:405
 msgid ""
 "The second user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:407
+#: config/internal/option-internal.cpp:408
 msgid "Automatically gather a full page before printing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:409
+#: config/internal/option-internal.cpp:410
 msgid "Automatically save printouts as screen captures with -print suffix"
 msgstr ""
 
-#: config/internal/option-internal.cpp:411
-#: config/internal/option-internal.cpp:439
+#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:440
 msgid "Directory to look for ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:413
 msgid "Directory to look for Game Boy Color ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:415
+#: config/internal/option-internal.cpp:416
 msgid "BIOS file to use, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:425
+#: config/internal/option-internal.cpp:426
 msgid "Enable link at boot"
 msgstr ""
 
-#: config/internal/option-internal.cpp:430
+#: config/internal/option-internal.cpp:431
 msgid "Enable faster network protocol by default"
 msgstr ""
 
-#: config/internal/option-internal.cpp:432
+#: config/internal/option-internal.cpp:433
 msgid "Default network link client host"
 msgstr ""
 
-#: config/internal/option-internal.cpp:433
+#: config/internal/option-internal.cpp:434
 msgid "Default network link server IP to bind"
 msgstr ""
 
-#: config/internal/option-internal.cpp:434
+#: config/internal/option-internal.cpp:435
 msgid "Default network link port (server and client)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:435
+#: config/internal/option-internal.cpp:436
 msgid "Default network protocol"
 msgstr ""
 
-#: config/internal/option-internal.cpp:436
+#: config/internal/option-internal.cpp:437
 msgid "Link timeout (ms)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:437
+#: config/internal/option-internal.cpp:438
 msgid "Link cable type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:442
+#: config/internal/option-internal.cpp:443
 msgid "Automatically load last saved state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:444
+#: config/internal/option-internal.cpp:445
 msgid ""
 "Directory to store game save files (relative paths are relative to ROM; "
 "blank is config dir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:446
+#: config/internal/option-internal.cpp:447
 msgid "Freeze recent load list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:448
+#: config/internal/option-internal.cpp:449
 msgid ""
 "Directory to store A / V and game recordings (relative paths are relative to"
 " ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:451
+#: config/internal/option-internal.cpp:452
 msgid "Number of seconds between rewind snapshots (0 to disable)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:453
+#: config/internal/option-internal.cpp:454
 msgid "Directory to store screenshots (relative paths are relative to ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:456
+#: config/internal/option-internal.cpp:457
 msgid ""
 "Directory to store saved state files (relative paths are relative to "
 "BatteryDir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:458
+#: config/internal/option-internal.cpp:459
 msgid "Enable status bar"
 msgstr ""
 
-#: config/internal/option-internal.cpp:459
+#: config/internal/option-internal.cpp:460
 msgid "INI file version (DO NOT MODIFY)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:463
+#: config/internal/option-internal.cpp:464
 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, "
@@ -501,266 +590,266 @@ msgid ""
 "MotionRight, AutoA, AutoB, Speed, Capture, GS"
 msgstr ""
 
-#: config/internal/option-internal.cpp:468
+#: config/internal/option-internal.cpp:469
 msgid "The autofire toggle period, in frames (1/60 s)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:469
+#: config/internal/option-internal.cpp:470
 msgid "The number of the stick to use in single-player mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:471
+#: config/internal/option-internal.cpp:472
 msgid "Whether to enable SDL GameController mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:475
+#: config/internal/option-internal.cpp:476
 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 "
 "executed."
 msgstr ""
 
-#: config/internal/option-internal.cpp:480
+#: config/internal/option-internal.cpp:481
 msgid "Enable AGB debug print"
 msgstr ""
 
-#: config/internal/option-internal.cpp:481
+#: config/internal/option-internal.cpp:482
 msgid "Auto skip frames"
 msgstr ""
 
-#: config/internal/option-internal.cpp:483
+#: config/internal/option-internal.cpp:484
 msgid "Apply IPS / UPS / IPF patches if found"
 msgstr ""
 
-#: config/internal/option-internal.cpp:485
+#: config/internal/option-internal.cpp:486
 msgid "Automatically save and load cheat list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:489
+#: config/internal/option-internal.cpp:490
 msgid "Automatically enable border for Super Game Boy games"
 msgstr ""
 
-#: config/internal/option-internal.cpp:491
+#: config/internal/option-internal.cpp:492
 msgid "Always enable border"
 msgstr ""
 
-#: config/internal/option-internal.cpp:492
+#: config/internal/option-internal.cpp:493
 msgid "Screen capture file format"
 msgstr ""
 
-#: config/internal/option-internal.cpp:493
+#: config/internal/option-internal.cpp:494
 msgid "Enable cheats"
 msgstr ""
 
-#: config/internal/option-internal.cpp:494
+#: config/internal/option-internal.cpp:495
 msgid "Disable on-screen status messages"
 msgstr ""
 
-#: config/internal/option-internal.cpp:495
+#: config/internal/option-internal.cpp:496
 msgid "Type of system to emulate"
 msgstr ""
 
-#: config/internal/option-internal.cpp:496
+#: config/internal/option-internal.cpp:497
 msgid "Flash size 0 = 64 KB 1 = 128 KB"
 msgstr ""
 
-#: config/internal/option-internal.cpp:498
+#: config/internal/option-internal.cpp:499
 msgid "Skip frames. Values are 0-9 or -1 to skip automatically based on time."
 msgstr ""
 
-#: config/internal/option-internal.cpp:500
+#: config/internal/option-internal.cpp:501
 msgid "The palette to use"
 msgstr ""
 
-#: config/internal/option-internal.cpp:501
+#: config/internal/option-internal.cpp:502
 msgid "Enable printer emulation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:503
+#: config/internal/option-internal.cpp:504
 msgid "Break into GDB after loading the game."
 msgstr ""
 
-#: config/internal/option-internal.cpp:504
+#: config/internal/option-internal.cpp:505
 msgid "Port to connect GDB to"
 msgstr ""
 
-#: config/internal/option-internal.cpp:506
+#: config/internal/option-internal.cpp:507
 msgid "Number of players in network"
 msgstr ""
 
-#: config/internal/option-internal.cpp:508
+#: config/internal/option-internal.cpp:509
 msgid "Maximum scale factor (0 = no limit)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:510
+#: config/internal/option-internal.cpp:511
 msgid "Pause game when main window loses focus"
 msgstr ""
 
-#: config/internal/option-internal.cpp:512
+#: config/internal/option-internal.cpp:513
 msgid "Enable RTC (vba-over.ini override is rtcEnabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:513
+#: config/internal/option-internal.cpp:514
 msgid "Native save (\"battery\") hardware type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:514
+#: config/internal/option-internal.cpp:515
 msgid "Show speed indicator"
 msgstr ""
 
-#: config/internal/option-internal.cpp:516
+#: config/internal/option-internal.cpp:517
 msgid "Draw on-screen messages transparently"
 msgstr ""
 
-#: config/internal/option-internal.cpp:517
+#: config/internal/option-internal.cpp:518
 msgid "Skip BIOS initialization"
 msgstr ""
 
-#: config/internal/option-internal.cpp:519
+#: config/internal/option-internal.cpp:520
 msgid "Do not overwrite cheat list when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:521
+#: config/internal/option-internal.cpp:522
 msgid "Do not overwrite native (battery) save when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:523
+#: config/internal/option-internal.cpp:524
 msgid "Throttle game speed, even when accelerated (0-450 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:526
+#: config/internal/option-internal.cpp:527
 msgid "Set throttle for speedup key (0-3000 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:528
+#: config/internal/option-internal.cpp:529
 msgid "Number of frames to skip with speedup (instead of speedup throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:531
+#: config/internal/option-internal.cpp:532
 msgid "Use frame skip for speedup throttle"
 msgstr ""
 
-#: config/internal/option-internal.cpp:532
+#: config/internal/option-internal.cpp:533
 msgid "Use the specified BIOS file for Game Boy"
 msgstr ""
 
-#: config/internal/option-internal.cpp:533
+#: config/internal/option-internal.cpp:534
 msgid "Use the specified BIOS file"
 msgstr ""
 
-#: config/internal/option-internal.cpp:535
+#: config/internal/option-internal.cpp:536
 msgid "Use the specified BIOS file for Game Boy Color"
 msgstr ""
 
-#: config/internal/option-internal.cpp:536
+#: config/internal/option-internal.cpp:537
 msgid "Wait for vertical sync"
 msgstr ""
 
-#: config/internal/option-internal.cpp:539
+#: config/internal/option-internal.cpp:540
 msgid "Enter fullscreen mode at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:540
+#: config/internal/option-internal.cpp:541
 msgid "Window maximized"
 msgstr ""
 
-#: config/internal/option-internal.cpp:541
+#: config/internal/option-internal.cpp:542
 msgid "Window height at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:542
+#: config/internal/option-internal.cpp:543
 msgid "Window width at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:543
+#: config/internal/option-internal.cpp:544
 msgid "Window axis X position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:544
+#: config/internal/option-internal.cpp:545
 msgid "Window axis Y position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:548
+#: config/internal/option-internal.cpp:549
 msgid "Capture key events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:550
+#: config/internal/option-internal.cpp:551
 msgid "Capture joy events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:551
+#: config/internal/option-internal.cpp:552
 msgid "Hide menu bar when mouse is inactive"
 msgstr ""
 
-#: config/internal/option-internal.cpp:553
+#: config/internal/option-internal.cpp:554
 msgid "Suspend screensaver when game is running"
 msgstr ""
 
-#: config/internal/option-internal.cpp:556
+#: config/internal/option-internal.cpp:557
 msgid "Sound API; if unsupported, default API will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:557
+#: config/internal/option-internal.cpp:558
 msgid "Device ID of chosen audio device for chosen driver"
 msgstr ""
 
-#: config/internal/option-internal.cpp:558
+#: config/internal/option-internal.cpp:559
 msgid "Number of sound buffers"
 msgstr ""
 
-#: config/internal/option-internal.cpp:559
+#: config/internal/option-internal.cpp:560
 msgid "Bit mask of sound channels to enable"
 msgstr ""
 
-#: config/internal/option-internal.cpp:560
+#: config/internal/option-internal.cpp:561
 msgid "Game Boy Advance sound filtering (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:562
+#: config/internal/option-internal.cpp:563
 msgid "Game Boy Advance sound interpolation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:563
+#: config/internal/option-internal.cpp:564
 msgid "Game Boy sound declicking"
 msgstr ""
 
-#: config/internal/option-internal.cpp:564
+#: config/internal/option-internal.cpp:565
 msgid "Game Boy echo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:565
+#: config/internal/option-internal.cpp:566
 msgid "Enable Game Boy sound effects"
 msgstr ""
 
-#: config/internal/option-internal.cpp:566
+#: config/internal/option-internal.cpp:567
 msgid "Game Boy stereo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:567
+#: config/internal/option-internal.cpp:568
 msgid "Game Boy surround sound effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:568
+#: config/internal/option-internal.cpp:569
 msgid "Sound sample rate (kHz)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:569
+#: config/internal/option-internal.cpp:570
 msgid "Use DirectSound hardware acceleration"
 msgstr ""
 
-#: config/internal/option-internal.cpp:570
+#: config/internal/option-internal.cpp:571
 msgid "Upmix stereo to surround"
 msgstr ""
 
-#: config/internal/option-internal.cpp:571
+#: config/internal/option-internal.cpp:572
 msgid "Sound volume (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:639
-#: config/internal/option-internal.cpp:659
-#: config/internal/option-internal.cpp:680
-#: config/internal/option-internal.cpp:700
-#: config/internal/option-internal.cpp:719
+#: config/internal/option-internal.cpp:640
+#: config/internal/option-internal.cpp:660
+#: config/internal/option-internal.cpp:681
+#: config/internal/option-internal.cpp:701
+#: config/internal/option-internal.cpp:720
 #, c-format
 msgid "Invalid value %s for option %s; valid values are %s"
 msgstr ""
@@ -775,7 +864,7 @@ msgstr "Ogiltigt värde %f för alternativ %s; giltiga värden är %f - %f"
 msgid "Invalid value %d for option %s; valid values are %d - %d"
 msgstr "Ogiltigt värde %d för alternativet %s; giltiga värden är %d - %d"
 
-#: config/option.cpp:480 opts.cpp:621 opts.cpp:630 opts.cpp:639 opts.cpp:648
+#: config/option.cpp:480 opts.cpp:468 opts.cpp:477 opts.cpp:486 opts.cpp:495
 #, c-format
 msgid "Invalid value %s for option %s"
 msgstr ""
@@ -940,19 +1029,19 @@ msgstr "Meta+"
 msgid "Key"
 msgstr ""
 
-#: dialogs/accel-config.cpp:149
+#: dialogs/accel-config.cpp:148
 msgid "Menu commands"
 msgstr "Menykommandon"
 
-#: dialogs/accel-config.cpp:261
+#: dialogs/accel-config.cpp:259
 msgid "This will clear all user-defined accelerators. Are you sure?"
 msgstr ""
 
-#: dialogs/accel-config.cpp:261 dialogs/accel-config.cpp:298
+#: dialogs/accel-config.cpp:259 dialogs/accel-config.cpp:306
 msgid "Confirm"
 msgstr "Bekräfta"
 
-#: dialogs/accel-config.cpp:295
+#: dialogs/accel-config.cpp:304
 #, c-format
 msgid "This will unassign \"%s\" from \"%s\". Are you sure?"
 msgstr ""
@@ -1324,22 +1413,22 @@ msgstr "Gammalt värde"
 msgid "New Value"
 msgstr "Nytt värde"
 
-#: guiinit.cpp:2518
+#: guiinit.cpp:2519
 msgid "JoyBus host invalid; disabling"
 msgstr "JoyBus värd ogiltig; inaktiverar"
 
-#: opts.cpp:298
+#: opts.cpp:154
 msgid ""
 "The INI file was written for a more recent version of VBA-M. Some INI option"
 " values may have been reset."
 msgstr ""
 
-#: opts.cpp:480 opts.cpp:500 opts.cpp:685
+#: opts.cpp:339 opts.cpp:355 opts.cpp:522
 #, c-format
 msgid "Invalid key binding %s for %s"
 msgstr "Ogiltig tangentbindning %s för %s"
 
-#: opts.cpp:707
+#: opts.cpp:528
 #, c-format
 msgid "Unknown option %s with value %s"
 msgstr ""
@@ -1563,37 +1652,37 @@ msgstr "Uppspelning slutade"
 msgid "%d %% (%d, %d fps)"
 msgstr ""
 
-#: sys.cpp:899 xrc/GBPrinter.xrc:65
+#: sys.cpp:898 xrc/GBPrinter.xrc:65
 msgid "&Discard"
 msgstr "&Discard"
 
-#: sys.cpp:933
+#: sys.cpp:932
 msgid "Image files (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 msgstr "Bildfiler (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 
-#: sys.cpp:942
+#: sys.cpp:941
 msgid "Save printer image to"
 msgstr "Spara skrivarbild till"
 
-#: sys.cpp:956 sys.cpp:1140
+#: sys.cpp:955 sys.cpp:1139
 #, c-format
 msgid "Wrote printer output to %s"
 msgstr "Skrev skrivarutdata till %s"
 
-#: sys.cpp:961 sys.cpp:1032
+#: sys.cpp:960 sys.cpp:1031
 msgid "&Close"
 msgstr "&Stäng"
 
-#: sys.cpp:1027
+#: sys.cpp:1026
 msgid "Printed"
 msgstr "Tryckt"
 
-#: sys.cpp:1302
+#: sys.cpp:1301
 #, c-format
 msgid "Error opening pseudo tty: %s"
 msgstr "Fel vid öppnande av pseudo tty: %s"
 
-#: sys.cpp:1401
+#: sys.cpp:1400
 #, c-format
 msgid "Error setting up server socket (%d)"
 msgstr "Fel vid inrättande av server sockel (%d)"
@@ -1627,80 +1716,80 @@ msgstr ""
 msgid "Unable to load dialog %s from resources"
 msgstr "Kan inte läsa in dialog %s från resurser"
 
-#: wxvbam.cpp:398 wxvbam.cpp:415
+#: wxvbam.cpp:401 wxvbam.cpp:418
 #, c-format
 msgid "Invalid configuration file provided: %s"
 msgstr ""
 
-#: wxvbam.cpp:559
+#: wxvbam.cpp:558
 msgid "Could not create main window"
 msgstr "Kunde inte skapa huvudfönster"
 
-#: wxvbam.cpp:634
+#: wxvbam.cpp:633
 msgid "Save built-in XRC file and exit"
 msgstr "Spara inbyggd XRC-fil och avsluta"
 
-#: wxvbam.cpp:637
+#: wxvbam.cpp:636
 msgid "Save built-in vba-over.ini and exit"
 msgstr "Spara inbyggd vba-over.ini och avsluta"
 
-#: wxvbam.cpp:640
+#: wxvbam.cpp:639
 msgid "Print configuration path and exit"
 msgstr "Skriv ut konfigurationssökväg och avsluta"
 
-#: wxvbam.cpp:643
+#: wxvbam.cpp:642
 msgid "Start in full-screen mode"
 msgstr "Starta i helskärmsläge"
 
-#: wxvbam.cpp:646
+#: wxvbam.cpp:645
 msgid "Set a configuration file"
 msgstr "Välj en konfigurationsfil"
 
-#: wxvbam.cpp:650
+#: wxvbam.cpp:649
 msgid "Delete shared link state first, if it exists"
 msgstr "Radera delat länktillstånd först, om det existerar"
 
-#: wxvbam.cpp:657
+#: wxvbam.cpp:656
 msgid "List all settable options and exit"
 msgstr "Lista alla inställbara alternativ och avsluta"
 
-#: wxvbam.cpp:660
+#: wxvbam.cpp:659
 msgid "ROM file"
 msgstr "ROM-fil"
 
-#: wxvbam.cpp:662
+#: wxvbam.cpp:661
 msgid "<config>=<value>"
 msgstr "<config>=<value>"
 
-#: wxvbam.cpp:693
+#: wxvbam.cpp:692
 msgid "Configuration / build error: can't find built-in xrc"
 msgstr ""
 
-#: wxvbam.cpp:701
+#: wxvbam.cpp:700
 #, c-format
 msgid ""
 "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:"
 msgstr ""
 
-#: wxvbam.cpp:715
+#: wxvbam.cpp:714
 msgid "Configuration is read from, in order:"
 msgstr "Konfiguration läses från, i ordning:"
 
-#: wxvbam.cpp:729
+#: wxvbam.cpp:728
 #, c-format
 msgid ""
 "Wrote built-in override file to %s\n"
 "To override, delete all but changed section. First found section is used from search path:"
 msgstr ""
 
-#: wxvbam.cpp:735
+#: wxvbam.cpp:734
 msgid ""
 "\n"
 "\tbuilt-in"
 msgstr "\n⇥inbyggd"
 
-#: wxvbam.cpp:750
+#: wxvbam.cpp:749
 msgid ""
 "Options set from the command line are saved if any configuration changes are made in the user interface.\n"
 "\n"
@@ -1708,17 +1797,17 @@ msgid ""
 "\n"
 msgstr "Alternativen från kommandoraden sparas om några konfigurationsändringar görs i användargränssnittet.\n\nFör flaggalternativ, sant och falskt anges som 1 och 0, respektive.\n\n"
 
-#: wxvbam.cpp:758
+#: wxvbam.cpp:757
 msgid ""
 "The commands available for the Keyboard/* option are:\n"
 "\n"
 msgstr "De tillgängliga kommandona för Tangentbord/* alternativ är:\n\n"
 
-#: wxvbam.cpp:769
+#: wxvbam.cpp:768
 msgid "Configuration file not found."
 msgstr "Hittade inte konfigurationsfil"
 
-#: wxvbam.cpp:800
+#: wxvbam.cpp:799
 msgid "Bad configuration option or multiple ROM files given:\n"
 msgstr "Dåligt konfigurationsalternativ eller flera ROM-filer angivna:\n"
 
@@ -2230,10 +2319,6 @@ msgstr "Hoppa över bildruta"
 msgid "&Number of frames to skip:"
 msgstr ""
 
-#: xrc/DisplayConfig.xrc:200
-msgid "Speed"
-msgstr "Hastighet"
-
 #: xrc/DisplayConfig.xrc:216
 msgid "Speed indicator:"
 msgstr ""
@@ -2769,58 +2854,10 @@ msgid ""
 " entire contents if too small."
 msgstr ""
 
-#: xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
-msgid "Up"
-msgstr "Upp"
-
-#: xrc/JoyPanel.xrc:37
-msgid "A"
-msgstr "A"
-
-#: xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
-msgid "Down"
-msgstr "Ner"
-
-#: xrc/JoyPanel.xrc:83
-msgid "B"
-msgstr "B"
-
-#: xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
-msgid "Left"
-msgstr "Vänster"
-
-#: xrc/JoyPanel.xrc:129
-msgid "L"
-msgstr "L"
-
-#: xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
-msgid "Right"
-msgstr "Höger"
-
-#: xrc/JoyPanel.xrc:175
-msgid "R"
-msgstr "R"
-
-#: xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
-msgid "Select"
-msgstr "Välj"
-
-#: xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
-msgid "Start"
-msgstr "Start"
-
-#: xrc/JoyPanel.xrc:254
-msgid "Motion Up"
-msgstr "Rörelse upp"
-
 #: xrc/JoyPanel.xrc:276
 msgid "Autofire A"
 msgstr "Autoavfyrning A"
 
-#: xrc/JoyPanel.xrc:298
-msgid "Motion Down"
-msgstr "Rörelse ned"
-
 #: xrc/JoyPanel.xrc:320
 msgid "Autofire B"
 msgstr "Autoavfyrning B"
diff --git a/po/wxvbam/tr.po b/po/wxvbam/tr.po
index 96c0e794..189b5b8c 100644
--- a/po/wxvbam/tr.po
+++ b/po/wxvbam/tr.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VBA-M\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-23 22:00+0000\n"
+"POT-Creation-Date: 2024-04-24 02:00+0000\n"
 "PO-Revision-Date: 2011-12-03 19:42+0000\n"
 "Last-Translator: Sinan H., 2016,2018,2022,2024\n"
 "Language-Team: Turkish (http://app.transifex.com/bgk/vba-m/language/tr/)\n"
@@ -327,174 +327,263 @@ msgstr ""
 msgid "Network is not supported in local mode."
 msgstr "Yerel kipte ağ desteği yoktur."
 
-#: config/internal/option-internal.cpp:379
-msgid "Use bilinear filter with 3d renderer"
+#: config/command.cpp:28 xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
+msgid "Up"
+msgstr "Yukarı"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
+msgid "Down"
+msgstr "Aşağı"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
+msgid "Left"
+msgstr "Sol"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
+msgid "Right"
+msgstr "Sağ"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:37
+msgid "A"
+msgstr "A"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:83
+msgid "B"
+msgstr "B"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:129
+msgid "L"
+msgstr "L"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:175
+msgid "R"
+msgstr "R"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
+msgid "Select"
+msgstr "Seç"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
+msgid "Start"
+msgstr "Başlat"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:254
+msgid "Motion Up"
+msgstr "Üst Hareket"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:298
+msgid "Motion Down"
+msgstr "Alt Hareket"
+
+#: config/command.cpp:30
+msgid "Motion Left"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion Right"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion In"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Motion Out"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto A"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto B"
+msgstr ""
+
+#: config/command.cpp:31 xrc/DisplayConfig.xrc:200
+msgid "Speed"
+msgstr "Hız"
+
+#: config/command.cpp:31
+msgid "Capture"
+msgstr ""
+
+#: config/command.cpp:32
+msgid "GameShark"
+msgstr ""
+
+#: config/command.cpp:106
+#, c-format
+msgid "Joypad %zu %s"
 msgstr ""
 
 #: config/internal/option-internal.cpp:380
-msgid "Full-screen filter to apply"
+msgid "Use bilinear filter with 3d renderer"
 msgstr ""
 
 #: config/internal/option-internal.cpp:381
+msgid "Full-screen filter to apply"
+msgstr ""
+
+#: config/internal/option-internal.cpp:382
 msgid "Filter plugin library"
 msgstr "Filtre eklenti kütüphanesi"
 
-#: config/internal/option-internal.cpp:382
+#: config/internal/option-internal.cpp:383
 msgid "Interframe blending function"
 msgstr ""
 
-#: config/internal/option-internal.cpp:383
+#: config/internal/option-internal.cpp:384
 msgid "Keep window on top"
 msgstr ""
 
-#: config/internal/option-internal.cpp:385
+#: config/internal/option-internal.cpp:386
 msgid "Maximum number of threads to run filters in"
 msgstr ""
 
-#: config/internal/option-internal.cpp:387
+#: config/internal/option-internal.cpp:388
 msgid "Render method; if unsupported, simple method will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:388
+#: config/internal/option-internal.cpp:389
 msgid "Default scale factor"
 msgstr ""
 
-#: config/internal/option-internal.cpp:389
+#: config/internal/option-internal.cpp:390
 msgid "Retain aspect ratio when resizing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:392
+#: config/internal/option-internal.cpp:393
 msgid "BIOS file to use for Game Boy, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:393
+#: config/internal/option-internal.cpp:394
 msgid "Game Boy color enhancement, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:394
+#: config/internal/option-internal.cpp:395
 msgid "Enable DX Colorization Hacks"
 msgstr ""
 
-#: config/internal/option-internal.cpp:395
-#: config/internal/option-internal.cpp:419
+#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:420
 msgid "Apply LCD filter, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:397
 msgid "BIOS file to use for Game Boy Color, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:398
+#: config/internal/option-internal.cpp:399
 msgid ""
 "The default palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:401
+#: config/internal/option-internal.cpp:402
 msgid ""
 "The first user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:404
+#: config/internal/option-internal.cpp:405
 msgid ""
 "The second user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:407
+#: config/internal/option-internal.cpp:408
 msgid "Automatically gather a full page before printing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:409
+#: config/internal/option-internal.cpp:410
 msgid "Automatically save printouts as screen captures with -print suffix"
 msgstr ""
 
-#: config/internal/option-internal.cpp:411
-#: config/internal/option-internal.cpp:439
+#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:440
 msgid "Directory to look for ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:413
 msgid "Directory to look for Game Boy Color ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:415
+#: config/internal/option-internal.cpp:416
 msgid "BIOS file to use, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:425
+#: config/internal/option-internal.cpp:426
 msgid "Enable link at boot"
 msgstr ""
 
-#: config/internal/option-internal.cpp:430
+#: config/internal/option-internal.cpp:431
 msgid "Enable faster network protocol by default"
 msgstr ""
 
-#: config/internal/option-internal.cpp:432
+#: config/internal/option-internal.cpp:433
 msgid "Default network link client host"
 msgstr ""
 
-#: config/internal/option-internal.cpp:433
+#: config/internal/option-internal.cpp:434
 msgid "Default network link server IP to bind"
 msgstr ""
 
-#: config/internal/option-internal.cpp:434
+#: config/internal/option-internal.cpp:435
 msgid "Default network link port (server and client)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:435
+#: config/internal/option-internal.cpp:436
 msgid "Default network protocol"
 msgstr ""
 
-#: config/internal/option-internal.cpp:436
+#: config/internal/option-internal.cpp:437
 msgid "Link timeout (ms)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:437
+#: config/internal/option-internal.cpp:438
 msgid "Link cable type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:442
+#: config/internal/option-internal.cpp:443
 msgid "Automatically load last saved state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:444
+#: config/internal/option-internal.cpp:445
 msgid ""
 "Directory to store game save files (relative paths are relative to ROM; "
 "blank is config dir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:446
+#: config/internal/option-internal.cpp:447
 msgid "Freeze recent load list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:448
+#: config/internal/option-internal.cpp:449
 msgid ""
 "Directory to store A / V and game recordings (relative paths are relative to"
 " ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:451
+#: config/internal/option-internal.cpp:452
 msgid "Number of seconds between rewind snapshots (0 to disable)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:453
+#: config/internal/option-internal.cpp:454
 msgid "Directory to store screenshots (relative paths are relative to ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:456
+#: config/internal/option-internal.cpp:457
 msgid ""
 "Directory to store saved state files (relative paths are relative to "
 "BatteryDir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:458
+#: config/internal/option-internal.cpp:459
 msgid "Enable status bar"
 msgstr ""
 
-#: config/internal/option-internal.cpp:459
+#: config/internal/option-internal.cpp:460
 msgid "INI file version (DO NOT MODIFY)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:463
+#: config/internal/option-internal.cpp:464
 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, "
@@ -502,266 +591,266 @@ msgid ""
 "MotionRight, AutoA, AutoB, Speed, Capture, GS"
 msgstr ""
 
-#: config/internal/option-internal.cpp:468
+#: config/internal/option-internal.cpp:469
 msgid "The autofire toggle period, in frames (1/60 s)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:469
+#: config/internal/option-internal.cpp:470
 msgid "The number of the stick to use in single-player mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:471
+#: config/internal/option-internal.cpp:472
 msgid "Whether to enable SDL GameController mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:475
+#: config/internal/option-internal.cpp:476
 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 "
 "executed."
 msgstr ""
 
-#: config/internal/option-internal.cpp:480
+#: config/internal/option-internal.cpp:481
 msgid "Enable AGB debug print"
 msgstr ""
 
-#: config/internal/option-internal.cpp:481
+#: config/internal/option-internal.cpp:482
 msgid "Auto skip frames"
 msgstr ""
 
-#: config/internal/option-internal.cpp:483
+#: config/internal/option-internal.cpp:484
 msgid "Apply IPS / UPS / IPF patches if found"
 msgstr ""
 
-#: config/internal/option-internal.cpp:485
+#: config/internal/option-internal.cpp:486
 msgid "Automatically save and load cheat list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:489
+#: config/internal/option-internal.cpp:490
 msgid "Automatically enable border for Super Game Boy games"
 msgstr ""
 
-#: config/internal/option-internal.cpp:491
+#: config/internal/option-internal.cpp:492
 msgid "Always enable border"
 msgstr ""
 
-#: config/internal/option-internal.cpp:492
+#: config/internal/option-internal.cpp:493
 msgid "Screen capture file format"
 msgstr ""
 
-#: config/internal/option-internal.cpp:493
+#: config/internal/option-internal.cpp:494
 msgid "Enable cheats"
 msgstr ""
 
-#: config/internal/option-internal.cpp:494
+#: config/internal/option-internal.cpp:495
 msgid "Disable on-screen status messages"
 msgstr ""
 
-#: config/internal/option-internal.cpp:495
+#: config/internal/option-internal.cpp:496
 msgid "Type of system to emulate"
 msgstr ""
 
-#: config/internal/option-internal.cpp:496
+#: config/internal/option-internal.cpp:497
 msgid "Flash size 0 = 64 KB 1 = 128 KB"
 msgstr ""
 
-#: config/internal/option-internal.cpp:498
+#: config/internal/option-internal.cpp:499
 msgid "Skip frames. Values are 0-9 or -1 to skip automatically based on time."
 msgstr ""
 
-#: config/internal/option-internal.cpp:500
+#: config/internal/option-internal.cpp:501
 msgid "The palette to use"
 msgstr ""
 
-#: config/internal/option-internal.cpp:501
+#: config/internal/option-internal.cpp:502
 msgid "Enable printer emulation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:503
+#: config/internal/option-internal.cpp:504
 msgid "Break into GDB after loading the game."
 msgstr ""
 
-#: config/internal/option-internal.cpp:504
+#: config/internal/option-internal.cpp:505
 msgid "Port to connect GDB to"
 msgstr ""
 
-#: config/internal/option-internal.cpp:506
+#: config/internal/option-internal.cpp:507
 msgid "Number of players in network"
 msgstr ""
 
-#: config/internal/option-internal.cpp:508
+#: config/internal/option-internal.cpp:509
 msgid "Maximum scale factor (0 = no limit)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:510
+#: config/internal/option-internal.cpp:511
 msgid "Pause game when main window loses focus"
 msgstr ""
 
-#: config/internal/option-internal.cpp:512
+#: config/internal/option-internal.cpp:513
 msgid "Enable RTC (vba-over.ini override is rtcEnabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:513
+#: config/internal/option-internal.cpp:514
 msgid "Native save (\"battery\") hardware type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:514
+#: config/internal/option-internal.cpp:515
 msgid "Show speed indicator"
 msgstr ""
 
-#: config/internal/option-internal.cpp:516
+#: config/internal/option-internal.cpp:517
 msgid "Draw on-screen messages transparently"
 msgstr ""
 
-#: config/internal/option-internal.cpp:517
+#: config/internal/option-internal.cpp:518
 msgid "Skip BIOS initialization"
 msgstr ""
 
-#: config/internal/option-internal.cpp:519
+#: config/internal/option-internal.cpp:520
 msgid "Do not overwrite cheat list when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:521
+#: config/internal/option-internal.cpp:522
 msgid "Do not overwrite native (battery) save when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:523
+#: config/internal/option-internal.cpp:524
 msgid "Throttle game speed, even when accelerated (0-450 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:526
+#: config/internal/option-internal.cpp:527
 msgid "Set throttle for speedup key (0-3000 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:528
+#: config/internal/option-internal.cpp:529
 msgid "Number of frames to skip with speedup (instead of speedup throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:531
+#: config/internal/option-internal.cpp:532
 msgid "Use frame skip for speedup throttle"
 msgstr ""
 
-#: config/internal/option-internal.cpp:532
+#: config/internal/option-internal.cpp:533
 msgid "Use the specified BIOS file for Game Boy"
 msgstr ""
 
-#: config/internal/option-internal.cpp:533
+#: config/internal/option-internal.cpp:534
 msgid "Use the specified BIOS file"
 msgstr ""
 
-#: config/internal/option-internal.cpp:535
+#: config/internal/option-internal.cpp:536
 msgid "Use the specified BIOS file for Game Boy Color"
 msgstr ""
 
-#: config/internal/option-internal.cpp:536
+#: config/internal/option-internal.cpp:537
 msgid "Wait for vertical sync"
 msgstr ""
 
-#: config/internal/option-internal.cpp:539
+#: config/internal/option-internal.cpp:540
 msgid "Enter fullscreen mode at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:540
+#: config/internal/option-internal.cpp:541
 msgid "Window maximized"
 msgstr ""
 
-#: config/internal/option-internal.cpp:541
+#: config/internal/option-internal.cpp:542
 msgid "Window height at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:542
+#: config/internal/option-internal.cpp:543
 msgid "Window width at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:543
+#: config/internal/option-internal.cpp:544
 msgid "Window axis X position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:544
+#: config/internal/option-internal.cpp:545
 msgid "Window axis Y position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:548
+#: config/internal/option-internal.cpp:549
 msgid "Capture key events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:550
+#: config/internal/option-internal.cpp:551
 msgid "Capture joy events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:551
+#: config/internal/option-internal.cpp:552
 msgid "Hide menu bar when mouse is inactive"
 msgstr ""
 
-#: config/internal/option-internal.cpp:553
+#: config/internal/option-internal.cpp:554
 msgid "Suspend screensaver when game is running"
 msgstr ""
 
-#: config/internal/option-internal.cpp:556
+#: config/internal/option-internal.cpp:557
 msgid "Sound API; if unsupported, default API will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:557
+#: config/internal/option-internal.cpp:558
 msgid "Device ID of chosen audio device for chosen driver"
 msgstr ""
 
-#: config/internal/option-internal.cpp:558
+#: config/internal/option-internal.cpp:559
 msgid "Number of sound buffers"
 msgstr ""
 
-#: config/internal/option-internal.cpp:559
+#: config/internal/option-internal.cpp:560
 msgid "Bit mask of sound channels to enable"
 msgstr ""
 
-#: config/internal/option-internal.cpp:560
+#: config/internal/option-internal.cpp:561
 msgid "Game Boy Advance sound filtering (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:562
+#: config/internal/option-internal.cpp:563
 msgid "Game Boy Advance sound interpolation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:563
+#: config/internal/option-internal.cpp:564
 msgid "Game Boy sound declicking"
 msgstr ""
 
-#: config/internal/option-internal.cpp:564
+#: config/internal/option-internal.cpp:565
 msgid "Game Boy echo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:565
+#: config/internal/option-internal.cpp:566
 msgid "Enable Game Boy sound effects"
 msgstr ""
 
-#: config/internal/option-internal.cpp:566
+#: config/internal/option-internal.cpp:567
 msgid "Game Boy stereo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:567
+#: config/internal/option-internal.cpp:568
 msgid "Game Boy surround sound effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:568
+#: config/internal/option-internal.cpp:569
 msgid "Sound sample rate (kHz)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:569
+#: config/internal/option-internal.cpp:570
 msgid "Use DirectSound hardware acceleration"
 msgstr ""
 
-#: config/internal/option-internal.cpp:570
+#: config/internal/option-internal.cpp:571
 msgid "Upmix stereo to surround"
 msgstr ""
 
-#: config/internal/option-internal.cpp:571
+#: config/internal/option-internal.cpp:572
 msgid "Sound volume (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:639
-#: config/internal/option-internal.cpp:659
-#: config/internal/option-internal.cpp:680
-#: config/internal/option-internal.cpp:700
-#: config/internal/option-internal.cpp:719
+#: config/internal/option-internal.cpp:640
+#: config/internal/option-internal.cpp:660
+#: config/internal/option-internal.cpp:681
+#: config/internal/option-internal.cpp:701
+#: config/internal/option-internal.cpp:720
 #, c-format
 msgid "Invalid value %s for option %s; valid values are %s"
 msgstr ""
@@ -776,7 +865,7 @@ msgstr "Seçenek %siçin geçersiz değer %f; Geçerli değerler %f-%f"
 msgid "Invalid value %d for option %s; valid values are %d - %d"
 msgstr "seçenek %siçin geçersiz değer %d; Geçerli değerler %d-%d"
 
-#: config/option.cpp:480 opts.cpp:621 opts.cpp:630 opts.cpp:639 opts.cpp:648
+#: config/option.cpp:480 opts.cpp:468 opts.cpp:477 opts.cpp:486 opts.cpp:495
 #, c-format
 msgid "Invalid value %s for option %s"
 msgstr ""
@@ -941,19 +1030,19 @@ msgstr "Meta+"
 msgid "Key"
 msgstr ""
 
-#: dialogs/accel-config.cpp:149
+#: dialogs/accel-config.cpp:148
 msgid "Menu commands"
 msgstr "Menü komutları"
 
-#: dialogs/accel-config.cpp:261
+#: dialogs/accel-config.cpp:259
 msgid "This will clear all user-defined accelerators. Are you sure?"
 msgstr ""
 
-#: dialogs/accel-config.cpp:261 dialogs/accel-config.cpp:298
+#: dialogs/accel-config.cpp:259 dialogs/accel-config.cpp:306
 msgid "Confirm"
 msgstr "Onayla"
 
-#: dialogs/accel-config.cpp:295
+#: dialogs/accel-config.cpp:304
 #, c-format
 msgid "This will unassign \"%s\" from \"%s\". Are you sure?"
 msgstr ""
@@ -1325,22 +1414,22 @@ msgstr "Eski Değer"
 msgid "New Value"
 msgstr "Yeni Değer"
 
-#: guiinit.cpp:2518
+#: guiinit.cpp:2519
 msgid "JoyBus host invalid; disabling"
 msgstr "JoyBus sunucusu geçersiz; kapatılıyor"
 
-#: opts.cpp:298
+#: opts.cpp:154
 msgid ""
 "The INI file was written for a more recent version of VBA-M. Some INI option"
 " values may have been reset."
 msgstr ""
 
-#: opts.cpp:480 opts.cpp:500 opts.cpp:685
+#: opts.cpp:339 opts.cpp:355 opts.cpp:522
 #, c-format
 msgid "Invalid key binding %s for %s"
 msgstr "%siçin%sgeçersiz tuş bağlantısı"
 
-#: opts.cpp:707
+#: opts.cpp:528
 #, c-format
 msgid "Unknown option %s with value %s"
 msgstr ""
@@ -1564,37 +1653,37 @@ msgstr "Oynatma sona erdi"
 msgid "%d %% (%d, %d fps)"
 msgstr ""
 
-#: sys.cpp:899 xrc/GBPrinter.xrc:65
+#: sys.cpp:898 xrc/GBPrinter.xrc:65
 msgid "&Discard"
 msgstr "&Sil"
 
-#: sys.cpp:933
+#: sys.cpp:932
 msgid "Image files (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 msgstr "Resim uzantıları (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 
-#: sys.cpp:942
+#: sys.cpp:941
 msgid "Save printer image to"
 msgstr "Yazıcı resmini şuraya kaydet"
 
-#: sys.cpp:956 sys.cpp:1140
+#: sys.cpp:955 sys.cpp:1139
 #, c-format
 msgid "Wrote printer output to %s"
 msgstr "Yazıcı çıktısı şuraya kayıt edildi;%s"
 
-#: sys.cpp:961 sys.cpp:1032
+#: sys.cpp:960 sys.cpp:1031
 msgid "&Close"
 msgstr "&Kapat"
 
-#: sys.cpp:1027
+#: sys.cpp:1026
 msgid "Printed"
 msgstr "Çıktı alındı"
 
-#: sys.cpp:1302
+#: sys.cpp:1301
 #, c-format
 msgid "Error opening pseudo tty: %s"
 msgstr "sahte tty:%saçılırken hata oluştu"
 
-#: sys.cpp:1401
+#: sys.cpp:1400
 #, c-format
 msgid "Error setting up server socket (%d)"
 msgstr "Sunucu soketi hazırlanırken hata oluştu (%d)"
@@ -1628,80 +1717,80 @@ msgstr ""
 msgid "Unable to load dialog %s from resources"
 msgstr "Kaynaktan diyalog penceresi %s oluşturma başarısız"
 
-#: wxvbam.cpp:398 wxvbam.cpp:415
+#: wxvbam.cpp:401 wxvbam.cpp:418
 #, c-format
 msgid "Invalid configuration file provided: %s"
 msgstr "Geçersiz yapılandırma dosyası sağlandı: %s"
 
-#: wxvbam.cpp:559
+#: wxvbam.cpp:558
 msgid "Could not create main window"
 msgstr "Ana pencere yaratılamadı"
 
-#: wxvbam.cpp:634
+#: wxvbam.cpp:633
 msgid "Save built-in XRC file and exit"
 msgstr "Dahili XRC dosyasını kaydet ve çık"
 
-#: wxvbam.cpp:637
+#: wxvbam.cpp:636
 msgid "Save built-in vba-over.ini and exit"
 msgstr "Dahili vba-over.ini dosyasını kaydet ve çık"
 
-#: wxvbam.cpp:640
+#: wxvbam.cpp:639
 msgid "Print configuration path and exit"
 msgstr "Ayar yolunu yazdır ve çık"
 
-#: wxvbam.cpp:643
+#: wxvbam.cpp:642
 msgid "Start in full-screen mode"
 msgstr "Programı tam ekran kipinde başlat"
 
-#: wxvbam.cpp:646
+#: wxvbam.cpp:645
 msgid "Set a configuration file"
 msgstr "Ayar dosyası belirleyin"
 
-#: wxvbam.cpp:650
+#: wxvbam.cpp:649
 msgid "Delete shared link state first, if it exists"
 msgstr "Eğer varsa, öncelikle paylaşımlı bağlantı durumunu sil"
 
-#: wxvbam.cpp:657
+#: wxvbam.cpp:656
 msgid "List all settable options and exit"
 msgstr "Tüm ayarlanabilir ayar seçeneklerini listele ve çık"
 
-#: wxvbam.cpp:660
+#: wxvbam.cpp:659
 msgid "ROM file"
 msgstr "ROM dosyası"
 
-#: wxvbam.cpp:662
+#: wxvbam.cpp:661
 msgid "<config>=<value>"
 msgstr "<config>=<value>"
 
-#: wxvbam.cpp:693
+#: wxvbam.cpp:692
 msgid "Configuration / build error: can't find built-in xrc"
 msgstr "Yapılandırma / derleme hatası: dahili xrc bulunamıyor"
 
-#: wxvbam.cpp:701
+#: wxvbam.cpp:700
 #, c-format
 msgid ""
 "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:"
 msgstr "Dahili yapılandırmanın yazıldığı yer %s.\nGeçersiz kılmak için, değiştirilmiş kök düğüm(ler) hariç tümünü kaldırın. Mevcut .xrc ya da .xrs dosyaları içinde bulunan ilk doğru isimdeki kök düğüm, takip eden arama yolunda dahilinin üzerine yazar:"
 
-#: wxvbam.cpp:715
+#: wxvbam.cpp:714
 msgid "Configuration is read from, in order:"
 msgstr "Ayar şu sıra ile, şuradan okunur:"
 
-#: wxvbam.cpp:729
+#: wxvbam.cpp:728
 #, c-format
 msgid ""
 "Wrote built-in override file to %s\n"
 "To override, delete all but changed section. First found section is used from search path:"
 msgstr "Dahili geçersiz kılma dosyasının yazıldığı yer %s\nGeçersiz kılmak için, değiştirilmiş bölüm hariç tamamını silin. İlk bulunan bölüm, mevcut arama yolundan sağlandı:"
 
-#: wxvbam.cpp:735
+#: wxvbam.cpp:734
 msgid ""
 "\n"
 "\tbuilt-in"
 msgstr "\ndahili"
 
-#: wxvbam.cpp:750
+#: wxvbam.cpp:749
 msgid ""
 "Options set from the command line are saved if any configuration changes are made in the user interface.\n"
 "\n"
@@ -1709,17 +1798,17 @@ msgid ""
 "\n"
 msgstr "Komut ekranında yapılan ayarlar ancak arayüz içinde herhangi bir ayar değişikliği yapılırsa kayıt edilir.\n\nBayrak seçenekleri; 1=doğru , 0=yanlış şeklindedir\n\n"
 
-#: wxvbam.cpp:758
+#: wxvbam.cpp:757
 msgid ""
 "The commands available for the Keyboard/* option are:\n"
 "\n"
 msgstr "Klavye ile kullanılabilecek komutlar/* şunlar:\n"
 
-#: wxvbam.cpp:769
+#: wxvbam.cpp:768
 msgid "Configuration file not found."
 msgstr "Ayar dosyası bulunamadı."
 
-#: wxvbam.cpp:800
+#: wxvbam.cpp:799
 msgid "Bad configuration option or multiple ROM files given:\n"
 msgstr "Hatalı bir yapılandırma ayarı mevcut, ya da birden fazla ROM açılmaya çalışılıyor\n"
 
@@ -2231,10 +2320,6 @@ msgstr "Kare Atlama"
 msgid "&Number of frames to skip:"
 msgstr ""
 
-#: xrc/DisplayConfig.xrc:200
-msgid "Speed"
-msgstr "Hız"
-
 #: xrc/DisplayConfig.xrc:216
 msgid "Speed indicator:"
 msgstr ""
@@ -2770,58 +2855,10 @@ msgid ""
 " entire contents if too small."
 msgstr ""
 
-#: xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
-msgid "Up"
-msgstr "Yukarı"
-
-#: xrc/JoyPanel.xrc:37
-msgid "A"
-msgstr "A"
-
-#: xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
-msgid "Down"
-msgstr "Aşağı"
-
-#: xrc/JoyPanel.xrc:83
-msgid "B"
-msgstr "B"
-
-#: xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
-msgid "Left"
-msgstr "Sol"
-
-#: xrc/JoyPanel.xrc:129
-msgid "L"
-msgstr "L"
-
-#: xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
-msgid "Right"
-msgstr "Sağ"
-
-#: xrc/JoyPanel.xrc:175
-msgid "R"
-msgstr "R"
-
-#: xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
-msgid "Select"
-msgstr "Seç"
-
-#: xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
-msgid "Start"
-msgstr "Başlat"
-
-#: xrc/JoyPanel.xrc:254
-msgid "Motion Up"
-msgstr "Üst Hareket"
-
 #: xrc/JoyPanel.xrc:276
 msgid "Autofire A"
 msgstr "Oto. tıkla A"
 
-#: xrc/JoyPanel.xrc:298
-msgid "Motion Down"
-msgstr "Alt Hareket"
-
 #: xrc/JoyPanel.xrc:320
 msgid "Autofire B"
 msgstr "Oto. tıkla B"
diff --git a/po/wxvbam/uk.po b/po/wxvbam/uk.po
index a77e8eaf..507890d5 100644
--- a/po/wxvbam/uk.po
+++ b/po/wxvbam/uk.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VBA-M\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-23 22:00+0000\n"
+"POT-Creation-Date: 2024-04-24 02:00+0000\n"
 "PO-Revision-Date: 2011-12-03 19:42+0000\n"
 "Last-Translator: Svyatoslav <zarazafamila@gmail.com>, 2023\n"
 "Language-Team: Ukrainian (http://app.transifex.com/bgk/vba-m/language/uk/)\n"
@@ -320,174 +320,263 @@ msgstr "LAN-з'єднання активне. Вимкни режим з'єдн
 msgid "Network is not supported in local mode."
 msgstr "Мережа непідтримувана в локальному режимі."
 
-#: config/internal/option-internal.cpp:379
+#: config/command.cpp:28 xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
+msgid "Up"
+msgstr "↑"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
+msgid "Down"
+msgstr "↓"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
+msgid "Left"
+msgstr "←"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
+msgid "Right"
+msgstr "→"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:37
+msgid "A"
+msgstr "A"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:83
+msgid "B"
+msgstr "B"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:129
+msgid "L"
+msgstr "L"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:175
+msgid "R"
+msgstr "R"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
+msgid "Select"
+msgstr "Select"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
+msgid "Start"
+msgstr "Start"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:254
+msgid "Motion Up"
+msgstr "Рух ↑"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:298
+msgid "Motion Down"
+msgstr "Рух ↓"
+
+#: config/command.cpp:30
+msgid "Motion Left"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion Right"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion In"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Motion Out"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto A"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto B"
+msgstr ""
+
+#: config/command.cpp:31 xrc/DisplayConfig.xrc:200
+msgid "Speed"
+msgstr "Швидкість"
+
+#: config/command.cpp:31
+msgid "Capture"
+msgstr ""
+
+#: config/command.cpp:32
+msgid "GameShark"
+msgstr ""
+
+#: config/command.cpp:106
+#, c-format
+msgid "Joypad %zu %s"
+msgstr ""
+
+#: config/internal/option-internal.cpp:380
 msgid "Use bilinear filter with 3d renderer"
 msgstr "Використовувати білінійний фільтр із 3D-опрацьовувачем"
 
-#: config/internal/option-internal.cpp:380
+#: config/internal/option-internal.cpp:381
 msgid "Full-screen filter to apply"
 msgstr "Повноекранний фільтр для встановлення"
 
-#: config/internal/option-internal.cpp:381
+#: config/internal/option-internal.cpp:382
 msgid "Filter plugin library"
 msgstr "Бібліотека плаґінів фільтрів"
 
-#: config/internal/option-internal.cpp:382
+#: config/internal/option-internal.cpp:383
 msgid "Interframe blending function"
 msgstr "Функція міжкадрового змішування"
 
-#: config/internal/option-internal.cpp:383
+#: config/internal/option-internal.cpp:384
 msgid "Keep window on top"
 msgstr "Зберігати вікно над усіма вікнами"
 
-#: config/internal/option-internal.cpp:385
+#: config/internal/option-internal.cpp:386
 msgid "Maximum number of threads to run filters in"
 msgstr "Максимальна кількість потоків для запуску фільтрів"
 
-#: config/internal/option-internal.cpp:387
+#: config/internal/option-internal.cpp:388
 msgid "Render method; if unsupported, simple method will be used"
 msgstr "Спосіб опрацювання; при непідтримці буде використано простий спосіб"
 
-#: config/internal/option-internal.cpp:388
+#: config/internal/option-internal.cpp:389
 msgid "Default scale factor"
 msgstr "Типовий коефіцієнт масштабу"
 
-#: config/internal/option-internal.cpp:389
+#: config/internal/option-internal.cpp:390
 msgid "Retain aspect ratio when resizing"
 msgstr "Зберігати співвідношення сторін при зміні розміру"
 
-#: config/internal/option-internal.cpp:392
+#: config/internal/option-internal.cpp:393
 msgid "BIOS file to use for Game Boy, if enabled"
 msgstr "BIOS для використання Game Boy"
 
-#: config/internal/option-internal.cpp:393
+#: config/internal/option-internal.cpp:394
 msgid "Game Boy color enhancement, if enabled"
 msgstr "Посилення кольору Game Boy"
 
-#: config/internal/option-internal.cpp:394
+#: config/internal/option-internal.cpp:395
 msgid "Enable DX Colorization Hacks"
 msgstr "Увімкнути DX-хаки кольоризації"
 
-#: config/internal/option-internal.cpp:395
-#: config/internal/option-internal.cpp:419
+#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:420
 msgid "Apply LCD filter, if enabled"
 msgstr "Встановити LCD-фільтр"
 
-#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:397
 msgid "BIOS file to use for Game Boy Color, if enabled"
 msgstr "BIOS для використання Game Boy Color"
 
-#: config/internal/option-internal.cpp:398
+#: config/internal/option-internal.cpp:399
 msgid ""
 "The default palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr "Типова палітра, 8 розділених комами 4-значних шістнадцяткових цілих чисел (rgb555)."
 
-#: config/internal/option-internal.cpp:401
+#: config/internal/option-internal.cpp:402
 msgid ""
 "The first user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr "1-а палітра користувача, 8 розділених комами 4-значних шістнадцяткових цілих чисел (rgb555)."
 
-#: config/internal/option-internal.cpp:404
+#: config/internal/option-internal.cpp:405
 msgid ""
 "The second user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr "2-а палітра користувача, 8 розділених комами 4-значних шістнадцяткових цілих чисел (rgb555)."
 
-#: config/internal/option-internal.cpp:407
+#: config/internal/option-internal.cpp:408
 msgid "Automatically gather a full page before printing"
 msgstr "Автоматично збирати повну сторінку перед друком"
 
-#: config/internal/option-internal.cpp:409
+#: config/internal/option-internal.cpp:410
 msgid "Automatically save printouts as screen captures with -print suffix"
 msgstr "Автоматично зберігати роздруківки захопленнями екрана з суфіксом -print"
 
-#: config/internal/option-internal.cpp:411
-#: config/internal/option-internal.cpp:439
+#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:440
 msgid "Directory to look for ROM files"
 msgstr "Каталог пошуку ROM"
 
-#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:413
 msgid "Directory to look for Game Boy Color ROM files"
 msgstr "Каталог пошуку Game Boy Color ROM"
 
-#: config/internal/option-internal.cpp:415
+#: config/internal/option-internal.cpp:416
 msgid "BIOS file to use, if enabled"
 msgstr "BIOS для використання"
 
-#: config/internal/option-internal.cpp:425
+#: config/internal/option-internal.cpp:426
 msgid "Enable link at boot"
 msgstr "Увімкнути з'єднання при завантаженні"
 
-#: config/internal/option-internal.cpp:430
+#: config/internal/option-internal.cpp:431
 msgid "Enable faster network protocol by default"
 msgstr "Увімкнути швидший мережевий протокол типово"
 
-#: config/internal/option-internal.cpp:432
+#: config/internal/option-internal.cpp:433
 msgid "Default network link client host"
 msgstr "Типовий хост клієнта мережевого з'єднання"
 
-#: config/internal/option-internal.cpp:433
+#: config/internal/option-internal.cpp:434
 msgid "Default network link server IP to bind"
 msgstr "Типова IP-адреса сервера мережевого з'єднання для призначення"
 
-#: config/internal/option-internal.cpp:434
+#: config/internal/option-internal.cpp:435
 msgid "Default network link port (server and client)"
 msgstr "Типовий порт мережевого з'єднання (сервер і клієнт)"
 
-#: config/internal/option-internal.cpp:435
+#: config/internal/option-internal.cpp:436
 msgid "Default network protocol"
 msgstr "Типовий мережевий протокол"
 
-#: config/internal/option-internal.cpp:436
+#: config/internal/option-internal.cpp:437
 msgid "Link timeout (ms)"
 msgstr "Час очікування з'єднання (мсек)"
 
-#: config/internal/option-internal.cpp:437
+#: config/internal/option-internal.cpp:438
 msgid "Link cable type"
 msgstr "Тип кабелю з'єднання"
 
-#: config/internal/option-internal.cpp:442
+#: config/internal/option-internal.cpp:443
 msgid "Automatically load last saved state"
 msgstr "Автоматично завантажувати останній збережений стан"
 
-#: config/internal/option-internal.cpp:444
+#: config/internal/option-internal.cpp:445
 msgid ""
 "Directory to store game save files (relative paths are relative to ROM; "
 "blank is config dir)"
 msgstr "Каталог зберігання збережень гри (відносні шляхи до ROM; порожнє - каталог конфігурації)"
 
-#: config/internal/option-internal.cpp:446
+#: config/internal/option-internal.cpp:447
 msgid "Freeze recent load list"
 msgstr "Зупинити перелік останніх завантажень"
 
-#: config/internal/option-internal.cpp:448
+#: config/internal/option-internal.cpp:449
 msgid ""
 "Directory to store A / V and game recordings (relative paths are relative to"
 " ROM)"
 msgstr "Каталог зберігання аудіо / відео та записів ігор (відносні шляхи до ROM)"
 
-#: config/internal/option-internal.cpp:451
+#: config/internal/option-internal.cpp:452
 msgid "Number of seconds between rewind snapshots (0 to disable)"
 msgstr "Кількість секунд між перемотуванням знімків назад (0: вимкнути)"
 
-#: config/internal/option-internal.cpp:453
+#: config/internal/option-internal.cpp:454
 msgid "Directory to store screenshots (relative paths are relative to ROM)"
 msgstr "Каталог зберігання екранних кадрів (відносні шляхи до ROM)"
 
-#: config/internal/option-internal.cpp:456
+#: config/internal/option-internal.cpp:457
 msgid ""
 "Directory to store saved state files (relative paths are relative to "
 "BatteryDir)"
 msgstr "Каталог зберігання станів збереження (відносні шляхи до каталогу батареї)"
 
-#: config/internal/option-internal.cpp:458
+#: config/internal/option-internal.cpp:459
 msgid "Enable status bar"
 msgstr "Увімкнути панель стану"
 
-#: config/internal/option-internal.cpp:459
+#: config/internal/option-internal.cpp:460
 msgid "INI file version (DO NOT MODIFY)"
 msgstr "Версія INI (не змінювати)"
 
-#: config/internal/option-internal.cpp:463
+#: config/internal/option-internal.cpp:464
 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, "
@@ -495,266 +584,266 @@ msgid ""
 "MotionRight, AutoA, AutoB, Speed, Capture, GS"
 msgstr "Параметр Joypad/<n>/<button> містить розділений комами перелік імен кнопок, призначених для джойстика #<n> кнопка <button>. Кнопки: ↑, ↓, ←, →, A, B, L, R, Select, Start, Motion Up, Motion Down, Motion Left, Motion Right, Autofire A, Autofire B, Speed, Capture, Game Shark."
 
-#: config/internal/option-internal.cpp:468
+#: config/internal/option-internal.cpp:469
 msgid "The autofire toggle period, in frames (1/60 s)"
 msgstr "Період перемикання турбо в кадрах (1 / 60 сек)"
 
-#: config/internal/option-internal.cpp:469
+#: config/internal/option-internal.cpp:470
 msgid "The number of the stick to use in single-player mode"
 msgstr "Номер важеля для використання в одиничному режимі"
 
-#: config/internal/option-internal.cpp:471
+#: config/internal/option-internal.cpp:472
 msgid "Whether to enable SDL GameController mode"
 msgstr "Увімкнення режиму SDL Game Controller."
 
-#: config/internal/option-internal.cpp:475
+#: config/internal/option-internal.cpp:476
 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 "
 "executed."
 msgstr "Параметр Keyboard/<cmd> містить розділений комами перелік імен кнопок (наприклад, Alt + Shift + F1). При натисканні вказаної кнопки буде виконано команду <cmd>."
 
-#: config/internal/option-internal.cpp:480
+#: config/internal/option-internal.cpp:481
 msgid "Enable AGB debug print"
 msgstr "Увімкнути налагоджувальний AGB-друк"
 
-#: config/internal/option-internal.cpp:481
+#: config/internal/option-internal.cpp:482
 msgid "Auto skip frames"
 msgstr "Автопропуск кадрів"
 
-#: config/internal/option-internal.cpp:483
+#: config/internal/option-internal.cpp:484
 msgid "Apply IPS / UPS / IPF patches if found"
 msgstr "Встановити знайдені IPS / UPS / IPF-латки"
 
-#: config/internal/option-internal.cpp:485
+#: config/internal/option-internal.cpp:486
 msgid "Automatically save and load cheat list"
 msgstr "Автоматично зберігати та завантажувати перелік чітів"
 
-#: config/internal/option-internal.cpp:489
+#: config/internal/option-internal.cpp:490
 msgid "Automatically enable border for Super Game Boy games"
 msgstr "Автоматично вмикати межу для ігор Super Game Boy"
 
-#: config/internal/option-internal.cpp:491
+#: config/internal/option-internal.cpp:492
 msgid "Always enable border"
 msgstr "Завжди вмикати межу"
 
-#: config/internal/option-internal.cpp:492
+#: config/internal/option-internal.cpp:493
 msgid "Screen capture file format"
 msgstr "Формат файлу захоплення екрана"
 
-#: config/internal/option-internal.cpp:493
+#: config/internal/option-internal.cpp:494
 msgid "Enable cheats"
 msgstr "Увімкнути чіти"
 
-#: config/internal/option-internal.cpp:494
+#: config/internal/option-internal.cpp:495
 msgid "Disable on-screen status messages"
 msgstr "Вимкнути екранні повідомлення стану"
 
-#: config/internal/option-internal.cpp:495
+#: config/internal/option-internal.cpp:496
 msgid "Type of system to emulate"
 msgstr "Тип системи для емуляції"
 
-#: config/internal/option-internal.cpp:496
+#: config/internal/option-internal.cpp:497
 msgid "Flash size 0 = 64 KB 1 = 128 KB"
 msgstr "Флеш-розмір (0: 64 Кбайт; 1: 128 Кбайт)"
 
-#: config/internal/option-internal.cpp:498
+#: config/internal/option-internal.cpp:499
 msgid "Skip frames. Values are 0-9 or -1 to skip automatically based on time."
 msgstr "Пропуск кадрів. Значення 0-9 або -1 для автоматичного пропуску залежно від часу."
 
-#: config/internal/option-internal.cpp:500
+#: config/internal/option-internal.cpp:501
 msgid "The palette to use"
 msgstr "Палітра для використання"
 
-#: config/internal/option-internal.cpp:501
+#: config/internal/option-internal.cpp:502
 msgid "Enable printer emulation"
 msgstr "Увімкнути емуляцію принтера"
 
-#: config/internal/option-internal.cpp:503
+#: config/internal/option-internal.cpp:504
 msgid "Break into GDB after loading the game."
 msgstr "Переривання в GDB після завантаження гри."
 
-#: config/internal/option-internal.cpp:504
+#: config/internal/option-internal.cpp:505
 msgid "Port to connect GDB to"
 msgstr "Порт з'єднання GDB"
 
-#: config/internal/option-internal.cpp:506
+#: config/internal/option-internal.cpp:507
 msgid "Number of players in network"
 msgstr "Кількість гравців у мережі"
 
-#: config/internal/option-internal.cpp:508
+#: config/internal/option-internal.cpp:509
 msgid "Maximum scale factor (0 = no limit)"
 msgstr "Максимальний коефіцієнт масштабу (0: без обмежень)"
 
-#: config/internal/option-internal.cpp:510
+#: config/internal/option-internal.cpp:511
 msgid "Pause game when main window loses focus"
 msgstr "Призупинити гру при втраті виділення головного вікна"
 
-#: config/internal/option-internal.cpp:512
+#: config/internal/option-internal.cpp:513
 msgid "Enable RTC (vba-over.ini override is rtcEnabled"
 msgstr "Увімкнути RTC (vba-over.ini замінено rtcEnabled)"
 
-#: config/internal/option-internal.cpp:513
+#: config/internal/option-internal.cpp:514
 msgid "Native save (\"battery\") hardware type"
 msgstr "Тип апаратного забезпечення (\"батарея\") рідного збереження"
 
-#: config/internal/option-internal.cpp:514
+#: config/internal/option-internal.cpp:515
 msgid "Show speed indicator"
 msgstr "Показати вказівник швидкості"
 
-#: config/internal/option-internal.cpp:516
+#: config/internal/option-internal.cpp:517
 msgid "Draw on-screen messages transparently"
 msgstr "Показати прозорі екранні повідомлення"
 
-#: config/internal/option-internal.cpp:517
+#: config/internal/option-internal.cpp:518
 msgid "Skip BIOS initialization"
 msgstr "Пропустити визначення BIOS"
 
-#: config/internal/option-internal.cpp:519
+#: config/internal/option-internal.cpp:520
 msgid "Do not overwrite cheat list when loading state"
 msgstr "Не перезаписувати перелік чітів при завантаженні стану"
 
-#: config/internal/option-internal.cpp:521
+#: config/internal/option-internal.cpp:522
 msgid "Do not overwrite native (battery) save when loading state"
 msgstr "Не перезаписувати рідні збереження (батарея) при завантаженні стану"
 
-#: config/internal/option-internal.cpp:523
+#: config/internal/option-internal.cpp:524
 msgid "Throttle game speed, even when accelerated (0-450 %, 0 = no throttle)"
 msgstr "Прискорення швидкості гри (0-450 %, 0: без прискорення)"
 
-#: config/internal/option-internal.cpp:526
+#: config/internal/option-internal.cpp:527
 msgid "Set throttle for speedup key (0-3000 %, 0 = no throttle)"
 msgstr "Встановити прискорення для кнопки (0-3000 %, 0: без прискорення)"
 
-#: config/internal/option-internal.cpp:528
+#: config/internal/option-internal.cpp:529
 msgid "Number of frames to skip with speedup (instead of speedup throttle)"
 msgstr "Кількість кадрів для пропуску з прискоренням (замість прискорення)"
 
-#: config/internal/option-internal.cpp:531
+#: config/internal/option-internal.cpp:532
 msgid "Use frame skip for speedup throttle"
 msgstr "Використовувати пропуск кадрів для прискорення"
 
-#: config/internal/option-internal.cpp:532
+#: config/internal/option-internal.cpp:533
 msgid "Use the specified BIOS file for Game Boy"
 msgstr "Використовувати вказаний BIOS для Game Boy"
 
-#: config/internal/option-internal.cpp:533
+#: config/internal/option-internal.cpp:534
 msgid "Use the specified BIOS file"
 msgstr "Використовувати вказаний BIOS"
 
-#: config/internal/option-internal.cpp:535
+#: config/internal/option-internal.cpp:536
 msgid "Use the specified BIOS file for Game Boy Color"
 msgstr "Використовувати вказаний BIOS для Game Boy Color"
 
-#: config/internal/option-internal.cpp:536
+#: config/internal/option-internal.cpp:537
 msgid "Wait for vertical sync"
 msgstr "Чекати вертикальну синхронізацію"
 
-#: config/internal/option-internal.cpp:539
+#: config/internal/option-internal.cpp:540
 msgid "Enter fullscreen mode at startup"
 msgstr "Перейти до повного екрана при запуску"
 
-#: config/internal/option-internal.cpp:540
+#: config/internal/option-internal.cpp:541
 msgid "Window maximized"
 msgstr "Вікно розгорнуто"
 
-#: config/internal/option-internal.cpp:541
+#: config/internal/option-internal.cpp:542
 msgid "Window height at startup"
 msgstr "Висота вікна при запуску"
 
-#: config/internal/option-internal.cpp:542
+#: config/internal/option-internal.cpp:543
 msgid "Window width at startup"
 msgstr "Ширина вікна при запуску"
 
-#: config/internal/option-internal.cpp:543
+#: config/internal/option-internal.cpp:544
 msgid "Window axis X position at startup"
 msgstr "Положення осі X вікна при запуску"
 
-#: config/internal/option-internal.cpp:544
+#: config/internal/option-internal.cpp:545
 msgid "Window axis Y position at startup"
 msgstr "Положення осі Y вікна при запуску"
 
-#: config/internal/option-internal.cpp:548
+#: config/internal/option-internal.cpp:549
 msgid "Capture key events while on background"
 msgstr "Захоплювати ключові події на фоні"
 
-#: config/internal/option-internal.cpp:550
+#: config/internal/option-internal.cpp:551
 msgid "Capture joy events while on background"
 msgstr "Захоплювати радісні події на фоні"
 
-#: config/internal/option-internal.cpp:551
+#: config/internal/option-internal.cpp:552
 msgid "Hide menu bar when mouse is inactive"
 msgstr "Приховати панель меню при неактивній миші"
 
-#: config/internal/option-internal.cpp:553
+#: config/internal/option-internal.cpp:554
 msgid "Suspend screensaver when game is running"
 msgstr "Призупинити заставку при запущеній грі"
 
-#: config/internal/option-internal.cpp:556
+#: config/internal/option-internal.cpp:557
 msgid "Sound API; if unsupported, default API will be used"
 msgstr "Звуковий API; при непідтримці буде використано типовий API"
 
-#: config/internal/option-internal.cpp:557
+#: config/internal/option-internal.cpp:558
 msgid "Device ID of chosen audio device for chosen driver"
 msgstr "ID вибраного аудіопристрою для вибраного драйвера"
 
-#: config/internal/option-internal.cpp:558
+#: config/internal/option-internal.cpp:559
 msgid "Number of sound buffers"
 msgstr "Кількість звукових буферів"
 
-#: config/internal/option-internal.cpp:559
+#: config/internal/option-internal.cpp:560
 msgid "Bit mask of sound channels to enable"
 msgstr "Бітова маска звукових каналів для увімкнення"
 
-#: config/internal/option-internal.cpp:560
+#: config/internal/option-internal.cpp:561
 msgid "Game Boy Advance sound filtering (%)"
 msgstr "Фільтрація звуку Game Boy Advance (%)"
 
-#: config/internal/option-internal.cpp:562
+#: config/internal/option-internal.cpp:563
 msgid "Game Boy Advance sound interpolation"
 msgstr "Інтерполяція звуку Game Boy Advance"
 
-#: config/internal/option-internal.cpp:563
+#: config/internal/option-internal.cpp:564
 msgid "Game Boy sound declicking"
 msgstr "Без клацання звуку Game Boy"
 
-#: config/internal/option-internal.cpp:564
+#: config/internal/option-internal.cpp:565
 msgid "Game Boy echo effect (%)"
 msgstr "Луна Game Boy (%)"
 
-#: config/internal/option-internal.cpp:565
+#: config/internal/option-internal.cpp:566
 msgid "Enable Game Boy sound effects"
 msgstr "Увімкнути звукові ефекти Game Boy"
 
-#: config/internal/option-internal.cpp:566
+#: config/internal/option-internal.cpp:567
 msgid "Game Boy stereo effect (%)"
 msgstr "Стерео Game Boy (%)"
 
-#: config/internal/option-internal.cpp:567
+#: config/internal/option-internal.cpp:568
 msgid "Game Boy surround sound effect (%)"
 msgstr "Об'ємний звук Game Boy (%)"
 
-#: config/internal/option-internal.cpp:568
+#: config/internal/option-internal.cpp:569
 msgid "Sound sample rate (kHz)"
 msgstr "Частота дискретизації аудіо (кГц)"
 
-#: config/internal/option-internal.cpp:569
+#: config/internal/option-internal.cpp:570
 msgid "Use DirectSound hardware acceleration"
 msgstr "Використовувати апаратне прискорення Direct Sound"
 
-#: config/internal/option-internal.cpp:570
+#: config/internal/option-internal.cpp:571
 msgid "Upmix stereo to surround"
 msgstr "Зводити стерео для об'ємного звуку"
 
-#: config/internal/option-internal.cpp:571
+#: config/internal/option-internal.cpp:572
 msgid "Sound volume (%)"
 msgstr "Гучність звуку (%)"
 
-#: config/internal/option-internal.cpp:639
-#: config/internal/option-internal.cpp:659
-#: config/internal/option-internal.cpp:680
-#: config/internal/option-internal.cpp:700
-#: config/internal/option-internal.cpp:719
+#: config/internal/option-internal.cpp:640
+#: config/internal/option-internal.cpp:660
+#: config/internal/option-internal.cpp:681
+#: config/internal/option-internal.cpp:701
+#: config/internal/option-internal.cpp:720
 #, c-format
 msgid "Invalid value %s for option %s; valid values are %s"
 msgstr "Недійсне значення %s для опції %s; дійсні значення: %s."
@@ -769,7 +858,7 @@ msgstr "Недійсне значення %f для опції %s; дійсні
 msgid "Invalid value %d for option %s; valid values are %d - %d"
 msgstr "Недійсне значення %d для опції %s; дійсні значення: %d - %d."
 
-#: config/option.cpp:480 opts.cpp:621 opts.cpp:630 opts.cpp:639 opts.cpp:648
+#: config/option.cpp:480 opts.cpp:468 opts.cpp:477 opts.cpp:486 opts.cpp:495
 #, c-format
 msgid "Invalid value %s for option %s"
 msgstr "Недійсне значення %s для опції %s."
@@ -934,19 +1023,19 @@ msgstr "Meta+"
 msgid "Key"
 msgstr ""
 
-#: dialogs/accel-config.cpp:149
+#: dialogs/accel-config.cpp:148
 msgid "Menu commands"
 msgstr "Команди меню"
 
-#: dialogs/accel-config.cpp:261
+#: dialogs/accel-config.cpp:259
 msgid "This will clear all user-defined accelerators. Are you sure?"
 msgstr "Очистити всі користувацькі гарячі кнопки?"
 
-#: dialogs/accel-config.cpp:261 dialogs/accel-config.cpp:298
+#: dialogs/accel-config.cpp:259 dialogs/accel-config.cpp:306
 msgid "Confirm"
 msgstr "Підтвердити"
 
-#: dialogs/accel-config.cpp:295
+#: dialogs/accel-config.cpp:304
 #, c-format
 msgid "This will unassign \"%s\" from \"%s\". Are you sure?"
 msgstr "Скасувати призначення \"%s\" з \"%s\"?"
@@ -1318,22 +1407,22 @@ msgstr "Старе значення"
 msgid "New Value"
 msgstr "Нове значення"
 
-#: guiinit.cpp:2518
+#: guiinit.cpp:2519
 msgid "JoyBus host invalid; disabling"
 msgstr "Вимкнено недійсний хост Joy Bus."
 
-#: opts.cpp:298
+#: opts.cpp:154
 msgid ""
 "The INI file was written for a more recent version of VBA-M. Some INI option"
 " values may have been reset."
 msgstr "INI записано для новішої версії Visual Boy Advance-M. Можливе відновлення деяких значень INI-опцій."
 
-#: opts.cpp:480 opts.cpp:500 opts.cpp:685
+#: opts.cpp:339 opts.cpp:355 opts.cpp:522
 #, c-format
 msgid "Invalid key binding %s for %s"
 msgstr "Недійсна призначена кнопка %s для %s."
 
-#: opts.cpp:707
+#: opts.cpp:528
 #, c-format
 msgid "Unknown option %s with value %s"
 msgstr "Невідома опція %s зі значенням %s."
@@ -1557,37 +1646,37 @@ msgstr "Відтворення завершено."
 msgid "%d %% (%d, %d fps)"
 msgstr "%d %% (%d, %d Гц)"
 
-#: sys.cpp:899 xrc/GBPrinter.xrc:65
+#: sys.cpp:898 xrc/GBPrinter.xrc:65
 msgid "&Discard"
 msgstr "&Скасувати"
 
-#: sys.cpp:933
+#: sys.cpp:932
 msgid "Image files (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 msgstr "Зображення|*.bmp;*.jpg;*.png|"
 
-#: sys.cpp:942
+#: sys.cpp:941
 msgid "Save printer image to"
 msgstr "Зберегти зображення принтера до"
 
-#: sys.cpp:956 sys.cpp:1140
+#: sys.cpp:955 sys.cpp:1139
 #, c-format
 msgid "Wrote printer output to %s"
 msgstr "Записано кінцеві дані принтера до %s."
 
-#: sys.cpp:961 sys.cpp:1032
+#: sys.cpp:960 sys.cpp:1031
 msgid "&Close"
 msgstr "&Закрити"
 
-#: sys.cpp:1027
+#: sys.cpp:1026
 msgid "Printed"
 msgstr "Роздруковано."
 
-#: sys.cpp:1302
+#: sys.cpp:1301
 #, c-format
 msgid "Error opening pseudo tty: %s"
 msgstr "Помилка відкриття псевдо-tty: %s."
 
-#: sys.cpp:1401
+#: sys.cpp:1400
 #, c-format
 msgid "Error setting up server socket (%d)"
 msgstr "Помилка налаштування серверного сокета (%d)."
@@ -1621,80 +1710,80 @@ msgstr "Синій:"
 msgid "Unable to load dialog %s from resources"
 msgstr "Неможливо завантажити вікно %s з ресурсів."
 
-#: wxvbam.cpp:398 wxvbam.cpp:415
+#: wxvbam.cpp:401 wxvbam.cpp:418
 #, c-format
 msgid "Invalid configuration file provided: %s"
 msgstr "Надано недійсний файл конфігурації: %s."
 
-#: wxvbam.cpp:559
+#: wxvbam.cpp:558
 msgid "Could not create main window"
 msgstr "Неможливо створити головне вікно."
 
-#: wxvbam.cpp:634
+#: wxvbam.cpp:633
 msgid "Save built-in XRC file and exit"
 msgstr "Зберегти вбудований XRC та вийти"
 
-#: wxvbam.cpp:637
+#: wxvbam.cpp:636
 msgid "Save built-in vba-over.ini and exit"
 msgstr "Зберегти вбудований vba-over.ini та вийти"
 
-#: wxvbam.cpp:640
+#: wxvbam.cpp:639
 msgid "Print configuration path and exit"
 msgstr "Роздрукувати шлях конфігурації та вийти"
 
-#: wxvbam.cpp:643
+#: wxvbam.cpp:642
 msgid "Start in full-screen mode"
 msgstr "Запускати в повному екрані"
 
-#: wxvbam.cpp:646
+#: wxvbam.cpp:645
 msgid "Set a configuration file"
 msgstr "Встановити файл конфігурації"
 
-#: wxvbam.cpp:650
+#: wxvbam.cpp:649
 msgid "Delete shared link state first, if it exists"
 msgstr "Видалити спочатку стан загального з'єднання за наявності"
 
-#: wxvbam.cpp:657
+#: wxvbam.cpp:656
 msgid "List all settable options and exit"
 msgstr "Показати всі налаштовувані опції та вийти"
 
-#: wxvbam.cpp:660
+#: wxvbam.cpp:659
 msgid "ROM file"
 msgstr "ROM-файл"
 
-#: wxvbam.cpp:662
+#: wxvbam.cpp:661
 msgid "<config>=<value>"
 msgstr "<config>=<value>"
 
-#: wxvbam.cpp:693
+#: wxvbam.cpp:692
 msgid "Configuration / build error: can't find built-in xrc"
 msgstr "Помилка конфігурації / випуску: неможливо знайти вбудований xrc."
 
-#: wxvbam.cpp:701
+#: wxvbam.cpp:700
 #, c-format
 msgid ""
 "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:"
 msgstr "Записано вбудовану конфігурацію до %s.\nДля перевизначення вилучи всі вузли, крім змінених кореневих. Перший знайдений кореневий вузол із правильним іменем у будь-якому файлі .xrc чи .xrs у наведених шляхах пошуку перевизначає вбудований:"
 
-#: wxvbam.cpp:715
+#: wxvbam.cpp:714
 msgid "Configuration is read from, in order:"
 msgstr "Конфігурацію прочитано з файлів за порядком:"
 
-#: wxvbam.cpp:729
+#: wxvbam.cpp:728
 #, c-format
 msgid ""
 "Wrote built-in override file to %s\n"
 "To override, delete all but changed section. First found section is used from search path:"
 msgstr "Записано вбудоване перевизначення файлу до %s.\nДля перевизначення видали всі розділи, крім змінених. Перший знайдений розділ буде використано зі шляху пошуку:"
 
-#: wxvbam.cpp:735
+#: wxvbam.cpp:734
 msgid ""
 "\n"
 "\tbuilt-in"
 msgstr "\n\tвбудовано"
 
-#: wxvbam.cpp:750
+#: wxvbam.cpp:749
 msgid ""
 "Options set from the command line are saved if any configuration changes are made in the user interface.\n"
 "\n"
@@ -1702,17 +1791,17 @@ msgid ""
 "\n"
 msgstr "Опції, встановлені з командного рядка, буде збережено при зміні конфігурації інтерфейсу користувача.\n\nДля позначення значення \"істина\" та \"хиба\" вказуються як 1 і 0 відповідно.\n\n"
 
-#: wxvbam.cpp:758
+#: wxvbam.cpp:757
 msgid ""
 "The commands available for the Keyboard/* option are:\n"
 "\n"
 msgstr "Доступні команди для опцій клавіатури:\n"
 
-#: wxvbam.cpp:769
+#: wxvbam.cpp:768
 msgid "Configuration file not found."
 msgstr "Файл конфігурації не знайдено."
 
-#: wxvbam.cpp:800
+#: wxvbam.cpp:799
 msgid "Bad configuration option or multiple ROM files given:\n"
 msgstr "Неправильна опція конфігурації чи вибрано декілька ROM'ів:\n"
 
@@ -2224,10 +2313,6 @@ msgstr "Пропуск кадрів"
 msgid "&Number of frames to skip:"
 msgstr "&Кількість кадрів для пропуску:"
 
-#: xrc/DisplayConfig.xrc:200
-msgid "Speed"
-msgstr "Швидкість"
-
 #: xrc/DisplayConfig.xrc:216
 msgid "Speed indicator:"
 msgstr "Указівник швидкості:"
@@ -2763,58 +2848,10 @@ msgid ""
 " entire contents if too small."
 msgstr "Натисни поле та кнопку чи перемісти джойстик для додання. Натисни Backspace для видалення останньої доданої кнопки. Зміни розмір вікна чи натисни всередині та перемісти вказівник для показу замалого вмісту."
 
-#: xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
-msgid "Up"
-msgstr "↑"
-
-#: xrc/JoyPanel.xrc:37
-msgid "A"
-msgstr "A"
-
-#: xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
-msgid "Down"
-msgstr "↓"
-
-#: xrc/JoyPanel.xrc:83
-msgid "B"
-msgstr "B"
-
-#: xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
-msgid "Left"
-msgstr "←"
-
-#: xrc/JoyPanel.xrc:129
-msgid "L"
-msgstr "L"
-
-#: xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
-msgid "Right"
-msgstr "→"
-
-#: xrc/JoyPanel.xrc:175
-msgid "R"
-msgstr "R"
-
-#: xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
-msgid "Select"
-msgstr "Select"
-
-#: xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
-msgid "Start"
-msgstr "Start"
-
-#: xrc/JoyPanel.xrc:254
-msgid "Motion Up"
-msgstr "Рух ↑"
-
 #: xrc/JoyPanel.xrc:276
 msgid "Autofire A"
 msgstr "A-Turbo"
 
-#: xrc/JoyPanel.xrc:298
-msgid "Motion Down"
-msgstr "Рух ↓"
-
 #: xrc/JoyPanel.xrc:320
 msgid "Autofire B"
 msgstr "B-Turbo"
diff --git a/po/wxvbam/ur_PK.po b/po/wxvbam/ur_PK.po
index acda9edb..fb7673bf 100644
--- a/po/wxvbam/ur_PK.po
+++ b/po/wxvbam/ur_PK.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VBA-M\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-23 22:00+0000\n"
+"POT-Creation-Date: 2024-04-24 02:00+0000\n"
 "PO-Revision-Date: 2011-12-03 19:42+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Urdu (Pakistan) (http://app.transifex.com/bgk/vba-m/language/ur_PK/)\n"
@@ -318,174 +318,263 @@ msgstr ""
 msgid "Network is not supported in local mode."
 msgstr ""
 
-#: config/internal/option-internal.cpp:379
-msgid "Use bilinear filter with 3d renderer"
+#: config/command.cpp:28 xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
+msgid "Up"
+msgstr ""
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
+msgid "Down"
+msgstr ""
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
+msgid "Left"
+msgstr ""
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
+msgid "Right"
+msgstr ""
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:37
+msgid "A"
+msgstr ""
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:83
+msgid "B"
+msgstr ""
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:129
+msgid "L"
+msgstr ""
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:175
+msgid "R"
+msgstr ""
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
+msgid "Select"
+msgstr ""
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
+msgid "Start"
+msgstr ""
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:254
+msgid "Motion Up"
+msgstr ""
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:298
+msgid "Motion Down"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion Left"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion Right"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion In"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Motion Out"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto A"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto B"
+msgstr ""
+
+#: config/command.cpp:31 xrc/DisplayConfig.xrc:200
+msgid "Speed"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Capture"
+msgstr ""
+
+#: config/command.cpp:32
+msgid "GameShark"
+msgstr ""
+
+#: config/command.cpp:106
+#, c-format
+msgid "Joypad %zu %s"
 msgstr ""
 
 #: config/internal/option-internal.cpp:380
-msgid "Full-screen filter to apply"
+msgid "Use bilinear filter with 3d renderer"
 msgstr ""
 
 #: config/internal/option-internal.cpp:381
-msgid "Filter plugin library"
+msgid "Full-screen filter to apply"
 msgstr ""
 
 #: config/internal/option-internal.cpp:382
-msgid "Interframe blending function"
+msgid "Filter plugin library"
 msgstr ""
 
 #: config/internal/option-internal.cpp:383
+msgid "Interframe blending function"
+msgstr ""
+
+#: config/internal/option-internal.cpp:384
 msgid "Keep window on top"
 msgstr ""
 
-#: config/internal/option-internal.cpp:385
+#: config/internal/option-internal.cpp:386
 msgid "Maximum number of threads to run filters in"
 msgstr ""
 
-#: config/internal/option-internal.cpp:387
+#: config/internal/option-internal.cpp:388
 msgid "Render method; if unsupported, simple method will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:388
+#: config/internal/option-internal.cpp:389
 msgid "Default scale factor"
 msgstr ""
 
-#: config/internal/option-internal.cpp:389
+#: config/internal/option-internal.cpp:390
 msgid "Retain aspect ratio when resizing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:392
+#: config/internal/option-internal.cpp:393
 msgid "BIOS file to use for Game Boy, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:393
+#: config/internal/option-internal.cpp:394
 msgid "Game Boy color enhancement, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:394
+#: config/internal/option-internal.cpp:395
 msgid "Enable DX Colorization Hacks"
 msgstr ""
 
-#: config/internal/option-internal.cpp:395
-#: config/internal/option-internal.cpp:419
+#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:420
 msgid "Apply LCD filter, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:397
 msgid "BIOS file to use for Game Boy Color, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:398
+#: config/internal/option-internal.cpp:399
 msgid ""
 "The default palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:401
+#: config/internal/option-internal.cpp:402
 msgid ""
 "The first user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:404
+#: config/internal/option-internal.cpp:405
 msgid ""
 "The second user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr ""
 
-#: config/internal/option-internal.cpp:407
+#: config/internal/option-internal.cpp:408
 msgid "Automatically gather a full page before printing"
 msgstr ""
 
-#: config/internal/option-internal.cpp:409
+#: config/internal/option-internal.cpp:410
 msgid "Automatically save printouts as screen captures with -print suffix"
 msgstr ""
 
-#: config/internal/option-internal.cpp:411
-#: config/internal/option-internal.cpp:439
+#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:440
 msgid "Directory to look for ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:413
 msgid "Directory to look for Game Boy Color ROM files"
 msgstr ""
 
-#: config/internal/option-internal.cpp:415
+#: config/internal/option-internal.cpp:416
 msgid "BIOS file to use, if enabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:425
+#: config/internal/option-internal.cpp:426
 msgid "Enable link at boot"
 msgstr ""
 
-#: config/internal/option-internal.cpp:430
+#: config/internal/option-internal.cpp:431
 msgid "Enable faster network protocol by default"
 msgstr ""
 
-#: config/internal/option-internal.cpp:432
+#: config/internal/option-internal.cpp:433
 msgid "Default network link client host"
 msgstr ""
 
-#: config/internal/option-internal.cpp:433
+#: config/internal/option-internal.cpp:434
 msgid "Default network link server IP to bind"
 msgstr ""
 
-#: config/internal/option-internal.cpp:434
+#: config/internal/option-internal.cpp:435
 msgid "Default network link port (server and client)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:435
+#: config/internal/option-internal.cpp:436
 msgid "Default network protocol"
 msgstr ""
 
-#: config/internal/option-internal.cpp:436
+#: config/internal/option-internal.cpp:437
 msgid "Link timeout (ms)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:437
+#: config/internal/option-internal.cpp:438
 msgid "Link cable type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:442
+#: config/internal/option-internal.cpp:443
 msgid "Automatically load last saved state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:444
+#: config/internal/option-internal.cpp:445
 msgid ""
 "Directory to store game save files (relative paths are relative to ROM; "
 "blank is config dir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:446
+#: config/internal/option-internal.cpp:447
 msgid "Freeze recent load list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:448
+#: config/internal/option-internal.cpp:449
 msgid ""
 "Directory to store A / V and game recordings (relative paths are relative to"
 " ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:451
+#: config/internal/option-internal.cpp:452
 msgid "Number of seconds between rewind snapshots (0 to disable)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:453
+#: config/internal/option-internal.cpp:454
 msgid "Directory to store screenshots (relative paths are relative to ROM)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:456
+#: config/internal/option-internal.cpp:457
 msgid ""
 "Directory to store saved state files (relative paths are relative to "
 "BatteryDir)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:458
+#: config/internal/option-internal.cpp:459
 msgid "Enable status bar"
 msgstr ""
 
-#: config/internal/option-internal.cpp:459
+#: config/internal/option-internal.cpp:460
 msgid "INI file version (DO NOT MODIFY)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:463
+#: config/internal/option-internal.cpp:464
 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, "
@@ -493,266 +582,266 @@ msgid ""
 "MotionRight, AutoA, AutoB, Speed, Capture, GS"
 msgstr ""
 
-#: config/internal/option-internal.cpp:468
+#: config/internal/option-internal.cpp:469
 msgid "The autofire toggle period, in frames (1/60 s)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:469
+#: config/internal/option-internal.cpp:470
 msgid "The number of the stick to use in single-player mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:471
+#: config/internal/option-internal.cpp:472
 msgid "Whether to enable SDL GameController mode"
 msgstr ""
 
-#: config/internal/option-internal.cpp:475
+#: config/internal/option-internal.cpp:476
 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 "
 "executed."
 msgstr ""
 
-#: config/internal/option-internal.cpp:480
+#: config/internal/option-internal.cpp:481
 msgid "Enable AGB debug print"
 msgstr ""
 
-#: config/internal/option-internal.cpp:481
+#: config/internal/option-internal.cpp:482
 msgid "Auto skip frames"
 msgstr ""
 
-#: config/internal/option-internal.cpp:483
+#: config/internal/option-internal.cpp:484
 msgid "Apply IPS / UPS / IPF patches if found"
 msgstr ""
 
-#: config/internal/option-internal.cpp:485
+#: config/internal/option-internal.cpp:486
 msgid "Automatically save and load cheat list"
 msgstr ""
 
-#: config/internal/option-internal.cpp:489
+#: config/internal/option-internal.cpp:490
 msgid "Automatically enable border for Super Game Boy games"
 msgstr ""
 
-#: config/internal/option-internal.cpp:491
+#: config/internal/option-internal.cpp:492
 msgid "Always enable border"
 msgstr ""
 
-#: config/internal/option-internal.cpp:492
+#: config/internal/option-internal.cpp:493
 msgid "Screen capture file format"
 msgstr ""
 
-#: config/internal/option-internal.cpp:493
+#: config/internal/option-internal.cpp:494
 msgid "Enable cheats"
 msgstr ""
 
-#: config/internal/option-internal.cpp:494
+#: config/internal/option-internal.cpp:495
 msgid "Disable on-screen status messages"
 msgstr ""
 
-#: config/internal/option-internal.cpp:495
+#: config/internal/option-internal.cpp:496
 msgid "Type of system to emulate"
 msgstr ""
 
-#: config/internal/option-internal.cpp:496
+#: config/internal/option-internal.cpp:497
 msgid "Flash size 0 = 64 KB 1 = 128 KB"
 msgstr ""
 
-#: config/internal/option-internal.cpp:498
+#: config/internal/option-internal.cpp:499
 msgid "Skip frames. Values are 0-9 or -1 to skip automatically based on time."
 msgstr ""
 
-#: config/internal/option-internal.cpp:500
+#: config/internal/option-internal.cpp:501
 msgid "The palette to use"
 msgstr ""
 
-#: config/internal/option-internal.cpp:501
+#: config/internal/option-internal.cpp:502
 msgid "Enable printer emulation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:503
+#: config/internal/option-internal.cpp:504
 msgid "Break into GDB after loading the game."
 msgstr ""
 
-#: config/internal/option-internal.cpp:504
+#: config/internal/option-internal.cpp:505
 msgid "Port to connect GDB to"
 msgstr ""
 
-#: config/internal/option-internal.cpp:506
+#: config/internal/option-internal.cpp:507
 msgid "Number of players in network"
 msgstr ""
 
-#: config/internal/option-internal.cpp:508
+#: config/internal/option-internal.cpp:509
 msgid "Maximum scale factor (0 = no limit)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:510
+#: config/internal/option-internal.cpp:511
 msgid "Pause game when main window loses focus"
 msgstr ""
 
-#: config/internal/option-internal.cpp:512
+#: config/internal/option-internal.cpp:513
 msgid "Enable RTC (vba-over.ini override is rtcEnabled"
 msgstr ""
 
-#: config/internal/option-internal.cpp:513
+#: config/internal/option-internal.cpp:514
 msgid "Native save (\"battery\") hardware type"
 msgstr ""
 
-#: config/internal/option-internal.cpp:514
+#: config/internal/option-internal.cpp:515
 msgid "Show speed indicator"
 msgstr ""
 
-#: config/internal/option-internal.cpp:516
+#: config/internal/option-internal.cpp:517
 msgid "Draw on-screen messages transparently"
 msgstr ""
 
-#: config/internal/option-internal.cpp:517
+#: config/internal/option-internal.cpp:518
 msgid "Skip BIOS initialization"
 msgstr ""
 
-#: config/internal/option-internal.cpp:519
+#: config/internal/option-internal.cpp:520
 msgid "Do not overwrite cheat list when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:521
+#: config/internal/option-internal.cpp:522
 msgid "Do not overwrite native (battery) save when loading state"
 msgstr ""
 
-#: config/internal/option-internal.cpp:523
+#: config/internal/option-internal.cpp:524
 msgid "Throttle game speed, even when accelerated (0-450 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:526
+#: config/internal/option-internal.cpp:527
 msgid "Set throttle for speedup key (0-3000 %, 0 = no throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:528
+#: config/internal/option-internal.cpp:529
 msgid "Number of frames to skip with speedup (instead of speedup throttle)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:531
+#: config/internal/option-internal.cpp:532
 msgid "Use frame skip for speedup throttle"
 msgstr ""
 
-#: config/internal/option-internal.cpp:532
+#: config/internal/option-internal.cpp:533
 msgid "Use the specified BIOS file for Game Boy"
 msgstr ""
 
-#: config/internal/option-internal.cpp:533
+#: config/internal/option-internal.cpp:534
 msgid "Use the specified BIOS file"
 msgstr ""
 
-#: config/internal/option-internal.cpp:535
+#: config/internal/option-internal.cpp:536
 msgid "Use the specified BIOS file for Game Boy Color"
 msgstr ""
 
-#: config/internal/option-internal.cpp:536
+#: config/internal/option-internal.cpp:537
 msgid "Wait for vertical sync"
 msgstr ""
 
-#: config/internal/option-internal.cpp:539
+#: config/internal/option-internal.cpp:540
 msgid "Enter fullscreen mode at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:540
+#: config/internal/option-internal.cpp:541
 msgid "Window maximized"
 msgstr ""
 
-#: config/internal/option-internal.cpp:541
+#: config/internal/option-internal.cpp:542
 msgid "Window height at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:542
+#: config/internal/option-internal.cpp:543
 msgid "Window width at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:543
+#: config/internal/option-internal.cpp:544
 msgid "Window axis X position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:544
+#: config/internal/option-internal.cpp:545
 msgid "Window axis Y position at startup"
 msgstr ""
 
-#: config/internal/option-internal.cpp:548
+#: config/internal/option-internal.cpp:549
 msgid "Capture key events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:550
+#: config/internal/option-internal.cpp:551
 msgid "Capture joy events while on background"
 msgstr ""
 
-#: config/internal/option-internal.cpp:551
+#: config/internal/option-internal.cpp:552
 msgid "Hide menu bar when mouse is inactive"
 msgstr ""
 
-#: config/internal/option-internal.cpp:553
+#: config/internal/option-internal.cpp:554
 msgid "Suspend screensaver when game is running"
 msgstr ""
 
-#: config/internal/option-internal.cpp:556
+#: config/internal/option-internal.cpp:557
 msgid "Sound API; if unsupported, default API will be used"
 msgstr ""
 
-#: config/internal/option-internal.cpp:557
+#: config/internal/option-internal.cpp:558
 msgid "Device ID of chosen audio device for chosen driver"
 msgstr ""
 
-#: config/internal/option-internal.cpp:558
+#: config/internal/option-internal.cpp:559
 msgid "Number of sound buffers"
 msgstr ""
 
-#: config/internal/option-internal.cpp:559
+#: config/internal/option-internal.cpp:560
 msgid "Bit mask of sound channels to enable"
 msgstr ""
 
-#: config/internal/option-internal.cpp:560
+#: config/internal/option-internal.cpp:561
 msgid "Game Boy Advance sound filtering (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:562
+#: config/internal/option-internal.cpp:563
 msgid "Game Boy Advance sound interpolation"
 msgstr ""
 
-#: config/internal/option-internal.cpp:563
+#: config/internal/option-internal.cpp:564
 msgid "Game Boy sound declicking"
 msgstr ""
 
-#: config/internal/option-internal.cpp:564
+#: config/internal/option-internal.cpp:565
 msgid "Game Boy echo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:565
+#: config/internal/option-internal.cpp:566
 msgid "Enable Game Boy sound effects"
 msgstr ""
 
-#: config/internal/option-internal.cpp:566
+#: config/internal/option-internal.cpp:567
 msgid "Game Boy stereo effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:567
+#: config/internal/option-internal.cpp:568
 msgid "Game Boy surround sound effect (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:568
+#: config/internal/option-internal.cpp:569
 msgid "Sound sample rate (kHz)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:569
+#: config/internal/option-internal.cpp:570
 msgid "Use DirectSound hardware acceleration"
 msgstr ""
 
-#: config/internal/option-internal.cpp:570
+#: config/internal/option-internal.cpp:571
 msgid "Upmix stereo to surround"
 msgstr ""
 
-#: config/internal/option-internal.cpp:571
+#: config/internal/option-internal.cpp:572
 msgid "Sound volume (%)"
 msgstr ""
 
-#: config/internal/option-internal.cpp:639
-#: config/internal/option-internal.cpp:659
-#: config/internal/option-internal.cpp:680
-#: config/internal/option-internal.cpp:700
-#: config/internal/option-internal.cpp:719
+#: config/internal/option-internal.cpp:640
+#: config/internal/option-internal.cpp:660
+#: config/internal/option-internal.cpp:681
+#: config/internal/option-internal.cpp:701
+#: config/internal/option-internal.cpp:720
 #, c-format
 msgid "Invalid value %s for option %s; valid values are %s"
 msgstr ""
@@ -767,7 +856,7 @@ msgstr ""
 msgid "Invalid value %d for option %s; valid values are %d - %d"
 msgstr ""
 
-#: config/option.cpp:480 opts.cpp:621 opts.cpp:630 opts.cpp:639 opts.cpp:648
+#: config/option.cpp:480 opts.cpp:468 opts.cpp:477 opts.cpp:486 opts.cpp:495
 #, c-format
 msgid "Invalid value %s for option %s"
 msgstr ""
@@ -932,19 +1021,19 @@ msgstr ""
 msgid "Key"
 msgstr ""
 
-#: dialogs/accel-config.cpp:149
+#: dialogs/accel-config.cpp:148
 msgid "Menu commands"
 msgstr ""
 
-#: dialogs/accel-config.cpp:261
+#: dialogs/accel-config.cpp:259
 msgid "This will clear all user-defined accelerators. Are you sure?"
 msgstr ""
 
-#: dialogs/accel-config.cpp:261 dialogs/accel-config.cpp:298
+#: dialogs/accel-config.cpp:259 dialogs/accel-config.cpp:306
 msgid "Confirm"
 msgstr ""
 
-#: dialogs/accel-config.cpp:295
+#: dialogs/accel-config.cpp:304
 #, c-format
 msgid "This will unassign \"%s\" from \"%s\". Are you sure?"
 msgstr ""
@@ -1316,22 +1405,22 @@ msgstr ""
 msgid "New Value"
 msgstr ""
 
-#: guiinit.cpp:2518
+#: guiinit.cpp:2519
 msgid "JoyBus host invalid; disabling"
 msgstr ""
 
-#: opts.cpp:298
+#: opts.cpp:154
 msgid ""
 "The INI file was written for a more recent version of VBA-M. Some INI option"
 " values may have been reset."
 msgstr ""
 
-#: opts.cpp:480 opts.cpp:500 opts.cpp:685
+#: opts.cpp:339 opts.cpp:355 opts.cpp:522
 #, c-format
 msgid "Invalid key binding %s for %s"
 msgstr ""
 
-#: opts.cpp:707
+#: opts.cpp:528
 #, c-format
 msgid "Unknown option %s with value %s"
 msgstr ""
@@ -1555,37 +1644,37 @@ msgstr ""
 msgid "%d %% (%d, %d fps)"
 msgstr ""
 
-#: sys.cpp:899 xrc/GBPrinter.xrc:65
+#: sys.cpp:898 xrc/GBPrinter.xrc:65
 msgid "&Discard"
 msgstr ""
 
-#: sys.cpp:933
+#: sys.cpp:932
 msgid "Image files (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 msgstr ""
 
-#: sys.cpp:942
+#: sys.cpp:941
 msgid "Save printer image to"
 msgstr ""
 
-#: sys.cpp:956 sys.cpp:1140
+#: sys.cpp:955 sys.cpp:1139
 #, c-format
 msgid "Wrote printer output to %s"
 msgstr ""
 
-#: sys.cpp:961 sys.cpp:1032
+#: sys.cpp:960 sys.cpp:1031
 msgid "&Close"
 msgstr ""
 
-#: sys.cpp:1027
+#: sys.cpp:1026
 msgid "Printed"
 msgstr ""
 
-#: sys.cpp:1302
+#: sys.cpp:1301
 #, c-format
 msgid "Error opening pseudo tty: %s"
 msgstr ""
 
-#: sys.cpp:1401
+#: sys.cpp:1400
 #, c-format
 msgid "Error setting up server socket (%d)"
 msgstr ""
@@ -1619,80 +1708,80 @@ msgstr ""
 msgid "Unable to load dialog %s from resources"
 msgstr ""
 
-#: wxvbam.cpp:398 wxvbam.cpp:415
+#: wxvbam.cpp:401 wxvbam.cpp:418
 #, c-format
 msgid "Invalid configuration file provided: %s"
 msgstr ""
 
-#: wxvbam.cpp:559
+#: wxvbam.cpp:558
 msgid "Could not create main window"
 msgstr ""
 
-#: wxvbam.cpp:634
+#: wxvbam.cpp:633
 msgid "Save built-in XRC file and exit"
 msgstr ""
 
-#: wxvbam.cpp:637
+#: wxvbam.cpp:636
 msgid "Save built-in vba-over.ini and exit"
 msgstr ""
 
-#: wxvbam.cpp:640
+#: wxvbam.cpp:639
 msgid "Print configuration path and exit"
 msgstr ""
 
-#: wxvbam.cpp:643
+#: wxvbam.cpp:642
 msgid "Start in full-screen mode"
 msgstr ""
 
-#: wxvbam.cpp:646
+#: wxvbam.cpp:645
 msgid "Set a configuration file"
 msgstr ""
 
-#: wxvbam.cpp:650
+#: wxvbam.cpp:649
 msgid "Delete shared link state first, if it exists"
 msgstr ""
 
-#: wxvbam.cpp:657
+#: wxvbam.cpp:656
 msgid "List all settable options and exit"
 msgstr ""
 
-#: wxvbam.cpp:660
+#: wxvbam.cpp:659
 msgid "ROM file"
 msgstr ""
 
-#: wxvbam.cpp:662
+#: wxvbam.cpp:661
 msgid "<config>=<value>"
 msgstr ""
 
-#: wxvbam.cpp:693
+#: wxvbam.cpp:692
 msgid "Configuration / build error: can't find built-in xrc"
 msgstr ""
 
-#: wxvbam.cpp:701
+#: wxvbam.cpp:700
 #, c-format
 msgid ""
 "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:"
 msgstr ""
 
-#: wxvbam.cpp:715
+#: wxvbam.cpp:714
 msgid "Configuration is read from, in order:"
 msgstr ""
 
-#: wxvbam.cpp:729
+#: wxvbam.cpp:728
 #, c-format
 msgid ""
 "Wrote built-in override file to %s\n"
 "To override, delete all but changed section. First found section is used from search path:"
 msgstr ""
 
-#: wxvbam.cpp:735
+#: wxvbam.cpp:734
 msgid ""
 "\n"
 "\tbuilt-in"
 msgstr ""
 
-#: wxvbam.cpp:750
+#: wxvbam.cpp:749
 msgid ""
 "Options set from the command line are saved if any configuration changes are made in the user interface.\n"
 "\n"
@@ -1700,17 +1789,17 @@ msgid ""
 "\n"
 msgstr ""
 
-#: wxvbam.cpp:758
+#: wxvbam.cpp:757
 msgid ""
 "The commands available for the Keyboard/* option are:\n"
 "\n"
 msgstr ""
 
-#: wxvbam.cpp:769
+#: wxvbam.cpp:768
 msgid "Configuration file not found."
 msgstr ""
 
-#: wxvbam.cpp:800
+#: wxvbam.cpp:799
 msgid "Bad configuration option or multiple ROM files given:\n"
 msgstr ""
 
@@ -2222,10 +2311,6 @@ msgstr ""
 msgid "&Number of frames to skip:"
 msgstr ""
 
-#: xrc/DisplayConfig.xrc:200
-msgid "Speed"
-msgstr ""
-
 #: xrc/DisplayConfig.xrc:216
 msgid "Speed indicator:"
 msgstr ""
@@ -2761,58 +2846,10 @@ msgid ""
 " entire contents if too small."
 msgstr ""
 
-#: xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
-msgid "Up"
-msgstr ""
-
-#: xrc/JoyPanel.xrc:37
-msgid "A"
-msgstr ""
-
-#: xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
-msgid "Down"
-msgstr ""
-
-#: xrc/JoyPanel.xrc:83
-msgid "B"
-msgstr ""
-
-#: xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
-msgid "Left"
-msgstr ""
-
-#: xrc/JoyPanel.xrc:129
-msgid "L"
-msgstr ""
-
-#: xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
-msgid "Right"
-msgstr ""
-
-#: xrc/JoyPanel.xrc:175
-msgid "R"
-msgstr ""
-
-#: xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
-msgid "Select"
-msgstr ""
-
-#: xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
-msgid "Start"
-msgstr ""
-
-#: xrc/JoyPanel.xrc:254
-msgid "Motion Up"
-msgstr ""
-
 #: xrc/JoyPanel.xrc:276
 msgid "Autofire A"
 msgstr ""
 
-#: xrc/JoyPanel.xrc:298
-msgid "Motion Down"
-msgstr ""
-
 #: xrc/JoyPanel.xrc:320
 msgid "Autofire B"
 msgstr ""
diff --git a/po/wxvbam/zh-Hans.po b/po/wxvbam/zh-Hans.po
index 59e15240..3da3ac36 100644
--- a/po/wxvbam/zh-Hans.po
+++ b/po/wxvbam/zh-Hans.po
@@ -20,7 +20,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VBA-M\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-23 22:00+0000\n"
+"POT-Creation-Date: 2024-04-24 02:00+0000\n"
 "PO-Revision-Date: 2011-12-03 19:42+0000\n"
 "Last-Translator: 天绝星 <c.cejhb@gmail.com>, 2016-2017,2019-2020,2022-2024\n"
 "Language-Team: Chinese Simplified (http://app.transifex.com/bgk/vba-m/language/zh-Hans/)\n"
@@ -331,174 +331,263 @@ msgstr "局域网联机已激活，禁用联机模式即可断开联网。"
 msgid "Network is not supported in local mode."
 msgstr "本地模式不支持网络"
 
-#: config/internal/option-internal.cpp:379
+#: config/command.cpp:28 xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
+msgid "Up"
+msgstr "上"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
+msgid "Down"
+msgstr "下"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
+msgid "Left"
+msgstr "左"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
+msgid "Right"
+msgstr "右"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:37
+msgid "A"
+msgstr "A"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:83
+msgid "B"
+msgstr "B"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:129
+msgid "L"
+msgstr "L"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:175
+msgid "R"
+msgstr "R"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
+msgid "Select"
+msgstr "选择"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
+msgid "Start"
+msgstr "开始"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:254
+msgid "Motion Up"
+msgstr "体感 上"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:298
+msgid "Motion Down"
+msgstr "体感 下"
+
+#: config/command.cpp:30
+msgid "Motion Left"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion Right"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion In"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Motion Out"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto A"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto B"
+msgstr ""
+
+#: config/command.cpp:31 xrc/DisplayConfig.xrc:200
+msgid "Speed"
+msgstr "速度"
+
+#: config/command.cpp:31
+msgid "Capture"
+msgstr ""
+
+#: config/command.cpp:32
+msgid "GameShark"
+msgstr ""
+
+#: config/command.cpp:106
+#, c-format
+msgid "Joypad %zu %s"
+msgstr ""
+
+#: config/internal/option-internal.cpp:380
 msgid "Use bilinear filter with 3d renderer"
 msgstr "在 3D 渲染器中使用双线过滤 "
 
-#: config/internal/option-internal.cpp:380
+#: config/internal/option-internal.cpp:381
 msgid "Full-screen filter to apply"
 msgstr "要应用的全屏滤镜"
 
-#: config/internal/option-internal.cpp:381
+#: config/internal/option-internal.cpp:382
 msgid "Filter plugin library"
 msgstr "滤镜插件库"
 
-#: config/internal/option-internal.cpp:382
+#: config/internal/option-internal.cpp:383
 msgid "Interframe blending function"
 msgstr "帧间混合功能"
 
-#: config/internal/option-internal.cpp:383
+#: config/internal/option-internal.cpp:384
 msgid "Keep window on top"
 msgstr "保持窗口在最前"
 
-#: config/internal/option-internal.cpp:385
+#: config/internal/option-internal.cpp:386
 msgid "Maximum number of threads to run filters in"
 msgstr "运行滤镜的最大线程数"
 
-#: config/internal/option-internal.cpp:387
+#: config/internal/option-internal.cpp:388
 msgid "Render method; if unsupported, simple method will be used"
 msgstr "渲染方式；如果不支持，则使用简单方式"
 
-#: config/internal/option-internal.cpp:388
+#: config/internal/option-internal.cpp:389
 msgid "Default scale factor"
 msgstr "默认缩放系数"
 
-#: config/internal/option-internal.cpp:389
+#: config/internal/option-internal.cpp:390
 msgid "Retain aspect ratio when resizing"
 msgstr "调整大小时保持长宽比"
 
-#: config/internal/option-internal.cpp:392
+#: config/internal/option-internal.cpp:393
 msgid "BIOS file to use for Game Boy, if enabled"
 msgstr "用于 GB 的 BIOS 文件（如果启用）"
 
-#: config/internal/option-internal.cpp:393
+#: config/internal/option-internal.cpp:394
 msgid "Game Boy color enhancement, if enabled"
 msgstr "GB 色彩增强（如果启用）"
 
-#: config/internal/option-internal.cpp:394
+#: config/internal/option-internal.cpp:395
 msgid "Enable DX Colorization Hacks"
 msgstr "启用 DX 色彩修改"
 
-#: config/internal/option-internal.cpp:395
-#: config/internal/option-internal.cpp:419
+#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:420
 msgid "Apply LCD filter, if enabled"
 msgstr "应用 LCD 滤镜（如果启用）"
 
-#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:397
 msgid "BIOS file to use for Game Boy Color, if enabled"
 msgstr "用于 GBC 的 BIOS 文件（如果启用）"
 
-#: config/internal/option-internal.cpp:398
+#: config/internal/option-internal.cpp:399
 msgid ""
 "The default palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr "默认调色板，8 个逗号分隔的 4 位十六进制整数 (rgb555)。"
 
-#: config/internal/option-internal.cpp:401
+#: config/internal/option-internal.cpp:402
 msgid ""
 "The first user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr "第一用户调色板，8 个逗号分隔的 4 位十六进制整数 (rgb555)。"
 
-#: config/internal/option-internal.cpp:404
+#: config/internal/option-internal.cpp:405
 msgid ""
 "The second user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr "第二用户调色板，8 个逗号分隔的 4 位十六进制整数 (rgb555)。"
 
-#: config/internal/option-internal.cpp:407
+#: config/internal/option-internal.cpp:408
 msgid "Automatically gather a full page before printing"
 msgstr "打印前自动聚集整个页面"
 
-#: config/internal/option-internal.cpp:409
+#: config/internal/option-internal.cpp:410
 msgid "Automatically save printouts as screen captures with -print suffix"
 msgstr "使用 -print 后缀自动将打印输出保存为屏幕截图"
 
-#: config/internal/option-internal.cpp:411
-#: config/internal/option-internal.cpp:439
+#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:440
 msgid "Directory to look for ROM files"
 msgstr "要查找 ROM 文件的目录"
 
-#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:413
 msgid "Directory to look for Game Boy Color ROM files"
 msgstr "要查找 GBC ROM 文件的目录"
 
-#: config/internal/option-internal.cpp:415
+#: config/internal/option-internal.cpp:416
 msgid "BIOS file to use, if enabled"
 msgstr "要使用的 BIOS 文件（如果启用）"
 
-#: config/internal/option-internal.cpp:425
+#: config/internal/option-internal.cpp:426
 msgid "Enable link at boot"
 msgstr "在启动时启用联机"
 
-#: config/internal/option-internal.cpp:430
+#: config/internal/option-internal.cpp:431
 msgid "Enable faster network protocol by default"
 msgstr "默认启用更快的网络协议"
 
-#: config/internal/option-internal.cpp:432
+#: config/internal/option-internal.cpp:433
 msgid "Default network link client host"
 msgstr "默认网络联机客户端主机"
 
-#: config/internal/option-internal.cpp:433
+#: config/internal/option-internal.cpp:434
 msgid "Default network link server IP to bind"
 msgstr "要绑定的默认网络联机服务器 IP"
 
-#: config/internal/option-internal.cpp:434
+#: config/internal/option-internal.cpp:435
 msgid "Default network link port (server and client)"
 msgstr "默认网络联机端口（服务器和客户端）"
 
-#: config/internal/option-internal.cpp:435
+#: config/internal/option-internal.cpp:436
 msgid "Default network protocol"
 msgstr "默认网络协议"
 
-#: config/internal/option-internal.cpp:436
+#: config/internal/option-internal.cpp:437
 msgid "Link timeout (ms)"
 msgstr "联机超时（毫秒）"
 
-#: config/internal/option-internal.cpp:437
+#: config/internal/option-internal.cpp:438
 msgid "Link cable type"
 msgstr "联机线缆类型"
 
-#: config/internal/option-internal.cpp:442
+#: config/internal/option-internal.cpp:443
 msgid "Automatically load last saved state"
 msgstr "自动加载上次保存的状态"
 
-#: config/internal/option-internal.cpp:444
+#: config/internal/option-internal.cpp:445
 msgid ""
 "Directory to store game save files (relative paths are relative to ROM; "
 "blank is config dir)"
 msgstr "存放游戏存档文件的目录（相对路径是相对于 ROM；空白是配置目录）"
 
-#: config/internal/option-internal.cpp:446
+#: config/internal/option-internal.cpp:447
 msgid "Freeze recent load list"
 msgstr "冻结最近的加载列表"
 
-#: config/internal/option-internal.cpp:448
+#: config/internal/option-internal.cpp:449
 msgid ""
 "Directory to store A / V and game recordings (relative paths are relative to"
 " ROM)"
 msgstr "存储 A/V 和游戏录像的目录（相对路径是相对于 ROM）"
 
-#: config/internal/option-internal.cpp:451
+#: config/internal/option-internal.cpp:452
 msgid "Number of seconds between rewind snapshots (0 to disable)"
 msgstr "倒带快照之间的秒数（0 表示禁用）"
 
-#: config/internal/option-internal.cpp:453
+#: config/internal/option-internal.cpp:454
 msgid "Directory to store screenshots (relative paths are relative to ROM)"
 msgstr "存放截图的目录（相对路径是相对于 ROM）"
 
-#: config/internal/option-internal.cpp:456
+#: config/internal/option-internal.cpp:457
 msgid ""
 "Directory to store saved state files (relative paths are relative to "
 "BatteryDir)"
 msgstr "存储保存状态文件的目录（相对路径是相对于 BatteryDir）"
 
-#: config/internal/option-internal.cpp:458
+#: config/internal/option-internal.cpp:459
 msgid "Enable status bar"
 msgstr "启用状态栏"
 
-#: config/internal/option-internal.cpp:459
+#: config/internal/option-internal.cpp:460
 msgid "INI file version (DO NOT MODIFY)"
 msgstr "INI 文件版本 (请勿修改)"
 
-#: config/internal/option-internal.cpp:463
+#: config/internal/option-internal.cpp:464
 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, "
@@ -506,266 +595,266 @@ msgid ""
 "MotionRight, AutoA, AutoB, Speed, Capture, GS"
 msgstr "参数 手柄/<n>/<button> 包含一个逗号分隔的键名列表，这些键名映射到 手柄 #<n> 按键 <button>。 按键是 上、下、左、右、A、B、L、R、Select、Start、体感上、体感下、体感左、体感右、连发A、连发B、加速、截图、GS 中某一个"
 
-#: config/internal/option-internal.cpp:468
+#: config/internal/option-internal.cpp:469
 msgid "The autofire toggle period, in frames (1/60 s)"
 msgstr "连发切换周期，以帧为单位（1/60 秒）"
 
-#: config/internal/option-internal.cpp:469
+#: config/internal/option-internal.cpp:470
 msgid "The number of the stick to use in single-player mode"
 msgstr "在单人模式中使用的摇杆数量"
 
-#: config/internal/option-internal.cpp:471
+#: config/internal/option-internal.cpp:472
 msgid "Whether to enable SDL GameController mode"
 msgstr "选择是否启用 SDL 游戏控制器模式"
 
-#: config/internal/option-internal.cpp:475
+#: config/internal/option-internal.cpp:476
 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 "
 "executed."
 msgstr "参数 键盘/<cmd> 包含一个以逗号分隔的键名列表（例如 Alt-Shift-F1）。 当按下指定的键时，命令 <cmd> 被执行。"
 
-#: config/internal/option-internal.cpp:480
+#: config/internal/option-internal.cpp:481
 msgid "Enable AGB debug print"
 msgstr "启用 AGB 调试打印"
 
-#: config/internal/option-internal.cpp:481
+#: config/internal/option-internal.cpp:482
 msgid "Auto skip frames"
 msgstr "自动跳帧"
 
-#: config/internal/option-internal.cpp:483
+#: config/internal/option-internal.cpp:484
 msgid "Apply IPS / UPS / IPF patches if found"
 msgstr "如发现 IPS/UPS/IPF 补丁即应用"
 
-#: config/internal/option-internal.cpp:485
+#: config/internal/option-internal.cpp:486
 msgid "Automatically save and load cheat list"
 msgstr "自动保存和加载金手指列表"
 
-#: config/internal/option-internal.cpp:489
+#: config/internal/option-internal.cpp:490
 msgid "Automatically enable border for Super Game Boy games"
 msgstr "对 Super GameBoy 游戏自动启用边框"
 
-#: config/internal/option-internal.cpp:491
+#: config/internal/option-internal.cpp:492
 msgid "Always enable border"
 msgstr "始终启用边框"
 
-#: config/internal/option-internal.cpp:492
+#: config/internal/option-internal.cpp:493
 msgid "Screen capture file format"
 msgstr "屏幕截图文件格式"
 
-#: config/internal/option-internal.cpp:493
+#: config/internal/option-internal.cpp:494
 msgid "Enable cheats"
 msgstr "启用金手指"
 
-#: config/internal/option-internal.cpp:494
+#: config/internal/option-internal.cpp:495
 msgid "Disable on-screen status messages"
 msgstr "禁用屏幕状态消息"
 
-#: config/internal/option-internal.cpp:495
+#: config/internal/option-internal.cpp:496
 msgid "Type of system to emulate"
 msgstr "要模拟的系统类型"
 
-#: config/internal/option-internal.cpp:496
+#: config/internal/option-internal.cpp:497
 msgid "Flash size 0 = 64 KB 1 = 128 KB"
 msgstr "Flash 大小 0 = 64 KB 1 = 128 KB"
 
-#: config/internal/option-internal.cpp:498
+#: config/internal/option-internal.cpp:499
 msgid "Skip frames. Values are 0-9 or -1 to skip automatically based on time."
 msgstr "跳帧。值为 0-9 或 -1 以根据时间自动跳过。"
 
-#: config/internal/option-internal.cpp:500
+#: config/internal/option-internal.cpp:501
 msgid "The palette to use"
 msgstr "要使用的调色板"
 
-#: config/internal/option-internal.cpp:501
+#: config/internal/option-internal.cpp:502
 msgid "Enable printer emulation"
 msgstr "启用打印机模拟"
 
-#: config/internal/option-internal.cpp:503
+#: config/internal/option-internal.cpp:504
 msgid "Break into GDB after loading the game."
 msgstr "加载游戏后切入 GDB"
 
-#: config/internal/option-internal.cpp:504
+#: config/internal/option-internal.cpp:505
 msgid "Port to connect GDB to"
 msgstr "连接 GDB 的端口"
 
-#: config/internal/option-internal.cpp:506
+#: config/internal/option-internal.cpp:507
 msgid "Number of players in network"
 msgstr "联机中的玩家数量"
 
-#: config/internal/option-internal.cpp:508
+#: config/internal/option-internal.cpp:509
 msgid "Maximum scale factor (0 = no limit)"
 msgstr "最大缩放系数（0 = 无限制）"
 
-#: config/internal/option-internal.cpp:510
+#: config/internal/option-internal.cpp:511
 msgid "Pause game when main window loses focus"
 msgstr "当主窗口非活动时暂停游戏"
 
-#: config/internal/option-internal.cpp:512
+#: config/internal/option-internal.cpp:513
 msgid "Enable RTC (vba-over.ini override is rtcEnabled"
 msgstr "启用 RTC（vba-over.ini 里覆盖为 rtcEnabled"
 
-#: config/internal/option-internal.cpp:513
+#: config/internal/option-internal.cpp:514
 msgid "Native save (\"battery\") hardware type"
 msgstr "原生存档（“电池档”）硬件类型"
 
-#: config/internal/option-internal.cpp:514
+#: config/internal/option-internal.cpp:515
 msgid "Show speed indicator"
 msgstr "显示速度指示器"
 
-#: config/internal/option-internal.cpp:516
+#: config/internal/option-internal.cpp:517
 msgid "Draw on-screen messages transparently"
 msgstr "透明显示屏幕消息"
 
-#: config/internal/option-internal.cpp:517
+#: config/internal/option-internal.cpp:518
 msgid "Skip BIOS initialization"
 msgstr "跳过 BIOS 初始化"
 
-#: config/internal/option-internal.cpp:519
+#: config/internal/option-internal.cpp:520
 msgid "Do not overwrite cheat list when loading state"
 msgstr "加载状态时不覆盖金手指列表"
 
-#: config/internal/option-internal.cpp:521
+#: config/internal/option-internal.cpp:522
 msgid "Do not overwrite native (battery) save when loading state"
 msgstr "加载状态时不覆盖原生 (电池) 存档"
 
-#: config/internal/option-internal.cpp:523
+#: config/internal/option-internal.cpp:524
 msgid "Throttle game speed, even when accelerated (0-450 %, 0 = no throttle)"
 msgstr "阀门加快游戏速度，即使已经在加速时（0-450 %，0 = 无阀门）"
 
-#: config/internal/option-internal.cpp:526
+#: config/internal/option-internal.cpp:527
 msgid "Set throttle for speedup key (0-3000 %, 0 = no throttle)"
 msgstr "设置加速键的阀门值（0-3000 %，0 = 无阀门）"
 
-#: config/internal/option-internal.cpp:528
+#: config/internal/option-internal.cpp:529
 msgid "Number of frames to skip with speedup (instead of speedup throttle)"
 msgstr "加速时跳过的帧数（而不是阀门加速）"
 
-#: config/internal/option-internal.cpp:531
+#: config/internal/option-internal.cpp:532
 msgid "Use frame skip for speedup throttle"
 msgstr "使用跳帧来阀门加速"
 
-#: config/internal/option-internal.cpp:532
+#: config/internal/option-internal.cpp:533
 msgid "Use the specified BIOS file for Game Boy"
 msgstr "对 GB 使用指定的 BIOS 文件"
 
-#: config/internal/option-internal.cpp:533
+#: config/internal/option-internal.cpp:534
 msgid "Use the specified BIOS file"
 msgstr "使用指定的 BIOS 文件"
 
-#: config/internal/option-internal.cpp:535
+#: config/internal/option-internal.cpp:536
 msgid "Use the specified BIOS file for Game Boy Color"
 msgstr "对 GBC 使用指定的 BIOS 文件"
 
-#: config/internal/option-internal.cpp:536
+#: config/internal/option-internal.cpp:537
 msgid "Wait for vertical sync"
 msgstr "等待垂直同步"
 
-#: config/internal/option-internal.cpp:539
+#: config/internal/option-internal.cpp:540
 msgid "Enter fullscreen mode at startup"
 msgstr "启动时进入全屏模式"
 
-#: config/internal/option-internal.cpp:540
+#: config/internal/option-internal.cpp:541
 msgid "Window maximized"
 msgstr "窗口最大化"
 
-#: config/internal/option-internal.cpp:541
+#: config/internal/option-internal.cpp:542
 msgid "Window height at startup"
 msgstr "启动时的窗口高度"
 
-#: config/internal/option-internal.cpp:542
+#: config/internal/option-internal.cpp:543
 msgid "Window width at startup"
 msgstr "启动时的窗口宽度"
 
-#: config/internal/option-internal.cpp:543
+#: config/internal/option-internal.cpp:544
 msgid "Window axis X position at startup"
 msgstr "启动时的窗口 X 坐标位置"
 
-#: config/internal/option-internal.cpp:544
+#: config/internal/option-internal.cpp:545
 msgid "Window axis Y position at startup"
 msgstr "启动时的窗口 Y 坐标位置"
 
-#: config/internal/option-internal.cpp:548
+#: config/internal/option-internal.cpp:549
 msgid "Capture key events while on background"
 msgstr "在后台截取按键事件"
 
-#: config/internal/option-internal.cpp:550
+#: config/internal/option-internal.cpp:551
 msgid "Capture joy events while on background"
 msgstr "在后台截取摇杆事件"
 
-#: config/internal/option-internal.cpp:551
+#: config/internal/option-internal.cpp:552
 msgid "Hide menu bar when mouse is inactive"
 msgstr "鼠标非活动时隐藏菜单栏"
 
-#: config/internal/option-internal.cpp:553
+#: config/internal/option-internal.cpp:554
 msgid "Suspend screensaver when game is running"
 msgstr "游戏运行时暂停屏幕保护程序"
 
-#: config/internal/option-internal.cpp:556
+#: config/internal/option-internal.cpp:557
 msgid "Sound API; if unsupported, default API will be used"
 msgstr "声音 API；如果不支持，将使用默认 API"
 
-#: config/internal/option-internal.cpp:557
+#: config/internal/option-internal.cpp:558
 msgid "Device ID of chosen audio device for chosen driver"
 msgstr "所选驱动程序下的所选音频设备 ID"
 
-#: config/internal/option-internal.cpp:558
+#: config/internal/option-internal.cpp:559
 msgid "Number of sound buffers"
 msgstr "声音缓冲区数"
 
-#: config/internal/option-internal.cpp:559
+#: config/internal/option-internal.cpp:560
 msgid "Bit mask of sound channels to enable"
 msgstr "要启用的声道位掩码"
 
-#: config/internal/option-internal.cpp:560
+#: config/internal/option-internal.cpp:561
 msgid "Game Boy Advance sound filtering (%)"
 msgstr "GBA 声音过滤 (%)"
 
-#: config/internal/option-internal.cpp:562
+#: config/internal/option-internal.cpp:563
 msgid "Game Boy Advance sound interpolation"
 msgstr "GBA 声音插值"
 
-#: config/internal/option-internal.cpp:563
+#: config/internal/option-internal.cpp:564
 msgid "Game Boy sound declicking"
 msgstr "GB 声音降噪"
 
-#: config/internal/option-internal.cpp:564
+#: config/internal/option-internal.cpp:565
 msgid "Game Boy echo effect (%)"
 msgstr "GB 回声音效 (%)"
 
-#: config/internal/option-internal.cpp:565
+#: config/internal/option-internal.cpp:566
 msgid "Enable Game Boy sound effects"
 msgstr "启用 GB 音效"
 
-#: config/internal/option-internal.cpp:566
+#: config/internal/option-internal.cpp:567
 msgid "Game Boy stereo effect (%)"
 msgstr "GB 立体声音效 (%)"
 
-#: config/internal/option-internal.cpp:567
+#: config/internal/option-internal.cpp:568
 msgid "Game Boy surround sound effect (%)"
 msgstr "GB 环绕音效 (%)"
 
-#: config/internal/option-internal.cpp:568
+#: config/internal/option-internal.cpp:569
 msgid "Sound sample rate (kHz)"
 msgstr "声音采样率 (kHz)"
 
-#: config/internal/option-internal.cpp:569
+#: config/internal/option-internal.cpp:570
 msgid "Use DirectSound hardware acceleration"
 msgstr "启用 DirectSound 硬件加速"
 
-#: config/internal/option-internal.cpp:570
+#: config/internal/option-internal.cpp:571
 msgid "Upmix stereo to surround"
 msgstr "将立体声升级为环绕立体声"
 
-#: config/internal/option-internal.cpp:571
+#: config/internal/option-internal.cpp:572
 msgid "Sound volume (%)"
 msgstr "音量 (%)"
 
-#: config/internal/option-internal.cpp:639
-#: config/internal/option-internal.cpp:659
-#: config/internal/option-internal.cpp:680
-#: config/internal/option-internal.cpp:700
-#: config/internal/option-internal.cpp:719
+#: config/internal/option-internal.cpp:640
+#: config/internal/option-internal.cpp:660
+#: config/internal/option-internal.cpp:681
+#: config/internal/option-internal.cpp:701
+#: config/internal/option-internal.cpp:720
 #, c-format
 msgid "Invalid value %s for option %s; valid values are %s"
 msgstr "数值 %s 对于选项 %s 无效，有效数值为 %s"
@@ -780,7 +869,7 @@ msgstr "数值 %f 对于选项 %s； 有效数值为 %f - %f"
 msgid "Invalid value %d for option %s; valid values are %d - %d"
 msgstr "数值 %d 对于选项 %s 无效；有效数值为 %d - %d"
 
-#: config/option.cpp:480 opts.cpp:621 opts.cpp:630 opts.cpp:639 opts.cpp:648
+#: config/option.cpp:480 opts.cpp:468 opts.cpp:477 opts.cpp:486 opts.cpp:495
 #, c-format
 msgid "Invalid value %s for option %s"
 msgstr "数值 %s 对于选项 %s 无效"
@@ -945,19 +1034,19 @@ msgstr "Meta+"
 msgid "Key"
 msgstr ""
 
-#: dialogs/accel-config.cpp:149
+#: dialogs/accel-config.cpp:148
 msgid "Menu commands"
 msgstr "菜单命令"
 
-#: dialogs/accel-config.cpp:261
+#: dialogs/accel-config.cpp:259
 msgid "This will clear all user-defined accelerators. Are you sure?"
 msgstr "将清除所有自定义加速，是否确定？"
 
-#: dialogs/accel-config.cpp:261 dialogs/accel-config.cpp:298
+#: dialogs/accel-config.cpp:259 dialogs/accel-config.cpp:306
 msgid "Confirm"
 msgstr "确定"
 
-#: dialogs/accel-config.cpp:295
+#: dialogs/accel-config.cpp:304
 #, c-format
 msgid "This will unassign \"%s\" from \"%s\". Are you sure?"
 msgstr "这将从“%s”中取消分配“%s”。您确定吗？"
@@ -1329,22 +1418,22 @@ msgstr "旧数值"
 msgid "New Value"
 msgstr "新数值"
 
-#: guiinit.cpp:2518
+#: guiinit.cpp:2519
 msgid "JoyBus host invalid; disabling"
 msgstr "JoyBus 主机无效; 正在禁用"
 
-#: opts.cpp:298
+#: opts.cpp:154
 msgid ""
 "The INI file was written for a more recent version of VBA-M. Some INI option"
 " values may have been reset."
 msgstr "此 INI 文件是为新版本 VBA-M 编写的。某些 INI 选项值可能已被重置。"
 
-#: opts.cpp:480 opts.cpp:500 opts.cpp:685
+#: opts.cpp:339 opts.cpp:355 opts.cpp:522
 #, c-format
 msgid "Invalid key binding %s for %s"
 msgstr "%s 键不能绑定为 %s"
 
-#: opts.cpp:707
+#: opts.cpp:528
 #, c-format
 msgid "Unknown option %s with value %s"
 msgstr "未知选项 %s 带有数值 %s"
@@ -1568,37 +1657,37 @@ msgstr "回放已结束"
 msgid "%d %% (%d, %d fps)"
 msgstr "%d %% (%d, %d fps)"
 
-#: sys.cpp:899 xrc/GBPrinter.xrc:65
+#: sys.cpp:898 xrc/GBPrinter.xrc:65
 msgid "&Discard"
 msgstr "丢弃(&D)"
 
-#: sys.cpp:933
+#: sys.cpp:932
 msgid "Image files (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 msgstr "图像文件 (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 
-#: sys.cpp:942
+#: sys.cpp:941
 msgid "Save printer image to"
 msgstr "保存打印图像到"
 
-#: sys.cpp:956 sys.cpp:1140
+#: sys.cpp:955 sys.cpp:1139
 #, c-format
 msgid "Wrote printer output to %s"
 msgstr "写入打印输出到 %s"
 
-#: sys.cpp:961 sys.cpp:1032
+#: sys.cpp:960 sys.cpp:1031
 msgid "&Close"
 msgstr "关闭(&C)"
 
-#: sys.cpp:1027
+#: sys.cpp:1026
 msgid "Printed"
 msgstr "已打印"
 
-#: sys.cpp:1302
+#: sys.cpp:1301
 #, c-format
 msgid "Error opening pseudo tty: %s"
 msgstr "打开伪 tty 错误: %s"
 
-#: sys.cpp:1401
+#: sys.cpp:1400
 #, c-format
 msgid "Error setting up server socket (%d)"
 msgstr "设置服务器插口错误 (%d)"
@@ -1632,80 +1721,80 @@ msgstr "Blue:"
 msgid "Unable to load dialog %s from resources"
 msgstr "无法从源加载对话框 %s "
 
-#: wxvbam.cpp:398 wxvbam.cpp:415
+#: wxvbam.cpp:401 wxvbam.cpp:418
 #, c-format
 msgid "Invalid configuration file provided: %s"
 msgstr "提供的配置文件无效: %s"
 
-#: wxvbam.cpp:559
+#: wxvbam.cpp:558
 msgid "Could not create main window"
 msgstr "无法创建主窗口"
 
-#: wxvbam.cpp:634
+#: wxvbam.cpp:633
 msgid "Save built-in XRC file and exit"
 msgstr "保存内置 XRC 文件并退出"
 
-#: wxvbam.cpp:637
+#: wxvbam.cpp:636
 msgid "Save built-in vba-over.ini and exit"
 msgstr "保存内置 vba-over.ini 文件并退出"
 
-#: wxvbam.cpp:640
+#: wxvbam.cpp:639
 msgid "Print configuration path and exit"
 msgstr "打印配置路径并退出"
 
-#: wxvbam.cpp:643
+#: wxvbam.cpp:642
 msgid "Start in full-screen mode"
 msgstr "以全屏模式启动"
 
-#: wxvbam.cpp:646
+#: wxvbam.cpp:645
 msgid "Set a configuration file"
 msgstr "设置配置文件"
 
-#: wxvbam.cpp:650
+#: wxvbam.cpp:649
 msgid "Delete shared link state first, if it exists"
 msgstr "请先删除共享联机状态，如果存在的话"
 
-#: wxvbam.cpp:657
+#: wxvbam.cpp:656
 msgid "List all settable options and exit"
 msgstr "列出所有可设置的选项并退出"
 
-#: wxvbam.cpp:660
+#: wxvbam.cpp:659
 msgid "ROM file"
 msgstr "ROM 文件"
 
-#: wxvbam.cpp:662
+#: wxvbam.cpp:661
 msgid "<config>=<value>"
 msgstr "<config>=<value>"
 
-#: wxvbam.cpp:693
+#: wxvbam.cpp:692
 msgid "Configuration / build error: can't find built-in xrc"
 msgstr "配置/建构错误：无法找到内置 xrc 文件"
 
-#: wxvbam.cpp:701
+#: wxvbam.cpp:700
 #, c-format
 msgid ""
 "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:"
 msgstr "将内置配置写入到 %s。\n如要覆盖，请删除所有未更改的根节点。首先在以下搜索覆盖内置路径里找到任意 .xrc 或 .xrs 文件中正确名称的根节点："
 
-#: wxvbam.cpp:715
+#: wxvbam.cpp:714
 msgid "Configuration is read from, in order:"
 msgstr "配置按顺序从中读取："
 
-#: wxvbam.cpp:729
+#: wxvbam.cpp:728
 #, c-format
 msgid ""
 "Wrote built-in override file to %s\n"
 "To override, delete all but changed section. First found section is used from search path:"
 msgstr "将内置覆盖文件写入到 %s\n 如要覆盖，请删除所有未更改的部分。首个找到的部分从以下搜索路径使用："
 
-#: wxvbam.cpp:735
+#: wxvbam.cpp:734
 msgid ""
 "\n"
 "\tbuilt-in"
 msgstr "\n\t内置"
 
-#: wxvbam.cpp:750
+#: wxvbam.cpp:749
 msgid ""
 "Options set from the command line are saved if any configuration changes are made in the user interface.\n"
 "\n"
@@ -1713,17 +1802,17 @@ msgid ""
 "\n"
 msgstr "如果在用户界面中进行了任何配置更改，则保存从命令行设置的选项。\n\n对于标志选项，true 和 false 分别指定为 1 和 0。\n\n"
 
-#: wxvbam.cpp:758
+#: wxvbam.cpp:757
 msgid ""
 "The commands available for the Keyboard/* option are:\n"
 "\n"
 msgstr "可用于键盘 /* 选项的命令是:\n\n"
 
-#: wxvbam.cpp:769
+#: wxvbam.cpp:768
 msgid "Configuration file not found."
 msgstr "未找到配置文件。"
 
-#: wxvbam.cpp:800
+#: wxvbam.cpp:799
 msgid "Bad configuration option or multiple ROM files given:\n"
 msgstr "错误的配置选项或多个 ROM 文件被指定:\n"
 
@@ -2235,10 +2324,6 @@ msgstr "跳帧"
 msgid "&Number of frames to skip:"
 msgstr "要跳过的帧数(&N) :"
 
-#: xrc/DisplayConfig.xrc:200
-msgid "Speed"
-msgstr "速度"
-
 #: xrc/DisplayConfig.xrc:216
 msgid "Speed indicator:"
 msgstr "速度指示器："
@@ -2774,58 +2859,10 @@ msgid ""
 " entire contents if too small."
 msgstr "单击字段，然后按键或移动操纵杆以添加。按退格键删除最后添加的键值。如果太小则调整窗口尺寸或单击内部再移动指针以查看整个内容。"
 
-#: xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
-msgid "Up"
-msgstr "上"
-
-#: xrc/JoyPanel.xrc:37
-msgid "A"
-msgstr "A"
-
-#: xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
-msgid "Down"
-msgstr "下"
-
-#: xrc/JoyPanel.xrc:83
-msgid "B"
-msgstr "B"
-
-#: xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
-msgid "Left"
-msgstr "左"
-
-#: xrc/JoyPanel.xrc:129
-msgid "L"
-msgstr "L"
-
-#: xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
-msgid "Right"
-msgstr "右"
-
-#: xrc/JoyPanel.xrc:175
-msgid "R"
-msgstr "R"
-
-#: xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
-msgid "Select"
-msgstr "选择"
-
-#: xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
-msgid "Start"
-msgstr "开始"
-
-#: xrc/JoyPanel.xrc:254
-msgid "Motion Up"
-msgstr "体感 上"
-
 #: xrc/JoyPanel.xrc:276
 msgid "Autofire A"
 msgstr "连发 A"
 
-#: xrc/JoyPanel.xrc:298
-msgid "Motion Down"
-msgstr "体感 下"
-
 #: xrc/JoyPanel.xrc:320
 msgid "Autofire B"
 msgstr "连发 B"
diff --git a/po/wxvbam/zh_CN.po b/po/wxvbam/zh_CN.po
index 72928d6b..0159faea 100644
--- a/po/wxvbam/zh_CN.po
+++ b/po/wxvbam/zh_CN.po
@@ -19,7 +19,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: VBA-M\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-23 22:00+0000\n"
+"POT-Creation-Date: 2024-04-24 02:00+0000\n"
 "PO-Revision-Date: 2011-12-03 19:42+0000\n"
 "Last-Translator: 天绝星 <c.cejhb@gmail.com>, 2017,2019-2020,2022-2024\n"
 "Language-Team: Chinese (China) (http://app.transifex.com/bgk/vba-m/language/zh_CN/)\n"
@@ -330,174 +330,263 @@ msgstr "局域网联机已激活，禁用联机模式即可断开联网。"
 msgid "Network is not supported in local mode."
 msgstr "本地模式不支持网络"
 
-#: config/internal/option-internal.cpp:379
+#: config/command.cpp:28 xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
+msgid "Up"
+msgstr "上"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
+msgid "Down"
+msgstr "下"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
+msgid "Left"
+msgstr "左"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
+msgid "Right"
+msgstr "右"
+
+#: config/command.cpp:28 xrc/JoyPanel.xrc:37
+msgid "A"
+msgstr "A"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:83
+msgid "B"
+msgstr "B"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:129
+msgid "L"
+msgstr "L"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:175
+msgid "R"
+msgstr "R"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
+msgid "Select"
+msgstr "选择"
+
+#: config/command.cpp:29 xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
+msgid "Start"
+msgstr "开始"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:254
+msgid "Motion Up"
+msgstr "体感 上"
+
+#: config/command.cpp:30 xrc/JoyPanel.xrc:298
+msgid "Motion Down"
+msgstr "体感 下"
+
+#: config/command.cpp:30
+msgid "Motion Left"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion Right"
+msgstr ""
+
+#: config/command.cpp:30
+msgid "Motion In"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Motion Out"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto A"
+msgstr ""
+
+#: config/command.cpp:31
+msgid "Auto B"
+msgstr ""
+
+#: config/command.cpp:31 xrc/DisplayConfig.xrc:200
+msgid "Speed"
+msgstr "速度"
+
+#: config/command.cpp:31
+msgid "Capture"
+msgstr ""
+
+#: config/command.cpp:32
+msgid "GameShark"
+msgstr ""
+
+#: config/command.cpp:106
+#, c-format
+msgid "Joypad %zu %s"
+msgstr ""
+
+#: config/internal/option-internal.cpp:380
 msgid "Use bilinear filter with 3d renderer"
 msgstr "在 3D 渲染器中使用双线过滤 "
 
-#: config/internal/option-internal.cpp:380
+#: config/internal/option-internal.cpp:381
 msgid "Full-screen filter to apply"
 msgstr "要应用的全屏滤镜"
 
-#: config/internal/option-internal.cpp:381
+#: config/internal/option-internal.cpp:382
 msgid "Filter plugin library"
 msgstr "滤镜插件库"
 
-#: config/internal/option-internal.cpp:382
+#: config/internal/option-internal.cpp:383
 msgid "Interframe blending function"
 msgstr "帧间混合功能"
 
-#: config/internal/option-internal.cpp:383
+#: config/internal/option-internal.cpp:384
 msgid "Keep window on top"
 msgstr "保持窗口在最前"
 
-#: config/internal/option-internal.cpp:385
+#: config/internal/option-internal.cpp:386
 msgid "Maximum number of threads to run filters in"
 msgstr "运行滤镜的最大线程数"
 
-#: config/internal/option-internal.cpp:387
+#: config/internal/option-internal.cpp:388
 msgid "Render method; if unsupported, simple method will be used"
 msgstr "渲染方式；如果不支持，则使用简单方式"
 
-#: config/internal/option-internal.cpp:388
+#: config/internal/option-internal.cpp:389
 msgid "Default scale factor"
 msgstr "默认缩放系数"
 
-#: config/internal/option-internal.cpp:389
+#: config/internal/option-internal.cpp:390
 msgid "Retain aspect ratio when resizing"
 msgstr "调整大小时保持长宽比"
 
-#: config/internal/option-internal.cpp:392
+#: config/internal/option-internal.cpp:393
 msgid "BIOS file to use for Game Boy, if enabled"
 msgstr "用于 GB 的 BIOS 文件（如果启用）"
 
-#: config/internal/option-internal.cpp:393
+#: config/internal/option-internal.cpp:394
 msgid "Game Boy color enhancement, if enabled"
 msgstr "GB 色彩增强（如果启用）"
 
-#: config/internal/option-internal.cpp:394
+#: config/internal/option-internal.cpp:395
 msgid "Enable DX Colorization Hacks"
 msgstr "启用 DX 色彩修改"
 
-#: config/internal/option-internal.cpp:395
-#: config/internal/option-internal.cpp:419
+#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:420
 msgid "Apply LCD filter, if enabled"
 msgstr "应用 LCD 滤镜（如果启用）"
 
-#: config/internal/option-internal.cpp:396
+#: config/internal/option-internal.cpp:397
 msgid "BIOS file to use for Game Boy Color, if enabled"
 msgstr "用于 GBC 的 BIOS 文件（如果启用）"
 
-#: config/internal/option-internal.cpp:398
+#: config/internal/option-internal.cpp:399
 msgid ""
 "The default palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr "默认调色板，8 个逗号分隔的 4 位十六进制整数 (rgb555)。"
 
-#: config/internal/option-internal.cpp:401
+#: config/internal/option-internal.cpp:402
 msgid ""
 "The first user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr "第一用户调色板，8 个逗号分隔的 4 位十六进制整数 (rgb555)。"
 
-#: config/internal/option-internal.cpp:404
+#: config/internal/option-internal.cpp:405
 msgid ""
 "The second user palette, as 8 comma-separated 4-digit hex integers (rgb555)."
 msgstr "第二用户调色板，8 个逗号分隔的 4 位十六进制整数 (rgb555)。"
 
-#: config/internal/option-internal.cpp:407
+#: config/internal/option-internal.cpp:408
 msgid "Automatically gather a full page before printing"
 msgstr "打印前自动聚集整个页面"
 
-#: config/internal/option-internal.cpp:409
+#: config/internal/option-internal.cpp:410
 msgid "Automatically save printouts as screen captures with -print suffix"
 msgstr "使用 -print 后缀自动将打印输出保存为屏幕截图"
 
-#: config/internal/option-internal.cpp:411
-#: config/internal/option-internal.cpp:439
+#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:440
 msgid "Directory to look for ROM files"
 msgstr "要查找 ROM 文件的目录"
 
-#: config/internal/option-internal.cpp:412
+#: config/internal/option-internal.cpp:413
 msgid "Directory to look for Game Boy Color ROM files"
 msgstr "要查找 GBC ROM 文件的目录"
 
-#: config/internal/option-internal.cpp:415
+#: config/internal/option-internal.cpp:416
 msgid "BIOS file to use, if enabled"
 msgstr "要使用的 BIOS 文件（如果启用）"
 
-#: config/internal/option-internal.cpp:425
+#: config/internal/option-internal.cpp:426
 msgid "Enable link at boot"
 msgstr "在启动时启用联机"
 
-#: config/internal/option-internal.cpp:430
+#: config/internal/option-internal.cpp:431
 msgid "Enable faster network protocol by default"
 msgstr "默认启用更快的网络协议"
 
-#: config/internal/option-internal.cpp:432
+#: config/internal/option-internal.cpp:433
 msgid "Default network link client host"
 msgstr "默认网络联机客户端主机"
 
-#: config/internal/option-internal.cpp:433
+#: config/internal/option-internal.cpp:434
 msgid "Default network link server IP to bind"
 msgstr "要绑定的默认网络联机服务器 IP"
 
-#: config/internal/option-internal.cpp:434
+#: config/internal/option-internal.cpp:435
 msgid "Default network link port (server and client)"
 msgstr "默认网络联机端口（服务器和客户端）"
 
-#: config/internal/option-internal.cpp:435
+#: config/internal/option-internal.cpp:436
 msgid "Default network protocol"
 msgstr "默认网络协议"
 
-#: config/internal/option-internal.cpp:436
+#: config/internal/option-internal.cpp:437
 msgid "Link timeout (ms)"
 msgstr "联机超时（毫秒）"
 
-#: config/internal/option-internal.cpp:437
+#: config/internal/option-internal.cpp:438
 msgid "Link cable type"
 msgstr "联机线缆类型"
 
-#: config/internal/option-internal.cpp:442
+#: config/internal/option-internal.cpp:443
 msgid "Automatically load last saved state"
 msgstr "自动加载上次保存的状态"
 
-#: config/internal/option-internal.cpp:444
+#: config/internal/option-internal.cpp:445
 msgid ""
 "Directory to store game save files (relative paths are relative to ROM; "
 "blank is config dir)"
 msgstr "存放游戏存档文件的目录（相对路径是相对于 ROM；空白是配置目录）"
 
-#: config/internal/option-internal.cpp:446
+#: config/internal/option-internal.cpp:447
 msgid "Freeze recent load list"
 msgstr "冻结最近的加载列表"
 
-#: config/internal/option-internal.cpp:448
+#: config/internal/option-internal.cpp:449
 msgid ""
 "Directory to store A / V and game recordings (relative paths are relative to"
 " ROM)"
 msgstr "存储 A/V 和游戏录像的目录（相对路径是相对于 ROM）"
 
-#: config/internal/option-internal.cpp:451
+#: config/internal/option-internal.cpp:452
 msgid "Number of seconds between rewind snapshots (0 to disable)"
 msgstr "倒带快照之间的秒数（0 表示禁用）"
 
-#: config/internal/option-internal.cpp:453
+#: config/internal/option-internal.cpp:454
 msgid "Directory to store screenshots (relative paths are relative to ROM)"
 msgstr "存放截图的目录（相对路径是相对于 ROM）"
 
-#: config/internal/option-internal.cpp:456
+#: config/internal/option-internal.cpp:457
 msgid ""
 "Directory to store saved state files (relative paths are relative to "
 "BatteryDir)"
 msgstr "存储保存状态文件的目录（相对路径是相对于 BatteryDir）"
 
-#: config/internal/option-internal.cpp:458
+#: config/internal/option-internal.cpp:459
 msgid "Enable status bar"
 msgstr "启用状态栏"
 
-#: config/internal/option-internal.cpp:459
+#: config/internal/option-internal.cpp:460
 msgid "INI file version (DO NOT MODIFY)"
 msgstr "INI 文件版本 (请勿修改)"
 
-#: config/internal/option-internal.cpp:463
+#: config/internal/option-internal.cpp:464
 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, "
@@ -505,266 +594,266 @@ msgid ""
 "MotionRight, AutoA, AutoB, Speed, Capture, GS"
 msgstr "参数 手柄/<n>/<button> 包含一个逗号分隔的键名列表，这些键名映射到 手柄 #<n> 按键 <button>。 按键是 上、下、左、右、A、B、L、R、Select、Start、体感上、体感下、体感左、体感右、连发A、连发B、加速、截图、GS 中某一个"
 
-#: config/internal/option-internal.cpp:468
+#: config/internal/option-internal.cpp:469
 msgid "The autofire toggle period, in frames (1/60 s)"
 msgstr "连发切换周期，以帧为单位（1/60 秒）"
 
-#: config/internal/option-internal.cpp:469
+#: config/internal/option-internal.cpp:470
 msgid "The number of the stick to use in single-player mode"
 msgstr "在单人模式中使用的摇杆数量"
 
-#: config/internal/option-internal.cpp:471
+#: config/internal/option-internal.cpp:472
 msgid "Whether to enable SDL GameController mode"
 msgstr "选择是否启用 SDL 游戏控制器模式"
 
-#: config/internal/option-internal.cpp:475
+#: config/internal/option-internal.cpp:476
 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 "
 "executed."
 msgstr "参数 键盘/<cmd> 包含一个以逗号分隔的键名列表（例如 Alt-Shift-F1）。 当按下指定的键时，命令 <cmd> 被执行。"
 
-#: config/internal/option-internal.cpp:480
+#: config/internal/option-internal.cpp:481
 msgid "Enable AGB debug print"
 msgstr "启用 AGB 调试打印"
 
-#: config/internal/option-internal.cpp:481
+#: config/internal/option-internal.cpp:482
 msgid "Auto skip frames"
 msgstr "自动跳帧"
 
-#: config/internal/option-internal.cpp:483
+#: config/internal/option-internal.cpp:484
 msgid "Apply IPS / UPS / IPF patches if found"
 msgstr "如发现 IPS/UPS/IPF 补丁即应用"
 
-#: config/internal/option-internal.cpp:485
+#: config/internal/option-internal.cpp:486
 msgid "Automatically save and load cheat list"
 msgstr "自动保存和加载金手指列表"
 
-#: config/internal/option-internal.cpp:489
+#: config/internal/option-internal.cpp:490
 msgid "Automatically enable border for Super Game Boy games"
 msgstr "对 Super GameBoy 游戏自动启用边框"
 
-#: config/internal/option-internal.cpp:491
+#: config/internal/option-internal.cpp:492
 msgid "Always enable border"
 msgstr "始终启用边框"
 
-#: config/internal/option-internal.cpp:492
+#: config/internal/option-internal.cpp:493
 msgid "Screen capture file format"
 msgstr "屏幕截图文件格式"
 
-#: config/internal/option-internal.cpp:493
+#: config/internal/option-internal.cpp:494
 msgid "Enable cheats"
 msgstr "启用金手指"
 
-#: config/internal/option-internal.cpp:494
+#: config/internal/option-internal.cpp:495
 msgid "Disable on-screen status messages"
 msgstr "禁用屏幕状态消息"
 
-#: config/internal/option-internal.cpp:495
+#: config/internal/option-internal.cpp:496
 msgid "Type of system to emulate"
 msgstr "要模拟的系统类型"
 
-#: config/internal/option-internal.cpp:496
+#: config/internal/option-internal.cpp:497
 msgid "Flash size 0 = 64 KB 1 = 128 KB"
 msgstr "Flash 大小 0 = 64 KB 1 = 128 KB"
 
-#: config/internal/option-internal.cpp:498
+#: config/internal/option-internal.cpp:499
 msgid "Skip frames. Values are 0-9 or -1 to skip automatically based on time."
 msgstr "跳帧。值为 0-9 或 -1 以根据时间自动跳过。"
 
-#: config/internal/option-internal.cpp:500
+#: config/internal/option-internal.cpp:501
 msgid "The palette to use"
 msgstr "要使用的调色板"
 
-#: config/internal/option-internal.cpp:501
+#: config/internal/option-internal.cpp:502
 msgid "Enable printer emulation"
 msgstr "启用打印机模拟"
 
-#: config/internal/option-internal.cpp:503
+#: config/internal/option-internal.cpp:504
 msgid "Break into GDB after loading the game."
 msgstr "加载游戏后切入 GDB"
 
-#: config/internal/option-internal.cpp:504
+#: config/internal/option-internal.cpp:505
 msgid "Port to connect GDB to"
 msgstr "连接 GDB 的端口"
 
-#: config/internal/option-internal.cpp:506
+#: config/internal/option-internal.cpp:507
 msgid "Number of players in network"
 msgstr "联机中的玩家数量"
 
-#: config/internal/option-internal.cpp:508
+#: config/internal/option-internal.cpp:509
 msgid "Maximum scale factor (0 = no limit)"
 msgstr "最大缩放系数（0 = 无限制）"
 
-#: config/internal/option-internal.cpp:510
+#: config/internal/option-internal.cpp:511
 msgid "Pause game when main window loses focus"
 msgstr "当主窗口非活动时暂停游戏"
 
-#: config/internal/option-internal.cpp:512
+#: config/internal/option-internal.cpp:513
 msgid "Enable RTC (vba-over.ini override is rtcEnabled"
 msgstr "启用 RTC（vba-over.ini 里覆盖为 rtcEnabled"
 
-#: config/internal/option-internal.cpp:513
+#: config/internal/option-internal.cpp:514
 msgid "Native save (\"battery\") hardware type"
 msgstr "原生存档（“电池档”）硬件类型"
 
-#: config/internal/option-internal.cpp:514
+#: config/internal/option-internal.cpp:515
 msgid "Show speed indicator"
 msgstr "显示速度指示器"
 
-#: config/internal/option-internal.cpp:516
+#: config/internal/option-internal.cpp:517
 msgid "Draw on-screen messages transparently"
 msgstr "透明显示屏幕消息"
 
-#: config/internal/option-internal.cpp:517
+#: config/internal/option-internal.cpp:518
 msgid "Skip BIOS initialization"
 msgstr "跳过 BIOS 初始化"
 
-#: config/internal/option-internal.cpp:519
+#: config/internal/option-internal.cpp:520
 msgid "Do not overwrite cheat list when loading state"
 msgstr "加载状态时不覆盖金手指列表"
 
-#: config/internal/option-internal.cpp:521
+#: config/internal/option-internal.cpp:522
 msgid "Do not overwrite native (battery) save when loading state"
 msgstr "加载状态时不覆盖原生 (电池) 存档"
 
-#: config/internal/option-internal.cpp:523
+#: config/internal/option-internal.cpp:524
 msgid "Throttle game speed, even when accelerated (0-450 %, 0 = no throttle)"
 msgstr "阀门加快游戏速度，即使已经在加速时（0-450 %，0 = 无阀门）"
 
-#: config/internal/option-internal.cpp:526
+#: config/internal/option-internal.cpp:527
 msgid "Set throttle for speedup key (0-3000 %, 0 = no throttle)"
 msgstr "设置加速键的阀门值（0-3000 %，0 = 无阀门）"
 
-#: config/internal/option-internal.cpp:528
+#: config/internal/option-internal.cpp:529
 msgid "Number of frames to skip with speedup (instead of speedup throttle)"
 msgstr "加速时跳过的帧数（而不是阀门加速）"
 
-#: config/internal/option-internal.cpp:531
+#: config/internal/option-internal.cpp:532
 msgid "Use frame skip for speedup throttle"
 msgstr "使用跳帧来阀门加速"
 
-#: config/internal/option-internal.cpp:532
+#: config/internal/option-internal.cpp:533
 msgid "Use the specified BIOS file for Game Boy"
 msgstr "对 GB 使用指定的 BIOS 文件"
 
-#: config/internal/option-internal.cpp:533
+#: config/internal/option-internal.cpp:534
 msgid "Use the specified BIOS file"
 msgstr "使用指定的 BIOS 文件"
 
-#: config/internal/option-internal.cpp:535
+#: config/internal/option-internal.cpp:536
 msgid "Use the specified BIOS file for Game Boy Color"
 msgstr "对 GBC 使用指定的 BIOS 文件"
 
-#: config/internal/option-internal.cpp:536
+#: config/internal/option-internal.cpp:537
 msgid "Wait for vertical sync"
 msgstr "等待垂直同步"
 
-#: config/internal/option-internal.cpp:539
+#: config/internal/option-internal.cpp:540
 msgid "Enter fullscreen mode at startup"
 msgstr "启动时进入全屏模式"
 
-#: config/internal/option-internal.cpp:540
+#: config/internal/option-internal.cpp:541
 msgid "Window maximized"
 msgstr "窗口最大化"
 
-#: config/internal/option-internal.cpp:541
+#: config/internal/option-internal.cpp:542
 msgid "Window height at startup"
 msgstr "启动时的窗口高度"
 
-#: config/internal/option-internal.cpp:542
+#: config/internal/option-internal.cpp:543
 msgid "Window width at startup"
 msgstr "启动时的窗口宽度"
 
-#: config/internal/option-internal.cpp:543
+#: config/internal/option-internal.cpp:544
 msgid "Window axis X position at startup"
 msgstr "启动时的窗口 X 坐标位置"
 
-#: config/internal/option-internal.cpp:544
+#: config/internal/option-internal.cpp:545
 msgid "Window axis Y position at startup"
 msgstr "启动时的窗口 Y 坐标位置"
 
-#: config/internal/option-internal.cpp:548
+#: config/internal/option-internal.cpp:549
 msgid "Capture key events while on background"
 msgstr "在后台截取按键事件"
 
-#: config/internal/option-internal.cpp:550
+#: config/internal/option-internal.cpp:551
 msgid "Capture joy events while on background"
 msgstr "在后台截取摇杆事件"
 
-#: config/internal/option-internal.cpp:551
+#: config/internal/option-internal.cpp:552
 msgid "Hide menu bar when mouse is inactive"
 msgstr "鼠标非活动时隐藏菜单栏"
 
-#: config/internal/option-internal.cpp:553
+#: config/internal/option-internal.cpp:554
 msgid "Suspend screensaver when game is running"
 msgstr "游戏运行时暂停屏幕保护程序"
 
-#: config/internal/option-internal.cpp:556
+#: config/internal/option-internal.cpp:557
 msgid "Sound API; if unsupported, default API will be used"
 msgstr "声音 API；如果不支持，将使用默认 API"
 
-#: config/internal/option-internal.cpp:557
+#: config/internal/option-internal.cpp:558
 msgid "Device ID of chosen audio device for chosen driver"
 msgstr "所选驱动程序下的所选音频设备 ID"
 
-#: config/internal/option-internal.cpp:558
+#: config/internal/option-internal.cpp:559
 msgid "Number of sound buffers"
 msgstr "声音缓冲区数"
 
-#: config/internal/option-internal.cpp:559
+#: config/internal/option-internal.cpp:560
 msgid "Bit mask of sound channels to enable"
 msgstr "要启用的声道位掩码"
 
-#: config/internal/option-internal.cpp:560
+#: config/internal/option-internal.cpp:561
 msgid "Game Boy Advance sound filtering (%)"
 msgstr "GBA 声音过滤 (%)"
 
-#: config/internal/option-internal.cpp:562
+#: config/internal/option-internal.cpp:563
 msgid "Game Boy Advance sound interpolation"
 msgstr "GBA 声音插值"
 
-#: config/internal/option-internal.cpp:563
+#: config/internal/option-internal.cpp:564
 msgid "Game Boy sound declicking"
 msgstr "GB 声音降噪"
 
-#: config/internal/option-internal.cpp:564
+#: config/internal/option-internal.cpp:565
 msgid "Game Boy echo effect (%)"
 msgstr "GB 回声音效 (%)"
 
-#: config/internal/option-internal.cpp:565
+#: config/internal/option-internal.cpp:566
 msgid "Enable Game Boy sound effects"
 msgstr "启用 GB 音效"
 
-#: config/internal/option-internal.cpp:566
+#: config/internal/option-internal.cpp:567
 msgid "Game Boy stereo effect (%)"
 msgstr "GB 立体声音效 (%)"
 
-#: config/internal/option-internal.cpp:567
+#: config/internal/option-internal.cpp:568
 msgid "Game Boy surround sound effect (%)"
 msgstr "GB 环绕音效 (%)"
 
-#: config/internal/option-internal.cpp:568
+#: config/internal/option-internal.cpp:569
 msgid "Sound sample rate (kHz)"
 msgstr "声音采样率 (kHz)"
 
-#: config/internal/option-internal.cpp:569
+#: config/internal/option-internal.cpp:570
 msgid "Use DirectSound hardware acceleration"
 msgstr "启用 DirectSound 硬件加速"
 
-#: config/internal/option-internal.cpp:570
+#: config/internal/option-internal.cpp:571
 msgid "Upmix stereo to surround"
 msgstr "将立体声升级为环绕立体声"
 
-#: config/internal/option-internal.cpp:571
+#: config/internal/option-internal.cpp:572
 msgid "Sound volume (%)"
 msgstr "音量 (%)"
 
-#: config/internal/option-internal.cpp:639
-#: config/internal/option-internal.cpp:659
-#: config/internal/option-internal.cpp:680
-#: config/internal/option-internal.cpp:700
-#: config/internal/option-internal.cpp:719
+#: config/internal/option-internal.cpp:640
+#: config/internal/option-internal.cpp:660
+#: config/internal/option-internal.cpp:681
+#: config/internal/option-internal.cpp:701
+#: config/internal/option-internal.cpp:720
 #, c-format
 msgid "Invalid value %s for option %s; valid values are %s"
 msgstr "数值 %s 对于选项 %s 无效，有效数值为 %s"
@@ -779,7 +868,7 @@ msgstr "数值 %f 对于选项 %s； 有效数值为 %f - %f"
 msgid "Invalid value %d for option %s; valid values are %d - %d"
 msgstr "数值 %d 对于选项 %s 无效；有效数值为 %d - %d"
 
-#: config/option.cpp:480 opts.cpp:621 opts.cpp:630 opts.cpp:639 opts.cpp:648
+#: config/option.cpp:480 opts.cpp:468 opts.cpp:477 opts.cpp:486 opts.cpp:495
 #, c-format
 msgid "Invalid value %s for option %s"
 msgstr "数值 %s 对于选项 %s 无效"
@@ -944,19 +1033,19 @@ msgstr "Meta+"
 msgid "Key"
 msgstr ""
 
-#: dialogs/accel-config.cpp:149
+#: dialogs/accel-config.cpp:148
 msgid "Menu commands"
 msgstr "菜单命令"
 
-#: dialogs/accel-config.cpp:261
+#: dialogs/accel-config.cpp:259
 msgid "This will clear all user-defined accelerators. Are you sure?"
 msgstr "将清除所有自定义加速，是否确定？"
 
-#: dialogs/accel-config.cpp:261 dialogs/accel-config.cpp:298
+#: dialogs/accel-config.cpp:259 dialogs/accel-config.cpp:306
 msgid "Confirm"
 msgstr "确定"
 
-#: dialogs/accel-config.cpp:295
+#: dialogs/accel-config.cpp:304
 #, c-format
 msgid "This will unassign \"%s\" from \"%s\". Are you sure?"
 msgstr "这将从“%s”中取消分配“%s”。您确定吗？"
@@ -1328,22 +1417,22 @@ msgstr "旧数值"
 msgid "New Value"
 msgstr "新数值"
 
-#: guiinit.cpp:2518
+#: guiinit.cpp:2519
 msgid "JoyBus host invalid; disabling"
 msgstr "JoyBus 主机无效; 正在禁用"
 
-#: opts.cpp:298
+#: opts.cpp:154
 msgid ""
 "The INI file was written for a more recent version of VBA-M. Some INI option"
 " values may have been reset."
 msgstr "此 INI 文件是为新版本 VBA-M 编写的。某些 INI 选项值可能已被重置。"
 
-#: opts.cpp:480 opts.cpp:500 opts.cpp:685
+#: opts.cpp:339 opts.cpp:355 opts.cpp:522
 #, c-format
 msgid "Invalid key binding %s for %s"
 msgstr "%s 键不能绑定为 %s"
 
-#: opts.cpp:707
+#: opts.cpp:528
 #, c-format
 msgid "Unknown option %s with value %s"
 msgstr "未知选项 %s 带有数值 %s"
@@ -1567,37 +1656,37 @@ msgstr "回放已结束"
 msgid "%d %% (%d, %d fps)"
 msgstr "%d %% (%d, %d fps)"
 
-#: sys.cpp:899 xrc/GBPrinter.xrc:65
+#: sys.cpp:898 xrc/GBPrinter.xrc:65
 msgid "&Discard"
 msgstr "丢弃(&D)"
 
-#: sys.cpp:933
+#: sys.cpp:932
 msgid "Image files (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 msgstr "图像文件 (*.bmp;*.jpg;*.png)|*.bmp;*.jpg;*.png|"
 
-#: sys.cpp:942
+#: sys.cpp:941
 msgid "Save printer image to"
 msgstr "保存打印图像到"
 
-#: sys.cpp:956 sys.cpp:1140
+#: sys.cpp:955 sys.cpp:1139
 #, c-format
 msgid "Wrote printer output to %s"
 msgstr "写入打印输出到 %s"
 
-#: sys.cpp:961 sys.cpp:1032
+#: sys.cpp:960 sys.cpp:1031
 msgid "&Close"
 msgstr "关闭(&C)"
 
-#: sys.cpp:1027
+#: sys.cpp:1026
 msgid "Printed"
 msgstr "已打印"
 
-#: sys.cpp:1302
+#: sys.cpp:1301
 #, c-format
 msgid "Error opening pseudo tty: %s"
 msgstr "打开伪 tty 错误: %s"
 
-#: sys.cpp:1401
+#: sys.cpp:1400
 #, c-format
 msgid "Error setting up server socket (%d)"
 msgstr "设置服务器插口错误 (%d)"
@@ -1631,80 +1720,80 @@ msgstr "Blue:"
 msgid "Unable to load dialog %s from resources"
 msgstr "无法从源加载对话框 %s "
 
-#: wxvbam.cpp:398 wxvbam.cpp:415
+#: wxvbam.cpp:401 wxvbam.cpp:418
 #, c-format
 msgid "Invalid configuration file provided: %s"
 msgstr "提供的配置文件无效: %s"
 
-#: wxvbam.cpp:559
+#: wxvbam.cpp:558
 msgid "Could not create main window"
 msgstr "无法创建主窗口"
 
-#: wxvbam.cpp:634
+#: wxvbam.cpp:633
 msgid "Save built-in XRC file and exit"
 msgstr "保存内置 XRC 文件并退出"
 
-#: wxvbam.cpp:637
+#: wxvbam.cpp:636
 msgid "Save built-in vba-over.ini and exit"
 msgstr "保存内置 vba-over.ini 文件并退出"
 
-#: wxvbam.cpp:640
+#: wxvbam.cpp:639
 msgid "Print configuration path and exit"
 msgstr "打印配置路径并退出"
 
-#: wxvbam.cpp:643
+#: wxvbam.cpp:642
 msgid "Start in full-screen mode"
 msgstr "以全屏模式启动"
 
-#: wxvbam.cpp:646
+#: wxvbam.cpp:645
 msgid "Set a configuration file"
 msgstr "设置配置文件"
 
-#: wxvbam.cpp:650
+#: wxvbam.cpp:649
 msgid "Delete shared link state first, if it exists"
 msgstr "请先删除共享联机状态，如果存在的话"
 
-#: wxvbam.cpp:657
+#: wxvbam.cpp:656
 msgid "List all settable options and exit"
 msgstr "列出所有可设置的选项并退出"
 
-#: wxvbam.cpp:660
+#: wxvbam.cpp:659
 msgid "ROM file"
 msgstr "ROM 文件"
 
-#: wxvbam.cpp:662
+#: wxvbam.cpp:661
 msgid "<config>=<value>"
 msgstr "<config>=<value>"
 
-#: wxvbam.cpp:693
+#: wxvbam.cpp:692
 msgid "Configuration / build error: can't find built-in xrc"
 msgstr "配置/建构错误：无法找到内置 xrc 文件"
 
-#: wxvbam.cpp:701
+#: wxvbam.cpp:700
 #, c-format
 msgid ""
 "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:"
 msgstr "已将内置配置写入到 %s。\n如要覆盖，请删除所有未更改的根节点。首先在以下搜索覆盖内置路径里找到任意 .xrc 或 .xrs 文件中正确名称的根节点："
 
-#: wxvbam.cpp:715
+#: wxvbam.cpp:714
 msgid "Configuration is read from, in order:"
 msgstr "配置按顺序从中读取："
 
-#: wxvbam.cpp:729
+#: wxvbam.cpp:728
 #, c-format
 msgid ""
 "Wrote built-in override file to %s\n"
 "To override, delete all but changed section. First found section is used from search path:"
 msgstr "已将内置覆盖文件写入到 %s\n 如要覆盖，请删除所有未更改的部分。首个找到的部分从以下搜索路径使用："
 
-#: wxvbam.cpp:735
+#: wxvbam.cpp:734
 msgid ""
 "\n"
 "\tbuilt-in"
 msgstr "\n\t内置"
 
-#: wxvbam.cpp:750
+#: wxvbam.cpp:749
 msgid ""
 "Options set from the command line are saved if any configuration changes are made in the user interface.\n"
 "\n"
@@ -1712,17 +1801,17 @@ msgid ""
 "\n"
 msgstr "如果在用户界面中进行了任何配置更改，则保存从命令行设置的选项。\n\n对于标志选项，true 和 false 分别指定为 1 和 0。\n\n"
 
-#: wxvbam.cpp:758
+#: wxvbam.cpp:757
 msgid ""
 "The commands available for the Keyboard/* option are:\n"
 "\n"
 msgstr "可用于键盘 /* 选项的命令是:\n\n"
 
-#: wxvbam.cpp:769
+#: wxvbam.cpp:768
 msgid "Configuration file not found."
 msgstr "未找到配置文件。"
 
-#: wxvbam.cpp:800
+#: wxvbam.cpp:799
 msgid "Bad configuration option or multiple ROM files given:\n"
 msgstr "错误的配置选项或多个 ROM 文件被指定:\n"
 
@@ -2234,10 +2323,6 @@ msgstr "跳帧"
 msgid "&Number of frames to skip:"
 msgstr "要跳过的帧数(&N) :"
 
-#: xrc/DisplayConfig.xrc:200
-msgid "Speed"
-msgstr "速度"
-
 #: xrc/DisplayConfig.xrc:216
 msgid "Speed indicator:"
 msgstr "速度指示器："
@@ -2773,58 +2858,10 @@ msgid ""
 " entire contents if too small."
 msgstr "单击字段，然后按键或移动操纵杆以添加。按退格键删除最后添加的键值。如果太小则调整窗口尺寸或单击内部再移动指针以查看整个内容。"
 
-#: xrc/JoyPanel.xrc:14 xrc/MainMenu.xrc:450
-msgid "Up"
-msgstr "上"
-
-#: xrc/JoyPanel.xrc:37
-msgid "A"
-msgstr "A"
-
-#: xrc/JoyPanel.xrc:60 xrc/MainMenu.xrc:454
-msgid "Down"
-msgstr "下"
-
-#: xrc/JoyPanel.xrc:83
-msgid "B"
-msgstr "B"
-
-#: xrc/JoyPanel.xrc:106 xrc/MainMenu.xrc:458
-msgid "Left"
-msgstr "左"
-
-#: xrc/JoyPanel.xrc:129
-msgid "L"
-msgstr "L"
-
-#: xrc/JoyPanel.xrc:152 xrc/MainMenu.xrc:462
-msgid "Right"
-msgstr "右"
-
-#: xrc/JoyPanel.xrc:175
-msgid "R"
-msgstr "R"
-
-#: xrc/JoyPanel.xrc:199 xrc/MainMenu.xrc:482
-msgid "Select"
-msgstr "选择"
-
-#: xrc/JoyPanel.xrc:222 xrc/MainMenu.xrc:486
-msgid "Start"
-msgstr "开始"
-
-#: xrc/JoyPanel.xrc:254
-msgid "Motion Up"
-msgstr "体感 上"
-
 #: xrc/JoyPanel.xrc:276
 msgid "Autofire A"
 msgstr "连发 A"
 
-#: xrc/JoyPanel.xrc:298
-msgid "Motion Down"
-msgstr "体感 下"
-
 #: xrc/JoyPanel.xrc:320
 msgid "Autofire B"
 msgstr "连发 B"