From e1b60916b790ec05dd30089ace7039d94cac3fdb Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Tue, 27 Mar 2018 14:17:23 -0400 Subject: [PATCH 1/2] More consistent naming conventions for choice control items... ... This commit leaves at least a comment for all choice controls of all built-in effects and commands. Use CamelCase with no spaces for the internal identifiers, given in wxT("...") Use more idiomatic English with spaces in the user-visible names, given in XO("..."); these strings go to the message catalog for internationalization Do not use underscores In case these strings are the same, give it just once in XO("..."), but if in a future version it is decided to change the name in XO("..."), then the original should be kept also in a distinct wxT("...") string, so that saved configuration or plugin settings or macro files don't become gratuitously incompatible just because of that user-visible name change. Left TruncateSilence alone for now -- I think that choice demands a rewrite as a slider instead. --- src/commands/DragCommand.cpp | 6 +++--- src/commands/GetInfoCommand.cpp | 6 +++++- src/commands/ScreenshotCommand.cpp | 29 ++++++++++++++-------------- src/commands/SelectCommand.cpp | 10 ++++++---- src/commands/SetClipCommand.cpp | 8 ++++---- src/commands/SetTrackInfoCommand.cpp | 13 ++++++++----- src/effects/Distortion.cpp | 20 +++++++++---------- src/effects/Equalization.cpp | 2 ++ src/effects/Noise.cpp | 1 + src/effects/ScienFilter.cpp | 5 +++-- src/effects/ToneGen.cpp | 3 ++- src/effects/TruncSilence.cpp | 6 ++++-- 12 files changed, 63 insertions(+), 46 deletions(-) diff --git a/src/commands/DragCommand.cpp b/src/commands/DragCommand.cpp index 163aa267d..129e0a7b6 100644 --- a/src/commands/DragCommand.cpp +++ b/src/commands/DragCommand.cpp @@ -41,9 +41,9 @@ enum kCoordTypes static const IdentInterfaceSymbol kCoordTypeStrings[nCoordTypes] = { { XO("Panel") }, - { XO("App") }, - { XO("Track0") }, - { XO("Track1") }, + { wxT("App"), XO("Application") }, + { wxT("Track0"), XO("Track 0") }, + { wxT("Track1"), XO("Track 1") }, }; diff --git a/src/commands/GetInfoCommand.cpp b/src/commands/GetInfoCommand.cpp index 16bfc4594..8f6a60bd8 100644 --- a/src/commands/GetInfoCommand.cpp +++ b/src/commands/GetInfoCommand.cpp @@ -58,7 +58,7 @@ enum { static const IdentInterfaceSymbol kTypes[nTypes] = { { XO("Commands") }, - { XO("Commands+") }, + { wxT("CommandsPlus"), XO("Commands Plus") }, { XO("Menus") }, { XO("Preferences") }, { XO("Tracks") }, @@ -77,7 +77,11 @@ enum { static const IdentInterfaceSymbol kFormats[nFormats] = { + // These are acceptable dual purpose internal/visible names + + /* i18n-hint JavaScript Object Notation */ { XO("JSON") }, + /* i18n-hint name of a computer programming language */ { XO("LISP") }, { XO("Brief") } }; diff --git a/src/commands/ScreenshotCommand.cpp b/src/commands/ScreenshotCommand.cpp index 7843cd264..bdfed1c45 100644 --- a/src/commands/ScreenshotCommand.cpp +++ b/src/commands/ScreenshotCommand.cpp @@ -50,21 +50,21 @@ static const IdentInterfaceSymbol kCaptureWhatStrings[ ScreenshotCommand::nCaptureWhats ] = { { XO("Window") }, - { XO("Full_Window") }, - { XO("Window_Plus") }, + { wxT("FullWindow"), XO("Full Window") }, + { wxT("WindowPlus"), XO("Window Plus") }, { XO("Fullscreen") }, { XO("Toolbars") }, { XO("Effects") }, { XO("Scriptables") }, { XO("Preferences") }, { XO("Selectionbar") }, - { XO("Spectral_Selection") }, + { wxT("SpectralSelection"), XO("Spectral Selection") }, { XO("Tools") }, { XO("Transport") }, { XO("Mixer") }, { XO("Meter") }, - { XO("Play_Meter") }, - { XO("Record_Meter") }, + { wxT("PlayMeter"), XO("Play Meter") }, + { wxT("RecordMeter"), XO("Record Meter") }, { XO("Edit") }, { XO("Device") }, { XO("Scrub") }, @@ -72,21 +72,22 @@ kCaptureWhatStrings[ ScreenshotCommand::nCaptureWhats ] = { XO("Trackpanel") }, { XO("Ruler") }, { XO("Tracks") }, - { XO("First_Track") }, - { XO("First_Two_Tracks") }, - { XO("First_Three_Tracks") }, - { XO("First_Four_Tracks") }, - { XO("Second_Track") }, - { XO("Tracks_Plus") }, - { XO("First_Track_Plus") }, - { XO("All_Tracks") }, - { XO("All_Tracks_Plus") }, + { wxT("FirstTrack"), XO("First Track") }, + { wxT("FirstTwoTracks"), XO("First Two Tracks") }, + { wxT("FirstThreeTracks"), XO("First Three Tracks") }, + { wxT("FirstFourTracks"), XO("First Four Tracks") }, + { wxT("SecondTrack"), XO("Second Track") }, + { wxT("TracksPlus"), XO("Tracks Plus") }, + { wxT("FirstTrackPlus"), XO("First Track Plus") }, + { wxT("AllTracks"), XO("All Tracks") }, + { wxT("AllTracksPlus"), XO("All Tracks Plus") }, }; static const IdentInterfaceSymbol kBackgroundStrings[ ScreenshotCommand::nBackgrounds ] = { + // These are acceptable dual purpose internal/visible names { XO("Blue") }, { XO("White") }, { XO("None") }, diff --git a/src/commands/SelectCommand.cpp b/src/commands/SelectCommand.cpp index 414f5c59a..c44a49c20 100644 --- a/src/commands/SelectCommand.cpp +++ b/src/commands/SelectCommand.cpp @@ -46,12 +46,12 @@ explicitly code all three. const int nRelativeTos =6; static const IdentInterfaceSymbol kRelativeTo[nRelativeTos] = { - { XO("Project Start") }, + { wxT("ProjectStart"), XO("Project Start") }, { XO("Project") }, - { XO("Project End") }, - { XO("Selection Start") }, + { wxT("ProjectEnd"), XO("Project End") }, + { wxT("SelectionStart"), XO("Selection Start") }, { XO("Selection") }, - { XO("Selection End") } + { wxT("SelectionEnd"), XO("Selection End") } }; bool SelectTimeCommand::DefineParams( ShuttleParams & S ){ @@ -169,6 +169,8 @@ bool SelectFrequenciesCommand::Apply(const CommandContext & context){ const int nModes =3; static const IdentInterfaceSymbol kModes[nModes] = { + // These are acceptable dual purpose internal/visible names + /* i18n-hint verb, imperative */ { XO("Set") }, { XO("Add") }, diff --git a/src/commands/SetClipCommand.cpp b/src/commands/SetClipCommand.cpp index be6c3caba..c73fb9eea 100644 --- a/src/commands/SetClipCommand.cpp +++ b/src/commands/SetClipCommand.cpp @@ -40,10 +40,10 @@ enum kColours static const IdentInterfaceSymbol kColourStrings[nColours] = { - { XO("Color0") }, - { XO("Color1") }, - { XO("Color2") }, - { XO("Color3") }, + { wxT("Color0"), XO("Color 0") }, + { wxT("Color1"), XO("Color 1") }, + { wxT("Color2"), XO("Color 2") }, + { wxT("Color3"), XO("Color 3") }, }; diff --git a/src/commands/SetTrackInfoCommand.cpp b/src/commands/SetTrackInfoCommand.cpp index f2c4df7d4..b1974b46b 100644 --- a/src/commands/SetTrackInfoCommand.cpp +++ b/src/commands/SetTrackInfoCommand.cpp @@ -238,10 +238,10 @@ enum kColours static const IdentInterfaceSymbol kColourStrings[nColours] = { - { XO("Color0") }, - { XO("Color1") }, - { XO("Color2") }, - { XO("Color3") }, + { wxT("Color0"), XO("Color 0") }, + { wxT("Color1"), XO("Color 1") }, + { wxT("Color2"), XO("Color 2") }, + { wxT("Color3"), XO("Color 3") }, }; @@ -254,6 +254,7 @@ enum kDisplayTypes static const IdentInterfaceSymbol kDisplayTypeStrings[nDisplayTypes] = { + // These are acceptable dual purpose internal/visible names { XO("Waveform") }, { XO("Spectrogram") }, }; @@ -267,7 +268,9 @@ enum kScaleTypes static const IdentInterfaceSymbol kScaleTypeStrings[nScaleTypes] = { + // These are acceptable dual purpose internal/visible names { XO("Linear") }, + /* i18n-hint: abbreviates decibels */ { XO("dB") }, }; @@ -282,7 +285,7 @@ enum kZoomTypes static const IdentInterfaceSymbol kZoomTypeStrings[nZoomTypes] = { { XO("Reset") }, - { XO("Times2") }, + { wxT("Times2"), XO("Times 2") }, { XO("HalfWave") }, }; diff --git a/src/effects/Distortion.cpp b/src/effects/Distortion.cpp index 4e56be899..5e1a047ab 100644 --- a/src/effects/Distortion.cpp +++ b/src/effects/Distortion.cpp @@ -59,17 +59,17 @@ enum kTableType static const IdentInterfaceSymbol kTableTypeStrings[nTableTypes] = { - { XO("Hard Clipping") }, - { XO("Soft Clipping") }, - { XO("Soft Overdrive") }, - { XO("Medium Overdrive") }, - { XO("Hard Overdrive") }, - { XO("Cubic Curve (odd harmonics)") }, - { XO("Even Harmonics") }, - { XO("Expand and Compress") }, + { wxT("HardClipping"), XO("Hard Clipping") }, + { wxT("SoftClipping"), XO("Soft Clipping") }, + { wxT("SoftOverdrive"), XO("Soft Overdrive") }, + { wxT("MediumOverdrive"), XO("Medium Overdrive") }, + { wxT("HardOverdrive"), XO("Hard Overdrive") }, + { wxT("CubicCurveOddHarmonics"), XO("Cubic Curve (odd harmonics)") }, + { wxT("EvenHarmonics"), XO("Even Harmonics") }, + { wxT("ExpandCompress"), XO("Expand and Compress") }, { XO("Leveller") }, - { XO("Rectifier Distortion") }, - { XO("Hard Limiter 1413") } + { wxT("RectifierDistortion"), XO("Rectifier Distortion") }, + { wxT("HardLimiter1413"), XO("Hard Limiter 1413") } }; // Define keys, defaults, minimums, and maximums for the effect parameters diff --git a/src/effects/Equalization.cpp b/src/effects/Equalization.cpp index 1f190359b..55f6a5d54 100644 --- a/src/effects/Equalization.cpp +++ b/src/effects/Equalization.cpp @@ -146,6 +146,8 @@ enum kInterpolations static const IdentInterfaceSymbol kInterpStrings[nInterpolations] = { + // These are acceptable dual purpose internal/visible names + /* i18n-hint: Technical term for a kind of curve.*/ { XO("B-spline") }, { XO("Cosine") }, diff --git a/src/effects/Noise.cpp b/src/effects/Noise.cpp index 15752bba0..53978b043 100644 --- a/src/effects/Noise.cpp +++ b/src/effects/Noise.cpp @@ -37,6 +37,7 @@ enum kTypes static const IdentInterfaceSymbol kTypeStrings[nTypes] = { + // These are acceptable dual purpose internal/visible names { XO("White") }, { XO("Pink") }, { XO("Brownian") } diff --git a/src/effects/ScienFilter.cpp b/src/effects/ScienFilter.cpp index 276dbbeb0..78ee013d0 100644 --- a/src/effects/ScienFilter.cpp +++ b/src/effects/ScienFilter.cpp @@ -91,9 +91,9 @@ static const IdentInterfaceSymbol kTypeStrings[nTypes] = /*i18n-hint: Butterworth is the name of the person after whom the filter type is named.*/ { XO("Butterworth") }, /*i18n-hint: Chebyshev is the name of the person after whom the filter type is named.*/ - { XO("Chebyshev Type I") }, + { wxT("ChebyshevTypeI"), XO("Chebyshev Type I") }, /*i18n-hint: Chebyshev is the name of the person after whom the filter type is named.*/ - { XO("Chebyshev Type II") } + { wxT("ChebyshevTypeII"), XO("Chebyshev Type II") } }; enum kSubTypes @@ -105,6 +105,7 @@ enum kSubTypes static const IdentInterfaceSymbol kSubTypeStrings[nSubTypes] = { + // These are acceptable dual purpose internal/visible names { XO("Lowpass") }, { XO("Highpass") } }; diff --git a/src/effects/ToneGen.cpp b/src/effects/ToneGen.cpp index 8dc8fd63b..a78363b09 100644 --- a/src/effects/ToneGen.cpp +++ b/src/effects/ToneGen.cpp @@ -41,6 +41,7 @@ enum kInterpolations static const IdentInterfaceSymbol kInterStrings[nInterpolations] = { + // These are acceptable dual purpose internal/visible names { XO("Linear") }, { XO("Logarithmic") } }; @@ -59,7 +60,7 @@ static const IdentInterfaceSymbol kWaveStrings[nWaveforms] = { XO("Sine") }, { XO("Square") }, { XO("Sawtooth") }, - { XO("Square, no alias") } + { wxT("SquareNoAlias"), XO("Square, no alias") } }; // Define keys, defaults, minimums, and maximums for the effect parameters diff --git a/src/effects/TruncSilence.cpp b/src/effects/TruncSilence.cpp index c7e67332a..aa824bc73 100644 --- a/src/effects/TruncSilence.cpp +++ b/src/effects/TruncSilence.cpp @@ -42,6 +42,8 @@ public: }; const IdentInterfaceSymbol Enums::DbChoices[] = { + // Yuck, why is this a choice control and not a slider? I'm leaving this + // table of names alone for now -- PRL { wxT("-20 dB") }, { wxT("-25 dB") }, { wxT("-30 dB") }, @@ -79,8 +81,8 @@ enum kActions static const IdentInterfaceSymbol kActionStrings[nActions] = { - { XO("Truncate Detected Silence") }, - { XO("Compress Excess Silence") } + { wxT("Truncate"), XO("Truncate Detected Silence") }, + { wxT("Compress"), XO("Compress Excess Silence") } }; static CommandParameters::ObsoleteMap kObsoleteActions[] = { From 842025aeb3daefe9959966e228ef1673860a42b9 Mon Sep 17 00:00:00 2001 From: Paul Licameli Date: Tue, 27 Mar 2018 14:47:47 -0400 Subject: [PATCH 2/2] Naming conventions for Nyquist choice controls too... ... see previous commit comment. Also some i18n-hints --- plug-ins/adjustable-fade.ny | 33 ++++++++++++++++++++++++--------- plug-ins/crossfadetracks.ny | 13 +++++++++++-- plug-ins/delay.ny | 16 +++++++++++++--- plug-ins/equalabel.ny | 21 ++++++++++++++++----- plug-ins/highpass.ny | 8 +++++++- plug-ins/limiter.ny | 13 +++++++++++-- plug-ins/lowpass.ny | 8 +++++++- plug-ins/pluck.ny | 5 ++++- plug-ins/rhythmtrack.ny | 14 ++++++++++++-- plug-ins/sample-data-export.ny | 31 ++++++++++++++++++++----------- plug-ins/sample-data-import.ny | 5 ++++- plug-ins/tremolo.ny | 8 +++++++- plug-ins/vocalrediso.ny | 17 +++++++++-------- plug-ins/vocalremover.ny | 8 ++++---- plug-ins/vocoder.ny | 5 ++++- 15 files changed, 153 insertions(+), 52 deletions(-) diff --git a/plug-ins/adjustable-fade.ny b/plug-ins/adjustable-fade.ny index c99aa8e8a..77c9ca14f 100644 --- a/plug-ins/adjustable-fade.ny +++ b/plug-ins/adjustable-fade.ny @@ -18,19 +18,34 @@ $copyright (_ "Released under terms of the GNU General Public License version 2" ;; For information about writing and modifying Nyquist plug-ins: ;; https://wiki.audacityteam.org/wiki/Nyquist_Plug-ins_Reference -$control type (_ "Fade Type") choice ((_ "Fade Up") (_ "Fade Down") (_ "S-Curve Up") (_ "S-Curve Down")) 0 +$control type (_ "Fade Type") choice ( + ("Up" (_ "Fade Up")) + ("Down" (_ "Fade Down")) + ("SCurveUp" (_ "S-Curve Up")) + ("SCurveDown" (_ "S-Curve Down")) +) 0 $control curve (_ "Mid-fade Adjust (%)") real "" 0 -100 100 -$control units (_ "Start/End as") choice ((_ "% of Original") (_ "dB Gain")) 0 +$control units (_ "Start/End as") choice ( + ("Percent" (_ "% of Original")) + ("dB" (_ "dB Gain")) +) 0 $control gain0 (_ "Start (or end)") float-text "" 0 nil nil $control gain1 (_ "End (or start)") float-text "" 100 nil nil $control preset (_ "Handy Presets (override controls)") choice ( - (_ "None Selected") - (_ "Linear In") (_ "Linear Out") - (_ "Exponential In") (_ "Exponential Out") - (_ "Logarithmic In") (_ "Logarithmic Out") - (_ "Rounded In") (_ "Rounded Out") - (_ "Cosine In") (_ "Cosine Out") - (_ "S-Curve In") (_ "S-Curve Out")) 0 + ("None" (_ "None Selected")) + ("LinearIn" (_ "Linear In")) + ("LinearOut" (_ "Linear Out")) + ("ExponentialIn" (_ "Exponential In")) + ("ExponentialOut" (_ "Exponential Out")) + ("LogarithmicIn" (_ "Logarithmic In")) + ("LogarithmicOut" (_ "Logarithmic Out")) + ("RoundedIn" (_ "Rounded In")) + ("RoundedOut" (_ "Rounded Out")) + ("CosineIn" (_ "Cosine In")) + ("CosineOut" (_ "Cosine Out")) + ("SCurveIn" (_ "S-Curve In")) + ("SCurveOut" (_ "S-Curve Out")) +) 0 (defun get-input (sig) diff --git a/plug-ins/crossfadetracks.ny b/plug-ins/crossfadetracks.ny index 332b2fca9..3bae8bbf0 100644 --- a/plug-ins/crossfadetracks.ny +++ b/plug-ins/crossfadetracks.ny @@ -17,9 +17,18 @@ $copyright (_ "Released under terms of the GNU General Public License version 2" ;; For information about writing and modifying Nyquist plug-ins: ;; https://wiki.audacityteam.org/wiki/Nyquist_Plug-ins_Reference -$control type (_ "Fade type") choice ((_ "Constant Gain") (_ "Constant Power 1") (_ "Constant Power 2") (_ "Custom Curve")) 0 +$control type (_ "Fade type") choice ( + ("ConstantGain" (_ "Constant Gain")) + ("ConstantPower1" (_ "Constant Power 1")) + ("ConstantPower2" (_ "Constant Power 2")) + ("CustomCurve" (_ "Custom Curve")) +) 0 $control curve (_ "Custom curve") real "" 0 0 1 -$control direction (_ "Fade direction") choice ((_ "Automatic") (_ "Alternating Out / In") (_ "Alternating In / Out")) 0 +$control direction (_ "Fade direction") choice ( + (_ "Automatic") + ("OutIn" (_ "Alternating Out / In")) + ("InOut" (_ "Alternating In / Out")) +) 0 (defun crossfade (type dir curve) diff --git a/plug-ins/delay.ny b/plug-ins/delay.ny index a00359578..1e60219aa 100644 --- a/plug-ins/delay.ny +++ b/plug-ins/delay.ny @@ -17,13 +17,23 @@ $copyright (_ "Released under terms of the GNU General Public License version 2" ;; For information about writing and modifying Nyquist plug-ins: ;; https://wiki.audacityteam.org/wiki/Nyquist_Plug-ins_Reference -$control delay-type (_ "Delay type") choice ((_ "regular") (_ "bouncing ball") (_ "reverse bouncing ball")) 0 +$control delay-type (_ "Delay type") choice ( + (_ "Regular") + ("BouncingBall" (_ "Bouncing Ball")) + ("ReverseBouncingBall" (_ "Reverse Bouncing Ball")) +) 0 $control dgain (_ "Delay level per echo (dB)") real "" -6 -30 1 $control delay (_ "Delay time (seconds)") real "" 0.3 0 5 -$control pitch-type (_ "Pitch change effect") choice ((_ "Pitch/Tempo") (_ "LQ Pitch Shift")) 0 +$control pitch-type (_ "Pitch change effect") choice ( + ("PitchTempo" (_ "Pitch/Tempo")) + ("LQPitchShift" (_ "Low-quality Pitch Shift")) +) 0 $control shift (_ "Pitch change per echo (semitones)") real "" 0 -2 2 $control number (_ "Number of echoes") int "" 5 1 30 -$control constrain (_ "Allow duration to change") choice ((_ "Yes") (_ "No")) 0 +$control constrain (_ "Allow duration to change") choice ( + (_ "Yes") + (_ "No") +) 0 ;; The default pitch shift effect is a simple resampling, diff --git a/plug-ins/equalabel.ny b/plug-ins/equalabel.ny index 64f1f714e..cb0a58287 100644 --- a/plug-ins/equalabel.ny +++ b/plug-ins/equalabel.ny @@ -19,15 +19,26 @@ $copyright (_ "Released under terms of the GNU General Public License version 2" ;; https://wiki.audacityteam.org/wiki/Nyquist_Plug-ins_Reference -$control mode (_ "Use 'Number of labels' OR 'Label interval'") choice ((_ "Number of labels") (_ "Label interval")) 0 +$control mode (_ "Use 'Number of labels' OR 'Label interval'") choice ( + ("Number" (_ "Number of Labels")) + ("Interval" (_ "Label Interval")) +) 0 $control totalnum (_ "Number of labels") int-text "" 10 1 1000 $control interval (_ "Label interval (seconds)") float-text "" 60 0.001 3600 -$control adjust (_ "Adjust label interval to fit length") choice ((_ "No") (_ "Yes")) 0 +$control adjust (_ "Adjust label interval to fit length") choice ( + (_ "No") + (_ "Yes") +) 0 $control labeltext (_ "Label text") string "" (_ "Label") $control zeros (_ "Minimum number of digits in label") choice ( - (_ "None - text only") - (_ "1 (before label)") (_ "2 (before label)") (_ "3 (before label)") - (_ "1 (after label)") (_ "2 (after label)") (_ "3 (after label)")) 2 + ("TextOnly" (_ "None - Text Only")) + ("OneBefore" (_ "1 (Before Label)")) + ("TwoBefore" (_ "2 (Before Label)")) + ("ThreeBefore" (_ "3 (Before Label)")) + ("OneAfter" (_ "1 (After Label)")) + ("TwoAfter" (_ "2 (After Label)")) + ("ThreeAfter" (_ "3 (After Label)")) +) 2 $control firstnum (_ "Begin numbering from") int-text "" 1 0 nil diff --git a/plug-ins/highpass.ny b/plug-ins/highpass.ny index c720c7ce4..ccf6b4d6e 100644 --- a/plug-ins/highpass.ny +++ b/plug-ins/highpass.ny @@ -19,7 +19,13 @@ $copyright (_ "Released under terms of the GNU General Public License version 2" $control frequency (_ "Frequency (Hz)") float-text "" 1000 0 nil -$control rolloff (_ "Rolloff (dB per octave)") choice ((_ "6 dB") (_ "12 dB") (_ "24 dB") (_ "36 dB") (_ "48 dB")) 0 +$control rolloff (_ "Rolloff (dB per octave)") choice ( + ("dB6" (_ "6 dB")) + ("dB12" (_ "12 dB")) + ("dB24" (_ "24 dB")) + ("dB36" (_ "36 dB")) + ("dB48" (_ "48 dB")) + ) 0 (cond diff --git a/plug-ins/limiter.ny b/plug-ins/limiter.ny index e22ec0341..224b0025b 100644 --- a/plug-ins/limiter.ny +++ b/plug-ins/limiter.ny @@ -17,14 +17,23 @@ $copyright (_ "Released under terms of the GNU General Public License version 2" ;; For information about writing and modifying Nyquist plug-ins: ;; https://wiki.audacityteam.org/wiki/Nyquist_Plug-ins_Reference -$control type (_ "Type") choice ((_ "Soft Limit") (_ "Hard Limit") (_ "Soft Clip") (_ "Hard Clip")) 0 +$control type (_ "Type") choice ( + ("SoftLimit" (_ "Soft Limit")) + ("HardLimit" (_ "Hard Limit")) + ;i18n-hint: clipping of wave peaks and troughs, not division of a track into clips + ("SoftClip" (_ "Soft Clip")) + ("HardClip" (_ "Hard Clip")) +) 0 $control gain-L (_ "Input Gain (dB) mono/Left") real "" 0 0 10 $control gain-R (_ "Input Gain (dB) Right channel") real "" 0 0 10 $control thresh (_ "Limit to (dB)") real "" -3 -10 0 $control hold (_ "Hold (ms)") real "" 10 1 50 -$control makeup (_ "Apply Make-up Gain") choice ((_ "No") (_ "Yes")) 0 +$control makeup (_ "Apply Make-up Gain") choice ( + (_ "No") + (_ "Yes") +) 0 (if (not (boundp 'type)) (setf type 0)) diff --git a/plug-ins/lowpass.ny b/plug-ins/lowpass.ny index f218874eb..fd8e01661 100644 --- a/plug-ins/lowpass.ny +++ b/plug-ins/lowpass.ny @@ -19,7 +19,13 @@ $copyright (_ "Released under terms of the GNU General Public License version 2" $control frequency (_ "Frequency (Hz)") float-text "" 1000 0 nil -$control rolloff (_ "Rolloff (dB per octave)") choice ((_ "6 dB") (_ "12 dB") (_ "24 dB") (_ "36 dB") (_ "48 dB")) 0 +$control rolloff (_ "Rolloff (dB per octave)") choice ( + ("dB6" (_ "6 dB")) + ("dB12" (_ "12 dB")) + ("dB24" (_ "24 dB")) + ("dB36" (_ "36 dB")) + ("dB48" (_ "48 dB")) +) 0 (cond diff --git a/plug-ins/pluck.ny b/plug-ins/pluck.ny index 0562baede..9fdd18bae 100644 --- a/plug-ins/pluck.ny +++ b/plug-ins/pluck.ny @@ -30,7 +30,10 @@ $copyright (_ "Released under terms of the GNU General Public License version 2" $control pitch (_ "Pluck MIDI pitch") int "" 60 1 120 -$control fade (_ "Fade-out type") choice ((_ "abrupt") (_ "gradual")) 0 +$control fade (_ "Fade-out type") choice ( + (_ "Abrupt") + (_ "Gradual") +) 0 $control dur (_ "Duration [seconds]") real "" 1 0.1 30 diff --git a/plug-ins/rhythmtrack.ny b/plug-ins/rhythmtrack.ny index 6866c4e9b..88649ba63 100644 --- a/plug-ins/rhythmtrack.ny +++ b/plug-ins/rhythmtrack.ny @@ -18,7 +18,11 @@ $copyright (_ "Released under terms of the GNU General Public License version 2" ;; https://wiki.audacityteam.org/wiki/Nyquist_Plug-ins_Reference -$control action (_ "Action choice") choice ((_ "Generate track") (_ "Help screen 1") (_ "Help screen 2")) 0 +$control action (_ "Action choice") choice ( + ("Generate" (_ "Generate Track")) + ("Help1" (_ "Help Screen 1")) + ("Help2" (_ "Help Screen 2")) +) 0 $control tempo (_ "Tempo (beats per minute)") real (_ "30 - 300 beats/minute") 120 30 300 $control timesig (_ "Beats per measure (bar)") int (_ "1 - 20 beats/measure") 4 1 20 $control swing (_ "Swing amount") float (_ "+/- 1") 0 -1 1 @@ -29,7 +33,13 @@ $control click-track-dur (_ "Optional rhythm track duration (minutes seconds)") $control offset (_ "Start time offset (seconds)") real (_ "0 - 30 seconds") 0 0 30 $control click-type (_ "Beat sound") choice ( - (_ "Metronome tick") (_ "Ping") (_ "Cowbell") (_ "Resonant noise") (_ "Noise click") (_ "Drip")) 0 + ("Metronome" (_ "Metronome Tick")) + (_ "Ping") + (_ "Cowbell") + ("ResonantNoise" (_ "Resonant Noise")) + ("NoiseClick" (_ "Noise Click")) + (_ "Drip") +) 0 ;;control q "Noise click resonance - discernable pitch (q)" int "1 - 20" 1 1 20 diff --git a/plug-ins/sample-data-export.ny b/plug-ins/sample-data-export.ny index e3fe2ef07..997ec827a 100644 --- a/plug-ins/sample-data-export.ny +++ b/plug-ins/sample-data-export.ny @@ -19,13 +19,17 @@ $copyright (_ "Released under terms of the GNU General Public License version 2" $control number (_ "Limit output to first") string (_ "samples") "100" -$control units (_ "Measurement scale") choice ((_ "dB") (_ "Linear")) 0 +$control units (_ "Measurement scale") choice ( + (_ "dB") + (_ "Linear") +) 0 $control fileformat (_ "File data format") choice ( - (_ "Sample List (txt)") - (_ "Indexed List (txt)") - (_ "Time Indexed (txt)") - (_ "Data (csv)") - (_ "Web Page (html)") + ("SampleList" (_ "Sample List (txt)")) + ("IndexedList" (_ "Indexed List (txt)")) + ("TimeIndexed" (_ "Time Indexed (txt)")) + ;i18n-hint: "comma separated values" + ("CSV" (_ "Data (csv)")) + ("Web" (_ "Web Page (html)")) ) 0 $control header (_ "Include header information") choice ( (_ "None") @@ -35,18 +39,23 @@ $control header (_ "Include header information") choice ( ) 2 $control optext (_ "Optional header text") string "" $control chan (_ "Channel layout for stereo") choice ( - (_ "L-R on Same Line") - (_ "Alternate Lines") - (_ "L Channel First") + ;i18n-hint: Left and Right + ("SameLine" (_ "L-R on Same Line")) + ("Alternate" (_ "Alternate Lines")) + ;i18n-hint: L for Left + ("LFirst" (_ "L Channel First")) ) 0 $control messages (_ "Show messages") choice ( (_ "Yes") - (_ "Errors Only") + ("Errors" (_ "Errors Only")) (_ "None") ) 0 $control filename (_ "File name") string "" (_ "sample-data") $control path (_ "Output folder") string "" (_ "Home directory") -$control owrite (_ "Allow files to be overwritten") choice ((_ "No") (_ "Yes")) 0 +$control owrite (_ "Allow files to be overwritten") choice ( + (_ "No") + (_ "Yes") +) 0 ;; To enable L/R prefix before alternate L/R channels diff --git a/plug-ins/sample-data-import.ny b/plug-ins/sample-data-import.ny index f242d6054..212f596da 100644 --- a/plug-ins/sample-data-import.ny +++ b/plug-ins/sample-data-import.ny @@ -94,7 +94,10 @@ $copyright (_ "Released under terms of the GNU General Public License version 2" $control filename (_ "File name") string "" "sample-data.txt" $control path (_ "File location (path to file)") string "" "Home directory" -$control bad-data (_ "Invalid data handling") choice ((_ "Throw error") (_ "Read as zero")) 0 +$control bad-data (_ "Invalid data handling") choice ( + ("ThrowError" (_ "Throw Error")) + ("ReadAsZero" (_ "Read as Zero")) +) 0 ;; home directory diff --git a/plug-ins/tremolo.ny b/plug-ins/tremolo.ny index 2f5248ad8..49add9e43 100644 --- a/plug-ins/tremolo.ny +++ b/plug-ins/tremolo.ny @@ -18,7 +18,13 @@ $copyright (_ "Released under terms of the GNU General Public License version 2" ;; For information about writing and modifying Nyquist plug-ins: ;; https://wiki.audacityteam.org/wiki/Nyquist_Plug-ins_Reference -$control wave (_ "Waveform type") choice ((_ "sine") (_ "triangle") (_ "sawtooth") (_ "inverse sawtooth") (_ "square")) 0 +$control wave (_ "Waveform type") choice ( + (_ "Sine") + (_ "Triangle") + (_ "Sawtooth") + ("InverseSawtooth" (_ "Inverse Sawtooth")) + (_ "Square") +) 0 $control phase (_ "Starting phase (degrees)") int "" 0 -180 180 $control wet (_ "Wet level (percent)") int "" 40 1 100 $control lfo (_ "Frequency (Hz)") float-text "" 4 0.001 1000 diff --git a/plug-ins/vocalrediso.ny b/plug-ins/vocalrediso.ny index d27a1a3b6..147b8e6dd 100644 --- a/plug-ins/vocalrediso.ny +++ b/plug-ins/vocalrediso.ny @@ -20,14 +20,15 @@ $copyright (_ "Released under terms of the GNU General Public License version 2" ;; https://wiki.audacityteam.org/wiki/Nyquist_Plug-ins_Reference $control action (_ "Action") choice ( - (_ "Remove Vocals") - (_ "Isolate Vocals") - (_ "Isolate Vocals and Invert") - (_ "Remove Center") - (_ "Isolate Center") - (_ "Isolate Center and Invert") - (_ "Remove Center Classic: Mono") - (_ "Analyze")) 0 + ("Remove" (_ "Remove Vocals")) + ("Isolate" (_ "Isolate Vocals")) + ("IsolateInvert" (_ "Isolate Vocals and Invert")) + ("RemoveCenter" (_ "Remove Center")) + ("IsolateCenter" (_ "Isolate Center")) + ("IsolateCenterInvert" (_ "Isolate Center and Invert")) + ("RemoveCenter" (_ "Remove Center Classic: Mono")) + (_ "Analyze") +) 0 $control strength (_ "Strength") real "" 1.0 0.0 50.0 $control low-transition (_ "Low Cut for Vocals (Hz)") real "" 120 1 24000 $control high-transition (_ "High Cut for Vocals (Hz)") real "" 9000 1 24000 diff --git a/plug-ins/vocalremover.ny b/plug-ins/vocalremover.ny index dab2d602d..ce095fbc8 100644 --- a/plug-ins/vocalremover.ny +++ b/plug-ins/vocalremover.ny @@ -23,13 +23,13 @@ $copyright (_ "Released under terms of the GNU General Public License version 2" ;; https://wiki.audacityteam.org/wiki/Nyquist_Plug-ins_Reference $control action (_ "Remove vocals or view Help") choice ( - (_ "Remove vocals") + (_ "Remove Vocals") (_ "View Help") ) 0 $control band-choice (_ "Removal choice") choice ( - (_ "Simple (entire spectrum)") - (_ "Remove frequency band") - (_ "Retain frequency band") + ("Simple" (_ "Simple (Entire Spectrum)")) + ("Remove" (_ "Remove Frequency Band")) + ("Retain" (_ "Retain Frequency Band")) ) 0 $control low-range (_ "Frequency band from (Hz)") float-text "" 500 0 nil $control high-range (_ "Frequency band to (Hz)") float-text "" 2000 0 nil diff --git a/plug-ins/vocoder.ny b/plug-ins/vocoder.ny index 6a73f95af..363f80a5f 100644 --- a/plug-ins/vocoder.ny +++ b/plug-ins/vocoder.ny @@ -21,7 +21,10 @@ $copyright (_ "Released under terms of the GNU General Public License version 2" ;; https://wiki.audacityteam.org/wiki/Nyquist_Plug-ins_Reference $control dst (_ "Distance: (1 to 120, default = 20)") real "" 20 1 120 -$control mst (_ "Output choice") choice ((_ "both channels") (_ "right only")) 0 +$control mst (_ "Output choice") choice ( + ("BothChannels" (_ "Both Channels")) + ("RightOnly" (_ "Right Only")) +) 0 $control bands (_ "Number of vocoder bands") int "" 40 10 240 $control track-vl (_ "Amplitude of original audio (percent)") real "" 100 0 100 $control noise-vl (_ "Amplitude of white noise (percent)") real "" 0 0 100