Don't mark the provider/player names as translatable in the preferences dialog

The dropdown to pick the provider/player can't be made translatable with
how they're currently implemented, and having the options group name not
match the values in the dropdown is more confusing than useful.

Originally committed to SVN as r6678.
This commit is contained in:
Thomas Goyne 2012-04-10 20:40:26 +00:00
parent 7cda44c3f0
commit 08a63d437a

View file

@ -528,7 +528,7 @@ Advanced_Audio::Advanced_Audio(wxTreebook *book, Preferences *parent): OptionPag
OptionAdd(spectrum, _("Cache memory max (MB)"), "Audio/Renderer/Spectrum/Memory Max", 2, 1024); OptionAdd(spectrum, _("Cache memory max (MB)"), "Audio/Renderer/Spectrum/Memory Max", 2, 1024);
#ifdef WITH_AVISYNTH #ifdef WITH_AVISYNTH
wxFlexGridSizer *avisynth = PageSizer(_("Avisynth")); wxFlexGridSizer *avisynth = PageSizer("Avisynth");
const wxString adm_arr[3] = { "ConvertToMono", "GetLeftChannel", "GetRightChannel" }; const wxString adm_arr[3] = { "ConvertToMono", "GetLeftChannel", "GetRightChannel" };
wxArrayString adm_choice(3, adm_arr); wxArrayString adm_choice(3, adm_arr);
OptionChoice(avisynth, _("Avisynth down-mixer"), adm_choice, "Audio/Downmixer"); OptionChoice(avisynth, _("Avisynth down-mixer"), adm_choice, "Audio/Downmixer");
@ -536,7 +536,7 @@ Advanced_Audio::Advanced_Audio(wxTreebook *book, Preferences *parent): OptionPag
#endif #endif
#ifdef WITH_FFMS2 #ifdef WITH_FFMS2
wxFlexGridSizer *ffms = PageSizer(_("FFMS2")); wxFlexGridSizer *ffms = PageSizer("FFmpegSource");
const wxString error_modes[] = { _("Ignore"), _("Clear"), _("Stop"), _("Abort") }; const wxString error_modes[] = { _("Ignore"), _("Clear"), _("Stop"), _("Abort") };
wxArrayString error_modes_choice(4, error_modes); wxArrayString error_modes_choice(4, error_modes);
@ -546,17 +546,17 @@ Advanced_Audio::Advanced_Audio(wxTreebook *book, Preferences *parent): OptionPag
#endif #endif
#ifdef WITH_PORTAUDIO #ifdef WITH_PORTAUDIO
wxFlexGridSizer *portaudio = PageSizer(_("Portaudio")); wxFlexGridSizer *portaudio = PageSizer("Portaudio");
OptionChoice(portaudio, _("Portaudio device"), PortAudioPlayer::GetOutputDevices(), "Player/Audio/PortAudio/Device Name"); OptionChoice(portaudio, _("Portaudio device"), PortAudioPlayer::GetOutputDevices(), "Player/Audio/PortAudio/Device Name");
#endif #endif
#ifdef WITH_OSS #ifdef WITH_OSS
wxFlexGridSizer *oss = PageSizer(_("OSS")); wxFlexGridSizer *oss = PageSizer("OSS");
OptionBrowse(oss, _("OSS Device"), "Player/Audio/OSS/Device"); OptionBrowse(oss, _("OSS Device"), "Player/Audio/OSS/Device");
#endif #endif
#ifdef WITH_DIRECTSOUND #ifdef WITH_DIRECTSOUND
wxFlexGridSizer *dsound = PageSizer(_("DirectSound")); wxFlexGridSizer *dsound = PageSizer("DirectSound");
OptionAdd(dsound, _("Buffer latency"), "Player/Audio/DirectSound/Buffer Latency", 1, 1000); OptionAdd(dsound, _("Buffer latency"), "Player/Audio/DirectSound/Buffer Latency", 1, 1000);
OptionAdd(dsound, _("Buffer length"), "Player/Audio/DirectSound/Buffer Length", 1, 100); OptionAdd(dsound, _("Buffer length"), "Player/Audio/DirectSound/Buffer Length", 1, 100);
#endif #endif
@ -576,14 +576,14 @@ Advanced_Video::Advanced_Video(wxTreebook *book, Preferences *parent): OptionPag
#ifdef WITH_AVISYNTH #ifdef WITH_AVISYNTH
wxFlexGridSizer *avisynth = PageSizer(_("Avisynth")); wxFlexGridSizer *avisynth = PageSizer("Avisynth");
OptionAdd(avisynth, _("Allow pre-2.56a Avisynth"), "Provider/Avisynth/Allow Ancient"); OptionAdd(avisynth, _("Allow pre-2.56a Avisynth"), "Provider/Avisynth/Allow Ancient");
CellSkip(avisynth); CellSkip(avisynth);
OptionAdd(avisynth, _("Avisynth memory limit"), "Provider/Avisynth/Memory Max"); OptionAdd(avisynth, _("Avisynth memory limit"), "Provider/Avisynth/Memory Max");
#endif #endif
#ifdef WITH_FFMS2 #ifdef WITH_FFMS2
wxFlexGridSizer *ffms = PageSizer(_("FFMS2")); wxFlexGridSizer *ffms = PageSizer("FFmpegSource");
const wxString log_levels[] = { "Quiet", "Panic", "Fatal", "Error", "Warning", "Info", "Verbose", "Debug" }; const wxString log_levels[] = { "Quiet", "Panic", "Fatal", "Error", "Warning", "Info", "Verbose", "Debug" };
wxArrayString log_levels_choice(8, log_levels); wxArrayString log_levels_choice(8, log_levels);