From 29ec921c8b621c6df435a6bbebcda98a74509941 Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@audacityteam.org>
Date: Thu, 5 Jul 2018 09:51:24 -0400
Subject: [PATCH] Revert parts of e1b6091 involving effects, for .cfg file
 compatibility

---
 src/effects/Distortion.cpp   | 20 ++++++++++----------
 src/effects/ScienFilter.cpp  |  4 ++--
 src/effects/ToneGen.cpp      |  2 +-
 src/effects/TruncSilence.cpp |  4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/effects/Distortion.cpp b/src/effects/Distortion.cpp
index 5993d2503..ef1a7fbd9 100644
--- a/src/effects/Distortion.cpp
+++ b/src/effects/Distortion.cpp
@@ -59,17 +59,17 @@ enum kTableType
 
 static const IdentInterfaceSymbol kTableTypeStrings[nTableTypes] =
 {
-   { 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("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") },
    { XO("Leveller") },
-   { wxT("RectifierDistortion"),        XO("Rectifier Distortion") },
-   { wxT("HardLimiter1413"),            XO("Hard Limiter 1413") }
+   { XO("Rectifier Distortion") },
+   { XO("Hard Limiter 1413") }
 };
 
 // Define keys, defaults, minimums, and maximums for the effect parameters
diff --git a/src/effects/ScienFilter.cpp b/src/effects/ScienFilter.cpp
index d04dde516..094d555d3 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.*/
-   { wxT("ChebyshevTypeI"), XO("Chebyshev Type I") },
+   { XO("Chebyshev Type I") },
    /*i18n-hint: Chebyshev is the name of the person after whom the filter type is named.*/
-   { wxT("ChebyshevTypeII"), XO("Chebyshev Type II") }
+   { XO("Chebyshev Type II") }
 };
 
 enum kSubTypes
diff --git a/src/effects/ToneGen.cpp b/src/effects/ToneGen.cpp
index 71db1c483..1a31a6019 100644
--- a/src/effects/ToneGen.cpp
+++ b/src/effects/ToneGen.cpp
@@ -60,7 +60,7 @@ static const IdentInterfaceSymbol kWaveStrings[nWaveforms] =
    { XO("Sine") },
    { XO("Square") },
    { XO("Sawtooth") },
-   { wxT("SquareNoAlias"), XO("Square, no alias") }
+   { 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 50237a356..da1be49ee 100644
--- a/src/effects/TruncSilence.cpp
+++ b/src/effects/TruncSilence.cpp
@@ -76,8 +76,8 @@ enum kActions
 
 static const IdentInterfaceSymbol kActionStrings[nActions] =
 {
-   { wxT("Truncate"), XO("Truncate Detected Silence") },
-   { wxT("Compress"), XO("Compress Excess Silence") }
+   { XO("Truncate Detected Silence") },
+   { XO("Compress Excess Silence") }
 };
 
 static CommandParameters::ObsoleteMap kObsoleteActions[] = {