From 618fee21ecac2a17d5dd8e6b0cde16837d23557d Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Sun, 8 Dec 2019 13:53:48 -0500 Subject: [PATCH] TranslatableString for ComponentInterface::GetDescription() --- include/audacity/ComponentInterface.h | 2 +- src/commands/AudacityCommand.h | 4 ++-- src/commands/CompareAudioCommand.h | 2 +- src/commands/Demo.h | 2 +- src/commands/DragCommand.h | 2 +- src/commands/GetInfoCommand.h | 2 +- src/commands/GetTrackInfoCommand.h | 2 +- src/commands/HelpCommand.h | 2 +- src/commands/ImportExportCommands.h | 4 ++-- src/commands/LoadCommands.cpp | 4 ++-- src/commands/LoadCommands.h | 2 +- src/commands/MessageCommand.h | 2 +- src/commands/OpenSaveCommands.h | 4 ++-- src/commands/PreferenceCommands.h | 4 ++-- src/commands/ScreenshotCommand.h | 2 +- src/commands/SelectCommand.h | 8 ++++---- src/commands/SetClipCommand.h | 2 +- src/commands/SetEnvelopeCommand.h | 2 +- src/commands/SetLabelCommand.h | 2 +- src/commands/SetProjectCommand.h | 2 +- src/commands/SetTrackInfoCommand.h | 8 ++++---- src/effects/Amplify.cpp | 4 ++-- src/effects/Amplify.h | 2 +- src/effects/AutoDuck.cpp | 4 ++-- src/effects/AutoDuck.h | 2 +- src/effects/BassTreble.cpp | 4 ++-- src/effects/BassTreble.h | 2 +- src/effects/ChangePitch.cpp | 4 ++-- src/effects/ChangePitch.h | 2 +- src/effects/ChangeSpeed.cpp | 4 ++-- src/effects/ChangeSpeed.h | 2 +- src/effects/ChangeTempo.cpp | 4 ++-- src/effects/ChangeTempo.h | 2 +- src/effects/ClickRemoval.cpp | 4 ++-- src/effects/ClickRemoval.h | 2 +- src/effects/Compressor.cpp | 4 ++-- src/effects/Compressor.h | 2 +- src/effects/Distortion.cpp | 4 ++-- src/effects/Distortion.h | 2 +- src/effects/DtmfGen.cpp | 4 ++-- src/effects/DtmfGen.h | 2 +- src/effects/Echo.cpp | 4 ++-- src/effects/Echo.h | 2 +- src/effects/Effect.cpp | 6 +++--- src/effects/Effect.h | 2 +- src/effects/EffectManager.cpp | 4 ++-- src/effects/Equalization.cpp | 4 ++-- src/effects/Equalization.h | 2 +- src/effects/Fade.cpp | 6 +++--- src/effects/Fade.h | 2 +- src/effects/FindClipping.cpp | 4 ++-- src/effects/FindClipping.h | 2 +- src/effects/Invert.cpp | 4 ++-- src/effects/Invert.h | 2 +- src/effects/LoadEffects.cpp | 4 ++-- src/effects/LoadEffects.h | 2 +- src/effects/Loudness.cpp | 4 ++-- src/effects/Loudness.h | 2 +- src/effects/Noise.cpp | 4 ++-- src/effects/Noise.h | 2 +- src/effects/NoiseReduction.cpp | 4 ++-- src/effects/NoiseReduction.h | 2 +- src/effects/NoiseRemoval.cpp | 4 ++-- src/effects/NoiseRemoval.h | 2 +- src/effects/Normalize.cpp | 4 ++-- src/effects/Normalize.h | 2 +- src/effects/Paulstretch.cpp | 4 ++-- src/effects/Paulstretch.h | 2 +- src/effects/Phaser.cpp | 4 ++-- src/effects/Phaser.h | 2 +- src/effects/Repair.cpp | 4 ++-- src/effects/Repair.h | 2 +- src/effects/Repeat.cpp | 4 ++-- src/effects/Repeat.h | 2 +- src/effects/Reverb.cpp | 4 ++-- src/effects/Reverb.h | 2 +- src/effects/Reverse.cpp | 4 ++-- src/effects/Reverse.h | 2 +- src/effects/ScienFilter.cpp | 5 +++-- src/effects/ScienFilter.h | 2 +- src/effects/Silence.cpp | 4 ++-- src/effects/Silence.h | 2 +- src/effects/StereoToMono.cpp | 4 ++-- src/effects/StereoToMono.h | 2 +- src/effects/TimeScale.cpp | 4 ++-- src/effects/TimeScale.h | 2 +- src/effects/ToneGen.cpp | 6 +++--- src/effects/ToneGen.h | 2 +- src/effects/TruncSilence.cpp | 4 ++-- src/effects/TruncSilence.h | 2 +- src/effects/VST/VSTEffect.cpp | 17 ++++++++--------- src/effects/VST/VSTEffect.h | 4 ++-- src/effects/Wahwah.cpp | 4 ++-- src/effects/Wahwah.h | 2 +- src/effects/audiounits/AudioUnitEffect.cpp | 8 ++++---- src/effects/audiounits/AudioUnitEffect.h | 4 ++-- src/effects/ladspa/LadspaEffect.cpp | 8 ++++---- src/effects/ladspa/LadspaEffect.h | 4 ++-- src/effects/lv2/LV2Effect.cpp | 4 ++-- src/effects/lv2/LV2Effect.h | 2 +- src/effects/lv2/LoadLV2.cpp | 4 ++-- src/effects/lv2/LoadLV2.h | 2 +- src/effects/nyquist/LoadNyquist.cpp | 4 ++-- src/effects/nyquist/LoadNyquist.h | 2 +- src/effects/nyquist/Nyquist.cpp | 5 ++--- src/effects/nyquist/Nyquist.h | 2 +- src/effects/vamp/LoadVamp.cpp | 4 ++-- src/effects/vamp/LoadVamp.h | 2 +- src/effects/vamp/VampEffect.cpp | 5 +++-- src/effects/vamp/VampEffect.h | 2 +- src/prefs/BatchPrefs.cpp | 4 ++-- src/prefs/BatchPrefs.h | 2 +- src/prefs/DevicePrefs.cpp | 4 ++-- src/prefs/DevicePrefs.h | 2 +- src/prefs/DirectoriesPrefs.cpp | 4 ++-- src/prefs/DirectoriesPrefs.h | 2 +- src/prefs/EffectsPrefs.cpp | 4 ++-- src/prefs/EffectsPrefs.h | 2 +- src/prefs/ExtImportPrefs.cpp | 4 ++-- src/prefs/ExtImportPrefs.h | 2 +- src/prefs/GUIPrefs.cpp | 4 ++-- src/prefs/GUIPrefs.h | 2 +- src/prefs/ImportExportPrefs.cpp | 4 ++-- src/prefs/ImportExportPrefs.h | 2 +- src/prefs/KeyConfigPrefs.cpp | 4 ++-- src/prefs/KeyConfigPrefs.h | 2 +- src/prefs/LibraryPrefs.cpp | 4 ++-- src/prefs/LibraryPrefs.h | 2 +- src/prefs/MidiIOPrefs.cpp | 4 ++-- src/prefs/MidiIOPrefs.h | 2 +- src/prefs/ModulePrefs.cpp | 4 ++-- src/prefs/ModulePrefs.h | 2 +- src/prefs/MousePrefs.cpp | 4 ++-- src/prefs/MousePrefs.h | 2 +- src/prefs/PlaybackPrefs.cpp | 4 ++-- src/prefs/PlaybackPrefs.h | 2 +- src/prefs/ProjectsPrefs.cpp | 4 ++-- src/prefs/ProjectsPrefs.h | 2 +- src/prefs/QualityPrefs.cpp | 4 ++-- src/prefs/QualityPrefs.h | 2 +- src/prefs/RecordingPrefs.cpp | 4 ++-- src/prefs/RecordingPrefs.h | 2 +- src/prefs/SpectrumPrefs.cpp | 4 ++-- src/prefs/SpectrumPrefs.h | 2 +- src/prefs/ThemePrefs.cpp | 4 ++-- src/prefs/ThemePrefs.h | 2 +- src/prefs/TracksBehaviorsPrefs.cpp | 4 ++-- src/prefs/TracksBehaviorsPrefs.h | 2 +- src/prefs/TracksPrefs.cpp | 4 ++-- src/prefs/TracksPrefs.h | 2 +- src/prefs/WarningsPrefs.cpp | 4 ++-- src/prefs/WarningsPrefs.h | 2 +- src/prefs/WaveformPrefs.cpp | 4 ++-- src/prefs/WaveformPrefs.h | 2 +- 154 files changed, 250 insertions(+), 250 deletions(-) diff --git a/include/audacity/ComponentInterface.h b/include/audacity/ComponentInterface.h index 2fb0f6bf8..9967a84db 100644 --- a/include/audacity/ComponentInterface.h +++ b/include/audacity/ComponentInterface.h @@ -134,7 +134,7 @@ public: // This returns a translated string // Any verb should be present tense indicative, not imperative - virtual wxString GetDescription() = 0; + virtual TranslatableString GetDescription() = 0; // non-virtual convenience function const wxString GetTranslatedName(); diff --git a/src/commands/AudacityCommand.h b/src/commands/AudacityCommand.h index cf5cfe3b8..2407254a2 100644 --- a/src/commands/AudacityCommand.h +++ b/src/commands/AudacityCommand.h @@ -61,8 +61,8 @@ class AUDACITY_DLL_API AudacityCommand /* not final */ : public wxEvtHandler, //These two must be implemented by instances. ComponentInterfaceSymbol GetSymbol() override = 0; - virtual wxString GetDescription() override - {wxFAIL_MSG( "Implement a Description for this command");return "FAIL";}; + virtual TranslatableString GetDescription() override + {wxFAIL_MSG( "Implement a Description for this command");return XO("FAIL");}; // Name of page in the Audacity alpha manual virtual wxString ManualPage(){ return wxEmptyString;}; diff --git a/src/commands/CompareAudioCommand.h b/src/commands/CompareAudioCommand.h index de51d88fd..d4e3473e9 100644 --- a/src/commands/CompareAudioCommand.h +++ b/src/commands/CompareAudioCommand.h @@ -30,7 +30,7 @@ class CompareAudioCommand final : public AudacityCommand public: // ComponentInterface overrides ComponentInterfaceSymbol GetSymbol() override {return XO("Compare Audio");} - wxString GetDescription() override {return _("Compares a range on two tracks.");}; + TranslatableString GetDescription() override {return XO("Compares a range on two tracks.");}; bool DefineParams( ShuttleParams & S ) override; void PopulateOrExchange(ShuttleGui & S) override; diff --git a/src/commands/Demo.h b/src/commands/Demo.h index cdad95c99..582d39945 100644 --- a/src/commands/Demo.h +++ b/src/commands/Demo.h @@ -23,7 +23,7 @@ class DemoCommand final : public AudacityCommand public: // ComponentInterface overrides ComponentInterfaceSymbol GetSymbol() override {return DEMO_PLUGIN_SYMBOL;}; - wxString GetDescription() override {return _("Does the demo action.");}; + TranslatableString GetDescription() override {return XO("Does the demo action.");}; bool DefineParams( ShuttleParams & S ) override; void PopulateOrExchange(ShuttleGui & S) override; bool Apply(const CommandContext & context) override; diff --git a/src/commands/DragCommand.h b/src/commands/DragCommand.h index 7e9a816bd..779553a44 100644 --- a/src/commands/DragCommand.h +++ b/src/commands/DragCommand.h @@ -27,7 +27,7 @@ public: DragCommand(); // ComponentInterface overrides ComponentInterfaceSymbol GetSymbol() override {return DRAG_PLUGIN_SYMBOL;}; - wxString GetDescription() override {return _("Drags mouse from one place to another.");}; + TranslatableString GetDescription() override {return XO("Drags mouse from one place to another.");}; bool DefineParams( ShuttleParams & S ) override; void PopulateOrExchange(ShuttleGui & S) override; diff --git a/src/commands/GetInfoCommand.h b/src/commands/GetInfoCommand.h index df72e8ed0..7035e540b 100644 --- a/src/commands/GetInfoCommand.h +++ b/src/commands/GetInfoCommand.h @@ -33,7 +33,7 @@ class GetInfoCommand : public AudacityCommand public: // ComponentInterface overrides ComponentInterfaceSymbol GetSymbol() override {return GET_INFO_PLUGIN_SYMBOL;}; - wxString GetDescription() override {return _("Gets information in JSON format.");}; + TranslatableString GetDescription() override {return XO("Gets information in JSON format.");}; bool DefineParams( ShuttleParams & S ) override; void PopulateOrExchange(ShuttleGui & S) override; diff --git a/src/commands/GetTrackInfoCommand.h b/src/commands/GetTrackInfoCommand.h index 24dc203fd..bd383ce72 100644 --- a/src/commands/GetTrackInfoCommand.h +++ b/src/commands/GetTrackInfoCommand.h @@ -27,7 +27,7 @@ public: GetTrackInfoCommand(); // ComponentInterface overrides ComponentInterfaceSymbol GetSymbol() override {return GET_TRACK_INFO_PLUGIN_SYMBOL;}; - wxString GetDescription() override {return _("Gets track values as JSON.");}; + TranslatableString GetDescription() override {return XO("Gets track values as JSON.");}; bool DefineParams( ShuttleParams & S ) override; void PopulateOrExchange(ShuttleGui & S) override; diff --git a/src/commands/HelpCommand.h b/src/commands/HelpCommand.h index 42a02530e..06881ed0b 100644 --- a/src/commands/HelpCommand.h +++ b/src/commands/HelpCommand.h @@ -30,7 +30,7 @@ class HelpCommand : public AudacityCommand public: // ComponentInterface overrides ComponentInterfaceSymbol GetSymbol() override {return HELP_PLUGIN_SYMBOL;}; - wxString GetDescription() override {return _("Gives help on a command.");}; + TranslatableString GetDescription() override {return XO("Gives help on a command.");}; bool DefineParams( ShuttleParams & S ) override; void PopulateOrExchange(ShuttleGui & S) override; bool Apply(const CommandContext & context) override; diff --git a/src/commands/ImportExportCommands.h b/src/commands/ImportExportCommands.h index 3c1741274..974866e8f 100644 --- a/src/commands/ImportExportCommands.h +++ b/src/commands/ImportExportCommands.h @@ -30,7 +30,7 @@ class ImportCommand : public AudacityCommand public: // ComponentInterface overrides ComponentInterfaceSymbol GetSymbol() override {return IMPORT_PLUGIN_SYMBOL;}; - wxString GetDescription() override {return _("Imports from a file.");}; + TranslatableString GetDescription() override {return XO("Imports from a file.");}; bool DefineParams( ShuttleParams & S ) override; void PopulateOrExchange(ShuttleGui & S) override; bool Apply(const CommandContext & context) override; @@ -48,7 +48,7 @@ class ExportCommand : public AudacityCommand public: // ComponentInterface overrides ComponentInterfaceSymbol GetSymbol() override {return EXPORT_PLUGIN_SYMBOL;}; - wxString GetDescription() override {return _("Exports to a file.");}; + TranslatableString GetDescription() override {return XO("Exports to a file.");}; bool DefineParams( ShuttleParams & S ) override; void PopulateOrExchange(ShuttleGui & S) override; bool Apply(const CommandContext & context) override; diff --git a/src/commands/LoadCommands.cpp b/src/commands/LoadCommands.cpp index ad5491bcb..53bd73faa 100644 --- a/src/commands/LoadCommands.cpp +++ b/src/commands/LoadCommands.cpp @@ -190,9 +190,9 @@ wxString BuiltinCommandsModule::GetVersion() return AUDACITY_VERSION_STRING; } -wxString BuiltinCommandsModule::GetDescription() +TranslatableString BuiltinCommandsModule::GetDescription() { - return _("Provides builtin commands to Audacity"); + return XO("Provides builtin commands to Audacity"); } // ============================================================================ diff --git a/src/commands/LoadCommands.h b/src/commands/LoadCommands.h index c4192b55a..9bda7f6c1 100644 --- a/src/commands/LoadCommands.h +++ b/src/commands/LoadCommands.h @@ -33,7 +33,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; VendorSymbol GetVendor() override; wxString GetVersion() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; // ModuleInterface implementation diff --git a/src/commands/MessageCommand.h b/src/commands/MessageCommand.h index a58e5ead3..967ec3e24 100644 --- a/src/commands/MessageCommand.h +++ b/src/commands/MessageCommand.h @@ -31,7 +31,7 @@ class MessageCommand : public AudacityCommand public: // ComponentInterface overrides ComponentInterfaceSymbol GetSymbol() override {return MESSAGE_PLUGIN_SYMBOL;}; - wxString GetDescription() override {return _("Echos a message.");}; + TranslatableString GetDescription() override {return XO("Echos a message.");}; bool DefineParams( ShuttleParams & S ) override; void PopulateOrExchange(ShuttleGui & S) override; bool Apply(const CommandContext & context) override; diff --git a/src/commands/OpenSaveCommands.h b/src/commands/OpenSaveCommands.h index 61b5352d5..93a9a199b 100644 --- a/src/commands/OpenSaveCommands.h +++ b/src/commands/OpenSaveCommands.h @@ -28,7 +28,7 @@ class OpenProjectCommand : public AudacityCommand public: // ComponentInterface overrides ComponentInterfaceSymbol GetSymbol() override {return OPEN_PROJECT_PLUGIN_SYMBOL;}; - wxString GetDescription() override {return _("Opens a project.");}; + TranslatableString GetDescription() override {return XO("Opens a project.");}; bool DefineParams( ShuttleParams & S ) override; void PopulateOrExchange(ShuttleGui & S) override; bool Apply(const CommandContext & context) override; @@ -48,7 +48,7 @@ class SaveProjectCommand : public AudacityCommand public: // ComponentInterface overrides ComponentInterfaceSymbol GetSymbol() override {return SAVE_PROJECT_PLUGIN_SYMBOL;}; - wxString GetDescription() override {return _("Saves a project.");}; + TranslatableString GetDescription() override {return XO("Saves a project.");}; bool DefineParams( ShuttleParams & S ) override; void PopulateOrExchange(ShuttleGui & S) override; bool Apply(const CommandContext & context) override; diff --git a/src/commands/PreferenceCommands.h b/src/commands/PreferenceCommands.h index d9e978400..3d551d7a9 100644 --- a/src/commands/PreferenceCommands.h +++ b/src/commands/PreferenceCommands.h @@ -34,7 +34,7 @@ class GetPreferenceCommand final : public AudacityCommand public: // ComponentInterface overrides ComponentInterfaceSymbol GetSymbol() override {return GET_PREFERENCE_PLUGIN_SYMBOL;}; - wxString GetDescription() override {return _("Gets the value of a single preference.");}; + TranslatableString GetDescription() override {return XO("Gets the value of a single preference.");}; bool DefineParams( ShuttleParams & S ) override; void PopulateOrExchange(ShuttleGui & S) override; bool Apply(const CommandContext & context) override; @@ -52,7 +52,7 @@ class SetPreferenceCommand final : public AudacityCommand public: // ComponentInterface overrides ComponentInterfaceSymbol GetSymbol() override {return SET_PREFERENCE_PLUGIN_SYMBOL;}; - wxString GetDescription() override {return _("Sets the value of a single preference.");}; + TranslatableString GetDescription() override {return XO("Sets the value of a single preference.");}; bool DefineParams( ShuttleParams & S ) override; void PopulateOrExchange(ShuttleGui & S) override; bool Apply(const CommandContext & context) override; diff --git a/src/commands/ScreenshotCommand.h b/src/commands/ScreenshotCommand.h index ce7e818c4..b963bdafe 100644 --- a/src/commands/ScreenshotCommand.h +++ b/src/commands/ScreenshotCommand.h @@ -81,7 +81,7 @@ public: ScreenshotCommand(); // ComponentInterface overrides ComponentInterfaceSymbol GetSymbol() override {return SCREENSHOT_PLUGIN_SYMBOL;}; - wxString GetDescription() override {return _("Takes screenshots.");}; + TranslatableString GetDescription() override {return XO("Takes screenshots.");}; bool DefineParams( ShuttleParams & S ) override; void PopulateOrExchange(ShuttleGui & S) override; diff --git a/src/commands/SelectCommand.h b/src/commands/SelectCommand.h index 9868d09cf..f5a461155 100644 --- a/src/commands/SelectCommand.h +++ b/src/commands/SelectCommand.h @@ -35,7 +35,7 @@ class SelectTimeCommand : public AudacityCommand public: // ComponentInterface overrides ComponentInterfaceSymbol GetSymbol() override {return SELECT_TIME_PLUGIN_SYMBOL;}; - wxString GetDescription() override {return _("Selects a time range.");}; + TranslatableString GetDescription() override {return XO("Selects a time range.");}; bool DefineParams( ShuttleParams & S ) override; void PopulateOrExchange(ShuttleGui & S) override; bool Apply(const CommandContext & context) override; @@ -59,7 +59,7 @@ class SelectFrequenciesCommand : public AudacityCommand public: // ComponentInterface overrides ComponentInterfaceSymbol GetSymbol() override {return SELECT_FREQUENCIES_PLUGIN_SYMBOL;}; - wxString GetDescription() override {return _("Selects a frequency range.");}; + TranslatableString GetDescription() override {return XO("Selects a frequency range.");}; bool DefineParams( ShuttleParams & S ) override; void PopulateOrExchange(ShuttleGui & S) override; bool Apply(const CommandContext & context) override; @@ -80,7 +80,7 @@ class SelectTracksCommand : public AudacityCommand public: // ComponentInterface overrides ComponentInterfaceSymbol GetSymbol() override {return SELECT_TRACKS_PLUGIN_SYMBOL;}; - wxString GetDescription() override {return _("Selects a range of tracks.");}; + TranslatableString GetDescription() override {return XO("Selects a range of tracks.");}; bool DefineParams( ShuttleParams & S ) override; void PopulateOrExchange(ShuttleGui & S) override; bool Apply(const CommandContext & context) override; @@ -102,7 +102,7 @@ class SelectCommand : public AudacityCommand public: // ComponentInterface overrides ComponentInterfaceSymbol GetSymbol() override {return SELECT_PLUGIN_SYMBOL;}; - wxString GetDescription() override {return _("Selects Audio.");}; + TranslatableString GetDescription() override {return XO("Selects Audio.");}; bool DefineParams( ShuttleParams & S ) override { return mSelTime.DefineParams(S) && diff --git a/src/commands/SetClipCommand.h b/src/commands/SetClipCommand.h index 4c9b6a13f..cfbb8a350 100644 --- a/src/commands/SetClipCommand.h +++ b/src/commands/SetClipCommand.h @@ -26,7 +26,7 @@ public: SetClipCommand(); // ComponentInterface overrides ComponentInterfaceSymbol GetSymbol() override {return SET_CLIP_PLUGIN_SYMBOL;}; - wxString GetDescription() override {return _("Sets various values for a clip.");}; + TranslatableString GetDescription() override {return XO("Sets various values for a clip.");}; bool DefineParams( ShuttleParams & S ) override; void PopulateOrExchange(ShuttleGui & S) override; diff --git a/src/commands/SetEnvelopeCommand.h b/src/commands/SetEnvelopeCommand.h index 6b365fa10..6f7ce4f7a 100644 --- a/src/commands/SetEnvelopeCommand.h +++ b/src/commands/SetEnvelopeCommand.h @@ -26,7 +26,7 @@ public: SetEnvelopeCommand(); // ComponentInterface overrides ComponentInterfaceSymbol GetSymbol() override {return SET_ENVELOPE_PLUGIN_SYMBOL;}; - wxString GetDescription() override {return _("Sets an envelope point position.");}; + TranslatableString GetDescription() override {return XO("Sets an envelope point position.");}; bool DefineParams( ShuttleParams & S ) override; void PopulateOrExchange(ShuttleGui & S) override; diff --git a/src/commands/SetLabelCommand.h b/src/commands/SetLabelCommand.h index 4ade1b35f..2d881c7c6 100644 --- a/src/commands/SetLabelCommand.h +++ b/src/commands/SetLabelCommand.h @@ -27,7 +27,7 @@ public: SetLabelCommand(); // ComponentInterface overrides ComponentInterfaceSymbol GetSymbol() override {return SET_LABEL_PLUGIN_SYMBOL;}; - wxString GetDescription() override {return _("Sets various values for a label.");}; + TranslatableString GetDescription() override {return XO("Sets various values for a label.");}; bool DefineParams( ShuttleParams & S ) override; void PopulateOrExchange(ShuttleGui & S) override; diff --git a/src/commands/SetProjectCommand.h b/src/commands/SetProjectCommand.h index fc94dd04d..38463e05a 100644 --- a/src/commands/SetProjectCommand.h +++ b/src/commands/SetProjectCommand.h @@ -28,7 +28,7 @@ public: SetProjectCommand(); // ComponentInterface overrides ComponentInterfaceSymbol GetSymbol() override {return SET_PROJECT_PLUGIN_SYMBOL;}; - wxString GetDescription() override {return _("Sets various values for a project.");}; + TranslatableString GetDescription() override {return XO("Sets various values for a project.");}; bool DefineParams( ShuttleParams & S ) override; void PopulateOrExchange(ShuttleGui & S) override; diff --git a/src/commands/SetTrackInfoCommand.h b/src/commands/SetTrackInfoCommand.h index e9fa3d759..2ef6e525f 100644 --- a/src/commands/SetTrackInfoCommand.h +++ b/src/commands/SetTrackInfoCommand.h @@ -52,7 +52,7 @@ public: //SetTrackStatusCommand(); // ComponentInterface overrides ComponentInterfaceSymbol GetSymbol() override {return SET_TRACK_STATUS_PLUGIN_SYMBOL;}; - wxString GetDescription() override {return _("Sets various values for a track.");}; + TranslatableString GetDescription() override {return XO("Sets various values for a track.");}; bool DefineParams( ShuttleParams & S ) override; void PopulateOrExchange(ShuttleGui & S) override; @@ -77,7 +77,7 @@ public: //SetTrackAudioCommand(); // ComponentInterface overrides ComponentInterfaceSymbol GetSymbol() override {return SET_TRACK_AUDIO_PLUGIN_SYMBOL;}; - wxString GetDescription() override {return _("Sets various values for a track.");}; + TranslatableString GetDescription() override {return XO("Sets various values for a track.");}; bool DefineParams( ShuttleParams & S ) override; void PopulateOrExchange(ShuttleGui & S) override; @@ -104,7 +104,7 @@ public: //SetTrackVisualsCommand(); // ComponentInterface overrides ComponentInterfaceSymbol GetSymbol() override {return SET_TRACK_VISUALS_PLUGIN_SYMBOL;}; - wxString GetDescription() override {return _("Sets various values for a track.");}; + TranslatableString GetDescription() override {return XO("Sets various values for a track.");}; bool DefineParams( ShuttleParams & S ) override; void PopulateOrExchange(ShuttleGui & S) override; @@ -145,7 +145,7 @@ public: SetTrackCommand(); // ComponentInterface overrides ComponentInterfaceSymbol GetSymbol() override {return SET_TRACK_PLUGIN_SYMBOL;}; - wxString GetDescription() override {return _("Sets various values for a track.");}; + TranslatableString GetDescription() override {return XO("Sets various values for a track.");}; // AudacityCommand overrides wxString ManualPage() override {return wxT("Extra_Menu:_Scriptables_II#set_track");}; diff --git a/src/effects/Amplify.cpp b/src/effects/Amplify.cpp index 59de3812e..5455b8098 100644 --- a/src/effects/Amplify.cpp +++ b/src/effects/Amplify.cpp @@ -87,10 +87,10 @@ ComponentInterfaceSymbol EffectAmplify::GetSymbol() return AMPLIFY_PLUGIN_SYMBOL; } -wxString EffectAmplify::GetDescription() +TranslatableString EffectAmplify::GetDescription() { // Note: This is useful only after ratio has been set. - return _("Increases or decreases the volume of the audio you have selected"); + return XO("Increases or decreases the volume of the audio you have selected"); } wxString EffectAmplify::ManualPage() diff --git a/src/effects/Amplify.h b/src/effects/Amplify.h index ce106ac2c..511b7c86a 100644 --- a/src/effects/Amplify.h +++ b/src/effects/Amplify.h @@ -33,7 +33,7 @@ public: // ComponentInterface implementation ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; wxString ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/AutoDuck.cpp b/src/effects/AutoDuck.cpp index d727482b7..e7870e58e 100644 --- a/src/effects/AutoDuck.cpp +++ b/src/effects/AutoDuck.cpp @@ -106,9 +106,9 @@ ComponentInterfaceSymbol EffectAutoDuck::GetSymbol() return AUTODUCK_PLUGIN_SYMBOL; } -wxString EffectAutoDuck::GetDescription() +TranslatableString EffectAutoDuck::GetDescription() { - return _("Reduces (ducks) the volume of one or more tracks whenever the volume of a specified \"control\" track reaches a particular level"); + return XO("Reduces (ducks) the volume of one or more tracks whenever the volume of a specified \"control\" track reaches a particular level"); } wxString EffectAutoDuck::ManualPage() diff --git a/src/effects/AutoDuck.h b/src/effects/AutoDuck.h index 566707c7b..d90d5fa02 100644 --- a/src/effects/AutoDuck.h +++ b/src/effects/AutoDuck.h @@ -31,7 +31,7 @@ public: // ComponentInterface implementation ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; wxString ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/BassTreble.cpp b/src/effects/BassTreble.cpp index deda6b9f6..521b6b814 100644 --- a/src/effects/BassTreble.cpp +++ b/src/effects/BassTreble.cpp @@ -89,9 +89,9 @@ ComponentInterfaceSymbol EffectBassTreble::GetSymbol() return BASSTREBLE_PLUGIN_SYMBOL; } -wxString EffectBassTreble::GetDescription() +TranslatableString EffectBassTreble::GetDescription() { - return _("Simple tone control effect"); + return XO("Simple tone control effect"); } wxString EffectBassTreble::ManualPage() diff --git a/src/effects/BassTreble.h b/src/effects/BassTreble.h index 3ccb48c53..499c9d7dc 100644 --- a/src/effects/BassTreble.h +++ b/src/effects/BassTreble.h @@ -44,7 +44,7 @@ public: // ComponentInterface implementation ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; wxString ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/ChangePitch.cpp b/src/effects/ChangePitch.cpp index 9e146532f..9e25203fb 100644 --- a/src/effects/ChangePitch.cpp +++ b/src/effects/ChangePitch.cpp @@ -139,9 +139,9 @@ ComponentInterfaceSymbol EffectChangePitch::GetSymbol() return CHANGEPITCH_PLUGIN_SYMBOL; } -wxString EffectChangePitch::GetDescription() +TranslatableString EffectChangePitch::GetDescription() { - return _("Changes the pitch of a track without changing its tempo"); + return XO("Changes the pitch of a track without changing its tempo"); } wxString EffectChangePitch::ManualPage() diff --git a/src/effects/ChangePitch.h b/src/effects/ChangePitch.h index f37721fc1..51297ba31 100644 --- a/src/effects/ChangePitch.h +++ b/src/effects/ChangePitch.h @@ -45,7 +45,7 @@ public: // ComponentInterface implementation ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; wxString ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/ChangeSpeed.cpp b/src/effects/ChangeSpeed.cpp index 048b8c179..a5d286b1a 100644 --- a/src/effects/ChangeSpeed.cpp +++ b/src/effects/ChangeSpeed.cpp @@ -113,9 +113,9 @@ ComponentInterfaceSymbol EffectChangeSpeed::GetSymbol() return CHANGESPEED_PLUGIN_SYMBOL; } -wxString EffectChangeSpeed::GetDescription() +TranslatableString EffectChangeSpeed::GetDescription() { - return _("Changes the speed of a track, also changing its pitch"); + return XO("Changes the speed of a track, also changing its pitch"); } wxString EffectChangeSpeed::ManualPage() diff --git a/src/effects/ChangeSpeed.h b/src/effects/ChangeSpeed.h index 1fa8470bf..a48be5bdc 100644 --- a/src/effects/ChangeSpeed.h +++ b/src/effects/ChangeSpeed.h @@ -32,7 +32,7 @@ public: // ComponentInterface implementation ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; wxString ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/ChangeTempo.cpp b/src/effects/ChangeTempo.cpp index eae5907b0..f3ec85732 100644 --- a/src/effects/ChangeTempo.cpp +++ b/src/effects/ChangeTempo.cpp @@ -113,9 +113,9 @@ ComponentInterfaceSymbol EffectChangeTempo::GetSymbol() return CHANGETEMPO_PLUGIN_SYMBOL; } -wxString EffectChangeTempo::GetDescription() +TranslatableString EffectChangeTempo::GetDescription() { - return _("Changes the tempo of a selection without changing its pitch"); + return XO("Changes the tempo of a selection without changing its pitch"); } wxString EffectChangeTempo::ManualPage() diff --git a/src/effects/ChangeTempo.h b/src/effects/ChangeTempo.h index ccb8c60e0..6a37d5ff3 100644 --- a/src/effects/ChangeTempo.h +++ b/src/effects/ChangeTempo.h @@ -39,7 +39,7 @@ public: // ComponentInterface implementation ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; wxString ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/ClickRemoval.cpp b/src/effects/ClickRemoval.cpp index d7dfaf2cb..ebb6ea6e3 100644 --- a/src/effects/ClickRemoval.cpp +++ b/src/effects/ClickRemoval.cpp @@ -82,9 +82,9 @@ ComponentInterfaceSymbol EffectClickRemoval::GetSymbol() return CLICKREMOVAL_PLUGIN_SYMBOL; } -wxString EffectClickRemoval::GetDescription() +TranslatableString EffectClickRemoval::GetDescription() { - return _("Click Removal is designed to remove clicks on audio tracks"); + return XO("Click Removal is designed to remove clicks on audio tracks"); } wxString EffectClickRemoval::ManualPage() diff --git a/src/effects/ClickRemoval.h b/src/effects/ClickRemoval.h index 39a5a6a4e..61f7320e1 100644 --- a/src/effects/ClickRemoval.h +++ b/src/effects/ClickRemoval.h @@ -34,7 +34,7 @@ public: // ComponentInterface implementation ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; wxString ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/Compressor.cpp b/src/effects/Compressor.cpp index 04425d5fb..7bbc8e3a1 100644 --- a/src/effects/Compressor.cpp +++ b/src/effects/Compressor.cpp @@ -104,9 +104,9 @@ ComponentInterfaceSymbol EffectCompressor::GetSymbol() return COMPRESSOR_PLUGIN_SYMBOL; } -wxString EffectCompressor::GetDescription() +TranslatableString EffectCompressor::GetDescription() { - return _("Compresses the dynamic range of audio"); + return XO("Compresses the dynamic range of audio"); } wxString EffectCompressor::ManualPage() diff --git a/src/effects/Compressor.h b/src/effects/Compressor.h index a1a3aa4ee..c6a19126d 100644 --- a/src/effects/Compressor.h +++ b/src/effects/Compressor.h @@ -31,7 +31,7 @@ public: // ComponentInterface implementation ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; wxString ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/Distortion.cpp b/src/effects/Distortion.cpp index 045970686..f34b5fd75 100644 --- a/src/effects/Distortion.cpp +++ b/src/effects/Distortion.cpp @@ -195,9 +195,9 @@ ComponentInterfaceSymbol EffectDistortion::GetSymbol() return DISTORTION_PLUGIN_SYMBOL; } -wxString EffectDistortion::GetDescription() +TranslatableString EffectDistortion::GetDescription() { - return _("Waveshaping distortion effect"); + return XO("Waveshaping distortion effect"); } wxString EffectDistortion::ManualPage() diff --git a/src/effects/Distortion.h b/src/effects/Distortion.h index f151e4723..ee80e6ade 100644 --- a/src/effects/Distortion.h +++ b/src/effects/Distortion.h @@ -63,7 +63,7 @@ public: // ComponentInterface implementation ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; wxString ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/DtmfGen.cpp b/src/effects/DtmfGen.cpp index 06c25eb0e..a83136904 100644 --- a/src/effects/DtmfGen.cpp +++ b/src/effects/DtmfGen.cpp @@ -101,9 +101,9 @@ ComponentInterfaceSymbol EffectDtmf::GetSymbol() return DTMFTONES_PLUGIN_SYMBOL; } -wxString EffectDtmf::GetDescription() +TranslatableString EffectDtmf::GetDescription() { - return _("Generates dual-tone multi-frequency (DTMF) tones like those produced by the keypad on telephones"); + return XO("Generates dual-tone multi-frequency (DTMF) tones like those produced by the keypad on telephones"); } wxString EffectDtmf::ManualPage() diff --git a/src/effects/DtmfGen.h b/src/effects/DtmfGen.h index ea265c01b..8111734e5 100644 --- a/src/effects/DtmfGen.h +++ b/src/effects/DtmfGen.h @@ -33,7 +33,7 @@ public: // ComponentInterface implementation ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; wxString ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/Echo.cpp b/src/effects/Echo.cpp index e9249373a..590c7859c 100644 --- a/src/effects/Echo.cpp +++ b/src/effects/Echo.cpp @@ -56,9 +56,9 @@ ComponentInterfaceSymbol EffectEcho::GetSymbol() return ECHO_PLUGIN_SYMBOL; } -wxString EffectEcho::GetDescription() +TranslatableString EffectEcho::GetDescription() { - return _("Repeats the selected audio again and again"); + return XO("Repeats the selected audio again and again"); } wxString EffectEcho::ManualPage() diff --git a/src/effects/Echo.h b/src/effects/Echo.h index f2084abb6..7b6c19818 100644 --- a/src/effects/Echo.h +++ b/src/effects/Echo.h @@ -27,7 +27,7 @@ public: // ComponentInterface implementation ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; wxString ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/Effect.cpp b/src/effects/Effect.cpp index e19304c00..9a7213c17 100644 --- a/src/effects/Effect.cpp +++ b/src/effects/Effect.cpp @@ -224,14 +224,14 @@ wxString Effect::GetVersion() return AUDACITY_VERSION_STRING; } -wxString Effect::GetDescription() +TranslatableString Effect::GetDescription() { if (mClient) { return mClient->GetDescription(); } - return wxEmptyString; + return {}; } EffectFamilySymbol Effect::GetFamily() @@ -3238,7 +3238,7 @@ void EffectUIHost::OnMenu(wxCommandEvent & WXUNUSED(evt)) sub->Append(kDummyID, wxString::Format(_("Name: %s"), mEffect->GetTranslatedName())); sub->Append(kDummyID, wxString::Format(_("Version: %s"), mEffect->GetVersion())); sub->Append(kDummyID, wxString::Format(_("Vendor: %s"), mEffect->GetVendor().Translation())); - sub->Append(kDummyID, wxString::Format(_("Description: %s"), mEffect->GetDescription())); + sub->Append(kDummyID, wxString::Format(_("Description: %s"), mEffect->GetDescription().Translation())); menu.Append(0, _("About"), sub.release()); } diff --git a/src/effects/Effect.h b/src/effects/Effect.h index c10f8c741..1be5d4aef 100644 --- a/src/effects/Effect.h +++ b/src/effects/Effect.h @@ -95,7 +95,7 @@ class AUDACITY_DLL_API Effect /* not final */ : public wxEvtHandler, VendorSymbol GetVendor() override; wxString GetVersion() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; // EffectDefinitionInterface implementation diff --git a/src/effects/EffectManager.cpp b/src/effects/EffectManager.cpp index e3e648480..ad0d2c068 100644 --- a/src/effects/EffectManager.cpp +++ b/src/effects/EffectManager.cpp @@ -367,10 +367,10 @@ wxString EffectManager::GetCommandTip(const PluginID & ID) { Effect* pEff = GetEffect(ID); if( pEff ) - return pEff->GetDescription(); + return pEff->GetDescription().Translation(); AudacityCommand * pCom = GetAudacityCommand(ID); if( pCom ) - return pCom->GetDescription(); + return pCom->GetDescription().Translation(); return wxEmptyString; } diff --git a/src/effects/Equalization.cpp b/src/effects/Equalization.cpp index a7b5d09e3..f42834ff5 100644 --- a/src/effects/Equalization.cpp +++ b/src/effects/Equalization.cpp @@ -310,9 +310,9 @@ ComponentInterfaceSymbol EffectEqualization::GetSymbol() return EQUALIZATION_PLUGIN_SYMBOL; } -wxString EffectEqualization::GetDescription() +TranslatableString EffectEqualization::GetDescription() { - return _("Adjusts the volume levels of particular frequencies"); + return XO("Adjusts the volume levels of particular frequencies"); } wxString EffectEqualization::ManualPage() diff --git a/src/effects/Equalization.h b/src/effects/Equalization.h index a71e40ca0..677454ea1 100644 --- a/src/effects/Equalization.h +++ b/src/effects/Equalization.h @@ -108,7 +108,7 @@ public: // ComponentInterface implementation ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; wxString ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/Fade.cpp b/src/effects/Fade.cpp index 49d27a96d..f7f8898b4 100644 --- a/src/effects/Fade.cpp +++ b/src/effects/Fade.cpp @@ -36,11 +36,11 @@ ComponentInterfaceSymbol EffectFade::GetSymbol() : FADEOUT_PLUGIN_SYMBOL; } -wxString EffectFade::GetDescription() +TranslatableString EffectFade::GetDescription() { return mFadeIn - ? _("Applies a linear fade-in to the selected audio") - : _("Applies a linear fade-out to the selected audio"); + ? XO("Applies a linear fade-in to the selected audio") + : XO("Applies a linear fade-out to the selected audio"); } // EffectDefinitionInterface implementation diff --git a/src/effects/Fade.h b/src/effects/Fade.h index 5a6fa8126..302b4bd44 100644 --- a/src/effects/Fade.h +++ b/src/effects/Fade.h @@ -25,7 +25,7 @@ public: // ComponentInterface implementation ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; // EffectDefinitionInterface implementation diff --git a/src/effects/FindClipping.cpp b/src/effects/FindClipping.cpp index 8682619ca..e4acfad23 100644 --- a/src/effects/FindClipping.cpp +++ b/src/effects/FindClipping.cpp @@ -57,9 +57,9 @@ ComponentInterfaceSymbol EffectFindClipping::GetSymbol() return FINDCLIPPING_PLUGIN_SYMBOL; } -wxString EffectFindClipping::GetDescription() +TranslatableString EffectFindClipping::GetDescription() { - return _("Creates labels where clipping is detected"); + return XO("Creates labels where clipping is detected"); } wxString EffectFindClipping::ManualPage() diff --git a/src/effects/FindClipping.h b/src/effects/FindClipping.h index fe0455c89..87273046d 100644 --- a/src/effects/FindClipping.h +++ b/src/effects/FindClipping.h @@ -29,7 +29,7 @@ public: // ComponentInterface implementation ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; wxString ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/Invert.cpp b/src/effects/Invert.cpp index 9aaff6b4d..3662f97b4 100644 --- a/src/effects/Invert.cpp +++ b/src/effects/Invert.cpp @@ -34,9 +34,9 @@ ComponentInterfaceSymbol EffectInvert::GetSymbol() return INVERT_PLUGIN_SYMBOL; } -wxString EffectInvert::GetDescription() +TranslatableString EffectInvert::GetDescription() { - return _("Flips the audio samples upside-down, reversing their polarity"); + return XO("Flips the audio samples upside-down, reversing their polarity"); } // EffectDefinitionInterface implementation diff --git a/src/effects/Invert.h b/src/effects/Invert.h index ca2cdd531..a4a2c0c52 100644 --- a/src/effects/Invert.h +++ b/src/effects/Invert.h @@ -26,7 +26,7 @@ public: // ComponentInterface implementation ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; // EffectDefinitionInterface implementation diff --git a/src/effects/LoadEffects.cpp b/src/effects/LoadEffects.cpp index c9714bf9c..e07a33a07 100644 --- a/src/effects/LoadEffects.cpp +++ b/src/effects/LoadEffects.cpp @@ -260,9 +260,9 @@ wxString BuiltinEffectsModule::GetVersion() return AUDACITY_VERSION_STRING; } -wxString BuiltinEffectsModule::GetDescription() +TranslatableString BuiltinEffectsModule::GetDescription() { - return _("Provides builtin effects to Audacity"); + return XO("Provides builtin effects to Audacity"); } // ============================================================================ diff --git a/src/effects/LoadEffects.h b/src/effects/LoadEffects.h index fe8b89f3f..8073f452c 100644 --- a/src/effects/LoadEffects.h +++ b/src/effects/LoadEffects.h @@ -32,7 +32,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; VendorSymbol GetVendor() override; wxString GetVersion() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; // ModuleInterface implementation diff --git a/src/effects/Loudness.cpp b/src/effects/Loudness.cpp index 5007d5d46..20b1d85f2 100644 --- a/src/effects/Loudness.cpp +++ b/src/effects/Loudness.cpp @@ -80,9 +80,9 @@ ComponentInterfaceSymbol EffectLoudness::GetSymbol() return LOUDNESS_PLUGIN_SYMBOL; } -wxString EffectLoudness::GetDescription() +TranslatableString EffectLoudness::GetDescription() { - return _("Sets the loudness of one or more tracks"); + return XO("Sets the loudness of one or more tracks"); } wxString EffectLoudness::ManualPage() diff --git a/src/effects/Loudness.h b/src/effects/Loudness.h index 2f14b67db..7d95e5e59 100644 --- a/src/effects/Loudness.h +++ b/src/effects/Loudness.h @@ -35,7 +35,7 @@ public: // ComponentInterface implementation ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; wxString ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/Noise.cpp b/src/effects/Noise.cpp index 6ebfdc1ee..b70212a82 100644 --- a/src/effects/Noise.cpp +++ b/src/effects/Noise.cpp @@ -76,9 +76,9 @@ ComponentInterfaceSymbol EffectNoise::GetSymbol() return NOISE_PLUGIN_SYMBOL; } -wxString EffectNoise::GetDescription() +TranslatableString EffectNoise::GetDescription() { - return _("Generates one of three different types of noise"); + return XO("Generates one of three different types of noise"); } wxString EffectNoise::ManualPage() diff --git a/src/effects/Noise.h b/src/effects/Noise.h index 9efd528e3..de2538ed7 100644 --- a/src/effects/Noise.h +++ b/src/effects/Noise.h @@ -29,7 +29,7 @@ public: // ComponentInterface implementation ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; wxString ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/NoiseReduction.cpp b/src/effects/NoiseReduction.cpp index be5c9eba1..a873ea887 100644 --- a/src/effects/NoiseReduction.cpp +++ b/src/effects/NoiseReduction.cpp @@ -437,9 +437,9 @@ ComponentInterfaceSymbol EffectNoiseReduction::GetSymbol() return NOISEREDUCTION_PLUGIN_SYMBOL; } -wxString EffectNoiseReduction::GetDescription() +TranslatableString EffectNoiseReduction::GetDescription() { - return _("Removes background noise such as fans, tape noise, or hums"); + return XO("Removes background noise such as fans, tape noise, or hums"); } // EffectDefinitionInterface implementation diff --git a/src/effects/NoiseReduction.h b/src/effects/NoiseReduction.h index 6fc8614d4..9b26249a0 100644 --- a/src/effects/NoiseReduction.h +++ b/src/effects/NoiseReduction.h @@ -28,7 +28,7 @@ public: // ComponentInterface implementation ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; // EffectDefinitionInterface implementation diff --git a/src/effects/NoiseRemoval.cpp b/src/effects/NoiseRemoval.cpp index 269a6d911..8488a8201 100644 --- a/src/effects/NoiseRemoval.cpp +++ b/src/effects/NoiseRemoval.cpp @@ -114,9 +114,9 @@ ComponentInterfaceSymbol EffectNoiseRemoval::GetSymbol() return XO("Noise Removal"); } -wxString EffectNoiseRemoval::GetDescription() +TranslatableString EffectNoiseRemoval::GetDescription() { - return _("Removes constant background noise such as fans, tape noise, or hums"); + return XO("Removes constant background noise such as fans, tape noise, or hums"); } // EffectDefinitionInterface implementation diff --git a/src/effects/NoiseRemoval.h b/src/effects/NoiseRemoval.h index 9ff197940..7eff39e76 100644 --- a/src/effects/NoiseRemoval.h +++ b/src/effects/NoiseRemoval.h @@ -44,7 +44,7 @@ public: // ComponentInterface implementation ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; // EffectDefinitionInterface implementation diff --git a/src/effects/Normalize.cpp b/src/effects/Normalize.cpp index dd625a81f..de9c70fbb 100644 --- a/src/effects/Normalize.cpp +++ b/src/effects/Normalize.cpp @@ -69,9 +69,9 @@ ComponentInterfaceSymbol EffectNormalize::GetSymbol() return NORMALIZE_PLUGIN_SYMBOL; } -wxString EffectNormalize::GetDescription() +TranslatableString EffectNormalize::GetDescription() { - return _("Sets the peak amplitude of one or more tracks"); + return XO("Sets the peak amplitude of one or more tracks"); } wxString EffectNormalize::ManualPage() diff --git a/src/effects/Normalize.h b/src/effects/Normalize.h index 2af663765..83d685c16 100644 --- a/src/effects/Normalize.h +++ b/src/effects/Normalize.h @@ -33,7 +33,7 @@ public: // ComponentInterface implementation ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; wxString ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/Paulstretch.cpp b/src/effects/Paulstretch.cpp index 7a52a30ff..f0b45f2dc 100644 --- a/src/effects/Paulstretch.cpp +++ b/src/effects/Paulstretch.cpp @@ -106,9 +106,9 @@ ComponentInterfaceSymbol EffectPaulstretch::GetSymbol() return PAULSTRETCH_PLUGIN_SYMBOL; } -wxString EffectPaulstretch::GetDescription() +TranslatableString EffectPaulstretch::GetDescription() { - return _("Paulstretch is only for an extreme time-stretch or \"stasis\" effect"); + return XO("Paulstretch is only for an extreme time-stretch or \"stasis\" effect"); } wxString EffectPaulstretch::ManualPage() diff --git a/src/effects/Paulstretch.h b/src/effects/Paulstretch.h index 0e817a37d..6ad89b82d 100644 --- a/src/effects/Paulstretch.h +++ b/src/effects/Paulstretch.h @@ -25,7 +25,7 @@ public: // ComponentInterface implementation ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; wxString ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/Phaser.cpp b/src/effects/Phaser.cpp index 99d87ec71..ee329d9a1 100644 --- a/src/effects/Phaser.cpp +++ b/src/effects/Phaser.cpp @@ -106,9 +106,9 @@ ComponentInterfaceSymbol EffectPhaser::GetSymbol() return PHASER_PLUGIN_SYMBOL; } -wxString EffectPhaser::GetDescription() +TranslatableString EffectPhaser::GetDescription() { - return _("Combines phase-shifted signals with the original signal"); + return XO("Combines phase-shifted signals with the original signal"); } wxString EffectPhaser::ManualPage() diff --git a/src/effects/Phaser.h b/src/effects/Phaser.h index ecc48083a..62255a921 100644 --- a/src/effects/Phaser.h +++ b/src/effects/Phaser.h @@ -50,7 +50,7 @@ public: // ComponentInterface implementation ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; wxString ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/Repair.cpp b/src/effects/Repair.cpp index 3cefdd4e9..afa2acbf3 100644 --- a/src/effects/Repair.cpp +++ b/src/effects/Repair.cpp @@ -47,9 +47,9 @@ ComponentInterfaceSymbol EffectRepair::GetSymbol() return REPAIR_PLUGIN_SYMBOL; } -wxString EffectRepair::GetDescription() +TranslatableString EffectRepair::GetDescription() { - return _("Sets the peak amplitude of a one or more tracks"); + return XO("Sets the peak amplitude of a one or more tracks"); } // EffectDefinitionInterface implementation diff --git a/src/effects/Repair.h b/src/effects/Repair.h index 074bb02a3..1665e5ae6 100644 --- a/src/effects/Repair.h +++ b/src/effects/Repair.h @@ -26,7 +26,7 @@ public: // ComponentInterface implementation ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; // EffectDefinitionInterface implementation diff --git a/src/effects/Repeat.cpp b/src/effects/Repeat.cpp index 2bf510979..33b410ec3 100644 --- a/src/effects/Repeat.cpp +++ b/src/effects/Repeat.cpp @@ -63,9 +63,9 @@ ComponentInterfaceSymbol EffectRepeat::GetSymbol() return REPEAT_PLUGIN_SYMBOL; } -wxString EffectRepeat::GetDescription() +TranslatableString EffectRepeat::GetDescription() { - return _("Repeats the selection the specified number of times"); + return XO("Repeats the selection the specified number of times"); } wxString EffectRepeat::ManualPage() diff --git a/src/effects/Repeat.h b/src/effects/Repeat.h index 447b8d492..d0b41f25b 100644 --- a/src/effects/Repeat.h +++ b/src/effects/Repeat.h @@ -29,7 +29,7 @@ public: // ComponentInterface implementation ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; wxString ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/Reverb.cpp b/src/effects/Reverb.cpp index 313e3b4ec..b1be5fea7 100644 --- a/src/effects/Reverb.cpp +++ b/src/effects/Reverb.cpp @@ -138,9 +138,9 @@ ComponentInterfaceSymbol EffectReverb::GetSymbol() return REVERB_PLUGIN_SYMBOL; } -wxString EffectReverb::GetDescription() +TranslatableString EffectReverb::GetDescription() { - return _("Adds ambience or a \"hall effect\""); + return XO("Adds ambience or a \"hall effect\""); } wxString EffectReverb::ManualPage() diff --git a/src/effects/Reverb.h b/src/effects/Reverb.h index da8ae586f..e8effbeb0 100644 --- a/src/effects/Reverb.h +++ b/src/effects/Reverb.h @@ -46,7 +46,7 @@ public: // ComponentInterface implementation ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; wxString ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/Reverse.cpp b/src/effects/Reverse.cpp index 0814d2d6c..a7d51d392 100644 --- a/src/effects/Reverse.cpp +++ b/src/effects/Reverse.cpp @@ -44,9 +44,9 @@ ComponentInterfaceSymbol EffectReverse::GetSymbol() return REVERSE_PLUGIN_SYMBOL; } -wxString EffectReverse::GetDescription() +TranslatableString EffectReverse::GetDescription() { - return _("Reverses the selected audio"); + return XO("Reverses the selected audio"); } // EffectDefinitionInterface implementation diff --git a/src/effects/Reverse.h b/src/effects/Reverse.h index 51225857f..3e95050e9 100644 --- a/src/effects/Reverse.h +++ b/src/effects/Reverse.h @@ -26,7 +26,7 @@ public: // ComponentInterface implementation ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; // EffectDefinitionInterface implementation diff --git a/src/effects/ScienFilter.cpp b/src/effects/ScienFilter.cpp index 09acac3b3..d5357632d 100644 --- a/src/effects/ScienFilter.cpp +++ b/src/effects/ScienFilter.cpp @@ -177,9 +177,10 @@ ComponentInterfaceSymbol EffectScienFilter::GetSymbol() return CLASSICFILTERS_PLUGIN_SYMBOL; } -wxString EffectScienFilter::GetDescription() +TranslatableString EffectScienFilter::GetDescription() { - return _("Performs IIR filtering that emulates analog filters"); + /* i18n-hint: "infinite impulse response" */ + return XO("Performs IIR filtering that emulates analog filters"); } wxString EffectScienFilter::ManualPage() diff --git a/src/effects/ScienFilter.h b/src/effects/ScienFilter.h index 4a1c23b2c..71e697a37 100644 --- a/src/effects/ScienFilter.h +++ b/src/effects/ScienFilter.h @@ -40,7 +40,7 @@ public: // ComponentInterface implementation ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; wxString ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/Silence.cpp b/src/effects/Silence.cpp index 143501190..e00bebe42 100644 --- a/src/effects/Silence.cpp +++ b/src/effects/Silence.cpp @@ -38,9 +38,9 @@ ComponentInterfaceSymbol EffectSilence::GetSymbol() return SILENCE_PLUGIN_SYMBOL; } -wxString EffectSilence::GetDescription() +TranslatableString EffectSilence::GetDescription() { - return _("Creates audio of zero amplitude"); + return XO("Creates audio of zero amplitude"); } wxString EffectSilence::ManualPage() diff --git a/src/effects/Silence.h b/src/effects/Silence.h index b8f60eb98..a4f9d56fa 100644 --- a/src/effects/Silence.h +++ b/src/effects/Silence.h @@ -28,7 +28,7 @@ public: // ComponentInterface implementation ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; wxString ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/StereoToMono.cpp b/src/effects/StereoToMono.cpp index 0fafb1df7..1d585d437 100644 --- a/src/effects/StereoToMono.cpp +++ b/src/effects/StereoToMono.cpp @@ -36,9 +36,9 @@ ComponentInterfaceSymbol EffectStereoToMono::GetSymbol() return STEREOTOMONO_PLUGIN_SYMBOL; } -wxString EffectStereoToMono::GetDescription() +TranslatableString EffectStereoToMono::GetDescription() { - return _("Converts stereo tracks to mono"); + return XO("Converts stereo tracks to mono"); } // EffectDefinitionInterface implementation diff --git a/src/effects/StereoToMono.h b/src/effects/StereoToMono.h index 2a6765eb6..66eea0377 100644 --- a/src/effects/StereoToMono.h +++ b/src/effects/StereoToMono.h @@ -24,7 +24,7 @@ public: // ComponentInterface implementation ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; // EffectDefinitionInterface implementation diff --git a/src/effects/TimeScale.cpp b/src/effects/TimeScale.cpp index 87a9d1347..c240e8a9f 100644 --- a/src/effects/TimeScale.cpp +++ b/src/effects/TimeScale.cpp @@ -90,9 +90,9 @@ ComponentInterfaceSymbol EffectTimeScale::GetSymbol() return TIMESCALE_PLUGIN_SYMBOL; } -wxString EffectTimeScale::GetDescription() +TranslatableString EffectTimeScale::GetDescription() { - return _("Allows continuous changes to the tempo and/or pitch"); + return XO("Allows continuous changes to the tempo and/or pitch"); } wxString EffectTimeScale::ManualPage() diff --git a/src/effects/TimeScale.h b/src/effects/TimeScale.h index 52bc7d4c2..a499af5b4 100644 --- a/src/effects/TimeScale.h +++ b/src/effects/TimeScale.h @@ -36,7 +36,7 @@ public: // ComponentInterface implementation ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; wxString ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/ToneGen.cpp b/src/effects/ToneGen.cpp index 60f84ce46..55c40810b 100644 --- a/src/effects/ToneGen.cpp +++ b/src/effects/ToneGen.cpp @@ -121,11 +121,11 @@ ComponentInterfaceSymbol EffectToneGen::GetSymbol() : TONE_PLUGIN_SYMBOL; } -wxString EffectToneGen::GetDescription() +TranslatableString EffectToneGen::GetDescription() { return mChirp - ? _("Generates an ascending or descending tone of one of four types") - : _("Generates a constant frequency tone of one of four types"); + ? XO("Generates an ascending or descending tone of one of four types") + : XO("Generates a constant frequency tone of one of four types"); } wxString EffectToneGen::ManualPage() diff --git a/src/effects/ToneGen.h b/src/effects/ToneGen.h index ca988c801..ebdc6c17d 100644 --- a/src/effects/ToneGen.h +++ b/src/effects/ToneGen.h @@ -30,7 +30,7 @@ public: // ComponentInterface implementation ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; wxString ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/TruncSilence.cpp b/src/effects/TruncSilence.cpp index c86faf0d9..37c662941 100644 --- a/src/effects/TruncSilence.cpp +++ b/src/effects/TruncSilence.cpp @@ -157,9 +157,9 @@ ComponentInterfaceSymbol EffectTruncSilence::GetSymbol() return TRUNCATESILENCE_PLUGIN_SYMBOL; } -wxString EffectTruncSilence::GetDescription() +TranslatableString EffectTruncSilence::GetDescription() { - return _("Automatically reduces the length of passages where the volume is below a specified level"); + return XO("Automatically reduces the length of passages where the volume is below a specified level"); } wxString EffectTruncSilence::ManualPage() diff --git a/src/effects/TruncSilence.h b/src/effects/TruncSilence.h index 723610127..a4656c686 100644 --- a/src/effects/TruncSilence.h +++ b/src/effects/TruncSilence.h @@ -37,7 +37,7 @@ public: // ComponentInterface implementation ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; wxString ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/VST/VSTEffect.cpp b/src/effects/VST/VSTEffect.cpp index 6be3dc4bf..9f6037dbf 100644 --- a/src/effects/VST/VSTEffect.cpp +++ b/src/effects/VST/VSTEffect.cpp @@ -249,7 +249,7 @@ public: return mVersion; } - wxString GetDescription() override + TranslatableString GetDescription() override { return mDescription; } @@ -294,7 +294,7 @@ public: wxString mName; wxString mVendor; wxString mVersion; - wxString mDescription; + TranslatableString mDescription; EffectType mType; bool mInteractive; bool mAutomatable; @@ -345,9 +345,9 @@ wxString VSTEffectsModule::GetVersion() return AUDACITY_VERSION_STRING; } -wxString VSTEffectsModule::GetDescription() +TranslatableString VSTEffectsModule::GetDescription() { - return _("Adds the ability to use VST effects in Audacity."); + return XO("Adds the ability to use VST effects in Audacity."); } // ============================================================================ @@ -618,7 +618,7 @@ unsigned VSTEffectsModule::DiscoverPluginsAtPath( break; case kKeyDescription: - proc.mDescription = val; + proc.mDescription = TranslatableString{ val }; keycount++; break; @@ -741,7 +741,7 @@ void VSTEffectsModule::Check(const wxChar *path) out += wxString::Format(wxT("%s%d=%s\n"), OUTPUTKEY, kKeyVendor, effect.GetVendor().Internal()); out += wxString::Format(wxT("%s%d=%s\n"), OUTPUTKEY, kKeyVersion, effect.GetVersion()); - out += wxString::Format(wxT("%s%d=%s\n"), OUTPUTKEY, kKeyDescription, effect.GetDescription()); + out += wxString::Format(wxT("%s%d=%s\n"), OUTPUTKEY, kKeyDescription, effect.GetDescription().Translation()); out += wxString::Format(wxT("%s%d=%d\n"), OUTPUTKEY, kKeyEffectType, effect.GetType()); out += wxString::Format(wxT("%s%d=%d\n"), OUTPUTKEY, kKeyInteractive, effect.IsInteractive()); out += wxString::Format(wxT("%s%d=%d\n"), OUTPUTKEY, kKeyAutomatable, effect.SupportsAutomation()); @@ -1228,13 +1228,12 @@ wxString VSTEffect::GetVersion() return version; } -wxString VSTEffect::GetDescription() +TranslatableString VSTEffect::GetDescription() { // VST does have a product string opcode and some effects return a short // description, but most do not or they just return the name again. So, // try to provide some sort of useful information. - return wxString::Format( _("Audio In: %d, Audio Out: %d"), - mAudioIns, mAudioOuts); + return XO("Audio In: %d, Audio Out: %d").Format( mAudioIns, mAudioOuts ); } // ============================================================================ diff --git a/src/effects/VST/VSTEffect.h b/src/effects/VST/VSTEffect.h index 1ecf26859..27f09dea5 100644 --- a/src/effects/VST/VSTEffect.h +++ b/src/effects/VST/VSTEffect.h @@ -105,7 +105,7 @@ class VSTEffect final : public wxEvtHandler, ComponentInterfaceSymbol GetSymbol() override; VendorSymbol GetVendor() override; wxString GetVersion() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; // EffectDefinitionInterface implementation @@ -411,7 +411,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; VendorSymbol GetVendor() override; wxString GetVersion() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; // ModuleInterface implementation diff --git a/src/effects/Wahwah.cpp b/src/effects/Wahwah.cpp index f03e2be96..85fde3f57 100644 --- a/src/effects/Wahwah.cpp +++ b/src/effects/Wahwah.cpp @@ -97,9 +97,9 @@ ComponentInterfaceSymbol EffectWahwah::GetSymbol() return WAHWAH_PLUGIN_SYMBOL; } -wxString EffectWahwah::GetDescription() +TranslatableString EffectWahwah::GetDescription() { - return _("Rapid tone quality variations, like that guitar sound so popular in the 1970's"); + return XO("Rapid tone quality variations, like that guitar sound so popular in the 1970's"); } wxString EffectWahwah::ManualPage() diff --git a/src/effects/Wahwah.h b/src/effects/Wahwah.h index f8ae65395..d08109bd3 100644 --- a/src/effects/Wahwah.h +++ b/src/effects/Wahwah.h @@ -47,7 +47,7 @@ public: // ComponentInterface implementation ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; wxString ManualPage() override; // EffectDefinitionInterface implementation diff --git a/src/effects/audiounits/AudioUnitEffect.cpp b/src/effects/audiounits/AudioUnitEffect.cpp index 0a2b155dd..d87557e49 100644 --- a/src/effects/audiounits/AudioUnitEffect.cpp +++ b/src/effects/audiounits/AudioUnitEffect.cpp @@ -126,9 +126,9 @@ wxString AudioUnitEffectsModule::GetVersion() return AUDIOUNITEFFECTS_VERSION; } -wxString AudioUnitEffectsModule::GetDescription() +TranslatableString AudioUnitEffectsModule::GetDescription() { - return _("Provides Audio Unit Effects support to Audacity"); + return XO("Provides Audio Unit Effects support to Audacity"); } // ============================================================================ @@ -899,10 +899,10 @@ wxString AudioUnitEffect::GetVersion() version & 0xff); } -wxString AudioUnitEffect::GetDescription() +TranslatableString AudioUnitEffect::GetDescription() { /* i18n-hint: Can mean "not available," "not applicable," "no answer" */ - return _("n/a"); + return XO("n/a"); } // ============================================================================ diff --git a/src/effects/audiounits/AudioUnitEffect.h b/src/effects/audiounits/AudioUnitEffect.h index 2fc996395..e25cfb999 100644 --- a/src/effects/audiounits/AudioUnitEffect.h +++ b/src/effects/audiounits/AudioUnitEffect.h @@ -55,7 +55,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; VendorSymbol GetVendor() override; wxString GetVersion() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; // EffectComponentInterface implementation @@ -235,7 +235,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; VendorSymbol GetVendor() override; wxString GetVersion() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; // ModuleInterface implementation diff --git a/src/effects/ladspa/LadspaEffect.cpp b/src/effects/ladspa/LadspaEffect.cpp index 9097d7725..f366b44c9 100644 --- a/src/effects/ladspa/LadspaEffect.cpp +++ b/src/effects/ladspa/LadspaEffect.cpp @@ -141,9 +141,9 @@ wxString LadspaEffectsModule::GetVersion() return LADSPAEFFECTS_VERSION; } -wxString LadspaEffectsModule::GetDescription() +TranslatableString LadspaEffectsModule::GetDescription() { - return _("Provides LADSPA Effects"); + return XO("Provides LADSPA Effects"); } // ============================================================================ @@ -667,9 +667,9 @@ wxString LadspaEffect::GetVersion() return _("n/a"); } -wxString LadspaEffect::GetDescription() +TranslatableString LadspaEffect::GetDescription() { - return LAT1CTOWX(mData->Copyright); + return TranslatableString{ LAT1CTOWX(mData->Copyright) }; } // ============================================================================ diff --git a/src/effects/ladspa/LadspaEffect.h b/src/effects/ladspa/LadspaEffect.h index 6ffb6eac1..a931dc41e 100644 --- a/src/effects/ladspa/LadspaEffect.h +++ b/src/effects/ladspa/LadspaEffect.h @@ -53,7 +53,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; VendorSymbol GetVendor() override; wxString GetVersion() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; // EffectDefinitionInterface implementation @@ -216,7 +216,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; VendorSymbol GetVendor() override; wxString GetVersion() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; // ModuleInterface implementation diff --git a/src/effects/lv2/LV2Effect.cpp b/src/effects/lv2/LV2Effect.cpp index a46f24e52..301be53f1 100644 --- a/src/effects/lv2/LV2Effect.cpp +++ b/src/effects/lv2/LV2Effect.cpp @@ -355,9 +355,9 @@ wxString LV2Effect::GetVersion() return wxT("1.0"); } -wxString LV2Effect::GetDescription() +TranslatableString LV2Effect::GetDescription() { - return _("n/a"); + return XO("n/a"); } // ============================================================================ diff --git a/src/effects/lv2/LV2Effect.h b/src/effects/lv2/LV2Effect.h index b77cea027..f6904d266 100644 --- a/src/effects/lv2/LV2Effect.h +++ b/src/effects/lv2/LV2Effect.h @@ -113,7 +113,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; VendorSymbol GetVendor() override; wxString GetVersion() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; // EffectDefinitionInterface implementation diff --git a/src/effects/lv2/LoadLV2.cpp b/src/effects/lv2/LoadLV2.cpp index 46f7676a9..30a3c6b78 100644 --- a/src/effects/lv2/LoadLV2.cpp +++ b/src/effects/lv2/LoadLV2.cpp @@ -111,9 +111,9 @@ wxString LV2EffectsModule::GetVersion() return LV2EFFECTS_VERSION; } -wxString LV2EffectsModule::GetDescription() +TranslatableString LV2EffectsModule::GetDescription() { - return _("Provides LV2 Effects support to Audacity"); + return XO("Provides LV2 Effects support to Audacity"); } // ============================================================================ diff --git a/src/effects/lv2/LoadLV2.h b/src/effects/lv2/LoadLV2.h index 72983a425..91652c584 100644 --- a/src/effects/lv2/LoadLV2.h +++ b/src/effects/lv2/LoadLV2.h @@ -79,7 +79,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; VendorSymbol GetVendor() override; wxString GetVersion() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; // ModuleInterface implementation diff --git a/src/effects/nyquist/LoadNyquist.cpp b/src/effects/nyquist/LoadNyquist.cpp index 17b79913b..52b523c23 100644 --- a/src/effects/nyquist/LoadNyquist.cpp +++ b/src/effects/nyquist/LoadNyquist.cpp @@ -117,9 +117,9 @@ wxString NyquistEffectsModule::GetVersion() return NYQUISTEFFECTS_VERSION; } -wxString NyquistEffectsModule::GetDescription() +TranslatableString NyquistEffectsModule::GetDescription() { - return _("Provides Nyquist Effects support to Audacity"); + return XO("Provides Nyquist Effects support to Audacity"); } // ============================================================================ diff --git a/src/effects/nyquist/LoadNyquist.h b/src/effects/nyquist/LoadNyquist.h index b9800db26..6d12a2801 100644 --- a/src/effects/nyquist/LoadNyquist.h +++ b/src/effects/nyquist/LoadNyquist.h @@ -30,7 +30,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; VendorSymbol GetVendor() override; wxString GetVersion() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; // ModuleInterface implementation diff --git a/src/effects/nyquist/Nyquist.cpp b/src/effects/nyquist/Nyquist.cpp index 3c1686f8c..33593c367 100644 --- a/src/effects/nyquist/Nyquist.cpp +++ b/src/effects/nyquist/Nyquist.cpp @@ -235,10 +235,9 @@ wxString NyquistEffect::GetVersion() return mReleaseVersion.Translation(); } -wxString NyquistEffect::GetDescription() +TranslatableString NyquistEffect::GetDescription() { - // This should be a translated string, consistent with other effects - return mCopyright.Translation(); + return mCopyright; } wxString NyquistEffect::ManualPage() diff --git a/src/effects/nyquist/Nyquist.h b/src/effects/nyquist/Nyquist.h index bb33900f6..56fd2d09d 100644 --- a/src/effects/nyquist/Nyquist.h +++ b/src/effects/nyquist/Nyquist.h @@ -75,7 +75,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; VendorSymbol GetVendor() override; wxString GetVersion() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; wxString ManualPage() override; wxString HelpPage() override; diff --git a/src/effects/vamp/LoadVamp.cpp b/src/effects/vamp/LoadVamp.cpp index 2ae86f582..a0af53a2b 100644 --- a/src/effects/vamp/LoadVamp.cpp +++ b/src/effects/vamp/LoadVamp.cpp @@ -90,9 +90,9 @@ wxString VampEffectsModule::GetVersion() return VAMPEFFECTS_VERSION; } -wxString VampEffectsModule::GetDescription() +TranslatableString VampEffectsModule::GetDescription() { - return _("Provides Vamp Effects support to Audacity"); + return XO("Provides Vamp Effects support to Audacity"); } // ============================================================================ diff --git a/src/effects/vamp/LoadVamp.h b/src/effects/vamp/LoadVamp.h index 9b24d53f1..d24697e13 100644 --- a/src/effects/vamp/LoadVamp.h +++ b/src/effects/vamp/LoadVamp.h @@ -38,7 +38,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; VendorSymbol GetVendor() override; wxString GetVersion() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; // ModuleInterface implementation diff --git a/src/effects/vamp/VampEffect.cpp b/src/effects/vamp/VampEffect.cpp index 08bcf3eaf..1a4fdca2f 100644 --- a/src/effects/vamp/VampEffect.cpp +++ b/src/effects/vamp/VampEffect.cpp @@ -107,9 +107,10 @@ wxString VampEffect::GetVersion() return wxString::Format(wxT("%d"), mPlugin->getPluginVersion()); } -wxString VampEffect::GetDescription() +TranslatableString VampEffect::GetDescription() { - return wxString::FromUTF8(mPlugin->getCopyright().c_str()); + return TranslatableString{ + wxString::FromUTF8(mPlugin->getCopyright().c_str()) }; } // ============================================================================ diff --git a/src/effects/vamp/VampEffect.h b/src/effects/vamp/VampEffect.h index d3b406be8..c521b7795 100644 --- a/src/effects/vamp/VampEffect.h +++ b/src/effects/vamp/VampEffect.h @@ -46,7 +46,7 @@ public: ComponentInterfaceSymbol GetSymbol() override; VendorSymbol GetVendor() override; wxString GetVersion() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; // EffectDefinitionInterface implementation diff --git a/src/prefs/BatchPrefs.cpp b/src/prefs/BatchPrefs.cpp index a454bddf2..3da4b5ae9 100644 --- a/src/prefs/BatchPrefs.cpp +++ b/src/prefs/BatchPrefs.cpp @@ -40,9 +40,9 @@ ComponentInterfaceSymbol BatchPrefs::GetSymbol() return BATCH_PREFS_PLUGIN_SYMBOL; } -wxString BatchPrefs::GetDescription() +TranslatableString BatchPrefs::GetDescription() { - return _("Preferences for Batch"); + return XO("Preferences for Batch"); } wxString BatchPrefs::HelpPageName() diff --git a/src/prefs/BatchPrefs.h b/src/prefs/BatchPrefs.h index 49d5d000f..f732669e8 100644 --- a/src/prefs/BatchPrefs.h +++ b/src/prefs/BatchPrefs.h @@ -26,7 +26,7 @@ public: BatchPrefs(wxWindow * parent, wxWindowID winid); ~BatchPrefs(); ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; wxString HelpPageName() override; bool Commit() override; diff --git a/src/prefs/DevicePrefs.cpp b/src/prefs/DevicePrefs.cpp index 6a797b761..cec479490 100644 --- a/src/prefs/DevicePrefs.cpp +++ b/src/prefs/DevicePrefs.cpp @@ -68,9 +68,9 @@ ComponentInterfaceSymbol DevicePrefs::GetSymbol() return DEVICE_PREFS_PLUGIN_SYMBOL; } -wxString DevicePrefs::GetDescription() +TranslatableString DevicePrefs::GetDescription() { - return _("Preferences for Device"); + return XO("Preferences for Device"); } wxString DevicePrefs::HelpPageName() diff --git a/src/prefs/DevicePrefs.h b/src/prefs/DevicePrefs.h index ed491449c..e98bad9aa 100644 --- a/src/prefs/DevicePrefs.h +++ b/src/prefs/DevicePrefs.h @@ -28,7 +28,7 @@ class DevicePrefs final : public PrefsPanel DevicePrefs(wxWindow * parent, wxWindowID winid); virtual ~DevicePrefs(); ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; bool Commit() override; wxString HelpPageName() override; diff --git a/src/prefs/DirectoriesPrefs.cpp b/src/prefs/DirectoriesPrefs.cpp index 350211eee..824c7f7d7 100644 --- a/src/prefs/DirectoriesPrefs.cpp +++ b/src/prefs/DirectoriesPrefs.cpp @@ -66,9 +66,9 @@ ComponentInterfaceSymbol DirectoriesPrefs::GetSymbol() return DIRECTORIES_PREFS_PLUGIN_SYMBOL; } -wxString DirectoriesPrefs::GetDescription() +TranslatableString DirectoriesPrefs::GetDescription() { - return _("Preferences for Directories"); + return XO("Preferences for Directories"); } wxString DirectoriesPrefs::HelpPageName() diff --git a/src/prefs/DirectoriesPrefs.h b/src/prefs/DirectoriesPrefs.h index bf4681f1f..fb3d12ac4 100644 --- a/src/prefs/DirectoriesPrefs.h +++ b/src/prefs/DirectoriesPrefs.h @@ -26,7 +26,7 @@ class DirectoriesPrefs final : public PrefsPanel DirectoriesPrefs(wxWindow * parent, wxWindowID winid); ~DirectoriesPrefs(); ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; bool Commit() override; bool Validate() override; diff --git a/src/prefs/EffectsPrefs.cpp b/src/prefs/EffectsPrefs.cpp index 66b883d17..fe63bb11d 100644 --- a/src/prefs/EffectsPrefs.cpp +++ b/src/prefs/EffectsPrefs.cpp @@ -45,9 +45,9 @@ ComponentInterfaceSymbol EffectsPrefs::GetSymbol() return EFFECTS_PREFS_PLUGIN_SYMBOL; } -wxString EffectsPrefs::GetDescription() +TranslatableString EffectsPrefs::GetDescription() { - return _("Preferences for Effects"); + return XO("Preferences for Effects"); } wxString EffectsPrefs::HelpPageName() diff --git a/src/prefs/EffectsPrefs.h b/src/prefs/EffectsPrefs.h index 4159e45e6..997fd6c5a 100644 --- a/src/prefs/EffectsPrefs.h +++ b/src/prefs/EffectsPrefs.h @@ -28,7 +28,7 @@ class EffectsPrefs final : public PrefsPanel EffectsPrefs(wxWindow * parent, wxWindowID winid); ~EffectsPrefs(); ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; bool Commit() override; wxString HelpPageName() override; diff --git a/src/prefs/ExtImportPrefs.cpp b/src/prefs/ExtImportPrefs.cpp index 0534311ae..9268284f1 100644 --- a/src/prefs/ExtImportPrefs.cpp +++ b/src/prefs/ExtImportPrefs.cpp @@ -76,9 +76,9 @@ ComponentInterfaceSymbol ExtImportPrefs::GetSymbol() return EXT_IMPORT_PREFS_PLUGIN_SYMBOL; } -wxString ExtImportPrefs::GetDescription() +TranslatableString ExtImportPrefs::GetDescription() { - return _("Preferences for ExtImport"); + return XO("Preferences for ExtImport"); } wxString ExtImportPrefs::HelpPageName() diff --git a/src/prefs/ExtImportPrefs.h b/src/prefs/ExtImportPrefs.h index 20b83555f..ee7eb77a5 100644 --- a/src/prefs/ExtImportPrefs.h +++ b/src/prefs/ExtImportPrefs.h @@ -52,7 +52,7 @@ class ExtImportPrefs final : public PrefsPanel ExtImportPrefs(wxWindow * parent, wxWindowID winid); ~ExtImportPrefs(); ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; bool Commit() override; wxString HelpPageName() override; diff --git a/src/prefs/GUIPrefs.cpp b/src/prefs/GUIPrefs.cpp index 9ea5f3561..910ad99db 100644 --- a/src/prefs/GUIPrefs.cpp +++ b/src/prefs/GUIPrefs.cpp @@ -56,9 +56,9 @@ ComponentInterfaceSymbol GUIPrefs::GetSymbol() return GUI_PREFS_PLUGIN_SYMBOL; } -wxString GUIPrefs::GetDescription() +TranslatableString GUIPrefs::GetDescription() { - return _("Preferences for GUI"); + return XO("Preferences for GUI"); } wxString GUIPrefs::HelpPageName() diff --git a/src/prefs/GUIPrefs.h b/src/prefs/GUIPrefs.h index 4d136f62c..4e87e65c9 100644 --- a/src/prefs/GUIPrefs.h +++ b/src/prefs/GUIPrefs.h @@ -29,7 +29,7 @@ class GUIPrefs final : public PrefsPanel GUIPrefs(wxWindow * parent, wxWindowID winid); ~GUIPrefs(); ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; bool Commit() override; wxString HelpPageName() override; diff --git a/src/prefs/ImportExportPrefs.cpp b/src/prefs/ImportExportPrefs.cpp index 8551299c2..f6041e0b6 100644 --- a/src/prefs/ImportExportPrefs.cpp +++ b/src/prefs/ImportExportPrefs.cpp @@ -39,9 +39,9 @@ ComponentInterfaceSymbol ImportExportPrefs::GetSymbol() return IMPORT_EXPORT_PREFS_PLUGIN_SYMBOL; } -wxString ImportExportPrefs::GetDescription() +TranslatableString ImportExportPrefs::GetDescription() { - return _("Preferences for ImportExport"); + return XO("Preferences for ImportExport"); } wxString ImportExportPrefs::HelpPageName() diff --git a/src/prefs/ImportExportPrefs.h b/src/prefs/ImportExportPrefs.h index bc7fdaa71..f4af7f42f 100644 --- a/src/prefs/ImportExportPrefs.h +++ b/src/prefs/ImportExportPrefs.h @@ -32,7 +32,7 @@ class ImportExportPrefs final : public PrefsPanel ImportExportPrefs(wxWindow * parent, wxWindowID winid); ~ImportExportPrefs(); ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; bool Commit() override; wxString HelpPageName() override; diff --git a/src/prefs/KeyConfigPrefs.cpp b/src/prefs/KeyConfigPrefs.cpp index 37288a002..5368a5828 100644 --- a/src/prefs/KeyConfigPrefs.cpp +++ b/src/prefs/KeyConfigPrefs.cpp @@ -102,9 +102,9 @@ ComponentInterfaceSymbol KeyConfigPrefs::GetSymbol() return KEY_CONFIG_PREFS_PLUGIN_SYMBOL; } -wxString KeyConfigPrefs::GetDescription() +TranslatableString KeyConfigPrefs::GetDescription() { - return _("Preferences for KeyConfig"); + return XO("Preferences for KeyConfig"); } wxString KeyConfigPrefs::HelpPageName() diff --git a/src/prefs/KeyConfigPrefs.h b/src/prefs/KeyConfigPrefs.h index 28a001f1a..5bcfc0616 100644 --- a/src/prefs/KeyConfigPrefs.h +++ b/src/prefs/KeyConfigPrefs.h @@ -34,7 +34,7 @@ class KeyConfigPrefs final : public PrefsPanel public: KeyConfigPrefs(wxWindow * parent, wxWindowID winid, const CommandID &name); ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; bool Commit() override; void Cancel() override; diff --git a/src/prefs/LibraryPrefs.cpp b/src/prefs/LibraryPrefs.cpp index c00c841c2..68f775890 100644 --- a/src/prefs/LibraryPrefs.cpp +++ b/src/prefs/LibraryPrefs.cpp @@ -61,9 +61,9 @@ ComponentInterfaceSymbol LibraryPrefs::GetSymbol() return LIBRARY_PREFS_PLUGIN_SYMBOL; } -wxString LibraryPrefs::GetDescription() +TranslatableString LibraryPrefs::GetDescription() { - return _("Preferences for Library"); + return XO("Preferences for Library"); } wxString LibraryPrefs::HelpPageName() diff --git a/src/prefs/LibraryPrefs.h b/src/prefs/LibraryPrefs.h index 2aa8fa960..f508707bf 100644 --- a/src/prefs/LibraryPrefs.h +++ b/src/prefs/LibraryPrefs.h @@ -28,7 +28,7 @@ class LibraryPrefs final : public PrefsPanel LibraryPrefs(wxWindow * parent, wxWindowID winid); ~LibraryPrefs(); ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; bool Commit() override; wxString HelpPageName() override; diff --git a/src/prefs/MidiIOPrefs.cpp b/src/prefs/MidiIOPrefs.cpp index f164665e7..1e3d10f24 100644 --- a/src/prefs/MidiIOPrefs.cpp +++ b/src/prefs/MidiIOPrefs.cpp @@ -72,9 +72,9 @@ ComponentInterfaceSymbol MidiIOPrefs::GetSymbol() return MIDI_IO_PREFS_PLUGIN_SYMBOL; } -wxString MidiIOPrefs::GetDescription() +TranslatableString MidiIOPrefs::GetDescription() { - return _("Preferences for MidiIO"); + return XO("Preferences for MidiIO"); } wxString MidiIOPrefs::HelpPageName() diff --git a/src/prefs/MidiIOPrefs.h b/src/prefs/MidiIOPrefs.h index ba0daded2..e845f3299 100644 --- a/src/prefs/MidiIOPrefs.h +++ b/src/prefs/MidiIOPrefs.h @@ -34,7 +34,7 @@ class MidiIOPrefs final : public PrefsPanel MidiIOPrefs(wxWindow * parent, wxWindowID winid); virtual ~MidiIOPrefs(); ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; bool Commit() override; bool Validate() override; diff --git a/src/prefs/ModulePrefs.cpp b/src/prefs/ModulePrefs.cpp index 2f9ba835d..3d94a451d 100644 --- a/src/prefs/ModulePrefs.cpp +++ b/src/prefs/ModulePrefs.cpp @@ -43,9 +43,9 @@ ComponentInterfaceSymbol ModulePrefs::GetSymbol() return MODULE_PREFS_PLUGIN_SYMBOL; } -wxString ModulePrefs::GetDescription() +TranslatableString ModulePrefs::GetDescription() { - return _("Preferences for Module"); + return XO("Preferences for Module"); } wxString ModulePrefs::HelpPageName() diff --git a/src/prefs/ModulePrefs.h b/src/prefs/ModulePrefs.h index c99cd3bdd..1e4fdc301 100644 --- a/src/prefs/ModulePrefs.h +++ b/src/prefs/ModulePrefs.h @@ -38,7 +38,7 @@ class ModulePrefs final : public PrefsPanel ModulePrefs(wxWindow * parent, wxWindowID winid); ~ModulePrefs(); ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; bool Commit() override; wxString HelpPageName() override; diff --git a/src/prefs/MousePrefs.cpp b/src/prefs/MousePrefs.cpp index 7de3a8494..d96884c5a 100644 --- a/src/prefs/MousePrefs.cpp +++ b/src/prefs/MousePrefs.cpp @@ -75,9 +75,9 @@ ComponentInterfaceSymbol MousePrefs::GetSymbol() return MOUSE_PREFS_PLUGIN_SYMBOL; } -wxString MousePrefs::GetDescription() +TranslatableString MousePrefs::GetDescription() { - return _("Preferences for Mouse"); + return XO("Preferences for Mouse"); } wxString MousePrefs::HelpPageName() diff --git a/src/prefs/MousePrefs.h b/src/prefs/MousePrefs.h index 2feb8a415..bbbe56982 100644 --- a/src/prefs/MousePrefs.h +++ b/src/prefs/MousePrefs.h @@ -25,7 +25,7 @@ class MousePrefs final : public PrefsPanel MousePrefs(wxWindow * parent, wxWindowID winid); ~MousePrefs(); ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; bool Commit() override; wxString HelpPageName() override; diff --git a/src/prefs/PlaybackPrefs.cpp b/src/prefs/PlaybackPrefs.cpp index 3c7855aac..407f660b6 100644 --- a/src/prefs/PlaybackPrefs.cpp +++ b/src/prefs/PlaybackPrefs.cpp @@ -42,9 +42,9 @@ ComponentInterfaceSymbol PlaybackPrefs::GetSymbol() return PLAYBACK_PREFS_PLUGIN_SYMBOL; } -wxString PlaybackPrefs::GetDescription() +TranslatableString PlaybackPrefs::GetDescription() { - return _("Preferences for Playback"); + return XO("Preferences for Playback"); } wxString PlaybackPrefs::HelpPageName() diff --git a/src/prefs/PlaybackPrefs.h b/src/prefs/PlaybackPrefs.h index 0cc917c74..400bb7db8 100644 --- a/src/prefs/PlaybackPrefs.h +++ b/src/prefs/PlaybackPrefs.h @@ -26,7 +26,7 @@ class PlaybackPrefs final : public PrefsPanel PlaybackPrefs(wxWindow * parent, wxWindowID winid); virtual ~PlaybackPrefs(); ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; bool Commit() override; wxString HelpPageName() override; diff --git a/src/prefs/ProjectsPrefs.cpp b/src/prefs/ProjectsPrefs.cpp index 778031240..e76765e48 100644 --- a/src/prefs/ProjectsPrefs.cpp +++ b/src/prefs/ProjectsPrefs.cpp @@ -45,9 +45,9 @@ ComponentInterfaceSymbol ProjectsPrefs::GetSymbol() return PROJECTS_PREFS_PLUGIN_SYMBOL; } -wxString ProjectsPrefs::GetDescription() +TranslatableString ProjectsPrefs::GetDescription() { - return _("Preferences for Projects"); + return XO("Preferences for Projects"); } wxString ProjectsPrefs::HelpPageName() diff --git a/src/prefs/ProjectsPrefs.h b/src/prefs/ProjectsPrefs.h index d5f23f5c5..66c14d97a 100644 --- a/src/prefs/ProjectsPrefs.h +++ b/src/prefs/ProjectsPrefs.h @@ -27,7 +27,7 @@ class ProjectsPrefs final : public PrefsPanel ProjectsPrefs(wxWindow * parent, wxWindowID winid); ~ProjectsPrefs(); ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; bool Commit() override; wxString HelpPageName() override; diff --git a/src/prefs/QualityPrefs.cpp b/src/prefs/QualityPrefs.cpp index 776352ff0..d42290735 100644 --- a/src/prefs/QualityPrefs.cpp +++ b/src/prefs/QualityPrefs.cpp @@ -71,9 +71,9 @@ ComponentInterfaceSymbol QualityPrefs::GetSymbol() return QUALITY_PREFS_PLUGIN_SYMBOL; } -wxString QualityPrefs::GetDescription() +TranslatableString QualityPrefs::GetDescription() { - return _("Preferences for Quality"); + return XO("Preferences for Quality"); } wxString QualityPrefs::HelpPageName() diff --git a/src/prefs/QualityPrefs.h b/src/prefs/QualityPrefs.h index 602edd621..cff97c5d1 100644 --- a/src/prefs/QualityPrefs.h +++ b/src/prefs/QualityPrefs.h @@ -33,7 +33,7 @@ class QualityPrefs final : public PrefsPanel QualityPrefs(wxWindow * parent, wxWindowID winid); virtual ~QualityPrefs(); ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; bool Commit() override; wxString HelpPageName() override; diff --git a/src/prefs/RecordingPrefs.cpp b/src/prefs/RecordingPrefs.cpp index 61a35d73b..0cd571234 100644 --- a/src/prefs/RecordingPrefs.cpp +++ b/src/prefs/RecordingPrefs.cpp @@ -58,9 +58,9 @@ ComponentInterfaceSymbol RecordingPrefs::GetSymbol() return RECORDING_PREFS_PLUGIN_SYMBOL; } -wxString RecordingPrefs::GetDescription() +TranslatableString RecordingPrefs::GetDescription() { - return _("Preferences for Recording"); + return XO("Preferences for Recording"); } wxString RecordingPrefs::HelpPageName() diff --git a/src/prefs/RecordingPrefs.h b/src/prefs/RecordingPrefs.h index 29fe793c0..220009fba 100644 --- a/src/prefs/RecordingPrefs.h +++ b/src/prefs/RecordingPrefs.h @@ -46,7 +46,7 @@ class RecordingPrefs final : public PrefsPanel RecordingPrefs(wxWindow * parent, wxWindowID winid); virtual ~RecordingPrefs(); ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; bool Commit() override; wxString HelpPageName() override; diff --git a/src/prefs/SpectrumPrefs.cpp b/src/prefs/SpectrumPrefs.cpp index 7c9346b76..3c3266a5d 100644 --- a/src/prefs/SpectrumPrefs.cpp +++ b/src/prefs/SpectrumPrefs.cpp @@ -72,9 +72,9 @@ ComponentInterfaceSymbol SpectrumPrefs::GetSymbol() return SPECTRUM_PREFS_PLUGIN_SYMBOL; } -wxString SpectrumPrefs::GetDescription() +TranslatableString SpectrumPrefs::GetDescription() { - return _("Preferences for Spectrum"); + return XO("Preferences for Spectrum"); } wxString SpectrumPrefs::HelpPageName() diff --git a/src/prefs/SpectrumPrefs.h b/src/prefs/SpectrumPrefs.h index f22e1e7e1..bdb11d2d8 100644 --- a/src/prefs/SpectrumPrefs.h +++ b/src/prefs/SpectrumPrefs.h @@ -49,7 +49,7 @@ class SpectrumPrefs final : public PrefsPanel SpectrumPrefs(wxWindow * parent, wxWindowID winid, WaveTrack *wt); virtual ~SpectrumPrefs(); ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; void Preview() override; bool Commit() override; diff --git a/src/prefs/ThemePrefs.cpp b/src/prefs/ThemePrefs.cpp index d4a64cbd7..ee50cdcdd 100644 --- a/src/prefs/ThemePrefs.cpp +++ b/src/prefs/ThemePrefs.cpp @@ -77,9 +77,9 @@ ComponentInterfaceSymbol ThemePrefs::GetSymbol() return THEME_PREFS_PLUGIN_SYMBOL; } -wxString ThemePrefs::GetDescription() +TranslatableString ThemePrefs::GetDescription() { - return _("Preferences for Theme"); + return XO("Preferences for Theme"); } wxString ThemePrefs::HelpPageName() diff --git a/src/prefs/ThemePrefs.h b/src/prefs/ThemePrefs.h index 7cfb5cef1..4c659a1f3 100644 --- a/src/prefs/ThemePrefs.h +++ b/src/prefs/ThemePrefs.h @@ -33,7 +33,7 @@ class ThemePrefs final : public PrefsPanel ThemePrefs(wxWindow * parent, wxWindowID winid); ~ThemePrefs(void); ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; bool Commit() override; wxString HelpPageName() override; diff --git a/src/prefs/TracksBehaviorsPrefs.cpp b/src/prefs/TracksBehaviorsPrefs.cpp index 396549f60..789a3d6c8 100644 --- a/src/prefs/TracksBehaviorsPrefs.cpp +++ b/src/prefs/TracksBehaviorsPrefs.cpp @@ -38,9 +38,9 @@ ComponentInterfaceSymbol TracksBehaviorsPrefs::GetSymbol() return TRACKS_BEHAVIORS_PREFS_PLUGIN_SYMBOL; } -wxString TracksBehaviorsPrefs::GetDescription() +TranslatableString TracksBehaviorsPrefs::GetDescription() { - return _("Preferences for TracksBehaviors"); + return XO("Preferences for TracksBehaviors"); } wxString TracksBehaviorsPrefs::HelpPageName() diff --git a/src/prefs/TracksBehaviorsPrefs.h b/src/prefs/TracksBehaviorsPrefs.h index 9e4c0b9ab..9261516c9 100644 --- a/src/prefs/TracksBehaviorsPrefs.h +++ b/src/prefs/TracksBehaviorsPrefs.h @@ -28,7 +28,7 @@ class TracksBehaviorsPrefs final : public PrefsPanel TracksBehaviorsPrefs(wxWindow * parent, wxWindowID winid); ~TracksBehaviorsPrefs(); ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; bool Commit() override; wxString HelpPageName() override; diff --git a/src/prefs/TracksPrefs.cpp b/src/prefs/TracksPrefs.cpp index e8156bfc9..048e84716 100644 --- a/src/prefs/TracksPrefs.cpp +++ b/src/prefs/TracksPrefs.cpp @@ -232,9 +232,9 @@ ComponentInterfaceSymbol TracksPrefs::GetSymbol() return TRACKS_PREFS_PLUGIN_SYMBOL; } -wxString TracksPrefs::GetDescription() +TranslatableString TracksPrefs::GetDescription() { - return _("Preferences for Tracks"); + return XO("Preferences for Tracks"); } wxString TracksPrefs::HelpPageName() diff --git a/src/prefs/TracksPrefs.h b/src/prefs/TracksPrefs.h index 6c3ab4607..6b499a903 100644 --- a/src/prefs/TracksPrefs.h +++ b/src/prefs/TracksPrefs.h @@ -29,7 +29,7 @@ class TracksPrefs final : public PrefsPanel TracksPrefs(wxWindow * parent, wxWindowID winid); ~TracksPrefs(); ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; bool Commit() override; wxString HelpPageName() override; diff --git a/src/prefs/WarningsPrefs.cpp b/src/prefs/WarningsPrefs.cpp index a65084f66..90e20d00c 100644 --- a/src/prefs/WarningsPrefs.cpp +++ b/src/prefs/WarningsPrefs.cpp @@ -41,9 +41,9 @@ ComponentInterfaceSymbol WarningsPrefs::GetSymbol() return WARNINGS_PREFS_PLUGIN_SYMBOL; } -wxString WarningsPrefs::GetDescription() +TranslatableString WarningsPrefs::GetDescription() { - return _("Preferences for Warnings"); + return XO("Preferences for Warnings"); } wxString WarningsPrefs::HelpPageName() diff --git a/src/prefs/WarningsPrefs.h b/src/prefs/WarningsPrefs.h index 36e8e402d..6c47a8e9e 100644 --- a/src/prefs/WarningsPrefs.h +++ b/src/prefs/WarningsPrefs.h @@ -27,7 +27,7 @@ class WarningsPrefs final : public PrefsPanel WarningsPrefs(wxWindow * parent, wxWindowID winid); ~WarningsPrefs(); ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; bool Commit() override; wxString HelpPageName() override; diff --git a/src/prefs/WaveformPrefs.cpp b/src/prefs/WaveformPrefs.cpp index 26eec486d..c02b6c80e 100644 --- a/src/prefs/WaveformPrefs.cpp +++ b/src/prefs/WaveformPrefs.cpp @@ -59,9 +59,9 @@ ComponentInterfaceSymbol WaveformPrefs::GetSymbol() return WAVEFORM_PREFS_PLUGIN_SYMBOL; } -wxString WaveformPrefs::GetDescription() +TranslatableString WaveformPrefs::GetDescription() { - return _("Preferences for Waveforms"); + return XO("Preferences for Waveforms"); } wxString WaveformPrefs::HelpPageName() diff --git a/src/prefs/WaveformPrefs.h b/src/prefs/WaveformPrefs.h index b79f6122a..55177b241 100644 --- a/src/prefs/WaveformPrefs.h +++ b/src/prefs/WaveformPrefs.h @@ -30,7 +30,7 @@ public: WaveformPrefs(wxWindow * parent, wxWindowID winid, WaveTrack *wt); virtual ~WaveformPrefs(); ComponentInterfaceSymbol GetSymbol() override; - wxString GetDescription() override; + TranslatableString GetDescription() override; wxString HelpPageName() override; bool Commit() override;