diff --git a/src/device.c b/src/device.c
index 857103fa1..3ce49ee78 100644
--- a/src/device.c
+++ b/src/device.c
@@ -483,7 +483,7 @@ device_has_config(const device_t *dev)
     return (c > 0) ? 1 : 0;
 }
 
-static const char *
+const char *
 device_get_bus_name(const device_t *dev)
 {
     const char *sbus = NULL;
@@ -556,9 +556,11 @@ device_get_name(const device_t *dev, int bus, char *name)
 
         if (sbus != NULL) {
             /* First concatenate [<Bus>] before the device's name. */
-            strcat(name, "[");
-            strcat(name, sbus);
-            strcat(name, "] ");
+            if (bus > 0) {
+                strcat(name, "[");
+                strcat(name, sbus);
+                strcat(name, "] ");
+            }
 
             /* Then change string from ISA16 to ISA if applicable. */
             if (!strcmp(sbus, "ISA16"))
diff --git a/src/include/86box/device.h b/src/include/86box/device.h
index b6e78f41c..58edab35c 100644
--- a/src/include/86box/device.h
+++ b/src/include/86box/device.h
@@ -206,6 +206,7 @@ extern void *device_get_priv(const device_t *dev);
 extern int   device_available(const device_t *dev);
 extern void  device_speed_changed(void);
 extern void  device_force_redraw(void);
+extern const char *device_get_bus_name(const device_t *dev);
 extern void  device_get_name(const device_t *dev, int bus, char *name);
 extern int   device_has_config(const device_t *dev);
 
diff --git a/src/qt/languages/86box.pot b/src/qt/languages/86box.pot
index b00cdddbe..5af770c37 100644
--- a/src/qt/languages/86box.pot
+++ b/src/qt/languages/86box.pot
@@ -531,10 +531,10 @@ msgstr ""
 msgid "CD-ROM controller:"
 msgstr ""
 
-msgid "[ISA16] Tertiary IDE Controller"
+msgid "Tertiary IDE Controller"
 msgstr ""
 
-msgid "[ISA16] Quaternary IDE Controller"
+msgid "Quaternary IDE Controller"
 msgstr ""
 
 msgid "Hard disk controllers"
@@ -1842,7 +1842,7 @@ msgstr ""
 msgid "Default Baud rate"
 msgstr ""
 
-msgid "[COM] Standard Hayes-compliant Modem"
+msgid "Standard Hayes-compliant Modem"
 msgstr ""
 
 msgid "Roland MT-32 Emulation"
diff --git a/src/qt/languages/ca-ES.po b/src/qt/languages/ca-ES.po
index 35d8b7505..a47814d1f 100644
--- a/src/qt/languages/ca-ES.po
+++ b/src/qt/languages/ca-ES.po
@@ -537,11 +537,11 @@ msgstr "Controladora de disquets:"
 msgid "CD-ROM controller:"
 msgstr "Controladora de CD-ROM:"
 
-msgid "[ISA16] Tertiary IDE Controller"
-msgstr "[ISA16] Controlador IDE terciari"
+msgid "Tertiary IDE Controller"
+msgstr "Controlador IDE terciari"
 
-msgid "[ISA16] Quaternary IDE Controller"
-msgstr "[ISA16] Controlador IDE quaternari"
+msgid "Quaternary IDE Controller"
+msgstr "Controlador IDE quaternari"
 
 msgid "Hard disk controllers"
 msgstr "Controladores de disc dur"
@@ -1848,8 +1848,8 @@ msgstr "3M MicroTouch (sèrie)"
 msgid "Default Baud rate"
 msgstr "Velocitat de transmissió per defecte"
 
-msgid "[COM] Standard Hayes-compliant Modem"
-msgstr "[COM] Mòdem estàndard compatible amb Hayes"
+msgid "Standard Hayes-compliant Modem"
+msgstr "Mòdem estàndard compatible amb Hayes"
 
 msgid "Roland MT-32 Emulation"
 msgstr "Emulació Roland MT-32"
diff --git a/src/qt/languages/cs-CZ.po b/src/qt/languages/cs-CZ.po
index 7064e6543..9b40ababc 100644
--- a/src/qt/languages/cs-CZ.po
+++ b/src/qt/languages/cs-CZ.po
@@ -537,11 +537,11 @@ msgstr "Disketový řadič:"
 msgid "CD-ROM controller:"
 msgstr "Řadič CD-ROM:"
 
-msgid "[ISA16] Tertiary IDE Controller"
-msgstr "[ISA16] Třetí řadič IDE"
+msgid "Tertiary IDE Controller"
+msgstr "Třetí řadič IDE"
 
-msgid "[ISA16] Quaternary IDE Controller"
-msgstr "[ISA16] Čtvrtý řadič IDE"
+msgid "Quaternary IDE Controller"
+msgstr "Čtvrtý řadič IDE"
 
 msgid "Hard disk controllers"
 msgstr "Řadiče pevných disků"
@@ -1848,8 +1848,8 @@ msgstr "3M MicroTouch (sériová)"
 msgid "Default Baud rate"
 msgstr "Výchozí přenosová rychlost"
 
-msgid "[COM] Standard Hayes-compliant Modem"
-msgstr "[COM] Modem kompatibilní se standardem Hayes"
+msgid "Standard Hayes-compliant Modem"
+msgstr "Modem kompatibilní se standardem Hayes"
 
 msgid "Roland MT-32 Emulation"
 msgstr "Emulace Roland MT-32"
diff --git a/src/qt/languages/de-DE.po b/src/qt/languages/de-DE.po
index 59f5acac6..00770fc65 100644
--- a/src/qt/languages/de-DE.po
+++ b/src/qt/languages/de-DE.po
@@ -537,11 +537,11 @@ msgstr "Disketten-Controller:"
 msgid "CD-ROM controller:"
 msgstr "CD-ROM-Controller:"
 
-msgid "[ISA16] Tertiary IDE Controller"
-msgstr "[ISA16] Tertiärer IDE-Controller"
+msgid "Tertiary IDE Controller"
+msgstr "Tertiärer IDE-Controller"
 
-msgid "[ISA16] Quaternary IDE Controller"
-msgstr "[ISA16] Quartärer IDE-Controller"
+msgid "Quaternary IDE Controller"
+msgstr "Quartärer IDE-Controller"
 
 msgid "Hard disk controllers"
 msgstr "Festplattencontroller"
@@ -1848,8 +1848,8 @@ msgstr "3M MicroTouch (Seriell)"
 msgid "Default Baud rate"
 msgstr "Standard-Baudrate"
 
-msgid "[COM] Standard Hayes-compliant Modem"
-msgstr "[COM] Standard Hayes-kompatibles Modem"
+msgid "Standard Hayes-compliant Modem"
+msgstr "Standard Hayes-kompatibles Modem"
 
 msgid "Roland MT-32 Emulation"
 msgstr "Roland MT-32-Emulation"
diff --git a/src/qt/languages/el-GR.po b/src/qt/languages/el-GR.po
index 69393c751..a3a788d2f 100644
--- a/src/qt/languages/el-GR.po
+++ b/src/qt/languages/el-GR.po
@@ -537,11 +537,11 @@ msgstr "Ελεγκτής δισκέτας:"
 msgid "CD-ROM controller:"
 msgstr "Ελεγκτής CD-ROM:"
 
-msgid "[ISA16] Tertiary IDE Controller"
-msgstr "[ISA16] Τριτογενής Ελεγκτής IDE"
+msgid "Tertiary IDE Controller"
+msgstr "Τριτογενής Ελεγκτής IDE"
 
-msgid "[ISA16] Quaternary IDE Controller"
-msgstr "[ISA16] Τεταρτογενής Ελεγκτής IDE"
+msgid "Quaternary IDE Controller"
+msgstr "Τεταρτογενής Ελεγκτής IDE"
 
 msgid "Hard disk controllers"
 msgstr "Ελεγκτές σκληρού δίσκου"
@@ -1884,8 +1884,8 @@ msgstr "3M MicroTouch (Σειριακό)"
 msgid "Default Baud rate"
 msgstr "Προεπιλεγμένος ρυθμός Baud"
 
-msgid "[COM] Standard Hayes-compliant Modem"
-msgstr "[COM] Τυπικό μόντεμ συμβατό με Hayes"
+msgid "Standard Hayes-compliant Modem"
+msgstr "Τυπικό μόντεμ συμβατό με Hayes"
 
 msgid "Roland MT-32 Emulation"
 msgstr "Εξομοίωση Roland MT-32"
diff --git a/src/qt/languages/es-ES.po b/src/qt/languages/es-ES.po
index c7ff65f18..8b0c029e8 100644
--- a/src/qt/languages/es-ES.po
+++ b/src/qt/languages/es-ES.po
@@ -537,11 +537,11 @@ msgstr "Controladora de disquetes:"
 msgid "CD-ROM controller:"
 msgstr "Controladora CD-ROM:"
 
-msgid "[ISA16] Tertiary IDE Controller"
-msgstr "[ISA16] Tercera controladora IDE"
+msgid "Tertiary IDE Controller"
+msgstr "Tercera controladora IDE"
 
-msgid "[ISA16] Quaternary IDE Controller"
-msgstr "[ISA16] Cuarta controladora IDE"
+msgid "Quaternary IDE Controller"
+msgstr "Cuarta controladora IDE"
 
 msgid "Hard disk controllers"
 msgstr "Controladores de disco duro"
@@ -1848,8 +1848,8 @@ msgstr "3M MicroTouch (serie)"
 msgid "Default Baud rate"
 msgstr "Velocidad de transmisión pretederminada"
 
-msgid "[COM] Standard Hayes-compliant Modem"
-msgstr "[COM] Módem estándar compatible con Hayes"
+msgid "Standard Hayes-compliant Modem"
+msgstr "Módem estándar compatible con Hayes"
 
 msgid "Roland MT-32 Emulation"
 msgstr "Emulación Roland MT-32"
diff --git a/src/qt/languages/fi-FI.po b/src/qt/languages/fi-FI.po
index 71dee237e..5fa58548e 100644
--- a/src/qt/languages/fi-FI.po
+++ b/src/qt/languages/fi-FI.po
@@ -537,11 +537,11 @@ msgstr "Levykeohjain:"
 msgid "CD-ROM controller:"
 msgstr "CD-ohjain:"
 
-msgid "[ISA16] Tertiary IDE Controller"
-msgstr "[ISA16] Kolmas IDE-ohjain"
+msgid "Tertiary IDE Controller"
+msgstr "Kolmas IDE-ohjain"
 
-msgid "[ISA16] Quaternary IDE Controller"
-msgstr "[ISA16] Neljäs IDE-ohjain"
+msgid "Quaternary IDE Controller"
+msgstr "Neljäs IDE-ohjain"
 
 msgid "Hard disk controllers"
 msgstr "Kiintolevyohjaimet"
@@ -1848,8 +1848,8 @@ msgstr "3M MicroTouch (sarja)"
 msgid "Default Baud rate"
 msgstr "Oletussiirtonopeus"
 
-msgid "[COM] Standard Hayes-compliant Modem"
-msgstr "[COM] Tavallinen Hayes-yhteensopiva modeemi"
+msgid "Standard Hayes-compliant Modem"
+msgstr "Tavallinen Hayes-yhteensopiva modeemi"
 
 msgid "Roland MT-32 Emulation"
 msgstr "Roland MT-32-emulointi"
diff --git a/src/qt/languages/fr-FR.po b/src/qt/languages/fr-FR.po
index daef71ec8..482acdc20 100644
--- a/src/qt/languages/fr-FR.po
+++ b/src/qt/languages/fr-FR.po
@@ -537,11 +537,11 @@ msgstr "Contrôleur de disquette :"
 msgid "CD-ROM controller:"
 msgstr "Contrôleur CD-ROM :"
 
-msgid "[ISA16] Tertiary IDE Controller"
-msgstr "[ISA16] Troisième contrôleur IDE"
+msgid "Tertiary IDE Controller"
+msgstr "Troisième contrôleur IDE"
 
-msgid "[ISA16] Quaternary IDE Controller"
-msgstr "[ISA16] Quatrième contrôleur IDE"
+msgid "Quaternary IDE Controller"
+msgstr "Quatrième contrôleur IDE"
 
 msgid "Hard disk controllers"
 msgstr "Contrôleurs de disque dur"
@@ -1848,8 +1848,8 @@ msgstr "3M MicroTouch (série)"
 msgid "Default Baud rate"
 msgstr "Vitesse de transmission par défaut"
 
-msgid "[COM] Standard Hayes-compliant Modem"
-msgstr "[COM] Modem standard conforme à la norme Hayes"
+msgid "Standard Hayes-compliant Modem"
+msgstr "Modem standard conforme à la norme Hayes"
 
 msgid "Roland MT-32 Emulation"
 msgstr "Émulation Roland MT-32"
diff --git a/src/qt/languages/hr-HR.po b/src/qt/languages/hr-HR.po
index 7c4f9d2be..aec1a38d4 100644
--- a/src/qt/languages/hr-HR.po
+++ b/src/qt/languages/hr-HR.po
@@ -539,11 +539,11 @@ msgstr "Kontroler diskete:"
 msgid "CD-ROM controller:"
 msgstr "Kontroler CD-ROM:"
 
-msgid "[ISA16] Tertiary IDE Controller"
-msgstr "[ISA16] Tercijarni IDE kontroler"
+msgid "Tertiary IDE Controller"
+msgstr "Tercijarni IDE kontroler"
 
-msgid "[ISA16] Quaternary IDE Controller"
-msgstr "[ISA16] Kvaternarni IDE kontroler"
+msgid "Quaternary IDE Controller"
+msgstr "Kvaternarni IDE kontroler"
 
 msgid "Hard disk controllers"
 msgstr "Kontroleri tvrdih diskova"
@@ -1850,8 +1850,8 @@ msgstr "3M MicroTouch (serijski)"
 msgid "Default Baud rate"
 msgstr "Zadana brzina prijenosa podataka"
 
-msgid "[COM] Standard Hayes-compliant Modem"
-msgstr "[COM] Standardni modem, usklađen s standardom Hayesom"
+msgid "Standard Hayes-compliant Modem"
+msgstr "Standardni modem, usklađen s standardom Hayesom"
 
 msgid "Roland MT-32 Emulation"
 msgstr "Emulacija Rolanda MT-32"
diff --git a/src/qt/languages/it-IT.po b/src/qt/languages/it-IT.po
index aa846ca15..a7f780029 100644
--- a/src/qt/languages/it-IT.po
+++ b/src/qt/languages/it-IT.po
@@ -537,11 +537,11 @@ msgstr "Controller del floppy disk:"
 msgid "CD-ROM controller:"
 msgstr "Controller CD-ROM:"
 
-msgid "[ISA16] Tertiary IDE Controller"
-msgstr "[ISA16] Controller IDE terziario"
+msgid "Tertiary IDE Controller"
+msgstr "Controller IDE terziario"
 
-msgid "[ISA16] Quaternary IDE Controller"
-msgstr "[ISA16] Controller IDE quaternario"
+msgid "Quaternary IDE Controller"
+msgstr "Controller IDE quaternario"
 
 msgid "Hard disk controllers"
 msgstr "Controller del disco rigido"
@@ -1848,8 +1848,8 @@ msgstr "3M MicroTouch (seriale)"
 msgid "Default Baud rate"
 msgstr "Velocità di trasmissione predefinita"
 
-msgid "[COM] Standard Hayes-compliant Modem"
-msgstr "[COM] Modem standard conforme a Hayes"
+msgid "Standard Hayes-compliant Modem"
+msgstr "Modem standard conforme a Hayes"
 
 msgid "Roland MT-32 Emulation"
 msgstr "Emulazione Roland MT-32"
diff --git a/src/qt/languages/ja-JP.po b/src/qt/languages/ja-JP.po
index 003c32d67..e891d0dc4 100644
--- a/src/qt/languages/ja-JP.po
+++ b/src/qt/languages/ja-JP.po
@@ -538,11 +538,11 @@ msgstr "FDDコントローラー:"
 msgid "CD-ROM controller:"
 msgstr "CD-ROMコントローラー:"
 
-msgid "[ISA16] Tertiary IDE Controller"
-msgstr "[ISA16] 第三IDEコントローラー"
+msgid "Tertiary IDE Controller"
+msgstr "第三IDEコントローラー"
 
-msgid "[ISA16] Quaternary IDE Controller"
-msgstr "[ISA16] 第四IDEコントローラー"
+msgid "Quaternary IDE Controller"
+msgstr "第四IDEコントローラー"
 
 msgid "Hard disk controllers"
 msgstr "ハードディスクコントローラー"
@@ -1849,8 +1849,8 @@ msgstr "3Mマイクロタッチ（シリアル）"
 msgid "Default Baud rate"
 msgstr "デフォルトのボーレート"
 
-msgid "[COM] Standard Hayes-compliant Modem"
-msgstr "[COM] 標準ヘイズ準拠モデム"
+msgid "Standard Hayes-compliant Modem"
+msgstr "標準ヘイズ準拠モデム"
 
 msgid "Roland MT-32 Emulation"
 msgstr "Roland MT-32エミュレーション"
diff --git a/src/qt/languages/ko-KR.po b/src/qt/languages/ko-KR.po
index 54e618ccf..072cbef04 100644
--- a/src/qt/languages/ko-KR.po
+++ b/src/qt/languages/ko-KR.po
@@ -531,11 +531,11 @@ msgstr "플로피 디스크 컨트롤러:"
 msgid "CD-ROM controller:"
 msgstr "CD-ROM 컨트롤러:"
 
-msgid "[ISA16] Tertiary IDE Controller"
-msgstr "[ISA16] 제3의 IDE 컨트롤러"
+msgid "Tertiary IDE Controller"
+msgstr "제3의 IDE 컨트롤러"
 
-msgid "[ISA16] Quaternary IDE Controller"
-msgstr "[ISA16] 제4의 IDE 컨트롤러"
+msgid "Quaternary IDE Controller"
+msgstr "제4의 IDE 컨트롤러"
 
 msgid "Hard disk controllers"
 msgstr "하드 디스크 컨트롤러"
@@ -1842,8 +1842,8 @@ msgstr "3M 마이크로터치(직렬)"
 msgid "Default Baud rate"
 msgstr "기본 보드 속도"
 
-msgid "[COM] Standard Hayes-compliant Modem"
-msgstr "[COM] 표준 헤이즈 호환 모뎀"
+msgid "Standard Hayes-compliant Modem"
+msgstr "표준 헤이즈 호환 모뎀"
 
 msgid "Roland MT-32 Emulation"
 msgstr "롤랜드 MT-32 에뮬레이션"
diff --git a/src/qt/languages/nb-NO.po b/src/qt/languages/nb-NO.po
index 1716eefd3..c0f7db5e4 100644
--- a/src/qt/languages/nb-NO.po
+++ b/src/qt/languages/nb-NO.po
@@ -531,11 +531,11 @@ msgstr "Diskettkontroller:"
 msgid "CD-ROM controller:"
 msgstr "CD-ROM-kontroller:"
 
-msgid "[ISA16] Tertiary IDE Controller"
-msgstr "[ISA16] Tertiær IDE-kontroller"
+msgid "Tertiary IDE Controller"
+msgstr "Tertiær IDE-kontroller"
 
-msgid "[ISA16] Quaternary IDE Controller"
-msgstr "[ISA16] Kvartær IDE-kontroller"
+msgid "Quaternary IDE Controller"
+msgstr "Kvartær IDE-kontroller"
 
 msgid "Hard disk controllers"
 msgstr "Harddiskkontrollere"
@@ -1842,8 +1842,8 @@ msgstr "3M MicroTouch (seriell)"
 msgid "Default Baud rate"
 msgstr "Standard baudrate"
 
-msgid "[COM] Standard Hayes-compliant Modem"
-msgstr "[COM] Standard Hayes-kompatibelt modem"
+msgid "Standard Hayes-compliant Modem"
+msgstr "Standard Hayes-kompatibelt modem"
 
 msgid "Roland MT-32 Emulation"
 msgstr "Roland MT-32-emulering"
diff --git a/src/qt/languages/nl-NL.po b/src/qt/languages/nl-NL.po
index 711477a12..5a6de011e 100644
--- a/src/qt/languages/nl-NL.po
+++ b/src/qt/languages/nl-NL.po
@@ -531,11 +531,11 @@ msgstr "Floppy disk controller:"
 msgid "CD-ROM controller:"
 msgstr "CD-ROM controller:"
 
-msgid "[ISA16] Tertiary IDE Controller"
-msgstr "[ISA16] Tertiaire IDE-controller"
+msgid "Tertiary IDE Controller"
+msgstr "Tertiaire IDE-controller"
 
-msgid "[ISA16] Quaternary IDE Controller"
-msgstr "[ISA16] Quaternaire IDE-controller"
+msgid "Quaternary IDE Controller"
+msgstr "Quaternaire IDE-controller"
 
 msgid "Hard disk controllers"
 msgstr "Harde schijfcontrollers"
@@ -1842,8 +1842,8 @@ msgstr "3M MicroTouch (serieel)"
 msgid "Default Baud rate"
 msgstr "Standaard baudrate"
 
-msgid "[COM] Standard Hayes-compliant Modem"
-msgstr "[COM] Standaard Hayes-compatibele modem"
+msgid "Standard Hayes-compliant Modem"
+msgstr "Standaard Hayes-compatibele modem"
 
 msgid "Roland MT-32 Emulation"
 msgstr "Roland MT-32-emulatie"
diff --git a/src/qt/languages/pl-PL.po b/src/qt/languages/pl-PL.po
index 307affc79..6a2ddc3ea 100644
--- a/src/qt/languages/pl-PL.po
+++ b/src/qt/languages/pl-PL.po
@@ -538,11 +538,11 @@ msgstr "Kontroler dyskietek:"
 msgid "CD-ROM controller:"
 msgstr "Kontroler CD-ROM:"
 
-msgid "[ISA16] Tertiary IDE Controller"
-msgstr "[ISA16] Trzeciorzędny kontroler IDE"
+msgid "Tertiary IDE Controller"
+msgstr "Trzeciorzędny kontroler IDE"
 
-msgid "[ISA16] Quaternary IDE Controller"
-msgstr "[ISA16] Czwartorzędny kontroler IDE"
+msgid "Quaternary IDE Controller"
+msgstr "Czwartorzędny kontroler IDE"
 
 msgid "Hard disk controllers"
 msgstr "Kontrolery dysków twardych"
@@ -1849,8 +1849,8 @@ msgstr "3M MicroTouch (szeregowy)"
 msgid "Default Baud rate"
 msgstr "Domyślna szybkość transmisji"
 
-msgid "[COM] Standard Hayes-compliant Modem"
-msgstr "[COM] Standardowy modem zgodny z Hayes"
+msgid "Standard Hayes-compliant Modem"
+msgstr "Standardowy modem zgodny z Hayes"
 
 msgid "Roland MT-32 Emulation"
 msgstr "Emulacja Roland MT-32"
diff --git a/src/qt/languages/pt-BR.po b/src/qt/languages/pt-BR.po
index 6f46fa90a..64b7939f3 100644
--- a/src/qt/languages/pt-BR.po
+++ b/src/qt/languages/pt-BR.po
@@ -531,11 +531,11 @@ msgstr "Controlador de disquete:"
 msgid "CD-ROM controller:"
 msgstr "Controlador de CD-ROM:"
 
-msgid "[ISA16] Tertiary IDE Controller"
-msgstr "[ISA16] Controlador IDE terciário"
+msgid "Tertiary IDE Controller"
+msgstr "Controlador IDE terciário"
 
-msgid "[ISA16] Quaternary IDE Controller"
-msgstr "[ISA16] Controlador IDE quaternário"
+msgid "Quaternary IDE Controller"
+msgstr "Controlador IDE quaternário"
 
 msgid "Hard disk controllers"
 msgstr "Controladores de disco rígido"
@@ -1842,8 +1842,8 @@ msgstr "3M MicroTouch (serial)"
 msgid "Default Baud rate"
 msgstr "Taxa de transmissão padrão"
 
-msgid "[COM] Standard Hayes-compliant Modem"
-msgstr "[COM] Modem padrão compatível com Hayes"
+msgid "Standard Hayes-compliant Modem"
+msgstr "Modem padrão compatível com Hayes"
 
 msgid "Roland MT-32 Emulation"
 msgstr "Emulação do Roland MT-32"
diff --git a/src/qt/languages/pt-PT.po b/src/qt/languages/pt-PT.po
index 7713bb5f0..086fbe1b5 100644
--- a/src/qt/languages/pt-PT.po
+++ b/src/qt/languages/pt-PT.po
@@ -538,11 +538,11 @@ msgstr "Controlador de disquetes:"
 msgid "CD-ROM controller:"
 msgstr "Controlador CD-ROM:"
 
-msgid "[ISA16] Tertiary IDE Controller"
-msgstr "[ISA16] Controlador IDE terciário"
+msgid "Tertiary IDE Controller"
+msgstr "Controlador IDE terciário"
 
-msgid "[ISA16] Quaternary IDE Controller"
-msgstr "[ISA16] Controlador IDE quaternário"
+msgid "Quaternary IDE Controller"
+msgstr "Controlador IDE quaternário"
 
 msgid "Hard disk controllers"
 msgstr "Controladores de disco rígido"
@@ -1849,8 +1849,8 @@ msgstr "3M MicroTouch (série)"
 msgid "Default Baud rate"
 msgstr "Velocidade de transmissão padrão"
 
-msgid "[COM] Standard Hayes-compliant Modem"
-msgstr "[COM] Modem padrão compatível com Hayes"
+msgid "Standard Hayes-compliant Modem"
+msgstr "Modem padrão compatível com Hayes"
 
 msgid "Roland MT-32 Emulation"
 msgstr "Emulação do Roland MT-32"
diff --git a/src/qt/languages/ru-RU.po b/src/qt/languages/ru-RU.po
index 47f473d90..9308e6da3 100644
--- a/src/qt/languages/ru-RU.po
+++ b/src/qt/languages/ru-RU.po
@@ -538,11 +538,11 @@ msgstr "Контроллер гибких дисков:"
 msgid "CD-ROM controller:"
 msgstr "Контроллер CD-ROM:"
 
-msgid "[ISA16] Tertiary IDE Controller"
-msgstr "[ISA16] Третичный контроллер IDE"
+msgid "Tertiary IDE Controller"
+msgstr "Третичный контроллер IDE"
 
-msgid "[ISA16] Quaternary IDE Controller"
-msgstr "[ISA16] Четвертичный контроллер IDE"
+msgid "Quaternary IDE Controller"
+msgstr "Четвертичный контроллер IDE"
 
 msgid "Hard disk controllers"
 msgstr "Контроллеры жёстких дисков"
@@ -1861,8 +1861,8 @@ msgstr "3M MicroTouch (последовательный)"
 msgid "Default Baud rate"
 msgstr "Скорость передачи данных по умолчанию"
 
-msgid "[COM] Standard Hayes-compliant Modem"
-msgstr "[COM] Стандартный Hayes-совместимый модем"
+msgid "Standard Hayes-compliant Modem"
+msgstr "Стандартный Hayes-совместимый модем"
 
 msgid "Roland MT-32 Emulation"
 msgstr "Эмуляция Roland MT-32"
diff --git a/src/qt/languages/sk-SK.po b/src/qt/languages/sk-SK.po
index 01a178a68..76015e0b1 100644
--- a/src/qt/languages/sk-SK.po
+++ b/src/qt/languages/sk-SK.po
@@ -537,11 +537,11 @@ msgstr "Disketový radič:"
 msgid "CD-ROM controller:"
 msgstr "Radič CD-ROM:"
 
-msgid "[ISA16] Tertiary IDE Controller"
-msgstr "[ISA16] Tretí radič IDE"
+msgid "Tertiary IDE Controller"
+msgstr "Tretí radič IDE"
 
-msgid "[ISA16] Quaternary IDE Controller"
-msgstr "[ISA16] Štvrtý radič IDE"
+msgid "Quaternary IDE Controller"
+msgstr "Štvrtý radič IDE"
 
 msgid "Hard disk controllers"
 msgstr "Radiče pevných diskov"
@@ -1848,8 +1848,8 @@ msgstr "3M MicroTouch (sériová)"
 msgid "Default Baud rate"
 msgstr "Východná prenosová rýchlosť"
 
-msgid "[COM] Standard Hayes-compliant Modem"
-msgstr "[COM] Štandardný modem kompatibilný s Hayesom"
+msgid "Standard Hayes-compliant Modem"
+msgstr "Štandardný modem kompatibilný s Hayesom"
 
 msgid "Roland MT-32 Emulation"
 msgstr "Emulácia Roland MT-32"
diff --git a/src/qt/languages/sl-SI.po b/src/qt/languages/sl-SI.po
index 9eb1875bb..f36f32e50 100644
--- a/src/qt/languages/sl-SI.po
+++ b/src/qt/languages/sl-SI.po
@@ -539,11 +539,11 @@ msgstr "Disketni krmilnik:"
 msgid "CD-ROM controller:"
 msgstr "Krmilnik CD-ROM:"
 
-msgid "[ISA16] Tertiary IDE Controller"
-msgstr "[ISA16] Terciarni krmilnik IDE"
+msgid "Tertiary IDE Controller"
+msgstr "Terciarni krmilnik IDE"
 
-msgid "[ISA16] Quaternary IDE Controller"
-msgstr "[ISA16] Kvartarni krmilnik IDE"
+msgid "Quaternary IDE Controller"
+msgstr "Kvartarni krmilnik IDE"
 
 msgid "Hard disk controllers"
 msgstr "Krmilniki trdih diskov"
@@ -1850,8 +1850,8 @@ msgstr "3M MicroTouch (serijska)"
 msgid "Default Baud rate"
 msgstr "Privzeta baudna hitrost"
 
-msgid "[COM] Standard Hayes-compliant Modem"
-msgstr "[COM] Standardni modem v skladen s Hayes"
+msgid "Standard Hayes-compliant Modem"
+msgstr "Standardni modem v skladen s Hayes"
 
 msgid "Roland MT-32 Emulation"
 msgstr "Emulacija Roland MT-32"
diff --git a/src/qt/languages/sv-SE.po b/src/qt/languages/sv-SE.po
index 055b1420e..c897ed83d 100644
--- a/src/qt/languages/sv-SE.po
+++ b/src/qt/languages/sv-SE.po
@@ -531,11 +531,11 @@ msgstr "Styrenhet för diskett:"
 msgid "CD-ROM controller:"
 msgstr "Styrenhet för CD-ROM:"
 
-msgid "[ISA16] Tertiary IDE Controller"
-msgstr "[ISA16] Tertiär IDE-kontroller"
+msgid "Tertiary IDE Controller"
+msgstr "Tertiär IDE-kontroller"
 
-msgid "[ISA16] Quaternary IDE Controller"
-msgstr "[ISA16] Kvartär IDE-kontroller"
+msgid "Quaternary IDE Controller"
+msgstr "Kvartär IDE-kontroller"
 
 msgid "Hard disk controllers"
 msgstr "Hårddiskkontroller"
@@ -1842,8 +1842,8 @@ msgstr "3M MicroTouch (serie)"
 msgid "Default Baud rate"
 msgstr "Standard Baudhastighet"
 
-msgid "[COM] Standard Hayes-compliant Modem"
-msgstr "[COM] Standard Hayes-kompatibelt modem"
+msgid "Standard Hayes-compliant Modem"
+msgstr "Standard Hayes-kompatibelt modem"
 
 msgid "Roland MT-32 Emulation"
 msgstr "Roland MT-32 emulering"
diff --git a/src/qt/languages/tr-TR.po b/src/qt/languages/tr-TR.po
index fef1db11c..546b197a6 100644
--- a/src/qt/languages/tr-TR.po
+++ b/src/qt/languages/tr-TR.po
@@ -537,11 +537,11 @@ msgstr "Disket denetleyicisi:"
 msgid "CD-ROM controller:"
 msgstr "CD-ROM denetleyicisi:"
 
-msgid "[ISA16] Tertiary IDE Controller"
-msgstr "[ISA16] Üçüncül IDE denetleyicisi"
+msgid "Tertiary IDE Controller"
+msgstr "Üçüncül IDE denetleyicisi"
 
-msgid "[ISA16] Quaternary IDE Controller"
-msgstr "[ISA16] Dördüncül IDE denetleyicisi"
+msgid "Quaternary IDE Controller"
+msgstr "Dördüncül IDE denetleyicisi"
 
 msgid "Hard disk controllers"
 msgstr "Sabit disk denetleyicileri"
@@ -1848,8 +1848,8 @@ msgstr "3M MicroTouch (seri)"
 msgid "Default Baud rate"
 msgstr "Varsayılan Baud hızı"
 
-msgid "[COM] Standard Hayes-compliant Modem"
-msgstr "[COM] Standart Hayes Uyumlu Modem"
+msgid "Standard Hayes-compliant Modem"
+msgstr "Standart Hayes Uyumlu Modem"
 
 msgid "Roland MT-32 Emulation"
 msgstr "Roland MT-32 Emülasyonu"
diff --git a/src/qt/languages/uk-UA.po b/src/qt/languages/uk-UA.po
index 9ce655b54..9f7711d04 100644
--- a/src/qt/languages/uk-UA.po
+++ b/src/qt/languages/uk-UA.po
@@ -539,11 +539,11 @@ msgstr "Контролер гнучких дисків:"
 msgid "CD-ROM controller:"
 msgstr "Контролер CD-ROM:"
 
-msgid "[ISA16] Tertiary IDE Controller"
-msgstr "[ISA16] Третинний контролер IDE"
+msgid "Tertiary IDE Controller"
+msgstr "Третинний контролер IDE"
 
-msgid "[ISA16] Quaternary IDE Controller"
-msgstr "[ISA16] Четвертинний контролер IDE"
+msgid "Quaternary IDE Controller"
+msgstr "Четвертинний контролер IDE"
 
 msgid "Hard disk controllers"
 msgstr "Контролери жорстких дисків"
@@ -1850,8 +1850,8 @@ msgstr "3M MicroTouch (послідовна)"
 msgid "Default Baud rate"
 msgstr "Швидкість передачі даних за замовчуванням"
 
-msgid "[COM] Standard Hayes-compliant Modem"
-msgstr "[COM] Стандартний модем, сумісний зі стандартом Hayes"
+msgid "Standard Hayes-compliant Modem"
+msgstr "Стандартний модем, сумісний зі стандартом Hayes"
 
 msgid "Roland MT-32 Emulation"
 msgstr "Емуляція Roland MT-32"
diff --git a/src/qt/languages/vi-VN.po b/src/qt/languages/vi-VN.po
index 79575f0a9..00ca5f514 100644
--- a/src/qt/languages/vi-VN.po
+++ b/src/qt/languages/vi-VN.po
@@ -531,11 +531,11 @@ msgstr "Bộ điều khiển ổ mềm:"
 msgid "CD-ROM controller:"
 msgstr "Bộ điều khiển CD-ROM:"
 
-msgid "[ISA16] Tertiary IDE Controller"
-msgstr "[ISA16] Bộ điều khiển IDE thứ ba"
+msgid "Tertiary IDE Controller"
+msgstr "Bộ điều khiển IDE thứ ba"
 
-msgid "[ISA16] Quaternary IDE Controller"
-msgstr "[ISA16] Bộ điều khiển IDE thứ tư"
+msgid "Quaternary IDE Controller"
+msgstr "Bộ điều khiển IDE thứ tư"
 
 msgid "Hard disk controllers"
 msgstr "Bộ điều khiển ổ cứng"
@@ -1842,8 +1842,8 @@ msgstr "3M MicroTouch (Serial)"
 msgid "Default Baud rate"
 msgstr "Tốc độ baud mặc định"
 
-msgid "[COM] Standard Hayes-compliant Modem"
-msgstr "[COM] Modem tuân thủ tiêu chuẩn Hayes"
+msgid "Standard Hayes-compliant Modem"
+msgstr "Modem tuân thủ tiêu chuẩn Hayes"
 
 msgid "Roland MT-32 Emulation"
 msgstr "Mô phỏng Roland MT-32"
diff --git a/src/qt/languages/zh-CN.po b/src/qt/languages/zh-CN.po
index 76d1c53b2..e61f2ce7f 100644
--- a/src/qt/languages/zh-CN.po
+++ b/src/qt/languages/zh-CN.po
@@ -531,11 +531,11 @@ msgstr "软盘控制器:"
 msgid "CD-ROM controller:"
 msgstr "CD-ROM 控制器:"
 
-msgid "[ISA16] Tertiary IDE Controller"
-msgstr "[ISA16] 第三 IDE 控制器"
+msgid "Tertiary IDE Controller"
+msgstr "第三 IDE 控制器"
 
-msgid "[ISA16] Quaternary IDE Controller"
-msgstr "[ISA16] 第四 IDE 控制器"
+msgid "Quaternary IDE Controller"
+msgstr "第四 IDE 控制器"
 
 msgid "Hard disk controllers"
 msgstr "硬盘控制器"
@@ -1842,8 +1842,8 @@ msgstr "3M MicroTouch (串口)"
 msgid "Default Baud rate"
 msgstr "默认波特率"
 
-msgid "[COM] Standard Hayes-compliant Modem"
-msgstr "[COM] 标准 Hayes 兼容调制解调器"
+msgid "Standard Hayes-compliant Modem"
+msgstr "标准 Hayes 兼容调制解调器"
 
 msgid "Roland MT-32 Emulation"
 msgstr "Roland MT-32 仿真"
diff --git a/src/qt/languages/zh-TW.po b/src/qt/languages/zh-TW.po
index 200ed0095..736435c89 100644
--- a/src/qt/languages/zh-TW.po
+++ b/src/qt/languages/zh-TW.po
@@ -538,11 +538,11 @@ msgstr "軟碟控制器:"
 msgid "CD-ROM controller:"
 msgstr "CD-ROM 控制器:"
 
-msgid "[ISA16] Tertiary IDE Controller"
-msgstr "[ISA16] 第三 IDE 控制器"
+msgid "Tertiary IDE Controller"
+msgstr "第三 IDE 控制器"
 
-msgid "[ISA16] Quaternary IDE Controller"
-msgstr "[ISA16] 第四 IDE 控制器"
+msgid "Quaternary IDE Controller"
+msgstr "第四 IDE 控制器"
 
 msgid "Hard disk controllers"
 msgstr "硬碟控制器"
@@ -1849,8 +1849,8 @@ msgstr "3M MicroTouch (序列埠)"
 msgid "Default Baud rate"
 msgstr "預設鮑率"
 
-msgid "[COM] Standard Hayes-compliant Modem"
-msgstr "[COM] 標準 Hayes 相容的數據機"
+msgid "Standard Hayes-compliant Modem"
+msgstr "標準 Hayes 相容的數據機"
 
 msgid "Roland MT-32 Emulation"
 msgstr "Roland MT-32 模擬"
diff --git a/src/qt/qt_deviceconfig.cpp b/src/qt/qt_deviceconfig.cpp
index 7cc398988..42d63243d 100644
--- a/src/qt/qt_deviceconfig.cpp
+++ b/src/qt/qt_deviceconfig.cpp
@@ -492,8 +492,18 @@ DeviceConfig::DeviceName(const _device_ *device, const char *internalName, const
     else if (device == nullptr)
         return "";
     else {
-        char temp[512];
-        device_get_name(device, bus, temp);
-        return tr((const char *) temp);
+        char        temp[512];
+        const char *tempbus;
+        if (bus == 1) {
+            device_get_name(device, -1, temp);
+            tempbus = device_get_bus_name(device);
+            if (tempbus != nullptr)
+                return QString("[%1] %2").arg(tr(tempbus), tr((const char *) temp));
+            else
+                return tr((const char *) temp);
+        } else {
+            device_get_name(device, bus, temp);
+            return tr((const char *) temp);
+        }
     }
 }