From 3c909558face114e37a30159b297fd7a613a2901 Mon Sep 17 00:00:00 2001 From: tytan652 Date: Thu, 23 Mar 2023 08:13:53 +0100 Subject: [PATCH] UI: Make simple audio codec name translatable Also adds "(Default)" to the AAC combobox option. --- UI/data/locale/en-US.ini | 3 +++ UI/window-basic-settings-stream.cpp | 13 ++++++++++--- UI/window-basic-settings.cpp | 8 ++++++-- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/UI/data/locale/en-US.ini b/UI/data/locale/en-US.ini index 738160d60..f08a95b1d 100644 --- a/UI/data/locale/en-US.ini +++ b/UI/data/locale/en-US.ini @@ -987,6 +987,9 @@ Basic.Settings.Output.Simple.Encoder.Hardware.NVENC.HEVC="Hardware (NVENC, HEVC) Basic.Settings.Output.Simple.Encoder.Hardware.Apple.H264="Hardware (Apple, H.264)" Basic.Settings.Output.Simple.Encoder.Hardware.Apple.HEVC="Hardware (Apple, HEVC)" Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Software (x264 low CPU usage preset, increases file size)" +Basic.Settings.Output.Simple.Codec.AAC="AAC" +Basic.Settings.Output.Simple.Codec.AAC.Default="AAC (Default)" +Basic.Settings.Output.Simple.Codec.Opus="Opus" Basic.Settings.Output.Simple.TwitchVodTrack="Twitch VOD Track (Uses Track 2)" Basic.Settings.Output.Warn.EnforceResolutionFPS.Title="Incompatible Resolution/Framerate" Basic.Settings.Output.Warn.EnforceResolutionFPS.Msg="This streaming service does not support your current output resolution and/or framerate. They will be changed to the closest compatible value:\n\n%1\n\nDo you want to continue?" diff --git a/UI/window-basic-settings-stream.cpp b/UI/window-basic-settings-stream.cpp index eec423fc3..3d5c1c5c5 100644 --- a/UI/window-basic-settings-stream.cpp +++ b/UI/window-basic-settings-stream.cpp @@ -1432,7 +1432,10 @@ bool OBSBasicSettings::ServiceSupportsCodecCheck() cur_audio_name = ui->simpleOutStrAEncoder->itemText( ui->simpleOutStrAEncoder->findData(cur_enc)); - fb_audio_name = (cur_enc == "opus") ? "AAC" : "Opus"; + fb_audio_name = + (cur_enc == "opus") + ? QTStr("Basic.Settings.Output.Simple.Codec.AAC") + : QTStr("Basic.Settings.Output.Simple.Codec.Opus"); } else { QString cur_enc = ui->advOutEncoder->currentData().toString(); QString fb_enc = get_adv_fallback(cur_enc); @@ -1643,9 +1646,13 @@ void OBSBasicSettings::ResetEncoders(bool streamOnly) if (service_supports_encoder(acodecs, "CoreAudio_AAC") || service_supports_encoder(acodecs, "libfdk_aac") || service_supports_encoder(acodecs, "ffmpeg_aac")) - ui->simpleOutStrAEncoder->addItem("AAC", "aac"); + ui->simpleOutStrAEncoder->addItem( + QTStr("Basic.Settings.Output.Simple.Codec.AAC.Default"), + "aac"); if (service_supports_encoder(acodecs, "ffmpeg_opus")) - ui->simpleOutStrAEncoder->addItem("Opus", "opus"); + ui->simpleOutStrAEncoder->addItem( + QTStr("Basic.Settings.Output.Simple.Codec.Opus"), + "opus"); #undef ENCODER_STR /* ------------------------------------------------- */ diff --git a/UI/window-basic-settings.cpp b/UI/window-basic-settings.cpp index c3d886b3f..e4fb8964e 100644 --- a/UI/window-basic-settings.cpp +++ b/UI/window-basic-settings.cpp @@ -5130,9 +5130,13 @@ void OBSBasicSettings::FillSimpleRecordingValues() if (EncoderAvailable("CoreAudio_AAC") || EncoderAvailable("libfdk_aac") || EncoderAvailable("ffmpeg_aac")) - ui->simpleOutRecAEncoder->addItem("AAC", "aac"); + ui->simpleOutRecAEncoder->addItem( + QTStr("Basic.Settings.Output.Simple.Codec.AAC.Default"), + "aac"); if (EncoderAvailable("ffmpeg_opus")) - ui->simpleOutRecAEncoder->addItem("Opus", "opus"); + ui->simpleOutRecAEncoder->addItem( + QTStr("Basic.Settings.Output.Simple.Codec.Opus"), + "opus"); #undef ADD_QUALITY #undef ENCODER_STR