diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
index a55ec3d731..a15b91920c 100644
--- a/UI/GameSettingsScreen.cpp
+++ b/UI/GameSettingsScreen.cpp
@@ -377,8 +377,14 @@ void GameSettingsScreen::CreateViews() {
 
 	systemSettings->Add(new ItemHeader(s->T("Networking")));
 	systemSettings->Add(new CheckBox(&g_Config.bEnableWlan, s->T("Enable networking", "Enable networking/wlan (beta)")));
+
+#ifdef _WIN32
+	systemSettings->Add(new PopupTextInputChoice(&g_Config.proAdhocServer, s->T("Change proAdhocServer Address"), "", screenManager()));
+	systemSettings->Add(new PopupTextInputChoice(&g_Config.localMacAddress, s->T("Change Mac Address"), "", screenManager()));
+#else
 	systemSettings->Add(new Choice(s->T("Change proAdhocServer Address")))->OnClick.Handle(this, &GameSettingsScreen::OnChangeproAdhocServerAddress);
 	systemSettings->Add(new Choice(s->T("Change Mac Address")))->OnClick.Handle(this, &GameSettingsScreen::OnChangeMacAddress);
+#endif
 
 //#ifndef ANDROID
 	systemSettings->Add(new ItemHeader(s->T("Cheats", "Cheats (experimental, see forums)")));
diff --git a/lang b/lang
index faef520e60..674bb87b81 160000
--- a/lang
+++ b/lang
@@ -1 +1 @@
-Subproject commit faef520e6080f6438d350c28b8587eb2823b810c
+Subproject commit 674bb87b81b98ff89479ca6234fc333da45232e0
diff --git a/native b/native
index 76cb31cdd5..8cd755942b 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit 76cb31cdd5e0ef7b65819943c9f667810600fe6f
+Subproject commit 8cd755942b0b8ab5f69dbc54c97a0aa7eef81d5d