Rewrite conditionally compiled Add/TieCheckBox calls

src/Screenshot.cpp

@@ -376,8 +376,8 @@ void ScreenshotBigDialog::PopulateOrExchange(ShuttleGui & S)
 
          S.StartHorizontalLay();
          {
-            mDelayCheckBox = S.Id(IdDelayCheckBox).AddCheckBox
+            mDelayCheckBox = S.Id(IdDelayCheckBox).AddCheckBox(
-               (XO("Wait 5 seconds and capture frontmost window/dialog"),
+               XO("Wait 5 seconds and capture frontmost window/dialog"),
                 false);
          }
          S.EndHorizontalLay();

src/effects/ScoreAlignDialog.cpp

@@ -120,12 +120,12 @@ ScoreAlignDialog::ScoreAlignDialog(ScoreAlignParams &params)
    mForceFinalAlignmentCheckBox = S.Id(ID_FORCEFINALALIGNMENT)
       .Name(XO("Force Final Alignment"))
       .AddCheckBox(
-                wxT("Force Final Alignment"),
+                XO("Force Final Alignment"),
                 p.mForceFinalAlignment);
    mIgnoreSilenceCheckBox = S.Id(ID_IGNORESILENCE)
       .Name(XO("Ignore Silence at Beginnings and Endings"))
       .AddCheckBox(
-         wxT("Ignore Silence at Beginnings and Endings"),
+         XO("Ignore Silence at Beginnings and Endings"),
          p.mIgnoreSilence );
    // need a third column after checkboxes:
    S.AddVariableText({}, true, wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);

src/import/ImportPCM.cpp

@@ -361,7 +361,7 @@ static wxString AskCopyOrEdit()
             XO("Read the files &directly from the original (faster)") );
 
          dontAskNextTimeBox = S.AddCheckBox(
-            _("Don't &warn again and always use my choice above"),
+            XO("Don't &warn again and always use my choice above"),
             wxT("false"));
       }
       S.EndStatic();

src/prefs/EffectsPrefs.cpp

@@ -220,10 +220,10 @@ void EffectsPrefs::PopulateOrExchange(ShuttleGui & S)
 #ifndef EXPERIMENTAL_EFFECT_MANAGEMENT
    S.StartStatic(XO("Plugin Options"));
    {
-      S.TieCheckBox(_("Check for updated plugins when Audacity starts"),
+      S.TieCheckBox(XO("Check for updated plugins when Audacity starts"),
                      wxT("/Plugins/CheckForUpdates"),
                      true);
-      S.TieCheckBox(_("Rescan plugins next time Audacity is started"),
+      S.TieCheckBox(XO("Rescan plugins next time Audacity is started"),
                      wxT("/Plugins/Rescan"),
                      false);
    }
@@ -233,7 +233,7 @@ void EffectsPrefs::PopulateOrExchange(ShuttleGui & S)
 #ifdef EXPERIMENTAL_EQ_SSE_THREADED
    S.StartStatic(XO("Instruction Set"));
    {
-      S.TieCheckBox(_("&Use SSE/SSE2/.../AVX"),
+      S.TieCheckBox(XO("&Use SSE/SSE2/.../AVX"),
                     wxT("/SSE/GUI"),
                     true);
    }

src/prefs/GUIPrefs.cpp

@@ -211,7 +211,7 @@ void GUIPrefs::PopulateOrExchange(ShuttleGui & S)
 //      S.AddSpace(10);
 // JKC: This is a silly preference.  Kept here as a reminder that we may
 // later want to have configurable button order.
-//      S.TieCheckBox(_("&Ergonomic order of Transport Toolbar buttons"),
+//      S.TieCheckBox(XO("&Ergonomic order of Transport Toolbar buttons"),
 //                    wxT("/GUI/ErgonomicTransportButtons"),
 //                    true);
 
@@ -230,7 +230,7 @@ void GUIPrefs::PopulateOrExchange(ShuttleGui & S)
 #ifdef EXPERIMENTAL_THEME_PREFS
       // We do not want to make this option mainstream.  It's a 
       // convenience for developers.
-      S.TieCheckBox(_("Show alternative &styling (Mac vs PC)"),
+      S.TieCheckBox(XO("Show alternative &styling (Mac vs PC)"),
                     {wxT("/GUI/ShowMac"),
                      false});
 #endif

src/prefs/RecordingPrefs.cpp

@@ -99,7 +99,7 @@ void RecordingPrefs::PopulateOrExchange(ShuttleGui & S)
 //#if defined(__WXMAC__)
 // Bug 388.  Feature not supported on any Mac Hardware.
 #if 0
-      S.TieCheckBox(_("Use &hardware to play other tracks"),
+      S.TieCheckBox(XO("Use &hardware to play other tracks"),
                     {wxT("/AudioIO/Playthrough"),
                      false});
 #endif

src/prefs/SpectrumPrefs.cpp

@@ -282,7 +282,7 @@ void SpectrumPrefs::PopulateOrExchange(ShuttleGui & S)
 #endif
 
 #ifdef EXPERIMENTAL_FFT_Y_GRID
-         S.TieCheckBox(_("Show a grid along the &Y-axis"),
+         S.TieCheckBox(XO("Show a grid along the &Y-axis"),
             mTempSettings.fftYGrid);
 #endif //EXPERIMENTAL_FFT_Y_GRID
 

src/prefs/TracksPrefs.cpp

@@ -279,7 +279,7 @@ void TracksPrefs::PopulateOrExchange(ShuttleGui & S)
                    false});
 #endif
 #ifdef SHOW_PINNED_UNPINNED_IN_PREFS
-      S.TieCheckBox(_("&Pinned Recording/Playback head"),
+      S.TieCheckBox(XO("&Pinned Recording/Playback head"),
          {PinnedHeadPreferenceKey(),
           PinnedHeadPreferenceDefault()});
 #endif

src/prefs/WarningsPrefs.cpp

@@ -88,7 +88,7 @@ void WarningsPrefs::PopulateOrExchange(ShuttleGui & S)
                     {wxT("/Warnings/MixUnknownChannels"),
                      true});
 #ifdef EXPERIMENTAL_OD_DATA
-      S.TieCheckBox(_("&Importing uncompressed audio files"),
+      S.TieCheckBox(XO("&Importing uncompressed audio files"),
                     {wxT("/Warnings/CopyOrEditUncompressedDataAsk"),
                      true});
 #endif