diff --git a/lib-src/mod-null/ModNullCallback.cpp b/lib-src/mod-null/ModNullCallback.cpp
index abac88a90..a05908ff7 100644
--- a/lib-src/mod-null/ModNullCallback.cpp
+++ b/lib-src/mod-null/ModNullCallback.cpp
@@ -146,12 +146,12 @@ void RegisterMenuItems()
       ( FinderScope( ident ), Section( wxT("NullModule"),
          Command(
             _T("A New Command"), // internal name
-            XO("1st Experimental Command..."), //displayed name
+            XXO("1st Experimental Command..."), //displayed name
             ModNullFN( OnFuncFirst ),
             AudioIONotBusyFlag() ),
          Command(
             _T("Another New Command"),
-            XO("2nd Experimental Command"),
+            XXO("2nd Experimental Command"),
             ModNullFN( OnFuncSecond ),
             AudioIONotBusyFlag() )
       ) )
diff --git a/lib-src/mod-nyq-bench/NyqBench.cpp b/lib-src/mod-nyq-bench/NyqBench.cpp
index d21397279..de20244b0 100755
--- a/lib-src/mod-nyq-bench/NyqBench.cpp
+++ b/lib-src/mod-nyq-bench/NyqBench.cpp
@@ -152,7 +152,7 @@ void RegisterMenuItems()
    using namespace MenuTable;
    static AttachedItem sAttachment{ wxT("Tools"),
       ( FinderScope( findme ), Section( wxT("NyquistWorkBench"),
-         Command( wxT("NyqBench"), XO("&Nyquist Workbench..."),
+         Command( wxT("NyqBench"), XXO("&Nyquist Workbench..."),
             static_cast<CommandFunctorPointer>(&NyqBench::ShowNyqBench),
             AudioIONotBusyFlag())
       ) )
diff --git a/src/AboutDialog.cpp b/src/AboutDialog.cpp
index cb0c06946..20dca1132 100644
--- a/src/AboutDialog.cpp
+++ b/src/AboutDialog.cpp
@@ -300,7 +300,7 @@ AboutDialog::AboutDialog(wxWindow * parent)
 
    S.Id(wxID_OK)
       .Prop(0)
-      .AddButton(XO("OK"), wxALIGN_CENTER, true);
+      .AddButton(XXO("OK"), wxALIGN_CENTER, true);
 
    Fit();
    this->Centre();
diff --git a/src/AudacityLogger.cpp b/src/AudacityLogger.cpp
index 6f83cd2b7..a9417f5d3 100644
--- a/src/AudacityLogger.cpp
+++ b/src/AudacityLogger.cpp
@@ -167,9 +167,9 @@ void AudacityLogger::Show(bool show)
          S.StartHorizontalLay(wxALIGN_CENTER, 0);
          {
             S.AddSpace(10, 0);
-            S.Id(LoggerID_Save).AddButton(XO("&Save..."));
-            S.Id(LoggerID_Clear).AddButton(XO("Cl&ear"));
-            S.Id(LoggerID_Close).AddButton(XO("&Close"));
+            S.Id(LoggerID_Save).AddButton(XXO("&Save..."));
+            S.Id(LoggerID_Clear).AddButton(XXO("Cl&ear"));
+            S.Id(LoggerID_Close).AddButton(XXO("&Close"));
             S.AddSpace(10, 0);
          }
          S.EndHorizontalLay();
diff --git a/src/AutoRecoveryDialog.cpp b/src/AutoRecoveryDialog.cpp
index 029135b32..c925e221b 100644
--- a/src/AutoRecoveryDialog.cpp
+++ b/src/AutoRecoveryDialog.cpp
@@ -88,9 +88,9 @@ void AutoRecoveryDialog::PopulateOrExchange(ShuttleGui& S)
 
       S.StartHorizontalLay();
       {
-         S.Id(ID_QUIT_AUDACITY).AddButton(XO("Quit Audacity"));
-         S.Id(ID_RECOVER_NONE).AddButton(XO("Discard Projects"));
-         S.Id(ID_RECOVER_ALL).AddButton(XO("Recover Projects"));
+         S.Id(ID_QUIT_AUDACITY).AddButton(XXO("Quit Audacity"));
+         S.Id(ID_RECOVER_NONE).AddButton(XXO("Discard Projects"));
+         S.Id(ID_RECOVER_ALL).AddButton(XXO("Recover Projects"));
       }
       S.EndHorizontalLay();
    }
diff --git a/src/BatchCommandDialog.cpp b/src/BatchCommandDialog.cpp
index f6fa6be36..07f23e354 100644
--- a/src/BatchCommandDialog.cpp
+++ b/src/BatchCommandDialog.cpp
@@ -88,23 +88,23 @@ void MacroCommandDialog::PopulateOrExchange(ShuttleGui &S)
       S.StartMultiColumn(4, wxEXPAND);
       {
          S.SetStretchyCol(1);
-         mCommand = S.AddTextBox(XO("&Command"), wxT(""), 20);
+         mCommand = S.AddTextBox(XXO("&Command"), wxT(""), 20);
          mCommand->SetEditable(false);
          mEditParams = S.Id(EditParamsButtonID)
             .Disable() // disable button as box is empty
-            .AddButton(XO("&Edit Parameters"));
+            .AddButton(XXO("&Edit Parameters"));
          mUsePreset = S.Id(UsePresetButtonID)
             .Disable() // disable button as box is empty
-            .AddButton(XO("&Use Preset"));
+            .AddButton(XXO("&Use Preset"));
       }
       S.EndMultiColumn();
 
       S.StartMultiColumn(2, wxEXPAND);
       {
          S.SetStretchyCol(1);
-         mParameters = S.AddTextBox(XO("&Parameters"), wxT(""), 0);
+         mParameters = S.AddTextBox(XXO("&Parameters"), wxT(""), 0);
          mParameters->SetEditable(false);
-         auto prompt = XO("&Details");
+         auto prompt = XXO("&Details");
          S.Prop(0).AddPrompt(prompt);
          mDetails = S
             .Name( prompt )
diff --git a/src/BatchProcessDialog.cpp b/src/BatchProcessDialog.cpp
index 23c6b98a1..e35ae1531 100644
--- a/src/BatchProcessDialog.cpp
+++ b/src/BatchProcessDialog.cpp
@@ -147,10 +147,10 @@ void ApplyMacroDialog::PopulateOrExchange(ShuttleGui &S)
 
    S.StartHorizontalLay(wxEXPAND, 0);
    {
-      S.AddPrompt( XO("Apply Macro to:") );
+      S.AddPrompt( XXO("Apply Macro to:") );
       wxButton* btn = S.Id(ApplyToProjectID)
          .Name(XO("Apply macro to project"))
-         .AddButton(XO("&Project"));
+         .AddButton(XXO("&Project"));
 #if wxUSE_ACCESSIBILITY
       // so that name can be set on a standard control
       btn->SetAccessible(safenew WindowAccessible(btn));
@@ -158,7 +158,7 @@ void ApplyMacroDialog::PopulateOrExchange(ShuttleGui &S)
 
       btn = S.Id(ApplyToFilesID)
          .Name(XO("Apply macro to files..."))
-         .AddButton(XO("&Files..."));
+         .AddButton(XXO("&Files..."));
 #if wxUSE_ACCESSIBILITY
       // so that name can be set on a standard control
       btn->SetAccessible(safenew WindowAccessible(btn));
@@ -169,7 +169,7 @@ void ApplyMacroDialog::PopulateOrExchange(ShuttleGui &S)
    S.StartHorizontalLay(wxEXPAND, 0);
    {
       /* i18n-hint: The Expand button makes the dialog bigger, with more in it */
-      mResize = S.Id(ExpandID).AddButton(XO("&Expand"));
+      mResize = S.Id(ExpandID).AddButton(XXO("&Expand"));
       S.Prop(1).AddSpace( 10 );
       S.AddStandardButtons( eCancelButton | eHelpButton);
    }
@@ -388,7 +388,7 @@ void ApplyMacroDialog::OnApplyToFiles(wxCommandEvent & WXUNUSED(event))
 
       S.StartHorizontalLay(wxCENTER, false);
       {
-         S.Id(wxID_CANCEL).AddButton(XO("&Cancel"));
+         S.Id(wxID_CANCEL).AddButton(XXO("&Cancel"));
       }
       S.EndHorizontalLay();
    }
@@ -594,10 +594,10 @@ void MacrosWindow::PopulateOrExchange(ShuttleGui & S)
               .AddListControlReportMode( { XO("Macro") } );
             S.StartVerticalLay(wxALIGN_TOP, 0);
             {
-               S.Id(AddButtonID).AddButton(XO("&New"));
-               mRemove = S.Id(RemoveButtonID).AddButton(XO("Remo&ve"));
-               mRename = S.Id(RenameButtonID).AddButton(XO("&Rename..."));
-               mRestore = S.Id(RestoreButtonID).AddButton(XO("Re&store"));
+               S.Id(AddButtonID).AddButton(XXO("&New"));
+               mRemove = S.Id(RemoveButtonID).AddButton(XXO("Remo&ve"));
+               mRename = S.Id(RenameButtonID).AddButton(XXO("&Rename..."));
+               mRestore = S.Id(RestoreButtonID).AddButton(XXO("Re&store"));
 // Not yet ready for prime time.
 #if 0
                S.Id(ImportButtonID)
@@ -631,11 +631,11 @@ void MacrosWindow::PopulateOrExchange(ShuttleGui & S)
 
             S.StartVerticalLay(wxALIGN_TOP, 0);
             {
-               S.Id(InsertButtonID).AddButton(XO("&Insert"), wxALIGN_LEFT);
-               S.Id(EditButtonID).AddButton(XO("&Edit..."), wxALIGN_LEFT);
-               S.Id(DeleteButtonID).AddButton(XO("De&lete"), wxALIGN_LEFT);
-               S.Id(UpButtonID).AddButton(XO("Move &Up"), wxALIGN_LEFT);
-               S.Id(DownButtonID).AddButton(XO("Move &Down"), wxALIGN_LEFT);
+               S.Id(InsertButtonID).AddButton(XXO("&Insert"), wxALIGN_LEFT);
+               S.Id(EditButtonID).AddButton(XXO("&Edit..."), wxALIGN_LEFT);
+               S.Id(DeleteButtonID).AddButton(XXO("De&lete"), wxALIGN_LEFT);
+               S.Id(UpButtonID).AddButton(XXO("Move &Up"), wxALIGN_LEFT);
+               S.Id(DownButtonID).AddButton(XXO("Move &Down"), wxALIGN_LEFT);
             }
             S.EndVerticalLay();
          }
@@ -648,13 +648,13 @@ void MacrosWindow::PopulateOrExchange(ShuttleGui & S)
    S.StartHorizontalLay(wxEXPAND, 0);
    {  
       /* i18n-hint: The Shrink button makes the dialog smaller, with less in it */
-      mResize = S.Id(ShrinkID).AddButton(XO("Shrin&k"));
+      mResize = S.Id(ShrinkID).AddButton(XXO("Shrin&k"));
       // Using variable text just to get the positioning options.
       S.Prop(0).AddVariableText(
          XO("Apply Macro to:"), false, wxALL | wxALIGN_CENTRE_VERTICAL );
       wxButton* btn = S.Id(ApplyToProjectID)
          .Name(XO("Apply macro to project"))
-         .AddButton(XO("&Project"));
+         .AddButton(XXO("&Project"));
 #if wxUSE_ACCESSIBILITY
       // so that name can be set on a standard control
       btn->SetAccessible(safenew WindowAccessible(btn));
@@ -662,7 +662,7 @@ void MacrosWindow::PopulateOrExchange(ShuttleGui & S)
 
       btn = S.Id(ApplyToFilesID)
          .Name(XO("Apply macro to files..."))
-         .AddButton(XO("&Files..."));
+         .AddButton(XXO("&Files..."));
 #if wxUSE_ACCESSIBILITY
       // so that name can be set on a standard control
       btn->SetAccessible(safenew WindowAccessible(btn));
diff --git a/src/Benchmark.cpp b/src/Benchmark.cpp
index 37dcde801..6b405bf80 100644
--- a/src/Benchmark.cpp
+++ b/src/Benchmark.cpp
@@ -178,21 +178,21 @@ void BenchmarkDialog::MakeBenchmarkDialog()
          //
          S.Id(BlockSizeID)
             .Validator<wxTextValidator>(wxFILTER_NUMERIC, &mBlockSizeStr)
-            .AddTextBox(XO("Disk Block Size (KB):"),
+            .AddTextBox(XXO("Disk Block Size (KB):"),
                                              wxT(""),
                                              12);
 
          //
          S.Id(NumEditsID)
             .Validator<wxTextValidator>(wxFILTER_NUMERIC, &mNumEditsStr)
-            .AddTextBox(XO("Number of Edits:"),
+            .AddTextBox(XXO("Number of Edits:"),
                                             wxT(""),
                                             12);
 
          //
          S.Id(DataSizeID)
             .Validator<wxTextValidator>(wxFILTER_NUMERIC, &mDataSizeStr)
-            .AddTextBox(XO("Test Data Size (MB):"),
+            .AddTextBox(XXO("Test Data Size (MB):"),
                                             wxT(""),
                                             12);
 
@@ -201,7 +201,7 @@ void BenchmarkDialog::MakeBenchmarkDialog()
             .Validator<wxTextValidator>(wxFILTER_NUMERIC, &mRandSeedStr)
             /* i18n-hint: A "seed" is a number that initializes a
                pseudorandom number generating algorithm */
-            .AddTextBox(XO("Random Seed:"),
+            .AddTextBox(XXO("Random Seed:"),
                                             wxT(""),
                                             12);
 
@@ -210,12 +210,12 @@ void BenchmarkDialog::MakeBenchmarkDialog()
 
       //
       S.Validator<wxGenericValidator>(&mBlockDetail)
-         .AddCheckBox(XO("Show detailed info about each block file"),
+         .AddCheckBox(XXO("Show detailed info about each block file"),
                            false);
 
       //
       S.Validator<wxGenericValidator>(&mEditDetail)
-         .AddCheckBox(XO("Show detailed info about each editing operation"),
+         .AddCheckBox(XXO("Show detailed info about each editing operation"),
                            false);
 
       //
@@ -232,10 +232,10 @@ void BenchmarkDialog::MakeBenchmarkDialog()
       {
          S.StartHorizontalLay(wxALIGN_LEFT, false);
          {
-            S.Id(RunID).AddButton(XO("Run"), wxALIGN_CENTRE, true);
-            S.Id(BSaveID).AddButton(XO("Save"));
+            S.Id(RunID).AddButton(XXO("Run"), wxALIGN_CENTRE, true);
+            S.Id(BSaveID).AddButton(XXO("Save"));
             /* i18n-hint verb; to empty or erase */
-            S.Id(ClearID).AddButton(XO("Clear"));
+            S.Id(ClearID).AddButton(XXO("Clear"));
          }
          S.EndHorizontalLay();
 
@@ -248,7 +248,7 @@ void BenchmarkDialog::MakeBenchmarkDialog()
          S.StartHorizontalLay(wxALIGN_NOT | wxALIGN_LEFT, false);
          {
             /* i18n-hint verb */
-            S.Id(wxID_CANCEL).AddButton(XO("Close"));
+            S.Id(wxID_CANCEL).AddButton(XXO("Close"));
          }
          S.EndHorizontalLay();
       }
diff --git a/src/Dependencies.cpp b/src/Dependencies.cpp
index 4859d269d..cdbbcd314 100644
--- a/src/Dependencies.cpp
+++ b/src/Dependencies.cpp
@@ -365,7 +365,7 @@ void DependencyDialog::PopulateOrExchange(ShuttleGui& S)
                .Focus()
                .Disable(mFileListCtrl->GetSelectedItemCount() <= 0)
                .AddButton(
-                  XO("Copy Selected Files"),
+                  XXO("Copy Selected Files"),
                   wxALIGN_LEFT, true);
       }
       S.EndStatic();
@@ -373,18 +373,18 @@ void DependencyDialog::PopulateOrExchange(ShuttleGui& S)
       S.StartHorizontalLay(wxALIGN_CENTRE,0);
       {
          if (mIsSaving) {
-            S.Id(wxID_CANCEL).AddButton(XO("Cancel Save"));
-            S.Id(wxID_NO).AddButton(XO("Save Without Copying"));
+            S.Id(wxID_CANCEL).AddButton(XXO("Cancel Save"));
+            S.Id(wxID_NO).AddButton(XXO("Save Without Copying"));
          }
          else
-            S.Id(wxID_NO).AddButton(XO("Do Not Copy"));
+            S.Id(wxID_NO).AddButton(XXO("Do Not Copy"));
 
          mCopyAllFilesButton =
             S.Id(wxID_YES)
                // Enabling mCopyAllFilesButton is also done in PopulateList,
                // but at its call above, mCopyAllFilesButton does not yet exist.
                .Disable(mHasMissingFiles)
-               .AddButton(XO("Copy All Files (Safer)"));
+               .AddButton(XXO("Copy All Files (Safer)"));
 
       }
       S.EndHorizontalLay();
@@ -395,7 +395,7 @@ void DependencyDialog::PopulateOrExchange(ShuttleGui& S)
          {
             mFutureActionChoice =
                S.Id(FutureActionChoiceID).AddChoice(
-                  XO("Whenever a project depends on other files:"),
+                  XXO("Whenever a project depends on other files:"),
                   {
                      /*i18n-hint: One of the choices of what you want Audacity to do when
                      * Audacity finds a project depends on another file.*/
diff --git a/src/FFmpeg.cpp b/src/FFmpeg.cpp
index 6ed242a04..0f227d976 100644
--- a/src/FFmpeg.cpp
+++ b/src/FFmpeg.cpp
@@ -497,10 +497,10 @@ public:
             else {
                mPathText = S.AddTextBox( {}, mLibPath.GetFullPath(), 0);
             }
-            S.Id(ID_FFMPEG_BROWSE).AddButton(XO("Browse..."), wxALIGN_RIGHT);
+            S.Id(ID_FFMPEG_BROWSE).AddButton(XXO("Browse..."), wxALIGN_RIGHT);
             S.AddVariableText(
                XO("To get a free copy of FFmpeg, click here -->"), true);
-            S.Id(ID_FFMPEG_DLOAD).AddButton(XO("Download"), wxALIGN_RIGHT);
+            S.Id(ID_FFMPEG_DLOAD).AddButton(XXO("Download"), wxALIGN_RIGHT);
          }
          S.EndMultiColumn();
 
@@ -593,7 +593,7 @@ to download or locate the FFmpeg libraries."
       ));
 
       mDontShow = S
-         .AddCheckBox(XO("Do not show this warning again"),
+         .AddCheckBox(XXO("Do not show this warning again"),
             gPrefs->ReadBool(wxT("/FFmpeg/NotFoundDontShow"), false) );
 
       S.AddStandardButtons(eOkButton);
diff --git a/src/FileFormats.cpp b/src/FileFormats.cpp
index b51522bbb..453054828 100644
--- a/src/FileFormats.cpp
+++ b/src/FileFormats.cpp
@@ -343,11 +343,11 @@ ChoiceSetting FileFormatsCopyOrEditSetting{
    {
       EnumValueSymbol{
          wxT("copy"),
-         XO("&Copy uncompressed files into the project (safer)")
+         XXO("&Copy uncompressed files into the project (safer)")
       },
       EnumValueSymbol{
          wxT("edit"),
-         XO("&Read uncompressed files from original location (faster)")
+         XXO("&Read uncompressed files from original location (faster)")
       },
    },
    0 // copy
@@ -356,9 +356,9 @@ ChoiceSetting FileFormatsCopyOrEditSetting{
 ChoiceSetting FileFormatsSaveWithDependenciesSetting{
    wxT("/FileFormats/SaveProjectWithDependencies"),
    {
-      { wxT("copy"), XO("&Copy all audio into project (safest)") },
-      { wxT("never"), XO("Do &not copy any audio") },
-      { wxT("ask"), XO("As&k") },
+      { wxT("copy"), XXO("&Copy all audio into project (safest)") },
+      { wxT("never"), XXO("Do &not copy any audio") },
+      { wxT("ask"), XXO("As&k") },
    },
    2 // ask
 };
diff --git a/src/FreqWindow.cpp b/src/FreqWindow.cpp
index 2917c63b4..5d53ca3ae 100644
--- a/src/FreqWindow.cpp
+++ b/src/FreqWindow.cpp
@@ -403,18 +403,18 @@ FrequencyPlotDialog::FrequencyPlotDialog(wxWindow * parent, wxWindowID id,
          S.SetStretchyCol(1);
          S.SetStretchyCol(3);
          {
-            S.AddPrompt(XO("Cursor:"));
+            S.AddPrompt(XXO("Cursor:"));
 
             mCursorText = S.Style(wxTE_READONLY)
                .AddTextBox( {}, wxT(""), 10);
 
-            S.AddPrompt(XO("Peak:"));
+            S.AddPrompt(XXO("Peak:"));
 
             mPeakText = S.Style(wxTE_READONLY)
                .AddTextBox( {}, wxT(""), 10);
             S.AddSpace(5);
 
-            mGridOnOff = S.Id(GridOnOffID).AddCheckBox(XO("&Grids"), mDrawGrid);
+            mGridOnOff = S.Id(GridOnOffID).AddCheckBox(XXO("&Grids"), mDrawGrid);
          }
          S.EndMultiColumn();
       }
@@ -442,17 +442,17 @@ FrequencyPlotDialog::FrequencyPlotDialog(wxWindow * parent, wxWindowID id,
 
       mAlgChoice = S.Id(FreqAlgChoiceID).Focus()
          .MinSize( { wxDefaultCoord, wxDefaultCoord } )
-         .AddChoice(XO("&Algorithm:"), algChoices, mAlg);
+         .AddChoice(XXO("&Algorithm:"), algChoices, mAlg);
 
       S.AddSpace(5);
 
       mSizeChoice = S.Id(FreqSizeChoiceID)
          .MinSize( { wxDefaultCoord, wxDefaultCoord } )
-         .AddChoice(XO("&Size:"), sizeChoices, mSize);
+         .AddChoice(XXO("&Size:"), sizeChoices, mSize);
 
       S.AddSpace(5);
 
-      mExportButton = S.Id(FreqExportButtonID).AddButton(XO("&Export..."));
+      mExportButton = S.Id(FreqExportButtonID).AddButton(XXO("&Export..."));
 
       S.AddSpace(5);
 
@@ -465,19 +465,19 @@ FrequencyPlotDialog::FrequencyPlotDialog(wxWindow * parent, wxWindowID id,
 
       mFuncChoice = S.Id(FreqFuncChoiceID)
          .MinSize( { wxDefaultCoord, wxDefaultCoord } )
-         .AddChoice(XO("&Function:"), funcChoices, mFunc);
+         .AddChoice(XXO("&Function:"), funcChoices, mFunc);
       mFuncChoice->MoveAfterInTabOrder(mSizeChoice);
 
       S.AddSpace(5);
 
       mAxisChoice = S.Id(FreqAxisChoiceID)
          .MinSize( { wxDefaultCoord, wxDefaultCoord } )
-         .AddChoice(XO("&Axis:"), axisChoices, mAxis);
+         .AddChoice(XXO("&Axis:"), axisChoices, mAxis);
       mAxisChoice->MoveAfterInTabOrder(mFuncChoice);
 
       S.AddSpace(5);
 
-      mReplotButton = S.Id(ReplotButtonID).AddButton(XO("&Replot..."));
+      mReplotButton = S.Id(ReplotButtonID).AddButton(XXO("&Replot..."));
 
       S.AddSpace(5);
 
diff --git a/src/HistoryWindow.cpp b/src/HistoryWindow.cpp
index 9090ae744..4251ad9c5 100644
--- a/src/HistoryWindow.cpp
+++ b/src/HistoryWindow.cpp
@@ -100,15 +100,15 @@ HistoryDialog::HistoryDialog(AudacityProject *parent, UndoManager *manager):
          {
             mTotal = S.Id(ID_TOTAL)
                .ConnectRoot(wxEVT_KEY_DOWN, &HistoryDialog::OnChar)
-               .AddTextBox(XO("&Total space used"), wxT("0"), 10);
+               .AddTextBox(XXO("&Total space used"), wxT("0"), 10);
             S.AddVariableText( {} )->Hide();
 
             mAvail = S.Id(ID_AVAIL)
                .ConnectRoot(wxEVT_KEY_DOWN, &HistoryDialog::OnChar)
-               .AddTextBox(XO("&Undo levels available"), wxT("0"), 10);
+               .AddTextBox(XXO("&Undo levels available"), wxT("0"), 10);
             S.AddVariableText( {} )->Hide();
 
-            S.AddPrompt(XO("&Levels to discard"));
+            S.AddPrompt(XXO("&Levels to discard"));
             mLevels = safenew wxSpinCtrl(S.GetParent(),
                                      ID_LEVELS,
                                      wxT("1"),
@@ -120,12 +120,12 @@ HistoryDialog::HistoryDialog(AudacityProject *parent, UndoManager *manager):
                                      0);
             S.AddWindow(mLevels);
             /* i18n-hint: (verb)*/
-            mDiscard = S.Id(ID_DISCARD).AddButton(XO("&Discard"));
+            mDiscard = S.Id(ID_DISCARD).AddButton(XXO("&Discard"));
 
             mClipboard = S
                .ConnectRoot(wxEVT_KEY_DOWN, &HistoryDialog::OnChar)
-               .AddTextBox(XO("Clipboard space used"), wxT("0"), 10);
-            S.Id(ID_DISCARD_CLIPBOARD).AddButton(XO("Discard"));
+               .AddTextBox(XXO("Clipboard space used"), wxT("0"), 10);
+            S.Id(ID_DISCARD_CLIPBOARD).AddButton(XXO("Discard"));
          }
          S.EndMultiColumn();
       }
@@ -134,7 +134,7 @@ HistoryDialog::HistoryDialog(AudacityProject *parent, UndoManager *manager):
       S.StartHorizontalLay(wxALIGN_RIGHT, false);
       {
          S.SetBorder(10);
-         S.Id(wxID_OK).AddButton(XO("&OK"), wxALIGN_CENTER, true);
+         S.Id(wxID_OK).AddButton(XXO("&OK"), wxALIGN_CENTER, true);
       }
       S.EndHorizontalLay();
    }
diff --git a/src/Internat.h b/src/Internat.h
index 5986ef32f..4547fda93 100644
--- a/src/Internat.h
+++ b/src/Internat.h
@@ -29,9 +29,13 @@ extern AUDACITY_DLL_API const wxString& GetCustomSubstitution(const wxString& st
 #define _TS( s ) GetCustomSubstitution( s )
 
 // Marks strings for extraction only... use .Translate() to translate.
+// '&', preceding menu accelerators, should NOT occur in the argument.
 #define XO(s)  (TranslatableString{ wxT(s), {} })
-// XXO is used instead of XO in some places, for reasons that are
-// no longer important.  The two are equivalent now.
+
+// Marks strings for extraction only, where '&', preceding men accelerators, MAY
+// occur.
+// For now, expands eactly as macro XO does, but in future there will be a
+// type distinction.
 #define XXO(s)  XO(s)
 
 #ifdef _
diff --git a/src/LabelDialog.cpp b/src/LabelDialog.cpp
index 3af8b81ef..53703af44 100644
--- a/src/LabelDialog.cpp
+++ b/src/LabelDialog.cpp
@@ -264,11 +264,11 @@ void LabelDialog::PopulateOrExchange( ShuttleGui & S )
       S.StartVerticalLay(0);
       {
          //S.Id(ID_INSERTA).AddButton(XO("&Insert"), wxALIGN_LEFT);
-         S.Id(ID_INSERTB).AddButton(XO("&Insert"), wxALIGN_LEFT);
+         S.Id(ID_INSERTB).AddButton(XXO("&Insert"), wxALIGN_LEFT);
          //S.Id(EditButtonID).AddButton(XO("&Edit"), wxALIGN_LEFT);
-         S.Id(ID_REMOVE).AddButton(XO("De&lete"), wxALIGN_LEFT);
-         S.Id(ID_IMPORT).AddButton(XO("I&mport..."), wxALIGN_LEFT);
-         S.Id(ID_EXPORT).AddButton(XO("&Export..."), wxALIGN_LEFT);
+         S.Id(ID_REMOVE).AddButton(XXO("De&lete"), wxALIGN_LEFT);
+         S.Id(ID_IMPORT).AddButton(XXO("I&mport..."), wxALIGN_LEFT);
+         S.Id(ID_EXPORT).AddButton(XXO("&Export..."), wxALIGN_LEFT);
       }
       S.EndVerticalLay();
    }
diff --git a/src/LangChoice.cpp b/src/LangChoice.cpp
index 47880d90f..7d6de010d 100644
--- a/src/LangChoice.cpp
+++ b/src/LangChoice.cpp
@@ -86,7 +86,7 @@ LangChoiceDialog::LangChoiceDialog(wxWindow * parent,
       S.StartHorizontalLay();
       {
          S.SetBorder(15);
-         mChoice = S.AddChoice(XO("Choose Language for Audacity to use:"),
+         mChoice = S.AddChoice(XXO("Choose Language for Audacity to use:"),
             mLangNames,
             lang);
       }
diff --git a/src/Menus.cpp b/src/Menus.cpp
index 661b146c3..3b865afcd 100644
--- a/src/Menus.cpp
+++ b/src/Menus.cpp
@@ -1242,25 +1242,27 @@ void MenuManager::ModifyUndoMenuItems(AudacityProject &project)
    if (undoManager.UndoAvailable()) {
       undoManager.GetShortDescription(cur, &desc);
       commandManager.Modify(wxT("Undo"),
-                             XO("&Undo %s").Format( desc ));
+         XXO("&Undo %s")
+            .Format( desc ));
       commandManager.Enable(wxT("Undo"),
          ProjectHistory::Get( project ).UndoAvailable());
    }
    else {
       commandManager.Modify(wxT("Undo"),
-                            XO("&Undo"));
+                            XXO("&Undo"));
    }
 
    if (undoManager.RedoAvailable()) {
       undoManager.GetShortDescription(cur+1, &desc);
       commandManager.Modify(wxT("Redo"),
-                             XO("&Redo %s").Format( desc));
+         XXO("&Redo %s")
+            .Format( desc ));
       commandManager.Enable(wxT("Redo"),
          ProjectHistory::Get( project ).RedoAvailable());
    }
    else {
       commandManager.Modify(wxT("Redo"),
-                            XO("&Redo"));
+                            XXO("&Redo"));
       commandManager.Enable(wxT("Redo"), false);
    }
 }
diff --git a/src/PluginManager.cpp b/src/PluginManager.cpp
index d8232dbeb..a05e2842d 100644
--- a/src/PluginManager.cpp
+++ b/src/PluginManager.cpp
@@ -519,7 +519,7 @@ void PluginRegistrationDialog::PopulateOrExchange(ShuttleGui &S)
          {
             S.StartHorizontalLay(wxALIGN_LEFT, 0);
             {
-               S.AddPrompt(XO("Select effects, click the Enable or Disable button, then click OK."));
+               S.AddPrompt(XXO("Select effects, click the Enable or Disable button, then click OK."));
             }
             S.EndHorizontalLay();
 
@@ -534,12 +534,12 @@ void PluginRegistrationDialog::PopulateOrExchange(ShuttleGui &S)
                wxRadioButton *rb;
 
                /* i18n-hint: This is before radio buttons selecting which effects to show */
-               S.AddPrompt(XO("Show:"));
+               S.AddPrompt(XXO("Show:"));
                rb = S.Id(ID_ShowAll)
                   /* i18n-hint: Radio button to show all effects */
                   .Name(XO("Show all"))
                   /* i18n-hint: Radio button to show all effects */
-                  .AddRadioButton(XO("&All"));
+                  .AddRadioButton(XXO("&All"));
 #if wxUSE_ACCESSIBILITY
                // so that name can be set on a standard control
                rb->SetAccessible(safenew WindowAccessible(rb));
@@ -549,7 +549,7 @@ void PluginRegistrationDialog::PopulateOrExchange(ShuttleGui &S)
                   /* i18n-hint: Radio button to show just the currently disabled effects */
                   .Name(XO("Show disabled"))
                   /* i18n-hint: Radio button to show just the currently disabled effects */
-                  .AddRadioButtonToGroup(XO("D&isabled"));
+                  .AddRadioButtonToGroup(XXO("D&isabled"));
 #if wxUSE_ACCESSIBILITY
                // so that name can be set on a standard control
                rb->SetAccessible(safenew WindowAccessible(rb));
@@ -559,7 +559,7 @@ void PluginRegistrationDialog::PopulateOrExchange(ShuttleGui &S)
                   /* i18n-hint: Radio button to show just the currently enabled effects */
                   .Name(XO("Show enabled"))
                   /* i18n-hint: Radio button to show just the currently enabled effects */
-                  .AddRadioButtonToGroup(XO("E&nabled"));
+                  .AddRadioButtonToGroup(XXO("E&nabled"));
 #if wxUSE_ACCESSIBILITY
                // so that name can be set on a standard control
                rb->SetAccessible(safenew WindowAccessible(rb));
@@ -569,7 +569,7 @@ void PluginRegistrationDialog::PopulateOrExchange(ShuttleGui &S)
                   /* i18n-hint: Radio button to show just the newly discovered effects */
                   .Name(XO("Show new"))
                   /* i18n-hint: Radio button to show just the newly discovered effects */
-                  .AddRadioButtonToGroup(XO("Ne&w"));
+                  .AddRadioButtonToGroup(XXO("Ne&w"));
 #if wxUSE_ACCESSIBILITY
                // so that name can be set on a standard control
                rb->SetAccessible(safenew WindowAccessible(rb));
@@ -590,8 +590,8 @@ void PluginRegistrationDialog::PopulateOrExchange(ShuttleGui &S)
 
          S.StartHorizontalLay(wxALIGN_LEFT | wxEXPAND, 0);
          {
-            S.Id(ID_SelectAll).AddButton(XO("&Select All"));
-            S.Id(ID_ClearAll).AddButton(XO("C&lear All"));
+            S.Id(ID_SelectAll).AddButton(XXO("&Select All"));
+            S.Id(ID_ClearAll).AddButton(XXO("C&lear All"));
 
             S.StartHorizontalLay(wxALIGN_CENTER);
             {
@@ -599,8 +599,8 @@ void PluginRegistrationDialog::PopulateOrExchange(ShuttleGui &S)
             }
             S.EndHorizontalLay();
 
-            S.Id(ID_Enable).AddButton(XO("&Enable"));
-            S.Id(ID_Disable).AddButton(XO("&Disable"));
+            S.Id(ID_Enable).AddButton(XXO("&Enable"));
+            S.Id(ID_Disable).AddButton(XXO("&Disable"));
          }
          S.EndHorizontalLay();
       }
diff --git a/src/ProjectAudioManager.cpp b/src/ProjectAudioManager.cpp
index 8c7e2677d..e96070c01 100644
--- a/src/ProjectAudioManager.cpp
+++ b/src/ProjectAudioManager.cpp
@@ -900,7 +900,7 @@ You are saving directly to a slow external storage device\n\
 "
          ),
          false,
-         XO("Turn off dropout detection"));
+         XXO("Turn off dropout detection"));
       }
 
       auto &history = ProjectHistory::Get( project );
diff --git a/src/Screenshot.cpp b/src/Screenshot.cpp
index 86ed8bf34..41efe52cd 100644
--- a/src/Screenshot.cpp
+++ b/src/Screenshot.cpp
@@ -346,11 +346,11 @@ void ScreenshotBigDialog::PopulateOrExchange(ShuttleGui & S)
 
             mDirectoryTextBox =
             S.Id(IdDirectory).AddTextBox(
-               XO("Save images to:"),
+               XXO("Save images to:"),
                gPrefs->Read(wxT("/ScreenshotPath"), wxFileName::GetHomeDir()),
                30
             );
-            S.Id(IdDirChoose).AddButton(XO("Choose..."));
+            S.Id(IdDirChoose).AddButton(XXO("Choose..."));
          }
          S.EndMultiColumn();
       }
@@ -360,8 +360,8 @@ void ScreenshotBigDialog::PopulateOrExchange(ShuttleGui & S)
       {
          S.StartHorizontalLay();
          {
-            S.Id(IdMainWindowSmall).AddButton(XO("Resize Small"));
-            S.Id(IdMainWindowLarge).AddButton(XO("Resize Large"));
+            S.Id(IdMainWindowSmall).AddButton(XXO("Resize Small"));
+            S.Id(IdMainWindowLarge).AddButton(XXO("Resize Large"));
             mBlue = safenew wxToggleButton(S.GetParent(),
                                        IdToggleBackgroundBlue,
             /* i18n-hint: Bkgnd is short for background and appears on a small button
@@ -379,22 +379,22 @@ void ScreenshotBigDialog::PopulateOrExchange(ShuttleGui & S)
 
          S.StartHorizontalLay();
          {
-            S.Id(IdCaptureWindowContents).AddButton(XO("Capture Window Only"));
-            S.Id(IdCaptureFullWindow).AddButton(XO("Capture Full Window"));
-            S.Id(IdCaptureWindowPlus).AddButton(XO("Capture Window Plus"));
+            S.Id(IdCaptureWindowContents).AddButton(XXO("Capture Window Only"));
+            S.Id(IdCaptureFullWindow).AddButton(XXO("Capture Full Window"));
+            S.Id(IdCaptureWindowPlus).AddButton(XXO("Capture Window Plus"));
          }
          S.EndHorizontalLay();
 
          S.StartHorizontalLay();
          {
-            S.Id(IdCaptureFullScreen).AddButton(XO("Capture Full Screen"));
+            S.Id(IdCaptureFullScreen).AddButton(XXO("Capture Full Screen"));
          }
          S.EndHorizontalLay();
 
          S.StartHorizontalLay();
          {
             mDelayCheckBox = S.Id(IdDelayCheckBox).AddCheckBox(
-               XO("Wait 5 seconds and capture frontmost window/dialog"),
+               XXO("Wait 5 seconds and capture frontmost window/dialog"),
                 false);
          }
          S.EndHorizontalLay();
@@ -405,48 +405,48 @@ void ScreenshotBigDialog::PopulateOrExchange(ShuttleGui & S)
       {
          S.StartHorizontalLay();
          {
-            S.Id(IdCaptureToolbars).AddButton(XO("All Toolbars"));
-            S.Id(IdCaptureEffects).AddButton(XO("All Effects"));
-            S.Id(IdCaptureScriptables).AddButton(XO("All Scriptables"));
-            S.Id(IdCapturePreferences).AddButton(XO("All Preferences"));
+            S.Id(IdCaptureToolbars).AddButton(XXO("All Toolbars"));
+            S.Id(IdCaptureEffects).AddButton(XXO("All Effects"));
+            S.Id(IdCaptureScriptables).AddButton(XXO("All Scriptables"));
+            S.Id(IdCapturePreferences).AddButton(XXO("All Preferences"));
          }
          S.EndHorizontalLay();
 
          S.StartHorizontalLay();
          {
-            S.Id(IdCaptureSelectionBar).AddButton(XO("SelectionBar"));
-            S.Id(IdCaptureSpectralSelection).AddButton(XO("Spectral Selection"));
-            S.Id(IdCaptureTimer).AddButton(XO("Timer"));
-            S.Id(IdCaptureTools).AddButton(XO("Tools"));
-            S.Id(IdCaptureTransport).AddButton(XO("Transport"));
+            S.Id(IdCaptureSelectionBar).AddButton(XXO("SelectionBar"));
+            S.Id(IdCaptureSpectralSelection).AddButton(XXO("Spectral Selection"));
+            S.Id(IdCaptureTimer).AddButton(XXO("Timer"));
+            S.Id(IdCaptureTools).AddButton(XXO("Tools"));
+            S.Id(IdCaptureTransport).AddButton(XXO("Transport"));
          }
          S.EndHorizontalLay();
 
          S.StartHorizontalLay();
          {
-            S.Id(IdCaptureMixer).AddButton(XO("Mixer"));
-            S.Id(IdCaptureMeter).AddButton(XO("Meter"));
-            S.Id(IdCapturePlayMeter).AddButton(XO("Play Meter"));
-            S.Id(IdCaptureRecordMeter).AddButton(XO("Record Meter"));
+            S.Id(IdCaptureMixer).AddButton(XXO("Mixer"));
+            S.Id(IdCaptureMeter).AddButton(XXO("Meter"));
+            S.Id(IdCapturePlayMeter).AddButton(XXO("Play Meter"));
+            S.Id(IdCaptureRecordMeter).AddButton(XXO("Record Meter"));
          }
          S.EndHorizontalLay();
 
          S.StartHorizontalLay();
          {
-            S.Id(IdCaptureEdit).AddButton(XO("Edit"));
-            S.Id(IdCaptureDevice).AddButton(XO("Device"));
-            S.Id(IdCaptureTranscription).AddButton(XO("Play-at-Speed"));
-            S.Id(IdCaptureScrub).AddButton(XO("Scrub"));
+            S.Id(IdCaptureEdit).AddButton(XXO("Edit"));
+            S.Id(IdCaptureDevice).AddButton(XXO("Device"));
+            S.Id(IdCaptureTranscription).AddButton(XXO("Play-at-Speed"));
+            S.Id(IdCaptureScrub).AddButton(XXO("Scrub"));
          }
          S.EndHorizontalLay();
 
          S.StartHorizontalLay();
          {
-            S.Id(IdCaptureTrackPanel).AddButton(XO("Track Panel"));
-            S.Id(IdCaptureRuler).AddButton(XO("Ruler"));
-            S.Id(IdCaptureTracks).AddButton(XO("Tracks"));
-            S.Id(IdCaptureFirstTrack).AddButton(XO("First Track"));
-            S.Id(IdCaptureSecondTrack).AddButton(XO("Second Track"));
+            S.Id(IdCaptureTrackPanel).AddButton(XXO("Track Panel"));
+            S.Id(IdCaptureRuler).AddButton(XXO("Ruler"));
+            S.Id(IdCaptureTracks).AddButton(XXO("Tracks"));
+            S.Id(IdCaptureFirstTrack).AddButton(XXO("First Track"));
+            S.Id(IdCaptureSecondTrack).AddButton(XXO("Second Track"));
          }
          S.EndHorizontalLay();
       }
@@ -456,19 +456,19 @@ void ScreenshotBigDialog::PopulateOrExchange(ShuttleGui & S)
       {
          S.StartHorizontalLay();
          {
-            S.Id(IdOneSec).AddButton(XO("One Sec"));
-            S.Id(IdTenSec).AddButton(XO("Ten Sec"));
-            S.Id(IdOneMin).AddButton(XO("One Min"));
-            S.Id(IdFiveMin).AddButton(XO("Five Min"));
-            S.Id(IdOneHour).AddButton(XO("One Hour"));
+            S.Id(IdOneSec).AddButton(XXO("One Sec"));
+            S.Id(IdTenSec).AddButton(XXO("Ten Sec"));
+            S.Id(IdOneMin).AddButton(XXO("One Min"));
+            S.Id(IdFiveMin).AddButton(XXO("Five Min"));
+            S.Id(IdOneHour).AddButton(XXO("One Hour"));
          }
          S.EndHorizontalLay();
 
          S.StartHorizontalLay();
          {
-            S.Id(IdShortTracks).AddButton(XO("Short Tracks"));
-            S.Id(IdMedTracks).AddButton(XO("Medium Tracks"));
-            S.Id(IdTallTracks).AddButton(XO("Tall Tracks"));
+            S.Id(IdShortTracks).AddButton(XXO("Short Tracks"));
+            S.Id(IdMedTracks).AddButton(XXO("Medium Tracks"));
+            S.Id(IdTallTracks).AddButton(XXO("Tall Tracks"));
          }
          S.EndHorizontalLay();
       }
diff --git a/src/SoundActivatedRecord.cpp b/src/SoundActivatedRecord.cpp
index 5b1c45405..bfd1fbd46 100644
--- a/src/SoundActivatedRecord.cpp
+++ b/src/SoundActivatedRecord.cpp
@@ -54,7 +54,7 @@ void SoundActivatedRecordDialog::PopulateOrExchange(ShuttleGui & S)
       S.StartMultiColumn(2, wxEXPAND);
       S.SetStretchyCol(1);
       S.TieSlider(
-         XO("Activation level (dB):"),
+         XXO("Activation level (dB):"),
          {wxT("/AudioIO/SilenceLevel"), -50},
          0, -gPrefs->Read(ENV_DB_KEY, ENV_DB_RANGE)
       );
diff --git a/src/SplashDialog.cpp b/src/SplashDialog.cpp
index 018fc8886..356da3ecd 100644
--- a/src/SplashDialog.cpp
+++ b/src/SplashDialog.cpp
@@ -142,12 +142,12 @@ void SplashDialog::Populate( ShuttleGui & S )
    S.SetStretchyCol( 1 );// Column 1 is stretchy...
    {
       S.SetBorder( 5 );
-      S.Id( DontShowID).AddCheckBox( XO("Don't show this again at start up"), !bShow );
+      S.Id( DontShowID).AddCheckBox( XXO("Don't show this again at start up"), !bShow );
       S.SetBorder( 5 );
 
       S.Id(wxID_OK)
          .Prop(0)
-         .AddButton(XO("OK"), wxALIGN_RIGHT| wxALL, true);
+         .AddButton(XXO("OK"), wxALIGN_RIGHT| wxALL, true);
    }
    S.EndVerticalLay();
 }
diff --git a/src/Tags.cpp b/src/Tags.cpp
index 9b16985a8..a51f24b44 100644
--- a/src/Tags.cpp
+++ b/src/Tags.cpp
@@ -913,10 +913,10 @@ void TagsEditorDialog::PopulateOrExchange(ShuttleGui & S)
 
       S.StartMultiColumn(4, wxALIGN_CENTER);
       {
-         S.Id(AddID).AddButton(XO("&Add"));
-         S.Id(RemoveID).AddButton(XO("&Remove"));
+         S.Id(AddID).AddButton(XXO("&Add"));
+         S.Id(RemoveID).AddButton(XXO("&Remove"));
          S.AddTitle( {} );
-         S.Id(ClearID).AddButton(XO("Cl&ear"));
+         S.Id(ClearID).AddButton(XXO("Cl&ear"));
       }
       S.EndMultiColumn();
 
@@ -926,8 +926,8 @@ void TagsEditorDialog::PopulateOrExchange(ShuttleGui & S)
          {
             S.StartMultiColumn(4, wxALIGN_CENTER);
             {
-               S.Id(EditID).AddButton(XO("E&dit..."));
-               S.Id(ResetID).AddButton(XO("Rese&t..."));
+               S.Id(EditID).AddButton(XXO("E&dit..."));
+               S.Id(ResetID).AddButton(XXO("Rese&t..."));
             }
             S.EndMultiColumn();
          }
@@ -936,10 +936,10 @@ void TagsEditorDialog::PopulateOrExchange(ShuttleGui & S)
          {
             S.StartMultiColumn(4, wxALIGN_CENTER);
             {
-               S.Id(LoadID).AddButton(XO("&Load..."));
-               S.Id(SaveID).AddButton(XO("&Save..."));
+               S.Id(LoadID).AddButton(XXO("&Load..."));
+               S.Id(SaveID).AddButton(XXO("&Save..."));
                S.AddTitle( {} );
-               S.Id(SaveDefaultsID).AddButton(XO("Set De&fault"));
+               S.Id(SaveDefaultsID).AddButton(XXO("Set De&fault"));
             }
             S.EndMultiColumn();
          }
@@ -948,7 +948,7 @@ void TagsEditorDialog::PopulateOrExchange(ShuttleGui & S)
       S.EndHorizontalLay();
       S.StartHorizontalLay(wxALIGN_LEFT, 0);
       {
-         S.Id( DontShowID ).AddCheckBox( XO("Don't show this when exporting audio"), !bShow );
+         S.Id( DontShowID ).AddCheckBox( XXO("Don't show this when exporting audio"), !bShow );
       }
       S.EndHorizontalLay();
    }
diff --git a/src/TimerRecordDialog.cpp b/src/TimerRecordDialog.cpp
index e29a4630d..8040cffda 100644
--- a/src/TimerRecordDialog.cpp
+++ b/src/TimerRecordDialog.cpp
@@ -926,7 +926,7 @@ void TimerRecordDialog::PopulateOrExchange(ShuttleGui& S)
          S.StartStatic(XO("Automatic Save"), true);
          {
             // If checked, the project will be saved when the recording is completed
-            m_pTimerAutoSaveCheckBoxCtrl = S.Id(ID_AUTOSAVE_CHECKBOX).AddCheckBox(XO("Enable &Automatic Save?"),
+            m_pTimerAutoSaveCheckBoxCtrl = S.Id(ID_AUTOSAVE_CHECKBOX).AddCheckBox(XXO("Enable &Automatic Save?"),
                                                                                     bAutoSave);
             S.StartMultiColumn(3, wxEXPAND);
             {
@@ -937,13 +937,13 @@ void TimerRecordDialog::PopulateOrExchange(ShuttleGui& S)
                   m_fnAutoSaveFile.Assign(sSaveValue);
                   sInitialValue = XO("Current Project");
                }
-               S.AddPrompt(XO("Save Project As:"));
+               S.AddPrompt(XXO("Save Project As:"));
                m_pTimerSavePathTextCtrl = NewPathControl(
                   S.GetParent(), ID_AUTOSAVEPATH_TEXT,
                   XO("Save Project As:"), sInitialValue);
                m_pTimerSavePathTextCtrl->SetEditable(false);
                S.AddWindow(m_pTimerSavePathTextCtrl);
-               m_pTimerSavePathButtonCtrl = S.Id(ID_AUTOSAVEPATH_BUTTON).AddButton(XO("Select..."));
+               m_pTimerSavePathButtonCtrl = S.Id(ID_AUTOSAVEPATH_BUTTON).AddButton(XXO("Select..."));
                }
             S.EndMultiColumn();
          }
@@ -951,16 +951,16 @@ void TimerRecordDialog::PopulateOrExchange(ShuttleGui& S)
 
          S.StartStatic(XO("Automatic Export"), true);
          {
-            m_pTimerAutoExportCheckBoxCtrl = S.Id(ID_AUTOEXPORT_CHECKBOX).AddCheckBox(XO("Enable Automatic &Export?"), bAutoExport);
+            m_pTimerAutoExportCheckBoxCtrl = S.Id(ID_AUTOEXPORT_CHECKBOX).AddCheckBox(XXO("Enable Automatic &Export?"), bAutoExport);
             S.StartMultiColumn(3, wxEXPAND);
             {
-               S.AddPrompt(XO("Export Project As:"));
+               S.AddPrompt(XXO("Export Project As:"));
                m_pTimerExportPathTextCtrl = NewPathControl(
                   S.GetParent(), ID_AUTOEXPORTPATH_TEXT,
                   XO("Export Project As:"), {});
                m_pTimerExportPathTextCtrl->SetEditable(false);
                S.AddWindow(m_pTimerExportPathTextCtrl);
-               m_pTimerExportPathButtonCtrl = S.Id(ID_AUTOEXPORTPATH_BUTTON).AddButton(XO("Select..."));
+               m_pTimerExportPathButtonCtrl = S.Id(ID_AUTOEXPORTPATH_BUTTON).AddButton(XXO("Select..."));
             }
             S.EndMultiColumn();
          }
@@ -972,7 +972,7 @@ void TimerRecordDialog::PopulateOrExchange(ShuttleGui& S)
             S.StartMultiColumn(1, wxEXPAND);
             {
                S.SetStretchyCol( 0 );
-               m_pTimerAfterCompleteChoiceCtrl = S.AddChoice(XO("After Recording completes:"),
+               m_pTimerAfterCompleteChoiceCtrl = S.AddChoice(XXO("After Recording completes:"),
                      {
                         XO("Do nothing") ,
                         XO("Exit Audacity") ,
diff --git a/src/commands/CompareAudioCommand.cpp b/src/commands/CompareAudioCommand.cpp
index 90272e7e3..035ea2033 100644
--- a/src/commands/CompareAudioCommand.cpp
+++ b/src/commands/CompareAudioCommand.cpp
@@ -58,7 +58,7 @@ void CompareAudioCommand::PopulateOrExchange(ShuttleGui & S)
 
    S.StartMultiColumn(2, wxALIGN_CENTER);
    {
-      S.TieTextBox(XO("Threshold:"),errorThreshold);
+      S.TieTextBox(XXO("Threshold:"),errorThreshold);
    }
    S.EndMultiColumn();
 }
diff --git a/src/commands/Demo.cpp b/src/commands/Demo.cpp
index 02bf634b9..5e9e8d302 100644
--- a/src/commands/Demo.cpp
+++ b/src/commands/Demo.cpp
@@ -56,8 +56,8 @@ void DemoCommand::PopulateOrExchange(ShuttleGui & S)
 
    S.StartMultiColumn(2, wxALIGN_CENTER);
    {
-      S.TieTextBox(XO("Delay time (seconds):"),delay);
-      S.TieTextBox(XO("Decay factor:"),decay);
+      S.TieTextBox(XXO("Delay time (seconds):"),delay);
+      S.TieTextBox(XXO("Decay factor:"),decay);
    }
    S.EndMultiColumn();
 }
diff --git a/src/commands/DragCommand.cpp b/src/commands/DragCommand.cpp
index 162c0bcf4..eb24049a1 100644
--- a/src/commands/DragCommand.cpp
+++ b/src/commands/DragCommand.cpp
@@ -73,13 +73,13 @@ void DragCommand::PopulateOrExchange(ShuttleGui & S)
    S.StartMultiColumn(3, wxALIGN_CENTER);
    {
       /* i18n-hint abbreviates "Identity" or "Identifier" */
-      S.Optional( bHasId         ).TieNumericTextBox(  XO("Id:"),          mId );
-      S.Optional( bHasWinName    ).TieTextBox(         XO("Window Name:"), mWinName );
-      S.Optional( bHasFromX      ).TieNumericTextBox(  XO("From X:"),      mFromX );
-      S.Optional( bHasFromY      ).TieNumericTextBox(  XO("From Y:"),      mFromY );
-      S.Optional( bHasToX        ).TieNumericTextBox(  XO("To X:"),        mToX );
-      S.Optional( bHasToY        ).TieNumericTextBox(  XO("To Y:"),        mToY );
-      S.Optional( bHasRelativeTo ).TieChoice(          XO("Relative To:"), mRelativeTo,
+      S.Optional( bHasId         ).TieNumericTextBox(  XXO("Id:"),          mId );
+      S.Optional( bHasWinName    ).TieTextBox(         XXO("Window Name:"), mWinName );
+      S.Optional( bHasFromX      ).TieNumericTextBox(  XXO("From X:"),      mFromX );
+      S.Optional( bHasFromY      ).TieNumericTextBox(  XXO("From Y:"),      mFromY );
+      S.Optional( bHasToX        ).TieNumericTextBox(  XXO("To X:"),        mToX );
+      S.Optional( bHasToY        ).TieNumericTextBox(  XXO("To Y:"),        mToY );
+      S.Optional( bHasRelativeTo ).TieChoice(          XXO("Relative To:"), mRelativeTo,
          Msgids( kCoordTypeStrings, nCoordTypes ) );
    }
    S.EndMultiColumn();
diff --git a/src/commands/GetInfoCommand.cpp b/src/commands/GetInfoCommand.cpp
index 4de0b1c2d..69ae9eb03 100644
--- a/src/commands/GetInfoCommand.cpp
+++ b/src/commands/GetInfoCommand.cpp
@@ -112,9 +112,9 @@ void GetInfoCommand::PopulateOrExchange(ShuttleGui & S)
 
    S.StartMultiColumn(2, wxALIGN_CENTER);
    {
-      S.TieChoice( XO("Type:"),
+      S.TieChoice( XXO("Type:"),
          mInfoType, Msgids( kTypes, nTypes ));
-      S.TieChoice( XO("Format:"),
+      S.TieChoice( XXO("Format:"),
          mFormat, Msgids( kFormats, nFormats ));
    }
    S.EndMultiColumn();
diff --git a/src/commands/GetTrackInfoCommand.cpp b/src/commands/GetTrackInfoCommand.cpp
index 6182a40c7..333ecaf70 100644
--- a/src/commands/GetTrackInfoCommand.cpp
+++ b/src/commands/GetTrackInfoCommand.cpp
@@ -58,7 +58,7 @@ void GetTrackInfoCommand::PopulateOrExchange(ShuttleGui & S)
 
    S.StartMultiColumn(2, wxALIGN_CENTER);
    {
-      S.TieChoice( XO("Types:"), mInfoType, Msgids( kTypes, nTypes ));
+      S.TieChoice( XXO("Types:"), mInfoType, Msgids( kTypes, nTypes ));
    }
    S.EndMultiColumn();
 }
diff --git a/src/commands/HelpCommand.cpp b/src/commands/HelpCommand.cpp
index 0616c2b63..ca855282a 100644
--- a/src/commands/HelpCommand.cpp
+++ b/src/commands/HelpCommand.cpp
@@ -60,8 +60,8 @@ void HelpCommand::PopulateOrExchange(ShuttleGui & S)
 
    S.StartMultiColumn(2, wxALIGN_CENTER);
    {
-      S.TieTextBox(XO("Command:"),mCommandName);
-      S.TieChoice( XO("Format:"),
+      S.TieTextBox(XXO("Command:"),mCommandName);
+      S.TieChoice( XXO("Format:"),
          mFormat, Msgids( kFormats, nFormats ));
    }
    S.EndMultiColumn();
diff --git a/src/commands/ImportExportCommands.cpp b/src/commands/ImportExportCommands.cpp
index 1a9d2db7e..69db2cbc0 100644
--- a/src/commands/ImportExportCommands.cpp
+++ b/src/commands/ImportExportCommands.cpp
@@ -42,7 +42,7 @@ void ImportCommand::PopulateOrExchange(ShuttleGui & S)
 
    S.StartMultiColumn(2, wxALIGN_CENTER);
    {
-      S.TieTextBox(XO("File Name:"),mFileName);
+      S.TieTextBox(XXO("File Name:"),mFileName);
    }
    S.EndMultiColumn();
 }
@@ -72,8 +72,8 @@ void ExportCommand::PopulateOrExchange(ShuttleGui & S)
 
    S.StartMultiColumn(2, wxALIGN_CENTER);
    {
-      S.TieTextBox(XO("File Name:"),mFileName);
-      S.TieTextBox(XO("Number of Channels:"),mnChannels);
+      S.TieTextBox(XXO("File Name:"),mFileName);
+      S.TieTextBox(XXO("Number of Channels:"),mnChannels);
    }
    S.EndMultiColumn();
 }
diff --git a/src/commands/MessageCommand.cpp b/src/commands/MessageCommand.cpp
index 4a4de2e52..89c4f6f2b 100644
--- a/src/commands/MessageCommand.cpp
+++ b/src/commands/MessageCommand.cpp
@@ -37,7 +37,7 @@ void MessageCommand::PopulateOrExchange(ShuttleGui & S)
 
    S.StartMultiColumn(2, wxALIGN_CENTER);
    {
-      S.TieTextBox(XO("Text:"),mMessage,60);
+      S.TieTextBox(XXO("Text:"),mMessage,60);
    }
    S.EndMultiColumn();
 }
diff --git a/src/commands/OpenSaveCommands.cpp b/src/commands/OpenSaveCommands.cpp
index 788ed0d84..34cf596e9 100644
--- a/src/commands/OpenSaveCommands.cpp
+++ b/src/commands/OpenSaveCommands.cpp
@@ -44,8 +44,8 @@ void OpenProjectCommand::PopulateOrExchange(ShuttleGui & S)
 
    S.StartMultiColumn(2, wxALIGN_CENTER);
    {
-      S.TieTextBox(XO("File Name:"),mFileName);
-      S.TieCheckBox(XO("Add to History"), mbAddToHistory );
+      S.TieTextBox(XXO("File Name:"),mFileName);
+      S.TieCheckBox(XXO("Add to History"), mbAddToHistory );
    }
    S.EndMultiColumn();
 }
@@ -89,9 +89,9 @@ void SaveProjectCommand::PopulateOrExchange(ShuttleGui & S)
 
    S.StartMultiColumn(2, wxALIGN_CENTER);
    {
-      S.TieTextBox(XO("File Name:"),mFileName);
-      S.TieCheckBox(XO("Add to History"), mbAddToHistory );
-      S.TieCheckBox(XO("Compress"), mbCompress );
+      S.TieTextBox(XXO("File Name:"),mFileName);
+      S.TieCheckBox(XXO("Add to History"), mbAddToHistory );
+      S.TieCheckBox(XXO("Compress"), mbCompress );
    }
    S.EndMultiColumn();
 }
diff --git a/src/commands/PreferenceCommands.cpp b/src/commands/PreferenceCommands.cpp
index fa555b047..7e19f6de8 100644
--- a/src/commands/PreferenceCommands.cpp
+++ b/src/commands/PreferenceCommands.cpp
@@ -41,7 +41,7 @@ void GetPreferenceCommand::PopulateOrExchange(ShuttleGui & S)
 
    S.StartMultiColumn(2, wxALIGN_CENTER);
    {
-      S.TieTextBox(XO("Name:"),mName);
+      S.TieTextBox(XXO("Name:"),mName);
    }
    S.EndMultiColumn();
 }
@@ -75,9 +75,9 @@ void SetPreferenceCommand::PopulateOrExchange(ShuttleGui & S)
 
    S.StartMultiColumn(2, wxALIGN_CENTER);
    {
-      S.TieTextBox(XO("Name:"),mName);
-      S.TieTextBox(XO("Value:"),mValue);
-      S.TieCheckBox(XO("Reload"),mbReload);
+      S.TieTextBox(XXO("Name:"),mName);
+      S.TieTextBox(XXO("Value:"),mValue);
+      S.TieCheckBox(XXO("Reload"),mbReload);
    }
    S.EndMultiColumn();
 }
diff --git a/src/commands/ScreenshotCommand.cpp b/src/commands/ScreenshotCommand.cpp
index 7a7a187cf..0891681a4 100644
--- a/src/commands/ScreenshotCommand.cpp
+++ b/src/commands/ScreenshotCommand.cpp
@@ -126,12 +126,12 @@ void ScreenshotCommand::PopulateOrExchange(ShuttleGui & S)
 
    S.StartMultiColumn(2, wxALIGN_CENTER);
    {
-      S.TieTextBox(  XO("Path:"), mPath);
-      S.TieChoice(   XO("Capture What:"),
+      S.TieTextBox(  XXO("Path:"), mPath);
+      S.TieChoice(   XXO("Capture What:"),
          mWhat, Msgids(kCaptureWhatStrings, nCaptureWhats));
-      S.TieChoice(   XO("Background:"),
+      S.TieChoice(   XXO("Background:"),
          mBack, Msgids(kBackgroundStrings, nBackgrounds));
-      S.TieCheckBox( XO("Bring To Top"), mbBringToTop);
+      S.TieCheckBox( XXO("Bring To Top"), mbBringToTop);
    }
    S.EndMultiColumn();
 }
diff --git a/src/commands/SelectCommand.cpp b/src/commands/SelectCommand.cpp
index b87588e8c..e78908220 100644
--- a/src/commands/SelectCommand.cpp
+++ b/src/commands/SelectCommand.cpp
@@ -79,11 +79,11 @@ void SelectTimeCommand::PopulateOrExchange(ShuttleGui & S)
    S.StartMultiColumn(3, wxEXPAND);
    {
       S.SetStretchyCol( 2 );
-      S.Optional( bHasT0 ).TieTextBox(XO("Start Time:"), mT0);
-      S.Optional( bHasT1 ).TieTextBox(XO("End Time:"),   mT1);
+      S.Optional( bHasT0 ).TieTextBox(XXO("Start Time:"), mT0);
+      S.Optional( bHasT1 ).TieTextBox(XXO("End Time:"),   mT1);
       // Chooses what time is relative to.
       S.Optional( bHasRelativeSpec ).TieChoice(
-         XO("Relative To:"),
+         XXO("Relative To:"),
          mRelativeTo, Msgids( kRelativeTo, nRelativeTos ));
    }
    S.EndMultiColumn();
@@ -160,8 +160,8 @@ void SelectFrequenciesCommand::PopulateOrExchange(ShuttleGui & S)
    S.StartMultiColumn(3, wxEXPAND);
    {
       S.SetStretchyCol( 2 );
-      S.Optional( bHasTop    ).TieTextBox(XO("High:"), mTop);
-      S.Optional( bHasBottom ).TieTextBox(XO("Low:"),  mBottom);
+      S.Optional( bHasTop    ).TieTextBox(XXO("High:"), mTop);
+      S.Optional( bHasBottom ).TieTextBox(XXO("Low:"),  mBottom);
    }
    S.EndMultiColumn();
 }
@@ -212,14 +212,14 @@ void SelectTracksCommand::PopulateOrExchange(ShuttleGui & S)
    S.StartMultiColumn(3, wxEXPAND);
    {
       S.SetStretchyCol( 2 );
-      S.Optional( bHasFirstTrack).TieTextBox(XO("First Track:"),mFirstTrack);
-      S.Optional( bHasNumTracks).TieTextBox(XO("Track Count:"),mNumTracks);
+      S.Optional( bHasFirstTrack).TieTextBox(XXO("First Track:"),mFirstTrack);
+      S.Optional( bHasNumTracks).TieTextBox(XXO("Track Count:"),mNumTracks);
    }
    S.EndMultiColumn();
    S.StartMultiColumn(2, wxALIGN_CENTER);
    {
       // Always used, so no check box.
-      S.TieChoice( XO("Mode:"), mMode, Msgids( kModes, nModes ));
+      S.TieChoice( XXO("Mode:"), mMode, Msgids( kModes, nModes ));
    }
    S.EndMultiColumn();
 }
diff --git a/src/commands/SetClipCommand.cpp b/src/commands/SetClipCommand.cpp
index cfb841884..29f779343 100644
--- a/src/commands/SetClipCommand.cpp
+++ b/src/commands/SetClipCommand.cpp
@@ -67,10 +67,10 @@ void SetClipCommand::PopulateOrExchange(ShuttleGui & S)
 
    S.StartMultiColumn(3, wxALIGN_CENTER);
    {
-      S.Optional( bHasContainsTime).TieNumericTextBox(  XO("At:"),            mContainsTime );
-      S.Optional( bHasColour      ).TieChoice(          XO("Color:"),         mColour,
+      S.Optional( bHasContainsTime).TieNumericTextBox(  XXO("At:"),            mContainsTime );
+      S.Optional( bHasColour      ).TieChoice(          XXO("Color:"),         mColour,
          Msgids( kColourStrings, nColours ) );
-      S.Optional( bHasT0          ).TieNumericTextBox(  XO("Start:"),         mT0 );
+      S.Optional( bHasT0          ).TieNumericTextBox(  XXO("Start:"),         mT0 );
    }
    S.EndMultiColumn();
 }
diff --git a/src/commands/SetEnvelopeCommand.cpp b/src/commands/SetEnvelopeCommand.cpp
index f844cfc0a..b0e79c019 100644
--- a/src/commands/SetEnvelopeCommand.cpp
+++ b/src/commands/SetEnvelopeCommand.cpp
@@ -50,9 +50,9 @@ void SetEnvelopeCommand::PopulateOrExchange(ShuttleGui & S)
 
    S.StartMultiColumn(3, wxALIGN_CENTER);
    {
-      S.Optional( bHasT           ).TieNumericTextBox(  XO("Time:"),          mT );
-      S.Optional( bHasV           ).TieNumericTextBox(  XO("Value:"),         mV );
-      S.Optional( bHasDelete      ).TieCheckBox(        XO("Delete"),         mbDelete );
+      S.Optional( bHasT           ).TieNumericTextBox(  XXO("Time:"),          mT );
+      S.Optional( bHasV           ).TieNumericTextBox(  XXO("Value:"),         mV );
+      S.Optional( bHasDelete      ).TieCheckBox(        XXO("Delete"),         mbDelete );
    }
    S.EndMultiColumn();
 }
diff --git a/src/commands/SetLabelCommand.cpp b/src/commands/SetLabelCommand.cpp
index bd8e76275..474e249d4 100644
--- a/src/commands/SetLabelCommand.cpp
+++ b/src/commands/SetLabelCommand.cpp
@@ -53,15 +53,15 @@ void SetLabelCommand::PopulateOrExchange(ShuttleGui & S)
 
    S.StartMultiColumn(2, wxALIGN_CENTER);
    {
-      S.TieNumericTextBox( XO("Label Index"), mLabelIndex );
+      S.TieNumericTextBox( XXO("Label Index"), mLabelIndex );
    }
    S.EndMultiColumn();
    S.StartMultiColumn(3, wxALIGN_CENTER);
    {
-      S.Optional( bHasText      ).TieTextBox(         XO("Text:"),     mText );
-      S.Optional( bHasT0        ).TieNumericTextBox(  XO("Start:"),    mT0 );
-      S.Optional( bHasT1        ).TieNumericTextBox(  XO("End:"),      mT1 );
-      S.Optional( bHasSelected  ).TieCheckBox(        XO("Selected"),  mbSelected );
+      S.Optional( bHasText      ).TieTextBox(         XXO("Text:"),     mText );
+      S.Optional( bHasT0        ).TieNumericTextBox(  XXO("Start:"),    mT0 );
+      S.Optional( bHasT1        ).TieNumericTextBox(  XXO("End:"),      mT1 );
+      S.Optional( bHasSelected  ).TieCheckBox(        XXO("Selected"),  mbSelected );
    }
    S.EndMultiColumn();
 }
diff --git a/src/commands/SetProjectCommand.cpp b/src/commands/SetProjectCommand.cpp
index 80919e69d..046a3957c 100644
--- a/src/commands/SetProjectCommand.cpp
+++ b/src/commands/SetProjectCommand.cpp
@@ -55,18 +55,18 @@ void SetProjectCommand::PopulateOrExchange(ShuttleGui & S)
    S.AddSpace(0, 5);
    S.StartMultiColumn(3, wxALIGN_CENTER);
    {
-      S.Optional( bHasName      ).TieTextBox(         XO("Name:"),     mName );
-      S.Optional( bHasRate      ).TieTextBox(         XO("Rate:"),     mRate );
-      S.TieCheckBox( XO("Resize:"), bHasSizing    );
+      S.Optional( bHasName      ).TieTextBox(         XXO("Name:"),     mName );
+      S.Optional( bHasRate      ).TieTextBox(         XXO("Rate:"),     mRate );
+      S.TieCheckBox( XXO("Resize:"), bHasSizing    );
       S.AddSpace(0,0);
    }
    S.EndMultiColumn();
    S.StartMultiColumn(2, wxALIGN_CENTER);
    {
-      S.TieNumericTextBox(  XO("X:"),        mPosX );
-      S.TieNumericTextBox(  XO("Y:"),        mPosY );
-      S.TieNumericTextBox(  XO("Width:"),    mWidth );
-      S.TieNumericTextBox(  XO("Height:"),   mHeight );
+      S.TieNumericTextBox(  XXO("X:"),        mPosX );
+      S.TieNumericTextBox(  XXO("Y:"),        mPosY );
+      S.TieNumericTextBox(  XXO("Width:"),    mWidth );
+      S.TieNumericTextBox(  XXO("Height:"),   mHeight );
    }
    S.EndMultiColumn();
 }
diff --git a/src/commands/SetTrackInfoCommand.cpp b/src/commands/SetTrackInfoCommand.cpp
index ec2054829..405e0a4ff 100644
--- a/src/commands/SetTrackInfoCommand.cpp
+++ b/src/commands/SetTrackInfoCommand.cpp
@@ -142,14 +142,14 @@ void SetTrackStatusCommand::PopulateOrExchange(ShuttleGui & S)
    S.StartMultiColumn(3, wxEXPAND);
    {
       S.SetStretchyCol( 2 );
-      S.Optional( bHasTrackName   ).TieTextBox(         XO("Name:"),          mTrackName );
+      S.Optional( bHasTrackName   ).TieTextBox(         XXO("Name:"),          mTrackName );
    }
    S.EndMultiColumn();
    S.StartMultiColumn(2, wxEXPAND);
    {
       S.SetStretchyCol( 1 );
-      S.Optional( bHasSelected       ).TieCheckBox( XO("Selected"),           bSelected );
-      S.Optional( bHasFocused        ).TieCheckBox( XO("Focused"),            bFocused);
+      S.Optional( bHasSelected       ).TieCheckBox( XXO("Selected"),           bSelected );
+      S.Optional( bHasFocused        ).TieCheckBox( XXO("Focused"),            bFocused);
    }
    S.EndMultiColumn();
 }
@@ -205,15 +205,15 @@ void SetTrackAudioCommand::PopulateOrExchange(ShuttleGui & S)
    S.StartMultiColumn(2, wxEXPAND);
    {
       S.SetStretchyCol( 1 );
-      S.Optional( bHasMute           ).TieCheckBox( XO("Mute"),               bMute);
-      S.Optional( bHasSolo           ).TieCheckBox( XO("Solo"),               bSolo);
+      S.Optional( bHasMute           ).TieCheckBox( XXO("Mute"),               bMute);
+      S.Optional( bHasSolo           ).TieCheckBox( XXO("Solo"),               bSolo);
    }
    S.EndMultiColumn();
    S.StartMultiColumn(3, wxEXPAND);
    {
       S.SetStretchyCol( 2 );
-      S.Optional( bHasGain        ).TieSlider(          XO("Gain:"),          mGain, 36.0,-36.0);
-      S.Optional( bHasPan         ).TieSlider(          XO("Pan:"),           mPan,  100.0, -100.0);
+      S.Optional( bHasGain        ).TieSlider(          XXO("Gain:"),          mGain, 36.0,-36.0);
+      S.Optional( bHasPan         ).TieSlider(          XXO("Pan:"),           mPan,  100.0, -100.0);
    }
    S.EndMultiColumn();
 }
@@ -329,32 +329,32 @@ void SetTrackVisualsCommand::PopulateOrExchange(ShuttleGui & S)
    S.StartMultiColumn(3, wxEXPAND);
    {
       S.SetStretchyCol( 2 );
-      S.Optional( bHasHeight      ).TieNumericTextBox(  XO("Height:"),        mHeight );
-      S.Optional( bHasColour      ).TieChoice(          XO("Color:"),         mColour,
+      S.Optional( bHasHeight      ).TieNumericTextBox(  XXO("Height:"),        mHeight );
+      S.Optional( bHasColour      ).TieChoice(          XXO("Color:"),         mColour,
          Msgids(  kColourStrings, nColours ) );
       
       {
          auto symbols = DiscoverSubViewTypes();
          auto typeNames = transform_container<TranslatableStrings>(
              symbols, std::mem_fn( &EnumValueSymbol::Stripped ) );
-         S.Optional( bHasDisplayType ).TieChoice(          XO("Display:"),       mDisplayType,
+         S.Optional( bHasDisplayType ).TieChoice(          XXO("Display:"),       mDisplayType,
             typeNames );
       }
 
-      S.Optional( bHasScaleType   ).TieChoice(          XO("Scale:"),         mScaleType,
+      S.Optional( bHasScaleType   ).TieChoice(          XXO("Scale:"),         mScaleType,
          Msgids( kScaleTypeStrings, nScaleTypes ) );
-      S.Optional( bHasVZoom       ).TieChoice(          XO("VZoom:"),         mVZoom,
+      S.Optional( bHasVZoom       ).TieChoice(          XXO("VZoom:"),         mVZoom,
          Msgids( kZoomTypeStrings, nZoomTypes ) );
-      S.Optional( bHasVZoomTop    ).TieTextBox(         XO("VZoom Top:"),     mVZoomTop );
-      S.Optional( bHasVZoomBottom ).TieTextBox(         XO("VZoom Bottom:"),  mVZoomBottom );
+      S.Optional( bHasVZoomTop    ).TieTextBox(         XXO("VZoom Top:"),     mVZoomTop );
+      S.Optional( bHasVZoomBottom ).TieTextBox(         XXO("VZoom Bottom:"),  mVZoomBottom );
    }
    S.EndMultiColumn();
    S.StartMultiColumn(2, wxEXPAND);
    {
       S.SetStretchyCol( 1 );
-      S.Optional( bHasUseSpecPrefs   ).TieCheckBox( XO("Use Spectral Prefs"), bUseSpecPrefs );
-      S.Optional( bHasSpectralSelect ).TieCheckBox( XO("Spectral Select"),    bSpectralSelect);
-      S.Optional( bHasGrayScale      ).TieCheckBox( XO("Gray Scale"),         bGrayScale );
+      S.Optional( bHasUseSpecPrefs   ).TieCheckBox( XXO("Use Spectral Prefs"), bUseSpecPrefs );
+      S.Optional( bHasSpectralSelect ).TieCheckBox( XXO("Spectral Select"),    bSpectralSelect);
+      S.Optional( bHasGrayScale      ).TieCheckBox( XXO("Gray Scale"),         bGrayScale );
    }
    S.EndMultiColumn();
 }
diff --git a/src/effects/Amplify.cpp b/src/effects/Amplify.cpp
index b758b7ba5..b487b3215 100644
--- a/src/effects/Amplify.cpp
+++ b/src/effects/Amplify.cpp
@@ -245,7 +245,7 @@ void EffectAmplify::PopulateOrExchange(ShuttleGui & S)
             .Validator<FloatingPointValidator<double>>(
                precision, &mAmp, NumValidatorStyle::ONE_TRAILING_ZERO, MIN_Amp, MAX_Amp
             )
-            .AddTextBox(XO("&Amplification (dB):"), wxT(""), 12);
+            .AddTextBox(XXO("&Amplification (dB):"), wxT(""), 12);
       }
       S.EndMultiColumn();
 
@@ -272,7 +272,7 @@ void EffectAmplify::PopulateOrExchange(ShuttleGui & S)
                RoundValue( precision + 1, MIN_Amp + LINEAR_TO_DB(mPeak) ),
                RoundValue( precision + 1, MAX_Amp + LINEAR_TO_DB(mPeak) )
             )
-            .AddTextBox(XO("&New Peak Amplitude (dB):"), wxT(""), 12);
+            .AddTextBox(XXO("&New Peak Amplitude (dB):"), wxT(""), 12);
       }
       S.EndMultiColumn();
 
@@ -281,7 +281,7 @@ void EffectAmplify::PopulateOrExchange(ShuttleGui & S)
       {
 
          mClip = S.Id(ID_Clip).Disable( batch )
-            .AddCheckBox(XO("Allo&w clipping"), false);
+            .AddCheckBox(XXO("Allo&w clipping"), false);
       }
       S.EndHorizontalLay();
    }
diff --git a/src/effects/AutoDuck.cpp b/src/effects/AutoDuck.cpp
index ac880e12c..145fcaa3e 100644
--- a/src/effects/AutoDuck.cpp
+++ b/src/effects/AutoDuck.cpp
@@ -442,7 +442,7 @@ void EffectAutoDuck::PopulateOrExchange(ShuttleGui & S)
                MIN_DuckAmountDb, MAX_DuckAmountDb
             )
             .NameSuffix(XO("db"))
-            .AddTextBox(XO("Duck &amount:"), wxT(""), 10);
+            .AddTextBox(XXO("Duck &amount:"), wxT(""), 10);
          S.AddUnits(XO("dB"));
 
          mMaximumPauseBox = S.Validator<FloatingPointValidator<double>>(
@@ -450,7 +450,7 @@ void EffectAutoDuck::PopulateOrExchange(ShuttleGui & S)
                MIN_MaximumPause, MAX_MaximumPause
             )
             .NameSuffix(XO("seconds"))
-            .AddTextBox(XO("Ma&ximum pause:"), wxT(""), 10);
+            .AddTextBox(XXO("Ma&ximum pause:"), wxT(""), 10);
          S.AddUnits(XO("seconds"));
 
          mOuterFadeDownLenBox = S.Validator<FloatingPointValidator<double>>(
@@ -458,7 +458,7 @@ void EffectAutoDuck::PopulateOrExchange(ShuttleGui & S)
                MIN_OuterFadeDownLen, MAX_OuterFadeDownLen
             )
             .NameSuffix(XO("seconds"))
-            .AddTextBox(XO("Outer fade &down length:"), wxT(""), 10);
+            .AddTextBox(XXO("Outer fade &down length:"), wxT(""), 10);
          S.AddUnits(XO("seconds"));
 
          mOuterFadeUpLenBox = S.Validator<FloatingPointValidator<double>>(
@@ -466,7 +466,7 @@ void EffectAutoDuck::PopulateOrExchange(ShuttleGui & S)
                MIN_OuterFadeUpLen, MAX_OuterFadeUpLen
             )
             .NameSuffix(XO("seconds"))
-            .AddTextBox(XO("Outer fade &up length:"), wxT(""), 10);
+            .AddTextBox(XXO("Outer fade &up length:"), wxT(""), 10);
          S.AddUnits(XO("seconds"));
 
          mInnerFadeDownLenBox = S.Validator<FloatingPointValidator<double>>(
@@ -474,7 +474,7 @@ void EffectAutoDuck::PopulateOrExchange(ShuttleGui & S)
                MIN_InnerFadeDownLen, MAX_InnerFadeDownLen
             )
             .NameSuffix(XO("seconds"))
-            .AddTextBox(XO("Inner fade d&own length:"), wxT(""), 10);
+            .AddTextBox(XXO("Inner fade d&own length:"), wxT(""), 10);
          S.AddUnits(XO("seconds"));
 
          mInnerFadeUpLenBox = S.Validator<FloatingPointValidator<double>>(
@@ -482,7 +482,7 @@ void EffectAutoDuck::PopulateOrExchange(ShuttleGui & S)
                MIN_InnerFadeUpLen, MAX_InnerFadeUpLen
             )
             .NameSuffix(XO("seconds"))
-            .AddTextBox(XO("Inner &fade up length:"), wxT(""), 10);
+            .AddTextBox(XXO("Inner &fade up length:"), wxT(""), 10);
          S.AddUnits(XO("seconds"));
       }
       S.EndMultiColumn();
@@ -494,7 +494,7 @@ void EffectAutoDuck::PopulateOrExchange(ShuttleGui & S)
                MIN_ThresholdDb, MAX_ThresholdDb
             )
             .NameSuffix(XO("db"))
-            .AddTextBox(XO("&Threshold:"), wxT(""), 10);
+            .AddTextBox(XXO("&Threshold:"), wxT(""), 10);
          S.AddUnits(XO("dB"));
       }
       S.EndMultiColumn();
diff --git a/src/effects/BassTreble.cpp b/src/effects/BassTreble.cpp
index 4ab7cceb2..f3ce8de75 100644
--- a/src/effects/BassTreble.cpp
+++ b/src/effects/BassTreble.cpp
@@ -237,7 +237,7 @@ void EffectBassTreble::PopulateOrExchange(ShuttleGui & S)
             .Name(XO("Bass (dB):"))
             .Validator<FloatingPointValidator<double>>(
                1, &mBass, NumValidatorStyle::DEFAULT, MIN_Bass, MAX_Bass)
-            .AddTextBox(XO("Ba&ss (dB):"), wxT(""), 10);
+            .AddTextBox(XXO("Ba&ss (dB):"), wxT(""), 10);
 
          mBassS = S.Id(ID_Bass)
             .Name(XO("Bass"))
@@ -248,7 +248,7 @@ void EffectBassTreble::PopulateOrExchange(ShuttleGui & S)
          mTrebleT = S.Id(ID_Treble)
             .Validator<FloatingPointValidator<double>>(
                1, &mTreble, NumValidatorStyle::DEFAULT, MIN_Treble, MAX_Treble)
-            .AddTextBox(XO("&Treble (dB):"), wxT(""), 10);
+            .AddTextBox(XXO("&Treble (dB):"), wxT(""), 10);
 
          mTrebleS = S.Id(ID_Treble)
             .Name(XO("Treble"))
@@ -269,7 +269,7 @@ void EffectBassTreble::PopulateOrExchange(ShuttleGui & S)
          mGainT = S.Id(ID_Gain)
             .Validator<FloatingPointValidator<double>>(
                1, &mGain, NumValidatorStyle::DEFAULT, MIN_Gain, MAX_Gain)
-            .AddTextBox(XO("&Volume (dB):"), wxT(""), 10);
+            .AddTextBox(XXO("&Volume (dB):"), wxT(""), 10);
 
          mGainS = S.Id(ID_Gain)
             .Name(XO("Level"))
@@ -281,7 +281,7 @@ void EffectBassTreble::PopulateOrExchange(ShuttleGui & S)
       S.StartMultiColumn(2, wxCENTER);
       {
          // Link checkbox
-         mLinkCheckBox = S.Id(ID_Link).AddCheckBox(XO("&Link Volume control to Tone controls"),
+         mLinkCheckBox = S.Id(ID_Link).AddCheckBox(XXO("&Link Volume control to Tone controls"),
                                           DEF_Link);
       }
       S.EndMultiColumn();
diff --git a/src/effects/ChangePitch.cpp b/src/effects/ChangePitch.cpp
index e5bb1515e..fa5ff9b0e 100644
--- a/src/effects/ChangePitch.cpp
+++ b/src/effects/ChangePitch.cpp
@@ -285,7 +285,7 @@ void EffectChangePitch::PopulateOrExchange(ShuttleGui & S)
                /* i18n-hint: changing a quantity "from" one value "to" another */
                .Name(XO("from"))
                .MinSize( { 80, -1 } )
-               .AddChoice(XO("&from"), pitch);
+               .AddChoice(XXO("&from"), pitch);
 
             m_pSpin_FromOctave = S.Id(ID_FromOctave)
                .Name(XO("from Octave"))
@@ -296,7 +296,7 @@ void EffectChangePitch::PopulateOrExchange(ShuttleGui & S)
                /* i18n-hint: changing a quantity "from" one value "to" another */
                .Name(XO("to"))
                .MinSize( { 80, -1 } )
-               .AddChoice(XO("&to"), pitch);
+               .AddChoice(XXO("&to"), pitch);
 
             m_pSpin_ToOctave = S.Id(ID_ToOctave)
                .Name(XO("to Octave"))
@@ -313,7 +313,7 @@ void EffectChangePitch::PopulateOrExchange(ShuttleGui & S)
                   2, &m_dSemitonesChange,
                   NumValidatorStyle::TWO_TRAILING_ZEROES
                )
-               .AddTextBox(XO("&Semitones (half-steps):"), wxT(""), 12);
+               .AddTextBox(XXO("&Semitones (half-steps):"), wxT(""), 12);
          }
          S.EndHorizontalLay();
       }
@@ -330,7 +330,7 @@ void EffectChangePitch::PopulateOrExchange(ShuttleGui & S)
                   NumValidatorStyle::THREE_TRAILING_ZEROES,
                   0.0
                )
-               .AddTextBox(XO("f&rom"), wxT(""), 12);
+               .AddTextBox(XXO("f&rom"), wxT(""), 12);
 
             m_pTextCtrl_ToFrequency = S.Id(ID_ToFrequency)
                .Name(XO("to (Hz)"))
@@ -339,7 +339,7 @@ void EffectChangePitch::PopulateOrExchange(ShuttleGui & S)
                   NumValidatorStyle::THREE_TRAILING_ZEROES,
                   0.0
                )
-               .AddTextBox(XO("t&o"), wxT(""), 12);
+               .AddTextBox(XXO("t&o"), wxT(""), 12);
 
             S.AddUnits(XO("Hz"));
          }
@@ -353,7 +353,7 @@ void EffectChangePitch::PopulateOrExchange(ShuttleGui & S)
                   NumValidatorStyle::THREE_TRAILING_ZEROES,
                   MIN_Percentage, MAX_Percentage
                )
-               .AddTextBox(XO("Percent C&hange:"), wxT(""), 12);
+               .AddTextBox(XXO("Percent C&hange:"), wxT(""), 12);
          }
          S.EndHorizontalLay();
 
@@ -372,7 +372,7 @@ void EffectChangePitch::PopulateOrExchange(ShuttleGui & S)
       S.StartMultiColumn(2);
       {
          mUseSBSMSCheckBox = S.Validator<wxGenericValidator>(&mUseSBSMS)
-            .AddCheckBox(XO("&Use high quality stretching (slow)"),
+            .AddCheckBox(XXO("&Use high quality stretching (slow)"),
                                              mUseSBSMS);
       }
       S.EndMultiColumn();
diff --git a/src/effects/ChangeSpeed.cpp b/src/effects/ChangeSpeed.cpp
index 7a64df2c3..e6aaf7f9e 100644
--- a/src/effects/ChangeSpeed.cpp
+++ b/src/effects/ChangeSpeed.cpp
@@ -317,7 +317,7 @@ void EffectChangeSpeed::PopulateOrExchange(ShuttleGui & S)
                NumValidatorStyle::THREE_TRAILING_ZEROES,
                MIN_Percentage / 100.0, ((MAX_Percentage / 100.0) + 1)
             )
-            .AddTextBox(XO("&Speed Multiplier:"), wxT(""), 12);
+            .AddTextBox(XXO("&Speed Multiplier:"), wxT(""), 12);
 
          mpTextCtrl_PercentChange = S.Id(ID_PercentChange)
             .Validator<FloatingPointValidator<double>>(
@@ -325,7 +325,7 @@ void EffectChangeSpeed::PopulateOrExchange(ShuttleGui & S)
                NumValidatorStyle::THREE_TRAILING_ZEROES,
                MIN_Percentage, MAX_Percentage
             )
-            .AddTextBox(XO("Percent C&hange:"), wxT(""), 12);
+            .AddTextBox(XXO("Percent C&hange:"), wxT(""), 12);
       }
       S.EndMultiColumn();
 
@@ -350,14 +350,14 @@ void EffectChangeSpeed::PopulateOrExchange(ShuttleGui & S)
             .Name(XO("From rpm"))
             .MinSize( { 100, -1 } )
             /* i18n-hint: changing a quantity "from" one value "to" another */
-            .AddChoice(XO("&from"), kVinylStrings);
+            .AddChoice(XXO("&from"), kVinylStrings);
 
          mpChoice_ToVinyl = S.Id(ID_ToVinyl)
             /* i18n-hint: changing a quantity "from" one value "to" another */
             .Name(XO("To rpm"))
             .MinSize( { 100, -1 } )
             /* i18n-hint: changing a quantity "from" one value "to" another */
-            .AddChoice(XO("&to"), kVinylStrings);
+            .AddChoice(XXO("&to"), kVinylStrings);
       }
       S.EndMultiColumn();
 
@@ -366,7 +366,7 @@ void EffectChangeSpeed::PopulateOrExchange(ShuttleGui & S)
       {
          S.StartMultiColumn(2, wxALIGN_LEFT);
          {
-            S.AddPrompt(XO("C&urrent Length:"));
+            S.AddPrompt(XXO("C&urrent Length:"));
 
             mpFromLengthCtrl = safenew
                   NumericTextCtrl(S.GetParent(), wxID_ANY,
@@ -384,7 +384,7 @@ void EffectChangeSpeed::PopulateOrExchange(ShuttleGui & S)
                .Position(wxALIGN_LEFT)
                .AddWindow(mpFromLengthCtrl);
 
-            S.AddPrompt(XO("&New Length:"));
+            S.AddPrompt(XXO("&New Length:"));
 
             mpToLengthCtrl = safenew
                   NumericTextCtrl(S.GetParent(), ID_ToLength,
diff --git a/src/effects/ChangeTempo.cpp b/src/effects/ChangeTempo.cpp
index bf66e30ab..dc418bf88 100644
--- a/src/effects/ChangeTempo.cpp
+++ b/src/effects/ChangeTempo.cpp
@@ -244,7 +244,7 @@ void EffectChangeTempo::PopulateOrExchange(ShuttleGui & S)
                3, &m_PercentChange, NumValidatorStyle::THREE_TRAILING_ZEROES,
                MIN_Percentage, MAX_Percentage
             )
-            .AddTextBox(XO("Percent C&hange:"), wxT(""), 12);
+            .AddTextBox(XXO("Percent C&hange:"), wxT(""), 12);
       }
       S.EndMultiColumn();
 
@@ -270,7 +270,7 @@ void EffectChangeTempo::PopulateOrExchange(ShuttleGui & S)
                   NumValidatorStyle::THREE_TRAILING_ZEROES
                      | NumValidatorStyle::ZERO_AS_BLANK)
                /* i18n-hint: changing a quantity "from" one value "to" another */
-               .AddTextBox(XO("&from"), wxT(""), 12);
+               .AddTextBox(XXO("&from"), wxT(""), 12);
 
             m_pTextCtrl_ToBPM = S.Id(ID_ToBPM)
                /* i18n-hint: changing a quantity "from" one value "to" another */
@@ -280,7 +280,7 @@ void EffectChangeTempo::PopulateOrExchange(ShuttleGui & S)
                   NumValidatorStyle::THREE_TRAILING_ZEROES
                      | NumValidatorStyle::ZERO_AS_BLANK)
                /* i18n-hint: changing a quantity "from" one value "to" another */
-               .AddTextBox(XO("&to"), wxT(""), 12);
+               .AddTextBox(XXO("&to"), wxT(""), 12);
          }
          S.EndHorizontalLay();
       }
@@ -298,7 +298,7 @@ void EffectChangeTempo::PopulateOrExchange(ShuttleGui & S)
                   precision, &m_FromLength,
                   NumValidatorStyle::TWO_TRAILING_ZEROES)
                /* i18n-hint: changing a quantity "from" one value "to" another */
-               .AddTextBox(XO("from"), wxT(""), 12);
+               .AddTextBox(XXO("from"), wxT(""), 12);
             m_pTextCtrl_ToLength = S.Id(ID_ToLength)
                .Validator<FloatingPointValidator<double>>(
                   2, &m_ToLength, NumValidatorStyle::TWO_TRAILING_ZEROES,
@@ -309,7 +309,7 @@ void EffectChangeTempo::PopulateOrExchange(ShuttleGui & S)
                      (m_FromLength * 100.0) / (100.0 + MIN_Percentage) )
                )
                /* i18n-hint: changing a quantity "from" one value "to" another */
-               .AddTextBox(XO("t&o"), wxT(""), 12);
+               .AddTextBox(XXO("t&o"), wxT(""), 12);
          }
          S.EndHorizontalLay();
       }
@@ -319,7 +319,7 @@ void EffectChangeTempo::PopulateOrExchange(ShuttleGui & S)
       S.StartMultiColumn(2);
       {
          mUseSBSMSCheckBox = S.Validator<wxGenericValidator>(&mUseSBSMS)
-            .AddCheckBox(XO("&Use high quality stretching (slow)"),
+            .AddCheckBox(XXO("&Use high quality stretching (slow)"),
                                              mUseSBSMS);
       }
       S.EndMultiColumn();
diff --git a/src/effects/ClickRemoval.cpp b/src/effects/ClickRemoval.cpp
index 1df18f8a6..88ef47f3e 100644
--- a/src/effects/ClickRemoval.cpp
+++ b/src/effects/ClickRemoval.cpp
@@ -349,7 +349,7 @@ void EffectClickRemoval::PopulateOrExchange(ShuttleGui & S)
             &mThresholdLevel, NumValidatorStyle::DEFAULT,
             MIN_Threshold, MAX_Threshold
          )
-         .AddTextBox(XO("&Threshold (lower is more sensitive):"),
+         .AddTextBox(XXO("&Threshold (lower is more sensitive):"),
                      wxT(""),
                      10);
 
@@ -364,7 +364,7 @@ void EffectClickRemoval::PopulateOrExchange(ShuttleGui & S)
       mWidthT = S.Id(ID_Width)
          .Validator<IntegerValidator<int>>(
             &mClickWidth, NumValidatorStyle::DEFAULT, MIN_Width, MAX_Width)
-         .AddTextBox(XO("Max &Spike Width (higher is more sensitive):"),
+         .AddTextBox(XXO("Max &Spike Width (higher is more sensitive):"),
                      wxT(""),
                      10);
 
diff --git a/src/effects/Compressor.cpp b/src/effects/Compressor.cpp
index c2f4ce4e5..2b478abc4 100644
--- a/src/effects/Compressor.cpp
+++ b/src/effects/Compressor.cpp
@@ -349,11 +349,11 @@ void EffectCompressor::PopulateOrExchange(ShuttleGui & S)
    S.StartHorizontalLay(wxCENTER, false);
    {
       /* i18n-hint: Make-up, i.e. correct for any reduction, rather than fabricate it.*/
-      mGainCheckBox = S.AddCheckBox(XO("Ma&ke-up gain for 0 dB after compressing"),
+      mGainCheckBox = S.AddCheckBox(XXO("Ma&ke-up gain for 0 dB after compressing"),
                                     DEF_Normalize);
       /* i18n-hint: "Compress" here means reduce variations of sound volume,
        NOT related to file-size compression; Peaks means extremes in volume */
-      mPeakCheckBox = S.AddCheckBox(XO("C&ompress based on Peaks"),
+      mPeakCheckBox = S.AddCheckBox(XXO("C&ompress based on Peaks"),
                                     DEF_UsePeak);
    }
    S.EndHorizontalLay();
diff --git a/src/effects/Contrast.cpp b/src/effects/Contrast.cpp
index 1f52f3497..fc1efc24e 100644
--- a/src/effects/Contrast.cpp
+++ b/src/effects/Contrast.cpp
@@ -270,7 +270,7 @@ ContrastDialog::ContrastDialog(wxWindow * parent, wxWindowID id,
          S.Name(XO("Foreground end time"))
             .AddWindow(mForegroundEndT);
 
-         m_pButton_UseCurrentF = S.Id(ID_BUTTON_USECURRENTF).AddButton(XO("&Measure selection"));
+         m_pButton_UseCurrentF = S.Id(ID_BUTTON_USECURRENTF).AddButton(XXO("&Measure selection"));
          mForegroundRMSText = S.Id(ID_FOREGROUNDDB_TEXT)
             .ConnectRoot(wxEVT_KEY_DOWN,
                          &ContrastDialog::OnChar)
@@ -304,7 +304,7 @@ ContrastDialog::ContrastDialog(wxWindow * parent, wxWindowID id,
          S.Name(XO("Background end time"))
             .AddWindow(mBackgroundEndT);
 
-         m_pButton_UseCurrentB = S.Id(ID_BUTTON_USECURRENTB).AddButton(XO("Mea&sure selection"));
+         m_pButton_UseCurrentB = S.Id(ID_BUTTON_USECURRENTB).AddButton(XXO("Mea&sure selection"));
          mBackgroundRMSText = S.Id(ID_BACKGROUNDDB_TEXT)
             .ConnectRoot(wxEVT_KEY_DOWN,
                          &ContrastDialog::OnChar)
@@ -326,7 +326,7 @@ ContrastDialog::ContrastDialog(wxWindow * parent, wxWindowID id,
             .ConnectRoot(wxEVT_KEY_DOWN,
                          &ContrastDialog::OnChar)
             .AddTextBox( {}, wxT(""), 50);
-         m_pButton_Reset = S.Id(ID_BUTTON_RESET).AddButton(XO("R&eset"));
+         m_pButton_Reset = S.Id(ID_BUTTON_RESET).AddButton(XXO("R&eset"));
 
          label = XO("&Difference:");
          S.AddFixedText(label);
@@ -335,7 +335,7 @@ ContrastDialog::ContrastDialog(wxWindow * parent, wxWindowID id,
             .ConnectRoot(wxEVT_KEY_DOWN,
                          &ContrastDialog::OnChar)
             .AddTextBox( {}, wxT(""), 50);
-         m_pButton_Export = S.Id(ID_BUTTON_EXPORT).AddButton(XO("E&xport..."));
+         m_pButton_Export = S.Id(ID_BUTTON_EXPORT).AddButton(XXO("E&xport..."));
       }
       S.EndMultiColumn();
    }
diff --git a/src/effects/Distortion.cpp b/src/effects/Distortion.cpp
index ee1c3b683..ae0e64d54 100644
--- a/src/effects/Distortion.cpp
+++ b/src/effects/Distortion.cpp
@@ -369,10 +369,10 @@ void EffectDistortion::PopulateOrExchange(ShuttleGui & S)
          mTypeChoiceCtrl = S.Id(ID_Type)
             .MinSize( { -1, -1 } )
             .Validator<wxGenericValidator>(&mParams.mTableChoiceIndx)
-            .AddChoice(XO("Distortion type:"),
+            .AddChoice(XXO("Distortion type:"),
                Msgids(kTableTypeStrings, nTableTypes));
 
-         mDCBlockCheckBox = S.Id(ID_DCBlock).AddCheckBox(XO("DC blocking filter"),
+         mDCBlockCheckBox = S.Id(ID_DCBlock).AddCheckBox(XXO("DC blocking filter"),
                                        DEF_DCBlock);
       }
       S.EndMultiColumn();
diff --git a/src/effects/DtmfGen.cpp b/src/effects/DtmfGen.cpp
index 3474d6392..ee9482093 100644
--- a/src/effects/DtmfGen.cpp
+++ b/src/effects/DtmfGen.cpp
@@ -345,15 +345,15 @@ void EffectDtmf::PopulateOrExchange(ShuttleGui & S)
             vldDtmf.SetIncludes(wxArrayString(WXSIZEOF(kSymbols), kSymbols));
             return vldDtmf;
          })
-         .AddTextBox(XO("DTMF &sequence:"), wxT(""), 10);
+         .AddTextBox(XXO("DTMF &sequence:"), wxT(""), 10);
 
       S.Id(ID_Amplitude)
          .Validator<FloatingPointValidator<double>>(
             3, &dtmfAmplitude, NumValidatorStyle::NO_TRAILING_ZEROES,
             MIN_Amplitude, MAX_Amplitude)
-         .AddTextBox(XO("&Amplitude (0-1):"), wxT(""), 10);
+         .AddTextBox(XXO("&Amplitude (0-1):"), wxT(""), 10);
 
-      S.AddPrompt(XO("&Duration:"));
+      S.AddPrompt(XXO("&Duration:"));
       mDtmfDurationT = safenew
          NumericTextCtrl(S.GetParent(), ID_Duration,
                          NumericConverter::TIME,
diff --git a/src/effects/Echo.cpp b/src/effects/Echo.cpp
index ac7ce707b..a9cbaa7d1 100644
--- a/src/effects/Echo.cpp
+++ b/src/effects/Echo.cpp
@@ -177,12 +177,12 @@ void EffectEcho::PopulateOrExchange(ShuttleGui & S)
             3, &delay, NumValidatorStyle::NO_TRAILING_ZEROES,
             MIN_Delay, MAX_Delay
          )
-         .AddTextBox(XO("&Delay time (seconds):"), wxT(""), 10);
+         .AddTextBox(XXO("&Delay time (seconds):"), wxT(""), 10);
 
       S.Validator<FloatingPointValidator<double>>(
             3, &decay, NumValidatorStyle::NO_TRAILING_ZEROES,
             MIN_Decay, MAX_Decay)
-         .AddTextBox(XO("D&ecay factor:"), wxT(""), 10);
+         .AddTextBox(XXO("D&ecay factor:"), wxT(""), 10);
    }
    S.EndMultiColumn();
 }
diff --git a/src/effects/EffectManager.cpp b/src/effects/EffectManager.cpp
index 0d318b94f..b4592ba03 100644
--- a/src/effects/EffectManager.cpp
+++ b/src/effects/EffectManager.cpp
@@ -405,10 +405,10 @@ EffectPresetsDialog::EffectPresetsDialog(wxWindow *parent, Effect *effect)
       S.StartTwoColumn();
       S.SetStretchyCol(1);
       {
-         S.AddPrompt(XO("Type:"));
+         S.AddPrompt(XXO("Type:"));
          mType = S.Id(ID_Type).AddChoice( {}, {}, 0 );
 
-         S.AddPrompt(XO("&Preset:"));
+         S.AddPrompt(XXO("&Preset:"));
          mPresets = S
             .Style( wxLB_SINGLE | wxLB_NEEDED_SB )
             .AddListBox( {} );
diff --git a/src/effects/EffectUI.cpp b/src/effects/EffectUI.cpp
index 00a2ef5f0..4bc5999e5 100644
--- a/src/effects/EffectUI.cpp
+++ b/src/effects/EffectUI.cpp
@@ -885,7 +885,7 @@ wxPanel *EffectUIHost::BuildButtonBar(wxWindow *parent)
       {
          mMenuBtn = S.Id( kMenuID )
             .ToolTip(XO("Manage presets and options"))
-            .AddButton( XO("&Manage"), wxALIGN_CENTER | wxTOP | wxBOTTOM );
+            .AddButton( XXO("&Manage"), wxALIGN_CENTER | wxTOP | wxBOTTOM );
       }
       else
       {
@@ -906,7 +906,7 @@ wxPanel *EffectUIHost::BuildButtonBar(wxWindow *parent)
             {
                mPlayToggleBtn = S.Id( kPlayID )
                   .ToolTip(XO("Start and stop playback"))
-                  .AddButton( XO("Start &Playback"),
+                  .AddButton( XXO("Start &Playback"),
                               wxALIGN_CENTER | wxTOP | wxBOTTOM );
             }
             else if (mEffect &&
@@ -915,7 +915,7 @@ wxPanel *EffectUIHost::BuildButtonBar(wxWindow *parent)
             {
                mPlayToggleBtn = S.Id( kPlayID )
                   .ToolTip(XO("Preview effect"))
-                  .AddButton( XO("&Preview"),
+                  .AddButton( XXO("&Preview"),
                               wxALIGN_CENTER | wxTOP | wxBOTTOM );
             }
          }
@@ -945,7 +945,7 @@ wxPanel *EffectUIHost::BuildButtonBar(wxWindow *parent)
             {
                mRewindBtn = S.Id( kRewindID )
                   .ToolTip(XO("Skip backward"))
-                  .AddButton( XO("Skip &Backward"),
+                  .AddButton( XXO("Skip &Backward"),
                               wxALIGN_CENTER | wxTOP | wxBOTTOM );
             }
             else
@@ -964,7 +964,7 @@ wxPanel *EffectUIHost::BuildButtonBar(wxWindow *parent)
             {
                mFFwdBtn = S.Id( kFFwdID )
                   .ToolTip(XO("Skip forward"))
-                  .AddButton( XO("Skip &Forward"),
+                  .AddButton( XXO("Skip &Forward"),
                      wxALIGN_CENTER | wxTOP | wxBOTTOM );
             }
             else
@@ -984,7 +984,7 @@ wxPanel *EffectUIHost::BuildButtonBar(wxWindow *parent)
             mEnableCb = S.Id( kEnableID )
                .Position(wxALIGN_CENTER | wxTOP | wxBOTTOM)
                .Name(XO("Enable"))
-               .AddCheckBox( XO("&Enable"), mEnabled );
+               .AddCheckBox( XXO("&Enable"), mEnabled );
             //
          }
       }
@@ -1569,7 +1569,7 @@ void EffectUIHost::OnSaveAs(wxCommandEvent & WXUNUSED(evt))
       {
          S.StartHorizontalLay(wxALIGN_LEFT, 0);
          {
-            text = S.AddTextBox(XO("Preset name:"), name, 30);
+            text = S.AddTextBox(XXO("Preset name:"), name, 30);
          }
          S.EndHorizontalLay();
          S.SetBorder(10);
diff --git a/src/effects/Equalization.cpp b/src/effects/Equalization.cpp
index 9ebf023b3..cbeeeeaf7 100644
--- a/src/effects/Equalization.cpp
+++ b/src/effects/Equalization.cpp
@@ -944,7 +944,7 @@ void EffectEqualization::PopulateOrExchange(ShuttleGui & S)
          {
             S.StartHorizontalLay(wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);
             {
-               S.AddPrompt(XO("&EQ Type:"));
+               S.AddPrompt(XXO("&EQ Type:"));
             }
             S.EndHorizontalLay();
 
@@ -954,11 +954,11 @@ void EffectEqualization::PopulateOrExchange(ShuttleGui & S)
                {
                   mDraw = S.Id(ID_Draw)
                      .Name(XO("Draw Curves"))
-                     .AddRadioButton(XO("&Draw"));
+                     .AddRadioButton(XXO("&Draw"));
 
                   mGraphic = S.Id(ID_Graphic)
                      .Name(XO("Graphic EQ"))
-                     .AddRadioButtonToGroup(XO("&Graphic"));
+                     .AddRadioButtonToGroup(XXO("&Graphic"));
                }
                S.EndHorizontalLay();
             }
@@ -990,7 +990,7 @@ void EffectEqualization::PopulateOrExchange(ShuttleGui & S)
 
                mLinFreq = S.Id(ID_Linear)
                   .Name(XO("Linear Frequency Scale"))
-                  .AddCheckBox(XO("Li&near Frequency Scale"), false);
+                  .AddCheckBox(XXO("Li&near Frequency Scale"), false);
             }
             S.EndHorizontalLay();
          }
@@ -1005,7 +1005,7 @@ void EffectEqualization::PopulateOrExchange(ShuttleGui & S)
             {
                S.StartHorizontalLay(wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, 0);
                {
-                  S.AddPrompt(XO("Length of &Filter:"));
+                  S.AddPrompt(XXO("Length of &Filter:"));
                }
                S.EndHorizontalLay();
 
@@ -1040,7 +1040,7 @@ void EffectEqualization::PopulateOrExchange(ShuttleGui & S)
             S.AddSpace(5, 5);
             S.StartHorizontalLay(wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL);
             {
-               S.AddPrompt(XO("&Select Curve:"));
+               S.AddPrompt(XXO("&Select Curve:"));
             }
             S.EndHorizontalLay();
 
@@ -1063,17 +1063,17 @@ void EffectEqualization::PopulateOrExchange(ShuttleGui & S)
             }
             S.EndHorizontalLay();
 
-            S.Id(ID_Manage).AddButton(XO("S&ave/Manage Curves..."));
+            S.Id(ID_Manage).AddButton(XXO("S&ave/Manage Curves..."));
          }
 
          S.StartHorizontalLay(wxALIGN_LEFT | wxALIGN_CENTER_VERTICAL, 1);
          {
-            S.Id(ID_Clear).AddButton(XO("Fla&tten"));
-            S.Id(ID_Invert).AddButton(XO("&Invert"));
+            S.Id(ID_Clear).AddButton(XXO("Fla&tten"));
+            S.Id(ID_Invert).AddButton(XXO("&Invert"));
 
             mGridOnOff = S.Id(ID_Grid)
                .Name(XO("Show grid lines"))
-               .AddCheckBox(XO("Show g&rid lines"), false);
+               .AddCheckBox(XXO("Show g&rid lines"), false);
          }
          S.EndHorizontalLay();
 
@@ -1111,27 +1111,27 @@ void EffectEqualization::PopulateOrExchange(ShuttleGui & S)
                : 0;
 
          mMathProcessingType[0] = S.Id(ID_DefaultMath)
-            .AddRadioButton(XO("D&efault"),
+            .AddRadioButton(XXO("D&efault"),
                             0, value);
          mMathProcessingType[1] = S.Id(ID_SSE)
             .Disable(!EffectEqualization48x::GetMathCaps()->SSE)
-            .AddRadioButtonToGroup(XO("&SSE"),
+            .AddRadioButtonToGroup(XXO("&SSE"),
                                    1, value);
          mMathProcessingType[2] = S.Id(ID_SSEThreaded)
             .Disable(!EffectEqualization48x::GetMathCaps()->SSE)
-            .AddRadioButtonToGroup(XO("SSE &Threaded"),
+            .AddRadioButtonToGroup(XXO("SSE &Threaded"),
                                    2, value);
          mMathProcessingType[3] = S.Id(ID_AVX)
             // not implemented
             .Disable(true /* !EffectEqualization48x::GetMathCaps()->AVX */)
-            .AddRadioButtonToGroup(XO("A&VX"),
+            .AddRadioButtonToGroup(XXO("A&VX"),
                                    3, value);
          mMathProcessingType[4] = S.Id(ID_AVXThreaded)
             // not implemented
             .Disable(true /* !EffectEqualization48x::GetMathCaps()->AVX */)
-            .AddRadioButtonToGroup(XO("AV&X Threaded"),
+            .AddRadioButtonToGroup(XXO("AV&X Threaded"),
                                    4, value);
-         S.Id(ID_Bench).AddButton(XO("&Bench"));
+         S.Id(ID_Bench).AddButton(XXO("&Bench"));
       }
       S.EndHorizontalLay();
 
@@ -3394,14 +3394,14 @@ void EditCurvesDialog::PopulateOrExchange(ShuttleGui & S)
       S.EndStatic();
       S.StartVerticalLay(0);
       {
-         S.Id(UpButtonID).AddButton(XO("Move &Up"), wxALIGN_LEFT);
-         S.Id(DownButtonID).AddButton(XO("Move &Down"), wxALIGN_LEFT);
-         S.Id(RenameButtonID).AddButton(XO("&Rename..."), wxALIGN_LEFT);
-         S.Id(DeleteButtonID).AddButton(XO("D&elete..."), wxALIGN_LEFT);
-         S.Id(ImportButtonID).AddButton(XO("I&mport..."), wxALIGN_LEFT);
-         S.Id(ExportButtonID).AddButton(XO("E&xport..."), wxALIGN_LEFT);
-         S.Id(LibraryButtonID).AddButton(XO("&Get More..."), wxALIGN_LEFT);
-         S.Id(DefaultsButtonID).AddButton(XO("De&faults"), wxALIGN_LEFT);
+         S.Id(UpButtonID).AddButton(XXO("Move &Up"), wxALIGN_LEFT);
+         S.Id(DownButtonID).AddButton(XXO("Move &Down"), wxALIGN_LEFT);
+         S.Id(RenameButtonID).AddButton(XXO("&Rename..."), wxALIGN_LEFT);
+         S.Id(DeleteButtonID).AddButton(XXO("D&elete..."), wxALIGN_LEFT);
+         S.Id(ImportButtonID).AddButton(XXO("I&mport..."), wxALIGN_LEFT);
+         S.Id(ExportButtonID).AddButton(XXO("E&xport..."), wxALIGN_LEFT);
+         S.Id(LibraryButtonID).AddButton(XXO("&Get More..."), wxALIGN_LEFT);
+         S.Id(DefaultsButtonID).AddButton(XXO("De&faults"), wxALIGN_LEFT);
       }
       S.EndVerticalLay();
    }
diff --git a/src/effects/FindClipping.cpp b/src/effects/FindClipping.cpp
index c5b6dce7b..1a02f5232 100644
--- a/src/effects/FindClipping.cpp
+++ b/src/effects/FindClipping.cpp
@@ -246,11 +246,11 @@ void EffectFindClipping::PopulateOrExchange(ShuttleGui & S)
    {
       S.Validator<IntegerValidator<int>>(
             &mStart, NumValidatorStyle::DEFAULT, MIN_Start)
-         .TieTextBox(XO("&Start threshold (samples):"), mStart, 10);
+         .TieTextBox(XXO("&Start threshold (samples):"), mStart, 10);
 
       S.Validator<IntegerValidator<int>>(
             &mStop, NumValidatorStyle::DEFAULT, MIN_Stop)
-         .TieTextBox(XO("St&op threshold (samples):"), mStop, 10);
+         .TieTextBox(XXO("St&op threshold (samples):"), mStop, 10);
    }
    S.EndMultiColumn();
 }
diff --git a/src/effects/Loudness.cpp b/src/effects/Loudness.cpp
index 23d40a0ee..9f13d696f 100644
--- a/src/effects/Loudness.cpp
+++ b/src/effects/Loudness.cpp
@@ -328,12 +328,12 @@ void EffectLoudness::PopulateOrExchange(ShuttleGui & S)
 
             mStereoIndCheckBox = S
                .Validator<wxGenericValidator>( &mStereoInd )
-               .AddCheckBox(XO("Normalize &stereo channels independently"),
+               .AddCheckBox(XXO("Normalize &stereo channels independently"),
                   mStereoInd );
 
             mDualMonoCheckBox = S
                .Validator<wxGenericValidator>( &mDualMono )
-               .AddCheckBox(XO("&Treat mono as dual-mono (recommended)"),
+               .AddCheckBox(XXO("&Treat mono as dual-mono (recommended)"),
                   mDualMono );
          }
          S.EndVerticalLay();
diff --git a/src/effects/Noise.cpp b/src/effects/Noise.cpp
index 00f481965..b27698e7b 100644
--- a/src/effects/Noise.cpp
+++ b/src/effects/Noise.cpp
@@ -232,14 +232,14 @@ void EffectNoise::PopulateOrExchange(ShuttleGui & S)
    S.StartMultiColumn(2, wxCENTER);
    {
       S.Validator<wxGenericValidator>(&mType)
-         .AddChoice(XO("&Noise type:"), Msgids(kTypeStrings, nTypes));
+         .AddChoice(XXO("&Noise type:"), Msgids(kTypeStrings, nTypes));
 
       S.Validator<FloatingPointValidator<double>>(
             6, &mAmp, NumValidatorStyle::NO_TRAILING_ZEROES, MIN_Amp, MAX_Amp
          )
-         .AddTextBox(XO("&Amplitude (0-1):"), wxT(""), 12);
+         .AddTextBox(XXO("&Amplitude (0-1):"), wxT(""), 12);
 
-      S.AddPrompt(XO("&Duration:"));
+      S.AddPrompt(XXO("&Duration:"));
       mNoiseDurationT = safenew
          NumericTextCtrl(S.GetParent(), wxID_ANY,
                          NumericConverter::TIME,
diff --git a/src/effects/NoiseReduction.cpp b/src/effects/NoiseReduction.cpp
index 2aa91cf29..a206738a2 100644
--- a/src/effects/NoiseReduction.cpp
+++ b/src/effects/NoiseReduction.cpp
@@ -1487,26 +1487,26 @@ const ControlInfo *controlInfo() {
    static const ControlInfo table[] = {
          ControlInfo(&EffectNoiseReduction::Settings::mNoiseGain,
          0.0, 48.0, 48, wxT("%d"), true,
-         XO("&Noise reduction (dB):"), XO("Noise reduction")),
+         XXO("&Noise reduction (dB):"), XO("Noise reduction")),
          ControlInfo(&EffectNoiseReduction::Settings::mNewSensitivity,
          0.0, 24.0, 48, wxT("%.2f"), false,
-         XO("&Sensitivity:"), XO("Sensitivity")),
+         XXO("&Sensitivity:"), XO("Sensitivity")),
 #ifdef ATTACK_AND_RELEASE
          ControlInfo(&EffectNoiseReduction::Settings::mAttackTime,
          0, 1.0, 100, wxT("%.2f"), false,
-         XO("Attac&k time (secs):"), XO("Attack time")),
+         XXO("Attac&k time (secs):"), XO("Attack time")),
          ControlInfo(&EffectNoiseReduction::Settings::mReleaseTime,
          0, 1.0, 100, wxT("%.2f"), false,
-         XO("R&elease time (secs):"), XO("Release time")),
+         XXO("R&elease time (secs):"), XO("Release time")),
 #endif
          ControlInfo(&EffectNoiseReduction::Settings::mFreqSmoothingBands,
          0, 12, 12, wxT("%d"), true,
-         XO("&Frequency smoothing (bands):"), XO("Frequency smoothing")),
+         XXO("&Frequency smoothing (bands):"), XO("Frequency smoothing")),
 
 #ifdef ADVANCED_SETTINGS
          ControlInfo(&EffectNoiseReduction::Settings::mOldSensitivity,
          -20.0, 20.0, 4000, wxT("%.2f"), false,
-         XO("Sensiti&vity (dB):"), XO("Old Sensitivity")),
+         XXO("Sensiti&vity (dB):"), XO("Old Sensitivity")),
          // add here
 #endif
    };
@@ -1721,7 +1721,7 @@ void EffectNoiseReduction::Dialog::PopulateOrExchange(ShuttleGui & S)
       S.AddVariableText(XO(
 "Select a few seconds of just noise so Audacity knows what to filter out,\nthen click Get Noise Profile:"));
       //m_pButton_GetProfile =
-      S.Id(ID_BUTTON_GETPROFILE).AddButton(XO("&Get Noise Profile"));
+      S.Id(ID_BUTTON_GETPROFILE).AddButton(XXO("&Get Noise Profile"));
    }
    S.EndStatic();
 
@@ -1751,18 +1751,18 @@ void EffectNoiseReduction::Dialog::PopulateOrExchange(ShuttleGui & S)
          ,
          wxALIGN_CENTER_HORIZONTAL);
       {
-         S.AddPrompt(XO("Noise:"));
+         S.AddPrompt(XXO("Noise:"));
          mKeepSignal = S.Id(ID_RADIOBUTTON_KEEPSIGNAL)
                /* i18n-hint: Translate differently from "Residue" ! */
-               .AddRadioButton(XO("Re&duce"));
+               .AddRadioButton(XXO("Re&duce"));
 #ifdef ISOLATE_CHOICE
          mKeepNoise = S.Id(ID_RADIOBUTTON_KEEPNOISE)
-               .AddRadioButtonToGroup(XO("&Isolate"));
+               .AddRadioButtonToGroup(XXO("&Isolate"));
 #endif
 #ifdef RESIDUE_CHOICE
          mResidue = S.Id(ID_RADIOBUTTON_RESIDUE)
                /* i18n-hint: Means the difference between effect and original sound.  Translate differently from "Reduce" ! */
-               .AddRadioButtonToGroup(XO("Resid&ue"));
+               .AddRadioButtonToGroup(XXO("Resid&ue"));
 #endif
       }
       S.EndMultiColumn();
@@ -1775,7 +1775,7 @@ void EffectNoiseReduction::Dialog::PopulateOrExchange(ShuttleGui & S)
    {
       S.StartMultiColumn(2);
       {
-         S.TieChoice(XO("&Window types:"),
+         S.TieChoice(XXO("&Window types:"),
             mTempSettings.mWindowTypes,
             []{
                TranslatableStrings windowTypeChoices;
@@ -1785,7 +1785,7 @@ void EffectNoiseReduction::Dialog::PopulateOrExchange(ShuttleGui & S)
             }()
          );
 
-         S.TieChoice(XO("Window si&ze:"),
+         S.TieChoice(XXO("Window si&ze:"),
             mTempSettings.mWindowSizeChoice,
             {
                XO("8") ,
@@ -1803,7 +1803,7 @@ void EffectNoiseReduction::Dialog::PopulateOrExchange(ShuttleGui & S)
             }
          );
 
-         S.TieChoice(XO("S&teps per window:"),
+         S.TieChoice(XXO("S&teps per window:"),
             mTempSettings.mStepsPerWindowChoice,
             {
                XO("2") ,
@@ -1816,7 +1816,7 @@ void EffectNoiseReduction::Dialog::PopulateOrExchange(ShuttleGui & S)
          );
 
          S.Id(ID_CHOICE_METHOD)
-         .TieChoice(XO("Discrimination &method:"),
+         .TieChoice(XXO("Discrimination &method:"),
             mTempSettings.mMethod,
             []{
                TranslatableStrings methodChoices;
diff --git a/src/effects/NoiseRemoval.cpp b/src/effects/NoiseRemoval.cpp
index 59b7f77e2..56f534490 100644
--- a/src/effects/NoiseRemoval.cpp
+++ b/src/effects/NoiseRemoval.cpp
@@ -714,7 +714,7 @@ void NoiseRemovalDialog::PopulateOrExchange(ShuttleGui & S)
    {
       S.AddVariableText(XO(
 "Select a few seconds of just noise so Audacity knows what to filter out,\nthen click Get Noise Profile:"));
-      m_pButton_GetProfile = S.Id(ID_BUTTON_GETPROFILE).AddButton(XO("&Get Noise Profile"));
+      m_pButton_GetProfile = S.Id(ID_BUTTON_GETPROFILE).AddButton(XXO("&Get Noise Profile"));
    }
    S.EndStatic();
 
@@ -728,7 +728,7 @@ void NoiseRemovalDialog::PopulateOrExchange(ShuttleGui & S)
       {
          mGainT = S.Id(ID_GAIN_TEXT)
             .Validator<wxTextValidator>(wxFILTER_NUMERIC)
-            .AddTextBox(XO("Noise re&duction (dB):"), wxT(""), 0);
+            .AddTextBox(XXO("Noise re&duction (dB):"), wxT(""), 0);
 
          mGainS = S.Id(ID_GAIN_SLIDER)
             .Name(XO("Noise reduction"))
@@ -738,7 +738,7 @@ void NoiseRemovalDialog::PopulateOrExchange(ShuttleGui & S)
 
          mSensitivityT = S.Id(ID_SENSITIVITY_TEXT)
             .Validator<wxTextValidator>(wxFILTER_NUMERIC)
-            .AddTextBox(XO("&Sensitivity (dB):"), wxT(""), 0);
+            .AddTextBox(XXO("&Sensitivity (dB):"), wxT(""), 0);
          mSensitivityS = S.Id(ID_SENSITIVITY_SLIDER)
             .Name(XO("Sensitivity"))
             .Style(wxSL_HORIZONTAL)
@@ -747,7 +747,7 @@ void NoiseRemovalDialog::PopulateOrExchange(ShuttleGui & S)
 
          mFreqT = S.Id(ID_FREQ_TEXT)
             .Validator<wxTextValidator>(wxFILTER_NUMERIC)
-            .AddTextBox(XO("Fr&equency smoothing (Hz):"), wxT(""), 0);
+            .AddTextBox(XXO("Fr&equency smoothing (Hz):"), wxT(""), 0);
          mFreqS = S.Id(ID_FREQ_SLIDER)
             .Name(XO("Frequency smoothing"))
             .Style(wxSL_HORIZONTAL)
@@ -756,18 +756,18 @@ void NoiseRemovalDialog::PopulateOrExchange(ShuttleGui & S)
 
          mTimeT = S.Id(ID_TIME_TEXT)
             .Validator<wxTextValidator>(wxFILTER_NUMERIC)
-            .AddTextBox(XO("Attac&k/decay time (secs):"), wxT(""), 0);
+            .AddTextBox(XXO("Attac&k/decay time (secs):"), wxT(""), 0);
          mTimeS = S.Id(ID_TIME_SLIDER)
             .Name(XO("Attack/decay time"))
             .Style(wxSL_HORIZONTAL)
             .MinSize( { 150, -1 } )
             .AddSlider( {}, 0, TIME_MAX, TIME_MIN);
 
-         S.AddPrompt(XO("Noise:"));
+         S.AddPrompt(XXO("Noise:"));
          mKeepSignal = S.Id(ID_RADIOBUTTON_KEEPSIGNAL)
-               .AddRadioButton(XO("Re&move"));
+               .AddRadioButton(XXO("Re&move"));
          mKeepNoise = S.Id(ID_RADIOBUTTON_KEEPNOISE)
-               .AddRadioButtonToGroup(XO("&Isolate"));
+               .AddRadioButtonToGroup(XXO("&Isolate"));
       }
       S.EndMultiColumn();
    }
diff --git a/src/effects/Normalize.cpp b/src/effects/Normalize.cpp
index e120fab67..e8afcbc97 100644
--- a/src/effects/Normalize.cpp
+++ b/src/effects/Normalize.cpp
@@ -298,7 +298,7 @@ void EffectNormalize::PopulateOrExchange(ShuttleGui & S)
          S.StartVerticalLay(false);
          {
             mDCCheckBox = S.Validator<wxGenericValidator>(&mDC)
-               .AddCheckBox(XO("&Remove DC offset (center on 0.0 vertically)"),
+               .AddCheckBox(XXO("&Remove DC offset (center on 0.0 vertically)"),
                                         mDC);
 
             S.StartHorizontalLay(wxALIGN_LEFT, false);
@@ -306,7 +306,7 @@ void EffectNormalize::PopulateOrExchange(ShuttleGui & S)
                mGainCheckBox = S
                   .MinSize()
                   .Validator<wxGenericValidator>(&mGain)
-                  .AddCheckBox(XO("&Normalize peak amplitude to   "),
+                  .AddCheckBox(XXO("&Normalize peak amplitude to   "),
                      mGain);
 
                mLevelTextCtrl = S
@@ -328,7 +328,7 @@ void EffectNormalize::PopulateOrExchange(ShuttleGui & S)
 
             mStereoIndCheckBox = S
                .Validator<wxGenericValidator>(&mStereoInd)
-               .AddCheckBox(XO("N&ormalize stereo channels independently"),
+               .AddCheckBox(XXO("N&ormalize stereo channels independently"),
                                                mStereoInd);
          }
          S.EndVerticalLay();
diff --git a/src/effects/Paulstretch.cpp b/src/effects/Paulstretch.cpp
index f12a3759e..98bd02f26 100644
--- a/src/effects/Paulstretch.cpp
+++ b/src/effects/Paulstretch.cpp
@@ -206,11 +206,11 @@ void EffectPaulstretch::PopulateOrExchange(ShuttleGui & S)
           * the effect to a 1-second sample, with the default Stretch Factor of 10.0
           * will give an (approximately) 10 second sound
           */
-         .AddTextBox(XO("&Stretch Factor:"), wxT(""), 10);
+         .AddTextBox(XXO("&Stretch Factor:"), wxT(""), 10);
 
       S.Validator<FloatingPointValidator<float>>(
             3, &mTime_resolution, NumValidatorStyle::ONE_TRAILING_ZERO, MIN_Time)
-         .AddTextBox(XO("&Time Resolution (seconds):"), wxT(""), 10);
+         .AddTextBox(XXO("&Time Resolution (seconds):"), wxT(""), 10);
    }
    S.EndMultiColumn();
 };
diff --git a/src/effects/Phaser.cpp b/src/effects/Phaser.cpp
index edcf120db..8bf244e37 100644
--- a/src/effects/Phaser.cpp
+++ b/src/effects/Phaser.cpp
@@ -265,7 +265,7 @@ void EffectPhaser::PopulateOrExchange(ShuttleGui & S)
       mStagesT = S.Id(ID_Stages)
          .Validator<IntegerValidator<int>>(
             &mStages, NumValidatorStyle::DEFAULT, MIN_Stages, MAX_Stages)
-         .AddTextBox(XO("&Stages:"), wxT(""), 15);
+         .AddTextBox(XXO("&Stages:"), wxT(""), 15);
 
       mStagesS = S.Id(ID_Stages)
          .Name(XO("Stages"))
@@ -277,7 +277,7 @@ void EffectPhaser::PopulateOrExchange(ShuttleGui & S)
       mDryWetT = S.Id(ID_DryWet)
          .Validator<IntegerValidator<int>>(
             &mDryWet, NumValidatorStyle::DEFAULT, MIN_DryWet, MAX_DryWet)
-         .AddTextBox(XO("&Dry/Wet:"), wxT(""), 15);
+         .AddTextBox(XXO("&Dry/Wet:"), wxT(""), 15);
 
       mDryWetS = S.Id(ID_DryWet)
          .Name(XO("Dry Wet"))
@@ -288,7 +288,7 @@ void EffectPhaser::PopulateOrExchange(ShuttleGui & S)
       mFreqT = S.Id(ID_Freq)
          .Validator<FloatingPointValidator<double>>(
             5, &mFreq, NumValidatorStyle::ONE_TRAILING_ZERO, MIN_Freq, MAX_Freq)
-         .AddTextBox(XO("LFO Freq&uency (Hz):"), wxT(""), 15);
+         .AddTextBox(XXO("LFO Freq&uency (Hz):"), wxT(""), 15);
 
       mFreqS = S.Id(ID_Freq)
          .Name(XO("LFO frequency in hertz"))
@@ -299,7 +299,7 @@ void EffectPhaser::PopulateOrExchange(ShuttleGui & S)
       mPhaseT = S.Id(ID_Phase)
          .Validator<FloatingPointValidator<double>>(
             1, &mPhase, NumValidatorStyle::DEFAULT, MIN_Phase, MAX_Phase)
-         .AddTextBox(XO("LFO Sta&rt Phase (deg.):"), wxT(""), 15);
+         .AddTextBox(XXO("LFO Sta&rt Phase (deg.):"), wxT(""), 15);
 
       mPhaseS = S.Id(ID_Phase)
          .Name(XO("LFO start phase in degrees"))
@@ -311,7 +311,7 @@ void EffectPhaser::PopulateOrExchange(ShuttleGui & S)
       mDepthT = S.Id(ID_Depth)
          .Validator<IntegerValidator<int>>(
             &mDepth, NumValidatorStyle::DEFAULT, MIN_Depth, MAX_Depth)
-         .AddTextBox(XO("Dept&h:"), wxT(""), 15);
+         .AddTextBox(XXO("Dept&h:"), wxT(""), 15);
 
       mDepthS = S.Id(ID_Depth)
          .Name(XO("Depth in percent"))
@@ -322,7 +322,7 @@ void EffectPhaser::PopulateOrExchange(ShuttleGui & S)
       mFeedbackT = S.Id(ID_Feedback)
          .Validator<IntegerValidator<int>>(
             &mFeedback, NumValidatorStyle::DEFAULT, MIN_Feedback, MAX_Feedback)
-         .AddTextBox(XO("Feedbac&k (%):"), wxT(""), 15);
+         .AddTextBox(XXO("Feedbac&k (%):"), wxT(""), 15);
 
       mFeedbackS = S.Id(ID_Feedback)
          .Name(XO("Feedback in percent"))
@@ -334,7 +334,7 @@ void EffectPhaser::PopulateOrExchange(ShuttleGui & S)
       mOutGainT = S.Id(ID_OutGain)
          .Validator<FloatingPointValidator<double>>(
             1, &mOutGain, NumValidatorStyle::DEFAULT, MIN_OutGain, MAX_OutGain)
-         .AddTextBox(XO("&Output gain (dB):"), wxT(""), 12);
+         .AddTextBox(XXO("&Output gain (dB):"), wxT(""), 12);
 
       mOutGainS = S.Id(ID_OutGain)
          .Name(XO("Output gain (dB)"))
diff --git a/src/effects/Repeat.cpp b/src/effects/Repeat.cpp
index 174036f34..ebe217b3d 100644
--- a/src/effects/Repeat.cpp
+++ b/src/effects/Repeat.cpp
@@ -183,7 +183,7 @@ void EffectRepeat::PopulateOrExchange(ShuttleGui & S)
             &repeatCount, NumValidatorStyle::DEFAULT,
             MIN_Count, 2147483647 / mProjectRate
          )
-         .AddTextBox(XO("&Number of repeats to add:"), wxT(""), 12);
+         .AddTextBox(XXO("&Number of repeats to add:"), wxT(""), 12);
    }
    S.EndHorizontalLay();
 
diff --git a/src/effects/Reverb.cpp b/src/effects/Reverb.cpp
index f837f88e1..aacb64d96 100644
--- a/src/effects/Reverb.cpp
+++ b/src/effects/Reverb.cpp
@@ -450,15 +450,15 @@ void EffectReverb::PopulateOrExchange(ShuttleGui & S)
          .Style(wxSL_HORIZONTAL) \
          .AddSlider( {}, DEF_ ## n, MAX_ ## n, MIN_ ## n);
 
-      SpinSlider(RoomSize,       XO("&Room Size (%):"))
-      SpinSlider(PreDelay,       XO("&Pre-delay (ms):"))
-      SpinSlider(Reverberance,   XO("Rever&berance (%):"))
-      SpinSlider(HfDamping,      XO("Da&mping (%):"))
-      SpinSlider(ToneLow,        XO("Tone &Low (%):"))
-      SpinSlider(ToneHigh,       XO("Tone &High (%):"))
-      SpinSlider(WetGain,        XO("Wet &Gain (dB):"))
-      SpinSlider(DryGain,        XO("Dr&y Gain (dB):"))
-      SpinSlider(StereoWidth,    XO("Stereo Wid&th (%):"))
+      SpinSlider(RoomSize,       XXO("&Room Size (%):"))
+      SpinSlider(PreDelay,       XXO("&Pre-delay (ms):"))
+      SpinSlider(Reverberance,   XXO("Rever&berance (%):"))
+      SpinSlider(HfDamping,      XXO("Da&mping (%):"))
+      SpinSlider(ToneLow,        XXO("Tone &Low (%):"))
+      SpinSlider(ToneHigh,       XXO("Tone &High (%):"))
+      SpinSlider(WetGain,        XXO("Wet &Gain (dB):"))
+      SpinSlider(DryGain,        XXO("Dr&y Gain (dB):"))
+      SpinSlider(StereoWidth,    XXO("Stereo Wid&th (%):"))
 
 #undef SpinSlider
 
@@ -468,7 +468,7 @@ void EffectReverb::PopulateOrExchange(ShuttleGui & S)
    S.StartHorizontalLay(wxCENTER, false);
    {
       mWetOnlyC = S.Id(ID_WetOnly).
-         AddCheckBox(XO("Wet O&nly"), DEF_WetOnly);
+         AddCheckBox(XXO("Wet O&nly"), DEF_WetOnly);
    }
    S.EndHorizontalLay();
 
diff --git a/src/effects/ScienFilter.cpp b/src/effects/ScienFilter.cpp
index 7e3ceee21..b8ddf7c51 100644
--- a/src/effects/ScienFilter.cpp
+++ b/src/effects/ScienFilter.cpp
@@ -473,7 +473,7 @@ void EffectScienFilter::PopulateOrExchange(ShuttleGui & S)
             .Focus()
             .Validator<wxGenericValidator>(&mFilterType)
             .MinSize( { -1, -1 } )
-            .AddChoice(XO("&Filter Type:"),
+            .AddChoice(XXO("&Filter Type:"),
                Msgids(kTypeStrings, nTypes)
             );
 
@@ -481,7 +481,7 @@ void EffectScienFilter::PopulateOrExchange(ShuttleGui & S)
             .Validator<wxGenericValidator>(&mOrderIndex)
             .MinSize( { -1, -1 } )
             /*i18n-hint: 'Order' means the complexity of the filter, and is a number between 1 and 10.*/
-            .AddChoice(XO("O&rder:"),
+            .AddChoice(XXO("O&rder:"),
                []{
                   TranslatableStrings orders;
                   for (int i = 1; i <= 10; i++)
@@ -505,7 +505,7 @@ void EffectScienFilter::PopulateOrExchange(ShuttleGui & S)
          mFilterSubTypeCtl = S.Id(ID_SubType)
             .Validator<wxGenericValidator>(&mFilterSubtype)
             .MinSize( { -1, -1 } )
-            .AddChoice(XO("&Subtype:"),
+            .AddChoice(XXO("&Subtype:"),
                Msgids(kSubTypeStrings, nSubTypes)
             );
 
@@ -514,7 +514,7 @@ void EffectScienFilter::PopulateOrExchange(ShuttleGui & S)
             .Validator<FloatingPointValidator<float>>(
                1, &mCutoff, NumValidatorStyle::DEFAULT,
                MIN_Cutoff, mNyquist - 1)
-            .AddTextBox(XO("C&utoff:"), wxT(""), 10);
+            .AddTextBox(XXO("C&utoff:"), wxT(""), 10);
          S.AddUnits(XO("Hz"));
 
          mStopbandRippleCtlP =
diff --git a/src/effects/Silence.cpp b/src/effects/Silence.cpp
index 33c7c5f3e..04284408b 100644
--- a/src/effects/Silence.cpp
+++ b/src/effects/Silence.cpp
@@ -70,7 +70,7 @@ void EffectSilence::PopulateOrExchange(ShuttleGui & S)
    {
       S.StartHorizontalLay();
       {
-         S.AddPrompt(XO("&Duration:"));
+         S.AddPrompt(XXO("&Duration:"));
          mDurationT = safenew
             NumericTextCtrl(S.GetParent(), wxID_ANY,
                               NumericConverter::TIME,
diff --git a/src/effects/TimeScale.cpp b/src/effects/TimeScale.cpp
index 705cab859..d639dca78 100644
--- a/src/effects/TimeScale.cpp
+++ b/src/effects/TimeScale.cpp
@@ -265,7 +265,7 @@ void EffectTimeScale::PopulateOrExchange(ShuttleGui & S)
                   NumValidatorStyle::NO_TRAILING_ZEROES,
                   MIN_HalfStepsStart, MAX_HalfStepsStart
                )
-               .AddTextBox(XO("(&semitones) [-12 to 12]:"), wxT(""), 12);
+               .AddTextBox(XXO("(&semitones) [-12 to 12]:"), wxT(""), 12);
 
 
             m_pTextCtrl_PitchPercentChangeStart = S.Id(ID_PitchPercentChangeStart)
@@ -274,7 +274,7 @@ void EffectTimeScale::PopulateOrExchange(ShuttleGui & S)
                   NumValidatorStyle::NO_TRAILING_ZEROES,
                   MIN_PitchPercentStart, MAX_PitchPercentStart
                )
-               .AddTextBox(XO("(%) [-50 to 100]:"), wxT(""), 12);
+               .AddTextBox(XXO("(%) [-50 to 100]:"), wxT(""), 12);
          }
          S.EndMultiColumn();
       }
@@ -291,14 +291,14 @@ void EffectTimeScale::PopulateOrExchange(ShuttleGui & S)
                   NumValidatorStyle::NO_TRAILING_ZEROES,
                   MIN_HalfStepsEnd, MAX_HalfStepsEnd
                )
-               .AddTextBox(XO("(s&emitones) [-12 to 12]:"), wxT(""), 12);
+               .AddTextBox(XXO("(s&emitones) [-12 to 12]:"), wxT(""), 12);
 
             m_pTextCtrl_PitchPercentChangeEnd = S.Id(ID_PitchPercentChangeEnd)
                .Validator<FloatingPointValidator<double>>(
                   3, &m_PitchPercentChangeEnd,
                   NumValidatorStyle::NO_TRAILING_ZEROES,
                   MIN_PitchPercentStart, MAX_PitchPercentStart)
-               .AddTextBox(XO("(%) [-50 to 100]:"), wxT(""), 12);
+               .AddTextBox(XXO("(%) [-50 to 100]:"), wxT(""), 12);
          }
          S.EndMultiColumn();
       }
diff --git a/src/effects/ToneGen.cpp b/src/effects/ToneGen.cpp
index 151ed2a19..be0dbeb3f 100644
--- a/src/effects/ToneGen.cpp
+++ b/src/effects/ToneGen.cpp
@@ -352,7 +352,7 @@ void EffectToneGen::PopulateOrExchange(ShuttleGui & S)
    S.StartMultiColumn(2, wxCENTER);
    {
       S.Validator<wxGenericValidator>(&mWaveform)
-         .AddChoice(XO("&Waveform:"),
+         .AddChoice(XXO("&Waveform:"),
             Msgids( kWaveStrings, nWaveforms ) );
 
       if (mChirp)
@@ -374,7 +374,7 @@ void EffectToneGen::PopulateOrExchange(ShuttleGui & S)
          }
          S.EndHorizontalLay();
 
-         S.AddPrompt(XO("&Frequency (Hz):"));
+         S.AddPrompt(XXO("&Frequency (Hz):"));
          S.StartHorizontalLay(wxEXPAND);
          {
             S.StartHorizontalLay(wxLEFT, 50);
@@ -405,7 +405,7 @@ void EffectToneGen::PopulateOrExchange(ShuttleGui & S)
          }
          S.EndHorizontalLay();
 
-         S.AddPrompt(XO("&Amplitude (0-1):"));
+         S.AddPrompt(XXO("&Amplitude (0-1):"));
          S.StartHorizontalLay(wxEXPAND);
          {
             S.StartHorizontalLay(wxLEFT, 50);
@@ -433,7 +433,7 @@ void EffectToneGen::PopulateOrExchange(ShuttleGui & S)
          S.EndHorizontalLay();
 
          S.Validator<wxGenericValidator>(&mInterpolation)
-            .AddChoice(XO("I&nterpolation:"),
+            .AddChoice(XXO("I&nterpolation:"),
                Msgids( kInterStrings, nInterpolations ) );
       }
       else
@@ -443,16 +443,16 @@ void EffectToneGen::PopulateOrExchange(ShuttleGui & S)
                MIN_Frequency,
                mProjectRate / 2.0
             )
-            .AddTextBox(XO("&Frequency (Hz):"), wxT(""), 12);
+            .AddTextBox(XXO("&Frequency (Hz):"), wxT(""), 12);
 
          t = S.Validator<FloatingPointValidator<double>>(
                6, &mAmplitude[0], NumValidatorStyle::NO_TRAILING_ZEROES,
                MIN_Amplitude, MAX_Amplitude
             )
-            .AddTextBox(XO("&Amplitude (0-1):"), wxT(""), 12);
+            .AddTextBox(XXO("&Amplitude (0-1):"), wxT(""), 12);
       }
 
-      S.AddPrompt(XO("&Duration:"));
+      S.AddPrompt(XXO("&Duration:"));
       mToneDurationT = safenew
          NumericTextCtrl(S.GetParent(), wxID_ANY,
                          NumericConverter::TIME,
diff --git a/src/effects/TruncSilence.cpp b/src/effects/TruncSilence.cpp
index cec633b84..1d8d525d7 100644
--- a/src/effects/TruncSilence.cpp
+++ b/src/effects/TruncSilence.cpp
@@ -768,7 +768,7 @@ void EffectTruncSilence::PopulateOrExchange(ShuttleGui & S)
                MIN_Threshold, MAX_Threshold
             )
             .NameSuffix(XO("db"))
-            .AddTextBox(XO("&Threshold:"), wxT(""), 0);
+            .AddTextBox(XXO("&Threshold:"), wxT(""), 0);
          S.AddUnits(XO("dB"));
 
          // Ignored silence
@@ -777,7 +777,7 @@ void EffectTruncSilence::PopulateOrExchange(ShuttleGui & S)
                NumValidatorStyle::NO_TRAILING_ZEROES,
                MIN_Minimum, MAX_Minimum)
             .NameSuffix(XO("seconds"))
-            .AddTextBox(XO("&Duration:"), wxT(""), 12);
+            .AddTextBox(XXO("&Duration:"), wxT(""), 12);
          S.AddUnits(XO("seconds"));
       }
       S.EndMultiColumn();
@@ -806,7 +806,7 @@ void EffectTruncSilence::PopulateOrExchange(ShuttleGui & S)
                MIN_Truncate, MAX_Truncate
             )
             .NameSuffix(XO("seconds"))
-            .AddTextBox(XO("Tr&uncate to:"), wxT(""), 12);
+            .AddTextBox(XXO("Tr&uncate to:"), wxT(""), 12);
          S.AddUnits(XO("seconds"));
 
          mSilenceCompressPercentT = S.Validator<FloatingPointValidator<double>>(
@@ -815,14 +815,14 @@ void EffectTruncSilence::PopulateOrExchange(ShuttleGui & S)
                MIN_Compress, MAX_Compress
             )
             .NameSuffix(XO("%"))
-            .AddTextBox(XO("C&ompress to:"), wxT(""), 12);
+            .AddTextBox(XXO("C&ompress to:"), wxT(""), 12);
          S.AddUnits(XO("%"));
       }
       S.EndMultiColumn();
 
       S.StartMultiColumn(2, wxALIGN_CENTER_HORIZONTAL);
       {
-         mIndependent = S.AddCheckBox(XO("Trunc&ate tracks independently"),
+         mIndependent = S.AddCheckBox(XXO("Trunc&ate tracks independently"),
             mbIndependent);
       }
    S.EndMultiColumn();
diff --git a/src/effects/VST/VSTEffect.cpp b/src/effects/VST/VSTEffect.cpp
index 59305246a..8512ef31a 100644
--- a/src/effects/VST/VSTEffect.cpp
+++ b/src/effects/VST/VSTEffect.cpp
@@ -825,7 +825,7 @@ void VSTEffectOptionsDialog::PopulateOrExchange(ShuttleGui & S)
                t = S.Validator<IntegerValidator<int>>(
                      &mBufferSize, NumValidatorStyle::DEFAULT, 8, 1048576 * 1)
                   .MinSize( { 100, -1 } )
-                  .TieNumericTextBox(XO("&Buffer Size (8 to 1048576 samples):"),
+                  .TieNumericTextBox(XXO("&Buffer Size (8 to 1048576 samples):"),
                                        mBufferSize,
                                        12);
             }
@@ -845,7 +845,7 @@ void VSTEffectOptionsDialog::PopulateOrExchange(ShuttleGui & S)
 
             S.StartHorizontalLay(wxALIGN_LEFT);
             {
-               S.TieCheckBox(XO("Enable &compensation"),
+               S.TieCheckBox(XXO("Enable &compensation"),
                              mUseLatency);
             }
             S.EndHorizontalLay();
@@ -859,7 +859,7 @@ void VSTEffectOptionsDialog::PopulateOrExchange(ShuttleGui & S)
 " A basic text-only method is also available. "
 " Reopen the effect for this to take effect."),
                false, 0, 650);
-            S.TieCheckBox(XO("Enable &graphical interface"),
+            S.TieCheckBox(XXO("Enable &graphical interface"),
                           mUseGUI);
          }
          S.EndStatic();
diff --git a/src/effects/Wahwah.cpp b/src/effects/Wahwah.cpp
index fac9760bd..bb7d05ee9 100644
--- a/src/effects/Wahwah.cpp
+++ b/src/effects/Wahwah.cpp
@@ -249,7 +249,7 @@ void EffectWahwah::PopulateOrExchange(ShuttleGui & S)
       mFreqT = S.Id(ID_Freq)
          .Validator<FloatingPointValidator<double>>(
             5, &mFreq, NumValidatorStyle::ONE_TRAILING_ZERO, MIN_Freq, MAX_Freq)
-         .AddTextBox(XO("LFO Freq&uency (Hz):"), wxT(""), 12);
+         .AddTextBox(XXO("LFO Freq&uency (Hz):"), wxT(""), 12);
 
       mFreqS = S.Id(ID_Freq)
          .Name(XO("LFO frequency in hertz"))
@@ -260,7 +260,7 @@ void EffectWahwah::PopulateOrExchange(ShuttleGui & S)
       mPhaseT = S.Id(ID_Phase)
          .Validator<FloatingPointValidator<double>>(
             1, &mPhase, NumValidatorStyle::DEFAULT, MIN_Phase, MAX_Phase)
-         .AddTextBox(XO("LFO Sta&rt Phase (deg.):"), wxT(""), 12);
+         .AddTextBox(XXO("LFO Sta&rt Phase (deg.):"), wxT(""), 12);
 
       mPhaseS = S.Id(ID_Phase)
          .Name(XO("LFO start phase in degrees"))
@@ -272,7 +272,7 @@ void EffectWahwah::PopulateOrExchange(ShuttleGui & S)
       mDepthT = S.Id(ID_Depth)
          .Validator<IntegerValidator<int>>(
             &mDepth, NumValidatorStyle::DEFAULT, MIN_Depth, MAX_Depth)
-         .AddTextBox(XO("Dept&h (%):"), wxT(""), 12);
+         .AddTextBox(XXO("Dept&h (%):"), wxT(""), 12);
 
       mDepthS = S.Id(ID_Depth)
          .Name(XO("Depth in percent"))
@@ -283,7 +283,7 @@ void EffectWahwah::PopulateOrExchange(ShuttleGui & S)
       mResT = S.Id(ID_Res)
          .Validator<FloatingPointValidator<double>>(
             1, &mRes, NumValidatorStyle::DEFAULT, MIN_Res, MAX_Res)
-         .AddTextBox(XO("Reso&nance:"), wxT(""), 12);
+         .AddTextBox(XXO("Reso&nance:"), wxT(""), 12);
 
       mResS = S.Id(ID_Res)
          .Name(XO("Resonance"))
@@ -294,7 +294,7 @@ void EffectWahwah::PopulateOrExchange(ShuttleGui & S)
       mFreqOfsT = S.Id(ID_FreqOfs)
          .Validator<IntegerValidator<int>>(
             &mFreqOfs, NumValidatorStyle::DEFAULT, MIN_FreqOfs, MAX_FreqOfs)
-         .AddTextBox(XO("Wah Frequency Offse&t (%):"), wxT(""), 12);
+         .AddTextBox(XXO("Wah Frequency Offse&t (%):"), wxT(""), 12);
 
       mFreqOfsS = S.Id(ID_FreqOfs)
          .Name(XO("Wah frequency offset in percent"))
@@ -305,7 +305,7 @@ void EffectWahwah::PopulateOrExchange(ShuttleGui & S)
       mOutGainT = S.Id(ID_OutGain)
          .Validator<FloatingPointValidator<double>>(
             1, &mOutGain, NumValidatorStyle::DEFAULT, MIN_OutGain, MAX_OutGain)
-         .AddTextBox(XO("&Output gain (dB):"), wxT(""), 12);
+         .AddTextBox(XXO("&Output gain (dB):"), wxT(""), 12);
 
       mOutGainS = S.Id(ID_OutGain)
          .Name(XO("Output gain (dB)"))
diff --git a/src/effects/audiounits/AudioUnitEffect.cpp b/src/effects/audiounits/AudioUnitEffect.cpp
index 8eb10d43c..2faa3d994 100644
--- a/src/effects/audiounits/AudioUnitEffect.cpp
+++ b/src/effects/audiounits/AudioUnitEffect.cpp
@@ -568,7 +568,7 @@ void AudioUnitEffectOptionsDialog::PopulateOrExchange(ShuttleGui & S)
 
             S.StartHorizontalLay(wxALIGN_LEFT);
             {
-               S.TieCheckBox(XO("Enable &compensation"),
+               S.TieCheckBox(XXO("Enable &compensation"),
                              mUseLatency);
             }
             S.EndHorizontalLay();
@@ -588,7 +588,7 @@ void AudioUnitEffectOptionsDialog::PopulateOrExchange(ShuttleGui & S)
 
             S.StartHorizontalLay(wxALIGN_LEFT);
             {
-               S.TieChoice(XO("Select &interface"),
+               S.TieChoice(XXO("Select &interface"),
                   mUIType,
                   {
                      XO("Full"),
diff --git a/src/effects/ladspa/LadspaEffect.cpp b/src/effects/ladspa/LadspaEffect.cpp
index 71f96e517..b830ec5e4 100644
--- a/src/effects/ladspa/LadspaEffect.cpp
+++ b/src/effects/ladspa/LadspaEffect.cpp
@@ -461,7 +461,7 @@ void LadspaEffectOptionsDialog::PopulateOrExchange(ShuttleGui & S)
 
             S.StartHorizontalLay(wxALIGN_LEFT);
             {
-               S.TieCheckBox(XO("Enable &compensation"),
+               S.TieCheckBox(XXO("Enable &compensation"),
                              mUseLatency);
             }
             S.EndHorizontalLay();
diff --git a/src/effects/lv2/LV2Effect.cpp b/src/effects/lv2/LV2Effect.cpp
index 53deec549..c020589d1 100755
--- a/src/effects/lv2/LV2Effect.cpp
+++ b/src/effects/lv2/LV2Effect.cpp
@@ -261,7 +261,7 @@ void LV2EffectSettingsDialog::PopulateOrExchange(ShuttleGui &S)
             {
                wxTextCtrl *t;
                t = S.TieNumericTextBox(
-                  XO("&Buffer Size (8 to %d) samples:")
+                  XXO("&Buffer Size (8 to %d) samples:")
                      .Format( DEFAULT_BLOCKSIZE ),
                   mBufferSize,
                   12);
@@ -284,7 +284,7 @@ void LV2EffectSettingsDialog::PopulateOrExchange(ShuttleGui &S)
 
             S.StartHorizontalLay(wxALIGN_LEFT);
             {
-               S.TieCheckBox(XO("Enable &compensation"),
+               S.TieCheckBox(XXO("Enable &compensation"),
                              mUseLatency);
             }
             S.EndHorizontalLay();
@@ -298,7 +298,7 @@ void LV2EffectSettingsDialog::PopulateOrExchange(ShuttleGui &S)
 " A basic text-only method is also available. "
 " Reopen the effect for this to take effect."),
                false, 0, 650);
-            S.TieCheckBox(XO("Enable &graphical interface"),
+            S.TieCheckBox(XXO("Enable &graphical interface"),
                           mUseGUI);
          }
          S.EndStatic();
diff --git a/src/effects/nyquist/Nyquist.cpp b/src/effects/nyquist/Nyquist.cpp
index 31890841f..0ac0c29ae 100644
--- a/src/effects/nyquist/Nyquist.cpp
+++ b/src/effects/nyquist/Nyquist.cpp
@@ -2675,7 +2675,7 @@ void NyquistEffect::BuildPromptWindow(ShuttleGui & S)
 
          S.AddSpace(1, 1);
 
-         mVersionCheckBox = S.AddCheckBox(XO("&Use legacy (version 3) syntax."),
+         mVersionCheckBox = S.AddCheckBox(XXO("&Use legacy (version 3) syntax."),
                                           (mVersion == 3));
       }
       S.EndMultiColumn();
@@ -2690,8 +2690,8 @@ void NyquistEffect::BuildPromptWindow(ShuttleGui & S)
 
       S.StartHorizontalLay(wxALIGN_CENTER, 0);
       {
-         S.Id(ID_Load).AddButton(XO("&Load"));
-         S.Id(ID_Save).AddButton(XO("&Save"));
+         S.Id(ID_Load).AddButton(XXO("&Load"));
+         S.Id(ID_Save).AddButton(XXO("&Save"));
       }
       S.EndHorizontalLay();
    }
@@ -2722,7 +2722,7 @@ void NyquistEffect::BuildEffectWindow(ShuttleGui & S)
             }
             else
             {
-               auto prompt = XO("%s:").Format( ctrl.name );
+               auto prompt = XXO("%s:").Format( ctrl.name );
                S.AddPrompt( prompt );
 
                if (ctrl.type == NYQ_CTRL_STRING)
@@ -3264,7 +3264,7 @@ NyquistOutputDialog::NyquistOutputDialog(wxWindow * parent, wxWindowID id,
       S.StartHorizontalLay(wxALIGN_CENTRE | wxLEFT | wxBOTTOM | wxRIGHT, 0 );
       {
          /* i18n-hint: In most languages OK is to be translated as OK.  It appears on a button.*/
-         S.Id(wxID_OK).AddButton( XO("OK"), wxALIGN_CENTRE, true );
+         S.Id(wxID_OK).AddButton( XXO("OK"), wxALIGN_CENTRE, true );
       }
       S.EndHorizontalLay();
 
diff --git a/src/effects/vamp/VampEffect.cpp b/src/effects/vamp/VampEffect.cpp
index 8c9b82b06..5e3a67a9c 100644
--- a/src/effects/vamp/VampEffect.cpp
+++ b/src/effects/vamp/VampEffect.cpp
@@ -558,7 +558,7 @@ void VampEffect::PopulateOrExchange(ShuttleGui & S)
 
             if (!programs.empty())
             {
-               S.AddPrompt(XO("Program"));
+               S.AddPrompt(XXO("Program"));
 
                S.Id(ID_Program);
                mProgram = S.Name(XO("Program"))
@@ -600,7 +600,7 @@ void VampEffect::PopulateOrExchange(ShuttleGui & S)
                }
                /* i18n-hint: An item name introducing a value, which is not part of the string but
                appears in a following text box window; translate with appropriate punctuation */
-               S.AddPrompt(XO("%s:").Format( labelText ));
+               S.AddPrompt(XXO("%s:").Format( labelText ));
 
                if (mParameters[p].isQuantized &&
                    mParameters[p].quantizeStep == 1.0 &&
diff --git a/src/export/ExportCL.cpp b/src/export/ExportCL.cpp
index 317e6663b..198a671bb 100644
--- a/src/export/ExportCL.cpp
+++ b/src/export/ExportCL.cpp
@@ -131,13 +131,13 @@ void ExportCLOptions::PopulateOrExchange(ShuttleGui & S)
          S.StartMultiColumn(3, wxEXPAND);
          {
             S.SetStretchyCol(1);
-            mCmd = S.AddCombo(XO("Command:"),
+            mCmd = S.AddCombo(XXO("Command:"),
                               cmd,
                               cmds);
-            S.Id(ID_BROWSE).AddButton(XO("Browse..."),
+            S.Id(ID_BROWSE).AddButton(XXO("Browse..."),
                                       wxALIGN_CENTER_VERTICAL);
             S.AddFixedText( {} );
-            S.TieCheckBox(XO("Show output"),
+            S.TieCheckBox(XXO("Show output"),
                           {wxT("/FileFormats/ExternalProgramShowOutput"),
                            false});
          }
@@ -601,7 +601,7 @@ ProgressResult ExportCL::Export(AudacityProject *project,
          .AddTextWindow(mCmd + wxT("\n\n") + output);
       S.StartHorizontalLay(wxALIGN_CENTER, false);
       {
-         S.Id(wxID_OK).AddButton(XO("&OK"), wxALIGN_CENTER, true);
+         S.Id(wxID_OK).AddButton(XXO("&OK"), wxALIGN_CENTER, true);
       }
       dlg.GetSizer()->AddSpacer(5);
       dlg.Layout();
diff --git a/src/export/ExportFFmpegDialogs.cpp b/src/export/ExportFFmpegDialogs.cpp
index e5ec51d2b..0d3ef7ad6 100644
--- a/src/export/ExportFFmpegDialogs.cpp
+++ b/src/export/ExportFFmpegDialogs.cpp
@@ -221,7 +221,7 @@ void ExportFFmpegAC3Options::PopulateOrExchange(ShuttleGui & S)
          S.StartMultiColumn(2, wxCENTER);
          {
             S.TieNumberAsChoice(
-               XO("Bit Rate:"),
+               XXO("Bit Rate:"),
                {wxT("/FileFormats/AC3BitRate"),
                 160000},
                AC3BitRateNames,
@@ -285,7 +285,7 @@ void ExportFFmpegAACOptions::PopulateOrExchange(ShuttleGui & S)
          {
             S.SetStretchyCol(1);
             S.Prop(1).TieSlider(
-               XO("Quality (kbps):"),
+               XXO("Quality (kbps):"),
                {wxT("/FileFormats/AACQuality"), 160},320, 98);
          }
          S.EndMultiColumn();
@@ -376,7 +376,7 @@ void ExportFFmpegAMRNBOptions::PopulateOrExchange(ShuttleGui & S)
          S.StartMultiColumn(2, wxCENTER);
          {
             S.TieNumberAsChoice(
-               XO("Bit Rate:"),
+               XXO("Bit Rate:"),
                {wxT("/FileFormats/AMRNBBitRate"),
                 12200},
                AMRNBBitRateNames,
@@ -473,7 +473,7 @@ namespace {
             XO("7"),
             XO("8"),
             XO("9"),
-            XO("10"), 
+            XO("10"),
          },
          {
             wxT("0"),
@@ -611,15 +611,15 @@ void ExportFFmpegOPUSOptions::PopulateOrExchange(ShuttleGui & S)
             S.StartMultiColumn(2, wxCENTER);
             {
                S.TieChoice(
-                  XO("Bit Rate:"),
+                  XXO("Bit Rate:"),
                   OPUSBitrate);
 
                S.TieChoice(
-                  XO("Compression"),
+                  XXO("Compression"),
                   OPUSCompression);
 
                S.TieChoice(
-                  XO("Frame Duration:"),
+                  XXO("Frame Duration:"),
                   OPUSFrameDuration);
             }
             S.EndMultiColumn();
@@ -627,15 +627,15 @@ void ExportFFmpegOPUSOptions::PopulateOrExchange(ShuttleGui & S)
             S.StartMultiColumn(2, wxCENTER);
             {
                S.TieChoice(
-                  XO("Vbr Mode:"),
+                  XXO("Vbr Mode:"),
                   OPUSVbrMode);
 
                S.TieChoice(
-                  XO("Application:"),
+                  XXO("Application:"),
                   OPUSApplication);
 
                S.TieChoice(
-                  XO("Cutoff:"),
+                  XXO("Cutoff:"),
                   OPUSCutoff);
 
             }
@@ -735,7 +735,7 @@ void ExportFFmpegWMAOptions::PopulateOrExchange(ShuttleGui & S)
          S.StartMultiColumn(2, wxCENTER);
          {
             S.TieNumberAsChoice(
-               XO("Bit Rate:"),
+               XXO("Bit Rate:"),
                {wxT("/FileFormats/WMABitRate"),
                 128000},
                WMABitRateNames,
@@ -802,12 +802,12 @@ void ExportFFmpegCustomOptions::PopulateOrExchange(ShuttleGui & S)
    {
       S.StartVerticalLay(wxCENTER, 0);
       {
-         S.Id(OpenID).AddButton(XO("Open custom FFmpeg format options"));
+         S.Id(OpenID).AddButton(XXO("Open custom FFmpeg format options"));
          S.StartMultiColumn(2, wxCENTER);
          {
-            S.AddPrompt(XO("Current Format:"));
+            S.AddPrompt(XXO("Current Format:"));
             mFormat = S.Style(wxTE_READONLY).AddTextBox({}, wxT(""), 25);
-            S.AddPrompt(XO("Current Codec:"));
+            S.AddPrompt(XXO("Current Codec:"));
             mCodec = S.Style(wxTE_READONLY).AddTextBox({}, wxT(""), 25);
          }
          S.EndMultiColumn();
@@ -1824,12 +1824,12 @@ void ExportFFmpegOptions::PopulateOrExchange(ShuttleGui & S)
       S.StartMultiColumn(7, wxEXPAND);
       {
          S.SetStretchyCol(1);
-         mPresetCombo = S.Id(FEPresetID).AddCombo(XO("Preset:"), gPrefs->Read(wxT("/FileFormats/FFmpegPreset"),wxEmptyString), mPresetNames);
-         S.Id(FELoadPresetID).AddButton(XO("Load Preset"));
-         S.Id(FESavePresetID).AddButton(XO("Save Preset"));
-         S.Id(FEDeletePresetID).AddButton(XO("Delete Preset"));
-         S.Id(FEImportPresetsID).AddButton(XO("Import Presets"));
-         S.Id(FEExportPresetsID).AddButton(XO("Export Presets"));
+         mPresetCombo = S.Id(FEPresetID).AddCombo(XXO("Preset:"), gPrefs->Read(wxT("/FileFormats/FFmpegPreset"),wxEmptyString), mPresetNames);
+         S.Id(FELoadPresetID).AddButton(XXO("Load Preset"));
+         S.Id(FESavePresetID).AddButton(XXO("Save Preset"));
+         S.Id(FEDeletePresetID).AddButton(XXO("Delete Preset"));
+         S.Id(FEImportPresetsID).AddButton(XXO("Import Presets"));
+         S.Id(FEExportPresetsID).AddButton(XXO("Export Presets"));
       }
       S.EndMultiColumn();
       S.StartMultiColumn(4, wxALIGN_LEFT);
@@ -1851,8 +1851,8 @@ void ExportFFmpegOptions::PopulateOrExchange(ShuttleGui & S)
          S.StartMultiColumn(2, wxEXPAND);
          {
             S.SetStretchyRow(1);
-            S.Id(FEAllFormatsID).AddButton(XO("Show All Formats"));
-            S.Id(FEAllCodecsID).AddButton(XO("Show All Codecs"));
+            S.Id(FEAllFormatsID).AddButton(XXO("Show All Formats"));
+            S.Id(FEAllCodecsID).AddButton(XXO("Show All Codecs"));
             mFormatList = S.Id(FEFormatID).AddListBox(mFormatNames);
             mFormatList->DeselectAll();
             mCodecList = S.Id(FECodecID).AddListBox(mCodecNames);
@@ -1869,7 +1869,7 @@ void ExportFFmpegOptions::PopulateOrExchange(ShuttleGui & S)
                {
                   S.Id(FELanguageID)
                      .ToolTip(XO("ISO 639 3-letter language code\nOptional\nempty - automatic"))
-                     .TieTextBox(XO("Language:"), {wxT("/FileFormats/FFmpegLanguage"), wxEmptyString}, 9);
+                     .TieTextBox(XXO("Language:"), {wxT("/FileFormats/FFmpegLanguage"), wxEmptyString}, 9);
 
                   S.AddSpace( 20,0 );
                   S.AddVariableText(XO("Bit Reservoir"));
@@ -1885,28 +1885,28 @@ void ExportFFmpegOptions::PopulateOrExchange(ShuttleGui & S)
                   S.Id(FETagID)
                      /* i18n-hint: "codec" is short for a "coder-decoder" algorithm */
                      .ToolTip(XO("Codec tag (FOURCC)\nOptional\nempty - automatic"))
-                     .TieTextBox(XO("Tag:"), {wxT("/FileFormats/FFmpegTag"), wxEmptyString}, 4);
+                     .TieTextBox(XXO("Tag:"), {wxT("/FileFormats/FFmpegTag"), wxEmptyString}, 4);
 
                   S.Id(FEBitrateID)
                      .ToolTip(XO("Bit Rate (bits/second) - influences the resulting file size and quality\nSome codecs may only accept specific values (128k, 192k, 256k etc)\n0 - automatic\nRecommended - 192000"))
-                     .TieSpinCtrl(XO("Bit Rate:"), {wxT("/FileFormats/FFmpegBitRate"), 0}, 1000000, 0);
+                     .TieSpinCtrl(XXO("Bit Rate:"), {wxT("/FileFormats/FFmpegBitRate"), 0}, 1000000, 0);
 
                   S.Id(FEQualityID)
                      .ToolTip(XO("Overall quality, used differently by different codecs\nRequired for vorbis\n0 - automatic\n-1 - off (use bitrate instead)"))
-                     .TieSpinCtrl(XO("Quality:"), {wxT("/FileFormats/FFmpegQuality"), 0}, 500, -1);
+                     .TieSpinCtrl(XXO("Quality:"), {wxT("/FileFormats/FFmpegQuality"), 0}, 500, -1);
 
                   S.Id(FESampleRateID)
                      .ToolTip(XO("Sample rate (Hz)\n0 - don't change sample rate"))
-                     .TieSpinCtrl(XO("Sample Rate:"), {wxT("/FileFormats/FFmpegSampleRate"), 0}, 200000, 0);
+                     .TieSpinCtrl(XXO("Sample Rate:"), {wxT("/FileFormats/FFmpegSampleRate"), 0}, 200000, 0);
 
                   S.Id(FECutoffID)
                      .ToolTip(XO("Audio cutoff bandwidth (Hz)\nOptional\n0 - automatic"))
-                     .TieSpinCtrl(XO("Cutoff:"), {wxT("/FileFormats/FFmpegCutOff"), 0}, 10000000, 0);
+                     .TieSpinCtrl(XXO("Cutoff:"), {wxT("/FileFormats/FFmpegCutOff"), 0}, 10000000, 0);
 
                   S.Id(FEProfileID)
                      .ToolTip(XO("AAC Profile\nLow Complexity - default\nMost players won't play anything other than LC"))
                      .MinSize( { 100, -1 } )
-                     .TieChoice(XO("Profile:"), AACProfiles);
+                     .TieChoice(XXO("Profile:"), AACProfiles);
                }
                S.EndMultiColumn();
             }
@@ -1917,21 +1917,21 @@ void ExportFFmpegOptions::PopulateOrExchange(ShuttleGui & S)
                {
                   S
                      .ToolTip(XO("Compression level\nRequired for FLAC\n-1 - automatic\nmin - 0 (fast encoding, large output file)\nmax - 10 (slow encoding, small output file)"))
-                     .Id(FECompLevelID).TieSpinCtrl(XO("Compression:"), {wxT("/FileFormats/FFmpegCompLevel"), 0}, 10, -1);
+                     .Id(FECompLevelID).TieSpinCtrl(XXO("Compression:"), {wxT("/FileFormats/FFmpegCompLevel"), 0}, 10, -1);
 
                   S.Id(FEFrameSizeID)
                      .ToolTip(XO("Frame size\nOptional\n0 - default\nmin - 16\nmax - 65535"))
-                     .TieSpinCtrl(XO("Frame:"), {wxT("/FileFormats/FFmpegFrameSize"), 0}, 65535, 0);
+                     .TieSpinCtrl(XXO("Frame:"), {wxT("/FileFormats/FFmpegFrameSize"), 0}, 65535, 0);
 
                   S.Id(FELPCCoeffsID)
                      .ToolTip(XO("LPC coefficients precision\nOptional\n0 - default\nmin - 1\nmax - 15"))
-                     .TieSpinCtrl(XO("LPC"), {wxT("/FileFormats/FFmpegLPCCoefPrec"), 0}, 15, 0);
+                     .TieSpinCtrl(XXO("LPC"), {wxT("/FileFormats/FFmpegLPCCoefPrec"), 0}, 15, 0);
 
                   S.Id(FEPredOrderID)
                      .ToolTip(XO("Prediction Order Method\nEstimate - fastest, lower compression\nLog search - slowest, best compression\nFull search - default"))
                      .MinSize( { 100, -1 } )
                      .TieNumberAsChoice(
-                        XO("PdO Method:"),
+                        XXO("PdO Method:"),
                         {wxT("/FileFormats/FFmpegPredOrderMethod"),
                          4}, // Full search
                         PredictionOrderMethodNames
@@ -1939,19 +1939,19 @@ void ExportFFmpegOptions::PopulateOrExchange(ShuttleGui & S)
 
                   S.Id(FEMinPredID)
                      .ToolTip(XO("Minimal prediction order\nOptional\n-1 - default\nmin - 0\nmax - 32 (with LPC) or 4 (without LPC)"))
-                     .TieSpinCtrl(XO("Min. PdO"), {wxT("/FileFormats/FFmpegMinPredOrder"), -1}, 32, -1);
+                     .TieSpinCtrl(XXO("Min. PdO"), {wxT("/FileFormats/FFmpegMinPredOrder"), -1}, 32, -1);
 
                   S.Id(FEMaxPredID)
                      .ToolTip(XO("Maximal prediction order\nOptional\n-1 - default\nmin - 0\nmax - 32 (with LPC) or 4 (without LPC)"))
-                     .TieSpinCtrl(XO("Max. PdO"), {wxT("/FileFormats/FFmpegMaxPredOrder"), -1}, 32, -1);
+                     .TieSpinCtrl(XXO("Max. PdO"), {wxT("/FileFormats/FFmpegMaxPredOrder"), -1}, 32, -1);
 
                   S.Id(FEMinPartOrderID)
                      .ToolTip(XO("Minimal partition order\nOptional\n-1 - default\nmin - 0\nmax - 8"))
-                     .TieSpinCtrl(XO("Min. PtO"), {wxT("/FileFormats/FFmpegMinPartOrder"), -1}, 8, -1);
+                     .TieSpinCtrl(XXO("Min. PtO"), {wxT("/FileFormats/FFmpegMinPartOrder"), -1}, 8, -1);
 
                   S.Id(FEMaxPartOrderID)
                      .ToolTip(XO("Maximal partition order\nOptional\n-1 - default\nmin - 0\nmax - 8"))
-                     .TieSpinCtrl(XO("Max. PtO"), {wxT("/FileFormats/FFmpegMaxPartOrder"), -1}, 8, -1);
+                     .TieSpinCtrl(XXO("Max. PtO"), {wxT("/FileFormats/FFmpegMaxPartOrder"), -1}, 8, -1);
 
                   /* i18n-hint:  Abbreviates "Linear Predictive Coding",
                      but this text needs to be kept very short */
@@ -1971,7 +1971,7 @@ void ExportFFmpegOptions::PopulateOrExchange(ShuttleGui & S)
                      /* i18n-hint: 'mux' is short for multiplexor, a device that selects between several inputs
                        'Mux Rate' is a parameter that has some bearing on compression ratio for MPEG
                        it has a hard to predict effect on the degree of compression */
-                     .TieSpinCtrl(XO("Mux Rate:"), {wxT("/FileFormats/FFmpegMuxRate"), 0}, 10000000, 0);
+                     .TieSpinCtrl(XXO("Mux Rate:"), {wxT("/FileFormats/FFmpegMuxRate"), 0}, 10000000, 0);
 
                   S.Id(FEPacketSizeID)
                      /* i18n-hint: 'Packet Size' is a parameter that has some bearing on compression ratio for MPEG
@@ -1979,7 +1979,7 @@ void ExportFFmpegOptions::PopulateOrExchange(ShuttleGui & S)
                      .ToolTip(XO("Packet size\nOptional\n0 - default"))
                      /* i18n-hint: 'Packet Size' is a parameter that has some bearing on compression ratio for MPEG
                        compression.  It measures how big a chunk of audio is compressed in one piece. */
-                     .TieSpinCtrl(XO("Packet Size:"), {wxT("/FileFormats/FFmpegPacketSize"), 0}, 10000000, 0);
+                     .TieSpinCtrl(XXO("Packet Size:"), {wxT("/FileFormats/FFmpegPacketSize"), 0}, 10000000, 0);
                }
                S.EndMultiColumn();
             }
diff --git a/src/export/ExportFLAC.cpp b/src/export/ExportFLAC.cpp
index 3c4e4741e..8a81a3266 100644
--- a/src/export/ExportFLAC.cpp
+++ b/src/export/ExportFLAC.cpp
@@ -127,8 +127,8 @@ void ExportFLACOptions::PopulateOrExchange(ShuttleGui & S)
       {
          S.StartMultiColumn(2, wxCENTER);
          {
-            S.TieChoice( XO("Level:"), FLACLevel);
-            S.TieChoice( XO("Bit depth:"), FLACBitDepth);
+            S.TieChoice( XXO("Level:"), FLACLevel);
+            S.TieChoice( XXO("Bit depth:"), FLACBitDepth);
          }
          S.EndMultiColumn();
       }
diff --git a/src/export/ExportMP2.cpp b/src/export/ExportMP2.cpp
index 52f16dcdd..ede865a7c 100644
--- a/src/export/ExportMP2.cpp
+++ b/src/export/ExportMP2.cpp
@@ -162,7 +162,7 @@ void ExportMP2Options::PopulateOrExchange(ShuttleGui & S)
          S.StartMultiColumn(2, wxCENTER);
          {
             S.TieNumberAsChoice(
-               XO("Bit Rate:"),
+               XXO("Bit Rate:"),
                {wxT("/FileFormats/MP2Bitrate"),
                 160},
                BitRateNames,
diff --git a/src/export/ExportMP3.cpp b/src/export/ExportMP3.cpp
index cddb36c0a..040b3cacd 100644
--- a/src/export/ExportMP3.cpp
+++ b/src/export/ExportMP3.cpp
@@ -295,10 +295,10 @@ ExportMP3Options::~ExportMP3Options()
 EnumSetting< MP3RateMode > MP3RateModeSetting{
    wxT("/FileFormats/MP3RateModeChoice"),
    {
-      { wxT("SET"), XO("Preset") },
-      { wxT("VBR"), XO("Variable") },
-      { wxT("ABR"), XO("Average") },
-      { wxT("CBR"), XO("Constant") },
+      { wxT("SET"), XXO("Preset") },
+      { wxT("VBR"), XXO("Variable") },
+      { wxT("ABR"), XXO("Average") },
+      { wxT("CBR"), XXO("Constant") },
    },
    0, // MODE_SET
 
@@ -312,8 +312,8 @@ EnumSetting< MP3RateMode > MP3RateModeSetting{
 static EnumSetting< MP3ChannelMode > MP3ChannelModeSetting{
    wxT("/FileFormats/MP3ChannelModeChoice"),
    {
-      EnumValueSymbol{ wxT("JOINT"), XO("Joint Stereo") },
-      EnumValueSymbol{ wxT("STEREO"), XO("Stereo") },
+      EnumValueSymbol{ wxT("JOINT"), XXO("Joint Stereo") },
+      EnumValueSymbol{ wxT("STEREO"), XXO("Stereo") },
    },
    0, // CHANNEL_JOINT
 
@@ -345,7 +345,7 @@ void ExportMP3Options::PopulateOrExchange(ShuttleGui & S)
             S.SetStretchyCol(1);
             S.StartTwoColumn();
             {
-               S.AddPrompt(XO("Bit Rate Mode:"));
+               S.AddPrompt(XXO("Bit Rate Mode:"));
                S.StartHorizontalLay();
                {
                   S.StartRadioButtonGroup(MP3RateModeSetting);
@@ -395,7 +395,7 @@ void ExportMP3Options::PopulateOrExchange(ShuttleGui & S)
                }
 
                mRate = S.Id(ID_QUALITY).TieNumberAsChoice(
-                  XO("Quality"),
+                  XXO("Quality"),
                   { wxT("/FileFormats/MP3Bitrate"), defrate },
                   *choices,
                   codes
@@ -403,11 +403,11 @@ void ExportMP3Options::PopulateOrExchange(ShuttleGui & S)
 
                mMode = S.Disable(!enable)
                   .TieNumberAsChoice(
-                     XO("Variable Speed:"),
+                     XXO("Variable Speed:"),
                      { wxT("/FileFormats/MP3VarMode"), ROUTINE_FAST },
                      varModeNames );
    
-               S.AddPrompt(XO("Channel Mode:"));
+               S.AddPrompt(XXO("Channel Mode:"));
                S.StartMultiColumn(3, wxEXPAND);
                {
                   S.StartRadioButtonGroup(MP3ChannelModeSetting);
@@ -419,7 +419,7 @@ void ExportMP3Options::PopulateOrExchange(ShuttleGui & S)
                   }
                   S.EndRadioButtonGroup();
 
-                  mMono = S.Id(ID_MONO).AddCheckBox(XO("Force export to mono"), mono);
+                  mMono = S.Id(ID_MONO).AddCheckBox(XXO("Force export to mono"), mono);
                }
                S.EndTwoColumn();
             }
@@ -614,12 +614,12 @@ public:
             else {
                mPathText = S.AddTextBox( {}, mLibPath.GetFullPath(), 0);
             }
-            S.Id(ID_BROWSE).AddButton(XO("Browse..."), wxALIGN_RIGHT);
+            S.Id(ID_BROWSE).AddButton(XXO("Browse..."), wxALIGN_RIGHT);
             S.AddVariableText(
                /* i18n-hint: There is a  button to the right of the arrow.*/
                XO("To get a free copy of LAME, click here -->"), true);
             /* i18n-hint: (verb)*/
-            S.Id(ID_DLOAD).AddButton(XO("Download"), wxALIGN_RIGHT);
+            S.Id(ID_DLOAD).AddButton(XXO("Download"), wxALIGN_RIGHT);
          }
          S.EndMultiColumn();
 
@@ -2054,7 +2054,7 @@ int ExportMP3::AskResample(int bitrate, int rate, int lowrate, int highrate)
 
          S.StartHorizontalLay(wxALIGN_CENTER, false);
          {
-            choice = S.AddChoice(XO("Sample Rates"),
+            choice = S.AddChoice(XXO("Sample Rates"),
                [&]{
                   TranslatableStrings choices;
                   for (size_t ii = 0, nn = sampRates.size(); ii < nn; ++ii) {
diff --git a/src/export/ExportMultiple.cpp b/src/export/ExportMultiple.cpp
index 0f6410f25..16bd4433e 100644
--- a/src/export/ExportMultiple.cpp
+++ b/src/export/ExportMultiple.cpp
@@ -276,15 +276,15 @@ void ExportMultipleDialog::PopulateOrExchange(ShuttleGui& S)
          S.StartMultiColumn(4, true);
          {
             mDir = S.Id(DirID)
-               .TieTextBox(XO("Folder:"),
+               .TieTextBox(XXO("Folder:"),
                            {wxT("/Export/MultiplePath"),
                             DefaultPath},
                            64);
-            S.Id(ChooseID).AddButton(XO("Choose..."));
-            S.Id(CreateID).AddButton(XO("Create"));
+            S.Id(ChooseID).AddButton(XXO("Choose..."));
+            S.Id(CreateID).AddButton(XXO("Create"));
 
             mFormat = S.Id(FormatID)
-               .TieChoice( XO("Format:"),
+               .TieChoice( XXO("Format:"),
                {
                   wxT("/Export/MultipleFormat"),
                   {
@@ -298,7 +298,7 @@ void ExportMultipleDialog::PopulateOrExchange(ShuttleGui& S)
             S.AddVariableText( {}, false);
             S.AddVariableText( {}, false);
 
-            S.AddPrompt(XO("Options:"));
+            S.AddPrompt(XXO("Options:"));
 
             mBook = S.Id(OptionsID)
                .Style(wxBORDER_STATIC)
@@ -335,12 +335,12 @@ void ExportMultipleDialog::PopulateOrExchange(ShuttleGui& S)
          // Row 1
          S.SetBorder(1);
          mTrack = S.Id(TrackID)
-            .AddRadioButton(XO("Tracks"));
+            .AddRadioButton(XXO("Tracks"));
 
          // Row 2
          S.SetBorder(1);
          mLabel = S.Id(LabelID)
-            .AddRadioButtonToGroup(XO("Labels"));
+            .AddRadioButtonToGroup(XXO("Labels"));
          S.SetBorder(3);
 
          S.StartMultiColumn(2, wxEXPAND);
@@ -349,7 +349,7 @@ void ExportMultipleDialog::PopulateOrExchange(ShuttleGui& S)
             // Row 3 (indented)
             S.AddVariableText(Verbatim("   "), false);
             mFirst = S.Id(FirstID)
-               .AddCheckBox(XO("Include audio before first label"), false);
+               .AddCheckBox(XXO("Include audio before first label"), false);
 
             // Row 4
             S.AddVariableText( {}, false);
@@ -380,9 +380,9 @@ void ExportMultipleDialog::PopulateOrExchange(ShuttleGui& S)
          S.StartRadioButtonGroup({
             wxT("/Export/TrackNameWithOrWithoutNumbers"),
             {
-               { wxT("labelTrack"), XO("Using Label/Track Name") },
-               { wxT("numberBefore"), XO("Numbering before Label/Track Name") },
-               { wxT("numberAfter"), XO("Numbering after File name prefix") },
+               { wxT("labelTrack"), XXO("Using Label/Track Name") },
+               { wxT("numberBefore"), XXO("Numbering before Label/Track Name") },
+               { wxT("numberAfter"), XXO("Numbering after File name prefix") },
             },
             0 // labelTrack
          });
@@ -416,7 +416,7 @@ void ExportMultipleDialog::PopulateOrExchange(ShuttleGui& S)
    S.SetBorder(5);
    S.StartHorizontalLay(wxEXPAND, false);
    {
-      mOverwrite = S.Id(OverwriteID).TieCheckBox(XO("Overwrite existing files"),
+      mOverwrite = S.Id(OverwriteID).TieCheckBox(XXO("Overwrite existing files"),
                                                  {wxT("/Export/OverwriteExisting"),
                                                   false});
    }
diff --git a/src/export/ExportOGG.cpp b/src/export/ExportOGG.cpp
index 4eae0a5c8..e15ebae2b 100644
--- a/src/export/ExportOGG.cpp
+++ b/src/export/ExportOGG.cpp
@@ -88,7 +88,7 @@ void ExportOGGOptions::PopulateOrExchange(ShuttleGui & S)
          {
             S.SetStretchyCol(1);
             S.Prop(1).TieSlider(
-               XO("Quality:"), mOggQualityUnscaled, 10);
+               XXO("Quality:"), mOggQualityUnscaled, 10);
          }
          S.EndMultiColumn();
       }
diff --git a/src/export/ExportPCM.cpp b/src/export/ExportPCM.cpp
index 2dc4447d0..0871d9542 100644
--- a/src/export/ExportPCM.cpp
+++ b/src/export/ExportPCM.cpp
@@ -210,12 +210,12 @@ void ExportPCMOptions::PopulateOrExchange(ShuttleGui & S)
             if (mSelFormat == FMT_OTHER)
             {
                mHeaderChoice = S.Id(ID_HEADER_CHOICE)
-                  .AddChoice(XO("Header:"),
+                  .AddChoice(XXO("Header:"),
                              mHeaderNames,
                              mHeaderFromChoice);
             }
             mEncodingChoice = S.Id(ID_ENCODING_CHOICE)
-               .AddChoice(XO("Encoding:"),
+               .AddChoice(XXO("Encoding:"),
                           mEncodingNames,
                           mEncodingFromChoice);
          }
diff --git a/src/import/ImportPCM.cpp b/src/import/ImportPCM.cpp
index af6b521bd..7ebfd74ec 100644
--- a/src/import/ImportPCM.cpp
+++ b/src/import/ImportPCM.cpp
@@ -350,13 +350,13 @@ static wxString AskCopyOrEdit()
          S.SetBorder(0);
 
          copyRadio = S.AddRadioButton(
-            XO("Make a &copy of the files before editing (safer)") );
+            XXO("Make a &copy of the files before editing (safer)") );
 
          aliasRadio = S.AddRadioButtonToGroup(
-            XO("Read the files &directly from the original (faster)") );
+            XXO("Read the files &directly from the original (faster)") );
 
          dontAskNextTimeBox = S.AddCheckBox(
-            XO("Don't &warn again and always use my choice above"),
+            XXO("Don't &warn again and always use my choice above"),
             wxT("false"));
       }
       S.EndStatic();
diff --git a/src/import/ImportRaw.cpp b/src/import/ImportRaw.cpp
index 74a839f73..87dab5b81 100644
--- a/src/import/ImportRaw.cpp
+++ b/src/import/ImportRaw.cpp
@@ -391,13 +391,13 @@ ImportRawDialog::ImportRawDialog(wxWindow * parent,
       S.SetBorder(5);
       S.StartTwoColumn();
       {
-         mEncodingChoice = S.Id(ChoiceID).AddChoice(XO("Encoding:"),
+         mEncodingChoice = S.Id(ChoiceID).AddChoice(XXO("Encoding:"),
                                                     encodings,
                                                     selection);
-         mEndianChoice = S.Id(ChoiceID).AddChoice(XO("Byte order:"),
+         mEndianChoice = S.Id(ChoiceID).AddChoice(XXO("Byte order:"),
                                                   endians,
                                                   endian);
-         mChannelChoice = S.Id(ChoiceID).AddChoice(XO("Channels:"),
+         mChannelChoice = S.Id(ChoiceID).AddChoice(XXO("Channels:"),
                                                    chans,
                                                    mChannels - 1);
       }
@@ -408,20 +408,20 @@ ImportRawDialog::ImportRawDialog(wxWindow * parent,
       {
          // Offset text
          /* i18n-hint: (noun)*/
-         mOffsetText = S.AddTextBox(XO("Start offset:"),
+         mOffsetText = S.AddTextBox(XXO("Start offset:"),
                                     wxString::Format(wxT("%d"), mOffset),
                                     12);
          S.AddUnits(XO("bytes"));
 
          // Percent text
-         mPercentText = S.AddTextBox(XO("Amount to import:"),
+         mPercentText = S.AddTextBox(XXO("Amount to import:"),
                                      wxT("100"),
                                      12);
          S.AddUnits(XO("%"));
 
          // Rate text
          /* i18n-hint: (noun)*/
-         mRateText = S.AddTextBox(XO("Sample rate:"),
+         mRateText = S.AddTextBox(XXO("Sample rate:"),
                                   wxString::Format(wxT("%d"), (int)mRate),
                                   12);
          /* i18n-hint: This is the abbreviation for "Hertz", or
diff --git a/src/menus/ClipMenus.cpp b/src/menus/ClipMenus.cpp
index 532b54033..66a7809d1 100644
--- a/src/menus/ClipMenus.cpp
+++ b/src/menus/ClipMenus.cpp
@@ -831,7 +831,7 @@ BaseItemSharedPtr ClipSelectMenu()
 
    static BaseItemSharedPtr menu {
    ( FinderScope{ findCommandHandler },
-   Menu( wxT("Clip"), XO("Clip B&oundaries"),
+   Menu( wxT("Clip"), XXO("Clip B&oundaries"),
       Command( wxT("SelPrevClipBoundaryToCursor"),
          XXO("Pre&vious Clip Boundary to Cursor"),
          FN(OnSelectPrevClipBoundaryToCursor),
diff --git a/src/menus/EditMenus.cpp b/src/menus/EditMenus.cpp
index 6e14f4f7d..f43a18d69 100644
--- a/src/menus/EditMenus.cpp
+++ b/src/menus/EditMenus.cpp
@@ -1053,7 +1053,7 @@ BaseItemSharedPtr EditMenu()
 
    static BaseItemSharedPtr menu{
    ( FinderScope{ findCommandHandler },
-   Menu( wxT("Edit"), XO("&Edit"),
+   Menu( wxT("Edit"), XXO("&Edit"),
       Section( "UndoRedo",
          Command( wxT("Undo"), XXO("&Undo"), FN(OnUndo),
             AudioIONotBusyFlag() | UndoAvailableFlag(), wxT("Ctrl+Z") ),
@@ -1088,7 +1088,7 @@ BaseItemSharedPtr EditMenu()
             NotBusyTimeAndTracksFlags, wxT("Ctrl+D") ),
 
          Section( "",
-            Menu( wxT("RemoveSpecial"), XO("R&emove Special"),
+            Menu( wxT("RemoveSpecial"), XXO("R&emove Special"),
                Section( "",
                   /* i18n-hint: (verb) Do a special kind of cut*/
                   Command( wxT("SplitCut"), XXO("Spl&it Cut"), FN(OnSplitCut),
@@ -1118,7 +1118,7 @@ BaseItemSharedPtr EditMenu()
       Section( "Other",
       //////////////////////////////////////////////////////////////////////////
 
-         Menu( wxT("Clip"), XO("Clip B&oundaries"),
+         Menu( wxT("Clip"), XXO("Clip B&oundaries"),
             Section( "",
                /* i18n-hint: (verb) It's an item on a menu. */
                Command( wxT("Split"), XXO("Sp&lit"), FN(OnSplit),
@@ -1173,7 +1173,7 @@ BaseItemSharedPtr ExtraEditMenu()
       AudioIONotBusyFlag() | TracksSelectedFlag() | TimeSelectedFlag();
    static BaseItemSharedPtr menu{
    ( FinderScope{ findCommandHandler },
-   Menu( wxT("Edit"), XO("&Edit"),
+   Menu( wxT("Edit"), XXO("&Edit"),
       Command( wxT("DeleteKey"), XXO("&Delete Key"), FN(OnDelete),
          (flags | NoAutoSelect()),
          wxT("Backspace") ),
diff --git a/src/menus/ExtraMenus.cpp b/src/menus/ExtraMenus.cpp
index f72649a88..c779c2f2c 100644
--- a/src/menus/ExtraMenus.cpp
+++ b/src/menus/ExtraMenus.cpp
@@ -160,7 +160,7 @@ BaseItemSharedPtr ExtraMenu()
       []{ return gPrefs->ReadBool(wxT("/GUI/ShowExtraMenus"), false); };
    static BaseItemSharedPtr menu{
       ConditionalItems( wxT("Optional"),
-         pred, Menu( wxT("Extra"), XO("Ext&ra"), extraItems ) )
+         pred, Menu( wxT("Extra"), XXO("Ext&ra"), extraItems ) )
    };
    return menu;
 }
@@ -175,7 +175,7 @@ BaseItemSharedPtr ExtraMixerMenu()
 {
    static BaseItemSharedPtr menu{
    ( FinderScope{ findCommandHandler },
-   Menu( wxT("Mixer"), XO("Mi&xer"),
+   Menu( wxT("Mixer"), XXO("Mi&xer"),
       Command( wxT("OutputGain"), XXO("Ad&just Playback Volume..."),
          FN(OnOutputGain), AlwaysEnabledFlag ),
       Command( wxT("OutputGainInc"), XXO("&Increase Playback Volume"),
@@ -197,7 +197,7 @@ BaseItemSharedPtr ExtraDeviceMenu()
 {
    static BaseItemSharedPtr menu{
    ( FinderScope{ findCommandHandler },
-   Menu( wxT("Device"), XO("De&vice"),
+   Menu( wxT("Device"), XXO("De&vice"),
       Command( wxT("InputDevice"), XXO("Change &Recording Device..."),
          FN(OnInputDevice),
          AudioIONotBusyFlag(), wxT("Shift+I") ),
diff --git a/src/menus/FileMenus.cpp b/src/menus/FileMenus.cpp
index 28ba31d73..eea2b8d5e 100644
--- a/src/menus/FileMenus.cpp
+++ b/src/menus/FileMenus.cpp
@@ -560,7 +560,7 @@ BaseItemSharedPtr FileMenu()
 
    static BaseItemSharedPtr menu{
    ( FinderScope{ findCommandHandler },
-   Menu( wxT("File"), XO("&File"),
+   Menu( wxT("File"), XXO("&File"),
       Section( "Basic",
          /*i18n-hint: "New" is an action (verb) to create a NEW project*/
          Command( wxT("New"), XXO("&New"), FN(OnNew),
@@ -584,10 +584,10 @@ BaseItemSharedPtr FileMenu()
          Menu( wxT("Recent"),
    #ifdef __WXMAC__
             /* i18n-hint: This is the name of the menu item on Mac OS X only */
-            XO("Open Recent")
+            XXO("Open Recent")
    #else
             /* i18n-hint: This is the name of the menu item on Windows and Linux */
-            XO("Recent &Files")
+            XXO("Recent &Files")
    #endif
             ,
             Special( wxT("PopulateRecentFilesStep"),
@@ -620,7 +620,7 @@ BaseItemSharedPtr FileMenu()
       ),
 
       Section( "Save",
-         Menu( wxT("Save"), XO("&Save Project"),
+         Menu( wxT("Save"), XXO("&Save Project"),
             Command( wxT("Save"), XXO("&Save Project"), FN(OnSave),
                AudioIONotBusyFlag() | UnsavedChangesFlag(), wxT("Ctrl+S") ),
             Command( wxT("SaveAs"), XXO("Save Project &As..."), FN(OnSaveAs),
@@ -638,7 +638,7 @@ BaseItemSharedPtr FileMenu()
       ),
 
       Section( "Import-Export",
-         Menu( wxT("Export"), XO("&Export"),
+         Menu( wxT("Export"), XXO("&Export"),
             // Enable Export audio commands only when there are audio tracks.
             Command( wxT("ExportMp3"), XXO("Export as MP&3"), FN(OnExportMp3),
                AudioIONotBusyFlag() | WaveTracksExistFlag() ),
@@ -672,7 +672,7 @@ BaseItemSharedPtr FileMenu()
    #endif
          ),
 
-         Menu( wxT("Import"), XO("&Import"),
+         Menu( wxT("Import"), XXO("&Import"),
             Command( wxT("ImportAudio"), XXO("&Audio..."), FN(OnImport),
                AudioIONotBusyFlag(), wxT("Ctrl+Shift+I") ),
             Command( wxT("ImportLabels"), XXO("&Labels..."), FN(OnImportLabels),
diff --git a/src/menus/HelpMenus.cpp b/src/menus/HelpMenus.cpp
index 577f90e93..ccac0e3c1 100644
--- a/src/menus/HelpMenus.cpp
+++ b/src/menus/HelpMenus.cpp
@@ -168,7 +168,7 @@ void QuickFixDialog::AddStuck(
    if( !bBool)
       return;
    S.AddFixedText( Prompt );
-   S.Id(FixButtonID + mItem).AddButton( XO("Fix") )->SetClientObject(
+   S.Id(FixButtonID + mItem).AddButton( XXO("Fix") )->SetClientObject(
       safenew wxStringClientData(Pref));
 
    {
@@ -494,7 +494,7 @@ BaseItemSharedPtr HelpMenu()
 {
    static BaseItemSharedPtr menu{
    ( FinderScope{ findCommandHandler },
-   Menu( wxT("Help"), XO("&Help"),
+   Menu( wxT("Help"), XXO("&Help"),
       Section( "Basic",
          // QuickFix menu item not in Audacity 2.3.1 whilst we discuss further.
    #ifdef EXPERIMENTAL_DA
@@ -522,7 +522,7 @@ BaseItemSharedPtr HelpMenu()
       Section
    #endif
       ( "Other",
-         Menu( wxT("Diagnostics"), XO("&Diagnostics"),
+         Menu( wxT("Diagnostics"), XXO("&Diagnostics"),
             Command( wxT("DeviceInfo"), XXO("Au&dio Device Info..."),
                FN(OnAudioDeviceInfo),
                AudioIONotBusyFlag() ),
diff --git a/src/menus/LabelMenus.cpp b/src/menus/LabelMenus.cpp
index 06a8e11a7..21c51f436 100644
--- a/src/menus/LabelMenus.cpp
+++ b/src/menus/LabelMenus.cpp
@@ -602,7 +602,7 @@ BaseItemSharedPtr LabelEditMenus()
    ( FinderScope{ findCommandHandler },
    Items( wxT("LabelEditMenus"),
    
-   Menu( wxT("Labels"), XO("&Labels"),
+   Menu( wxT("Labels"), XXO("&Labels"),
       Section( "",
          Command( wxT("EditLabels"), XXO("&Edit Labels..."), FN(OnEditLabels),
                     AudioIONotBusyFlag() )
@@ -635,7 +635,7 @@ BaseItemSharedPtr LabelEditMenus()
 
    /////////////////////////////////////////////////////////////////////////////
 
-   Menu( wxT("Labeled"), XO("La&beled Audio"),
+   Menu( wxT("Labeled"), XXO("La&beled Audio"),
       Section( "",
          /* i18n-hint: (verb)*/
          Command( wxT("CutLabels"), XXO("&Cut"), FN(OnCutLabels),
diff --git a/src/menus/NavigationMenus.cpp b/src/menus/NavigationMenus.cpp
index 95020ccca..3a4850b5b 100644
--- a/src/menus/NavigationMenus.cpp
+++ b/src/menus/NavigationMenus.cpp
@@ -586,7 +586,7 @@ BaseItemSharedPtr ExtraFocusMenu()
 
    static BaseItemSharedPtr menu{
    ( FinderScope{ findCommandHandler },
-   Menu( wxT("Focus"), XO("Foc&us"),
+   Menu( wxT("Focus"), XXO("Foc&us"),
       Command( wxT("PrevFrame"),
          XXO("Move &Backward from Toolbars to Tracks"), FN(OnPrevFrame),
          AlwaysEnabledFlag, wxT("Ctrl+Shift+F6") ),
diff --git a/src/menus/PluginMenus.cpp b/src/menus/PluginMenus.cpp
index cbd87e173..8699b9bb2 100644
--- a/src/menus/PluginMenus.cpp
+++ b/src/menus/PluginMenus.cpp
@@ -663,7 +663,7 @@ void AddEffectMenuItemGroup(
             }
             // Done collecting
             table.push_back( Menu( wxEmptyString,
-               XO("Plug-in %d to %d").Format( groupNdx + 1, end ),
+               XXO("Plug-in %d to %d").Format( groupNdx + 1, end ),
                std::move( temp1 )
             ) );
             items = max;
@@ -711,7 +711,7 @@ BaseItemSharedPtr GenerateMenu()
 
    static BaseItemSharedPtr menu{
    ( FinderScope{ findCommandHandler },
-   Menu( wxT("Generate"), XO("&Generate"),
+   Menu( wxT("Generate"), XXO("&Generate"),
 #ifdef EXPERIMENTAL_EFFECT_MANAGEMENT
       Section( "Manage",
          Command( wxT("ManageGenerators"), XXO("Add / Remove Plug-ins..."),
@@ -751,7 +751,7 @@ BaseItemSharedPtr EffectMenu()
 
    static BaseItemSharedPtr menu{
    ( FinderScope{ findCommandHandler },
-   Menu( wxT("Effect"), XO("Effe&ct"),
+   Menu( wxT("Effect"), XXO("Effe&ct"),
 #ifdef EXPERIMENTAL_EFFECT_MANAGEMENT
       Section( "Manage",
          Command( wxT("ManageEffects"), XXO("Add / Remove Plug-ins..."),
@@ -804,7 +804,7 @@ BaseItemSharedPtr AnalyzeMenu()
 
    static BaseItemSharedPtr menu{
    ( FinderScope{ findCommandHandler },
-   Menu( wxT("Analyze"), XO("&Analyze"),
+   Menu( wxT("Analyze"), XXO("&Analyze"),
 #ifdef EXPERIMENTAL_EFFECT_MANAGEMENT
       Section( "Manage",
          Command( wxT("ManageAnalyzers"), XXO("Add / Remove Plug-ins..."),
@@ -838,7 +838,7 @@ BaseItemSharedPtr ToolsMenu()
 
    static BaseItemSharedPtr menu{
    ( FinderScope{ findCommandHandler },
-   Menu( wxT("Tools"), XO("T&ools"),
+   Menu( wxT("Tools"), XXO("T&ools"),
       Section( "Manage",
    #ifdef EXPERIMENTAL_EFFECT_MANAGEMENT
          Command( wxT("ManageTools"), XXO("Add / Remove Plug-ins..."),
@@ -851,7 +851,7 @@ BaseItemSharedPtr ToolsMenu()
          Command( wxT("ManageMacros"), XXO("&Macros..."),
             FN(OnManageMacros), AudioIONotBusyFlag() ),
 
-         Menu( wxT("Macros"), XO("&Apply Macro"),
+         Menu( wxT("Macros"), XXO("&Apply Macro"),
             // Palette has no access key to ensure first letter navigation of
             // sub menu
             Section( "",
@@ -925,7 +925,7 @@ BaseItemSharedPtr ExtraScriptablesIMenu()
    static BaseItemSharedPtr menu{
    ( FinderScope{ findCommandHandler },
    // i18n-hint: Scriptables are commands normally used from Python, Perl etc.
-   Menu( wxT("Scriptables1"), XO("Script&ables I"),
+   Menu( wxT("Scriptables1"), XXO("Script&ables I"),
       // Note that the PLUGIN_SYMBOL must have a space between words,
       // whereas the short-form used here must not.
       // (So if you did write "CompareAudio" for the PLUGIN_SYMBOL name, then
@@ -977,7 +977,7 @@ BaseItemSharedPtr ExtraScriptablesIIMenu()
    static BaseItemSharedPtr menu{
    ( FinderScope{ findCommandHandler },
    // i18n-hint: Scriptables are commands normally used from Python, Perl etc.
-   Menu( wxT("Scriptables2"), XO("Scripta&bles II"),
+   Menu( wxT("Scriptables2"), XXO("Scripta&bles II"),
       Command( wxT("Select"), XXO("Select..."), FN(OnAudacityCommand),
          AudioIONotBusyFlag() ),
       Command( wxT("SetTrack"), XXO("Set Track..."), FN(OnAudacityCommand),
diff --git a/src/menus/SelectMenus.cpp b/src/menus/SelectMenus.cpp
index d54986b61..7b9a13928 100644
--- a/src/menus/SelectMenus.cpp
+++ b/src/menus/SelectMenus.cpp
@@ -1036,7 +1036,7 @@ BaseItemSharedPtr SelectMenu()
    static BaseItemSharedPtr menu{
    ( FinderScope{ findCommandHandler },
    /* i18n-hint: (verb) It's an item on a menu. */
-   Menu( wxT("Select"), XO("&Select"),
+   Menu( wxT("Select"), XXO("&Select"),
       Section( "Basic",
          Command( wxT("SelectAll"), XXO("&All"), FN(OnSelectAll),
             TracksExistFlag(),
@@ -1047,7 +1047,7 @@ BaseItemSharedPtr SelectMenu()
 
          //////////////////////////////////////////////////////////////////////////
 
-         Menu( wxT("Tracks"), XO("&Tracks"),
+         Menu( wxT("Tracks"), XXO("&Tracks"),
             Command( wxT("SelAllTracks"), XXO("In All &Tracks"),
                FN(OnSelectAllTracks),
                TracksExistFlag(),
@@ -1064,7 +1064,7 @@ BaseItemSharedPtr SelectMenu()
 
          //////////////////////////////////////////////////////////////////////////
 
-         Menu( wxT("Region"), XO("R&egion"),
+         Menu( wxT("Region"), XXO("R&egion"),
             Section( "",
                Command( wxT("SetLeftSelection"), XXO("&Left at Playback Position"),
                   FN(OnSetLeftSelection), TracksExistFlag(),
@@ -1100,7 +1100,7 @@ BaseItemSharedPtr SelectMenu()
          //////////////////////////////////////////////////////////////////////////
 
    #ifdef EXPERIMENTAL_SPECTRAL_EDITING
-         Menu( wxT("Spectral"), XO("S&pectral"),
+         Menu( wxT("Spectral"), XXO("S&pectral"),
             Command( wxT("ToggleSpectralSelection"),
                XXO("To&ggle Spectral Selection"), FN(OnToggleSpectralSelection),
                TracksExistFlag(), wxT("Q") ),
@@ -1145,7 +1145,7 @@ BaseItemSharedPtr ExtraSelectionMenu()
 {
    static BaseItemSharedPtr menu{
    ( FinderScope{ findCommandHandler },
-   Menu( wxT("Select"), XO("&Selection"),
+   Menu( wxT("Select"), XXO("&Selection"),
       Command( wxT("SnapToOff"), XXO("Snap-To &Off"), FN(OnSnapToOff),
          AlwaysEnabledFlag ),
       Command( wxT("SnapToNearest"), XXO("Snap-To &Nearest"),
@@ -1201,7 +1201,7 @@ BaseItemSharedPtr CursorMenu()
    // than 'Skip'.
    static BaseItemSharedPtr menu{
    ( FinderScope{ findCommandHandler },
-   Menu( wxT("Cursor"), XO("&Cursor to"),
+   Menu( wxT("Cursor"), XXO("&Cursor to"),
       Command( wxT("CursSelStart"), XXO("Selection Star&t"),
          FN(OnCursorSelStart),
          TimeSelectedFlag(),
@@ -1240,7 +1240,7 @@ BaseItemSharedPtr ExtraCursorMenu()
 {
    static BaseItemSharedPtr menu{
    ( FinderScope{ findCommandHandler },
-   Menu( wxT("Cursor"), XO("&Cursor"),
+   Menu( wxT("Cursor"), XXO("&Cursor"),
       Command( wxT("CursorLeft"), XXO("Cursor &Left"), FN(OnCursorLeft),
          TracksExistFlag() | TrackPanelHasFocus(),
          wxT("Left\twantKeyup\tallowDup") ),
@@ -1272,7 +1272,7 @@ BaseItemSharedPtr ExtraSeekMenu()
 {
    static BaseItemSharedPtr menu{
    ( FinderScope{ findCommandHandler },
-   Menu( wxT("Seek"), XO("See&k"),
+   Menu( wxT("Seek"), XXO("See&k"),
       Command( wxT("SeekLeftShort"), XXO("Short Seek &Left During Playback"),
          FN(OnSeekLeftShort), AudioIOBusyFlag(), wxT("Left\tallowDup") ),
       Command( wxT("SeekRightShort"),
diff --git a/src/menus/ToolbarMenus.cpp b/src/menus/ToolbarMenus.cpp
index 51c23931a..6b7d52a2e 100644
--- a/src/menus/ToolbarMenus.cpp
+++ b/src/menus/ToolbarMenus.cpp
@@ -58,7 +58,7 @@ BaseItemSharedPtr ToolbarsMenu()
    static BaseItemSharedPtr menu{
    ( FinderScope{ findCommandHandler },
    Section( wxT("Toolbars"),
-      Menu( wxT("Toolbars"), XO("&Toolbars"),
+      Menu( wxT("Toolbars"), XXO("&Toolbars"),
          Section( "Reset",
             /* i18n-hint: (verb)*/
             Command( wxT("ResetToolbars"), XXO("Reset Toolb&ars"),
diff --git a/src/menus/TrackMenus.cpp b/src/menus/TrackMenus.cpp
index 76e5b62ad..9b221c531 100644
--- a/src/menus/TrackMenus.cpp
+++ b/src/menus/TrackMenus.cpp
@@ -190,11 +190,11 @@ enum {
 
 static const std::vector< ComponentInterfaceSymbol >
 &alignLabels() { static std::vector< ComponentInterfaceSymbol > symbols{
-   { wxT("StartToZero"),     XO("Start to &Zero") },
-   { wxT("StartToSelStart"), XO("Start to &Cursor/Selection Start") },
-   { wxT("StartToSelEnd"),   XO("Start to Selection &End") },
-   { wxT("EndToSelStart"),   XO("End to Cu&rsor/Selection Start") },
-   { wxT("EndToSelEnd"),     XO("End to Selection En&d") },
+   { wxT("StartToZero"),     XXO("Start to &Zero") },
+   { wxT("StartToSelStart"), XXO("Start to &Cursor/Selection Start") },
+   { wxT("StartToSelEnd"),   XXO("Start to Selection &End") },
+   { wxT("EndToSelStart"),   XXO("End to Cu&rsor/Selection Start") },
+   { wxT("EndToSelEnd"),     XXO("End to Selection En&d") },
 }; return symbols; }
 
 const size_t kAlignLabelsCount(){ return alignLabels().size(); }
@@ -765,7 +765,7 @@ void OnResample(const CommandContext &context)
 
          S.StartHorizontalLay(wxCENTER, false);
          {
-            cb = S.AddCombo(XO("New sample rate (Hz):"),
+            cb = S.AddCombo(XXO("New sample rate (Hz):"),
                             rate,
                             rates);
          }
@@ -1301,9 +1301,9 @@ BaseItemSharedPtr TracksMenu()
    
    static BaseItemSharedPtr menu{
    ( FinderScope{ findCommandHandler },
-   Menu( wxT("Tracks"), XO("&Tracks"),
+   Menu( wxT("Tracks"), XXO("&Tracks"),
       Section( "Add",
-         Menu( wxT("Add"), XO("Add &New"),
+         Menu( wxT("Add"), XXO("Add &New"),
             Command( wxT("NewMonoTrack"), XXO("&Mono Track"), FN(OnNewWaveTrack),
                AudioIONotBusyFlag(), wxT("Ctrl+Shift+N") ),
             Command( wxT("NewStereoTrack"), XXO("&Stereo Track"),
@@ -1318,7 +1318,7 @@ BaseItemSharedPtr TracksMenu()
       //////////////////////////////////////////////////////////////////////////
 
       Section( "",
-         Menu( wxT("Mix"), XO("Mi&x"),
+         Menu( wxT("Mix"), XXO("Mi&x"),
             // Delayed evaluation
             // Stereo to Mono is an oddball command that is also subject to control
             // by the plug-in manager, as if an effect.  Decide whether to show or
@@ -1354,7 +1354,7 @@ BaseItemSharedPtr TracksMenu()
       ),
 
       Section( "",
-         Menu( wxT("Mute"), XO("M&ute/Unmute"),
+         Menu( wxT("Mute"), XXO("M&ute/Unmute"),
             Command( wxT("MuteAllTracks"), XXO("&Mute All Tracks"),
                FN(OnMuteAllTracks), TracksExistFlag(), wxT("Ctrl+U") ),
             Command( wxT("UnmuteAllTracks"), XXO("&Unmute All Tracks"),
@@ -1365,7 +1365,7 @@ BaseItemSharedPtr TracksMenu()
                FN(OnUnmuteSelectedTracks), TracksSelectedFlag(), wxT("Ctrl+Alt+Shift+U") )
          ),
 
-         Menu( wxT("Pan"), XO("&Pan"),
+         Menu( wxT("Pan"), XXO("&Pan"),
             // As Pan changes are not saved on Undo stack,
             // pan settings for all tracks
             // in the project could very easily be lost unless we
@@ -1383,13 +1383,13 @@ BaseItemSharedPtr TracksMenu()
       ),
 
       Section( "",
-         Menu( wxT("Align"), XO("&Align Tracks"), // XO("Just Move Tracks"),
+         Menu( wxT("Align"), XXO("&Align Tracks"), // XO("Just Move Tracks"),
             Section( "",
                // Mutual alignment of tracks independent of selection or zero
                CommandGroup(wxT("Align"),
                   {
-                     { wxT("EndToEnd"),     XO("&Align End to End") },
-                     { wxT("Together"),     XO("Align &Together") },
+                     { wxT("EndToEnd"),     XXO("&Align End to End") },
+                     { wxT("Together"),     XXO("Align &Together") },
                   },
                   FN(OnAlignNoSync), AudioIONotBusyFlag() | TracksSelectedFlag())
             ),
@@ -1429,7 +1429,7 @@ BaseItemSharedPtr TracksMenu()
 
          //////////////////////////////////////////////////////////////////////////
 
-         Menu( wxT("Sort"), XO("S&ort Tracks"),
+         Menu( wxT("Sort"), XXO("S&ort Tracks"),
             Command( wxT("SortByTime"), XXO("By &Start Time"), FN(OnSortTime),
                TracksExistFlag(),
                Options{}.LongName( XO("Sort by Time") ) ),
@@ -1465,7 +1465,7 @@ BaseItemSharedPtr ExtraTrackMenu()
 {
    static BaseItemSharedPtr menu{
    ( FinderScope{ findCommandHandler },
-   Menu( wxT("Track"), XO("&Track"),
+   Menu( wxT("Track"), XXO("&Track"),
       Command( wxT("TrackPan"), XXO("Change P&an on Focused Track..."),
          FN(OnTrackPan),
          TrackPanelHasFocus() | TracksExistFlag(), wxT("Shift+P") ),
diff --git a/src/menus/TransportMenus.cpp b/src/menus/TransportMenus.cpp
index 7617ac961..fbdb2a7ea 100644
--- a/src/menus/TransportMenus.cpp
+++ b/src/menus/TransportMenus.cpp
@@ -971,9 +971,9 @@ BaseItemSharedPtr TransportMenu()
    ( FinderScope{ findCommandHandler },
    /* i18n-hint: 'Transport' is the name given to the set of controls that
       play, record, pause etc. */
-   Menu( wxT("Transport"), XO("Tra&nsport"),
+   Menu( wxT("Transport"), XXO("Tra&nsport"),
       Section( "Basic",
-         Menu( wxT("Play"), XO("Pl&aying"),
+         Menu( wxT("Play"), XXO("Pl&aying"),
             /* i18n-hint: (verb) Start or Stop audio playback*/
             Command( wxT("PlayStop"), XXO("Pl&ay/Stop"), FN(OnPlayStop),
                CanStopAudioStreamFlag(), wxT("Space") ),
@@ -985,7 +985,7 @@ BaseItemSharedPtr TransportMenu()
                CanStopAudioStreamFlag(), wxT("P") )
          ),
 
-         Menu( wxT("Record"), XO("&Recording"),
+         Menu( wxT("Record"), XXO("&Recording"),
             /* i18n-hint: (verb)*/
             Command( wxT("Record1stChoice"), XXO("&Record"), FN(OnRecord),
                CanStopFlags, wxT("R") ),
@@ -1001,7 +1001,7 @@ BaseItemSharedPtr TransportMenu()
                // We supply the name for the 'other one' here.
                // It should be bound to Shift+R
                (gPrefs->ReadBool("/GUI/PreferNewTrackRecord", false)
-                ? XO("&Append Record") : XO("Record &New Track")),
+                ? XXO("&Append Record") : XXO("Record &New Track")),
                FN(OnRecord2ndChoice), CanStopFlags,
                wxT("Shift+R"),
                findCommandHandler
@@ -1027,7 +1027,7 @@ BaseItemSharedPtr TransportMenu()
 
       Section( "Other",
          Section( "",
-            Menu( wxT("PlayRegion"), XO("Pla&y Region"),
+            Menu( wxT("PlayRegion"), XXO("Pla&y Region"),
                Command( wxT("LockPlayRegion"), XXO("&Lock"), FN(OnLockPlayRegion),
                   PlayRegionNotLockedFlag() ),
                Command( wxT("UnlockPlayRegion"), XXO("&Unlock"),
@@ -1038,7 +1038,7 @@ BaseItemSharedPtr TransportMenu()
          Command( wxT("RescanDevices"), XXO("R&escan Audio Devices"),
             FN(OnRescanDevices), AudioIONotBusyFlag() | CanStopAudioStreamFlag() ),
 
-         Menu( wxT("Options"), XO("Transport &Options"),
+         Menu( wxT("Options"), XXO("Transport &Options"),
             Section( "",
                // Sound Activated recording options
                Command( wxT("SoundActivationLevel"),
@@ -1101,7 +1101,7 @@ BaseItemSharedPtr ExtraTransportMenu()
 {
    static BaseItemSharedPtr menu{
    ( FinderScope{ findCommandHandler },
-   Menu( wxT("Transport"), XO("T&ransport"),
+   Menu( wxT("Transport"), XXO("T&ransport"),
       // PlayStop is already in the menus.
       /* i18n-hint: (verb) Start playing audio*/
       Command( wxT("Play"), XXO("Pl&ay"), FN(OnPlayStop),
@@ -1150,7 +1150,7 @@ BaseItemSharedPtr ExtraPlayAtSpeedMenu()
 {
    static BaseItemSharedPtr menu{
    ( FinderScope{ findCommandHandler },
-   Menu( wxT("PlayAtSpeed"), XO("&Play-at-Speed"),
+   Menu( wxT("PlayAtSpeed"), XXO("&Play-at-Speed"),
       /* i18n-hint: 'Normal Play-at-Speed' doesn't loop or cut preview. */
       Command( wxT("PlayAtSpeed"), XXO("Normal Pl&ay-at-Speed"),
          FN(OnPlayAtSpeed), CaptureNotBusyFlag() ),
diff --git a/src/menus/ViewMenus.cpp b/src/menus/ViewMenus.cpp
index 4a9e398fc..8142be887 100644
--- a/src/menus/ViewMenus.cpp
+++ b/src/menus/ViewMenus.cpp
@@ -393,9 +393,9 @@ BaseItemSharedPtr ViewMenu()
 
    static BaseItemSharedPtr menu{
    ( FinderScope{ findCommandHandler },
-   Menu( wxT("View"), XO("&View"),
+   Menu( wxT("View"), XXO("&View"),
       Section( "Basic",
-         Menu( wxT("Zoom"), XO("&Zoom"),
+         Menu( wxT("Zoom"), XXO("&Zoom"),
             Section( "",
                Command( wxT("ZoomIn"), XXO("Zoom &In"), FN(OnZoomIn),
                   ZoomInAvailableFlag(), wxT("Ctrl+1") ),
@@ -415,7 +415,7 @@ BaseItemSharedPtr ViewMenu()
             )
          ),
 
-         Menu( wxT("TrackSize"), XO("T&rack Size"),
+         Menu( wxT("TrackSize"), XXO("T&rack Size"),
             Command( wxT("FitInWindow"), XXO("&Fit to Width"), FN(OnZoomFit),
                TracksExistFlag(), wxT("Ctrl+F") ),
             Command( wxT("FitV"), XXO("Fit to &Height"), FN(OnZoomFitV),
@@ -426,7 +426,7 @@ BaseItemSharedPtr ViewMenu()
                FN(OnExpandAllTracks), TracksExistFlag(), wxT("Ctrl+Shift+X") )
          ),
 
-         Menu( wxT("SkipTo"), XO("Sk&ip to"),
+         Menu( wxT("SkipTo"), XXO("Sk&ip to"),
             Command( wxT("SkipSelStart"), XXO("Selection Sta&rt"),
                FN(OnGoSelStart), TimeSelectedFlag(),
                Options{ wxT("Ctrl+["), XO("Skip to Selection Start") } ),
diff --git a/src/menus/WindowMenus.cpp b/src/menus/WindowMenus.cpp
index a40c0009a..6c583a17b 100644
--- a/src/menus/WindowMenus.cpp
+++ b/src/menus/WindowMenus.cpp
@@ -185,7 +185,7 @@ BaseItemSharedPtr WindowMenu()
       //////////////////////////////////////////////////////////////////////////
    static BaseItemSharedPtr menu{
    ( FinderScope{ findCommandHandler },
-   Menu( wxT("Window"), XO("&Window"),
+   Menu( wxT("Window"), XXO("&Window"),
       Section( "",
          /* i18n-hint: Standard Macintosh Window menu item:  Make (the current
           * window) shrink to an icon on the dock */
diff --git a/src/prefs/BatchPrefs.cpp b/src/prefs/BatchPrefs.cpp
index 5cc728755..e0dc54880 100644
--- a/src/prefs/BatchPrefs.cpp
+++ b/src/prefs/BatchPrefs.cpp
@@ -72,7 +72,7 @@ void BatchPrefs::PopulateOrExchange( ShuttleGui & S )
    S.StartStatic( XO("Behaviors"),1 );
    {
 #ifdef _DEBUG
-      S.TieCheckBox( XO("&Don't apply effects in batch mode"),
+      S.TieCheckBox( XXO("&Don't apply effects in batch mode"),
          {wxT("/Batch/Debug"), false});
 #endif
    }
diff --git a/src/prefs/DevicePrefs.cpp b/src/prefs/DevicePrefs.cpp
index ac69ce829..e0f008b9c 100644
--- a/src/prefs/DevicePrefs.cpp
+++ b/src/prefs/DevicePrefs.cpp
@@ -134,14 +134,14 @@ void DevicePrefs::PopulateOrExchange(ShuttleGui & S)
       S.StartMultiColumn(2);
       {
          S.Id(HostID);
-         mHost = S.TieChoice( XO("&Host:"),
+         mHost = S.TieChoice( XXO("&Host:"),
             {
                wxT("/AudioIO/Host"),
                { ByColumns, mHostNames, mHostLabels }
             }
          );
 
-         S.AddPrompt(XO("Using:"));
+         S.AddPrompt(XXO("Using:"));
          S.AddFixedText( Verbatim(wxSafeConvertMB2WX(Pa_GetVersionText() ) ) );
       }
       S.EndMultiColumn();
@@ -153,7 +153,7 @@ void DevicePrefs::PopulateOrExchange(ShuttleGui & S)
       S.StartMultiColumn(2);
       {
          S.Id(PlayID);
-         mPlay = S.AddChoice(XO("&Device:"),
+         mPlay = S.AddChoice(XXO("&Device:"),
                              {} );
       }
       S.EndMultiColumn();
@@ -165,11 +165,11 @@ void DevicePrefs::PopulateOrExchange(ShuttleGui & S)
       S.StartMultiColumn(2);
       {
          S.Id(RecordID);
-         mRecord = S.AddChoice(XO("De&vice:"),
+         mRecord = S.AddChoice(XXO("De&vice:"),
                                {} );
 
          S.Id(ChannelsID);
-         mChannels = S.AddChoice(XO("Cha&nnels:"),
+         mChannels = S.AddChoice(XXO("Cha&nnels:"),
                                  {} );
       }
       S.EndMultiColumn();
@@ -188,7 +188,7 @@ void DevicePrefs::PopulateOrExchange(ShuttleGui & S)
          // for Portaudio v18 we always use default buffer sizes
          w = S
             .NameSuffix(XO("milliseconds"))
-            .TieNumericTextBox(XO("&Buffer length:"),
+            .TieNumericTextBox(XXO("&Buffer length:"),
                                  {wxT("/AudioIO/LatencyDuration"),
                                   DEFAULT_LATENCY_DURATION},
                                  9);
@@ -196,7 +196,7 @@ void DevicePrefs::PopulateOrExchange(ShuttleGui & S)
 
          w = S
             .NameSuffix(XO("milliseconds"))
-            .TieNumericTextBox(XO("&Latency compensation:"),
+            .TieNumericTextBox(XXO("&Latency compensation:"),
                                  {wxT("/AudioIO/LatencyCorrection"),
                                   DEFAULT_LATENCY_CORRECTION},
                                  9);
diff --git a/src/prefs/DirectoriesPrefs.cpp b/src/prefs/DirectoriesPrefs.cpp
index 93e593d80..a3f9365a5 100644
--- a/src/prefs/DirectoriesPrefs.cpp
+++ b/src/prefs/DirectoriesPrefs.cpp
@@ -103,7 +103,7 @@ void DirectoriesPrefs::PopulateOrExchange(ShuttleGui & S)
          S.SetStretchyCol(1);
 
          S.Id(TempDirID);
-         mTempDir = S.TieTextBox(XO("&Location:"),
+         mTempDir = S.TieTextBox(XXO("&Location:"),
                                  {wxT("/Directories/TempDir"),
                                   wxT("")},
                                  30);
@@ -114,7 +114,7 @@ void DirectoriesPrefs::PopulateOrExchange(ShuttleGui & S)
          S.Prop(0).AddFixedText(XO("Free Space:"));
          mFreeSpace = S.Prop(0).AddVariableText( {} );
          S.Prop(10).AddSpace( 10 );
-         S.Id(ChooseButtonID).Prop(0).AddButton(XO("C&hoose..."));
+         S.Id(ChooseButtonID).Prop(0).AddButton(XXO("C&hoose..."));
       }
 
    }
diff --git a/src/prefs/EffectsPrefs.cpp b/src/prefs/EffectsPrefs.cpp
index e227a569d..6e3a49c69 100644
--- a/src/prefs/EffectsPrefs.cpp
+++ b/src/prefs/EffectsPrefs.cpp
@@ -102,30 +102,30 @@ namespace {
 const std::map< wxString, TranslatableString > SuggestedPrompts{
 
 /* i18n-hint: Audio Unit is the name of an Apple audio software protocol */
-   { wxT("AudioUnit"), XO("Audio Unit") },
+   { wxT("AudioUnit"), XXO("Audio Unit") },
 
 /* i18n-hint: abbreviates "Linux Audio Developer's Simple Plugin API"
    (Application programming interface)
  */
-   { wxT("LADSPA"),    XO("&LADSPA") },
+   { wxT("LADSPA"),    XXO("&LADSPA") },
 
 /* i18n-hint: abbreviates
    "Linux Audio Developer's Simple Plugin API (LADSPA) version 2" */
-   { wxT("LV2"),       XO("LV&2") },
+   { wxT("LV2"),       XXO("LV&2") },
 
 /* i18n-hint: "Nyquist" is an embedded interpreted programming language in
  Audacity, named in honor of the Swedish-American Harry Nyquist (or Nyqvist).
  In the translations of this and other strings, you may transliterate the
  name into another alphabet.  */
-   { wxT("Nyquist"),   XO("N&yquist") },
+   { wxT("Nyquist"),   XXO("N&yquist") },
 
 /* i18n-hint: Vamp is the proper name of a software protocol for sound analysis.
    It is not an abbreviation for anything.  See http://vamp-plugins.org */
-   { wxT("Vamp"),      XO("&Vamp") },
+   { wxT("Vamp"),      XXO("&Vamp") },
 
 /* i18n-hint: Abbreviates Virtual Studio Technology, an audio software protocol
    developed by Steinberg GmbH */
-   { wxT("VST"),       XO("V&ST") },
+   { wxT("VST"),       XXO("V&ST") },
 
 };
 
@@ -201,9 +201,9 @@ void EffectsPrefs::PopulateOrExchange(ShuttleGui & S)
       {
          wxChoice *c = S
             .MinSize()
-            .TieChoice( XO("S&ort or Group:"), EffectsGroupBy);
+            .TieChoice( XXO("S&ort or Group:"), EffectsGroupBy);
 
-         S.TieIntegerTextBox(XO("&Maximum effects per group (0 to disable):"),
+         S.TieIntegerTextBox(XXO("&Maximum effects per group (0 to disable):"),
                              {wxT("/Effects/MaxPerGroup"),
 #if defined(__WXGTK__)
                               15
@@ -220,10 +220,10 @@ void EffectsPrefs::PopulateOrExchange(ShuttleGui & S)
 #ifndef EXPERIMENTAL_EFFECT_MANAGEMENT
    S.StartStatic(XO("Plugin Options"));
    {
-      S.TieCheckBox(XO("Check for updated plugins when Audacity starts"),
+      S.TieCheckBox(XXO("Check for updated plugins when Audacity starts"),
                      wxT("/Plugins/CheckForUpdates"),
                      true);
-      S.TieCheckBox(XO("Rescan plugins next time Audacity is started"),
+      S.TieCheckBox(XXO("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(XO("&Use SSE/SSE2/.../AVX"),
+      S.TieCheckBox(XXO("&Use SSE/SSE2/.../AVX"),
                     wxT("/SSE/GUI"),
                     true);
    }
diff --git a/src/prefs/ExtImportPrefs.cpp b/src/prefs/ExtImportPrefs.cpp
index 1e7b5cece..ed02bcf6e 100644
--- a/src/prefs/ExtImportPrefs.cpp
+++ b/src/prefs/ExtImportPrefs.cpp
@@ -106,7 +106,7 @@ void ExtImportPrefs::PopulateOrExchange(ShuttleGui & S)
    S.SetBorder(2);
    S.StartScroller();
 
-   S.TieCheckBox(XO("A&ttempt to use filter in OpenFile dialog first"),
+   S.TieCheckBox(XXO("A&ttempt to use filter in OpenFile dialog first"),
          {wxT("/ExtendedImport/OverrideExtendedImportByOpenFileDialogChoice"),
           true});
    S.StartStatic(XO("Rules to choose import filters"), 1);
@@ -184,19 +184,19 @@ void ExtImportPrefs::PopulateOrExchange(ShuttleGui & S)
       S.EndHorizontalLay();
       S.StartHorizontalLay (wxSHRINK, 0);
       {
-          MoveRuleUp = S.Id (EIPMoveRuleUp).AddButton(XO("Move rule &up"));
+          MoveRuleUp = S.Id (EIPMoveRuleUp).AddButton(XXO("Move rule &up"));
           MoveRuleDown = S.Id (EIPMoveRuleDown).AddButton(
-             XO("Move rule &down"));
+             XXO("Move rule &down"));
           MoveFilterUp = S.Id (EIPMoveFilterUp).AddButton(
-             XO("Move f&ilter up"));
+             XXO("Move f&ilter up"));
           MoveFilterDown = S.Id (EIPMoveFilterDown).AddButton(
-             XO("Move &filter down"));
+             XXO("Move &filter down"));
       }
       S.EndHorizontalLay();
       S.StartHorizontalLay (wxSHRINK, 0);
       {
-          AddRule = S.Id (EIPAddRule).AddButton(XO("&Add new rule"));
-          DelRule = S.Id (EIPDelRule).AddButton(XO("De&lete selected rule"));
+          AddRule = S.Id (EIPAddRule).AddButton(XXO("&Add new rule"));
+          DelRule = S.Id (EIPDelRule).AddButton(XXO("De&lete selected rule"));
       }
       S.EndHorizontalLay();
    }
diff --git a/src/prefs/GUIPrefs.cpp b/src/prefs/GUIPrefs.cpp
index 3157e7996..f94108c7f 100644
--- a/src/prefs/GUIPrefs.cpp
+++ b/src/prefs/GUIPrefs.cpp
@@ -185,18 +185,18 @@ void GUIPrefs::PopulateOrExchange(ShuttleGui & S)
       S.StartMultiColumn(2);
       {
 
-         S.TieChoice( XO("&Language:"),
+         S.TieChoice( XXO("&Language:"),
             {
                wxT("/Locale/Language"),
                { ByColumns, mLangNames, mLangCodes }
             }
          );
 
-         S.TieChoice( XO("Location of &Manual:"), GUIManualLocation);
+         S.TieChoice( XXO("Location of &Manual:"), GUIManualLocation);
 
-         S.TieChoice( XO("Th&eme:"), GUITheme);
+         S.TieChoice( XXO("Th&eme:"), GUITheme);
 
-         S.TieChoice( XO("Meter dB &range:"),
+         S.TieChoice( XXO("Meter dB &range:"),
             {
                ENV_DB_KEY,
                { ByColumns, mRangeChoices, mRangeCodes },
@@ -208,7 +208,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(XO("&Ergonomic order of Transport Toolbar buttons"),
+//      S.TieCheckBox(XXO("&Ergonomic order of Transport Toolbar buttons"),
 //                    wxT("/GUI/ErgonomicTransportButtons"),
 //                    true);
 
@@ -218,31 +218,31 @@ void GUIPrefs::PopulateOrExchange(ShuttleGui & S)
    S.StartStatic(XO("Options"));
    {
       // Start wording of options with a verb, if possible.
-      S.TieCheckBox(XO("Show 'How to Get &Help' at launch"),
+      S.TieCheckBox(XXO("Show 'How to Get &Help' at launch"),
                     {wxT("/GUI/ShowSplashScreen"),
                      true});
-      S.TieCheckBox(XO("Show e&xtra menus"),
+      S.TieCheckBox(XXO("Show e&xtra menus"),
                     {wxT("/GUI/ShowExtraMenus"),
                      false});
 #ifdef EXPERIMENTAL_THEME_PREFS
       // We do not want to make this option mainstream.  It's a 
       // convenience for developers.
-      S.TieCheckBox(XO("Show alternative &styling (Mac vs PC)"),
+      S.TieCheckBox(XXO("Show alternative &styling (Mac vs PC)"),
                     {wxT("/GUI/ShowMac"),
                      false});
 #endif
-      S.TieCheckBox(XO("&Beep on completion of longer activities"),
+      S.TieCheckBox(XXO("&Beep on completion of longer activities"),
                     {wxT("/GUI/BeepOnCompletion"),
                      false});
-      S.TieCheckBox(XO("Re&tain labels if selection snaps to a label"),
+      S.TieCheckBox(XXO("Re&tain labels if selection snaps to a label"),
                     {wxT("/GUI/RetainLabels"),
                      false});
-      S.TieCheckBox(XO("B&lend system and Audacity theme"),
+      S.TieCheckBox(XXO("B&lend system and Audacity theme"),
                     {wxT("/GUI/BlendThemes"),
                      true});
 #ifndef __WXMAC__
       /* i18n-hint: RTL stands for 'Right to Left'  */
-      S.TieCheckBox(XO("Use mostly Left-to-Right layouts in RTL languages"),
+      S.TieCheckBox(XXO("Use mostly Left-to-Right layouts in RTL languages"),
          {"/GUI/RtlWorkaround",
           true});
 #endif
@@ -251,10 +251,10 @@ void GUIPrefs::PopulateOrExchange(ShuttleGui & S)
 
    S.StartStatic(XO("Timeline"));
    {
-      S.TieCheckBox(XO("Show Timeline Tooltips"),
+      S.TieCheckBox(XXO("Show Timeline Tooltips"),
                     {wxT("/QuickPlay/ToolTips"),
                      true});
-      S.TieCheckBox(XO("Show Scrub Ruler"),
+      S.TieCheckBox(XXO("Show Scrub Ruler"),
                     {wxT("/QuickPlay/ScrubbingEnabled"),
                      false});
    }
diff --git a/src/prefs/ImportExportPrefs.cpp b/src/prefs/ImportExportPrefs.cpp
index 33980f1e3..064acc1ba 100644
--- a/src/prefs/ImportExportPrefs.cpp
+++ b/src/prefs/ImportExportPrefs.cpp
@@ -64,8 +64,8 @@ void ImportExportPrefs::Populate()
 EnumSetting< bool > ImportExportPrefs::ExportDownMixSetting{
    wxT("/FileFormats/ExportDownMixChoice"),
    {
-      EnumValueSymbol{ wxT("MixDown"), XO("&Mix down to Stereo or Mono") },
-      EnumValueSymbol{ wxT("Custom"), XO("&Use Advanced Mixing Options") },
+      EnumValueSymbol{ wxT("MixDown"), XXO("&Mix down to Stereo or Mono") },
+      EnumValueSymbol{ wxT("Custom"), XXO("&Use Advanced Mixing Options") },
    },
    0, // true
 
@@ -79,8 +79,8 @@ EnumSetting< bool > ImportExportPrefs::ExportDownMixSetting{
 EnumSetting< bool > ImportExportPrefs::AllegroStyleSetting{
    wxT("/FileFormats/AllegroStyleChoice"),
    {
-      EnumValueSymbol{ wxT("Seconds"), XO("&Seconds") },
-      EnumValueSymbol{ wxT("Beats"), XO("&Beats") },
+      EnumValueSymbol{ wxT("Seconds"), XXO("&Seconds") },
+      EnumValueSymbol{ wxT("Beats"), XXO("&Beats") },
    },
    0, // true
 
@@ -117,11 +117,11 @@ void ImportExportPrefs::PopulateOrExchange(ShuttleGui & S)
       }
       S.EndRadioButtonGroup();
 
-      S.TieCheckBox(XO("S&how Metadata Tags editor before export"),
+      S.TieCheckBox(XXO("S&how Metadata Tags editor before export"),
                     {wxT("/AudioFiles/ShowId3Dialog"),
                      true});
       /* i18n-hint 'blank space' is space on the tracks with no audio in it*/
-      S.TieCheckBox(XO("&Ignore blank space at the beginning"),
+      S.TieCheckBox(XXO("&Ignore blank space at the beginning"),
                     {wxT("/AudioFiles/SkipSilenceAtBeginning"),
                      false});
    }
diff --git a/src/prefs/KeyConfigPrefs.cpp b/src/prefs/KeyConfigPrefs.cpp
index cb9fb9c68..af3407c57 100644
--- a/src/prefs/KeyConfigPrefs.cpp
+++ b/src/prefs/KeyConfigPrefs.cpp
@@ -187,9 +187,9 @@ void KeyConfigPrefs::PopulateOrExchange(ShuttleGui & S)
             S.StartRadioButtonGroup({
                wxT("/Prefs/KeyConfig/ViewBy"),
                {
-                  { wxT("tree"), XO("&Tree") },
-                  { wxT("name"), XO("&Name") },
-                  { wxT("key"), XO("&Key") },
+                  { wxT("tree"), XXO("&Tree") },
+                  { wxT("name"), XXO("&Name") },
+                  { wxT("key"), XXO("&Key") },
                },
                0 // tree
             });
@@ -290,9 +290,9 @@ void KeyConfigPrefs::PopulateOrExchange(ShuttleGui & S)
             .AddWindow(mKey);
 
          /* i18n-hint: (verb)*/
-         mSet = S.Id(SetButtonID).AddButton(XO("&Set"));
+         mSet = S.Id(SetButtonID).AddButton(XXO("&Set"));
          /* i18n-hint: (verb)*/
-         mClear = S.Id(ClearButtonID).AddButton(XO("Cl&ear"));
+         mClear = S.Id(ClearButtonID).AddButton(XXO("Cl&ear"));
       }
       S.EndThreeColumn();
 
@@ -302,9 +302,9 @@ void KeyConfigPrefs::PopulateOrExchange(ShuttleGui & S)
 
       S.StartThreeColumn();
       {
-         S.Id(ImportButtonID).AddButton(XO("&Import..."));
-         S.Id(ExportButtonID).AddButton(XO("&Export..."));
-         S.Id(AssignDefaultsButtonID).AddButton(XO("&Defaults"));
+         S.Id(ImportButtonID).AddButton(XXO("&Import..."));
+         S.Id(ExportButtonID).AddButton(XXO("&Export..."));
+         S.Id(AssignDefaultsButtonID).AddButton(XXO("&Defaults"));
       }
       S.EndThreeColumn();
    }
diff --git a/src/prefs/LibraryPrefs.cpp b/src/prefs/LibraryPrefs.cpp
index 3a1d58423..7b8979c07 100644
--- a/src/prefs/LibraryPrefs.cpp
+++ b/src/prefs/LibraryPrefs.cpp
@@ -115,7 +115,7 @@ void LibraryPrefs::PopulateOrExchange(ShuttleGui & S)
 #ifdef DISABLE_DYNAMIC_LOADING_LAME
              .Disable()
 #endif
-            .AddButton(XO("&Locate..."),
+            .AddButton(XXO("&Locate..."),
                        wxALL | wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL);
          S.AddVariableText(XO("LAME MP3 Library:"),
             true, wxALL | wxALIGN_RIGHT | wxALIGN_CENTRE_VERTICAL);
@@ -123,7 +123,7 @@ void LibraryPrefs::PopulateOrExchange(ShuttleGui & S)
 #ifdef DISABLE_DYNAMIC_LOADING_LAME
              .Disable()
 #endif
-            .AddButton(XO("&Download"),
+            .AddButton(XXO("&Download"),
                        wxALL | wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL);
 
 #endif
@@ -154,7 +154,7 @@ void LibraryPrefs::PopulateOrExchange(ShuttleGui & S)
 #if !defined(USE_FFMPEG) || defined(DISABLE_DYNAMIC_LOADING_FFMPEG)
             .Disable()
 #endif
-            .AddButton(XO("Loca&te..."),
+            .AddButton(XXO("Loca&te..."),
                        wxALL | wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL);
          S.AddVariableText(XO("FFmpeg Library:"),
             true, wxALL | wxALIGN_RIGHT | wxALIGN_CENTRE_VERTICAL);
@@ -163,7 +163,7 @@ void LibraryPrefs::PopulateOrExchange(ShuttleGui & S)
 #if !defined(USE_FFMPEG) || defined(DISABLE_DYNAMIC_LOADING_FFMPEG)
             .Disable()
 #endif
-            .AddButton(XO("Dow&nload"),
+            .AddButton(XXO("Dow&nload"),
                        wxALL | wxALIGN_LEFT | wxALIGN_CENTRE_VERTICAL);
       }
       S.EndTwoColumn();
@@ -172,7 +172,7 @@ void LibraryPrefs::PopulateOrExchange(ShuttleGui & S)
 #if !defined(USE_FFMPEG)
          .Disable()
 #endif
-         .TieCheckBox(XO("Allow &background on-demand loading"),
+         .TieCheckBox(XXO("Allow &background on-demand loading"),
                     {wxT("/Library/FFmpegOnDemand"), false});
 #endif
    }
diff --git a/src/prefs/MidiIOPrefs.cpp b/src/prefs/MidiIOPrefs.cpp
index 1a8ec49d4..33e8728f5 100644
--- a/src/prefs/MidiIOPrefs.cpp
+++ b/src/prefs/MidiIOPrefs.cpp
@@ -139,14 +139,14 @@ void MidiIOPrefs::PopulateOrExchange( ShuttleGui & S ) {
       {
          S.Id(HostID);
          /* i18n-hint: (noun) */
-         mHost = S.TieChoice( XO("&Host:"),
+         mHost = S.TieChoice( XXO("&Host:"),
             {
                wxT("/MidiIO/Host"),
                { ByColumns, mHostNames, mHostLabels }
             }
          );
 
-         S.AddPrompt(XO("Using: PortMidi"));
+         S.AddPrompt(XXO("Using: PortMidi"));
       }
       S.EndMultiColumn();
    }
@@ -157,9 +157,9 @@ void MidiIOPrefs::PopulateOrExchange( ShuttleGui & S ) {
       S.StartMultiColumn(2);
       {
          S.Id(PlayID);
-         mPlay = S.AddChoice(XO("&Device:"),
+         mPlay = S.AddChoice(XXO("&Device:"),
                              {} );
-         mLatency = S.TieIntegerTextBox(XO("MIDI Synth L&atency (ms):"),
+         mLatency = S.TieIntegerTextBox(XXO("MIDI Synth L&atency (ms):"),
                                         {wxT("/MidiIO/SynthLatency"),
                                          DEFAULT_SYNTH_LATENCY}, 3);
       }
diff --git a/src/prefs/PlaybackPrefs.cpp b/src/prefs/PlaybackPrefs.cpp
index a27a6d69f..29cbe0bca 100644
--- a/src/prefs/PlaybackPrefs.cpp
+++ b/src/prefs/PlaybackPrefs.cpp
@@ -87,7 +87,7 @@ void PlaybackPrefs::PopulateOrExchange(ShuttleGui & S)
       S.StartThreeColumn();
       {
          S.NameSuffix(suffix)
-            .TieNumericTextBox(XO("&Length:"),
+            .TieNumericTextBox(XXO("&Length:"),
                                  {wxT("/AudioIO/EffectsPreviewLen"),
                                   6.0},
                                  9);
@@ -103,14 +103,14 @@ void PlaybackPrefs::PopulateOrExchange(ShuttleGui & S)
       S.StartThreeColumn();
       {
          S.NameSuffix(suffix)
-            .TieNumericTextBox(XO("&Before cut region:"),
+            .TieNumericTextBox(XXO("&Before cut region:"),
                                  {wxT("/AudioIO/CutPreviewBeforeLen"),
                                   2.0},
                                  9);
          S.AddUnits(XO("seconds"));
 
          S.NameSuffix(suffix)
-            .TieNumericTextBox(XO("&After cut region:"),
+            .TieNumericTextBox(XXO("&After cut region:"),
                                  {wxT("/AudioIO/CutPreviewAfterLen"),
                                   1.0},
                                  9);
@@ -125,14 +125,14 @@ void PlaybackPrefs::PopulateOrExchange(ShuttleGui & S)
       S.StartThreeColumn();
       {
          S.NameSuffix(suffix)
-            .TieNumericTextBox(XO("&Short period:"),
+            .TieNumericTextBox(XXO("&Short period:"),
                                  {wxT("/AudioIO/SeekShortPeriod"),
                                   1.0},
                                  9);
          S.AddUnits(XO("seconds"));
 
          S.NameSuffix(suffix)
-            .TieNumericTextBox(XO("Lo&ng period:"),
+            .TieNumericTextBox(XXO("Lo&ng period:"),
                                  {wxT("/AudioIO/SeekLongPeriod"),
                                   15.0},
                                  9);
@@ -146,9 +146,9 @@ void PlaybackPrefs::PopulateOrExchange(ShuttleGui & S)
    {
       S.StartVerticalLay();
       {
-         S.TieCheckBox(XO("&Vari-Speed Play"), {"/AudioIO/VariSpeedPlay", true});
-         S.TieCheckBox(XO("&Micro-fades"), {"/AudioIO/Microfades", false});
-         S.TieCheckBox(XO("Always scrub un&pinned"),
+         S.TieCheckBox(XXO("&Vari-Speed Play"), {"/AudioIO/VariSpeedPlay", true});
+         S.TieCheckBox(XXO("&Micro-fades"), {"/AudioIO/Microfades", false});
+         S.TieCheckBox(XXO("Always scrub un&pinned"),
             {UnpinnedScrubbingPreferenceKey(),
              UnpinnedScrubbingPreferenceDefault()});
       }
diff --git a/src/prefs/QualityPrefs.cpp b/src/prefs/QualityPrefs.cpp
index ef4504a8e..adaeae624 100644
--- a/src/prefs/QualityPrefs.cpp
+++ b/src/prefs/QualityPrefs.cpp
@@ -142,7 +142,7 @@ void QualityPrefs::PopulateOrExchange(ShuttleGui & S)
    {
       S.StartMultiColumn(2);
       {
-         S.AddPrompt(XO("Default Sample &Rate:"));
+         S.AddPrompt(XXO("Default Sample &Rate:"));
 
          S.StartMultiColumn(2);
          {
@@ -167,7 +167,7 @@ void QualityPrefs::PopulateOrExchange(ShuttleGui & S)
          }
          S.EndHorizontalLay();
 
-         S.TieChoice(XO("Default Sample &Format:"),
+         S.TieChoice(XXO("Default Sample &Format:"),
                      formatSetting);
       }
       S.EndMultiColumn();
@@ -178,11 +178,11 @@ void QualityPrefs::PopulateOrExchange(ShuttleGui & S)
    {
       S.StartMultiColumn(2, wxEXPAND);
       {
-         S.TieChoice(XO("Sample Rate Con&verter:"),
+         S.TieChoice(XXO("Sample Rate Con&verter:"),
                      Resample::FastMethodSetting);
 
          /* i18n-hint: technical term for randomization to reduce undesirable resampling artifacts */
-         S.TieChoice(XO("&Dither:"),
+         S.TieChoice(XXO("&Dither:"),
                      Dither::FastSetting);
       }
       S.EndMultiColumn();
@@ -193,11 +193,11 @@ void QualityPrefs::PopulateOrExchange(ShuttleGui & S)
    {
       S.StartMultiColumn(2);
       {
-         S.TieChoice(XO("Sample Rate Conver&ter:"),
+         S.TieChoice(XXO("Sample Rate Conver&ter:"),
                      Resample::BestMethodSetting);
 
          /* i18n-hint: technical term for randomization to reduce undesirable resampling artifacts */
-         S.TieChoice(XO("Dit&her:"),
+         S.TieChoice(XXO("Dit&her:"),
                      Dither::BestSetting);
       }
       S.EndMultiColumn();
diff --git a/src/prefs/RecordingPrefs.cpp b/src/prefs/RecordingPrefs.cpp
index 92ab9c56e..547652308 100644
--- a/src/prefs/RecordingPrefs.cpp
+++ b/src/prefs/RecordingPrefs.cpp
@@ -87,7 +87,7 @@ void RecordingPrefs::PopulateOrExchange(ShuttleGui & S)
    S.StartStatic(XO("Options"));
    {
       // Start wording of options with a verb, if possible.
-      S.TieCheckBox(XO("Play &other tracks while recording (overdub)"),
+      S.TieCheckBox(XXO("Play &other tracks while recording (overdub)"),
                      {wxT("/AudioIO/Duplex"),
 #ifdef EXPERIMENTAL_DA
                       false
@@ -103,19 +103,19 @@ void RecordingPrefs::PopulateOrExchange(ShuttleGui & S)
                     {wxT("/AudioIO/Playthrough"),
                      false});
 #endif
-      S.TieCheckBox(XO("&Software playthrough of input"),
+      S.TieCheckBox(XXO("&Software playthrough of input"),
                     {wxT("/AudioIO/SWPlaythrough"),
                      false});
 #if !defined(__WXMAC__)
       //S.AddUnits(XO("     (uncheck when recording computer playback)"));
 #endif
 
-       S.TieCheckBox(XO("Record on a new track"),
+       S.TieCheckBox(XXO("Record on a new track"),
                     {wxT("/GUI/PreferNewTrackRecord"),
                      false});
 
 /* i18n-hint: Dropout is a loss of a short sequence audio sample data from the recording */
-       S.TieCheckBox(XO("Detect dropouts"),
+       S.TieCheckBox(XXO("Detect dropouts"),
                      {WarningDialogKey(wxT("DropoutDetected")),
                       true});
 
@@ -125,7 +125,7 @@ void RecordingPrefs::PopulateOrExchange(ShuttleGui & S)
 
    S.StartStatic(XO("Sound Activated Recording"));
    {
-      S.TieCheckBox(XO("&Enable"),
+      S.TieCheckBox(XXO("&Enable"),
                     {wxT("/AudioIO/SoundActivatedRecord"),
                      false});
 
@@ -133,7 +133,7 @@ void RecordingPrefs::PopulateOrExchange(ShuttleGui & S)
       {
          S.SetStretchyCol(1);
 
-         S.TieSlider(XO("Le&vel (dB):"),
+         S.TieSlider(XXO("Le&vel (dB):"),
                      {wxT("/AudioIO/SilenceLevel"),
                       -50},
                      0,
@@ -155,7 +155,7 @@ void RecordingPrefs::PopulateOrExchange(ShuttleGui & S)
          S.AddFixedText(XO("With:")) ;
          S.StartMultiColumn(3);
          {
-            S.Id(UseCustomTrackNameID).TieCheckBox(XO("Custom Track &Name"),
+            S.Id(UseCustomTrackNameID).TieCheckBox(XXO("Custom Track &Name"),
                                             {wxT("/GUI/TrackNames/RecordingNameCustom"),
                                              mUseCustomTrackName});
 
@@ -173,15 +173,15 @@ void RecordingPrefs::PopulateOrExchange(ShuttleGui & S)
          S.AddFixedText(  {} );
          S.StartMultiColumn(3);
          {
-            S.TieCheckBox(XO("&Track Number"),
+            S.TieCheckBox(XXO("&Track Number"),
                           {wxT("/GUI/TrackNames/TrackNumber"),
                            false});
 
-            S.TieCheckBox(XO("System &Date"),
+            S.TieCheckBox(XXO("System &Date"),
                           {wxT("/GUI/TrackNames/DateStamp"),
                            false});
 
-            S.TieCheckBox(XO("System T&ime"),
+            S.TieCheckBox(XXO("System T&ime"),
                           {wxT("/GUI/TrackNames/TimeStamp"),
                            false});
          }
@@ -194,7 +194,7 @@ void RecordingPrefs::PopulateOrExchange(ShuttleGui & S)
    #ifdef EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT
       S.StartStatic(XO("Automated Recording Level Adjustment"));
       {
-         S.TieCheckBox(XO("Enable Automated Recording Level Adjustment."),
+         S.TieCheckBox(XXO("Enable Automated Recording Level Adjustment."),
                        {wxT("/AudioIO/AutomatedInputLevelAdjustment"),
                         false});
 
@@ -203,13 +203,13 @@ void RecordingPrefs::PopulateOrExchange(ShuttleGui & S)
             S.SetStretchyCol(1);
 
             /* i18n-hint: Desired maximum (peak) volume for sound */
-            S.TieSlider(XO("Target Peak:"),
+            S.TieSlider(XXO("Target Peak:"),
                         {wxT("/AudioIO/TargetPeak"),
                          AILA_DEF_TARGET_PEAK},
                         100,
                         0);
 
-            S.TieSlider(XO("Within:"),
+            S.TieSlider(XXO("Within:"),
                      {wxT("/AudioIO/DeltaPeakVolume"),
                       AILA_DEF_DELTA_PEAK},
                      100,
@@ -219,13 +219,13 @@ void RecordingPrefs::PopulateOrExchange(ShuttleGui & S)
 
          S.StartThreeColumn();
          {
-            S.TieIntegerTextBox(XO("Analysis Time:"),
+            S.TieIntegerTextBox(XXO("Analysis Time:"),
                                 {wxT("/AudioIO/AnalysisTime"),
                                  AILA_DEF_ANALYSIS_TIME},
                                 9);
             S.AddUnits(XO("milliseconds (time of one analysis)"));
 
-            S.TieIntegerTextBox(XO("Number of consecutive analysis:"),
+            S.TieIntegerTextBox(XXO("Number of consecutive analysis:"),
                                 {wxT("/AudioIO/NumberAnalysis"),
                                  AILA_DEF_NUMBER_ANALYSIS},
                                 2);
@@ -243,7 +243,7 @@ void RecordingPrefs::PopulateOrExchange(ShuttleGui & S)
          {
             auto w = S
                .NameSuffix(XO("seconds"))
-               .TieNumericTextBox(XO("Pre-ro&ll:"),
+               .TieNumericTextBox(XXO("Pre-ro&ll:"),
                   {AUDIO_PRE_ROLL_KEY,
                    DEFAULT_PRE_ROLL_SECONDS},
                   9);
@@ -252,7 +252,7 @@ void RecordingPrefs::PopulateOrExchange(ShuttleGui & S)
          {
             auto w = S
                .NameSuffix(XO("milliseconds"))
-               .TieNumericTextBox(XO("Cross&fade:"),
+               .TieNumericTextBox(XXO("Cross&fade:"),
                   {AUDIO_ROLL_CROSSFADE_KEY,
                    DEFAULT_ROLL_CROSSFADE_MS},
                   9);
diff --git a/src/prefs/SpectrumPrefs.cpp b/src/prefs/SpectrumPrefs.cpp
index 292aeeae0..67e73c01f 100644
--- a/src/prefs/SpectrumPrefs.cpp
+++ b/src/prefs/SpectrumPrefs.cpp
@@ -177,7 +177,7 @@ void SpectrumPrefs::PopulateOrExchange(ShuttleGui & S)
    mDefaultsCheckbox = 0;
    if (mWt) {
       /* i18n-hint: use is a verb */
-      mDefaultsCheckbox = S.Id(ID_DEFAULTS).TieCheckBox(XO("&Use Preferences"), mDefaulted);
+      mDefaultsCheckbox = S.Id(ID_DEFAULTS).TieCheckBox(XXO("&Use Preferences"), mDefaulted);
    }
 
    S.StartMultiColumn(2,wxEXPAND);
@@ -190,15 +190,15 @@ void SpectrumPrefs::PopulateOrExchange(ShuttleGui & S)
          {
             S.SetStretchyCol( 0 );
             S.SetStretchyCol( 1 );
-            S.Id(ID_SCALE).TieChoice(XO("S&cale:"),
+            S.Id(ID_SCALE).TieChoice(XXO("S&cale:"),
                mTempSettings.scaleType,
                Msgids( SpectrogramSettings::GetScaleNames() ) );
             mMinFreq =
-               S.Id(ID_MINIMUM).TieNumericTextBox(XO("Mi&n Frequency (Hz):"),
+               S.Id(ID_MINIMUM).TieNumericTextBox(XXO("Mi&n Frequency (Hz):"),
                mTempSettings.minFreq,
                12);
             mMaxFreq =
-               S.Id(ID_MAXIMUM).TieNumericTextBox(XO("Ma&x Frequency (Hz):"),
+               S.Id(ID_MAXIMUM).TieNumericTextBox(XXO("Ma&x Frequency (Hz):"),
                mTempSettings.maxFreq,
                12);
          }
@@ -213,22 +213,22 @@ void SpectrumPrefs::PopulateOrExchange(ShuttleGui & S)
             S.SetStretchyCol( 0 );
             S.SetStretchyCol( 1 );
             mGain =
-               S.Id(ID_GAIN).TieNumericTextBox(XO("&Gain (dB):"),
+               S.Id(ID_GAIN).TieNumericTextBox(XXO("&Gain (dB):"),
                mTempSettings.gain,
                8);
             mRange =
-               S.Id(ID_RANGE).TieNumericTextBox(XO("&Range (dB):"),
+               S.Id(ID_RANGE).TieNumericTextBox(XXO("&Range (dB):"),
                mTempSettings.range,
                8);
 
             mFrequencyGain =
-               S.Id(ID_FREQUENCY_GAIN).TieNumericTextBox(XO("High &boost (dB/dec):"),
+               S.Id(ID_FREQUENCY_GAIN).TieNumericTextBox(XXO("High &boost (dB/dec):"),
                mTempSettings.frequencyGain,
                8);
          }
          S.EndMultiColumn();
 
-         S.Id(ID_GRAYSCALE).TieCheckBox(XO("Gra&yscale"),
+         S.Id(ID_GRAYSCALE).TieCheckBox(XXO("Gra&yscale"),
             mTempSettings.isGrayscale);
       }
       S.EndStatic();
@@ -240,11 +240,11 @@ void SpectrumPrefs::PopulateOrExchange(ShuttleGui & S)
       S.StartMultiColumn(2);
       {
          mAlgorithmChoice =
-            S.Id(ID_ALGORITHM).TieChoice(XO("A&lgorithm:"),
+            S.Id(ID_ALGORITHM).TieChoice(XXO("A&lgorithm:"),
             mTempSettings.algorithm,
             SpectrogramSettings::GetAlgorithmNames() );
 
-         S.Id(ID_WINDOW_SIZE).TieChoice(XO("Window &size:"),
+         S.Id(ID_WINDOW_SIZE).TieChoice(XXO("Window &size:"),
             mTempSettings.windowSize,
             {
                XO("8 - most wideband"),
@@ -263,13 +263,13 @@ void SpectrumPrefs::PopulateOrExchange(ShuttleGui & S)
             }
          );
 
-         S.Id(ID_WINDOW_TYPE).TieChoice(XO("Window &type:"),
+         S.Id(ID_WINDOW_TYPE).TieChoice(XXO("Window &type:"),
             mTempSettings.windowType,
             mTypeChoices);
 
 #ifdef EXPERIMENTAL_ZERO_PADDED_SPECTROGRAMS
          mZeroPaddingChoiceCtrl =
-            S.Id(ID_PADDING_SIZE).TieChoice(XO("&Zero padding factor:"),
+            S.Id(ID_PADDING_SIZE).TieChoice(XXO("&Zero padding factor:"),
             mTempSettings.zeroPaddingFactor,
             mZeroPaddingChoices);
 #endif
@@ -279,7 +279,7 @@ void SpectrumPrefs::PopulateOrExchange(ShuttleGui & S)
    S.EndStatic();
 
 #ifndef SPECTRAL_SELECTION_GLOBAL_SWITCH
-   S.Id(ID_SPECTRAL_SELECTION).TieCheckBox(XO("Ena&ble Spectral Selection"),
+   S.Id(ID_SPECTRAL_SELECTION).TieCheckBox(XXO("Ena&ble Spectral Selection"),
       mTempSettings.spectralSelection);
 #endif
 
@@ -295,21 +295,21 @@ void SpectrumPrefs::PopulateOrExchange(ShuttleGui & S)
          S.StartTwoColumn();
          {
             mFindNotesMinA =
-               S.TieNumericTextBox(XO("Minimum Amplitude (dB):"),
+               S.TieNumericTextBox(XXO("Minimum Amplitude (dB):"),
                mTempSettings.findNotesMinA,
                8);
 
             mFindNotesN =
-               S.TieNumericTextBox(XO("Max. Number of Notes (1..128):"),
+               S.TieNumericTextBox(XXO("Max. Number of Notes (1..128):"),
                mTempSettings.numberOfMaxima,
                8);
          }
          S.EndTwoColumn();
 
-         S.TieCheckBox(XO("&Find Notes"),
+         S.TieCheckBox(XXO("&Find Notes"),
             mTempSettings.fftFindNotes);
 
-         S.TieCheckBox(XO("&Quantize Notes"),
+         S.TieCheckBox(XXO("&Quantize Notes"),
             mTempSettings.findNotesQuantize);
       }
       S.EndStatic();
@@ -319,7 +319,7 @@ void SpectrumPrefs::PopulateOrExchange(ShuttleGui & S)
 #ifdef SPECTRAL_SELECTION_GLOBAL_SWITCH
    S.StartStatic(XO("Global settings"));
    {
-      S.TieCheckBox(XO("Ena&ble spectral selection"),
+      S.TieCheckBox(XXO("Ena&ble spectral selection"),
          SpectrogramSettings::Globals::Get().spectralSelection);
    }
    S.EndStatic();
diff --git a/src/prefs/ThemePrefs.cpp b/src/prefs/ThemePrefs.cpp
index a65fc7377..126ec95c2 100644
--- a/src/prefs/ThemePrefs.cpp
+++ b/src/prefs/ThemePrefs.cpp
@@ -136,8 +136,8 @@ void ThemePrefs::PopulateOrExchange(ShuttleGui & S)
    {
       S.StartHorizontalLay(wxALIGN_LEFT);
       {
-         S.Id(idSaveThemeCache).AddButton(XO("Save Theme Cache"));
-         S.Id(idLoadThemeCache).AddButton(XO("Load Theme Cache"));
+         S.Id(idSaveThemeCache).AddButton(XXO("Save Theme Cache"));
+         S.Id(idLoadThemeCache).AddButton(XXO("Load Theme Cache"));
 
          // This next button is only provided in Debug mode.
          // It is for developers who are compiling Audacity themselves
@@ -146,7 +146,7 @@ void ThemePrefs::PopulateOrExchange(ShuttleGui & S)
          S.Id(idSaveThemeAsCode).AddButton(Verbatim("Output Sourcery"));
 #endif
 
-         S.Id(idReadThemeInternal).AddButton(XO("&Defaults"));
+         S.Id(idReadThemeInternal).AddButton(XXO("&Defaults"));
       }
       S.EndHorizontalLay();
    }
@@ -163,8 +163,8 @@ void ThemePrefs::PopulateOrExchange(ShuttleGui & S)
    {
       S.StartHorizontalLay(wxALIGN_LEFT);
       {
-         S.Id(idSaveThemeComponents).AddButton( XO("Save Files"));
-         S.Id(idLoadThemeComponents).AddButton( XO("Load Files"));
+         S.Id(idSaveThemeComponents).AddButton( XXO("Save Files"));
+         S.Id(idLoadThemeComponents).AddButton( XXO("Load Files"));
       }
       S.EndHorizontalLay();
    }
diff --git a/src/prefs/TracksBehaviorsPrefs.cpp b/src/prefs/TracksBehaviorsPrefs.cpp
index 2f0c1ef5f..9b34fc8a5 100644
--- a/src/prefs/TracksBehaviorsPrefs.cpp
+++ b/src/prefs/TracksBehaviorsPrefs.cpp
@@ -80,34 +80,34 @@ void TracksBehaviorsPrefs::PopulateOrExchange(ShuttleGui & S)
 
    S.StartStatic(XO("Behaviors"));
    {
-      S.TieCheckBox(XO("&Select all audio, if selection required"),
+      S.TieCheckBox(XXO("&Select all audio, if selection required"),
                     {wxT("/GUI/SelectAllOnNone"),
                      false});
       /* i18n-hint: Cut-lines are lines that can expand to show the cut audio.*/
-      S.TieCheckBox(XO("Enable cut &lines"),
+      S.TieCheckBox(XXO("Enable cut &lines"),
                     {wxT("/GUI/EnableCutLines"),
                      false});
-      S.TieCheckBox(XO("Enable &dragging selection edges"),
+      S.TieCheckBox(XXO("Enable &dragging selection edges"),
                     {wxT("/GUI/AdjustSelectionEdges"),
                      true});
-      S.TieCheckBox(XO("Editing a clip can &move other clips"),
+      S.TieCheckBox(XXO("Editing a clip can &move other clips"),
                     {wxT("/GUI/EditClipCanMove"),
                      true});
-      S.TieCheckBox(XO("\"Move track focus\" c&ycles repeatedly through tracks"),
+      S.TieCheckBox(XXO("\"Move track focus\" c&ycles repeatedly through tracks"),
                     {wxT("/GUI/CircularTrackNavigation"),
                      false});
-      S.TieCheckBox(XO("&Type to create a label"),
+      S.TieCheckBox(XXO("&Type to create a label"),
                     {wxT("/GUI/TypeToCreateLabel"),
                      false});
-      S.TieCheckBox(XO("Use dialog for the &name of a new label"),
+      S.TieCheckBox(XXO("Use dialog for the &name of a new label"),
                     {wxT("/GUI/DialogForNameNewLabel"),
                      false});
 #ifdef EXPERIMENTAL_SCROLLING_LIMITS
-      S.TieCheckBox(XO("Enable scrolling left of &zero"),
+      S.TieCheckBox(XXO("Enable scrolling left of &zero"),
                     {ScrollingPreferenceKey(),
                      ScrollingPreferenceDefault()});
 #endif
-      S.TieCheckBox(XO("Advanced &vertical zooming"),
+      S.TieCheckBox(XXO("Advanced &vertical zooming"),
                     {wxT("/GUI/VerticalZooming"),
                      false});
 
@@ -115,7 +115,7 @@ void TracksBehaviorsPrefs::PopulateOrExchange(ShuttleGui & S)
 
       S.StartMultiColumn(2);
       {
-         S.TieChoice( XO("Solo &Button:"), TracksBehaviorsSolo);
+         S.TieChoice( XXO("Solo &Button:"), TracksBehaviorsSolo);
       }
       S.EndMultiColumn();
    }
diff --git a/src/prefs/TracksPrefs.cpp b/src/prefs/TracksPrefs.cpp
index df86bfdd3..b36e17699 100644
--- a/src/prefs/TracksPrefs.cpp
+++ b/src/prefs/TracksPrefs.cpp
@@ -315,23 +315,23 @@ void TracksPrefs::PopulateOrExchange(ShuttleGui & S)
 
    S.StartStatic(XO("Display"));
    {
-      S.TieCheckBox(XO("Auto-&fit track height"),
+      S.TieCheckBox(XXO("Auto-&fit track height"),
                     {wxT("/GUI/TracksFitVerticallyZoomed"),
                      false});
-      S.TieCheckBox(XO("Sho&w track name as overlay"),
+      S.TieCheckBox(XXO("Sho&w track name as overlay"),
                   {wxT("/GUI/ShowTrackNameInWaveform"),
                    false});
 #ifdef EXPERIMENTAL_HALF_WAVE
-      S.TieCheckBox(XO("Use &half-wave display when collapsed"),
+      S.TieCheckBox(XXO("Use &half-wave display when collapsed"),
                   {wxT("/GUI/CollapseToHalfWave"),
                    false});
 #endif
 #ifdef SHOW_PINNED_UNPINNED_IN_PREFS
-      S.TieCheckBox(XO("&Pinned Recording/Playback head"),
+      S.TieCheckBox(XXO("&Pinned Recording/Playback head"),
          {PinnedHeadPreferenceKey(),
           PinnedHeadPreferenceDefault()});
 #endif
-      S.TieCheckBox(XO("A&uto-scroll if head unpinned"),
+      S.TieCheckBox(XXO("A&uto-scroll if head unpinned"),
          {wxT("/GUI/AutoScroll"),
           true});
 
@@ -341,23 +341,23 @@ void TracksPrefs::PopulateOrExchange(ShuttleGui & S)
       {
 #ifdef SHOW_PINNED_POSITION_IN_PREFS
          S.TieNumericTextBox(
-            XO("Pinned &head position"),
+            XXO("Pinned &head position"),
             {PinnedHeadPositionPreferenceKey(),
              PinnedHeadPositionPreferenceDefault()},
             30
          );
 #endif
 
-         S.TieChoice(XO("Default &view mode:"),
+         S.TieChoice(XXO("Default &view mode:"),
                      viewModeSetting() );
 
-         S.TieChoice(XO("Default Waveform scale:"),
+         S.TieChoice(XXO("Default Waveform scale:"),
                      waveformScaleSetting );
 
-         S.TieChoice(XO("Display &samples:"),
+         S.TieChoice(XXO("Display &samples:"),
                      sampleDisplaySetting );
 
-         S.TieTextBox(XO("Default audio track &name:"),
+         S.TieTextBox(XXO("Default audio track &name:"),
                       {wxT("/GUI/TrackNames/DefaultTrackName"),
                        _("Audio Track")},
                       30);
@@ -370,10 +370,10 @@ void TracksPrefs::PopulateOrExchange(ShuttleGui & S)
    {
       S.StartMultiColumn(4);
       {
-         S.TieChoice(XO("Preset 1:"),
+         S.TieChoice(XXO("Preset 1:"),
                      zoom1Setting );
 
-         S.TieChoice(XO("Preset 2:"),
+         S.TieChoice(XXO("Preset 2:"),
                      zoom2Setting );
       }
    }
diff --git a/src/prefs/WarningsPrefs.cpp b/src/prefs/WarningsPrefs.cpp
index bbe6e9e1d..29aab3edd 100644
--- a/src/prefs/WarningsPrefs.cpp
+++ b/src/prefs/WarningsPrefs.cpp
@@ -69,29 +69,29 @@ void WarningsPrefs::PopulateOrExchange(ShuttleGui & S)
 
    S.StartStatic(XO("Show Warnings/Prompts for"));
    {
-      S.TieCheckBox(XO("Saving &projects"),
+      S.TieCheckBox(XXO("Saving &projects"),
                     {wxT("/Warnings/FirstProjectSave"),
                      true});
-      S.TieCheckBox(XO("Saving &empty project"),
+      S.TieCheckBox(XXO("Saving &empty project"),
                     {wxT("/GUI/EmptyCanBeDirty"),
                      true});
-      S.TieCheckBox(XO("&Low disk space at launch or new project"),
+      S.TieCheckBox(XXO("&Low disk space at launch or new project"),
                     {wxT("/Warnings/DiskSpaceWarning"),
                      true});
-      S.TieCheckBox(XO("Mixing down to &mono during export"),
+      S.TieCheckBox(XXO("Mixing down to &mono during export"),
                     {wxT("/Warnings/MixMono"),
                      true});
-      S.TieCheckBox(XO("Mixing down to &stereo during export"),
+      S.TieCheckBox(XXO("Mixing down to &stereo during export"),
                     {wxT("/Warnings/MixStereo"),
                      true});
-      S.TieCheckBox(XO("Mixing down on export (&Custom FFmpeg or external program)"),
+      S.TieCheckBox(XXO("Mixing down on export (&Custom FFmpeg or external program)"),
                     {wxT("/Warnings/MixUnknownChannels"),
                      true});
-      S.TieCheckBox(XO("Missing file &name extension during export"),
+      S.TieCheckBox(XXO("Missing file &name extension during export"),
                     {wxT("/Warnings/MissingExtension"),
                      true});
 #ifdef EXPERIMENTAL_OD_DATA
-      S.TieCheckBox(XO("&Importing uncompressed audio files"),
+      S.TieCheckBox(XXO("&Importing uncompressed audio files"),
                     {wxT("/Warnings/CopyOrEditUncompressedDataAsk"),
                      true});
 #endif
diff --git a/src/prefs/WaveformPrefs.cpp b/src/prefs/WaveformPrefs.cpp
index 5f1516549..84cc1057b 100644
--- a/src/prefs/WaveformPrefs.cpp
+++ b/src/prefs/WaveformPrefs.cpp
@@ -102,7 +102,7 @@ void WaveformPrefs::PopulateOrExchange(ShuttleGui & S)
       mDefaultsCheckbox = 0;
       if (mWt) {
          /* i18n-hint: use is a verb */
-         mDefaultsCheckbox = S.Id(ID_DEFAULTS).TieCheckBox(XO("&Use Preferences"), mDefaulted);
+         mDefaultsCheckbox = S.Id(ID_DEFAULTS).TieCheckBox(XXO("&Use Preferences"), mDefaulted);
       }
 
       S.StartStatic(XO("Display"));
@@ -110,12 +110,12 @@ void WaveformPrefs::PopulateOrExchange(ShuttleGui & S)
          S.StartTwoColumn();
          {
             mScaleChoice =
-               S.Id(ID_SCALE).TieChoice(XO("S&cale:"),
+               S.Id(ID_SCALE).TieChoice(XXO("S&cale:"),
                   mTempSettings.scaleType,
                   Msgids( WaveformSettings::GetScaleNames() ) );
 
             mRangeChoice =
-               S.Id(ID_RANGE).TieChoice(XO("Waveform dB &range:"),
+               S.Id(ID_RANGE).TieChoice(XXO("Waveform dB &range:"),
                mTempSettings.dBRange,
                mRangeChoices);
          }
diff --git a/src/toolbars/ToolsToolBar.cpp b/src/toolbars/ToolsToolBar.cpp
index ac4ed1ca5..cc018fd3f 100644
--- a/src/toolbars/ToolsToolBar.cpp
+++ b/src/toolbars/ToolsToolBar.cpp
@@ -410,7 +410,7 @@ BaseItemSharedPtr ExtraToolsMenu()
 {
    static BaseItemSharedPtr menu{
    ( FinderScope{ findCommandHandler },
-   Menu( wxT("Tools"), XO("T&ools"),
+   Menu( wxT("Tools"), XXO("T&ools"),
       Command( wxT("SelectTool"), XXO("&Selection Tool"), FN(OnSelectTool),
          AlwaysEnabledFlag, wxT("F1") ),
       Command( wxT("EnvelopeTool"), XXO("&Envelope Tool"),
diff --git a/src/tracks/labeltrack/ui/LabelTrackControls.cpp b/src/tracks/labeltrack/ui/LabelTrackControls.cpp
index 40ca3509b..fec23f55d 100644
--- a/src/tracks/labeltrack/ui/LabelTrackControls.cpp
+++ b/src/tracks/labeltrack/ui/LabelTrackControls.cpp
@@ -73,7 +73,7 @@ enum
 
 BEGIN_POPUP_MENU(LabelTrackMenuTable)
    BeginSection( "Basic" );
-      AppendItem( "Font", OnSetFontID, XO("&Font..."), POPUP_MENU_FN( OnSetFont ) );
+      AppendItem( "Font", OnSetFontID, XXO("&Font..."), POPUP_MENU_FN( OnSetFont ) );
    EndSection();
 END_POPUP_MENU()
 
@@ -127,7 +127,7 @@ void LabelTrackMenuTable::OnSetFont(wxCommandEvent &)
          S.SetStretchyCol(1);
 
          /* i18n-hint: (noun) The name of the typeface*/
-         S.AddPrompt(XO("Face name"));
+         S.AddPrompt(XXO("Face name"));
          lb = safenew wxListBox(S.GetParent(), wxID_ANY,
             wxDefaultPosition,
             wxDefaultSize,
@@ -141,7 +141,7 @@ void LabelTrackMenuTable::OnSetFont(wxCommandEvent &)
             .AddWindow(lb);
 
          /* i18n-hint: (noun) The size of the typeface*/
-         S.AddPrompt(XO("Face size"));
+         S.AddPrompt(XXO("Face size"));
          sc = safenew wxSpinCtrl(S.GetParent(), wxID_ANY,
             wxString::Format(wxT("%ld"), fontsize),
             wxDefaultPosition,
diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.cpp b/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.cpp
index ebe52eb73..e54552b05 100644
--- a/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.cpp
+++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackControls.cpp
@@ -132,8 +132,8 @@ void NoteTrackMenuTable::OnChangeOctave(wxCommandEvent &event)
 
 BEGIN_POPUP_MENU(NoteTrackMenuTable)
    BeginSection( "Basic" );
-      AppendItem( "Up", OnUpOctaveID, XO("Up &Octave"), POPUP_MENU_FN( OnChangeOctave ) );
-      AppendItem( "Down", OnDownOctaveID, XO("Down Octa&ve"), POPUP_MENU_FN( OnChangeOctave ) );
+      AppendItem( "Up", OnUpOctaveID, XXO("Up &Octave"), POPUP_MENU_FN( OnChangeOctave ) );
+      AppendItem( "Down", OnDownOctaveID, XXO("Down Octa&ve"), POPUP_MENU_FN( OnChangeOctave ) );
    EndSection();
 END_POPUP_MENU()
 
diff --git a/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp b/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp
index a5021f248..ae152a827 100644
--- a/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp
+++ b/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp
@@ -250,20 +250,20 @@ BEGIN_POPUP_MENU(NoteTrackVRulerMenuTable)
 
    BeginSection( "Zoom" );
       BeginSection( "Basic" );
-         AppendItem( "Reset", OnZoomResetID,      XO("Zoom Reset\tShift-Right-Click"), POPUP_MENU_FN( OnZoomReset ) );
-         AppendItem( "Max", OnZoomMaxID,        XO("Max Zoom"), POPUP_MENU_FN( OnZoomMax ) );
+         AppendItem( "Reset", OnZoomResetID,      XXO("Zoom Reset\tShift-Right-Click"), POPUP_MENU_FN( OnZoomReset ) );
+         AppendItem( "Max", OnZoomMaxID,        XXO("Max Zoom"), POPUP_MENU_FN( OnZoomMax ) );
       EndSection();
 
       BeginSection( "InOut" );
-         AppendItem( "In", OnZoomInVerticalID,  XO("Zoom In\tLeft-Click/Left-Drag"),  POPUP_MENU_FN( OnZoomInVertical ) );
-         AppendItem( "Out", OnZoomOutVerticalID, XO("Zoom Out\tShift-Left-Click"),     POPUP_MENU_FN( OnZoomOutVertical ) );
+         AppendItem( "In", OnZoomInVerticalID,  XXO("Zoom In\tLeft-Click/Left-Drag"),  POPUP_MENU_FN( OnZoomInVertical ) );
+         AppendItem( "Out", OnZoomOutVerticalID, XXO("Zoom Out\tShift-Left-Click"),     POPUP_MENU_FN( OnZoomOutVertical ) );
       EndSection();
    EndSection();
 
    BeginSection( "Pan" );
       BeginSection( "Octaves" );
-         AppendItem( "Up", OnUpOctaveID,   XO("Up &Octave"),   POPUP_MENU_FN( OnUpOctave) );
-         AppendItem( "Down", OnDownOctaveID, XO("Down Octa&ve"), POPUP_MENU_FN( OnDownOctave ) );
+         AppendItem( "Up", OnUpOctaveID,   XXO("Up &Octave"),   POPUP_MENU_FN( OnUpOctave) );
+         AppendItem( "Down", OnDownOctaveID, XXO("Down Octa&ve"), POPUP_MENU_FN( OnDownOctave ) );
       EndSection();
    EndSection();
 
diff --git a/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.cpp b/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.cpp
index fa90f05d4..e3325903b 100644
--- a/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.cpp
+++ b/src/tracks/playabletrack/wavetrack/ui/SpectrumVZoomHandle.cpp
@@ -290,13 +290,13 @@ EndSection();
 
 
 BeginSection( "Zoom" );
-   AppendItem( "Reset", OnZoomResetID,         XO("Zoom Reset"),
+   AppendItem( "Reset", OnZoomResetID,         XXO("Zoom Reset"),
               POPUP_MENU_FN( OnZoomReset ) );
-   AppendItem( "Fit", OnZoomFitVerticalID,   XO("Zoom to Fit\tShift-Right-Click"),
+   AppendItem( "Fit", OnZoomFitVerticalID,   XXO("Zoom to Fit\tShift-Right-Click"),
               POPUP_MENU_FN( OnZoomFitVertical ) );
-   AppendItem( "In", OnZoomInVerticalID,    XO("Zoom In\tLeft-Click/Left-Drag"),
+   AppendItem( "In", OnZoomInVerticalID,    XXO("Zoom In\tLeft-Click/Left-Drag"),
               POPUP_MENU_FN( OnZoomInVertical ) );
-   AppendItem( "Out", OnZoomOutVerticalID,   XO("Zoom Out\tShift-Left-Click"),
+   AppendItem( "Out", OnZoomOutVerticalID,   XXO("Zoom Out\tShift-Left-Click"),
               POPUP_MENU_FN( OnZoomOutVertical ) );
 EndSection();
 
diff --git a/src/tracks/playabletrack/wavetrack/ui/SpectrumView.cpp b/src/tracks/playabletrack/wavetrack/ui/SpectrumView.cpp
index 059a06271..87992b87a 100644
--- a/src/tracks/playabletrack/wavetrack/ui/SpectrumView.cpp
+++ b/src/tracks/playabletrack/wavetrack/ui/SpectrumView.cpp
@@ -32,7 +32,7 @@ Paul Licameli split from WaveTrackView.cpp
 
 static WaveTrackSubView::Type sType{
    WaveTrackViewConstants::Spectrum,
-   { wxT("Spectrogram"), XO("&Spectrogram") }
+   { wxT("Spectrogram"), XXO("&Spectrogram") }
 };
 
 static WaveTrackSubViewType::RegisteredType reg{ sType };
@@ -794,7 +794,7 @@ PopupMenuTable::AttachedItem sAttachment{
                return std::make_unique<Entry>( "SpectrogramSettings",
                   Entry::Item,
                   OnSpectrogramSettingsID,
-                  XO("S&pectrogram Settings..."),
+                  XXO("S&pectrogram Settings..."),
                   (wxCommandEventFunction)
                      (&SpectrogramSettingsHandler::OnSpectrogramSettings),
                   SpectrogramSettingsHandler::Instance(),
diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp
index a11e6fb38..18ba5e5e2 100644
--- a/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp
+++ b/src/tracks/playabletrack/wavetrack/ui/WaveTrackControls.cpp
@@ -316,19 +316,19 @@ BEGIN_POPUP_MENU(RateMenuTable)
       }
    );
 
-   AppendCheckItem( "8000", OnRate8ID, XO("8000 Hz"), POPUP_MENU_FN( OnRateChange ), fn );
-   AppendCheckItem( "11025", OnRate11ID, XO("11025 Hz"), POPUP_MENU_FN( OnRateChange ), fn );
-   AppendCheckItem( "16000", OnRate16ID, XO("16000 Hz"), POPUP_MENU_FN( OnRateChange ), fn );
-   AppendCheckItem( "22050", OnRate22ID, XO("22050 Hz"), POPUP_MENU_FN( OnRateChange ), fn );
-   AppendCheckItem( "44100", OnRate44ID, XO("44100 Hz"), POPUP_MENU_FN( OnRateChange ), fn );
-   AppendCheckItem( "48000", OnRate48ID, XO("48000 Hz"), POPUP_MENU_FN( OnRateChange ), fn );
-   AppendCheckItem( "88200", OnRate88ID, XO("88200 Hz"), POPUP_MENU_FN( OnRateChange ), fn );
-   AppendCheckItem( "96000", OnRate96ID, XO("96000 Hz"), POPUP_MENU_FN( OnRateChange ), fn );
-   AppendCheckItem( "176400", OnRate176ID, XO("176400 Hz"), POPUP_MENU_FN( OnRateChange ), fn );
-   AppendCheckItem( "192000", OnRate192ID, XO("192000 Hz"), POPUP_MENU_FN( OnRateChange ), fn );
-   AppendCheckItem( "352800", OnRate352ID, XO("352800 Hz"), POPUP_MENU_FN( OnRateChange ), fn );
-   AppendCheckItem( "384000", OnRate384ID, XO("384000 Hz"), POPUP_MENU_FN( OnRateChange ), fn );
-   AppendCheckItem( "Other", OnRateOtherID, XO("&Other..."), POPUP_MENU_FN( OnRateOther ), fn );
+   AppendCheckItem( "8000", OnRate8ID, XXO("8000 Hz"), POPUP_MENU_FN( OnRateChange ), fn );
+   AppendCheckItem( "11025", OnRate11ID, XXO("11025 Hz"), POPUP_MENU_FN( OnRateChange ), fn );
+   AppendCheckItem( "16000", OnRate16ID, XXO("16000 Hz"), POPUP_MENU_FN( OnRateChange ), fn );
+   AppendCheckItem( "22050", OnRate22ID, XXO("22050 Hz"), POPUP_MENU_FN( OnRateChange ), fn );
+   AppendCheckItem( "44100", OnRate44ID, XXO("44100 Hz"), POPUP_MENU_FN( OnRateChange ), fn );
+   AppendCheckItem( "48000", OnRate48ID, XXO("48000 Hz"), POPUP_MENU_FN( OnRateChange ), fn );
+   AppendCheckItem( "88200", OnRate88ID, XXO("88200 Hz"), POPUP_MENU_FN( OnRateChange ), fn );
+   AppendCheckItem( "96000", OnRate96ID, XXO("96000 Hz"), POPUP_MENU_FN( OnRateChange ), fn );
+   AppendCheckItem( "176400", OnRate176ID, XXO("176400 Hz"), POPUP_MENU_FN( OnRateChange ), fn );
+   AppendCheckItem( "192000", OnRate192ID, XXO("192000 Hz"), POPUP_MENU_FN( OnRateChange ), fn );
+   AppendCheckItem( "352800", OnRate352ID, XXO("352800 Hz"), POPUP_MENU_FN( OnRateChange ), fn );
+   AppendCheckItem( "384000", OnRate384ID, XXO("384000 Hz"), POPUP_MENU_FN( OnRateChange ), fn );
+   AppendCheckItem( "Other", OnRateOtherID, XXO("&Other..."), POPUP_MENU_FN( OnRateOther ), fn );
 
 END_POPUP_MENU()
 
@@ -418,7 +418,7 @@ void RateMenuTable::OnRateOther(wxCommandEvent &)
          S.SetBorder(10);
          S.StartHorizontalLay(wxEXPAND, false);
          {
-            cb = S.AddCombo(XO("New sample rate (Hz):"),
+            cb = S.AddCombo(XXO("New sample rate (Hz):"),
                rate,
                rates);
 #if defined(__WXMAC__)
@@ -544,7 +544,7 @@ BEGIN_POPUP_MENU(WaveTrackMenuTable)
       Append( []( My &table ) -> Registry::BaseItemPtr {
          if ( WaveTrackSubViews::slots() > 1 )
             return std::make_unique<Entry>(
-               "MultiView", Entry::CheckItem, OnMultiViewID, XO("&Multi-view"),
+               "MultiView", Entry::CheckItem, OnMultiViewID, XXO("&Multi-view"),
                POPUP_MENU_FN( OnMultiView ),
                table,
                []( PopupMenuHandler &handler, wxMenu &menu, int id ){
@@ -612,28 +612,28 @@ BEGIN_POPUP_MENU(WaveTrackMenuTable)
    BeginSection( "Channels" );
    // If these are enabled again, choose a hot key for Mono that does not conflict
    // with Multi View
-   //   AppendRadioItem(OnChannelMonoID, XO("&Mono"),
+   //   AppendRadioItem(OnChannelMonoID, XXO("&Mono"),
    //      POPUP_MENU_FN( OnChannelChange ),
    //      []( PopupMenuHandler &handler, wxMenu &menu, int id ){
    //         menu.Enable( id, isMono( handler ) );
    //         menu.Check( id, findTrack( handler ).GetChannel() == Track::MonoChannel );
    //      }
    //   );
-   //   AppendRadioItem(OnChannelLeftID, XO("&Left Channel"),
+   //   AppendRadioItem(OnChannelLeftID, XXO("&Left Channel"),
    //      POPUP_MENU_FN( OnChannelChange ),
    //      []( PopupMenuHandler &handler, wxMenu &menu, int id ){
    //         menu.Enable( id, isMono( handler ) );
    //         menu.Check( id, findTrack( handler ).GetChannel() == Track::LeftChannel );
    //      }
    //   );
-   //   AppendRadioItem(OnChannelRightID, XO("R&ight Channel"),
+   //   AppendRadioItem(OnChannelRightID, XXO("R&ight Channel"),
    //      POPUP_MENU_FN( OnChannelChange ),
    //      []( PopupMenuHandler &handler, wxMenu &menu, int id ){
    //         menu.Enable( id, isMono( handler ) );
    //         menu.Check( id, findTrack( handler ).GetChannel() == Track::RightChannel );
    //      }
    //   );
-      AppendItem( "MakeStereo", OnMergeStereoID, XO("Ma&ke Stereo Track"),
+      AppendItem( "MakeStereo", OnMergeStereoID, XXO("Ma&ke Stereo Track"),
          POPUP_MENU_FN( OnMergeStereo ),
          []( PopupMenuHandler &handler, wxMenu &menu, int id ){
             bool canMakeStereo = !isUnsafe( handler ) && isMono( handler );
@@ -653,7 +653,7 @@ BEGIN_POPUP_MENU(WaveTrackMenuTable)
          }
       );
 
-      AppendItem( "Swap", OnSwapChannelsID, XO("Swap Stereo &Channels"),
+      AppendItem( "Swap", OnSwapChannelsID, XXO("Swap Stereo &Channels"),
          POPUP_MENU_FN( OnSwapChannels ),
          []( PopupMenuHandler &handler, wxMenu &menu, int id ){
             auto &track =
@@ -669,12 +669,12 @@ BEGIN_POPUP_MENU(WaveTrackMenuTable)
          menu.Enable( id, !isMono( handler ) && !isUnsafe( handler ) );
       };
 
-      AppendItem( "Split", OnSplitStereoID, XO("Spl&it Stereo Track"),
+      AppendItem( "Split", OnSplitStereoID, XXO("Spl&it Stereo Track"),
          POPUP_MENU_FN( OnSplitStereo ), enableSplitStereo );
    // DA: Uses split stereo track and then drag pan sliders for split-stereo-to-mono
    #ifndef EXPERIMENTAL_DA
       AppendItem( "SplitToMono", OnSplitStereoMonoID,
-         XO("Split Stereo to Mo&no"), POPUP_MENU_FN( OnSplitStereoMono ),
+         XXO("Split Stereo to Mo&no"), POPUP_MENU_FN( OnSplitStereoMono ),
          enableSplitStereo );
    #endif
    EndSection();
diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.cpp
index cccadd017..b457ed5c1 100644
--- a/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.cpp
+++ b/src/tracks/playabletrack/wavetrack/ui/WaveformVZoomHandle.cpp
@@ -289,18 +289,18 @@ BEGIN_POPUP_MENU(WaveformVRulerMenuTable)
 
    BeginSection( "Zoom" );
       BeginSection( "Basic" );
-         AppendItem( "Reset", OnZoomFitVerticalID, XO("Zoom Reset\tShift-Right-Click"), POPUP_MENU_FN( OnZoomReset ) );
-         AppendItem( "TimesHalf", OnZoomDiv2ID,        XO("Zoom x1/2"),                     POPUP_MENU_FN( OnZoomDiv2Vertical ) );
-         AppendItem( "TimesTwo", OnZoomTimes2ID,      XO("Zoom x2"),                       POPUP_MENU_FN( OnZoomTimes2Vertical ) );
+         AppendItem( "Reset", OnZoomFitVerticalID, XXO("Zoom Reset\tShift-Right-Click"), POPUP_MENU_FN( OnZoomReset ) );
+         AppendItem( "TimesHalf", OnZoomDiv2ID,        XXO("Zoom x1/2"),                     POPUP_MENU_FN( OnZoomDiv2Vertical ) );
+         AppendItem( "TimesTwo", OnZoomTimes2ID,      XXO("Zoom x2"),                       POPUP_MENU_FN( OnZoomTimes2Vertical ) );
 
    #ifdef EXPERIMENTAL_HALF_WAVE
-         AppendItem( "HalfWave", OnZoomHalfWaveID,    XO("Half Wave"),                     POPUP_MENU_FN( OnZoomHalfWave ) );
+         AppendItem( "HalfWave", OnZoomHalfWaveID,    XXO("Half Wave"),                     POPUP_MENU_FN( OnZoomHalfWave ) );
    #endif
       EndSection();
 
       BeginSection( "InOut" );
-         AppendItem( "In", OnZoomInVerticalID,  XO("Zoom In\tLeft-Click/Left-Drag"),  POPUP_MENU_FN( OnZoomInVertical ) );
-         AppendItem( "Out", OnZoomOutVerticalID, XO("Zoom Out\tShift-Left-Click"),     POPUP_MENU_FN( OnZoomOutVertical ) );
+         AppendItem( "In", OnZoomInVerticalID,  XXO("Zoom In\tLeft-Click/Left-Drag"),  POPUP_MENU_FN( OnZoomInVertical ) );
+         AppendItem( "Out", OnZoomOutVerticalID, XXO("Zoom Out\tShift-Left-Click"),     POPUP_MENU_FN( OnZoomOutVertical ) );
       EndSection();
    EndSection();
 
diff --git a/src/tracks/playabletrack/wavetrack/ui/WaveformView.cpp b/src/tracks/playabletrack/wavetrack/ui/WaveformView.cpp
index 148e9bc6c..ac3dd9dd1 100644
--- a/src/tracks/playabletrack/wavetrack/ui/WaveformView.cpp
+++ b/src/tracks/playabletrack/wavetrack/ui/WaveformView.cpp
@@ -38,7 +38,7 @@ Paul Licameli split from WaveTrackView.cpp
 
 static WaveTrackSubView::Type sType{
    WaveTrackViewConstants::Waveform,
-   { wxT("Waveform"), XO("Wa&veform") }
+   { wxT("Waveform"), XXO("Wa&veform") }
 };
 
 static WaveTrackSubViewType::RegisteredType reg{ sType };
@@ -1096,7 +1096,7 @@ using ValueFinder = std::function< int( WaveTrack& ) >;
 
 const TranslatableString GetWaveColorStr(int colorIndex)
 {
-   return XO("Instrument %i").Format( colorIndex+1 );
+   return XXO("Instrument %i").Format( colorIndex+1 );
 }
 }
 
diff --git a/src/tracks/timetrack/ui/TimeTrackControls.cpp b/src/tracks/timetrack/ui/TimeTrackControls.cpp
index ee99a6595..d971d611c 100644
--- a/src/tracks/timetrack/ui/TimeTrackControls.cpp
+++ b/src/tracks/timetrack/ui/TimeTrackControls.cpp
@@ -157,12 +157,12 @@ BEGIN_POPUP_MENU(TimeTrackMenuTable)
    };
 
    BeginSection( "Scales" );
-      AppendRadioItem( "Linear", OnTimeTrackLinID, XO("&Linear scale"),
+      AppendRadioItem( "Linear", OnTimeTrackLinID, XXO("&Linear scale"),
          POPUP_MENU_FN( OnTimeTrackLin ),
          []( PopupMenuHandler &handler, wxMenu &menu, int id ){
             menu.Check( id, !findTrack(handler)->GetDisplayLog() );
          } );
-      AppendRadioItem( "Log", OnTimeTrackLogID, XO("L&ogarithmic scale"),
+      AppendRadioItem( "Log", OnTimeTrackLogID, XXO("L&ogarithmic scale"),
          POPUP_MENU_FN( OnTimeTrackLog ),
          []( PopupMenuHandler &handler, wxMenu &menu, int id ){
             menu.Check( id, findTrack(handler)->GetDisplayLog() );
@@ -170,10 +170,10 @@ BEGIN_POPUP_MENU(TimeTrackMenuTable)
    EndSection();
 
    BeginSection( "Other" );
-      AppendItem( "Range", OnSetTimeTrackRangeID, XO("&Range..."),
+      AppendItem( "Range", OnSetTimeTrackRangeID, XXO("&Range..."),
          POPUP_MENU_FN( OnSetTimeTrackRange ) );
       AppendCheckItem( "LogInterp", OnTimeTrackLogIntID,
-         XO("Logarithmic &Interpolation"), POPUP_MENU_FN( OnTimeTrackLogInt),
+         XXO("Logarithmic &Interpolation"), POPUP_MENU_FN( OnTimeTrackLogInt),
          []( PopupMenuHandler &handler, wxMenu &menu, int id ){
             menu.Check( id, findTrack(handler)->GetInterpolateLog() );
          } );
diff --git a/src/tracks/ui/CommonTrackControls.cpp b/src/tracks/ui/CommonTrackControls.cpp
index e4342bd6e..c48e7d932 100644
--- a/src/tracks/ui/CommonTrackControls.cpp
+++ b/src/tracks/ui/CommonTrackControls.cpp
@@ -125,7 +125,7 @@ BEGIN_POPUP_MENU(TrackMenuTable)
    };
 
    BeginSection( "Basic" );
-      AppendItem( "Name", OnSetNameID, XO("&Name..."), POPUP_MENU_FN( OnSetName ) );
+      AppendItem( "Name", OnSetNameID, XXO("&Name..."), POPUP_MENU_FN( OnSetName ) );
    EndSection();
    BeginSection( "Move" );
       AppendItem( "Up",
@@ -133,7 +133,7 @@ BEGIN_POPUP_MENU(TrackMenuTable)
          // wxWidgets will apply its equivalent to the key names passed to menu
          // functions.
          OnMoveUpID,
-         XO("Move Track &Up").Join(
+         XXO("Move Track &Up").Join(
             Verbatim(
                CommandManager::Get( mpData->project ).
                    // using GET to compose menu item name for wxWidgets
@@ -143,7 +143,7 @@ BEGIN_POPUP_MENU(TrackMenuTable)
          POPUP_MENU_FN( OnMoveTrack ), enableIfCanMove(true) );
       AppendItem( "Down",
          OnMoveDownID,
-         XO("Move Track &Down").Join(
+         XXO("Move Track &Down").Join(
             Verbatim(
                CommandManager::Get( mpData->project ).
                   // using GET to compose menu item name for wxWidgets
@@ -153,7 +153,7 @@ BEGIN_POPUP_MENU(TrackMenuTable)
          POPUP_MENU_FN( OnMoveTrack ), enableIfCanMove(false) );
       AppendItem( "Top",
          OnMoveTopID,
-         XO("Move Track to &Top").Join(
+         XXO("Move Track to &Top").Join(
             Verbatim(
                CommandManager::Get( mpData->project ).
                    // using GET to compose menu item name for wxWidgets
@@ -163,7 +163,7 @@ BEGIN_POPUP_MENU(TrackMenuTable)
          POPUP_MENU_FN( OnMoveTrack ), enableIfCanMove(true) );
       AppendItem( "Bottom",
          OnMoveBottomID,
-         XO("Move Track to &Bottom").Join(
+         XXO("Move Track to &Bottom").Join(
             Verbatim(
                CommandManager::Get( mpData->project ).
                   // using GET to compose menu item name for wxWidgets
@@ -209,7 +209,7 @@ void SetTrackNameCommand::PopulateOrExchange(ShuttleGui & S)
 
    S.StartMultiColumn(2, wxALIGN_CENTER);
    {
-      S.TieTextBox(XO("Name:"),mName,60);
+      S.TieTextBox(XXO("Name:"),mName,60);
    }
    S.EndMultiColumn();
 }
diff --git a/src/tracks/ui/Scrubbing.cpp b/src/tracks/ui/Scrubbing.cpp
index 44d91da73..58244ffae 100644
--- a/src/tracks/ui/Scrubbing.cpp
+++ b/src/tracks/ui/Scrubbing.cpp
@@ -277,7 +277,7 @@ namespace {
          "Scrubbing" is variable-speed playback, ...
          "Seeking" is normal speed playback but with skips, ...
        */
-      { wxT("Scrub"),       XO("&Scrub"),           XO("Scrubbing"),
+      { wxT("Scrub"),       XXO("&Scrub"),           XO("Scrubbing"),
          CaptureNotBusyFlag() | HasWaveDataFlag(),
          &Scrubber::OnScrub,       false,      &Scrubber::Scrubs,
       },
@@ -286,7 +286,7 @@ namespace {
          "Scrubbing" is variable-speed playback, ...
          "Seeking" is normal speed playback but with skips, ...
        */
-      { wxT("Seek"),        XO("See&k"),            XO("Seeking"),
+      { wxT("Seek"),        XXO("See&k"),            XO("Seeking"),
          CaptureNotBusyFlag() | HasWaveDataFlag(),
          &Scrubber::OnSeek,        true,       &Scrubber::Seeks,
       },
@@ -295,7 +295,7 @@ namespace {
          "Scrubbing" is variable-speed playback, ...
          "Seeking" is normal speed playback but with skips, ...
        */
-      { wxT("ToggleScrubRuler"),            XO("Scrub &Ruler"),   {},
+      { wxT("ToggleScrubRuler"),            XXO("Scrub &Ruler"),   {},
          AlwaysEnabledFlag,
          &Scrubber::OnToggleScrubRuler, false,    &Scrubber::ShowsBar,
       },
@@ -1223,7 +1223,7 @@ BaseItemSharedPtr ToolbarMenu()
    static BaseItemSharedPtr menu { (
    FinderScope{ finder },
    Menu( wxT("Scrubbing"),
-      XO("Scru&bbing"),
+      XXO("Scru&bbing"),
       []{
          BaseItemPtrs ptrs;
          for (const auto &item : menuItems()) {
diff --git a/src/widgets/HelpSystem.cpp b/src/widgets/HelpSystem.cpp
index bbdb57138..0dbab77b8 100644
--- a/src/widgets/HelpSystem.cpp
+++ b/src/widgets/HelpSystem.cpp
@@ -172,14 +172,14 @@ void HelpSystem::ShowHtmlText(wxWindow *pParent,
             .ToolTip( XO("Backwards" ) )
 #endif
             /* i18n-hint arrowhead meaning backward movement */
-            .AddButton( XO("<") );
+            .AddButton( XXO("<") );
          S.Id( wxID_FORWARD  )
             .Disable()
 #if wxUSE_TOOLTIPS
             .ToolTip( XO("Forwards" ) )
 #endif
             /* i18n-hint arrowhead meaning forward movement */
-            .AddButton( XO(">") );
+            .AddButton( XXO(">") );
       }
       S.EndHorizontalLay();
 
@@ -197,7 +197,7 @@ void HelpSystem::ShowHtmlText(wxWindow *pParent,
       S.Prop(1).Focus().Position( wxEXPAND )
          .AddWindow( html );
 
-      S.Id( wxID_CANCEL ).AddButton( XO("Close"), wxALIGN_CENTER, true );
+      S.Id( wxID_CANCEL ).AddButton( XXO("Close"), wxALIGN_CENTER, true );
    }
    S.EndPanel();
 
diff --git a/src/widgets/Meter.cpp b/src/widgets/Meter.cpp
index 97a1dc488..4a02f3c8a 100644
--- a/src/widgets/Meter.cpp
+++ b/src/widgets/Meter.cpp
@@ -2009,7 +2009,7 @@ void MeterPanel::OnPreferences(wxCommandEvent & WXUNUSED(event))
                .Validator<IntegerValidator<long>>(
                   &mMeterRefreshRate, NumValidatorStyle::DEFAULT,
                   MIN_REFRESH_RATE, MAX_REFRESH_RATE)
-               .AddTextBox(XO("Meter refresh rate per second [1-100]: "),
+               .AddTextBox(XXO("Meter refresh rate per second [1-100]: "),
                                 wxString::Format(wxT("%d"), meterRefreshRate),
                                 10);
          }
@@ -2023,8 +2023,8 @@ void MeterPanel::OnPreferences(wxCommandEvent & WXUNUSED(event))
         {
            S.StartVerticalLay();
            {
-              gradient = S.AddRadioButton(XO("Gradient"), true, mGradient);
-              rms = S.AddRadioButtonToGroup(XO("RMS"), false, mGradient);
+              gradient = S.AddRadioButton(XXO("Gradient"), true, mGradient);
+              rms = S.AddRadioButtonToGroup(XXO("RMS"), false, mGradient);
            }
            S.EndVerticalLay();
         }
@@ -2034,8 +2034,8 @@ void MeterPanel::OnPreferences(wxCommandEvent & WXUNUSED(event))
         {
            S.StartVerticalLay();
            {
-              db = S.AddRadioButton(XO("dB"), true, mDB);
-              linear = S.AddRadioButtonToGroup(XO("Linear"), false, mDB);
+              db = S.AddRadioButton(XXO("dB"), true, mDB);
+              linear = S.AddRadioButtonToGroup(XXO("Linear"), false, mDB);
            }
            S.EndVerticalLay();
         }
@@ -2046,11 +2046,11 @@ void MeterPanel::OnPreferences(wxCommandEvent & WXUNUSED(event))
            S.StartVerticalLay();
            {
               automatic = S.AddRadioButton(
-                  XO("Automatic"), AutomaticStereo, mDesiredStyle);
+                  XXO("Automatic"), AutomaticStereo, mDesiredStyle);
               horizontal = S.AddRadioButtonToGroup(
-                  XO("Horizontal"), HorizontalStereo, mDesiredStyle);
+                  XXO("Horizontal"), HorizontalStereo, mDesiredStyle);
               vertical = S.AddRadioButtonToGroup(
-                  XO("Vertical"), VerticalStereo, mDesiredStyle);
+                  XXO("Vertical"), VerticalStereo, mDesiredStyle);
            }
            S.EndVerticalLay();
         }
diff --git a/src/widgets/MultiDialog.cpp b/src/widgets/MultiDialog.cpp
index 95df9f1e9..151fd5b4c 100644
--- a/src/widgets/MultiDialog.cpp
+++ b/src/widgets/MultiDialog.cpp
@@ -135,7 +135,7 @@ MultiDialog::MultiDialog(wxWindow * pParent,
                S
                   .Id(ID_SHOW_LOG_BUTTON)
                   .AddButton(
-                     XO("Show Log for Details"), wxALIGN_LEFT | wxALL,
+                     XXO("Show Log for Details"), wxALIGN_LEFT | wxALL,
                      // set default to encourage user to look at files.
                      true);
 
@@ -143,7 +143,7 @@ MultiDialog::MultiDialog(wxWindow * pParent,
             }
 
             auto pButton = S.Id(wxID_OK)
-               .AddButton(XO("OK"), wxALIGN_CENTER, !log);
+               .AddButton(XXO("OK"), wxALIGN_CENTER, !log);
 
             if (!mHelpPage.IsEmpty()) {
                auto pHelpBtn = S.Id(wxID_HELP)
diff --git a/src/widgets/Warning.cpp b/src/widgets/Warning.cpp
index 6e85cb5ac..fae4f02c9 100644
--- a/src/widgets/Warning.cpp
+++ b/src/widgets/Warning.cpp
@@ -53,7 +53,7 @@ END_EVENT_TABLE()
 
 const TranslatableString &DefaultWarningFooter()
 {
-   static auto result = XO("Don't show this warning again");
+   static auto result = XXO("Don't show this warning again");
    return result;
 }