From 3b39734e32f0321429c897a7d2960a25f86379d4 Mon Sep 17 00:00:00 2001
From: Alexander Babikov <lemondrops358@gmail.com>
Date: Fri, 22 Aug 2025 20:57:27 +0500
Subject: [PATCH 1/2] Manager: Fix bugs with Voodoo type translation

Also fix Voodoo and ISA RTC remaining after removal
---
 src/qt/qt_vmmanager_system.cpp | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/qt/qt_vmmanager_system.cpp b/src/qt/qt_vmmanager_system.cpp
index 72d6f2eea..61c52b1b0 100644
--- a/src/qt/qt_vmmanager_system.cpp
+++ b/src/qt/qt_vmmanager_system.cpp
@@ -622,10 +622,12 @@ VMManagerSystem::setupVars() {
         display_table[Display::Name::Video].append(tr("IBM PS/55 Display Adapter Graphics").prepend(VMManagerDetailSection::sectionSeparator));
 
     // Voodoo
+    QString voodoo_name = "";
     if (video_config.contains("voodoo") && (video_config["voodoo"].toInt() != 0)) {
-        auto voodoo_config = getCategory(DeviceConfig::DeviceName(&voodoo_device, "voodoo", 0));
+        char temp[512];
+        device_get_name(&voodoo_device, 0, temp);
+        auto voodoo_config = getCategory(QString(temp));
         int voodoo_type = voodoo_config["type"].toInt();
-        QString voodoo_name;
         switch (voodoo_type) {
             case 0:
             default:
@@ -638,8 +640,8 @@ VMManagerSystem::setupVars() {
                 voodoo_name = tr("3Dfx Voodoo 2");
                 break;
         }
-        display_table[Display::Name::Voodoo] = voodoo_name;
     }
+    display_table[Display::Name::Voodoo] = voodoo_name;
 
     // Drives
     // First the number of disks
@@ -1028,12 +1030,13 @@ VMManagerSystem::setupVars() {
     display_table[Display::Name::Parallel] = (lptFinal.empty()    ?  tr("None") : lptFinal.join((hasLptDevices ? VMManagerDetailSection::sectionSeparator : ", ")));
 
     // ISA RTC
+    QString isartc_dev_name = "";
     if (other_config.contains("isartc_type")) {
         auto isartc_internal_name = other_config["isartc_type"];
         auto isartc_dev = isartc_get_from_internal_name(isartc_internal_name.toUtf8().data());
-        auto isartc_dev_name = DeviceConfig::DeviceName(isartc_get_device(isartc_dev), isartc_get_internal_name(isartc_dev), 0);
-        display_table[Display::Name::IsaRtc] = isartc_dev_name;
+        isartc_dev_name = DeviceConfig::DeviceName(isartc_get_device(isartc_dev), isartc_get_internal_name(isartc_dev), 0);
     }
+    display_table[Display::Name::IsaRtc] = isartc_dev_name;
 
     // ISA RAM
     QStringList IsaMemCards;

From e42aeb500c8e7492b10a9ddffc3af31becc48ba6 Mon Sep 17 00:00:00 2001
From: Alexander Babikov <lemondrops358@gmail.com>
Date: Fri, 22 Aug 2025 21:44:59 +0500
Subject: [PATCH 2/2] Fix French translation mnemonics

---
 src/qt/languages/fr-FR.po | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/qt/languages/fr-FR.po b/src/qt/languages/fr-FR.po
index 6c94e9635..151d3c91d 100644
--- a/src/qt/languages/fr-FR.po
+++ b/src/qt/languages/fr-FR.po
@@ -40,7 +40,7 @@ msgid "&View"
 msgstr "&Vue"
 
 msgid "&Hide status bar"
-msgstr "&Masquer la barre de status"
+msgstr "Masquer &la barre de status"
 
 msgid "Hide &toolbar"
 msgstr "Masquer la &barre d'outils"
@@ -52,7 +52,7 @@ msgid "R&emember size && position"
 msgstr "S&auvegarder taille && position"
 
 msgid "Re&nderer"
-msgstr "Moteur de &rendu vidéo"
+msgstr "Moteur de re&ndu vidéo"
 
 msgid "&Qt (Software)"
 msgstr "&Qt (Logiciel)"
@@ -64,10 +64,10 @@ msgid "&VNC"
 msgstr "&VNC"
 
 msgid "Specify &dimensions..."
-msgstr "Spécifier dimensions..."
+msgstr "Spécifier dimen&sions..."
 
-msgid "F&orce 4:3 display ratio"
-msgstr "F&orcer le ratio 4:3"
+msgid "Force &4:3 display ratio"
+msgstr "Forcer le ratio &4:3"
 
 msgid "&Window scale factor"
 msgstr "Facteur d'&Echelle"
@@ -103,7 +103,7 @@ msgid "&8x"
 msgstr "&8x"
 
 msgid "Fi&lter method"
-msgstr "Méthode de Filtre"
+msgstr "Mét&hode de Filtre"
 
 msgid "&Nearest"
 msgstr "&Plus proche"
@@ -118,7 +118,7 @@ msgid "&Fullscreen"
 msgstr "&Plein écran"
 
 msgid "Fullscreen &stretch mode"
-msgstr "Mode plein écran &étiré"
+msgstr "Mode plein écran é&tiré"
 
 msgid "&Full screen stretch"
 msgstr "&Plein écran étiré"
@@ -220,7 +220,7 @@ msgid "End trace"
 msgstr "Arrêter traces"
 
 msgid "&Help"
-msgstr "&Aide"
+msgstr "Ai&de"
 
 msgid "&Documentation..."
 msgstr "&Documentation..."
@@ -1639,13 +1639,13 @@ msgid "&MCA devices..."
 msgstr "Dispositifs MCA..."
 
 msgid "Show non-&primary monitors"
-msgstr "Afficher les moniteurs non primaires"
+msgstr "Afficher les moniteurs non pr&imaires"
 
 msgid "Open screenshots &folder..."
 msgstr "Ouvrir le dossier des captures d'écran..."
 
 msgid "Appl&y fullscreen stretch mode when maximized"
-msgstr "Appliquer le mode élargi plein écran lorsque la fenêtre est maximisée"
+msgstr "Appli&quer le mode élargi plein écran lorsque la fenêtre est maximisée"
 
 msgid "&Cursor/Puck"
 msgstr "&Curseur/Palette"
@@ -1792,7 +1792,7 @@ msgid "Serial port passthrough 4"
 msgstr "Transfert du port série 4"
 
 msgid "Renderer &options..."
-msgstr "Options du rendu..."
+msgstr "&Options du rendu..."
 
 msgid "PC/XT Keyboard"
 msgstr "Clavier PC/XT"
@@ -2767,7 +2767,7 @@ msgid "Keybind"
 msgstr "Raccourci clavier"
 
 msgid "Clear binding"
-msgstr "Supprimer la raccourci"
+msgstr "Supprimer le raccourci"
 
 msgid "Bind"
 msgstr "Lier"