mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-23 18:08:20 -07:00
Code Issues Packages Projects Releases Activity

Merge pull request #6015 from lemondrops/manager-fix

Browse Source 
Manager: Fix bugs with Voodoo type translation
This commit is contained in:
Miran Grča
2025-08-22 19:14:47 +02:00
committed by GitHub
parent bb513059ae e42aeb500c
commit 2fdc5c927c
2 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/qt/languages/fr-FR.po
View File

@@ -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"

13
src/qt/qt_vmmanager_system.cpp
View File

@@ -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;