Finish merge.

2023-05-16 00:53:59 +02:00
parent 7343b7972c
commit 6bb5942ad1
14 changed files with 429 additions and 69 deletions
--- a/src/qt/qt_mediamenu.cpp
+++ b/src/qt/qt_mediamenu.cpp
@@ -849,7 +849,7 @@ MediaMenu::nicUpdateMenu(int i)
    if (!netMenus.contains(i))
        return;

-    QString netType = tr("None");
+    QString netType = tr("Null Driver");
    switch (net_cards_conf[i].net_type) {
        case NET_TYPE_SLIRP:
            netType = "SLiRP";