diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp index 5181dadcd6..74cfeb7675 100644 --- a/UI/GameSettingsScreen.cpp +++ b/UI/GameSettingsScreen.cpp @@ -113,7 +113,8 @@ void GameSettingsScreen::CreateViews() { graphicsSettings->Add(new PopupSliderChoice(&iAlternateSpeedPercent_, 0, 600, gs->T("Alternative Speed", "Alternative Speed (in %, 0 = unlimited)"), 5, screenManager())); graphicsSettings->Add(new ItemHeader(gs->T("Features"))); - postProcChoice_ = graphicsSettings->Add(new ChoiceWithValueDisplay(&g_Config.sPostShaderName, gs->T("Postprocessing Shader"))); + I18NCategory *ps = GetI18NCategory("PostShaders"); + postProcChoice_ = graphicsSettings->Add(new ChoiceWithValueDisplay(&g_Config.sPostShaderName, gs->T("Postprocessing Shader"), ps)); postProcChoice_->OnClick.Handle(this, &GameSettingsScreen::OnPostProcShader); postProcEnable_ = !g_Config.bSoftwareRendering && (g_Config.iRenderingMode != FB_NON_BUFFERED_MODE); postProcChoice_->SetEnabledPtr(&postProcEnable_); @@ -394,7 +395,7 @@ void GameSettingsScreen::CreateViews() { systemSettings->Add(new ChoiceWithValueDisplay(&g_Config.proAdhocServer, s->T("Change proAdhocServer Address")))->OnClick.Handle(this, &GameSettingsScreen::OnChangeproAdhocServerAddress); #endif - systemSettings->Add(new ChoiceWithValueDisplay(&g_Config.sMACAddress, s->T("Change Mac Address")))->OnClick.Handle(this, &GameSettingsScreen::OnChangeMacAddress); + systemSettings->Add(new ChoiceWithValueDisplay(&g_Config.sMACAddress, s->T("Change Mac Address"), nullptr))->OnClick.Handle(this, &GameSettingsScreen::OnChangeMacAddress); //#ifndef ANDROID systemSettings->Add(new ItemHeader(s->T("Cheats", "Cheats (experimental, see forums)"))); diff --git a/native b/native index 9d8d64b321..4195da289c 160000 --- a/native +++ b/native @@ -1 +1 @@ -Subproject commit 9d8d64b321f6d8964066dd6ed83064a32969ec04 +Subproject commit 4195da289c15dbdecc1c71989efb3baaf0758043