Merge branch '86Box:master' into master

2026-02-23 18:08:20 -07:00 · 2025-04-19 21:58:09 +01:00
parent 52c36d5644 74dc135160
commit d02a4f587d
52 changed files with 2836 additions and 665 deletions
--- a/.github/workflows/cmake_macos.yml
+++ b/.github/workflows/cmake_macos.yml
@@ -56,22 +56,13 @@ jobs:
          - name: SDL GUI
            qt: off
            static: on
-            src-packages: >-
-              libsndfile
          - name: Qt GUI
            qt: on
            slug: -Qt
            packages: >-
              qt@5
-            src-packages: >-
-              libsndfile

    steps:
-      - name: Install source dependencies
-        run: >-
-          brew reinstall -s
-          ${{ matrix.ui.src-packages }}
-
      - name: Install dependencies
        run: >-
          brew install
@@ -158,22 +149,13 @@ jobs:
          - name: SDL GUI
            qt: off
            static: on
-            src-packages: >-
-              libsndfile
          - name: Qt GUI
            qt: on
            slug: -Qt
            packages: >-
              qt@5
-            src-packages: >-
-              libsndfile

    steps:
-      - name: Install source dependencies
-        run: >-
-          brew reinstall -s
-          ${{ matrix.ui.src-packages }}
-
      - name: Install dependencies
        run: >-
          brew install
--- a/src/86box.c
+++ b/src/86box.c
@@ -160,6 +160,7 @@ int      window_remember;
 int      vid_resize;                                              /* (C) allow resizing */
 int      invert_display                         = 0;              /* (C) invert the display */
 int      suppress_overscan                      = 0;              /* (C) suppress overscans */
+int      lang_id                                = 0;              /* (C) language id */
 int      scale                                  = 0;              /* (C) screen scale factor */
 int      dpi_scale                              = 0;              /* (C) DPI scaling of the emulated
                                                                         screen */
@@ -584,7 +585,7 @@ pc_init(int argc, char *argv[])
    uint32_t *uid;
    uint32_t *shwnd;
 #endif
-    uint32_t lang_init = 0;
+    int lang_init = 0;

    /* Grab the executable's full path. */
    plat_get_exe_name(exe_path, sizeof(exe_path) - 1);
--- a/src/cdrom/cdrom.c
+++ b/src/cdrom/cdrom.c
@@ -29,6 +29,9 @@
 #include <86box/cdrom.h>
 #include <86box/cdrom_image.h>
 #include <86box/cdrom_interface.h>
+#ifdef USE_CDROM_MITSUMI
+#include <86box/cdrom_mitsumi.h>
+#endif
 #include <86box/log.h>
 #include <86box/plat.h>
 #include <86box/plat_cdrom_ioctl.h>
@@ -117,6 +120,9 @@ static const struct {
 } controllers[] = {
    // clang-format off
    { &cdrom_interface_none_device  },
+#ifdef USE_CDROM_MITSUMI
+    { &mitsumi_cdrom_device },
+#endif
    { NULL                          }
    // clang-format on
 };
--- a/src/config.c
+++ b/src/config.c
@@ -186,7 +186,7 @@ load_general(void)
    if (p != NULL)
        lang_id = plat_language_code(p);
    else
-        lang_id = 0xffff;
+        lang_id = plat_language_code(DEFAULT_LANGUAGE);

    mouse_sensitivity = ini_section_get_double(cat, "mouse_sensitivity", 1.0);
    if (mouse_sensitivity < 0.1)
@@ -1842,7 +1842,7 @@ config_load(void)
        cassette_pcm          = 0;
        cassette_ui_writeprot = 0;

-        lang_id = DEFAULT_LANGUAGE;
+        lang_id = plat_language_code(DEFAULT_LANGUAGE);

        config_log("Config file not present or invalid!\n");
    } else {
@@ -2029,7 +2029,7 @@ save_general(void)
    else
        ini_section_delete_var(cat, "mouse_sensitivity");

-    if (lang_id == DEFAULT_LANGUAGE)
+    if (lang_id == plat_language_code(DEFAULT_LANGUAGE))
        ini_section_delete_var(cat, "language");
    else {
        plat_language_code_r(lang_id, buffer, 511);
--- a/src/device/kbc_at.c
+++ b/src/device/kbc_at.c
@@ -2807,7 +2807,7 @@ const device_t keyboard_ps2_acer_pci_device = {

 const device_t keyboard_ps2_phoenix_pci_device = {
    .name          = "PS/2 Keyboard (Phoenix)",
-    .internal_name = "keyboard_ps2_acer_pci",
+    .internal_name = "keyboard_ps2_phoenix_pci",
    .flags         = DEVICE_KBC | DEVICE_PCI,
    .local         = KBC_TYPE_PS2_1 | KBC_VEN_PHOENIX,
    .init          = kbc_at_init,
--- a/src/include/86box/86box.h
+++ b/src/include/86box/86box.h
@@ -44,8 +44,8 @@
 /* Max UUID Length */
 #define MAX_UUID_LEN 64

-/* Default language 0xFFFF = from system, 0x409 = en-US */
-#define DEFAULT_LANGUAGE 0xffff
+/* Default language code */
+#define DEFAULT_LANGUAGE "system"

 #define POSTCARDS_NUM 4
 #define POSTCARD_MASK (POSTCARDS_NUM - 1)
@@ -84,8 +84,6 @@ extern "C" {
 #endif

 /* Global variables. */
-extern uint32_t lang_sys; /* (-) system language code */
-
 extern int dump_on_exit;        /* (O) dump regs on exit*/
 extern int start_in_fullscreen; /* (O) start in fullscreen */
 #ifdef _WIN32
@@ -117,7 +115,7 @@ extern int      window_remember;
 extern int      vid_resize;                 /* (C) allow resizing */
 extern int      invert_display;             /* (C) invert the display */
 extern int      suppress_overscan;          /* (C) suppress overscans */
-extern uint32_t lang_id;                    /* (C) language code identifier */
+extern int      lang_id;                    /* (C) language id */
 extern int      scale;                      /* (C) screen scale factor */
 extern int      dpi_scale;                  /* (C) DPI scaling of the emulated screen */
 extern int      vid_api;                    /* (C) video renderer */
--- a/src/include/86box/machine.h
+++ b/src/include/86box/machine.h
@@ -571,6 +571,7 @@ extern int machine_at_r418_init(const machine_t *);
 extern int machine_at_ls486e_init(const machine_t *);
 extern int machine_at_4dps_init(const machine_t *);
 extern int machine_at_ms4144_init(const machine_t *);
+extern int machine_at_acerp3_init(const machine_t *);
 extern int machine_at_4saw2_init(const machine_t *);
 extern int machine_at_m4li_init(const machine_t *);
 extern int machine_at_alfredo_init(const machine_t *);
--- a/src/include/86box/plat.h
+++ b/src/include/86box/plat.h
@@ -160,8 +160,8 @@ extern int      plat_vidapi(const char *name);
 extern char    *plat_vidapi_name(int api);
 extern void     plat_resize(int x, int y, int monitor_index);
 extern void     plat_resize_request(int x, int y, int monitor_index);
-extern uint32_t plat_language_code(char *langcode);
-extern void     plat_language_code_r(uint32_t lcid, char *outbuf, int len);
+extern int      plat_language_code(char *langcode);
+extern void     plat_language_code_r(int id, char *outbuf, int len);
 extern void     plat_get_cpu_string(char *outbuf, uint8_t len);
 extern void     plat_set_thread_name(void *thread, const char *name);
 extern void     plat_break(void);
--- a/src/machine/m_at_386dx_486.c
+++ b/src/machine/m_at_386dx_486.c
@@ -1182,6 +1182,39 @@ machine_at_ms4144_init(const machine_t *model)
    return ret;
 }

+int
+machine_at_acerp3_init(const machine_t *model)
+{
+    int ret;
+
+    ret = bios_load_linear("roms/machines/acerp3/Acer Mate 600 P3 BIOS U13 V2.0R02-J3 ACR8DE00-S00-950911-R02-J3.bin",
+                           0x000e0000, 131072, 0);
+
+    if (bios_only || !ret)
+        return ret;
+
+    machine_at_common_init_ex(model, 2);
+
+    machine_at_sis_85c496_common_init(model);
+    device_add(&sis_85c496_device);
+    pci_register_slot(0x09, PCI_CARD_VIDEO,  0, 0, 0, 0);
+    pci_register_slot(0x0A, PCI_CARD_IDE, 	 0, 0, 0, 0);
+    pci_register_slot(0x12, PCI_CARD_NORMAL, 3, 4, 1, 2);
+    pci_register_slot(0x13, PCI_CARD_NORMAL, 2, 3, 4, 1);
+	pci_register_slot(0x14, PCI_CARD_NORMAL, 1, 2, 3, 4);
+
+    device_add(&fdc37c665_ide_device);
+    device_add(&keyboard_ps2_acer_pci_device);
+	device_add(&ide_cmd640_pci_legacy_only_device);
+	
+	if (gfxcard[0] == VID_INTERNAL)
+        device_add(&gd5434_onboard_pci_device);
+
+    device_add(&intel_flash_bxt_device);
+
+    return ret;
+}
+
 int
 machine_at_486sp3c_init(const machine_t *model)
 {
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -8357,6 +8357,45 @@ const machine_t machines[] = {
        .snd_device = NULL,
        .net_device = NULL
    },
+    {
+        .name = "[SiS 496] Acer P3",
+        .internal_name = "acerp3",
+        .type = MACHINE_TYPE_486_S3_PCI,
+        .chipset = MACHINE_CHIPSET_SIS_496,
+        .init = machine_at_acerp3_init,
+        .p1_handler = NULL,
+        .gpio_handler = NULL,
+        .available_flag = MACHINE_AVAILABLE,
+        .gpio_acpi_handler = NULL,
+        .cpu = {
+            .package = CPU_PKG_SOCKET3,
+            .block = CPU_BLOCK(CPU_i486SX, CPU_i486DX, CPU_Am486SX, CPU_Am486DX),
+            .min_bus = 0,
+            .max_bus = 0,
+            .min_voltage = 0,
+            .max_voltage = 0,
+            .min_multi = 0,
+            .max_multi = 0
+        },
+        .bus_flags = MACHINE_PS2_PCI,
+        .flags = MACHINE_IDE_DUAL | MACHINE_APM | MACHINE_VIDEO,
+        .ram = {
+            .min = 2048,
+            .max = 131072,
+            .step = 1024
+        },
+        .nvrmask = 255,
+        .kbc_device = NULL,
+        .kbc_p1 = 0xff,
+        .gpio = 0xffffffff,
+        .gpio_acpi = 0xffffffff,
+        .device = NULL,
+        .fdc_device = NULL,
+        .sio_device = NULL,
+        .vid_device = NULL,
+        .snd_device = NULL,
+        .net_device = NULL
+    },
    /* This has an AMIKey-2, which is an updated version of type 'H'. */
    {
        .name = "[SiS 496] ASUS PVI-486SP3C",
--- a/src/network/network.c
+++ b/src/network/network.c
@@ -501,7 +501,7 @@ network_attach(void *card_drv, uint8_t *mac, NETRXCB rx, NETSETLINKSTATE set_lin

        if(net_cards_conf[net_card_current].net_type != NET_TYPE_NONE) {
            // We're here because of a failure
-            swprintf(tempmsg, sizeof_w(tempmsg), L"%ls:<br /><br />%s<br /><br />%ls", plat_get_string(STRING_NET_ERROR), net_drv_error, plat_get_string(STRING_NET_ERROR_DESC));
+            swprintf(tempmsg, sizeof_w(tempmsg), L"%ls:\n\n%s\n\n%ls", plat_get_string(STRING_NET_ERROR), net_drv_error, plat_get_string(STRING_NET_ERROR_DESC));
            ui_msgbox(MBX_ERROR, tempmsg);
            net_cards_conf[net_card_current].net_type = NET_TYPE_NONE;
        }
--- a/src/qt/CMakeLists.txt
+++ b/src/qt/CMakeLists.txt
@@ -207,6 +207,10 @@ if(WACOM)
    target_compile_definitions(ui PRIVATE USE_WACOM)
 endif()

+if(CDROM_MITSUMI)
+    target_compile_definitions(ui PRIVATE USE_CDROM_MITSUMI)
+endif()
+
 if(WIN32)
    enable_language(RC)
    target_sources(86Box PUBLIC 86Box-qt.rc)
--- a/src/qt/languages/86box.pot
+++ b/src/qt/languages/86box.pot
@@ -450,15 +450,6 @@ msgstr ""
 msgid "YMFM (faster)"
 msgstr ""

-msgid "Network type:"
-msgstr ""
-
-msgid "PCap device:"
-msgstr ""
-
-msgid "Network adapter:"
-msgstr ""
-
 msgid "COM1 Device:"
 msgstr ""

@@ -1350,16 +1341,16 @@ msgstr ""
 msgid "Network Card #4"
 msgstr ""

-msgid "Mode"
+msgid "Mode:"
 msgstr ""

-msgid "Interface"
+msgid "Interface:"
 msgstr ""

-msgid "Adapter"
+msgid "Adapter:"
 msgstr ""

-msgid "VDE Socket"
+msgid "VDE Socket:"
 msgstr ""

 msgid "86Box Unit Tester"
@@ -1818,6 +1809,9 @@ msgstr ""
 msgid "Five + Wheel"
 msgstr ""

+msgid "Five + 2 Wheels"
+msgstr ""
+
 msgid "A3 - SMT2 Serial / SMT3(R)V"
 msgstr ""

@@ -2124,6 +2118,9 @@ msgstr ""
 msgid "Options"
 msgstr ""

+msgid "Model"
+msgstr ""
+
 msgid "Model:"
 msgstr ""

--- a/src/qt/languages/ca-ES.po
+++ b/src/qt/languages/ca-ES.po
@@ -450,15 +450,6 @@ msgstr "Nuked (més acurat)"
 msgid "YMFM (faster)"
 msgstr "YMFM (més ràpid)"

-msgid "Network type:"
-msgstr "Tipus de xarxa:"
-
-msgid "PCap device:"
-msgstr "Dispositiu PCap:"
-
-msgid "Network adapter:"
-msgstr "Adaptador de xarxa:"
-
 msgid "COM1 Device:"
 msgstr "Dispositiu COM1:"

@@ -1350,17 +1341,17 @@ msgstr "Targeta de xarxa 3"
 msgid "Network Card #4"
 msgstr "Targeta de xarxa 4"

-msgid "Mode"
-msgstr "Mode"
+msgid "Mode:"
+msgstr "Mode:"

-msgid "Interface"
-msgstr "Interfície"
+msgid "Interface:"
+msgstr "Interfície:"

-msgid "Adapter"
-msgstr "Adaptador"
+msgid "Adapter:"
+msgstr "Adaptador:"

-msgid "VDE Socket"
-msgstr "Socket de VDE"
+msgid "VDE Socket:"
+msgstr "Socket de VDE:"

 msgid "86Box Unit Tester"
 msgstr "Test de la unitat de 86 Box"
@@ -1818,6 +1809,9 @@ msgstr "Roda"
 msgid "Five + Wheel"
 msgstr "Cinc + roda"

+msgid "Five + 2 Wheels"
+msgstr ""
+
 msgid "A3 - SMT2 Serial / SMT3(R)V"
 msgstr "A3 - SMT2 sèrie / SMT3(R)V"

@@ -2118,6 +2112,9 @@ msgstr ""
 msgid "Options"
 msgstr ""

+msgid "Model"
+msgstr ""
+
 msgid "Model:"
 msgstr ""

--- a/src/qt/languages/cs-CZ.po
+++ b/src/qt/languages/cs-CZ.po
@@ -450,15 +450,6 @@ msgstr "Nuked (přesnější)"
 msgid "YMFM (faster)"
 msgstr "YMFM (rychlejší)"

-msgid "Network type:"
-msgstr "Druh sítě:"
-
-msgid "PCap device:"
-msgstr "PCap zařízení:"
-
-msgid "Network adapter:"
-msgstr "Síťový adaptér:"
-
 msgid "COM1 Device:"
 msgstr "Zařízení na COM1:"

@@ -1350,17 +1341,17 @@ msgstr "Síťová karta 3"
 msgid "Network Card #4"
 msgstr "Síťová karta 4"

-msgid "Mode"
-msgstr "Režim"
+msgid "Mode:"
+msgstr "Režim:"

-msgid "Interface"
-msgstr "Rozhraní"
+msgid "Interface:"
+msgstr "Rozhraní:"

-msgid "Adapter"
-msgstr "Adaptér"
+msgid "Adapter:"
+msgstr "Adaptér:"

-msgid "VDE Socket"
-msgstr "Zásuvka VDE"
+msgid "VDE Socket:"
+msgstr "Zásuvka VDE:"

 msgid "86Box Unit Tester"
 msgstr "86Box Unit Tester"
@@ -1818,6 +1809,9 @@ msgstr "Kolečko"
 msgid "Five + Wheel"
 msgstr "Pět + kolečko"

+msgid "Five + 2 Wheels"
+msgstr ""
+
 msgid "A3 - SMT2 Serial / SMT3(R)V"
 msgstr "A3 - SMT2 sériová / SMT3(R)V"

@@ -2118,6 +2112,9 @@ msgstr ""
 msgid "Options"
 msgstr ""

+msgid "Model"
+msgstr ""
+
 msgid "Model:"
 msgstr ""

--- a/src/qt/languages/de-DE.po
+++ b/src/qt/languages/de-DE.po
@@ -450,15 +450,6 @@ msgstr "Nuked (genauer)"
 msgid "YMFM (faster)"
 msgstr "YMFM (schneller)"

-msgid "Network type:"
-msgstr "Netzwerktyp:"
-
-msgid "PCap device:"
-msgstr "PCap-Gerät:"
-
-msgid "Network adapter:"
-msgstr "Netzwerkadapter:"
-
 msgid "COM1 Device:"
 msgstr "COM1-Gerät:"

@@ -1353,17 +1344,17 @@ msgstr "Netzwerkkarte 3"
 msgid "Network Card #4"
 msgstr "Netzwerkkarte 4"

-msgid "Mode"
-msgstr "Modus"
+msgid "Mode:"
+msgstr "Modus:"

-msgid "Interface"
-msgstr "Schnittstelle"
+msgid "Interface:"
+msgstr "Schnittstelle:"

-msgid "Adapter"
-msgstr "Adapter"
+msgid "Adapter:"
+msgstr "Adapter:"

-msgid "VDE Socket"
-msgstr "VDE Port"
+msgid "VDE Socket:"
+msgstr "VDE Port:"

 msgid "86Box Unit Tester"
 msgstr "86Box-Gerätetester"
@@ -1821,6 +1812,9 @@ msgstr "Rad"
 msgid "Five + Wheel"
 msgstr "Fünf + Rad"

+msgid "Five + 2 Wheels"
+msgstr ""
+
 msgid "A3 - SMT2 Serial / SMT3(R)V"
 msgstr "A3 - SMT2 Seriell / SMT3(R)V"

@@ -2121,6 +2115,9 @@ msgstr ""
 msgid "Options"
 msgstr ""

+msgid "Model"
+msgstr ""
+
 msgid "Model:"
 msgstr ""

--- a/src/qt/languages/es-ES.po
+++ b/src/qt/languages/es-ES.po
@@ -450,15 +450,6 @@ msgstr "Nuked (más preciso)"
 msgid "YMFM (faster)"
 msgstr "YMFM (más rápido)"

-msgid "Network type:"
-msgstr "Tipo de red:"
-
-msgid "PCap device:"
-msgstr "Dispositivo PCap:"
-
-msgid "Network adapter:"
-msgstr "Adaptador de red:"
-
 msgid "COM1 Device:"
 msgstr "Dispositivo COM1:"

@@ -1349,17 +1340,17 @@ msgstr "Tarjeta de red 3"
 msgid "Network Card #4"
 msgstr "Tarjeta de red 4"

-msgid "Mode"
-msgstr "Modalidad"
+msgid "Mode:"
+msgstr "Modalidad:"

-msgid "Interface"
-msgstr "Interfaz"
+msgid "Interface:"
+msgstr "Interfaz:"

-msgid "Adapter"
-msgstr "Adaptador"
+msgid "Adapter:"
+msgstr "Adaptador:"

-msgid "VDE Socket"
-msgstr "Toma VDE"
+msgid "VDE Socket:"
+msgstr "Toma VDE:"

 msgid "86Box Unit Tester"
 msgstr "Comprobador de unidad 86Box"
@@ -1817,6 +1808,9 @@ msgstr "Rueda"
 msgid "Five + Wheel"
 msgstr "Cinco + rueda"

+msgid "Five + 2 Wheels"
+msgstr ""
+
 msgid "A3 - SMT2 Serial / SMT3(R)V"
 msgstr "A3 - SMT2 serie / SMT3(R)V"

@@ -2117,6 +2111,9 @@ msgstr ""
 msgid "Options"
 msgstr ""

+msgid "Model"
+msgstr ""
+
 msgid "Model:"
 msgstr ""

--- a/src/qt/languages/fi-FI.po
+++ b/src/qt/languages/fi-FI.po
@@ -450,15 +450,6 @@ msgstr "Nuked (tarkempi)"
 msgid "YMFM (faster)"
 msgstr "YMFM (nopeampi)"

-msgid "Network type:"
-msgstr "Verkon tyyppi:"
-
-msgid "PCap device:"
-msgstr "PCap-laite:"
-
-msgid "Network adapter:"
-msgstr "Verkkokortti:"
-
 msgid "COM1 Device:"
 msgstr "COM1-laite:"

@@ -1353,17 +1344,17 @@ msgstr "Verkkokortti 3"
 msgid "Network Card #4"
 msgstr "Verkkokortti 4"

-msgid "Mode"
-msgstr "Tila"
+msgid "Mode:"
+msgstr "Tila:"

-msgid "Interface"
-msgstr "Liitäntä"
+msgid "Interface:"
+msgstr "Liitäntä:"

-msgid "Adapter"
-msgstr "Sovitin"
+msgid "Adapter:"
+msgstr "Sovitin:"

-msgid "VDE Socket"
-msgstr "VDE-pistorasia"
+msgid "VDE Socket:"
+msgstr "VDE-pistorasia:"

 msgid "86Box Unit Tester"
 msgstr "86Box Unit Tester"
@@ -1821,6 +1812,9 @@ msgstr "Pyörä"
 msgid "Five + Wheel"
 msgstr "Viisi + pyörä"

+msgid "Five + 2 Wheels"
+msgstr ""
+
 msgid "A3 - SMT2 Serial / SMT3(R)V"
 msgstr "A3 - SMT2 sarja / SMT3(R)V"

@@ -2121,6 +2115,9 @@ msgstr ""
 msgid "Options"
 msgstr ""

+msgid "Model"
+msgstr ""
+
 msgid "Model:"
 msgstr ""

--- a/src/qt/languages/fr-FR.po
+++ b/src/qt/languages/fr-FR.po
@@ -40,7 +40,7 @@ msgid "Hide &toolbar"
 msgstr "Masquer la &barre d'outils"

 msgid "&Resizeable window"
-msgstr "Fenètre &Retaillable"
+msgstr "Fenêtre &Redimensionnable"

 msgid "R&emember size && position"
 msgstr "S&auvegarder taille && position"
@@ -61,7 +61,7 @@ msgid "&VNC"
 msgstr "&VNC"

 msgid "Specify dimensions..."
-msgstr "Specifier dimensions..."
+msgstr "Spécifier dimensions..."

 msgid "F&orce 4:3 display ratio"
 msgstr "F&orcer 4:3"
@@ -100,7 +100,7 @@ msgid "&8x"
 msgstr "&8x"

 msgid "Filter method"
-msgstr "Methode Filtre"
+msgstr "Méthode Filtre"

 msgid "&Nearest"
 msgstr "&Plus proche"
@@ -157,7 +157,7 @@ msgid "&White monitor"
 msgstr "Moniteur &Blanc"

 msgid "Grayscale &conversion type"
-msgstr "Grayscale &conversion type"
+msgstr "Mode &Conversion tons de gris"

 msgid "BT&601 (NTSC/PAL)"
 msgstr "BT&601 (NTSC/PAL)"
@@ -169,7 +169,7 @@ msgid "&Average"
 msgstr "&Moyenne"

 msgid "CGA/PCjr/Tandy/E&GA/(S)VGA overscan"
-msgstr "CGA/PCjr/Tandy/E&GA/(S)VGA overscan"
+msgstr "Overscan CGA/PCjr/Tandy/E&GA/(S)VGA"

 msgid "Change contrast for &monochrome display"
 msgstr "Modifier contraste affichage &monochrome"
@@ -205,7 +205,7 @@ msgid "Begin trace"
 msgstr "Démarrer traces"

 msgid "End trace"
-msgstr "Finir traces"
+msgstr "Arrêter traces"

 msgid "&Help"
 msgstr "&Aide"
@@ -244,7 +244,7 @@ msgid "&Image..."
 msgstr "&Image..."

 msgid "E&xport to 86F..."
-msgstr "E&xport vers 86F..."
+msgstr "E&xporter vers 86F..."

 msgid "&Mute"
 msgstr "&Couper"
@@ -301,7 +301,7 @@ msgid "Settings"
 msgstr "Réglages"

 msgid "Specify Main Window Dimensions"
-msgstr "Spécifier le détournement de la fenêtre principale"
+msgstr "Spécifier les dimensions de la fenêtre principale"

 msgid "OK"
 msgstr "OK"
@@ -349,7 +349,7 @@ msgid "Configure"
 msgstr "Configurer"

 msgid "CPU type:"
-msgstr "Type du processeur:"
+msgstr "Type de processeur:"

 msgid "Speed:"
 msgstr "Vitesse:"
@@ -403,7 +403,7 @@ msgid "Mouse:"
 msgstr "Souris:"

 msgid "Joystick:"
-msgstr "Manette de commande:"
+msgstr "Manette:"

 msgid "Joystick 1..."
 msgstr "Manette 1..."
@@ -450,15 +450,6 @@ msgstr "Nuked (plus précis)"
 msgid "YMFM (faster)"
 msgstr "YMFM (plus rapide)"

-msgid "Network type:"
-msgstr "Type de réseau:"
-
-msgid "PCap device:"
-msgstr "Dispositif PCap:"
-
-msgid "Network adapter:"
-msgstr "Adaptateur de réseau:"
-
 msgid "COM1 Device:"
 msgstr "Dispositif COM1:"

@@ -607,7 +598,7 @@ msgid "ISA RTC:"
 msgstr "Horloge temps réel ISA:"

 msgid "ISA Memory Expansion"
-msgstr "Expansion de la mémoire ISA"
+msgstr "Extension de mémoire ISA"

 msgid "Card 1:"
 msgstr "Carte 1:"
@@ -670,7 +661,7 @@ msgid "Off"
 msgstr "Désactivé"

 msgid "All images"
-msgstr "Tous les images"
+msgstr "Toutes les images"

 msgid "Basic sector images"
 msgstr "Images basiques du secteur"
@@ -862,16 +853,16 @@ msgid "Hardware not available"
 msgstr "Matériel non disponible"

 msgid "Make sure %1 is installed and that you are on a %1-compatible network connection."
-msgstr "Assurez-vous que %1 est installé et que vou utilisez une connexion réseau compatible avec %1."
+msgstr "Assurez-vous que %1 est installé et que vous utilisez une connexion réseau compatible avec %1."

 msgid "Invalid configuration"
 msgstr "Configuration non valide"

 msgid "%1 is required for automatic conversion of PostScript files to PDF.\n\nAny documents sent to the generic PostScript printer will be saved as PostScript (.ps) files."
-msgstr "%1 est nécessair pour la conversion automatique des fichiers PostScript dans PDF.\n\nTous les documents envoyés à l'imprimante générique PostScript seront sauvés comme des fichiers PostScript (.ps)."
+msgstr "%1 est nécessaire pour la conversion automatique des fichiers PostScript en PDF.\n\nTous les documents envoyés à l'imprimante générique PostScript seront sauvés en tant que fichiers PostScript (.ps)."

 msgid "%1 is required for automatic conversion of PCL files to PDF.\n\nAny documents sent to the generic PCL printer will be saved as Printer Command Language (.pcl) files."
-msgstr "%1 est nécessair pour la conversion automatique des fichiers PCL dans PDF.\n\nTous les documents envoyés à l'imprimante générique PCL seront sauvés comme des fichiers Printer Command Language (.pcl)."
+msgstr "%1 est nécessaire pour la conversion automatique des fichiers PCL en PDF.\n\nTous les documents envoyés à l'imprimante générique PCL seront sauvés en tant quefichiers Printer Command Language (.pcl)."

 msgid "Entering fullscreen mode"
 msgstr "Entrer en mode plein écran"
@@ -904,7 +895,7 @@ msgid "You are loading an unsupported configuration"
 msgstr "Vous chargez une configuration non prise en charge"

 msgid "CPU type filtering based on selected machine is disabled for this emulated machine.\n\nThis makes it possible to choose a CPU that is otherwise incompatible with the selected machine. However, you may run into incompatibilities with the machine BIOS or other software.\n\nEnabling this setting is not officially supported and any bug reports filed may be closed as invalid."
-msgstr "La filtrage du type du processeur sur la base de la machine sélectionné est désactivé pur cette machine émulée.\n\nCela permet de sélectionner une processeur que est sinon incompatible avec la machine sélectionné. Cependant, il pourrait y avoir des incompatibilités avec le BIOS de la machine ou autres logiciels.\n\nL'activatione de cette configuration non est officiellement prise en charge et tout rapport de bogue peut être fermé comme étant invalide."
+msgstr "Le filtrage du type du processeur sur la base de la machine sélectionnée est désactivé pur cette machine émulée.\n\nCela permet de sélectionner un processeur qui est sinon incompatible avec la machine sélectionné. Cependant, il pourrait y avoir des incompatibilités avec le BIOS de la machine ou autres logiciels.\n\nL'activation de cette configuration non officiellement prise en charge implique que tout rapport de bogue peut être fermé comme étant invalide."

 msgid "Continue"
 msgstr "Continuer"
@@ -928,7 +919,7 @@ msgid "Pause execution"
 msgstr "Pause de l'exécution"

 msgid "Press Ctrl+Alt+Del"
-msgstr "Appuyer sur Ctrl+Alt+Suppr."
+msgstr "Appuyer sur Ctrl+Alt+Suppr"

 msgid "Press Ctrl+Alt+Esc"
 msgstr "Appuyer sur Ctrl+Alt+Esc"
@@ -958,13 +949,13 @@ msgid "Add Existing Hard Disk"
 msgstr "Ajouter un disque dur existant"

 msgid "HDI disk images cannot be larger than 4 GB."
-msgstr "Les images de disque HDI ne peuvent pas avoir une taille supériure à Go."
+msgstr "Les images de disque HDI ne peuvent pas avoir une taille supérieure à 4 Go."

 msgid "Disk images cannot be larger than 127 GB."
-msgstr "Les images de disque ne peuvent pas avoir un taille supérieure à 127 Go."
+msgstr "Les images de disque ne peuvent pas avoir une taille supérieure à 127 Go."

 msgid "Hard disk images"
-msgstr "Images de dique dur"
+msgstr "Images de disque dur"

 msgid "Unable to read file"
 msgstr "Impossible de lire le fichier"
@@ -973,10 +964,10 @@ msgid "Unable to write file"
 msgstr "Impossible d'écrire le fichier"

 msgid "HDI or HDX images with a sector size other than 512 are not supported."
-msgstr "Les images HDI ou HDX avec une taille de secteur différente de 512 non sont pas prises en charge."
+msgstr "Les images HDI ou HDX avec une taille de secteur différente de 512 ne sont pas prises en charge."

 msgid "Disk image file already exists"
-msgstr "Le fichier de l'image disque existe déjà."
+msgstr "Le fichier de l'image disque existe déjà"

 msgid "Please specify a valid file name."
 msgstr "Veuillez spécifier un nom de fichier valide."
@@ -1048,10 +1039,10 @@ msgid "Differencing VHD (.vhd)"
 msgstr "VHD à différenciation (.vhd)"

 msgid "Large blocks (2 MB)"
-msgstr "Blocs grands (2 Mo)"
+msgstr "Grands Blocs (2 Mo)"

 msgid "Small blocks (512 KB)"
-msgstr "Blocs petits (512 Ko)"
+msgstr "Petits Blocs (512 Ko)"

 msgid "VHD files"
 msgstr "Fichiers VHD"
@@ -1060,10 +1051,10 @@ msgid "Select the parent VHD"
 msgstr "Sélectionnez le VHD parent"

 msgid "This could mean that the parent image was modified after the differencing image was created.\n\nIt can also happen if the image files were moved or copied, or by a bug in the program that created this disk.\n\nDo you want to fix the timestamps?"
-msgstr "Il est possible que l'image parente a été modifié après la création de l'image à différenciation.\n\nIl est même possible que les fichiers de l'mage ont été déplacés ou copiés ou il existe un bogue dans le programme que a créé ce disque.\n\nVoulez-vous réparer l'horodatage?"
+msgstr "Il est possible que l'image parente ai été modifiée après la création de l'image à différenciation.\n\nIl est même possible que les fichiers de l’image ont été déplacés ou copiés ou il existe un bogue dans le programme qui a créé ce disque.\n\nVoulez-vous réparer l'horodatage?"

 msgid "Parent and child disk timestamps do not match"
-msgstr "Les horodatages des disques parent et enfant ne correspondent pas"
+msgstr "Les horodatages des disques parents et enfants ne correspondent pas"

 msgid "Could not fix VHD timestamp."
 msgstr "Impossible de réparer l'horodatage du VHD."
@@ -1174,7 +1165,7 @@ msgid "Failed to initialize network driver"
 msgstr "Échec de l'initialisation du pilote réseau"

 msgid "The network configuration will be switched to the null driver"
-msgstr "La configuration du réseau passera au pilote nul"
+msgstr "La configuration du réseau passera au pilote NULL"

 msgid "Mouse sensitivity:"
 msgstr "Sensibilité de la souris:"
@@ -1195,7 +1186,7 @@ msgid "Fast"
 msgstr "Rapide"

 msgid "&Auto-pause on focus loss"
-msgstr "&Pause automatique à perte de mise au point"
+msgstr "&Pause automatique à perte de focus"

 msgid "WinBox is no longer supported"
 msgstr "WinBox n'est plus pris en charge"
@@ -1225,13 +1216,13 @@ msgid "List of MCA devices:"
 msgstr "Liste des dispositifs MCA :"

 msgid "Tablet tool"
-msgstr "Nástroj pro tablety"
+msgstr "Outil Tablette"

 msgid "Qt (OpenGL &ES)"
 msgstr "Qt (OpenGL &ES)"

 msgid "About Qt"
-msgstr "O programu Qt"
+msgstr "A propos de Qt"

 msgid "MCA devices..."
 msgstr "Dispositifs MCA..."
@@ -1270,7 +1261,7 @@ msgid "Unknown Bus"
 msgstr "Bus inconnu"

 msgid "Null Driver"
-msgstr "Pilote nul"
+msgstr "Pilote NULL"

 msgid "NIC %1 (%2) %3"
 msgstr "NIC %1 (%2) %3"
@@ -1282,7 +1273,7 @@ msgid "Use target framerate:"
 msgstr "Utiliser le taux de rafraîchissement cible:"

 msgid " fps"
-msgstr " mages par seconde"
+msgstr " Images par seconde"

 msgid "VSync"
 msgstr "VSync"
@@ -1330,7 +1321,7 @@ msgid "I Copied It"
 msgstr "Je l'ai copié"

 msgid "86Box Monitor #"
-msgstr "Moniteur 86Box "
+msgstr "Moniteur 86Box"

 msgid "No MCA devices."
 msgstr "Pas de dispositifs MCA."
@@ -1350,17 +1341,17 @@ msgstr "Carte réseau 3"
 msgid "Network Card #4"
 msgstr "Carte réseau 4"

-msgid "Mode"
-msgstr "Mode"
+msgid "Mode:"
+msgstr "Mode:"

-msgid "Interface"
-msgstr "Interface"
+msgid "Interface:"
+msgstr "Interface:"

-msgid "Adapter"
-msgstr "Adaptateur"
+msgid "Adapter:"
+msgstr "Adaptateur:"

-msgid "VDE Socket"
-msgstr "Prise VDE"
+msgid "VDE Socket:"
+msgstr "Prise VDE:"

 msgid "86Box Unit Tester"
 msgstr "Testeur d'unité de 86Box"
@@ -1621,7 +1612,7 @@ msgid "Enable Game port"
 msgstr "Activer le port de jeu"

 msgid "Surround module"
-msgstr "Module d'ambiance"
+msgstr "Module Surround"

 msgid "CODEC"
 msgstr "CODEC"
@@ -1818,6 +1809,9 @@ msgstr "Molette"
 msgid "Five + Wheel"
 msgstr "Cinq + molette"

+msgid "Five + 2 Wheels"
+msgstr ""
+
 msgid "A3 - SMT2 Serial / SMT3(R)V"
 msgstr "A3 - SMT2 série / SMT3(R)V"

@@ -1846,7 +1840,7 @@ msgid "2 MB"
 msgstr "2 Mo"

 msgid "8 MB"
-msgstr " 8 Mo"
+msgstr "8 Mo"

 msgid "28 MB"
 msgstr "28 Mo"
@@ -2002,10 +1996,10 @@ msgid "Stereo LPT DAC"
 msgstr "Convertisseur numérique stéréo LPT"

 msgid "Generic Text Printer"
-msgstr "Imprimante de texte générique"
+msgstr "Imprimante Texte générique"

 msgid "Generic ESC/P Dot-Matrix Printer"
-msgstr "Imprimant générique ESC/P à matrice à points"
+msgstr "Imprimante matricielle générique ESC/P"

 msgid "Generic PostScript Printer"
 msgstr "Imprimante PostScript générique"
@@ -2062,100 +2056,103 @@ msgid "[Generic] RAM Disk (max. speed)"
 msgstr "[Generic] Disque RAM (vitesse maximale)"

 msgid "[Generic] 1989 (3500 RPM)"
-msgstr ""
+msgstr "[Generic] 1989 (3500 RPM)"

 msgid "[Generic] 1992 (3600 RPM)"
-msgstr ""
+msgstr "[Generic] 1992 (3600 RPM)"

 msgid "[Generic] 1994 (4500 RPM)"
-msgstr ""
+msgstr "[Generic] 1994 (4500 RPM)"

 msgid "[Generic] 1996 (5400 RPM)"
-msgstr ""
+msgstr "[Generic] 1996 (5400 RPM)"

 msgid "[Generic] 1997 (5400 RPM)"
-msgstr ""
+msgstr "[Generic] 1997 (5400 RPM)"

 msgid "[Generic] 1998 (5400 RPM)"
-msgstr ""
+msgstr "[Generic] 1998 (5400 RPM)"

 msgid "[Generic] 2000 (7200 RPM)"
-msgstr ""
+msgstr "[Generic] 2000 (7200 RPM)"

 msgid "IBM 8514/A clone (ISA)"
-msgstr "Clon IBM 8514/A (ISA)"
+msgstr "Clone IBM 8514/A (ISA)"

 msgid "Vendor"
 msgstr "Fabricant"

 msgid "Generic PC/XT Memory Expansion"
-msgstr "Expansion de la mémoire générique PC/XT"
+msgstr "Extension de mémoire générique PC/XT"

 msgid "Generic PC/AT Memory Expansion"
-msgstr "Expansion de la mémoire générique PC/AT"
+msgstr "Extension de mémoire générique PC/AT"

 msgid "Unable to find Dot-Matrix fonts"
-msgstr "Impossible de trouver les polices à matrice à points"
+msgstr "Impossible de trouver les polices matricielles"

 msgid "TrueType fonts in the \"roms/printer/fonts\" directory are required for the emulation of the Generic ESC/P Dot-Matrix Printer."
-msgstr "Les polices TrueType dans le répertoire \"roms/printer/fonts\" sont nécessaires à l'émulation de l'imprimante générique ESC/P à matrice à points."
+msgstr "Les polices TrueType dans le répertoire \"roms/printer/fonts\" sont nécessaires à l'émulation de l'imprimante générique ESC/P matricielle."

 msgid "Inhibit multimedia keys"
-msgstr ""
+msgstr "Désactiver les touches multimédia"

 msgid "Ask for confirmation before saving settings"
-msgstr ""
+msgstr "Demander confirmation avant de sauvegarder les réglages"

 msgid "Ask for confirmation before hard resetting"
-msgstr ""
+msgstr "Demander confirmation avant Hard Reset"

 msgid "Ask for confirmation before quitting"
-msgstr ""
+msgstr "Demander confirmation avant de quitter"

 msgid "Display hotkey message when entering full-screen mode"
-msgstr ""
+msgstr "Afficher Raccourcis Clavier avant de passer en plein écran"

 msgid "Options"
-msgstr ""
+msgstr "Options"
+
+msgid "Model"
+msgstr "Modèle"

 msgid "Model:"
-msgstr ""
+msgstr "Modèle:"

 msgid "Failed to initialize Vulkan renderer."
-msgstr ""
+msgstr "Impossible d’initialiser le moteur de rendu Vulkan."

 msgid "GLSL Error"
-msgstr ""
+msgstr "Erreur GLSL"

 msgid "Could not load shader: %1"
-msgstr ""
+msgstr "Impossible de charger le shaker %1"

 msgid "OpenGL version 3.0 or greater is required. Current GLSL version is %1.%2"
-msgstr ""
+msgstr "OpenGL version 3.0 ou supérieur requis. Version installée: %1.%2"

 msgid "Could not load texture: %1"
-msgstr ""
+msgstr "Impossible de charger la texture %1"

 msgid "Could not compile shader:\n\n%1"
-msgstr ""
+msgstr "Impossible de compiler le shader:\n\n%1"

 msgid "Program not linked:\n\n%1"
-msgstr ""
+msgstr "Programme non linké:\n\n%1"

 msgid "Shader Manager"
-msgstr ""
+msgstr "Gestionnaire de shader"

 msgid "Shader Configuration"
-msgstr ""
+msgstr "Configuration Shader"

 msgid "Add"
-msgstr ""
+msgstr "Ajouter"

 msgid "Move up"
-msgstr ""
+msgstr "Monter"

 msgid "Move down"
-msgstr ""
+msgstr "Descendre"

 msgid "Could not load file %1"
-msgstr ""
+msgstr "Impossible de charger le fichier %1"
--- a/src/qt/languages/hr-HR.po
+++ b/src/qt/languages/hr-HR.po
@@ -450,15 +450,6 @@ msgstr "Nuked (precizniji)"
 msgid "YMFM (faster)"
 msgstr "YMFM (brži)"

-msgid "Network type:"
-msgstr "Tip mreže:"
-
-msgid "PCap device:"
-msgstr "Uređaj PCap:"
-
-msgid "Network adapter:"
-msgstr "Mrežna kartica:"
-
 msgid "COM1 Device:"
 msgstr "Uređaj COM1:"

@@ -1350,17 +1341,17 @@ msgstr "Mrežna kartica 3"
 msgid "Network Card #4"
 msgstr "Mrežna kartica 4"

-msgid "Mode"
-msgstr "Način"
+msgid "Mode:"
+msgstr "Način:"

-msgid "Interface"
-msgstr "Sučelje"
+msgid "Interface:"
+msgstr "Sučelje:"

-msgid "Adapter"
-msgstr "Adapter"
+msgid "Adapter:"
+msgstr "Adapter:"

-msgid "VDE Socket"
-msgstr "VDE utičnica"
+msgid "VDE Socket:"
+msgstr "VDE utičnica:"

 msgid "86Box Unit Tester"
 msgstr "Jedinični ispitivač 86Box-a"
@@ -1818,6 +1809,9 @@ msgstr "Kotač"
 msgid "Five + Wheel"
 msgstr "Pet + kotač"

+msgid "Five + 2 Wheels"
+msgstr ""
+
 msgid "A3 - SMT2 Serial / SMT3(R)V"
 msgstr "A3 - SMT2 serijski / SMT3(R)V"

@@ -2118,6 +2112,9 @@ msgstr ""
 msgid "Options"
 msgstr ""

+msgid "Model"
+msgstr ""
+
 msgid "Model:"
 msgstr ""

--- a/src/qt/languages/hu-HU.po
+++ b/src/qt/languages/hu-HU.po
@@ -450,15 +450,6 @@ msgstr "Nuked (pontosabb)"
 msgid "YMFM (faster)"
 msgstr "YMFM (gyorsabb)"

-msgid "Network type:"
-msgstr "Hálózati típusa:"
-
-msgid "PCap device:"
-msgstr "PCap eszköz:"
-
-msgid "Network adapter:"
-msgstr "Hálózati kártya:"
-
 msgid "COM1 Device:"
 msgstr "COM1 eszköz:"

@@ -1350,17 +1341,17 @@ msgstr "Hálózati kártya 3"
 msgid "Network Card #4"
 msgstr "Hálózati kártya 4"

-msgid "Mode"
-msgstr "Mód"
+msgid "Mode:"
+msgstr "Mód:"

-msgid "Interface"
-msgstr "Interfész"
+msgid "Interface:"
+msgstr "Interfész:"

-msgid "Adapter"
-msgstr "Adapter"
+msgid "Adapter:"
+msgstr "Adapter:"

-msgid "VDE Socket"
-msgstr "VDE aljzat"
+msgid "VDE Socket:"
+msgstr "VDE aljzat:"

 msgid "86Box Unit Tester"
 msgstr "86Box Unit Tester"
@@ -1818,6 +1809,9 @@ msgstr "Kerék"
 msgid "Five + Wheel"
 msgstr "Öt + kerék"

+msgid "Five + 2 Wheels"
+msgstr ""
+
 msgid "A3 - SMT2 Serial / SMT3(R)V"
 msgstr "A3 - SMT2 soros / SMT3(R)V"

@@ -2118,6 +2112,9 @@ msgstr ""
 msgid "Options"
 msgstr ""

+msgid "Model"
+msgstr ""
+
 msgid "Model:"
 msgstr ""

--- a/src/qt/languages/it-IT.po
+++ b/src/qt/languages/it-IT.po
@@ -450,15 +450,6 @@ msgstr "Nuked (più accurato)"
 msgid "YMFM (faster)"
 msgstr "YMFM (più veloce)"

-msgid "Network type:"
-msgstr "Tipo di rete:"
-
-msgid "PCap device:"
-msgstr "Dispositivo PCap:"
-
-msgid "Network adapter:"
-msgstr "Scheda di rete:"
-
 msgid "COM1 Device:"
 msgstr "Dispositivo COM1:"

@@ -1350,17 +1341,17 @@ msgstr "Scheda di rete n. 3"
 msgid "Network Card #4"
 msgstr "Scheda di rete n. 4"

-msgid "Mode"
-msgstr "Modalità"
+msgid "Mode:"
+msgstr "Modalità:"

-msgid "Interface"
-msgstr "Interfaccia"
+msgid "Interface:"
+msgstr "Interfaccia:"

-msgid "Adapter"
-msgstr "Adattatore"
+msgid "Adapter:"
+msgstr "Adattatore:"

-msgid "VDE Socket"
-msgstr "Presa VDE"
+msgid "VDE Socket:"
+msgstr "Presa VDE:"

 msgid "86Box Unit Tester"
 msgstr "Tester di unità 86Box"
@@ -1818,6 +1809,9 @@ msgstr "Ruota"
 msgid "Five + Wheel"
 msgstr "Cinque + ruota"

+msgid "Five + 2 Wheels"
+msgstr ""
+
 msgid "A3 - SMT2 Serial / SMT3(R)V"
 msgstr "A3 - SMT2 seriale / SMT3(R)V"

@@ -2118,6 +2112,9 @@ msgstr ""
 msgid "Options"
 msgstr ""

+msgid "Model"
+msgstr ""
+
 msgid "Model:"
 msgstr ""

--- a/src/qt/languages/ja-JP.po
+++ b/src/qt/languages/ja-JP.po
@@ -450,15 +450,6 @@ msgstr "Nuked(高精度化)"
 msgid "YMFM (faster)"
 msgstr "YMFM(より速く)"

-msgid "Network type:"
-msgstr "ネットワーク タイプ:"
-
-msgid "PCap device:"
-msgstr "PCapデバイス:"
-
-msgid "Network adapter:"
-msgstr "ネットワークアダプター:"
-
 msgid "COM1 Device:"
 msgstr "COM1デバイス:"

@@ -1350,17 +1341,17 @@ msgstr "ネットワークカード 3"
 msgid "Network Card #4"
 msgstr "ネットワークカード 4"

-msgid "Mode"
-msgstr "モード"
+msgid "Mode:"
+msgstr "モード:"

-msgid "Interface"
-msgstr "インターフェース"
+msgid "Interface:"
+msgstr "インターフェース:"

-msgid "Adapter"
-msgstr "アダプター"
+msgid "Adapter:"
+msgstr "アダプター:"

-msgid "VDE Socket"
-msgstr "VDEソケット"
+msgid "VDE Socket:"
+msgstr "VDEソケット:"

 msgid "86Box Unit Tester"
 msgstr "86Boxユニットテスター"
@@ -1818,6 +1809,9 @@ msgstr "ホイール"
 msgid "Five + Wheel"
 msgstr "五つ＋ホイール"

+msgid "Five + 2 Wheels"
+msgstr ""
+
 msgid "A3 - SMT2 Serial / SMT3(R)V"
 msgstr "A3 - SMT2 シリアル / SMT3(R)V"

@@ -2118,6 +2112,9 @@ msgstr ""
 msgid "Options"
 msgstr ""

+msgid "Model"
+msgstr ""
+
 msgid "Model:"
 msgstr ""

--- a/src/qt/languages/ko-KR.po
+++ b/src/qt/languages/ko-KR.po
@@ -450,15 +450,6 @@ msgstr "Nuked (더 정확한)"
 msgid "YMFM (faster)"
 msgstr "YMFM (더 빠르게)"

-msgid "Network type:"
-msgstr "네트워크 종류:"
-
-msgid "PCap device:"
-msgstr "PCap 장치:"
-
-msgid "Network adapter:"
-msgstr "네트워크 어댑터:"
-
 msgid "COM1 Device:"
 msgstr "COM1 장치:"

@@ -1350,17 +1341,17 @@ msgstr "네트워크 카드 3"
 msgid "Network Card #4"
 msgstr "네트워크 카드 4"

-msgid "Mode"
-msgstr "모드"
+msgid "Mode:"
+msgstr "모드:"

-msgid "Interface"
-msgstr "인터페이스"
+msgid "Interface:"
+msgstr "인터페이스:"

-msgid "Adapter"
-msgstr "어댑터"
+msgid "Adapter:"
+msgstr "어댑터:"

-msgid "VDE Socket"
-msgstr "VDE 소켓"
+msgid "VDE Socket:"
+msgstr "VDE 소켓:"

 msgid "86Box Unit Tester"
 msgstr "86Box 유닛 테스터"
@@ -1818,6 +1809,9 @@ msgstr "휠"
 msgid "Five + Wheel"
 msgstr "5개 + 휠"

+msgid "Five + 2 Wheels"
+msgstr ""
+
 msgid "A3 - SMT2 Serial / SMT3(R)V"
 msgstr "A3 - SMT2 직렬/SMT3(R)V"

@@ -2118,6 +2112,9 @@ msgstr ""
 msgid "Options"
 msgstr ""

+msgid "Model"
+msgstr ""
+
 msgid "Model:"
 msgstr ""

--- a/src/qt/languages/nl-NL.po
+++ b/src/qt/languages/nl-NL.po
@@ -450,15 +450,6 @@ msgstr "Nuked (nauwkeuriger)"
 msgid "YMFM (faster)"
 msgstr "YMFM (sneller)"

-msgid "Network type:"
-msgstr "Type netwerk:"
-
-msgid "PCap device:"
-msgstr "PCap-apparaat:"
-
-msgid "Network adapter:"
-msgstr "Netwerkadapter:"
-
 msgid "COM1 Device:"
 msgstr "COM1-apparaat:"

@@ -1350,17 +1341,17 @@ msgstr "Netwerkkaart #3"
 msgid "Network Card #4"
 msgstr "Netwerkkaart #4"

-msgid "Mode"
-msgstr "Modus"
+msgid "Mode:"
+msgstr "Modus:"

-msgid "Interface"
-msgstr "Interface"
+msgid "Interface:"
+msgstr "Interface:"

-msgid "Adapter"
-msgstr "Adapter"
+msgid "Adapter:"
+msgstr "Adapter:"

-msgid "VDE Socket"
-msgstr "VDE-socket"
+msgid "VDE Socket:"
+msgstr "VDE-socket:"

 msgid "86Box Unit Tester"
 msgstr "86Box apparaattester"
@@ -1818,6 +1809,9 @@ msgstr "Wiel"
 msgid "Five + Wheel"
 msgstr "Vijf + Wiel"

+msgid "Five + 2 Wheels"
+msgstr ""
+
 msgid "A3 - SMT2 Serial / SMT3(R)V"
 msgstr "A3 - SMT2 Serieel / SMT3(R)V"

@@ -2118,6 +2112,9 @@ msgstr ""
 msgid "Options"
 msgstr ""

+msgid "Model"
+msgstr ""
+
 msgid "Model:"
 msgstr ""

--- a/src/qt/languages/pl-PL.po
+++ b/src/qt/languages/pl-PL.po
@@ -450,15 +450,6 @@ msgstr "Nuked (dokładniejszy)"
 msgid "YMFM (faster)"
 msgstr "YMFM (szybszy)"

-msgid "Network type:"
-msgstr "Rodzaj sieci:"
-
-msgid "PCap device:"
-msgstr "Urządzenie PCap:"
-
-msgid "Network adapter:"
-msgstr "Karta sieciowa:"
-
 msgid "COM1 Device:"
 msgstr "Urządzenie COM1:"

@@ -1350,17 +1341,17 @@ msgstr "Karta sieciowa 3"
 msgid "Network Card #4"
 msgstr "Karta sieciowa 4"

-msgid "Mode"
-msgstr "Tryb"
+msgid "Mode:"
+msgstr "Tryb:"

-msgid "Interface"
-msgstr "Interfejs"
+msgid "Interface:"
+msgstr "Interfejs:"

-msgid "Adapter"
-msgstr "Adapter"
+msgid "Adapter:"
+msgstr "Adapter:"

-msgid "VDE Socket"
-msgstr "Gniazdo VDE"
+msgid "VDE Socket:"
+msgstr "Gniazdo VDE:"

 msgid "86Box Unit Tester"
 msgstr "Tester urządzeń 86Box"
@@ -1816,7 +1807,10 @@ msgid "Wheel"
 msgstr "Koło"

 msgid "Five + Wheel"
-msgstr "Five + Wheel"
+msgstr ""
+
+msgid "Five + 2 Wheels"
+msgstr ""

 msgid "A3 - SMT2 Serial / SMT3(R)V"
 msgstr "A3 - SMT2 szeregowa / SMT3(R)V"
@@ -2118,6 +2112,9 @@ msgstr ""
 msgid "Options"
 msgstr ""

+msgid "Model"
+msgstr ""
+
 msgid "Model:"
 msgstr ""

--- a/src/qt/languages/pt-BR.po
+++ b/src/qt/languages/pt-BR.po
@@ -450,15 +450,6 @@ msgstr "Nuked (mais preciso)"
 msgid "YMFM (faster)"
 msgstr "YMFM (mais rápido)"

-msgid "Network type:"
-msgstr "Tipo de rede:"
-
-msgid "PCap device:"
-msgstr "Dispositivo PCap:"
-
-msgid "Network adapter:"
-msgstr "Adaptador de rede:"
-
 msgid "COM1 Device:"
 msgstr "Dispositivo COM1:"

@@ -1350,17 +1341,17 @@ msgstr "Placa de rede 3"
 msgid "Network Card #4"
 msgstr "Placa de rede 4"

-msgid "Mode"
-msgstr "Modo"
+msgid "Mode:"
+msgstr "Modo:"

-msgid "Interface"
-msgstr "Interface"
+msgid "Interface:"
+msgstr "Interface:"

-msgid "Adapter"
-msgstr "Adaptador"
+msgid "Adapter:"
+msgstr "Adaptador:"

-msgid "VDE Socket"
-msgstr "Soquete VDE"
+msgid "VDE Socket:"
+msgstr "Soquete VDE:"

 msgid "86Box Unit Tester"
 msgstr "Testador de unidade 86Box"
@@ -1818,6 +1809,9 @@ msgstr "Roda"
 msgid "Five + Wheel"
 msgstr "Cinco + roda"

+msgid "Five + 2 Wheels"
+msgstr ""
+
 msgid "A3 - SMT2 Serial / SMT3(R)V"
 msgstr "A3 - SMT2 Serial / SMT3(R)V"

@@ -2118,6 +2112,9 @@ msgstr ""
 msgid "Options"
 msgstr ""

+msgid "Model"
+msgstr ""
+
 msgid "Model:"
 msgstr ""

--- a/src/qt/languages/pt-PT.po
+++ b/src/qt/languages/pt-PT.po
@@ -450,15 +450,6 @@ msgstr "Nuked (mais exacto)"
 msgid "YMFM (faster)"
 msgstr "YMFM (mais rápido)"

-msgid "Network type:"
-msgstr "Tipo de rede:"
-
-msgid "PCap device:"
-msgstr "Dispositivo PCap:"
-
-msgid "Network adapter:"
-msgstr "Placa de rede:"
-
 msgid "COM1 Device:"
 msgstr "Dispositivo COM1:"

@@ -1350,17 +1341,17 @@ msgstr "Placa de rede 3"
 msgid "Network Card #4"
 msgstr "Placa de rede 4"

-msgid "Mode"
-msgstr "Modo"
+msgid "Mode:"
+msgstr "Modo:"

-msgid "Interface"
-msgstr "Interface"
+msgid "Interface:"
+msgstr "Interface:"

-msgid "Adapter"
-msgstr "Adaptador"
+msgid "Adapter:"
+msgstr "Adaptador:"

-msgid "VDE Socket"
-msgstr "Tomada VDE"
+msgid "VDE Socket:"
+msgstr "Tomada VDE:"

 msgid "86Box Unit Tester"
 msgstr "Testador de unidades 86Box"
@@ -1818,6 +1809,9 @@ msgstr "Roda"
 msgid "Five + Wheel"
 msgstr "Cinco + Roda"

+msgid "Five + 2 Wheels"
+msgstr ""
+
 msgid "A3 - SMT2 Serial / SMT3(R)V"
 msgstr "A3 - SMT2 série / SMT3(R)V"

@@ -2118,6 +2112,9 @@ msgstr ""
 msgid "Options"
 msgstr ""

+msgid "Model"
+msgstr ""
+
 msgid "Model:"
 msgstr ""

--- a/src/qt/languages/ru-RU.po
+++ b/src/qt/languages/ru-RU.po
@@ -55,7 +55,7 @@ msgid "Qt (&OpenGL)"
 msgstr "Qt (&OpenGL)"

 msgid "Open&GL (3.0 Core)"
-msgstr "Open&GL (3.0)"
+msgstr "Open&GL (3.0 Core)"

 msgid "&VNC"
 msgstr "&VNC"
@@ -214,7 +214,7 @@ msgid "&Documentation..."
 msgstr "&Документация..."

 msgid "&About 86Box..."
-msgstr "&О программе 86Box..."
+msgstr "&О 86Box..."

 msgid "&New image..."
 msgstr "&Новый образ..."
@@ -253,7 +253,7 @@ msgid "E&mpty"
 msgstr "П&устой"

 msgid "Reload previous image"
-msgstr "Загрузить предыдущий образ"
+msgstr "Перезагрузить предыдущий образ"

 msgid "&Folder..."
 msgstr "&Папка..."
@@ -430,10 +430,10 @@ msgid "Sound card #4:"
 msgstr "Звуковая карта 4:"

 msgid "MIDI Out Device:"
-msgstr "MIDI Out устройство:"
+msgstr "Устройство вывода MIDI:"

 msgid "MIDI In Device:"
-msgstr "MIDI In устройство:"
+msgstr "Устройство ввода MIDI:"

 msgid "Standalone MPU-401"
 msgstr "Отдельный MPU-401"
@@ -450,15 +450,6 @@ msgstr "Nuked (более точный)"
 msgid "YMFM (faster)"
 msgstr "YMFM (быстрее)"

-msgid "Network type:"
-msgstr "Тип сети:"
-
-msgid "PCap device:"
-msgstr "Устройство PCap:"
-
-msgid "Network adapter:"
-msgstr "Сетевая карта:"
-
 msgid "COM1 Device:"
 msgstr "Устройство COM1:"

@@ -1350,17 +1341,17 @@ msgstr "Сетевая карта 3"
 msgid "Network Card #4"
 msgstr "Сетевая карта 4"

-msgid "Mode"
-msgstr "Режим"
+msgid "Mode:"
+msgstr "Режим:"

-msgid "Interface"
-msgstr "Интерфейс"
+msgid "Interface:"
+msgstr "Интерфейс:"

-msgid "Adapter"
-msgstr "Адаптер"
+msgid "Adapter:"
+msgstr "Адаптер:"

-msgid "VDE Socket"
-msgstr "VDE сокет"
+msgid "VDE Socket:"
+msgstr "VDE сокет:"

 msgid "86Box Unit Tester"
 msgstr "Модульный Тестер 86Box"
@@ -1444,7 +1435,7 @@ msgid "BIOS Revision"
 msgstr "Версия BIOS"

 msgid "Translate 26 -> 17"
-msgstr "Перевести 26 -> 17"
+msgstr "Переводить 26 -> 17"

 msgid "Language"
 msgstr "Язык"
@@ -1540,7 +1531,7 @@ msgid "Reversed stereo"
 msgstr "Реверс стерео"

 msgid "Nice ramp"
-msgstr "Nice ramp"
+msgstr "Улучшение рампы"

 msgid "Hz"
 msgstr "Гц"
@@ -1591,7 +1582,7 @@ msgid "RAM Address"
 msgstr "Адрес оперативной памяти"

 msgid "RAM size"
-msgstr "Объем оперативной памяти"
+msgstr "Размер оперативной памяти"

 msgid "Initial RAM size"
 msgstr "Начальный размер оперативной памяти"
@@ -1624,10 +1615,10 @@ msgid "Surround module"
 msgstr "Модуль объемного звучания"

 msgid "CODEC"
-msgstr "КОДЕК"
+msgstr "Кодек"

 msgid "Raise CODEC interrupt on CODEC setup (needed by some drivers)"
-msgstr "Поднимать прерывание CODEC при настройке CODEC (необходимо некоторым драйверам)."
+msgstr "Поднимать прерывание кодека при настройке кодека (необходимо некоторым драйверам)."

 msgid "SB Address"
 msgstr "Адрес SB"
@@ -1654,7 +1645,7 @@ msgid "Enable CMS"
 msgstr "Включить CMS"

 msgid "Mixer"
-msgstr "Смеситель"
+msgstr "Микшер"

 msgid "High DMA"
 msgstr "Высокий DMA"
@@ -1663,7 +1654,7 @@ msgid "Control PC speaker"
 msgstr "Управление динамиком ПК"

 msgid "Memory size"
-msgstr "Объем памяти"
+msgstr "Размер памяти"

 msgid "EMU8000 Address"
 msgstr "Адрес EMU8000"
@@ -1678,7 +1669,7 @@ msgid "GUS type"
 msgstr "Тип GUS"

 msgid "Enable 0x04 \"Exit 86Box\" command"
-msgstr "Включить команду 0x04 \"Выход 86Box\"."
+msgstr "Включить команду 0x04 \"Выход из 86Box\""

 msgid "Display type"
 msgstr "Тип дисплея"
@@ -1720,13 +1711,13 @@ msgid "Bilinear filtering"
 msgstr "Билинейная фильтрация"

 msgid "Dithering"
-msgstr "Dithering"
+msgstr "Дизеринг"

 msgid "Enable NMI for CGA emulation"
 msgstr "Включение NMI для эмуляции CGA"

 msgid "Voodoo type"
-msgstr "Тип Вуду"
+msgstr "Тип Voodoo"

 msgid "Framebuffer memory size"
 msgstr "Размер памяти фреймбуфера"
@@ -1735,10 +1726,10 @@ msgid "Texture memory size"
 msgstr "Размер памяти текстур"

 msgid "Dither subtraction"
-msgstr "Вычитание с вычитанием"
+msgstr "Вычитание дизеринга"

 msgid "Screen Filter"
-msgstr "Фильтр экрана"
+msgstr "Экранный фильтр"

 msgid "Render threads"
 msgstr "Потоки рендеринга"
@@ -1818,6 +1809,9 @@ msgstr "Колесо"
 msgid "Five + Wheel"
 msgstr "Пять + колесо"

+msgid "Five + 2 Wheels"
+msgstr "Пять + 2 колеса"
+
 msgid "A3 - SMT2 Serial / SMT3(R)V"
 msgstr "A3 - SMT2 последовательная / SMT3(R)V"

@@ -1921,7 +1915,7 @@ msgid "Monochrome (5151/MDA) (white)"
 msgstr "Монохромный (5151/MDA) (белый)"

 msgid "Monochrome (5151/MDA) (green)"
-msgstr "Монохромный (5151/MDA) (зеленый)"
+msgstr "Монохромный (5151/MDA) (зелёный)"

 msgid "Monochrome (5151/MDA) (amber)"
 msgstr "Монохромный (5151/MDA) (янтарный)"
@@ -1939,7 +1933,7 @@ msgid "Enhanced Color - Enhanced Mode (5154/ECD)"
 msgstr "Улучшенный цветной - улучшенный режим (5154/ECD)"

 msgid "Green"
-msgstr "Зеленый"
+msgstr "Зелёный"

 msgid "Amber"
 msgstr "Янтарный"
@@ -1963,13 +1957,13 @@ msgid "Bochs latest"
 msgstr "Bochs последний"

 msgid "Mono Non-Interlaced"
-msgstr "Монохромный без чересстрочной развертки"
+msgstr "Монохромный без чересстрочной развёртки"

 msgid "Color Interlaced"
-msgstr "Цветной с чересстрочной разверткой"
+msgstr "Цветной с чересстрочной развёрткой"

 msgid "Color Non-Interlaced"
-msgstr "Цветной без чересстрочной развертки"
+msgstr "Цветной без чересстрочной развёртки"

 msgid "3Dfx Voodoo Graphics"
 msgstr "Ускоритель 3Dfx Voodoo"
@@ -2020,10 +2014,10 @@ msgid "Protection Dongle for Savage Quest"
 msgstr "Защитный донгл для Savage Quest"

 msgid "Serial Passthrough Device"
-msgstr "Устройство прохода через последовательный порт"
+msgstr "Устройство проброса через последовательный порт"

 msgid "Passthrough Mode"
-msgstr "Проходной режим"
+msgstr "Режим проброса"

 msgid "Host Serial Device"
 msgstr "Последовательное устройство хоста"
@@ -2110,20 +2104,23 @@ msgid "Inhibit multimedia keys"
 msgstr "Перехватывать мультимедиа-клавиши"

 msgid "Ask for confirmation before saving settings"
-msgstr "Спрашивать подтверждения перед сохранением настроек"
+msgstr "Запрашивать подтверждение перед сохранением настроек"

 msgid "Ask for confirmation before hard resetting"
-msgstr "Спрашивать подтверждения перед холодной перезагрузкой"
+msgstr "Запрашивать подтверждение перед холодной перезагрузкой"

 msgid "Ask for confirmation before quitting"
-msgstr "Спрашивать подтвержждения перед выходом"
+msgstr "Запрашивать подтверждение перед выходом"

 msgid "Display hotkey message when entering full-screen mode"
-msgstr "Показывать сообщение о горячих клавишах при включении полноэкранного режима"
+msgstr "Показывать сообщение о горячей клавише при входе в полноэкранный режим"

 msgid "Options"
 msgstr "Параметры"

+msgid "Model"
+msgstr "Модель"
+
 msgid "Model:"
 msgstr "Модель:"

--- a/src/qt/languages/sk-SK.po
+++ b/src/qt/languages/sk-SK.po
@@ -450,15 +450,6 @@ msgstr "Nuked (presnejší)"
 msgid "YMFM (faster)"
 msgstr "YMFM (rýchlejší)"

-msgid "Network type:"
-msgstr "Druh siete:"
-
-msgid "PCap device:"
-msgstr "PCap zariadenia:"
-
-msgid "Network adapter:"
-msgstr "Sieťový adaptér:"
-
 msgid "COM1 Device:"
 msgstr "Zariadenie na COM1:"

@@ -1351,17 +1342,17 @@ msgstr "Sieťová karta 3"
 msgid "Network Card #4"
 msgstr "Sieťová karta 4"

-msgid "Mode"
-msgstr "Režim"
+msgid "Mode:"
+msgstr "Režim:"

-msgid "Interface"
-msgstr "Rozhranie"
+msgid "Interface:"
+msgstr "Rozhranie:"

-msgid "Adapter"
-msgstr "Adaptér"
+msgid "Adapter:"
+msgstr "Adaptér:"

-msgid "VDE Socket"
-msgstr "Zásuvka VDE"
+msgid "VDE Socket:"
+msgstr "Zásuvka VDE:"

 msgid "86Box Unit Tester"
 msgstr "86Box Unit Tester"
@@ -1819,6 +1810,9 @@ msgstr "Koleso"
 msgid "Five + Wheel"
 msgstr "Päť + koleso"

+msgid "Five + 2 Wheels"
+msgstr ""
+
 msgid "A3 - SMT2 Serial / SMT3(R)V"
 msgstr "A3 - SMT2 sériová / SMT3(R)V"

@@ -2119,6 +2113,9 @@ msgstr ""
 msgid "Options"
 msgstr ""

+msgid "Model"
+msgstr ""
+
 msgid "Model:"
 msgstr ""

--- a/src/qt/languages/sl-SI.po
+++ b/src/qt/languages/sl-SI.po
@@ -450,15 +450,6 @@ msgstr "Nuked (točnejši)"
 msgid "YMFM (faster)"
 msgstr "YMFM (hitrejši)"

-msgid "Network type:"
-msgstr "Vrsta omrežja:"
-
-msgid "PCap device:"
-msgstr "Naprava PCap:"
-
-msgid "Network adapter:"
-msgstr "Omrežna kartica:"
-
 msgid "COM1 Device:"
 msgstr "Naprava COM1:"

@@ -1350,17 +1341,17 @@ msgstr "Omrežna kartica 3"
 msgid "Network Card #4"
 msgstr "Omrežna kartica 4"

-msgid "Mode"
-msgstr "Način"
+msgid "Mode:"
+msgstr "Način:"

-msgid "Interface"
-msgstr "Vmesnik"
+msgid "Interface:"
+msgstr "Vmesnik:"

-msgid "Adapter"
-msgstr "Adapter"
+msgid "Adapter:"
+msgstr "Adapter:"

-msgid "VDE Socket"
-msgstr "Vtičnica VDE"
+msgid "VDE Socket:"
+msgstr "Vtičnica VDE:"

 msgid "86Box Unit Tester"
 msgstr "Tester enote 86Box"
@@ -1818,6 +1809,9 @@ msgstr "Kolesa"
 msgid "Five + Wheel"
 msgstr "Pet + kolo"

+msgid "Five + 2 Wheels"
+msgstr ""
+
 msgid "A3 - SMT2 Serial / SMT3(R)V"
 msgstr "A3 - SMT2 serijska / SMT3(R)V"

@@ -2118,6 +2112,9 @@ msgstr ""
 msgid "Options"
 msgstr ""

+msgid "Model"
+msgstr ""
+
 msgid "Model:"
 msgstr ""

--- a/src/qt/languages/sv-SE.po
+++ b/src/qt/languages/sv-SE.po
--- a/src/qt/languages/tr-TR.po
+++ b/src/qt/languages/tr-TR.po
@@ -450,15 +450,6 @@ msgstr "Nuked (daha doğru)"
 msgid "YMFM (faster)"
 msgstr "YMFM (daha hızlı)"

-msgid "Network type:"
-msgstr "Ağ türü:"
-
-msgid "PCap device:"
-msgstr "PCap cihazı:"
-
-msgid "Network adapter:"
-msgstr "Ağ cihazı:"
-
 msgid "COM1 Device:"
 msgstr "COM1 cihazı:"

@@ -1350,17 +1341,17 @@ msgstr "Ağ kartı 3"
 msgid "Network Card #4"
 msgstr "Ağ kartı 4"

-msgid "Mode"
-msgstr "Mod"
+msgid "Mode:"
+msgstr "Mod:"

-msgid "Interface"
-msgstr "Arayüz"
+msgid "Interface:"
+msgstr "Arayüz:"

-msgid "Adapter"
-msgstr "Adaptör"
+msgid "Adapter:"
+msgstr "Adaptör:"

-msgid "VDE Socket"
-msgstr "VDE soketi"
+msgid "VDE Socket:"
+msgstr "VDE soketi:"

 msgid "86Box Unit Tester"
 msgstr "86Box birim test cihazı"
@@ -1818,6 +1809,9 @@ msgstr "Tekerlek"
 msgid "Five + Wheel"
 msgstr "Beş + tekerlek"

+msgid "Five + 2 Wheels"
+msgstr ""
+
 msgid "A3 - SMT2 Serial / SMT3(R)V"
 msgstr "A3 - SMT2 seri / SMT3(R)V"

@@ -2118,6 +2112,9 @@ msgstr ""
 msgid "Options"
 msgstr ""

+msgid "Model"
+msgstr ""
+
 msgid "Model:"
 msgstr ""

--- a/src/qt/languages/uk-UA.po
+++ b/src/qt/languages/uk-UA.po
@@ -450,15 +450,6 @@ msgstr "Nuked (більш точний)"
 msgid "YMFM (faster)"
 msgstr "YMFM (швидший)"

-msgid "Network type:"
-msgstr "Тип мережі:"
-
-msgid "PCap device:"
-msgstr "Пристрій PCap:"
-
-msgid "Network adapter:"
-msgstr "Мережевий адаптер:"
-
 msgid "COM1 Device:"
 msgstr "Пристрій COM1:"

@@ -1350,17 +1341,17 @@ msgstr "Мережева карта 3"
 msgid "Network Card #4"
 msgstr "Мережева карта 4"

-msgid "Mode"
-msgstr "Режим"
+msgid "Mode:"
+msgstr "Режим:"

-msgid "Interface"
-msgstr "Інтерфейс"
+msgid "Interface:"
+msgstr "Інтерфейс:"

-msgid "Adapter"
-msgstr "Адаптер"
+msgid "Adapter:"
+msgstr "Адаптер:"

-msgid "VDE Socket"
-msgstr "VDE сокет"
+msgid "VDE Socket:"
+msgstr "VDE сокет:"

 msgid "86Box Unit Tester"
 msgstr "Тестер блоків 86Box"
@@ -1818,6 +1809,9 @@ msgstr "Колесо"
 msgid "Five + Wheel"
 msgstr "П'ять + колесо"

+msgid "Five + 2 Wheels"
+msgstr ""
+
 msgid "A3 - SMT2 Serial / SMT3(R)V"
 msgstr "A3 - SMT2 послідовна / SMT3(R)V"

@@ -2124,6 +2118,9 @@ msgstr ""
 msgid "Options"
 msgstr ""

+msgid "Model"
+msgstr ""
+
 msgid "Model:"
 msgstr ""

--- a/src/qt/languages/vi-VN.po
+++ b/src/qt/languages/vi-VN.po
@@ -450,15 +450,6 @@ msgstr "Nuked (chính xác hơn)"
 msgid "YMFM (faster)"
 msgstr "YMFM (nhanh hơn)"

-msgid "Network type:"
-msgstr "Kiểu loại mạng:"
-
-msgid "PCap device:"
-msgstr "Thiết bị PCap:"
-
-msgid "Network adapter:"
-msgstr "Bộ thích ứng (adapter) mạng:"
-
 msgid "COM1 Device:"
 msgstr "Thiết bị COM1:"

@@ -1350,17 +1341,17 @@ msgstr "Thẻ mạng 3"
 msgid "Network Card #4"
 msgstr "Thẻ mạng 4"

-msgid "Mode"
-msgstr "Chế độ"
+msgid "Mode:"
+msgstr "Chế độ:"

-msgid "Interface"
-msgstr "Giao diện"
+msgid "Interface:"
+msgstr "Giao diện:"

-msgid "Adapter"
-msgstr "Bộ chuyển đổi"
+msgid "Adapter:"
+msgstr "Bộ chuyển đổi:"

-msgid "VDE Socket"
-msgstr "Ổ cắm VDE"
+msgid "VDE Socket:"
+msgstr "Ổ cắm VDE:"

 msgid "86Box Unit Tester"
 msgstr "Trình kiểm tra đơn vị 86box"
@@ -1818,6 +1809,9 @@ msgstr "Con lăn"
 msgid "Five + Wheel"
 msgstr "Năm + con lăn"

+msgid "Five + 2 Wheels"
+msgstr ""
+
 msgid "A3 - SMT2 Serial / SMT3(R)V"
 msgstr "A3 - SMT2 Serial / SMT3(R)V"

@@ -2118,6 +2112,9 @@ msgstr ""
 msgid "Options"
 msgstr ""

+msgid "Model"
+msgstr ""
+
 msgid "Model:"
 msgstr ""

--- a/src/qt/languages/zh-CN.po
+++ b/src/qt/languages/zh-CN.po
@@ -450,15 +450,6 @@ msgstr "Nuked (更准确)"
 msgid "YMFM (faster)"
 msgstr "YMFM (更快)"

-msgid "Network type:"
-msgstr "网络类型:"
-
-msgid "PCap device:"
-msgstr "PCap 设备:"
-
-msgid "Network adapter:"
-msgstr "网络适配器:"
-
 msgid "COM1 Device:"
 msgstr "COM1 设备:"

@@ -1350,17 +1341,17 @@ msgstr "网卡 3"
 msgid "Network Card #4"
 msgstr "网卡 4"

-msgid "Mode"
-msgstr "模式"
+msgid "Mode:"
+msgstr "模式:"

-msgid "Interface"
-msgstr "界面"
+msgid "Interface:"
+msgstr "界面:"

-msgid "Adapter"
-msgstr "适配器"
+msgid "Adapter:"
+msgstr "适配器:"

-msgid "VDE Socket"
-msgstr "VDE 套接字"
+msgid "VDE Socket:"
+msgstr "VDE 套接字:"

 msgid "86Box Unit Tester"
 msgstr "86Box 装置测试仪"
@@ -1818,6 +1809,9 @@ msgstr "滚轮"
 msgid "Five + Wheel"
 msgstr "五键+滚轮"

+msgid "Five + 2 Wheels"
+msgstr ""
+
 msgid "A3 - SMT2 Serial / SMT3(R)V"
 msgstr "A3 - SMT2 串行 / SMT3（R）V"

@@ -2118,6 +2112,9 @@ msgstr ""
 msgid "Options"
 msgstr ""

+msgid "Model"
+msgstr ""
+
 msgid "Model:"
 msgstr ""

--- a/src/qt/languages/zh-TW.po
+++ b/src/qt/languages/zh-TW.po
@@ -450,15 +450,6 @@ msgstr "Nuked (更準確)"
 msgid "YMFM (faster)"
 msgstr "YMFM (更快)"

-msgid "Network type:"
-msgstr "網路類型:"
-
-msgid "PCap device:"
-msgstr "PCap 裝置:"
-
-msgid "Network adapter:"
-msgstr "網路配接器:"
-
 msgid "COM1 Device:"
 msgstr "COM1 裝置:"

@@ -1350,17 +1341,17 @@ msgstr "網路卡 3"
 msgid "Network Card #4"
 msgstr "網路卡 4"

-msgid "Mode"
-msgstr "模式"
+msgid "Mode:"
+msgstr "模式:"

-msgid "Interface"
-msgstr "介面"
+msgid "Interface:"
+msgstr "介面:"

-msgid "Adapter"
-msgstr "配接器"
+msgid "Adapter:"
+msgstr "配接器:"

-msgid "VDE Socket"
-msgstr "VDE 插座"
+msgid "VDE Socket:"
+msgstr "VDE 插座:"

 msgid "86Box Unit Tester"
 msgstr "86Box 單元測試器"
@@ -1818,6 +1809,9 @@ msgstr "滾輪"
 msgid "Five + Wheel"
 msgstr "五鍵 + 滾輪"

+msgid "Five + 2 Wheels"
+msgstr ""
+
 msgid "A3 - SMT2 Serial / SMT3(R)V"
 msgstr "A3 - SMT2 序列 / SMT3(R)V"

@@ -2118,6 +2112,9 @@ msgstr ""
 msgid "Options"
 msgstr ""

+msgid "Model"
+msgstr ""
+
 msgid "Model:"
 msgstr ""

--- a/src/qt/qt_harddrive_common.cpp
+++ b/src/qt/qt_harddrive_common.cpp
@@ -51,7 +51,7 @@ void
 Harddrives::populateRemovableBuses(QAbstractItemModel *model)
 {
    model->removeRows(0, model->rowCount());
-#if 0
+#ifdef USE_CDROM_MITSUMI
    model->insertRows(0, 4);
 #else
    model->insertRows(0, 3);
@@ -59,14 +59,14 @@ Harddrives::populateRemovableBuses(QAbstractItemModel *model)
    model->setData(model->index(0, 0), QObject::tr("Disabled"));
    model->setData(model->index(1, 0), QObject::tr("ATAPI"));
    model->setData(model->index(2, 0), QObject::tr("SCSI"));
-#if 0
+#ifdef USE_CDROM_MITSUMI
    model->setData(model->index(3, 0), QObject::tr("Mitsumi"));
 #endif

    model->setData(model->index(0, 0), HDD_BUS_DISABLED, Qt::UserRole);
    model->setData(model->index(1, 0), HDD_BUS_ATAPI, Qt::UserRole);
    model->setData(model->index(2, 0), HDD_BUS_SCSI, Qt::UserRole);
-#if 0
+#ifdef USE_CDROM_MITSUMI
    model->setData(model->index(3, 0), CDROM_BUS_MITSUMI, Qt::UserRole);
 #endif
 }
--- a/src/qt/qt_mainwindow.cpp
+++ b/src/qt/qt_mainwindow.cpp
@@ -1342,17 +1342,17 @@ MainWindow::refreshMediaMenu()
 }

 void
-MainWindow::showMessage(int flags, const QString &header, const QString &message)
+MainWindow::showMessage(int flags, const QString &header, const QString &message, bool richText)
 {
    if (QThread::currentThread() == this->thread()) {
        if (!cpu_thread_running) {
-            showMessageForNonQtThread(flags, header, message, nullptr);
+            showMessageForNonQtThread(flags, header, message, richText, nullptr);
        }
        else
-            showMessage_(flags, header, message);
+            showMessage_(flags, header, message, richText);
    } else {
        std::atomic_bool done = false;
-        emit showMessageForNonQtThread(flags, header, message, &done);
+        emit showMessageForNonQtThread(flags, header, message, richText, &done);
        while (!done) {
            QThread::msleep(1);
        }
@@ -1360,7 +1360,7 @@ MainWindow::showMessage(int flags, const QString &header, const QString &message
 }

 void
-MainWindow::showMessage_(int flags, const QString &header, const QString &message, std::atomic_bool *done)
+MainWindow::showMessage_(int flags, const QString &header, const QString &message, bool richText, std::atomic_bool *done)
 {
    if (done) {
        *done = false;
@@ -1372,7 +1372,8 @@ MainWindow::showMessage_(int flags, const QString &header, const QString &messag
    } else if (!(flags & (MBX_ERROR | MBX_WARNING))) {
        box.setIcon(QMessageBox::Warning);
    }
-    box.setTextFormat(Qt::TextFormat::RichText);
+    if (richText)
+        box.setTextFormat(Qt::TextFormat::RichText);
    box.exec();
    if (done) {
        *done = true;
--- a/src/qt/qt_mainwindow.hpp
+++ b/src/qt/qt_mainwindow.hpp
@@ -26,7 +26,7 @@ public:
    explicit MainWindow(QWidget *parent = nullptr);
    ~MainWindow();

-    void  showMessage(int flags, const QString &header, const QString &message);
+    void  showMessage(int flags, const QString &header, const QString &message, bool richText);
    void  getTitle(wchar_t *title);
    void  blitToWidget(int x, int y, int w, int h, int monitor_index);
    QSize getRenderWidgetSize();
@@ -55,7 +55,7 @@ signals:
    void setFullscreen(bool state);
    void setMouseCapture(bool state);

-    void showMessageForNonQtThread(int flags, const QString &header, const QString &message, std::atomic_bool* done);
+    void showMessageForNonQtThread(int flags, const QString &header, const QString &message, bool richText, std::atomic_bool* done);
    void getTitleForNonQtThread(wchar_t *title);
 public slots:
    void showSettings();
@@ -123,7 +123,7 @@ private slots:
    void on_actionRenderer_options_triggered();

    void refreshMediaMenu();
-    void showMessage_(int flags, const QString &header, const QString &message, std::atomic_bool* done = nullptr);
+    void showMessage_(int flags, const QString &header, const QString &message, bool richText, std::atomic_bool* done = nullptr);
    void getTitle_(wchar_t *title);

    void on_actionMCA_devices_triggered();
--- a/src/qt/qt_openglrenderer.cpp
+++ b/src/qt/qt_openglrenderer.cpp
@@ -200,7 +200,7 @@ OpenGLRenderer::create_program(struct shader_program *program)
        glw.glGetProgramiv(program->id, GL_INFO_LOG_LENGTH, &maxLength);
        char *log = (char *) malloc(maxLength);
        glw.glGetProgramInfoLog(program->id, maxLength, &length, log);
-        main_window->showMessage(MBX_ERROR | MBX_FATAL, tr("GLSL Error"), tr("Program not linked:\n\n%1").arg(log).replace("\n", "<br>"));
+        main_window->showMessage(MBX_ERROR | MBX_FATAL, tr("GLSL Error"), tr("Program not linked:\n\n%1").arg(log), false);
        // wx_simple_messagebox("GLSL Error", "Program not linked:\n%s", log);
        free(log);
        return 0;
@@ -247,7 +247,7 @@ OpenGLRenderer::compile_shader(GLenum shader_type, const char *prepend, const ch
        glw.glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &length);
        char *log = (char *) malloc(length);
        glw.glGetShaderInfoLog(shader, length, &length, log);
-        main_window->showMessage(MBX_ERROR | MBX_FATAL, tr("GLSL Error"), tr("Could not compile shader:\n\n%1").arg(log).replace("\n", "<br>"));
+        main_window->showMessage(MBX_ERROR | MBX_FATAL, tr("GLSL Error"), tr("Could not compile shader:\n\n%1").arg(log), false);
        // wx_simple_messagebox("GLSL Error", "Could not compile shader:\n%s", log);

        ogl3_log("Could not compile shader: %s\n", log);
@@ -651,7 +651,7 @@ OpenGLRenderer::load_glslp(glsl_t *glsl, int num_shader, const char *f)

            if (!load_texture(file, &tex->texture)) {
                //QMessageBox::critical(main_window, tr("GLSL Error"), tr("Could not load texture: %s").arg(file));
-                main_window->showMessage(MBX_ERROR | MBX_FATAL, tr("GLSL Error"), tr("Could not load texture: %1").arg(file));
+                main_window->showMessage(MBX_ERROR | MBX_FATAL, tr("GLSL Error"), tr("Could not load texture: %1").arg(file), false);
                ogl3_log("Could not load texture %s!\n", file);
                failed = 1;
                break;
@@ -697,7 +697,7 @@ OpenGLRenderer::load_glslp(glsl_t *glsl, int num_shader, const char *f)
                ogl3_log("Creating pass %u (%s)\n", (i + 1), pass->alias);
                ogl3_log("Loading shader %s...\n", shader->shader_fn);
                if (!shader->shader_program) {
-                    main_window->showMessage(MBX_ERROR | MBX_FATAL, tr("GLSL Error"), tr("Could not load shader: %1").arg(shader->shader_fn));
+                    main_window->showMessage(MBX_ERROR | MBX_FATAL, tr("GLSL Error"), tr("Could not load shader: %1").arg(shader->shader_fn), false);
                    // wx_simple_messagebox("GLSL Error", "Could not load shader: %s", shader->shader_fn);
                    ogl3_log("Could not load shader %s\n", shader->shader_fn);
                    failed = 1;
@@ -1115,7 +1115,7 @@ OpenGLRenderer::initialize()
        for (auto &flag : buf_usage)
            flag.test_and_set();

-        main_window->showMessage(MBX_ERROR | MBX_FATAL, tr("Error initializing OpenGL"), e.what() + tr("\nFalling back to software rendering."));
+        main_window->showMessage(MBX_ERROR | MBX_FATAL, tr("Error initializing OpenGL"), e.what() + tr("\nFalling back to software rendering."), false);

        context->doneCurrent();
        isFinalized   = true;
--- a/src/qt/qt_platform.cpp
+++ b/src/qt/qt_platform.cpp
@@ -140,7 +140,6 @@ int          update_icons    = 1;
 int          kbd_req_capture = 0;
 int          hide_status_bar = 0;
 int          hide_tool_bar   = 0;
-uint32_t     lang_id = 0x0409, lang_sys = 0x0409; // Multilangual UI variables, for now all set to LCID of en-US

 int
 stricmp(const char *s1, const char *s2)
@@ -461,58 +460,18 @@ plat_power_off(void)
    QTimer::singleShot(0, (const QWidget *) main_window, &QMainWindow::close);
 }

-extern "C++" {
-QMap<uint32_t, QPair<QString, QString>> ProgSettings::lcid_langcode = {
-    { 0x0403, { "ca-ES", "Catalan (Spain)" }         },
-    { 0x0804, { "zh-CN", "Chinese (Simplified)" }    },
-    { 0x0404, { "zh-TW", "Chinese (Traditional)" }   },
-    { 0x041A, { "hr-HR", "Croatian (Croatia)" }      },
-    { 0x0405, { "cs-CZ", "Czech (Czech Republic)" }  },
-    { 0x0407, { "de-DE", "German (Germany)" }        },
-    { 0x0809, { "en-GB", "English (United Kingdom)" }},
-    { 0x0409, { "en-US", "English (United States)" } },
-    { 0x040B, { "fi-FI", "Finnish (Finland)" }       },
-    { 0x040C, { "fr-FR", "French (France)" }         },
-    { 0x040E, { "hu-HU", "Hungarian (Hungary)" }     },
-    { 0x0410, { "it-IT", "Italian (Italy)" }         },
-    { 0x0411, { "ja-JP", "Japanese (Japan)" }        },
-    { 0x0412, { "ko-KR", "Korean (Korea)" }          },
-    { 0x0413, { "nl-NL", "Dutch (Netherlands)" }     },
-    { 0x0415, { "pl-PL", "Polish (Poland)" }         },
-    { 0x0416, { "pt-BR", "Portuguese (Brazil)" }     },
-    { 0x0816, { "pt-PT", "Portuguese (Portugal)" }   },
-    { 0x0419, { "ru-RU", "Russian (Russia)" }        },
-    { 0x041B, { "sk-SK", "Slovak (Slovakia)" }       },
-    { 0x0424, { "sl-SI", "Slovenian (Slovenia)" }    },
-    { 0x0C0A, { "es-ES", "Spanish (Spain, Modern Sort)" } },
-    { 0x041F, { "tr-TR", "Turkish (Turkey)" }        },
-    { 0x0422, { "uk-UA", "Ukrainian (Ukraine)" }     },
-    { 0x042A, { "vi-VN", "Vietnamese (Vietnam)" }    },
-    { 0xFFFF, { "system", "(System Default)" }       },
-};
-}
-
-/* Sets up the program language before initialization. */
-uint32_t
+/* Converts the language code string to a numeric language ID */
+int
 plat_language_code(char *langcode)
 {
-    for (auto &curKey : ProgSettings::lcid_langcode.keys()) {
-        if (ProgSettings::lcid_langcode[curKey].first == langcode) {
-            return curKey;
-        }
-    }
-    return 0xFFFF;
+    return ProgSettings::languageCodeToId(QString(langcode));
 }

-/* Converts back the language code to LCID */
+/* Converts the numeric language ID to a language code string */
 void
-plat_language_code_r(uint32_t lcid, char *outbuf, int len)
+plat_language_code_r(int id, char *outbuf, int len)
 {
-    if (!ProgSettings::lcid_langcode.contains(lcid)) {
-        qstrncpy(outbuf, "system", len);
-        return;
-    }
-    qstrncpy(outbuf, ProgSettings::lcid_langcode[lcid].first.toUtf8().constData(), len);
+    qstrncpy(outbuf, ProgSettings::languageIdToCode(id).toUtf8().constData(), len);
    return;
 }

--- a/src/qt/qt_progsettings.cpp
+++ b/src/qt/qt_progsettings.cpp
@@ -26,6 +26,10 @@
 #include <QDir>
 #include <QFile>
 #include <QLibraryInfo>
+#ifdef Q_OS_WINDOWS
+#    include <QSysInfo>
+#    include <QVersionNumber>
+#endif

 extern "C" {
 #include <86box/86box.h>
@@ -41,18 +45,46 @@ extern MainWindow            *main_window;
 ProgSettings::CustomTranslator *ProgSettings::translator   = nullptr;
 QTranslator                    *ProgSettings::qtTranslator = nullptr;

+QVector<QPair<QString, QString>> ProgSettings::languages = {
+    { "system", "(System Default)"         },
+    { "ca-ES",  "Catalan (Spain)"          },
+    { "zh-CN",  "Chinese (Simplified)"     },
+    { "zh-TW",  "Chinese (Traditional)"    },
+    { "hr-HR",  "Croatian (Croatia)"       },
+    { "cs-CZ",  "Czech (Czech Republic)"   },
+    { "de-DE",  "German (Germany)"         },
+    { "en-GB",  "English (United Kingdom)" },
+    { "en-US",  "English (United States)"  },
+    { "fi-FI",  "Finnish (Finland)"        },
+    { "fr-FR",  "French (France)"          },
+    { "hu-HU",  "Hungarian (Hungary)"      },
+    { "it-IT",  "Italian (Italy)"          },
+    { "ja-JP",  "Japanese (Japan)"         },
+    { "ko-KR",  "Korean (Korea)"           },
+    { "nl-NL",  "Dutch (Netherlands)"      },
+    { "pl-PL",  "Polish (Poland)"          },
+    { "pt-BR",  "Portuguese (Brazil)"      },
+    { "pt-PT",  "Portuguese (Portugal)"    },
+    { "ru-RU",  "Russian (Russia)"         },
+    { "sk-SK",  "Slovak (Slovakia)"        },
+    { "sl-SI",  "Slovenian (Slovenia)"     },
+    { "sv-SE",  "Swedish (Sweden)"         },
+    { "es-ES",  "Spanish (Spain)"          },
+    { "tr-TR",  "Turkish (Turkey)"         },
+    { "uk-UA",  "Ukrainian (Ukraine)"      },
+    { "vi-VN",  "Vietnamese (Vietnam)"     },
+};
+
 ProgSettings::ProgSettings(QWidget *parent)
    : QDialog(parent)
    , ui(new Ui::ProgSettings)
 {
    ui->setupUi(this);
-    ui->comboBoxLanguage->setItemData(0, 0xFFFF);
-    for (auto i = lcid_langcode.begin(); i != lcid_langcode.end(); i++) {
-        if (i.key() == 0xFFFF)
-            continue;
-        ui->comboBoxLanguage->addItem(lcid_langcode[i.key()].second, i.key());
-        if (i.key() == lang_id) {
-            ui->comboBoxLanguage->setCurrentIndex(ui->comboBoxLanguage->findData(i.key()));
+    ui->comboBoxLanguage->setItemData(0, 0);
+    for (int i = 1; i < languages.length(); i++) {
+        ui->comboBoxLanguage->addItem(languages[i].second, i);
+        if (i == lang_id) {
+            ui->comboBoxLanguage->setCurrentIndex(ui->comboBoxLanguage->findData(i));
        }
    }
    ui->comboBoxLanguage->model()->sort(Qt::AscendingOrder);
@@ -74,7 +106,7 @@ ProgSettings::ProgSettings(QWidget *parent)
 void
 ProgSettings::accept()
 {
-    lang_id                 = ui->comboBoxLanguage->currentData().toUInt();
+    lang_id                 = ui->comboBoxLanguage->currentData().toInt();
    open_dir_usr_path       = ui->openDirUsrPath->isChecked() ? 1 : 0;
    confirm_exit            = ui->checkBoxConfirmExit->isChecked() ? 1 : 0;
    confirm_save            = ui->checkBoxConfirmSave->isChecked() ? 1 : 0;
@@ -109,23 +141,46 @@ ProgSettings::~ProgSettings()
 /* Return the standard font name on Windows, which is overridden per-language
   to prevent CJK fonts with embedded bitmaps being chosen as a fallback. */
 QString
-ProgSettings::getFontName(uint32_t lcid)
+ProgSettings::getFontName(int langId)
 {
-    switch (lcid) {
-        case 0x0404: /* zh-TW */
-            return "Microsoft JhengHei";
-        case 0x0411: /* ja-JP */
+    QString langCode = languageIdToCode(lang_id);
+    if (langCode == "ja-JP") {
+        /* Check for Windows 10 or later to choose the appropriate system font */
+        if (QVersionNumber::fromString(QSysInfo::kernelVersion()).majorVersion() >= 10)
+            return "Yu Gothic UI";
+        else
            return "Meiryo UI";
-        case 0x0412: /* ko-KR */
-            return "Malgun Gothic";
-        case 0x0804: /* zh-CN */
-            return "Microsoft YaHei";
-        default:
-            return "Segoe UI";
-    }
+    } else if (langCode == "ko-KR")
+        return "Malgun Gothic";
+    else if (langCode == "zh-CN")
+        return "Microsoft YaHei";
+    else if (langCode == "zh-TW")
+        return "Microsoft JhengHei";
+    else
+        return "Segoe UI";
 }
 #endif

+int
+ProgSettings::languageCodeToId(QString langCode)
+{
+    for (int i = 0; i < languages.length(); i++) {
+        if (languages[i].first == langCode) {
+            return i;
+        }
+    }
+    return 0;
+}
+
+QString
+ProgSettings::languageIdToCode(int id)
+{
+    if ((id == 0) || (id >= languages.length())) {
+        return "system";
+    }
+    return languages[id].first;
+}
+
 void
 ProgSettings::loadTranslators(QObject *parent)
 {
@@ -140,7 +195,7 @@ ProgSettings::loadTranslators(QObject *parent)
    qtTranslator             = new QTranslator(parent);
    translator               = new CustomTranslator(parent);
    QString localetofilename = "";
-    if (lang_id == 0xFFFF || lcid_langcode.contains(lang_id) == false) {
+    if (lang_id == 0 || lang_id >= languages.length()) {
        for (int i = 0; i < QLocale::system().uiLanguages().size(); i++) {
            localetofilename = QLocale::system().uiLanguages()[i];
            if (translator->load(QLatin1String("86box_") + localetofilename, QLatin1String(":/"))) {
@@ -158,12 +213,12 @@ ProgSettings::loadTranslators(QObject *parent)
            }
        }
    } else {
-        translator->load(QLatin1String("86box_") + lcid_langcode[lang_id].first, QLatin1String(":/"));
+        translator->load(QLatin1String("86box_") + languages[lang_id].first, QLatin1String(":/"));
        QCoreApplication::installTranslator(translator);
-        if (!qtTranslator->load(QLatin1String("qtbase_") + QString(lcid_langcode[lang_id].first).replace('-', '_'), QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
-            if (!qtTranslator->load(QLatin1String("qtbase_") + QString(lcid_langcode[lang_id].first).left(QString(lcid_langcode[lang_id].first).indexOf('-')), QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
-                if(!qtTranslator->load(QLatin1String("qt_") + QString(lcid_langcode[lang_id].first).replace('-', '_'), QApplication::applicationDirPath() + "/./translations/"))
-                    qtTranslator->load(QLatin1String("qt_") + QString(lcid_langcode[lang_id].first).replace('-', '_'), QLatin1String(":/"));
+        if (!qtTranslator->load(QLatin1String("qtbase_") + QString(languages[lang_id].first).replace('-', '_'), QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
+            if (!qtTranslator->load(QLatin1String("qtbase_") + QString(languages[lang_id].first).left(QString(languages[lang_id].first).indexOf('-')), QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
+                if(!qtTranslator->load(QLatin1String("qt_") + QString(languages[lang_id].first).replace('-', '_'), QApplication::applicationDirPath() + "/./translations/"))
+                    qtTranslator->load(QLatin1String("qt_") + QString(languages[lang_id].first).replace('-', '_'), QLatin1String(":/"));

        QCoreApplication::installTranslator(qtTranslator);
    }
--- a/src/qt/qt_progsettings.hpp
+++ b/src/qt/qt_progsettings.hpp
@@ -15,10 +15,12 @@ public:
    explicit ProgSettings(QWidget *parent = nullptr);
    ~ProgSettings();
 #ifdef Q_OS_WINDOWS
-    static QString getFontName(uint32_t lcid);
+    static QString getFontName(int langId);
 #endif
-    static void    loadTranslators(QObject *parent = nullptr);
-    static void    reloadStrings();
+    static int      languageCodeToId(QString langCode);
+    static QString  languageIdToCode(int id);
+    static void     loadTranslators(QObject *parent = nullptr);
+    static void     reloadStrings();
    class CustomTranslator : public QTranslator {
    public:
        CustomTranslator(QObject *parent = nullptr)
@@ -31,10 +33,10 @@ public:
            return QTranslator::translate("", sourceText, disambiguation, n);
        }
    };
-    static CustomTranslator                       *translator;
-    static QTranslator                            *qtTranslator;
-    static QMap<uint32_t, QPair<QString, QString>> lcid_langcode;
-    static QMap<int, std::wstring>                 translatedstrings;
+    static CustomTranslator                 *translator;
+    static QTranslator                      *qtTranslator;
+    static QVector<QPair<QString, QString>>  languages;
+    static QMap<int, std::wstring>           translatedstrings;

 protected slots:
    void accept() override;
--- a/src/qt/qt_settingsharddisks.cpp
+++ b/src/qt/qt_settingsharddisks.cpp
@@ -116,7 +116,7 @@ SettingsHarddisks::SettingsHarddisks(QWidget *parent)
    model->setHeaderData(ColumnHeads, Qt::Horizontal, tr("H"));
    model->setHeaderData(ColumnSectors, Qt::Horizontal, tr("S"));
    model->setHeaderData(ColumnSize, Qt::Horizontal, tr("MiB"));
-    model->setHeaderData(ColumnSpeed, Qt::Horizontal, tr("Speed"));
+    model->setHeaderData(ColumnSpeed, Qt::Horizontal, tr("Model"));
    ui->tableView->setModel(model);

    for (int i = 0; i < HDD_NUM; i++) {
--- a/src/qt/qt_settingsnetwork.ui
+++ b/src/qt/qt_settingsnetwork.ui
@@ -58,7 +58,7 @@
          </sizepolicy>
         </property>
         <property name="text">
-          <string>Adapter</string>
+          <string>Adapter:</string>
         </property>
        </widget>
       </item>
@@ -84,7 +84,7 @@
          </sizepolicy>
         </property>
         <property name="text">
-          <string>Mode</string>
+          <string>Mode:</string>
         </property>
        </widget>
       </item>
@@ -124,14 +124,14 @@
          </sizepolicy>
         </property>
         <property name="text">
-          <string>Interface</string>
+          <string>Interface:</string>
         </property>
        </widget>
       </item>
       <item row="5" column="0">
        <widget class="QLabel" name="socketVDELabel1">
         <property name="text">
-          <string>VDE Socket</string>
+          <string>VDE Socket:</string>
         </property>
        </widget>
       </item>
@@ -197,7 +197,7 @@
          </sizepolicy>
         </property>
         <property name="text">
-          <string>Interface</string>
+          <string>Interface:</string>
         </property>
        </widget>
       </item>
@@ -217,7 +217,7 @@
          </sizepolicy>
         </property>
         <property name="text">
-          <string>Mode</string>
+          <string>Mode:</string>
         </property>
        </widget>
       </item>
@@ -237,7 +237,7 @@
       <item row="5" column="0">
        <widget class="QLabel" name="socketVDELabel2">
         <property name="text">
-          <string>VDE Socket</string>
+          <string>VDE Socket:</string>
         </property>
        </widget>
       </item>
@@ -257,7 +257,7 @@
          </sizepolicy>
         </property>
         <property name="text">
-          <string>Adapter</string>
+          <string>Adapter:</string>
         </property>
        </widget>
       </item>
@@ -326,7 +326,7 @@
       <item row="5" column="0">
        <widget class="QLabel" name="socketVDELabel3">
         <property name="text">
-          <string>VDE Socket</string>
+          <string>VDE Socket:</string>
         </property>
        </widget>
       </item>
@@ -362,7 +362,7 @@
          </sizepolicy>
         </property>
         <property name="text">
-          <string>Interface</string>
+          <string>Interface:</string>
         </property>
        </widget>
       </item>
@@ -382,7 +382,7 @@
          </sizepolicy>
         </property>
         <property name="text">
-          <string>Mode</string>
+          <string>Mode:</string>
         </property>
        </widget>
       </item>
@@ -408,7 +408,7 @@
          </sizepolicy>
         </property>
         <property name="text">
-          <string>Adapter</string>
+          <string>Adapter:</string>
         </property>
        </widget>
       </item>
@@ -461,7 +461,7 @@
          </sizepolicy>
         </property>
         <property name="text">
-          <string>Mode</string>
+          <string>Mode:</string>
         </property>
        </widget>
       </item>
@@ -481,7 +481,7 @@
       <item row="5" column="0">
        <widget class="QLabel" name="socketVDELabel4">
         <property name="text">
-          <string>VDE Socket</string>
+          <string>VDE Socket:</string>
         </property>
        </widget>
       </item>
@@ -494,7 +494,7 @@
          </sizepolicy>
         </property>
         <property name="text">
-          <string>Adapter</string>
+          <string>Adapter:</string>
         </property>
        </widget>
       </item>
@@ -514,7 +514,7 @@
          </sizepolicy>
         </property>
         <property name="text">
-          <string>Interface</string>
+          <string>Interface:</string>
         </property>
        </widget>
       </item>
--- a/src/qt/qt_settingsstoragecontrollers.cpp
+++ b/src/qt/qt_settingsstoragecontrollers.cpp
@@ -142,6 +142,15 @@ SettingsStorageControllers::onCurrentMachineChanged(int machineId)
    ui->comboBoxFD->setCurrentIndex(selectedRow);

    /*CD interface controller config*/
+#ifdef USE_CDROM_MITSUMI
+    ui->label_7->setVisible(true);
+    ui->comboBoxCDInterface->setVisible(true);
+    ui->pushButtonCDInterface->setVisible(true);
+#else
+    ui->label_7->setVisible(false);
+    ui->comboBoxCDInterface->setVisible(false);
+    ui->pushButtonCDInterface->setVisible(false);
+#endif
    c           = 0;
    model       = ui->comboBoxCDInterface->model();
    removeRows  = model->rowCount();
--- a/src/qt/qt_settingsstoragecontrollers.ui
+++ b/src/qt/qt_settingsstoragecontrollers.ui
@@ -51,9 +51,6 @@
     </item>
     <item row="2" column="0">
      <widget class="QLabel" name="label_7">
-       <property name="visible">
-        <bool>false</bool>
-       </property>
       <property name="text">
        <string>CD-ROM Controller:</string>
       </property>
@@ -61,9 +58,6 @@
     </item>
     <item row="2" column="1">
      <widget class="QComboBox" name="comboBoxCDInterface">
-       <property name="visible">
-        <bool>false</bool>
-       </property>
       <property name="maxVisibleItems">
        <number>30</number>
       </property>
@@ -71,9 +65,6 @@
     </item>
     <item row="2" column="2">
      <widget class="QPushButton" name="pushButtonCDInterface">
-       <property name="visible">
-        <bool>false</bool>
-       </property>
       <property name="text">
        <string>Configure</string>
       </property>
--- a/src/qt/qt_translations.qrc.in
+++ b/src/qt/qt_translations.qrc.in
@@ -20,6 +20,7 @@
        <file>86box_ru-RU.qm</file>
        <file>86box_sk-SK.qm</file>
        <file>86box_sl-SI.qm</file>
+        <file>86box_sv-SE.qm</file>
        <file>86box_tr-TR.qm</file>
        <file>86box_uk-UA.qm</file>
        <file>86box_vi-VN.qm</file>
--- a/src/qt/qt_ui.cpp
+++ b/src/qt/qt_ui.cpp
@@ -142,11 +142,10 @@ ui_msgbox_header(int flags, void *header, void *message)
    // any error in early init
    if (main_window == nullptr) {
        QMessageBox msgBox(QMessageBox::Icon::Critical, hdr, msg);
-        msgBox.setTextFormat(Qt::TextFormat::RichText);
        msgBox.exec();
    } else {
        // else scope it to main_window
-        main_window->showMessage(flags, hdr, msg);
+        main_window->showMessage(flags, hdr, msg, false);
    }
    return 0;
 }
--- a/src/qt/win_dynld.c
+++ b/src/qt/win_dynld.c
@@ -51,7 +51,7 @@ dynld_module(const char *name, dllimp_t *table)
    void     *func;

    /* See if we can load the desired module. */
-    if ((h = LoadLibrary(name)) == NULL) {
+    if ((h = LoadLibraryA(name)) == NULL) {
        dynld_log("DynLd(\"%s\"): library not found! (%08X)\n", name, GetLastError());
        return (NULL);
    }
--- a/src/unix/unix.c
+++ b/src/unix/unix.c
@@ -71,8 +71,6 @@ SDL_mutex      *blitmtx;
 SDL_threadID    eventthread;
 static int      exit_event         = 0;
 static int      fullscreen_pending = 0;
-uint32_t        lang_id  = 0x0409; // Multilangual UI variables, for now all set to LCID of en-US
-uint32_t        lang_sys = 0x0409; // Multilangual UI variables, for now all set to LCID of en-US

 static const uint16_t sdl_to_xt[0x200] = {
    [SDL_SCANCODE_ESCAPE]       = 0x01,
@@ -1378,8 +1376,8 @@ plat_vidapi_name(UNUSED(int i))
    return "default";
 }

-/* Sets up the program language before initialization. */
-uint32_t
+/* Converts the language code string to a numeric language ID */
+int
 plat_language_code(UNUSED(char *langcode))
 {
    /* or maybe not */
@@ -1419,9 +1417,9 @@ plat_set_thread_name(void *thread, const char *name)
 #endif
 }

-/* Converts back the language code to LCID */
+/* Converts the numeric language ID to a language code string */
 void
-plat_language_code_r(UNUSED(uint32_t lcid), UNUSED(char *outbuf), UNUSED(int len))
+plat_language_code_r(UNUSED(int id), UNUSED(char *outbuf), UNUSED(int len))
 {
    /* or maybe not */
    return;