From 4be00def5c0e6778d51e49e83a6e8111e18afb10 Mon Sep 17 00:00:00 2001
From: Kyle K <190571+Docteh@users.noreply.github.com>
Date: Sun, 1 May 2022 20:36:10 -0700
Subject: [PATCH 1/2] ui: retranslate the network tab

Looks like it was just missed when it was added, as currently the Network Tab only has one item
RetranslateUI is used more commonly throughout the project
---
 src/yuzu/configuration/configure_network.cpp | 10 +++++++++-
 src/yuzu/configuration/configure_network.h   |  3 ++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/yuzu/configuration/configure_network.cpp b/src/yuzu/configuration/configure_network.cpp
index f87d3d53aa..8ed08fa6a8 100644
--- a/src/yuzu/configuration/configure_network.cpp
+++ b/src/yuzu/configuration/configure_network.cpp
@@ -26,7 +26,15 @@ void ConfigureNetwork::ApplyConfiguration() {
     Settings::values.network_interface = ui->network_interface->currentText().toStdString();
 }
 
-void ConfigureNetwork::RetranslateUi() {
+void ConfigureNetwork::changeEvent(QEvent* event) {
+    if (event->type() == QEvent::LanguageChange) {
+        RetranslateUI();
+    }
+
+    QWidget::changeEvent(event);
+}
+
+void ConfigureNetwork::RetranslateUI() {
     ui->retranslateUi(this);
 }
 
diff --git a/src/yuzu/configuration/configure_network.h b/src/yuzu/configuration/configure_network.h
index e8245cfdc9..f666edbd13 100644
--- a/src/yuzu/configuration/configure_network.h
+++ b/src/yuzu/configuration/configure_network.h
@@ -18,9 +18,10 @@ public:
     ~ConfigureNetwork() override;
 
     void ApplyConfiguration();
-    void RetranslateUi();
 
 private:
+    void changeEvent(QEvent*) override;
+    void RetranslateUI();
     void SetConfiguration();
 
     std::unique_ptr<Ui::ConfigureNetwork> ui;

From 3e18873a8519425f8fc1d6d2764f7d3f93b40668 Mon Sep 17 00:00:00 2001
From: Levi Behunin <l3ehunin@gmail.com>
Date: Mon, 2 May 2022 00:57:22 -0600
Subject: [PATCH 2/2] Update gc_adapter.cpp

Just to silence an intermittent error.
GCC11.2 complains cannot find 'libusb.h' during a fresh build.
---
 src/input_common/drivers/gc_adapter.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/input_common/drivers/gc_adapter.cpp b/src/input_common/drivers/gc_adapter.cpp
index 27a0ffb0dc..a2880b9be2 100644
--- a/src/input_common/drivers/gc_adapter.cpp
+++ b/src/input_common/drivers/gc_adapter.cpp
@@ -2,7 +2,11 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 
 #include <fmt/format.h>
+#ifdef _WIN32
 #include <libusb.h>
+#else
+#include <libusb-1.0/libusb.h>
+#endif
 
 #include "common/logging/log.h"
 #include "common/param_package.h"